From: Ezio Melotti Date: Thu, 24 Dec 2009 03:23:23 +0000 (+0000) Subject: Merged revisions 77022 via svnmerge from X-Git-Tag: v3.2a1~1975 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=579c29be27ce417f630731aa4f5baa810ac61541;p=thirdparty%2FPython%2Fcpython.git Merged revisions 77022 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77022 | ezio.melotti | 2009-12-24 04:54:53 +0200 (Thu, 24 Dec 2009) | 1 line Added markup and default arg, fixed example ........ --- diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst index 202d7c1a05dc..e8f47562e177 100644 --- a/Doc/library/webbrowser.rst +++ b/Doc/library/webbrowser.rst @@ -17,10 +17,10 @@ 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 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 +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]_ For non-Unix platforms, or when a remote browser is available on Unix, the @@ -156,10 +156,10 @@ Notes: Here are some simple examples:: - url = 'http://www.python.org' + url = 'http://www.python.org/' # Open URL in a new tab, if a browser window is already open. - webbrowser.open_new_tab(url + '/doc') + webbrowser.open_new_tab(url + 'doc/') # Open URL in new window, raising the window if possible. webbrowser.open_new(url)