summaryrefslogtreecommitdiffstats
path: root/regress/usr.bin/mandoc/mdoc
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2014-08-26 11:32:53 +0000
committerschwarze <schwarze@openbsd.org>2014-08-26 11:32:53 +0000
commitc900c619af97f430405c0ff52ecd21f9fb308d20 (patch)
tree5e38031ab395b8a7c7e8e7a1bf5ad9b295a0ad49 /regress/usr.bin/mandoc/mdoc
parentUnify console and CGI section titles, bringing them closer to groff, (diff)
downloadwireguard-openbsd-c900c619af97f430405c0ff52ecd21f9fb308d20.tar.xz
wireguard-openbsd-c900c619af97f430405c0ff52ecd21f9fb308d20.zip
inevitable churn caused by the section title change
Diffstat (limited to 'regress/usr.bin/mandoc/mdoc')
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ad/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ad/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/An/break.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ap/eos.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ap/middle.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Aq/empty.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ar/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ar/punct.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/At/invalid.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/badargs.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/blank.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/break.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/broken.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/centered.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/empty.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/nested.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/offset-empty.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/spacing.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bd/unclosed.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bf/badargs.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bf/break.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bf/broken.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bf/multiargs.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bf/nest.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bk/badarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bk/break.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bk/inputlines.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bk/lines.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/badargs.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/bareIt.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/broken.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/diag.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/empty.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/emptyhead.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/emptyitem.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/emptytag.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/extend.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/hang.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/inset.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/item.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/multitag.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/multitype.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/nested.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/noIt.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/notype.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/ohang.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/unclosed.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Brq/empty.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bx/args.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Cd/eos.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Cd/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Cd/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Cm/basic.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Cm/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Cm/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dd/badarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dd/dupe.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dd/late.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dd/manarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dd/order.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dl/spacing.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dq/empty.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dt/case.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dt/dupe.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dt/nobody.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dt/order.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dv/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dv/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Em/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Em/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Eo/empty.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Eo/obsolete.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Er/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Er/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ev/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ev/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ex/args.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ex/noname.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ex/nostd.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fd/break.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fd/eos.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fd/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fl/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fl/multiarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fl/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fl/parsed.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fl/punct.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fo/basic.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fo/break.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fo/eos.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fo/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fo/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fo/obsolete.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fo/section.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ft/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ic/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ic/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/In/break.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/In/eos.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/In/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Lb/break.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Lb/eos.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Li/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Li/punct.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Lk/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Lk/link.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Lk/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ms/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ms/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Mt/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Mt/simple.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Nd/hyph.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Nd/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Nm/break.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Nm/empty.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Nm/emptyNAME.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Nm/emptyNAMEuse.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Nm/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Nm/long.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Nm/punct.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/No/punct.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/No/spacing.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ns/position.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ns/punct.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Op/broken.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Op/punct.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Os/dupe.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Os/late.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Os/missing.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ox/keep.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Pa/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Pa/punct.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Pf/spacing.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Pp/arg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Qq/empty.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Rs/allch.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Rs/break.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Rs/three_authors.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Rv/args.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Rv/noname.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Rv/nostd.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sh/badNAME.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sh/before.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sh/emptyNAME.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sh/order.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sh/subbefore.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sm/badarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sm/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sm/scope.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sm/spacing-No.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sm/spacing-Op.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sq/empty.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/St/badargs.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sx/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sx/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sy/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Sy/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Tn/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Tn/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ux/eos.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Ux/spacing.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Va/basic.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Va/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Va/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Vt/child.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Vt/font.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Vt/noarg.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Vt/spacing.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/blank/comment.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/blank/line.out_ascii2
-rw-r--r--regress/usr.bin/mandoc/mdoc/blank/list.out_ascii2
185 files changed, 185 insertions, 185 deletions
diff --git a/regress/usr.bin/mandoc/mdoc/Ad/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Ad/font.out_ascii
index 86529c66332..810107bc93b 100644
--- a/regress/usr.bin/mandoc/mdoc/Ad/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ad/font.out_ascii
@@ -1,4 +1,4 @@
-AD-FONT(1) OpenBSD Reference Manual AD-FONT(1)
+AD-FONT(1) General Commands Manual AD-FONT(1)
NNAAMMEE
AAdd--ffoonntt - changing fonts inside the address macro
diff --git a/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_ascii
index 59f69c744b8..6ad60d8a210 100644
--- a/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ad/noarg.out_ascii
@@ -1,4 +1,4 @@
-AD-NOARG(1) OpenBSD Reference Manual AD-NOARG(1)
+AD-NOARG(1) General Commands Manual AD-NOARG(1)
NNAAMMEE
AAdd--nnooaarrgg - address macro without an argument
diff --git a/regress/usr.bin/mandoc/mdoc/An/break.out_ascii b/regress/usr.bin/mandoc/mdoc/An/break.out_ascii
index 176a3bdd493..f03ffac81cc 100644
--- a/regress/usr.bin/mandoc/mdoc/An/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/An/break.out_ascii
@@ -1,4 +1,4 @@
-AN-BREAK(1) OpenBSD Reference Manual AN-BREAK(1)
+AN-BREAK(1) General Commands Manual AN-BREAK(1)
NNAAMMEE
AAnn--bbrreeaakk - line breaking of the author macro
diff --git a/regress/usr.bin/mandoc/mdoc/Ap/eos.out_ascii b/regress/usr.bin/mandoc/mdoc/Ap/eos.out_ascii
index 91d3084b02a..c91617c682e 100644
--- a/regress/usr.bin/mandoc/mdoc/Ap/eos.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ap/eos.out_ascii
@@ -1,4 +1,4 @@
-AP-EOS(1) OpenBSD Reference Manual AP-EOS(1)
+AP-EOS(1) General Commands Manual AP-EOS(1)
NNAAMMEE
AApp--eeooss - end of sentence handling after the apostrophe macro
diff --git a/regress/usr.bin/mandoc/mdoc/Ap/middle.out_ascii b/regress/usr.bin/mandoc/mdoc/Ap/middle.out_ascii
index d8e9f10dd7e..c51bd6d89dd 100644
--- a/regress/usr.bin/mandoc/mdoc/Ap/middle.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ap/middle.out_ascii
@@ -1,4 +1,4 @@
-AP-MIDDLE(1) OpenBSD Reference Manual AP-MIDDLE(1)
+AP-MIDDLE(1) General Commands Manual AP-MIDDLE(1)
NNAAMMEE
AApp--mmiiddddllee - apostrophe in the middle of a macro line
diff --git a/regress/usr.bin/mandoc/mdoc/Aq/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Aq/empty.out_ascii
index cbebfdd43a4..c587ee51976 100644
--- a/regress/usr.bin/mandoc/mdoc/Aq/empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Aq/empty.out_ascii
@@ -1,4 +1,4 @@
-AQ-EMPTY(1) OpenBSD Reference Manual AQ-EMPTY(1)
+AQ-EMPTY(1) General Commands Manual AQ-EMPTY(1)
NNAAMMEE
AAqq--eemmppttyy - empty implicit enclosure macros
diff --git a/regress/usr.bin/mandoc/mdoc/Ar/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Ar/font.out_ascii
index 9bef08d69e8..c30d00782dd 100644
--- a/regress/usr.bin/mandoc/mdoc/Ar/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ar/font.out_ascii
@@ -1,4 +1,4 @@
-AR-FONT(1) OpenBSD Reference Manual AR-FONT(1)
+AR-FONT(1) General Commands Manual AR-FONT(1)
NNAAMMEE
AArr--ffoonntt - changing fonts inside the argument macro
diff --git a/regress/usr.bin/mandoc/mdoc/Ar/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Ar/punct.out_ascii
index 77e19558154..d780dbcff26 100644
--- a/regress/usr.bin/mandoc/mdoc/Ar/punct.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ar/punct.out_ascii
@@ -1,4 +1,4 @@
-AR-PUNCT(1) OpenBSD Reference Manual AR-PUNCT(1)
+AR-PUNCT(1) General Commands Manual AR-PUNCT(1)
NNAAMMEE
AArr--ppuunncctt - punctuation handling by the Ar macro
diff --git a/regress/usr.bin/mandoc/mdoc/At/invalid.out_ascii b/regress/usr.bin/mandoc/mdoc/At/invalid.out_ascii
index 2d1ed362a5b..c1cab598e3b 100644
--- a/regress/usr.bin/mandoc/mdoc/At/invalid.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/At/invalid.out_ascii
@@ -1,4 +1,4 @@
-AT-INVALID(1) OpenBSD Reference Manual AT-INVALID(1)
+AT-INVALID(1) General Commands Manual AT-INVALID(1)
NNAAMMEE
AAtt--iinnvvaalliidd - handling of an invalid AT&T UNIX argument
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_ascii
index 56e551737e0..b690d28e570 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_ascii
@@ -1,4 +1,4 @@
-BD-BADARGS(1) OpenBSD Reference Manual BD-BADARGS(1)
+BD-BADARGS(1) General Commands Manual BD-BADARGS(1)
NNAAMMEE
BBdd--bbaaddaarrggss - display block with bad arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/blank.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/blank.out_ascii
index d2bd62f0620..de03e318ae1 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/blank.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/blank.out_ascii
@@ -1,4 +1,4 @@
-BD-BLANK(1) OpenBSD Reference Manual BD-BLANK(1)
+BD-BLANK(1) General Commands Manual BD-BLANK(1)
NNAAMMEE
BBdd--bbllaannkk - handling of blank lines in literal displays
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/break.out_ascii
index bb04bce8011..42f9eb25632 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/break.out_ascii
@@ -1,4 +1,4 @@
-BD-BREAK(1) OpenBSD Reference Manual BD-BREAK(1)
+BD-BREAK(1) General Commands Manual BD-BREAK(1)
NNAAMMEE
BBdd--bbrreeaakk - display breaking another block
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/broken.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/broken.out_ascii
index f59c4830c1c..5b24c21b0ad 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/broken.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/broken.out_ascii
@@ -1,4 +1,4 @@
-BD-BROKEN(1) OpenBSD Reference Manual BD-BROKEN(1)
+BD-BROKEN(1) General Commands Manual BD-BROKEN(1)
NNAAMMEE
BBdd--bbrrookkeenn - display broken by another block
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/centered.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/centered.out_ascii
index b1e1e2cc588..1f0bb194404 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/centered.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/centered.out_ascii
@@ -1,4 +1,4 @@
-BD-CENTERED(1) OpenBSD Reference Manual BD-CENTERED(1)
+BD-CENTERED(1) General Commands Manual BD-CENTERED(1)
NNAAMMEE
BBdd--cceenntteerreedd - centered display blocks
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/empty.out_ascii
index 0a275ee82fc..fefe835128c 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/empty.out_ascii
@@ -1,4 +1,4 @@
-BD-EMPTY(1) OpenBSD Reference Manual BD-EMPTY(1)
+BD-EMPTY(1) General Commands Manual BD-EMPTY(1)
NNAAMMEE
BBdd--eemmppttyy - empty displays
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/nested.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/nested.out_ascii
index 0ce7e4f5bdd..439611d81c0 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/nested.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/nested.out_ascii
@@ -1,4 +1,4 @@
-BD-NESTED(1) OpenBSD Reference Manual BD-NESTED(1)
+BD-NESTED(1) General Commands Manual BD-NESTED(1)
NNAAMMEE
BBdd--nneesstteedd - nested displays and lists
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.out_ascii
index 6b675340471..d33b537d15f 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/offset-empty.out_ascii
@@ -1,4 +1,4 @@
-BD-OFFSET-EMPTY(1) OpenBSD Reference Manual BD-OFFSET-EMPTY(1)
+BD-OFFSET-EMPTY(1) General Commands Manual BD-OFFSET-EMPTY(1)
NNAAMMEE
BBdd--ooffffsseett--eemmppttyy - no argument specified to Bd offset
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/spacing.out_ascii
index 4c1c4ee14ec..de8bee5cb9f 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/spacing.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/spacing.out_ascii
@@ -1,4 +1,4 @@
-BD-SPACING(1) OpenBSD Reference Manual BD-SPACING(1)
+BD-SPACING(1) General Commands Manual BD-SPACING(1)
NNAAMMEE
BBdd--ssppaacciinngg - vertical spacing around display blocks
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/unclosed.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/unclosed.out_ascii
index d9f01f0ae61..edea5b09658 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/unclosed.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/unclosed.out_ascii
@@ -1,4 +1,4 @@
-BD-UNCLOSED(1) OpenBSD Reference Manual BD-UNCLOSED(1)
+BD-UNCLOSED(1) General Commands Manual BD-UNCLOSED(1)
NNAAMMEE
BBdd--uunncclloosseedd - display still open at the end of the file
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_ascii b/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_ascii
index 7010d30d2dd..8d26ac4ba17 100644
--- a/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_ascii
@@ -1,4 +1,4 @@
-BF-BADARGS(1) OpenBSD Reference Manual BF-BADARGS(1)
+BF-BADARGS(1) General Commands Manual BF-BADARGS(1)
NNAAMMEE
BBff--bbaaddaarrggss - font blocks with bad arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Bf/break.out_ascii
index ab8270d49d5..6fcd71cfc08 100644
--- a/regress/usr.bin/mandoc/mdoc/Bf/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bf/break.out_ascii
@@ -1,4 +1,4 @@
-BF-BREAK(1) OpenBSD Reference Manual BF-BREAK(1)
+BF-BREAK(1) General Commands Manual BF-BREAK(1)
NNAAMMEE
BBff--bbrreeaakk - font block breaking another block
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/broken.out_ascii b/regress/usr.bin/mandoc/mdoc/Bf/broken.out_ascii
index b626dbb0d70..0320ca95dc7 100644
--- a/regress/usr.bin/mandoc/mdoc/Bf/broken.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bf/broken.out_ascii
@@ -1,4 +1,4 @@
-BF-BROKEN(1) OpenBSD Reference Manual BF-BROKEN(1)
+BF-BROKEN(1) General Commands Manual BF-BROKEN(1)
NNAAMMEE
BBff--bbrrookkeenn - font block broken by another block
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/multiargs.out_ascii b/regress/usr.bin/mandoc/mdoc/Bf/multiargs.out_ascii
index 653bf46c21b..52b89778ddf 100644
--- a/regress/usr.bin/mandoc/mdoc/Bf/multiargs.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bf/multiargs.out_ascii
@@ -1,4 +1,4 @@
-BF-MULTIARGS(1) OpenBSD Reference Manual BF-MULTIARGS(1)
+BF-MULTIARGS(1) General Commands Manual BF-MULTIARGS(1)
NNAAMMEE
BBff--mmuullttiiaarrggss - font blocks with multiple arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/nest.out_ascii b/regress/usr.bin/mandoc/mdoc/Bf/nest.out_ascii
index 80455dcce96..117a358d3ab 100644
--- a/regress/usr.bin/mandoc/mdoc/Bf/nest.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bf/nest.out_ascii
@@ -1,4 +1,4 @@
-BF-NEST(1) OpenBSD Reference Manual BF-NEST(1)
+BF-NEST(1) General Commands Manual BF-NEST(1)
NNAAMMEE
BBff--nneesstt - nesting font blocks
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_ascii
index 6823dfe93d0..9303d3f0186 100644
--- a/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bk/badarg.out_ascii
@@ -1,4 +1,4 @@
-BK-BADARG(1) OpenBSD Reference Manual BK-BADARG(1)
+BK-BADARG(1) General Commands Manual BK-BADARG(1)
NNAAMMEE
BBkk--bbaaddaarrgg - bad arguments after Bk
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Bk/break.out_ascii
index 50dcd533849..d39d64dc4a7 100644
--- a/regress/usr.bin/mandoc/mdoc/Bk/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bk/break.out_ascii
@@ -1,4 +1,4 @@
-BK-BREAK(1) OpenBSD Reference Manual BK-BREAK(1)
+BK-BREAK(1) General Commands Manual BK-BREAK(1)
NNAAMMEE
BBkk--bbrreeaakk - handling of word keeps
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/inputlines.out_ascii b/regress/usr.bin/mandoc/mdoc/Bk/inputlines.out_ascii
index 52da2ec6e77..448872f63da 100644
--- a/regress/usr.bin/mandoc/mdoc/Bk/inputlines.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bk/inputlines.out_ascii
@@ -1,4 +1,4 @@
-BK-INPUTLINES(1) OpenBSD Reference Manual BK-INPUTLINES(1)
+BK-INPUTLINES(1) General Commands Manual BK-INPUTLINES(1)
NNAAMMEE
BBkk--iinnppuuttlliinneess - effect of input lines breaks on word keeps
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/lines.out_ascii b/regress/usr.bin/mandoc/mdoc/Bk/lines.out_ascii
index eac37faef48..544804e45a3 100644
--- a/regress/usr.bin/mandoc/mdoc/Bk/lines.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bk/lines.out_ascii
@@ -1,4 +1,4 @@
-BK-LINES(1) OpenBSD Reference Manual BK-LINES(1)
+BK-LINES(1) General Commands Manual BK-LINES(1)
NNAAMMEE
BBkk--lliinneess - handling of line keeps
diff --git a/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii b/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii
index d105c3ee619..5ace74897a9 100644
--- a/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bk/synopsis.out_ascii
@@ -1,4 +1,4 @@
-BK-SYNOPSIS(1) OpenBSD Reference Manual BK-SYNOPSIS(1)
+BK-SYNOPSIS(1) General Commands Manual BK-SYNOPSIS(1)
NNAAMMEE
BBkk--ssyynnooppssiiss - automatic keeps in the synopsis
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_ascii
index c90878b15b2..c3eaeff5fa7 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_ascii
@@ -1,4 +1,4 @@
-BL-BADARGS(1) OpenBSD Reference Manual BL-BADARGS(1)
+BL-BADARGS(1) General Commands Manual BL-BADARGS(1)
NNAAMMEE
BBll--bbaaddaarrggss - list with bad arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/bareIt.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/bareIt.out_ascii
index aa1401a0b55..9c625c74bad 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/bareIt.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/bareIt.out_ascii
@@ -1,4 +1,4 @@
-BL-BAREIT(1) OpenBSD Reference Manual BL-BAREIT(1)
+BL-BAREIT(1) General Commands Manual BL-BAREIT(1)
NNAAMMEE
BBll--bbaarreeIItt - item macro outside list
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_ascii
index c5139d9cee5..d1378e08719 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_ascii
@@ -1,4 +1,4 @@
-TA-BARE(1) OpenBSD Reference Manual TA-BARE(1)
+TA-BARE(1) General Commands Manual TA-BARE(1)
NNAAMMEE
TTaa--bbaarree - bare tabular column macro
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii
index bc3e2769440..46218053f9d 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii
@@ -1,4 +1,4 @@
-BL-BREAK(1) OpenBSD Reference Manual BL-BREAK(1)
+BL-BREAK(1) General Commands Manual BL-BREAK(1)
NNAAMMEE
BBll--bbrreeaakk - list breaking another block
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/broken.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/broken.out_ascii
index 2f1575930e2..ef3a5802b0f 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/broken.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/broken.out_ascii
@@ -1,4 +1,4 @@
-BL-BROKEN(1) OpenBSD Reference Manual BL-BROKEN(1)
+BL-BROKEN(1) General Commands Manual BL-BROKEN(1)
NNAAMMEE
BBll--bbrrookkeenn - list broken by another block
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii
index 5722099d36c..d8442e0a787 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/bullet.out_ascii
@@ -1,4 +1,4 @@
-BL-BULLET(1) OpenBSD Reference Manual BL-BULLET(1)
+BL-BULLET(1) General Commands Manual BL-BULLET(1)
NNAAMMEE
BBll--bbuulllleett - bullet lists
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii
index 6a16b9956a8..e9d90cfe277 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii
@@ -1,4 +1,4 @@
-BL-COLUMN(1) OpenBSD Reference Manual BL-COLUMN(1)
+BL-COLUMN(1) General Commands Manual BL-COLUMN(1)
NNAAMMEE
BBll--ccoolluummnn - lists with multiple columns
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii
index 07f78523b66..f2a53dc1190 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/dash.out_ascii
@@ -1,4 +1,4 @@
-BL-DASH(1) OpenBSD Reference Manual BL-DASH(1)
+BL-DASH(1) General Commands Manual BL-DASH(1)
NNAAMMEE
BBll--ddaasshh - dash and hyphen lists
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/diag.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/diag.out_ascii
index 5d2c32815fd..9ee7a946b6d 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/diag.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/diag.out_ascii
@@ -1,4 +1,4 @@
-BL-DIAG(1) OpenBSD Reference Manual BL-DIAG(1)
+BL-DIAG(1) General Commands Manual BL-DIAG(1)
NNAAMMEE
BBll--ddiiaagg - section 4 diagnostic lists
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/empty.out_ascii
index bc8dc78d613..aba64bbe215 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/empty.out_ascii
@@ -1,4 +1,4 @@
-BL-EMPTY(1) OpenBSD Reference Manual BL-EMPTY(1)
+BL-EMPTY(1) General Commands Manual BL-EMPTY(1)
NNAAMMEE
BBll--eemmppttyy - empty lists
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/emptyhead.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/emptyhead.out_ascii
index 53117f4f0d1..3d0d0108cca 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/emptyhead.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/emptyhead.out_ascii
@@ -1,4 +1,4 @@
-BL-EMPTYHEAD(1) OpenBSD Reference Manual BL-EMPTYHEAD(1)
+BL-EMPTYHEAD(1) General Commands Manual BL-EMPTYHEAD(1)
NNAAMMEE
BBll--eemmppttyyhheeaadd - lists with empty item heads
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/emptyitem.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/emptyitem.out_ascii
index 2de9533ea06..a8d8c874bf5 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/emptyitem.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/emptyitem.out_ascii
@@ -1,4 +1,4 @@
-BL-EMPTYITEM(1) OpenBSD Reference Manual BL-EMPTYITEM(1)
+BL-EMPTYITEM(1) General Commands Manual BL-EMPTYITEM(1)
NNAAMMEE
BBll--eemmppttyyiitteemm - lists with fixed heads and empty items
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/emptytag.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/emptytag.out_ascii
index f83f0539995..533480b1a00 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/emptytag.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/emptytag.out_ascii
@@ -1,4 +1,4 @@
-BL-EMPTYTAG(1) OpenBSD Reference Manual BL-EMPTYTAG(1)
+BL-EMPTYTAG(1) General Commands Manual BL-EMPTYTAG(1)
NNAAMMEE
BBll--eemmppttyyttaagg - tag lists with empty item heads
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii
index 49ba343bf5f..71e4a7fdc96 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/enum.out_ascii
@@ -1,4 +1,4 @@
-BL-ENUM(1) OpenBSD Reference Manual BL-ENUM(1)
+BL-ENUM(1) General Commands Manual BL-ENUM(1)
NNAAMMEE
BBll--eennuumm - enumerated lists
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/extend.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/extend.out_ascii
index 8ba1613680e..6676ea486f6 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/extend.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/extend.out_ascii
@@ -1,4 +1,4 @@
-BL-EXTEND(1) OpenBSD Reference Manual BL-EXTEND(1)
+BL-EXTEND(1) General Commands Manual BL-EXTEND(1)
NNAAMMEE
BBll--eexxtteenndd - extending block headers
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/hang.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/hang.out_ascii
index 54178ce052e..1081c09a1e8 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/hang.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/hang.out_ascii
@@ -1,4 +1,4 @@
-BL-HANG(1) OpenBSD Reference Manual BL-HANG(1)
+BL-HANG(1) General Commands Manual BL-HANG(1)
NNAAMMEE
BBll--hhaanngg - hanged lists
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/inset.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/inset.out_ascii
index ea4b53ec6f5..4927df78aa0 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/inset.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/inset.out_ascii
@@ -1,4 +1,4 @@
-BL-INSET(1) OpenBSD Reference Manual BL-INSET(1)
+BL-INSET(1) General Commands Manual BL-INSET(1)
NNAAMMEE
BBll--iinnsseett - inset list labels
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/item.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/item.out_ascii
index 3ad42d9a011..ae3f452456b 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/item.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/item.out_ascii
@@ -1,4 +1,4 @@
-BL-ITEM(1) OpenBSD Reference Manual BL-ITEM(1)
+BL-ITEM(1) General Commands Manual BL-ITEM(1)
NNAAMMEE
BBll--iitteemm - itemized lists
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/multitag.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/multitag.out_ascii
index 5bed59048ca..3167b58718c 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/multitag.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/multitag.out_ascii
@@ -1,4 +1,4 @@
-BL-MULTITAG(1) OpenBSD Reference Manual BL-MULTITAG(1)
+BL-MULTITAG(1) General Commands Manual BL-MULTITAG(1)
NNAAMMEE
BBll--mmuullttiittaagg - lists with multiple successive tags
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/multitype.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/multitype.out_ascii
index fd9b96879bb..f22c89cf298 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/multitype.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/multitype.out_ascii
@@ -1,4 +1,4 @@
-BL-MULTITYPE(1) OpenBSD Reference Manual BL-MULTITYPE(1)
+BL-MULTITYPE(1) General Commands Manual BL-MULTITYPE(1)
NNAAMMEE
BBll--mmuullttiittyyppee - list with multiple types
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/nested.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/nested.out_ascii
index e866f16f5f1..50998896941 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/nested.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/nested.out_ascii
@@ -1,4 +1,4 @@
-BL-NESTED(1) OpenBSD Reference Manual BL-NESTED(1)
+BL-NESTED(1) General Commands Manual BL-NESTED(1)
NNAAMMEE
BBll--nneesstteedd - nested lists
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_ascii
index 474d13ac11c..fc55b525377 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/noIt.out_ascii
@@ -1,4 +1,4 @@
-BL-NOIT(1) OpenBSD Reference Manual BL-NOIT(1)
+BL-NOIT(1) General Commands Manual BL-NOIT(1)
NNAAMMEE
BBll--nnooIItt - list missing item macros
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/notype.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/notype.out_ascii
index 2bb4d069f56..57b0e43e6cb 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/notype.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/notype.out_ascii
@@ -1,4 +1,4 @@
-BL-NOTYPE(1) OpenBSD Reference Manual BL-NOTYPE(1)
+BL-NOTYPE(1) General Commands Manual BL-NOTYPE(1)
NNAAMMEE
BBll--nnoottyyppee - lists with late or missing types
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/ohang.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/ohang.out_ascii
index 99e73d7d6ba..238958dd07a 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/ohang.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/ohang.out_ascii
@@ -1,4 +1,4 @@
-BL-OHANG(1) OpenBSD Reference Manual BL-OHANG(1)
+BL-OHANG(1) General Commands Manual BL-OHANG(1)
NNAAMMEE
BBll--oohhaanngg - over-hanging lists
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
index e440a81e109..330bdcc1f62 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/tag.out_ascii
@@ -1,4 +1,4 @@
-BL-TAG(1) OpenBSD Reference Manual BL-TAG(1)
+BL-TAG(1) General Commands Manual BL-TAG(1)
NNAAMMEE
BBll--ttaagg - tagged lists
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/unclosed.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/unclosed.out_ascii
index 12cd84ceea4..3a350004313 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/unclosed.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/unclosed.out_ascii
@@ -1,4 +1,4 @@
-BL-UNCLOSED(1) OpenBSD Reference Manual BL-UNCLOSED(1)
+BL-UNCLOSED(1) General Commands Manual BL-UNCLOSED(1)
NNAAMMEE
BBll--uunncclloosseedd - list lacking an end macro
diff --git a/regress/usr.bin/mandoc/mdoc/Brq/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Brq/empty.out_ascii
index 4a3c8369440..bb59c24721e 100644
--- a/regress/usr.bin/mandoc/mdoc/Brq/empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Brq/empty.out_ascii
@@ -1,4 +1,4 @@
-BRQ-EMPTY(1) OpenBSD Reference Manual BRQ-EMPTY(1)
+BRQ-EMPTY(1) General Commands Manual BRQ-EMPTY(1)
NNAAMMEE
BBrrqq--eemmppttyy - empty implicit enclosure macros
diff --git a/regress/usr.bin/mandoc/mdoc/Bx/args.out_ascii b/regress/usr.bin/mandoc/mdoc/Bx/args.out_ascii
index 7bbd3d59be2..9f45970e449 100644
--- a/regress/usr.bin/mandoc/mdoc/Bx/args.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bx/args.out_ascii
@@ -1,4 +1,4 @@
-BX-ARGS(1) OpenBSD Reference Manual BX-ARGS(1)
+BX-ARGS(1) General Commands Manual BX-ARGS(1)
NNAAMMEE
BBxx--aarrggss - arguments to the BSD macro
diff --git a/regress/usr.bin/mandoc/mdoc/Cd/eos.out_ascii b/regress/usr.bin/mandoc/mdoc/Cd/eos.out_ascii
index 7a708a00660..4e0b1bea013 100644
--- a/regress/usr.bin/mandoc/mdoc/Cd/eos.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Cd/eos.out_ascii
@@ -1,4 +1,4 @@
-CD-EOS(1) OpenBSD Reference Manual CD-EOS(1)
+CD-EOS(1) General Commands Manual CD-EOS(1)
NNAAMMEE
CCdd--eeooss - end of sentence handling after the configuration directive macro
diff --git a/regress/usr.bin/mandoc/mdoc/Cd/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Cd/font.out_ascii
index 7b4a9a61b3b..8949462be55 100644
--- a/regress/usr.bin/mandoc/mdoc/Cd/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Cd/font.out_ascii
@@ -1,4 +1,4 @@
-CD-FONT(1) OpenBSD Reference Manual CD-FONT(1)
+CD-FONT(1) General Commands Manual CD-FONT(1)
NNAAMMEE
CCdd--ffoonntt - changing fonts inside the configuration declaration macro
diff --git a/regress/usr.bin/mandoc/mdoc/Cd/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Cd/noarg.out_ascii
index 16662968f83..eefae539b4f 100644
--- a/regress/usr.bin/mandoc/mdoc/Cd/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Cd/noarg.out_ascii
@@ -1,4 +1,4 @@
-CD-NOARG(1) OpenBSD Reference Manual CD-NOARG(1)
+CD-NOARG(1) General Commands Manual CD-NOARG(1)
NNAAMMEE
CCdd--nnooaarrgg - kernel configuration directive without arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Cm/basic.out_ascii b/regress/usr.bin/mandoc/mdoc/Cm/basic.out_ascii
index 4b7667d2065..98899c00fd9 100644
--- a/regress/usr.bin/mandoc/mdoc/Cm/basic.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Cm/basic.out_ascii
@@ -1,4 +1,4 @@
-CM-BASIC(1) OpenBSD Reference Manual CM-BASIC(1)
+CM-BASIC(1) General Commands Manual CM-BASIC(1)
NNAAMMEE
CCmm--bbaassiicc - basic usage of the Cm macro
diff --git a/regress/usr.bin/mandoc/mdoc/Cm/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Cm/font.out_ascii
index 469618100bc..ae48e4b1b8b 100644
--- a/regress/usr.bin/mandoc/mdoc/Cm/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Cm/font.out_ascii
@@ -1,4 +1,4 @@
-CM-FONT(1) OpenBSD Reference Manual CM-FONT(1)
+CM-FONT(1) General Commands Manual CM-FONT(1)
NNAAMMEE
CCmm--ffoonntt - changing fonts inside the command modifier macro
diff --git a/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_ascii
index 23c3881ba63..83186d1c7f3 100644
--- a/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Cm/noarg.out_ascii
@@ -1,4 +1,4 @@
-CM-NOARG(1) OpenBSD Reference Manual CM-NOARG(1)
+CM-NOARG(1) General Commands Manual CM-NOARG(1)
NNAAMMEE
CCmm--nnooaarrgg - command modifier macro without arguments
diff --git a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii
index 36b3fa1a325..ab9743dd0c8 100644
--- a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_ascii
@@ -1,4 +1,4 @@
-D1-SPACING(1) OpenBSD Reference Manual D1-SPACING(1)
+D1-SPACING(1) General Commands Manual D1-SPACING(1)
NNAAMMEE
DD11--ssppaacciinngg - spacing in and around one-line displays
diff --git a/regress/usr.bin/mandoc/mdoc/Dd/badarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Dd/badarg.out_ascii
index 70bcf04a0f7..a64abacc098 100644
--- a/regress/usr.bin/mandoc/mdoc/Dd/badarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dd/badarg.out_ascii
@@ -1,4 +1,4 @@
-DD-BADARG(1) OpenBSD Reference Manual DD-BADARG(1)
+DD-BADARG(1) General Commands Manual DD-BADARG(1)
NNAAMMEE
DDdd--bbaaddaarrgg - date cannot be parsed
diff --git a/regress/usr.bin/mandoc/mdoc/Dd/dupe.out_ascii b/regress/usr.bin/mandoc/mdoc/Dd/dupe.out_ascii
index 8828c8c5e29..6cc220d6aad 100644
--- a/regress/usr.bin/mandoc/mdoc/Dd/dupe.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dd/dupe.out_ascii
@@ -1,4 +1,4 @@
-DD-DUPE(1) OpenBSD Reference Manual DD-DUPE(1)
+DD-DUPE(1) General Commands Manual DD-DUPE(1)
NNAAMMEE
DDdd--dduuppee - duplicate date macro
diff --git a/regress/usr.bin/mandoc/mdoc/Dd/late.out_ascii b/regress/usr.bin/mandoc/mdoc/Dd/late.out_ascii
index 0873758bd8a..381b4ef33af 100644
--- a/regress/usr.bin/mandoc/mdoc/Dd/late.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dd/late.out_ascii
@@ -1,4 +1,4 @@
-DD-LATE(1) OpenBSD Reference Manual DD-LATE(1)
+DD-LATE(1) General Commands Manual DD-LATE(1)
NNAAMMEE
DDdd--llaattee - late date macro
diff --git a/regress/usr.bin/mandoc/mdoc/Dd/manarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Dd/manarg.out_ascii
index ac667f75feb..8c4b800f5ac 100644
--- a/regress/usr.bin/mandoc/mdoc/Dd/manarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dd/manarg.out_ascii
@@ -1,4 +1,4 @@
-DD-MANARG(1) OpenBSD Reference Manual DD-MANARG(1)
+DD-MANARG(1) General Commands Manual DD-MANARG(1)
NNAAMMEE
DDdd--mmaannaarrgg - date in traditional man format
diff --git a/regress/usr.bin/mandoc/mdoc/Dd/order.out_ascii b/regress/usr.bin/mandoc/mdoc/Dd/order.out_ascii
index fb953bfbd37..64c7925d7e5 100644
--- a/regress/usr.bin/mandoc/mdoc/Dd/order.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dd/order.out_ascii
@@ -1,4 +1,4 @@
-DD-ORDER(1) OpenBSD Reference Manual DD-ORDER(1)
+DD-ORDER(1) General Commands Manual DD-ORDER(1)
NNAAMMEE
DDdd--oorrddeerr - date macro after title macro
diff --git a/regress/usr.bin/mandoc/mdoc/Dl/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/Dl/spacing.out_ascii
index 1d38e48a1f4..017f679cc7f 100644
--- a/regress/usr.bin/mandoc/mdoc/Dl/spacing.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dl/spacing.out_ascii
@@ -1,4 +1,4 @@
-DL-SPACING(1) OpenBSD Reference Manual DL-SPACING(1)
+DL-SPACING(1) General Commands Manual DL-SPACING(1)
NNAAMMEE
DDll--ssppaacciinngg - spacing in and around one-line literal displays
diff --git a/regress/usr.bin/mandoc/mdoc/Dq/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Dq/empty.out_ascii
index ef59931c67f..aaa6962148b 100644
--- a/regress/usr.bin/mandoc/mdoc/Dq/empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dq/empty.out_ascii
@@ -1,4 +1,4 @@
-DQ-EMPTY(1) OpenBSD Reference Manual DQ-EMPTY(1)
+DQ-EMPTY(1) General Commands Manual DQ-EMPTY(1)
NNAAMMEE
DDqq--eemmppttyy - empty implicit enclosure macros
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/case.out_ascii b/regress/usr.bin/mandoc/mdoc/Dt/case.out_ascii
index 2152fe8fd91..0eb21827707 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/case.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dt/case.out_ascii
@@ -1,4 +1,4 @@
-Dt-case(1) OpenBSD Reference Manual Dt-case(1)
+Dt-case(1) General Commands Manual Dt-case(1)
NNAAMMEE
DDtt--ccaassee - document title is not all caps
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_ascii b/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_ascii
index 3cfc96d74b9..0d2ba0e647b 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_ascii
@@ -1,4 +1,4 @@
-DT-DUPE(1) OpenBSD Reference Manual DT-DUPE(1)
+DT-DUPE(1) General Commands Manual DT-DUPE(1)
NNAAMMEE
DDtt--oorrddeerr - duplicate prologue macro
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/nobody.out_ascii b/regress/usr.bin/mandoc/mdoc/Dt/nobody.out_ascii
index 61425787677..1de2b81a729 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/nobody.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dt/nobody.out_ascii
@@ -1,3 +1,3 @@
-DT-NOBODY(1) OpenBSD Reference Manual DT-NOBODY(1)
+DT-NOBODY(1) General Commands Manual DT-NOBODY(1)
OpenBSD June 20, 2014 OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/order.out_ascii b/regress/usr.bin/mandoc/mdoc/Dt/order.out_ascii
index e9039118e96..6524bcab839 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/order.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dt/order.out_ascii
@@ -1,4 +1,4 @@
-DT-ORDER(1) OpenBSD Reference Manual DT-ORDER(1)
+DT-ORDER(1) General Commands Manual DT-ORDER(1)
NNAAMMEE
DDtt--oorrddeerr - prologue macros out of order
diff --git a/regress/usr.bin/mandoc/mdoc/Dv/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Dv/font.out_ascii
index 8941d879ae8..88f0760d2c8 100644
--- a/regress/usr.bin/mandoc/mdoc/Dv/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dv/font.out_ascii
@@ -1,4 +1,4 @@
-DV-FONT(1) OpenBSD Reference Manual DV-FONT(1)
+DV-FONT(1) General Commands Manual DV-FONT(1)
NNAAMMEE
DDvv--ffoonntt - formatting of defined variables
diff --git a/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_ascii
index 38123531db3..b40d6635fcf 100644
--- a/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dv/noarg.out_ascii
@@ -1,4 +1,4 @@
-DV-NOARG(1) OpenBSD Reference Manual DV-NOARG(1)
+DV-NOARG(1) General Commands Manual DV-NOARG(1)
NNAAMMEE
DDvv--nnooaarrgg - defined variable macro without an argument
diff --git a/regress/usr.bin/mandoc/mdoc/Em/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Em/font.out_ascii
index 8d283a5b782..f461c7ae6a3 100644
--- a/regress/usr.bin/mandoc/mdoc/Em/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Em/font.out_ascii
@@ -1,4 +1,4 @@
-EM-FONT(1) OpenBSD Reference Manual EM-FONT(1)
+EM-FONT(1) General Commands Manual EM-FONT(1)
NNAAMMEE
EEmm--ffoonntt - changing fonts inside the emphasis macro
diff --git a/regress/usr.bin/mandoc/mdoc/Em/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Em/noarg.out_ascii
index 3d8f4c9edef..2489797ae04 100644
--- a/regress/usr.bin/mandoc/mdoc/Em/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Em/noarg.out_ascii
@@ -1,4 +1,4 @@
-EM-NOARG(1) OpenBSD Reference Manual EM-NOARG(1)
+EM-NOARG(1) General Commands Manual EM-NOARG(1)
NNAAMMEE
EEmm--nnooaarrgg - emphasis macro without arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Eo/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Eo/empty.out_ascii
index 21e9d9b2754..090ac390def 100644
--- a/regress/usr.bin/mandoc/mdoc/Eo/empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Eo/empty.out_ascii
@@ -1,4 +1,4 @@
-EO-EMPTY(1) OpenBSD Reference Manual EO-EMPTY(1)
+EO-EMPTY(1) General Commands Manual EO-EMPTY(1)
NNAAMMEE
EEoo--eemmppttyy - empty implicit enclosure macros
diff --git a/regress/usr.bin/mandoc/mdoc/Eo/obsolete.out_ascii b/regress/usr.bin/mandoc/mdoc/Eo/obsolete.out_ascii
index 2dd5b76d86c..bb2f15c5c94 100644
--- a/regress/usr.bin/mandoc/mdoc/Eo/obsolete.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Eo/obsolete.out_ascii
@@ -1,4 +1,4 @@
-EO-OBSOLETE(1) OpenBSD Reference Manual EO-OBSOLETE(1)
+EO-OBSOLETE(1) General Commands Manual EO-OBSOLETE(1)
NNAAMMEE
EEoo--oobbssoolleettee - obsolete enclosure macros
diff --git a/regress/usr.bin/mandoc/mdoc/Er/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Er/font.out_ascii
index 03111133456..cfe462bd318 100644
--- a/regress/usr.bin/mandoc/mdoc/Er/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Er/font.out_ascii
@@ -1,4 +1,4 @@
-ER-FONT(1) OpenBSD Reference Manual ER-FONT(1)
+ER-FONT(1) General Commands Manual ER-FONT(1)
NNAAMMEE
EErr--ffoonntt - changing fonts inside the error code macro
diff --git a/regress/usr.bin/mandoc/mdoc/Er/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Er/noarg.out_ascii
index 6388544286a..83f45f0764b 100644
--- a/regress/usr.bin/mandoc/mdoc/Er/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Er/noarg.out_ascii
@@ -1,4 +1,4 @@
-ER-NOARG(1) OpenBSD Reference Manual ER-NOARG(1)
+ER-NOARG(1) General Commands Manual ER-NOARG(1)
NNAAMMEE
EErr--nnooaarrgg - error constant macro without an argument
diff --git a/regress/usr.bin/mandoc/mdoc/Ev/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Ev/font.out_ascii
index 0105a47d228..fad07429b5a 100644
--- a/regress/usr.bin/mandoc/mdoc/Ev/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ev/font.out_ascii
@@ -1,4 +1,4 @@
-EV-FONT(1) OpenBSD Reference Manual EV-FONT(1)
+EV-FONT(1) General Commands Manual EV-FONT(1)
NNAAMMEE
EEvv--ffoonntt - formatting of environment variables
diff --git a/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_ascii
index 67a7591bdfb..11705a38882 100644
--- a/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ev/noarg.out_ascii
@@ -1,4 +1,4 @@
-EV-NOARG(1) OpenBSD Reference Manual EV-NOARG(1)
+EV-NOARG(1) General Commands Manual EV-NOARG(1)
NNAAMMEE
EEvv--nnooaarrgg - environment variable macro without an argument
diff --git a/regress/usr.bin/mandoc/mdoc/Ex/args.out_ascii b/regress/usr.bin/mandoc/mdoc/Ex/args.out_ascii
index 598fa566a53..d217c36abb2 100644
--- a/regress/usr.bin/mandoc/mdoc/Ex/args.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ex/args.out_ascii
@@ -1,4 +1,4 @@
-EX-ARGS(1) OpenBSD Reference Manual EX-ARGS(1)
+EX-ARGS(1) General Commands Manual EX-ARGS(1)
NNAAMMEE
EExx--aarrggss - arguments to the exit value macro
diff --git a/regress/usr.bin/mandoc/mdoc/Ex/noname.out_ascii b/regress/usr.bin/mandoc/mdoc/Ex/noname.out_ascii
index 3dd9dc3262a..00da4a6bc4d 100644
--- a/regress/usr.bin/mandoc/mdoc/Ex/noname.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ex/noname.out_ascii
@@ -1,4 +1,4 @@
-EX-NONAME(1) OpenBSD Reference Manual EX-NONAME(1)
+EX-NONAME(1) General Commands Manual EX-NONAME(1)
NNAAMMEE
- exit value macro without an available name
diff --git a/regress/usr.bin/mandoc/mdoc/Ex/nostd.out_ascii b/regress/usr.bin/mandoc/mdoc/Ex/nostd.out_ascii
index f1ba7c6221c..04abc9e9a42 100644
--- a/regress/usr.bin/mandoc/mdoc/Ex/nostd.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ex/nostd.out_ascii
@@ -1,4 +1,4 @@
-EX-NOSTD(1) OpenBSD Reference Manual EX-NOSTD(1)
+EX-NOSTD(1) General Commands Manual EX-NOSTD(1)
NNAAMMEE
EExx--nnoossttdd - exit value macros without -std arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Fd/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Fd/break.out_ascii
index 81cbc1336bf..fdd6aae46a8 100644
--- a/regress/usr.bin/mandoc/mdoc/Fd/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fd/break.out_ascii
@@ -1,4 +1,4 @@
-FD-BREAK(2) OpenBSD Programmer's Manual FD-BREAK(2)
+FD-BREAK(2) System Calls Manual FD-BREAK(2)
NNAAMMEE
FFdd--bbrreeaakk - line break before old-style header include file
diff --git a/regress/usr.bin/mandoc/mdoc/Fd/eos.out_ascii b/regress/usr.bin/mandoc/mdoc/Fd/eos.out_ascii
index deb09b50b78..3d54ac3e006 100644
--- a/regress/usr.bin/mandoc/mdoc/Fd/eos.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fd/eos.out_ascii
@@ -1,4 +1,4 @@
-FD-EOS(1) OpenBSD Reference Manual FD-EOS(1)
+FD-EOS(1) General Commands Manual FD-EOS(1)
NNAAMMEE
FFdd--eeooss - end of sentence handling after the legacy include macro
diff --git a/regress/usr.bin/mandoc/mdoc/Fd/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Fd/font.out_ascii
index 84312b99a79..7a3428fe6a5 100644
--- a/regress/usr.bin/mandoc/mdoc/Fd/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fd/font.out_ascii
@@ -1,4 +1,4 @@
-FD-FONT(2) OpenBSD Programmer's Manual FD-FONT(2)
+FD-FONT(2) System Calls Manual FD-FONT(2)
NNAAMMEE
FFdd--ffoonntt - changing the font inside the old-style include macro
diff --git a/regress/usr.bin/mandoc/mdoc/Fl/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Fl/font.out_ascii
index 9bb482d05a3..495c8975783 100644
--- a/regress/usr.bin/mandoc/mdoc/Fl/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fl/font.out_ascii
@@ -1,4 +1,4 @@
-FL-FONT(1) OpenBSD Reference Manual FL-FONT(1)
+FL-FONT(1) General Commands Manual FL-FONT(1)
NNAAMMEE
FFll--ffoonntt - changing fonts inside the flag macro
diff --git a/regress/usr.bin/mandoc/mdoc/Fl/multiarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Fl/multiarg.out_ascii
index a5c025cd178..0ad669e2418 100644
--- a/regress/usr.bin/mandoc/mdoc/Fl/multiarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fl/multiarg.out_ascii
@@ -1,4 +1,4 @@
-FL-MULTIARG(1) OpenBSD Reference Manual FL-MULTIARG(1)
+FL-MULTIARG(1) General Commands Manual FL-MULTIARG(1)
NNAAMMEE
FFll--mmuullttiiaarrgg - multiple arguments to a Fl macro
diff --git a/regress/usr.bin/mandoc/mdoc/Fl/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Fl/noarg.out_ascii
index d79e7d74f0b..eb230269f6e 100644
--- a/regress/usr.bin/mandoc/mdoc/Fl/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fl/noarg.out_ascii
@@ -1,4 +1,4 @@
-FL-NOARG(1) OpenBSD Reference Manual FL-NOARG(1)
+FL-NOARG(1) General Commands Manual FL-NOARG(1)
NNAAMMEE
FFll--nnooaarrgg - Fl macro without arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Fl/parsed.out_ascii b/regress/usr.bin/mandoc/mdoc/Fl/parsed.out_ascii
index 5d0ef4278b7..3b6de9d470c 100644
--- a/regress/usr.bin/mandoc/mdoc/Fl/parsed.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fl/parsed.out_ascii
@@ -1,4 +1,4 @@
-FL-PARSED(1) OpenBSD Reference Manual FL-PARSED(1)
+FL-PARSED(1) General Commands Manual FL-PARSED(1)
NNAAMMEE
FFll--ppaarrsseedd - is the Fl macro parsed?
diff --git a/regress/usr.bin/mandoc/mdoc/Fl/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Fl/punct.out_ascii
index 1c72b260019..b619154d092 100644
--- a/regress/usr.bin/mandoc/mdoc/Fl/punct.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fl/punct.out_ascii
@@ -1,4 +1,4 @@
-FL-PUNCT(1) OpenBSD Reference Manual FL-PUNCT(1)
+FL-PUNCT(1) General Commands Manual FL-PUNCT(1)
NNAAMMEE
FFll--ppuunncctt - punctuation handling by the Fl macro
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/basic.out_ascii b/regress/usr.bin/mandoc/mdoc/Fo/basic.out_ascii
index 9d8288232b1..7ab11d471b4 100644
--- a/regress/usr.bin/mandoc/mdoc/Fo/basic.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fo/basic.out_ascii
@@ -1,4 +1,4 @@
-FO-BASIC(1) OpenBSD Reference Manual FO-BASIC(1)
+FO-BASIC(1) General Commands Manual FO-BASIC(1)
NNAAMMEE
FFoo--bbaassiicc - function blocks
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Fo/break.out_ascii
index d01e7518d69..d8a5df7067e 100644
--- a/regress/usr.bin/mandoc/mdoc/Fo/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fo/break.out_ascii
@@ -1,4 +1,4 @@
-FO-BREAK(1) OpenBSD Reference Manual FO-BREAK(1)
+FO-BREAK(1) General Commands Manual FO-BREAK(1)
NNAAMMEE
FFoo--bbrreeaakk - line breaks in function blocks
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/eos.out_ascii b/regress/usr.bin/mandoc/mdoc/Fo/eos.out_ascii
index 3690acafb7a..a09113cfd4c 100644
--- a/regress/usr.bin/mandoc/mdoc/Fo/eos.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fo/eos.out_ascii
@@ -1,4 +1,4 @@
-FO-EOS(1) OpenBSD Reference Manual FO-EOS(1)
+FO-EOS(1) General Commands Manual FO-EOS(1)
NNAAMMEE
FFoo--eeooss - end of sentence handling after a function block
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Fo/font.out_ascii
index e291b47a0cf..3490ad8acd3 100644
--- a/regress/usr.bin/mandoc/mdoc/Fo/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fo/font.out_ascii
@@ -1,4 +1,4 @@
-FO-FONT(1) OpenBSD Reference Manual FO-FONT(1)
+FO-FONT(1) General Commands Manual FO-FONT(1)
NNAAMMEE
FFoo--ffoonntt - font nesting in function blocks
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Fo/noarg.out_ascii
index ce2a17dd783..bd895e4a350 100644
--- a/regress/usr.bin/mandoc/mdoc/Fo/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fo/noarg.out_ascii
@@ -1,4 +1,4 @@
-FN-NOARG(1) OpenBSD Reference Manual FN-NOARG(1)
+FN-NOARG(1) General Commands Manual FN-NOARG(1)
NNAAMMEE
FFnn--nnooaarrgg - function name macro without arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/obsolete.out_ascii b/regress/usr.bin/mandoc/mdoc/Fo/obsolete.out_ascii
index a6254c3a796..3e2cc61722d 100644
--- a/regress/usr.bin/mandoc/mdoc/Fo/obsolete.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fo/obsolete.out_ascii
@@ -1,4 +1,4 @@
-FO-OBSOLETE(1) OpenBSD Reference Manual FO-OBSOLETE(1)
+FO-OBSOLETE(1) General Commands Manual FO-OBSOLETE(1)
NNAAMMEE
FFoo--oobbssoolleettee - obsolete function macros
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/section.out_ascii b/regress/usr.bin/mandoc/mdoc/Fo/section.out_ascii
index 070fe5a7f71..9273ce84c99 100644
--- a/regress/usr.bin/mandoc/mdoc/Fo/section.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Fo/section.out_ascii
@@ -1,4 +1,4 @@
-FN-SECTION(3) OpenBSD Programmer's Manual FN-SECTION(3)
+FN-SECTION(3) Library Functions Manual FN-SECTION(3)
NNAAMMEE
FFnn--sseeccttiioonn - special handling of Fn in various sections
diff --git a/regress/usr.bin/mandoc/mdoc/Ft/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Ft/font.out_ascii
index e420ed392ac..ded66eca451 100644
--- a/regress/usr.bin/mandoc/mdoc/Ft/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ft/font.out_ascii
@@ -1,4 +1,4 @@
-FT-FONT(1) OpenBSD Reference Manual FT-FONT(1)
+FT-FONT(1) General Commands Manual FT-FONT(1)
NNAAMMEE
FFtt--ffoonntt - changing fonts inside the function return type macro
diff --git a/regress/usr.bin/mandoc/mdoc/Ic/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Ic/font.out_ascii
index d4ae50396e5..6267aed382a 100644
--- a/regress/usr.bin/mandoc/mdoc/Ic/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ic/font.out_ascii
@@ -1,4 +1,4 @@
-IC-FONT(1) OpenBSD Reference Manual IC-FONT(1)
+IC-FONT(1) General Commands Manual IC-FONT(1)
NNAAMMEE
IIcc--ffoonntt - changing fonts inside the internal command macro
diff --git a/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_ascii
index 68164782f54..c5dda265ffa 100644
--- a/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ic/noarg.out_ascii
@@ -1,4 +1,4 @@
-IC-NOARG(1) OpenBSD Reference Manual IC-NOARG(1)
+IC-NOARG(1) General Commands Manual IC-NOARG(1)
NNAAMMEE
IIcc--nnooaarrgg - interactive command without an argument
diff --git a/regress/usr.bin/mandoc/mdoc/In/break.out_ascii b/regress/usr.bin/mandoc/mdoc/In/break.out_ascii
index 51b2de76943..d6488f8169e 100644
--- a/regress/usr.bin/mandoc/mdoc/In/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/In/break.out_ascii
@@ -1,4 +1,4 @@
-IN-BREAK(2) OpenBSD Programmer's Manual IN-BREAK(2)
+IN-BREAK(2) System Calls Manual IN-BREAK(2)
NNAAMMEE
IInn--bbrreeaakk - line break before header include file
diff --git a/regress/usr.bin/mandoc/mdoc/In/eos.out_ascii b/regress/usr.bin/mandoc/mdoc/In/eos.out_ascii
index fee045373bc..4f5a1036cf1 100644
--- a/regress/usr.bin/mandoc/mdoc/In/eos.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/In/eos.out_ascii
@@ -1,4 +1,4 @@
-IN-EOS(1) OpenBSD Reference Manual IN-EOS(1)
+IN-EOS(1) General Commands Manual IN-EOS(1)
NNAAMMEE
IInn--eeooss - end of sentence handling after the include macro
diff --git a/regress/usr.bin/mandoc/mdoc/In/font.out_ascii b/regress/usr.bin/mandoc/mdoc/In/font.out_ascii
index a993579635f..7d1948e4cab 100644
--- a/regress/usr.bin/mandoc/mdoc/In/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/In/font.out_ascii
@@ -1,4 +1,4 @@
-IN-FONT(2) OpenBSD Programmer's Manual IN-FONT(2)
+IN-FONT(2) System Calls Manual IN-FONT(2)
NNAAMMEE
IInn--ffoonntt - changing the font inside the include macro
diff --git a/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii b/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii
index 69dece5fd1d..d4036ca3173 100644
--- a/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Lb/badargs.out_ascii
@@ -1,4 +1,4 @@
-LB-BADARGS(3) OpenBSD Programmer's Manual LB-BADARGS(3)
+LB-BADARGS(3) Library Functions Manual LB-BADARGS(3)
NNAAMMEE
LLbb--bbaaddaarrggss - bad arguments to the library macro
diff --git a/regress/usr.bin/mandoc/mdoc/Lb/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Lb/break.out_ascii
index 7ba6f65c872..05134083526 100644
--- a/regress/usr.bin/mandoc/mdoc/Lb/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Lb/break.out_ascii
@@ -1,4 +1,4 @@
-LB-BREAK(3) OpenBSD Programmer's Manual LB-BREAK(3)
+LB-BREAK(3) Library Functions Manual LB-BREAK(3)
NNAAMMEE
LLbb--bbrreeaakk - output line breaks after the library macro
diff --git a/regress/usr.bin/mandoc/mdoc/Lb/eos.out_ascii b/regress/usr.bin/mandoc/mdoc/Lb/eos.out_ascii
index 1d868d70c8d..c51263d4af7 100644
--- a/regress/usr.bin/mandoc/mdoc/Lb/eos.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Lb/eos.out_ascii
@@ -1,4 +1,4 @@
-LB-EOS(1) OpenBSD Reference Manual LB-EOS(1)
+LB-EOS(1) General Commands Manual LB-EOS(1)
NNAAMMEE
LLbb--eeooss - end of sentence handling after the library macro
diff --git a/regress/usr.bin/mandoc/mdoc/Li/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Li/font.out_ascii
index d2779983aac..4e012881390 100644
--- a/regress/usr.bin/mandoc/mdoc/Li/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Li/font.out_ascii
@@ -1,4 +1,4 @@
-LI-FONT(1) OpenBSD Reference Manual LI-FONT(1)
+LI-FONT(1) General Commands Manual LI-FONT(1)
NNAAMMEE
LLii--ffoonntt - changing fonts inside the literal in-line macro
diff --git a/regress/usr.bin/mandoc/mdoc/Li/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Li/punct.out_ascii
index 4d2e9dc2ecd..dd96c926dfa 100644
--- a/regress/usr.bin/mandoc/mdoc/Li/punct.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Li/punct.out_ascii
@@ -1,4 +1,4 @@
-LI-PUNCT(1) OpenBSD Reference Manual LI-PUNCT(1)
+LI-PUNCT(1) General Commands Manual LI-PUNCT(1)
NNAAMMEE
LLii--ppuunncctt - punctuation following a literal macro
diff --git a/regress/usr.bin/mandoc/mdoc/Lk/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Lk/font.out_ascii
index 41c51e38b9c..5c0425a1a20 100644
--- a/regress/usr.bin/mandoc/mdoc/Lk/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Lk/font.out_ascii
@@ -1,4 +1,4 @@
-LK-FONT(1) OpenBSD Reference Manual LK-FONT(1)
+LK-FONT(1) General Commands Manual LK-FONT(1)
NNAAMMEE
LLkk--ffoonntt - changing the font inside the hyperlink macro
diff --git a/regress/usr.bin/mandoc/mdoc/Lk/link.out_ascii b/regress/usr.bin/mandoc/mdoc/Lk/link.out_ascii
index 9fa11cb5aee..2b15a6a87de 100644
--- a/regress/usr.bin/mandoc/mdoc/Lk/link.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Lk/link.out_ascii
@@ -1,4 +1,4 @@
-LK-LINK(1) OpenBSD Reference Manual LK-LINK(1)
+LK-LINK(1) General Commands Manual LK-LINK(1)
NNAAMMEE
LLkk--lliinnkk - formatting of hyperlinks
diff --git a/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_ascii
index 6a8cc08399f..8c201f3d796 100644
--- a/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Lk/noarg.out_ascii
@@ -1,4 +1,4 @@
-LK-NOARG(1) OpenBSD Reference Manual LK-NOARG(1)
+LK-NOARG(1) General Commands Manual LK-NOARG(1)
NNAAMMEE
LLkk--nnooaarrgg - hyperlink macro without arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Ms/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Ms/font.out_ascii
index 4e1fbf95f5b..ae647b836e2 100644
--- a/regress/usr.bin/mandoc/mdoc/Ms/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ms/font.out_ascii
@@ -1,4 +1,4 @@
-MS-FONT(1) OpenBSD Reference Manual MS-FONT(1)
+MS-FONT(1) General Commands Manual MS-FONT(1)
NNAAMMEE
MMss--ffoonntt - changing fonts inside the mathematical symbol macro
diff --git a/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_ascii
index 52d06cad710..fa90d0f38bd 100644
--- a/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ms/noarg.out_ascii
@@ -1,4 +1,4 @@
-MS-NOARG(1) OpenBSD Reference Manual MS-NOARG(1)
+MS-NOARG(1) General Commands Manual MS-NOARG(1)
NNAAMMEE
MMss--nnooaarrgg - mathematical symbol without an argument
diff --git a/regress/usr.bin/mandoc/mdoc/Mt/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Mt/font.out_ascii
index 1b033d56a5c..f19cc2bf13f 100644
--- a/regress/usr.bin/mandoc/mdoc/Mt/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Mt/font.out_ascii
@@ -1,4 +1,4 @@
-MT-FONT(1) OpenBSD Reference Manual MT-FONT(1)
+MT-FONT(1) General Commands Manual MT-FONT(1)
NNAAMMEE
MMtt--ffoonntt - changing fonts inside the mailto macro
diff --git a/regress/usr.bin/mandoc/mdoc/Mt/simple.out_ascii b/regress/usr.bin/mandoc/mdoc/Mt/simple.out_ascii
index 2af2e5bd08d..65cde86476d 100644
--- a/regress/usr.bin/mandoc/mdoc/Mt/simple.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Mt/simple.out_ascii
@@ -1,4 +1,4 @@
-MT-SIMPLE(1) OpenBSD Reference Manual MT-SIMPLE(1)
+MT-SIMPLE(1) General Commands Manual MT-SIMPLE(1)
NNAAMMEE
MMtt--ssiimmppllee - mailto
diff --git a/regress/usr.bin/mandoc/mdoc/Nd/hyph.out_ascii b/regress/usr.bin/mandoc/mdoc/Nd/hyph.out_ascii
index 82e50b84b80..8388b6643f7 100644
--- a/regress/usr.bin/mandoc/mdoc/Nd/hyph.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nd/hyph.out_ascii
@@ -1,4 +1,4 @@
-ND-HYPH(1) OpenBSD Reference Manual ND-HYPH(1)
+ND-HYPH(1) General Commands Manual ND-HYPH(1)
NNAAMMEE
NNdd--hhyypphh - when there is already a hyphen within the the word, line-
diff --git a/regress/usr.bin/mandoc/mdoc/Nd/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Nd/noarg.out_ascii
index 2e4669fde60..fc78701fe96 100644
--- a/regress/usr.bin/mandoc/mdoc/Nd/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nd/noarg.out_ascii
@@ -1,4 +1,4 @@
-ND-ARG0(1) OpenBSD Reference Manual ND-ARG0(1)
+ND-ARG0(1) General Commands Manual ND-ARG0(1)
NNAAMMEE
NNdd--aarrgg00 -
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_ascii
index 473bb08fba5..3c1ff360f9d 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_ascii
@@ -1,4 +1,4 @@
-NM-BADNAME(1) OpenBSD Reference Manual NM-BADNAME(1)
+NM-BADNAME(1) General Commands Manual NM-BADNAME(1)
NNAAMMEE
BSD - text production macro on the NAME Nm line
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_ascii
index 1bf5d5d7d2b..21167d140bb 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_ascii
@@ -1,4 +1,4 @@
-NM-BADNAMEUSE(1) OpenBSD Reference Manual NM-BADNAMEUSE(1)
+NM-BADNAMEUSE(1) General Commands Manual NM-BADNAMEUSE(1)
NNAAMMEE
ssoommee__nnaammee BSD - text production macro on the NAME Nm line, used later
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/break.out_ascii
index 8c62c9f7d3c..8b94c3303ab 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/break.out_ascii
@@ -1,4 +1,4 @@
-NM-BREAK(1) OpenBSD Reference Manual NM-BREAK(1)
+NM-BREAK(1) General Commands Manual NM-BREAK(1)
NNAAMMEE
NNmm--bbrreeaakk - name block head breaking another block
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/empty.out_ascii
index 0b91bfdf7cb..b01d299e752 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/empty.out_ascii
@@ -1,4 +1,4 @@
-NM-EMPTY(2) OpenBSD Programmer's Manual NM-EMPTY(2)
+NM-EMPTY(2) System Calls Manual NM-EMPTY(2)
NNAAMMEE
NNmm--eemmppttyy - handling of empty name macros
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/emptyNAME.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/emptyNAME.out_ascii
index becaca756ef..4041e0f8e70 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/emptyNAME.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/emptyNAME.out_ascii
@@ -1,4 +1,4 @@
-NM-EMPTYNAME(1) OpenBSD Reference Manual NM-EMPTYNAME(1)
+NM-EMPTYNAME(1) General Commands Manual NM-EMPTYNAME(1)
NNAAMMEE
- empty NAME Nm line
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/emptyNAMEuse.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/emptyNAMEuse.out_ascii
index 5f9cabfda9d..ed58ab6c74f 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/emptyNAMEuse.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/emptyNAMEuse.out_ascii
@@ -1,4 +1,4 @@
-NM-EMPTYNAMEUSE(1) OpenBSD Reference Manual NM-EMPTYNAMEUSE(1)
+NM-EMPTYNAMEUSE(1) General Commands Manual NM-EMPTYNAMEUSE(1)
NNAAMMEE
ssoommee__nnaammee - empty NAME Nm line, used later
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/font.out_ascii
index adc9e56ff81..d6516ae5268 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/font.out_ascii
@@ -1,4 +1,4 @@
-NM-FONT(1) OpenBSD Reference Manual NM-FONT(1)
+NM-FONT(1) General Commands Manual NM-FONT(1)
NNAAMMEE
NNmm--ffoonntt - changing fonts inside the name macro
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/long.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/long.out_ascii
index ed4db924764..f679258119a 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/long.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/long.out_ascii
@@ -1,4 +1,4 @@
-NM-LONG(1) OpenBSD Reference Manual NM-LONG(1)
+NM-LONG(1) General Commands Manual NM-LONG(1)
NNAAMMEE
NNmm--lloonngg - long Nm in the SYNOPSIS
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/punct.out_ascii
index 1b66f9cf9f2..74cb98f45f1 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/punct.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/punct.out_ascii
@@ -1,4 +1,4 @@
-NM-PUNCT(1) OpenBSD Reference Manual NM-PUNCT(1)
+NM-PUNCT(1) General Commands Manual NM-PUNCT(1)
NNAAMMEE
NNmm--ppuunncctt - punctuation handling by the Nm macro
diff --git a/regress/usr.bin/mandoc/mdoc/No/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/No/punct.out_ascii
index 7b747afddf9..c5f951ef38d 100644
--- a/regress/usr.bin/mandoc/mdoc/No/punct.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/No/punct.out_ascii
@@ -1,4 +1,4 @@
-NO-PUNCT(1) OpenBSD Reference Manual NO-PUNCT(1)
+NO-PUNCT(1) General Commands Manual NO-PUNCT(1)
NNAAMMEE
NNoo--ppuunncctt - punctuation after the normal macro
diff --git a/regress/usr.bin/mandoc/mdoc/No/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/No/spacing.out_ascii
index 5885901971c..5a25b4a3b06 100644
--- a/regress/usr.bin/mandoc/mdoc/No/spacing.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/No/spacing.out_ascii
@@ -1,4 +1,4 @@
-NO-SPACING(1) OpenBSD Reference Manual NO-SPACING(1)
+NO-SPACING(1) General Commands Manual NO-SPACING(1)
NNAAMMEE
NNoo--ssppaacciinngg - spacing around the normal macro
diff --git a/regress/usr.bin/mandoc/mdoc/Ns/position.out_ascii b/regress/usr.bin/mandoc/mdoc/Ns/position.out_ascii
index af2dea38e2d..a2bd6c4583b 100644
--- a/regress/usr.bin/mandoc/mdoc/Ns/position.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ns/position.out_ascii
@@ -1,4 +1,4 @@
-NS-POSITION(1) OpenBSD Reference Manual NS-POSITION(1)
+NS-POSITION(1) General Commands Manual NS-POSITION(1)
NNAAMMEE
NNss--ppoossiittiioonn - effect of the position of the no space macro on the line
diff --git a/regress/usr.bin/mandoc/mdoc/Ns/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Ns/punct.out_ascii
index 32deb4ca33e..2afbf8667b8 100644
--- a/regress/usr.bin/mandoc/mdoc/Ns/punct.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ns/punct.out_ascii
@@ -1,4 +1,4 @@
-NS-PUNCT(1) OpenBSD Reference Manual NS-PUNCT(1)
+NS-PUNCT(1) General Commands Manual NS-PUNCT(1)
NNAAMMEE
NNss--ppuunncctt - punctuation after the no space macro
diff --git a/regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii
index 2536ca206ff..ca487cf65a0 100644
--- a/regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Oo/punct.out_ascii
@@ -1,4 +1,4 @@
-OO-PUNCT(1) OpenBSD Reference Manual OO-PUNCT(1)
+OO-PUNCT(1) General Commands Manual OO-PUNCT(1)
NNAAMMEE
OOoo--ppuunncctt - punctuation handling by the Oo macro
diff --git a/regress/usr.bin/mandoc/mdoc/Op/broken.out_ascii b/regress/usr.bin/mandoc/mdoc/Op/broken.out_ascii
index 32f1a6a1248..f9641277d97 100644
--- a/regress/usr.bin/mandoc/mdoc/Op/broken.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Op/broken.out_ascii
@@ -1,4 +1,4 @@
-OP-BROKEN(1) OpenBSD Reference Manual OP-BROKEN(1)
+OP-BROKEN(1) General Commands Manual OP-BROKEN(1)
NNAAMMEE
OOpp--bbrrookkeenn - partial implicit block broken by partial explicit block
diff --git a/regress/usr.bin/mandoc/mdoc/Op/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Op/punct.out_ascii
index 9e87025155c..53251b526c9 100644
--- a/regress/usr.bin/mandoc/mdoc/Op/punct.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Op/punct.out_ascii
@@ -1,4 +1,4 @@
-OP-PUNCT(1) OpenBSD Reference Manual OP-PUNCT(1)
+OP-PUNCT(1) General Commands Manual OP-PUNCT(1)
NNAAMMEE
OOpp--ppuunncctt - punctuation handling by the Op macro
diff --git a/regress/usr.bin/mandoc/mdoc/Os/dupe.out_ascii b/regress/usr.bin/mandoc/mdoc/Os/dupe.out_ascii
index a910cde5c9e..4f76190a8bd 100644
--- a/regress/usr.bin/mandoc/mdoc/Os/dupe.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Os/dupe.out_ascii
@@ -1,4 +1,4 @@
-OS-DUPE(1) OpenBSD Reference Manual OS-DUPE(1)
+OS-DUPE(1) General Commands Manual OS-DUPE(1)
NNAAMMEE
OOss--dduuppee - repeated operating system macros
diff --git a/regress/usr.bin/mandoc/mdoc/Os/late.out_ascii b/regress/usr.bin/mandoc/mdoc/Os/late.out_ascii
index d431033274f..06de34589af 100644
--- a/regress/usr.bin/mandoc/mdoc/Os/late.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Os/late.out_ascii
@@ -1,4 +1,4 @@
-OS-LATE(1) OpenBSD Reference Manual OS-LATE(1)
+OS-LATE(1) General Commands Manual OS-LATE(1)
NNAAMMEE
OOss--llaattee - late operating system macro
diff --git a/regress/usr.bin/mandoc/mdoc/Os/missing.out_ascii b/regress/usr.bin/mandoc/mdoc/Os/missing.out_ascii
index 017261dae63..8398c253280 100644
--- a/regress/usr.bin/mandoc/mdoc/Os/missing.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Os/missing.out_ascii
@@ -1,4 +1,4 @@
-OS-MISSING(1) OpenBSD Reference Manual OS-MISSING(1)
+OS-MISSING(1) General Commands Manual OS-MISSING(1)
NNAAMMEE
OOss--mmiissssiinngg - operating system macro missing in prologue
diff --git a/regress/usr.bin/mandoc/mdoc/Ox/keep.out_ascii b/regress/usr.bin/mandoc/mdoc/Ox/keep.out_ascii
index 3fe1fcdcd08..9f01890a174 100644
--- a/regress/usr.bin/mandoc/mdoc/Ox/keep.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ox/keep.out_ascii
@@ -1,4 +1,4 @@
-OX-KEEP(1) OpenBSD Reference Manual OX-KEEP(1)
+OX-KEEP(1) General Commands Manual OX-KEEP(1)
NNAAMMEE
OOxx--kkeeeepp - interaction of unix variant macros and word keeps
diff --git a/regress/usr.bin/mandoc/mdoc/Pa/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Pa/font.out_ascii
index c2b0dcaec6f..5cf318ceb0f 100644
--- a/regress/usr.bin/mandoc/mdoc/Pa/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Pa/font.out_ascii
@@ -1,4 +1,4 @@
-PA-FONT(1) OpenBSD Reference Manual PA-FONT(1)
+PA-FONT(1) General Commands Manual PA-FONT(1)
NNAAMMEE
PPaa--ffoonntt - changing fonts inside the path macro
diff --git a/regress/usr.bin/mandoc/mdoc/Pa/punct.out_ascii b/regress/usr.bin/mandoc/mdoc/Pa/punct.out_ascii
index 24db5a17111..65b247e9dd0 100644
--- a/regress/usr.bin/mandoc/mdoc/Pa/punct.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Pa/punct.out_ascii
@@ -1,4 +1,4 @@
-PA-PUNCT(1) OpenBSD Reference Manual PA-PUNCT(1)
+PA-PUNCT(1) General Commands Manual PA-PUNCT(1)
NNAAMMEE
PPaa--ppuunncctt - punctuation handling by the Pa macro
diff --git a/regress/usr.bin/mandoc/mdoc/Pf/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/Pf/spacing.out_ascii
index 9dda5803f84..cc4e03ff697 100644
--- a/regress/usr.bin/mandoc/mdoc/Pf/spacing.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Pf/spacing.out_ascii
@@ -1,4 +1,4 @@
-PF-SPACING(1) OpenBSD Reference Manual PF-SPACING(1)
+PF-SPACING(1) General Commands Manual PF-SPACING(1)
NNAAMMEE
PPff--ssppaacciinngg - spacing around the prefix macro
diff --git a/regress/usr.bin/mandoc/mdoc/Pp/arg.out_ascii b/regress/usr.bin/mandoc/mdoc/Pp/arg.out_ascii
index 200db9f269f..21eb3ca6bab 100644
--- a/regress/usr.bin/mandoc/mdoc/Pp/arg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Pp/arg.out_ascii
@@ -1,4 +1,4 @@
-PP-ARG(1) OpenBSD Reference Manual PP-ARG(1)
+PP-ARG(1) General Commands Manual PP-ARG(1)
NNAAMMEE
PPpp--aarrgg - paragraph macro with arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Qq/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Qq/empty.out_ascii
index 20992068e58..311f1e94b41 100644
--- a/regress/usr.bin/mandoc/mdoc/Qq/empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Qq/empty.out_ascii
@@ -1,4 +1,4 @@
-QQ-EMPTY(1) OpenBSD Reference Manual QQ-EMPTY(1)
+QQ-EMPTY(1) General Commands Manual QQ-EMPTY(1)
NNAAMMEE
QQqq--eemmppttyy - empty implicit enclosure macros
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/allch.out_ascii b/regress/usr.bin/mandoc/mdoc/Rs/allch.out_ascii
index a0a2e0e12d5..78b1230d47a 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/allch.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Rs/allch.out_ascii
@@ -1,4 +1,4 @@
-RS-ALLCH(1) OpenBSD Reference Manual RS-ALLCH(1)
+RS-ALLCH(1) General Commands Manual RS-ALLCH(1)
NNAAMMEE
RRss--aallllcchh - reference block using all supported child macros
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Rs/break.out_ascii
index 4587ced7e1f..556c82dbbed 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Rs/break.out_ascii
@@ -1,4 +1,4 @@
-RS-BREAK(1) OpenBSD Reference Manual RS-BREAK(1)
+RS-BREAK(1) General Commands Manual RS-BREAK(1)
NNAAMMEE
RRss--bbrreeaakk - line break before reference start
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/three_authors.out_ascii b/regress/usr.bin/mandoc/mdoc/Rs/three_authors.out_ascii
index e697338c496..a267086a05f 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/three_authors.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Rs/three_authors.out_ascii
@@ -1,4 +1,4 @@
-RS-THREE_AUTHORS(1) OpenBSD Reference Manual RS-THREE_AUTHORS(1)
+RS-THREE_AUTHORS(1) General Commands Manual RS-THREE_AUTHORS(1)
NNAAMMEE
RRss--tthhrreeee__aauutthhoorrss - listing three authors in a reference block
diff --git a/regress/usr.bin/mandoc/mdoc/Rv/args.out_ascii b/regress/usr.bin/mandoc/mdoc/Rv/args.out_ascii
index f3c5f65b10d..d2b92536bb7 100644
--- a/regress/usr.bin/mandoc/mdoc/Rv/args.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Rv/args.out_ascii
@@ -1,4 +1,4 @@
-RV-ARGS(3) OpenBSD Programmer's Manual RV-ARGS(3)
+RV-ARGS(3) Library Functions Manual RV-ARGS(3)
NNAAMMEE
RRvv--aarrggss - arguments to the return value macro
diff --git a/regress/usr.bin/mandoc/mdoc/Rv/noname.out_ascii b/regress/usr.bin/mandoc/mdoc/Rv/noname.out_ascii
index 7d3446422ca..8cdd6a2f406 100644
--- a/regress/usr.bin/mandoc/mdoc/Rv/noname.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Rv/noname.out_ascii
@@ -1,4 +1,4 @@
-RV-NONAME(3) OpenBSD Programmer's Manual RV-NONAME(3)
+RV-NONAME(3) Library Functions Manual RV-NONAME(3)
NNAAMMEE
- return value macro without an available name
diff --git a/regress/usr.bin/mandoc/mdoc/Rv/nostd.out_ascii b/regress/usr.bin/mandoc/mdoc/Rv/nostd.out_ascii
index 9ed02ba8b10..320b8b1114e 100644
--- a/regress/usr.bin/mandoc/mdoc/Rv/nostd.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Rv/nostd.out_ascii
@@ -1,4 +1,4 @@
-RV-NOSTD(3) OpenBSD Programmer's Manual RV-NOSTD(3)
+RV-NOSTD(3) Library Functions Manual RV-NOSTD(3)
NNAAMMEE
RRvv--nnoossttdd - return value macros without -std arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/badNAME.out_ascii b/regress/usr.bin/mandoc/mdoc/Sh/badNAME.out_ascii
index 657c5ba2f86..8c329a8576e 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/badNAME.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sh/badNAME.out_ascii
@@ -1,4 +1,4 @@
-SH-BADNAME(1) OpenBSD Reference Manual SH-BADNAME(1)
+SH-BADNAME(1) General Commands Manual SH-BADNAME(1)
NNAAMMEE
_b_a_d _N_A_M_E _s_e_c_t_i_o_n SShh--bbaaddNNAAMMEE
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/before.out_ascii b/regress/usr.bin/mandoc/mdoc/Sh/before.out_ascii
index 71f35f20095..246c684a815 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/before.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sh/before.out_ascii
@@ -1,4 +1,4 @@
-SH-BEFORE(1) OpenBSD Reference Manual SH-BEFORE(1)
+SH-BEFORE(1) General Commands Manual SH-BEFORE(1)
Can mandoc(1) on OpenBSD handle this?
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/emptyNAME.out_ascii b/regress/usr.bin/mandoc/mdoc/Sh/emptyNAME.out_ascii
index 9979b9366fa..32336cd921e 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/emptyNAME.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sh/emptyNAME.out_ascii
@@ -1,4 +1,4 @@
-SH-EMPTYNAME(1) OpenBSD Reference Manual SH-EMPTYNAME(1)
+SH-EMPTYNAME(1) General Commands Manual SH-EMPTYNAME(1)
NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/order.out_ascii b/regress/usr.bin/mandoc/mdoc/Sh/order.out_ascii
index 5f25e91025b..0ed561182ea 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/order.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sh/order.out_ascii
@@ -1,4 +1,4 @@
-SH-ORDER(1) OpenBSD Reference Manual SH-ORDER(1)
+SH-ORDER(1) General Commands Manual SH-ORDER(1)
NNAAMMEE
SShh--oorrddeerr - sections out of conventional order
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/subbefore.out_ascii b/regress/usr.bin/mandoc/mdoc/Sh/subbefore.out_ascii
index e50aff19550..a53bb7dcf36 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/subbefore.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sh/subbefore.out_ascii
@@ -1,4 +1,4 @@
-SH-SUBBEFORE(1) OpenBSD Reference Manual SH-SUBBEFORE(1)
+SH-SUBBEFORE(1) General Commands Manual SH-SUBBEFORE(1)
SSuubbsseeccttiioonn
Can mandoc(1) on OpenBSD handle this?
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/badarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Sm/badarg.out_ascii
index 7251472d8e3..6b65fb9a011 100644
--- a/regress/usr.bin/mandoc/mdoc/Sm/badarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sm/badarg.out_ascii
@@ -1,4 +1,4 @@
-SM-BADARG(1) OpenBSD Reference Manual SM-BADARG(1)
+SM-BADARG(1) General Commands Manual SM-BADARG(1)
NNAAMMEE
SSmm--bbaaddaarrgg - spacing macro with invalid arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Sm/noarg.out_ascii
index ad4d2c365bb..ea0f2fc6ca8 100644
--- a/regress/usr.bin/mandoc/mdoc/Sm/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sm/noarg.out_ascii
@@ -1,4 +1,4 @@
-SM-NOARG(1) OpenBSD Reference Manual SM-NOARG(1)
+SM-NOARG(1) General Commands Manual SM-NOARG(1)
NNAAMMEE
SSmm--nnooaarrgg - spacing macro without arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/scope.out_ascii b/regress/usr.bin/mandoc/mdoc/Sm/scope.out_ascii
index 9a396fc5939..8a735d1c65b 100644
--- a/regress/usr.bin/mandoc/mdoc/Sm/scope.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sm/scope.out_ascii
@@ -1,4 +1,4 @@
-SM-SCOPE(1) OpenBSD Reference Manual SM-SCOPE(1)
+SM-SCOPE(1) General Commands Manual SM-SCOPE(1)
NNAAMMEE
SSmm--ssccooppee - scope of the spacing macro
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/spacing-No.out_ascii b/regress/usr.bin/mandoc/mdoc/Sm/spacing-No.out_ascii
index 56d687c07d9..d303e3cfd64 100644
--- a/regress/usr.bin/mandoc/mdoc/Sm/spacing-No.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sm/spacing-No.out_ascii
@@ -1,4 +1,4 @@
-SM-SPACING(1) OpenBSD Reference Manual SM-SPACING(1)
+SM-SPACING(1) General Commands Manual SM-SPACING(1)
NNAAMMEE
SSmm--ssppaacciinngg - basic tests of spacing mode
diff --git a/regress/usr.bin/mandoc/mdoc/Sm/spacing-Op.out_ascii b/regress/usr.bin/mandoc/mdoc/Sm/spacing-Op.out_ascii
index f620363bac8..c5338dcee9d 100644
--- a/regress/usr.bin/mandoc/mdoc/Sm/spacing-Op.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sm/spacing-Op.out_ascii
@@ -1,4 +1,4 @@
-SM-SPACING-OP(1) OpenBSD Reference Manual SM-SPACING-OP(1)
+SM-SPACING-OP(1) General Commands Manual SM-SPACING-OP(1)
NNAAMMEE
SSmm--ssppaacciinngg--OOpp - spacing mode, demonstrated using the .Op macro
diff --git a/regress/usr.bin/mandoc/mdoc/Sq/empty.out_ascii b/regress/usr.bin/mandoc/mdoc/Sq/empty.out_ascii
index 07155b6ecba..4ca5e846d42 100644
--- a/regress/usr.bin/mandoc/mdoc/Sq/empty.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sq/empty.out_ascii
@@ -1,4 +1,4 @@
-SQ-EMPTY(1) OpenBSD Reference Manual SQ-EMPTY(1)
+SQ-EMPTY(1) General Commands Manual SQ-EMPTY(1)
NNAAMMEE
SSqq--eemmppttyy - empty implicit enclosure macros
diff --git a/regress/usr.bin/mandoc/mdoc/St/badargs.out_ascii b/regress/usr.bin/mandoc/mdoc/St/badargs.out_ascii
index 6890a11c41a..a32ff83ba6b 100644
--- a/regress/usr.bin/mandoc/mdoc/St/badargs.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/St/badargs.out_ascii
@@ -1,4 +1,4 @@
-ST-INVALID(1) OpenBSD Reference Manual ST-INVALID(1)
+ST-INVALID(1) General Commands Manual ST-INVALID(1)
NNAAMMEE
SStt--iinnvvaalliidd - handling of invalid standard argument
diff --git a/regress/usr.bin/mandoc/mdoc/Sx/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Sx/font.out_ascii
index c95637f4f80..a3906c380a3 100644
--- a/regress/usr.bin/mandoc/mdoc/Sx/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sx/font.out_ascii
@@ -1,4 +1,4 @@
-SX-FONT(1) OpenBSD Reference Manual SX-FONT(1)
+SX-FONT(1) General Commands Manual SX-FONT(1)
NNAAMMEE
SSxx--ffoonntt - changing fonts inside the cross reference macro
diff --git a/regress/usr.bin/mandoc/mdoc/Sx/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Sx/noarg.out_ascii
index 28c84090746..343ab0071f2 100644
--- a/regress/usr.bin/mandoc/mdoc/Sx/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sx/noarg.out_ascii
@@ -1,4 +1,4 @@
-SX-NOARG(1) OpenBSD Reference Manual SX-NOARG(1)
+SX-NOARG(1) General Commands Manual SX-NOARG(1)
NNAAMMEE
SSxx--nnooaarrgg - internal cross reference without a target
diff --git a/regress/usr.bin/mandoc/mdoc/Sy/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Sy/font.out_ascii
index 12d4bd8f8a0..b512ef4202d 100644
--- a/regress/usr.bin/mandoc/mdoc/Sy/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sy/font.out_ascii
@@ -1,4 +1,4 @@
-SY-FONT(1) OpenBSD Reference Manual SY-FONT(1)
+SY-FONT(1) General Commands Manual SY-FONT(1)
NNAAMMEE
SSyy--ffoonntt - changing fonts inside the symbolic font macro
diff --git a/regress/usr.bin/mandoc/mdoc/Sy/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Sy/noarg.out_ascii
index 4032c85412d..53a9f2755aa 100644
--- a/regress/usr.bin/mandoc/mdoc/Sy/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Sy/noarg.out_ascii
@@ -1,4 +1,4 @@
-SY-NOARG(1) OpenBSD Reference Manual SY-NOARG(1)
+SY-NOARG(1) General Commands Manual SY-NOARG(1)
NNAAMMEE
SSyy--nnooaarrgg - symbolic macro without arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Tn/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Tn/font.out_ascii
index 5bfcb9d4227..60a99b3ee50 100644
--- a/regress/usr.bin/mandoc/mdoc/Tn/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Tn/font.out_ascii
@@ -1,4 +1,4 @@
-TN-FONT(1) OpenBSD Reference Manual TN-FONT(1)
+TN-FONT(1) General Commands Manual TN-FONT(1)
NNAAMMEE
TTnn--ffoonntt - changing fonts inside the trade name macro
diff --git a/regress/usr.bin/mandoc/mdoc/Tn/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Tn/noarg.out_ascii
index 143d21c8720..1333a900311 100644
--- a/regress/usr.bin/mandoc/mdoc/Tn/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Tn/noarg.out_ascii
@@ -1,4 +1,4 @@
-TN-NOARG(1) OpenBSD Reference Manual TN-NOARG(1)
+TN-NOARG(1) General Commands Manual TN-NOARG(1)
NNAAMMEE
TTnn--nnooaarrgg - trade name macro without argument
diff --git a/regress/usr.bin/mandoc/mdoc/Ux/eos.out_ascii b/regress/usr.bin/mandoc/mdoc/Ux/eos.out_ascii
index 18ae00095a6..16e05df9caf 100644
--- a/regress/usr.bin/mandoc/mdoc/Ux/eos.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ux/eos.out_ascii
@@ -1,4 +1,4 @@
-UX-EOS(1) OpenBSD Reference Manual UX-EOS(1)
+UX-EOS(1) General Commands Manual UX-EOS(1)
NNAAMMEE
UUxx--eeooss - end of sentence spacing after Unix macros
diff --git a/regress/usr.bin/mandoc/mdoc/Ux/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/Ux/spacing.out_ascii
index ae4f79ab695..be5050c37a2 100644
--- a/regress/usr.bin/mandoc/mdoc/Ux/spacing.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Ux/spacing.out_ascii
@@ -1,4 +1,4 @@
-UX-SPACING(1) OpenBSD Reference Manual UX-SPACING(1)
+UX-SPACING(1) General Commands Manual UX-SPACING(1)
NNAAMMEE
UUxx--ssppaacciinngg - spacing around the Unix macro
diff --git a/regress/usr.bin/mandoc/mdoc/Va/basic.out_ascii b/regress/usr.bin/mandoc/mdoc/Va/basic.out_ascii
index d7bbe539dab..a599804a5c0 100644
--- a/regress/usr.bin/mandoc/mdoc/Va/basic.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Va/basic.out_ascii
@@ -1,4 +1,4 @@
-VA-BASIC(1) OpenBSD Reference Manual VA-BASIC(1)
+VA-BASIC(1) General Commands Manual VA-BASIC(1)
NNAAMMEE
VVaa--bbaassiicc - basic usage of the variable name macro
diff --git a/regress/usr.bin/mandoc/mdoc/Va/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Va/font.out_ascii
index d88f484e48a..d7e5af1d788 100644
--- a/regress/usr.bin/mandoc/mdoc/Va/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Va/font.out_ascii
@@ -1,4 +1,4 @@
-VA-FONT(1) OpenBSD Reference Manual VA-FONT(1)
+VA-FONT(1) General Commands Manual VA-FONT(1)
NNAAMMEE
VVaa--ffoonntt - changing fonts inside the variable name macro
diff --git a/regress/usr.bin/mandoc/mdoc/Va/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Va/noarg.out_ascii
index ed489c964a0..e7bec8c2f70 100644
--- a/regress/usr.bin/mandoc/mdoc/Va/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Va/noarg.out_ascii
@@ -1,4 +1,4 @@
-VA-NOARG(1) OpenBSD Reference Manual VA-NOARG(1)
+VA-NOARG(1) General Commands Manual VA-NOARG(1)
NNAAMMEE
VVaa--nnooaarrgg - variable name macro without arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Vt/child.out_ascii b/regress/usr.bin/mandoc/mdoc/Vt/child.out_ascii
index c256f2db588..500c0e80a7e 100644
--- a/regress/usr.bin/mandoc/mdoc/Vt/child.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Vt/child.out_ascii
@@ -1,4 +1,4 @@
-VT-CHILD(1) OpenBSD Reference Manual VT-CHILD(1)
+VT-CHILD(1) General Commands Manual VT-CHILD(1)
NNAAMMEE
VVtt--cchhiilldd - the variable type macro does not want children
diff --git a/regress/usr.bin/mandoc/mdoc/Vt/font.out_ascii b/regress/usr.bin/mandoc/mdoc/Vt/font.out_ascii
index 19762b431e0..bbc703a0521 100644
--- a/regress/usr.bin/mandoc/mdoc/Vt/font.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Vt/font.out_ascii
@@ -1,4 +1,4 @@
-VT-FONT(1) OpenBSD Reference Manual VT-FONT(1)
+VT-FONT(1) General Commands Manual VT-FONT(1)
NNAAMMEE
VVtt--ffoonntt - changing fonts inside the variable type macro
diff --git a/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_ascii b/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_ascii
index 2533c547b5d..04ca18dd5b6 100644
--- a/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Vt/noarg.out_ascii
@@ -1,4 +1,4 @@
-VT-NOARG(1) OpenBSD Reference Manual VT-NOARG(1)
+VT-NOARG(1) General Commands Manual VT-NOARG(1)
NNAAMMEE
VVtt--nnooaarrgg - variable type macro without arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Vt/spacing.out_ascii b/regress/usr.bin/mandoc/mdoc/Vt/spacing.out_ascii
index 1c8e6d2704f..bb5e8441ec5 100644
--- a/regress/usr.bin/mandoc/mdoc/Vt/spacing.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Vt/spacing.out_ascii
@@ -1,4 +1,4 @@
-VT-SPACING(1) OpenBSD Reference Manual VT-SPACING(1)
+VT-SPACING(1) General Commands Manual VT-SPACING(1)
NNAAMMEE
VVtt--ssppaacciinngg - spacing around the variable type macro
diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii b/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
index 170d5bb7bde..987ffb5ad43 100644
--- a/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
@@ -1,4 +1,4 @@
-XR-ARGS(1) OpenBSD Reference Manual XR-ARGS(1)
+XR-ARGS(1) General Commands Manual XR-ARGS(1)
NNAAMMEE
XXrr--aarrggss - additional arguments to cross references
diff --git a/regress/usr.bin/mandoc/mdoc/blank/comment.out_ascii b/regress/usr.bin/mandoc/mdoc/blank/comment.out_ascii
index efe030afbaf..26fde80d7dd 100644
--- a/regress/usr.bin/mandoc/mdoc/blank/comment.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/blank/comment.out_ascii
@@ -1,4 +1,4 @@
-BLANK-COMMENT(1) OpenBSD Reference Manual BLANK-COMMENT(1)
+BLANK-COMMENT(1) General Commands Manual BLANK-COMMENT(1)
NNAAMMEE
bbllaannkk--ccoommmmeenntt - normal and bogus comments
diff --git a/regress/usr.bin/mandoc/mdoc/blank/line.out_ascii b/regress/usr.bin/mandoc/mdoc/blank/line.out_ascii
index 0c69779db79..7fde57952d5 100644
--- a/regress/usr.bin/mandoc/mdoc/blank/line.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/blank/line.out_ascii
@@ -1,4 +1,4 @@
-BLANK-LINE(1) OpenBSD Reference Manual BLANK-LINE(1)
+BLANK-LINE(1) General Commands Manual BLANK-LINE(1)
NNAAMMEE
bbllaannkk--lliinnee - handling of blank line
diff --git a/regress/usr.bin/mandoc/mdoc/blank/list.out_ascii b/regress/usr.bin/mandoc/mdoc/blank/list.out_ascii
index 5dce1cb2c76..5f0eaa98c8f 100644
--- a/regress/usr.bin/mandoc/mdoc/blank/list.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/blank/list.out_ascii
@@ -1,4 +1,4 @@
-BLANK-LIST(1) OpenBSD Reference Manual BLANK-LIST(1)
+BLANK-LIST(1) General Commands Manual BLANK-LIST(1)
NNAAMMEE
bbllaannkk--lliisstt - handling of blank lines in lists