diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-01 19:33:06 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-01 19:33:06 -0500 |
| commit | f1ffaeeff438aa2ea768c508fe38e3dd108b9369 (patch) | |
| tree | 6ff2b0d0063be11ef0b3fa65232a37f629331165 /docs/narr/hybrid.rst | |
| parent | d195074f2c6ef704926cf56de4e26e36e11ee758 (diff) | |
| parent | 1220f3b8f869e4caf298d9acb5e5fffe0a86129e (diff) | |
| download | pyramid-f1ffaeeff438aa2ea768c508fe38e3dd108b9369.tar.gz pyramid-f1ffaeeff438aa2ea768c508fe38e3dd108b9369.tar.bz2 pyramid-f1ffaeeff438aa2ea768c508fe38e3dd108b9369.zip | |
Merge branch 'master' into twophase
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 e704463c7..df8d72ef4 100644 --- a/docs/narr/hybrid.rst +++ b/docs/narr/hybrid.rst @@ -262,7 +262,7 @@ 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 |