summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-06-07 15:31:39 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-06-07 15:31:39 (GMT)
commit313570a1851bbe8c44af07be2eceb021fea6c994 (patch)
tree19e92183602f61a4d6d107c8569440baf8cab213 /Doc
parent1752468d39a38ac73ec13fc1f8f6427623b69074 (diff)
parent69cdf9294fee18e3b38278f2baf00c15c7bdbd8e (diff)
downloadcpython-313570a1851bbe8c44af07be2eceb021fea6c994.zip
cpython-313570a1851bbe8c44af07be2eceb021fea6c994.tar.gz
cpython-313570a1851bbe8c44af07be2eceb021fea6c994.tar.bz2
Branch merge: packaging fixes
Diffstat (limited to 'Doc')
-rw-r--r--Doc/packaging/setupcfg.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/packaging/setupcfg.rst b/Doc/packaging/setupcfg.rst
index 92ddb8b..d3fc07a9 100644
--- a/Doc/packaging/setupcfg.rst
+++ b/Doc/packaging/setupcfg.rst
@@ -265,9 +265,9 @@ obsoletes-dist
Same format than *requires-dist*. *optional*, *multi*, *environ*
requires-python
- Specifies the Python version the distribution requires.
- The value is a version number, as described in PEP 345.
- *optional*, *multi*, *environ*
+ Specifies the Python version the distribution requires. The value is a
+ comma-separated list of version predicates, as described in PEP 345.
+ *optional*, *environ*
requires-externals
a dependency in the system. This field is free-form,