summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/authorization.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-04-22 13:45:13 -0400
committerChris McDonough <chrism@plope.com>2011-04-22 13:45:13 -0400
commit1440e9828fcd527ff79de0655ee65d3076f13911 (patch)
tree53637b76d148774c5a7c3b9e103373e33e6c2f9e /docs/tutorials/wiki2/authorization.rst
parentfeef5257261f3c37f11571a475dbd68f603b144e (diff)
parented7ffe0e2065100f551793b3774656d8bdde0fb0 (diff)
downloadpyramid-1440e9828fcd527ff79de0655ee65d3076f13911.tar.gz
pyramid-1440e9828fcd527ff79de0655ee65d3076f13911.tar.bz2
pyramid-1440e9828fcd527ff79de0655ee65d3076f13911.zip
Merge branch 'mmerickel-disambiguate_add_route'
Diffstat (limited to 'docs/tutorials/wiki2/authorization.rst')
-rw-r--r--docs/tutorials/wiki2/authorization.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index 64cab30db..d0354af99 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -97,25 +97,25 @@ We'll also change ``__init__.py``, adding a call to
:term:`view callable`. This is also known as a :term:`forbidden view`:
.. literalinclude:: src/authorization/tutorial/__init__.py
- :lines: 24-26
+ :lines: 41-43
:linenos:
:language: python
A forbidden view configures our newly created login view to show up when
:app:`Pyramid` detects that a view invocation can not be authorized.
-We'll also add ``view_permission`` arguments with the value ``edit`` to the
-``edit_page`` and ``add_page`` routes. This indicates that the view
-callables which these routes reference cannot be invoked without the
+We'll also add ``permission`` arguments with the value ``edit`` to the
+``edit_page`` and ``add_page`` views. This indicates that the view
+callables which these views reference cannot be invoked without the
authenticated user possessing the ``edit`` permission with respect to the
current context.
.. literalinclude:: src/authorization/tutorial/__init__.py
- :lines: 32-39
+ :lines: 37-40
:linenos:
:language: python
-Adding these ``view_permission`` arguments causes Pyramid to make the
+Adding these ``permission`` arguments causes Pyramid to make the
assertion that only users who possess the effective ``edit`` permission at
the time of the request may invoke those two views. We've granted the
``group:editors`` principal the ``edit`` permission at the root model via its