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

[christian.heimes]

http://hg.python.org/cpython/rev/287d7397218f
changeset:   86763:287d7397218f
parent:      86760:96fe644180d6
parent:      86762:62e7e08a0e21
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Oct 29 22:21:16 2013 +0100
summary:
  merge

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
@@ -33,7 +33,7 @@
 
    OpenSSL's internal random number generator does not properly handle fork.
    Applications must change the PRNG state of the parent process if they use
-   any SSL feature with with :func:`os.fork`. Any successful call of
+   any SSL feature with :func:`os.fork`. Any successful call of
    :func:`~ssl.RAND_add`, :func:`~ssl.RAND_bytes` or
    :func:`~ssl.RAND_pseudo_bytes` is sufficient.
 

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