diff options
| author | Casey Duncan <casey.duncan@gmail.com> | 2010-12-21 01:27:04 -0700 |
|---|---|---|
| committer | Casey Duncan <casey.duncan@gmail.com> | 2010-12-21 01:27:04 -0700 |
| commit | 6d0ff23fc3094f3f40d93d020bbc80ecdfceb825 (patch) | |
| tree | 28c72e86a6b6e3e4d06e4dc2223437c9ecb0c6a9 /docs/narr | |
| parent | 4a10119ecd49316b38c556ef720b515a0c5f7a22 (diff) | |
| parent | fa3bf3d7634137bdffc121ae318609a1ea13792c (diff) | |
| download | pyramid-6d0ff23fc3094f3f40d93d020bbc80ecdfceb825.tar.gz pyramid-6d0ff23fc3094f3f40d93d020bbc80ecdfceb825.tar.bz2 pyramid-6d0ff23fc3094f3f40d93d020bbc80ecdfceb825.zip | |
Merge https://github.com/Pylons/pyramid
Diffstat (limited to 'docs/narr')
| -rw-r--r-- | docs/narr/resources.rst | 2 | ||||
| -rw-r--r-- | docs/narr/views.rst | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/docs/narr/resources.rst b/docs/narr/resources.rst index 69dbc0af6..4baa39bd3 100644 --- a/docs/narr/resources.rst +++ b/docs/narr/resources.rst @@ -35,7 +35,7 @@ Also: - The ``context`` and ``containment`` predicate arguments to :meth:`pyramid.config.Configurator.add_view` (or a - :func:`pyramid.view.view_config` decorator) and reference a resource class + :func:`pyramid.view.view_config` decorator) reference a resource class or resource :term:`interface`. - A :term:`root factory` returns a resource. diff --git a/docs/narr/views.rst b/docs/narr/views.rst index c3723c05f..155ece8df 100644 --- a/docs/narr/views.rst +++ b/docs/narr/views.rst @@ -561,13 +561,10 @@ View configuration is performed in one of these ways: :term:`view handler` class (useful only for :term:`URL dispatch` applications). -.. note:: You can also add view configuration by adding a ``<view>`` or - ``<handler>`` declaration to :term:`ZCML` used by your application as per - :ref:`mapping_views_using_zcml_section`, :ref:`view_directive`, and - :ref:`handler_directive`. - -.. note:: ZCML users can use :ref:`route_directive` to perform the same task. - See also :ref:`zcml_route_configuration`. +.. note:: You can also add view configuration by adding a ``<view>``, + ``<route>`` or ``<handler>`` declaration to :term:`ZCML` used by your + application as per :ref:`mapping_views_using_zcml_section`, + :ref:`view_directive`, :ref:`route_directive` or :ref:`handler_directive`. .. _view_configuration_parameters: |