summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-31 02:51:44 -0500
committerChris McDonough <chrism@plope.com>2010-12-31 02:51:44 -0500
commitc26f03e1a920e950976e06c1a7f3b2e5e46c0754 (patch)
treedeb68628ecf37f74c068528f4a7cb5893eb5269b /docs/api
parentb26badf557847bf5a55f896c63a3b6a97b468936 (diff)
parent4f355b634b32b77c6b35ddc31dfa772f075bf2ee (diff)
downloadpyramid-c26f03e1a920e950976e06c1a7f3b2e5e46c0754.tar.gz
pyramid-c26f03e1a920e950976e06c1a7f3b2e5e46c0754.tar.bz2
pyramid-c26f03e1a920e950976e06c1a7f3b2e5e46c0754.zip
Merge branch 'viewderiver'
Conflicts: pyramid/config.py
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/interfaces.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/api/interfaces.rst b/docs/api/interfaces.rst
index b3c14e5f7..3ce926230 100644
--- a/docs/api/interfaces.rst
+++ b/docs/api/interfaces.rst
@@ -35,3 +35,7 @@ Other Interfaces
.. autointerface:: ITemplateRenderer
+ .. autointerface:: IViewMapperFactory
+
+ .. autointerface:: IViewMapper
+