Messages of the -Wbase level now print STYLE:. Since this

causes horrible churn anyway, profit of the opportunity to stop
excessive testing, such that this is hopefully the last instance
of such churn.  Consistently use OpenBSD RCS tags, blank .Os,
blank fourth .TH argument, and Mdocdate like everywhere else.
Use -Ios=OpenBSD for platform-independent predictable output.

129 files changed, 279 insertions, 227 deletions

diff --git a/regress/man/B/args.in b/regress/man/B/args.in
index 57493d5d..662fcb47 100644
--- a/regress/man/B/args.in
+++ b/regress/man/B/args.in
@@ -1,4 +1,5 @@
-.TH B-ARGS 1 "July 30, 2014" OpenBSD
+.\" $OpenBSD: args.in,v 1.3 2017/07/04 14:53:23 schwarze Exp $
+.TH B-ARGS 1 "July 30, 2014"
 .SH NAME
 B-args \- arguments to font macros
 .SH DESCRIPTION
diff --git a/regress/man/B/args.out_lint b/regress/man/B/args.out_lint
index 5347c6e9..42fad123 100644
--- a/regress/man/B/args.out_lint
+++ b/regress/man/B/args.out_lint
@@ -1,2 +1 @@
-mandoc: args.in:20:2: WARNING: line scope broken: EOF breaks B
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:21:2: WARNING: line scope broken: EOF breaks B
diff --git a/regress/man/B/blank.in b/regress/man/B/blank.in
index eef5126f..929ce982 100644
--- a/regress/man/B/blank.in
+++ b/regress/man/B/blank.in
@@ -1,4 +1,5 @@
-.TH B-BLANK 1 "June 3, 2017" OpenBSD
+.\" $OpenBSD: blank.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH B-BLANK 1 "June 3, 2017"
 .SH NAME
 B-blank \- blank line in font macro next line scope
 .SH DESCRIPTION
diff --git a/regress/man/B/blank.out_lint b/regress/man/B/blank.out_lint
index dd47ae8e..2520aa02 100644
--- a/regress/man/B/blank.out_lint
+++ b/regress/man/B/blank.out_lint
@@ -1,2 +1 @@
-mandoc: blank.in:7:1: WARNING: skipping blank line in line scope
-mandoc: blank.in: BASE: RCS id missing: (OpenBSD)
+mandoc: blank.in:8:1: WARNING: skipping blank line in line scope
diff --git a/regress/man/BI/emptyargs.in b/regress/man/BI/emptyargs.in
index acbf4986..4bfbb30c 100644
--- a/regress/man/BI/emptyargs.in
+++ b/regress/man/BI/emptyargs.in
@@ -1,4 +1,5 @@
-.TH BI-EMPTYARGS 1 "April 6, 2015" OpenBSD
+.\" $OpenBSD: emptyargs.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH BI-EMPTYARGS 1 "April 6, 2015"
 .SH NAME
 BI-emptyargs \- empty arguments to font alternation macros
 .SH DESCRIPTION
diff --git a/regress/man/BI/literal.in b/regress/man/BI/literal.in
index ebd22a67..9910bd7c 100644
--- a/regress/man/BI/literal.in
+++ b/regress/man/BI/literal.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: literal.in,v 1.3 2017/07/04 14:53:23 schwarze Exp $
 .TH GETTEXT 3 "May 2001" "GNU gettext 0.18"
 .SH NAME
 gettext, dgettext, dcgettext \- translate message
diff --git a/regress/man/EX/args.in b/regress/man/EX/args.in
index ac88a38a..9cfd112b 100644
--- a/regress/man/EX/args.in
+++ b/regress/man/EX/args.in
@@ -1,4 +1,5 @@
-.TH EX-ARGS 1 "June 3, 2012" OpenBSD
+.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH EX-ARGS 1 "June 3, 2012"
 .SH NAME
 EX-args \- example macro with arguments
 .SH DESCRIPTION
diff --git a/regress/man/EX/nested.in b/regress/man/EX/nested.in
index 8ecf0ca2..16ed9146 100644
--- a/regress/man/EX/nested.in
+++ b/regress/man/EX/nested.in
@@ -1,4 +1,5 @@
-.TH EX-NESTED 1 "June 3, 2012" OpenBSD
+.\" $OpenBSD: nested.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH EX-NESTED 1 "June 3, 2012"
 .SH NAME
 EX-nested \- nested example macros
 .SH DESCRIPTION
diff --git a/regress/man/EX/spacing.in b/regress/man/EX/spacing.in
index aa307d05..21ec1a3d 100644
--- a/regress/man/EX/spacing.in
+++ b/regress/man/EX/spacing.in
@@ -1,4 +1,5 @@
-.TH EX-SPACING 1 "June 3, 2012" OpenBSD
+.\" $OpenBSD: spacing.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH EX-SPACING 1 "June 3, 2012"
 .SH NAME
 EX-spacing \- spacing around the example macro
 .SH DESCRIPTION
diff --git a/regress/man/HP/break.in b/regress/man/HP/break.in
index d760b8f2..adefd55c 100644
--- a/regress/man/HP/break.in
+++ b/regress/man/HP/break.in
@@ -1,4 +1,5 @@
-.TH HP-BREAK 1 "September 21, 2011" OpenBSD
+.\" $OpenBSD: break.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH HP-BREAK 1 "September 21, 2011"
 .SH NAME
 HP-break \- breaking the head line of hanged paragraphs
 .SH DESCRIPTION
diff --git a/regress/man/HP/literal.in b/regress/man/HP/literal.in
index e7caee1c..0f256638 100644
--- a/regress/man/HP/literal.in
+++ b/regress/man/HP/literal.in
@@ -1,4 +1,5 @@
-.TH HP-LITERAL 1 "January 4, 2011" OpenBSD
+.\" $OpenBSD: literal.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH HP-LITERAL 1 "January 4, 2011"
 .SH NAME
 HP-literal \- hanged paragraphs in literal context
 .SH DESCRIPTION
diff --git a/regress/man/HP/macrotag.in b/regress/man/HP/macrotag.in
index 6582498c..d848da57 100644
--- a/regress/man/HP/macrotag.in
+++ b/regress/man/HP/macrotag.in
@@ -1,4 +1,5 @@
-.TH HP-MACROTAG 1 "September 20, 2011" OpenBSD
+.\" $OpenBSD: macrotag.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH HP-MACROTAG 1 "September 20, 2011"
 .SH NAME
 HP-macrotag \- macro in the head of a tagged paragraph
 .SH DESCRIPTION
diff --git a/regress/man/HP/manyargs.in b/regress/man/HP/manyargs.in
index b49e6649..9c7eb312 100644
--- a/regress/man/HP/manyargs.in
+++ b/regress/man/HP/manyargs.in
@@ -1,4 +1,5 @@
-.TH HP-MANYARGS 1 "January 4, 2011" OpenBSD
+.\" $OpenBSD: manyargs.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH HP-MANYARGS 1 "January 4, 2011"
 .SH NAME
 HP-manyargs \- too many header args for hanged blocks
 .SH DESCRIPTION
diff --git a/regress/man/HP/spacing.in b/regress/man/HP/spacing.in
index be511684..7f3f2f6b 100644
--- a/regress/man/HP/spacing.in
+++ b/regress/man/HP/spacing.in
@@ -1,4 +1,5 @@
-.TH HP-SPACING 1 "December 23, 2014" OpenBSD
+.\" $OpenBSD: spacing.in,v 1.6 2017/07/04 14:53:23 schwarze Exp $
+.TH HP-SPACING 1 "December 23, 2014"
 .SH NAME
 HP-spacing \- spacing in hanged lists
 .SH DESCRIPTION
diff --git a/regress/man/IP/empty.in b/regress/man/IP/empty.in
index 42afeefa..21c42983 100644
--- a/regress/man/IP/empty.in
+++ b/regress/man/IP/empty.in
@@ -1,4 +1,5 @@
-.TH IP-EMPTY 1 "July 17, 2012" OpenBSD
+.\" $OpenBSD: empty.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH IP-EMPTY 1 "July 17, 2012"
 .SH NAME
 IP-empty \- empty indented paragraphs
 .SH DESCRIPTION
diff --git a/regress/man/IP/empty.out_lint b/regress/man/IP/empty.out_lint
index 5a65e4ba..6c666c88 100644
--- a/regress/man/IP/empty.out_lint
+++ b/regress/man/IP/empty.out_lint
@@ -1,3 +1,2 @@
-mandoc: empty.in:12:2: WARNING: skipping paragraph macro: IP empty
-mandoc: empty.in:19:2: WARNING: skipping paragraph macro: IP empty
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:13:2: WARNING: skipping paragraph macro: IP empty
+mandoc: empty.in:20:2: WARNING: skipping paragraph macro: IP empty
diff --git a/regress/man/IP/literal.in b/regress/man/IP/literal.in
index 111ec79b..edb8eb02 100644
--- a/regress/man/IP/literal.in
+++ b/regress/man/IP/literal.in
@@ -1,4 +1,5 @@
-.TH IP-LITERAL 1 "January 4, 2011" OpenBSD
+.\" $OpenBSD: literal.in,v 1.6 2017/07/04 14:53:23 schwarze Exp $
+.TH IP-LITERAL 1 "January 4, 2011"
 .SH NAME
 IP-literal \- indented paragraphs in literal context
 .SH DESCRIPTION
diff --git a/regress/man/IP/longhead.in b/regress/man/IP/longhead.in
index f24922c0..566e5002 100644
--- a/regress/man/IP/longhead.in
+++ b/regress/man/IP/longhead.in
@@ -1,4 +1,5 @@
-.TH IP-LONGHEAD 1 "April 8, 2014" OpenBSD
+.\" $OpenBSD: longhead.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH IP-LONGHEAD 1 "April 8, 2014"
 .SH NAME
 IP-longhead \- indented paragraph with a long head
 .SH DESCRIPTION
