summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-03-31 15:44:33 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-03-31 15:44:33 (GMT)
commitdc60f940b5081e1303139099efe426beb05e5230 (patch)
treef22cd709fa887988051c5d32a8d82e508338796e /Doc/library
parent310052c1f0992ac7063307f4cbcc26fbc54d3e6b (diff)
parent9ee65f1f9247c49b0ab52ef9beef1ca4b0503bfc (diff)
downloadcpython-dc60f940b5081e1303139099efe426beb05e5230.zip
cpython-dc60f940b5081e1303139099efe426beb05e5230.tar.gz
cpython-dc60f940b5081e1303139099efe426beb05e5230.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/webbrowser.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst
index 9cf8c50..23211fa 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')` | |