summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2014-03-21 06:49:34 -0700
committerSteve Piercy <web@stevepiercy.com>2014-03-21 06:49:34 -0700
commitfc86aa2c3ce80460f8ec4bd49153540054191dd6 (patch)
tree5b6bca9e51b5a21e090d3d2ba75a0431838a064b /docs/tutorials
parentda52daa6dea1483177321ff77ba38fe51a3fc213 (diff)
parent49923dbf430fc6becc92133ba7672e93f1bc955e (diff)
downloadpyramid-fc86aa2c3ce80460f8ec4bd49153540054191dd6.tar.gz
pyramid-fc86aa2c3ce80460f8ec4bd49153540054191dd6.tar.bz2
pyramid-fc86aa2c3ce80460f8ec4bd49153540054191dd6.zip
Merge pull request #1276 from stevepiercy/master
Minor rendering, syntax, and grammar fixes
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki2/authorization.rst8
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/tutorials/wiki2/authorization.rst b/docs/tutorials/wiki2/authorization.rst
index e3811b338..2e35574fd 100644
--- a/docs/tutorials/wiki2/authorization.rst
+++ b/docs/tutorials/wiki2/authorization.rst
@@ -207,14 +207,16 @@ routes:
:linenos:
:language: python
-.. note:: These lines must be added *before* this ``view_page`` route
- definition:
+.. note:: The preceding lines must be added *before* the following
+ ``view_page`` route definition:
+
.. literalinclude:: src/authorization/tutorial/__init__.py
:lines: 32
:linenos:
:language: python
+
This is because ``view_page``'s route definition uses a catch-all
- "replacement marker" ``/{pagename}`` (see :ref:_route_pattern_syntax )
+ "replacement marker" ``/{pagename}`` (see :ref:`route_pattern_syntax`)
which will catch any route that was not already caught by any
route listed above it in ``__init__.py``. Hence, for ``login`` and
``logout`` views to have the opportunity of being matched