185 files changed, 620 insertions, 249 deletions
diff --git a/src/lib/libcrypto/man/ASN1_OBJECT_new.3 b/src/lib/libcrypto/man/ASN1_OBJECT_new.3
index 526e1d869b..9c73dcb0ce 100644
--- a/src/lib/libcrypto/man/ASN1_OBJECT_new.3
+++ b/src/lib/libcrypto/man/ASN1_OBJECT_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: March 12 2016 $
+.\"     $OpenBSD: ASN1_OBJECT_new.3,v 1.4 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ASN1_OBJECT_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ASN1_STRING_length.3 b/src/lib/libcrypto/man/ASN1_STRING_length.3
index 190cd81122..1fa794fc46 100644
--- a/src/lib/libcrypto/man/ASN1_STRING_length.3
+++ b/src/lib/libcrypto/man/ASN1_STRING_length.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: ASN1_STRING_length.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ASN1_STRING_LENGTH 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ASN1_STRING_new.3 b/src/lib/libcrypto/man/ASN1_STRING_new.3
index 00968f4995..5810d5a15f 100644
--- a/src/lib/libcrypto/man/ASN1_STRING_new.3
+++ b/src/lib/libcrypto/man/ASN1_STRING_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: ASN1_STRING_new.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ASN1_STRING_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ASN1_STRING_print_ex.3 b/src/lib/libcrypto/man/ASN1_STRING_print_ex.3
index f7dc70bf4c..75a07a0b6e 100644
--- a/src/lib/libcrypto/man/ASN1_STRING_print_ex.3
+++ b/src/lib/libcrypto/man/ASN1_STRING_print_ex.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: ASN1_STRING_print_ex.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ASN1_STRING_PRINT_EX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ASN1_generate_nconf.3 b/src/lib/libcrypto/man/ASN1_generate_nconf.3
index f92afece23..1fd7f38d26 100644
--- a/src/lib/libcrypto/man/ASN1_generate_nconf.3
+++ b/src/lib/libcrypto/man/ASN1_generate_nconf.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: ASN1_generate_nconf.3,v 1.5 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ASN1_GENERATE_NCONF 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BF_set_key.3 b/src/lib/libcrypto/man/BF_set_key.3
index 5b45ce8b57..5eca4409a0 100644
--- a/src/lib/libcrypto/man/BF_set_key.3
+++ b/src/lib/libcrypto/man/BF_set_key.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: BF_set_key.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BF_SET_KEY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO.3 b/src/lib/libcrypto/man/BIO.3
index 44b826bb89..f3a419721f 100644
--- a/src/lib/libcrypto/man/BIO.3
+++ b/src/lib/libcrypto/man/BIO.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: BIO.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_ctrl.3 b/src/lib/libcrypto/man/BIO_ctrl.3
index 1ad28b7213..391158bd42 100644
--- a/src/lib/libcrypto/man/BIO_ctrl.3
+++ b/src/lib/libcrypto/man/BIO_ctrl.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: BIO_ctrl.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_CTRL 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_f_base64.3 b/src/lib/libcrypto/man/BIO_f_base64.3
index a9fc0c20f5..d86a2e0daa 100644
--- a/src/lib/libcrypto/man/BIO_f_base64.3
+++ b/src/lib/libcrypto/man/BIO_f_base64.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: BIO_f_base64.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_F_BASE64 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_f_cipher.3 b/src/lib/libcrypto/man/BIO_f_cipher.3
index 1f1f42bd83..4ecde4f69d 100644
--- a/src/lib/libcrypto/man/BIO_f_cipher.3
+++ b/src/lib/libcrypto/man/BIO_f_cipher.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: BIO_f_cipher.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_F_CIPHER 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_f_md.3 b/src/lib/libcrypto/man/BIO_f_md.3
index cc37483eb3..3b3f1de329 100644
--- a/src/lib/libcrypto/man/BIO_f_md.3
+++ b/src/lib/libcrypto/man/BIO_f_md.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: BIO_f_md.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_F_MD 3
 .Os
 .Sh NAME
@@ -69,7 +71,7 @@ It is a
 macro.
 .Pp
 .Fn BIO_get_md
-places the a pointer to the digest BIOs digest method in
+places a pointer to the digest BIOs digest method in
 .Fa mdp .
 It is a
 .Xr BIO_ctrl 3
diff --git a/src/lib/libcrypto/man/BIO_f_null.3 b/src/lib/libcrypto/man/BIO_f_null.3
index 3f75d6286a..236d233e57 100644
--- a/src/lib/libcrypto/man/BIO_f_null.3
+++ b/src/lib/libcrypto/man/BIO_f_null.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: BIO_f_null.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_F_NULL 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_find_type.3 b/src/lib/libcrypto/man/BIO_find_type.3
index ccbab52cf2..1db2fe85c6 100644
--- a/src/lib/libcrypto/man/BIO_find_type.3
+++ b/src/lib/libcrypto/man/BIO_find_type.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: BIO_find_type.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_FIND_TYPE 3
 .Os
 .Sh NAME
@@ -92,14 +94,7 @@ chain or find multiple matches using
 Previous versions had to use:
 .Pp
 .Dl next = bio->next_bio;
-.Sh BUGS
+.Sh EXAMPLES
-.Fn BIO_find_type
-in OpenSSL 0.9.5a and earlier could not be safely passed a
-.Dv NULL
-pointer for the
-.Fa b
-argument.
-.Sh EXAMPLE
 Traverse a chain looking for digest BIOs:
 .Bd -literal -offset 2n
 BIO *btmp;
@@ -115,3 +110,10 @@ do {
        btmp = BIO_next(btmp);
 } while(btmp);
 .Ed
+.Sh BUGS
+.Fn BIO_find_type
+in OpenSSL 0.9.5a and earlier could not be safely passed a
+.Dv NULL
+pointer for the
+.Fa b
+argument.
diff --git a/src/lib/libcrypto/man/BIO_new.3 b/src/lib/libcrypto/man/BIO_new.3
index 0727f50c19..b08de9c650 100644
--- a/src/lib/libcrypto/man/BIO_new.3
+++ b/src/lib/libcrypto/man/BIO_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: September 9 2015 $
+.\"     $OpenBSD: BIO_new.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_push.3 b/src/lib/libcrypto/man/BIO_push.3
index 848a09ba53..0357a8446c 100644
--- a/src/lib/libcrypto/man/BIO_push.3
+++ b/src/lib/libcrypto/man/BIO_push.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 16 2015 $
+.\"     $OpenBSD: BIO_push.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_PUSH 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_read.3 b/src/lib/libcrypto/man/BIO_read.3
index 3114ab3da4..94a4fb1461 100644
--- a/src/lib/libcrypto/man/BIO_read.3
+++ b/src/lib/libcrypto/man/BIO_read.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 16 2015 $
+.\"     $OpenBSD: BIO_read.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_READ 3
 .Os
 .Sh NAME
@@ -84,7 +86,7 @@ is to use a system call (such as
 .Xr select 2 ,
 .Xr poll 2
 or equivalent) to determine when data is available and then call
-.Xr read 3
+.Xr read 2
 to read the data.
 The equivalent with BIOs (that is call
 .Xr select 2
diff --git a/src/lib/libcrypto/man/BIO_s_accept.3 b/src/lib/libcrypto/man/BIO_s_accept.3
index f5adfcc07c..766d86e2a4 100644
--- a/src/lib/libcrypto/man/BIO_s_accept.3
+++ b/src/lib/libcrypto/man/BIO_s_accept.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 16 2015 $
+.\"     $OpenBSD: BIO_s_accept.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_S_ACCEPT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_s_bio.3 b/src/lib/libcrypto/man/BIO_s_bio.3
index 39fa4504c5..c7d602990e 100644
--- a/src/lib/libcrypto/man/BIO_s_bio.3
+++ b/src/lib/libcrypto/man/BIO_s_bio.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: August 2 2015 $
+.\"     $OpenBSD: BIO_s_bio.3,v 1.4 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_S_BIO 3
 .Os
 .Sh NAME
@@ -231,7 +233,7 @@ will be true.
 If the application then waits for data to become available
 on the underlying transport before flushing the write buffer,
 it will never succeed because the request was never sent.
-.Sh EXAMPLE
+.Sh EXAMPLES
 The BIO pair can be used to have full control
 over the network access of an application.
 The application can call
diff --git a/src/lib/libcrypto/man/BIO_s_connect.3 b/src/lib/libcrypto/man/BIO_s_connect.3
index 960400e853..e0da157e12 100644
--- a/src/lib/libcrypto/man/BIO_s_connect.3
+++ b/src/lib/libcrypto/man/BIO_s_connect.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 16 2015 $
+.\"     $OpenBSD: BIO_s_connect.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_S_CONNECT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_s_fd.3 b/src/lib/libcrypto/man/BIO_s_fd.3
index 3d6a2a3ca9..004126565e 100644
--- a/src/lib/libcrypto/man/BIO_s_fd.3
+++ b/src/lib/libcrypto/man/BIO_s_fd.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 16 2015 $
+.\"     $OpenBSD: BIO_s_fd.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_S_FD 3
 .Os
 .Sh NAME
@@ -124,7 +126,7 @@ returns the file descriptor or -1 if the BIO has not been initialized.
 returns the newly allocated BIO or
 .Dv NULL
 if an error occurred.
-.Sh EXAMPLE
+.Sh EXAMPLES
 This is a file descriptor BIO version of "Hello World":
 .Bd -literal -offset indent
 BIO *out;
diff --git a/src/lib/libcrypto/man/BIO_s_file.3 b/src/lib/libcrypto/man/BIO_s_file.3
index c7075a3fb7..9676e4f0a5 100644
--- a/src/lib/libcrypto/man/BIO_s_file.3
+++ b/src/lib/libcrypto/man/BIO_s_file.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 16 2015 $
+.\"     $OpenBSD: BIO_s_file.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_S_FILE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_s_mem.3 b/src/lib/libcrypto/man/BIO_s_mem.3
index a37b4bff98..1512ebbb77 100644
--- a/src/lib/libcrypto/man/BIO_s_mem.3
+++ b/src/lib/libcrypto/man/BIO_s_mem.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 16 2015 $
+.\"     $OpenBSD: BIO_s_mem.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_S_MEM 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_s_null.3 b/src/lib/libcrypto/man/BIO_s_null.3
index 05008aabfc..5910bd5ce1 100644
--- a/src/lib/libcrypto/man/BIO_s_null.3
+++ b/src/lib/libcrypto/man/BIO_s_null.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 16 2015 $
+.\"     $OpenBSD: BIO_s_null.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_S_NULL 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_s_socket.3 b/src/lib/libcrypto/man/BIO_s_socket.3
index f7aff6a4c8..69768bc003 100644
--- a/src/lib/libcrypto/man/BIO_s_socket.3
+++ b/src/lib/libcrypto/man/BIO_s_socket.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 16 2015 $
+.\"     $OpenBSD: BIO_s_socket.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_S_SOCKET 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_set_callback.3 b/src/lib/libcrypto/man/BIO_set_callback.3
index 39d284890e..68ca2780f8 100644
--- a/src/lib/libcrypto/man/BIO_set_callback.3
+++ b/src/lib/libcrypto/man/BIO_set_callback.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 16 2015 $
+.\"     $OpenBSD: BIO_set_callback.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_SET_CALLBACK 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BIO_should_retry.3 b/src/lib/libcrypto/man/BIO_should_retry.3
index cb5eda3121..c06e907235 100644
--- a/src/lib/libcrypto/man/BIO_should_retry.3
+++ b/src/lib/libcrypto/man/BIO_should_retry.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 16 2015 $
+.\"     $OpenBSD: BIO_should_retry.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BIO_SHOULD_RETRY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_BLINDING_new.3 b/src/lib/libcrypto/man/BN_BLINDING_new.3
index 72ea5d8b34..d8860f543e 100644
--- a/src/lib/libcrypto/man/BN_BLINDING_new.3
+++ b/src/lib/libcrypto/man/BN_BLINDING_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: August 2 2015 $
+.\"     $OpenBSD: BN_BLINDING_new.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_BLINDING_NEW 3
 .Os
 .Sh NAME
@@ -210,7 +212,7 @@ and
 can be used to pass special functions for exponentiation (normally
 .Xr BN_mod_exp_mont 3
 and
-.Vt BN_MONT_CTX Ns ).
+.Vt BN_MONT_CTX ) .
 .Sh RETURN VALUES
 .Fn BN_BLINDING_new
 returns the newly allocated
