[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/fad22f068c7c
changeset:   93286:fad22f068c7c
parent:      93284:42d768a50926
parent:      93285:100e8eae0b2b
user:        Georg Brandl <georg at python.org>
date:        Thu Oct 30 22:52:06 2014 +0100
summary:
  merge with 3.4

files:
  Doc/howto/pyporting.rst |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst
--- a/Doc/howto/pyporting.rst
+++ b/Doc/howto/pyporting.rst
@@ -565,10 +565,10 @@
 ---------------------------------------------------------
 
 If you have Python 2 code but going forward only want to improve it as Python 3
-code, then you can use 2to3_ to translate your Python 2 code to Python 3 code.
-This is only recommended, though, if your current version of your project is
-going into maintenance mode and you want all new features to be exclusive to
-Python 3.
+code, then you can use :ref:`2to3 <2to3-reference>` to translate your Python 2
+code to Python 3 code.  This is only recommended, though, if your current
+version of your project is going into maintenance mode and you want all new
+features to be exclusive to Python 3.
 
 
 Backporting Python 3 code to Python 2

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