Merge pull request #474 from ppaez/wiki-documentation

Clarify two steps in the SQL wiki tutorial

2 files changed, 12 insertions, 3 deletions

diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index 900bf0975..5c60640b7 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -189,7 +189,13 @@ visit ``/login``.
 We'll need to import some stuff to service the needs of these two functions:
 the ``pyramid.view.forbidden_view_config`` class, a number of values from the
 ``pyramid.security`` module, and a value from our newly added
-``tutorial.security`` package.
+``tutorial.security`` package.  Add the following import statements to the
+head of the ``views.py`` file:
+
+.. literalinclude:: src/authorization/tutorial/views.py
+   :lines: 9-18,24-25
+   :linenos:
+   :language: python
 
 Changing Existing Views
 -----------------------
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index 592b183a4..5f7526b24 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -28,15 +28,18 @@ dependency of the original "tutorial" application.  The original "tutorial"
 application was generated by the ``pcreate`` command; it doesn't know
 about our custom application requirements.  We need to add a dependency on
 the ``docutils`` package to our ``tutorial`` package's ``setup.py`` file by
-assigning this dependency to the ``install_requires`` parameter in the
+assigning this dependency to the ``requires`` parameter in the
 ``setup`` function.
 
-Our resulting ``setup.py`` should look like so:
+Open ``tutorial/setup.py`` and edit it to look like the following:
 
 .. literalinclude:: src/views/setup.py
    :linenos:
+   :emphasize-lines: 17
    :language: python
 
+(Only the highlighted line needs to be added)
+
 Running ``setup.py develop``
 ============================