Merge pull request #413 from jogo/docs

Update doc/futurize to reflect what gets run

Author: jmadler

docs/futurize.rst

@@ -81,6 +81,7 @@ The complete set of fixers applied by ``futurize --stage1`` is:
 
     lib2to3.fixes.fix_apply
     lib2to3.fixes.fix_except
+    lib2to3.fixes.fix_exec
     lib2to3.fixes.fix_exitfunc
     lib2to3.fixes.fix_funcattrs
     lib2to3.fixes.fix_has_key
@@ -224,9 +225,7 @@ becomes::
 
 The complete list of fixers applied in Stage 2 is::
 
-    lib2to3.fixes.fix_basestring
     lib2to3.fixes.fix_dict
-    lib2to3.fixes.fix_exec
     lib2to3.fixes.fix_getcwdu
     lib2to3.fixes.fix_input
     lib2to3.fixes.fix_itertools
@@ -239,8 +238,9 @@ The complete list of fixers applied in Stage 2 is::
     lib2to3.fixes.fix_raw_input
     lib2to3.fixes.fix_zip
 
+    libfuturize.fixes.fix_basestring
     libfuturize.fixes.fix_cmp
-    libfuturize.fixes.fix_division
+    libfuturize.fixes.fix_division_safe
     libfuturize.fixes.fix_execfile
     libfuturize.fixes.fix_future_builtins
     libfuturize.fixes.fix_future_standard_library
@@ -269,11 +269,6 @@ Not applied::
     lib2to3.fixes.fix_xrange    # Custom one because of a bug with Py3.3's lib2to3
 
 
-Fixes applied with the ``futurize --conservative`` option::
-
-    libfuturize.fixes.fix_division_safe    # instead of libfuturize.fixes.fix_division.
-
-
 
 .. Ideally the output of this stage should not be a ``SyntaxError`` on either
 .. Python 3 or Python 2.