summaryrefslogtreecommitdiffstats
path: root/Doc/distutils
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2010-05-17 11:04:41 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2010-05-17 11:04:41 (GMT)
commit42db5c30331c0678702e16d5c6eb04b7c9a278b5 (patch)
tree80187ac2da9faf0d84c2c67c325203fcee9f79aa /Doc/distutils
parentdd4671a93eee8d4a9d121bb1b44bffb11c083560 (diff)
downloadcpython-42db5c30331c0678702e16d5c6eb04b7c9a278b5.zip
cpython-42db5c30331c0678702e16d5c6eb04b7c9a278b5.tar.gz
cpython-42db5c30331c0678702e16d5c6eb04b7c9a278b5.tar.bz2
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 ........ ................
Diffstat (limited to 'Doc/distutils')
-rw-r--r--Doc/distutils/sourcedist.rst12
1 files changed, 2 insertions, 10 deletions
diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst
index 0c786c5..96e891b 100644
--- a/Doc/distutils/sourcedist.rst
+++ b/Doc/distutils/sourcedist.rst
@@ -198,19 +198,11 @@ 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
+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 shortcut for :option:`--manifest-only`.