summaryrefslogtreecommitdiffstats
path: root/Doc/howto
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2016-02-06 03:37:47 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2016-02-06 03:37:47 (GMT)
commit029f7f7af2d23e34ae875489426185ce75c0e121 (patch)
tree9d91fe7bdbfcd4fbc345069b0ac5c37f52e5001d /Doc/howto
parent186c30b7ae2c304b863143809867cfef7eb1bf29 (diff)
parentb6213c5664cf983ae67059a41520af1aaeeb52c3 (diff)
downloadcpython-029f7f7af2d23e34ae875489426185ce75c0e121.zip
cpython-029f7f7af2d23e34ae875489426185ce75c0e121.tar.gz
cpython-029f7f7af2d23e34ae875489426185ce75c0e121.tar.bz2
merge from 3.5
Diffstat (limited to 'Doc/howto')
-rw-r--r--Doc/howto/urllib2.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
index 9052ed5..7d5044b 100644
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -514,7 +514,7 @@ component and the hostname and optionally the port number)
e.g. "http://example.com/" *or* an "authority" (i.e. the hostname,
optionally including the port number) e.g. "example.com" or "example.com:8080"
(the latter example includes a port number). The authority, if present, must
-NOT contain the "userinfo" component - for example "joe@password:example.com" is
+NOT contain the "userinfo" component - for example "joe:password@example.com" is
not correct.