diff options
author | Sandro Tosi <sandro.tosi@gmail.com> | 2012-03-31 17:44:33 +0200 |
---|---|---|
committer | Sandro Tosi <sandro.tosi@gmail.com> | 2012-03-31 17:44:33 +0200 |
commit | dc60f940b5081e1303139099efe426beb05e5230 (patch) | |
tree | f22cd709fa887988051c5d32a8d82e508338796e /Doc/library/webbrowser.rst | |
parent | Fix warning when compiling socketmodule.c with VS2010 (diff) | |
parent | add 'safari' to webbrowser browsers table; thanks to Jonathan Eunice from docs@ (diff) | |
download | cpython-dc60f940b5081e1303139099efe426beb05e5230.tar.gz cpython-dc60f940b5081e1303139099efe426beb05e5230.tar.bz2 cpython-dc60f940b5081e1303139099efe426beb05e5230.zip |
merge with 3.2
Diffstat (limited to 'Doc/library/webbrowser.rst')
-rw-r--r-- | Doc/library/webbrowser.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst index 9cf8c504cc2..23211fa9e64 100644 --- a/Doc/library/webbrowser.rst +++ b/Doc/library/webbrowser.rst @@ -137,6 +137,8 @@ for the controller classes, all defined in this module. +------------------------+-----------------------------------------+-------+ | ``'macosx'`` | :class:`MacOSX('default')` | \(4) | +------------------------+-----------------------------------------+-------+ +| ``'safari'`` | :class:`MacOSX('safari')` | \(4) | ++------------------------+-----------------------------------------+-------+ | ``'google-chrome'`` | :class:`Chrome('google-chrome')` | | +------------------------+-----------------------------------------+-------+ | ``'chrome'`` | :class:`Chrome('chrome')` | | |