diff options
| -rwxr-xr-x | docs/build_book | 4 | ||||
| -rw-r--r-- | docs/narr/templates.rst | 7 | ||||
| -rw-r--r-- | docs/narr/viewconfig.rst | 2 | ||||
| -rw-r--r-- | pyramid/config.py | 4 |
4 files changed, 6 insertions, 11 deletions
diff --git a/docs/build_book b/docs/build_book deleted file mode 100755 index d79de4e59..000000000 --- a/docs/build_book +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BOOK=1 make clean latex -cd _build/latex -make all diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst index a9cdc13fb..426ec229b 100644 --- a/docs/narr/templates.rst +++ b/docs/narr/templates.rst @@ -698,10 +698,9 @@ has built-in bindings for the Mako templating system. The language definition documentation for Mako templates is available from `the Mako website <http://www.makotemplates.org/>`_. -To use a Mako template, given a :term:`Mako` ZPT template file named -``foo.mak`` in the ``templates`` subdirectory in your application -package named ``mypackage``, you can configure the template as a -:term:`renderer` like so: +To use a Mako template, given a :term:`Mako` template file named ``foo.mak`` +in the ``templates`` subdirectory in your application package named +``mypackage``, you can configure the template as a :term:`renderer` like so: .. code-block:: python :linenos: diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst index 0a6d9ee61..9b2500a2b 100644 --- a/docs/narr/viewconfig.rst +++ b/docs/narr/viewconfig.rst @@ -258,7 +258,7 @@ configured view. variable) that has a name which matches the supplied value. If the value supplied has a ``=`` sign in it, - e.g. ``request_params="foo=123"``, then the key (``foo``) must both exist + e.g. ``request_param="foo=123"``, then the key (``foo``) must both exist in the ``request.params`` dictionary, *and* the value must match the right hand side of the expression (``123``) for the view to "match" the current request. diff --git a/pyramid/config.py b/pyramid/config.py index 86691c9a1..11770624d 100644 --- a/pyramid/config.py +++ b/pyramid/config.py @@ -1121,7 +1121,7 @@ class Configurator(object): dictionary (an HTTP ``GET`` or ``POST`` variable) that has a name which matches the supplied value. If the value supplied has a ``=`` sign in it, - e.g. ``request_params="foo=123"``, then the key (``foo``) + e.g. ``request_param="foo=123"``, then the key (``foo``) must both exist in the ``request.params`` dictionary, *and* the value must match the right hand side of the expression (``123``) for the view to "match" the current request. @@ -1550,7 +1550,7 @@ class Configurator(object): dictionary (an HTTP ``GET`` or ``POST`` variable) that has a name which matches the supplied value. If the value supplied as the argument has a ``=`` sign in it, - e.g. ``request_params="foo=123"``, then the key + e.g. ``request_param="foo=123"``, then the key (``foo``) must both exist in the ``request.params`` dictionary, and the value must match the right hand side of the expression (``123``) for the route to "match" the current request. If this predicate |