diff options
| author | Chris McDonough <chrism@plope.com> | 2013-01-14 16:07:22 -0800 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-01-14 16:07:22 -0800 |
| commit | ef5f08ad63806f81ee589291dfc4e33a9d1cf623 (patch) | |
| tree | 8ec2d99ac09eb31bc6655dadd29f58a36911fa73 | |
| parent | b00f1e46f100d8a23041a1bb7a7b37b026170fe3 (diff) | |
| parent | 024fd80060652a9d99c57abd55e940652c6dbb47 (diff) | |
| download | pyramid-ef5f08ad63806f81ee589291dfc4e33a9d1cf623.tar.gz pyramid-ef5f08ad63806f81ee589291dfc4e33a9d1cf623.tar.bz2 pyramid-ef5f08ad63806f81ee589291dfc4e33a9d1cf623.zip | |
Merge pull request #795 from tshepang/grammar
grammar fixes
| -rw-r--r-- | docs/api/config.rst | 2 | ||||
| -rw-r--r-- | pyramid/config/__init__.py | 2 | ||||
| -rw-r--r-- | pyramid/exceptions.py | 2 |
3 files changed, 3 insertions, 3 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..9a3562f94 100644 --- a/pyramid/config/__init__.py +++ b/pyramid/config/__init__.py @@ -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 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 |