summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-14 03:41:37 -0500
committerChris McDonough <chrism@plope.com>2011-12-14 03:41:37 -0500
commita1995a197b735b2d1bbf674a5a6a82c359b5131f (patch)
treee9b7f2f8ee0c892bbf6d35cd5d377a0193cd67ef /docs/api
parentec507ade5541e1e3949fd6020062e78d113e0ed8 (diff)
parent4375cf2bad3535ce896e95fcf1e388e33f2e8ecf (diff)
downloadpyramid-a1995a197b735b2d1bbf674a5a6a82c359b5131f.tar.gz
pyramid-a1995a197b735b2d1bbf674a5a6a82c359b5131f.tar.bz2
pyramid-a1995a197b735b2d1bbf674a5a6a82c359b5131f.zip
Merge branch 'feature.viewdefaults'
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/view.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/api/view.rst b/docs/api/view.rst
index 4dddea25f..9f59ddae7 100644
--- a/docs/api/view.rst
+++ b/docs/api/view.rst
@@ -16,6 +16,9 @@
.. autoclass:: view_config
:members:
+ .. autoclass:: view_defaults
+ :members:
+
.. autoclass:: static
:members:
:inherited-members: