Merged revisions 75893 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75893 | tarek.ziade | 2009-10-28 00:06:10 +0100 (Wed, 28 Oct 2009) | 1 line
Fixed #1180: Option to ignore ~/.pydistutils.cfg in Distutils
........
diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
index 0d796ad..2dd3b55 100644
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -208,6 +208,7 @@
* 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 @@
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 0751291..2231058 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -691,6 +691,9 @@
| local | :file:`setup.cfg` | \(3) |
+--------------+-------------------------------------------------+-------+
+On all platforms, the "personal" file can be temporarily disabled by
+passing the `--no-user-cfg` option.
+
Notes:
(1)