diff options
| author | Casey Duncan <casey.duncan@gmail.com> | 2010-12-02 22:05:31 -0700 |
|---|---|---|
| committer | Casey Duncan <casey.duncan@gmail.com> | 2010-12-02 22:05:31 -0700 |
| commit | 2ad17f46ff810b90c46359402cbdaebdd5f7ec36 (patch) | |
| tree | 92fd102e282dd070a10553d0dc52973e28a5aaba /docs/narr/hybrid.rst | |
| parent | ba5fffc0dc64ec3958233b342f63fd214f5c4472 (diff) | |
| parent | 1220f3b8f869e4caf298d9acb5e5fffe0a86129e (diff) | |
| download | pyramid-2ad17f46ff810b90c46359402cbdaebdd5f7ec36.tar.gz pyramid-2ad17f46ff810b90c46359402cbdaebdd5f7ec36.tar.bz2 pyramid-2ad17f46ff810b90c46359402cbdaebdd5f7ec36.zip | |
Merge https://github.com/Pylons/pyramid
Diffstat (limited to 'docs/narr/hybrid.rst')
| -rw-r--r-- | docs/narr/hybrid.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst index a6b1eb217..4acedc124 100644 --- a/docs/narr/hybrid.rst +++ b/docs/narr/hybrid.rst @@ -266,7 +266,7 @@ thing to do. :class:`pyramid.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 ``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 |