add some openbsd tags, and a first pass at cleanup;

166 files changed, 708 insertions, 210 deletions

diff --git a/src/lib/libssl/doc/BIO_f_ssl.3 b/src/lib/libssl/doc/BIO_f_ssl.3
index 31c9963edb..851e4f08ca 100644
--- a/src/lib/libssl/doc/BIO_f_ssl.3
+++ b/src/lib/libssl/doc/BIO_f_ssl.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: BIO_f_ssl.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt BIO_F_SSL 3
 .Os
 .Sh NAME
@@ -268,7 +271,7 @@ processing.
 .Sh RETURN VALUES
 .\" XXX
 This section is incomplete.
-.Sh EXAMPLE
+.Sh EXAMPLES
 This SSL/TLS client example attempts to retrieve a page from an SSL/TLS web
 server.
 The I/O routines are identical to those of the unencrypted example in
diff --git a/src/lib/libssl/doc/SSL_CIPHER_get_name.3 b/src/lib/libssl/doc/SSL_CIPHER_get_name.3
index 0c6cccd1cc..ebc478f9c6 100644
--- a/src/lib/libssl/doc/SSL_CIPHER_get_name.3
+++ b/src/lib/libssl/doc/SSL_CIPHER_get_name.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CIPHER_get_name.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CIPHER_GET_NAME 3
 .Os
 .Sh NAME
@@ -172,7 +175,7 @@ A complete list can be retrieved by invoking the following command:
 .Pp
 .Dl $ openssl ciphers -v ALL
 .Sh SEE ALSO
-.Xr ciphers 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_get_ciphers 3 ,
 .Xr SSL_get_current_cipher 3
diff --git a/src/lib/libssl/doc/SSL_COMP_add_compression_method.3 b/src/lib/libssl/doc/SSL_COMP_add_compression_method.3
index c23d676930..d683574dd3 100644
--- a/src/lib/libssl/doc/SSL_COMP_add_compression_method.3
+++ b/src/lib/libssl/doc/SSL_COMP_add_compression_method.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_COMP_add_compression_method.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_COMP_ADD_COMPRESSION_METHOD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_add_extra_chain_cert.3 b/src/lib/libssl/doc/SSL_CTX_add_extra_chain_cert.3
index 2664c67a5a..c18d220643 100644
--- a/src/lib/libssl/doc/SSL_CTX_add_extra_chain_cert.3
+++ b/src/lib/libssl/doc/SSL_CTX_add_extra_chain_cert.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_add_extra_chain_cert.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_ADD_EXTRA_CHAIN_CERT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_add_session.3 b/src/lib/libssl/doc/SSL_CTX_add_session.3
index 74b4481496..073b919dc1 100644
--- a/src/lib/libssl/doc/SSL_CTX_add_session.3
+++ b/src/lib/libssl/doc/SSL_CTX_add_session.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_add_session.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_ADD_SESSION 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_ctrl.3 b/src/lib/libssl/doc/SSL_CTX_ctrl.3
index d0a4ffd554..a016845585 100644
--- a/src/lib/libssl/doc/SSL_CTX_ctrl.3
+++ b/src/lib/libssl/doc/SSL_CTX_ctrl.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_ctrl.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_CTRL 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_flush_sessions.3 b/src/lib/libssl/doc/SSL_CTX_flush_sessions.3
index 6431008c4f..9d3c52cdd5 100644
--- a/src/lib/libssl/doc/SSL_CTX_flush_sessions.3
+++ b/src/lib/libssl/doc/SSL_CTX_flush_sessions.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_flush_sessions.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_FLUSH_SESSIONS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_free.3 b/src/lib/libssl/doc/SSL_CTX_free.3
index 9cf5934303..0b2f7a8247 100644
--- a/src/lib/libssl/doc/SSL_CTX_free.3
+++ b/src/lib/libssl/doc/SSL_CTX_free.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_free.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_FREE 3
 .Os
 .Sh NAME
@@ -19,7 +22,8 @@ object pointed to by
 and frees up the allocated memory if the reference count has reached 0.
 .Pp
 It also calls the
-.Xr free 3 Ns ing procedures for indirectly affected items, if applicable:
+.Xr free 3 Ns ing
+procedures for indirectly affected items, if applicable:
 the session cache, the list of ciphers, the list of Client CAs,
 the certificates and keys.
 .Sh WARNINGS
diff --git a/src/lib/libssl/doc/SSL_CTX_get_ex_new_index.3 b/src/lib/libssl/doc/SSL_CTX_get_ex_new_index.3
index 593f39c24c..72bbb608fa 100644
--- a/src/lib/libssl/doc/SSL_CTX_get_ex_new_index.3
+++ b/src/lib/libssl/doc/SSL_CTX_get_ex_new_index.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_get_ex_new_index.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_get_verify_mode.3 b/src/lib/libssl/doc/SSL_CTX_get_verify_mode.3
index 4139229d7b..12e21db6a3 100644
--- a/src/lib/libssl/doc/SSL_CTX_get_verify_mode.3
+++ b/src/lib/libssl/doc/SSL_CTX_get_verify_mode.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_get_verify_mode.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_GET_VERIFY_MODE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_load_verify_locations.3 b/src/lib/libssl/doc/SSL_CTX_load_verify_locations.3
index 1e494032f4..09884db5da 100644
--- a/src/lib/libssl/doc/SSL_CTX_load_verify_locations.3
+++ b/src/lib/libssl/doc/SSL_CTX_load_verify_locations.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_load_verify_locations.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_LOAD_VERIFY_LOCATIONS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_new.3 b/src/lib/libssl/doc/SSL_CTX_new.3
index b798d10a9e..d2c2b03452 100644
--- a/src/lib/libssl/doc/SSL_CTX_new.3
+++ b/src/lib/libssl/doc/SSL_CTX_new.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_new.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_sess_number.3 b/src/lib/libssl/doc/SSL_CTX_sess_number.3
index 862576ca50..f3af4eab07 100644
--- a/src/lib/libssl/doc/SSL_CTX_sess_number.3
+++ b/src/lib/libssl/doc/SSL_CTX_sess_number.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_sess_number.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SESS_NUMBER 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_sess_set_cache_size.3 b/src/lib/libssl/doc/SSL_CTX_sess_set_cache_size.3
index ad434e8496..89d02dd32b 100644
--- a/src/lib/libssl/doc/SSL_CTX_sess_set_cache_size.3
+++ b/src/lib/libssl/doc/SSL_CTX_sess_set_cache_size.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_sess_set_cache_size.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SESS_SET_CACHE_SIZE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_sess_set_get_cb.3 b/src/lib/libssl/doc/SSL_CTX_sess_set_get_cb.3
index d5c506cec8..7a372138c1 100644
--- a/src/lib/libssl/doc/SSL_CTX_sess_set_get_cb.3
+++ b/src/lib/libssl/doc/SSL_CTX_sess_set_get_cb.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_sess_set_get_cb.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SESS_SET_GET_CB 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_sessions.3 b/src/lib/libssl/doc/SSL_CTX_sessions.3
index 96aa018289..0d83711205 100644
--- a/src/lib/libssl/doc/SSL_CTX_sessions.3
+++ b/src/lib/libssl/doc/SSL_CTX_sessions.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_sessions.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SESSIONS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_cert_store.3 b/src/lib/libssl/doc/SSL_CTX_set_cert_store.3
index f80670ce78..8ef3c5561e 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_cert_store.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_cert_store.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_cert_store.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_CERT_STORE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_cert_verify_callback.3 b/src/lib/libssl/doc/SSL_CTX_set_cert_verify_callback.3
index b34d3a6003..bb242d6929 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_cert_verify_callback.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_cert_verify_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_cert_verify_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_CERT_VERIFY_CALLBACK 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_cipher_list.3 b/src/lib/libssl/doc/SSL_CTX_set_cipher_list.3
index c3ee5304e3..e7ce24fb34 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_cipher_list.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_cipher_list.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_cipher_list.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_CIPHER_LIST 3
 .Os
 .Sh NAME
