#1858: re-apply patch for this, adding the missing files

2 files changed, 39 insertions, 4 deletions

diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst
index 8242012..ef81d64 100644
--- a/Doc/distutils/packageindex.rst
+++ b/Doc/distutils/packageindex.rst
@@ -55,11 +55,40 @@ The .pypirc file
 
 The format of the :file:`.pypirc` file is as follows::
 
-   [server-login]
+   [distutils]
+   index-servers =
+     pypi
+
+   [pypi]
    repository: <repository-url>
    username: <username>
    password: <password>
 
 *repository* can be omitted and defaults to ``http://www.python.org/pypi``.
 
+If you want to define another server a new section can be created::
+
+   [distutils]
+   index-servers =
+     pypi
+     other
+ 
+   [pypi]
+   repository: <repository-url>
+   username: <username>
+   password: <password>
+
+   [other]
+   repository: http://example.com/pypi
+   username: <username>
+   password: <password>
+
+The command can then be called with the -r option::
+
+   python setup.py register -r http://example.com/pypi
+
+Or even with the section name::
+
+   python setup.py register -r other
 
+ 
diff --git a/Doc/distutils/uploading.rst b/Doc/distutils/uploading.rst
index 0b82184..52d6d5b 100644
--- a/Doc/distutils/uploading.rst
+++ b/Doc/distutils/uploading.rst
@@ -24,14 +24,20 @@ The :command:`upload` command uses the username, password, and repository URL
 from the :file:`$HOME/.pypirc` file (see section :ref:`pypirc` for more on this
 file).
 
+You can specify another PyPI server with the :option:`--repository=*url*` option::
+
+   python setup.py sdist bdist_wininst upload -r http://example.com/pypi
+
+See section :ref:`pypirc` for more on defining several servers.
+
 You can use the :option:`--sign` option to tell :command:`upload` to sign each
 uploaded file using GPG (GNU Privacy Guard).  The  :program:`gpg` program must
 be available for execution on the system :envvar:`PATH`.  You can also specify
 which key to use for signing using the :option:`--identity=*name*` option.
 
-Other :command:`upload` options include  :option:`--repository=*url*` (which
-lets you override the repository setting from :file:`$HOME/.pypirc`), and
+Other :command:`upload` options include  :option:`--repository=*url*` 
+or :option:`--repository=*section*` where `url` is the url of the server
+and `section` the name of the section in :file:`$HOME/.pypirc`, and
 :option:`--show-response` (which displays the full response text from the PyPI
 server for help in debugging upload problems).
 
-