diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-06-22 00:34:57 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-06-22 00:34:57 +0000 |
| commit | 3f224a5dd830cc52572886f8d11e810eeeab970a (patch) | |
| tree | 3029f9d99423d0133a91cf5381d6aed1a0ca6522 | |
| parent | 8c9514b39afe7bcd18c5e5e8682100d23117861b (diff) | |
| download | pyramid-3f224a5dd830cc52572886f8d11e810eeeab970a.tar.gz pyramid-3f224a5dd830cc52572886f8d11e810eeeab970a.tar.bz2 pyramid-3f224a5dd830cc52572886f8d11e810eeeab970a.zip | |
Gardening.
| -rw-r--r-- | docs/glossary.rst | 10 | ||||
| -rw-r--r-- | docs/narr/hybrid.rst | 2 | ||||
| -rw-r--r-- | docs/tutorials/bfgwiki2/basiclayout.rst | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 08844c953..41453b836 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -73,7 +73,10 @@ Glossary model in order to find a :term:`context`. The :mod:`repoze.bfg` :term:`router` performs traversal of model objects when a :term:`root factory` is specified. See the - :ref:`traversal_chapter` chapter for more information. + :ref:`traversal_chapter` chapter for more information. Traversal + can be performed *instead* of :term:`URL dispatch` or can be + combined *with* URL dispatch. See :ref:`hybrid_chapter` for more + information about combining traversal and URL dispatch (advanced). Router The :term:`WSGI` application created when you start a :mod:`repoze.bfg` application. The router intercepts requests, @@ -280,7 +283,10 @@ Glossary Subpath A list of element "left over" after the :term:`router` has performed a successful traversal to a view. The subpath is a - sequence of strings, e.g. ``['left', 'over', 'names']``. + sequence of strings, e.g. ``['left', 'over', 'names']``. Within + BFG applications that use URL dispatch rather than traversal, you + can use ``*subpath`` in the route pattern to influence the + subpath. See :ref:`star_subpath` for more information. Interface A `Zope interface <http://pypi.python.org/pypi/zope.interface>`_ object. In :mod:`repoze.bfg`, an interface may be attached to an diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst index 73648a129..86ae11166 100644 --- a/docs/narr/hybrid.rst +++ b/docs/narr/hybrid.rst @@ -215,6 +215,8 @@ In this way, each route can use a different factory, making it possible to traverse different graphs based on some routing parameter within the same application. +.. _star_subpath: + Using ``*subpath`` in a Route Path ---------------------------------- diff --git a/docs/tutorials/bfgwiki2/basiclayout.rst b/docs/tutorials/bfgwiki2/basiclayout.rst index 4b549caf7..89457b602 100644 --- a/docs/tutorials/bfgwiki2/basiclayout.rst +++ b/docs/tutorials/bfgwiki2/basiclayout.rst @@ -50,7 +50,7 @@ XML namespace. Our sample ZCML file looks like the following: declaration, we're saying that any URL that starts with ``/static`` should go to the static view; any remainder of its path (e.g. the ``/foo`` in ``/static/foo``) will be used to compose a path to a - static file resource (CSS and such). + static file resource (CSS and such). Content Models with ``models.py`` --------------------------------- |