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

[georg.brandl]

https://hg.python.org/cpython/rev/c964cd3f9858
changeset:   100349:c964cd3f9858
parent:      100347:732e46d081b5
parent:      100348:9b240ec2bd42
user:        Georg Brandl <georg at python.org>
date:        Fri Feb 26 19:16:43 2016 +0100
summary:
  merge with 3.5

files:
  Doc/library/xmlrpc.server.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/xmlrpc.server.rst b/Doc/library/xmlrpc.server.rst
--- a/Doc/library/xmlrpc.server.rst
+++ b/Doc/library/xmlrpc.server.rst
@@ -18,7 +18,7 @@
 
 .. warning::
 
-   The :mod:`xmlrpc.client` module is not secure against maliciously
+   The :mod:`xmlrpc.server` module is not secure against maliciously
    constructed data.  If you need to parse untrusted or unauthenticated data see
    :ref:`xml-vulnerabilities`.
 

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