summaryrefslogtreecommitdiff
path: root/docs/narr/hybrid.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-04-13 05:53:30 +0000
committerChris McDonough <chrism@agendaless.com>2010-04-13 05:53:30 +0000
commit2b6bc8adfa294f7133680f64df411251afb67dfc (patch)
tree0bb558e5ef2a56a7a185b87f7db120da2a7dc76c /docs/narr/hybrid.rst
parentbcd7816a420e113509e3e6fde59b3ed0d7a0c746 (diff)
downloadpyramid-2b6bc8adfa294f7133680f64df411251afb67dfc.tar.gz
pyramid-2b6bc8adfa294f7133680f64df411251afb67dfc.tar.bz2
pyramid-2b6bc8adfa294f7133680f64df411251afb67dfc.zip
Fix (thanks to Iain Duncan).
Diffstat (limited to 'docs/narr/hybrid.rst')
-rw-r--r--docs/narr/hybrid.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst
index dacb8c0f2..75592572c 100644
--- a/docs/narr/hybrid.rst
+++ b/docs/narr/hybrid.rst
@@ -165,11 +165,11 @@ always begin at a root object. Therefore it's important to know
Figuring out which :term:`root` object results from a particular route
match is straightforward. When a route is matched:
-- If the route's configuration has a ``root_factory`` argument which
+- If the route's configuration has a ``factory`` argument which
points to a :term:`root factory` callable, that callable will be
called to generate a :term:`root` object.
-- If the route's configuration does not have a ``root_factory``
+- If the route's configuration does not have a ``factory``
argument, the *global* :term:`root factory` will be called to
generate a :term:`root` object. The global root factory is the
callable implied by the ``root_factory`` argument passed to
@@ -263,10 +263,10 @@ route configuration statement:
<route
path=":foo/:bar/*traverse"
name="home"
- root_factory=".routes.root_factory"
+ factory=".routes.root_factory"
/>
-The ``root_factory`` above points at the function we've defined. It
+The ``factory`` above points at the function we've defined. It
will return an instance of the ``Traversable`` class as a root object
whenever this route is matched. Because the ``Traversable`` object
we've defined has a ``__getitem__`` method that does something
@@ -282,7 +282,7 @@ to do.
:class:`repoze.bfg.configuration.Configurator` constructor instead
of associating it with a particular route inside the route's
configuration. Every hybrid route configuration that is matched but
- which does *not* name a ``root_factory``` attribute will use the use
+ which does *not* name a ``factory``` attribute will use the use
global ``root_factory`` function to generate a root object.
When the route configuration named ``home`` above is matched during a
@@ -319,7 +319,7 @@ invoked after a route matches:
<route
path=":foo/:bar/*traverse"
name="home"
- root_factory=".routes.root_factory"
+ factory=".routes.root_factory"
/>
<view
@@ -355,7 +355,7 @@ when a hybrid route is matched:
<route
path=":foo/:bar/*traverse"
name="home"
- root_factory=".routes.root_factory"
+ factory=".routes.root_factory"
/>
<view