summaryrefslogtreecommitdiff
path: root/docs/api/registry.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-07 00:33:53 -0400
committerChris McDonough <chrism@plope.com>2012-08-07 00:33:53 -0400
commitc3a9a10324b991a42040760a04c5fb3fc5c9c864 (patch)
tree11787501669cee587f8b0a7c33024fb62d397e81 /docs/api/registry.rst
parent92b64cca2994774987cbce88cef89e9f71366185 (diff)
parent735abf49f936cedc845907516a3922cdffa83665 (diff)
downloadpyramid-c3a9a10324b991a42040760a04c5fb3fc5c9c864.tar.gz
pyramid-c3a9a10324b991a42040760a04c5fb3fc5c9c864.tar.bz2
pyramid-c3a9a10324b991a42040760a04c5fb3fc5c9c864.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api/registry.rst')
-rw-r--r--docs/api/registry.rst14
1 files changed, 14 insertions, 0 deletions
diff --git a/docs/api/registry.rst b/docs/api/registry.rst
index e62e2ba6f..1d5d52248 100644
--- a/docs/api/registry.rst
+++ b/docs/api/registry.rst
@@ -38,3 +38,17 @@
This class is new as of :app:`Pyramid` 1.3.
+.. autoclass:: Deferred
+
+ This class is new as of :app:`Pyramid` 1.4.
+
+.. autofunction:: undefer
+
+ This function is new as of :app:`Pyramid` 1.4.
+
+.. autoclass:: predvalseq
+
+ This class is new as of :app:`Pyramid` 1.4.
+
+
+