@@ -19,7 +22,7 @@ using the control string
 .Fa str .
 The format of the string is described
 in
-.Xr ciphers 1 .
+.Xr openssl 1 .
 The list of ciphers is inherited by all
 .Fa ssl
 objects created from
diff --git a/src/lib/libssl/doc/SSL_CTX_set_client_CA_list.3 b/src/lib/libssl/doc/SSL_CTX_set_client_CA_list.3
index 5d6fa9bea1..688c4ac023 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_client_CA_list.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_client_CA_list.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_client_CA_list.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_CLIENT_CA_LIST 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_client_cert_cb.3 b/src/lib/libssl/doc/SSL_CTX_set_client_cert_cb.3
index 6aaa5f1016..7a7d9466d2 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_client_cert_cb.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_client_cert_cb.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_client_cert_cb.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_CLIENT_CERT_CB 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_default_passwd_cb.3 b/src/lib/libssl/doc/SSL_CTX_set_default_passwd_cb.3
index 2c35ed501c..ac4d55ae73 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_default_passwd_cb.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_default_passwd_cb.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_default_passwd_cb.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_DEFAULT_PASSWD_CB 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_generate_session_id.3 b/src/lib/libssl/doc/SSL_CTX_set_generate_session_id.3
index e2e2a70362..0bea48904e 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_generate_session_id.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_generate_session_id.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_generate_session_id.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_GENERATE_SESSION_ID 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_info_callback.3 b/src/lib/libssl/doc/SSL_CTX_set_info_callback.3
index dcf298addf..24ee74dda9 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_info_callback.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_info_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_info_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_INFO_CALLBACK 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_max_cert_list.3 b/src/lib/libssl/doc/SSL_CTX_set_max_cert_list.3
index 7380884867..771b49a0b2 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_max_cert_list.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_max_cert_list.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_max_cert_list.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_MAX_CERT_LIST 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_mode.3 b/src/lib/libssl/doc/SSL_CTX_set_mode.3
index b980d43dbe..2a3fcd5531 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_mode.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_mode.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_mode.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_MODE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_msg_callback.3 b/src/lib/libssl/doc/SSL_CTX_set_msg_callback.3
index 82c1479af0..6589306fd4 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_msg_callback.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_msg_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_msg_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_MSG_CALLBACK 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_options.3 b/src/lib/libssl/doc/SSL_CTX_set_options.3
index 8b2f75cc59..6036dcdb2d 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_options.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_options.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_options.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_OPTIONS 3
 .Os
 .Sh NAME
@@ -164,7 +167,7 @@ This option must be used to prevent small subgroup attacks, when the DH
 parameters were not generated using
 .Dq strong
 primes (e.g., when using DSA-parameters, see
-.Xr dhparam 1 ) .
+.Xr openssl 1 ) .
 If
 .Dq strong
 primes were used, it is not strictly necessary to generate a new DH key during
@@ -341,7 +344,7 @@ return the current bitmask.
 .Fn SSL_get_secure_renegotiation_support
 returns 1 is the peer supports secure renegotiation and 0 if it does not.
 .Sh SEE ALSO
-.Xr dhparam 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_clear 3 ,
 .Xr SSL_CTX_set_tmp_dh_callback 3 ,
diff --git a/src/lib/libssl/doc/SSL_CTX_set_psk_client_callback.3 b/src/lib/libssl/doc/SSL_CTX_set_psk_client_callback.3
index 9bd5c9c545..40504ce59a 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_psk_client_callback.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_psk_client_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_psk_client_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_PSK_CLIENT_CALLBACK 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_quiet_shutdown.3 b/src/lib/libssl/doc/SSL_CTX_set_quiet_shutdown.3
index 5f35c1e7a9..5cad447318 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_quiet_shutdown.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_quiet_shutdown.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: November 30 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_quiet_shutdown.3,v 1.3 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_QUIET_SHUTDOWN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_session_cache_mode.3 b/src/lib/libssl/doc/SSL_CTX_set_session_cache_mode.3
index e7ebe2190e..a4e147f05a 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_session_cache_mode.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_session_cache_mode.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_session_cache_mode.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_SESSION_CACHE_MODE 3
 .Os
 .Sh NAME
@@ -93,7 +96,7 @@ the flag has no effect on clients.
 Depending on the presence of
 .Dv SSL_SESS_CACHE_CLIENT
 and/or
-.Dv SSL_SESS_CACHE_SERVER,
+.Dv SSL_SESS_CACHE_SERVER ,
 sessions negotiated in an SSL/TLS handshake may be cached for possible reuse.
 Normally a new session is added to the internal cache as well as any external
 session caching (callback) that is configured for the
diff --git a/src/lib/libssl/doc/SSL_CTX_set_session_id_context.3 b/src/lib/libssl/doc/SSL_CTX_set_session_id_context.3
index 0411c687a4..8f85c4e938 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_session_id_context.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_session_id_context.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_session_id_context.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_SESSION_ID_CONTEXT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_ssl_version.3 b/src/lib/libssl/doc/SSL_CTX_set_ssl_version.3
index f3753dac20..f4bd74e73b 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_ssl_version.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_ssl_version.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_ssl_version.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_SSL_VERSION 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_timeout.3 b/src/lib/libssl/doc/SSL_CTX_set_timeout.3
index c8aaee24e2..6454c4616f 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_timeout.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_timeout.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_timeout.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_TIMEOUT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_set_tmp_dh_callback.3 b/src/lib/libssl/doc/SSL_CTX_set_tmp_dh_callback.3
index f28d083f45..17eed868ee 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_tmp_dh_callback.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_tmp_dh_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_tmp_dh_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_TMP_DH_CALLBACK 3
 .Os
 .Sh NAME
@@ -107,11 +110,11 @@ The risk in reusing DH parameters is that an attacker may specialize on a very
 often used DH group.
 Applications should therefore generate their own DH parameters during the
 installation process using the openssl
-.Xr dhparam 1
+.Xr openssl 1
 application.
 In order to reduce the computer time needed for this generation,
 it is possible to use DSA parameters instead (see
-.Xr dhparam 1 ) ,
+.Xr openssl 1 ) ,
 but in this case
 .Dv SSL_OP_SINGLE_DH_USE
 is mandatory.
@@ -132,10 +135,10 @@ which use safe primes and were generated verifiably pseudo-randomly.
 These files can be converted into C code using the
 .Fl C
 option of the
-.Xr dhparam 1
+.Xr openssl 1
 application.
 Authors may also generate their own set of parameters using
