summaryrefslogtreecommitdiff
path: root/docs/narr/resources.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/resources.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/resources.rst')
-rw-r--r--docs/narr/resources.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/narr/resources.rst b/docs/narr/resources.rst
index b8dc6d857..256f69fc3 100644
--- a/docs/narr/resources.rst
+++ b/docs/narr/resources.rst
@@ -160,7 +160,9 @@ resource in the resource tree, you will eventually come to the root resource,
just like if you keep executing the ``cd ..`` filesystem command, eventually
you will reach the filesystem root directory.
-.. warning:: If your root resource has a ``__name__`` argument that is not
+.. warning::
+
+ If your root resource has a ``__name__`` argument that is not
``None`` or the empty string, URLs returned by the
:func:`~pyramid.request.Request.resource_url` function and paths generated
by the :func:`~pyramid.traversal.resource_path` and