summaryrefslogtreecommitdiff
path: root/docs/narr/resources.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-24 03:56:48 -0400
committerChris McDonough <chrism@plope.com>2011-09-24 03:56:48 -0400
commit4937d9e5280fff849b346dcf6c1833ef6fe95119 (patch)
tree69fe13b7853a3da419b03a7987e92e43753b65b5 /docs/narr/resources.rst
parentbfb71c175bb5de7a0c22599979d269d92f12ed27 (diff)
parent9a784a4c94946872c493627e4295a26a3e608439 (diff)
downloadpyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.tar.gz
pyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.tar.bz2
pyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.zip
Merge branch 'master' of github.com:Pylons/pyramid
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