traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.4

This commit is contained in:
Senthil Kumaran 2014-04-16 23:44:03 -04:00
parent 249e74aa26 aad7cc9dba
commit aedff520ea
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Doc/library/webbrowser.rst
View File

@ -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 available. If text-mode browsers are used, the calling process will block until
the user exits the browser. the user exits the browser.
If the environment variable :envvar:`BROWSER` exists, it is interpreted to If the environment variable :envvar:`BROWSER` exists, it is interpreted as the
override the platform default list of browsers, as a :data:`os.pathsep`-separated :data:`os.pathsep`-separated list of browsers to try ahead of the the platform
list of browsers to try in order. When the value of a list part contains the defaults. When the value of a list part contains the string ``%s``, then it is
string ``%s``, then it is interpreted as a literal browser command line to be interpreted as a literal browser command line to be used with the argument URL
used with the argument URL substituted for ``%s``; if the part does not contain substituted for ``%s``; if the part does not contain ``%s``, it is simply
``%s``, it is simply interpreted as the name of the browser to launch. [1]_ interpreted as the name of the browser to launch. [1]_
For non-Unix platforms, or when a remote browser is available on Unix, the 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 controlling process will not wait for the user to finish with the browser, but