From 813b7c636a77c0a1a182f9390cfadd0a452c5d2a Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Fri, 02 Jun 2017 02:15:55 +0200
Subject: [PATCH] specify cookiecutter branch, use shortcut for github URL

---
 docs/tutorials/modwsgi/index.rst      |    2 +-
 docs/tutorials/wiki2/installation.rst |    4 ++--
 docs/quick_tutorial/cookiecutters.rst |    2 +-
 CHANGES.txt                           |    4 ++++
 docs/narr/project.rst                 |    2 +-
 docs/tutorials/wiki/installation.rst  |    4 ++--
 docs/quick_tour.rst                   |    4 ++--
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 36d99b2..b9fc27f 100644
--- a/CHANGES.txt
+++ b/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:
 
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index a150afc..c9af0f3 100644
--- a/docs/narr/project.rst
+++ b/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.
 
diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 1265012..ec95623 100644
--- a/docs/quick_tour.rst
+++ b/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.
 
diff --git a/docs/quick_tutorial/cookiecutters.rst b/docs/quick_tutorial/cookiecutters.rst
index 337a5c5..941da02 100644
--- a/docs/quick_tutorial/cookiecutters.rst
+++ b/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.
 
diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst
index 170f2eb..46efa57 100644
--- a/docs/tutorials/modwsgi/index.rst
+++ b/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.
 
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index de057b1..9827d7d 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/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
 ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index c61d436..fd041a2 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/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
 ^^^^^^^^^^^^^^^^^^^^^^^^

--
Gitblit v1.9.3