diff --git a/src/lib/libcrypto/man/BN_CTX_new.3 b/src/lib/libcrypto/man/BN_CTX_new.3
index 1a77314854..5165f3bea2 100644
--- a/src/lib/libcrypto/man/BN_CTX_new.3
+++ b/src/lib/libcrypto/man/BN_CTX_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_CTX_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_CTX_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_CTX_start.3 b/src/lib/libcrypto/man/BN_CTX_start.3
index 986208ba1a..0d0797ef6f 100644
--- a/src/lib/libcrypto/man/BN_CTX_start.3
+++ b/src/lib/libcrypto/man/BN_CTX_start.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_CTX_start.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_CTX_START 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_add.3 b/src/lib/libcrypto/man/BN_add.3
index de5caaf403..1933be8c52 100644
--- a/src/lib/libcrypto/man/BN_add.3
+++ b/src/lib/libcrypto/man/BN_add.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: BN_add.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_ADD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_add_word.3 b/src/lib/libcrypto/man/BN_add_word.3
index 16f2a17eb5..589ede6f73 100644
--- a/src/lib/libcrypto/man/BN_add_word.3
+++ b/src/lib/libcrypto/man/BN_add_word.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: July 5 2016 $
+.\"     $OpenBSD: BN_add_word.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_ADD_WORD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_bn2bin.3 b/src/lib/libcrypto/man/BN_bn2bin.3
index 02d6b2c8b8..b371527935 100644
--- a/src/lib/libcrypto/man/BN_bn2bin.3
+++ b/src/lib/libcrypto/man/BN_bn2bin.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_bn2bin.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_BN2BIN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_cmp.3 b/src/lib/libcrypto/man/BN_cmp.3
index b0a03b25ce..f3f36aa2dd 100644
--- a/src/lib/libcrypto/man/BN_cmp.3
+++ b/src/lib/libcrypto/man/BN_cmp.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_cmp.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_CMP 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_copy.3 b/src/lib/libcrypto/man/BN_copy.3
index 765e46c01c..80b3087c62 100644
--- a/src/lib/libcrypto/man/BN_copy.3
+++ b/src/lib/libcrypto/man/BN_copy.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_copy.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_COPY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_generate_prime.3 b/src/lib/libcrypto/man/BN_generate_prime.3
index e269571914..01eb4de1f8 100644
--- a/src/lib/libcrypto/man/BN_generate_prime.3
+++ b/src/lib/libcrypto/man/BN_generate_prime.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_generate_prime.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_GENERATE_PRIME 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_mod_inverse.3 b/src/lib/libcrypto/man/BN_mod_inverse.3
index db63269fb8..2500c178f3 100644
--- a/src/lib/libcrypto/man/BN_mod_inverse.3
+++ b/src/lib/libcrypto/man/BN_mod_inverse.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_mod_inverse.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_MOD_INVERSE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_mod_mul_montgomery.3 b/src/lib/libcrypto/man/BN_mod_mul_montgomery.3
index ac120f3c02..8ec14c3ea0 100644
--- a/src/lib/libcrypto/man/BN_mod_mul_montgomery.3
+++ b/src/lib/libcrypto/man/BN_mod_mul_montgomery.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_mod_mul_montgomery.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_MOD_MUL_MONTGOMERY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_mod_mul_reciprocal.3 b/src/lib/libcrypto/man/BN_mod_mul_reciprocal.3
index ceb1ffae5b..c311cca961 100644
--- a/src/lib/libcrypto/man/BN_mod_mul_reciprocal.3
+++ b/src/lib/libcrypto/man/BN_mod_mul_reciprocal.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_mod_mul_reciprocal.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_MOD_MUL_RECIPROCAL 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_new.3 b/src/lib/libcrypto/man/BN_new.3
index ad8ce886d9..887336e914 100644
--- a/src/lib/libcrypto/man/BN_new.3
+++ b/src/lib/libcrypto/man/BN_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_num_bytes.3 b/src/lib/libcrypto/man/BN_num_bytes.3
index 2d7be7e443..5223ff1116 100644
--- a/src/lib/libcrypto/man/BN_num_bytes.3
+++ b/src/lib/libcrypto/man/BN_num_bytes.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_num_bytes.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_NUM_BYTES 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_rand.3 b/src/lib/libcrypto/man/BN_rand.3
index f4fd7f21cf..b580a09892 100644
--- a/src/lib/libcrypto/man/BN_rand.3
+++ b/src/lib/libcrypto/man/BN_rand.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: July 25 2015 $
+.\"     $OpenBSD: BN_rand.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_RAND 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_set_bit.3 b/src/lib/libcrypto/man/BN_set_bit.3
index 75c2379239..1e0ffc8ccc 100644
--- a/src/lib/libcrypto/man/BN_set_bit.3
+++ b/src/lib/libcrypto/man/BN_set_bit.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: BN_set_bit.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_SET_BIT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_swap.3 b/src/lib/libcrypto/man/BN_swap.3
index b252261067..e6a98ec0ef 100644
--- a/src/lib/libcrypto/man/BN_swap.3
+++ b/src/lib/libcrypto/man/BN_swap.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: February 23 2015 $
+.\"     $OpenBSD: BN_swap.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_SWAP 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BN_zero.3 b/src/lib/libcrypto/man/BN_zero.3
index 8e3dd7f6a3..2d9b943a96 100644
--- a/src/lib/libcrypto/man/BN_zero.3
+++ b/src/lib/libcrypto/man/BN_zero.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: BN_zero.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BN_ZERO 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/BUF_MEM_new.3 b/src/lib/libcrypto/man/BUF_MEM_new.3
index 10258b7aaf..609df41457 100644
--- a/src/lib/libcrypto/man/BUF_MEM_new.3
+++ b/src/lib/libcrypto/man/BUF_MEM_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: March 12 2016 $
+.\"     $OpenBSD: BUF_MEM_new.3,v 1.4 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt BUF_MEM_NEW 3
 .Os
 .Sh NAME
@@ -91,7 +93,7 @@ on error.
 .Pp
 .Fn BUF_MEM_grow
 returns zero on error or the new size (i.e.
-.Fa len Ns ).
+.Fa len ) .
 .Sh SEE ALSO
 .Xr bio 3
 .Sh HISTORY
diff --git a/src/lib/libcrypto/man/CONF_modules_free.3 b/src/lib/libcrypto/man/CONF_modules_free.3
index b09989d664..2735db8d3b 100644
--- a/src/lib/libcrypto/man/CONF_modules_free.3
+++ b/src/lib/libcrypto/man/CONF_modules_free.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 11 2015 $
+.\"     $OpenBSD: CONF_modules_free.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt CONF_MODULES_FREE 3
 .Os
 .Sh NAME
@@ -43,7 +45,7 @@ is 1, all modules, including builtin modules, will be unloaded.
 Normally applications will only call
 .Fn CONF_modules_free
 at application to tidy up any configuration performed.
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 None of the functions return a value.
 .Sh SEE ALSO
 .Xr CONF_modules_load_file 3 ,
