[Python-checkins] cpython (merge 3.4 -> default): Issue #21569: merge from 3.4

[nick.coghlan]

http://hg.python.org/cpython/rev/524d73b8f29e
changeset:   91099:524d73b8f29e
parent:      91097:8b93cdccd872
parent:      91098:454d4a9a3088
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Jun 09 13:30:33 2014 +1000
summary:
  Issue #21569: merge from 3.4

files:
  Doc/whatsnew/2.7.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -437,7 +437,7 @@
    :mod:`argparse` documentation
      The documentation page of the argparse module.
 
-   :ref:`argparse-from-optparse`
+   :ref:`upgrading-optparse-code`
      Part of the Python documentation, describing how to convert
      code that uses :mod:`optparse`.
 

-- 
Repository URL: http://hg.python.org/cpython