Fixed #1180: Option to ignore ~/.pydistutils.cfg in Distutils

3 files changed, 6 insertions, 1 deletions

diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
index e9ea0b3..f7670b1 100644
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -207,6 +207,7 @@ docs@python.org), and we'll be glad to correct the problem.
    * Mats Wichmann
    * Gerry Wiener
    * Timothy Wild
+   * Paul Winkler
    * Collin Winter
    * Blake Winton
    * Dan Wolfe
diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
index e58937d..c7b756b 100644
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -241,7 +241,8 @@ tedious and error-prone, so it's usually best to put them in the setup
 configuration file, :file:`setup.cfg`\ ---see section :ref:`setup-config`.  If
 you distribute or package many Python module distributions, you might want to
 put options that apply to all of them in your personal Distutils configuration
-file (:file:`~/.pydistutils.cfg`).
+file (:file:`~/.pydistutils.cfg`).  If you want to temporarily disable
+this file, you can pass the --no-user-cfg option to setup.py.
 
 There are three steps to building a binary RPM package, all of which are
 handled automatically by the Distutils:
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index 3781ad9..b270d57 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -694,6 +694,9 @@ And on Windows, the configuration files are:
 | local        | :file:`setup.cfg`                               | \(3)  |
 +--------------+-------------------------------------------------+-------+
 
+On all platforms, the "personal" file can be temporarily disabled by
+passing the `--no-user-cfg` option.
+
 Notes:
 
 (1)