summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-10-12 14:15:56 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-10-12 14:15:56 (GMT)
commitfb29e3527498a22caca6a4fc563cf868fa8c7b0c (patch)
tree5997d5f5ca82a4d4aaf98ce16f108afa3b1c19bb
parent80f0c824bae1b9a12f44e1a3afbdc6f7cd50f0f8 (diff)
parentf8757fd356936c800435f3270fff7a5c5df6dcb4 (diff)
downloadcpython-fb29e3527498a22caca6a4fc563cf868fa8c7b0c.zip
cpython-fb29e3527498a22caca6a4fc563cf868fa8c7b0c.tar.gz
cpython-fb29e3527498a22caca6a4fc563cf868fa8c7b0c.tar.bz2
Merge heads
-rw-r--r--Doc/library/urlparse.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
index 1bc361d..87e08dd 100644
--- a/Doc/library/urlparse.rst
+++ b/Doc/library/urlparse.rst
@@ -83,8 +83,9 @@ The :mod:`urlparse` module defines the following functions:
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: