Fix some SSL_export_keying_material() issues

[openssl.git] / doc / man3 / CONF_modules_free.pod

diff --git a/doc/man3/CONF_modules_free.pod b/doc/man3/CONF_modules_free.pod
index ac59f3736aefe0ff9abf84273511071390073632..452c29509c934fa7d05867c29fe777a011775ea8 100644 (file)
--- a/doc/man3/CONF_modules_free.pod
+++ b/doc/man3/CONF_modules_free.pod
@@ -12,16 +12,18 @@ OpenSSL configuration cleanup functions
  void CONF_modules_finish(void);
  void CONF_modules_unload(int all);
 
-Deprecated:
+Deprecated since OpenSSL 1.1.0, can be hidden entirely by defining
+B<OPENSSL_API_COMPAT> with a suitable version value, see
+L<openssl_user_macros(7)>:
 
- #if OPENSSL_API_COMPAT < 0x10100000L
  void CONF_modules_free(void)
- #endif
 
 =head1 DESCRIPTION
 
 CONF_modules_free() closes down and frees up all memory allocated by all
-configuration modules.
+configuration modules.  Normally, in versions of OpenSSL prior to 1.1.0,
+applications called
+CONF_modules_free() at exit to tidy up any configuration performed.
 
 CONF_modules_finish() calls each configuration modules B<finish> handler
 to free up any configuration that module may have performed.
@@ -30,29 +32,23 @@ CONF_modules_unload() finishes and unloads configuration modules. If
 B<all> is set to B<0> only modules loaded from DSOs will be unloads. If
 B<all> is B<1> all modules, including builtin modules will be unloaded.
 
-=head1 NOTES
-
-Normally in versions of OpenSSL prior to 1.1.0 applications will only call
-CONF_modules_free() at application exit to tidy up any configuration performed.
-From 1.1.0 CONF_modules_free() is deprecated and no explicit CONF cleanup is
-required at all. For more information see L<OPENSSL_init_crypto(3)>.
-
-=head1 RETURN VALUE
+=head1 RETURN VALUES
 
 None of the functions return a value.
 
 =head1 SEE ALSO
 
-L<conf(5)>, L<OPENSSL_config(3)>,
+L<config(5)>, L<OPENSSL_config(3)>,
 L<CONF_modules_load_file(3)>
 
 =head1 HISTORY
 
-CONF_modules_free() was deprecated in OpenSSL 1.1.0.
+CONF_modules_free() was deprecated in OpenSSL 1.1.0; do not use it.
+For more information see L<OPENSSL_init_crypto(3)>.
 
 =head1 COPYRIGHT
 
-Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy