Merged revisions 81261 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81261 | tarek.ziade | 2010-05-17 12:54:43 +0200 (Mon, 17 May 2010) | 1 line

  upgraded distutils docs w.r.t. the manifest regeneration
........

diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst
index 57e363be2f229443d5c97427e737e0e80f4b054b..f6809c95a02dc35ca5dbc1e98b1808e010e74bce 100644 (file)
--- a/Doc/distutils/sourcedist.rst
+++ b/Doc/distutils/sourcedist.rst
@@ -137,20 +137,12 @@ There are a couple of options that modify this behaviour.  First, use the
 :option:`--no-defaults` and :option:`--no-prune` to disable the standard
 "include" and "exclude" sets.
 
-Second, you might want to force the manifest to be regenerated---for example, if
-you have added or removed files or directories that match an existing pattern in
-the manifest template, you should regenerate the manifest::
-
-   python setup.py sdist --force-manifest
-
-Or, you might just want to (re)generate the manifest, but not create a source
-distribution::
+Second, you might just want to (re)generate the manifest, but not create a
+source distribution::
 
    python setup.py sdist --manifest-only
 
-:option:`--manifest-only` implies :option:`--force-manifest`. :option:`-o` is a
-shortcut for :option:`--manifest-only`, and :option:`-f` for
-:option:`--force-manifest`.
+:option:`-o` is a sortcut for :option:`--manifest-only`.
 
 .. _manifest_template:
 

diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py
index b2088f98d1fbd64d6f5c2a9c42ae664bf1809c16..f6e099b89f47319f607c678e11486f93d9d7320f 100644 (file)
--- a/Lib/distutils/command/sdist.py
+++ b/Lib/distutils/command/sdist.py
@@ -63,7 +63,8 @@ class sdist(Command):
          "just regenerate the manifest and then stop "
          "(implies --force-manifest)"),
         ('force-manifest', 'f',
-         "forcibly regenerate the manifest and carry on as usual"),
+         "forcibly regenerate the manifest and carry on as usual. "
+         "Deprecated: now the manifest is always regenerated."),
         ('formats=', None,
          "formats for source distribution (comma-separated list)"),
         ('keep-temp', 'k',