summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/authorization.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-09-20 14:10:05 -0400
committerChris McDonough <chrism@plope.com>2013-09-20 14:10:05 -0400
commitfaf334d94e8c7450962b6b0d18fe57cefd43f04a (patch)
treebac12a41585561e84b914ede37bcd83a62764fb9 /docs/tutorials/wiki2/authorization.rst
parent53e00ae36d969e8f8794549d66f9b1c6b92e0c60 (diff)
parent4d2fc0bbc58bc1948c73b2fcb3e0e1bdeee7a5d6 (diff)
downloadpyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.gz
pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.bz2
pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.zip
Merge branch 'master' into 1.5-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 01c301e74..cf20db6d7 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -83,7 +83,7 @@ statement at the head:
Add the following class definition:
.. literalinclude:: src/authorization/tutorial/models.py
- :lines: 36-40
+ :lines: 33-37
:linenos:
:language: python
@@ -203,7 +203,7 @@ Go back to ``tutorial/tutorial/__init__.py`` and add these two
routes:
.. literalinclude:: src/authorization/tutorial/__init__.py
- :lines: 30-31
+ :lines: 31-32
:linenos:
:language: python
@@ -329,7 +329,7 @@ when we're done:
.. literalinclude:: src/authorization/tutorial/__init__.py
:linenos:
- :emphasize-lines: 2-3,7,21-23,25-27,30-31
+ :emphasize-lines: 2-3,7,21-23,25-27,31-32
:language: python
(Only the highlighted lines need to be added.)
@@ -339,7 +339,7 @@ when we're done:
.. literalinclude:: src/authorization/tutorial/models.py
:linenos:
- :emphasize-lines: 1-4,36-40
+ :emphasize-lines: 1-4,33-37
:language: python
(Only the highlighted lines need to be added.)