[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/178d4ffe1249
changeset:   92991:178d4ffe1249
parent:      92989:75b5617b8dfc
parent:      92990:9eed2e7fa764
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 12 16:13:38 2014 +0200
summary:
  merge with 3.4

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


diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -81,7 +81,8 @@
    this argument is the empty string.
 
    If the *allow_fragments* argument is false, fragment identifiers are not
-   allowed.  The default value for this argument is :const:`True`.
+   recognized and parsed as part of the preceding component.  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