[Python-checkins] distutils2: merged

[tarek.ziade]

tarek.ziade pushed dcd2f13f6053 to distutils2:

http://hg.python.org/distutils2/rev/dcd2f13f6053
changeset:   770:dcd2f13f6053
tag:         tip
parent:      766:bb3afd03c844
parent:      769:c77de166761b
user:        Tarek Ziade <tarek at ziade.org>
date:        Wed Oct 13 16:58:38 2010 +0200
summary:     merged
files:       

diff --git a/distutils2/_trove.py b/distutils2/_trove.py
--- a/distutils2/_trove.py
+++ b/distutils2/_trove.py
@@ -1,4 +1,4 @@
-# Temporary helper for mkpkg.
+# Temporary helper for mkcfg.
 
 # XXX get the list from PyPI and cache it instead of hardcoding
 
diff --git a/docs/source/distutils/setupscript.rst b/docs/source/distutils/setupscript.rst
--- a/docs/source/distutils/setupscript.rst
+++ b/docs/source/distutils/setupscript.rst
@@ -597,7 +597,7 @@
 
 (4)
     The list of classifiers is available from the `PyPI website
-    <http://pypi.python.org/pypi>`_. See also :mod:`distutils2.mkpkg`.
+    <http://pypi.python.org/pypi>`_. See also :mod:`distutils2.mkcfg`.
 
 (5)
     The ``description`` field is used by PyPI when you are registering a
diff --git a/docs/source/library/distutils2.index.simple.rst b/docs/source/library/distutils2.index.simple.rst
--- a/docs/source/library/distutils2.index.simple.rst
+++ b/docs/source/library/distutils2.index.simple.rst
@@ -124,7 +124,7 @@
 +++++++++++++++++++++++++++++
 
 It's possible to search for projects with specific names in the package index.
-Assuming you want to find all projects containing the "pelican" keyword::
+Assuming you want to find all projects containing the "distutils" keyword::
 
     >>> c.search_projects("distutils")
     [<Project "collective.recipe.distutils">, <Project "Distutils">, <Project

--
Repository URL: http://hg.python.org/distutils2