[Python-checkins] cpython (merge 3.6 -> default): Merge (issue #25152)

[brett.cannon]

https://hg.python.org/cpython/rev/53bee4ef1d0a
changeset:   104617:53bee4ef1d0a
parent:      104614:ef6c4e76f110
parent:      104616:126ff1f3b6cd
user:        Brett Cannon <brett at python.org>
date:        Fri Oct 21 12:54:31 2016 -0700
summary:
  Merge (issue #25152)

files:
  Doc/library/venv.rst |  6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst
--- a/Doc/library/venv.rst
+++ b/Doc/library/venv.rst
@@ -23,6 +23,12 @@
 
 See :pep:`405` for more information about Python virtual environments.
 
+.. note::
+   The `pyvenv` script has been deprecated as of Python 3.6 in favor of using
+   ``python3 -m venv`` to help prevent any potential confusion as to which
+   Python interpreter a virtual environment will be based on.
+
+
 Creating virtual environments
 -----------------------------
 

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