[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #29069: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/b1ccf713e8f8
changeset:   105846:b1ccf713e8f8
branch:      3.6
parent:      105843:af71708d7445
parent:      105845:c4cd7e00a640
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Tue Dec 27 15:16:55 2016 +0300
summary:
  Issue #29069: Merge from 3.5

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


diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst
--- a/Doc/distutils/packageindex.rst
+++ b/Doc/distutils/packageindex.rst
@@ -173,7 +173,7 @@
 Each section describing a repository defines three variables:
 
 - *repository*, that defines the url of the PyPI server. Defaults to
-    ``https://www.python.org/pypi``.
+    ``https://upload.pypi.org/legacy/``.
 - *username*, which is the registered username on the PyPI server.
 - *password*, that will be used to authenticate. If omitted the user
     will be prompt to type it when needed.

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