summaryrefslogtreecommitdiff
path: root/docs/narr/assets.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-24 00:19:15 -0700
committerChris McDonough <chrism@plope.com>2011-09-24 00:19:15 -0700
commit50242db18dcafe01c755e22d6d45310bc5f5f9f3 (patch)
treec57c9a9797e29027c027c4eb65ad4735ca7a6214 /docs/narr/assets.rst
parentacefa30d7f2329acd545ab479fb983d988972f05 (diff)
parent012b9762cd0b114b6afbf2d6356554b51706804a (diff)
downloadpyramid-50242db18dcafe01c755e22d6d45310bc5f5f9f3.tar.gz
pyramid-50242db18dcafe01c755e22d6d45310bc5f5f9f3.tar.bz2
pyramid-50242db18dcafe01c755e22d6d45310bc5f5f9f3.zip
Merge pull request #285 from michr/012b9762
fix up all the ..note and ..warnings.
Diffstat (limited to 'docs/narr/assets.rst')
-rw-r--r--docs/narr/assets.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst
index 93b03fbc9..cd76f7b60 100644
--- a/docs/narr/assets.rst
+++ b/docs/narr/assets.rst
@@ -102,7 +102,9 @@ directory on a filesystem to an application user's browser. Use the
mechanism makes a directory of static files available at a name relative to
the application root URL, e.g. ``/static`` or as an external URL.
-.. note:: :meth:`~pyramid.config.Configurator.add_static_view` cannot serve a
+.. note::
+
+ :meth:`~pyramid.config.Configurator.add_static_view` cannot serve a
single file, nor can it serve a directory of static files directly
relative to the root URL of a :app:`Pyramid` application. For these
features, see :ref:`advanced_static`.
@@ -312,7 +314,9 @@ instance of this class is actually used by the
:meth:`~pyramid.config.Configurator.add_static_view` configuration method, so
its behavior is almost exactly the same once it's configured.
-.. warning:: The following example *will not work* for applications that use
+.. warning::
+
+ The following example *will not work* for applications that use
:term:`traversal`, it will only work if you use :term:`URL dispatch`
exclusively. The root-relative route we'll be registering will always be
matched before traversal takes place, subverting any views registered via