1 files changed, 8 insertions, 4 deletions

diff --git a/src/lib/libcrypto/man/openssl.cnf.5 b/src/lib/libcrypto/man/openssl.cnf.5
index de21a5d973..d95ccdcfbf 100644
--- a/src/lib/libcrypto/man/openssl.cnf.5
+++ b/src/lib/libcrypto/man/openssl.cnf.5
@@ -1,8 +1,9 @@
-.\"     $OpenBSD: openssl.cnf.5,v 1.3 2017/07/06 15:42:04 schwarze Exp $
-.\"     OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
+.\" $OpenBSD: openssl.cnf.5,v 1.4 2018/02/16 18:21:57 schwarze Exp $
+.\" full merge up to: OpenSSL man5/config b53338cb Feb 28 12:30:28 2017 +0100
+.\" selective merge up to: OpenSSL a8c5ed81 Jul 18 13:57:25 2017 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
-.\" Copyright (c) 1999, 2000, 2004, 2013, 2015, 2016 The OpenSSL Project.
+.\" Copyright (c) 1999, 2000, 2004, 2013, 2015, 2016, 2017 The OpenSSL Project.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -49,7 +50,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 6 2017 $
+.Dd $Mdocdate: February 16 2018 $
 .Dt OPENSSL.CNF 5
 .Os
 .Sh NAME
@@ -169,6 +170,8 @@ which is used by the
 utility.
 Other applications may use an alternative name such as
 .Sy myapplication_conf .
+All library configuration lines appear in the default section
+at the start of the configuration file.
 .Pp
 The configuration section should consist of a set of name value pairs
 which contain specific module configuration information.
@@ -182,6 +185,7 @@ configuration section containing configuration module specific
 information.
 For example:
 .Bd -literal -offset indent
+# The following line must be in the default section.
 openssl_conf = openssl_init
 
 [openssl_init]