summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt4
-rw-r--r--docs/narr/install.rst1
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