diff options
| author | Michael Merickel <michael@merickel.org> | 2015-03-05 10:09:53 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-03-05 10:09:53 -0600 |
| commit | 6279cc428b2464066f67e4795045680bb3d59973 (patch) | |
| tree | 5f8e22498468f316d88b326baa751abf0acb1d9d /docs/api | |
| parent | 06bb4a4db67321e7629f4f2438516ba358f226e9 (diff) | |
| parent | af810c54fa9829096085f0ca601030c4fb74b5c7 (diff) | |
| download | pyramid-6279cc428b2464066f67e4795045680bb3d59973.tar.gz pyramid-6279cc428b2464066f67e4795045680bb3d59973.tar.bz2 pyramid-6279cc428b2464066f67e4795045680bb3d59973.zip | |
Merge branch 'master' into fix.shared-view-renderer
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/config.rst | 5 | ||||
| -rw-r--r-- | docs/api/request.rst | 1 | ||||
| -rw-r--r-- | docs/api/static.rst | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 48dd2f0b9..ae913d32c 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -132,3 +132,8 @@ are being used. .. autoclass:: not_ + +.. attribute:: PHASE0_CONFIG +.. attribute:: PHASE1_CONFIG +.. attribute:: PHASE2_CONFIG +.. attribute:: PHASE3_CONFIG diff --git a/docs/api/request.rst b/docs/api/request.rst index dd68fa09c..b325ad076 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -369,3 +369,4 @@ that used as ``request.GET``, ``request.POST``, and ``request.params``), see :class:`pyramid.interfaces.IMultiDict`. +.. autofunction:: apply_request_extensions(request) diff --git a/docs/api/static.rst b/docs/api/static.rst index 543e526ad..b6b279139 100644 --- a/docs/api/static.rst +++ b/docs/api/static.rst @@ -9,6 +9,12 @@ :members: :inherited-members: + .. autoclass:: PathSegmentCacheBuster + :members: + + .. autoclass:: QueryStringCacheBuster + :members: + .. autoclass:: PathSegmentMd5CacheBuster :members: |