summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/index.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-03-21 23:34:26 -0500
committerMichael Merickel <michael@merickel.org>2016-03-21 23:34:26 -0500
commit5238bb64abfebc085ca95df517535f61e27b7fc2 (patch)
treec4eb14e487f561d4c12824b0b03656e24efccfd1 /docs/tutorials/wiki2/index.rst
parent0b0f7e1a6d411bcc2af615da8e9dec7ea7519152 (diff)
parent530bad618c33d65ad071b0280ce56eb265195805 (diff)
downloadpyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.gz
pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.bz2
pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.zip
Merge branch 'master' into feature/configurable-view-deriver
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