Merged revisions 81521 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81521 | r.david.murray | 2010-05-25 11:32:06 -0400 (Tue, 25 May 2010) | 2 lines

  Issue 8818: urlparse/urlsplit keyword is 'scheme', not 'default_scheme'.
........

diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
index ea64574188a49e33fe0536670809e029fcd3b188..47a7e5717a301119c313ae265277878eb54c34bc 100644 (file)
--- a/Doc/library/urlparse.rst
+++ b/Doc/library/urlparse.rst
@@ -36,7 +36,7 @@ following URL schemes: ``file``, ``ftp``, ``gopher``, ``hdl``, ``http``,
 The :mod:`urlparse` module defines the following functions:
 
 
-.. function:: urlparse(urlstring[, default_scheme[, allow_fragments]])
+.. function:: urlparse(urlstring[, scheme[, allow_fragments]])
 
    Parse a URL into six components, returning a 6-tuple.  This corresponds to the
    general structure of a URL: ``scheme://netloc/path;parameters?query#fragment``.
@@ -58,7 +58,7 @@ The :mod:`urlparse` module defines the following functions:
       >>> o.geturl()
       'http://www.cwi.nl:80/%7Eguido/Python.html'
 
-   If the *default_scheme* argument is specified, it gives the default addressing
+   If the *scheme* argument is specified, it gives the default addressing
    scheme, to be used only if the URL does not specify one.  The default value for
    this argument is the empty string.
 
@@ -157,7 +157,7 @@ The :mod:`urlparse` module defines the following functions:
    equivalent).
 
 
-.. function:: urlsplit(urlstring[, default_scheme[, allow_fragments]])
+.. function:: urlsplit(urlstring[, scheme[, allow_fragments]])
 
    This is similar to :func:`urlparse`, but does not split the params from the URL.
    This should generally be used instead of :func:`urlparse` if the more recent URL