diff --git a/regress/man/IP/manyargs.in b/regress/man/IP/manyargs.in
index 4a683829..f2542fe7 100644
--- a/regress/man/IP/manyargs.in
+++ b/regress/man/IP/manyargs.in
@@ -1,4 +1,5 @@
-.TH IP-MANYARGS 1 "January 4, 2011" OpenBSD
+.\" $OpenBSD: manyargs.in,v 1.5 2017/07/04 14:53:23 schwarze Exp $
+.TH IP-MANYARGS 1 "January 4, 2011"
 .SH NAME
 IP-manyargs \- too many header args for indented blocks
 .SH DESCRIPTION
diff --git a/regress/man/IP/spacing.in b/regress/man/IP/spacing.in
index e1239b5b..a8e6dcde 100644
--- a/regress/man/IP/spacing.in
+++ b/regress/man/IP/spacing.in
@@ -1,4 +1,5 @@
-.TH IP-SPACING 1 "September 21, 2015" OpenBSD
+.\" $OpenBSD: spacing.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.TH IP-SPACING 1 "September 21, 2015"
 .SH NAME
 IP-spacing \- spacing in indentend paragraphs
 .SH DESCRIPTION
diff --git a/regress/man/IP/width.in b/regress/man/IP/width.in
index 74372005..3b5aee46 100644
--- a/regress/man/IP/width.in
+++ b/regress/man/IP/width.in
@@ -1,4 +1,5 @@
-.TH IP-WIDTH 1 "December 23, 2014" OpenBSD
+.\" $OpenBSD: width.in,v 1.9 2017/07/04 14:53:23 schwarze Exp $
+.TH IP-WIDTH 1 "December 23, 2014"
 .SH NAME
 IP-width \- indentation width of indented paragraphs
 .SH DESCRIPTION
diff --git a/regress/man/MT/args.in b/regress/man/MT/args.in
index e8335d0b..c6ea1526 100644
--- a/regress/man/MT/args.in
+++ b/regress/man/MT/args.in
@@ -1,4 +1,5 @@
-.TH MT-ARGS 1 "June 25, 2017" OpenBSD
+.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH MT-ARGS 1 "June 25, 2017"
 .SH NAME
 MT-args \- argument handling of the man-ext mailto macro
 .SH DESCRIPTION
diff --git a/regress/man/MT/args.out_lint b/regress/man/MT/args.out_lint
index d26e9fdd..e94e63de 100644
--- a/regress/man/MT/args.out_lint
+++ b/regress/man/MT/args.out_lint
@@ -1,6 +1,5 @@
-mandoc: args.in:21:11: ERROR: skipping excess arguments: MT ... second
-mandoc: args.in:26:11: ERROR: skipping excess arguments: MT ... second
-mandoc: args.in:12:2: WARNING: empty block: MT
-mandoc: args.in:16:2: WARNING: missing resource identifier, using "": MT
-mandoc: args.in:26:2: WARNING: empty block: MT
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:22:11: ERROR: skipping excess arguments: MT ... second
+mandoc: args.in:27:11: ERROR: skipping excess arguments: MT ... second
+mandoc: args.in:13:2: WARNING: empty block: MT
+mandoc: args.in:17:2: WARNING: missing resource identifier, using "": MT
+mandoc: args.in:27:2: WARNING: empty block: MT
diff --git a/regress/man/MT/noME.in b/regress/man/MT/noME.in
index 45abdbef..930433ab 100644
--- a/regress/man/MT/noME.in
+++ b/regress/man/MT/noME.in
@@ -1,4 +1,5 @@
-.TH MT-NOME 1 "June 25, 2017" OpenBSD
+.\" $OpenBSD: noME.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH MT-NOME 1 "June 25, 2017"
 .SH NAME
 MT-noME \- unclosed mailto macro
 .SH DESCRIPTION
diff --git a/regress/man/MT/noME.out_lint b/regress/man/MT/noME.out_lint
index 98b1349e..70de6e25 100644
--- a/regress/man/MT/noME.out_lint
+++ b/regress/man/MT/noME.out_lint
@@ -1,3 +1,2 @@
-mandoc: noME.in:6:2: ERROR: skipping end of block that is not open: ME
-mandoc: noME.in:9:2: ERROR: appending missing end of block: MT
-mandoc: noME.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noME.in:7:2: ERROR: skipping end of block that is not open: ME
+mandoc: noME.in:10:2: ERROR: appending missing end of block: MT
diff --git a/regress/man/OP/args.in b/regress/man/OP/args.in
index 3fed8337..b6f65503 100644
--- a/regress/man/OP/args.in
+++ b/regress/man/OP/args.in
@@ -1,4 +1,5 @@
-.TH OP-ARGS 1 "February 6, 2015" OpenBSD
+.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH OP-ARGS 1 "February 6, 2015"
 .SH NAME
 OP-args \- argument handling of the man-ext OP macro
 .SH DESCRIPTION
diff --git a/regress/man/OP/args.out_lint b/regress/man/OP/args.out_lint
index 9d6b24d8..ae03588a 100644
--- a/regress/man/OP/args.out_lint
+++ b/regress/man/OP/args.out_lint
@@ -1,3 +1,2 @@
-mandoc: args.in:6:2: WARNING: missing option string, using "": OP
-mandoc: args.in:12:13: ERROR: skipping excess arguments: OP ... bogus
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:7:2: WARNING: missing option string, using "": OP
+mandoc: args.in:13:13: ERROR: skipping excess arguments: OP ... bogus
diff --git a/regress/man/PD/args.in b/regress/man/PD/args.in
index 97bd7993..292462da 100644
--- a/regress/man/PD/args.in
+++ b/regress/man/PD/args.in
@@ -1,4 +1,5 @@
-.TH PD-ARGS 1 "December 23, 2014" OpenBSD
+.\" $OpenBSD: args.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.TH PD-ARGS 1 "December 23, 2014"
 .SH NAME
 PD-args \- unusual arguments to the PD macro
 .SH DESCRIPTION
diff --git a/regress/man/PD/args.out_lint b/regress/man/PD/args.out_lint
index 60f24fa1..3409de2d 100644
--- a/regress/man/PD/args.out_lint
+++ b/regress/man/PD/args.out_lint
@@ -1,2 +1 @@
-mandoc: args.in:26:7: ERROR: skipping excess arguments: PD ... zzz
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:27:7: ERROR: skipping excess arguments: PD ... zzz
diff --git a/regress/man/PD/nextline.in b/regress/man/PD/nextline.in
index a417f9d8..68c20fec 100644
--- a/regress/man/PD/nextline.in
+++ b/regress/man/PD/nextline.in
@@ -1,4 +1,5 @@
-.TH PD-NEXTLINE 1 "March 20, 2015" OpenBSD
+.\" $OpenBSD: nextline.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH PD-NEXTLINE 1 "March 20, 2015"
 .SH NAME
 PD-nextline \- paragraph distance macro in next-line scope
 .SH DESCRIPTION
diff --git a/regress/man/PD/spacing.in b/regress/man/PD/spacing.in
index 9b324149..01c3bf30 100644
--- a/regress/man/PD/spacing.in
+++ b/regress/man/PD/spacing.in
@@ -1,4 +1,5 @@
-.TH PD-SPACING 1 "July 28, 2012" OpenBSD
+.\" $OpenBSD: spacing.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH PD-SPACING 1 "July 28, 2012"
 .SH NAME
 PD-spacing \- effect of the PD macro on vertical spacing
 .SH DESCRIPTION
diff --git a/regress/man/PP/args.in b/regress/man/PP/args.in
index e608d9b9..25ff2142 100644
--- a/regress/man/PP/args.in
+++ b/regress/man/PP/args.in
@@ -1,4 +1,5 @@
-.TH PP-ARG 1 "July 4, 2014" OpenBSD
+.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH PP-ARG 1 "July 4, 2014"
 .SH NAME
 PP-arg \- paragraphs macros with arguments
 .SH DESCRIPTION
diff --git a/regress/man/PP/args.out_lint b/regress/man/PP/args.out_lint
index 1056331b..c757d510 100644
--- a/regress/man/PP/args.out_lint
+++ b/regress/man/PP/args.out_lint
@@ -1,4 +1,3 @@
-mandoc: args.in:6:2: ERROR: skipping all arguments: PP arg
-mandoc: args.in:8:2: ERROR: skipping all arguments: LP arg1 ...
-mandoc: args.in:10:2: ERROR: skipping all arguments: P arg
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:7:2: ERROR: skipping all arguments: PP arg
+mandoc: args.in:9:2: ERROR: skipping all arguments: LP arg1 ...
+mandoc: args.in:11:2: ERROR: skipping all arguments: P arg
diff --git a/regress/man/PP/empty.in b/regress/man/PP/empty.in
index a6ac538f..7f5257fb 100644
--- a/regress/man/PP/empty.in
+++ b/regress/man/PP/empty.in
@@ -1,4 +1,5 @@
-.TH PP-EMPTY 1 "May 24, 2010" OpenBSD
+.\" $OpenBSD: empty.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.TH PP-EMPTY 1 "May 24, 2010"
 .SH NAME
 PP-empty \- handling of empty paragraphs
 .SH DESCRIPTION