-.Xr dhparam 1 ,
+.Xr openssl 1 ,
 but a user may not be sure how the parameters were generated.
 The generation of DH parameters during installation is therefore recommended.
 .Pp
@@ -225,8 +228,7 @@ tmp_dh_callback(SSL *s, int is_export, int keylength)
 }
 .Ed
 .Sh SEE ALSO
-.Xr ciphers 1 ,
-.Xr dhparam 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_CTX_set_cipher_list 3 ,
 .Xr SSL_CTX_set_options 3 ,
diff --git a/src/lib/libssl/doc/SSL_CTX_set_tmp_rsa_callback.3 b/src/lib/libssl/doc/SSL_CTX_set_tmp_rsa_callback.3
index 55b3aaafed..253274d122 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_tmp_rsa_callback.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_tmp_rsa_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_tmp_rsa_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_TMP_RSA_CALLBACK.POD 3
 .Os
 .Sh NAME
@@ -220,7 +223,7 @@ tmp_rsa_callback(SSL *s, int is_export, int keylength)
 }
 .Ed
 .Sh SEE ALSO
-.Xr ciphers 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_CTX_set_cipher_list 3 ,
 .Xr SSL_CTX_set_options 3 ,
diff --git a/src/lib/libssl/doc/SSL_CTX_set_verify.3 b/src/lib/libssl/doc/SSL_CTX_set_verify.3
index 6ce2e60089..9292f2086b 100644
--- a/src/lib/libssl/doc/SSL_CTX_set_verify.3
+++ b/src/lib/libssl/doc/SSL_CTX_set_verify.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_verify.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_VERIFY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_use_certificate.3 b/src/lib/libssl/doc/SSL_CTX_use_certificate.3
index eac4d8e42c..45345f30c1 100644
--- a/src/lib/libssl/doc/SSL_CTX_use_certificate.3
+++ b/src/lib/libssl/doc/SSL_CTX_use_certificate.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_use_certificate.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_USE_CERTIFICATE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_CTX_use_psk_identity_hint.3 b/src/lib/libssl/doc/SSL_CTX_use_psk_identity_hint.3
index 4d4e8a6173..00c92b51ab 100644
--- a/src/lib/libssl/doc/SSL_CTX_use_psk_identity_hint.3
+++ b/src/lib/libssl/doc/SSL_CTX_use_psk_identity_hint.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_use_psk_identity_hint.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_USE_PSK_IDENTITY_HINT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_SESSION_free.3 b/src/lib/libssl/doc/SSL_SESSION_free.3
index f7d2350b55..ffd5ae2b29 100644
--- a/src/lib/libssl/doc/SSL_SESSION_free.3
+++ b/src/lib/libssl/doc/SSL_SESSION_free.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_SESSION_free.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SESSION_FREE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_SESSION_get_ex_new_index.3 b/src/lib/libssl/doc/SSL_SESSION_get_ex_new_index.3
index d6a94cb0b7..a31f519506 100644
--- a/src/lib/libssl/doc/SSL_SESSION_get_ex_new_index.3
+++ b/src/lib/libssl/doc/SSL_SESSION_get_ex_new_index.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_SESSION_get_ex_new_index.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SESSION_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_SESSION_get_time.3 b/src/lib/libssl/doc/SSL_SESSION_get_time.3
index d094adb50a..5eb7e5a162 100644
--- a/src/lib/libssl/doc/SSL_SESSION_get_time.3
+++ b/src/lib/libssl/doc/SSL_SESSION_get_time.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_SESSION_get_time.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SESSION_GET_TIME 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_accept.3 b/src/lib/libssl/doc/SSL_accept.3
index 88bea1fde7..06465d1955 100644
--- a/src/lib/libssl/doc/SSL_accept.3
+++ b/src/lib/libssl/doc/SSL_accept.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_accept.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_ACCEPT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_alert_type_string.3 b/src/lib/libssl/doc/SSL_alert_type_string.3
index f4b652bc1a..93b67fbd1d 100644
--- a/src/lib/libssl/doc/SSL_alert_type_string.3
+++ b/src/lib/libssl/doc/SSL_alert_type_string.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_alert_type_string.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_ALERT_TYPE_STRING.POD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_clear.3 b/src/lib/libssl/doc/SSL_clear.3
index dc596ce12a..8d49a840ca 100644
--- a/src/lib/libssl/doc/SSL_clear.3
+++ b/src/lib/libssl/doc/SSL_clear.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_clear.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CLEAR 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_connect.3 b/src/lib/libssl/doc/SSL_connect.3
index 4f8428c3c9..74f9b61951 100644
--- a/src/lib/libssl/doc/SSL_connect.3
+++ b/src/lib/libssl/doc/SSL_connect.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_connect.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CONNECT 3
 .Os
 .Sh NAME
@@ -19,7 +22,7 @@ by setting an underlying
 The behaviour of
 .Fn SSL_connect
 depends on the underlying
-.Vt BIO.
+.Vt BIO .
 .Pp
 If the underlying
 .Vt BIO
