Merged revisions 81263 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81263 | tarek.ziade | 2010-05-17 13:01:57 +0200 (Mon, 17 May 2010) | 9 lines

  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
  ........
................

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',