summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/authorization.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-22 10:04:31 -0400
committerChris McDonough <chrism@plope.com>2012-09-22 10:04:31 -0400
commitf55cec52d3a2a64345ac2bce30c26ab274c8baea (patch)
tree6acc79ac91fc1cad787e70b73bca0e75da072d8e /docs/tutorials/wiki2/authorization.rst
parent3c05fb076c617fa0c8820344135cfe9e028400a8 (diff)
parent098599b497fb6cd7c9372ceb795e9e8a416d573e (diff)
downloadpyramid-f55cec52d3a2a64345ac2bce30c26ab274c8baea.tar.gz
pyramid-f55cec52d3a2a64345ac2bce30c26ab274c8baea.tar.bz2
pyramid-f55cec52d3a2a64345ac2bce30c26ab274c8baea.zip
Merge branch '1.4-branch'
Diffstat (limited to 'docs/tutorials/wiki2/authorization.rst')
-rw-r--r--docs/tutorials/wiki2/authorization.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index d7bd24a53..6b2d44410 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -112,7 +112,7 @@ parameter to our :term:`Configurator` constructor, that points to
the class we created above:
.. literalinclude:: src/authorization/tutorial/__init__.py
- :lines: 19-20
+ :lines: 23-24
:linenos:
:emphasize-lines: 2
:language: python
@@ -144,7 +144,7 @@ add these import statements:
Now add those policies to the configuration:
.. literalinclude:: src/authorization/tutorial/__init__.py
- :lines: 16-22
+ :lines: 20-26
:linenos:
:emphasize-lines: 1-3,6-7
:language: python
@@ -206,7 +206,7 @@ Go back to ``tutorial/tutorial/__init__.py`` and add these two
routes:
.. literalinclude:: src/authorization/tutorial/__init__.py
- :lines: 25-26
+ :lines: 29-30
:linenos:
:language: python
@@ -333,7 +333,7 @@ when we're done:
.. literalinclude:: src/authorization/tutorial/__init__.py
:linenos:
- :emphasize-lines: 2-3,7,16-18,20-22,25-26
+ :emphasize-lines: 2-3,7,23-24,20-26,29-30
:language: python
(Only the highlighted lines need to be added.)