diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:03:24 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2016-01-03 02:03:24 -0700 |
| commit | 30ae71b4a7ad97a649165374a75a70f4b64ae25c (patch) | |
| tree | b8a2cd06ff0130fd31b702862db2e46d39cd4e71 /docs/api | |
| parent | 504027873ab0e1b15601e2d1900ef8a4469f6a43 (diff) | |
| parent | 5558386fd1a6181b2e8ad06659049c055a7ed023 (diff) | |
| download | pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.gz pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.tar.bz2 pyramid-30ae71b4a7ad97a649165374a75a70f4b64ae25c.zip | |
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/session.rst | 1 | ||||
| -rw-r--r-- | docs/api/static.rst | 8 |
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: |