[Python-checkins] cpython (merge 3.6 -> default): Merge from 3.6

[steve.dower]

https://hg.python.org/cpython/rev/14c52bb996be
changeset:   104266:14c52bb996be
parent:      104264:3ec6a610e93e
parent:      104265:de79cc895203
user:        Steve Dower <steve.dower at microsoft.com>
date:        Mon Oct 03 09:15:39 2016 -0700
summary:
  Merge from 3.6

files:
  Doc/using/windows.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -818,7 +818,7 @@
 .. versionchanged::
    3.6
 
-   * Adds ``sys.path`` file support and removes ``applocal`` option from
+   * Adds ``._pth`` file support and removes ``applocal`` option from
      ``pyvenv.cfg``.
    * Adds ``pythonXX.zip`` as a potential landmark when directly adjacent
      to the executable.

-- 
Repository URL: https://hg.python.org/cpython