Merge pull request Pylons#2966 from stevepiercy/1.8-branch

Update pyramid-cookiecutter-starter prompts and reformat presentation of all cookiecutter prompts

CHANGES.txt

@@ -1,3 +1,14 @@
+.. _changes_1.8.3:
+
+1.8.3 (unreleased)
+==================
+
+Documentation Changes
+---------------------
+
+- Updated pyramid-cookiecutter-starter prompts and reformat presentation of all
+  cookiecutter prompts. See https://github.com/Pylons/pyramid/pull/2966
+
 .. _changes_1.8.2:
 
 1.8.2 (2017-02-20)

docs/narr/project.rst

@@ -89,10 +89,16 @@ On all platforms, generate a project using cookiecutter.
 
 If prompted for the first item, accept the default ``yes`` by hitting return.
 
-#. ``You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before. Is it
-   okay to delete and re-clone it? [yes]:``
-#. ``project_name [Pyramid Scaffold]: myproject``
-#. ``repo_name [scaffold]: myproject``
+.. code-block:: text
+
+    You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before.
+    Is it okay to delete and re-clone it? [yes]: yes
+    project_name [Pyramid Scaffold]: myproject
+    repo_name [scaffold]: myproject
+    Select template_language:
+    1 - jinja2
+    2 - chameleon
+    Choose from 1, 2 [1]: 1
 
 We then run through the following commands.
 

docs/quick_tour.rst

@@ -514,10 +514,16 @@ Let's use the cookiecutter ``pyramid-cookiecutter-starter`` to create a starter
 
 If prompted for the first item, accept the default ``yes`` by hitting return.
 
-#. ``You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before. Is it
-   okay to delete and re-clone it? [yes]:``
-#. ``project_name [Pyramid Scaffold]: hello_world``
-#. ``repo_name [scaffold]: hello_world``
+.. code-block:: text
+
+    You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before.
+    Is it okay to delete and re-clone it? [yes]: yes
+    project_name [Pyramid Scaffold]: hello_world
+    repo_name [scaffold]: hello_world
+    Select template_language:
+    1 - jinja2
+    2 - chameleon
+    Choose from 1, 2 [1]: 1
 
 We then run through the following commands.
 
@@ -863,10 +869,12 @@ Pyramid and SQLAlchemy are great friends. That friendship includes a cookiecutte
 
 If prompted for the first item, accept the default ``yes`` by hitting return.
 
-#. ``You've cloned ~/.cookiecutters/pyramid-cookiecutter-alchemy before. Is it
-   okay to delete and re-clone it? [yes]:``
-#. ``project_name [Pyramid Scaffold]: sqla_demo``
-#. ``repo_name [scaffold]: sqla_demo``
+.. code-block:: text
+
+    You've cloned ~/.cookiecutters/pyramid-cookiecutter-alchemy before.
+    Is it okay to delete and re-clone it? [yes]: yes
+    project_name [Pyramid Scaffold]: sqla_demo
+    repo_name [scaffold]: sqla_demo
 
 We then run through the following commands as before.
 

docs/quick_tutorial/cookiecutters.rst

@@ -32,9 +32,16 @@ Steps
 
     If prompted for the first item, accept the default ``yes`` by hitting return.
 
-    #. ``You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before. Is it okay to delete and re-clone it? [yes]:``
-    #. ``project_name [Pyramid Scaffold]: cc_starter``
-    #. ``repo_name [scaffold]: cc_starter``
+    .. code-block:: text
+
+        You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before.
+        Is it okay to delete and re-clone it? [yes]: yes
+        project_name [Pyramid Scaffold]: cc_starter
+        repo_name [scaffold]: cc_starter
+        Select template_language:
+        1 - jinja2
+        2 - chameleon
+        Choose from 1, 2 [1]: 1
 
 #.  We then run through the following commands.
 

docs/tutorials/modwsgi/index.rst

@@ -40,8 +40,19 @@ specific path information for commands and files.
 
        $ cd ~
        $ cookiecutter https://github.com/Pylons/pyramid-cookiecutter-starter
-       project_name [Pyramid Scaffold]: myproject
-       repo_name [scaffold]: myproject
+
+    If prompted for the first item, accept the default ``yes`` by hitting return.
+
+    .. code-block:: text
+
+        You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before.
+        Is it okay to delete and re-clone it? [yes]: yes
+        project_name [Pyramid Scaffold]: myproject
+        repo_name [scaffold]: myproject
+        Select template_language:
+        1 - jinja2
+        2 - chameleon
+        Choose from 1, 2 [1]: 1
 
 #.  Create a :term:`virtual environment` which we'll use to install our
     application. It is important to use the same base Python interpreter

docs/tutorials/wiki/installation.rst

@@ -45,11 +45,12 @@ On all operating systems
 ^^^^^^^^^^^^^^^^^^^^^^^^
 If prompted for the first item, accept the default ``yes`` by hitting return.
 
-#. ``You've cloned ~/.cookiecutters/pyramid-cookiecutter-zodb before. Is it
-   okay to delete and re-clone it? [yes]:``
-#. ``project_name [Pyramid Scaffold]: myproj``
-#. ``repo_name [scaffold]: tutorial``
+.. code-block:: text
 
+    You've cloned ~/.cookiecutters/pyramid-cookiecutter-zodb before.
+    Is it okay to delete and re-clone it? [yes]: yes
+    project_name [Pyramid Scaffold]: myproj
+    repo_name [scaffold]: tutorial
 
 Change directory into your newly created project
 ------------------------------------------------

docs/tutorials/wiki2/installation.rst

@@ -57,11 +57,12 @@ On all operating systems
 ^^^^^^^^^^^^^^^^^^^^^^^^
 If prompted for the first item, accept the default ``yes`` by hitting return.
 
-#. ``You've cloned ~/.cookiecutters/pyramid-cookiecutter-alchemy before. Is it
-   okay to delete and re-clone it? [yes]:``
-#. ``project_name [Pyramid Scaffold]: myproj``
-#. ``repo_name [scaffold]: tutorial``
+.. code-block:: text
 
+    You've cloned ~/.cookiecutters/pyramid-cookiecutter-alchemy before.
+    Is it okay to delete and re-clone it? [yes]: yes
+    project_name [Pyramid Scaffold]: myproj
+    repo_name [scaffold]: tutorial
 
 Change directory into your newly created project
 ------------------------------------------------