summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/installation.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2018-10-05 02:38:30 -0700
committerGitHub <noreply@github.com>2018-10-05 02:38:30 -0700
commit536caa6e0306be956a0bb281b6370effc476d38d (patch)
tree1af84e37e9ad7bdb445786a0345822dcdfd851f0 /docs/tutorials/wiki2/installation.rst
parentf6becd23966248fb7fc4db218258be4364902f8f (diff)
parent086198b5db7dcb86c2b4edbc5d3610dcade0332a (diff)
downloadpyramid-536caa6e0306be956a0bb281b6370effc476d38d.tar.gz
pyramid-536caa6e0306be956a0bb281b6370effc476d38d.tar.bz2
pyramid-536caa6e0306be956a0bb281b6370effc476d38d.zip
Merge pull request #3346 from stloma/one_cc
updating docs for merging cookiecutters
Diffstat (limited to 'docs/tutorials/wiki2/installation.rst')
-rw-r--r--docs/tutorials/wiki2/installation.rst29
1 files changed, 18 insertions, 11 deletions
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index b2f1dde4a..924927cd4 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-alchemy --checkout master
+ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
On Windows
^^^^^^^^^^
@@ -51,7 +51,7 @@ On Windows
.. code-block:: doscon
cd \
- cookiecutter gh:Pylons/pyramid-cookiecutter-alchemy --checkout master
+ cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout master
On all operating systems
^^^^^^^^^^^^^^^^^^^^^^^^
@@ -59,10 +59,21 @@ If prompted for the first item, accept the default ``yes`` by hitting return.
.. code-block:: text
- You've cloned ~/.cookiecutters/pyramid-cookiecutter-alchemy before.
+ You've cloned ~/.cookiecutters/pyramid-cookiecutter-starter before.
Is it okay to delete and re-clone it? [yes]: yes
project_name [Pyramid Scaffold]: myproj
repo_name [myproj]: tutorial
+ Select template_language:
+ 1 - jinja2
+ 2 - chameleon
+ 3 - mako
+ Choose from 1, 2, 3 [1]: 1
+ Select backend:
+ 1 - none
+ 2 - sqlalchemy
+ 3 - zodb
+ Choose from 1, 2, 3 [1]: 2
+
Change directory into your newly created project
------------------------------------------------
@@ -508,11 +519,11 @@ page. You can read more about the purpose of the icon at
application while you develop.
-Decisions the ``alchemy`` cookiecutter has made for you
--------------------------------------------------------
+Decisions the cookiecutter backend option ``sqlalchemy`` has made for you
+-------------------------------------------------------------------------
-Creating a project using the ``alchemy`` cookiecutter makes the following
-assumptions:
+When creating a project and selecting the backend option of ``sqlalchemy``, the
+cookiecutter makes the following assumptions:
- You are willing to use SQLite for persistent storage, although almost any SQL database could be used with SQLAlchemy.
@@ -527,10 +538,6 @@ assumptions:
- You want to use zope.sqlalchemy_, pyramid_tm_, and the transaction_ packages
to scope sessions to requests.
-- You want to use pyramid_jinja2_ to render your templates. Different
- templating engines can be used, but we had to choose one to make this
- tutorial. See :ref:`available_template_system_bindings` for some options.
-
.. note::
:app:`Pyramid` supports any persistent storage mechanism (e.g., object