diff --git a/regress/man/PP/empty.out_lint b/regress/man/PP/empty.out_lint
index 6c56a89c..4c62912f 100644
--- a/regress/man/PP/empty.out_lint
+++ b/regress/man/PP/empty.out_lint
@@ -1,4 +1,3 @@
-mandoc: empty.in:7:2: WARNING: skipping paragraph macro: PP empty
-mandoc: empty.in:10:2: WARNING: skipping paragraph macro: PP empty
-mandoc: empty.in:13:2: WARNING: skipping paragraph macro: PP empty
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:8:2: WARNING: skipping paragraph macro: PP empty
+mandoc: empty.in:11:2: WARNING: skipping paragraph macro: PP empty
+mandoc: empty.in:14:2: WARNING: skipping paragraph macro: PP empty
diff --git a/regress/man/RS/REarg.in b/regress/man/RS/REarg.in
index 05eadd8e..27af5017 100644
--- a/regress/man/RS/REarg.in
+++ b/regress/man/RS/REarg.in
@@ -1,4 +1,5 @@
-.TH RS-REARG 1 "January 24, 2015" OpenBSD
+.\" $OpenBSD: REarg.in,v 1.3 2017/07/04 14:53:23 schwarze Exp $
+.TH RS-REARG 1 "January 24, 2015"
 .SH NAME
 RS-REarg \- arguments to the RE macro
 .SH DESCRIPTION
diff --git a/regress/man/RS/REarg.out_lint b/regress/man/RS/REarg.out_lint
index 8c0c6957..457ccb15 100644
--- a/regress/man/RS/REarg.out_lint
+++ b/regress/man/RS/REarg.out_lint
@@ -1,8 +1,7 @@
-mandoc: REarg.in:6:8: ERROR: skipping excess arguments: RS ... 2i
-mandoc: REarg.in:10:6: ERROR: skipping excess arguments: RE ... a
-mandoc: REarg.in:12:6: ERROR: skipping excess arguments: RE ... b
-mandoc: REarg.in:18:6: ERROR: skipping excess arguments: RE ... c
-mandoc: REarg.in:24:6: ERROR: skipping excess arguments: RE ... d
-mandoc: REarg.in:26:6: ERROR: skipping excess arguments: RE ... e
-mandoc: REarg.in:26:2: ERROR: fewer RS blocks open, skipping: RE 1
-mandoc: REarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: REarg.in:7:8: ERROR: skipping excess arguments: RS ... 2i
+mandoc: REarg.in:11:6: ERROR: skipping excess arguments: RE ... a
+mandoc: REarg.in:13:6: ERROR: skipping excess arguments: RE ... b
+mandoc: REarg.in:19:6: ERROR: skipping excess arguments: RE ... c
+mandoc: REarg.in:25:6: ERROR: skipping excess arguments: RE ... d
+mandoc: REarg.in:27:6: ERROR: skipping excess arguments: RE ... e
+mandoc: REarg.in:27:2: ERROR: fewer RS blocks open, skipping: RE 1
diff --git a/regress/man/RS/an-margin.in b/regress/man/RS/an-margin.in
index b14b2cae..6eee6b7c 100644
--- a/regress/man/RS/an-margin.in
+++ b/regress/man/RS/an-margin.in
@@ -1,4 +1,5 @@
-.TH RS-AN-MARGIN 1 "June 13, 2017" OpenBSD
+.\" $OpenBSD: an-margin.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH RS-AN-MARGIN 1 "June 13, 2017"
 .SH NAME
 RS-an-margin \- reStructuredText peeks at an internal register
 .SH DESCRIPTION
diff --git a/regress/man/RS/breaking.in b/regress/man/RS/breaking.in
index 441c5524..c28faf76 100644
--- a/regress/man/RS/breaking.in
+++ b/regress/man/RS/breaking.in
@@ -1,4 +1,5 @@
-.TH RS-BREAKING 1 "7 July 2012" OpenBSD
+.\" $OpenBSD: breaking.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH RS-BREAKING 1 "7 July 2012"
 .SH NAME
 RS-breaking \- some block gets broken by an RS block
 .SH DESCRIPTION
diff --git a/regress/man/RS/broken.in b/regress/man/RS/broken.in
index ea81c0c3..bc871b52 100644
--- a/regress/man/RS/broken.in
+++ b/regress/man/RS/broken.in
@@ -1,4 +1,5 @@
-.TH RS-BROKEN 1 "January 24, 2015" OpenBSD
+.\" $OpenBSD: broken.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.TH RS-BROKEN 1 "January 24, 2015"
 .SH NAME
 RS-broken \- indented blocks broken by other blocks
 .SH DESCRIPTION
diff --git a/regress/man/RS/empty.in b/regress/man/RS/empty.in
index a7cd5829..4511686e 100644
--- a/regress/man/RS/empty.in
+++ b/regress/man/RS/empty.in
@@ -1,4 +1,5 @@
-.TH RS-EMPTY 1 "July 17, 2012" OpenBSD
+.\" $OpenBSD: empty.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH RS-EMPTY 1 "July 17, 2012"
 .SH NAME
 RS-empty \- empty margin reset blocks
 .SH DESCRIPTION
diff --git a/regress/man/RS/empty.out_lint b/regress/man/RS/empty.out_lint
index 308476a2..7ec48cba 100644
--- a/regress/man/RS/empty.out_lint
+++ b/regress/man/RS/empty.out_lint
@@ -1,2 +1 @@
-mandoc: empty.in:7:2: WARNING: empty block: RS
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:8:2: WARNING: empty block: RS
diff --git a/regress/man/RS/literal.in b/regress/man/RS/literal.in
index bd57c610..c77e2aec 100644
--- a/regress/man/RS/literal.in
+++ b/regress/man/RS/literal.in
@@ -1,4 +1,5 @@
-.TH RS-LITERAL 1 "January 5, 2013" OpenBSD
+.\" $OpenBSD: literal.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH RS-LITERAL 1 "January 5, 2013"
 .SH NAME
 RS-literal \- indented literal text
 .SH DESCRIPTION
diff --git a/regress/man/RS/lonelyRE.in b/regress/man/RS/lonelyRE.in
index 2f166dae..b5203d1f 100644
--- a/regress/man/RS/lonelyRE.in
+++ b/regress/man/RS/lonelyRE.in
@@ -1,4 +1,5 @@
-.TH RS-LONELYRE 1 "November 10, 2013" OpenBSD
+.\" $OpenBSD: lonelyRE.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH RS-LONELYRE 1 "November 10, 2013"
 .SH NAME
 RS-lonelyRE \- closing RS that is not open
 .SH DESCRIPTION
diff --git a/regress/man/RS/lonelyRE.out_lint b/regress/man/RS/lonelyRE.out_lint
index 886b20fe..7ee3f6e4 100644
--- a/regress/man/RS/lonelyRE.out_lint
+++ b/regress/man/RS/lonelyRE.out_lint
@@ -1,4 +1,3 @@
-mandoc: lonelyRE.in:11:2: ERROR: skipping end of block that is not open: RE
-mandoc: lonelyRE.in:15:2: ERROR: skipping end of block that is not open: RE
-mandoc: lonelyRE.in:20:2: ERROR: skipping end of block that is not open: RE
-mandoc: lonelyRE.in: BASE: RCS id missing: (OpenBSD)
+mandoc: lonelyRE.in:12:2: ERROR: skipping end of block that is not open: RE
+mandoc: lonelyRE.in:16:2: ERROR: skipping end of block that is not open: RE
+mandoc: lonelyRE.in:21:2: ERROR: skipping end of block that is not open: RE
diff --git a/regress/man/RS/nested.in b/regress/man/RS/nested.in
index 7650e43f..8b105f56 100644
--- a/regress/man/RS/nested.in
+++ b/regress/man/RS/nested.in
@@ -1,4 +1,5 @@
-.TH RS-NESTED 1 "April 4, 2015" OpenBSD
+.\" $OpenBSD: nested.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.TH RS-NESTED 1 "April 4, 2015"
 .SH NAME
 RS-nested \- various blocks nested inside reset blocks
 .SH DESCRIPTION
diff --git a/regress/man/RS/noRE.in b/regress/man/RS/noRE.in
index 45ecbc26..09415eb5 100644
--- a/regress/man/RS/noRE.in
+++ b/regress/man/RS/noRE.in
@@ -1,4 +1,5 @@
-.TH RS-NORE 1 "June 20, 2014" OpenBSD
+.\" $OpenBSD: noRE.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH RS-NORE 1 "June 20, 2014"
 .SH NAME
 RS-noRE \- unclosed indented block
 .SH DESCRIPTION
diff --git a/regress/man/RS/noRE.out_lint b/regress/man/RS/noRE.out_lint
index 7aeaf731..44460f92 100644
--- a/regress/man/RS/noRE.out_lint
+++ b/regress/man/RS/noRE.out_lint
@@ -1,2 +1 @@
-mandoc: noRE.in:7:2: ERROR: appending missing end of block: RS
-mandoc: noRE.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noRE.in:8:2: ERROR: appending missing end of block: RS
diff --git a/regress/man/RS/nowidth.in b/regress/man/RS/nowidth.in
index ee53489a..47c65768 100644
--- a/regress/man/RS/nowidth.in
+++ b/regress/man/RS/nowidth.in
@@ -1,4 +1,5 @@
-.TH RS-NESTED 1 "April 6, 2015" OpenBSD
+.\" $OpenBSD: nowidth.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH RS-NESTED 1 "April 6, 2015"
 .SH NAME
 RS-nowidth \- indentation blocks not specifying a width
 .SH DESCRIPTION
diff --git a/regress/man/RS/width.in b/regress/man/RS/width.in
index bba4abc8..bfd076e9 100644
--- a/regress/man/RS/width.in
+++ b/regress/man/RS/width.in
@@ -1,4 +1,5 @@
-.TH RS-WIDTH 1 "December 23, 2014" OpenBSD
+.\" $OpenBSD: width.in,v 1.5 2017/07/04 14:53:23 schwarze Exp $
+.TH RS-WIDTH 1 "December 23, 2014"
 .SH NAME
 RS-width \- negative and excessive indentation
 .SH DESCRIPTION
