diff options
| author | Tres Seaver <tseaver@palladion.com> | 2013-01-29 08:59:53 -0800 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2013-01-29 08:59:53 -0800 |
| commit | 7bdedc367d82bc619a52413f1e5c444792d15e36 (patch) | |
| tree | 449dd00fc7fb72767a7f9b12d97253807bfec7ab | |
| parent | 86902eaace031c2b118a780643d921eb68e1df3c (diff) | |
| parent | 23c8985a661b9e2b11b76750893724dc747ffc1c (diff) | |
| download | pyramid-7bdedc367d82bc619a52413f1e5c444792d15e36.tar.gz pyramid-7bdedc367d82bc619a52413f1e5c444792d15e36.tar.bz2 pyramid-7bdedc367d82bc619a52413f1e5c444792d15e36.zip | |
Merge pull request #829 from tshepang/request
request: replace 'note' with the more correct 'versionadded' directive
| -rw-r--r-- | docs/api/request.rst | 4 | ||||
| -rw-r--r-- | pyramid/url.py | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/docs/api/request.rst b/docs/api/request.rst index e4034c635..9f1f71b31 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -163,9 +163,7 @@ .. method:: invoke_subrequest(request, use_tweens=False) - .. warning:: - - This API was added in Pyramid 1.4a1. + .. versionadded:: 1.4a1 Obtain a response object from the Pyramid application based on information in the ``request`` object provided. The ``request`` object diff --git a/pyramid/url.py b/pyramid/url.py index 8fb5e49ab..84b58ac45 100644 --- a/pyramid/url.py +++ b/pyramid/url.py @@ -390,9 +390,8 @@ class URLMethodsMixin(object): pass ``app_url=''`. Passing ``app_url=''` when the resource path is ``/baz/bar`` will return ``/baz/bar``. - .. note:: - - ``app_url`` is new as of Pyramid 1.3. + .. versionadded:: 1.3 + ``app_url`` If ``app_url`` is passed and any of ``scheme``, ``port``, or ``host`` are also passed, ``app_url`` will take precedence and the values |