summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/definingviews.rst
diff options
context:
space:
mode:
authorStephen Martin <lockwood@opperline.com>2018-09-09 17:05:27 -0700
committerStephen Martin <lockwood@opperline.com>2018-09-09 17:05:27 -0700
commit6b6d0e4c2b4e56523bd41aefd9d462858e03f443 (patch)
tree51aa7bdc1dec89a6109f469934379726ea9fb835 /docs/tutorials/wiki2/definingviews.rst
parent60ab8c81c0e0cda731792cf1ecd540e2d450cc1d (diff)
downloadpyramid-6b6d0e4c2b4e56523bd41aefd9d462858e03f443.tar.gz
pyramid-6b6d0e4c2b4e56523bd41aefd9d462858e03f443.tar.bz2
pyramid-6b6d0e4c2b4e56523bd41aefd9d462858e03f443.zip
merging cookiecutters
Diffstat (limited to 'docs/tutorials/wiki2/definingviews.rst')
-rw-r--r--docs/tutorials/wiki2/definingviews.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index 700a105b1..c75f6d5ba 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 ``alchemy`` cookiecutter. It was only an example
-and isn't relevant to our application. We also deleted the ``db_err_msg``
-string.
+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.
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 ``alchemy`` cookiecutter, as we have created our own
-templates for the wiki.
+that was provided by the ``sqlalchemy`` backend cookiecutter, as we have
+created our own templates for the wiki.
.. note::