Steve Piercy
2017-06-02 d34e108a059b42e01afaeebb037ec73b2a2e2e31
Merge pull request #3070 from stevepiercy/1.8-branch

specify cookiecutter branch, use shortcut for github URL
7 files modified
22 ■■■■■ changed files
CHANGES.txt 4 ●●●● patch | view | raw | blame | history
docs/narr/project.rst 2 ●●● patch | view | raw | blame | history
docs/quick_tour.rst 4 ●●●● patch | view | raw | blame | history
docs/quick_tutorial/cookiecutters.rst 2 ●●● patch | view | raw | blame | history
docs/tutorials/modwsgi/index.rst 2 ●●● patch | view | raw | blame | history
docs/tutorials/wiki/installation.rst 4 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/installation.rst 4 ●●●● patch | view | raw | blame | history
CHANGES.txt
@@ -15,6 +15,10 @@
  resulting source files in tutorials.
  See https://github.com/Pylons/pyramid/issues/2548
- Update ``cookiecutter`` command to use a checkout for specific branch and
  shorten it.
  See https://github.com/Pylons/pyramid/issues/3042
.. _changes_1.8.3:
docs/narr/project.rst
@@ -85,7 +85,7 @@
.. code-block:: bash
   $ cookiecutter https://github.com/Pylons/pyramid-cookiecutter-starter
   $ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout 1.8-branch
If prompted for the first item, accept the default ``yes`` by hitting return.
docs/quick_tour.rst
@@ -510,7 +510,7 @@
.. code-block:: bash
    $ $VENV/bin/cookiecutter https://github.com/Pylons/pyramid-cookiecutter-starter
    $ $VENV/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout 1.8-branch
If prompted for the first item, accept the default ``yes`` by hitting return.
@@ -866,7 +866,7 @@
.. code-block:: bash
    $ cd ~
    $ env/bin/cookiecutter https://github.com/Pylons/pyramid-cookiecutter-alchemy
    $ env/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout 1.8-branch
If prompted for the first item, accept the default ``yes`` by hitting return.
docs/quick_tutorial/cookiecutters.rst
@@ -28,7 +28,7 @@
    .. code-block:: bash
        $ $VENV/bin/cookiecutter https://github.com/Pylons/pyramid-cookiecutter-starter
        $ $VENV/bin/cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout 1.8-branch
    If prompted for the first item, accept the default ``yes`` by hitting return.
docs/tutorials/modwsgi/index.rst
@@ -39,7 +39,7 @@
    .. code-block:: bash
       $ cd ~
       $ cookiecutter https://github.com/Pylons/pyramid-cookiecutter-starter
       $ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout 1.8-branch
    If prompted for the first item, accept the default ``yes`` by hitting return.
docs/tutorials/wiki/installation.rst
@@ -31,7 +31,7 @@
.. code-block:: bash
    $ cd ~
    $ cookiecutter https://github.com/Pylons/pyramid-cookiecutter-zodb
    $ cookiecutter gh:Pylons/pyramid-cookiecutter-zodb --checkout 1.8-branch
On Windows
^^^^^^^^^^
@@ -39,7 +39,7 @@
.. code-block:: doscon
    c:\> cd \
    c:\> cookiecutter https://github.com/Pylons/pyramid-cookiecutter-zodb
    c:\> cookiecutter gh:Pylons/pyramid-cookiecutter-zodb --checkout 1.8-branch
On all operating systems
^^^^^^^^^^^^^^^^^^^^^^^^
docs/tutorials/wiki2/installation.rst
@@ -43,7 +43,7 @@
.. code-block:: bash
    $ cd ~
    $ cookiecutter https://github.com/Pylons/pyramid-cookiecutter-alchemy
    $ cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout 1.8-branch
On Windows
^^^^^^^^^^
@@ -51,7 +51,7 @@
.. code-block:: doscon
    c:\> cd \
    c:\> cookiecutter https://github.com/Pylons/pyramid-cookiecutter-alchemy
    c:\> cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout 1.8-branch
On all operating systems
^^^^^^^^^^^^^^^^^^^^^^^^