merge 3.3 (#4590)

63c52027 · Benjamin Peterson · 238a6175 · 4dafd407 · 63c52027
Kaydet (Commit) 63c52027 authored Ock 28, 2013 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

2to3.rst Doc/library/2to3.rst +1 -2

No files found.
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -264,8 +264,7 @@ and off individually.  They are described here in more detail.

 .. 2to3fixer:: long

-   Strips the ``L`` prefix on long literals and renames :class:`long` to
-   :class:`int`.
+   Renames :class:`long` to :class:`int`.

 .. 2to3fixer:: map