merge with 3.2

diff --cc Doc/library/webbrowser.rst
index 9cf8c504cc22f06f74708762da124876c3a25d20,dfb09ee40e816b51bed6a21b923d6e2006d3fe0f..23211fa9e6452b1289a343e35bd85309591d5e16
--- 1/Doc/library/webbrowser.rst
--- 2/Doc/library/webbrowser.rst
+++ b/Doc/library/webbrowser.rst
@@@ -96,55 -96,49 +96,57 @@@ A number of browser types are predefine
  may be passed to the :func:`get` function and the corresponding instantiations
  for the controller classes, all defined in this module.
  
 -+-----------------------+-----------------------------------------+-------+
 -| Type Name             | Class Name                              | Notes |
 -+=======================+=========================================+=======+
 -| ``'mozilla'``         | :class:`Mozilla('mozilla')`             |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'firefox'``         | :class:`Mozilla('mozilla')`             |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'netscape'``        | :class:`Mozilla('netscape')`            |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'galeon'``          | :class:`Galeon('galeon')`               |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'epiphany'``        | :class:`Galeon('epiphany')`             |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'skipstone'``       | :class:`BackgroundBrowser('skipstone')` |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'kfmclient'``       | :class:`Konqueror()`                    | \(1)  |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'konqueror'``       | :class:`Konqueror()`                    | \(1)  |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'kfm'``             | :class:`Konqueror()`                    | \(1)  |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'mosaic'``          | :class:`BackgroundBrowser('mosaic')`    |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'opera'``           | :class:`Opera()`                        |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'grail'``           | :class:`Grail()`                        |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'links'``           | :class:`GenericBrowser('links')`        |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'elinks'``          | :class:`Elinks('elinks')`               |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'lynx'``            | :class:`GenericBrowser('lynx')`         |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'w3m'``             | :class:`GenericBrowser('w3m')`          |       |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'windows-default'`` | :class:`WindowsDefault`                 | \(2)  |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'internet-config'`` | :class:`InternetConfig`                 | \(3)  |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'macosx'``          | :class:`MacOSX('default')`              | \(4)  |
 -+-----------------------+-----------------------------------------+-------+
 -| ``'safari'``          | :class:`MacOSX('safari')`               | \(4)  |
 -+-----------------------+-----------------------------------------+-------+
 ++------------------------+-----------------------------------------+-------+
 +| Type Name              | Class Name                              | Notes |
 ++========================+=========================================+=======+
 +| ``'mozilla'``          | :class:`Mozilla('mozilla')`             |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'firefox'``          | :class:`Mozilla('mozilla')`             |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'netscape'``         | :class:`Mozilla('netscape')`            |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'galeon'``           | :class:`Galeon('galeon')`               |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'epiphany'``         | :class:`Galeon('epiphany')`             |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'skipstone'``        | :class:`BackgroundBrowser('skipstone')` |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'kfmclient'``        | :class:`Konqueror()`                    | \(1)  |
 ++------------------------+-----------------------------------------+-------+
 +| ``'konqueror'``        | :class:`Konqueror()`                    | \(1)  |
 ++------------------------+-----------------------------------------+-------+
 +| ``'kfm'``              | :class:`Konqueror()`                    | \(1)  |
 ++------------------------+-----------------------------------------+-------+
 +| ``'mosaic'``           | :class:`BackgroundBrowser('mosaic')`    |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'opera'``            | :class:`Opera()`                        |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'grail'``            | :class:`Grail()`                        |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'links'``            | :class:`GenericBrowser('links')`        |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'elinks'``           | :class:`Elinks('elinks')`               |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'lynx'``             | :class:`GenericBrowser('lynx')`         |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'w3m'``              | :class:`GenericBrowser('w3m')`          |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'windows-default'``  | :class:`WindowsDefault`                 | \(2)  |
 ++------------------------+-----------------------------------------+-------+
 +| ``'internet-config'``  | :class:`InternetConfig`                 | \(3)  |
 ++------------------------+-----------------------------------------+-------+
 +| ``'macosx'``           | :class:`MacOSX('default')`              | \(4)  |
 ++------------------------+-----------------------------------------+-------+
++| ``'safari'``           | :class:`MacOSX('safari')`               | \(4)  |
+++------------------------+-----------------------------------------+-------+
 +| ``'google-chrome'``    | :class:`Chrome('google-chrome')`        |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'chrome'``           | :class:`Chrome('chrome')`               |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'chromium'``         | :class:`Chromium('chromium')`           |       |
 ++------------------------+-----------------------------------------+-------+
 +| ``'chromium-browser'`` | :class:`Chromium('chromium-browser')`   |       |
 ++------------------------+-----------------------------------------+-------+
  
  Notes: