summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2
diff options
context:
space:
mode:
authorStephen Martin <lockwood@opperline.com>2018-09-16 15:46:31 -0700
committerStephen Martin <lockwood@opperline.com>2018-09-16 15:46:31 -0700
commitf2520e5910861beac0199aa424ba282f856f79b3 (patch)
tree9b9919cc52da2abd25ad6bd940ffb98ab4ccc488 /docs/tutorials/wiki2
parentf1f15e9f4d98de268b65166c88cf1e5bbb8c1e79 (diff)
downloadpyramid-f2520e5910861beac0199aa424ba282f856f79b3.tar.gz
pyramid-f2520e5910861beac0199aa424ba282f856f79b3.tar.bz2
pyramid-f2520e5910861beac0199aa424ba282f856f79b3.zip
doc fixes
Diffstat (limited to 'docs/tutorials/wiki2')
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst7
-rw-r--r--docs/tutorials/wiki2/definingviews.rst10
-rw-r--r--docs/tutorials/wiki2/installation.rst8
-rw-r--r--docs/tutorials/wiki2/tests.rst4
4 files changed, 15 insertions, 14 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index bb2d4cdcf..f3a9db223 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -4,9 +4,10 @@
Basic Layout
============
-The starter files generated by the ``sqlalchemy`` backend cookiecutter are very
-basic, but they provide a good orientation for the high-level patterns common
-to most :term:`URL dispatch`-based :app:`Pyramid` projects.
+The starter files generated from choosing the ``sqlalchemy`` backend option in
+the cookiecutter are very basic, but they provide a good orientation for the
+high-level patterns common to most :term:`URL dispatch`-based :app:`Pyramid`
+projects.
Application configuration with ``__init__.py``
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index c75f6d5ba..b73338f52 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -133,9 +133,9 @@ The highlighted lines need to be added or edited.
We added some imports, and created a regular expression to find "WikiWords".
We got rid of the ``my_view`` view function and its decorator that was added
-when we originally rendered the ``sqlalchemy`` backend cookiecutter. It was
-only an example and isn't relevant to our application. We also deleted the
-``db_err_msg`` string.
+when originally rendered after we selected the ``sqlalchemy`` backend option in
+the cookiecutter. It was only an example and isn't relevant to our
+application. We also deleted the ``db_err_msg`` string.
Then we added four :term:`view callable` functions to our ``views/default.py``
module, as mentioned in the previous step:
@@ -436,8 +436,8 @@ There are several important things to note about this configuration:
the view.
Finally, we may delete the ``tutorial/templates/mytemplate.jinja2`` template
-that was provided by the ``sqlalchemy`` backend cookiecutter, as we have
-created our own templates for the wiki.
+that was provided by selecting the backend option of ``sqlalchemy``, as we
+have created our own templates for the wiki.
.. note::
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 133bf75d3..0ab097b59 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -519,11 +519,11 @@ page. You can read more about the purpose of the icon at
application while you develop.
-Decisions the ``sqlalchemy`` backend cookiecutter has made for you
-------------------------------------------------------------------
+Decisions the cookiecutter backend option ``sqlalchemy`` has made for you
+-------------------------------------------------------------------------
-Creating a project using the ``sqlalchemy`` 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.
diff --git a/docs/tutorials/wiki2/tests.rst b/docs/tutorials/wiki2/tests.rst
index 99a594d31..a8c35aa51 100644
--- a/docs/tutorials/wiki2/tests.rst
+++ b/docs/tutorials/wiki2/tests.rst
@@ -8,8 +8,8 @@ We will now add tests for the models and views as well as a few functional
tests in a new ``tests`` subpackage. Tests ensure that an application works,
and that it continues to work when changes are made in the future.
-The file ``tests.py`` was generated as part of the ``sqlalchemy`` backend
-cookiecutter, but it is a common practice to put tests into a ``tests``
+The file ``tests.py`` was generated from choosing the ``sqlalchemy`` backend
+option, but it is a common practice to put tests into a ``tests``
subpackage, especially as projects grow in size and complexity. Each module in
the test subpackage should contain tests for its corresponding module in our
application. Each corresponding pair of modules should have the same names,