diff options
| author | Kyle Johnson <kyle@tinyepic.com> | 2011-01-28 20:16:49 -0800 |
|---|---|---|
| committer | Kyle Johnson <kyle@tinyepic.com> | 2011-01-28 20:16:49 -0800 |
| commit | a42a1efebd872f21c2fa96382248a2459cfb483c (patch) | |
| tree | 47a006c0d1b47bcdcc40fd49539a3b1ebc084a71 /docs | |
| parent | 82043fde6b343ccc065e880d2e9dcca8a99512ff (diff) | |
| download | pyramid-a42a1efebd872f21c2fa96382248a2459cfb483c.tar.gz pyramid-a42a1efebd872f21c2fa96382248a2459cfb483c.tar.bz2 pyramid-a42a1efebd872f21c2fa96382248a2459cfb483c.zip | |
minor grammar fixes ('a' vs 'an')
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/glossary.rst | 6 | ||||
| -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 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/basiclayout.rst | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index fc9f6a729..c8f1a2f12 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -181,10 +181,10 @@ Glossary :ref:`urldispatch_chapter` for more information. context - An resource in the resource tree that is found during :term:`traversal` + A resource in the resource tree that is found during :term:`traversal` or :term:`URL dispatch` based on URL data; if it's found via traversal, it's usually a :term:`resource` object that is part of a resource tree; - if it's found via :term:`URL dispatch`, it's a object manufactured on + if it's found via :term:`URL dispatch`, it's an object manufactured on behalf of the route's "factory". A context resource becomes the subject of a :term:`view`, and often has security information attached to it. See the :ref:`traversal_chapter` chapter and the @@ -487,7 +487,7 @@ Glossary available as its ``__parent__`` attribute. root factory - The "root factory" of an :app:`Pyramid` application is called + The "root factory" of a :app:`Pyramid` application is called on every request sent to the application. The root factory returns the traversal root of an application. It is conventionally named ``get_root``. An application may supply a 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 975529cee..2de8d4ec1 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 diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst index 565bd0e96..17dcfc48f 100644 --- a/docs/tutorials/wiki2/basiclayout.rst +++ b/docs/tutorials/wiki2/basiclayout.rst @@ -60,7 +60,7 @@ function: #. *Lines 13-14*. Register a :term:`route configuration` via the :meth:`pyramid.config.Configurator.add_route` method that will be - used when the URL is ``/``. Since this route has an ``pattern`` equalling + used when the URL is ``/``. Since this route has a ``pattern`` equalling ``/`` it is the "default" route. The argument named ``view`` with the value ``tutorial.views.my_view`` is the dotted name to a *function* we write (generated by the ``pyramid_routesalchemy`` template) that is given |