diff --git a/src/lib/libssl/doc/SSL_do_handshake.3 b/src/lib/libssl/doc/SSL_do_handshake.3
index 8e6e0a820b..cc29df2583 100644
--- a/src/lib/libssl/doc/SSL_do_handshake.3
+++ b/src/lib/libssl/doc/SSL_do_handshake.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_do_handshake.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_DO_HANDSHAKE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_free.3 b/src/lib/libssl/doc/SSL_free.3
index 453cd7d424..c0078d817a 100644
--- a/src/lib/libssl/doc/SSL_free.3
+++ b/src/lib/libssl/doc/SSL_free.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_free.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_FREE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_SSL_CTX.3 b/src/lib/libssl/doc/SSL_get_SSL_CTX.3
index 40effb512f..7ba5b0cb81 100644
--- a/src/lib/libssl/doc/SSL_get_SSL_CTX.3
+++ b/src/lib/libssl/doc/SSL_get_SSL_CTX.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_SSL_CTX.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_SSL_CTX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_ciphers.3 b/src/lib/libssl/doc/SSL_get_ciphers.3
index f836988f39..89abc172b4 100644
--- a/src/lib/libssl/doc/SSL_get_ciphers.3
+++ b/src/lib/libssl/doc/SSL_get_ciphers.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_ciphers.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_CIPHERS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_client_CA_list.3 b/src/lib/libssl/doc/SSL_get_client_CA_list.3
index 9c08a8e17d..7aa5a90c9a 100644
--- a/src/lib/libssl/doc/SSL_get_client_CA_list.3
+++ b/src/lib/libssl/doc/SSL_get_client_CA_list.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_client_CA_list.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_CLIENT_CA_LIST 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_current_cipher.3 b/src/lib/libssl/doc/SSL_get_current_cipher.3
index ec1f2bb7df..d7140571b0 100644
--- a/src/lib/libssl/doc/SSL_get_current_cipher.3
+++ b/src/lib/libssl/doc/SSL_get_current_cipher.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_current_cipher.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_CURRENT_CIPHER 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_default_timeout.3 b/src/lib/libssl/doc/SSL_get_default_timeout.3
index 28ab34d5e8..1a58e87f27 100644
--- a/src/lib/libssl/doc/SSL_get_default_timeout.3
+++ b/src/lib/libssl/doc/SSL_get_default_timeout.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_default_timeout.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_DEFAULT_TIMEOUT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_error.3 b/src/lib/libssl/doc/SSL_get_error.3
index ad533f68c5..95fdf5ab00 100644
--- a/src/lib/libssl/doc/SSL_get_error.3
+++ b/src/lib/libssl/doc/SSL_get_error.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_error.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_ERROR 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_ex_data_X509_STORE_CTX_idx.3 b/src/lib/libssl/doc/SSL_get_ex_data_X509_STORE_CTX_idx.3
index 0bc943d563..ac8a27c952 100644
--- a/src/lib/libssl/doc/SSL_get_ex_data_X509_STORE_CTX_idx.3
+++ b/src/lib/libssl/doc/SSL_get_ex_data_X509_STORE_CTX_idx.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: November 22 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_ex_data_X509_STORE_CTX_idx.3,v 1.3 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_EX_DATA_X509_STORE_CTX_IDX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_ex_new_index.3 b/src/lib/libssl/doc/SSL_get_ex_new_index.3
index 5b1ff19c54..d4613a6210 100644
--- a/src/lib/libssl/doc/SSL_get_ex_new_index.3
+++ b/src/lib/libssl/doc/SSL_get_ex_new_index.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_ex_new_index.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_fd.3 b/src/lib/libssl/doc/SSL_get_fd.3
index 458e73dacc..b66b5f1044 100644
--- a/src/lib/libssl/doc/SSL_get_fd.3
+++ b/src/lib/libssl/doc/SSL_get_fd.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_fd.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_FD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_peer_cert_chain.3 b/src/lib/libssl/doc/SSL_get_peer_cert_chain.3
index 850e8cf913..e4faece5d0 100644
--- a/src/lib/libssl/doc/SSL_get_peer_cert_chain.3
+++ b/src/lib/libssl/doc/SSL_get_peer_cert_chain.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_peer_cert_chain.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_PEER_CERT_CHAIN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_peer_certificate.3 b/src/lib/libssl/doc/SSL_get_peer_certificate.3
index 7e4ab3fccf..bb32572356 100644
--- a/src/lib/libssl/doc/SSL_get_peer_certificate.3
+++ b/src/lib/libssl/doc/SSL_get_peer_certificate.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_peer_certificate.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_PEER_CERTIFICATE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_psk_identity.3 b/src/lib/libssl/doc/SSL_get_psk_identity.3
index b3a72cca29..408555c0ee 100644
--- a/src/lib/libssl/doc/SSL_get_psk_identity.3
+++ b/src/lib/libssl/doc/SSL_get_psk_identity.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_psk_identity.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_PSK_IDENTITY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_rbio.3 b/src/lib/libssl/doc/SSL_get_rbio.3
index a8370d5ef2..4455692eac 100644
--- a/src/lib/libssl/doc/SSL_get_rbio.3
+++ b/src/lib/libssl/doc/SSL_get_rbio.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_rbio.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_RBIO 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_session.3 b/src/lib/libssl/doc/SSL_get_session.3
index fe9a6d48ef..a25e4cff7f 100644
--- a/src/lib/libssl/doc/SSL_get_session.3
+++ b/src/lib/libssl/doc/SSL_get_session.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_session.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_SESSION 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_get_verify_result.3 b/src/lib/libssl/doc/SSL_get_verify_result.3
index 3409dc0698..e89e3dea61 100644
--- a/src/lib/libssl/doc/SSL_get_verify_result.3
+++ b/src/lib/libssl/doc/SSL_get_verify_result.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_verify_result.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_VERIFY_RESULT 3
 .Os
 .Sh NAME
@@ -29,10 +32,10 @@ The following return values can currently occur:
 The verification succeeded or no peer certificate was presented.
 .It Any other value
 Documented in
-.Xr verify 1 .
+.Xr openssl 1 .
 .El
 .Sh SEE ALSO
-.Xr verify 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_get_peer_certificate 3 ,
 .Xr SSL_set_verify_result 3
diff --git a/src/lib/libssl/doc/SSL_get_version.3 b/src/lib/libssl/doc/SSL_get_version.3
index f8fe406d44..ecfd005f12 100644
--- a/src/lib/libssl/doc/SSL_get_version.3
+++ b/src/lib/libssl/doc/SSL_get_version.3
@@ -1,9 +1,12 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_version.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_VERSION 3
 .Os
 .Sh NAME
 .Nm SSL_get_version
-.Nd get the protocol version of a connection.
+.Nd get the protocol version of a connection
 .Sh SYNOPSIS
 .In openssl/ssl.h
 .Ft const char *
diff --git a/src/lib/libssl/doc/SSL_library_init.3 b/src/lib/libssl/doc/SSL_library_init.3
index 0644ebd987..0c84c5d9c9 100644
--- a/src/lib/libssl/doc/SSL_library_init.3
+++ b/src/lib/libssl/doc/SSL_library_init.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_library_init.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_LIBRARY_INIT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_load_client_CA_file.3 b/src/lib/libssl/doc/SSL_load_client_CA_file.3
index 52d21e8e31..d1f085583f 100644
--- a/src/lib/libssl/doc/SSL_load_client_CA_file.3
+++ b/src/lib/libssl/doc/SSL_load_client_CA_file.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_load_client_CA_file.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_LOAD_CLIENT_CA_FILE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_new.3 b/src/lib/libssl/doc/SSL_new.3
index 3c5b303bbb..884b51270b 100644
--- a/src/lib/libssl/doc/SSL_new.3
+++ b/src/lib/libssl/doc/SSL_new.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_new.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_pending.3 b/src/lib/libssl/doc/SSL_pending.3
index e07ba48283..25ef4ea0ba 100644
--- a/src/lib/libssl/doc/SSL_pending.3
+++ b/src/lib/libssl/doc/SSL_pending.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_pending.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_PENDING 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_read.3 b/src/lib/libssl/doc/SSL_read.3
index aed39c300f..d6e5960958 100644
--- a/src/lib/libssl/doc/SSL_read.3
+++ b/src/lib/libssl/doc/SSL_read.3
@@ -1,9 +1,12 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_read.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_READ 3
 .Os
 .Sh NAME
 .Nm SSL_read
-.Nd read bytes from a TLS/SSL connection.
+.Nd read bytes from a TLS/SSL connection
 .Sh SYNOPSIS
 .In openssl/ssl.h
 .Ft int
