Merge branch 'master' into feature.security-docs-enhancements

3 files changed, 54 insertions, 54 deletions

diff --git a/docs/api/exceptions.rst b/docs/api/exceptions.rst
index 0c630571f..faca0fbb6 100644
--- a/docs/api/exceptions.rst
+++ b/docs/api/exceptions.rst
@@ -5,14 +5,14 @@
 
 .. automodule:: pyramid.exceptions
 
-  .. autoclass:: BadCSRFToken
+  .. autoexception:: BadCSRFToken
 
-  .. autoclass:: PredicateMismatch
+  .. autoexception:: PredicateMismatch
 
-  .. autoclass:: Forbidden
+  .. autoexception:: Forbidden
 
-  .. autoclass:: NotFound
+  .. autoexception:: NotFound
 
-  .. autoclass:: ConfigurationError
+  .. autoexception:: ConfigurationError
 
-  .. autoclass:: URLDecodeError
+  .. autoexception:: URLDecodeError
diff --git a/docs/api/httpexceptions.rst b/docs/api/httpexceptions.rst
index b50f10beb..d4cf97f1d 100644
--- a/docs/api/httpexceptions.rst
+++ b/docs/api/httpexceptions.rst
@@ -13,96 +13,96 @@
 
   .. autofunction:: exception_response
 
-  .. autoclass:: HTTPException
+  .. autoexception:: HTTPException
 
-  .. autoclass:: HTTPOk
+  .. autoexception:: HTTPOk
 
-  .. autoclass:: HTTPRedirection
+  .. autoexception:: HTTPRedirection
 
-  .. autoclass:: HTTPError
+  .. autoexception:: HTTPError
 
-  .. autoclass:: HTTPClientError
+  .. autoexception:: HTTPClientError
 
-  .. autoclass:: HTTPServerError
+  .. autoexception:: HTTPServerError
 
-  .. autoclass:: HTTPCreated
+  .. autoexception:: HTTPCreated
 
-  .. autoclass:: HTTPAccepted
+  .. autoexception:: HTTPAccepted
 
-  .. autoclass:: HTTPNonAuthoritativeInformation
+  .. autoexception:: HTTPNonAuthoritativeInformation
 
-  .. autoclass:: HTTPNoContent
+  .. autoexception:: HTTPNoContent
 
-  .. autoclass:: HTTPResetContent
+  .. autoexception:: HTTPResetContent
 
-  .. autoclass:: HTTPPartialContent
+  .. autoexception:: HTTPPartialContent
 
-  .. autoclass:: HTTPMultipleChoices
+  .. autoexception:: HTTPMultipleChoices
 
-  .. autoclass:: HTTPMovedPermanently
+  .. autoexception:: HTTPMovedPermanently
 
-  .. autoclass:: HTTPFound
+  .. autoexception:: HTTPFound
 
-  .. autoclass:: HTTPSeeOther
+  .. autoexception:: HTTPSeeOther
 
-  .. autoclass:: HTTPNotModified
+  .. autoexception:: HTTPNotModified
 
-  .. autoclass:: HTTPUseProxy
+  .. autoexception:: HTTPUseProxy
 
-  .. autoclass:: HTTPTemporaryRedirect
+  .. autoexception:: HTTPTemporaryRedirect
 
-  .. autoclass:: HTTPBadRequest
+  .. autoexception:: HTTPBadRequest
 
-  .. autoclass:: HTTPUnauthorized
+  .. autoexception:: HTTPUnauthorized
 
-  .. autoclass:: HTTPPaymentRequired
+  .. autoexception:: HTTPPaymentRequired
 
-  .. autoclass:: HTTPForbidden
+  .. autoexception:: HTTPForbidden
 
-  .. autoclass:: HTTPNotFound
+  .. autoexception:: HTTPNotFound
 
-  .. autoclass:: HTTPMethodNotAllowed
+  .. autoexception:: HTTPMethodNotAllowed
 
-  .. autoclass:: HTTPNotAcceptable
+  .. autoexception:: HTTPNotAcceptable
 
-  .. autoclass:: HTTPProxyAuthenticationRequired
+  .. autoexception:: HTTPProxyAuthenticationRequired
 
-  .. autoclass:: HTTPRequestTimeout
+  .. autoexception:: HTTPRequestTimeout
 
-  .. autoclass:: HTTPConflict
+  .. autoexception:: HTTPConflict
 
-  .. autoclass:: HTTPGone
+  .. autoexception:: HTTPGone
 
-  .. autoclass:: HTTPLengthRequired
+  .. autoexception:: HTTPLengthRequired
 
-  .. autoclass:: HTTPPreconditionFailed
+  .. autoexception:: HTTPPreconditionFailed
 
-  .. autoclass:: HTTPRequestEntityTooLarge
+  .. autoexception:: HTTPRequestEntityTooLarge
 
-  .. autoclass:: HTTPRequestURITooLong
+  .. autoexception:: HTTPRequestURITooLong
 
-  .. autoclass:: HTTPUnsupportedMediaType
+  .. autoexception:: HTTPUnsupportedMediaType
 
-  .. autoclass:: HTTPRequestRangeNotSatisfiable
+  .. autoexception:: HTTPRequestRangeNotSatisfiable
 
-  .. autoclass:: HTTPExpectationFailed
+  .. autoexception:: HTTPExpectationFailed
 
-  .. autoclass:: HTTPUnprocessableEntity
+  .. autoexception:: HTTPUnprocessableEntity
 
-  .. autoclass:: HTTPLocked
+  .. autoexception:: HTTPLocked
 
-  .. autoclass:: HTTPFailedDependency
+  .. autoexception:: HTTPFailedDependency
 
-  .. autoclass:: HTTPInternalServerError
+  .. autoexception:: HTTPInternalServerError
 
-  .. autoclass:: HTTPNotImplemented
+  .. autoexception:: HTTPNotImplemented
 
-  .. autoclass:: HTTPBadGateway
+  .. autoexception:: HTTPBadGateway
 
-  .. autoclass:: HTTPServiceUnavailable
+  .. autoexception:: HTTPServiceUnavailable
 
-  .. autoclass:: HTTPGatewayTimeout
+  .. autoexception:: HTTPGatewayTimeout
 
-  .. autoclass:: HTTPVersionNotSupported
+  .. autoexception:: HTTPVersionNotSupported
 
-  .. autoclass:: HTTPInsufficientStorage
+  .. autoexception:: HTTPInsufficientStorage
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index 3313f8dad..3c804a158 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -354,7 +354,7 @@ command from Gettext:
    $ mkdir -p es/LC_MESSAGES
    $ msginit -l es -o es/LC_MESSAGES/myapplication.po
 
-This will create a new the message catalog ``.po`` file will in:
+This will create a new message catalog ``.po`` file in:
 
 ``myapplication/locale/es/LC_MESSAGES/myapplication.po``.