[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads

[serhiy.storchaka]

https://hg.python.org/cpython/rev/3930fd9b4bde
changeset:   92994:3930fd9b4bde
branch:      2.7
parent:      92993:be600ea4ad13
parent:      92992:c2eda29a8ccb
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Oct 12 17:15:56 2014 +0300
summary:
  Merge heads

files:
  Doc/library/urlparse.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
--- a/Doc/library/urlparse.rst
+++ b/Doc/library/urlparse.rst
@@ -83,8 +83,9 @@
    this argument is the empty string.
 
    If the *allow_fragments* argument is false, fragment identifiers are not
-   allowed, even if the URL's addressing scheme normally does support them.  The
-   default value for this argument is :const:`True`.
+   recognized and parsed as part of the preceding component, even if the URL's
+   addressing scheme normally does support them.  The default value for this
+   argument is :const:`True`.
 
    The return value is actually an instance of a subclass of :class:`tuple`.  This
    class has the following additional read-only convenience attributes:

-- 
Repository URL: https://hg.python.org/cpython