444 files changed, 40 insertions, 98 deletions

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 8d1dfbefcf..c24ba622ad 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -573,12 +573,9 @@ PROCESS_PODS=\
 	set -e; \
 	here=`cd $(SRCDIR); pwd`; \
 	point=$$here/util/point.sh; \
-	for ds in apps:1 crypto:3 ssl:3; do \
-	    defdir=`echo $$ds | cut -f1 -d:`; \
-	    defsec=`echo $$ds | cut -f2 -d:`; \
-	    for p in $(SRCDIR)/doc/$$defdir/*.pod; do \
-		SEC=`sed -ne 's/^=for  *comment  *openssl_manual_section: *\([0-9]\) *$$/\1/p' $$p`; \
-		[ -z "$$SEC" ] && SEC=$$defsec; \
+	for ds in man1 man3 man5 man7 ; do \
+	    SEC=`echo $$ds | sed -e s/man//`; \
+	    for p in $(SRCDIR)/doc/$$ds/*.pod; do \
 		fn=`basename $$p .pod`; \
 		Name=$$fn; \
 		NAME=`echo $$fn | tr '[a-z]' '[A-Z]'`; \
@@ -608,12 +605,9 @@ PROCESS_PODS=\
 UNINSTALL_DOCS=\
 	set -e; \
 	here=`cd $(SRCDIR); pwd`; \
-	for ds in apps:1 crypto:3 ssl:3; do \
-	    defdir=`echo $$ds | cut -f1 -d:`; \
-	    defsec=`echo $$ds | cut -f2 -d:`; \
-	    for p in $(SRCDIR)/doc/$$defdir/*.pod; do \
-		SEC=`sed -ne 's/^=for  *comment  *openssl_manual_section: *\([0-9]\) *$$/\1/p' $$p`; \
-		[ -z "$$SEC" ] && SEC=$$defsec; \
+	for ds in man1 man3 man5 man7 ; do \
+	    SEC=`echo $$ds | sed -e s/man//`; \
+	    for p in $(SRCDIR)/doc/$$ds/*.pod; do \
 		fn=`basename $$p .pod`; \
 		suf=`eval "echo $$OUTSUFFIX"`; \
 		top=`eval "echo $$OUTTOP"`; \
diff --git a/doc/README b/doc/README
index 5931290230..ead1be278a 100644
--- a/doc/README
+++ b/doc/README
@@ -9,12 +9,18 @@ standards.txt
 
 HOWTO/
         A few how-to documents; not necessarily up-to-date
-apps/
+
+man1/
         The openssl command-line tools; start with openssl.pod
-ssl/
-        The SSL library; start with ssl.pod
-crypto/
-        The cryptographic library; start with crypto.pod
+
+man3/
+        The SSL library and the crypto library
+
+man5/
+        File formats
+
+man7/
+        Overviews; start with crypto.pod and ssl.pod, for example
 
 Formatted versions of the manpages (apps,ssl,crypto) can be found at
         https://www.openssl.org/docs/manpages.html
diff --git a/doc/apps/CA.pl.pod b/doc/man1/CA.pl.pod
index ed30d6a2d1..ed30d6a2d1 100644
--- a/doc/apps/CA.pl.pod
+++ b/doc/man1/CA.pl.pod
diff --git a/doc/apps/asn1parse.pod b/doc/man1/asn1parse.pod
index ee09a83cf7..ee09a83cf7 100644
--- a/doc/apps/asn1parse.pod
+++ b/doc/man1/asn1parse.pod
diff --git a/doc/apps/ca.pod b/doc/man1/ca.pod
index 3be6979588..3be6979588 100644
--- a/doc/apps/ca.pod
+++ b/doc/man1/ca.pod
diff --git a/doc/apps/ciphers.pod b/doc/man1/ciphers.pod
index c392077653..c392077653 100644
--- a/doc/apps/ciphers.pod
+++ b/doc/man1/ciphers.pod
diff --git a/doc/apps/cms.pod b/doc/man1/cms.pod
index d5529bea6b..d5529bea6b 100644
--- a/doc/apps/cms.pod
+++ b/doc/man1/cms.pod
diff --git a/doc/apps/crl.pod b/doc/man1/crl.pod
index 0edff8d0f2..0edff8d0f2 100644
--- a/doc/apps/crl.pod
+++ b/doc/man1/crl.pod
diff --git a/doc/apps/crl2pkcs7.pod b/doc/man1/crl2pkcs7.pod
index 4056543cf6..4056543cf6 100644
--- a/doc/apps/crl2pkcs7.pod
+++ b/doc/man1/crl2pkcs7.pod
diff --git a/doc/apps/dgst.pod b/doc/man1/dgst.pod
index 3f1b02ca51..3f1b02ca51 100644
--- a/doc/apps/dgst.pod
+++ b/doc/man1/dgst.pod
diff --git a/doc/apps/dhparam.pod b/doc/man1/dhparam.pod
index addd88a540..addd88a540 100644
--- a/doc/apps/dhparam.pod
+++ b/doc/man1/dhparam.pod
diff --git a/doc/apps/dsa.pod b/doc/man1/dsa.pod
index caa06966e5..caa06966e5 100644
--- a/doc/apps/dsa.pod
+++ b/doc/man1/dsa.pod
diff --git a/doc/apps/dsaparam.pod b/doc/man1/dsaparam.pod
index 08ad47faa6..08ad47faa6 100644
--- a/doc/apps/dsaparam.pod
+++ b/doc/man1/dsaparam.pod
diff --git a/doc/apps/ec.pod b/doc/man1/ec.pod
index 758709f081..758709f081 100644
--- a/doc/apps/ec.pod
+++ b/doc/man1/ec.pod
diff --git a/doc/apps/ecparam.pod b/doc/man1/ecparam.pod
index 5167896403..5167896403 100644
--- a/doc/apps/ecparam.pod
+++ b/doc/man1/ecparam.pod
diff --git a/doc/apps/enc.pod b/doc/man1/enc.pod
index b3bf82adc2..b3bf82adc2 100644
--- a/doc/apps/enc.pod
+++ b/doc/man1/enc.pod
diff --git a/doc/apps/engine.pod b/doc/man1/engine.pod
index 674ab565d2..674ab565d2 100644
--- a/doc/apps/engine.pod
+++ b/doc/man1/engine.pod
diff --git a/doc/apps/errstr.pod b/doc/man1/errstr.pod
index 5ec7b2e395..5ec7b2e395 100644
--- a/doc/apps/errstr.pod
+++ b/doc/man1/errstr.pod
diff --git a/doc/apps/gendsa.pod b/doc/man1/gendsa.pod
index 4fd1714792..4fd1714792 100644
--- a/doc/apps/gendsa.pod
+++ b/doc/man1/gendsa.pod
diff --git a/doc/apps/genpkey.pod b/doc/man1/genpkey.pod
index e77fc7ef4e..e77fc7ef4e 100644
--- a/doc/apps/genpkey.pod
+++ b/doc/man1/genpkey.pod
diff --git a/doc/apps/genrsa.pod b/doc/man1/genrsa.pod
index 38e83f7261..38e83f7261 100644
--- a/doc/apps/genrsa.pod
+++ b/doc/man1/genrsa.pod
diff --git a/doc/apps/list.pod b/doc/man1/list.pod
index e6e1f17617..e6e1f17617 100644
--- a/doc/apps/list.pod
+++ b/doc/man1/list.pod
diff --git a/doc/apps/nseq.pod b/doc/man1/nseq.pod
index 4765aecea8..4765aecea8 100644
--- a/doc/apps/nseq.pod
+++ b/doc/man1/nseq.pod
diff --git a/doc/apps/ocsp.pod b/doc/man1/ocsp.pod
index 75273a9b25..75273a9b25 100644
--- a/doc/apps/ocsp.pod
+++ b/doc/man1/ocsp.pod
diff --git a/doc/apps/openssl.pod b/doc/man1/openssl.pod
index 3014bb31c7..3014bb31c7 100644
--- a/doc/apps/openssl.pod
+++ b/doc/man1/openssl.pod
diff --git a/doc/apps/passwd.pod b/doc/man1/passwd.pod
index fa11f630cf..fa11f630cf 100644
--- a/doc/apps/passwd.pod
+++ b/doc/man1/passwd.pod
diff --git a/doc/apps/pkcs12.pod b/doc/man1/pkcs12.pod
index e851018cfd..e851018cfd 100644
--- a/doc/apps/pkcs12.pod
+++ b/doc/man1/pkcs12.pod
diff --git a/doc/apps/pkcs7.pod b/doc/man1/pkcs7.pod
index 8c3c11f88b..8c3c11f88b 100644
--- a/doc/apps/pkcs7.pod
+++ b/doc/man1/pkcs7.pod
diff --git a/doc/apps/pkcs8.pod b/doc/man1/pkcs8.pod
index cd6db02a59..cd6db02a59 100644
--- a/doc/apps/pkcs8.pod
+++ b/doc/man1/pkcs8.pod
diff --git a/doc/apps/pkey.pod b/doc/man1/pkey.pod
index dc736a3370..dc736a3370 100644
--- a/doc/apps/pkey.pod
+++ b/doc/man1/pkey.pod
diff --git a/doc/apps/pkeyparam.pod b/doc/man1/pkeyparam.pod
index 6a8c4a806b..6a8c4a806b 100644
--- a/doc/apps/pkeyparam.pod
+++ b/doc/man1/pkeyparam.pod
diff --git a/doc/apps/pkeyutl.pod b/doc/man1/pkeyutl.pod
index 8a455b8187..8a455b8187 100644
--- a/doc/apps/pkeyutl.pod
+++ b/doc/man1/pkeyutl.pod
diff --git a/doc/apps/rand.pod b/doc/man1/rand.pod
index 0faf6872a2..0faf6872a2 100644
--- a/doc/apps/rand.pod
+++ b/doc/man1/rand.pod
diff --git a/doc/apps/rehash.pod b/doc/man1/rehash.pod
index 936fda6180..936fda6180 100644
--- a/doc/apps/rehash.pod
+++ b/doc/man1/rehash.pod
diff --git a/doc/apps/req.pod b/doc/man1/req.pod
index 299d092799..299d092799 100644
--- a/doc/apps/req.pod
+++ b/doc/man1/req.pod
diff --git a/doc/apps/rsa.pod b/doc/man1/rsa.pod
index c3178ab398..c3178ab398 100644
--- a/doc/apps/rsa.pod
+++ b/doc/man1/rsa.pod
diff --git a/doc/apps/rsautl.pod b/doc/man1/rsautl.pod
index 325c6911d6..325c6911d6 100644
--- a/doc/apps/rsautl.pod
+++ b/doc/man1/rsautl.pod
diff --git a/doc/apps/s_client.pod b/doc/man1/s_client.pod
index 4a2a28021c..4a2a28021c 100644
--- a/doc/apps/s_client.pod
+++ b/doc/man1/s_client.pod
diff --git a/doc/apps/s_server.pod b/doc/man1/s_server.pod
index b0d7888730..b0d7888730 100644
--- a/doc/apps/s_server.pod
+++ b/doc/man1/s_server.pod
diff --git a/doc/apps/s_time.pod b/doc/man1/s_time.pod
index acadd30025..acadd30025 100644
--- a/doc/apps/s_time.pod
+++ b/doc/man1/s_time.pod
diff --git a/doc/apps/sess_id.pod b/doc/man1/sess_id.pod
index 3694f7d838..3694f7d838 100644
--- a/doc/apps/sess_id.pod
+++ b/doc/man1/sess_id.pod
diff --git a/doc/apps/smime.pod b/doc/man1/smime.pod
index ba59eda26f..ba59eda26f 100644
--- a/doc/apps/smime.pod
+++ b/doc/man1/smime.pod
diff --git a/doc/apps/speed.pod b/doc/man1/speed.pod
index ad81bfbc74..ad81bfbc74 100644
--- a/doc/apps/speed.pod
+++ b/doc/man1/speed.pod
diff --git a/doc/apps/spkac.pod b/doc/man1/spkac.pod
index 35c6a128d8..35c6a128d8 100644
--- a/doc/apps/spkac.pod
+++ b/doc/man1/spkac.pod
diff --git a/doc/apps/ts.pod b/doc/man1/ts.pod
index 02b2adaa2f..02b2adaa2f 100644
--- a/doc/apps/ts.pod
+++ b/doc/man1/ts.pod
diff --git a/doc/apps/tsget.pod b/doc/man1/tsget.pod
index cf7817a0e7..cf7817a0e7 100644
--- a/doc/apps/tsget.pod
+++ b/doc/man1/tsget.pod
diff --git a/doc/apps/verify.pod b/doc/man1/verify.pod
index 0fd1799af2..0fd1799af2 100644
--- a/doc/apps/verify.pod
+++ b/doc/man1/verify.pod
diff --git a/doc/apps/version.pod b/doc/man1/version.pod
index a97ed20445..a97ed20445 100644
--- a/doc/apps/version.pod
+++ b/doc/man1/version.pod
diff --git a/doc/apps/x509.pod b/doc/man1/x509.pod
index cddfc8ce4a..cddfc8ce4a 100644
--- a/doc/apps/x509.pod
+++ b/doc/man1/x509.pod
diff --git a/doc/crypto/ASN1_INTEGER_get_int64.pod b/doc/man3/ASN1_INTEGER_get_int64.pod
index 6fa1428c42..6fa1428c42 100644
--- a/doc/crypto/ASN1_INTEGER_get_int64.pod
+++ b/doc/man3/ASN1_INTEGER_get_int64.pod
diff --git a/doc/crypto/ASN1_ITEM_lookup.pod b/doc/man3/ASN1_ITEM_lookup.pod
index 9ba69c9d34..9ba69c9d34 100644
--- a/doc/crypto/ASN1_ITEM_lookup.pod
+++ b/doc/man3/ASN1_ITEM_lookup.pod
diff --git a/doc/crypto/ASN1_OBJECT_new.pod b/doc/man3/ASN1_OBJECT_new.pod
index 4c018efffd..4c018efffd 100644
--- a/doc/crypto/ASN1_OBJECT_new.pod
+++ b/doc/man3/ASN1_OBJECT_new.pod
diff --git a/doc/crypto/ASN1_STRING_length.pod b/doc/man3/ASN1_STRING_length.pod
index 26cb176142..26cb176142 100644
--- a/doc/crypto/ASN1_STRING_length.pod
+++ b/doc/man3/ASN1_STRING_length.pod
diff --git a/doc/crypto/ASN1_STRING_new.pod b/doc/man3/ASN1_STRING_new.pod
index 7bd2fc1921..7bd2fc1921 100644
--- a/doc/crypto/ASN1_STRING_new.pod
+++ b/doc/man3/ASN1_STRING_new.pod
diff --git a/doc/crypto/ASN1_STRING_print_ex.pod b/doc/man3/ASN1_STRING_print_ex.pod
index d2bf538f6b..d2bf538f6b 100644
--- a/doc/crypto/ASN1_STRING_print_ex.pod
+++ b/doc/man3/ASN1_STRING_print_ex.pod
diff --git a/doc/crypto/ASN1_TIME_set.pod b/doc/man3/ASN1_TIME_set.pod
index 457b7218d4..457b7218d4 100644
--- a/doc/crypto/ASN1_TIME_set.pod
+++ b/doc/man3/ASN1_TIME_set.pod
diff --git a/doc/crypto/ASN1_TYPE_get.pod b/doc/man3/ASN1_TYPE_get.pod
index 70c56878b8..70c56878b8 100644
--- a/doc/crypto/ASN1_TYPE_get.pod
+++ b/doc/man3/ASN1_TYPE_get.pod
diff --git a/doc/crypto/ASN1_generate_nconf.pod b/doc/man3/ASN1_generate_nconf.pod
index 92f624fa24..92f624fa24 100644
--- a/doc/crypto/ASN1_generate_nconf.pod
+++ b/doc/man3/ASN1_generate_nconf.pod
diff --git a/doc/crypto/ASYNC_WAIT_CTX_new.pod b/doc/man3/ASYNC_WAIT_CTX_new.pod
index 580c4e5dd7..580c4e5dd7 100644
--- a/doc/crypto/ASYNC_WAIT_CTX_new.pod
+++ b/doc/man3/ASYNC_WAIT_CTX_new.pod
diff --git a/doc/crypto/ASYNC_start_job.pod b/doc/man3/ASYNC_start_job.pod
index c10a66f565..c10a66f565 100644
--- a/doc/crypto/ASYNC_start_job.pod
+++ b/doc/man3/ASYNC_start_job.pod
diff --git a/doc/crypto/BF_encrypt.pod b/doc/man3/BF_encrypt.pod
index 0401e90a20..0401e90a20 100644
--- a/doc/crypto/BF_encrypt.pod
+++ b/doc/man3/BF_encrypt.pod
diff --git a/doc/crypto/BIO_ADDR.pod b/doc/man3/BIO_ADDR.pod
index 4b169e8a89..4b169e8a89 100644
--- a/doc/crypto/BIO_ADDR.pod
+++ b/doc/man3/BIO_ADDR.pod
diff --git a/doc/crypto/BIO_ADDRINFO.pod b/doc/man3/BIO_ADDRINFO.pod
index 9ebf99a814..9ebf99a814 100644
--- a/doc/crypto/BIO_ADDRINFO.pod
+++ b/doc/man3/BIO_ADDRINFO.pod
diff --git a/doc/crypto/BIO_connect.pod b/doc/man3/BIO_connect.pod
index 5194033feb..5194033feb 100644
--- a/doc/crypto/BIO_connect.pod
+++ b/doc/man3/BIO_connect.pod
diff --git a/doc/crypto/BIO_ctrl.pod b/doc/man3/BIO_ctrl.pod
index 17dc6ed903..17dc6ed903 100644
--- a/doc/crypto/BIO_ctrl.pod
+++ b/doc/man3/BIO_ctrl.pod
diff --git a/doc/crypto/BIO_f_base64.pod b/doc/man3/BIO_f_base64.pod
index 19df1dd638..19df1dd638 100644
--- a/doc/crypto/BIO_f_base64.pod
+++ b/doc/man3/BIO_f_base64.pod
diff --git a/doc/crypto/BIO_f_buffer.pod b/doc/man3/BIO_f_buffer.pod
index 3224710942..3224710942 100644
--- a/doc/crypto/BIO_f_buffer.pod
+++ b/doc/man3/BIO_f_buffer.pod
diff --git a/doc/crypto/BIO_f_cipher.pod b/doc/man3/BIO_f_cipher.pod
index 87ab3ccc9d..87ab3ccc9d 100644
--- a/doc/crypto/BIO_f_cipher.pod
+++ b/doc/man3/BIO_f_cipher.pod
diff --git a/doc/crypto/BIO_f_md.pod b/doc/man3/BIO_f_md.pod
index 32f0046751..32f0046751 100644
--- a/doc/crypto/BIO_f_md.pod
+++ b/doc/man3/BIO_f_md.pod
diff --git a/doc/crypto/BIO_f_null.pod b/doc/man3/BIO_f_null.pod
index c4e4c667c1..c4e4c667c1 100644
--- a/doc/crypto/BIO_f_null.pod
+++ b/doc/man3/BIO_f_null.pod
diff --git a/doc/crypto/BIO_f_ssl.pod b/doc/man3/BIO_f_ssl.pod
index 3f9635ee68..3f9635ee68 100644
--- a/doc/crypto/BIO_f_ssl.pod
+++ b/doc/man3/BIO_f_ssl.pod
diff --git a/doc/crypto/BIO_find_type.pod b/doc/man3/BIO_find_type.pod
index ff7b488609..ff7b488609 100644
--- a/doc/crypto/BIO_find_type.pod
+++ b/doc/man3/BIO_find_type.pod
diff --git a/doc/crypto/BIO_get_data.pod b/doc/man3/BIO_get_data.pod
index 14f21fa720..14f21fa720 100644
--- a/doc/crypto/BIO_get_data.pod
+++ b/doc/man3/BIO_get_data.pod
diff --git a/doc/crypto/BIO_get_ex_new_index.pod b/doc/man3/BIO_get_ex_new_index.pod
index 3e24f10bc3..3e24f10bc3 100644
--- a/doc/crypto/BIO_get_ex_new_index.pod
+++ b/doc/man3/BIO_get_ex_new_index.pod
diff --git a/doc/crypto/BIO_meth_new.pod b/doc/man3/BIO_meth_new.pod
index bf3316104d..bf3316104d 100644
--- a/doc/crypto/BIO_meth_new.pod
+++ b/doc/man3/BIO_meth_new.pod
diff --git a/doc/crypto/BIO_new.pod b/doc/man3/BIO_new.pod
index 006cf5925c..006cf5925c 100644
--- a/doc/crypto/BIO_new.pod
+++ b/doc/man3/BIO_new.pod
diff --git a/doc/crypto/BIO_new_CMS.pod b/doc/man3/BIO_new_CMS.pod
index b06c224f71..b06c224f71 100644
--- a/doc/crypto/BIO_new_CMS.pod
+++ b/doc/man3/BIO_new_CMS.pod
diff --git a/doc/crypto/BIO_parse_hostserv.pod b/doc/man3/BIO_parse_hostserv.pod
index 4ee4f46a84..4ee4f46a84 100644
--- a/doc/crypto/BIO_parse_hostserv.pod
+++ b/doc/man3/BIO_parse_hostserv.pod
diff --git a/doc/crypto/BIO_push.pod b/doc/man3/BIO_push.pod
index 762027ff6a..762027ff6a 100644
--- a/doc/crypto/BIO_push.pod
+++ b/doc/man3/BIO_push.pod
diff --git a/doc/crypto/BIO_read.pod b/doc/man3/BIO_read.pod
index 45871c1be9..45871c1be9 100644
--- a/doc/crypto/BIO_read.pod
+++ b/doc/man3/BIO_read.pod
diff --git a/doc/crypto/BIO_s_accept.pod b/doc/man3/BIO_s_accept.pod
index ce9995dc3f..ce9995dc3f 100644
--- a/doc/crypto/BIO_s_accept.pod
+++ b/doc/man3/BIO_s_accept.pod
diff --git a/doc/crypto/BIO_s_bio.pod b/doc/man3/BIO_s_bio.pod
index cb46546e21..cb46546e21 100644
--- a/doc/crypto/BIO_s_bio.pod
+++ b/doc/man3/BIO_s_bio.pod
diff --git a/doc/crypto/BIO_s_connect.pod b/doc/man3/BIO_s_connect.pod
index 2143acd099..2143acd099 100644
--- a/doc/crypto/BIO_s_connect.pod
+++ b/doc/man3/BIO_s_connect.pod
diff --git a/doc/crypto/BIO_s_fd.pod b/doc/man3/BIO_s_fd.pod
index 79c4a5999f..79c4a5999f 100644
--- a/doc/crypto/BIO_s_fd.pod
+++ b/doc/man3/BIO_s_fd.pod
diff --git a/doc/crypto/BIO_s_file.pod b/doc/man3/BIO_s_file.pod
index e19d824290..e19d824290 100644
--- a/doc/crypto/BIO_s_file.pod
+++ b/doc/man3/BIO_s_file.pod
diff --git a/doc/crypto/BIO_s_mem.pod b/doc/man3/BIO_s_mem.pod
index b272c410a0..b272c410a0 100644
--- a/doc/crypto/BIO_s_mem.pod
+++ b/doc/man3/BIO_s_mem.pod
diff --git a/doc/crypto/BIO_s_null.pod b/doc/man3/BIO_s_null.pod
index 5a1d84dd2c..5a1d84dd2c 100644
--- a/doc/crypto/BIO_s_null.pod
+++ b/doc/man3/BIO_s_null.pod
diff --git a/doc/crypto/BIO_s_socket.pod b/doc/man3/BIO_s_socket.pod
index ad0574aee6..ad0574aee6 100644
--- a/doc/crypto/BIO_s_socket.pod
+++ b/doc/man3/BIO_s_socket.pod
diff --git a/doc/crypto/BIO_set_callback.pod b/doc/man3/BIO_set_callback.pod
index 113b416488..113b416488 100644
--- a/doc/crypto/BIO_set_callback.pod
+++ b/doc/man3/BIO_set_callback.pod
diff --git a/doc/crypto/BIO_should_retry.pod b/doc/man3/BIO_should_retry.pod
index d6ddf48e2c..d6ddf48e2c 100644
--- a/doc/crypto/BIO_should_retry.pod
+++ b/doc/man3/BIO_should_retry.pod
diff --git a/doc/crypto/BN_BLINDING_new.pod b/doc/man3/BN_BLINDING_new.pod
index 5f56aa3fc9..5f56aa3fc9 100644
--- a/doc/crypto/BN_BLINDING_new.pod
+++ b/doc/man3/BN_BLINDING_new.pod
diff --git a/doc/crypto/BN_CTX_new.pod b/doc/man3/BN_CTX_new.pod
index ca54590517..ca54590517 100644
--- a/doc/crypto/BN_CTX_new.pod
+++ b/doc/man3/BN_CTX_new.pod
diff --git a/doc/crypto/BN_CTX_start.pod b/doc/man3/BN_CTX_start.pod
index 372da506d9..372da506d9 100644
--- a/doc/crypto/BN_CTX_start.pod
+++ b/doc/man3/BN_CTX_start.pod
diff --git a/doc/crypto/BN_add.pod b/doc/man3/BN_add.pod
index 72cc09f67a..72cc09f67a 100644
--- a/doc/crypto/BN_add.pod
+++ b/doc/man3/BN_add.pod
diff --git a/doc/crypto/BN_add_word.pod b/doc/man3/BN_add_word.pod
index 35bdcf45c6..35bdcf45c6 100644
--- a/doc/crypto/BN_add_word.pod
+++ b/doc/man3/BN_add_word.pod
diff --git a/doc/crypto/BN_bn2bin.pod b/doc/man3/BN_bn2bin.pod
index b272010ba0..b272010ba0 100644
--- a/doc/crypto/BN_bn2bin.pod
+++ b/doc/man3/BN_bn2bin.pod
diff --git a/doc/crypto/BN_cmp.pod b/doc/man3/BN_cmp.pod
index ec005718a1..ec005718a1 100644
--- a/doc/crypto/BN_cmp.pod
+++ b/doc/man3/BN_cmp.pod
diff --git a/doc/crypto/BN_copy.pod b/doc/man3/BN_copy.pod
index b044b98a0b..b044b98a0b 100644
--- a/doc/crypto/BN_copy.pod
+++ b/doc/man3/BN_copy.pod
diff --git a/doc/crypto/BN_generate_prime.pod b/doc/man3/BN_generate_prime.pod
index 0472b9b829..0472b9b829 100644
--- a/doc/crypto/BN_generate_prime.pod
+++ b/doc/man3/BN_generate_prime.pod
diff --git a/doc/crypto/BN_mod_inverse.pod b/doc/man3/BN_mod_inverse.pod
index b4792add82..b4792add82 100644
--- a/doc/crypto/BN_mod_inverse.pod
+++ b/doc/man3/BN_mod_inverse.pod
diff --git a/doc/crypto/BN_mod_mul_montgomery.pod b/doc/man3/BN_mod_mul_montgomery.pod
index bf1ef343cd..bf1ef343cd 100644
--- a/doc/crypto/BN_mod_mul_montgomery.pod
+++ b/doc/man3/BN_mod_mul_montgomery.pod
diff --git a/doc/crypto/BN_mod_mul_reciprocal.pod b/doc/man3/BN_mod_mul_reciprocal.pod
index d0536cd95b..d0536cd95b 100644
--- a/doc/crypto/BN_mod_mul_reciprocal.pod
+++ b/doc/man3/BN_mod_mul_reciprocal.pod
diff --git a/doc/crypto/BN_new.pod b/doc/man3/BN_new.pod
index 0277614276..0277614276 100644
--- a/doc/crypto/BN_new.pod
+++ b/doc/man3/BN_new.pod
diff --git a/doc/crypto/BN_num_bytes.pod b/doc/man3/BN_num_bytes.pod
index 4680cf7a71..4680cf7a71 100644
--- a/doc/crypto/BN_num_bytes.pod
+++ b/doc/man3/BN_num_bytes.pod
diff --git a/doc/crypto/BN_rand.pod b/doc/man3/BN_rand.pod
index ae15ada7e5..ae15ada7e5 100644
--- a/doc/crypto/BN_rand.pod
+++ b/doc/man3/BN_rand.pod
diff --git a/doc/crypto/BN_set_bit.pod b/doc/man3/BN_set_bit.pod
index 363227ade3..363227ade3 100644
--- a/doc/crypto/BN_set_bit.pod
+++ b/doc/man3/BN_set_bit.pod
diff --git a/doc/crypto/BN_swap.pod b/doc/man3/BN_swap.pod
index fe7cc8482b..fe7cc8482b 100644
--- a/doc/crypto/BN_swap.pod
+++ b/doc/man3/BN_swap.pod
diff --git a/doc/crypto/BN_zero.pod b/doc/man3/BN_zero.pod
index fadc21b7fd..fadc21b7fd 100644
--- a/doc/crypto/BN_zero.pod
+++ b/doc/man3/BN_zero.pod
diff --git a/doc/crypto/BUF_MEM_new.pod b/doc/man3/BUF_MEM_new.pod
index eb85bed896..eb85bed896 100644
--- a/doc/crypto/BUF_MEM_new.pod
+++ b/doc/man3/BUF_MEM_new.pod
diff --git a/doc/crypto/CMS_add0_cert.pod b/doc/man3/CMS_add0_cert.pod
index 5b0cc2a25c..5b0cc2a25c 100644
--- a/doc/crypto/CMS_add0_cert.pod
+++ b/doc/man3/CMS_add0_cert.pod
diff --git a/doc/crypto/CMS_add1_recipient_cert.pod b/doc/man3/CMS_add1_recipient_cert.pod
index 0dae5cf5fa..0dae5cf5fa 100644
--- a/doc/crypto/CMS_add1_recipient_cert.pod
+++ b/doc/man3/CMS_add1_recipient_cert.pod
diff --git a/doc/crypto/CMS_add1_signer.pod b/doc/man3/CMS_add1_signer.pod
index f4738e0637..f4738e0637 100644
--- a/doc/crypto/CMS_add1_signer.pod
+++ b/doc/man3/CMS_add1_signer.pod
diff --git a/doc/crypto/CMS_compress.pod b/doc/man3/CMS_compress.pod
index e40510831f..e40510831f 100644
--- a/doc/crypto/CMS_compress.pod
+++ b/doc/man3/CMS_compress.pod
diff --git a/doc/crypto/CMS_decrypt.pod b/doc/man3/CMS_decrypt.pod
index b3b196c390..b3b196c390 100644
--- a/doc/crypto/CMS_decrypt.pod
+++ b/doc/man3/CMS_decrypt.pod
diff --git a/doc/crypto/CMS_encrypt.pod b/doc/man3/CMS_encrypt.pod
index 0ed42628c3..0ed42628c3 100644
--- a/doc/crypto/CMS_encrypt.pod
+++ b/doc/man3/CMS_encrypt.pod
diff --git a/doc/crypto/CMS_final.pod b/doc/man3/CMS_final.pod
index 264fe7bc3b..264fe7bc3b 100644
--- a/doc/crypto/CMS_final.pod
+++ b/doc/man3/CMS_final.pod
diff --git a/doc/crypto/CMS_get0_RecipientInfos.pod b/doc/man3/CMS_get0_RecipientInfos.pod
index 6c33c224e9..6c33c224e9 100644
--- a/doc/crypto/CMS_get0_RecipientInfos.pod
+++ b/doc/man3/CMS_get0_RecipientInfos.pod
diff --git a/doc/crypto/CMS_get0_SignerInfos.pod b/doc/man3/CMS_get0_SignerInfos.pod
index c8071591f3..c8071591f3 100644
--- a/doc/crypto/CMS_get0_SignerInfos.pod
+++ b/doc/man3/CMS_get0_SignerInfos.pod
diff --git a/doc/crypto/CMS_get0_type.pod b/doc/man3/CMS_get0_type.pod
index cad8d3f662..cad8d3f662 100644
--- a/doc/crypto/CMS_get0_type.pod
+++ b/doc/man3/CMS_get0_type.pod
diff --git a/doc/crypto/CMS_get1_ReceiptRequest.pod b/doc/man3/CMS_get1_ReceiptRequest.pod
index 79f5f4232d..79f5f4232d 100644
--- a/doc/crypto/CMS_get1_ReceiptRequest.pod
+++ b/doc/man3/CMS_get1_ReceiptRequest.pod
diff --git a/doc/crypto/CMS_sign.pod b/doc/man3/CMS_sign.pod
index 396deef772..396deef772 100644
--- a/doc/crypto/CMS_sign.pod
+++ b/doc/man3/CMS_sign.pod
diff --git a/doc/crypto/CMS_sign_receipt.pod b/doc/man3/CMS_sign_receipt.pod
index 8ea6df1fbc..8ea6df1fbc 100644
--- a/doc/crypto/CMS_sign_receipt.pod
+++ b/doc/man3/CMS_sign_receipt.pod
diff --git a/doc/crypto/CMS_uncompress.pod b/doc/man3/CMS_uncompress.pod
index 80f9c0d168..80f9c0d168 100644
--- a/doc/crypto/CMS_uncompress.pod
+++ b/doc/man3/CMS_uncompress.pod
diff --git a/doc/crypto/CMS_verify.pod b/doc/man3/CMS_verify.pod
index c2ff57bcf2..c2ff57bcf2 100644
--- a/doc/crypto/CMS_verify.pod
+++ b/doc/man3/CMS_verify.pod
diff --git a/doc/crypto/CMS_verify_receipt.pod b/doc/man3/CMS_verify_receipt.pod
index 193241c620..193241c620 100644
--- a/doc/crypto/CMS_verify_receipt.pod
+++ b/doc/man3/CMS_verify_receipt.pod
diff --git a/doc/crypto/CONF_modules_free.pod b/doc/man3/CONF_modules_free.pod
index ac59f3736a..ac59f3736a 100644
--- a/doc/crypto/CONF_modules_free.pod
+++ b/doc/man3/CONF_modules_free.pod
diff --git a/doc/crypto/CONF_modules_load_file.pod b/doc/man3/CONF_modules_load_file.pod
index 9e4071f2b3..9e4071f2b3 100644
--- a/doc/crypto/CONF_modules_load_file.pod
+++ b/doc/man3/CONF_modules_load_file.pod
diff --git a/doc/crypto/CRYPTO_THREAD_run_once.pod b/doc/man3/CRYPTO_THREAD_run_once.pod
index 7795a04477..7795a04477 100644
--- a/doc/crypto/CRYPTO_THREAD_run_once.pod
+++ b/doc/man3/CRYPTO_THREAD_run_once.pod
diff --git a/doc/crypto/CRYPTO_get_ex_new_index.pod b/doc/man3/CRYPTO_get_ex_new_index.pod
index 98085f525b..98085f525b 100644
--- a/doc/crypto/CRYPTO_get_ex_new_index.pod
+++ b/doc/man3/CRYPTO_get_ex_new_index.pod
diff --git a/doc/crypto/CTLOG_STORE_get0_log_by_id.pod b/doc/man3/CTLOG_STORE_get0_log_by_id.pod
index c517e95e0f..c517e95e0f 100644
--- a/doc/crypto/CTLOG_STORE_get0_log_by_id.pod
+++ b/doc/man3/CTLOG_STORE_get0_log_by_id.pod
diff --git a/doc/crypto/CTLOG_STORE_new.pod b/doc/man3/CTLOG_STORE_new.pod
index 2a38f263ba..2a38f263ba 100644
--- a/doc/crypto/CTLOG_STORE_new.pod
+++ b/doc/man3/CTLOG_STORE_new.pod
diff --git a/doc/crypto/CTLOG_new.pod b/doc/man3/CTLOG_new.pod
index ccda6b9c41..ccda6b9c41 100644
--- a/doc/crypto/CTLOG_new.pod
+++ b/doc/man3/CTLOG_new.pod
diff --git a/doc/crypto/CT_POLICY_EVAL_CTX_new.pod b/doc/man3/CT_POLICY_EVAL_CTX_new.pod
index 62792992e2..62792992e2 100644
--- a/doc/crypto/CT_POLICY_EVAL_CTX_new.pod
+++ b/doc/man3/CT_POLICY_EVAL_CTX_new.pod
diff --git a/doc/crypto/DEFINE_STACK_OF.pod b/doc/man3/DEFINE_STACK_OF.pod
index ae443b0a3b..ae443b0a3b 100644
--- a/doc/crypto/DEFINE_STACK_OF.pod
+++ b/doc/man3/DEFINE_STACK_OF.pod
diff --git a/doc/crypto/DES_random_key.pod b/doc/man3/DES_random_key.pod
index 0131093ba9..0131093ba9 100644
--- a/doc/crypto/DES_random_key.pod
+++ b/doc/man3/DES_random_key.pod
diff --git a/doc/crypto/DH_generate_key.pod b/doc/man3/DH_generate_key.pod
index de0847a94d..de0847a94d 100644
--- a/doc/crypto/DH_generate_key.pod
+++ b/doc/man3/DH_generate_key.pod
diff --git a/doc/crypto/DH_generate_parameters.pod b/doc/man3/DH_generate_parameters.pod
index b71497baaf..b71497baaf 100644
--- a/doc/crypto/DH_generate_parameters.pod
+++ b/doc/man3/DH_generate_parameters.pod
diff --git a/doc/crypto/DH_get0_pqg.pod b/doc/man3/DH_get0_pqg.pod
index 79647bf890..79647bf890 100644
--- a/doc/crypto/DH_get0_pqg.pod
+++ b/doc/man3/DH_get0_pqg.pod
diff --git a/doc/crypto/DH_get_1024_160.pod b/doc/man3/DH_get_1024_160.pod
index 4044f10418..4044f10418 100644
--- a/doc/crypto/DH_get_1024_160.pod
+++ b/doc/man3/DH_get_1024_160.pod
diff --git a/doc/crypto/DH_meth_new.pod b/doc/man3/DH_meth_new.pod
index bcf559215f..bcf559215f 100644
--- a/doc/crypto/DH_meth_new.pod
+++ b/doc/man3/DH_meth_new.pod
diff --git a/doc/crypto/DH_new.pod b/doc/man3/DH_new.pod
index 959a470ec4..959a470ec4 100644
--- a/doc/crypto/DH_new.pod
+++ b/doc/man3/DH_new.pod
diff --git a/doc/crypto/DH_set_method.pod b/doc/man3/DH_set_method.pod
index cd75a9b549..cd75a9b549 100644
--- a/doc/crypto/DH_set_method.pod
+++ b/doc/man3/DH_set_method.pod
diff --git a/doc/crypto/DH_size.pod b/doc/man3/DH_size.pod
index 8c1d151fcf..8c1d151fcf 100644
--- a/doc/crypto/DH_size.pod
+++ b/doc/man3/DH_size.pod
diff --git a/doc/crypto/DSA_SIG_new.pod b/doc/man3/DSA_SIG_new.pod
index 7503460a19..7503460a19 100644
--- a/doc/crypto/DSA_SIG_new.pod
+++ b/doc/man3/DSA_SIG_new.pod
diff --git a/doc/crypto/DSA_do_sign.pod b/doc/man3/DSA_do_sign.pod
index 5e56d20944..5e56d20944 100644
--- a/doc/crypto/DSA_do_sign.pod
+++ b/doc/man3/DSA_do_sign.pod
diff --git a/doc/crypto/DSA_dup_DH.pod b/doc/man3/DSA_dup_DH.pod
index 6967ef3dcf..6967ef3dcf 100644
--- a/doc/crypto/DSA_dup_DH.pod
+++ b/doc/man3/DSA_dup_DH.pod
diff --git a/doc/crypto/DSA_generate_key.pod b/doc/man3/DSA_generate_key.pod
index 4781abed7a..4781abed7a 100644
--- a/doc/crypto/DSA_generate_key.pod
+++ b/doc/man3/DSA_generate_key.pod
diff --git a/doc/crypto/DSA_generate_parameters.pod b/doc/man3/DSA_generate_parameters.pod
index ca2c2ce7bb..ca2c2ce7bb 100644
--- a/doc/crypto/DSA_generate_parameters.pod
+++ b/doc/man3/DSA_generate_parameters.pod
diff --git a/doc/crypto/DSA_get0_pqg.pod b/doc/man3/DSA_get0_pqg.pod
index e87e42a459..e87e42a459 100644
--- a/doc/crypto/DSA_get0_pqg.pod
+++ b/doc/man3/DSA_get0_pqg.pod
diff --git a/doc/crypto/DSA_meth_new.pod b/doc/man3/DSA_meth_new.pod
index 68f744abc3..68f744abc3 100644
--- a/doc/crypto/DSA_meth_new.pod
+++ b/doc/man3/DSA_meth_new.pod
diff --git a/doc/crypto/DSA_new.pod b/doc/man3/DSA_new.pod
index a967ab5da5..a967ab5da5 100644
--- a/doc/crypto/DSA_new.pod
+++ b/doc/man3/DSA_new.pod
diff --git a/doc/crypto/DSA_set_method.pod b/doc/man3/DSA_set_method.pod
index a64725f7e4..a64725f7e4 100644
--- a/doc/crypto/DSA_set_method.pod
+++ b/doc/man3/DSA_set_method.pod
diff --git a/doc/crypto/DSA_sign.pod b/doc/man3/DSA_sign.pod
index ba0f6b863e..ba0f6b863e 100644
--- a/doc/crypto/DSA_sign.pod
+++ b/doc/man3/DSA_sign.pod
diff --git a/doc/crypto/DSA_size.pod b/doc/man3/DSA_size.pod
index 16e6f3a963..16e6f3a963 100644
--- a/doc/crypto/DSA_size.pod
+++ b/doc/man3/DSA_size.pod
diff --git a/doc/ssl/DTLSv1_listen.pod b/doc/man3/DTLSv1_listen.pod
index a839d9fec1..a839d9fec1 100644
--- a/doc/ssl/DTLSv1_listen.pod
+++ b/doc/man3/DTLSv1_listen.pod
diff --git a/doc/crypto/ECDSA_SIG_new.pod b/doc/man3/ECDSA_SIG_new.pod
index f6aaed192b..f6aaed192b 100644
--- a/doc/crypto/ECDSA_SIG_new.pod
+++ b/doc/man3/ECDSA_SIG_new.pod
diff --git a/doc/crypto/ECPKParameters_print.pod b/doc/man3/ECPKParameters_print.pod
index c9c362835e..c9c362835e 100644
--- a/doc/crypto/ECPKParameters_print.pod
+++ b/doc/man3/ECPKParameters_print.pod
diff --git a/doc/crypto/EC_GFp_simple_method.pod b/doc/man3/EC_GFp_simple_method.pod
index 89c590eb2a..89c590eb2a 100644
--- a/doc/crypto/EC_GFp_simple_method.pod
+++ b/doc/man3/EC_GFp_simple_method.pod
diff --git a/doc/crypto/EC_GROUP_copy.pod b/doc/man3/EC_GROUP_copy.pod
index 6b398dfefc..6b398dfefc 100644
--- a/doc/crypto/EC_GROUP_copy.pod
+++ b/doc/man3/EC_GROUP_copy.pod
diff --git a/doc/crypto/EC_GROUP_new.pod b/doc/man3/EC_GROUP_new.pod
index 25129100b6..25129100b6 100644
--- a/doc/crypto/EC_GROUP_new.pod
+++ b/doc/man3/EC_GROUP_new.pod
diff --git a/doc/crypto/EC_KEY_get_enc_flags.pod b/doc/man3/EC_KEY_get_enc_flags.pod
index abc55c148f..abc55c148f 100644
--- a/doc/crypto/EC_KEY_get_enc_flags.pod
+++ b/doc/man3/EC_KEY_get_enc_flags.pod
diff --git a/doc/crypto/EC_KEY_new.pod b/doc/man3/EC_KEY_new.pod
index 83a2c6d097..83a2c6d097 100644
--- a/doc/crypto/EC_KEY_new.pod
+++ b/doc/man3/EC_KEY_new.pod
diff --git a/doc/crypto/EC_POINT_add.pod b/doc/man3/EC_POINT_add.pod
index c029de42b1..c029de42b1 100644
--- a/doc/crypto/EC_POINT_add.pod
+++ b/doc/man3/EC_POINT_add.pod
diff --git a/doc/crypto/EC_POINT_new.pod b/doc/man3/EC_POINT_new.pod
index 206648c83b..206648c83b 100644
--- a/doc/crypto/EC_POINT_new.pod
+++ b/doc/man3/EC_POINT_new.pod
diff --git a/doc/crypto/ENGINE_add.pod b/doc/man3/ENGINE_add.pod
index 37384f69b5..37384f69b5 100644
--- a/doc/crypto/ENGINE_add.pod
+++ b/doc/man3/ENGINE_add.pod
diff --git a/doc/crypto/ERR_GET_LIB.pod b/doc/man3/ERR_GET_LIB.pod
index 10e250f445..10e250f445 100644
--- a/doc/crypto/ERR_GET_LIB.pod
+++ b/doc/man3/ERR_GET_LIB.pod
diff --git a/doc/crypto/ERR_clear_error.pod b/doc/man3/ERR_clear_error.pod
index 892c67fcf9..892c67fcf9 100644
--- a/doc/crypto/ERR_clear_error.pod
+++ b/doc/man3/ERR_clear_error.pod
diff --git a/doc/crypto/ERR_error_string.pod b/doc/man3/ERR_error_string.pod
index 12f4f72be5..12f4f72be5 100644
--- a/doc/crypto/ERR_error_string.pod
+++ b/doc/man3/ERR_error_string.pod
diff --git a/doc/crypto/ERR_get_error.pod b/doc/man3/ERR_get_error.pod
index a7efc74d6a..a7efc74d6a 100644
--- a/doc/crypto/ERR_get_error.pod
+++ b/doc/man3/ERR_get_error.pod
diff --git a/doc/crypto/ERR_load_crypto_strings.pod b/doc/man3/ERR_load_crypto_strings.pod
index 15f8000c4e..15f8000c4e 100644
--- a/doc/crypto/ERR_load_crypto_strings.pod
+++ b/doc/man3/ERR_load_crypto_strings.pod
diff --git a/doc/crypto/ERR_load_strings.pod b/doc/man3/ERR_load_strings.pod
index 86ee5fda24..86ee5fda24 100644
--- a/doc/crypto/ERR_load_strings.pod
+++ b/doc/man3/ERR_load_strings.pod
diff --git a/doc/crypto/ERR_print_errors.pod b/doc/man3/ERR_print_errors.pod
index 17229af30c..17229af30c 100644
--- a/doc/crypto/ERR_print_errors.pod
+++ b/doc/man3/ERR_print_errors.pod
diff --git a/doc/crypto/ERR_put_error.pod b/doc/man3/ERR_put_error.pod
index 9d2405e3d3..9d2405e3d3 100644
--- a/doc/crypto/ERR_put_error.pod
+++ b/doc/man3/ERR_put_error.pod
diff --git a/doc/crypto/ERR_remove_state.pod b/doc/man3/ERR_remove_state.pod
index f2e71e3948..f2e71e3948 100644
--- a/doc/crypto/ERR_remove_state.pod
+++ b/doc/man3/ERR_remove_state.pod
diff --git a/doc/crypto/ERR_set_mark.pod b/doc/man3/ERR_set_mark.pod
index 9c55f5a7bb..9c55f5a7bb 100644
--- a/doc/crypto/ERR_set_mark.pod
+++ b/doc/man3/ERR_set_mark.pod
diff --git a/doc/crypto/EVP_BytesToKey.pod b/doc/man3/EVP_BytesToKey.pod
index 728c94e980..728c94e980 100644
--- a/doc/crypto/EVP_BytesToKey.pod
+++ b/doc/man3/EVP_BytesToKey.pod
diff --git a/doc/crypto/EVP_CIPHER_CTX_get_cipher_data.pod b/doc/man3/EVP_CIPHER_CTX_get_cipher_data.pod
index 3a57fcdb67..3a57fcdb67 100644
--- a/doc/crypto/EVP_CIPHER_CTX_get_cipher_data.pod
+++ b/doc/man3/EVP_CIPHER_CTX_get_cipher_data.pod
diff --git a/doc/crypto/EVP_CIPHER_meth_new.pod b/doc/man3/EVP_CIPHER_meth_new.pod
index 6e18ed5412..6e18ed5412 100644
--- a/doc/crypto/EVP_CIPHER_meth_new.pod
+++ b/doc/man3/EVP_CIPHER_meth_new.pod
diff --git a/doc/crypto/EVP_DigestInit.pod b/doc/man3/EVP_DigestInit.pod
index d615b31b87..d615b31b87 100644
--- a/doc/crypto/EVP_DigestInit.pod
+++ b/doc/man3/EVP_DigestInit.pod
diff --git a/doc/crypto/EVP_DigestSignInit.pod b/doc/man3/EVP_DigestSignInit.pod
index 13d6c7b3c1..13d6c7b3c1 100644
--- a/doc/crypto/EVP_DigestSignInit.pod
+++ b/doc/man3/EVP_DigestSignInit.pod
diff --git a/doc/crypto/EVP_DigestVerifyInit.pod b/doc/man3/EVP_DigestVerifyInit.pod
index c665d12772..c665d12772 100644
--- a/doc/crypto/EVP_DigestVerifyInit.pod
+++ b/doc/man3/EVP_DigestVerifyInit.pod
diff --git a/doc/crypto/EVP_EncodeInit.pod b/doc/man3/EVP_EncodeInit.pod
index d919b14b29..d919b14b29 100644
--- a/doc/crypto/EVP_EncodeInit.pod
+++ b/doc/man3/EVP_EncodeInit.pod
diff --git a/doc/crypto/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod
index d981620908..d981620908 100644
--- a/doc/crypto/EVP_EncryptInit.pod
+++ b/doc/man3/EVP_EncryptInit.pod
diff --git a/doc/crypto/EVP_MD_meth_new.pod b/doc/man3/EVP_MD_meth_new.pod
index c15a31e7fc..c15a31e7fc 100644
--- a/doc/crypto/EVP_MD_meth_new.pod
+++ b/doc/man3/EVP_MD_meth_new.pod
diff --git a/doc/crypto/EVP_OpenInit.pod b/doc/man3/EVP_OpenInit.pod
index ff84490a42..ff84490a42 100644
--- a/doc/crypto/EVP_OpenInit.pod
+++ b/doc/man3/EVP_OpenInit.pod
diff --git a/doc/crypto/EVP_PKEY_CTX_ctrl.pod b/doc/man3/EVP_PKEY_CTX_ctrl.pod
index a30450bb46..a30450bb46 100644
--- a/doc/crypto/EVP_PKEY_CTX_ctrl.pod
+++ b/doc/man3/EVP_PKEY_CTX_ctrl.pod
diff --git a/doc/crypto/EVP_PKEY_CTX_new.pod b/doc/man3/EVP_PKEY_CTX_new.pod
index eff94cd943..eff94cd943 100644
--- a/doc/crypto/EVP_PKEY_CTX_new.pod
+++ b/doc/man3/EVP_PKEY_CTX_new.pod
diff --git a/doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod b/doc/man3/EVP_PKEY_CTX_set_hkdf_md.pod
index 61e0eec528..61e0eec528 100644
--- a/doc/crypto/EVP_PKEY_CTX_set_hkdf_md.pod
+++ b/doc/man3/EVP_PKEY_CTX_set_hkdf_md.pod
diff --git a/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod b/doc/man3/EVP_PKEY_CTX_set_tls1_prf_md.pod
index 0d57f9fb6a..0d57f9fb6a 100644
--- a/doc/crypto/EVP_PKEY_CTX_set_tls1_prf_md.pod
+++ b/doc/man3/EVP_PKEY_CTX_set_tls1_prf_md.pod
diff --git a/doc/crypto/EVP_PKEY_cmp.pod b/doc/man3/EVP_PKEY_cmp.pod
index 270d635ce2..270d635ce2 100644
--- a/doc/crypto/EVP_PKEY_cmp.pod
+++ b/doc/man3/EVP_PKEY_cmp.pod
diff --git a/doc/crypto/EVP_PKEY_decrypt.pod b/doc/man3/EVP_PKEY_decrypt.pod
index ca732ed0f9..ca732ed0f9 100644
--- a/doc/crypto/EVP_PKEY_decrypt.pod
+++ b/doc/man3/EVP_PKEY_decrypt.pod
diff --git a/doc/crypto/EVP_PKEY_derive.pod b/doc/man3/EVP_PKEY_derive.pod
index f70a0b8d9b..f70a0b8d9b 100644
--- a/doc/crypto/EVP_PKEY_derive.pod
+++ b/doc/man3/EVP_PKEY_derive.pod
diff --git a/doc/crypto/EVP_PKEY_encrypt.pod b/doc/man3/EVP_PKEY_encrypt.pod
index 01336e128b..01336e128b 100644
--- a/doc/crypto/EVP_PKEY_encrypt.pod
+++ b/doc/man3/EVP_PKEY_encrypt.pod
diff --git a/doc/crypto/EVP_PKEY_get_default_digest_nid.pod b/doc/man3/EVP_PKEY_get_default_digest_nid.pod
index 3dce5c59a8..3dce5c59a8 100644
--- a/doc/crypto/EVP_PKEY_get_default_digest_nid.pod
+++ b/doc/man3/EVP_PKEY_get_default_digest_nid.pod
diff --git a/doc/crypto/EVP_PKEY_keygen.pod b/doc/man3/EVP_PKEY_keygen.pod
index 5b8b635cc5..5b8b635cc5 100644
--- a/doc/crypto/EVP_PKEY_keygen.pod
+++ b/doc/man3/EVP_PKEY_keygen.pod
diff --git a/doc/crypto/EVP_PKEY_new.pod b/doc/man3/EVP_PKEY_new.pod
index 956d699002..956d699002 100644
--- a/doc/crypto/EVP_PKEY_new.pod
+++ b/doc/man3/EVP_PKEY_new.pod
diff --git a/doc/crypto/EVP_PKEY_print_private.pod b/doc/man3/EVP_PKEY_print_private.pod
index 9f1d324f81..9f1d324f81 100644
--- a/doc/crypto/EVP_PKEY_print_private.pod
+++ b/doc/man3/EVP_PKEY_print_private.pod
diff --git a/doc/crypto/EVP_PKEY_set1_RSA.pod b/doc/man3/EVP_PKEY_set1_RSA.pod
index e1b7110fe5..e1b7110fe5 100644
--- a/doc/crypto/EVP_PKEY_set1_RSA.pod
+++ b/doc/man3/EVP_PKEY_set1_RSA.pod
diff --git a/doc/crypto/EVP_PKEY_sign.pod b/doc/man3/EVP_PKEY_sign.pod
index 9b3c8d4593..9b3c8d4593 100644
--- a/doc/crypto/EVP_PKEY_sign.pod
+++ b/doc/man3/EVP_PKEY_sign.pod
diff --git a/doc/crypto/EVP_PKEY_verify.pod b/doc/man3/EVP_PKEY_verify.pod
index e84f880419..e84f880419 100644
--- a/doc/crypto/EVP_PKEY_verify.pod
+++ b/doc/man3/EVP_PKEY_verify.pod
diff --git a/doc/crypto/EVP_PKEY_verify_recover.pod b/doc/man3/EVP_PKEY_verify_recover.pod
index 837bc64ec2..837bc64ec2 100644
--- a/doc/crypto/EVP_PKEY_verify_recover.pod
+++ b/doc/man3/EVP_PKEY_verify_recover.pod
diff --git a/doc/crypto/EVP_SealInit.pod b/doc/man3/EVP_SealInit.pod
index 30bd6808c1..30bd6808c1 100644
--- a/doc/crypto/EVP_SealInit.pod
+++ b/doc/man3/EVP_SealInit.pod
diff --git a/doc/crypto/EVP_SignInit.pod b/doc/man3/EVP_SignInit.pod
index cfbfd5efd4..cfbfd5efd4 100644
--- a/doc/crypto/EVP_SignInit.pod
+++ b/doc/man3/EVP_SignInit.pod
diff --git a/doc/crypto/EVP_VerifyInit.pod b/doc/man3/EVP_VerifyInit.pod
index 518c05ea0a..518c05ea0a 100644
--- a/doc/crypto/EVP_VerifyInit.pod
+++ b/doc/man3/EVP_VerifyInit.pod
diff --git a/doc/crypto/HMAC.pod b/doc/man3/HMAC.pod
index 87f7e33086..87f7e33086 100644
--- a/doc/crypto/HMAC.pod
+++ b/doc/man3/HMAC.pod
diff --git a/doc/crypto/MD5.pod b/doc/man3/MD5.pod
index 78da750796..78da750796 100644
--- a/doc/crypto/MD5.pod
+++ b/doc/man3/MD5.pod
diff --git a/doc/crypto/MDC2_Init.pod b/doc/man3/MDC2_Init.pod
index f7db71b460..f7db71b460 100644
--- a/doc/crypto/MDC2_Init.pod
+++ b/doc/man3/MDC2_Init.pod
diff --git a/doc/crypto/OBJ_nid2obj.pod b/doc/man3/OBJ_nid2obj.pod
index 3ada6679cf..3ada6679cf 100644
--- a/doc/crypto/OBJ_nid2obj.pod
+++ b/doc/man3/OBJ_nid2obj.pod
diff --git a/doc/crypto/OCSP_REQUEST_new.pod b/doc/man3/OCSP_REQUEST_new.pod
index 97c2337d10..97c2337d10 100644
--- a/doc/crypto/OCSP_REQUEST_new.pod
+++ b/doc/man3/OCSP_REQUEST_new.pod
diff --git a/doc/crypto/OCSP_cert_to_id.pod b/doc/man3/OCSP_cert_to_id.pod
index 0e37937fea..0e37937fea 100644
--- a/doc/crypto/OCSP_cert_to_id.pod
+++ b/doc/man3/OCSP_cert_to_id.pod
diff --git a/doc/crypto/OCSP_request_add1_nonce.pod b/doc/man3/OCSP_request_add1_nonce.pod
index dab42c67be..dab42c67be 100644
--- a/doc/crypto/OCSP_request_add1_nonce.pod
+++ b/doc/man3/OCSP_request_add1_nonce.pod
diff --git a/doc/crypto/OCSP_resp_find_status.pod b/doc/man3/OCSP_resp_find_status.pod
index 36f66a858f..36f66a858f 100644
--- a/doc/crypto/OCSP_resp_find_status.pod
+++ b/doc/man3/OCSP_resp_find_status.pod
diff --git a/doc/crypto/OCSP_response_status.pod b/doc/man3/OCSP_response_status.pod
index 81946a639b..81946a639b 100644
--- a/doc/crypto/OCSP_response_status.pod
+++ b/doc/man3/OCSP_response_status.pod
diff --git a/doc/crypto/OCSP_sendreq_new.pod b/doc/man3/OCSP_sendreq_new.pod
index c7fdc9b12e..c7fdc9b12e 100644
--- a/doc/crypto/OCSP_sendreq_new.pod
+++ b/doc/man3/OCSP_sendreq_new.pod
diff --git a/doc/crypto/OPENSSL_Applink.pod b/doc/man3/OPENSSL_Applink.pod
index d3a461ba39..d3a461ba39 100644
--- a/doc/crypto/OPENSSL_Applink.pod
+++ b/doc/man3/OPENSSL_Applink.pod
diff --git a/doc/crypto/OPENSSL_LH_COMPFUNC.pod b/doc/man3/OPENSSL_LH_COMPFUNC.pod
index e760ae3be7..e760ae3be7 100644
--- a/doc/crypto/OPENSSL_LH_COMPFUNC.pod
+++ b/doc/man3/OPENSSL_LH_COMPFUNC.pod
diff --git a/doc/crypto/OPENSSL_LH_stats.pod b/doc/man3/OPENSSL_LH_stats.pod
index c454a47eef..c454a47eef 100644
--- a/doc/crypto/OPENSSL_LH_stats.pod
+++ b/doc/man3/OPENSSL_LH_stats.pod
diff --git a/doc/crypto/OPENSSL_VERSION_NUMBER.pod b/doc/man3/OPENSSL_VERSION_NUMBER.pod
index 9cc1ed1d9c..9cc1ed1d9c 100644
--- a/doc/crypto/OPENSSL_VERSION_NUMBER.pod
+++ b/doc/man3/OPENSSL_VERSION_NUMBER.pod
diff --git a/doc/crypto/OPENSSL_config.pod b/doc/man3/OPENSSL_config.pod
index eae634a8fa..eae634a8fa 100644
--- a/doc/crypto/OPENSSL_config.pod
+++ b/doc/man3/OPENSSL_config.pod
diff --git a/doc/crypto/OPENSSL_ia32cap.pod b/doc/man3/OPENSSL_ia32cap.pod
index 60dd96484c..60dd96484c 100644
--- a/doc/crypto/OPENSSL_ia32cap.pod
+++ b/doc/man3/OPENSSL_ia32cap.pod
diff --git a/doc/crypto/OPENSSL_init_crypto.pod b/doc/man3/OPENSSL_init_crypto.pod
index 1989880752..1989880752 100644
--- a/doc/crypto/OPENSSL_init_crypto.pod
+++ b/doc/man3/OPENSSL_init_crypto.pod
diff --git a/doc/ssl/OPENSSL_init_ssl.pod b/doc/man3/OPENSSL_init_ssl.pod
index b963e5e7a9..b963e5e7a9 100644
--- a/doc/ssl/OPENSSL_init_ssl.pod
+++ b/doc/man3/OPENSSL_init_ssl.pod
diff --git a/doc/crypto/OPENSSL_instrument_bus.pod b/doc/man3/OPENSSL_instrument_bus.pod
index 1407261035..1407261035 100644
--- a/doc/crypto/OPENSSL_instrument_bus.pod
+++ b/doc/man3/OPENSSL_instrument_bus.pod
diff --git a/doc/crypto/OPENSSL_load_builtin_modules.pod b/doc/man3/OPENSSL_load_builtin_modules.pod
index 112718a68a..112718a68a 100644
--- a/doc/crypto/OPENSSL_load_builtin_modules.pod
+++ b/doc/man3/OPENSSL_load_builtin_modules.pod
diff --git a/doc/crypto/OPENSSL_malloc.pod b/doc/man3/OPENSSL_malloc.pod
index 50f09751cf..50f09751cf 100644
--- a/doc/crypto/OPENSSL_malloc.pod
+++ b/doc/man3/OPENSSL_malloc.pod
diff --git a/doc/crypto/OPENSSL_secure_malloc.pod b/doc/man3/OPENSSL_secure_malloc.pod
index 517bfbcde1..517bfbcde1 100644
--- a/doc/crypto/OPENSSL_secure_malloc.pod
+++ b/doc/man3/OPENSSL_secure_malloc.pod
diff --git a/doc/crypto/OpenSSL_add_all_algorithms.pod b/doc/man3/OpenSSL_add_all_algorithms.pod
index aaa28dd6a9..aaa28dd6a9 100644
--- a/doc/crypto/OpenSSL_add_all_algorithms.pod
+++ b/doc/man3/OpenSSL_add_all_algorithms.pod
diff --git a/doc/crypto/PEM_read.pod b/doc/man3/PEM_read.pod
index 66cbc7d243..66cbc7d243 100644
--- a/doc/crypto/PEM_read.pod
+++ b/doc/man3/PEM_read.pod
diff --git a/doc/crypto/PEM_read_CMS.pod b/doc/man3/PEM_read_CMS.pod
index 649c8089a9..649c8089a9 100644
--- a/doc/crypto/PEM_read_CMS.pod
+++ b/doc/man3/PEM_read_CMS.pod
diff --git a/doc/crypto/PEM_read_bio_PrivateKey.pod b/doc/man3/PEM_read_bio_PrivateKey.pod
index fbfe975be0..fbfe975be0 100644
--- a/doc/crypto/PEM_read_bio_PrivateKey.pod
+++ b/doc/man3/PEM_read_bio_PrivateKey.pod
diff --git a/doc/crypto/PEM_write_bio_CMS_stream.pod b/doc/man3/PEM_write_bio_CMS_stream.pod
index c73fafd44b..c73fafd44b 100644
--- a/doc/crypto/PEM_write_bio_CMS_stream.pod
+++ b/doc/man3/PEM_write_bio_CMS_stream.pod
diff --git a/doc/crypto/PEM_write_bio_PKCS7_stream.pod b/doc/man3/PEM_write_bio_PKCS7_stream.pod
index 77f97aaa2b..77f97aaa2b 100644
--- a/doc/crypto/PEM_write_bio_PKCS7_stream.pod
+++ b/doc/man3/PEM_write_bio_PKCS7_stream.pod
diff --git a/doc/crypto/PKCS12_create.pod b/doc/man3/PKCS12_create.pod
index 0a43b96c31..0a43b96c31 100644
--- a/doc/crypto/PKCS12_create.pod
+++ b/doc/man3/PKCS12_create.pod
diff --git a/doc/crypto/PKCS12_newpass.pod b/doc/man3/PKCS12_newpass.pod
index b91051195f..b91051195f 100644
--- a/doc/crypto/PKCS12_newpass.pod
+++ b/doc/man3/PKCS12_newpass.pod
diff --git a/doc/crypto/PKCS12_parse.pod b/doc/man3/PKCS12_parse.pod
index 2dfa7e259b..2dfa7e259b 100644
--- a/doc/crypto/PKCS12_parse.pod
+++ b/doc/man3/PKCS12_parse.pod
diff --git a/doc/crypto/PKCS5_PBKDF2_HMAC.pod b/doc/man3/PKCS5_PBKDF2_HMAC.pod
index 5cc2caa5fb..5cc2caa5fb 100644
--- a/doc/crypto/PKCS5_PBKDF2_HMAC.pod
+++ b/doc/man3/PKCS5_PBKDF2_HMAC.pod
diff --git a/doc/crypto/PKCS7_decrypt.pod b/doc/man3/PKCS7_decrypt.pod
index 4ed8aa77fa..4ed8aa77fa 100644
--- a/doc/crypto/PKCS7_decrypt.pod
+++ b/doc/man3/PKCS7_decrypt.pod
diff --git a/doc/crypto/PKCS7_encrypt.pod b/doc/man3/PKCS7_encrypt.pod
index 4e1afc916f..4e1afc916f 100644
--- a/doc/crypto/PKCS7_encrypt.pod
+++ b/doc/man3/PKCS7_encrypt.pod
diff --git a/doc/crypto/PKCS7_sign.pod b/doc/man3/PKCS7_sign.pod
index b5a52da9a2..b5a52da9a2 100644
--- a/doc/crypto/PKCS7_sign.pod
+++ b/doc/man3/PKCS7_sign.pod
diff --git a/doc/crypto/PKCS7_sign_add_signer.pod b/doc/man3/PKCS7_sign_add_signer.pod
index c2a06e7a77..c2a06e7a77 100644
--- a/doc/crypto/PKCS7_sign_add_signer.pod
+++ b/doc/man3/PKCS7_sign_add_signer.pod
diff --git a/doc/crypto/PKCS7_verify.pod b/doc/man3/PKCS7_verify.pod
index c34808eced..c34808eced 100644
--- a/doc/crypto/PKCS7_verify.pod
+++ b/doc/man3/PKCS7_verify.pod
diff --git a/doc/crypto/RAND_add.pod b/doc/man3/RAND_add.pod
index 46de165a97..46de165a97 100644
--- a/doc/crypto/RAND_add.pod
+++ b/doc/man3/RAND_add.pod
diff --git a/doc/crypto/RAND_bytes.pod b/doc/man3/RAND_bytes.pod
index 684215cea3..684215cea3 100644
--- a/doc/crypto/RAND_bytes.pod
+++ b/doc/man3/RAND_bytes.pod
diff --git a/doc/crypto/RAND_cleanup.pod b/doc/man3/RAND_cleanup.pod
index 2640c7d2c7..2640c7d2c7 100644
--- a/doc/crypto/RAND_cleanup.pod
+++ b/doc/man3/RAND_cleanup.pod
diff --git a/doc/crypto/RAND_egd.pod b/doc/man3/RAND_egd.pod
index fcc57c06f9..fcc57c06f9 100644
--- a/doc/crypto/RAND_egd.pod
+++ b/doc/man3/RAND_egd.pod
diff --git a/doc/crypto/RAND_load_file.pod b/doc/man3/RAND_load_file.pod
index 39084b2c5d..39084b2c5d 100644
--- a/doc/crypto/RAND_load_file.pod
+++ b/doc/man3/RAND_load_file.pod
diff --git a/doc/crypto/RAND_set_rand_method.pod b/doc/man3/RAND_set_rand_method.pod
index 02fe90ca89..02fe90ca89 100644
--- a/doc/crypto/RAND_set_rand_method.pod
+++ b/doc/man3/RAND_set_rand_method.pod
diff --git a/doc/crypto/RC4_set_key.pod b/doc/man3/RC4_set_key.pod
index fe5d2d1485..fe5d2d1485 100644
--- a/doc/crypto/RC4_set_key.pod
+++ b/doc/man3/RC4_set_key.pod
diff --git a/doc/crypto/RIPEMD160_Init.pod b/doc/man3/RIPEMD160_Init.pod
index a372e32ca3..a372e32ca3 100644
--- a/doc/crypto/RIPEMD160_Init.pod
+++ b/doc/man3/RIPEMD160_Init.pod
diff --git a/doc/crypto/RSA_blinding_on.pod b/doc/man3/RSA_blinding_on.pod
index 33d49d3720..33d49d3720 100644
--- a/doc/crypto/RSA_blinding_on.pod
+++ b/doc/man3/RSA_blinding_on.pod
diff --git a/doc/crypto/RSA_check_key.pod b/doc/man3/RSA_check_key.pod
index d8689f4a2b..d8689f4a2b 100644
--- a/doc/crypto/RSA_check_key.pod
+++ b/doc/man3/RSA_check_key.pod
diff --git a/doc/crypto/RSA_generate_key.pod b/doc/man3/RSA_generate_key.pod
index 3bafc6fe27..3bafc6fe27 100644
--- a/doc/crypto/RSA_generate_key.pod
+++ b/doc/man3/RSA_generate_key.pod
diff --git a/doc/crypto/RSA_get0_key.pod b/doc/man3/RSA_get0_key.pod
index 52f83e1b90..52f83e1b90 100644
--- a/doc/crypto/RSA_get0_key.pod
+++ b/doc/man3/RSA_get0_key.pod
diff --git a/doc/crypto/RSA_meth_new.pod b/doc/man3/RSA_meth_new.pod
index e46b3984f6..e46b3984f6 100644
--- a/doc/crypto/RSA_meth_new.pod
+++ b/doc/man3/RSA_meth_new.pod
diff --git a/doc/crypto/RSA_new.pod b/doc/man3/RSA_new.pod
index 3317920741..3317920741 100644
--- a/doc/crypto/RSA_new.pod
+++ b/doc/man3/RSA_new.pod
diff --git a/doc/crypto/RSA_padding_add_PKCS1_type_1.pod b/doc/man3/RSA_padding_add_PKCS1_type_1.pod
index 30899440ad..30899440ad 100644
--- a/doc/crypto/RSA_padding_add_PKCS1_type_1.pod
+++ b/doc/man3/RSA_padding_add_PKCS1_type_1.pod
diff --git a/doc/crypto/RSA_print.pod b/doc/man3/RSA_print.pod
index 1367478f93..1367478f93 100644
--- a/doc/crypto/RSA_print.pod
+++ b/doc/man3/RSA_print.pod
diff --git a/doc/crypto/RSA_private_encrypt.pod b/doc/man3/RSA_private_encrypt.pod
index 7870371936..7870371936 100644
--- a/doc/crypto/RSA_private_encrypt.pod
+++ b/doc/man3/RSA_private_encrypt.pod
diff --git a/doc/crypto/RSA_public_encrypt.pod b/doc/man3/RSA_public_encrypt.pod
index 2f78c27484..2f78c27484 100644
--- a/doc/crypto/RSA_public_encrypt.pod
+++ b/doc/man3/RSA_public_encrypt.pod
diff --git a/doc/crypto/RSA_set_method.pod b/doc/man3/RSA_set_method.pod
index 7e7d27cf93..7e7d27cf93 100644
--- a/doc/crypto/RSA_set_method.pod
+++ b/doc/man3/RSA_set_method.pod
diff --git a/doc/crypto/RSA_sign.pod b/doc/man3/RSA_sign.pod
index 64418a5653..64418a5653 100644
--- a/doc/crypto/RSA_sign.pod
+++ b/doc/man3/RSA_sign.pod
diff --git a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod b/doc/man3/RSA_sign_ASN1_OCTET_STRING.pod
index 16303c9f90..16303c9f90 100644
--- a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod
+++ b/doc/man3/RSA_sign_ASN1_OCTET_STRING.pod
diff --git a/doc/crypto/RSA_size.pod b/doc/man3/RSA_size.pod
index eb6e481361..eb6e481361 100644
--- a/doc/crypto/RSA_size.pod
+++ b/doc/man3/RSA_size.pod
diff --git a/doc/crypto/SCT_new.pod b/doc/man3/SCT_new.pod
index 4ee41a6d41..4ee41a6d41 100644
--- a/doc/crypto/SCT_new.pod
+++ b/doc/man3/SCT_new.pod
diff --git a/doc/crypto/SCT_print.pod b/doc/man3/SCT_print.pod
index 88ad43ecdc..88ad43ecdc 100644
--- a/doc/crypto/SCT_print.pod
+++ b/doc/man3/SCT_print.pod
diff --git a/doc/crypto/SCT_validate.pod b/doc/man3/SCT_validate.pod
index 713bcd29d8..713bcd29d8 100644
--- a/doc/crypto/SCT_validate.pod
+++ b/doc/man3/SCT_validate.pod
diff --git a/doc/crypto/SHA256_Init.pod b/doc/man3/SHA256_Init.pod
index f3565bb2f4..f3565bb2f4 100644
--- a/doc/crypto/SHA256_Init.pod
+++ b/doc/man3/SHA256_Init.pod
diff --git a/doc/crypto/SMIME_read_CMS.pod b/doc/man3/SMIME_read_CMS.pod
index efde0bda54..efde0bda54 100644
--- a/doc/crypto/SMIME_read_CMS.pod
+++ b/doc/man3/SMIME_read_CMS.pod
diff --git a/doc/crypto/SMIME_read_PKCS7.pod b/doc/man3/SMIME_read_PKCS7.pod
index 86d5cc3048..86d5cc3048 100644
--- a/doc/crypto/SMIME_read_PKCS7.pod
+++ b/doc/man3/SMIME_read_PKCS7.pod
diff --git a/doc/crypto/SMIME_write_CMS.pod b/doc/man3/SMIME_write_CMS.pod
index d58baeb746..d58baeb746 100644
--- a/doc/crypto/SMIME_write_CMS.pod
+++ b/doc/man3/SMIME_write_CMS.pod
diff --git a/doc/crypto/SMIME_write_PKCS7.pod b/doc/man3/SMIME_write_PKCS7.pod
index b57312386e..b57312386e 100644
--- a/doc/crypto/SMIME_write_PKCS7.pod
+++ b/doc/man3/SMIME_write_PKCS7.pod
diff --git a/doc/ssl/SSL_CIPHER_get_name.pod b/doc/man3/SSL_CIPHER_get_name.pod
index b7ee3c84f5..b7ee3c84f5 100644
--- a/doc/ssl/SSL_CIPHER_get_name.pod
+++ b/doc/man3/SSL_CIPHER_get_name.pod
diff --git a/doc/ssl/SSL_COMP_add_compression_method.pod b/doc/man3/SSL_COMP_add_compression_method.pod
index c455832078..c455832078 100644
--- a/doc/ssl/SSL_COMP_add_compression_method.pod
+++ b/doc/man3/SSL_COMP_add_compression_method.pod
diff --git a/doc/ssl/SSL_CONF_CTX_new.pod b/doc/man3/SSL_CONF_CTX_new.pod
index 79f0bbc7dd..79f0bbc7dd 100644
--- a/doc/ssl/SSL_CONF_CTX_new.pod
+++ b/doc/man3/SSL_CONF_CTX_new.pod
diff --git a/doc/ssl/SSL_CONF_CTX_set1_prefix.pod b/doc/man3/SSL_CONF_CTX_set1_prefix.pod
index da9e580244..da9e580244 100644
--- a/doc/ssl/SSL_CONF_CTX_set1_prefix.pod
+++ b/doc/man3/SSL_CONF_CTX_set1_prefix.pod
diff --git a/doc/ssl/SSL_CONF_CTX_set_flags.pod b/doc/man3/SSL_CONF_CTX_set_flags.pod
index efd8da3bc6..efd8da3bc6 100644
--- a/doc/ssl/SSL_CONF_CTX_set_flags.pod
+++ b/doc/man3/SSL_CONF_CTX_set_flags.pod
diff --git a/doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod b/doc/man3/SSL_CONF_CTX_set_ssl_ctx.pod
index 7e4120f7ce..7e4120f7ce 100644
--- a/doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod
+++ b/doc/man3/SSL_CONF_CTX_set_ssl_ctx.pod
diff --git a/doc/ssl/SSL_CONF_cmd.pod b/doc/man3/SSL_CONF_cmd.pod
index d8c0e9b95d..d8c0e9b95d 100644
--- a/doc/ssl/SSL_CONF_cmd.pod
+++ b/doc/man3/SSL_CONF_cmd.pod
diff --git a/doc/ssl/SSL_CONF_cmd_argv.pod b/doc/man3/SSL_CONF_cmd_argv.pod
index 15529a5973..15529a5973 100644
--- a/doc/ssl/SSL_CONF_cmd_argv.pod
+++ b/doc/man3/SSL_CONF_cmd_argv.pod
diff --git a/doc/ssl/SSL_CTX_add1_chain_cert.pod b/doc/man3/SSL_CTX_add1_chain_cert.pod
index 1f0418b249..1f0418b249 100644
--- a/doc/ssl/SSL_CTX_add1_chain_cert.pod
+++ b/doc/man3/SSL_CTX_add1_chain_cert.pod
diff --git a/doc/ssl/SSL_CTX_add_extra_chain_cert.pod b/doc/man3/SSL_CTX_add_extra_chain_cert.pod
index e2783de9c7..e2783de9c7 100644
--- a/doc/ssl/SSL_CTX_add_extra_chain_cert.pod
+++ b/doc/man3/SSL_CTX_add_extra_chain_cert.pod
diff --git a/doc/ssl/SSL_CTX_add_session.pod b/doc/man3/SSL_CTX_add_session.pod
index dbdd9f0c54..dbdd9f0c54 100644
--- a/doc/ssl/SSL_CTX_add_session.pod
+++ b/doc/man3/SSL_CTX_add_session.pod
diff --git a/doc/ssl/SSL_CTX_config.pod b/doc/man3/SSL_CTX_config.pod
index 802c4c359e..802c4c359e 100644
--- a/doc/ssl/SSL_CTX_config.pod
+++ b/doc/man3/SSL_CTX_config.pod
diff --git a/doc/ssl/SSL_CTX_ctrl.pod b/doc/man3/SSL_CTX_ctrl.pod
index e8386a5930..e8386a5930 100644
--- a/doc/ssl/SSL_CTX_ctrl.pod
+++ b/doc/man3/SSL_CTX_ctrl.pod
diff --git a/doc/ssl/SSL_CTX_dane_enable.pod b/doc/man3/SSL_CTX_dane_enable.pod
index fb535ec527..fb535ec527 100644
--- a/doc/ssl/SSL_CTX_dane_enable.pod
+++ b/doc/man3/SSL_CTX_dane_enable.pod
diff --git a/doc/ssl/SSL_CTX_flush_sessions.pod b/doc/man3/SSL_CTX_flush_sessions.pod
index 7639451c5d..7639451c5d 100644
--- a/doc/ssl/SSL_CTX_flush_sessions.pod
+++ b/doc/man3/SSL_CTX_flush_sessions.pod
diff --git a/doc/ssl/SSL_CTX_free.pod b/doc/man3/SSL_CTX_free.pod
index e5cc1aab77..e5cc1aab77 100644
--- a/doc/ssl/SSL_CTX_free.pod
+++ b/doc/man3/SSL_CTX_free.pod
diff --git a/doc/ssl/SSL_CTX_get0_param.pod b/doc/man3/SSL_CTX_get0_param.pod
index 6b93737458..6b93737458 100644
--- a/doc/ssl/SSL_CTX_get0_param.pod
+++ b/doc/man3/SSL_CTX_get0_param.pod
diff --git a/doc/ssl/SSL_CTX_get_verify_mode.pod b/doc/man3/SSL_CTX_get_verify_mode.pod
index bd100344d1..bd100344d1 100644
--- a/doc/ssl/SSL_CTX_get_verify_mode.pod
+++ b/doc/man3/SSL_CTX_get_verify_mode.pod
diff --git a/doc/ssl/SSL_CTX_has_client_custom_ext.pod b/doc/man3/SSL_CTX_has_client_custom_ext.pod
index d9e9a066ea..d9e9a066ea 100644
--- a/doc/ssl/SSL_CTX_has_client_custom_ext.pod
+++ b/doc/man3/SSL_CTX_has_client_custom_ext.pod
diff --git a/doc/ssl/SSL_CTX_load_verify_locations.pod b/doc/man3/SSL_CTX_load_verify_locations.pod
index 59d11e03ee..59d11e03ee 100644
--- a/doc/ssl/SSL_CTX_load_verify_locations.pod
+++ b/doc/man3/SSL_CTX_load_verify_locations.pod
diff --git a/doc/ssl/SSL_CTX_new.pod b/doc/man3/SSL_CTX_new.pod
index 29387d343f..29387d343f 100644
--- a/doc/ssl/SSL_CTX_new.pod
+++ b/doc/man3/SSL_CTX_new.pod
diff --git a/doc/ssl/SSL_CTX_sess_number.pod b/doc/man3/SSL_CTX_sess_number.pod
index 049c04c449..049c04c449 100644
--- a/doc/ssl/SSL_CTX_sess_number.pod
+++ b/doc/man3/SSL_CTX_sess_number.pod
diff --git a/doc/ssl/SSL_CTX_sess_set_cache_size.pod b/doc/man3/SSL_CTX_sess_set_cache_size.pod
index 5aef10bd8e..5aef10bd8e 100644
--- a/doc/ssl/SSL_CTX_sess_set_cache_size.pod
+++ b/doc/man3/SSL_CTX_sess_set_cache_size.pod
diff --git a/doc/ssl/SSL_CTX_sess_set_get_cb.pod b/doc/man3/SSL_CTX_sess_set_get_cb.pod
index d2b0e04737..d2b0e04737 100644
--- a/doc/ssl/SSL_CTX_sess_set_get_cb.pod
+++ b/doc/man3/SSL_CTX_sess_set_get_cb.pod
diff --git a/doc/ssl/SSL_CTX_sessions.pod b/doc/man3/SSL_CTX_sessions.pod
index bc4a55e1a2..bc4a55e1a2 100644
--- a/doc/ssl/SSL_CTX_sessions.pod
+++ b/doc/man3/SSL_CTX_sessions.pod
diff --git a/doc/ssl/SSL_CTX_set1_curves.pod b/doc/man3/SSL_CTX_set1_curves.pod
index b0276c80f3..b0276c80f3 100644
--- a/doc/ssl/SSL_CTX_set1_curves.pod
+++ b/doc/man3/SSL_CTX_set1_curves.pod
diff --git a/doc/ssl/SSL_CTX_set1_sigalgs.pod b/doc/man3/SSL_CTX_set1_sigalgs.pod
index e9073b99e3..e9073b99e3 100644
--- a/doc/ssl/SSL_CTX_set1_sigalgs.pod
+++ b/doc/man3/SSL_CTX_set1_sigalgs.pod
diff --git a/doc/ssl/SSL_CTX_set1_verify_cert_store.pod b/doc/man3/SSL_CTX_set1_verify_cert_store.pod
index bfe8b70af9..bfe8b70af9 100644
--- a/doc/ssl/SSL_CTX_set1_verify_cert_store.pod
+++ b/doc/man3/SSL_CTX_set1_verify_cert_store.pod
diff --git a/doc/ssl/SSL_CTX_set_alpn_select_cb.pod b/doc/man3/SSL_CTX_set_alpn_select_cb.pod
index 59acbad545..59acbad545 100644
--- a/doc/ssl/SSL_CTX_set_alpn_select_cb.pod
+++ b/doc/man3/SSL_CTX_set_alpn_select_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_cert_cb.pod b/doc/man3/SSL_CTX_set_cert_cb.pod
index eaa7a4e3cb..eaa7a4e3cb 100644
--- a/doc/ssl/SSL_CTX_set_cert_cb.pod
+++ b/doc/man3/SSL_CTX_set_cert_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_cert_store.pod b/doc/man3/SSL_CTX_set_cert_store.pod
index 7f7a794bdf..7f7a794bdf 100644
--- a/doc/ssl/SSL_CTX_set_cert_store.pod
+++ b/doc/man3/SSL_CTX_set_cert_store.pod
diff --git a/doc/ssl/SSL_CTX_set_cert_verify_callback.pod b/doc/man3/SSL_CTX_set_cert_verify_callback.pod
index af303f25fa..af303f25fa 100644
--- a/doc/ssl/SSL_CTX_set_cert_verify_callback.pod
+++ b/doc/man3/SSL_CTX_set_cert_verify_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_cipher_list.pod b/doc/man3/SSL_CTX_set_cipher_list.pod
index 4e66917bab..4e66917bab 100644
--- a/doc/ssl/SSL_CTX_set_cipher_list.pod
+++ b/doc/man3/SSL_CTX_set_cipher_list.pod
diff --git a/doc/ssl/SSL_CTX_set_client_CA_list.pod b/doc/man3/SSL_CTX_set_client_CA_list.pod
index 0252e7b521..0252e7b521 100644
--- a/doc/ssl/SSL_CTX_set_client_CA_list.pod
+++ b/doc/man3/SSL_CTX_set_client_CA_list.pod
diff --git a/doc/ssl/SSL_CTX_set_client_cert_cb.pod b/doc/man3/SSL_CTX_set_client_cert_cb.pod
index aed7d4f0c1..aed7d4f0c1 100644
--- a/doc/ssl/SSL_CTX_set_client_cert_cb.pod
+++ b/doc/man3/SSL_CTX_set_client_cert_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_ct_validation_callback.pod b/doc/man3/SSL_CTX_set_ct_validation_callback.pod
index c481ecbc87..c481ecbc87 100644
--- a/doc/ssl/SSL_CTX_set_ct_validation_callback.pod
+++ b/doc/man3/SSL_CTX_set_ct_validation_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_ctlog_list_file.pod b/doc/man3/SSL_CTX_set_ctlog_list_file.pod
index 4a2fa946fe..4a2fa946fe 100644
--- a/doc/ssl/SSL_CTX_set_ctlog_list_file.pod
+++ b/doc/man3/SSL_CTX_set_ctlog_list_file.pod
diff --git a/doc/ssl/SSL_CTX_set_default_passwd_cb.pod b/doc/man3/SSL_CTX_set_default_passwd_cb.pod
index 2196906141..2196906141 100644
--- a/doc/ssl/SSL_CTX_set_default_passwd_cb.pod
+++ b/doc/man3/SSL_CTX_set_default_passwd_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_generate_session_id.pod b/doc/man3/SSL_CTX_set_generate_session_id.pod
index 515fd251d2..515fd251d2 100644
--- a/doc/ssl/SSL_CTX_set_generate_session_id.pod
+++ b/doc/man3/SSL_CTX_set_generate_session_id.pod
diff --git a/doc/ssl/SSL_CTX_set_info_callback.pod b/doc/man3/SSL_CTX_set_info_callback.pod
index f36f217e3b..f36f217e3b 100644
--- a/doc/ssl/SSL_CTX_set_info_callback.pod
+++ b/doc/man3/SSL_CTX_set_info_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_max_cert_list.pod b/doc/man3/SSL_CTX_set_max_cert_list.pod
index 482751e73c..482751e73c 100644
--- a/doc/ssl/SSL_CTX_set_max_cert_list.pod
+++ b/doc/man3/SSL_CTX_set_max_cert_list.pod
diff --git a/doc/ssl/SSL_CTX_set_min_proto_version.pod b/doc/man3/SSL_CTX_set_min_proto_version.pod
index 3e9fe80b70..3e9fe80b70 100644
--- a/doc/ssl/SSL_CTX_set_min_proto_version.pod
+++ b/doc/man3/SSL_CTX_set_min_proto_version.pod
diff --git a/doc/ssl/SSL_CTX_set_mode.pod b/doc/man3/SSL_CTX_set_mode.pod
index 1b3e783ad6..1b3e783ad6 100644
--- a/doc/ssl/SSL_CTX_set_mode.pod
+++ b/doc/man3/SSL_CTX_set_mode.pod
diff --git a/doc/ssl/SSL_CTX_set_msg_callback.pod b/doc/man3/SSL_CTX_set_msg_callback.pod
index 9546e75124..9546e75124 100644
--- a/doc/ssl/SSL_CTX_set_msg_callback.pod
+++ b/doc/man3/SSL_CTX_set_msg_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_options.pod b/doc/man3/SSL_CTX_set_options.pod
index 63609f3a31..63609f3a31 100644
--- a/doc/ssl/SSL_CTX_set_options.pod
+++ b/doc/man3/SSL_CTX_set_options.pod
diff --git a/doc/ssl/SSL_CTX_set_psk_client_callback.pod b/doc/man3/SSL_CTX_set_psk_client_callback.pod
index a4175081c5..a4175081c5 100644
--- a/doc/ssl/SSL_CTX_set_psk_client_callback.pod
+++ b/doc/man3/SSL_CTX_set_psk_client_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_quiet_shutdown.pod b/doc/man3/SSL_CTX_set_quiet_shutdown.pod
index d39d747ce7..d39d747ce7 100644
--- a/doc/ssl/SSL_CTX_set_quiet_shutdown.pod
+++ b/doc/man3/SSL_CTX_set_quiet_shutdown.pod
diff --git a/doc/ssl/SSL_CTX_set_read_ahead.pod b/doc/man3/SSL_CTX_set_read_ahead.pod
index bea8390085..bea8390085 100644
--- a/doc/ssl/SSL_CTX_set_read_ahead.pod
+++ b/doc/man3/SSL_CTX_set_read_ahead.pod
diff --git a/doc/ssl/SSL_CTX_set_security_level.pod b/doc/man3/SSL_CTX_set_security_level.pod
index 577b393729..577b393729 100644
--- a/doc/ssl/SSL_CTX_set_security_level.pod
+++ b/doc/man3/SSL_CTX_set_security_level.pod
diff --git a/doc/ssl/SSL_CTX_set_session_cache_mode.pod b/doc/man3/SSL_CTX_set_session_cache_mode.pod
index a2e82664d0..a2e82664d0 100644
--- a/doc/ssl/SSL_CTX_set_session_cache_mode.pod
+++ b/doc/man3/SSL_CTX_set_session_cache_mode.pod
diff --git a/doc/ssl/SSL_CTX_set_session_id_context.pod b/doc/man3/SSL_CTX_set_session_id_context.pod
index a873b0389e..a873b0389e 100644
--- a/doc/ssl/SSL_CTX_set_session_id_context.pod
+++ b/doc/man3/SSL_CTX_set_session_id_context.pod
diff --git a/doc/ssl/SSL_CTX_set_split_send_fragment.pod b/doc/man3/SSL_CTX_set_split_send_fragment.pod
index accf5af247..accf5af247 100644
--- a/doc/ssl/SSL_CTX_set_split_send_fragment.pod
+++ b/doc/man3/SSL_CTX_set_split_send_fragment.pod
diff --git a/doc/ssl/SSL_CTX_set_ssl_version.pod b/doc/man3/SSL_CTX_set_ssl_version.pod
index 22c0370b75..22c0370b75 100644
--- a/doc/ssl/SSL_CTX_set_ssl_version.pod
+++ b/doc/man3/SSL_CTX_set_ssl_version.pod
diff --git a/doc/ssl/SSL_CTX_set_timeout.pod b/doc/man3/SSL_CTX_set_timeout.pod
index 470efdfc29..470efdfc29 100644
--- a/doc/ssl/SSL_CTX_set_timeout.pod
+++ b/doc/man3/SSL_CTX_set_timeout.pod
diff --git a/doc/ssl/SSL_CTX_set_tlsext_status_cb.pod b/doc/man3/SSL_CTX_set_tlsext_status_cb.pod
index c12ff0e587..c12ff0e587 100644
--- a/doc/ssl/SSL_CTX_set_tlsext_status_cb.pod
+++ b/doc/man3/SSL_CTX_set_tlsext_status_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod b/doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod
index 34d8ce9ae0..34d8ce9ae0 100644
--- a/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod
+++ b/doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod
diff --git a/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod b/doc/man3/SSL_CTX_set_tmp_dh_callback.pod
index fbfb8cbaa5..fbfb8cbaa5 100644
--- a/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
+++ b/doc/man3/SSL_CTX_set_tmp_dh_callback.pod
diff --git a/doc/ssl/SSL_CTX_set_verify.pod b/doc/man3/SSL_CTX_set_verify.pod
index 96a98acaac..96a98acaac 100644
--- a/doc/ssl/SSL_CTX_set_verify.pod
+++ b/doc/man3/SSL_CTX_set_verify.pod
diff --git a/doc/ssl/SSL_CTX_use_certificate.pod b/doc/man3/SSL_CTX_use_certificate.pod
index c645f58078..c645f58078 100644
--- a/doc/ssl/SSL_CTX_use_certificate.pod
+++ b/doc/man3/SSL_CTX_use_certificate.pod
diff --git a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod b/doc/man3/SSL_CTX_use_psk_identity_hint.pod
index 753074a720..753074a720 100644
--- a/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+++ b/doc/man3/SSL_CTX_use_psk_identity_hint.pod
diff --git a/doc/ssl/SSL_CTX_use_serverinfo.pod b/doc/man3/SSL_CTX_use_serverinfo.pod
index bd496ff8c5..bd496ff8c5 100644
--- a/doc/ssl/SSL_CTX_use_serverinfo.pod
+++ b/doc/man3/SSL_CTX_use_serverinfo.pod
diff --git a/doc/ssl/SSL_SESSION_free.pod b/doc/man3/SSL_SESSION_free.pod
index 1906510e41..1906510e41 100644
--- a/doc/ssl/SSL_SESSION_free.pod
+++ b/doc/man3/SSL_SESSION_free.pod
diff --git a/doc/ssl/SSL_SESSION_get0_cipher.pod b/doc/man3/SSL_SESSION_get0_cipher.pod
index fdd36edc0c..fdd36edc0c 100644
--- a/doc/ssl/SSL_SESSION_get0_cipher.pod
+++ b/doc/man3/SSL_SESSION_get0_cipher.pod
diff --git a/doc/ssl/SSL_SESSION_get0_hostname.pod b/doc/man3/SSL_SESSION_get0_hostname.pod
index 6fb12bec37..6fb12bec37 100644
--- a/doc/ssl/SSL_SESSION_get0_hostname.pod
+++ b/doc/man3/SSL_SESSION_get0_hostname.pod
diff --git a/doc/ssl/SSL_SESSION_get0_id_context.pod b/doc/man3/SSL_SESSION_get0_id_context.pod
index 2ac3fc4dd0..2ac3fc4dd0 100644
--- a/doc/ssl/SSL_SESSION_get0_id_context.pod
+++ b/doc/man3/SSL_SESSION_get0_id_context.pod
diff --git a/doc/ssl/SSL_SESSION_get_protocol_version.pod b/doc/man3/SSL_SESSION_get_protocol_version.pod
index a033fdd9bb..a033fdd9bb 100644
--- a/doc/ssl/SSL_SESSION_get_protocol_version.pod
+++ b/doc/man3/SSL_SESSION_get_protocol_version.pod
diff --git a/doc/ssl/SSL_SESSION_get_time.pod b/doc/man3/SSL_SESSION_get_time.pod
index d92a8efb10..d92a8efb10 100644
--- a/doc/ssl/SSL_SESSION_get_time.pod
+++ b/doc/man3/SSL_SESSION_get_time.pod
diff --git a/doc/ssl/SSL_SESSION_has_ticket.pod b/doc/man3/SSL_SESSION_has_ticket.pod
index 9e37255299..9e37255299 100644
--- a/doc/ssl/SSL_SESSION_has_ticket.pod
+++ b/doc/man3/SSL_SESSION_has_ticket.pod
diff --git a/doc/ssl/SSL_SESSION_set1_id.pod b/doc/man3/SSL_SESSION_set1_id.pod
index fe8a1c485a..fe8a1c485a 100644
--- a/doc/ssl/SSL_SESSION_set1_id.pod
+++ b/doc/man3/SSL_SESSION_set1_id.pod
diff --git a/doc/ssl/SSL_accept.pod b/doc/man3/SSL_accept.pod
index 3248cacf1e..3248cacf1e 100644
--- a/doc/ssl/SSL_accept.pod
+++ b/doc/man3/SSL_accept.pod
diff --git a/doc/ssl/SSL_alert_type_string.pod b/doc/man3/SSL_alert_type_string.pod
index 6e2768e8ff..6e2768e8ff 100644
--- a/doc/ssl/SSL_alert_type_string.pod
+++ b/doc/man3/SSL_alert_type_string.pod
diff --git a/doc/ssl/SSL_check_chain.pod b/doc/man3/SSL_check_chain.pod
index 8691994229..8691994229 100644
--- a/doc/ssl/SSL_check_chain.pod
+++ b/doc/man3/SSL_check_chain.pod
diff --git a/doc/ssl/SSL_clear.pod b/doc/man3/SSL_clear.pod
index ed0ad60cbe..ed0ad60cbe 100644
--- a/doc/ssl/SSL_clear.pod
+++ b/doc/man3/SSL_clear.pod
diff --git a/doc/ssl/SSL_connect.pod b/doc/man3/SSL_connect.pod
index df198f9b2e..df198f9b2e 100644
--- a/doc/ssl/SSL_connect.pod
+++ b/doc/man3/SSL_connect.pod
diff --git a/doc/ssl/SSL_do_handshake.pod b/doc/man3/SSL_do_handshake.pod
index ffb71cc0b8..ffb71cc0b8 100644
--- a/doc/ssl/SSL_do_handshake.pod
+++ b/doc/man3/SSL_do_handshake.pod
diff --git a/doc/ssl/SSL_extension_supported.pod b/doc/man3/SSL_extension_supported.pod
index a56087e130..a56087e130 100644
--- a/doc/ssl/SSL_extension_supported.pod
+++ b/doc/man3/SSL_extension_supported.pod
diff --git a/doc/ssl/SSL_free.pod b/doc/man3/SSL_free.pod
index eb69a162bc..eb69a162bc 100644
--- a/doc/ssl/SSL_free.pod
+++ b/doc/man3/SSL_free.pod
diff --git a/doc/ssl/SSL_get0_peer_scts.pod b/doc/man3/SSL_get0_peer_scts.pod
index 05d39fee8c..05d39fee8c 100644
--- a/doc/ssl/SSL_get0_peer_scts.pod
+++ b/doc/man3/SSL_get0_peer_scts.pod
diff --git a/doc/ssl/SSL_get_SSL_CTX.pod b/doc/man3/SSL_get_SSL_CTX.pod
index 98b9bc67eb..98b9bc67eb 100644
--- a/doc/ssl/SSL_get_SSL_CTX.pod
+++ b/doc/man3/SSL_get_SSL_CTX.pod
diff --git a/doc/ssl/SSL_get_all_async_fds.pod b/doc/man3/SSL_get_all_async_fds.pod
index b4fa4ee0d1..b4fa4ee0d1 100644
--- a/doc/ssl/SSL_get_all_async_fds.pod
+++ b/doc/man3/SSL_get_all_async_fds.pod
diff --git a/doc/ssl/SSL_get_ciphers.pod b/doc/man3/SSL_get_ciphers.pod
index cc55095d47..cc55095d47 100644
--- a/doc/ssl/SSL_get_ciphers.pod
+++ b/doc/man3/SSL_get_ciphers.pod
diff --git a/doc/ssl/SSL_get_client_CA_list.pod b/doc/man3/SSL_get_client_CA_list.pod
index b6092fe32d..b6092fe32d 100644
--- a/doc/ssl/SSL_get_client_CA_list.pod
+++ b/doc/man3/SSL_get_client_CA_list.pod
diff --git a/doc/ssl/SSL_get_client_random.pod b/doc/man3/SSL_get_client_random.pod
index 46a2aa35ea..46a2aa35ea 100644
--- a/doc/ssl/SSL_get_client_random.pod
+++ b/doc/man3/SSL_get_client_random.pod
diff --git a/doc/ssl/SSL_get_current_cipher.pod b/doc/man3/SSL_get_current_cipher.pod
index 87cecb0ce2..87cecb0ce2 100644
--- a/doc/ssl/SSL_get_current_cipher.pod
+++ b/doc/man3/SSL_get_current_cipher.pod
diff --git a/doc/ssl/SSL_get_default_timeout.pod b/doc/man3/SSL_get_default_timeout.pod
index 875d38a9e6..875d38a9e6 100644
--- a/doc/ssl/SSL_get_default_timeout.pod
+++ b/doc/man3/SSL_get_default_timeout.pod
diff --git a/doc/ssl/SSL_get_error.pod b/doc/man3/SSL_get_error.pod
index ddd72f7065..ddd72f7065 100644
--- a/doc/ssl/SSL_get_error.pod
+++ b/doc/man3/SSL_get_error.pod
diff --git a/doc/ssl/SSL_get_extms_support.pod b/doc/man3/SSL_get_extms_support.pod
index ba4de3a560..ba4de3a560 100644
--- a/doc/ssl/SSL_get_extms_support.pod
+++ b/doc/man3/SSL_get_extms_support.pod
diff --git a/doc/ssl/SSL_get_fd.pod b/doc/man3/SSL_get_fd.pod
index cd5b6ecf4f..cd5b6ecf4f 100644
--- a/doc/ssl/SSL_get_fd.pod
+++ b/doc/man3/SSL_get_fd.pod
diff --git a/doc/ssl/SSL_get_peer_cert_chain.pod b/doc/man3/SSL_get_peer_cert_chain.pod
index 2e4f1e4185..2e4f1e4185 100644
--- a/doc/ssl/SSL_get_peer_cert_chain.pod
+++ b/doc/man3/SSL_get_peer_cert_chain.pod
diff --git a/doc/ssl/SSL_get_peer_certificate.pod b/doc/man3/SSL_get_peer_certificate.pod
index 57ed2723eb..57ed2723eb 100644
--- a/doc/ssl/SSL_get_peer_certificate.pod
+++ b/doc/man3/SSL_get_peer_certificate.pod
diff --git a/doc/ssl/SSL_get_psk_identity.pod b/doc/man3/SSL_get_psk_identity.pod
index d330eee52d..d330eee52d 100644
--- a/doc/ssl/SSL_get_psk_identity.pod
+++ b/doc/man3/SSL_get_psk_identity.pod
diff --git a/doc/ssl/SSL_get_rbio.pod b/doc/man3/SSL_get_rbio.pod
index 5ac4ca2740..5ac4ca2740 100644
--- a/doc/ssl/SSL_get_rbio.pod
+++ b/doc/man3/SSL_get_rbio.pod
diff --git a/doc/ssl/SSL_get_session.pod b/doc/man3/SSL_get_session.pod
index 99936ad765..99936ad765 100644
--- a/doc/ssl/SSL_get_session.pod
+++ b/doc/man3/SSL_get_session.pod
diff --git a/doc/ssl/SSL_get_shared_sigalgs.pod b/doc/man3/SSL_get_shared_sigalgs.pod
index 6a70e9023b..6a70e9023b 100644
--- a/doc/ssl/SSL_get_shared_sigalgs.pod
+++ b/doc/man3/SSL_get_shared_sigalgs.pod
diff --git a/doc/ssl/SSL_get_verify_result.pod b/doc/man3/SSL_get_verify_result.pod
index 3b8b657846..3b8b657846 100644
--- a/doc/ssl/SSL_get_verify_result.pod
+++ b/doc/man3/SSL_get_verify_result.pod
diff --git a/doc/ssl/SSL_get_version.pod b/doc/man3/SSL_get_version.pod
index 23b6497d4f..23b6497d4f 100644
--- a/doc/ssl/SSL_get_version.pod
+++ b/doc/man3/SSL_get_version.pod
diff --git a/doc/ssl/SSL_library_init.pod b/doc/man3/SSL_library_init.pod
index 6b921f66e7..6b921f66e7 100644
--- a/doc/ssl/SSL_library_init.pod
+++ b/doc/man3/SSL_library_init.pod
diff --git a/doc/ssl/SSL_load_client_CA_file.pod b/doc/man3/SSL_load_client_CA_file.pod
index cc6a19cdea..cc6a19cdea 100644
--- a/doc/ssl/SSL_load_client_CA_file.pod
+++ b/doc/man3/SSL_load_client_CA_file.pod
diff --git a/doc/ssl/SSL_new.pod b/doc/man3/SSL_new.pod
index a5a3ff98f7..a5a3ff98f7 100644
--- a/doc/ssl/SSL_new.pod
+++ b/doc/man3/SSL_new.pod
diff --git a/doc/ssl/SSL_pending.pod b/doc/man3/SSL_pending.pod
index f6ed5652a1..f6ed5652a1 100644
--- a/doc/ssl/SSL_pending.pod
+++ b/doc/man3/SSL_pending.pod
diff --git a/doc/ssl/SSL_read.pod b/doc/man3/SSL_read.pod
index 8dff2448d0..8dff2448d0 100644
--- a/doc/ssl/SSL_read.pod
+++ b/doc/man3/SSL_read.pod
diff --git a/doc/ssl/SSL_rstate_string.pod b/doc/man3/SSL_rstate_string.pod
index 7775913beb..7775913beb 100644
--- a/doc/ssl/SSL_rstate_string.pod
+++ b/doc/man3/SSL_rstate_string.pod
diff --git a/doc/ssl/SSL_session_reused.pod b/doc/man3/SSL_session_reused.pod
index eda66b2bc8..eda66b2bc8 100644
--- a/doc/ssl/SSL_session_reused.pod
+++ b/doc/man3/SSL_session_reused.pod
diff --git a/doc/ssl/SSL_set1_host.pod b/doc/man3/SSL_set1_host.pod
index 3339a0e803..3339a0e803 100644
--- a/doc/ssl/SSL_set1_host.pod
+++ b/doc/man3/SSL_set1_host.pod
diff --git a/doc/ssl/SSL_set_bio.pod b/doc/man3/SSL_set_bio.pod
index e8e55f4648..e8e55f4648 100644
--- a/doc/ssl/SSL_set_bio.pod
+++ b/doc/man3/SSL_set_bio.pod
diff --git a/doc/ssl/SSL_set_connect_state.pod b/doc/man3/SSL_set_connect_state.pod
index 60c18a4510..60c18a4510 100644
--- a/doc/ssl/SSL_set_connect_state.pod
+++ b/doc/man3/SSL_set_connect_state.pod
diff --git a/doc/ssl/SSL_set_fd.pod b/doc/man3/SSL_set_fd.pod
index e1f9988db5..e1f9988db5 100644
--- a/doc/ssl/SSL_set_fd.pod
+++ b/doc/man3/SSL_set_fd.pod
diff --git a/doc/ssl/SSL_set_session.pod b/doc/man3/SSL_set_session.pod
index 1de533f4c5..1de533f4c5 100644
--- a/doc/ssl/SSL_set_session.pod
+++ b/doc/man3/SSL_set_session.pod
diff --git a/doc/ssl/SSL_set_shutdown.pod b/doc/man3/SSL_set_shutdown.pod
index ecdf60cff3..ecdf60cff3 100644
--- a/doc/ssl/SSL_set_shutdown.pod
+++ b/doc/man3/SSL_set_shutdown.pod
diff --git a/doc/ssl/SSL_set_verify_result.pod b/doc/man3/SSL_set_verify_result.pod
index 8738d7828c..8738d7828c 100644
--- a/doc/ssl/SSL_set_verify_result.pod
+++ b/doc/man3/SSL_set_verify_result.pod
diff --git a/doc/ssl/SSL_shutdown.pod b/doc/man3/SSL_shutdown.pod
index e8ec4546a3..e8ec4546a3 100644
--- a/doc/ssl/SSL_shutdown.pod
+++ b/doc/man3/SSL_shutdown.pod
diff --git a/doc/ssl/SSL_state_string.pod b/doc/man3/SSL_state_string.pod
index a2f59e84e8..a2f59e84e8 100644
--- a/doc/ssl/SSL_state_string.pod
+++ b/doc/man3/SSL_state_string.pod
diff --git a/doc/ssl/SSL_want.pod b/doc/man3/SSL_want.pod
index e179d6befa..e179d6befa 100644
--- a/doc/ssl/SSL_want.pod
+++ b/doc/man3/SSL_want.pod
diff --git a/doc/ssl/SSL_write.pod b/doc/man3/SSL_write.pod
index 5ab079042e..5ab079042e 100644
--- a/doc/ssl/SSL_write.pod
+++ b/doc/man3/SSL_write.pod
diff --git a/doc/crypto/UI_new.pod b/doc/man3/UI_new.pod
index 9abb697807..9abb697807 100644
--- a/doc/crypto/UI_new.pod
+++ b/doc/man3/UI_new.pod
diff --git a/doc/crypto/X509V3_get_d2i.pod b/doc/man3/X509V3_get_d2i.pod
index ac560b21e9..ac560b21e9 100644
--- a/doc/crypto/X509V3_get_d2i.pod
+++ b/doc/man3/X509V3_get_d2i.pod
diff --git a/doc/crypto/X509_ALGOR_dup.pod b/doc/man3/X509_ALGOR_dup.pod
index 21845e975a..21845e975a 100644
--- a/doc/crypto/X509_ALGOR_dup.pod
+++ b/doc/man3/X509_ALGOR_dup.pod
diff --git a/doc/crypto/X509_CRL_get0_by_serial.pod b/doc/man3/X509_CRL_get0_by_serial.pod
index d9d4360fe0..d9d4360fe0 100644
--- a/doc/crypto/X509_CRL_get0_by_serial.pod
+++ b/doc/man3/X509_CRL_get0_by_serial.pod
diff --git a/doc/crypto/X509_EXTENSION_set_object.pod b/doc/man3/X509_EXTENSION_set_object.pod
index f3f0de636e..f3f0de636e 100644
--- a/doc/crypto/X509_EXTENSION_set_object.pod
+++ b/doc/man3/X509_EXTENSION_set_object.pod
diff --git a/doc/crypto/X509_LOOKUP_hash_dir.pod b/doc/man3/X509_LOOKUP_hash_dir.pod
index 08fa731238..08fa731238 100644
--- a/doc/crypto/X509_LOOKUP_hash_dir.pod
+++ b/doc/man3/X509_LOOKUP_hash_dir.pod
diff --git a/doc/crypto/X509_NAME_ENTRY_get_object.pod b/doc/man3/X509_NAME_ENTRY_get_object.pod
index 72e0f7b11d..72e0f7b11d 100644
--- a/doc/crypto/X509_NAME_ENTRY_get_object.pod
+++ b/doc/man3/X509_NAME_ENTRY_get_object.pod
diff --git a/doc/crypto/X509_NAME_add_entry_by_txt.pod b/doc/man3/X509_NAME_add_entry_by_txt.pod
index 27e5baf856..27e5baf856 100644
--- a/doc/crypto/X509_NAME_add_entry_by_txt.pod
+++ b/doc/man3/X509_NAME_add_entry_by_txt.pod
diff --git a/doc/crypto/X509_NAME_get0_der.pod b/doc/man3/X509_NAME_get0_der.pod
index f91fd4d977..f91fd4d977 100644
--- a/doc/crypto/X509_NAME_get0_der.pod
+++ b/doc/man3/X509_NAME_get0_der.pod
diff --git a/doc/crypto/X509_NAME_get_index_by_NID.pod b/doc/man3/X509_NAME_get_index_by_NID.pod
index 042da24697..042da24697 100644
--- a/doc/crypto/X509_NAME_get_index_by_NID.pod
+++ b/doc/man3/X509_NAME_get_index_by_NID.pod
diff --git a/doc/crypto/X509_NAME_print_ex.pod b/doc/man3/X509_NAME_print_ex.pod
index eba6276bee..eba6276bee 100644
--- a/doc/crypto/X509_NAME_print_ex.pod
+++ b/doc/man3/X509_NAME_print_ex.pod
diff --git a/doc/crypto/X509_PUBKEY_new.pod b/doc/man3/X509_PUBKEY_new.pod
index b13310513b..b13310513b 100644
--- a/doc/crypto/X509_PUBKEY_new.pod
+++ b/doc/man3/X509_PUBKEY_new.pod
diff --git a/doc/crypto/X509_SIG_get0.pod b/doc/man3/X509_SIG_get0.pod
index d24eadcdf9..d24eadcdf9 100644
--- a/doc/crypto/X509_SIG_get0.pod
+++ b/doc/man3/X509_SIG_get0.pod
diff --git a/doc/crypto/X509_STORE_CTX_get_error.pod b/doc/man3/X509_STORE_CTX_get_error.pod
index 105e051a1d..105e051a1d 100644
--- a/doc/crypto/X509_STORE_CTX_get_error.pod
+++ b/doc/man3/X509_STORE_CTX_get_error.pod
diff --git a/doc/crypto/X509_STORE_CTX_new.pod b/doc/man3/X509_STORE_CTX_new.pod
index bf587a3bd9..880c66cdf9 100644
--- a/doc/crypto/X509_STORE_CTX_new.pod
+++ b/doc/man3/X509_STORE_CTX_new.pod
@@ -10,9 +10,8 @@ X509_STORE_CTX_get0_param, X509_STORE_CTX_set0_param,
 X509_STORE_CTX_get0_untrusted, X509_STORE_CTX_set0_untrusted,
 X509_STORE_CTX_get_num_untrusted,
 X509_STORE_CTX_set_default,
-X509_STORE_CTX_set_verify,
-X509_STORE_set_verify,
-X509_STORE_CTX_get_verify - X509_STORE_CTX initialisation
+X509_STORE_CTX_set_verify
+- X509_STORE_CTX initialisation
 
 =head1 SYNOPSIS
 
@@ -42,11 +41,8 @@ X509_STORE_CTX_get_verify - X509_STORE_CTX initialisation
  int X509_STORE_CTX_get_num_untrusted(X509_STORE_CTX *ctx);
 
  typedef int (*X509_STORE_CTX_verify_fn)(X509_STORE_CTX *);
- X509_STORE_CTX_verify_fn X509_STORE_CTX_get_verify(X509_STORE_CTX *ctx);
  void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx, X509_STORE_CTX_verify_fn verify);
 
- void X509_STORE_set_verify(X509_STORE *ctx, X509_STORE_CTX_verify verify);
-
 =head1 DESCRIPTION
 
 These functions initialise an B<X509_STORE_CTX> structure for subsequent use
@@ -113,12 +109,7 @@ that were used in building the chain following a call to X509_verify_cert().
 
 X509_STORE_CTX_set_verify() provides the capability for overriding the default
 verify function. This function is responsible for verifying chain signatures and
-expiration times. X509_STORE_CTX_get_verify() obtains the current verify
-function being used.
-
-X509_STORE_set_verify() works in the same way as for X509_STORE_CTX_set_verify()
-but sets the default verify function to be used by all X509_STORE_CTX objects
-created for this X509_STORE.
+expiration times.
 
 A verify function is defined as an X509_STORE_CTX_verify type which has the
 following signature:
@@ -160,9 +151,6 @@ X509_STORE_CTX_set_default() returns 1 for success or 0 if an error occurred.
 X509_STORE_CTX_get_num_untrusted() returns the number of untrusted certificates
 used.
 
-X509_STORE_CTX_get_verify() returns the current verify function in use for this
-X509_STORE_CTX.
-
 =head1 SEE ALSO
 
 L<X509_verify_cert(3)>
@@ -172,9 +160,6 @@ L<X509_VERIFY_PARAM_set_flags(3)>
 
 X509_STORE_CTX_set0_crls() was first added to OpenSSL 1.0.0
 X509_STORE_CTX_get_num_untrusted() was first added to OpenSSL 1.1.0
-X509_STORE_set_verify() was first added to OpenSSL 1.1.0. It was previously
-available as a macro X509_STORE_set_verify_func(). This macro still exists but
-simply calls this function.
 
 =head1 COPYRIGHT
 
diff --git a/doc/crypto/X509_STORE_CTX_set_verify_cb.pod b/doc/man3/X509_STORE_CTX_set_verify_cb.pod
index 266a4c1ecb..78f2c3d90c 100644
--- a/doc/crypto/X509_STORE_CTX_set_verify_cb.pod
+++ b/doc/man3/X509_STORE_CTX_set_verify_cb.pod
@@ -12,7 +12,6 @@ X509_STORE_CTX_get_get_crl,
 X509_STORE_CTX_get_check_revocation,
 X509_STORE_CTX_get_check_issued,
 X509_STORE_CTX_get_get_issuer,
-X509_STORE_CTX_get_verify,
 X509_STORE_CTX_get_verify_cb,
 X509_STORE_CTX_set_verify_cb - get and set verification callback
 
@@ -27,7 +26,6 @@ X509_STORE_CTX_set_verify_cb - get and set verification callback
  void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
                                    X509_STORE_CTX_verify_cb verify_cb);
 
- X509_STORE_CTX_verify_fn X509_STORE_CTX_get_verify(X509_STORE_CTX *ctx);
  X509_STORE_CTX_get_issuer_fn X509_STORE_CTX_get_get_issuer(X509_STORE_CTX *ctx);
  X509_STORE_CTX_check_issued_fn X509_STORE_CTX_get_check_issued(X509_STORE_CTX *ctx);
  X509_STORE_CTX_check_revocation_fn X509_STORE_CTX_get_check_revocation(X509_STORE_CTX *ctx);
@@ -66,7 +64,7 @@ be passed to the callback via the B<ex_data> mechanism.
 X509_STORE_CTX_get_verify_cb() returns the value of the current callback
 for the specific B<ctx>.
 
-X509_STORE_CTX_get_verify(), X509_STORE_CTX_get_get_issuer(),
+X509_STORE_CTX_get_get_issuer(),
 X509_STORE_CTX_get_check_issued(), X509_STORE_CTX_get_check_revocation(),
 X509_STORE_CTX_get_get_crl(), X509_STORE_CTX_get_check_crl(),
 X509_STORE_CTX_get_cert_crl(), X509_STORE_CTX_get_check_policy(),
@@ -196,7 +194,7 @@ L<X509_STORE_CTX_get_ex_new_index(3)>
 
 =head1 HISTORY
 
-X509_STORE_CTX_get_verify(), X509_STORE_CTX_get_get_issuer(),
+X509_STORE_CTX_get_get_issuer(),
 X509_STORE_CTX_get_check_issued(), X509_STORE_CTX_get_check_revocation(),
 X509_STORE_CTX_get_get_crl(), X509_STORE_CTX_get_check_crl(),
 X509_STORE_CTX_get_cert_crl(), X509_STORE_CTX_get_check_policy(),
diff --git a/doc/crypto/X509_STORE_get0_param.pod b/doc/man3/X509_STORE_get0_param.pod
index 2144f2b0ae..2144f2b0ae 100644
--- a/doc/crypto/X509_STORE_get0_param.pod
+++ b/doc/man3/X509_STORE_get0_param.pod
diff --git a/doc/crypto/X509_STORE_new.pod b/doc/man3/X509_STORE_new.pod
index f7a5c81416..f7a5c81416 100644
--- a/doc/crypto/X509_STORE_new.pod
+++ b/doc/man3/X509_STORE_new.pod
diff --git a/doc/crypto/X509_STORE_set_verify_cb_func.pod b/doc/man3/X509_STORE_set_verify_cb_func.pod
index c4f48162c3..c4f48162c3 100644
--- a/doc/crypto/X509_STORE_set_verify_cb_func.pod
+++ b/doc/man3/X509_STORE_set_verify_cb_func.pod
diff --git a/doc/crypto/X509_VERIFY_PARAM_set_flags.pod b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
index 2800cd441d..2800cd441d 100644
--- a/doc/crypto/X509_VERIFY_PARAM_set_flags.pod
+++ b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
diff --git a/doc/crypto/X509_check_ca.pod b/doc/man3/X509_check_ca.pod
index b79efb5b5a..b79efb5b5a 100644
--- a/doc/crypto/X509_check_ca.pod
+++ b/doc/man3/X509_check_ca.pod
diff --git a/doc/crypto/X509_check_host.pod b/doc/man3/X509_check_host.pod
index 93848152b5..93848152b5 100644
--- a/doc/crypto/X509_check_host.pod
+++ b/doc/man3/X509_check_host.pod
diff --git a/doc/crypto/X509_check_issued.pod b/doc/man3/X509_check_issued.pod
index 8e4b1117ca..8e4b1117ca 100644
--- a/doc/crypto/X509_check_issued.pod
+++ b/doc/man3/X509_check_issued.pod
diff --git a/doc/crypto/X509_dup.pod b/doc/man3/X509_dup.pod
index 574994d00c..d704962546 100644
--- a/doc/crypto/X509_dup.pod
+++ b/doc/man3/X509_dup.pod
@@ -170,7 +170,6 @@ RSA_OAEP_PARAMS_free,
 RSA_OAEP_PARAMS_new,
 RSA_PSS_PARAMS_free,
 RSA_PSS_PARAMS_new,
-SCT_LIST_free,
 SXNETID_free,
 SXNETID_new,
 SXNET_free,
diff --git a/doc/crypto/X509_get0_signature.pod b/doc/man3/X509_get0_signature.pod
index 61a2dda981..61a2dda981 100644
--- a/doc/crypto/X509_get0_signature.pod
+++ b/doc/man3/X509_get0_signature.pod
diff --git a/doc/crypto/X509_get0_uids.pod b/doc/man3/X509_get0_uids.pod
index 4eab26e23f..4eab26e23f 100644
--- a/doc/crypto/X509_get0_uids.pod
+++ b/doc/man3/X509_get0_uids.pod
diff --git a/doc/crypto/X509_get_extension_flags.pod b/doc/man3/X509_get_extension_flags.pod
index 92e8a6ba1f..92e8a6ba1f 100644
--- a/doc/crypto/X509_get_extension_flags.pod
+++ b/doc/man3/X509_get_extension_flags.pod
diff --git a/doc/crypto/X509_get_notBefore.pod b/doc/man3/X509_get_notBefore.pod
index 82502f6588..82502f6588 100644
--- a/doc/crypto/X509_get_notBefore.pod
+++ b/doc/man3/X509_get_notBefore.pod
diff --git a/doc/crypto/X509_get_pubkey.pod b/doc/man3/X509_get_pubkey.pod
index 2b9a956c2d..2b9a956c2d 100644
--- a/doc/crypto/X509_get_pubkey.pod
+++ b/doc/man3/X509_get_pubkey.pod
diff --git a/doc/crypto/X509_get_serialNumber.pod b/doc/man3/X509_get_serialNumber.pod
index 2e81c62396..2e81c62396 100644
--- a/doc/crypto/X509_get_serialNumber.pod
+++ b/doc/man3/X509_get_serialNumber.pod
diff --git a/doc/crypto/X509_get_subject_name.pod b/doc/man3/X509_get_subject_name.pod
index ce36bbf0b2..ce36bbf0b2 100644
--- a/doc/crypto/X509_get_subject_name.pod
+++ b/doc/man3/X509_get_subject_name.pod
diff --git a/doc/crypto/X509_get_version.pod b/doc/man3/X509_get_version.pod
index c1826ea30d..c1826ea30d 100644
--- a/doc/crypto/X509_get_version.pod
+++ b/doc/man3/X509_get_version.pod
diff --git a/doc/crypto/X509_new.pod b/doc/man3/X509_new.pod
index 4f5349931a..4f5349931a 100644
--- a/doc/crypto/X509_new.pod
+++ b/doc/man3/X509_new.pod
diff --git a/doc/crypto/X509_sign.pod b/doc/man3/X509_sign.pod
index 994fd43881..994fd43881 100644
--- a/doc/crypto/X509_sign.pod
+++ b/doc/man3/X509_sign.pod
diff --git a/doc/crypto/X509_verify_cert.pod b/doc/man3/X509_verify_cert.pod
index 74acf8df71..74acf8df71 100644
--- a/doc/crypto/X509_verify_cert.pod
+++ b/doc/man3/X509_verify_cert.pod
diff --git a/doc/crypto/X509v3_get_ext_by_NID.pod b/doc/man3/X509v3_get_ext_by_NID.pod
index 032f71c494..032f71c494 100644
--- a/doc/crypto/X509v3_get_ext_by_NID.pod
+++ b/doc/man3/X509v3_get_ext_by_NID.pod
diff --git a/doc/crypto/d2i_DHparams.pod b/doc/man3/d2i_DHparams.pod
index cd1c162b40..cd1c162b40 100644
--- a/doc/crypto/d2i_DHparams.pod
+++ b/doc/man3/d2i_DHparams.pod
diff --git a/doc/crypto/d2i_Netscape_RSA.pod b/doc/man3/d2i_Netscape_RSA.pod
index ee39bd817a..ee39bd817a 100644
--- a/doc/crypto/d2i_Netscape_RSA.pod
+++ b/doc/man3/d2i_Netscape_RSA.pod
diff --git a/doc/crypto/d2i_PKCS8PrivateKey_bio.pod b/doc/man3/d2i_PKCS8PrivateKey_bio.pod
index 164d93ff4f..164d93ff4f 100644
--- a/doc/crypto/d2i_PKCS8PrivateKey_bio.pod
+++ b/doc/man3/d2i_PKCS8PrivateKey_bio.pod
diff --git a/doc/crypto/d2i_PrivateKey.pod b/doc/man3/d2i_PrivateKey.pod
index 6b12ad9eab..6b12ad9eab 100644
--- a/doc/crypto/d2i_PrivateKey.pod
+++ b/doc/man3/d2i_PrivateKey.pod
diff --git a/doc/ssl/d2i_SSL_SESSION.pod b/doc/man3/d2i_SSL_SESSION.pod
index d6b17071f6..d6b17071f6 100644
--- a/doc/ssl/d2i_SSL_SESSION.pod
+++ b/doc/man3/d2i_SSL_SESSION.pod
diff --git a/doc/crypto/d2i_X509.pod b/doc/man3/d2i_X509.pod
index 06546a4875..06546a4875 100644
--- a/doc/crypto/d2i_X509.pod
+++ b/doc/man3/d2i_X509.pod
diff --git a/doc/crypto/i2d_CMS_bio_stream.pod b/doc/man3/i2d_CMS_bio_stream.pod
index ece7a4800e..ece7a4800e 100644
--- a/doc/crypto/i2d_CMS_bio_stream.pod
+++ b/doc/man3/i2d_CMS_bio_stream.pod
diff --git a/doc/crypto/i2d_PKCS7_bio_stream.pod b/doc/man3/i2d_PKCS7_bio_stream.pod
index b42940a83c..b42940a83c 100644
--- a/doc/crypto/i2d_PKCS7_bio_stream.pod
+++ b/doc/man3/i2d_PKCS7_bio_stream.pod
diff --git a/doc/crypto/i2d_re_X509_tbs.pod b/doc/man3/i2d_re_X509_tbs.pod
index 672c7ab5ae..672c7ab5ae 100644
--- a/doc/crypto/i2d_re_X509_tbs.pod
+++ b/doc/man3/i2d_re_X509_tbs.pod
diff --git a/doc/crypto/o2i_SCT_LIST.pod b/doc/man3/o2i_SCT_LIST.pod
index 82922fce15..82922fce15 100644
--- a/doc/crypto/o2i_SCT_LIST.pod
+++ b/doc/man3/o2i_SCT_LIST.pod
diff --git a/doc/apps/config.pod b/doc/man5/config.pod
index a9cde8952a..9df0ecb1e4 100644
--- a/doc/apps/config.pod
+++ b/doc/man5/config.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:5
-
 =head1 NAME
 
 config - OpenSSL CONF library configuration files
diff --git a/doc/apps/x509v3_config.pod b/doc/man5/x509v3_config.pod
index edfd76e125..e78cf7d760 100644
--- a/doc/apps/x509v3_config.pod
+++ b/doc/man5/x509v3_config.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:5
-
 =head1 NAME
 
 x509v3_config - X509 V3 certificate extension configuration format
diff --git a/doc/crypto/bio.pod b/doc/man7/bio.pod
index 1e1dd02106..ec0d2df2c2 100644
--- a/doc/crypto/bio.pod
+++ b/doc/man7/bio.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section 7
-
 =head1 NAME
 
 bio - Basic I/O abstraction
diff --git a/doc/crypto/crypto.pod b/doc/man7/crypto.pod
index 082f8435b2..9dd0564645 100644
--- a/doc/crypto/crypto.pod
+++ b/doc/man7/crypto.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 crypto - OpenSSL cryptographic library
diff --git a/doc/crypto/ct.pod b/doc/man7/ct.pod
index bdcda98618..119899c6da 100644
--- a/doc/crypto/ct.pod
+++ b/doc/man7/ct.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 ct - Certificate Transparency
diff --git a/doc/crypto/des_modes.pod b/doc/man7/des_modes.pod
index 5107b77c8d..50871f63f0 100644
--- a/doc/crypto/des_modes.pod
+++ b/doc/man7/des_modes.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 des_modes - the variants of DES and other crypto algorithms of OpenSSL
diff --git a/doc/crypto/evp.pod b/doc/man7/evp.pod
index 31f459084d..c930e7d1fe 100644
--- a/doc/crypto/evp.pod
+++ b/doc/man7/evp.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 evp - high-level cryptographic functions
diff --git a/doc/ssl/ssl.pod b/doc/man7/ssl.pod
index 582a276a8f..b67edbc467 100644
--- a/doc/ssl/ssl.pod
+++ b/doc/man7/ssl.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 SSL - OpenSSL SSL/TLS library
diff --git a/doc/crypto/x509.pod b/doc/man7/x509.pod
index 8319b15270..a8969deea1 100644
--- a/doc/crypto/x509.pod
+++ b/doc/man7/x509.pod
@@ -1,7 +1,5 @@
 =pod
 
-=for comment openssl_manual_section:7
-
 =head1 NAME
 
 x509 - X.509 certificate handling
diff --git a/util/find-doc-nits.pl b/util/find-doc-nits.pl
index d9d16d698e..9d73c99c66 100755
--- a/util/find-doc-nits.pl
+++ b/util/find-doc-nits.pl
@@ -26,10 +26,6 @@ my %mandatory_sections =
       3      => [ 'SYNOPSIS', 'RETURN\s+VALUES' ],
       5      => [ ],
       7      => [ ] );
-my %default_sections =
-    ( apps   => 1,
-      crypto => 3,
-      ssl    => 3 );
 
 # Cross-check functions in the NAME and SYNOPSIS section.
 sub name_synopsis()
@@ -112,8 +108,7 @@ sub check()
 
     &name_synopsis($id, $filename, $contents)
         unless $contents =~ /=for comment generic/
-            or $contents =~ /=for comment openssl_manual_section:7/
-            or $filename =~ m@/apps/@;
+            or $filename =~ m@man[157]/@;
 
     print "$id doesn't start with =pod\n"
         if $contents !~ /^=pod/;
@@ -156,10 +151,8 @@ sub check()
 
     # Find what section this page is in.  If run from "." assume
     # section 3.
-    my $section = $default_sections{$dirname} || 3;
-    if ($contents =~ /^=for\s+comment\s+openssl_manual_section:\s*(\d+)\s*$/m) {
-        $section = $1;
-    }
+    my $section = 3;
+    $section = $1 if $dirname =~ /man([1-9])/;
 
     foreach ((@{$mandatory_sections{'*'}}, @{$mandatory_sections{$section}})) {
         print "$id doesn't have a head1 section matching $_\n"
diff --git a/util/find-undoc-api.pl b/util/find-undoc-api.pl
index 7b2cb973b7..585ccc4b62 100755
--- a/util/find-undoc-api.pl
+++ b/util/find-undoc-api.pl
@@ -44,13 +44,11 @@ sub getdocced()
     my %return;
 
     foreach my $pod ( glob("$dir/*.pod") ) {
-        next if $pod eq 'doc/crypto/crypto.pod';
-        next if $pod eq 'doc/ssl/ssl.pod';
         my %podinfo = extract_pod_info($pod);
         foreach my $n ( @{$podinfo{names}} ) {
             $return{$n} = $pod;
             print "# Duplicate $n in $pod and $dups{$n}\n"
-                if defined $dups{$n};
+                if defined $dups{$n} && $dups{$n} ne $pod;
             $dups{$n} = $pod;
         }
     }
@@ -58,11 +56,11 @@ sub getdocced()
     return %return;
 }
 
+my %docced = &getdocced('doc/man3');
+
 sub printem()
 {
-    my $docdir = shift;
     my $numfile = shift;
-    my %docced = &getdocced($docdir);
     my $count = 0;
 
     foreach my $func ( &parsenum($numfile) ) {
@@ -77,6 +75,5 @@ sub printem()
     print "# Found $count missing from $numfile\n\n";
 }
 
-
-&printem('doc/crypto', 'util/libcrypto.num');
-&printem('doc/ssl', 'util/libssl.num');
+&printem('util/libcrypto.num');
+&printem('util/libssl.num');
diff --git a/util/perl/OpenSSL/Util/Pod.pm b/util/perl/OpenSSL/Util/Pod.pm
index 5c0af95918..9f76fbf1a6 100644
--- a/util/perl/OpenSSL/Util/Pod.pm
+++ b/util/perl/OpenSSL/Util/Pod.pm
@@ -53,11 +53,8 @@ The additional hash is for extra parameters:
 
 =item B<section =E<gt> N>
 
-The value MUST be a number, and will be the default man section number
-to be used with the given .pod file.  This number can be altered if
-the .pod file has a line like this:
-
-  =for comment openssl_manual_section: 4
+The value MUST be a number, and will be the man section number
+to be used with the given .pod file.
 
 =item B<debug =E<gt> 0|1>
 
@@ -109,12 +106,6 @@ sub extract_pod_info {
     my %podinfo = ( section => $defaults{section});
     while(<$input>) {
         s|\R$||;
-        if (m|^=for\s+comment\s+openssl_manual_section:\s*([0-9])\s*$|) {
-            print STDERR "DEBUG: Found man section number $1\n"
-                if $defaults{debug};
-            $podinfo{section} = $1;
-        }
-
         # Stop reading when we have reached past the NAME section.
         last if (m|^=head1|
                  && defined $podinfo{lastsect}
diff --git a/util/process_docs.pl b/util/process_docs.pl
index 8b8de81acd..2c54f02c6c 100644
--- a/util/process_docs.pl
+++ b/util/process_docs.pl
@@ -28,26 +28,23 @@ use OpenSSL::Util::Pod;
 my %options = ();
 GetOptions(\%options,
            'sourcedir=s',       # Source directory
-           'subdir=s%',         # Subdirectories to look through,
+           'section=i@',        # Subdirectories to look through,
                                 # with associated section numbers
            'destdir=s',         # Destination directory
            #'in=s@',             # Explicit files to process (ignores sourcedir)
-           #'section=i',         # Default section used for --in files
            'type=s',            # The result type, 'man' or 'html'
            'remove',            # To remove files rather than writing them
            'dry-run|n',         # Only output file names on STDOUT
            'debug|D+',
           );
 
-unless ($options{subdir}) {
-    $options{subdir} = { apps   => '1',
-                         crypto => '3',
-                         ssl    => '3' };
+unless ($options{section}) {
+    $options{section} = [ 1, 3, 5, 7 ];
 }
 unless ($options{sourcedir}) {
     $options{sourcedir} = catdir($config{sourcedir}, "doc");
 }
-pod2usage(1) unless ( defined $options{subdir}
+pod2usage(1) unless ( defined $options{section}
                       && defined $options{sourcedir}
                       && defined $options{destdir}
                       && defined $options{type}
@@ -62,8 +59,8 @@ if ($options{debug}) {
         if defined $options{destdir};
     print STDERR "DEBUG:   --type      = $options{type}\n"
         if defined $options{type};
-    foreach (keys %{$options{subdir}}) {
-        print STDERR "DEBUG:   --subdir    = $_=$options{subdir}->{$_}\n";
+    foreach (sort @{$options{section}}) {
+        print STDERR "DEBUG:   --section   = $_\n";
     }
     print STDERR "DEBUG:   --remove    = $options{remove}\n"
         if defined $options{remove};
@@ -75,8 +72,8 @@ if ($options{debug}) {
 
 my $symlink_exists = eval { symlink("",""); 1 };
 
-foreach my $subdir (keys %{$options{subdir}}) {
-    my $section = $options{subdir}->{$subdir};
+foreach my $section (sort @{$options{section}}) {
+    my $subdir = "man$section";
     my $podsourcedir = catfile($options{sourcedir}, $subdir);
     my $podglob = catfile($podsourcedir, "*.pod");