summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/authorization.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-02-29 12:48:09 -0600
committerMichael Merickel <michael@merickel.org>2016-02-29 12:48:09 -0600
commita79bac6697fa312cd1ba0ac4e784bbc820c5e603 (patch)
tree9f7098358c01622fcae8fbe8a318f6484e5d3c8b /docs/tutorials/wiki/authorization.rst
parent0c185a3f7bd717845b7e5a00bd0d7a267be582b6 (diff)
parentcb98a90c3dcc40dc42813143a601ef631249f5f4 (diff)
downloadpyramid-a79bac6697fa312cd1ba0ac4e784bbc820c5e603.tar.gz
pyramid-a79bac6697fa312cd1ba0ac4e784bbc820c5e603.tar.bz2
pyramid-a79bac6697fa312cd1ba0ac4e784bbc820c5e603.zip
Merge branch 'master' into feature/alchemy-scaffold-update
Diffstat (limited to 'docs/tutorials/wiki/authorization.rst')
-rw-r--r--docs/tutorials/wiki/authorization.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst
index b0a8c155d..c6f551b42 100644
--- a/docs/tutorials/wiki/authorization.rst
+++ b/docs/tutorials/wiki/authorization.rst
@@ -248,7 +248,7 @@ Return a ``logged_in`` flag to the renderer
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Open ``tutorial/tutorial/views.py`` again. Add a ``logged_in`` parameter to
-the return value of ``view_page()``, ``edit_page()``, and ``add_page()`` as
+the return value of ``view_page()``, ``add_page()``, and ``edit_page()`` as
follows:
.. literalinclude:: src/authorization/tutorial/views.py
@@ -262,7 +262,7 @@ follows:
:language: python
.. literalinclude:: src/authorization/tutorial/views.py
- :lines: 75-77
+ :lines: 78-80
:emphasize-lines: 2-3
:language: python