Merge remote-tracking branch 'refs/remotes/Pylons/master'

1 files changed, 11 insertions, 11 deletions

diff --git a/docs/tutorials/wiki2/index.rst b/docs/tutorials/wiki2/index.rst
index d05d70f3c..18e9f552e 100644
--- a/docs/tutorials/wiki2/index.rst
+++ b/docs/tutorials/wiki2/index.rst
@@ -1,29 +1,29 @@
 .. _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
-:app:`Pyramid` application to a developer familiar with Python, and will be
-most familiar to developers who have used the :term:`Pylons` 1.X web
-framework.  When the tutorial is finished, the developer will have created a
-basic Wiki application with authentication.
+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 and authorization.
 
-For cut and paste purposes, the source code for all stages of this
-tutorial can be browsed at
-`http://github.com/Pylons/pyramid/tree/master/docs/tutorials/wiki2/src/
-<http://github.com/Pylons/pyramid/tree/master/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.
 
 .. toctree::
    :maxdepth: 2
 
    background
+   design
    installation
    basiclayout
    definingmodels
    definingviews
+   authentication
    authorization
    tests
    distributing
 
-