diff --git a/src/lib/libcrypto/man/CONF_modules_load_file.3 b/src/lib/libcrypto/man/CONF_modules_load_file.3
index b5de94411d..9fbd1aba47 100644
--- a/src/lib/libcrypto/man/CONF_modules_load_file.3
+++ b/src/lib/libcrypto/man/CONF_modules_load_file.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 11 2015 $
+.\"     $OpenBSD: CONF_modules_load_file.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt CONF_MODULES_LOAD_FILE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/CRYPTO_set_ex_data.3 b/src/lib/libcrypto/man/CRYPTO_set_ex_data.3
index 1be42dedd9..d7a88b5293 100644
--- a/src/lib/libcrypto/man/CRYPTO_set_ex_data.3
+++ b/src/lib/libcrypto/man/CRYPTO_set_ex_data.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 11 2015 $
+.\"     $OpenBSD: CRYPTO_set_ex_data.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt CRYPTO_SET_EX_DATA 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/CRYPTO_set_locking_callback.3 b/src/lib/libcrypto/man/CRYPTO_set_locking_callback.3
index 708c52d7d3..eb99f30d23 100644
--- a/src/lib/libcrypto/man/CRYPTO_set_locking_callback.3
+++ b/src/lib/libcrypto/man/CRYPTO_set_locking_callback.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: March 26 2016 $
+.\"     $OpenBSD: CRYPTO_set_locking_callback.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt CRYPTO_SET_LOCKING_CALLBACK 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/DES_set_key.3 b/src/lib/libcrypto/man/DES_set_key.3
index 9c33bf29e6..1e4de6255f 100644
--- a/src/lib/libcrypto/man/DES_set_key.3
+++ b/src/lib/libcrypto/man/DES_set_key.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DES_set_key.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DES_SET_KEY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/DH_generate_key.3 b/src/lib/libcrypto/man/DH_generate_key.3
index 6e2edbadb3..94fe00823e 100644
--- a/src/lib/libcrypto/man/DH_generate_key.3
+++ b/src/lib/libcrypto/man/DH_generate_key.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DH_generate_key.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DH_GENERATE_KEY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/DH_generate_parameters.3 b/src/lib/libcrypto/man/DH_generate_parameters.3
index 431ffd634c..b092ad0263 100644
--- a/src/lib/libcrypto/man/DH_generate_parameters.3
+++ b/src/lib/libcrypto/man/DH_generate_parameters.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DH_generate_parameters.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DH_GENERATE_PARAMETERS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/DH_get_ex_new_index.3 b/src/lib/libcrypto/man/DH_get_ex_new_index.3
index c93efa73d6..ccc5b6dc95 100644
--- a/src/lib/libcrypto/man/DH_get_ex_new_index.3
+++ b/src/lib/libcrypto/man/DH_get_ex_new_index.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DH_get_ex_new_index.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DH_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/DH_new.3 b/src/lib/libcrypto/man/DH_new.3
index 46b1570765..272e7bbdd6 100644
--- a/src/lib/libcrypto/man/DH_new.3
+++ b/src/lib/libcrypto/man/DH_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DH_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DH_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/DH_set_method.3 b/src/lib/libcrypto/man/DH_set_method.3
index 86dae1728c..93cdf5576d 100644
--- a/src/lib/libcrypto/man/DH_set_method.3
+++ b/src/lib/libcrypto/man/DH_set_method.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DH_set_method.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DH_SET_METHOD 3
 .Os
 .Sh NAME
@@ -88,7 +90,7 @@ It is possible to have
 .Vt DH
 keys that only work with certain
 .Vt DH_METHOD