diff --git a/src/lib/libssl/doc/SSL_rstate_string.3 b/src/lib/libssl/doc/SSL_rstate_string.3
index 77fcd06eac..81d83e52a1 100644
--- a/src/lib/libssl/doc/SSL_rstate_string.3
+++ b/src/lib/libssl/doc/SSL_rstate_string.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_rstate_string.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_RSTATE_STRING 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_session_reused.3 b/src/lib/libssl/doc/SSL_session_reused.3
index 40a88cd881..6ea45f749b 100644
--- a/src/lib/libssl/doc/SSL_session_reused.3
+++ b/src/lib/libssl/doc/SSL_session_reused.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_session_reused.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SESSION_REUSED 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_set_bio.3 b/src/lib/libssl/doc/SSL_set_bio.3
index 62bc22370d..7e2611e000 100644
--- a/src/lib/libssl/doc/SSL_set_bio.3
+++ b/src/lib/libssl/doc/SSL_set_bio.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_bio.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_BIO 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_set_connect_state.3 b/src/lib/libssl/doc/SSL_set_connect_state.3
index 37e52788a4..e3f946f8ee 100644
--- a/src/lib/libssl/doc/SSL_set_connect_state.3
+++ b/src/lib/libssl/doc/SSL_set_connect_state.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_connect_state.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_CONNECT_STATE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_set_fd.3 b/src/lib/libssl/doc/SSL_set_fd.3
index 94345ae236..94e0c7614a 100644
--- a/src/lib/libssl/doc/SSL_set_fd.3
+++ b/src/lib/libssl/doc/SSL_set_fd.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_fd.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_FD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_set_session.3 b/src/lib/libssl/doc/SSL_set_session.3
index 3721b0e0e6..1f2fc66cba 100644
--- a/src/lib/libssl/doc/SSL_set_session.3
+++ b/src/lib/libssl/doc/SSL_set_session.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_session.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_SESSION 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_set_shutdown.3 b/src/lib/libssl/doc/SSL_set_shutdown.3
index 239bbd6801..546b52dad5 100644
--- a/src/lib/libssl/doc/SSL_set_shutdown.3
+++ b/src/lib/libssl/doc/SSL_set_shutdown.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_shutdown.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_SHUTDOWN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_set_verify_result.3 b/src/lib/libssl/doc/SSL_set_verify_result.3
index 3c7f0540fb..9d5474d07a 100644
--- a/src/lib/libssl/doc/SSL_set_verify_result.3
+++ b/src/lib/libssl/doc/SSL_set_verify_result.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_verify_result.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_VERIFY_RESULT 3
 .Os
 .Sh NAME
@@ -28,12 +31,12 @@ reused later, the original value will reappear.
 The valid codes for
 .Fa verify_result
 are documented in
-.Xr verify 1 .
+.Xr openssl 1 .
 .Sh RETURN VALUES
 .Fn SSL_set_verify_result
 does not provide a return value.
 .Sh SEE ALSO
-.Xr verify 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_get_peer_certificate 3 ,
 .Xr SSL_get_verify_result 3
diff --git a/src/lib/libssl/doc/SSL_shutdown.3 b/src/lib/libssl/doc/SSL_shutdown.3
index aa8d483b24..187e656fe3 100644
--- a/src/lib/libssl/doc/SSL_shutdown.3
+++ b/src/lib/libssl/doc/SSL_shutdown.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_shutdown.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SHUTDOWN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_state_string.3 b/src/lib/libssl/doc/SSL_state_string.3
index 828b8f351a..e9a042a3ce 100644
--- a/src/lib/libssl/doc/SSL_state_string.3
+++ b/src/lib/libssl/doc/SSL_state_string.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_state_string.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_STATE_STRING 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_want.3 b/src/lib/libssl/doc/SSL_want.3
index 5f9d89ea92..e9513c8793 100644
--- a/src/lib/libssl/doc/SSL_want.3
+++ b/src/lib/libssl/doc/SSL_want.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_want.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_WANT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/SSL_write.3 b/src/lib/libssl/doc/SSL_write.3
index 19dfffae1b..f020b8b59c 100644
--- a/src/lib/libssl/doc/SSL_write.3
+++ b/src/lib/libssl/doc/SSL_write.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_write.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_WRITE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/d2i_SSL_SESSION.3 b/src/lib/libssl/doc/d2i_SSL_SESSION.3
index 3a40c32e69..ef8a36de79 100644
--- a/src/lib/libssl/doc/d2i_SSL_SESSION.3
+++ b/src/lib/libssl/doc/d2i_SSL_SESSION.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: d2i_SSL_SESSION.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt D2I_SSL_SESSION 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/doc/ssl.3 b/src/lib/libssl/doc/ssl.3
index 901e1fdfc1..d87d7583c4 100644
--- a/src/lib/libssl/doc/ssl.3
+++ b/src/lib/libssl/doc/ssl.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: ssl.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL 3
 .Os
 .Sh NAME
@@ -1313,5 +1316,5 @@ unsigned char *psk, int max_psk_len)"
 .Xr SSL_write 3
 .Sh HISTORY
 The
-.Xr ssl 3
+.Nm
 document appeared in OpenSSL 0.9.2.
diff --git a/src/lib/libssl/src/doc/ssl/BIO_f_ssl.3 b/src/lib/libssl/src/doc/ssl/BIO_f_ssl.3
index 31c9963edb..851e4f08ca 100644
--- a/src/lib/libssl/src/doc/ssl/BIO_f_ssl.3
+++ b/src/lib/libssl/src/doc/ssl/BIO_f_ssl.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: BIO_f_ssl.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt BIO_F_SSL 3
 .Os
 .Sh NAME
@@ -268,7 +271,7 @@ processing.
 .Sh RETURN VALUES
 .\" XXX
 This section is incomplete.
-.Sh EXAMPLE
+.Sh EXAMPLES
 This SSL/TLS client example attempts to retrieve a page from an SSL/TLS web
 server.
 The I/O routines are identical to those of the unencrypted example in
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CIPHER_get_name.3 b/src/lib/libssl/src/doc/ssl/SSL_CIPHER_get_name.3
index 0c6cccd1cc..ebc478f9c6 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CIPHER_get_name.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CIPHER_get_name.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CIPHER_get_name.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CIPHER_GET_NAME 3
 .Os
 .Sh NAME
@@ -172,7 +175,7 @@ A complete list can be retrieved by invoking the following command:
 .Pp
 .Dl $ openssl ciphers -v ALL
 .Sh SEE ALSO
-.Xr ciphers 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_get_ciphers 3 ,
 .Xr SSL_get_current_cipher 3
diff --git a/src/lib/libssl/src/doc/ssl/SSL_COMP_add_compression_method.3 b/src/lib/libssl/src/doc/ssl/SSL_COMP_add_compression_method.3
index c23d676930..d683574dd3 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_COMP_add_compression_method.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_COMP_add_compression_method.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_COMP_add_compression_method.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_COMP_ADD_COMPRESSION_METHOD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_add_extra_chain_cert.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_add_extra_chain_cert.3
index 2664c67a5a..c18d220643 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_add_extra_chain_cert.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_add_extra_chain_cert.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_add_extra_chain_cert.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_ADD_EXTRA_CHAIN_CERT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_add_session.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_add_session.3
index 74b4481496..073b919dc1 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_add_session.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_add_session.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_add_session.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_ADD_SESSION 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_ctrl.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_ctrl.3
index d0a4ffd554..a016845585 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_ctrl.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_ctrl.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_ctrl.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_CTRL 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_flush_sessions.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_flush_sessions.3
index 6431008c4f..9d3c52cdd5 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_flush_sessions.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_flush_sessions.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_flush_sessions.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_FLUSH_SESSIONS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_free.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_free.3
index 9cf5934303..0b2f7a8247 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_free.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_free.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_free.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_FREE 3
 .Os
 .Sh NAME
@@ -19,7 +22,8 @@ object pointed to by
 and frees up the allocated memory if the reference count has reached 0.
 .Pp
 It also calls the
