[Python-checkins] cpython (merge 3.3 -> default): Merge #18311: fix typo.

[r.david.murray]

http://hg.python.org/cpython/rev/16fe29689f3f
changeset:   84351:16fe29689f3f
parent:      84349:520490c4c388
parent:      84350:d7ae8a84f443
user:        R David Murray <rdmurray at bitdance.com>
date:        Wed Jun 26 15:11:32 2013 -0400
summary:
  Merge #18311: fix typo.

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


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -885,7 +885,7 @@
 
 .. method:: SSLContext.set_npn_protocols(protocols)
 
-   Specify which protocols the socket should avertise during the SSL/TLS
+   Specify which protocols the socket should advertise during the SSL/TLS
    handshake. It should be a list of strings, like ``['http/1.1', 'spdy/2']``,
    ordered by preference. The selection of a protocol will happen during the
    handshake, and will play out according to the `NPN draft specification

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