summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/index.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-02-29 13:02:13 -0600
committerMichael Merickel <michael@merickel.org>2016-02-29 13:02:13 -0600
commit565fa59e7eab1e71ec4c4c1ee5773f2ecbf7a07f (patch)
tree9f7098358c01622fcae8fbe8a318f6484e5d3c8b /docs/tutorials/wiki2/index.rst
parentcb98a90c3dcc40dc42813143a601ef631249f5f4 (diff)
parenta79bac6697fa312cd1ba0ac4e784bbc820c5e603 (diff)
downloadpyramid-565fa59e7eab1e71ec4c4c1ee5773f2ecbf7a07f.tar.gz
pyramid-565fa59e7eab1e71ec4c4c1ee5773f2ecbf7a07f.tar.bz2
pyramid-565fa59e7eab1e71ec4c4c1ee5773f2ecbf7a07f.zip
Merge pull request #2024 from Pylons/feature/alchemy-scaffold-update
alchemy scaffold updates
Diffstat (limited to 'docs/tutorials/wiki2/index.rst')
-rw-r--r--docs/tutorials/wiki2/index.rst13
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/tutorials/wiki2/index.rst b/docs/tutorials/wiki2/index.rst
index 0a3873dcd..18e9f552e 100644
--- a/docs/tutorials/wiki2/index.rst
+++ b/docs/tutorials/wiki2/index.rst
@@ -1,15 +1,15 @@
.. _bfg_sql_wiki_tutorial:
-SQLAlchemy + URL Dispatch Wiki Tutorial
+SQLAlchemy + URL dispatch wiki tutorial
=======================================
-This tutorial introduces a :term:`SQLAlchemy` and :term:`url dispatch`-based
+This tutorial introduces an :term:`SQLAlchemy` and :term:`URL dispatch`-based
:app:`Pyramid` application to a developer familiar with Python. When the
-tutorial is finished, the developer will have created a basic Wiki
-application with authentication.
+tutorial is finished, the developer will have created a basic wiki
+application with authentication and authorization.
-For cut and paste purposes, the source code for all stages of this
-tutorial can be browsed on GitHub at `docs/tutorials/wiki2/src
+For cut and paste purposes, the source code for all stages of this tutorial can
+be browsed on GitHub at `docs/tutorials/wiki2/src
<https://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src>`_,
which corresponds to the same location if you have Pyramid sources.
@@ -22,6 +22,7 @@ which corresponds to the same location if you have Pyramid sources.
basiclayout
definingmodels
definingviews
+ authentication
authorization
tests
distributing