Merged revisions 80337 via svnmerge from

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

................
  r80337 | senthil.kumaran | 2010-04-22 11:23:18 +0530 (Thu, 22 Apr 2010) | 9 lines

  Merged revisions 80336 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80336 | senthil.kumaran | 2010-04-22 11:18:35 +0530 (Thu, 22 Apr 2010) | 3 lines

    Updated the RFCs list in the See Also section of urlparse.rst
  ........
................

diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
index f2518521bf4b4126cb3c844638211548ed13c068..aa3685d227b1d0e9c20101bc94fa090b53b225db 100644 (file)
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -326,17 +326,26 @@ The :mod:`urllib.parse` module defines the following functions:
 
 .. seealso::
 
-   :rfc:`1738` - Uniform Resource Locators (URL)
-      This specifies the formal syntax and semantics of absolute URLs.
+   :rfc:`3986` - Uniform Resource Identifiers
+      This is the current standard (STD66). Any changes to urlparse module
+      should conform to this. Certain deviations could be observed, which are
+      mostly due backward compatiblity purposes and for certain to de-facto
+      parsing requirements as commonly observed in major browsers.
+
+   :rfc:`2396` - Uniform Resource Identifiers (URI): Generic Syntax
+      Document describing the generic syntactic requirements for both Uniform Resource
+      Names (URNs) and Uniform Resource Locators (URLs).
+
+   :rfc:`2368` - The mailto URL scheme.
+      Parsing requirements for mailto url schemes.
 
    :rfc:`1808` - Relative Uniform Resource Locators
       This Request For Comments includes the rules for joining an absolute and a
       relative URL, including a fair number of "Abnormal Examples" which govern the
       treatment of border cases.
 
-   :rfc:`2396` - Uniform Resource Identifiers (URI): Generic Syntax
-      Document describing the generic syntactic requirements for both Uniform Resource
-      Names (URNs) and Uniform Resource Locators (URLs).
+   :rfc:`1738` - Uniform Resource Locators (URL)
+      This specifies the formal syntax and semantics of absolute URLs.
 
 
 .. _urlparse-result-object: