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

Sun Oct 19 16:48:58 CEST 2014

https://hg.python.org/cpython/rev/b532a0dab2cc
changeset: 93139:b532a0dab2cc
parent: 93135:35250487eb9e
parent: 93138:a808cc33d68c
user: Benjamin Peterson <benjamin at python.org>
date: Sun Oct 19 10:48:06 2014 -0400
summary:
 merge 3.4
files:
 Doc/library/xmlrpc.client.rst | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@ -29,7 +29,7 @@
 
 .. warning::
 
- In the case of https URIS, :mod:`xmlrpc.client` does not do any verification
+ In the case of https URIs, :mod:`xmlrpc.client` does not do any verification
 of the server's certificate.
 
 
-- 
Repository URL: https://hg.python.org/cpython
