summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-02-07 16:34:46 -0500
committerChris McDonough <chrism@plope.com>2016-02-07 16:34:46 -0500
commitdf7a123a847e2243f38688c033f06200382ba139 (patch)
treecc8e032c2a85d9fee45e68f7f3501046c8bec8ed /docs/api
parent5cd91621668807f9b66811fe57a04fba96e7458a (diff)
parented04017d5a8e82db2e46412f841c55d83ef062b0 (diff)
downloadpyramid-df7a123a847e2243f38688c033f06200382ba139.tar.gz
pyramid-df7a123a847e2243f38688c033f06200382ba139.tar.bz2
pyramid-df7a123a847e2243f38688c033f06200382ba139.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/session.rst1
-rw-r--r--docs/api/static.rst8
2 files changed, 2 insertions, 7 deletions
diff --git a/docs/api/session.rst b/docs/api/session.rst
index dde9d20e9..474e2bb32 100644
--- a/docs/api/session.rst
+++ b/docs/api/session.rst
@@ -17,4 +17,5 @@
.. autofunction:: BaseCookieSessionFactory
+ .. autoclass:: PickleSerializer
diff --git a/docs/api/static.rst b/docs/api/static.rst
index b6b279139..f3727e197 100644
--- a/docs/api/static.rst
+++ b/docs/api/static.rst
@@ -9,17 +9,11 @@
:members:
:inherited-members:
- .. autoclass:: PathSegmentCacheBuster
+ .. autoclass:: ManifestCacheBuster
:members:
.. autoclass:: QueryStringCacheBuster
:members:
- .. autoclass:: PathSegmentMd5CacheBuster
- :members:
-
- .. autoclass:: QueryStringMd5CacheBuster
- :members:
-
.. autoclass:: QueryStringConstantCacheBuster
:members: