diff options
| author | Tres Seaver <tseaver@palladion.com> | 2013-03-21 14:56:33 -0400 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2013-03-21 14:56:33 -0400 |
| commit | f38126c3214c936f022e68a1cac88c3cd8644879 (patch) | |
| tree | 41b3b32e58b8071adef23f3220ddd1be939239ff /docs/narr/router.rst | |
| parent | 1b280e0df1269f539145f941b81ee3b98115ddc2 (diff) | |
| parent | 02e6877a79fe7874af5103d9e6c886d67a09eb7f (diff) | |
| download | pyramid-f38126c3214c936f022e68a1cac88c3cd8644879.tar.gz pyramid-f38126c3214c936f022e68a1cac88c3cd8644879.tar.bz2 pyramid-f38126c3214c936f022e68a1cac88c3cd8644879.zip | |
Resolve conflict.
Diffstat (limited to 'docs/narr/router.rst')
| -rw-r--r-- | docs/narr/router.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/router.rst b/docs/narr/router.rst index b78362066..ac3deefdc 100644 --- a/docs/narr/router.rst +++ b/docs/narr/router.rst @@ -46,7 +46,7 @@ request enters a :app:`Pyramid` application through to the point that :class:`~pyramid.interfaces.IRoute` object representing the route which matched. The root object associated with the route found is also generated: if the :term:`route configuration` which matched has an - associated a ``factory`` argument, this factory is used to generate the + associated ``factory`` argument, this factory is used to generate the root object, otherwise a default :term:`root factory` is used. #. If a route match was *not* found, and a ``root_factory`` argument was |