summaryrefslogtreecommitdiff
path: root/docs/narr/renderers.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-29 01:36:58 -0500
committerChris McDonough <chrism@plope.com>2011-01-29 01:36:58 -0500
commita936df49ac018656df417b5a76bf04b620cfcdc9 (patch)
tree3261680948dbd55cf573aef4a35f1d3e69c85d00 /docs/narr/renderers.rst
parent3e4f429cce60465f2d58d0a60eb6a3adb5f9a377 (diff)
parent91ab804c9786d680a1eff9041de1bea76e75c225 (diff)
downloadpyramid-a936df49ac018656df417b5a76bf04b620cfcdc9.tar.gz
pyramid-a936df49ac018656df417b5a76bf04b620cfcdc9.tar.bz2
pyramid-a936df49ac018656df417b5a76bf04b620cfcdc9.zip
Merge branch 'osmaker-master'
Diffstat (limited to 'docs/narr/renderers.rst')
-rw-r--r--docs/narr/renderers.rst4
1 files changed, 2 insertions, 2 deletions
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