-.Xr free 3 Ns ing procedures for indirectly affected items, if applicable:
+.Xr free 3 Ns ing
+procedures for indirectly affected items, if applicable:
 the session cache, the list of ciphers, the list of Client CAs,
 the certificates and keys.
 .Sh WARNINGS
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_get_ex_new_index.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_get_ex_new_index.3
index 593f39c24c..72bbb608fa 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_get_ex_new_index.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_get_ex_new_index.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_get_ex_new_index.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_get_verify_mode.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_get_verify_mode.3
index 4139229d7b..12e21db6a3 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_get_verify_mode.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_get_verify_mode.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_get_verify_mode.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_GET_VERIFY_MODE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_load_verify_locations.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_load_verify_locations.3
index 1e494032f4..09884db5da 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_load_verify_locations.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_load_verify_locations.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_load_verify_locations.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_LOAD_VERIFY_LOCATIONS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_new.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_new.3
index b798d10a9e..d2c2b03452 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_new.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_new.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_new.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_number.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_number.3
index 862576ca50..f3af4eab07 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_number.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_number.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_sess_number.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SESS_NUMBER 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_set_cache_size.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_set_cache_size.3
index ad434e8496..89d02dd32b 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_set_cache_size.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_set_cache_size.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_sess_set_cache_size.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SESS_SET_CACHE_SIZE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_set_get_cb.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_set_get_cb.3
index d5c506cec8..7a372138c1 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_set_get_cb.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_sess_set_get_cb.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_sess_set_get_cb.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SESS_SET_GET_CB 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_sessions.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_sessions.3
index 96aa018289..0d83711205 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_sessions.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_sessions.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_sessions.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SESSIONS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_store.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_store.3
index f80670ce78..8ef3c5561e 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_store.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_store.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_cert_store.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_CERT_STORE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_verify_callback.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_verify_callback.3
index b34d3a6003..bb242d6929 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_verify_callback.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cert_verify_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_cert_verify_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_CERT_VERIFY_CALLBACK 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cipher_list.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cipher_list.3
index c3ee5304e3..e7ce24fb34 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cipher_list.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_cipher_list.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_cipher_list.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_CIPHER_LIST 3
 .Os
 .Sh NAME
@@ -19,7 +22,7 @@ using the control string
 .Fa str .
 The format of the string is described
 in
-.Xr ciphers 1 .
+.Xr openssl 1 .
 The list of ciphers is inherited by all
 .Fa ssl
 objects created from
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_CA_list.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_CA_list.3
index 5d6fa9bea1..688c4ac023 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_CA_list.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_CA_list.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_client_CA_list.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_CLIENT_CA_LIST 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_cert_cb.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_cert_cb.3
index 6aaa5f1016..7a7d9466d2 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_cert_cb.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_client_cert_cb.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_client_cert_cb.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_CLIENT_CERT_CB 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_default_passwd_cb.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_default_passwd_cb.3
index 2c35ed501c..ac4d55ae73 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_default_passwd_cb.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_default_passwd_cb.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_default_passwd_cb.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_DEFAULT_PASSWD_CB 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_generate_session_id.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_generate_session_id.3
index e2e2a70362..0bea48904e 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_generate_session_id.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_generate_session_id.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_generate_session_id.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_GENERATE_SESSION_ID 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_info_callback.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_info_callback.3
index dcf298addf..24ee74dda9 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_info_callback.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_info_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_info_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_INFO_CALLBACK 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_max_cert_list.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_max_cert_list.3
index 7380884867..771b49a0b2 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_max_cert_list.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_max_cert_list.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_max_cert_list.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_MAX_CERT_LIST 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_mode.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_mode.3
index b980d43dbe..2a3fcd5531 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_mode.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_mode.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_mode.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_MODE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3
index 82c1479af0..6589306fd4 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_msg_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_msg_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_MSG_CALLBACK 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_options.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_options.3
index 8b2f75cc59..6036dcdb2d 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_options.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_options.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_options.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_OPTIONS 3
 .Os
 .Sh NAME
@@ -164,7 +167,7 @@ This option must be used to prevent small subgroup attacks, when the DH
 parameters were not generated using
 .Dq strong
 primes (e.g., when using DSA-parameters, see
-.Xr dhparam 1 ) .
+.Xr openssl 1 ) .
 If
 .Dq strong
 primes were used, it is not strictly necessary to generate a new DH key during
@@ -341,7 +344,7 @@ return the current bitmask.
 .Fn SSL_get_secure_renegotiation_support
 returns 1 is the peer supports secure renegotiation and 0 if it does not.
 .Sh SEE ALSO
-.Xr dhparam 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_clear 3 ,
 .Xr SSL_CTX_set_tmp_dh_callback 3 ,
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_psk_client_callback.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_psk_client_callback.3
index 9bd5c9c545..40504ce59a 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_psk_client_callback.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_psk_client_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_psk_client_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_PSK_CLIENT_CALLBACK 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_quiet_shutdown.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_quiet_shutdown.3
index 5f35c1e7a9..5cad447318 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_quiet_shutdown.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_quiet_shutdown.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: November 30 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_quiet_shutdown.3,v 1.3 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_QUIET_SHUTDOWN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_cache_mode.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_cache_mode.3
index e7ebe2190e..a4e147f05a 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_cache_mode.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_cache_mode.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_session_cache_mode.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_SESSION_CACHE_MODE 3
 .Os
 .Sh NAME
@@ -93,7 +96,7 @@ the flag has no effect on clients.
 Depending on the presence of
 .Dv SSL_SESS_CACHE_CLIENT
 and/or
-.Dv SSL_SESS_CACHE_SERVER,
+.Dv SSL_SESS_CACHE_SERVER ,
 sessions negotiated in an SSL/TLS handshake may be cached for possible reuse.
 Normally a new session is added to the internal cache as well as any external
 session caching (callback) that is configured for the
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_id_context.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_id_context.3
index 0411c687a4..8f85c4e938 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_id_context.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_session_id_context.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_session_id_context.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_SESSION_ID_CONTEXT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_ssl_version.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_ssl_version.3
index f3753dac20..f4bd74e73b 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_ssl_version.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_ssl_version.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_ssl_version.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_SSL_VERSION 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_timeout.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_timeout.3
index c8aaee24e2..6454c4616f 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_timeout.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_timeout.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_timeout.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_TIMEOUT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_dh_callback.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_dh_callback.3
index f28d083f45..17eed868ee 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_dh_callback.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_dh_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_tmp_dh_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_TMP_DH_CALLBACK 3
 .Os
 .Sh NAME
@@ -107,11 +110,11 @@ The risk in reusing DH parameters is that an attacker may specialize on a very
 often used DH group.
 Applications should therefore generate their own DH parameters during the
 installation process using the openssl
-.Xr dhparam 1
+.Xr openssl 1
 application.
 In order to reduce the computer time needed for this generation,
 it is possible to use DSA parameters instead (see
-.Xr dhparam 1 ) ,
+.Xr openssl 1 ) ,
 but in this case
 .Dv SSL_OP_SINGLE_DH_USE
 is mandatory.
@@ -132,10 +135,10 @@ which use safe primes and were generated verifiably pseudo-randomly.
 These files can be converted into C code using the
 .Fl C
 option of the
-.Xr dhparam 1
+.Xr openssl 1
 application.
 Authors may also generate their own set of parameters using
