summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-09-20 22:38:13 (GMT)
committerGeorg Brandl <georg@python.org>2014-09-20 22:38:13 (GMT)
commit9e7fbde67f55e8e5c21bc41568c7fe13e72b44bc (patch)
tree334c8fe6379a66615b299b6fe96116c11727e981 /Doc/whatsnew
parent895ce149c1ba5a4ebd1e5b238bd7e5022fd49a20 (diff)
parent3f40c40dea5f68fa4f1711c9cfa04c4edf6f8f53 (diff)
downloadcpython-9e7fbde67f55e8e5c21bc41568c7fe13e72b44bc.zip
cpython-9e7fbde67f55e8e5c21bc41568c7fe13e72b44bc.tar.gz
cpython-9e7fbde67f55e8e5c21bc41568c7fe13e72b44bc.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc/whatsnew')
-rw-r--r--Doc/whatsnew/2.1.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/whatsnew/2.1.rst b/Doc/whatsnew/2.1.rst
index 144ea1c..001403b 100644
--- a/Doc/whatsnew/2.1.rst
+++ b/Doc/whatsnew/2.1.rst
@@ -555,7 +555,7 @@ will include metadata, making it possible to build automated cataloguing systems
and experiment with them. With the result experience, perhaps it'll be possible
to design a really good catalog and then build support for it into Python 2.2.
For example, the Distutils :command:`sdist` and :command:`bdist_\*` commands
-could support a :option:`upload` option that would automatically upload your
+could support a ``upload`` option that would automatically upload your
package to a catalog server.
You can start creating packages containing :file:`PKG-INFO` even if you're not