[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #25176: Merge cgi.parse_qsl link from 3.4 into 3.5

[martin.panter]

https://hg.python.org/cpython/rev/138bbb7cf612
changeset:   98076:138bbb7cf612
branch:      3.5
parent:      98070:21076e24cd8a
parent:      98075:3ed2427758cf
user:        Martin Panter <vadmium>
date:        Sun Sep 20 01:07:41 2015 +0000
summary:
  Issue #25176: Merge cgi.parse_qsl link from 3.4 into 3.5

files:
  Doc/library/cgi.rst |  2 +-
  Misc/ACKS           |  1 +
  2 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/library/cgi.rst b/Doc/library/cgi.rst
--- a/Doc/library/cgi.rst
+++ b/Doc/library/cgi.rst
@@ -292,7 +292,7 @@
 
 .. function:: parse_qsl(qs, keep_blank_values=False, strict_parsing=False)
 
-   This function is deprecated in this module. Use :func:`urllib.parse.parse_qs`
+   This function is deprecated in this module. Use :func:`urllib.parse.parse_qsl`
    instead. It is maintained here only for backward compatibility.
 
 .. function:: parse_multipart(fp, pdict)
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1334,6 +1334,7 @@
 George Sipe
 J. Sipprell
 Kragen Sitaker
+Ville Skyttä
 Michael Sloan
 Nick Sloan
 Václav Šmilauer

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