[Python-checkins] cpython (merge 3.4 -> 3.5): Merge from 3.4

[tal.einat]

https://hg.python.org/cpython/rev/d0775e9935a1
changeset:   96566:d0775e9935a1
branch:      3.5
parent:      96562:24bb564469b4
parent:      96565:bb51d486a899
user:        Tal Einat <taleinat at gmail.com>
date:        Tue Jun 09 18:42:18 2015 +0300
summary:
  Merge from 3.4

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


diff --git a/Doc/tutorial/venv.rst b/Doc/tutorial/venv.rst
--- a/Doc/tutorial/venv.rst
+++ b/Doc/tutorial/venv.rst
@@ -90,8 +90,8 @@
 
 Once you've activated a virtual environment, you can install, upgrade,
 and remove packages using a program called :program:`pip`.  By default
-``pip`` will install packages from the Python Packaging Index,
-<https://pypi.python.org/pypi>.  You can browse the Python Packaging Index
+``pip`` will install packages from the Python Package Index,
+<https://pypi.python.org/pypi>.  You can browse the Python Package Index
 by going to it in your web browser, or you can use ``pip``'s
 limited search feature::
 
@@ -193,5 +193,5 @@
 
 ``pip`` has many more options.  Consult the :ref:`installing-index`
 guide for complete documentation for ``pip``.  When you've written
-a package and want to make it available on the Python Packaging Index,
+a package and want to make it available on the Python Package Index,
 consult the :ref:`distributing-index` guide.

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