diff --git a/regress/man/SH/broken.in b/regress/man/SH/broken.in
index 3d963ae1..ae7c3492 100644
--- a/regress/man/SH/broken.in
+++ b/regress/man/SH/broken.in
@@ -1,4 +1,5 @@
-.TH SH-BROKEN 1 "July 30, 2014" OpenBSD
+.\" $OpenBSD: broken.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH SH-BROKEN 1 "July 30, 2014"
 .SH NAME
 SH-broken \- section header line scope broken by end of file
 .SH DESCRIPTION
diff --git a/regress/man/SH/broken.out_lint b/regress/man/SH/broken.out_lint
index 43a4c124..eb5a72f1 100644
--- a/regress/man/SH/broken.out_lint
+++ b/regress/man/SH/broken.out_lint
@@ -1,2 +1 @@
-mandoc: broken.in:6:2: WARNING: line scope broken: EOF breaks SH
-mandoc: broken.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken.in:7:2: WARNING: line scope broken: EOF breaks SH
diff --git a/regress/man/SH/broken_eline.in b/regress/man/SH/broken_eline.in
index 262be276..f8fff846 100644
--- a/regress/man/SH/broken_eline.in
+++ b/regress/man/SH/broken_eline.in
@@ -1,4 +1,5 @@
-.TH SH-BROKEN_ELINE 1 "July 30, 2014" OpenBSD
+.\" $OpenBSD: broken_eline.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH SH-BROKEN_ELINE 1 "July 30, 2014"
 .SH NAME
 SH-broken_eline \- section and element line scope broken by eof
 .SH DESCRIPTION
diff --git a/regress/man/SH/broken_eline.out_lint b/regress/man/SH/broken_eline.out_lint
index 9a205352..44493c93 100644
--- a/regress/man/SH/broken_eline.out_lint
+++ b/regress/man/SH/broken_eline.out_lint
@@ -1,3 +1,2 @@
-mandoc: broken_eline.in:7:2: WARNING: line scope broken: EOF breaks B
-mandoc: broken_eline.in:6:2: WARNING: line scope broken: EOF breaks SH
-mandoc: broken_eline.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken_eline.in:8:2: WARNING: line scope broken: EOF breaks B
+mandoc: broken_eline.in:7:2: WARNING: line scope broken: EOF breaks SH
diff --git a/regress/man/SH/empty_before.in b/regress/man/SH/empty_before.in
index af1e4ac7..15c9b0d2 100644
--- a/regress/man/SH/empty_before.in
+++ b/regress/man/SH/empty_before.in
@@ -1,4 +1,5 @@
-.TH SH-EMPTY_BEFORE 1 "August 18, 2014" OpenBSD
+.\" $OpenBSD: empty_before.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH SH-EMPTY_BEFORE 1 "August 18, 2014"
 .PP
 .SH NAME
 SH-empty_before \- empty paragraph before first section header
diff --git a/regress/man/SH/empty_before.out_lint b/regress/man/SH/empty_before.out_lint
index dcf976da..f43a65d0 100644
--- a/regress/man/SH/empty_before.out_lint
+++ b/regress/man/SH/empty_before.out_lint
@@ -1,2 +1 @@
-mandoc: empty_before.in:2:2: WARNING: skipping paragraph macro: PP empty
-mandoc: empty_before.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty_before.in:3:2: WARNING: skipping paragraph macro: PP empty
diff --git a/regress/man/SH/longarg.in b/regress/man/SH/longarg.in
index 54fa474f..274b9de1 100644
--- a/regress/man/SH/longarg.in
+++ b/regress/man/SH/longarg.in
@@ -1,4 +1,5 @@
-.TH SH-LONGARG 1 "April 4, 2015" OpenBSD
+.\" $OpenBSD: longarg.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH SH-LONGARG 1 "April 4, 2015"
 .SH NAME
 SH-longarg \- long section header lines
 .SH
diff --git a/regress/man/SH/noarg.in b/regress/man/SH/noarg.in
index 087ac834..1fe96e5f 100644
--- a/regress/man/SH/noarg.in
+++ b/regress/man/SH/noarg.in
@@ -1,4 +1,5 @@
-.TH SH-NOARG 1 "March 20, 2015" OpenBSD
+.\" $OpenBSD: noarg.in,v 1.5 2017/07/04 14:53:23 schwarze Exp $
+.TH SH-NOARG 1 "March 20, 2015"
 .SH NAME
 SH-noarg \- empty header lines
 .SH
diff --git a/regress/man/SH/noarg.out_lint b/regress/man/SH/noarg.out_lint
index ab91086a..12a013c6 100644
--- a/regress/man/SH/noarg.out_lint
+++ b/regress/man/SH/noarg.out_lint
@@ -1,15 +1,14 @@
-mandoc: noarg.in:4:2: WARNING: line scope broken: SH breaks SH
-mandoc: noarg.in:8:2: WARNING: line scope broken: SS breaks SH
-mandoc: noarg.in:11:2: WARNING: line scope broken: TP breaks SH
-mandoc: noarg.in:15:2: WARNING: line scope broken: IP breaks SH
-mandoc: noarg.in:18:2: WARNING: line scope broken: HP breaks SH
-mandoc: noarg.in:22:2: WARNING: line scope broken: PP breaks SH
-mandoc: noarg.in:25:2: WARNING: line scope broken: RS breaks SH
-mandoc: noarg.in:28:2: WARNING: line scope broken: RE breaks SH
-mandoc: noarg.in:29:2: ERROR: skipping end of block that is not open: RE
-mandoc: noarg.in:31:2: WARNING: line scope broken: UR breaks SH
-mandoc: noarg.in:34:2: WARNING: line scope broken: UE breaks SH
-mandoc: noarg.in:35:2: ERROR: skipping end of block that is not open: UE
-mandoc: noarg.in:41:2: WARNING: fill mode already enabled, skipping: fi
-mandoc: noarg.in:44:1: WARNING: skipping blank line in line scope
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:5:2: WARNING: line scope broken: SH breaks SH
+mandoc: noarg.in:9:2: WARNING: line scope broken: SS breaks SH
+mandoc: noarg.in:12:2: WARNING: line scope broken: TP breaks SH
+mandoc: noarg.in:16:2: WARNING: line scope broken: IP breaks SH
+mandoc: noarg.in:19:2: WARNING: line scope broken: HP breaks SH
+mandoc: noarg.in:23:2: WARNING: line scope broken: PP breaks SH
+mandoc: noarg.in:26:2: WARNING: line scope broken: RS breaks SH
+mandoc: noarg.in:29:2: WARNING: line scope broken: RE breaks SH
+mandoc: noarg.in:30:2: ERROR: skipping end of block that is not open: RE
+mandoc: noarg.in:32:2: WARNING: line scope broken: UR breaks SH
+mandoc: noarg.in:35:2: WARNING: line scope broken: UE breaks SH
+mandoc: noarg.in:36:2: ERROR: skipping end of block that is not open: UE
+mandoc: noarg.in:42:2: WARNING: fill mode already enabled, skipping: fi
+mandoc: noarg.in:45:1: WARNING: skipping blank line in line scope
diff --git a/regress/man/SS/broken.in b/regress/man/SS/broken.in
index 784d2c46..42776e31 100644
--- a/regress/man/SS/broken.in
+++ b/regress/man/SS/broken.in
@@ -1,4 +1,5 @@
-.TH SS-BROKEN 1 "July 30, 2014" OpenBSD
+.\" $OpenBSD: broken.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH SS-BROKEN 1 "July 30, 2014"
 .SH NAME
 SS-broken \- section header line scope broken by end of file
 .SH DESCRIPTION
diff --git a/regress/man/SS/broken.out_lint b/regress/man/SS/broken.out_lint
index d9e5da65..222fe5cb 100644
--- a/regress/man/SS/broken.out_lint
+++ b/regress/man/SS/broken.out_lint
@@ -1,2 +1 @@
-mandoc: broken.in:6:2: WARNING: line scope broken: EOF breaks SS
-mandoc: broken.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken.in:7:2: WARNING: line scope broken: EOF breaks SS
diff --git a/regress/man/SS/broken_eline.in b/regress/man/SS/broken_eline.in
index d5ba6324..07f3f17e 100644
--- a/regress/man/SS/broken_eline.in
+++ b/regress/man/SS/broken_eline.in
@@ -1,4 +1,5 @@
-.TH SS-BROKEN_ELINE 1 "July 30, 2014" OpenBSD
+.\" $OpenBSD: broken_eline.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH SS-BROKEN_ELINE 1 "July 30, 2014"
 .SH NAME
 SS-broken_eline \- subsection and element line scope broken by eof
 .SH DESCRIPTION
diff --git a/regress/man/SS/broken_eline.out_lint b/regress/man/SS/broken_eline.out_lint
index 20bfe7d9..34eeae53 100644
--- a/regress/man/SS/broken_eline.out_lint
+++ b/regress/man/SS/broken_eline.out_lint
@@ -1,3 +1,2 @@
-mandoc: broken_eline.in:7:2: WARNING: line scope broken: EOF breaks B
-mandoc: broken_eline.in:6:2: WARNING: line scope broken: EOF breaks SS
-mandoc: broken_eline.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken_eline.in:8:2: WARNING: line scope broken: EOF breaks B
+mandoc: broken_eline.in:7:2: WARNING: line scope broken: EOF breaks SS
diff --git a/regress/man/SS/longarg.in b/regress/man/SS/longarg.in
index ba218e4d..183d033f 100644
--- a/regress/man/SS/longarg.in
+++ b/regress/man/SS/longarg.in
@@ -1,4 +1,5 @@
-.TH SS-LONGARG 1 "April 4, 2015" OpenBSD
+.\" $OpenBSD: longarg.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH SS-LONGARG 1 "April 4, 2015"
 .SH NAME
 SS-longarg \- long subsection header lines
 .SH
