summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/authorization.rst
diff options
context:
space:
mode:
authorCarlos de la Guardia <cguardia@yahoo.com>2011-06-07 01:54:50 -0500
committerCarlos de la Guardia <cguardia@yahoo.com>2011-06-07 01:54:50 -0500
commitfd5203000d4d051b51f804af023aefe59b832029 (patch)
treef92f1f163aed0d2c282fb674069f987fe4dfba47 /docs/tutorials/wiki2/authorization.rst
parenta5713863a80a493a1485057609578b907d04c770 (diff)
parentdf75cee020e49cc4668448b83e0617b14904bfa2 (diff)
downloadpyramid-fd5203000d4d051b51f804af023aefe59b832029.tar.gz
pyramid-fd5203000d4d051b51f804af023aefe59b832029.tar.bz2
pyramid-fd5203000d4d051b51f804af023aefe59b832029.zip
Merge remote branch 'cito/master'
Diffstat (limited to 'docs/tutorials/wiki2/authorization.rst')
-rw-r--r--docs/tutorials/wiki2/authorization.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index 64c587f07..76ce4b83f 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -76,7 +76,7 @@ information about what an :term:`ACL` represents.
:meth:`pyramid.config.Configurator.add_route` for more info.
We'll pass the ``RootFactory`` we created in the step above in as the
-``root_factory`` argument to a :term:`Configurator`.
+``root_factory`` argument to a :term:`Configurator`.
Configuring an Authorization Policy
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -116,7 +116,7 @@ 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: 41-43
+ :lines: 25,41-43
:linenos:
:language: python
@@ -163,7 +163,7 @@ Adding ``security.py``
----------------------
Add a ``security.py`` module within your package (in the same directory as
-:file:`__init__.py`, :file:`views.py`, etc) with the following content:
+:file:`__init__.py`, :file:`views.py`, etc.) with the following content:
.. literalinclude:: src/authorization/tutorial/security.py
:linenos: