Merged revisions 86296 via svnmerge from

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

........
  r86296 | senthil.kumaran | 2010-11-07 20:57:04 +0800 (Sun, 07 Nov 2010) | 3 lines

  Fix Issue10226 - Clarifying the role of the netloc separator.
........

diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
index 26d422fd117aa0d01662e5c8ce9393774e0a8e4f..88dafa97c5381bb51a2d79cdaebe957d9e8d7c94 100644 (file)
--- a/Doc/library/urlparse.rst
+++ b/Doc/library/urlparse.rst
@@ -64,11 +64,10 @@ The :mod:`urlparse` module defines the following functions:
       'http://www.cwi.nl:80/%7Eguido/Python.html'
 
 
-   If the scheme value is not specified, urlparse following the syntax
-   specifications from RFC 1808, expects the netloc value to start with '//',
-   Otherwise, it is not possible to distinguish between net_loc and path
-   component and would classify the indistinguishable component as path as in
-   a relative url.
+   Following the syntax specifications in :rfc:`1808`, urlparse recognizes
+   a netloc only if it is properly introduced by '//'.  Otherwise the
+   input is presumed to be a relative URL and thus to start with
+   a path component.
 
        >>> from urlparse import urlparse
        >>> urlparse('//www.cwi.nl:80/%7Eguido/Python.html')