diff --git a/regress/man/SS/noarg.in b/regress/man/SS/noarg.in
index a0ee1059..2eda5b0e 100644
--- a/regress/man/SS/noarg.in
+++ b/regress/man/SS/noarg.in
@@ -1,4 +1,5 @@
-.TH SS-NOARG 1 "March 20, 2015" OpenBSD
+.\" $OpenBSD: noarg.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.TH SS-NOARG 1 "March 20, 2015"
 .SH NAME
 SS-noarg \- empty subsection header lines
 .SS
diff --git a/regress/man/SS/noarg.out_lint b/regress/man/SS/noarg.out_lint
index b3e8c72f..ea550861 100644
--- a/regress/man/SS/noarg.out_lint
+++ b/regress/man/SS/noarg.out_lint
@@ -1,15 +1,14 @@
-mandoc: noarg.in:4:2: WARNING: line scope broken: SH breaks SS
-mandoc: noarg.in:8:2: WARNING: line scope broken: SS breaks SS
-mandoc: noarg.in:11:2: WARNING: line scope broken: TP breaks SS
-mandoc: noarg.in:15:2: WARNING: line scope broken: IP breaks SS
-mandoc: noarg.in:18:2: WARNING: line scope broken: HP breaks SS
-mandoc: noarg.in:22:2: WARNING: line scope broken: PP breaks SS
-mandoc: noarg.in:25:2: WARNING: line scope broken: RS breaks SS
-mandoc: noarg.in:28:2: WARNING: line scope broken: RE breaks SS
-mandoc: noarg.in:29:2: ERROR: skipping end of block that is not open: RE
-mandoc: noarg.in:31:2: WARNING: line scope broken: UR breaks SS
-mandoc: noarg.in:34:2: WARNING: line scope broken: UE breaks SS
-mandoc: noarg.in:35:2: ERROR: skipping end of block that is not open: UE
-mandoc: noarg.in:41:2: WARNING: fill mode already enabled, skipping: fi
-mandoc: noarg.in:44:1: WARNING: skipping blank line in line scope
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:5:2: WARNING: line scope broken: SH breaks SS
+mandoc: noarg.in:9:2: WARNING: line scope broken: SS breaks SS
+mandoc: noarg.in:12:2: WARNING: line scope broken: TP breaks SS
+mandoc: noarg.in:16:2: WARNING: line scope broken: IP breaks SS
+mandoc: noarg.in:19:2: WARNING: line scope broken: HP breaks SS
+mandoc: noarg.in:23:2: WARNING: line scope broken: PP breaks SS
+mandoc: noarg.in:26:2: WARNING: line scope broken: RS breaks SS
+mandoc: noarg.in:29:2: WARNING: line scope broken: RE breaks SS
+mandoc: noarg.in:30:2: ERROR: skipping end of block that is not open: RE
+mandoc: noarg.in:32:2: WARNING: line scope broken: UR breaks SS
+mandoc: noarg.in:35:2: WARNING: line scope broken: UE breaks SS
+mandoc: noarg.in:36:2: ERROR: skipping end of block that is not open: UE
+mandoc: noarg.in:42:2: WARNING: fill mode already enabled, skipping: fi
+mandoc: noarg.in:45:1: WARNING: skipping blank line in line scope
diff --git a/regress/man/TH/baddate.in b/regress/man/TH/baddate.in
index c8819696..d91302b8 100644
--- a/regress/man/TH/baddate.in
+++ b/regress/man/TH/baddate.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: baddate.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .TH TH-BADDATE 1 "three bad words" source
 .SH NAME
 TH-baddate \- the date has three words, but bad ones
diff --git a/regress/man/TH/baddate.out_lint b/regress/man/TH/baddate.out_lint
index 57f24404..6785463d 100644
--- a/regress/man/TH/baddate.out_lint
+++ b/regress/man/TH/baddate.out_lint
@@ -1 +1 @@
-mandoc: baddate.in:1:18: WARNING: cannot parse date, using it verbatim: three bad words
+mandoc: baddate.in:2:18: WARNING: cannot parse date, using it verbatim: three bad words
diff --git a/regress/man/TH/case.in b/regress/man/TH/case.in
index 74954de4..88da2310 100644
--- a/regress/man/TH/case.in
+++ b/regress/man/TH/case.in
@@ -1,4 +1,5 @@
-.TH TH-case 1 "June 13, 2014" OpenBSD
+.\" $OpenBSD: case.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH TH-case 1 "June 13, 2014"
 .SH NAME
 TH-case \- document title is not all caps
 .SH DESCRIPTION
diff --git a/regress/man/TH/case.out_lint b/regress/man/TH/case.out_lint
index 87ddc793..c6e8a65e 100644
--- a/regress/man/TH/case.out_lint
+++ b/regress/man/TH/case.out_lint
@@ -1,2 +1 @@
-mandoc: case.in:1:8: WARNING: lower case character in document title: TH TH-case
-mandoc: case.in: BASE: RCS id missing: (OpenBSD)
+mandoc: case.in:2:8: WARNING: lower case character in document title: TH TH-case
diff --git a/regress/man/TH/emptydate.in b/regress/man/TH/emptydate.in
index da4b7950..587709fc 100644
--- a/regress/man/TH/emptydate.in
+++ b/regress/man/TH/emptydate.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: emptydate.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .TH TH-EMPTYDATE 1 "" source
 .SH NAME
 TH-emptydate \- an empty date string
diff --git a/regress/man/TH/emptydate.out_lint b/regress/man/TH/emptydate.out_lint
index 757fda6c..dba0e545 100644
--- a/regress/man/TH/emptydate.out_lint
+++ b/regress/man/TH/emptydate.out_lint
@@ -1 +1 @@
-mandoc: emptydate.in:1:20: WARNING: missing date, using today's date: TH
+mandoc: emptydate.in:2:20: WARNING: missing date, using today's date: TH
diff --git a/regress/man/TH/isodate.in b/regress/man/TH/isodate.in
index ff483ff8..cc86b3c3 100644
--- a/regress/man/TH/isodate.in
+++ b/regress/man/TH/isodate.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: isodate.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .TH TH-ISODATE 1 "2011-07-02" source
 .SH NAME
 TH-isodate \- ISO date format
diff --git a/regress/man/TH/longdate.in b/regress/man/TH/longdate.in
index 263df782..8fab961f 100644
--- a/regress/man/TH/longdate.in
+++ b/regress/man/TH/longdate.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: longdate.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .TH TH-LONGDATE 1 "1234567890123456789012345678901234567890123456789012345678901234567890123456789012" source
 .SH NAME
 TH-longdate \- the date is longer than the line length
diff --git a/regress/man/TH/longdate.out_lint b/regress/man/TH/longdate.out_lint
index 87add528..3006dad3 100644
--- a/regress/man/TH/longdate.out_lint
+++ b/regress/man/TH/longdate.out_lint
@@ -1 +1 @@
-mandoc: longdate.in:1:19: WARNING: cannot parse date, using it verbatim: 1234567890123456789012345678901234567890123456789012345678901234567890123456789012
+mandoc: longdate.in:2:19: WARNING: cannot parse date, using it verbatim: 1234567890123456789012345678901234567890123456789012345678901234567890123456789012
diff --git a/regress/man/TH/longtit.in b/regress/man/TH/longtit.in
index f0b66b97..7534da68 100644
--- a/regress/man/TH/longtit.in
+++ b/regress/man/TH/longtit.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: longtit.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .TH TH-LONGTIT-23456789012345678901234567890123456789012345678901234567890123456789 1 "November 20, 2014" source
 .SH NAME
 TH-longtit \- the title is longer than the line length
diff --git a/regress/man/TH/longvol.in b/regress/man/TH/longvol.in
index 2b6d0f1f..a32f9015 100644
--- a/regress/man/TH/longvol.in
+++ b/regress/man/TH/longvol.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: longvol.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .TH TH-LONGVOL 1 "November 20, 2014" source 1234567890123456789012345678901234567890123456789012345678901234567890123456789
 .SH NAME
 TH-longvol \- the volume string is longer than the line length
diff --git a/regress/man/TH/mdocdate.in b/regress/man/TH/mdocdate.in
index 1def0a1c..7ceff01a 100644
--- a/regress/man/TH/mdocdate.in
+++ b/regress/man/TH/mdocdate.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: mdocdate.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .TH TH-MDOCDATE 1 "July 2, 2011" source
 .SH NAME
 TH-mdocdate \- standard mdoc(7) date format
diff --git a/regress/man/TH/noTH.in b/regress/man/TH/noTH.in
index 1b1d9a69..09536c7a 100644
--- a/regress/man/TH/noTH.in
+++ b/regress/man/TH/noTH.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: noTH.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .SH NAME
 TH-noTH \- TH macro missing
 .SH DESCRIPTION
diff --git a/regress/man/TH/noarg.in b/regress/man/TH/noarg.in
index 3c15e942..598b8351 100644
--- a/regress/man/TH/noarg.in
+++ b/regress/man/TH/noarg.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: noarg.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .TH
 .SH NAME
 TH-noarg \- no arguments to the TH macro
diff --git a/regress/man/TH/noarg.out_ascii b/regress/man/TH/noarg.out_ascii
index 2857a908..1fb35ffb 100644
--- a/regress/man/TH/noarg.out_ascii
+++ b/regress/man/TH/noarg.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
 
 
 
