diff options
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/assets.rst | 2 | ||||
| -rw-r--r-- | docs/narr/renderers.rst | 4 | ||||
| -rw-r--r-- | docs/narr/resources.rst | 2 | ||||
| -rw-r--r-- | docs/narr/urldispatch.rst | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst index a9dc1f129..976e7b0af 100644 --- a/docs/narr/assets.rst +++ b/docs/narr/assets.rst @@ -185,7 +185,7 @@ discussed in more detail later in this chapter. .. note:: - The :ref:`static_directive` ZCML directive offers an declarative + The :ref:`static_directive` ZCML directive offers a declarative equivalent to :meth:`~pyramid.config.Configurator.add_static_view`. Use of the :ref:`static_directive` ZCML directive is completely equivalent to using imperative configuration for the same purpose. diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst index d8c58a66a..8ec2e3fb8 100644 --- a/docs/narr/renderers.rst +++ b/docs/narr/renderers.rst @@ -456,14 +456,14 @@ There are essentially two different kinds of renderer factories: such as a template. - A renderer factory which expects to accept a token that does not represent - a filesystem path or a asset specification in the ``name`` + a filesystem path or an asset specification in the ``name`` attribute of the ``info`` object fed to its constructor. These renderer factories are registered with a ``name`` value that does not begin with a dot. These renderer factories are typically object serializers. .. sidebar:: Asset Specifications - A asset specification is a colon-delimited identifier for a + An asset specification is a colon-delimited identifier for an :term:`asset`. The colon separates a Python :term:`package` name from a package subpath. For example, the asset specification ``my.package:static/baz.css`` identifies the file named diff --git a/docs/narr/resources.rst b/docs/narr/resources.rst index 4fc7e037e..90dd34bfe 100644 --- a/docs/narr/resources.rst +++ b/docs/narr/resources.rst @@ -231,7 +231,7 @@ The simplest call to :func:`~pyramid.url.resource_url` looks like this: url = resource_url(resource, request) The ``request`` passed to ``resource_url`` in the above example is an -instance of an :app:`Pyramid` :term:`request` object. +instance of a :app:`Pyramid` :term:`request` object. If the resource referred to as ``resource`` in the above example was the root resource, and the host that was used to contact the server was diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst index ad0550e69..626d2db2c 100644 --- a/docs/narr/urldispatch.rst +++ b/docs/narr/urldispatch.rst @@ -439,7 +439,7 @@ neither predicates nor view configuration information. matched which contains a ``*traverse`` remainder marker in its pattern (see :ref:`using_traverse_in_a_route_pattern`). The ``traverse`` argument allows you to associate route patterns with an arbitrary traversal path - without using a a ``*traverse`` remainder marker; instead you can use other + without using a ``*traverse`` remainder marker; instead you can use other match information. Note that the ``traverse`` argument is ignored when attached to a route |