summaryrefslogtreecommitdiff
path: root/docs/narr/assets.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-29 01:36:49 -0500
committerChris McDonough <chrism@plope.com>2011-01-29 01:36:49 -0500
commit91ab804c9786d680a1eff9041de1bea76e75c225 (patch)
tree3261680948dbd55cf573aef4a35f1d3e69c85d00 /docs/narr/assets.rst
parent3e4f429cce60465f2d58d0a60eb6a3adb5f9a377 (diff)
parent6b471ecd40cc04a595349e7074f02d836fd2ea6a (diff)
downloadpyramid-91ab804c9786d680a1eff9041de1bea76e75c225.tar.gz
pyramid-91ab804c9786d680a1eff9041de1bea76e75c225.tar.bz2
pyramid-91ab804c9786d680a1eff9041de1bea76e75c225.zip
Merge branch 'master' of https://github.com/osmaker/pyramid into osmaker-master
Diffstat (limited to 'docs/narr/assets.rst')
-rw-r--r--docs/narr/assets.rst2
1 files changed, 1 insertions, 1 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.