Merge with 3.1.

diff --cc Doc/tutorial/inputoutput.rst
index b35cc8051a6e663a47e64642141797869ff20487,abe1ce09c0f73282cd43c574ca0d12c6716d114d..00f5aea609094bf6adeb98f5474f32c128ca65de
--- 1/Doc/tutorial/inputoutput.rst
--- 2/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@@ -40,8 -40,8 +40,8 @@@ which can be read by the interpreter (o
  there is not equivalent syntax).  For objects which don't have a particular
  representation for human consumption, :func:`str` will return the same value as
  :func:`repr`.  Many values, such as numbers or structures like lists and
--dictionaries, have the same representation using either function.  Strings and
--floating point numbers, in particular, have two distinct representations.
++dictionaries, have the same representation using either function.  Strings, in
++particular, have two distinct representations.
  
  Some examples::
  
@@@ -50,9 -50,9 +50,7 @@@
     'Hello, world.'
     >>> repr(s)
     "'Hello, world.'"
--   >>> str(1.0/7.0)
--   '0.142857142857'
--   >>> repr(1.0/7.0)
++   >>> str(1/7)
     '0.14285714285714285'
     >>> x = 10 * 3.25
     >>> y = 200 * 200