summaryrefslogtreecommitdiff
path: root/docs/api/interfaces.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-10 20:20:05 -0400
committerChris McDonough <chrism@plope.com>2011-08-10 20:20:05 -0400
commit995466c6bc0da04f50d2db83af653362a0dadd6f (patch)
treee5e57108a3d751d9e02cbf06ad5eca8902f4a100 /docs/api/interfaces.rst
parent9a8ba2f09fe3791febbfec2ac383c091aacfbf5b (diff)
parent3e3fcdf1376218a4fa6dcffec4f27a41c63d1675 (diff)
downloadpyramid-995466c6bc0da04f50d2db83af653362a0dadd6f.tar.gz
pyramid-995466c6bc0da04f50d2db83af653362a0dadd6f.tar.bz2
pyramid-995466c6bc0da04f50d2db83af653362a0dadd6f.zip
fix merge conflicts
Diffstat (limited to 'docs/api/interfaces.rst')
-rw-r--r--docs/api/interfaces.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/api/interfaces.rst b/docs/api/interfaces.rst
index 51a1963b5..9ab9eefc3 100644
--- a/docs/api/interfaces.rst
+++ b/docs/api/interfaces.rst
@@ -9,14 +9,19 @@ Event-Related Interfaces
++++++++++++++++++++++++
.. autointerface:: IApplicationCreated
+ :members:
.. autointerface:: INewRequest
+ :members:
.. autointerface:: IContextFound
+ :members:
.. autointerface:: INewResponse
+ :members:
.. autointerface:: IBeforeRender
+ :members:
Other Interfaces
++++++++++++++++