[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

senthil.kumaran python-checkins at python.org
Thu Apr 17 05:44:13 CEST 2014


http://hg.python.org/cpython/rev/3441b4edb779
changeset:   90377:3441b4edb779
parent:      90375:c99b4341330c
parent:      90376:503bf9dee28e
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Wed Apr 16 23:44:03 2014 -0400
summary:
  merge 3.4

files:
  Doc/library/webbrowser.rst |  12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst
--- a/Doc/library/webbrowser.rst
+++ b/Doc/library/webbrowser.rst
@@ -19,12 +19,12 @@
 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

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list