summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2022-12-30 11:18:04 -0600
committerGitHub <noreply@github.com>2022-12-30 11:18:04 -0600
commitd3fc4f97e8d5b8553c2a40da535a4b82d41d8ea1 (patch)
tree60774a19ad044f32cf6c9416c807b3d423376847 /docs/tutorials
parent240f34a18cde2473922bcc139ee92ee8b6978ce2 (diff)
parent068555acbd102694bd83c2fe11b5b125ca8649f8 (diff)
downloadpyramid-d3fc4f97e8d5b8553c2a40da535a4b82d41d8ea1.tar.gz
pyramid-d3fc4f97e8d5b8553c2a40da535a4b82d41d8ea1.tar.bz2
pyramid-d3fc4f97e8d5b8553c2a40da535a4b82d41d8ea1.zip
Merge pull request #3713 from jvanasco/main
rename "master" to "main"
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/modwsgi/index.rst2
-rw-r--r--docs/tutorials/wiki/installation.rst4
-rw-r--r--docs/tutorials/wiki2/installation.rst6
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst
index be72c014c..fdb3cb33a 100644
--- a/docs/tutorials/modwsgi/index.rst
+++ b/docs/tutorials/modwsgi/index.rst
@@ -39,7 +39,7 @@ specific path information for commands and files.
.. code-block:: bash
cd ~
- cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
+ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout main
If prompted for the first item, accept the default ``yes`` by hitting return.
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index 7113c4bc2..ce15bff0e 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -36,7 +36,7 @@ On Unix
.. code-block:: bash
cd ~
- cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
+ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout main
On Windows
@@ -45,7 +45,7 @@ On Windows
.. code-block:: doscon
cd \
- cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
+ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout main
On all operating systems
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index c961d490b..12855e83b 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -43,7 +43,7 @@ On Unix
.. code-block:: bash
cd ~
- cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
+ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout main
On Windows
^^^^^^^^^^
@@ -51,7 +51,7 @@ On Windows
.. code-block:: doscon
cd \
- cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
+ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout main
On all operating systems
^^^^^^^^^^^^^^^^^^^^^^^^
@@ -273,7 +273,7 @@ On Windows
There should be no output to your console.
You should now have a ``tutorial.sqlite`` file in your current working directory.
-This is an SQLite database with three tables defined in it, ``alembic_version``, ``models``, and ``master``, where the first two tables each have single record inside of them.
+This is an SQLite database with three tables defined in it, ``alembic_version``, ``models``, where the first two tables each have single record inside of them.
.. _sql_running_tests: