Merge heads

serhiy-storchaka · serhiy-storchaka · commit 0fa23e4a36a0 · 2015-04-10T16:21:58.000+03:00
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
@@ -292,6 +292,8 @@ Random generation
    can be used to check the status of the PRNG and :func:`RAND_add` can be used
    to seed the PRNG.
 
+   For almost all applications :func:`os.urandom` is preferable.
+
    Read the Wikipedia article, `Cryptographically secure pseudorandom number
    generator (CSPRNG)
    <http://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator>`_,
@@ -311,6 +313,8 @@ Random generation
    for non-cryptographic purposes and for certain purposes in cryptographic
    protocols, but usually not for key generation etc.
 
+   For almost all applications :func:`os.urandom` is preferable.
+
    .. versionadded:: 3.3
 
 .. function:: RAND_status()
