summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2014-04-17 03:44:03 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2014-04-17 03:44:03 (GMT)
commitaedff520eab83c48848d2346d6f55cc1579182ef (patch)
tree27e0ea0616136ca01d6a13575bd85e2002a6a208 /Doc
parent249e74aa26e03e3278fa80f74b4eba9b75f92270 (diff)
parentaad7cc9dba9e2a1ad0b1977da3133a8435b212d9 (diff)
downloadcpython-aedff520eab83c48848d2346d6f55cc1579182ef.zip
cpython-aedff520eab83c48848d2346d6f55cc1579182ef.tar.gz
cpython-aedff520eab83c48848d2346d6f55cc1579182ef.tar.bz2
merge 3.4
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/webbrowser.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst
index 9c2b3ab..ef63769 100644
--- a/Doc/library/webbrowser.rst
+++ b/Doc/library/webbrowser.rst
@@ -19,12 +19,12 @@ will be used if graphical browsers are not available or an X11 display isn't
available. If text-mode browsers are used, the calling process will block until
the user exits the browser.
-If the environment variable :envvar:`BROWSER` exists, it is interpreted to
-override the platform default list of browsers, as a :data:`os.pathsep`-separated
-list of browsers to try in order. When the value of a list part contains the
-string ``%s``, then it is interpreted as a literal browser command line to be
-used with the argument URL substituted for ``%s``; if the part does not contain
-``%s``, it is simply interpreted as the name of the browser to launch. [1]_
+If the environment variable :envvar:`BROWSER` exists, it is interpreted as the
+:data:`os.pathsep`-separated list of browsers to try ahead of the the platform
+defaults. When the value of a list part contains the string ``%s``, then it is
+interpreted as a literal browser command line to be used with the argument URL
+substituted for ``%s``; if the part does not contain ``%s``, it is simply
+interpreted as the name of the browser to launch. [1]_
For non-Unix platforms, or when a remote browser is available on Unix, the
controlling process will not wait for the user to finish with the browser, but