[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0320e8e2869fb6cde4579375e65f6d576bbec95e (commit)
      from  b4c1950d8914775db503d8ab931735325032a40d (commit)


- Log -----------------------------------------------------------------
commit 0320e8e2869fb6cde4579375e65f6d576bbec95e
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Apr 13 08:19:54 2018 +0200

    Docs for OpenSSL_init_crypto: there is no way to specify another file
    
    The documentation erroneously stated that one can change the default
    configuration file name.
    
    Fixes #5939
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5941)

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

Summary of changes:
 doc/man3/OPENSSL_init_crypto.pod | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/man3/OPENSSL_init_crypto.pod b/doc/man3/OPENSSL_init_crypto.pod
index c6a1715..b979c25 100644
--- a/doc/man3/OPENSSL_init_crypto.pod
+++ b/doc/man3/OPENSSL_init_crypto.pod
@@ -197,10 +197,10 @@ resources should be freed at an earlier time, or under the circumstances
 described in the NOTES section below.
 
 The B<OPENSSL_INIT_LOAD_CONFIG> flag will load a default configuration
-file.  To specify a different file, an B<OPENSSL_INIT_SETTINGS> must
-be created and used. The routines
-OPENSSL_INIT_new() and OPENSSL_INIT_set_config_appname() can be used to
-allocate the object and set the application name, and then the
+file. For optional configuration file settings, an B<OPENSSL_INIT_SETTINGS>
+must be created and used.
+The routines OPENSSL_init_new() and OPENSSL_INIT_set_config_appname() can
+be used to allocate the object and set the application name, and then the
 object can be released with OPENSSL_INIT_free() when done.
 
 =head1 NOTES