-                                                                            ()
+OpenBSD                                                                     ()
diff --git a/regress/man/TH/noarg.out_lint b/regress/man/TH/noarg.out_lint
index aa0b4eb0..f4273215 100644
--- a/regress/man/TH/noarg.out_lint
+++ b/regress/man/TH/noarg.out_lint
@@ -1,3 +1,3 @@
-mandoc: noarg.in:1:2: WARNING: missing manual title, using "": TH
-mandoc: noarg.in:1:2: WARNING: missing manual section, using "": TH 
-mandoc: noarg.in:1:2: WARNING: missing date, using today's date: TH
+mandoc: noarg.in:2:2: WARNING: missing manual title, using "": TH
+mandoc: noarg.in:2:2: WARNING: missing manual section, using "": TH 
+mandoc: noarg.in:2:2: WARNING: missing date, using today's date: TH
diff --git a/regress/man/TH/nobody.in b/regress/man/TH/nobody.in
index ab1a47b3..b24909ad 100644
--- a/regress/man/TH/nobody.in
+++ b/regress/man/TH/nobody.in
@@ -1 +1,2 @@
-.TH TH-NOBODY 1 "June 20, 2014" OpenBSD
+.\" $OpenBSD: nobody.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH TH-NOBODY 1 "June 20, 2014"
diff --git a/regress/man/TH/nobody.out_lint b/regress/man/TH/nobody.out_lint
index 191c3a29..f5439fcd 100644
--- a/regress/man/TH/nobody.out_lint
+++ b/regress/man/TH/nobody.out_lint
@@ -1,2 +1 @@
 mandoc: nobody.in: WARNING: no document body
-mandoc: nobody.in: BASE: RCS id missing: (OpenBSD)
diff --git a/regress/man/TH/onearg.in b/regress/man/TH/onearg.in
index fe77903e..9564a36b 100644
--- a/regress/man/TH/onearg.in
+++ b/regress/man/TH/onearg.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: onearg.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .TH TH-ONEARG
 .SH NAME
 TH-onearg \- only one argument to the TH macro
diff --git a/regress/man/TH/onearg.out_ascii b/regress/man/TH/onearg.out_ascii
index 08fb66af..490c8082 100644
--- a/regress/man/TH/onearg.out_ascii
+++ b/regress/man/TH/onearg.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
 
 
 
-                                                                   TH-ONEARG()
+OpenBSD                                                            TH-ONEARG()
diff --git a/regress/man/TH/onearg.out_lint b/regress/man/TH/onearg.out_lint
index e24e90f4..65062684 100644
--- a/regress/man/TH/onearg.out_lint
+++ b/regress/man/TH/onearg.out_lint
@@ -1,2 +1,2 @@
-mandoc: onearg.in:1:2: WARNING: missing manual section, using "": TH TH-ONEARG
-mandoc: onearg.in:1:2: WARNING: missing date, using today's date: TH
+mandoc: onearg.in:2:2: WARNING: missing manual section, using "": TH TH-ONEARG
+mandoc: onearg.in:2:2: WARNING: missing date, using today's date: TH
diff --git a/regress/man/TH/onlyyear.in b/regress/man/TH/onlyyear.in
index 1762438f..f1f2c429 100644
--- a/regress/man/TH/onlyyear.in
+++ b/regress/man/TH/onlyyear.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: onlyyear.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .TH TH-ONLYYEAR 1 2011 source
 .SH NAME
 TH-onlyyear \- the date has only a year
diff --git a/regress/man/TH/sixargs.in b/regress/man/TH/sixargs.in
index 5594818e..4350b816 100644
--- a/regress/man/TH/sixargs.in
+++ b/regress/man/TH/sixargs.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: sixargs.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
 .TH TH-SIXARGS 1 "January 16, 2011" OpenBSD regress SIX
 .SH NAME
 TH-sixargs \- six arguments to the TH macro
diff --git a/regress/man/TH/sixargs.out_lint b/regress/man/TH/sixargs.out_lint
index ef93ddcf..2a1c4a28 100644
--- a/regress/man/TH/sixargs.out_lint
+++ b/regress/man/TH/sixargs.out_lint
@@ -1,2 +1 @@
-mandoc: sixargs.in:1:53: ERROR: skipping excess arguments: TH ... SIX
-mandoc: sixargs.in: BASE: RCS id missing: (OpenBSD)
+mandoc: sixargs.in:2:53: ERROR: skipping excess arguments: TH ... SIX
diff --git a/regress/man/TH/twoargs.in b/regress/man/TH/twoargs.in
index 6048321a..810a1c76 100644
--- a/regress/man/TH/twoargs.in
+++ b/regress/man/TH/twoargs.in
@@ -1,3 +1,4 @@
+.\" $OpenBSD: twoargs.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
 .TH TH-TWOARGS
 .SH NAME
 TH-twoargs \- only two arguments to the TH macro
diff --git a/regress/man/TH/twoargs.out_ascii b/regress/man/TH/twoargs.out_ascii
index b05312fd..cb0fc6ed 100644
--- a/regress/man/TH/twoargs.out_ascii
+++ b/regress/man/TH/twoargs.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
 
 
 
-                                                                  TH-TWOARGS()
+OpenBSD                                                           TH-TWOARGS()
diff --git a/regress/man/TH/twoargs.out_lint b/regress/man/TH/twoargs.out_lint
index ce7c74eb..3cd469f5 100644
--- a/regress/man/TH/twoargs.out_lint
+++ b/regress/man/TH/twoargs.out_lint
@@ -1,2 +1,2 @@
-mandoc: twoargs.in:1:2: WARNING: missing manual section, using "": TH TH-TWOARGS
-mandoc: twoargs.in:1:2: WARNING: missing date, using today's date: TH
+mandoc: twoargs.in:2:2: WARNING: missing manual section, using "": TH TH-TWOARGS
+mandoc: twoargs.in:2:2: WARNING: missing date, using today's date: TH
diff --git a/regress/man/TP/badarg.in b/regress/man/TP/badarg.in
index d40759e2..f4f92ce9 100644
--- a/regress/man/TP/badarg.in
+++ b/regress/man/TP/badarg.in
@@ -1,4 +1,5 @@
-.TH TP-BADARG 1 "November 18, 2012" OpenBSD
+.\" $OpenBSD: badarg.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-BADARG 1 "November 18, 2012"
 .SH NAME
 TP-badarg \- invalid width specification for tagged paragraph
 .SH DESCRIPTION
diff --git a/regress/man/TP/broken.in b/regress/man/TP/broken.in
index 5638ea33..686b5559 100644
--- a/regress/man/TP/broken.in
+++ b/regress/man/TP/broken.in
@@ -1,4 +1,5 @@
-.TH TP-BROKEN 1 "December 16, 2014" OpenBSD
+.\" $OpenBSD: broken.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-BROKEN 1 "December 16, 2014"
 .SH NAME
 TP-broken \- broken tagged paragraph
 .SH DESCRIPTION
diff --git a/regress/man/TP/broken.out_lint b/regress/man/TP/broken.out_lint
index e9e849df..2539a622 100644
--- a/regress/man/TP/broken.out_lint
+++ b/regress/man/TP/broken.out_lint
@@ -1,3 +1,2 @@
-mandoc: broken.in:10:2: WARNING: line scope broken: RE breaks TP
-mandoc: broken.in:15:1: WARNING: skipping blank line in line scope
-mandoc: broken.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken.in:11:2: WARNING: line scope broken: RE breaks TP
+mandoc: broken.in:16:1: WARNING: skipping blank line in line scope
diff --git a/regress/man/TP/double.in b/regress/man/TP/double.in
index 4a6b1674..f81339eb 100644
--- a/regress/man/TP/double.in
+++ b/regress/man/TP/double.in
@@ -1,4 +1,5 @@
-.TH TP-DOUBLE 1 2013-06-23 OpenBSD
+.\" $OpenBSD: double.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-DOUBLE 1 2013-06-23
 .SH NAME
 TP-double \- effect of double tagged paragraph
 .SH DESCRIPTION
diff --git a/regress/man/TP/double.out_lint b/regress/man/TP/double.out_lint
index 78dd403a..f5cada43 100644
--- a/regress/man/TP/double.out_lint
+++ b/regress/man/TP/double.out_lint
@@ -1,6 +1,5 @@
-mandoc: double.in:21:2: WARNING: line scope broken: TP breaks TP
-mandoc: double.in:30:2: WARNING: line scope broken: PP breaks B
-mandoc: double.in:32:2: WARNING: line scope broken: TP breaks TP
-mandoc: double.in:20:2: WARNING: skipping paragraph macro: PP empty
-mandoc: double.in:31:2: WARNING: skipping paragraph macro: PP empty
-mandoc: double.in: BASE: RCS id missing: (OpenBSD)
+mandoc: double.in:22:2: WARNING: line scope broken: TP breaks TP
+mandoc: double.in:31:2: WARNING: line scope broken: PP breaks B
+mandoc: double.in:33:2: WARNING: line scope broken: TP breaks TP
+mandoc: double.in:21:2: WARNING: skipping paragraph macro: PP empty
+mandoc: double.in:32:2: WARNING: skipping paragraph macro: PP empty
diff --git a/regress/man/TP/eof.in b/regress/man/TP/eof.in
index 7ab9a100..e073f7db 100644
--- a/regress/man/TP/eof.in
+++ b/regress/man/TP/eof.in
@@ -1,4 +1,5 @@
-.TH TP-EOF 1 "July 7, 2014" OpenBSD
+.\" $OpenBSD: eof.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-EOF 1 "July 7, 2014"
 .SH NAME
 TP-eof \- indented paragraph macro at the end of the file
 .SH DESCRIPTION
