diff options
| author | Casey Duncan <casey.duncan@gmail.com> | 2010-12-12 09:40:19 -0700 |
|---|---|---|
| committer | Casey Duncan <casey.duncan@gmail.com> | 2010-12-12 09:40:19 -0700 |
| commit | 226c469217cbddc3443da2a60dc414b82021bcbe (patch) | |
| tree | c049b1c25b4b70a43f2b99f8515fd3d628cbffd2 /docs/glossary.rst | |
| parent | 87a6ffdb91ae9f983169c3e9da15ea0266745a74 (diff) | |
| parent | fee38663daccc0130d0c34dbc5a14e67bef2e183 (diff) | |
| download | pyramid-226c469217cbddc3443da2a60dc414b82021bcbe.tar.gz pyramid-226c469217cbddc3443da2a60dc414b82021bcbe.tar.bz2 pyramid-226c469217cbddc3443da2a60dc414b82021bcbe.zip | |
fix merge conflicts
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index ee7a2784d..2494a6cdf 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -585,7 +585,7 @@ Glossary configurator An object used to do :term:`configuration declaration` within an application. The most common configurator is an instance of the - ``pyramid.configuration.Configurator`` class. + ``pyramid.config.Configurator`` class. imperative configuration The configuration mode in which you use Python to call methods on @@ -822,8 +822,8 @@ Glossary View handler A view handler ties together - :meth:`pyramid.configuration.Configurator.add_route` and - :meth:`pyramid.configuration.Configurator.add_view` to make it more + :meth:`pyramid.config.Configurator.add_route` and + :meth:`pyramid.config.Configurator.add_view` to make it more convenient to register a collection of views as a single class when using :term:`url dispatch`. See also :ref:`handlers_chapter`. |