summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-09-16 11:45:15 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-09-16 11:45:15 (GMT)
commitf8479eeb34de987a5683af9a0c446dc35b4fd534 (patch)
tree0940fd6b20ab8dfda34104ab5636267ccfcd756d /Doc
parent355bbb0a2ae864acd6c719b3529c6f5cabfdd950 (diff)
parentf676748a052cacdf9963aa840bfa6107275d163e (diff)
downloadcpython-f8479eeb34de987a5683af9a0c446dc35b4fd534.zip
cpython-f8479eeb34de987a5683af9a0c446dc35b4fd534.tar.gz
cpython-f8479eeb34de987a5683af9a0c446dc35b4fd534.tar.bz2
Issue #25895: Merge from 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/urllib.parse.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
index d79d8f0..a66b1c3 100644
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -25,7 +25,7 @@ Resource Locators. It supports the following URL schemes: ``file``, ``ftp``,
``gopher``, ``hdl``, ``http``, ``https``, ``imap``, ``mailto``, ``mms``,
``news``, ``nntp``, ``prospero``, ``rsync``, ``rtsp``, ``rtspu``, ``sftp``,
``shttp``, ``sip``, ``sips``, ``snews``, ``svn``, ``svn+ssh``, ``telnet``,
-``wais``.
+``wais``, ``ws``, ``wss``.
The :mod:`urllib.parse` module defines functions that fall into two broad
categories: URL parsing and URL quoting. These are covered in detail in