Merge functional howto improvements with 3.2.

diff --cc Doc/howto/functional.rst
index f1ed07b44ceaeea28a6451e0567b5dd87b0f4ca6,8eadb01c68fc36f338c1802d3d2f65f5104d2992..f298d897f1c362ad580fdfef432cc11d4b30ab6d
--- 1/Doc/howto/functional.rst
--- 2/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@@ -296,7 -296,7 +296,8 @@@ ordering of the objects in the dictiona
  Applying :func:`iter` to a dictionary always loops over the keys, but
  dictionaries have methods that return other iterators.  If you want to iterate
  over values or key/value pairs, you can explicitly call the
- :meth:`values` or :meth:`items` methods to get an appropriate iterator.
 -:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate iterator.
++:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate
++iterator.
  
  The :func:`dict` constructor can accept an iterator that returns a finite stream
  of ``(key, value)`` tuples: