summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorPatricio Paez <pp@pp.com.mx>2012-03-12 17:57:13 -0700
committerPatricio Paez <pp@pp.com.mx>2012-03-12 17:57:13 -0700
commit533c89ebe807f02f5eae3240e770864b21f78168 (patch)
tree4814326602401bd640a5233c7040ac031c96611e /docs/tutorials
parent218ad474c5e8db6925ed6a5f4067ae3db69f68c8 (diff)
downloadpyramid-533c89ebe807f02f5eae3240e770864b21f78168.tar.gz
pyramid-533c89ebe807f02f5eae3240e770864b21f78168.tar.bz2
pyramid-533c89ebe807f02f5eae3240e770864b21f78168.zip
Clarify two steps in the SQL wiki tutorial
- Highlight the added or changed lines
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki2/authorization.rst8
-rw-r--r--docs/tutorials/wiki2/definingviews.rst7
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``
============================