-.Xr dhparam 1 ,
+.Xr openssl 1 ,
 but a user may not be sure how the parameters were generated.
 The generation of DH parameters during installation is therefore recommended.
 .Pp
@@ -225,8 +228,7 @@ tmp_dh_callback(SSL *s, int is_export, int keylength)
 }
 .Ed
 .Sh SEE ALSO
-.Xr ciphers 1 ,
-.Xr dhparam 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_CTX_set_cipher_list 3 ,
 .Xr SSL_CTX_set_options 3 ,
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_rsa_callback.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_rsa_callback.3
index 55b3aaafed..253274d122 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_rsa_callback.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_tmp_rsa_callback.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_tmp_rsa_callback.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_TMP_RSA_CALLBACK.POD 3
 .Os
 .Sh NAME
@@ -220,7 +223,7 @@ tmp_rsa_callback(SSL *s, int is_export, int keylength)
 }
 .Ed
 .Sh SEE ALSO
-.Xr ciphers 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_CTX_set_cipher_list 3 ,
 .Xr SSL_CTX_set_options 3 ,
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_verify.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_verify.3
index 6ce2e60089..9292f2086b 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_set_verify.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_set_verify.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_set_verify.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_SET_VERIFY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.3
index eac4d8e42c..45345f30c1 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_use_certificate.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_use_certificate.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_USE_CERTIFICATE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_CTX_use_psk_identity_hint.3 b/src/lib/libssl/src/doc/ssl/SSL_CTX_use_psk_identity_hint.3
index 4d4e8a6173..00c92b51ab 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_CTX_use_psk_identity_hint.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_CTX_use_psk_identity_hint.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_CTX_use_psk_identity_hint.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CTX_USE_PSK_IDENTITY_HINT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_SESSION_free.3 b/src/lib/libssl/src/doc/ssl/SSL_SESSION_free.3
index f7d2350b55..ffd5ae2b29 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_SESSION_free.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_SESSION_free.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_SESSION_free.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SESSION_FREE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_ex_new_index.3 b/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_ex_new_index.3
index d6a94cb0b7..a31f519506 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_ex_new_index.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_ex_new_index.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_SESSION_get_ex_new_index.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SESSION_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3 b/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3
index d094adb50a..5eb7e5a162 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_SESSION_get_time.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_SESSION_get_time.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SESSION_GET_TIME 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_accept.3 b/src/lib/libssl/src/doc/ssl/SSL_accept.3
index 88bea1fde7..06465d1955 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_accept.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_accept.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_accept.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_ACCEPT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.3 b/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.3
index f4b652bc1a..93b67fbd1d 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_alert_type_string.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_ALERT_TYPE_STRING.POD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_clear.3 b/src/lib/libssl/src/doc/ssl/SSL_clear.3
index dc596ce12a..8d49a840ca 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_clear.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_clear.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_clear.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CLEAR 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_connect.3 b/src/lib/libssl/src/doc/ssl/SSL_connect.3
index 4f8428c3c9..74f9b61951 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_connect.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_connect.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_connect.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_CONNECT 3
 .Os
 .Sh NAME
@@ -19,7 +22,7 @@ by setting an underlying
 The behaviour of
 .Fn SSL_connect
 depends on the underlying
-.Vt BIO.
+.Vt BIO .
 .Pp
 If the underlying
 .Vt BIO
diff --git a/src/lib/libssl/src/doc/ssl/SSL_do_handshake.3 b/src/lib/libssl/src/doc/ssl/SSL_do_handshake.3
index 8e6e0a820b..cc29df2583 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_do_handshake.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_do_handshake.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_do_handshake.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_DO_HANDSHAKE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_free.3 b/src/lib/libssl/src/doc/ssl/SSL_free.3
index 453cd7d424..c0078d817a 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_free.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_free.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_free.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_FREE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_SSL_CTX.3 b/src/lib/libssl/src/doc/ssl/SSL_get_SSL_CTX.3
index 40effb512f..7ba5b0cb81 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_SSL_CTX.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_SSL_CTX.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_SSL_CTX.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_SSL_CTX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_ciphers.3 b/src/lib/libssl/src/doc/ssl/SSL_get_ciphers.3
index f836988f39..89abc172b4 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_ciphers.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_ciphers.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_ciphers.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_CIPHERS 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_client_CA_list.3 b/src/lib/libssl/src/doc/ssl/SSL_get_client_CA_list.3
index 9c08a8e17d..7aa5a90c9a 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_client_CA_list.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_client_CA_list.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_client_CA_list.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_CLIENT_CA_LIST 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_current_cipher.3 b/src/lib/libssl/src/doc/ssl/SSL_get_current_cipher.3
index ec1f2bb7df..d7140571b0 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_current_cipher.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_current_cipher.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_current_cipher.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_CURRENT_CIPHER 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_default_timeout.3 b/src/lib/libssl/src/doc/ssl/SSL_get_default_timeout.3
index 28ab34d5e8..1a58e87f27 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_default_timeout.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_default_timeout.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_default_timeout.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_DEFAULT_TIMEOUT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_error.3 b/src/lib/libssl/src/doc/ssl/SSL_get_error.3
index ad533f68c5..95fdf5ab00 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_error.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_error.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_error.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_ERROR 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.3 b/src/lib/libssl/src/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.3
index 0bc943d563..ac8a27c952 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_ex_data_X509_STORE_CTX_idx.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: November 22 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_ex_data_X509_STORE_CTX_idx.3,v 1.3 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_EX_DATA_X509_STORE_CTX_IDX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_ex_new_index.3 b/src/lib/libssl/src/doc/ssl/SSL_get_ex_new_index.3
index 5b1ff19c54..d4613a6210 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_ex_new_index.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_ex_new_index.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_ex_new_index.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_EX_NEW_INDEX 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_fd.3 b/src/lib/libssl/src/doc/ssl/SSL_get_fd.3
index 458e73dacc..b66b5f1044 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_fd.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_fd.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_fd.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_FD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_peer_cert_chain.3 b/src/lib/libssl/src/doc/ssl/SSL_get_peer_cert_chain.3
index 850e8cf913..e4faece5d0 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_peer_cert_chain.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_peer_cert_chain.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_peer_cert_chain.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_PEER_CERT_CHAIN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_peer_certificate.3 b/src/lib/libssl/src/doc/ssl/SSL_get_peer_certificate.3
index 7e4ab3fccf..bb32572356 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_peer_certificate.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_peer_certificate.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_peer_certificate.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_PEER_CERTIFICATE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_psk_identity.3 b/src/lib/libssl/src/doc/ssl/SSL_get_psk_identity.3
index b3a72cca29..408555c0ee 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_psk_identity.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_psk_identity.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_psk_identity.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_PSK_IDENTITY 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_rbio.3 b/src/lib/libssl/src/doc/ssl/SSL_get_rbio.3
index a8370d5ef2..4455692eac 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_rbio.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_rbio.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_rbio.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_RBIO 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_session.3 b/src/lib/libssl/src/doc/ssl/SSL_get_session.3
index fe9a6d48ef..a25e4cff7f 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_session.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_session.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_session.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_SESSION 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_verify_result.3 b/src/lib/libssl/src/doc/ssl/SSL_get_verify_result.3
index 3409dc0698..e89e3dea61 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_verify_result.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_verify_result.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_verify_result.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_VERIFY_RESULT 3
 .Os
 .Sh NAME