-implementations (eg. from an
+implementations (e.g. from an
 .Vt ENGINE
 module that supports embedded hardware-protected keys),
 and in such cases attempting to change the
@@ -208,7 +210,7 @@ DH API without requiring changing these function prototypes.
 As of version 0.9.7,
 .Vt DH_METHOD
 implementations are grouped together with other algorithmic APIs
-(eg. RSA_METHOD, EVP_CIPHER, etc) in
+(e.g. RSA_METHOD, EVP_CIPHER) in
 .Vt ENGINE
 modules.
 If a default
@@ -216,7 +218,7 @@ If a default
 is specified for DH functionality using an
 .Xr engine 3
 API function, that will override any DH defaults set using the DH API
-.Pq ie. Fn DH_set_default_method .
+.Pq i.e. Fn DH_set_default_method .
 For this reason, the
 .Xr engine 3
 API is the recommended way to control default implementations
diff --git a/src/lib/libcrypto/man/DH_size.3 b/src/lib/libcrypto/man/DH_size.3
index 3675f7b12b..251860aa4a 100644
--- a/src/lib/libcrypto/man/DH_size.3
+++ b/src/lib/libcrypto/man/DH_size.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DH_size.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DH_SIZE 3
 .Os
 .Sh NAME
@@ -19,7 +21,7 @@ shared secret computed by
 .Fa dh->p
 must not be
 .Dv NULL .
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 The size in bytes.
 .Sh SEE ALSO
 .Xr dh 3 ,
diff --git a/src/lib/libcrypto/man/DSA_SIG_new.3 b/src/lib/libcrypto/man/DSA_SIG_new.3
index 32d21fb782..2a424cf3d9 100644
--- a/src/lib/libcrypto/man/DSA_SIG_new.3
+++ b/src/lib/libcrypto/man/DSA_SIG_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DSA_SIG_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DSA_SIG_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/DSA_do_sign.3 b/src/lib/libcrypto/man/DSA_do_sign.3
index c61ff925bb..552699cb35 100644
--- a/src/lib/libcrypto/man/DSA_do_sign.3
+++ b/src/lib/libcrypto/man/DSA_do_sign.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DSA_do_sign.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DSA_DO_SIGN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/DSA_dup_DH.3 b/src/lib/libcrypto/man/DSA_dup_DH.3
index c8b7ec60ab..f2005202b0 100644
--- a/src/lib/libcrypto/man/DSA_dup_DH.3
+++ b/src/lib/libcrypto/man/DSA_dup_DH.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DSA_dup_DH.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DSA_DUP_DH 3
 .Os
 .Sh NAME
@@ -21,7 +23,7 @@ parameters/keys.
 is lost during that conversion, but the resulting
 .Vt DH
 parameters contain its length.
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 .Fn DSA_dup_DH
 returns the new
 .Vt DH
diff --git a/src/lib/libcrypto/man/DSA_generate_key.3 b/src/lib/libcrypto/man/DSA_generate_key.3
index cf0872463f..4138bf547f 100644
--- a/src/lib/libcrypto/man/DSA_generate_key.3
+++ b/src/lib/libcrypto/man/DSA_generate_key.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DSA_generate_key.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DSA_GENERATE_KEY 3
 .Os
 .Sh NAME
@@ -19,7 +21,7 @@ It generates a new key pair and stores it in
 .Fa a->pub_key
 and
 .Fa a->priv_key .
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 .Fn DSA_generate_key
 returns 1 on success or 0 otherwise.
 The error codes can be obtained by
diff --git a/src/lib/libcrypto/man/DSA_generate_parameters.3 b/src/lib/libcrypto/man/DSA_generate_parameters.3
index 1acb85e77a..cd68411eec 100644
--- a/src/lib/libcrypto/man/DSA_generate_parameters.3
+++ b/src/lib/libcrypto/man/DSA_generate_parameters.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DSA_generate_parameters.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DSA_GENERATE_PARAMETERS 3
 .Os
 .Sh NAME
@@ -132,7 +134,7 @@ based approach.
 Refer to
 .Xr BN_generate_prime 3
 for further information.
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 .Fn DSA_generate_parameters_ex
 returns a 1 on success, or 0 otherwise.
 .Pp
diff --git a/src/lib/libcrypto/man/DSA_get_ex_new_index.3 b/src/lib/libcrypto/man/DSA_get_ex_new_index.3
index da2a6ae7aa..ab408d4109 100644
--- a/src/lib/libcrypto/man/DSA_get_ex_new_index.3
+++ b/src/lib/libcrypto/man/DSA_get_ex_new_index.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DSA_get_ex_new_index.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DSA_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/DSA_new.3 b/src/lib/libcrypto/man/DSA_new.3
index 0e8e87deed..50670f5098 100644
--- a/src/lib/libcrypto/man/DSA_new.3
+++ b/src/lib/libcrypto/man/DSA_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DSA_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DSA_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/DSA_set_method.3 b/src/lib/libcrypto/man/DSA_set_method.3
index 2ba34ddf94..f7c16492ff 100644
--- a/src/lib/libcrypto/man/DSA_set_method.3
+++ b/src/lib/libcrypto/man/DSA_set_method.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DSA_set_method.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DSA_SET_METHOD 3
 .Os
 .Sh NAME
@@ -80,7 +82,7 @@ the handle to that
 will be released during the change.
 It is possible to have DSA keys that only work with certain
 .Vt DSA_METHOD
-implementations (eg. from an
+implementations (e.g. from an
 .Vt ENGINE
 module that supports embedded hardware-protected keys),
 and in such cases attempting to change the
@@ -209,7 +211,7 @@ API now transparently overrides the behaviour of defaults in the
 DSA API without requiring changing these function prototypes.
 .Sh CAVEATS
 As of version 0.9.7, DSA_METHOD implementations are grouped together
-with other algorithmic APIs (eg. RSA_METHOD, EVP_CIPHER, etc) in
+with other algorithmic APIs (e.g. RSA_METHOD, EVP_CIPHER) in
 .Vt ENGINE
 modules.
 If a default
@@ -217,7 +219,7 @@ If a default
 is specified for DSA functionality using an
 .Xr engine 3
 API function, that will override any DSA defaults set using the DSA API
-.Pq ie. DSA_set_default_method .
+.Pq i.e. DSA_set_default_method .
 For this reason, the
 .Xr engine 3
 API is the recommended way to control default implementations for
diff --git a/src/lib/libcrypto/man/DSA_sign.3 b/src/lib/libcrypto/man/DSA_sign.3
index 371f1f4555..9682f8d54b 100644
--- a/src/lib/libcrypto/man/DSA_sign.3
+++ b/src/lib/libcrypto/man/DSA_sign.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DSA_sign.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DSA_SIGN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/DSA_size.3 b/src/lib/libcrypto/man/DSA_size.3
index 64dce38f7c..c12c7dd598 100644
--- a/src/lib/libcrypto/man/DSA_size.3
+++ b/src/lib/libcrypto/man/DSA_size.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: DSA_size.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DSA_SIZE 3
 .Os
 .Sh NAME
@@ -19,7 +21,7 @@ signature.
 .Fa dsa->q
 must not be
 .Dv NULL .
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 The size in bytes.
 .Sh SEE ALSO
 .Xr dsa 3 ,
diff --git a/src/lib/libcrypto/man/ECDSA_SIG_new.3 b/src/lib/libcrypto/man/ECDSA_SIG_new.3
index 422ccdeb42..cc5bcd8d3a 100644
--- a/src/lib/libcrypto/man/ECDSA_SIG_new.3
+++ b/src/lib/libcrypto/man/ECDSA_SIG_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 12 2015 $
+.\"     $OpenBSD: ECDSA_SIG_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ECDSA_SIG_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EC_GFp_simple_method.3 b/src/lib/libcrypto/man/EC_GFp_simple_method.3
index 8f401e85c8..c8c5e9883f 100644
--- a/src/lib/libcrypto/man/EC_GFp_simple_method.3
+++ b/src/lib/libcrypto/man/EC_GFp_simple_method.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: EC_GFp_simple_method.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EC_GFP_SIMPLE_METHOD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EC_GROUP_copy.3 b/src/lib/libcrypto/man/EC_GROUP_copy.3
index 61c094700a..25ef67344d 100644
--- a/src/lib/libcrypto/man/EC_GROUP_copy.3
+++ b/src/lib/libcrypto/man/EC_GROUP_copy.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: EC_GROUP_copy.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EC_GROUP_COPY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EC_GROUP_new.3 b/src/lib/libcrypto/man/EC_GROUP_new.3
index 00690dfc07..6534e8fc99 100644
--- a/src/lib/libcrypto/man/EC_GROUP_new.3
+++ b/src/lib/libcrypto/man/EC_GROUP_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: EC_GROUP_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EC_GROUP_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EC_KEY_new.3 b/src/lib/libcrypto/man/EC_KEY_new.3
index dcc55fa973..b977323e29 100644
--- a/src/lib/libcrypto/man/EC_KEY_new.3
+++ b/src/lib/libcrypto/man/EC_KEY_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: EC_KEY_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EC_KEY_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EC_POINT_add.3 b/src/lib/libcrypto/man/EC_POINT_add.3
index b8e3290952..e432dd5757 100644
--- a/src/lib/libcrypto/man/EC_POINT_add.3
+++ b/src/lib/libcrypto/man/EC_POINT_add.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: EC_POINT_add.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EC_POINT_ADD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EC_POINT_new.3 b/src/lib/libcrypto/man/EC_POINT_new.3
index cd0dcaf986..7ece11bb6a 100644
--- a/src/lib/libcrypto/man/EC_POINT_new.3
+++ b/src/lib/libcrypto/man/EC_POINT_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: EC_POINT_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EC_POINT_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ERR.3 b/src/lib/libcrypto/man/ERR.3
index 2c9a4479f7..94e38b1645 100644
--- a/src/lib/libcrypto/man/ERR.3
+++ b/src/lib/libcrypto/man/ERR.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: ERR.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ERR 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ERR_GET_LIB.3 b/src/lib/libcrypto/man/ERR_GET_LIB.3
index 9b50ce39e6..ec569f6be2 100644
--- a/src/lib/libcrypto/man/ERR_GET_LIB.3
+++ b/src/lib/libcrypto/man/ERR_GET_LIB.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: ERR_GET_LIB.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ERR_GET_LIB 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ERR_clear_error.3 b/src/lib/libcrypto/man/ERR_clear_error.3
index f5beb14b10..ed0c345b6e 100644
--- a/src/lib/libcrypto/man/ERR_clear_error.3
+++ b/src/lib/libcrypto/man/ERR_clear_error.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: ERR_clear_error.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ERR_CLEAR_ERROR 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ERR_error_string.3 b/src/lib/libcrypto/man/ERR_error_string.3
index 75878d233e..e516fa2703 100644
--- a/src/lib/libcrypto/man/ERR_error_string.3
+++ b/src/lib/libcrypto/man/ERR_error_string.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: ERR_error_string.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ERR_ERROR_STRING 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ERR_get_error.3 b/src/lib/libcrypto/man/ERR_get_error.3
index 8b11f792c1..de526a9cde 100644
--- a/src/lib/libcrypto/man/ERR_get_error.3
+++ b/src/lib/libcrypto/man/ERR_get_error.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: ERR_get_error.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ERR_GET_ERROR 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ERR_load_crypto_strings.3 b/src/lib/libcrypto/man/ERR_load_crypto_strings.3
index 7d14b1e572..51ee650b0c 100644
--- a/src/lib/libcrypto/man/ERR_load_crypto_strings.3
+++ b/src/lib/libcrypto/man/ERR_load_crypto_strings.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: ERR_load_crypto_strings.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ERR_LOAD_CRYPTO_STRINGS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ERR_load_strings.3 b/src/lib/libcrypto/man/ERR_load_strings.3
index 691a4067d3..780d0869fa 100644
--- a/src/lib/libcrypto/man/ERR_load_strings.3
+++ b/src/lib/libcrypto/man/ERR_load_strings.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: ERR_load_strings.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ERR_LOAD_STRINGS 3
 .Os
 .Sh NAME
@@ -49,16 +51,15 @@ The last entry in the array is
 .Pp
 .Fn ERR_get_next_error_library
 can be used to assign library numbers to user libraries at runtime.
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 .Fn ERR_PACK
 returns the error code.
 .Fn ERR_get_next_error_library
 returns a new library number.
 .Sh SEE ALSO
-.Xr ERR 3 ,
+.Xr ERR 3
-.Xr ERR_load_strings 3
 .Sh HISTORY
-.Xr ERR_load_error_strings 3
+.Fn ERR_load_error_strings
 and
 .Fn ERR_PACK
 are available in all versions of SSLeay and OpenSSL.
diff --git a/src/lib/libcrypto/man/ERR_print_errors.3 b/src/lib/libcrypto/man/ERR_print_errors.3
index 1fc80d93f7..74b4442b1a 100644
--- a/src/lib/libcrypto/man/ERR_print_errors.3
+++ b/src/lib/libcrypto/man/ERR_print_errors.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: ERR_print_errors.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ERR_PRINT_ERRORS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ERR_put_error.3 b/src/lib/libcrypto/man/ERR_put_error.3
index 703b74d713..0b0a458b8d 100644
--- a/src/lib/libcrypto/man/ERR_put_error.3
+++ b/src/lib/libcrypto/man/ERR_put_error.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: ERR_put_error.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ERR_PUT_ERROR 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/ERR_remove_state.3 b/src/lib/libcrypto/man/ERR_remove_state.3
index c15779edfc..faa1aa227f 100644
--- a/src/lib/libcrypto/man/ERR_remove_state.3
+++ b/src/lib/libcrypto/man/ERR_remove_state.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: ERR_remove_state.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ERR_REMOVE_STATE 3
 .Os
 .Sh NAME
@@ -41,7 +43,7 @@ Calling
 .Fn ERR_remove_state
 is equivalent to
 .Fn ERR_remove_thread_state NULL .
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 .Fn ERR_remove_thread_state
 and
 .Fn ERR_remove_state
diff --git a/src/lib/libcrypto/man/ERR_set_mark.3 b/src/lib/libcrypto/man/ERR_set_mark.3
index e268271418..478ca08962 100644
--- a/src/lib/libcrypto/man/ERR_set_mark.3
+++ b/src/lib/libcrypto/man/ERR_set_mark.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 2 2016 $
+.\"     $OpenBSD: ERR_set_mark.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ERR_SET_MARK 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_BytesToKey.3 b/src/lib/libcrypto/man/EVP_BytesToKey.3
index 45a3d9bf33..ad277b8882 100644
--- a/src/lib/libcrypto/man/EVP_BytesToKey.3
+++ b/src/lib/libcrypto/man/EVP_BytesToKey.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_BytesToKey.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_BYTESTOKEY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_DigestInit.3 b/src/lib/libcrypto/man/EVP_DigestInit.3
index 9bcf79241c..f9be8ef75b 100644
--- a/src/lib/libcrypto/man/EVP_DigestInit.3
+++ b/src/lib/libcrypto/man/EVP_DigestInit.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_DigestInit.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_DIGESTINIT 3
 .Os
 .Sh NAME
@@ -505,7 +507,7 @@ were added in OpenSSL 0.9.7.
 .Fn EVP_dss1 ,
 and
 .Fn EVP_ripemd160
-were changed to return truely const
+were changed to return truly const
 .Vt EVP_MD
 pointers in OpenSSL 0.9.7.
 .Pp
diff --git a/src/lib/libcrypto/man/EVP_DigestSignInit.3 b/src/lib/libcrypto/man/EVP_DigestSignInit.3
index 89a2d7afbd..98a5f16b21 100644
--- a/src/lib/libcrypto/man/EVP_DigestSignInit.3
+++ b/src/lib/libcrypto/man/EVP_DigestSignInit.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_DigestSignInit.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_DIGESTSIGNINIT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_DigestVerifyInit.3 b/src/lib/libcrypto/man/EVP_DigestVerifyInit.3
index 0b26eb617e..d0e777faed 100644
--- a/src/lib/libcrypto/man/EVP_DigestVerifyInit.3
+++ b/src/lib/libcrypto/man/EVP_DigestVerifyInit.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_DigestVerifyInit.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_DIGESTVERIFYINIT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_EncryptInit.3 b/src/lib/libcrypto/man/EVP_EncryptInit.3
index 44967f863f..e786468550 100644
--- a/src/lib/libcrypto/man/EVP_EncryptInit.3
+++ b/src/lib/libcrypto/man/EVP_EncryptInit.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_EncryptInit.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_ENCRYPTINIT 3
 .Os
 .Sh NAME
@@ -489,7 +491,8 @@ and
 return the type of the passed cipher or context.
 This "type" is the actual NID of the cipher OBJECT IDENTIFIER as such it
 ignores the cipher parameters and 40 bit RC2 and 128 bit RC2 have the
-same NID. If the cipher does not have an object identifier or does not
+same NID.
+If the cipher does not have an object identifier or does not
 have ASN1 support this function will return
 .Dv NID_undef .
 .Pp
diff --git a/src/lib/libcrypto/man/EVP_OpenInit.3 b/src/lib/libcrypto/man/EVP_OpenInit.3
index 92873ac453..092053c6af 100644
--- a/src/lib/libcrypto/man/EVP_OpenInit.3
+++ b/src/lib/libcrypto/man/EVP_OpenInit.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_OpenInit.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_OPENINIT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 b/src/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
index 5b1b94653a..1b346607d1 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_CTX_ctrl.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_CTX_CTRL 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_CTX_new.3 b/src/lib/libcrypto/man/EVP_PKEY_CTX_new.3
index c08db1eb21..03439d6658 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_CTX_new.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_CTX_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_CTX_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_CTX_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_cmp.3 b/src/lib/libcrypto/man/EVP_PKEY_cmp.3
index a3c3ba4fec..2e366402ca 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_cmp.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_cmp.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_cmp.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_CMP 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_decrypt.3 b/src/lib/libcrypto/man/EVP_PKEY_decrypt.3
index 28c343838d..f8d29fbef2 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_decrypt.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_decrypt.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_decrypt.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_DECRYPT 3
 .Os
 .Sh NAME
@@ -71,7 +73,7 @@ and
 return 1 for success and 0 or a negative value for failure.
 In particular, a return value of -2 indicates the operation is not
 supported by the public key algorithm.
-.Sh EXAMPLE
+.Sh EXAMPLES
 Decrypt data using OAEP (for RSA keys):
 .Bd -literal
 #include <openssl/evp.h>
diff --git a/src/lib/libcrypto/man/EVP_PKEY_derive.3 b/src/lib/libcrypto/man/EVP_PKEY_derive.3
index e67280cf20..e29587be7e 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_derive.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_derive.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_derive.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_DERIVE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_encrypt.3 b/src/lib/libcrypto/man/EVP_PKEY_encrypt.3
index bda37ef160..8edd53745d 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_encrypt.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_encrypt.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_encrypt.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_ENCRYPT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 b/src/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
index 2266adadf3..38546b964d 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_get_default_digest.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_GET_DEFAULT_DIGEST 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_keygen.3 b/src/lib/libcrypto/man/EVP_PKEY_keygen.3
index 8a5c7be0c6..c464924384 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_keygen.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_keygen.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_keygen.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_KEYGEN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_new.3 b/src/lib/libcrypto/man/EVP_PKEY_new.3
index 155ca9ad24..92610bb2b3 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_new.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_print_private.3 b/src/lib/libcrypto/man/EVP_PKEY_print_private.3
index d1f627c6a0..a271835f9c 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_print_private.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_print_private.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_print_private.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_PRINT_PRIVATE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 b/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
index 986918dc2f..4caadfb2a4 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_SET1_RSA 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_sign.3 b/src/lib/libcrypto/man/EVP_PKEY_sign.3
index f8e4da7a9d..8ed1432618 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_sign.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_sign.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_sign.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_SIGN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_verify.3 b/src/lib/libcrypto/man/EVP_PKEY_verify.3
index bec3283349..faf2dca1f6 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_verify.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_verify.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_PKEY_verify.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_VERIFY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_PKEY_verify_recover.3 b/src/lib/libcrypto/man/EVP_PKEY_verify_recover.3
index ab195ce502..d1cedadef4 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_verify_recover.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_verify_recover.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: EVP_PKEY_verify_recover.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_PKEY_VERIFY_RECOVER 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_SealInit.3 b/src/lib/libcrypto/man/EVP_SealInit.3
index 9511111486..32e7c0b35e 100644
--- a/src/lib/libcrypto/man/EVP_SealInit.3
+++ b/src/lib/libcrypto/man/EVP_SealInit.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_SealInit.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_SEALINIT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_SignInit.3 b/src/lib/libcrypto/man/EVP_SignInit.3
index 22f81148a2..c18b074b6d 100644
--- a/src/lib/libcrypto/man/EVP_SignInit.3
+++ b/src/lib/libcrypto/man/EVP_SignInit.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_SignInit.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_SIGNINIT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/EVP_VerifyInit.3 b/src/lib/libcrypto/man/EVP_VerifyInit.3
index b1635d4cac..cec803136e 100644
--- a/src/lib/libcrypto/man/EVP_VerifyInit.3
+++ b/src/lib/libcrypto/man/EVP_VerifyInit.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: EVP_VerifyInit.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP_VERIFYINIT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/HMAC.3 b/src/lib/libcrypto/man/HMAC.3
index 577070afb0..fc82e77563 100644
--- a/src/lib/libcrypto/man/HMAC.3
+++ b/src/lib/libcrypto/man/HMAC.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: HMAC.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt HMAC 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/MD5.3 b/src/lib/libcrypto/man/MD5.3
index b0053c1acd..305af8053e 100644
--- a/src/lib/libcrypto/man/MD5.3
+++ b/src/lib/libcrypto/man/MD5.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: MD5.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt MD5 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/OBJ_nid2obj.3 b/src/lib/libcrypto/man/OBJ_nid2obj.3
index 5634d8ea4a..b4149a73aa 100644
--- a/src/lib/libcrypto/man/OBJ_nid2obj.3
+++ b/src/lib/libcrypto/man/OBJ_nid2obj.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: OBJ_nid2obj.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt OBJ_NID2OBJ 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 b/src/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
index 660a964427..a24b3ddb95 100644
--- a/src/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
+++ b/src/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: OPENSSL_VERSION_NUMBER.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt OPENSSL_VERSION_NUMBER 3
 .Os
 .Sh NAME
@@ -81,7 +83,7 @@ The "OPENSSLDIR" setting of the library build in the form "OPENSSLDIR:
 For an unknown
 .Fa t ,
 the text "not available" is returned.
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 The version number.
 .Sh SEE ALSO
 .Xr crypto 3
diff --git a/src/lib/libcrypto/man/OPENSSL_config.3 b/src/lib/libcrypto/man/OPENSSL_config.3
index a944ba7b4e..e2e277d129 100644
--- a/src/lib/libcrypto/man/OPENSSL_config.3
+++ b/src/lib/libcrypto/man/OPENSSL_config.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: OPENSSL_config.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt OPENSSL_CONFIG 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 b/src/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
index 2a107ab7c4..f56d5e8c9d 100644
--- a/src/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
+++ b/src/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: OPENSSL_load_builtin_modules.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt OPENSSL_LOAD_BUILTIN_MODULES 3
 .Os
 .Sh NAME
@@ -45,7 +47,7 @@ Applications should call
 to load all configuration modules instead of adding modules selectively:
 otherwise functionality may be missing from the application when
 new modules are added.
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 None of the functions return a value.
 .Sh SEE ALSO
 .Xr OPENSSL_config 3
diff --git a/src/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 b/src/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
index b6e93a939e..26910d45b0 100644
--- a/src/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
+++ b/src/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: OpenSSL_add_all_algorithms.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt OPENSSL_ADD_ALL_ALGORITHMS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 b/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
index 7dcea6dbe1..8532ef1b27 100644
--- a/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
+++ b/src/lib/libcrypto/man/PEM_read_bio_PrivateKey.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: PEM_read_bio_PrivateKey.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt PEM_READ_BIO_PRIVATEKEY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 b/src/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
index 12d556558d..12d3d781eb 100644
--- a/src/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
+++ b/src/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: PEM_write_bio_PKCS7_stream.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt PEM_WRITE_BIO_PKCS7_STREAM 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/PKCS12_create.3 b/src/lib/libcrypto/man/PKCS12_create.3
index 0a7f0c2ab5..f638fbf82e 100644
--- a/src/lib/libcrypto/man/PKCS12_create.3
+++ b/src/lib/libcrypto/man/PKCS12_create.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: PKCS12_create.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt PKCS12_CREATE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/PKCS12_parse.3 b/src/lib/libcrypto/man/PKCS12_parse.3
index 6930bdf339..69786d49c0 100644
--- a/src/lib/libcrypto/man/PKCS12_parse.3
+++ b/src/lib/libcrypto/man/PKCS12_parse.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: PKCS12_parse.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt PKCS12_PARSE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/PKCS5_PBKDF2_HMAC.3 b/src/lib/libcrypto/man/PKCS5_PBKDF2_HMAC.3
index 333e45250e..6ab6f30b9e 100644
--- a/src/lib/libcrypto/man/PKCS5_PBKDF2_HMAC.3
+++ b/src/lib/libcrypto/man/PKCS5_PBKDF2_HMAC.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: PKCS5_PBKDF2_HMAC.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt PKCS5_PBKDF2_HMAC 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/PKCS7_decrypt.3 b/src/lib/libcrypto/man/PKCS7_decrypt.3
index efc8454dde..fa006af0ad 100644
--- a/src/lib/libcrypto/man/PKCS7_decrypt.3
+++ b/src/lib/libcrypto/man/PKCS7_decrypt.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: PKCS7_decrypt.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt PKCS7_DECRYPT 3
 .Os
 .Sh NAME
@@ -66,4 +68,4 @@ The lack of single pass processing and need to hold all data in memory
 as mentioned in
 .Xr PKCS7_sign 3
 also applies to
-.Xr PKCS7_decrypt 3 .
+.Fn PKCS7_decrypt .
diff --git a/src/lib/libcrypto/man/PKCS7_encrypt.3 b/src/lib/libcrypto/man/PKCS7_encrypt.3
index 860a9181b8..1ab99c917c 100644
--- a/src/lib/libcrypto/man/PKCS7_encrypt.3
+++ b/src/lib/libcrypto/man/PKCS7_encrypt.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: PKCS7_encrypt.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt PKCS7_ENCRYPT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/PKCS7_sign.3 b/src/lib/libcrypto/man/PKCS7_sign.3
index 894472402d..6dfdde2616 100644
--- a/src/lib/libcrypto/man/PKCS7_sign.3
+++ b/src/lib/libcrypto/man/PKCS7_sign.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: PKCS7_sign.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt PKCS7_SIGN 3
 .Os
 .Sh NAME
@@ -143,7 +145,7 @@ if the
 .Dv PKCS7_PARTIAL
 flag is set.
 One or more signers can be added using the function
-.Xr PKCS7_sign_add_signer 3.
+.Xr PKCS7_sign_add_signer 3 .
 .Xr PKCS7_final 3
 must also be called to finalize the structure if streaming is not
 enabled.
diff --git a/src/lib/libcrypto/man/PKCS7_sign_add_signer.3 b/src/lib/libcrypto/man/PKCS7_sign_add_signer.3
index b20b6b91e6..9ec6a54818 100644
--- a/src/lib/libcrypto/man/PKCS7_sign_add_signer.3
+++ b/src/lib/libcrypto/man/PKCS7_sign_add_signer.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: PKCS7_sign_add_signer.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt PKCS7_SIGN_ADD_SIGNER 3
 .Os
 .Sh NAME
@@ -124,5 +126,5 @@ if an error occurs.
 .Xr PKCS7_final 3 ,
 .Xr PKCS7_sign 3
 .Sh HISTORY
-.Xr PKCS7_sign_add_signer 3
+.Fn PKCS7_sign_add_signer
 was added to OpenSSL 1.0.0.
diff --git a/src/lib/libcrypto/man/PKCS7_verify.3 b/src/lib/libcrypto/man/PKCS7_verify.3
index 3cc6cbac66..11439915bd 100644
--- a/src/lib/libcrypto/man/PKCS7_verify.3
+++ b/src/lib/libcrypto/man/PKCS7_verify.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: PKCS7_verify.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt PKCS7_VERIFY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RAND_add.3 b/src/lib/libcrypto/man/RAND_add.3
index 31b61a6386..54a2328bb4 100644
--- a/src/lib/libcrypto/man/RAND_add.3
+++ b/src/lib/libcrypto/man/RAND_add.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: RAND_add.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RAND_ADD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RAND_bytes.3 b/src/lib/libcrypto/man/RAND_bytes.3
index 41f0950fe3..8c17454548 100644
--- a/src/lib/libcrypto/man/RAND_bytes.3
+++ b/src/lib/libcrypto/man/RAND_bytes.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: RAND_bytes.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RAND_BYTES 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RAND_cleanup.3 b/src/lib/libcrypto/man/RAND_cleanup.3
index 00ee14b371..8c57e09fc7 100644
--- a/src/lib/libcrypto/man/RAND_cleanup.3
+++ b/src/lib/libcrypto/man/RAND_cleanup.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: RAND_cleanup.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RAND_CLEANUP 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RAND_load_file.3 b/src/lib/libcrypto/man/RAND_load_file.3
index fb521a8e9c..003196b59f 100644
--- a/src/lib/libcrypto/man/RAND_load_file.3
+++ b/src/lib/libcrypto/man/RAND_load_file.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: RAND_load_file.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RAND_LOAD_FILE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RAND_set_rand_method.3 b/src/lib/libcrypto/man/RAND_set_rand_method.3
index 7efdeefd41..cb5675d4aa 100644
--- a/src/lib/libcrypto/man/RAND_set_rand_method.3
+++ b/src/lib/libcrypto/man/RAND_set_rand_method.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: RAND_set_rand_method.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RAND_SET_RAND_METHOD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RC4.3 b/src/lib/libcrypto/man/RC4.3
index 2c631c36be..60df7792cb 100644
--- a/src/lib/libcrypto/man/RC4.3
+++ b/src/lib/libcrypto/man/RC4.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: RC4.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RC4 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RIPEMD160.3 b/src/lib/libcrypto/man/RIPEMD160.3
index 57cff8a9e4..ac86f82ef6 100644
--- a/src/lib/libcrypto/man/RIPEMD160.3
+++ b/src/lib/libcrypto/man/RIPEMD160.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: RIPEMD160.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RIPEMD160 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RSA_blinding_on.3 b/src/lib/libcrypto/man/RSA_blinding_on.3
index a2d22c9093..05a1085b36 100644
--- a/src/lib/libcrypto/man/RSA_blinding_on.3
+++ b/src/lib/libcrypto/man/RSA_blinding_on.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_blinding_on.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_BLINDING_ON 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RSA_check_key.3 b/src/lib/libcrypto/man/RSA_check_key.3
index c57ed4b4db..cedebebf68 100644
--- a/src/lib/libcrypto/man/RSA_check_key.3
+++ b/src/lib/libcrypto/man/RSA_check_key.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_check_key.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_CHECK_KEY 3
 .Os
 .Sh NAME
@@ -63,7 +65,7 @@ If the
 in question is only being used for acceleration or analysis purposes,
 then in all likelihood the RSA key data is complete and untouched,
 but this can't be assumed in the general case.
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 .Fn RSA_check_key
 returns 1 if
 .Fa rsa
diff --git a/src/lib/libcrypto/man/RSA_generate_key.3 b/src/lib/libcrypto/man/RSA_generate_key.3
index a9e72c6594..d54185f6c0 100644
--- a/src/lib/libcrypto/man/RSA_generate_key.3
+++ b/src/lib/libcrypto/man/RSA_generate_key.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_generate_key.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_GENERATE_KEY 3
 .Os
 .Sh NAME
@@ -80,7 +82,7 @@ except it uses "old style" call backs.
 See
 .Xr BN_generate_prime 3
 for further details.
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 If key generation fails,
 .Fn RSA_generate_key
 returns
diff --git a/src/lib/libcrypto/man/RSA_get_ex_new_index.3 b/src/lib/libcrypto/man/RSA_get_ex_new_index.3
index b61084a18e..8dafe26ecc 100644
--- a/src/lib/libcrypto/man/RSA_get_ex_new_index.3
+++ b/src/lib/libcrypto/man/RSA_get_ex_new_index.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_get_ex_new_index.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RSA_new.3 b/src/lib/libcrypto/man/RSA_new.3
index b01c8cd089..b979c9fa04 100644
--- a/src/lib/libcrypto/man/RSA_new.3
+++ b/src/lib/libcrypto/man/RSA_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 b/src/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
index 7724f45970..07922a5f8d 100644
--- a/src/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
+++ b/src/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_padding_add_PKCS1_type_1.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_PADDING_ADD_PKCS1_TYPE_1 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RSA_print.3 b/src/lib/libcrypto/man/RSA_print.3
index 986dce2eb4..82ca0df1c4 100644
--- a/src/lib/libcrypto/man/RSA_print.3
+++ b/src/lib/libcrypto/man/RSA_print.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_print.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_PRINT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RSA_private_encrypt.3 b/src/lib/libcrypto/man/RSA_private_encrypt.3
index ff59e66f6a..ff7102a2bc 100644
--- a/src/lib/libcrypto/man/RSA_private_encrypt.3
+++ b/src/lib/libcrypto/man/RSA_private_encrypt.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_private_encrypt.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_PRIVATE_ENCRYPT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RSA_public_encrypt.3 b/src/lib/libcrypto/man/RSA_public_encrypt.3
index c2c81019c6..7ac330a14c 100644
--- a/src/lib/libcrypto/man/RSA_public_encrypt.3
+++ b/src/lib/libcrypto/man/RSA_public_encrypt.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_public_encrypt.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_PUBLIC_ENCRYPT 3
 .Os
 .Sh NAME
@@ -104,5 +106,6 @@ SSL, PKCS #1 v2.0
 The
 .Fa padding
 argument was added in SSLeay 0.8.
-.Dv RSA_NO_PADDING is available since SSLeay 0.9.0.
+.Dv RSA_NO_PADDING
+is available since SSLeay 0.9.0.
 OAEP was added in OpenSSL 0.9.2b.
diff --git a/src/lib/libcrypto/man/RSA_set_method.3 b/src/lib/libcrypto/man/RSA_set_method.3
index d7a2756b70..d296baf010 100644
--- a/src/lib/libcrypto/man/RSA_set_method.3
+++ b/src/lib/libcrypto/man/RSA_set_method.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_set_method.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_SET_METHOD 3
 .Os
 .Sh NAME
@@ -93,7 +95,7 @@ the handle to that
 will be released during the change.
 It is possible to have RSA keys that only work with certain
 .Vt RSA_METHOD
-implementations (eg. from an
+implementations (e.g. from an
 .Vt ENGINE
 module that supports embedded hardware-protected keys),
 and in such cases attempting to change the
@@ -296,7 +298,7 @@ RSA API without requiring changing these function prototypes.
 .Sh CAVEATS
 As of version 0.9.7,
 .Vt RSA_METHOD
-implementations are grouped together with other algorithmic APIs (eg.\&
+implementations are grouped together with other algorithmic APIs (e.g.\&
 .Vt DSA_METHOD ,
 .Vt EVP_CIPHER ,
 etc.) into
@@ -307,7 +309,7 @@ If a default
 is specified for RSA functionality using an
 .Xr engine 3
 API function, that will override any RSA defaults set using the RSA
-API, ie.\&
+API, i.e.\&
 .Fn RSA_set_default_method .
 For this reason, the
 .Xr engine 3
diff --git a/src/lib/libcrypto/man/RSA_sign.3 b/src/lib/libcrypto/man/RSA_sign.3
index 2b9e5eb6f1..afc24e6581 100644
--- a/src/lib/libcrypto/man/RSA_sign.3
+++ b/src/lib/libcrypto/man/RSA_sign.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_sign.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_SIGN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 b/src/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
index 7398a294c9..ea7801586d 100644
--- a/src/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
+++ b/src/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_sign_ASN1_OCTET_STRING.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_SIGN_ASN1_OCTET_STRING 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/RSA_size.3 b/src/lib/libcrypto/man/RSA_size.3
index 8b9a4d0552..b96d778b95 100644
--- a/src/lib/libcrypto/man/RSA_size.3
+++ b/src/lib/libcrypto/man/RSA_size.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: RSA_size.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt RSA_SIZE 3
 .Os
 .Sh NAME
@@ -18,7 +20,7 @@ encrypted value.
 .Fa rsa->n
 must not be
 .Dv NULL .
-.Sh RETURN VALUE
+.Sh RETURN VALUES
 The size in bytes.
 .Sh SEE ALSO
 .Xr rsa 3
diff --git a/src/lib/libcrypto/man/SHA1.3 b/src/lib/libcrypto/man/SHA1.3
index c873a8cbb7..48292c1e31 100644
--- a/src/lib/libcrypto/man/SHA1.3
+++ b/src/lib/libcrypto/man/SHA1.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: SHA1.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt SHA1 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/SMIME_read_PKCS7.3 b/src/lib/libcrypto/man/SMIME_read_PKCS7.3
index 2e7fcb514c..3c4f8ee3d3 100644
--- a/src/lib/libcrypto/man/SMIME_read_PKCS7.3
+++ b/src/lib/libcrypto/man/SMIME_read_PKCS7.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: SMIME_read_PKCS7.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt SMIME_READ_PKCS7 3
 .Os
 .Sh NAME
@@ -77,8 +79,7 @@ The error can be obtained from
 .Xr PKCS7_encrypt 3 ,
 .Xr PKCS7_sign 3 ,
 .Xr PKCS7_type 3 ,
-.Xr PKCS7_verify 3 ,
+.Xr PKCS7_verify 3
-.Xr SMIME_read_PKCS7 3
 .Sh HISTORY
 .Fn SMIME_read_PKCS7
 was added to OpenSSL 0.9.5.
diff --git a/src/lib/libcrypto/man/SMIME_write_PKCS7.3 b/src/lib/libcrypto/man/SMIME_write_PKCS7.3
index f4f465e2e4..8e4a0ccd75 100644
--- a/src/lib/libcrypto/man/SMIME_write_PKCS7.3
+++ b/src/lib/libcrypto/man/SMIME_write_PKCS7.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: SMIME_write_PKCS7.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt SMIME_WRITE_PKCS7 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/UI_new.3 b/src/lib/libcrypto/man/UI_new.3
index 9d0c518791..79078eb24c 100644
--- a/src/lib/libcrypto/man/UI_new.3
+++ b/src/lib/libcrypto/man/UI_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 24 2015 $
+.\"     $OpenBSD: UI_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt UI_NEW 3
 .Os
 .Sh NAME
@@ -182,7 +184,7 @@
 UI stands for User Interface, and is general purpose set of routines
 to prompt the user for text-based information.
 Through user-written methods (see
-.Xr ui_create 3 Ns ),
+.Xr ui_create 3 ) ,
 prompting can be done in any way imaginable, be it plain text prompting,
 through dialog boxes or from a cell phone.
 .Pp
@@ -295,7 +297,7 @@ With the builtin method, there's no technical difference between them.
 Other methods may make a difference between them, however.
 .Pp
 The flags currently supported are
-.Dv UI_INPUT_FLAG_ECHO,
+.Dv UI_INPUT_FLAG_ECHO ,
 which is relevant for
 .Fn UI_add_input_string
 and will have the users response be echoed (when prompting for a
diff --git a/src/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 b/src/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
index 97978ea542..eb0fedd9bb 100644
--- a/src/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
+++ b/src/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_NAME_ENTRY_get_object.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_NAME_ENTRY_GET_OBJECT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 b/src/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
index c77763cc68..b83ac6d478 100644
--- a/src/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
+++ b/src/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_NAME_add_entry_by_txt.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_NAME_ADD_ENTRY_BY_TXT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 b/src/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
index 4710fd1ec2..efd74f07e9 100644
--- a/src/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
+++ b/src/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_NAME_get_index_by_NID.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_NAME_GET_INDEX_BY_NID 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/X509_NAME_print_ex.3 b/src/lib/libcrypto/man/X509_NAME_print_ex.3
index ca5fc61e18..6692765c99 100644
--- a/src/lib/libcrypto/man/X509_NAME_print_ex.3
+++ b/src/lib/libcrypto/man/X509_NAME_print_ex.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_NAME_print_ex.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_NAME_PRINT_EX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/X509_STORE_CTX_get_error.3 b/src/lib/libcrypto/man/X509_STORE_CTX_get_error.3
index f31e438cde..85b7ac06f0 100644
--- a/src/lib/libcrypto/man/X509_STORE_CTX_get_error.3
+++ b/src/lib/libcrypto/man/X509_STORE_CTX_get_error.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_STORE_CTX_get_error.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_STORE_CTX_GET_ERROR 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 b/src/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
index 511933d4a1..5762f89ecc 100644
--- a/src/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
+++ b/src/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_STORE_CTX_get_ex_new_index.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_STORE_CTX_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/X509_STORE_CTX_new.3 b/src/lib/libcrypto/man/X509_STORE_CTX_new.3
index 6a4b9e3e53..ffb50b6564 100644
--- a/src/lib/libcrypto/man/X509_STORE_CTX_new.3
+++ b/src/lib/libcrypto/man/X509_STORE_CTX_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_STORE_CTX_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_STORE_CTX_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 b/src/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
index f588bd7d70..f9679e88ff 100644
--- a/src/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
+++ b/src/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_STORE_CTX_set_verify_cb.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_STORE_CTX_SET_VERIFY_CB 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 b/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
index 5db4313047..32a6d7c329 100644
--- a/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
+++ b/src/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_STORE_set_verify_cb_func.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_STORE_SET_VERIFY_CB_FUNC 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 b/src/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
index 66724ed169..43da66c6d1 100644
--- a/src/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
+++ b/src/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_VERIFY_PARAM_set_flags.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_VERIFY_PARAM_SET_FLAGS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/X509_new.3 b/src/lib/libcrypto/man/X509_new.3
index 26c46ae3a9..00343e1764 100644
--- a/src/lib/libcrypto/man/X509_new.3
+++ b/src/lib/libcrypto/man/X509_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/X509_verify_cert.3 b/src/lib/libcrypto/man/X509_verify_cert.3
index fd3d6bebda..fab813ffaa 100644
--- a/src/lib/libcrypto/man/X509_verify_cert.3
+++ b/src/lib/libcrypto/man/X509_verify_cert.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: X509_verify_cert.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509_VERIFY_CERT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/bn.3 b/src/lib/libcrypto/man/bn.3
index 51bf586a84..61ea3ee6fe 100644
--- a/src/lib/libcrypto/man/bn.3
+++ b/src/lib/libcrypto/man/bn.3
@@ -1,3 +1,5 @@
+.\"     $OpenBSD: bn.3,v 1.4 2016/11/06 15:52:50 jmc Exp $
+.\"
 .Dd $Mdocdate: November 6 2016 $
 .Dt BN 3
 .Os
diff --git a/src/lib/libcrypto/man/crypto.3 b/src/lib/libcrypto/man/crypto.3
index 3f2c8ca9dd..dde0f76d79 100644
--- a/src/lib/libcrypto/man/crypto.3
+++ b/src/lib/libcrypto/man/crypto.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: October 5 2016 $
+.\"     $OpenBSD: crypto.3,v 1.4 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt CRYPTO 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/d2i_ASN1_OBJECT.3 b/src/lib/libcrypto/man/d2i_ASN1_OBJECT.3
index 686101cff5..6e8ac20929 100644
--- a/src/lib/libcrypto/man/d2i_ASN1_OBJECT.3
+++ b/src/lib/libcrypto/man/d2i_ASN1_OBJECT.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: d2i_ASN1_OBJECT.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_ASN1_OBJECT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/d2i_DHparams.3 b/src/lib/libcrypto/man/d2i_DHparams.3
index 73aec0269b..e6c08b6415 100644
--- a/src/lib/libcrypto/man/d2i_DHparams.3
+++ b/src/lib/libcrypto/man/d2i_DHparams.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: d2i_DHparams.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_DHPARAMS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/d2i_DSAPublicKey.3 b/src/lib/libcrypto/man/d2i_DSAPublicKey.3
index aff5d0f814..3a87706514 100644
--- a/src/lib/libcrypto/man/d2i_DSAPublicKey.3
+++ b/src/lib/libcrypto/man/d2i_DSAPublicKey.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: d2i_DSAPublicKey.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_DSAPUBLICKEY 3
 .Os
 .Sh NAME
@@ -146,7 +148,7 @@ fields is encoded.
 .Pp
 The
 .Fn *_DSAPrivateKey
-functions also use a non-standard structure consisting consisting of a
+functions also use a non-standard structure consisting of a
 SEQUENCE containing the
 .Fa a->p ,
 .Fa a->q ,
diff --git a/src/lib/libcrypto/man/d2i_ECPKParameters.3 b/src/lib/libcrypto/man/d2i_ECPKParameters.3
index 71d84b95c9..29aaa184a3 100644
--- a/src/lib/libcrypto/man/d2i_ECPKParameters.3
+++ b/src/lib/libcrypto/man/d2i_ECPKParameters.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: d2i_ECPKParameters.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_ECPKPARAMETERS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
index 9eb5fadfab..0e6c2923ef 100644
--- a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
+++ b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 12 2015 $
+.\"     $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_PKCS8PRIVATEKEY_BIO 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/d2i_RSAPublicKey.3 b/src/lib/libcrypto/man/d2i_RSAPublicKey.3
index b54487a621..72530c7dac 100644
--- a/src/lib/libcrypto/man/d2i_RSAPublicKey.3
+++ b/src/lib/libcrypto/man/d2i_RSAPublicKey.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: d2i_RSAPublicKey.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_RSAPUBLICKEY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/d2i_X509.3 b/src/lib/libcrypto/man/d2i_X509.3
index 09c65afa58..899a801c44 100644
--- a/src/lib/libcrypto/man/d2i_X509.3
+++ b/src/lib/libcrypto/man/d2i_X509.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: d2i_X509.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_X509 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/d2i_X509_ALGOR.3 b/src/lib/libcrypto/man/d2i_X509_ALGOR.3
index e17678019b..93ff6a450b 100644
--- a/src/lib/libcrypto/man/d2i_X509_ALGOR.3
+++ b/src/lib/libcrypto/man/d2i_X509_ALGOR.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: d2i_X509_ALGOR.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_X509_ALGOR 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/d2i_X509_CRL.3 b/src/lib/libcrypto/man/d2i_X509_CRL.3
index e487da16d0..b42dc0338e 100644
--- a/src/lib/libcrypto/man/d2i_X509_CRL.3
+++ b/src/lib/libcrypto/man/d2i_X509_CRL.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: d2i_X509_CRL.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_X509_CRL 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/d2i_X509_NAME.3 b/src/lib/libcrypto/man/d2i_X509_NAME.3
index b145bf5b58..7687e8e7c5 100644
--- a/src/lib/libcrypto/man/d2i_X509_NAME.3
+++ b/src/lib/libcrypto/man/d2i_X509_NAME.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: d2i_X509_NAME.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_X509_NAME 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/d2i_X509_REQ.3 b/src/lib/libcrypto/man/d2i_X509_REQ.3
index c69cd00fb1..85bce67eeb 100644
--- a/src/lib/libcrypto/man/d2i_X509_REQ.3
+++ b/src/lib/libcrypto/man/d2i_X509_REQ.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: d2i_X509_REQ.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_X509_REQ 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/d2i_X509_SIG.3 b/src/lib/libcrypto/man/d2i_X509_SIG.3
index 5356dd67de..0f0163d0b2 100644
--- a/src/lib/libcrypto/man/d2i_X509_SIG.3
+++ b/src/lib/libcrypto/man/d2i_X509_SIG.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: d2i_X509_SIG.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt D2I_X509_SIG 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/des_read_pw.3 b/src/lib/libcrypto/man/des_read_pw.3
index 4b0bf2b52a..87410b3c52 100644
--- a/src/lib/libcrypto/man/des_read_pw.3
+++ b/src/lib/libcrypto/man/des_read_pw.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 15 2015 $
+.\"     $OpenBSD: des_read_pw.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DES_READ_PW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/dh.3 b/src/lib/libcrypto/man/dh.3
index 2a8f172e2b..6a790d3e6b 100644
--- a/src/lib/libcrypto/man/dh.3
+++ b/src/lib/libcrypto/man/dh.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: dh.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt DH 3
 .Os
 .Sh NAME
@@ -123,7 +125,7 @@ Note that DH keys may use non-standard
 implementations, either directly or by the use of
 .Vt ENGINE
 modules.
-In some cases (eg. an
+In some cases (e.g. an
 .Vt ENGINE
 providing support for hardware-embedded keys), these
 .Vt BIGNUM
diff --git a/src/lib/libcrypto/man/dsa.3 b/src/lib/libcrypto/man/dsa.3
index 102cf6e5e4..4e552df835 100644
--- a/src/lib/libcrypto/man/dsa.3
+++ b/src/lib/libcrypto/man/dsa.3
@@ -1,3 +1,5 @@
+.\"     $OpenBSD: dsa.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
 .Dd $Mdocdate: November 6 2016 $
 .Dt DSA 3
 .Os
@@ -39,7 +41,7 @@ Note that DSA keys may use non-standard
 implementations, either directly or by the use of
 .Vt ENGINE
 modules.
-In some cases (eg. an
+In some cases (e.g. an
 .Vt ENGINE
 providing support for hardware-embedded keys), these
 .Vt BIGNUM
diff --git a/src/lib/libcrypto/man/ec.3 b/src/lib/libcrypto/man/ec.3
index 3ecdd5dd8d..c48cc62410 100644
--- a/src/lib/libcrypto/man/ec.3
+++ b/src/lib/libcrypto/man/ec.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: ec.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EC 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/engine.3 b/src/lib/libcrypto/man/engine.3
index 3624fa76e4..7ecc5f3bb2 100644
--- a/src/lib/libcrypto/man/engine.3
+++ b/src/lib/libcrypto/man/engine.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: engine.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt ENGINE 3
 .Os
 .Sh NAME
@@ -511,7 +513,7 @@ Due to the modular nature of the
 .Nm engine
 API, pointers to
 .Vt ENGINE Ns s
-need to be treated as handles - ie. not only as pointers, but also
+need to be treated as handles - i.e. not only as pointers, but also
 as references to the underlying
 .Vt ENGINE
 object.
@@ -527,8 +529,8 @@ At the most basic level, each
 pointer is inherently a
 .Sy structural
 reference - a structural reference is required to use the pointer value
-at all, as this kind of reference is a guarantee that the structure can
+at all, as this kind of reference is a guarantee that the structure cannot
-not be deallocated until the reference is released.
+be deallocated until the reference is released.
 .Pp
 However, a structural reference provides no guarantee that the
 .Vt ENGINE
@@ -653,7 +655,7 @@ function.
 This returns zero if the
 .Vt ENGINE
 was not already operational and couldn't be successfully initialised
-(eg. lack of system drivers, no special hardware attached, etc.),
+(e.g. lack of system drivers, no special hardware attached),
 otherwise it will return non-zero to indicate that the
 .Vt ENGINE
 is now operational and will have allocated a new
@@ -665,7 +667,7 @@ All functional references are released by calling
 which removes the implicit structural reference as well.
 .Pp
 The second way to get a functional reference is by asking OpenSSL for a
-default implementation for a given task, eg.
+default implementation for a given task, e.g.
 by
 .Fn ENGINE_get_default_RSA ,
 .Fn ENGINE_get_default_cipher_engine ,
@@ -697,7 +699,7 @@ index.
 .Pp
 When a default
 .Vt ENGINE
-is requested for a given abstraction/algorithm/mode, (eg. when
+is requested for a given abstraction/algorithm/mode, (e.g. when
 calling
 .Fn RSA_new_method NULL ) ,
 a "get_default" call will be made to the
@@ -781,7 +783,7 @@ code at all.
 So the first consideration is whether any/all available
 .Vt ENGINE
 implementations should be made visible to OpenSSL.
-This is controlled by calling the various "load" functions, eg.
+This is controlled by calling the various "load" functions, e.g.
 .Fn ENGINE_load_builtin_engines
 to make all
 .Vt ENGINE
@@ -836,7 +838,7 @@ they want used if any is to be used at all.
 Others may prefer to load all support and have OpenSSL automatically use
 at run-time any
 .Vt ENGINE
-that is able to successfully initialised - ie. to assume that this
+that is able to successfully initialised - i.e. to assume that this
 corresponds to acceleration hardware attached to the machine or
 some such thing.
 There are probably numerous other ways in which applications may prefer
@@ -942,11 +944,11 @@ nothing at all specific to the host system) so that it can be
 initialised for use.
 This could include the path to any driver or config files it needs to
 load, required network addresses, smart-card identifiers, passwords to
-initialise protected devices, logging information, etc etc.
+initialise protected devices, logging information, etc.
 This class of commands typically needs to be passed to an
 .Vt ENGINE
 .Sy before
-attempting to initialise it, ie. before calling
+attempting to initialise it, i.e. before calling
 .Fn ENGINE_init .
 The other class of commands consist of settings or operations that tweak
 certain behaviour or cause certain operations to take place, and these
@@ -1049,7 +1051,7 @@ using a structural reference.
 Note that some control commands are defined by OpenSSL itself and it
 will intercept and handle these control commands on behalf of the
 .Vt ENGINE ,
-ie. the
+i.e. the
 .Vt ENGINE Ap s
 ctrl() handler is not used for the control command.
 .In openssl/engine.h
@@ -1160,7 +1162,7 @@ arbitrary type.
 These commands are supported in the discovery mechanisms simply allow
 applications to determine if an
 .Vt ENGINE
-supports certain specific commands it might want to use (eg.
+supports certain specific commands it might want to use (e.g.
 application "foo" might query various
 .Vt ENGINE Ns s
 to see if they implement "FOO_GET_VENDOR_LOGO_GIF" - and
@@ -1173,7 +1175,8 @@ The
 API and internal architecture is currently being reviewed.
 Slated for possible release in 0.9.8 is support for transparent loading
 of "dynamic"
-.Vt ENGINE Ns s (built as self-contained shared libraries).
+.Vt ENGINE Ns s
+(built as self-contained shared libraries).
 This would allow
 .Vt ENGINE
 implementations to be provided independently of
diff --git a/src/lib/libcrypto/man/evp.3 b/src/lib/libcrypto/man/evp.3
index 7bf7dfec81..832009f3a0 100644
--- a/src/lib/libcrypto/man/evp.3
+++ b/src/lib/libcrypto/man/evp.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: evp.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt EVP 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 b/src/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
index 755bf3eb86..04ec0bcc74 100644
--- a/src/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
+++ b/src/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 3 2016 $
+.\"     $OpenBSD: i2d_PKCS7_bio_stream.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt I2D_PKCS7_BIO_STREAM 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/lh_new.3 b/src/lib/libcrypto/man/lh_new.3
index 2779cf9202..6552446859 100644
--- a/src/lib/libcrypto/man/lh_new.3
+++ b/src/lib/libcrypto/man/lh_new.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 12 2015 $
+.\"     $OpenBSD: lh_new.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt LH_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/lh_stats.3 b/src/lib/libcrypto/man/lh_stats.3
index b56bb81979..a9d5f9e67b 100644
--- a/src/lib/libcrypto/man/lh_stats.3
+++ b/src/lib/libcrypto/man/lh_stats.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 5 2016 $
+.\"     $OpenBSD: lh_stats.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt LH_STATS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libcrypto/man/rsa.3 b/src/lib/libcrypto/man/rsa.3
index eea271e66d..528adb378b 100644
--- a/src/lib/libcrypto/man/rsa.3
+++ b/src/lib/libcrypto/man/rsa.3
@@ -1,3 +1,5 @@
+.\"     $OpenBSD: rsa.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\"
 .Dd $Mdocdate: November 6 2016 $
 .Dt RSA 3
 .Os
@@ -47,7 +49,7 @@ Note that RSA keys may use non-standard
 implementations, either directly or by the use of
 .Vt ENGINE
 modules.
-In some cases (eg. an
+In some cases (e.g. an
 .Vt ENGINE
 providing support for hardware-embedded keys), these
 .Vt BIGNUM
diff --git a/src/lib/libcrypto/man/x509.3 b/src/lib/libcrypto/man/x509.3
index 1f7b7f4128..02e31fcb26 100644
--- a/src/lib/libcrypto/man/x509.3
+++ b/src/lib/libcrypto/man/x509.3
@@ -1,4 +1,6 @@
-.Dd $Mdocdate: November 4 2016 $
+.\"     $OpenBSD: x509.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\"
+.Dd $Mdocdate: November 6 2016 $
 .Dt X509 3
 .Os
 .Sh NAME