diff options
| -rw-r--r-- | docs/api/config.rst | 2 | ||||
| -rw-r--r-- | pyramid/config/__init__.py | 10 | ||||
| -rw-r--r-- | pyramid/exceptions.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 5d2bce23e..e6a67830e 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -130,7 +130,7 @@ .. attribute:: global_registries The set of registries that have been created for :app:`Pyramid` - applications, one per each call to + applications, one for each call to :meth:`pyramid.config.Configurator.make_wsgi_app` in the current process. The object itself supports iteration and has a ``last`` property containing the last registry loaded. diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py index 40c487704..90bd89116 100644 --- a/pyramid/config/__init__.py +++ b/pyramid/config/__init__.py @@ -631,7 +631,7 @@ class Configurator( self.action_state = ActionState() # old actions have been processed def include(self, callable, route_prefix=None): - """Include a configuration callables, to support imperative + """Include a configuration callable, to support imperative application extensibility. .. warning:: In versions of :app:`Pyramid` prior to 1.2, this @@ -640,8 +640,8 @@ class Configurator( A configuration callable should be a callable that accepts a single argument named ``config``, which will be an instance of a - :term:`Configurator` (be warned that it will not be the same - configurator instance on which you call this method, however). The + :term:`Configurator`. However, be warned that it will not be the same + configurator instance on which you call this method. The code which runs as the result of calling the callable should invoke methods on the configurator passed to it which add configuration state. The return value of a callable will be ignored. @@ -668,7 +668,7 @@ class Configurator( def includeme(config): config.add_view(my_view) - You might cause it be included within your Pyramid application like + You might cause it to be included within your Pyramid application like so: .. code-block:: python @@ -701,7 +701,7 @@ class Configurator( to :meth:`pyramid.config.Configurator.add_route` within the included callable will have their pattern prefixed with the value of ``route_prefix``. This can be used to help mount a set of routes at a - different location than the included callable's author intended while + different location than the included callable's author intended, while still maintaining the same route names. For example: .. code-block:: python diff --git a/pyramid/exceptions.py b/pyramid/exceptions.py index 1c8f99f62..dab958282 100644 --- a/pyramid/exceptions.py +++ b/pyramid/exceptions.py @@ -21,7 +21,7 @@ class URLDecodeError(UnicodeDecodeError): """ This exception is raised when :app:`Pyramid` cannot successfully decode a URL or a URL path segment. This exception - it behaves just like the Python builtin + behaves just like the Python builtin :exc:`UnicodeDecodeError`. It is a subclass of the builtin :exc:`UnicodeDecodeError` exception only for identity purposes, mostly so an exception view can be registered when a URL cannot be |