summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2017-02-17 20:38:40 -0500
committerChris McDonough <chrism@plope.com>2017-02-17 20:38:40 -0500
commitb2e8884a94d9e869bf29ea55298ad308f16ed420 (patch)
treee46bf79d1a8811ad273a40ce194d05836fcc7409 /docs/api
parent7bb06f28ee296ecf43ba63279fc4c2439b4571d3 (diff)
parent40d71e805bfcf8522c6af71995c05c496f1c4b4f (diff)
downloadpyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.gz
pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.bz2
pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/config.rst1
-rw-r--r--docs/api/i18n.rst1
-rw-r--r--docs/api/view.rst2
3 files changed, 4 insertions, 0 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index ab3ff0fe1..62f138b76 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -26,6 +26,7 @@
.. automethod:: add_view
.. automethod:: add_notfound_view
.. automethod:: add_forbidden_view
+ .. automethod:: add_exception_view
:methodcategory:`Adding an Event Subscriber`
diff --git a/docs/api/i18n.rst b/docs/api/i18n.rst
index 3b9abbc1d..7a61246df 100644
--- a/docs/api/i18n.rst
+++ b/docs/api/i18n.rst
@@ -6,6 +6,7 @@
.. automodule:: pyramid.i18n
.. autoclass:: TranslationString
+ :noindex:
.. autofunction:: TranslationStringFactory
diff --git a/docs/api/view.rst b/docs/api/view.rst
index d8e429552..e41212012 100644
--- a/docs/api/view.rst
+++ b/docs/api/view.rst
@@ -23,4 +23,6 @@
.. autoclass:: forbidden_view_config
:members:
+ .. autoclass:: exception_view_config
+ :members: