[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6d53100f6e14b7d47cd1dabb895abc7ed81e8533 (commit)
      from  21e001747d4a246827ad432fc508d67ac404ecdb (commit)


- Log -----------------------------------------------------------------
commit 6d53100f6e14b7d47cd1dabb895abc7ed81e8533
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue May 10 13:12:01 2016 +0200

    Fix the docs for ERR_remove_thread_state and ERR_remove_state
    
    Don't primarly recommend using OPENSSL_thread_stop(), as that's a last
    resort.  Instead, recommend leaving it to automatic mechanisms.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 doc/crypto/ERR_remove_state.pod | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/crypto/ERR_remove_state.pod b/doc/crypto/ERR_remove_state.pod
index 944365d..a0d2f29 100644
--- a/doc/crypto/ERR_remove_state.pod
+++ b/doc/crypto/ERR_remove_state.pod
@@ -21,8 +21,9 @@ Deprecated:
 The functions described here were used to free the error queue
 associated with the current or specificed thread.
 
-They are now deprecated and do nothing, please use
-OPENSSL_thread_stop() instead.
+They are now deprecated and do nothing, as the OpenSSL libraries now
+normally do all thread initialisation and deinitialisation
+automatically (see L<OPENSSL_init_crypto(3)>).
 
 =head1 RETURN VALUE
 
@@ -30,7 +31,7 @@ The functions described here return no value.
 
 =head1 SEE ALSO
 
-L<err(3)>, L<OPENSSL_thread_stop(3)>
+L<err(3)>, L<OPENSSL_init_crypto(3)>
 
 =head1 HISTORY