Merged revisions 81522 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81522 | r.david.murray | 2010-05-25 11:36:46 -0400 (Tue, 25 May 2010) | 9 lines

  Recorded merge of 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/urllib.parse.rst b/Doc/library/urllib.parse.rst
index aa3685d227b1d0e9c20101bc94fa090b53b225db..483e340e59e4fd24f2baff6954d74ac5085b3397 100644 (file)
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -26,7 +26,7 @@ following URL schemes: ``file``, ``ftp``, ``gopher``, ``hdl``, ``http``,
 
 The :mod:`urllib.parse` module defines the following functions:
 
-.. function:: urlparse(urlstring, default_scheme='', allow_fragments=True)
+.. function:: urlparse(urlstring, scheme='', allow_fragments=True)
 
    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``.
@@ -48,7 +48,7 @@ The :mod:`urllib.parse` 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.
 
@@ -139,7 +139,7 @@ The :mod:`urllib.parse` module defines the following functions:
    states that these are equivalent).
 
 
-.. function:: urlsplit(urlstring, default_scheme='', allow_fragments=True)
+.. function:: urlsplit(urlstring, scheme='', allow_fragments=True)
 
    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