Permalink
Browse files

fix directives for newer sphinxen

  • Loading branch information...
1 parent a9d0fbd commit cc0ddcaa8081519f4e8345697281f647de608575 @mcdonc mcdonc committed Dec 15, 2011
Showing with 18 additions and 17 deletions.
  1. +13 −12 docs/narr.rst
  2. +5 −5 pyramid_zcml/__init__.py
View
@@ -605,18 +605,19 @@ the following set of :term:`resource location` results:
- A :term:`view name` equalling ``hello.html``.
-.. note:: Values prefixed with a period (``.``) for the ``context``
- and ``view`` attributes of a ``view`` declaration (such as those
- above) mean "relative to the Python package directory in which this
- :term:`ZCML` file is stored". So if the above ``view`` declaration
- was made inside a ``configure.zcml`` file that lived in the
- ``hello`` package, you could replace the relative ``.resources.Hello``
- with the absolute ``hello.resources.Hello``; likewise you could
- replace the relative ``.views.hello_world`` with the absolute
- ``hello.views.hello_world``. Either the relative or absolute form
- is functionally equivalent. It's often useful to use the relative
- form, in case your package's name changes. It's also shorter to
- type.
+.. note::
+
+ Values prefixed with a period (``.``) for the ``context`` and ``view``
+ attributes of a ``view`` declaration (such as those above) mean "relative
+ to the Python package directory in which this :term:`ZCML` file is
+ stored". So if the above ``view`` declaration was made inside a
+ ``configure.zcml`` file that lived in the ``hello`` package, you could
+ replace the relative ``.resources.Hello`` with the absolute
+ ``hello.resources.Hello``; likewise you could replace the relative
+ ``.views.hello_world`` with the absolute ``hello.views.hello_world``.
+ Either the relative or absolute form is functionally equivalent. It's
+ often useful to use the relative form, in case your package's name
+ changes. It's also shorter to type.
You can also declare a *default view callable* for a :term:`resource` type:
View
@@ -870,11 +870,11 @@ def make_app(root_factory, package=None, filename='configure.zcml',
""" Return a Router object, representing a fully configured
Pyramid WSGI application.
- .. warning:: Use of this function is deprecated as of
- Pyramid 1.0. You should instead use a
- :class:`pyramid.config.Configurator` instance to
- perform startup configuration as shown in
- :ref:`configuration_narr`.
+ .. warning::
+
+ Use of this function is deprecated as of Pyramid 1.0. You should
+ instead use a :class:`pyramid.config.Configurator` instance to perform
+ startup configuration as shown in :ref:`configuration_narr`.
``root_factory`` must be a callable that accepts a :term:`request`
object and which returns a traversal root object. The traversal

0 comments on commit cc0ddca

Please sign in to comment.