@@ -29,10 +32,10 @@ The following return values can currently occur:
 The verification succeeded or no peer certificate was presented.
 .It Any other value
 Documented in
-.Xr verify 1 .
+.Xr openssl 1 .
 .El
 .Sh SEE ALSO
-.Xr verify 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_get_peer_certificate 3 ,
 .Xr SSL_set_verify_result 3
diff --git a/src/lib/libssl/src/doc/ssl/SSL_get_version.3 b/src/lib/libssl/src/doc/ssl/SSL_get_version.3
index f8fe406d44..ecfd005f12 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_get_version.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_get_version.3
@@ -1,9 +1,12 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_get_version.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_GET_VERSION 3
 .Os
 .Sh NAME
 .Nm SSL_get_version
-.Nd get the protocol version of a connection.
+.Nd get the protocol version of a connection
 .Sh SYNOPSIS
 .In openssl/ssl.h
 .Ft const char *
diff --git a/src/lib/libssl/src/doc/ssl/SSL_library_init.3 b/src/lib/libssl/src/doc/ssl/SSL_library_init.3
index 0644ebd987..0c84c5d9c9 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_library_init.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_library_init.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_library_init.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_LIBRARY_INIT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_load_client_CA_file.3 b/src/lib/libssl/src/doc/ssl/SSL_load_client_CA_file.3
index 52d21e8e31..d1f085583f 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_load_client_CA_file.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_load_client_CA_file.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_load_client_CA_file.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_LOAD_CLIENT_CA_FILE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_new.3 b/src/lib/libssl/src/doc/ssl/SSL_new.3
index 3c5b303bbb..884b51270b 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_new.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_new.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_new.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_NEW 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_pending.3 b/src/lib/libssl/src/doc/ssl/SSL_pending.3
index e07ba48283..25ef4ea0ba 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_pending.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_pending.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_pending.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_PENDING 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_read.3 b/src/lib/libssl/src/doc/ssl/SSL_read.3
index aed39c300f..d6e5960958 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_read.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_read.3
@@ -1,9 +1,12 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_read.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_READ 3
 .Os
 .Sh NAME
 .Nm SSL_read
-.Nd read bytes from a TLS/SSL connection.
+.Nd read bytes from a TLS/SSL connection
 .Sh SYNOPSIS
 .In openssl/ssl.h
 .Ft int
diff --git a/src/lib/libssl/src/doc/ssl/SSL_rstate_string.3 b/src/lib/libssl/src/doc/ssl/SSL_rstate_string.3
index 77fcd06eac..81d83e52a1 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_rstate_string.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_rstate_string.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_rstate_string.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_RSTATE_STRING 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_session_reused.3 b/src/lib/libssl/src/doc/ssl/SSL_session_reused.3
index 40a88cd881..6ea45f749b 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_session_reused.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_session_reused.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_session_reused.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SESSION_REUSED 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_set_bio.3 b/src/lib/libssl/src/doc/ssl/SSL_set_bio.3
index 62bc22370d..7e2611e000 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_set_bio.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_set_bio.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_bio.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_BIO 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_set_connect_state.3 b/src/lib/libssl/src/doc/ssl/SSL_set_connect_state.3
index 37e52788a4..e3f946f8ee 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_set_connect_state.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_set_connect_state.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_connect_state.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_CONNECT_STATE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_set_fd.3 b/src/lib/libssl/src/doc/ssl/SSL_set_fd.3
index 94345ae236..94e0c7614a 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_set_fd.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_set_fd.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_fd.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_FD 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_set_session.3 b/src/lib/libssl/src/doc/ssl/SSL_set_session.3
index 3721b0e0e6..1f2fc66cba 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_set_session.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_set_session.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_session.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_SESSION 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_set_shutdown.3 b/src/lib/libssl/src/doc/ssl/SSL_set_shutdown.3
index 239bbd6801..546b52dad5 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_set_shutdown.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_set_shutdown.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_shutdown.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_SHUTDOWN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_set_verify_result.3 b/src/lib/libssl/src/doc/ssl/SSL_set_verify_result.3
index 3c7f0540fb..9d5474d07a 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_set_verify_result.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_set_verify_result.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_set_verify_result.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SET_VERIFY_RESULT 3
 .Os
 .Sh NAME
@@ -28,12 +31,12 @@ reused later, the original value will reappear.
 The valid codes for
 .Fa verify_result
 are documented in
-.Xr verify 1 .
+.Xr openssl 1 .
 .Sh RETURN VALUES
 .Fn SSL_set_verify_result
 does not provide a return value.
 .Sh SEE ALSO
-.Xr verify 1 ,
+.Xr openssl 1 ,
 .Xr ssl 3 ,
 .Xr SSL_get_peer_certificate 3 ,
 .Xr SSL_get_verify_result 3
diff --git a/src/lib/libssl/src/doc/ssl/SSL_shutdown.3 b/src/lib/libssl/src/doc/ssl/SSL_shutdown.3
index aa8d483b24..187e656fe3 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_shutdown.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_shutdown.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_shutdown.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_SHUTDOWN 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_state_string.3 b/src/lib/libssl/src/doc/ssl/SSL_state_string.3
index 828b8f351a..e9a042a3ce 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_state_string.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_state_string.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_state_string.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_STATE_STRING 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_want.3 b/src/lib/libssl/src/doc/ssl/SSL_want.3
index 5f9d89ea92..e9513c8793 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_want.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_want.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_want.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_WANT 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/SSL_write.3 b/src/lib/libssl/src/doc/ssl/SSL_write.3
index 19dfffae1b..f020b8b59c 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_write.3
+++ b/src/lib/libssl/src/doc/ssl/SSL_write.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: SSL_write.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL_WRITE 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/d2i_SSL_SESSION.3 b/src/lib/libssl/src/doc/ssl/d2i_SSL_SESSION.3
index 3a40c32e69..ef8a36de79 100644
--- a/src/lib/libssl/src/doc/ssl/d2i_SSL_SESSION.3
+++ b/src/lib/libssl/src/doc/ssl/d2i_SSL_SESSION.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: d2i_SSL_SESSION.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt D2I_SSL_SESSION 3
 .Os
 .Sh NAME
diff --git a/src/lib/libssl/src/doc/ssl/ssl.3 b/src/lib/libssl/src/doc/ssl/ssl.3
index 901e1fdfc1..d87d7583c4 100644
--- a/src/lib/libssl/src/doc/ssl/ssl.3
+++ b/src/lib/libssl/src/doc/ssl/ssl.3
@@ -1,4 +1,7 @@
-.Dd $Mdocdate: October 12 2014 $
+.\"
+.\"     $OpenBSD: ssl.3,v 1.2 2014/12/02 14:11:01 jmc Exp $
+.\"
+.Dd $Mdocdate: December 2 2014 $
 .Dt SSL 3
 .Os
 .Sh NAME
@@ -1313,5 +1316,5 @@ unsigned char *psk, int max_psk_len)"
 .Xr SSL_write 3
 .Sh HISTORY
 The
-.Xr ssl 3
+.Nm
 document appeared in OpenSSL 0.9.2.