diff options
| author | Tshepang Lekhonkhobe <tshepang@gmail.com> | 2013-08-15 21:57:48 +0200 |
|---|---|---|
| committer | Tshepang Lekhonkhobe <tshepang@gmail.com> | 2013-08-15 21:57:48 +0200 |
| commit | 58c5fefd37109fe7f27ca77a3d0896cc4b8e0470 (patch) | |
| tree | 68abd5f034da3169b7ffddbc898cea85f7d57f32 | |
| parent | 7319ab677216063581e47a231fd70b8b55a19466 (diff) | |
| download | pyramid-58c5fefd37109fe7f27ca77a3d0896cc4b8e0470.tar.gz pyramid-58c5fefd37109fe7f27ca77a3d0896cc4b8e0470.tar.bz2 pyramid-58c5fefd37109fe7f27ca77a3d0896cc4b8e0470.zip | |
fix some rST issues
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | docs/narr/install.rst | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 679f8ed4a..48efad6d4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -51,11 +51,13 @@ Features - The ``AuthTktAuthenticationPolicy`` has two new options to configure its domain usage: + * ``parent_domain``: if set the authentication cookie is set on the parent domain. This is useful if you have multiple sites sharing the same domain. * ``domain``: if provided the cookie is always set for this domain, bypassing - all usual logic. + all usual logic. + See https://github.com/Pylons/pyramid/pull/1028, https://github.com/Pylons/pyramid/pull/1072 and https://github.com/Pylons/pyramid/pull/1078. diff --git a/docs/narr/install.rst b/docs/narr/install.rst index d05c8abeb..ef5772f79 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -336,6 +336,7 @@ You can use Pyramid on Windows under Python 2 or under Python 3. #. Install `virtualenv`: .. code-block:: text + # modify the command according to the python version, e.g.: # for Python 2.7: c:\> c:\Python27\Scripts\easy_install virtualenv |