diff --git a/regress/man/TP/eof.out_lint b/regress/man/TP/eof.out_lint
index 44d1d4be..84b5a3fb 100644
--- a/regress/man/TP/eof.out_lint
+++ b/regress/man/TP/eof.out_lint
@@ -1,2 +1 @@
-mandoc: eof.in:6:2: WARNING: line scope broken: EOF breaks TP
-mandoc: eof.in: BASE: RCS id missing: (OpenBSD)
+mandoc: eof.in:7:2: WARNING: line scope broken: EOF breaks TP
diff --git a/regress/man/TP/fill.in b/regress/man/TP/fill.in
index 642c4e5a..dfcf62a5 100644
--- a/regress/man/TP/fill.in
+++ b/regress/man/TP/fill.in
@@ -1,4 +1,5 @@
-.TH TP-FILL 1 "September 4, 2015" OpenBSD
+.\" $OpenBSD: fill.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-FILL 1 "September 4, 2015"
 .SH NAME
 TP-fill \- interaction of tagged paragraphs and fill mode
 .SH DESCRIPTION
diff --git a/regress/man/TP/indent.in b/regress/man/TP/indent.in
index 5480da67..a046ef80 100644
--- a/regress/man/TP/indent.in
+++ b/regress/man/TP/indent.in
@@ -1,4 +1,5 @@
-.TH TP-INDENT 1 "June 17, 2017" OpenBSD
+.\" $OpenBSD: indent.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-INDENT 1 "June 17, 2017"
 .SH NAME
 TP-indent \- indent request inside TP head
 .SH DESCRIPTION
diff --git a/regress/man/TP/literal.in b/regress/man/TP/literal.in
index ca86df57..4fa30fd1 100644
--- a/regress/man/TP/literal.in
+++ b/regress/man/TP/literal.in
@@ -1,4 +1,5 @@
-.TH TP-LITERAL 1 "January 4, 2011" OpenBSD
+.\" $OpenBSD: literal.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-LITERAL 1 "January 4, 2011"
 .SH NAME
 TP-literal \- indented paragraphs in literal context
 .SH DESCRIPTION
diff --git a/regress/man/TP/longhead.in b/regress/man/TP/longhead.in
index 2fab0df4..98b5264a 100644
--- a/regress/man/TP/longhead.in
+++ b/regress/man/TP/longhead.in
@@ -1,4 +1,5 @@
-.TH TP-LONGHEAD 1 "April 8, 2014" OpenBSD
+.\" $OpenBSD: longhead.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-LONGHEAD 1 "April 8, 2014"
 .SH NAME
 TP-longhead \- tagged paragraph with a long head
 .SH DESCRIPTION
diff --git a/regress/man/TP/macrotag.in b/regress/man/TP/macrotag.in
index 5fbb5914..ec214f41 100644
--- a/regress/man/TP/macrotag.in
+++ b/regress/man/TP/macrotag.in
@@ -1,4 +1,5 @@
-.TH TP-MACROTAG 1 "September 20, 2011" OpenBSD
+.\" $OpenBSD: macrotag.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-MACROTAG 1 "September 20, 2011"
 .SH NAME
 TP-macrotag \- macro in the head of a tagged paragraph
 .SH DESCRIPTION
diff --git a/regress/man/TP/manyargs.in b/regress/man/TP/manyargs.in
index 4270c786..9736690b 100644
--- a/regress/man/TP/manyargs.in
+++ b/regress/man/TP/manyargs.in
@@ -1,4 +1,5 @@
-.TH TP-MANYARGS 1 "January 4, 2011" OpenBSD
+.\" $OpenBSD: manyargs.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-MANYARGS 1 "January 4, 2011"
 .SH NAME
 TP-manyargs \- too many header args for indented blocks
 .SH DESCRIPTION
diff --git a/regress/man/TP/sameline.in b/regress/man/TP/sameline.in
index 8857b231..5fa1cac7 100644
--- a/regress/man/TP/sameline.in
+++ b/regress/man/TP/sameline.in
@@ -1,4 +1,5 @@
-.TH TP-SAMELINE 1 "March 8, 2014" OpenBSD
+.\" $OpenBSD: sameline.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-SAMELINE 1 "March 8, 2014"
 .SH NAME
 TP-sameline \- test sameline logic of indented paragraphs
 .SH DESCRIPTION
diff --git a/regress/man/TP/spacing.in b/regress/man/TP/spacing.in
index 71c788aa..181dec63 100644
--- a/regress/man/TP/spacing.in
+++ b/regress/man/TP/spacing.in
@@ -1,4 +1,5 @@
-.TH TP-SPACING 1 "September 21, 2015" OpenBSD
+.\" $OpenBSD: spacing.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-SPACING 1 "September 21, 2015"
 .SH NAME
 TP-spacing \- spacing in tagged paragraphs
 .SH DESCRIPTION
diff --git a/regress/man/TP/width.in b/regress/man/TP/width.in
index 2f4cb1f7..794392b6 100644
--- a/regress/man/TP/width.in
+++ b/regress/man/TP/width.in
@@ -1,4 +1,5 @@
-.TH TP-WIDTH 1 "December 23, 2014" OpenBSD
+.\" $OpenBSD: width.in,v 1.6 2017/07/04 14:53:24 schwarze Exp $
+.TH TP-WIDTH 1 "December 23, 2014"
 .SH NAME
 TP-width \- indentation width of indented paragraphs
 .SH DESCRIPTION
diff --git a/regress/man/TS/break.in b/regress/man/TS/break.in
index 31dfe631..3c910311 100644
--- a/regress/man/TS/break.in
+++ b/regress/man/TS/break.in
@@ -1,4 +1,5 @@
-.TH TBL-BREAK 1 "January 30, 2015" OpenBSD
+.\" $OpenBSD: break.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH TBL-BREAK 1 "January 30, 2015"
 .SH NAME
 tbl-break \- tables breaking blocks
 .SH DESCRIPTION
diff --git a/regress/man/TS/break.out_lint b/regress/man/TS/break.out_lint
index 7ca7a3d3..5d32f3e0 100644
--- a/regress/man/TS/break.out_lint
+++ b/regress/man/TS/break.out_lint
@@ -1,5 +1,4 @@
-mandoc: break.in:6:2: WARNING: line scope broken: TS breaks TP
-mandoc: break.in:13:2: WARNING: line scope broken: TS breaks SH
-mandoc: break.in:20:2: WARNING: line scope broken: TS breaks SS
-mandoc: break.in:27:2: WARNING: line scope broken: TS breaks B
-mandoc: break.in: BASE: RCS id missing: (OpenBSD)
+mandoc: break.in:7:2: WARNING: line scope broken: TS breaks TP
+mandoc: break.in:14:2: WARNING: line scope broken: TS breaks SH
+mandoc: break.in:21:2: WARNING: line scope broken: TS breaks SS
+mandoc: break.in:28:2: WARNING: line scope broken: TS breaks B
diff --git a/regress/man/TS/vspace.in b/regress/man/TS/vspace.in
index 3fbb0c94..226a71af 100644
--- a/regress/man/TS/vspace.in
+++ b/regress/man/TS/vspace.in
@@ -1,4 +1,5 @@
-.TH TBL-VSPACE 1 "May 27, 2012" OpenBSD
+.\" $OpenBSD: vspace.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.TH TBL-VSPACE 1 "May 27, 2012"
 .SH NAME
 tbl-vspace \- vertical spacing around tables
 .SH DESCRIPTION
diff --git a/regress/man/UR/args.in b/regress/man/UR/args.in
index f45770b2..183269e8 100644
--- a/regress/man/UR/args.in
+++ b/regress/man/UR/args.in
@@ -1,4 +1,5 @@
-.TH UR-ARGS 1 "October 17, 2013" OpenBSD
+.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH UR-ARGS 1 "October 17, 2013"
 .SH NAME
 UR-basic \- argument handling of the man-ext URI macro
 .SH DESCRIPTION
diff --git a/regress/man/UR/args.out_lint b/regress/man/UR/args.out_lint
index e94f7bcd..262c9886 100644
--- a/regress/man/UR/args.out_lint
+++ b/regress/man/UR/args.out_lint
@@ -1,6 +1,5 @@
-mandoc: args.in:21:11: ERROR: skipping excess arguments: UR ... second
-mandoc: args.in:26:11: ERROR: skipping excess arguments: UR ... second
-mandoc: args.in:12:2: WARNING: empty block: UR
-mandoc: args.in:16:2: WARNING: missing resource identifier, using "": UR
-mandoc: args.in:26:2: WARNING: empty block: UR
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:22:11: ERROR: skipping excess arguments: UR ... second
+mandoc: args.in:27:11: ERROR: skipping excess arguments: UR ... second
+mandoc: args.in:13:2: WARNING: empty block: UR
+mandoc: args.in:17:2: WARNING: missing resource identifier, using "": UR
+mandoc: args.in:27:2: WARNING: empty block: UR
diff --git a/regress/man/UR/noUE.in b/regress/man/UR/noUE.in
index 8b6f61dd..780dcd9e 100644
--- a/regress/man/UR/noUE.in
+++ b/regress/man/UR/noUE.in
@@ -1,4 +1,5 @@
-.TH UR-NOUE 1 "July 7, 2014" OpenBSD
+.\" $OpenBSD: noUE.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH UR-NOUE 1 "July 7, 2014"
 .SH NAME
 UR-noUE \- unclosed URI macro
 .SH DESCRIPTION
diff --git a/regress/man/UR/noUE.out_lint b/regress/man/UR/noUE.out_lint
index e1fda272..ecc56b03 100644
--- a/regress/man/UR/noUE.out_lint
+++ b/regress/man/UR/noUE.out_lint
@@ -1,3 +1,2 @@
-mandoc: noUE.in:6:2: ERROR: skipping end of block that is not open: UE
-mandoc: noUE.in:9:2: ERROR: appending missing end of block: UR
-mandoc: noUE.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noUE.in:7:2: ERROR: skipping end of block that is not open: UE
+mandoc: noUE.in:10:2: ERROR: appending missing end of block: UR
diff --git a/regress/man/blank/afterSH.in b/regress/man/blank/afterSH.in
index 28934fdf..01bea3e4 100644
--- a/regress/man/blank/afterSH.in
+++ b/regress/man/blank/afterSH.in
@@ -1,4 +1,5 @@
-.TH BLANK-AFTERSH 1 "November 10, 2013" OpenBSD
+.\" $OpenBSD: afterSH.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH BLANK-AFTERSH 1 "November 10, 2013"
 .SH NAME
 blank-afterSH \- handling of blank lines right after a section heading
 .SH DESCRIPTION
diff --git a/regress/man/blank/afterSH.out_lint b/regress/man/blank/afterSH.out_lint
index 8a2d9ce0..4f641b3c 100644
--- a/regress/man/blank/afterSH.out_lint
+++ b/regress/man/blank/afterSH.out_lint
@@ -1,5 +1,4 @@
-mandoc: afterSH.in:31:2: WARNING: skipping paragraph macro: br after SH
-mandoc: afterSH.in:35:2: WARNING: skipping paragraph macro: sp after SH
-mandoc: afterSH.in:71:2: WARNING: skipping paragraph macro: br after SH
-mandoc: afterSH.in:76:2: WARNING: skipping paragraph macro: sp after SH
-mandoc: afterSH.in: BASE: RCS id missing: (OpenBSD)
+mandoc: afterSH.in:32:2: WARNING: skipping paragraph macro: br after SH
+mandoc: afterSH.in:36:2: WARNING: skipping paragraph macro: sp after SH
+mandoc: afterSH.in:72:2: WARNING: skipping paragraph macro: br after SH
+mandoc: afterSH.in:77:2: WARNING: skipping paragraph macro: sp after SH
diff --git a/regress/man/blank/afterSS.in b/regress/man/blank/afterSS.in
index cbf7afe3..163e1199 100644
--- a/regress/man/blank/afterSS.in
+++ b/regress/man/blank/afterSS.in
@@ -1,4 +1,5 @@
-.TH BLANK-AFTERSS 1 "November 10, 2013" OpenBSD
+.\" $OpenBSD: afterSS.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH BLANK-AFTERSS 1 "November 10, 2013"
 .SH NAME
 blank-afterSS \- handling of blank lines right after a subsection heading
 .SH DESCRIPTION
diff --git a/regress/man/blank/afterSS.out_lint b/regress/man/blank/afterSS.out_lint
index a7da2c6e..e5f5bc47 100644
--- a/regress/man/blank/afterSS.out_lint
+++ b/regress/man/blank/afterSS.out_lint
@@ -1,5 +1,4 @@
-mandoc: afterSS.in:32:2: WARNING: skipping paragraph macro: br after SS
-mandoc: afterSS.in:36:2: WARNING: skipping paragraph macro: sp after SS
-mandoc: afterSS.in:72:2: WARNING: skipping paragraph macro: br after SS
-mandoc: afterSS.in:77:2: WARNING: skipping paragraph macro: sp after SS
-mandoc: afterSS.in: BASE: RCS id missing: (OpenBSD)
+mandoc: afterSS.in:33:2: WARNING: skipping paragraph macro: br after SS
+mandoc: afterSS.in:37:2: WARNING: skipping paragraph macro: sp after SS
+mandoc: afterSS.in:73:2: WARNING: skipping paragraph macro: br after SS
+mandoc: afterSS.in:78:2: WARNING: skipping paragraph macro: sp after SS
diff --git a/regress/man/blank/line.in b/regress/man/blank/line.in
index e9479960..8293e12b 100644
--- a/regress/man/blank/line.in
+++ b/regress/man/blank/line.in
@@ -1,4 +1,5 @@
-.TH BLANK-LINE 1 "July 14, 2012" OpenBSD
+.\" $OpenBSD: line.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.TH BLANK-LINE 1 "July 14, 2012"
 .SH NAME
 blank-line \- handling of blank lines
 .SH DESCRIPTION
diff --git a/regress/man/blank/line.out_lint b/regress/man/blank/line.out_lint
index 1abf3faf..30de6f49 100644
--- a/regress/man/blank/line.out_lint
+++ b/regress/man/blank/line.out_lint
@@ -1,9 +1,8 @@
-mandoc: line.in:5:2: WARNING: skipping paragraph macro: sp after SH
-mandoc: line.in:23:2: WARNING: skipping paragraph macro: br after PP
-mandoc: line.in:25:2: WARNING: skipping paragraph macro: PP empty
-mandoc: line.in:35:2: WARNING: skipping paragraph macro: sp after PP
-mandoc: line.in:38:2: WARNING: skipping paragraph macro: sp after PP
-mandoc: line.in:53:1: WARNING: skipping paragraph macro: sp after PP
-mandoc: line.in:81:2: WARNING: skipping paragraph macro: sp after SH
-mandoc: line.in:84:2: WARNING: skipping paragraph macro: sp after SS
-mandoc: line.in: BASE: RCS id missing: (OpenBSD)
+mandoc: line.in:6:2: WARNING: skipping paragraph macro: sp after SH
+mandoc: line.in:24:2: WARNING: skipping paragraph macro: br after PP
+mandoc: line.in:26:2: WARNING: skipping paragraph macro: PP empty
+mandoc: line.in:36:2: WARNING: skipping paragraph macro: sp after PP
+mandoc: line.in:39:2: WARNING: skipping paragraph macro: sp after PP
+mandoc: line.in:54:1: WARNING: skipping paragraph macro: sp after PP
+mandoc: line.in:82:2: WARNING: skipping paragraph macro: sp after SH
+mandoc: line.in:85:2: WARNING: skipping paragraph macro: sp after SS
diff --git a/regress/man/nf/args.in b/regress/man/nf/args.in
index 8d0c7e58..d5213520 100644
--- a/regress/man/nf/args.in
+++ b/regress/man/nf/args.in
@@ -1,4 +1,5 @@
-.TH NF-ARGS 1 "January 16, 2011" OpenBSD
+.\" $OpenBSD: args.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.TH NF-ARGS 1 "January 16, 2011"
 .SH NAME
 nf-args \- filling macros with arguments
 .SH DESCRIPTION
diff --git a/regress/man/nf/args.out_lint b/regress/man/nf/args.out_lint
index c8a3d2c7..64c41f66 100644
--- a/regress/man/nf/args.out_lint
+++ b/regress/man/nf/args.out_lint
@@ -1,3 +1,2 @@
-mandoc: args.in:7:5: ERROR: skipping all arguments: nf arg1 arg2 arg3
-mandoc: args.in:10:5: ERROR: skipping all arguments: fi arg1 arg2 arg3
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:8:5: ERROR: skipping all arguments: nf arg1 arg2 arg3
+mandoc: args.in:11:5: ERROR: skipping all arguments: fi arg1 arg2 arg3
diff --git a/regress/man/nf/dupe.in b/regress/man/nf/dupe.in
index dfa1acbb..5d35c278 100644
--- a/regress/man/nf/dupe.in
+++ b/regress/man/nf/dupe.in
@@ -1,4 +1,5 @@
-.TH NF-DUPE 1 "July 2, 2014" OpenBSD
+.\" $OpenBSD: dupe.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH NF-DUPE 1 "July 2, 2014"
 .SH NAME
 nf-dupe \- duplicate filling macros
 .SH DESCRIPTION
diff --git a/regress/man/nf/dupe.out_lint b/regress/man/nf/dupe.out_lint
index abce2407..1f4cb241 100644
--- a/regress/man/nf/dupe.out_lint
+++ b/regress/man/nf/dupe.out_lint
@@ -1,3 +1,2 @@
-mandoc: dupe.in:7:2: WARNING: fill mode already enabled, skipping: fi
-mandoc: dupe.in:14:2: WARNING: fill mode already disabled, skipping: nf
-mandoc: dupe.in: BASE: RCS id missing: (OpenBSD)
+mandoc: dupe.in:8:2: WARNING: fill mode already enabled, skipping: fi
+mandoc: dupe.in:15:2: WARNING: fill mode already disabled, skipping: nf
diff --git a/regress/man/nf/indent.in b/regress/man/nf/indent.in
index 8c6aedbb..aaf7e905 100644
--- a/regress/man/nf/indent.in
+++ b/regress/man/nf/indent.in
@@ -1,4 +1,5 @@
-.TH NF-INDENT 1 "January 4, 2011" OpenBSD
+.\" $OpenBSD: indent.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.TH NF-INDENT 1 "January 4, 2011"
 .SH NAME
 nf-indent \- indentation of literal blocks
 .SH DESCRIPTION
diff --git a/regress/man/nf/userdef.in b/regress/man/nf/userdef.in
index 93422469..5201cd49 100644
--- a/regress/man/nf/userdef.in
+++ b/regress/man/nf/userdef.in
@@ -1,4 +1,5 @@
-.TH NF-USERDEF 1 "March 8, 2014" OpenBSD
+.\" $OpenBSD: userdef.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH NF-USERDEF 1 "March 8, 2014"
 .SH NAME
 nf-userdef \- setting unfilled mode via user-defined macros
 .SH DESCRIPTION
diff --git a/regress/man/nf/vert.in b/regress/man/nf/vert.in
index 3241e6af..bfa25a8f 100644
--- a/regress/man/nf/vert.in
+++ b/regress/man/nf/vert.in
@@ -1,4 +1,5 @@
-.TH NF-VERT 1 "June 2, 2012" OpenBSD
+.\" $OpenBSD: vert.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.TH NF-VERT 1 "June 2, 2012"
 .SH NAME
 nf-vert \- spacing around filling macros
 .SH DESCRIPTION