summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--regress/char/N/basic.in3
-rw-r--r--regress/char/accent/combine.in3
-rw-r--r--regress/char/accent/nocombine.in3
-rw-r--r--regress/char/accent/utf8only.in3
-rw-r--r--regress/char/bar/man.in3
-rw-r--r--regress/char/bar/mdoc.in5
-rw-r--r--regress/char/bar/mdoc.out_ascii2
-rw-r--r--regress/char/hyphen/man.in3
-rw-r--r--regress/char/hyphen/mdoc.in5
-rw-r--r--regress/char/hyphen/mdoc.out_ascii2
-rw-r--r--regress/char/space/break.in5
-rw-r--r--regress/char/space/break.out_ascii2
-rw-r--r--regress/char/space/eos-man.in3
-rw-r--r--regress/char/space/eos.in5
-rw-r--r--regress/char/space/eos.out_ascii2
-rw-r--r--regress/char/space/esct-man.in3
-rw-r--r--regress/char/space/esct-man.out_lint13
-rw-r--r--regress/char/space/esct-mdoc.in5
-rw-r--r--regress/char/space/esct-mdoc.out_ascii2
-rw-r--r--regress/char/space/esct-mdoc.out_lint9
-rw-r--r--regress/char/space/leading-man.in3
-rw-r--r--regress/char/space/leading-mdoc.in5
-rw-r--r--regress/char/space/leading-mdoc.out_ascii2
-rw-r--r--regress/char/space/multiple.in5
-rw-r--r--regress/char/space/multiple.out_ascii2
-rw-r--r--regress/char/space/nobreak.in5
-rw-r--r--regress/char/space/nobreak.out_ascii2
-rw-r--r--regress/char/space/tab-man.in3
-rw-r--r--regress/char/space/tab-man.out_lint43
-rw-r--r--regress/char/space/tab.in5
-rw-r--r--regress/char/space/tab.out_ascii2
-rw-r--r--regress/char/space/tab.out_lint85
-rw-r--r--regress/char/space/trailing-mdoc.in5
-rw-r--r--regress/char/space/trailing-mdoc.out_ascii2
-rw-r--r--regress/char/space/trailing-mdoc.out_lint9
-rw-r--r--regress/char/space/zerowidth.in3
-rw-r--r--regress/char/unicode/ascii.in3
-rw-r--r--regress/char/unicode/input.inbin2371 -> 2427 bytes
-rw-r--r--regress/char/unicode/input.out_lint137
-rw-r--r--regress/char/unicode/invalid.in5
-rw-r--r--regress/char/unicode/invalid.out_ascii2
-rw-r--r--regress/char/unicode/invalid.out_lint21
-rw-r--r--regress/char/unicode/invalid.out_utf82
-rw-r--r--regress/char/unicode/latin1.in3
-rw-r--r--regress/char/unicode/latin1diff.in3
-rw-r--r--regress/char/unicode/man.in3
-rw-r--r--regress/char/unicode/mdoc.in5
-rw-r--r--regress/char/unicode/mdoc.out_utf82
-rw-r--r--regress/char/unicode/named.in3
-rw-r--r--regress/char/unicode/namediff.in3
-rw-r--r--regress/char/unicode/nogroff.in3
-rw-r--r--regress/eqn/define/font.in5
-rw-r--r--regress/eqn/define/font.out_ascii2
-rw-r--r--regress/eqn/define/infinite.in5
-rw-r--r--regress/eqn/define/infinite.out_ascii2
-rw-r--r--regress/eqn/define/infinite.out_lint11
-rw-r--r--regress/eqn/define/invalid.in5
-rw-r--r--regress/eqn/define/invalid.out_ascii2
-rw-r--r--regress/eqn/define/invalid.out_lint13
-rw-r--r--regress/eqn/define/quoted.in5
-rw-r--r--regress/eqn/define/quoted.out_ascii2
-rw-r--r--regress/eqn/delim/basic.in5
-rw-r--r--regress/eqn/delim/basic.out_ascii2
-rw-r--r--regress/eqn/fromto/basic.in5
-rw-r--r--regress/eqn/fromto/basic.out_ascii2
-rw-r--r--regress/eqn/fromto/noarg.in5
-rw-r--r--regress/eqn/fromto/noarg.out_ascii2
-rw-r--r--regress/eqn/matrix/basic.in5
-rw-r--r--regress/eqn/matrix/basic.out_ascii2
-rw-r--r--regress/eqn/matrix/empty.in5
-rw-r--r--regress/eqn/matrix/empty.out_ascii2
-rw-r--r--regress/eqn/nullary/roman.in5
-rw-r--r--regress/eqn/nullary/roman.out_ascii2
-rw-r--r--regress/eqn/nullary/symbol.in5
-rw-r--r--regress/eqn/nullary/symbol.out_ascii2
-rw-r--r--regress/eqn/nullary/symbol.out_utf82
-rw-r--r--regress/eqn/over/noarg.in5
-rw-r--r--regress/eqn/over/noarg.out_ascii2
-rw-r--r--regress/eqn/over/noarg.out_lint5
-rw-r--r--regress/eqn/over/precedence.in5
-rw-r--r--regress/eqn/over/precedence.out_ascii2
-rw-r--r--regress/eqn/size/basic.in5
-rw-r--r--regress/eqn/size/basic.out_ascii2
-rw-r--r--regress/eqn/subsup/combine.in5
-rw-r--r--regress/eqn/subsup/combine.out_ascii2
-rw-r--r--regress/eqn/subsup/noarg.in5
-rw-r--r--regress/eqn/subsup/noarg.out_ascii2
-rw-r--r--regress/eqn/subsup/sub_group.in5
-rw-r--r--regress/eqn/subsup/sub_group.out_ascii2
-rw-r--r--regress/eqn/unary/bold.in5
-rw-r--r--regress/eqn/unary/bold.out_ascii2
-rw-r--r--regress/eqn/unary/diacrit.in5
-rw-r--r--regress/eqn/unary/diacrit.out_ascii2
-rw-r--r--regress/eqn/unary/sqrt.in5
-rw-r--r--regress/eqn/unary/sqrt.out_ascii2
-rw-r--r--regress/man/B/args.in3
-rw-r--r--regress/man/B/args.out_lint3
-rw-r--r--regress/man/B/blank.in3
-rw-r--r--regress/man/B/blank.out_lint3
-rw-r--r--regress/man/BI/emptyargs.in3
-rw-r--r--regress/man/BI/literal.in1
-rw-r--r--regress/man/EX/args.in3
-rw-r--r--regress/man/EX/nested.in3
-rw-r--r--regress/man/EX/spacing.in3
-rw-r--r--regress/man/HP/break.in3
-rw-r--r--regress/man/HP/literal.in3
-rw-r--r--regress/man/HP/macrotag.in3
-rw-r--r--regress/man/HP/manyargs.in3
-rw-r--r--regress/man/HP/spacing.in3
-rw-r--r--regress/man/IP/empty.in3
-rw-r--r--regress/man/IP/empty.out_lint5
-rw-r--r--regress/man/IP/literal.in3
-rw-r--r--regress/man/IP/longhead.in3
-rw-r--r--regress/man/IP/manyargs.in3
-rw-r--r--regress/man/IP/spacing.in3
-rw-r--r--regress/man/IP/width.in3
-rw-r--r--regress/man/MT/args.in3
-rw-r--r--regress/man/MT/args.out_lint11
-rw-r--r--regress/man/MT/noME.in3
-rw-r--r--regress/man/MT/noME.out_lint5
-rw-r--r--regress/man/OP/args.in3
-rw-r--r--regress/man/OP/args.out_lint5
-rw-r--r--regress/man/PD/args.in3
-rw-r--r--regress/man/PD/args.out_lint3
-rw-r--r--regress/man/PD/nextline.in3
-rw-r--r--regress/man/PD/spacing.in3
-rw-r--r--regress/man/PP/args.in3
-rw-r--r--regress/man/PP/args.out_lint7
-rw-r--r--regress/man/PP/empty.in3
-rw-r--r--regress/man/PP/empty.out_lint7
-rw-r--r--regress/man/RS/REarg.in3
-rw-r--r--regress/man/RS/REarg.out_lint15
-rw-r--r--regress/man/RS/an-margin.in3
-rw-r--r--regress/man/RS/breaking.in3
-rw-r--r--regress/man/RS/broken.in3
-rw-r--r--regress/man/RS/empty.in3
-rw-r--r--regress/man/RS/empty.out_lint3
-rw-r--r--regress/man/RS/literal.in3
-rw-r--r--regress/man/RS/lonelyRE.in3
-rw-r--r--regress/man/RS/lonelyRE.out_lint7
-rw-r--r--regress/man/RS/nested.in3
-rw-r--r--regress/man/RS/noRE.in3
-rw-r--r--regress/man/RS/noRE.out_lint3
-rw-r--r--regress/man/RS/nowidth.in3
-rw-r--r--regress/man/RS/width.in3
-rw-r--r--regress/man/SH/broken.in3
-rw-r--r--regress/man/SH/broken.out_lint3
-rw-r--r--regress/man/SH/broken_eline.in3
-rw-r--r--regress/man/SH/broken_eline.out_lint5
-rw-r--r--regress/man/SH/empty_before.in3
-rw-r--r--regress/man/SH/empty_before.out_lint3
-rw-r--r--regress/man/SH/longarg.in3
-rw-r--r--regress/man/SH/noarg.in3
-rw-r--r--regress/man/SH/noarg.out_lint29
-rw-r--r--regress/man/SS/broken.in3
-rw-r--r--regress/man/SS/broken.out_lint3
-rw-r--r--regress/man/SS/broken_eline.in3
-rw-r--r--regress/man/SS/broken_eline.out_lint5
-rw-r--r--regress/man/SS/longarg.in3
-rw-r--r--regress/man/SS/noarg.in3
-rw-r--r--regress/man/SS/noarg.out_lint29
-rw-r--r--regress/man/TH/baddate.in1
-rw-r--r--regress/man/TH/baddate.out_lint2
-rw-r--r--regress/man/TH/case.in3
-rw-r--r--regress/man/TH/case.out_lint3
-rw-r--r--regress/man/TH/emptydate.in1
-rw-r--r--regress/man/TH/emptydate.out_lint2
-rw-r--r--regress/man/TH/isodate.in1
-rw-r--r--regress/man/TH/longdate.in1
-rw-r--r--regress/man/TH/longdate.out_lint2
-rw-r--r--regress/man/TH/longtit.in1
-rw-r--r--regress/man/TH/longvol.in1
-rw-r--r--regress/man/TH/mdocdate.in1
-rw-r--r--regress/man/TH/noTH.in1
-rw-r--r--regress/man/TH/noarg.in1
-rw-r--r--regress/man/TH/noarg.out_ascii2
-rw-r--r--regress/man/TH/noarg.out_lint6
-rw-r--r--regress/man/TH/nobody.in3
-rw-r--r--regress/man/TH/nobody.out_lint1
-rw-r--r--regress/man/TH/onearg.in1
-rw-r--r--regress/man/TH/onearg.out_ascii2
-rw-r--r--regress/man/TH/onearg.out_lint4
-rw-r--r--regress/man/TH/onlyyear.in1
-rw-r--r--regress/man/TH/sixargs.in1
-rw-r--r--regress/man/TH/sixargs.out_lint3
-rw-r--r--regress/man/TH/twoargs.in1
-rw-r--r--regress/man/TH/twoargs.out_ascii2
-rw-r--r--regress/man/TH/twoargs.out_lint4
-rw-r--r--regress/man/TP/badarg.in3
-rw-r--r--regress/man/TP/broken.in3
-rw-r--r--regress/man/TP/broken.out_lint5
-rw-r--r--regress/man/TP/double.in3
-rw-r--r--regress/man/TP/double.out_lint11
-rw-r--r--regress/man/TP/eof.in3
-rw-r--r--regress/man/TP/eof.out_lint3
-rw-r--r--regress/man/TP/fill.in3
-rw-r--r--regress/man/TP/indent.in3
-rw-r--r--regress/man/TP/literal.in3
-rw-r--r--regress/man/TP/longhead.in3
-rw-r--r--regress/man/TP/macrotag.in3
-rw-r--r--regress/man/TP/manyargs.in3
-rw-r--r--regress/man/TP/sameline.in3
-rw-r--r--regress/man/TP/spacing.in3
-rw-r--r--regress/man/TP/width.in3
-rw-r--r--regress/man/TS/break.in3
-rw-r--r--regress/man/TS/break.out_lint9
-rw-r--r--regress/man/TS/vspace.in3
-rw-r--r--regress/man/UR/args.in3
-rw-r--r--regress/man/UR/args.out_lint11
-rw-r--r--regress/man/UR/noUE.in3
-rw-r--r--regress/man/UR/noUE.out_lint5
-rw-r--r--regress/man/blank/afterSH.in3
-rw-r--r--regress/man/blank/afterSH.out_lint9
-rw-r--r--regress/man/blank/afterSS.in3
-rw-r--r--regress/man/blank/afterSS.out_lint9
-rw-r--r--regress/man/blank/line.in3
-rw-r--r--regress/man/blank/line.out_lint17
-rw-r--r--regress/man/nf/args.in3
-rw-r--r--regress/man/nf/args.out_lint5
-rw-r--r--regress/man/nf/dupe.in3
-rw-r--r--regress/man/nf/dupe.out_lint5
-rw-r--r--regress/man/nf/indent.in3
-rw-r--r--regress/man/nf/userdef.in3
-rw-r--r--regress/man/nf/vert.in3
-rw-r--r--regress/mdoc/Ad/font.in5
-rw-r--r--regress/mdoc/Ad/font.out_ascii2
-rw-r--r--regress/mdoc/Ad/font.out_markdown2
-rw-r--r--regress/mdoc/Ad/noarg.in5
-rw-r--r--regress/mdoc/Ad/noarg.out_ascii2
-rw-r--r--regress/mdoc/Ad/noarg.out_lint7
-rw-r--r--regress/mdoc/Ad/noarg.out_markdown2
-rw-r--r--regress/mdoc/An/break.in5
-rw-r--r--regress/mdoc/An/break.out_ascii2
-rw-r--r--regress/mdoc/An/break.out_lint29
-rw-r--r--regress/mdoc/An/break.out_markdown2
-rw-r--r--regress/mdoc/Ap/eos.in5
-rw-r--r--regress/mdoc/Ap/eos.out_ascii2
-rw-r--r--regress/mdoc/Ap/eos.out_markdown2
-rw-r--r--regress/mdoc/Ap/middle.in5
-rw-r--r--regress/mdoc/Ap/middle.out_ascii2
-rw-r--r--regress/mdoc/Ap/middle.out_markdown2
-rw-r--r--regress/mdoc/Aq/author.in5
-rw-r--r--regress/mdoc/Aq/author.out_ascii2
-rw-r--r--regress/mdoc/Aq/author.out_markdown2
-rw-r--r--regress/mdoc/Aq/author.out_utf82
-rw-r--r--regress/mdoc/Aq/empty.in5
-rw-r--r--regress/mdoc/Aq/empty.out_ascii2
-rw-r--r--regress/mdoc/Aq/empty.out_lint7
-rw-r--r--regress/mdoc/Aq/empty.out_markdown2
-rw-r--r--regress/mdoc/Aq/empty.out_utf82
-rw-r--r--regress/mdoc/Ar/font.in5
-rw-r--r--regress/mdoc/Ar/font.out_ascii2
-rw-r--r--regress/mdoc/Ar/font.out_markdown2
-rw-r--r--regress/mdoc/Ar/punct.in5
-rw-r--r--regress/mdoc/Ar/punct.out_ascii2
-rw-r--r--regress/mdoc/Ar/punct.out_lint5
-rw-r--r--regress/mdoc/Ar/punct.out_markdown2
-rw-r--r--regress/mdoc/At/invalid.in5
-rw-r--r--regress/mdoc/At/invalid.out_ascii2
-rw-r--r--regress/mdoc/At/invalid.out_lint5
-rw-r--r--regress/mdoc/At/invalid.out_markdown2
-rw-r--r--regress/mdoc/Bd/badargs.in5
-rw-r--r--regress/mdoc/Bd/badargs.out_ascii2
-rw-r--r--regress/mdoc/Bd/badargs.out_lint27
-rw-r--r--regress/mdoc/Bd/badargs.out_markdown2
-rw-r--r--regress/mdoc/Bd/beforeNAME.in5
-rw-r--r--regress/mdoc/Bd/beforeNAME.out_ascii2
-rw-r--r--regress/mdoc/Bd/beforeNAME.out_lint5
-rw-r--r--regress/mdoc/Bd/beforeNAME.out_markdown2
-rw-r--r--regress/mdoc/Bd/blank.in5
-rw-r--r--regress/mdoc/Bd/blank.out_ascii2
-rw-r--r--regress/mdoc/Bd/blank.out_lint19
-rw-r--r--regress/mdoc/Bd/blank.out_markdown2
-rw-r--r--regress/mdoc/Bd/break.in5
-rw-r--r--regress/mdoc/Bd/break.out_ascii2
-rw-r--r--regress/mdoc/Bd/break.out_lint5
-rw-r--r--regress/mdoc/Bd/break.out_markdown2
-rw-r--r--regress/mdoc/Bd/broken.in5
-rw-r--r--regress/mdoc/Bd/broken.out_ascii2
-rw-r--r--regress/mdoc/Bd/broken.out_lint5
-rw-r--r--regress/mdoc/Bd/broken.out_markdown2
-rw-r--r--regress/mdoc/Bd/centered.in5
-rw-r--r--regress/mdoc/Bd/centered.out_ascii2
-rw-r--r--regress/mdoc/Bd/centered.out_markdown2
-rw-r--r--regress/mdoc/Bd/empty.in5
-rw-r--r--regress/mdoc/Bd/empty.out_ascii2
-rw-r--r--regress/mdoc/Bd/empty.out_markdown2
-rw-r--r--regress/mdoc/Bd/nested.in5
-rw-r--r--regress/mdoc/Bd/nested.out_ascii2
-rw-r--r--regress/mdoc/Bd/nested.out_lint7
-rw-r--r--regress/mdoc/Bd/nested.out_markdown2
-rw-r--r--regress/mdoc/Bd/offset-empty.in5
-rw-r--r--regress/mdoc/Bd/offset-empty.out_ascii2
-rw-r--r--regress/mdoc/Bd/offset-empty.out_markdown2
-rw-r--r--regress/mdoc/Bd/offset-neg.in5
-rw-r--r--regress/mdoc/Bd/offset-neg.out_ascii2
-rw-r--r--regress/mdoc/Bd/offset-neg.out_markdown2
-rw-r--r--regress/mdoc/Bd/spacing.in5
-rw-r--r--regress/mdoc/Bd/spacing.out_ascii2
-rw-r--r--regress/mdoc/Bd/spacing.out_markdown2
-rw-r--r--regress/mdoc/Bd/unclosed.in5
-rw-r--r--regress/mdoc/Bd/unclosed.out_ascii2
-rw-r--r--regress/mdoc/Bd/unclosed.out_lint5
-rw-r--r--regress/mdoc/Bd/unclosed.out_markdown2
-rw-r--r--regress/mdoc/Bf/badargs.in5
-rw-r--r--regress/mdoc/Bf/badargs.out_ascii2
-rw-r--r--regress/mdoc/Bf/badargs.out_lint9
-rw-r--r--regress/mdoc/Bf/break.in5
-rw-r--r--regress/mdoc/Bf/break.out_ascii2
-rw-r--r--regress/mdoc/Bf/break.out_lint5
-rw-r--r--regress/mdoc/Bf/broken.in5
-rw-r--r--regress/mdoc/Bf/broken.out_ascii2
-rw-r--r--regress/mdoc/Bf/broken.out_lint5
-rw-r--r--regress/mdoc/Bf/multiargs.in5
-rw-r--r--regress/mdoc/Bf/multiargs.out_ascii2
-rw-r--r--regress/mdoc/Bf/multiargs.out_lint13
-rw-r--r--regress/mdoc/Bf/nest.in5
-rw-r--r--regress/mdoc/Bf/nest.out_ascii2
-rw-r--r--regress/mdoc/Bk/badarg.in5
-rw-r--r--regress/mdoc/Bk/badarg.out_ascii2
-rw-r--r--regress/mdoc/Bk/badarg.out_lint15
-rw-r--r--regress/mdoc/Bk/break.in5
-rw-r--r--regress/mdoc/Bk/break.out_ascii2
-rw-r--r--regress/mdoc/Bk/broken.in5
-rw-r--r--regress/mdoc/Bk/broken.out_ascii2
-rw-r--r--regress/mdoc/Bk/broken.out_lint7
-rw-r--r--regress/mdoc/Bk/inputlines.in5
-rw-r--r--regress/mdoc/Bk/inputlines.out_ascii2
-rw-r--r--regress/mdoc/Bk/lines.in5
-rw-r--r--regress/mdoc/Bk/lines.out_ascii2
-rw-r--r--regress/mdoc/Bk/synopsis.in5
-rw-r--r--regress/mdoc/Bk/synopsis.out_ascii2
-rw-r--r--regress/mdoc/Bl/badargs.in5
-rw-r--r--regress/mdoc/Bl/badargs.out_ascii2
-rw-r--r--regress/mdoc/Bl/badargs.out_lint39
-rw-r--r--regress/mdoc/Bl/badargs.out_markdown2
-rw-r--r--regress/mdoc/Bl/bareIt.in5
-rw-r--r--regress/mdoc/Bl/bareIt.out_ascii2
-rw-r--r--regress/mdoc/Bl/bareIt.out_lint9
-rw-r--r--regress/mdoc/Bl/bareIt.out_markdown2
-rw-r--r--regress/mdoc/Bl/bareTa.in5
-rw-r--r--regress/mdoc/Bl/bareTa.out_ascii2
-rw-r--r--regress/mdoc/Bl/bareTa.out_lint13
-rw-r--r--regress/mdoc/Bl/bareTa.out_markdown2
-rw-r--r--regress/mdoc/Bl/break.in5
-rw-r--r--regress/mdoc/Bl/break.out_ascii2
-rw-r--r--regress/mdoc/Bl/break.out_lint39
-rw-r--r--regress/mdoc/Bl/breakingIt.in5
-rw-r--r--regress/mdoc/Bl/breakingIt.out_ascii2
-rw-r--r--regress/mdoc/Bl/breakingIt.out_lint35
-rw-r--r--regress/mdoc/Bl/breakingIt.out_markdown2
-rw-r--r--regress/mdoc/Bl/breakingTa.in5
-rw-r--r--regress/mdoc/Bl/breakingTa.out_ascii2
-rw-r--r--regress/mdoc/Bl/breakingTa.out_markdown2
-rw-r--r--regress/mdoc/Bl/broken.in5
-rw-r--r--regress/mdoc/Bl/broken.out_ascii2
-rw-r--r--regress/mdoc/Bl/broken.out_lint9
-rw-r--r--regress/mdoc/Bl/broken.out_markdown2
-rw-r--r--regress/mdoc/Bl/bullet.in5
-rw-r--r--regress/mdoc/Bl/bullet.out_ascii2
-rw-r--r--regress/mdoc/Bl/bullet.out_markdown2
-rw-r--r--regress/mdoc/Bl/colNoIt.in5
-rw-r--r--regress/mdoc/Bl/colNoIt.out_ascii2
-rw-r--r--regress/mdoc/Bl/colNoIt.out_markdown2
-rw-r--r--regress/mdoc/Bl/column.in5
-rw-r--r--regress/mdoc/Bl/column.out_ascii2
-rw-r--r--regress/mdoc/Bl/column.out_lint17
-rw-r--r--regress/mdoc/Bl/column.out_markdown2
-rw-r--r--regress/mdoc/Bl/column_nogroff.in5
-rw-r--r--regress/mdoc/Bl/column_nogroff.out_ascii2
-rw-r--r--regress/mdoc/Bl/column_nogroff.out_lint7
-rw-r--r--regress/mdoc/Bl/column_nogroff.out_markdown2
-rw-r--r--regress/mdoc/Bl/dash.in5
-rw-r--r--regress/mdoc/Bl/dash.out_ascii2
-rw-r--r--regress/mdoc/Bl/dash.out_markdown2
-rw-r--r--regress/mdoc/Bl/dash.out_utf82
-rw-r--r--regress/mdoc/Bl/diag.in5
-rw-r--r--regress/mdoc/Bl/diag.out_ascii2
-rw-r--r--regress/mdoc/Bl/diag.out_markdown2
-rw-r--r--regress/mdoc/Bl/empty.in5
-rw-r--r--regress/mdoc/Bl/empty.out_ascii2
-rw-r--r--regress/mdoc/Bl/empty.out_lint25
-rw-r--r--regress/mdoc/Bl/empty.out_markdown2
-rw-r--r--regress/mdoc/Bl/emptyhead.in5
-rw-r--r--regress/mdoc/Bl/emptyhead.out_ascii2
-rw-r--r--regress/mdoc/Bl/emptyhead.out_lint11
-rw-r--r--regress/mdoc/Bl/emptyhead.out_markdown2
-rw-r--r--regress/mdoc/Bl/emptyitem.in5
-rw-r--r--regress/mdoc/Bl/emptyitem.out_ascii2
-rw-r--r--regress/mdoc/Bl/emptyitem.out_lint19
-rw-r--r--regress/mdoc/Bl/emptyitem.out_markdown2
-rw-r--r--regress/mdoc/Bl/emptytag.in5
-rw-r--r--regress/mdoc/Bl/emptytag.out_ascii2
-rw-r--r--regress/mdoc/Bl/emptytag.out_lint5
-rw-r--r--regress/mdoc/Bl/emptytag.out_markdown2
-rw-r--r--regress/mdoc/Bl/enum.in5
-rw-r--r--regress/mdoc/Bl/enum.out_ascii2
-rw-r--r--regress/mdoc/Bl/enum.out_markdown2
-rw-r--r--regress/mdoc/Bl/extend.in5
-rw-r--r--regress/mdoc/Bl/extend.out_ascii2
-rw-r--r--regress/mdoc/Bl/extend.out_markdown2
-rw-r--r--regress/mdoc/Bl/hang.in5
-rw-r--r--regress/mdoc/Bl/hang.out_ascii2
-rw-r--r--regress/mdoc/Bl/hang.out_markdown2
-rw-r--r--regress/mdoc/Bl/inset.in5
-rw-r--r--regress/mdoc/Bl/inset.out_ascii2
-rw-r--r--regress/mdoc/Bl/inset.out_markdown2
-rw-r--r--regress/mdoc/Bl/item.in5
-rw-r--r--regress/mdoc/Bl/item.out_ascii2
-rw-r--r--regress/mdoc/Bl/item.out_markdown2
-rw-r--r--regress/mdoc/Bl/multitag.in5
-rw-r--r--regress/mdoc/Bl/multitag.out_ascii2
-rw-r--r--regress/mdoc/Bl/multitag.out_markdown2
-rw-r--r--regress/mdoc/Bl/multitype.in5
-rw-r--r--regress/mdoc/Bl/multitype.out_ascii2
-rw-r--r--regress/mdoc/Bl/multitype.out_markdown2
-rw-r--r--regress/mdoc/Bl/nested.in5
-rw-r--r--regress/mdoc/Bl/nested.out_ascii2
-rw-r--r--regress/mdoc/Bl/nested.out_markdown2
-rw-r--r--regress/mdoc/Bl/noIt.in5
-rw-r--r--regress/mdoc/Bl/noIt.out_ascii2
-rw-r--r--regress/mdoc/Bl/noIt.out_lint19
-rw-r--r--regress/mdoc/Bl/noIt.out_markdown2
-rw-r--r--regress/mdoc/Bl/notype.in5
-rw-r--r--regress/mdoc/Bl/notype.out_ascii2
-rw-r--r--regress/mdoc/Bl/notype.out_lint13
-rw-r--r--regress/mdoc/Bl/notype.out_markdown2
-rw-r--r--regress/mdoc/Bl/offset.in5
-rw-r--r--regress/mdoc/Bl/offset.out_ascii2
-rw-r--r--regress/mdoc/Bl/offset.out_markdown2
-rw-r--r--regress/mdoc/Bl/ohang.in5
-rw-r--r--regress/mdoc/Bl/ohang.out_ascii2
-rw-r--r--regress/mdoc/Bl/ohang.out_markdown2
-rw-r--r--regress/mdoc/Bl/secstart.in5
-rw-r--r--regress/mdoc/Bl/secstart.out_ascii2
-rw-r--r--regress/mdoc/Bl/secstart.out_markdown2
-rw-r--r--regress/mdoc/Bl/tag.in5
-rw-r--r--regress/mdoc/Bl/tag.out_ascii2
-rw-r--r--regress/mdoc/Bl/tag.out_lint5
-rw-r--r--regress/mdoc/Bl/tag.out_markdown2
-rw-r--r--regress/mdoc/Bl/unclosed.in5
-rw-r--r--regress/mdoc/Bl/unclosed.out_ascii2
-rw-r--r--regress/mdoc/Bl/unclosed.out_markdown2
-rw-r--r--regress/mdoc/Brq/empty.in5
-rw-r--r--regress/mdoc/Brq/empty.out_ascii2
-rw-r--r--regress/mdoc/Brq/empty.out_lint7
-rw-r--r--regress/mdoc/Brq/empty.out_markdown2
-rw-r--r--regress/mdoc/Bx/args.in5
-rw-r--r--regress/mdoc/Bx/args.out_ascii2
-rw-r--r--regress/mdoc/Bx/args.out_lint5
-rw-r--r--regress/mdoc/Bx/args.out_markdown2
-rw-r--r--regress/mdoc/Cd/eos.in5
-rw-r--r--regress/mdoc/Cd/eos.out_ascii2
-rw-r--r--regress/mdoc/Cd/eos.out_markdown2
-rw-r--r--regress/mdoc/Cd/font.in5
-rw-r--r--regress/mdoc/Cd/font.out_ascii2
-rw-r--r--regress/mdoc/Cd/font.out_markdown2
-rw-r--r--regress/mdoc/Cd/noarg.in5
-rw-r--r--regress/mdoc/Cd/noarg.out_ascii2
-rw-r--r--regress/mdoc/Cd/noarg.out_lint5
-rw-r--r--regress/mdoc/Cd/noarg.out_markdown2
-rw-r--r--regress/mdoc/Cd/punct.in5
-rw-r--r--regress/mdoc/Cd/punct.out_ascii2
-rw-r--r--regress/mdoc/Cd/punct.out_markdown2
-rw-r--r--regress/mdoc/Cm/basic.in5
-rw-r--r--regress/mdoc/Cm/basic.out_ascii2
-rw-r--r--regress/mdoc/Cm/basic.out_markdown2
-rw-r--r--regress/mdoc/Cm/font.in5
-rw-r--r--regress/mdoc/Cm/font.out_ascii2
-rw-r--r--regress/mdoc/Cm/font.out_markdown2
-rw-r--r--regress/mdoc/Cm/noarg.in5
-rw-r--r--regress/mdoc/Cm/noarg.out_ascii2
-rw-r--r--regress/mdoc/Cm/noarg.out_lint9
-rw-r--r--regress/mdoc/Cm/noarg.out_markdown2
-rw-r--r--regress/mdoc/Cm/punct.in5
-rw-r--r--regress/mdoc/Cm/punct.out_ascii2
-rw-r--r--regress/mdoc/Cm/punct.out_markdown2
-rw-r--r--regress/mdoc/D1/spacing.in5
-rw-r--r--regress/mdoc/D1/spacing.out_ascii2
-rw-r--r--regress/mdoc/D1/spacing.out_lint5
-rw-r--r--regress/mdoc/D1/spacing.out_markdown2
-rw-r--r--regress/mdoc/Db/args.in5
-rw-r--r--regress/mdoc/Db/args.out_ascii2
-rw-r--r--regress/mdoc/Db/args.out_lint9
-rw-r--r--regress/mdoc/Dd/badarg.in3
-rw-r--r--regress/mdoc/Dd/badarg.out_lint6
-rw-r--r--regress/mdoc/Dd/dupe.in3
-rw-r--r--regress/mdoc/Dd/dupe.out_lint8
-rw-r--r--regress/mdoc/Dd/late.in3
-rw-r--r--regress/mdoc/Dd/late.out_lint4
-rw-r--r--regress/mdoc/Dd/long.in3
-rw-r--r--regress/mdoc/Dd/long.out_lint6
-rw-r--r--regress/mdoc/Dd/manarg.in3
-rw-r--r--regress/mdoc/Dd/manarg.out_lint6
-rw-r--r--regress/mdoc/Dd/noarg.in3
-rw-r--r--regress/mdoc/Dd/noarg.out_lint4
-rw-r--r--regress/mdoc/Dd/order.in3
-rw-r--r--regress/mdoc/Dd/order.out_lint6
-rw-r--r--regress/mdoc/Dl/spacing.in5
-rw-r--r--regress/mdoc/Dl/spacing.out_ascii2
-rw-r--r--regress/mdoc/Dl/spacing.out_lint5
-rw-r--r--regress/mdoc/Dl/spacing.out_markdown2
-rw-r--r--regress/mdoc/Dq/empty.in5
-rw-r--r--regress/mdoc/Dq/empty.out_ascii2
-rw-r--r--regress/mdoc/Dq/empty.out_lint3
-rw-r--r--regress/mdoc/Dq/empty.out_markdown2
-rw-r--r--regress/mdoc/Dt/badsec.in5
-rw-r--r--regress/mdoc/Dt/badsec.out_lint5
-rw-r--r--regress/mdoc/Dt/case.in5
-rw-r--r--regress/mdoc/Dt/case.out_ascii2
-rw-r--r--regress/mdoc/Dt/case.out_lint5
-rw-r--r--regress/mdoc/Dt/case.out_markdown2
-rw-r--r--regress/mdoc/Dt/dupe.in5
-rw-r--r--regress/mdoc/Dt/dupe.out_ascii2
-rw-r--r--regress/mdoc/Dt/dupe.out_lint7
-rw-r--r--regress/mdoc/Dt/dupe.out_markdown2
-rw-r--r--regress/mdoc/Dt/fourargs.in5
-rw-r--r--regress/mdoc/Dt/fourargs.out_ascii2
-rw-r--r--regress/mdoc/Dt/fourargs.out_lint5
-rw-r--r--regress/mdoc/Dt/fourargs.out_markdown2
-rw-r--r--regress/mdoc/Dt/late.in5
-rw-r--r--regress/mdoc/Dt/late.out_ascii2
-rw-r--r--regress/mdoc/Dt/late.out_lint5
-rw-r--r--regress/mdoc/Dt/late.out_markdown2
-rw-r--r--regress/mdoc/Dt/missing.in5
-rw-r--r--regress/mdoc/Dt/missing.out_ascii2
-rw-r--r--regress/mdoc/Dt/missing.out_lint3
-rw-r--r--regress/mdoc/Dt/missing.out_markdown2
-rw-r--r--regress/mdoc/Dt/noarg.in5
-rw-r--r--regress/mdoc/Dt/noarg.out_ascii2
-rw-r--r--regress/mdoc/Dt/noarg.out_lint7
-rw-r--r--regress/mdoc/Dt/noarg.out_markdown2
-rw-r--r--regress/mdoc/Dt/nobody.in5
-rw-r--r--regress/mdoc/Dt/nobody.out_ascii2
-rw-r--r--regress/mdoc/Dt/nobody.out_lint3
-rw-r--r--regress/mdoc/Dt/nobody.out_markdown2
-rw-r--r--regress/mdoc/Dt/nosec.in5
-rw-r--r--regress/mdoc/Dt/nosec.out_ascii2
-rw-r--r--regress/mdoc/Dt/nosec.out_lint5
-rw-r--r--regress/mdoc/Dt/nosec.out_markdown2
-rw-r--r--regress/mdoc/Dt/order.in5
-rw-r--r--regress/mdoc/Dt/order.out_ascii2
-rw-r--r--regress/mdoc/Dt/order.out_lint5
-rw-r--r--regress/mdoc/Dt/order.out_markdown2
-rw-r--r--regress/mdoc/Dv/font.in5
-rw-r--r--regress/mdoc/Dv/font.out_ascii2
-rw-r--r--regress/mdoc/Dv/font.out_markdown2
-rw-r--r--regress/mdoc/Dv/noarg.in5
-rw-r--r--regress/mdoc/Dv/noarg.out_ascii2
-rw-r--r--regress/mdoc/Dv/noarg.out_lint7
-rw-r--r--regress/mdoc/Dv/noarg.out_markdown2
-rw-r--r--regress/mdoc/Em/font.in5
-rw-r--r--regress/mdoc/Em/font.out_ascii2
-rw-r--r--regress/mdoc/Em/font.out_markdown2
-rw-r--r--regress/mdoc/Em/noarg.in5
-rw-r--r--regress/mdoc/Em/noarg.out_ascii2
-rw-r--r--regress/mdoc/Em/noarg.out_lint5
-rw-r--r--regress/mdoc/Em/noarg.out_markdown2
-rw-r--r--regress/mdoc/Em/punct.in5
-rw-r--r--regress/mdoc/Em/punct.out_ascii2
-rw-r--r--regress/mdoc/Em/punct.out_lint13
-rw-r--r--regress/mdoc/Em/punct.out_markdown2
-rw-r--r--regress/mdoc/Eo/break.in5
-rw-r--r--regress/mdoc/Eo/break.out_ascii2
-rw-r--r--regress/mdoc/Eo/break.out_lint19
-rw-r--r--regress/mdoc/Eo/break.out_markdown2
-rw-r--r--regress/mdoc/Eo/empty.in5
-rw-r--r--regress/mdoc/Eo/empty.out_ascii2
-rw-r--r--regress/mdoc/Eo/empty.out_markdown2
-rw-r--r--regress/mdoc/Eo/obsolete.in5
-rw-r--r--regress/mdoc/Eo/obsolete.out_ascii2
-rw-r--r--regress/mdoc/Eo/obsolete.out_lint15
-rw-r--r--regress/mdoc/Eo/obsolete.out_markdown2
-rw-r--r--regress/mdoc/Eo/unclosed.in5
-rw-r--r--regress/mdoc/Eo/unclosed.out_ascii2
-rw-r--r--regress/mdoc/Eo/unclosed.out_lint5
-rw-r--r--regress/mdoc/Eo/unclosed.out_markdown2
-rw-r--r--regress/mdoc/Er/font.in5
-rw-r--r--regress/mdoc/Er/font.out_ascii2
-rw-r--r--regress/mdoc/Er/font.out_markdown2
-rw-r--r--regress/mdoc/Er/noarg.in5
-rw-r--r--regress/mdoc/Er/noarg.out_ascii2
-rw-r--r--regress/mdoc/Er/noarg.out_lint7
-rw-r--r--regress/mdoc/Er/noarg.out_markdown2
-rw-r--r--regress/mdoc/Ev/font.in5
-rw-r--r--regress/mdoc/Ev/font.out_ascii2
-rw-r--r--regress/mdoc/Ev/font.out_markdown2
-rw-r--r--regress/mdoc/Ev/noarg.in5
-rw-r--r--regress/mdoc/Ev/noarg.out_ascii2
-rw-r--r--regress/mdoc/Ev/noarg.out_lint7
-rw-r--r--regress/mdoc/Ev/noarg.out_markdown2
-rw-r--r--regress/mdoc/Ex/args.in5
-rw-r--r--regress/mdoc/Ex/args.out_ascii2
-rw-r--r--regress/mdoc/Ex/args.out_markdown2
-rw-r--r--regress/mdoc/Ex/noname.in5
-rw-r--r--regress/mdoc/Ex/noname.out_ascii2
-rw-r--r--regress/mdoc/Ex/noname.out_lint7
-rw-r--r--regress/mdoc/Ex/noname.out_markdown2
-rw-r--r--regress/mdoc/Ex/nostd.in5
-rw-r--r--regress/mdoc/Ex/nostd.out_ascii2
-rw-r--r--regress/mdoc/Ex/nostd.out_lint9
-rw-r--r--regress/mdoc/Ex/nostd.out_markdown2
-rw-r--r--regress/mdoc/Fd/break.in5
-rw-r--r--regress/mdoc/Fd/break.out_ascii2
-rw-r--r--regress/mdoc/Fd/break.out_markdown2
-rw-r--r--regress/mdoc/Fd/empty.in5
-rw-r--r--regress/mdoc/Fd/empty.out_ascii2
-rw-r--r--regress/mdoc/Fd/empty.out_lint7
-rw-r--r--regress/mdoc/Fd/empty.out_markdown2
-rw-r--r--regress/mdoc/Fd/eos.in5
-rw-r--r--regress/mdoc/Fd/eos.out_ascii2
-rw-r--r--regress/mdoc/Fd/eos.out_markdown2
-rw-r--r--regress/mdoc/Fd/font.in5
-rw-r--r--regress/mdoc/Fd/font.out_ascii2
-rw-r--r--regress/mdoc/Fd/font.out_markdown2
-rw-r--r--regress/mdoc/Fl/font.in5
-rw-r--r--regress/mdoc/Fl/font.out_ascii2
-rw-r--r--regress/mdoc/Fl/font.out_markdown2
-rw-r--r--regress/mdoc/Fl/multiarg.in5
-rw-r--r--regress/mdoc/Fl/multiarg.out_ascii2
-rw-r--r--regress/mdoc/Fl/multiarg.out_markdown2
-rw-r--r--regress/mdoc/Fl/noarg.in5
-rw-r--r--regress/mdoc/Fl/noarg.out_ascii2
-rw-r--r--regress/mdoc/Fl/noarg.out_markdown2
-rw-r--r--regress/mdoc/Fl/parsed.in5
-rw-r--r--regress/mdoc/Fl/parsed.out_ascii2
-rw-r--r--regress/mdoc/Fl/parsed.out_markdown2
-rw-r--r--regress/mdoc/Fl/punct.in5
-rw-r--r--regress/mdoc/Fl/punct.out_ascii2
-rw-r--r--regress/mdoc/Fl/punct.out_lint5
-rw-r--r--regress/mdoc/Fl/punct.out_markdown2
-rw-r--r--regress/mdoc/Fo/basic.in5
-rw-r--r--regress/mdoc/Fo/basic.out_ascii2
-rw-r--r--regress/mdoc/Fo/basic.out_markdown2
-rw-r--r--regress/mdoc/Fo/break.in5
-rw-r--r--regress/mdoc/Fo/break.out_ascii2
-rw-r--r--regress/mdoc/Fo/break.out_markdown2
-rw-r--r--regress/mdoc/Fo/eos.in5
-rw-r--r--regress/mdoc/Fo/eos.out_ascii2
-rw-r--r--regress/mdoc/Fo/eos.out_markdown2
-rw-r--r--regress/mdoc/Fo/font.in5
-rw-r--r--regress/mdoc/Fo/font.out_ascii2
-rw-r--r--regress/mdoc/Fo/font.out_markdown2
-rw-r--r--regress/mdoc/Fo/noarg.in5
-rw-r--r--regress/mdoc/Fo/noarg.out_ascii2
-rw-r--r--regress/mdoc/Fo/noarg.out_lint23
-rw-r--r--regress/mdoc/Fo/noarg.out_markdown2
-rw-r--r--regress/mdoc/Fo/nohead.in5
-rw-r--r--regress/mdoc/Fo/nohead.out_ascii2
-rw-r--r--regress/mdoc/Fo/nohead.out_lint5
-rw-r--r--regress/mdoc/Fo/nohead.out_markdown2
-rw-r--r--regress/mdoc/Fo/obsolete.in5
-rw-r--r--regress/mdoc/Fo/obsolete.out_ascii2
-rw-r--r--regress/mdoc/Fo/obsolete.out_lint7
-rw-r--r--regress/mdoc/Fo/obsolete.out_markdown2
-rw-r--r--regress/mdoc/Fo/punct.in5
-rw-r--r--regress/mdoc/Fo/punct.out_ascii2
-rw-r--r--regress/mdoc/Fo/punct.out_lint9
-rw-r--r--regress/mdoc/Fo/punct.out_markdown2
-rw-r--r--regress/mdoc/Fo/section.in5
-rw-r--r--regress/mdoc/Fo/section.out_ascii2
-rw-r--r--regress/mdoc/Fo/section.out_markdown2
-rw-r--r--regress/mdoc/Fo/warn.in5
-rw-r--r--regress/mdoc/Fo/warn.out_ascii2
-rw-r--r--regress/mdoc/Fo/warn.out_lint7
-rw-r--r--regress/mdoc/Fo/warn.out_markdown2
-rw-r--r--regress/mdoc/Ft/font.in5
-rw-r--r--regress/mdoc/Ft/font.out_ascii2
-rw-r--r--regress/mdoc/Ft/font.out_markdown2
-rw-r--r--regress/mdoc/Ic/font.in5
-rw-r--r--regress/mdoc/Ic/font.out_ascii2
-rw-r--r--regress/mdoc/Ic/font.out_markdown2
-rw-r--r--regress/mdoc/Ic/noarg.in5
-rw-r--r--regress/mdoc/Ic/noarg.out_ascii2
-rw-r--r--regress/mdoc/Ic/noarg.out_lint7
-rw-r--r--regress/mdoc/Ic/noarg.out_markdown2
-rw-r--r--regress/mdoc/Ic/punct.in5
-rw-r--r--regress/mdoc/Ic/punct.out_ascii2
-rw-r--r--regress/mdoc/Ic/punct.out_markdown2
-rw-r--r--regress/mdoc/In/break.in5
-rw-r--r--regress/mdoc/In/break.out_ascii2
-rw-r--r--regress/mdoc/In/break.out_markdown2
-rw-r--r--regress/mdoc/In/eos.in5
-rw-r--r--regress/mdoc/In/eos.out_ascii2
-rw-r--r--regress/mdoc/In/eos.out_markdown2
-rw-r--r--regress/mdoc/In/font.in5
-rw-r--r--regress/mdoc/In/font.out_ascii2
-rw-r--r--regress/mdoc/In/font.out_markdown2
-rw-r--r--regress/mdoc/In/noarg.in5
-rw-r--r--regress/mdoc/In/noarg.out_ascii2
-rw-r--r--regress/mdoc/In/noarg.out_lint9
-rw-r--r--regress/mdoc/In/noarg.out_markdown2
-rw-r--r--regress/mdoc/Lb/badargs.in5
-rw-r--r--regress/mdoc/Lb/badargs.out_ascii2
-rw-r--r--regress/mdoc/Lb/badargs.out_lint13
-rw-r--r--regress/mdoc/Lb/badargs.out_markdown2
-rw-r--r--regress/mdoc/Lb/break.in5
-rw-r--r--regress/mdoc/Lb/break.out_ascii2
-rw-r--r--regress/mdoc/Lb/break.out_markdown2
-rw-r--r--regress/mdoc/Lb/eos.in5
-rw-r--r--regress/mdoc/Lb/eos.out_ascii2
-rw-r--r--regress/mdoc/Lb/eos.out_markdown2
-rw-r--r--regress/mdoc/Li/font.in5
-rw-r--r--regress/mdoc/Li/font.out_ascii2
-rw-r--r--regress/mdoc/Li/font.out_markdown2
-rw-r--r--regress/mdoc/Li/punct.in5
-rw-r--r--regress/mdoc/Li/punct.out_ascii2
-rw-r--r--regress/mdoc/Li/punct.out_lint13
-rw-r--r--regress/mdoc/Li/punct.out_markdown2
-rw-r--r--regress/mdoc/Lk/font.in5
-rw-r--r--regress/mdoc/Lk/font.out_ascii2
-rw-r--r--regress/mdoc/Lk/link.in5
-rw-r--r--regress/mdoc/Lk/link.out_ascii2
-rw-r--r--regress/mdoc/Lk/link.out_markdown2
-rw-r--r--regress/mdoc/Lk/noarg.in5
-rw-r--r--regress/mdoc/Lk/noarg.out_ascii2
-rw-r--r--regress/mdoc/Lk/noarg.out_lint9
-rw-r--r--regress/mdoc/Lk/noarg.out_markdown2
-rw-r--r--regress/mdoc/Ms/font.in5
-rw-r--r--regress/mdoc/Ms/font.out_ascii2
-rw-r--r--regress/mdoc/Ms/font.out_markdown2
-rw-r--r--regress/mdoc/Ms/noarg.in5
-rw-r--r--regress/mdoc/Ms/noarg.out_ascii2
-rw-r--r--regress/mdoc/Ms/noarg.out_lint7
-rw-r--r--regress/mdoc/Ms/noarg.out_markdown2
-rw-r--r--regress/mdoc/Mt/font.in5
-rw-r--r--regress/mdoc/Mt/font.out_ascii2
-rw-r--r--regress/mdoc/Mt/simple.in5
-rw-r--r--regress/mdoc/Mt/simple.out_ascii2
-rw-r--r--regress/mdoc/Mt/simple.out_lint5
-rw-r--r--regress/mdoc/Mt/simple.out_markdown2
-rw-r--r--regress/mdoc/Nd/broken.in5
-rw-r--r--regress/mdoc/Nd/broken.out_ascii2
-rw-r--r--regress/mdoc/Nd/broken.out_lint21
-rw-r--r--regress/mdoc/Nd/hyph.in5
-rw-r--r--regress/mdoc/Nd/hyph.out_ascii2
-rw-r--r--regress/mdoc/Nd/hyph.out_markdown2
-rw-r--r--regress/mdoc/Nd/noarg.in5
-rw-r--r--regress/mdoc/Nd/noarg.out_ascii2
-rw-r--r--regress/mdoc/Nd/noarg.out_lint5
-rw-r--r--regress/mdoc/Nd/noarg.out_markdown2
-rw-r--r--regress/mdoc/Nd/par.in5
-rw-r--r--regress/mdoc/Nd/par.out_ascii2
-rw-r--r--regress/mdoc/Nd/par.out_markdown2
-rw-r--r--regress/mdoc/Nm/badNAME.in5
-rw-r--r--regress/mdoc/Nm/badNAME.out_ascii2
-rw-r--r--regress/mdoc/Nm/badNAME.out_lint7
-rw-r--r--regress/mdoc/Nm/badNAMEuse.in5
-rw-r--r--regress/mdoc/Nm/badNAMEuse.out_ascii2
-rw-r--r--regress/mdoc/Nm/badNAMEuse.out_lint7
-rw-r--r--regress/mdoc/Nm/break.in5
-rw-r--r--regress/mdoc/Nm/break.out_ascii2
-rw-r--r--regress/mdoc/Nm/break.out_lint5
-rw-r--r--regress/mdoc/Nm/break.out_markdown2
-rw-r--r--regress/mdoc/Nm/broken.in5
-rw-r--r--regress/mdoc/Nm/broken.out_ascii2
-rw-r--r--regress/mdoc/Nm/broken.out_lint7
-rw-r--r--regress/mdoc/Nm/broken.out_markdown2
-rw-r--r--regress/mdoc/Nm/empty.in5
-rw-r--r--regress/mdoc/Nm/empty.out_ascii2
-rw-r--r--regress/mdoc/Nm/empty.out_markdown2
-rw-r--r--regress/mdoc/Nm/emptyNAME.in5
-rw-r--r--regress/mdoc/Nm/emptyNAME.out_ascii2
-rw-r--r--regress/mdoc/Nm/emptyNAMEuse.in5
-rw-r--r--regress/mdoc/Nm/emptyNAMEuse.out_ascii2
-rw-r--r--regress/mdoc/Nm/font.in5
-rw-r--r--regress/mdoc/Nm/font.out_ascii2
-rw-r--r--regress/mdoc/Nm/font.out_markdown2
-rw-r--r--regress/mdoc/Nm/long.in5
-rw-r--r--regress/mdoc/Nm/long.out_ascii2
-rw-r--r--regress/mdoc/Nm/long.out_markdown2
-rw-r--r--regress/mdoc/Nm/par.in5
-rw-r--r--regress/mdoc/Nm/par.out_ascii2
-rw-r--r--regress/mdoc/Nm/par.out_markdown2
-rw-r--r--regress/mdoc/Nm/parns.in5
-rw-r--r--regress/mdoc/Nm/parns.out_ascii2
-rw-r--r--regress/mdoc/Nm/parns.out_markdown2
-rw-r--r--regress/mdoc/Nm/punct.in5
-rw-r--r--regress/mdoc/Nm/punct.out_ascii2
-rw-r--r--regress/mdoc/Nm/punct.out_lint5
-rw-r--r--regress/mdoc/Nm/punct.out_markdown2
-rw-r--r--regress/mdoc/No/punct.in5
-rw-r--r--regress/mdoc/No/punct.out_ascii2
-rw-r--r--regress/mdoc/No/punct.out_lint11
-rw-r--r--regress/mdoc/No/punct.out_markdown2
-rw-r--r--regress/mdoc/No/spacing.in5
-rw-r--r--regress/mdoc/No/spacing.out_ascii2
-rw-r--r--regress/mdoc/No/spacing.out_markdown2
-rw-r--r--regress/mdoc/Ns/position.in5
-rw-r--r--regress/mdoc/Ns/position.out_ascii2
-rw-r--r--regress/mdoc/Ns/position.out_lint7
-rw-r--r--regress/mdoc/Ns/position.out_markdown2
-rw-r--r--regress/mdoc/Ns/punct.in5
-rw-r--r--regress/mdoc/Ns/punct.out_ascii2
-rw-r--r--regress/mdoc/Ns/punct.out_markdown2
-rw-r--r--regress/mdoc/Oo/punct.in5
-rw-r--r--regress/mdoc/Oo/punct.out_ascii2
-rw-r--r--regress/mdoc/Oo/punct.out_lint5
-rw-r--r--regress/mdoc/Oo/punct.out_markdown2
-rw-r--r--regress/mdoc/Op/break.in5
-rw-r--r--regress/mdoc/Op/break.out_lint9
-rw-r--r--regress/mdoc/Op/break.out_markdown2
-rw-r--r--regress/mdoc/Op/broken.in5
-rw-r--r--regress/mdoc/Op/broken.out_ascii2
-rw-r--r--regress/mdoc/Op/broken.out_lint7
-rw-r--r--regress/mdoc/Op/broken.out_markdown2
-rw-r--r--regress/mdoc/Op/punct.in5
-rw-r--r--regress/mdoc/Op/punct.out_ascii2
-rw-r--r--regress/mdoc/Op/punct.out_lint5
-rw-r--r--regress/mdoc/Op/punct.out_markdown2
-rw-r--r--regress/mdoc/Os/dupe.in3
-rw-r--r--regress/mdoc/Os/dupe.out_ascii2
-rw-r--r--regress/mdoc/Os/dupe.out_lint16
-rw-r--r--regress/mdoc/Os/dupe.out_markdown2
-rw-r--r--regress/mdoc/Os/late.in5
-rw-r--r--regress/mdoc/Os/late.out_ascii2
-rw-r--r--regress/mdoc/Os/late.out_lint4
-rw-r--r--regress/mdoc/Os/late.out_markdown2
-rw-r--r--regress/mdoc/Os/long.in3
-rw-r--r--regress/mdoc/Os/long.out_ascii2
-rw-r--r--regress/mdoc/Os/long.out_markdown2
-rw-r--r--regress/mdoc/Os/missing.in3
-rw-r--r--regress/mdoc/Os/missing.out_ascii2
-rw-r--r--regress/mdoc/Os/missing.out_markdown2
-rw-r--r--regress/mdoc/Ox/keep.in5
-rw-r--r--regress/mdoc/Ox/keep.out_ascii2
-rw-r--r--regress/mdoc/Ox/keep.out_markdown2
-rw-r--r--regress/mdoc/Pa/font.in5
-rw-r--r--regress/mdoc/Pa/font.out_ascii2
-rw-r--r--regress/mdoc/Pa/font.out_markdown2
-rw-r--r--regress/mdoc/Pa/punct.in5
-rw-r--r--regress/mdoc/Pa/punct.out_ascii2
-rw-r--r--regress/mdoc/Pa/punct.out_lint5
-rw-r--r--regress/mdoc/Pa/punct.out_markdown2
-rw-r--r--regress/mdoc/Pf/spacing.in5
-rw-r--r--regress/mdoc/Pf/spacing.out_ascii2
-rw-r--r--regress/mdoc/Pf/spacing.out_lint9
-rw-r--r--regress/mdoc/Pf/spacing.out_markdown2
-rw-r--r--regress/mdoc/Pp/arg.in5
-rw-r--r--regress/mdoc/Pp/arg.out_ascii2
-rw-r--r--regress/mdoc/Pp/arg.out_lint9
-rw-r--r--regress/mdoc/Pp/arg.out_markdown2
-rw-r--r--regress/mdoc/Qq/empty.in5
-rw-r--r--regress/mdoc/Qq/empty.out_ascii2
-rw-r--r--regress/mdoc/Qq/empty.out_lint7
-rw-r--r--regress/mdoc/Qq/empty.out_markdown2
-rw-r--r--regress/mdoc/Rs/allch.in5
-rw-r--r--regress/mdoc/Rs/allch.out_ascii2
-rw-r--r--regress/mdoc/Rs/allch.out_lint15
-rw-r--r--regress/mdoc/Rs/allch.out_markdown2
-rw-r--r--regress/mdoc/Rs/allch.out_utf82
-rw-r--r--regress/mdoc/Rs/args.in5
-rw-r--r--regress/mdoc/Rs/args.out_ascii2
-rw-r--r--regress/mdoc/Rs/args.out_lint7
-rw-r--r--regress/mdoc/Rs/args.out_markdown2
-rw-r--r--regress/mdoc/Rs/break.in5
-rw-r--r--regress/mdoc/Rs/break.out_ascii2
-rw-r--r--regress/mdoc/Rs/break.out_markdown2
-rw-r--r--regress/mdoc/Rs/break.out_utf82
-rw-r--r--regress/mdoc/Rs/empty.in5
-rw-r--r--regress/mdoc/Rs/empty.out_ascii2
-rw-r--r--regress/mdoc/Rs/empty.out_lint7
-rw-r--r--regress/mdoc/Rs/empty.out_markdown2
-rw-r--r--regress/mdoc/Rs/empty.out_utf82
-rw-r--r--regress/mdoc/Rs/three_authors.in5
-rw-r--r--regress/mdoc/Rs/three_authors.out_ascii2
-rw-r--r--regress/mdoc/Rs/three_authors.out_markdown2
-rw-r--r--regress/mdoc/Rs/three_authors.out_utf82
-rw-r--r--regress/mdoc/Rv/args.in5
-rw-r--r--regress/mdoc/Rv/args.out_ascii2
-rw-r--r--regress/mdoc/Rv/args.out_markdown2
-rw-r--r--regress/mdoc/Rv/noname.in5
-rw-r--r--regress/mdoc/Rv/noname.out_ascii2
-rw-r--r--regress/mdoc/Rv/noname.out_lint5
-rw-r--r--regress/mdoc/Rv/nostd.in5
-rw-r--r--regress/mdoc/Rv/nostd.out_ascii2
-rw-r--r--regress/mdoc/Rv/nostd.out_lint9
-rw-r--r--regress/mdoc/Rv/nostd.out_markdown2
-rw-r--r--regress/mdoc/Sh/badNAME.in5
-rw-r--r--regress/mdoc/Sh/badNAME.out_ascii2
-rw-r--r--regress/mdoc/Sh/badNAME.out_lint7
-rw-r--r--regress/mdoc/Sh/badNAME.out_markdown2
-rw-r--r--regress/mdoc/Sh/before.in5
-rw-r--r--regress/mdoc/Sh/before.out_ascii2
-rw-r--r--regress/mdoc/Sh/before.out_lint5
-rw-r--r--regress/mdoc/Sh/before.out_markdown2
-rw-r--r--regress/mdoc/Sh/empty.in5
-rw-r--r--regress/mdoc/Sh/empty.out_ascii2
-rw-r--r--regress/mdoc/Sh/empty.out_lint5
-rw-r--r--regress/mdoc/Sh/empty.out_markdown2
-rw-r--r--regress/mdoc/Sh/emptyNAME.in5
-rw-r--r--regress/mdoc/Sh/emptyNAME.out_ascii2
-rw-r--r--regress/mdoc/Sh/emptyNAME.out_lint7
-rw-r--r--regress/mdoc/Sh/emptyNAME.out_markdown2
-rw-r--r--regress/mdoc/Sh/first.in5
-rw-r--r--regress/mdoc/Sh/first.out_ascii2
-rw-r--r--regress/mdoc/Sh/first.out_lint5
-rw-r--r--regress/mdoc/Sh/first.out_markdown2
-rw-r--r--regress/mdoc/Sh/nohead.in5
-rw-r--r--regress/mdoc/Sh/nohead.out_ascii2
-rw-r--r--regress/mdoc/Sh/nohead.out_lint7
-rw-r--r--regress/mdoc/Sh/nohead.out_markdown2
-rw-r--r--regress/mdoc/Sh/order.in5
-rw-r--r--regress/mdoc/Sh/order.out_ascii2
-rw-r--r--regress/mdoc/Sh/order.out_lint9
-rw-r--r--regress/mdoc/Sh/order.out_markdown2
-rw-r--r--regress/mdoc/Sh/orderNAME.in5
-rw-r--r--regress/mdoc/Sh/orderNAME.out_ascii2
-rw-r--r--regress/mdoc/Sh/orderNAME.out_lint7
-rw-r--r--regress/mdoc/Sh/orderNAME.out_markdown2
-rw-r--r--regress/mdoc/Sh/parbefore.in5
-rw-r--r--regress/mdoc/Sh/parbefore.out_ascii2
-rw-r--r--regress/mdoc/Sh/parbefore.out_lint5
-rw-r--r--regress/mdoc/Sh/parbefore.out_markdown2
-rw-r--r--regress/mdoc/Sh/parborder.in5
-rw-r--r--regress/mdoc/Sh/parborder.out_ascii2
-rw-r--r--regress/mdoc/Sh/parborder.out_lint17
-rw-r--r--regress/mdoc/Sh/parborder.out_markdown2
-rw-r--r--regress/mdoc/Sh/punctNAME.in5
-rw-r--r--regress/mdoc/Sh/punctNAME.out_ascii2
-rw-r--r--regress/mdoc/Sh/punctNAME.out_lint11
-rw-r--r--regress/mdoc/Sh/punctNAME.out_markdown2
-rw-r--r--regress/mdoc/Sh/subbefore.in5
-rw-r--r--regress/mdoc/Sh/subbefore.out_ascii2
-rw-r--r--regress/mdoc/Sh/subbefore.out_lint5
-rw-r--r--regress/mdoc/Sh/subbefore.out_markdown2
-rw-r--r--regress/mdoc/Sm/badarg.in5
-rw-r--r--regress/mdoc/Sm/badarg.out_ascii2
-rw-r--r--regress/mdoc/Sm/badarg.out_lint7
-rw-r--r--regress/mdoc/Sm/badarg.out_markdown2
-rw-r--r--regress/mdoc/Sm/noarg.in5
-rw-r--r--regress/mdoc/Sm/noarg.out_ascii2
-rw-r--r--regress/mdoc/Sm/noarg.out_markdown2
-rw-r--r--regress/mdoc/Sm/scope.in5
-rw-r--r--regress/mdoc/Sm/scope.out_ascii2
-rw-r--r--regress/mdoc/Sm/scope.out_markdown2
-rw-r--r--regress/mdoc/Sm/spacing-No.in5
-rw-r--r--regress/mdoc/Sm/spacing-No.out_ascii2
-rw-r--r--regress/mdoc/Sm/spacing-No.out_markdown2
-rw-r--r--regress/mdoc/Sm/spacing-Op.in5
-rw-r--r--regress/mdoc/Sm/spacing-Op.out_ascii2
-rw-r--r--regress/mdoc/Sm/spacing-Op.out_markdown2
-rw-r--r--regress/mdoc/Sm/twoarg.in5
-rw-r--r--regress/mdoc/Sm/twoarg.out_ascii2
-rw-r--r--regress/mdoc/Sm/twoarg.out_lint5
-rw-r--r--regress/mdoc/Sm/twoarg.out_markdown2
-rw-r--r--regress/mdoc/Sq/empty.in5
-rw-r--r--regress/mdoc/Sq/empty.out_ascii2
-rw-r--r--regress/mdoc/Sq/empty.out_lint7
-rw-r--r--regress/mdoc/Sq/empty.out_markdown2
-rw-r--r--regress/mdoc/St/badargs.in5
-rw-r--r--regress/mdoc/St/badargs.out_ascii2
-rw-r--r--regress/mdoc/St/badargs.out_lint7
-rw-r--r--regress/mdoc/St/badargs.out_markdown2
-rw-r--r--regress/mdoc/St/call.in5
-rw-r--r--regress/mdoc/St/call.out_ascii2
-rw-r--r--regress/mdoc/St/call.out_lint5
-rw-r--r--regress/mdoc/St/call.out_markdown2
-rw-r--r--regress/mdoc/Sx/font.in5
-rw-r--r--regress/mdoc/Sx/font.out_ascii2
-rw-r--r--regress/mdoc/Sx/font.out_markdown2
-rw-r--r--regress/mdoc/Sx/noarg.in5
-rw-r--r--regress/mdoc/Sx/noarg.out_ascii2
-rw-r--r--regress/mdoc/Sx/noarg.out_lint5
-rw-r--r--regress/mdoc/Sx/noarg.out_markdown2
-rw-r--r--regress/mdoc/Sy/font.in5
-rw-r--r--regress/mdoc/Sy/font.out_ascii2
-rw-r--r--regress/mdoc/Sy/font.out_markdown2
-rw-r--r--regress/mdoc/Sy/noarg.in5
-rw-r--r--regress/mdoc/Sy/noarg.out_ascii2
-rw-r--r--regress/mdoc/Sy/noarg.out_lint5
-rw-r--r--regress/mdoc/Sy/noarg.out_markdown2
-rw-r--r--regress/mdoc/Sy/punct.in5
-rw-r--r--regress/mdoc/Sy/punct.out_ascii2
-rw-r--r--regress/mdoc/Sy/punct.out_lint13
-rw-r--r--regress/mdoc/Sy/punct.out_markdown2
-rw-r--r--regress/mdoc/Tn/font.in5
-rw-r--r--regress/mdoc/Tn/font.out_ascii2
-rw-r--r--regress/mdoc/Tn/font.out_markdown2
-rw-r--r--regress/mdoc/Tn/noarg.in5
-rw-r--r--regress/mdoc/Tn/noarg.out_ascii2
-rw-r--r--regress/mdoc/Tn/noarg.out_lint7
-rw-r--r--regress/mdoc/Tn/noarg.out_markdown2
-rw-r--r--regress/mdoc/Ud/arg.in5
-rw-r--r--regress/mdoc/Ud/arg.out_ascii2
-rw-r--r--regress/mdoc/Ud/arg.out_lint23
-rw-r--r--regress/mdoc/Ud/arg.out_markdown2
-rw-r--r--regress/mdoc/Ux/eos.in5
-rw-r--r--regress/mdoc/Ux/eos.out_ascii2
-rw-r--r--regress/mdoc/Ux/eos.out_markdown2
-rw-r--r--regress/mdoc/Ux/punct.in5
-rw-r--r--regress/mdoc/Ux/punct.out_ascii2
-rw-r--r--regress/mdoc/Ux/punct.out_lint13
-rw-r--r--regress/mdoc/Ux/punct.out_markdown2
-rw-r--r--regress/mdoc/Ux/spacing.in5
-rw-r--r--regress/mdoc/Ux/spacing.out_ascii2
-rw-r--r--regress/mdoc/Ux/spacing.out_markdown2
-rw-r--r--regress/mdoc/Va/basic.in5
-rw-r--r--regress/mdoc/Va/basic.out_ascii2
-rw-r--r--regress/mdoc/Va/basic.out_markdown2
-rw-r--r--regress/mdoc/Va/font.in5
-rw-r--r--regress/mdoc/Va/font.out_ascii2
-rw-r--r--regress/mdoc/Va/font.out_markdown2
-rw-r--r--regress/mdoc/Va/noarg.in5
-rw-r--r--regress/mdoc/Va/noarg.out_ascii2
-rw-r--r--regress/mdoc/Va/noarg.out_lint7
-rw-r--r--regress/mdoc/Va/noarg.out_markdown2
-rw-r--r--regress/mdoc/Va/punct.in5
-rw-r--r--regress/mdoc/Va/punct.out_ascii2
-rw-r--r--regress/mdoc/Va/punct.out_markdown2
-rw-r--r--regress/mdoc/Vt/child.in5
-rw-r--r--regress/mdoc/Vt/child.out_ascii2
-rw-r--r--regress/mdoc/Vt/child.out_markdown2
-rw-r--r--regress/mdoc/Vt/font.in5
-rw-r--r--regress/mdoc/Vt/font.out_ascii2
-rw-r--r--regress/mdoc/Vt/font.out_markdown2
-rw-r--r--regress/mdoc/Vt/noarg.in5
-rw-r--r--regress/mdoc/Vt/noarg.out_ascii2
-rw-r--r--regress/mdoc/Vt/noarg.out_lint7
-rw-r--r--regress/mdoc/Vt/noarg.out_markdown2
-rw-r--r--regress/mdoc/Vt/spacing.in5
-rw-r--r--regress/mdoc/Vt/spacing.out_ascii2
-rw-r--r--regress/mdoc/Vt/spacing.out_markdown2
-rw-r--r--regress/mdoc/Xr/args.in5
-rw-r--r--regress/mdoc/Xr/args.out_ascii2
-rw-r--r--regress/mdoc/Xr/args.out_lint16
-rw-r--r--regress/mdoc/Xr/args.out_markdown2
-rw-r--r--regress/mdoc/blank/comment.in5
-rw-r--r--regress/mdoc/blank/comment.out_ascii2
-rw-r--r--regress/mdoc/blank/comment.out_lint5
-rw-r--r--regress/mdoc/blank/comment.out_markdown2
-rw-r--r--regress/mdoc/blank/line.in5
-rw-r--r--regress/mdoc/blank/line.out_ascii2
-rw-r--r--regress/mdoc/blank/line.out_lint47
-rw-r--r--regress/mdoc/blank/list.in5
-rw-r--r--regress/mdoc/blank/list.out_ascii2
-rw-r--r--regress/mdoc/blank/list.out_lint17
-rw-r--r--regress/mdoc/blank/list.out_markdown2
-rw-r--r--regress/mdoc/break/brokenbreaker.in5
-rw-r--r--regress/mdoc/break/brokenbreaker.out_ascii2
-rw-r--r--regress/mdoc/break/brokenbreaker.out_lint9
-rw-r--r--regress/mdoc/break/brokenbreaker.out_markdown2
-rw-r--r--regress/mdoc/break/notopen.in5
-rw-r--r--regress/mdoc/break/notopen.out_ascii2
-rw-r--r--regress/mdoc/break/notopen.out_lint5
-rw-r--r--regress/mdoc/break/notopen.out_markdown2
-rw-r--r--regress/mdoc/break/tail.in5
-rw-r--r--regress/mdoc/break/tail.out_ascii2
-rw-r--r--regress/mdoc/break/tail.out_lint13
-rw-r--r--regress/mdoc/break/tail.out_markdown2
-rw-r--r--regress/mdoc/break/twice.in5
-rw-r--r--regress/mdoc/break/twice.out_ascii2
-rw-r--r--regress/mdoc/break/twice.out_lint23
-rw-r--r--regress/mdoc/break/twice.out_markdown2
-rw-r--r--regress/mdoc/break/two.in5
-rw-r--r--regress/mdoc/break/two.out_ascii2
-rw-r--r--regress/mdoc/break/two.out_lint19
-rw-r--r--regress/mdoc/break/two.out_markdown2
-rwxr-xr-xregress/regress.pl12
-rw-r--r--regress/roff/args/man.in3
-rw-r--r--regress/roff/args/man.out_lint19
-rw-r--r--regress/roff/args/mdoc.in5
-rw-r--r--regress/roff/args/mdoc.out_ascii2
-rw-r--r--regress/roff/args/mdoc.out_lint29
-rw-r--r--regress/roff/args/roff.in3
-rw-r--r--regress/roff/args/roff.out_lint33
-rw-r--r--regress/roff/br/args.in3
-rw-r--r--regress/roff/br/args.out_lint3
-rw-r--r--regress/roff/cc/basic.in3
-rw-r--r--regress/roff/cc/basic.out_lint3
-rw-r--r--regress/roff/cond/before-Dd.in5
-rw-r--r--regress/roff/cond/before-Dd.out_ascii2
-rw-r--r--regress/roff/cond/close.in3
-rw-r--r--regress/roff/cond/close.out_lint5
-rw-r--r--regress/roff/cond/ie.in3
-rw-r--r--regress/roff/cond/if.in3
-rw-r--r--regress/roff/cond/if.out_lint5
-rw-r--r--regress/roff/cond/numeric.in3
-rw-r--r--regress/roff/cond/register.in3
-rw-r--r--regress/roff/cond/strcmp.in3
-rw-r--r--regress/roff/cond/string.in3
-rw-r--r--regress/roff/de/Dd.in5
-rw-r--r--regress/roff/de/Dd.out_ascii2
-rw-r--r--regress/roff/de/Makefile4
-rw-r--r--regress/roff/de/TH.in3
-rw-r--r--regress/roff/de/append.in5
-rw-r--r--regress/roff/de/append.out_ascii2
-rw-r--r--regress/roff/de/cond.in5
-rw-r--r--regress/roff/de/cond.out_ascii2
-rw-r--r--regress/roff/de/escname.in5
-rw-r--r--regress/roff/de/escname.out_ascii2
-rw-r--r--regress/roff/de/escname.out_lint19
-rw-r--r--regress/roff/de/factorial.in5
-rw-r--r--regress/roff/de/factorial.out_ascii2
-rw-r--r--regress/roff/de/indir.in5
-rw-r--r--regress/roff/de/indir.out_ascii2
-rw-r--r--regress/roff/de/indir.out_lint11
-rw-r--r--regress/roff/de/infinite.in5
-rw-r--r--regress/roff/de/infinite.out_ascii2
-rw-r--r--regress/roff/de/infinite.out_lint7
-rw-r--r--regress/roff/de/startde.in5
-rw-r--r--regress/roff/de/startde.out_ascii2
-rw-r--r--regress/roff/ds/append.in5
-rw-r--r--regress/roff/ds/append.out_ascii2
-rw-r--r--regress/roff/ds/escname.in5
-rw-r--r--regress/roff/ds/escname.out_ascii2
-rw-r--r--regress/roff/ds/nested.in5
-rw-r--r--regress/roff/ds/nested.out_ascii2
-rw-r--r--regress/roff/ds/quoting.in5
-rw-r--r--regress/roff/ds/quoting.out_ascii2
-rw-r--r--regress/roff/esc/B.in5
-rw-r--r--regress/roff/esc/B.out_ascii2
-rw-r--r--regress/roff/esc/B.out_lint5
-rw-r--r--regress/roff/esc/c.in5
-rw-r--r--regress/roff/esc/c.out_ascii2
-rw-r--r--regress/roff/esc/c_man.in3
-rw-r--r--regress/roff/esc/e.in5
-rw-r--r--regress/roff/esc/e.out_ascii2
-rw-r--r--regress/roff/esc/f.in5
-rw-r--r--regress/roff/esc/f.out_ascii2
-rw-r--r--regress/roff/esc/h.in5
-rw-r--r--regress/roff/esc/h.out_ascii2
-rw-r--r--regress/roff/esc/h.out_lint5
-rw-r--r--regress/roff/esc/ignore.in5
-rw-r--r--regress/roff/esc/ignore.out_ascii2
-rw-r--r--regress/roff/esc/ignore.out_lint5
-rw-r--r--regress/roff/esc/l.in5
-rw-r--r--regress/roff/esc/l.out_ascii2
-rw-r--r--regress/roff/esc/l.out_lint5
-rw-r--r--regress/roff/esc/multi.in5
-rw-r--r--regress/roff/esc/multi.out_ascii2
-rw-r--r--regress/roff/esc/o.in5
-rw-r--r--regress/roff/esc/o.out_ascii2
-rw-r--r--regress/roff/esc/one.in5
-rw-r--r--regress/roff/esc/one.out_ascii2
-rw-r--r--regress/roff/esc/p.in5
-rw-r--r--regress/roff/esc/p.out_ascii2
-rw-r--r--regress/roff/esc/two.in5
-rw-r--r--regress/roff/esc/two.out_ascii2
-rw-r--r--regress/roff/esc/w.in5
-rw-r--r--regress/roff/esc/w.out_ascii2
-rw-r--r--regress/roff/esc/w.out_lint5
-rw-r--r--regress/roff/esc/z.in5
-rw-r--r--regress/roff/esc/z.out_ascii2
-rw-r--r--regress/roff/ft/badargs-mdoc.in5
-rw-r--r--regress/roff/ft/badargs-mdoc.out_ascii2
-rw-r--r--regress/roff/ft/badargs-mdoc.out_lint7
-rw-r--r--regress/roff/ft/badargs.in3
-rw-r--r--regress/roff/ft/badargs.out_lint5
-rw-r--r--regress/roff/ig/basic.in5
-rw-r--r--regress/roff/ig/basic.out_ascii2
-rw-r--r--regress/roff/ig/basic.out_lint9
-rw-r--r--regress/roff/it/badarg.in5
-rw-r--r--regress/roff/it/badarg.out_ascii2
-rw-r--r--regress/roff/it/badarg.out_lint7
-rw-r--r--regress/roff/it/double.in3
-rw-r--r--regress/roff/it/text.in5
-rw-r--r--regress/roff/it/text.out_ascii2
-rw-r--r--regress/roff/ll/basic.in5
-rw-r--r--regress/roff/ll/basic.out_ascii2
-rw-r--r--regress/roff/na/args.in3
-rw-r--r--regress/roff/nr/argc.in5
-rw-r--r--regress/roff/nr/argc.out_ascii2
-rw-r--r--regress/roff/nr/divzero.in3
-rw-r--r--regress/roff/nr/divzero.out_lint5
-rw-r--r--regress/roff/nr/escname.in3
-rw-r--r--regress/roff/nr/escname.out_lint9
-rw-r--r--regress/roff/nr/eval.in3
-rw-r--r--regress/roff/nr/int.in3
-rw-r--r--regress/roff/nr/predef.in3
-rw-r--r--regress/roff/nr/rr.in3
-rw-r--r--regress/roff/nr/scale.in3
-rw-r--r--regress/roff/po/basic-mdoc.in5
-rw-r--r--regress/roff/po/basic-mdoc.out_ascii2
-rw-r--r--regress/roff/ps/ignore.in3
-rw-r--r--regress/roff/rm/basic.in5
-rw-r--r--regress/roff/rm/basic.out_ascii2
-rw-r--r--regress/roff/rn/append.in5
-rw-r--r--regress/roff/rn/append.out_ascii2
-rw-r--r--regress/roff/scale/horiz.in3
-rw-r--r--regress/roff/sp/badargs-man.in3
-rw-r--r--regress/roff/sp/badargs-man.out_lint3
-rw-r--r--regress/roff/sp/badargs-mdoc.in5
-rw-r--r--regress/roff/sp/badargs-mdoc.out_ascii2
-rw-r--r--regress/roff/sp/negative.in3
-rw-r--r--regress/roff/sp/scaling-man.in3
-rw-r--r--regress/roff/sp/scaling-mdoc.in5
-rw-r--r--regress/roff/sp/scaling-mdoc.out_ascii2
-rw-r--r--regress/roff/string/escape.in3
-rw-r--r--regress/roff/string/infinite.in3
-rw-r--r--regress/roff/string/name.in5
-rw-r--r--regress/roff/string/name.out_ascii2
-rw-r--r--regress/roff/string/name.out_lint37
-rw-r--r--regress/roff/string/std.in3
-rw-r--r--regress/roff/string/std.out_lint5
-rw-r--r--regress/roff/string/zerolength.in3
-rw-r--r--regress/roff/ta/basic-man.in3
-rw-r--r--regress/roff/ta/basic-mdoc.in5
-rw-r--r--regress/roff/ta/basic-mdoc.out_ascii2
-rw-r--r--regress/roff/ti/basic-man.in3
-rw-r--r--regress/roff/ti/basic-mdoc.in5
-rw-r--r--regress/roff/ti/basic-mdoc.out_ascii2
-rw-r--r--regress/roff/tr/args.in3
-rw-r--r--regress/roff/tr/args.out_lint7
-rw-r--r--regress/tbl/data/blankline.in3
-rw-r--r--regress/tbl/data/block_unclosed.in3
-rw-r--r--regress/tbl/data/block_unclosed.out_lint5
-rw-r--r--regress/tbl/data/block_width.in5
-rw-r--r--regress/tbl/data/block_width.out_ascii2
-rw-r--r--regress/tbl/data/block_wrap.in5
-rw-r--r--regress/tbl/data/block_wrap.out_ascii2
-rw-r--r--regress/tbl/data/empty.in3
-rw-r--r--regress/tbl/data/empty.out_lint3
-rw-r--r--regress/tbl/layout/center.in3
-rw-r--r--regress/tbl/layout/complex.in3
-rw-r--r--regress/tbl/layout/complex.out_lint11
-rw-r--r--regress/tbl/layout/empty.in3
-rw-r--r--regress/tbl/layout/empty.out_lint5
-rw-r--r--regress/tbl/layout/emptyline.in3
-rw-r--r--regress/tbl/layout/lines-nogroff.in5
-rw-r--r--regress/tbl/layout/lines-nogroff.out_ascii2
-rw-r--r--regress/tbl/layout/lines.in5
-rw-r--r--regress/tbl/layout/lines.out_ascii2
-rw-r--r--regress/tbl/layout/numbers.in3
-rw-r--r--regress/tbl/layout/span.in3
-rw-r--r--regress/tbl/macro/column.in5
-rw-r--r--regress/tbl/macro/column.out_ascii2
-rw-r--r--regress/tbl/macro/man.in3
-rw-r--r--regress/tbl/macro/man.out_lint5
-rw-r--r--regress/tbl/macro/nested.in3
-rw-r--r--regress/tbl/macro/nested.out_lint3
-rw-r--r--regress/tbl/mod/badfont.in3
-rw-r--r--regress/tbl/mod/badfont.out_lint5
-rw-r--r--regress/tbl/mod/expand-toowide.in3
-rw-r--r--regress/tbl/mod/expand.in3
-rw-r--r--regress/tbl/mod/font.in3
-rw-r--r--regress/tbl/mod/font.out_lint11
-rw-r--r--regress/tbl/mod/misalign.in3
-rw-r--r--regress/tbl/mod/spacing.in3
-rw-r--r--regress/tbl/mod/width.in3
-rw-r--r--regress/tbl/opt/box.in3
-rw-r--r--regress/tbl/opt/center.in3
-rw-r--r--regress/tbl/opt/invalid.in3
-rw-r--r--regress/tbl/opt/invalid.out_lint11
1244 files changed, 2681 insertions, 2724 deletions
diff --git a/regress/char/N/basic.in b/regress/char/N/basic.in
index f915c8b7..aa310f65 100644
--- a/regress/char/N/basic.in
+++ b/regress/char/N/basic.in
@@ -1,4 +1,5 @@
-.TH N-BASIC 1 "January 29, 2011" OpenBSD
+.\" $OpenBSD: basic.in,v 1.3 2017/07/04 14:53:23 schwarze Exp $
+.TH N-BASIC 1 "January 29, 2011"
.SH NAME
N-basic \- basic handling of character number escapes
.SH DESCRIPTION
diff --git a/regress/char/accent/combine.in b/regress/char/accent/combine.in
index 124d82d5..ed0ed940 100644
--- a/regress/char/accent/combine.in
+++ b/regress/char/accent/combine.in
@@ -1,4 +1,5 @@
-.TH CHAR-ACCENT-COMBINE 1 "February 28, 2014" OpenBSD
+.\" $OpenBSD: combine.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH CHAR-ACCENT-COMBINE 1 "February 28, 2014"
.SH NAME
\fBchar-accent-combine\fR - combining accents
.SH DESCRIPTION
diff --git a/regress/char/accent/nocombine.in b/regress/char/accent/nocombine.in
index 39428f76..a81d446b 100644
--- a/regress/char/accent/nocombine.in
+++ b/regress/char/accent/nocombine.in
@@ -1,4 +1,5 @@
-.TH CHAR-ACCENT-NOCOMBINE 1 "March 8, 2014" OpenBSD
+.\" $OpenBSD: nocombine.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH CHAR-ACCENT-NOCOMBINE 1 "March 8, 2014"
.SH NAME
\fBchar-accent-nocombine\fR - non-combining accents
.SH DESCRIPTION
diff --git a/regress/char/accent/utf8only.in b/regress/char/accent/utf8only.in
index 8c7d2ca0..6e65526d 100644
--- a/regress/char/accent/utf8only.in
+++ b/regress/char/accent/utf8only.in
@@ -1,4 +1,5 @@
-.TH CHAR-ACCENT-UTF8ONLY 1 "March 8, 2014" OpenBSD
+.\" $OpenBSD: utf8only.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH CHAR-ACCENT-UTF8ONLY 1 "March 8, 2014"
.SH NAME
\fBchar-accent-utf8only\fR - accents available in UTF-8 only
.SH DESCRIPTION
diff --git a/regress/char/bar/man.in b/regress/char/bar/man.in
index acabf501..70e8a354 100644
--- a/regress/char/bar/man.in
+++ b/regress/char/bar/man.in
@@ -1,4 +1,5 @@
-.TH bar-man 1 "July 17, 2012" OpenBSD
+.\" $OpenBSD: man.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH bar-man 1 "July 17, 2012"
.SH NAME
\fBbar-man\fR - formatting the vertical bar symbol
.SH DESCRIPTION
diff --git a/regress/char/bar/mdoc.in b/regress/char/bar/mdoc.in
index 5e9afa0a..31f401e8 100644
--- a/regress/char/bar/mdoc.in
+++ b/regress/char/bar/mdoc.in
@@ -1,6 +1,7 @@
-.Dd July 17, 2012
+.\" $OpenBSD: mdoc.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt BAR-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm bar-mdoc
.Nd formatting the vertical bar symbol
diff --git a/regress/char/bar/mdoc.out_ascii b/regress/char/bar/mdoc.out_ascii
index 8d98160a..259d0943 100644
--- a/regress/char/bar/mdoc.out_ascii
+++ b/regress/char/bar/mdoc.out_ascii
@@ -28,4 +28,4 @@ DDEESSCCRRIIPPTTIIOONN
_i_s_o_l_a_t_e_d | _e_m|_b_e_d_d_e_d
_i_s_o_l_a_t_e_d | _e_m|_b_e_d_d_e_d
-OpenBSD July 17, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/hyphen/man.in b/regress/char/hyphen/man.in
index 546c7c56..a61c2ea3 100644
--- a/regress/char/hyphen/man.in
+++ b/regress/char/hyphen/man.in
@@ -1,4 +1,5 @@
-.TH hyphen-man 1 "September 18, 2011" OpenBSD
+.\" $OpenBSD: man.in,v 1.3 2017/07/04 14:53:23 schwarze Exp $
+.TH hyphen-man 1 "September 18, 2011"
.SH NAME
\fBhyphen-man\fR - formatting hyphens and breaking lines
.SH DESCRIPTION
diff --git a/regress/char/hyphen/mdoc.in b/regress/char/hyphen/mdoc.in
index 76cfd0d3..943c5181 100644
--- a/regress/char/hyphen/mdoc.in
+++ b/regress/char/hyphen/mdoc.in
@@ -1,6 +1,7 @@
-.Dd February 22, 2014
+.\" $OpenBSD: mdoc.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt HYPHEN-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm hyphen-mdoc
.Nd formatting hyphens and breaking lines
diff --git a/regress/char/hyphen/mdoc.out_ascii b/regress/char/hyphen/mdoc.out_ascii
index d1171156..34d892e9 100644
--- a/regress/char/hyphen/mdoc.out_ascii
+++ b/regress/char/hyphen/mdoc.out_ascii
@@ -16,4 +16,4 @@ DDEESSCCRRIIPPTTIIOONN
And finally, try it a third time, but this time in bold font mode: bbrreeaakk--
hheerree
-OpenBSD February 22, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/space/break.in b/regress/char/space/break.in
index f82fd01b..d889fec8 100644
--- a/regress/char/space/break.in
+++ b/regress/char/space/break.in
@@ -1,6 +1,7 @@
-.Dd January 8, 2014
+.\" $OpenBSD: break.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt CHAR-BREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm char-break
.Nd optional line-break
diff --git a/regress/char/space/break.out_ascii b/regress/char/space/break.out_ascii
index f03c7eec..00b034ec 100644
--- a/regress/char/space/break.out_ascii
+++ b/regress/char/space/break.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
end of text
-OpenBSD January 8, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/space/eos-man.in b/regress/char/space/eos-man.in
index 48f8a984..439281d1 100644
--- a/regress/char/space/eos-man.in
+++ b/regress/char/space/eos-man.in
@@ -1,4 +1,5 @@
-.TH SPACE-EOS-MAN 1 "December 22, 2013" OpenBSD
+.\" $OpenBSD: eos-man.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH SPACE-EOS-MAN 1 "December 22, 2013"
.SH NAME
SPACE-EOS-MAN \- end-of-sentence spacing in man(7) documents
.SH DESCRIPTION
diff --git a/regress/char/space/eos.in b/regress/char/space/eos.in
index 2b5ae698..7b344f4d 100644
--- a/regress/char/space/eos.in
+++ b/regress/char/space/eos.in
@@ -1,6 +1,7 @@
-.Dd December 30, 2013
+.\" $OpenBSD: eos.in,v 1.3 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt SPACE-EOS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm space-eos
.Nd end-of-sentence spacing
diff --git a/regress/char/space/eos.out_ascii b/regress/char/space/eos.out_ascii
index 1a5bd493..ea446635 100644
--- a/regress/char/space/eos.out_ascii
+++ b/regress/char/space/eos.out_ascii
@@ -18,4 +18,4 @@ DDEESSCCRRIIPPTTIIOONN
At the end of an input line, even an escaped dot . is regarded as a full
stop.
-OpenBSD December 30, 2013 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/space/esct-man.in b/regress/char/space/esct-man.in
index 90aed2c7..e7afeefe 100644
--- a/regress/char/space/esct-man.in
+++ b/regress/char/space/esct-man.in
@@ -1,4 +1,5 @@
-.TH SPACE-ESCT-MAN 1 2013-06-20 OpenBSD
+.\" $OpenBSD: esct-man.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH SPACE-ESCT-MAN 1 2013-06-20
.SH NAME
SPACE-T-MAN \- the t escape sequence in pages with man macros
.SH DESCRIPTION
diff --git a/regress/char/space/esct-man.out_lint b/regress/char/space/esct-man.out_lint
index 21c52440..c625b3a3 100644
--- a/regress/char/space/esct-man.out_lint
+++ b/regress/char/space/esct-man.out_lint
@@ -1,7 +1,6 @@
-mandoc: esct-man.in:7:7: WARNING: tab in filled text
-mandoc: esct-man.in:11:7: WARNING: tab in filled text
-mandoc: esct-man.in:11:8: WARNING: tab in filled text
-mandoc: esct-man.in:27:11: WARNING: tab in filled text
-mandoc: esct-man.in:29:11: WARNING: tab in filled text
-mandoc: esct-man.in:34:10: WARNING: tab in filled text
-mandoc: esct-man.in: BASE: RCS id missing: (OpenBSD)
+mandoc: esct-man.in:8:7: WARNING: tab in filled text
+mandoc: esct-man.in:12:7: WARNING: tab in filled text
+mandoc: esct-man.in:12:8: WARNING: tab in filled text
+mandoc: esct-man.in:28:11: WARNING: tab in filled text
+mandoc: esct-man.in:30:11: WARNING: tab in filled text
+mandoc: esct-man.in:35:10: WARNING: tab in filled text
diff --git a/regress/char/space/esct-mdoc.in b/regress/char/space/esct-mdoc.in
index 0c9ba1eb..a22f4914 100644
--- a/regress/char/space/esct-mdoc.in
+++ b/regress/char/space/esct-mdoc.in
@@ -1,6 +1,7 @@
-.Dd June 20, 2013
+.\" $OpenBSD: esct-mdoc.in,v 1.3 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt SPACE-ESCT-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm space-esct-mdoc
.Nd the t escape sequence in pages with mdoc macros
diff --git a/regress/char/space/esct-mdoc.out_ascii b/regress/char/space/esct-mdoc.out_ascii
index 9b09325e..33dd06db 100644
--- a/regress/char/space/esct-mdoc.out_ascii
+++ b/regress/char/space/esct-mdoc.out_ascii
@@ -31,4 +31,4 @@ DDEESSCCRRIIPPTTIIOONN
double tab
doubleescape-t
-OpenBSD June 20, 2013 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/space/esct-mdoc.out_lint b/regress/char/space/esct-mdoc.out_lint
index 6ee3a0d3..e9887ef8 100644
--- a/regress/char/space/esct-mdoc.out_lint
+++ b/regress/char/space/esct-mdoc.out_lint
@@ -1,6 +1,3 @@
-mandoc: esct-mdoc.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: esct-mdoc.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: esct-mdoc.in:10:7: WARNING: tab in filled text
-mandoc: esct-mdoc.in:14:7: WARNING: tab in filled text
-mandoc: esct-mdoc.in:14:8: WARNING: tab in filled text
-mandoc: esct-mdoc.in: BASE: RCS id missing: (OpenBSD)
+mandoc: esct-mdoc.in:11:7: WARNING: tab in filled text
+mandoc: esct-mdoc.in:15:7: WARNING: tab in filled text
+mandoc: esct-mdoc.in:15:8: WARNING: tab in filled text
diff --git a/regress/char/space/leading-man.in b/regress/char/space/leading-man.in
index 6d48f3be..6b56ad26 100644
--- a/regress/char/space/leading-man.in
+++ b/regress/char/space/leading-man.in
@@ -1,4 +1,5 @@
-.TH SPACE-LEADING-MAN 1 "January 15, 2011" OpenBSD
+.\" $OpenBSD: leading-man.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.TH SPACE-LEADING-MAN 1 "January 15, 2011"
.SH NAME
space-leading-man \- leading spaces on text lines in man documents
.SH DESCRIPTION
diff --git a/regress/char/space/leading-mdoc.in b/regress/char/space/leading-mdoc.in
index 912b9000..d17a81b3 100644
--- a/regress/char/space/leading-mdoc.in
+++ b/regress/char/space/leading-mdoc.in
@@ -1,6 +1,7 @@
-.Dd January 15, 2011
+.\" $OpenBSD: leading-mdoc.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt SPACE-LEADING_MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm space-leading-mdoc
.Nd leading spaces on text lines in mdoc documents
diff --git a/regress/char/space/leading-mdoc.out_ascii b/regress/char/space/leading-mdoc.out_ascii
index 91ef3f36..02e980e7 100644
--- a/regress/char/space/leading-mdoc.out_ascii
+++ b/regress/char/space/leading-mdoc.out_ascii
@@ -15,4 +15,4 @@ DDEESSCCRRIIPPTTIIOONN
normal line in a filled display
leading space in a filled display another normal line
-OpenBSD January 15, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/space/multiple.in b/regress/char/space/multiple.in
index 47037269..b96a3306 100644
--- a/regress/char/space/multiple.in
+++ b/regress/char/space/multiple.in
@@ -1,6 +1,7 @@
-.Dd April 23, 2010
+.\" $OpenBSD: multiple.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt SPACE-MULTIPLE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm space-multiple
.Nd handling of multiple adjacent space characters
diff --git a/regress/char/space/multiple.out_ascii b/regress/char/space/multiple.out_ascii
index 945cd260..0f2898b7 100644
--- a/regress/char/space/multiple.out_ascii
+++ b/regress/char/space/multiple.out_ascii
@@ -16,4 +16,4 @@ DDEESSCCRRIIPPTTIIOONN
three non-collapsing spaces here
-OpenBSD April 23, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/space/nobreak.in b/regress/char/space/nobreak.in
index 20bd19bd..aef08d5d 100644
--- a/regress/char/space/nobreak.in
+++ b/regress/char/space/nobreak.in
@@ -1,6 +1,7 @@
-.Dd July 29, 2012
+.\" $OpenBSD: nobreak.in,v 1.5 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt SPACE-NOBREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm space-nobreak
.Nd non-breaking, non-collapsing space
diff --git a/regress/char/space/nobreak.out_ascii b/regress/char/space/nobreak.out_ascii
index 5544c77e..36c96322 100644
--- a/regress/char/space/nobreak.out_ascii
+++ b/regress/char/space/nobreak.out_ascii
@@ -31,4 +31,4 @@ DDEESSCCRRIIPPTTIIOONN
79 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x x
-OpenBSD July 29, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/space/tab-man.in b/regress/char/space/tab-man.in
index a3645fd2..5864385d 100644
--- a/regress/char/space/tab-man.in
+++ b/regress/char/space/tab-man.in
@@ -1,4 +1,5 @@
-.TH SPACE-TAB-MAN 1 "May 24, 2010" OpenBSD
+.\" $OpenBSD: tab-man.in,v 1.5 2017/07/04 14:53:23 schwarze Exp $
+.TH SPACE-TAB-MAN 1 "May 24, 2010"
.SH NAME
SPACE-TAB-MAN \- handling of literal tab characters
.SH DESCRIPTION
diff --git a/regress/char/space/tab-man.out_lint b/regress/char/space/tab-man.out_lint
index 6bcd99f6..4a51a1f3 100644
--- a/regress/char/space/tab-man.out_lint
+++ b/regress/char/space/tab-man.out_lint
@@ -1,23 +1,22 @@
-mandoc: tab-man.in:7:2: WARNING: tab in filled text
-mandoc: tab-man.in:9:3: WARNING: tab in filled text
-mandoc: tab-man.in:11:4: WARNING: tab in filled text
-mandoc: tab-man.in:13:5: WARNING: tab in filled text
-mandoc: tab-man.in:15:6: WARNING: tab in filled text
-mandoc: tab-man.in:17:7: WARNING: tab in filled text
-mandoc: tab-man.in:19:8: WARNING: tab in filled text
-mandoc: tab-man.in:21:9: WARNING: tab in filled text
-mandoc: tab-man.in:23:10: WARNING: tab in filled text
-mandoc: tab-man.in:25:11: WARNING: tab in filled text
-mandoc: tab-man.in:27:12: WARNING: tab in filled text
-mandoc: tab-man.in:29:13: WARNING: tab in filled text
-mandoc: tab-man.in:31:14: WARNING: tab in filled text
-mandoc: tab-man.in:33:4: WARNING: tab in filled text
-mandoc: tab-man.in:35:4: WARNING: tab in filled text
-mandoc: tab-man.in:35:5: WARNING: tab in filled text
-mandoc: tab-man.in:37:7: WARNING: tab in filled text
-mandoc: tab-man.in:39:1: WARNING: tab in filled text
-mandoc: tab-man.in:41:1: WARNING: tab in filled text
-mandoc: tab-man.in:41:2: WARNING: tab in filled text
-mandoc: tab-man.in:43:1: WARNING: tab in filled text
+mandoc: tab-man.in:8:2: WARNING: tab in filled text
+mandoc: tab-man.in:10:3: WARNING: tab in filled text
+mandoc: tab-man.in:12:4: WARNING: tab in filled text
+mandoc: tab-man.in:14:5: WARNING: tab in filled text
+mandoc: tab-man.in:16:6: WARNING: tab in filled text
+mandoc: tab-man.in:18:7: WARNING: tab in filled text
+mandoc: tab-man.in:20:8: WARNING: tab in filled text
+mandoc: tab-man.in:22:9: WARNING: tab in filled text
+mandoc: tab-man.in:24:10: WARNING: tab in filled text
+mandoc: tab-man.in:26:11: WARNING: tab in filled text
+mandoc: tab-man.in:28:12: WARNING: tab in filled text
+mandoc: tab-man.in:30:13: WARNING: tab in filled text
+mandoc: tab-man.in:32:14: WARNING: tab in filled text
+mandoc: tab-man.in:34:4: WARNING: tab in filled text
+mandoc: tab-man.in:36:4: WARNING: tab in filled text
+mandoc: tab-man.in:36:5: WARNING: tab in filled text
+mandoc: tab-man.in:38:7: WARNING: tab in filled text
+mandoc: tab-man.in:40:1: WARNING: tab in filled text
+mandoc: tab-man.in:42:1: WARNING: tab in filled text
+mandoc: tab-man.in:42:2: WARNING: tab in filled text
mandoc: tab-man.in:44:1: WARNING: tab in filled text
-mandoc: tab-man.in: BASE: RCS id missing: (OpenBSD)
+mandoc: tab-man.in:45:1: WARNING: tab in filled text
diff --git a/regress/char/space/tab.in b/regress/char/space/tab.in
index e801cbd9..b1fd8ee7 100644
--- a/regress/char/space/tab.in
+++ b/regress/char/space/tab.in
@@ -1,6 +1,7 @@
-.Dd April 23, 2010
+.\" $OpenBSD: tab.in,v 1.6 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt SPACE-TAB 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm space-tab
.Nd handling of literal space characters
diff --git a/regress/char/space/tab.out_ascii b/regress/char/space/tab.out_ascii
index 64d32af1..2326e0b7 100644
--- a/regress/char/space/tab.out_ascii
+++ b/regress/char/space/tab.out_ascii
@@ -86,4 +86,4 @@ DDEESSCCRRIIPPTTIIOONN
tab
tab
-OpenBSD April 23, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/space/tab.out_lint b/regress/char/space/tab.out_lint
index 6eabe2d8..befbf367 100644
--- a/regress/char/space/tab.out_lint
+++ b/regress/char/space/tab.out_lint
@@ -1,45 +1,42 @@
-mandoc: tab.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: tab.in:1:5: BASE: Mdocdate missing: Dd April (OpenBSD)
-mandoc: tab.in:10:2: WARNING: tab in filled text
-mandoc: tab.in:12:3: WARNING: tab in filled text
-mandoc: tab.in:14:4: WARNING: tab in filled text
-mandoc: tab.in:16:5: WARNING: tab in filled text
-mandoc: tab.in:18:6: WARNING: tab in filled text
-mandoc: tab.in:20:7: WARNING: tab in filled text
-mandoc: tab.in:22:8: WARNING: tab in filled text
-mandoc: tab.in:24:9: WARNING: tab in filled text
-mandoc: tab.in:26:10: WARNING: tab in filled text
-mandoc: tab.in:28:11: WARNING: tab in filled text
-mandoc: tab.in:30:12: WARNING: tab in filled text
-mandoc: tab.in:32:13: WARNING: tab in filled text
-mandoc: tab.in:34:14: WARNING: tab in filled text
-mandoc: tab.in:36:4: WARNING: tab in filled text
-mandoc: tab.in:38:4: WARNING: tab in filled text
-mandoc: tab.in:38:5: WARNING: tab in filled text
-mandoc: tab.in:40:7: WARNING: tab in filled text
-mandoc: tab.in:42:1: WARNING: tab in filled text
-mandoc: tab.in:44:1: WARNING: tab in filled text
-mandoc: tab.in:44:2: WARNING: tab in filled text
-mandoc: tab.in:46:1: WARNING: tab in filled text
+mandoc: tab.in:11:2: WARNING: tab in filled text
+mandoc: tab.in:13:3: WARNING: tab in filled text
+mandoc: tab.in:15:4: WARNING: tab in filled text
+mandoc: tab.in:17:5: WARNING: tab in filled text
+mandoc: tab.in:19:6: WARNING: tab in filled text
+mandoc: tab.in:21:7: WARNING: tab in filled text
+mandoc: tab.in:23:8: WARNING: tab in filled text
+mandoc: tab.in:25:9: WARNING: tab in filled text
+mandoc: tab.in:27:10: WARNING: tab in filled text
+mandoc: tab.in:29:11: WARNING: tab in filled text
+mandoc: tab.in:31:12: WARNING: tab in filled text
+mandoc: tab.in:33:13: WARNING: tab in filled text
+mandoc: tab.in:35:14: WARNING: tab in filled text
+mandoc: tab.in:37:4: WARNING: tab in filled text
+mandoc: tab.in:39:4: WARNING: tab in filled text
+mandoc: tab.in:39:5: WARNING: tab in filled text
+mandoc: tab.in:41:7: WARNING: tab in filled text
+mandoc: tab.in:43:1: WARNING: tab in filled text
+mandoc: tab.in:45:1: WARNING: tab in filled text
+mandoc: tab.in:45:2: WARNING: tab in filled text
mandoc: tab.in:47:1: WARNING: tab in filled text
-mandoc: tab.in:51:2: WARNING: tab in filled text
-mandoc: tab.in:53:3: WARNING: tab in filled text
-mandoc: tab.in:55:4: WARNING: tab in filled text
-mandoc: tab.in:57:5: WARNING: tab in filled text
-mandoc: tab.in:59:6: WARNING: tab in filled text
-mandoc: tab.in:61:7: WARNING: tab in filled text
-mandoc: tab.in:63:8: WARNING: tab in filled text
-mandoc: tab.in:65:9: WARNING: tab in filled text
-mandoc: tab.in:67:10: WARNING: tab in filled text
-mandoc: tab.in:69:11: WARNING: tab in filled text
-mandoc: tab.in:71:12: WARNING: tab in filled text
-mandoc: tab.in:73:13: WARNING: tab in filled text
-mandoc: tab.in:75:14: WARNING: tab in filled text
-mandoc: tab.in:77:4: WARNING: tab in filled text
-mandoc: tab.in:79:4: WARNING: tab in filled text
-mandoc: tab.in:79:5: WARNING: tab in filled text
-mandoc: tab.in:81:7: WARNING: tab in filled text
-mandoc: tab.in:83:1: WARNING: tab in filled text
-mandoc: tab.in:85:1: WARNING: tab in filled text
-mandoc: tab.in:85:2: WARNING: tab in filled text
-mandoc: tab.in: BASE: RCS id missing: (OpenBSD)
+mandoc: tab.in:48:1: WARNING: tab in filled text
+mandoc: tab.in:52:2: WARNING: tab in filled text
+mandoc: tab.in:54:3: WARNING: tab in filled text
+mandoc: tab.in:56:4: WARNING: tab in filled text
+mandoc: tab.in:58:5: WARNING: tab in filled text
+mandoc: tab.in:60:6: WARNING: tab in filled text
+mandoc: tab.in:62:7: WARNING: tab in filled text
+mandoc: tab.in:64:8: WARNING: tab in filled text
+mandoc: tab.in:66:9: WARNING: tab in filled text
+mandoc: tab.in:68:10: WARNING: tab in filled text
+mandoc: tab.in:70:11: WARNING: tab in filled text
+mandoc: tab.in:72:12: WARNING: tab in filled text
+mandoc: tab.in:74:13: WARNING: tab in filled text
+mandoc: tab.in:76:14: WARNING: tab in filled text
+mandoc: tab.in:78:4: WARNING: tab in filled text
+mandoc: tab.in:80:4: WARNING: tab in filled text
+mandoc: tab.in:80:5: WARNING: tab in filled text
+mandoc: tab.in:82:7: WARNING: tab in filled text
+mandoc: tab.in:84:1: WARNING: tab in filled text
+mandoc: tab.in:86:1: WARNING: tab in filled text
+mandoc: tab.in:86:2: WARNING: tab in filled text
diff --git a/regress/char/space/trailing-mdoc.in b/regress/char/space/trailing-mdoc.in
index 3cc8dc08..3dcf2356 100644
--- a/regress/char/space/trailing-mdoc.in
+++ b/regress/char/space/trailing-mdoc.in
@@ -1,6 +1,7 @@
-.Dd December 8, 2016
+.\" $OpenBSD: trailing-mdoc.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt SPACE-TRAILING-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm space-trailing-mdoc
.Nd trailing spaces on input lines
diff --git a/regress/char/space/trailing-mdoc.out_ascii b/regress/char/space/trailing-mdoc.out_ascii
index 28c32ed8..eb96a927 100644
--- a/regress/char/space/trailing-mdoc.out_ascii
+++ b/regress/char/space/trailing-mdoc.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
on a text line, on a _m_a_c_r_o line, after a comment
-OpenBSD December 8, 2016 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/space/trailing-mdoc.out_lint b/regress/char/space/trailing-mdoc.out_lint
index b3af772d..701f864a 100644
--- a/regress/char/space/trailing-mdoc.out_lint
+++ b/regress/char/space/trailing-mdoc.out_lint
@@ -1,6 +1,3 @@
-mandoc: trailing-mdoc.in:8:16: WARNING: whitespace at end of input line
-mandoc: trailing-mdoc.in:10:12: WARNING: whitespace at end of input line
-mandoc: trailing-mdoc.in:11:27: WARNING: whitespace at end of input line
-mandoc: trailing-mdoc.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: trailing-mdoc.in:1:5: BASE: Mdocdate missing: Dd December (OpenBSD)
-mandoc: trailing-mdoc.in: BASE: RCS id missing: (OpenBSD)
+mandoc: trailing-mdoc.in:9:16: WARNING: whitespace at end of input line
+mandoc: trailing-mdoc.in:11:12: WARNING: whitespace at end of input line
+mandoc: trailing-mdoc.in:12:27: WARNING: whitespace at end of input line
diff --git a/regress/char/space/zerowidth.in b/regress/char/space/zerowidth.in
index 9d2f3ff2..9c15cae4 100644
--- a/regress/char/space/zerowidth.in
+++ b/regress/char/space/zerowidth.in
@@ -1,4 +1,5 @@
-.TH SPACE-ZEROWIDTH 1 "October 27, 2014" OpenBSD
+.\" $OpenBSD: zerowidth.in,v 1.3 2017/07/04 14:53:23 schwarze Exp $
+.TH SPACE-ZEROWIDTH 1 "October 27, 2014"
.SH NAME
space-zerowidth \- zero width and narrow space characters
.SH DESCRIPTION
diff --git a/regress/char/unicode/ascii.in b/regress/char/unicode/ascii.in
index 66664155..b8e561a8 100644
--- a/regress/char/unicode/ascii.in
+++ b/regress/char/unicode/ascii.in
@@ -1,4 +1,5 @@
-.TH CHAR-UNICODE-ASCII 1 "October 27, 2014" OpenBSD
+.\" $OpenBSD: ascii.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.TH CHAR-UNICODE-ASCII 1 "October 27, 2014"
.SH NAME
char-unicode-ascii \- Unicode characters in the ASCII range
.SH DESCRIPTION
diff --git a/regress/char/unicode/input.in b/regress/char/unicode/input.in
index 15a59f5b..b0d9c7fc 100644
--- a/regress/char/unicode/input.in
+++ b/regress/char/unicode/input.in
Binary files differ
diff --git a/regress/char/unicode/input.out_lint b/regress/char/unicode/input.out_lint
index 5478c27c..e537b4fd 100644
--- a/regress/char/unicode/input.out_lint
+++ b/regress/char/unicode/input.out_lint
@@ -1,82 +1,81 @@
-mandoc: input.in:10:21: ERROR: skipping bad character: 0x0
-mandoc: input.in:11:21: ERROR: skipping bad character: 0x1f
-mandoc: input.in:12:21: ERROR: skipping bad character: 0x7f
-mandoc: input.in:13:7: ERROR: skipping bad character: 0x80
-mandoc: input.in:14:7: ERROR: skipping bad character: 0xbf
-mandoc: input.in:20:15: ERROR: skipping bad character: 0xc0
-mandoc: input.in:20:16: ERROR: skipping bad character: 0x80
-mandoc: input.in:21:15: ERROR: skipping bad character: 0xc1
-mandoc: input.in:21:16: ERROR: skipping bad character: 0xbf
-mandoc: input.in:22:9: ERROR: skipping bad character: 0xc2
-mandoc: input.in:24:11: ERROR: skipping bad character: 0xc2
-mandoc: input.in:31:17: ERROR: skipping bad character: 0xc0
-mandoc: input.in:31:18: ERROR: skipping bad character: 0x80
-mandoc: input.in:31:19: ERROR: skipping bad character: 0x80
-mandoc: input.in:32:17: ERROR: skipping bad character: 0xe0
-mandoc: input.in:32:18: ERROR: skipping bad character: 0x81
-mandoc: input.in:32:19: ERROR: skipping bad character: 0xbf
+mandoc: input.in:11:21: ERROR: skipping bad character: 0x0
+mandoc: input.in:12:21: ERROR: skipping bad character: 0x1f
+mandoc: input.in:13:21: ERROR: skipping bad character: 0x7f
+mandoc: input.in:14:7: ERROR: skipping bad character: 0x80
+mandoc: input.in:15:7: ERROR: skipping bad character: 0xbf
+mandoc: input.in:21:15: ERROR: skipping bad character: 0xc0
+mandoc: input.in:21:16: ERROR: skipping bad character: 0x80
+mandoc: input.in:22:15: ERROR: skipping bad character: 0xc1
+mandoc: input.in:22:16: ERROR: skipping bad character: 0xbf
+mandoc: input.in:23:9: ERROR: skipping bad character: 0xc2
+mandoc: input.in:25:11: ERROR: skipping bad character: 0xc2
+mandoc: input.in:32:17: ERROR: skipping bad character: 0xc0
+mandoc: input.in:32:18: ERROR: skipping bad character: 0x80
+mandoc: input.in:32:19: ERROR: skipping bad character: 0x80
mandoc: input.in:33:17: ERROR: skipping bad character: 0xe0
-mandoc: input.in:33:18: ERROR: skipping bad character: 0x82
-mandoc: input.in:33:19: ERROR: skipping bad character: 0x80
+mandoc: input.in:33:18: ERROR: skipping bad character: 0x81
+mandoc: input.in:33:19: ERROR: skipping bad character: 0xbf
mandoc: input.in:34:17: ERROR: skipping bad character: 0xe0
-mandoc: input.in:34:18: ERROR: skipping bad character: 0x9f
-mandoc: input.in:34:19: ERROR: skipping bad character: 0xbf
-mandoc: input.in:41:25: ERROR: skipping bad character: 0xed
-mandoc: input.in:41:26: ERROR: skipping bad character: 0xa0
-mandoc: input.in:41:27: ERROR: skipping bad character: 0x80
-mandoc: input.in:41:17: WARNING: invalid escape sequence: \[uD800]
+mandoc: input.in:34:18: ERROR: skipping bad character: 0x82
+mandoc: input.in:34:19: ERROR: skipping bad character: 0x80
+mandoc: input.in:35:17: ERROR: skipping bad character: 0xe0
+mandoc: input.in:35:18: ERROR: skipping bad character: 0x9f
+mandoc: input.in:35:19: ERROR: skipping bad character: 0xbf
mandoc: input.in:42:25: ERROR: skipping bad character: 0xed
-mandoc: input.in:42:26: ERROR: skipping bad character: 0xbf
-mandoc: input.in:42:27: ERROR: skipping bad character: 0xbf
-mandoc: input.in:42:17: WARNING: invalid escape sequence: \[uDFFF]
-mandoc: input.in:50:19: ERROR: skipping bad character: 0xf0
-mandoc: input.in:50:20: ERROR: skipping bad character: 0x80
-mandoc: input.in:50:21: ERROR: skipping bad character: 0x80
-mandoc: input.in:50:22: ERROR: skipping bad character: 0x80
+mandoc: input.in:42:26: ERROR: skipping bad character: 0xa0
+mandoc: input.in:42:27: ERROR: skipping bad character: 0x80
+mandoc: input.in:42:17: WARNING: invalid escape sequence: \[uD800]
+mandoc: input.in:43:25: ERROR: skipping bad character: 0xed
+mandoc: input.in:43:26: ERROR: skipping bad character: 0xbf
+mandoc: input.in:43:27: ERROR: skipping bad character: 0xbf
+mandoc: input.in:43:17: WARNING: invalid escape sequence: \[uDFFF]
mandoc: input.in:51:19: ERROR: skipping bad character: 0xf0
mandoc: input.in:51:20: ERROR: skipping bad character: 0x80
-mandoc: input.in:51:21: ERROR: skipping bad character: 0x81
-mandoc: input.in:51:22: ERROR: skipping bad character: 0xbf
+mandoc: input.in:51:21: ERROR: skipping bad character: 0x80
+mandoc: input.in:51:22: ERROR: skipping bad character: 0x80
mandoc: input.in:52:19: ERROR: skipping bad character: 0xf0
mandoc: input.in:52:20: ERROR: skipping bad character: 0x80
-mandoc: input.in:52:21: ERROR: skipping bad character: 0x82
-mandoc: input.in:52:22: ERROR: skipping bad character: 0x80
+mandoc: input.in:52:21: ERROR: skipping bad character: 0x81
+mandoc: input.in:52:22: ERROR: skipping bad character: 0xbf
mandoc: input.in:53:19: ERROR: skipping bad character: 0xf0
mandoc: input.in:53:20: ERROR: skipping bad character: 0x80
-mandoc: input.in:53:21: ERROR: skipping bad character: 0x9f
-mandoc: input.in:53:22: ERROR: skipping bad character: 0xbf
+mandoc: input.in:53:21: ERROR: skipping bad character: 0x82
+mandoc: input.in:53:22: ERROR: skipping bad character: 0x80
mandoc: input.in:54:19: ERROR: skipping bad character: 0xf0
mandoc: input.in:54:20: ERROR: skipping bad character: 0x80
-mandoc: input.in:54:21: ERROR: skipping bad character: 0xa0
-mandoc: input.in:54:22: ERROR: skipping bad character: 0x80
+mandoc: input.in:54:21: ERROR: skipping bad character: 0x9f
+mandoc: input.in:54:22: ERROR: skipping bad character: 0xbf
mandoc: input.in:55:19: ERROR: skipping bad character: 0xf0
-mandoc: input.in:55:20: ERROR: skipping bad character: 0x8f
-mandoc: input.in:55:21: ERROR: skipping bad character: 0xbf
-mandoc: input.in:55:22: ERROR: skipping bad character: 0xbf
-mandoc: input.in:62:31: ERROR: skipping bad character: 0xf4
-mandoc: input.in:62:32: ERROR: skipping bad character: 0x90
-mandoc: input.in:62:33: ERROR: skipping bad character: 0x80
-mandoc: input.in:62:34: ERROR: skipping bad character: 0x80
-mandoc: input.in:62:21: WARNING: invalid escape sequence: \[u110000]
+mandoc: input.in:55:20: ERROR: skipping bad character: 0x80
+mandoc: input.in:55:21: ERROR: skipping bad character: 0xa0
+mandoc: input.in:55:22: ERROR: skipping bad character: 0x80
+mandoc: input.in:56:19: ERROR: skipping bad character: 0xf0
+mandoc: input.in:56:20: ERROR: skipping bad character: 0x8f
+mandoc: input.in:56:21: ERROR: skipping bad character: 0xbf
+mandoc: input.in:56:22: ERROR: skipping bad character: 0xbf
mandoc: input.in:63:31: ERROR: skipping bad character: 0xf4
-mandoc: input.in:63:32: ERROR: skipping bad character: 0xbf
-mandoc: input.in:63:33: ERROR: skipping bad character: 0xbf
-mandoc: input.in:63:34: ERROR: skipping bad character: 0xbf
-mandoc: input.in:63:21: WARNING: invalid escape sequence: \[u13FFFF]
-mandoc: input.in:64:31: ERROR: skipping bad character: 0xf5
-mandoc: input.in:64:32: ERROR: skipping bad character: 0x80
-mandoc: input.in:64:33: ERROR: skipping bad character: 0x80
-mandoc: input.in:64:34: ERROR: skipping bad character: 0x80
-mandoc: input.in:64:21: WARNING: invalid escape sequence: \[u140000]
-mandoc: input.in:65:31: ERROR: skipping bad character: 0xf7
-mandoc: input.in:65:32: ERROR: skipping bad character: 0xbf
-mandoc: input.in:65:33: ERROR: skipping bad character: 0xbf
-mandoc: input.in:65:34: ERROR: skipping bad character: 0xbf
-mandoc: input.in:65:21: WARNING: invalid escape sequence: \[u1FFFFF]
-mandoc: input.in:66:33: ERROR: skipping bad character: 0xf8
-mandoc: input.in:66:34: ERROR: skipping bad character: 0x88
-mandoc: input.in:66:35: ERROR: skipping bad character: 0x80
-mandoc: input.in:66:36: ERROR: skipping bad character: 0x80
-mandoc: input.in:66:37: ERROR: skipping bad character: 0x80
-mandoc: input.in:66:23: WARNING: invalid escape sequence: \[u200000]
-mandoc: input.in: BASE: RCS id missing: (OpenBSD)
+mandoc: input.in:63:32: ERROR: skipping bad character: 0x90
+mandoc: input.in:63:33: ERROR: skipping bad character: 0x80
+mandoc: input.in:63:34: ERROR: skipping bad character: 0x80
+mandoc: input.in:63:21: WARNING: invalid escape sequence: \[u110000]
+mandoc: input.in:64:31: ERROR: skipping bad character: 0xf4
+mandoc: input.in:64:32: ERROR: skipping bad character: 0xbf
+mandoc: input.in:64:33: ERROR: skipping bad character: 0xbf
+mandoc: input.in:64:34: ERROR: skipping bad character: 0xbf
+mandoc: input.in:64:21: WARNING: invalid escape sequence: \[u13FFFF]
+mandoc: input.in:65:31: ERROR: skipping bad character: 0xf5
+mandoc: input.in:65:32: ERROR: skipping bad character: 0x80
+mandoc: input.in:65:33: ERROR: skipping bad character: 0x80
+mandoc: input.in:65:34: ERROR: skipping bad character: 0x80
+mandoc: input.in:65:21: WARNING: invalid escape sequence: \[u140000]
+mandoc: input.in:66:31: ERROR: skipping bad character: 0xf7
+mandoc: input.in:66:32: ERROR: skipping bad character: 0xbf
+mandoc: input.in:66:33: ERROR: skipping bad character: 0xbf
+mandoc: input.in:66:34: ERROR: skipping bad character: 0xbf
+mandoc: input.in:66:21: WARNING: invalid escape sequence: \[u1FFFFF]
+mandoc: input.in:67:33: ERROR: skipping bad character: 0xf8
+mandoc: input.in:67:34: ERROR: skipping bad character: 0x88
+mandoc: input.in:67:35: ERROR: skipping bad character: 0x80
+mandoc: input.in:67:36: ERROR: skipping bad character: 0x80
+mandoc: input.in:67:37: ERROR: skipping bad character: 0x80
+mandoc: input.in:67:23: WARNING: invalid escape sequence: \[u200000]
diff --git a/regress/char/unicode/invalid.in b/regress/char/unicode/invalid.in
index 4c0432bc..0bd3a795 100644
--- a/regress/char/unicode/invalid.in
+++ b/regress/char/unicode/invalid.in
@@ -1,6 +1,7 @@
-.Dd October 28, 2014
+.\" $OpenBSD: invalid.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt CHAR-UNICODE-INVALID 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm char-unicode-invalid
.Nd invalid unicode characters
diff --git a/regress/char/unicode/invalid.out_ascii b/regress/char/unicode/invalid.out_ascii
index c30a7617..a5249e63 100644
--- a/regress/char/unicode/invalid.out_ascii
+++ b/regress/char/unicode/invalid.out_ascii
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
not unicode: >_.|^.=^<
ENDTEST
-OpenBSD October 28, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/unicode/invalid.out_lint b/regress/char/unicode/invalid.out_lint
index 4e698959..baf228fa 100644
--- a/regress/char/unicode/invalid.out_lint
+++ b/regress/char/unicode/invalid.out_lint
@@ -1,12 +1,9 @@
-mandoc: invalid.in:10:20: WARNING: invalid escape sequence: \[u02B]
-mandoc: invalid.in:10:13: WARNING: invalid escape sequence: \[u2B]
-mandoc: invalid.in:12:33: WARNING: invalid escape sequence: \[u000002B]
-mandoc: invalid.in:12:22: WARNING: invalid escape sequence: \[u00002B]
-mandoc: invalid.in:12:12: WARNING: invalid escape sequence: \[u0002B]
-mandoc: invalid.in:13:35: WARNING: invalid escape sequence: \[u1000000]
-mandoc: invalid.in:13:24: WARNING: invalid escape sequence: \[u200000]
-mandoc: invalid.in:13:13: WARNING: invalid escape sequence: \[u110000]
-mandoc: invalid.in:14:20: WARNING: invalid escape sequence: \[u1234g]
-mandoc: invalid.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: invalid.in:1:5: BASE: Mdocdate missing: Dd October (OpenBSD)
-mandoc: invalid.in: BASE: RCS id missing: (OpenBSD)
+mandoc: invalid.in:11:20: WARNING: invalid escape sequence: \[u02B]
+mandoc: invalid.in:11:13: WARNING: invalid escape sequence: \[u2B]
+mandoc: invalid.in:13:33: WARNING: invalid escape sequence: \[u000002B]
+mandoc: invalid.in:13:22: WARNING: invalid escape sequence: \[u00002B]
+mandoc: invalid.in:13:12: WARNING: invalid escape sequence: \[u0002B]
+mandoc: invalid.in:14:35: WARNING: invalid escape sequence: \[u1000000]
+mandoc: invalid.in:14:24: WARNING: invalid escape sequence: \[u200000]
+mandoc: invalid.in:14:13: WARNING: invalid escape sequence: \[u110000]
+mandoc: invalid.in:15:20: WARNING: invalid escape sequence: \[u1234g]
diff --git a/regress/char/unicode/invalid.out_utf8 b/regress/char/unicode/invalid.out_utf8
index ed91d82a..91e120f0 100644
--- a/regress/char/unicode/invalid.out_utf8
+++ b/regress/char/unicode/invalid.out_utf8
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
not unicode: >_.↑.⇑<
ENDTEST
-OpenBSD October 28, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/unicode/latin1.in b/regress/char/unicode/latin1.in
index 54b9ca6e..e9960b7c 100644
--- a/regress/char/unicode/latin1.in
+++ b/regress/char/unicode/latin1.in
@@ -1,4 +1,5 @@
-.TH CHAR-UNICODE-LATIN1 1 "October 27, 2014" OpenBSD
+.\" $OpenBSD: latin1.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.TH CHAR-UNICODE-LATIN1 1 "October 27, 2014"
.SH NAME
char-unicode-latin1 \- Unicode characters in the ISO-8859-1 range
.SH DESCRIPTION
diff --git a/regress/char/unicode/latin1diff.in b/regress/char/unicode/latin1diff.in
index f0e255b5..6455a1ef 100644
--- a/regress/char/unicode/latin1diff.in
+++ b/regress/char/unicode/latin1diff.in
@@ -1,4 +1,5 @@
-.TH CHAR-UNICODE-LATIN1DIFF 1 "October 27, 2014" OpenBSD
+.\" $OpenBSD: latin1diff.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.TH CHAR-UNICODE-LATIN1DIFF 1 "October 27, 2014"
.SH NAME
char-unicode-latin1diff \- Unicode characters in the ISO-8859-1 range
.SH DESCRIPTION
diff --git a/regress/char/unicode/man.in b/regress/char/unicode/man.in
index 56148b72..d5102fd9 100644
--- a/regress/char/unicode/man.in
+++ b/regress/char/unicode/man.in
@@ -1,4 +1,5 @@
-.TH CHAR-UNICODE-MAN 1 "October 13, 2014" OpenBSD
+.\" $OpenBSD: man.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.TH CHAR-UNICODE-MAN 1 "October 13, 2014"
.SH NAME
char-unicode-mdoc \- unicode characters in man code
.SH DESCRIPTION
diff --git a/regress/char/unicode/mdoc.in b/regress/char/unicode/mdoc.in
index 2a7af346..1ad8d7be 100644
--- a/regress/char/unicode/mdoc.in
+++ b/regress/char/unicode/mdoc.in
@@ -1,6 +1,7 @@
-.Dd October 13, 2014
+.\" $OpenBSD: mdoc.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt CHAR-UNICODE-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm char-unicode-mdoc
.Nd unicode characters in mdoc code
diff --git a/regress/char/unicode/mdoc.out_utf8 b/regress/char/unicode/mdoc.out_utf8
index 7b0d13aa..23b47606 100644
--- a/regress/char/unicode/mdoc.out_utf8
+++ b/regress/char/unicode/mdoc.out_utf8
@@ -12,4 +12,4 @@ DDEESSCCRRIIPPTTIIOONN
not really Unicode: up arrows: ↑⇑ = ↑⇑ = ↑⇑
-OpenBSD October 13, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/char/unicode/named.in b/regress/char/unicode/named.in
index c18d4253..cfc87139 100644
--- a/regress/char/unicode/named.in
+++ b/regress/char/unicode/named.in
@@ -1,4 +1,5 @@
-.TH CHAR-UNICODE-NAMED 1 "October 27, 2014" OpenBSD
+.\" $OpenBSD: named.in,v 1.7 2017/07/04 14:53:23 schwarze Exp $
+.TH CHAR-UNICODE-NAMED 1 "October 27, 2014"
.SH NAME
char-unicode-named \- Unicode characters having named escapes
.SH DESCRIPTION
diff --git a/regress/char/unicode/namediff.in b/regress/char/unicode/namediff.in
index 78094b96..7b98650e 100644
--- a/regress/char/unicode/namediff.in
+++ b/regress/char/unicode/namediff.in
@@ -1,4 +1,5 @@
-.TH CHAR-UNICODE-NAMEDIFF 1 "October 27, 2014" OpenBSD
+.\" $OpenBSD: namediff.in,v 1.6 2017/07/04 14:53:23 schwarze Exp $
+.TH CHAR-UNICODE-NAMEDIFF 1 "October 27, 2014"
.SH NAME
char-unicode-namediff \- Unicode characters having named escapes
.SH DESCRIPTION
diff --git a/regress/char/unicode/nogroff.in b/regress/char/unicode/nogroff.in
index 10e5f516..a5265d61 100644
--- a/regress/char/unicode/nogroff.in
+++ b/regress/char/unicode/nogroff.in
@@ -1,4 +1,5 @@
-.TH CHAR-UNICODE-NOGROFF 1 "October 28, 2014" OpenBSD
+.\" $OpenBSD: nogroff.in,v 1.5 2017/07/04 14:53:23 schwarze Exp $
+.TH CHAR-UNICODE-NOGROFF 1 "October 28, 2014"
.SH NAME
char-unicode-nogroff \- characters handled differently by groff
.SH DESCRIPTION
diff --git a/regress/eqn/define/font.in b/regress/eqn/define/font.in
index 627c7e05..0bc98009 100644
--- a/regress/eqn/define/font.in
+++ b/regress/eqn/define/font.in
@@ -1,6 +1,7 @@
-.Dd June 25, 2017
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt DEFINE-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm define-font
.Nd font selection takes place after define resolution
diff --git a/regress/eqn/define/font.out_ascii b/regress/eqn/define/font.out_ascii
index 57199257..3318e343 100644
--- a/regress/eqn/define/font.out_ascii
+++ b/regress/eqn/define/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text sin _x _v_a_l_u_e final text
-OpenBSD June 25, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/define/infinite.in b/regress/eqn/define/infinite.in
index f37602fb..de930fc7 100644
--- a/regress/eqn/define/infinite.in
+++ b/regress/eqn/define/infinite.in
@@ -1,6 +1,7 @@
-.Dd March 11, 2017
+.\" $OpenBSD: infinite.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt DEFINE-INFINITE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm define-infinite
.Nd infinite recursion in define statements
diff --git a/regress/eqn/define/infinite.out_ascii b/regress/eqn/define/infinite.out_ascii
index 772d526b..7219ce5b 100644
--- a/regress/eqn/define/infinite.out_ascii
+++ b/regress/eqn/define/infinite.out_ascii
@@ -12,4 +12,4 @@ DDEESSCCRRIIPPTTIIOONN
trailing position: eol
-OpenBSD March 11, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/define/infinite.out_lint b/regress/eqn/define/infinite.out_lint
index 4c142ecb..43089bb3 100644
--- a/regress/eqn/define/infinite.out_lint
+++ b/regress/eqn/define/infinite.out_lint
@@ -1,7 +1,4 @@
-mandoc: infinite.in:9:2: ERROR: input stack limit exceeded, infinite loop?
-mandoc: infinite.in:15:2: ERROR: input stack limit exceeded, infinite loop?
-mandoc: infinite.in:21:2: ERROR: input stack limit exceeded, infinite loop?
-mandoc: infinite.in:27:2: ERROR: input stack limit exceeded, infinite loop?
-mandoc: infinite.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: infinite.in:1:5: BASE: Mdocdate missing: Dd March (OpenBSD)
-mandoc: infinite.in: BASE: RCS id missing: (OpenBSD)
+mandoc: infinite.in:10:2: ERROR: input stack limit exceeded, infinite loop?
+mandoc: infinite.in:16:2: ERROR: input stack limit exceeded, infinite loop?
+mandoc: infinite.in:22:2: ERROR: input stack limit exceeded, infinite loop?
+mandoc: infinite.in:28:2: ERROR: input stack limit exceeded, infinite loop?
diff --git a/regress/eqn/define/invalid.in b/regress/eqn/define/invalid.in
index aa8bcb8c..50daa35f 100644
--- a/regress/eqn/define/invalid.in
+++ b/regress/eqn/define/invalid.in
@@ -1,6 +1,7 @@
-.Dd January 28, 2015
+.\" $OpenBSD: invalid.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt DEFINE-INVALID 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm define-invalid
.Nd invalid define and undef statements
diff --git a/regress/eqn/define/invalid.out_ascii b/regress/eqn/define/invalid.out_ascii
index 62496650..3f518a75 100644
--- a/regress/eqn/define/invalid.out_ascii
+++ b/regress/eqn/define/invalid.out_ascii
@@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
tdefine without value: eol
-OpenBSD January 28, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/define/invalid.out_lint b/regress/eqn/define/invalid.out_lint
index a2c4f423..1e692176 100644
--- a/regress/eqn/define/invalid.out_lint
+++ b/regress/eqn/define/invalid.out_lint
@@ -1,8 +1,5 @@
-mandoc: invalid.in:9:2: WARNING: skipping empty request: define
-mandoc: invalid.in:15:2: WARNING: skipping empty request: define bruch
-mandoc: invalid.in:21:2: WARNING: skipping empty request: undef
-mandoc: invalid.in:27:2: WARNING: skipping empty request: tdefine
-mandoc: invalid.in:33:2: WARNING: skipping empty request: tdefine
-mandoc: invalid.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: invalid.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: invalid.in: BASE: RCS id missing: (OpenBSD)
+mandoc: invalid.in:10:2: WARNING: skipping empty request: define
+mandoc: invalid.in:16:2: WARNING: skipping empty request: define bruch
+mandoc: invalid.in:22:2: WARNING: skipping empty request: undef
+mandoc: invalid.in:28:2: WARNING: skipping empty request: tdefine
+mandoc: invalid.in:34:2: WARNING: skipping empty request: tdefine
diff --git a/regress/eqn/define/quoted.in b/regress/eqn/define/quoted.in
index a98733f1..35d13b87 100644
--- a/regress/eqn/define/quoted.in
+++ b/regress/eqn/define/quoted.in
@@ -1,6 +1,7 @@
-.Dd June 25, 2017
+.\" $OpenBSD: quoted.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt DEFINE-QUOTED 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm define-quoted
.Nd interaction of the define control statement with quoting
diff --git a/regress/eqn/define/quoted.out_ascii b/regress/eqn/define/quoted.out_ascii
index ed86222f..ad3404bc 100644
--- a/regress/eqn/define/quoted.out_ascii
+++ b/regress/eqn/define/quoted.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text _u_n_q_u_o_t_e_d sin _q_u_o_t_e_d _s_i_n final text
-OpenBSD June 25, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/delim/basic.in b/regress/eqn/delim/basic.in
index 60a09701..8c17e80a 100644
--- a/regress/eqn/delim/basic.in
+++ b/regress/eqn/delim/basic.in
@@ -1,6 +1,7 @@
-.Dd June 26, 2017
+.\" $OpenBSD: basic.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt DELIM-BASIC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm delim-basic
.Nd inline eqn delimiters
diff --git a/regress/eqn/delim/basic.out_ascii b/regress/eqn/delim/basic.out_ascii
index d139aabd..3f317b69 100644
--- a/regress/eqn/delim/basic.out_ascii
+++ b/regress/eqn/delim/basic.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text a inline B y inline <delta> e inline ,C final text
-OpenBSD June 26, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/fromto/basic.in b/regress/eqn/fromto/basic.in
index 5d42605a..d37747f3 100644
--- a/regress/eqn/fromto/basic.in
+++ b/regress/eqn/fromto/basic.in
@@ -1,6 +1,7 @@
-.Dd January 1, 2015
+.\" $OpenBSD: basic.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt FROMTO-BASIC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm fromto-basic
.Nd vertical stacking
diff --git a/regress/eqn/fromto/basic.out_ascii b/regress/eqn/fromto/basic.out_ascii
index f8572579..e4530a15 100644
--- a/regress/eqn/fromto/basic.out_ascii
+++ b/regress/eqn/fromto/basic.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text E_(_i = 1)^oo 1/_i^2 final text
-OpenBSD January 1, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/fromto/noarg.in b/regress/eqn/fromto/noarg.in
index e37d2e93..c10e6dc5 100644
--- a/regress/eqn/fromto/noarg.in
+++ b/regress/eqn/fromto/noarg.in
@@ -1,6 +1,7 @@
-.Dd January 1, 2015
+.\" $OpenBSD: noarg.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt FROMTO-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm fromto-noarg
.Nd vertical stacking lacks final argument
diff --git a/regress/eqn/fromto/noarg.out_ascii b/regress/eqn/fromto/noarg.out_ascii
index 312fc36e..c09dcde2 100644
--- a/regress/eqn/fromto/noarg.out_ascii
+++ b/regress/eqn/fromto/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text _x__a^^ final text
-OpenBSD January 1, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/matrix/basic.in b/regress/eqn/matrix/basic.in
index 09e318b3..c7168d5f 100644
--- a/regress/eqn/matrix/basic.in
+++ b/regress/eqn/matrix/basic.in
@@ -1,6 +1,7 @@
-.Dd October 10, 2014
+.\" $OpenBSD: basic.in,v 1.3 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt MATRIX-BASIC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm matrix-basic
.Nd matrixes in equations
diff --git a/regress/eqn/matrix/basic.out_ascii b/regress/eqn/matrix/basic.out_ascii
index a7a1ba21..21087dee 100644
--- a/regress/eqn/matrix/basic.out_ascii
+++ b/regress/eqn/matrix/basic.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text ((_a_11 _a_21) (_a_12 _a_22)) (_b_1 _b_2) [sin ssiinn] final text
-OpenBSD October 10, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/matrix/empty.in b/regress/eqn/matrix/empty.in
index fda70b2f..e1cfcc6b 100644
--- a/regress/eqn/matrix/empty.in
+++ b/regress/eqn/matrix/empty.in
@@ -1,6 +1,7 @@
-.Dd February 12, 2017
+.\" $OpenBSD: empty.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt MATRIX-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm matrix-empty
.Nd empty matrixes
diff --git a/regress/eqn/matrix/empty.out_ascii b/regress/eqn/matrix/empty.out_ascii
index ca555848..aba8f08c 100644
--- a/regress/eqn/matrix/empty.out_ascii
+++ b/regress/eqn/matrix/empty.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text () () final text
-OpenBSD February 12, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/nullary/roman.in b/regress/eqn/nullary/roman.in
index f808ba7a..9bd77de0 100644
--- a/regress/eqn/nullary/roman.in
+++ b/regress/eqn/nullary/roman.in
@@ -1,6 +1,7 @@
-.Dd June 25, 2017
+.\" $OpenBSD: roman.in,v 1.3 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt NULLARY-ROMAN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm nullary-roman
.Nd equation tokens set in roman font
diff --git a/regress/eqn/nullary/roman.out_ascii b/regress/eqn/nullary/roman.out_ascii
index 7b50dc46..1ae9a78d 100644
--- a/regress/eqn/nullary/roman.out_ascii
+++ b/regress/eqn/nullary/roman.out_ascii
@@ -11,4 +11,4 @@ DDEESSCCRRIIPPTTIIOONN
operations: sin ssiinn -- superstring: _s_i_n_u_s -- composite word: tan = _s_i_n /
_c_o_s -- final text
-OpenBSD June 25, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/nullary/symbol.in b/regress/eqn/nullary/symbol.in
index f43e9e5a..00d614a6 100644
--- a/regress/eqn/nullary/symbol.in
+++ b/regress/eqn/nullary/symbol.in
@@ -1,6 +1,7 @@
-.Dd June 25, 2017
+.\" $OpenBSD: symbol.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt NULLARY-SYMBOL 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm nullary-symbol
.Nd equation tokens for symbols
diff --git a/regress/eqn/nullary/symbol.out_ascii b/regress/eqn/nullary/symbol.out_ascii
index bbb74390..90459c37 100644
--- a/regress/eqn/nullary/symbol.out_ascii
+++ b/regress/eqn/nullary/symbol.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
initial text -- unquoted words: e ' -- quoted words: _e_p_s_i_l_o_n _p_r_i_m_e --
composite word: _e_p_s_i_l_o_n - _p_r_i_m_e -- final text
-OpenBSD June 25, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/nullary/symbol.out_utf8 b/regress/eqn/nullary/symbol.out_utf8
index 7fae3b44..a6ef313a 100644
--- a/regress/eqn/nullary/symbol.out_utf8
+++ b/regress/eqn/nullary/symbol.out_utf8
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
initial text — unquoted words: ε ′ — quoted words: _e_p_s_i_l_o_n _p_r_i_m_e —
composite word: _e_p_s_i_l_o_n - _p_r_i_m_e — final text
-OpenBSD June 25, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/over/noarg.in b/regress/eqn/over/noarg.in
index ac93fcca..bf42749f 100644
--- a/regress/eqn/over/noarg.in
+++ b/regress/eqn/over/noarg.in
@@ -1,6 +1,7 @@
-.Dd January 1, 2015
+.\" $OpenBSD: noarg.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt OVER-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm over-noarg
.Nd fraction operator without arguments
diff --git a/regress/eqn/over/noarg.out_ascii b/regress/eqn/over/noarg.out_ascii
index 4057f6bd..22ceb49e 100644
--- a/regress/eqn/over/noarg.out_ascii
+++ b/regress/eqn/over/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text // final text
-OpenBSD January 1, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/over/noarg.out_lint b/regress/eqn/over/noarg.out_lint
index e6ac320a..de34469c 100644
--- a/regress/eqn/over/noarg.out_lint
+++ b/regress/eqn/over/noarg.out_lint
@@ -1,4 +1 @@
-mandoc: noarg.in:9:2: WARNING: missing eqn box, using "": over
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:10:2: WARNING: missing eqn box, using "": over
diff --git a/regress/eqn/over/precedence.in b/regress/eqn/over/precedence.in
index 2386ff8c..9e1bb7d7 100644
--- a/regress/eqn/over/precedence.in
+++ b/regress/eqn/over/precedence.in
@@ -1,6 +1,7 @@
-.Dd October 10, 2014
+.\" $OpenBSD: precedence.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt OVER-PRECEDENCE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm over-precedence
.Nd precedence of the fraction operator
diff --git a/regress/eqn/over/precedence.out_ascii b/regress/eqn/over/precedence.out_ascii
index 80bec6c2..92529bb4 100644
--- a/regress/eqn/over/precedence.out_ascii
+++ b/regress/eqn/over/precedence.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text 1 + _x + _x^2/2 + _x^3/(2 * 3) final text
-OpenBSD October 10, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/size/basic.in b/regress/eqn/size/basic.in
index af9b20e8..2feda6c6 100644
--- a/regress/eqn/size/basic.in
+++ b/regress/eqn/size/basic.in
@@ -1,6 +1,7 @@
-.Dd October 10, 2014
+.\" $OpenBSD: basic.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt SIZE-BASIC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm size-basic
.Nd font sizes
diff --git a/regress/eqn/size/basic.out_ascii b/regress/eqn/size/basic.out_ascii
index 2f825eaa..c134b34e 100644
--- a/regress/eqn/size/basic.out_ascii
+++ b/regress/eqn/size/basic.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text _x _x _x _x final text
-OpenBSD October 10, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/subsup/combine.in b/regress/eqn/subsup/combine.in
index 1fdedd4e..de27c40c 100644
--- a/regress/eqn/subsup/combine.in
+++ b/regress/eqn/subsup/combine.in
@@ -1,6 +1,7 @@
-.Dd October 10, 2014
+.\" $OpenBSD: combine.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt SUBSUP-COMBINE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm subsup-combine
.Nd combination of subscripts and superscripts
diff --git a/regress/eqn/subsup/combine.out_ascii b/regress/eqn/subsup/combine.out_ascii
index 1eaeb504..8812f6f6 100644
--- a/regress/eqn/subsup/combine.out_ascii
+++ b/regress/eqn/subsup/combine.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text _x_1^2 + _e^_x_2 final text
-OpenBSD October 10, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/subsup/noarg.in b/regress/eqn/subsup/noarg.in
index adc32d8f..0790013d 100644
--- a/regress/eqn/subsup/noarg.in
+++ b/regress/eqn/subsup/noarg.in
@@ -1,6 +1,7 @@
-.Dd January 1, 2015
+.\" $OpenBSD: noarg.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt SUBSUP-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm subsup-noarg
.Nd empty subscripts and superscripts
diff --git a/regress/eqn/subsup/noarg.out_ascii b/regress/eqn/subsup/noarg.out_ascii
index a0e8cbd1..d5b87b24 100644
--- a/regress/eqn/subsup/noarg.out_ascii
+++ b/regress/eqn/subsup/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text _x_1^^ final text
-OpenBSD January 1, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/subsup/sub_group.in b/regress/eqn/subsup/sub_group.in
index 67a2de2b..2f0bf3b8 100644
--- a/regress/eqn/subsup/sub_group.in
+++ b/regress/eqn/subsup/sub_group.in
@@ -1,6 +1,7 @@
-.Dd October 10, 2014
+.\" $OpenBSD: sub_group.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt SUBSUP-SUB_GROUP 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm subsup-sub_group
.Nd grouping of subscripts
diff --git a/regress/eqn/subsup/sub_group.out_ascii b/regress/eqn/subsup/sub_group.out_ascii
index 0ffd31c9..85e3568a 100644
--- a/regress/eqn/subsup/sub_group.out_ascii
+++ b/regress/eqn/subsup/sub_group.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text _x__i + _x__j_1 + (_M__i)__j final text
-OpenBSD October 10, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/unary/bold.in b/regress/eqn/unary/bold.in
index d1d1686d..4854106a 100644
--- a/regress/eqn/unary/bold.in
+++ b/regress/eqn/unary/bold.in
@@ -1,6 +1,7 @@
-.Dd June 26, 2017
+.\" $OpenBSD: bold.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt UNARY-BOLD 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm unary-bold
.Nd font handling in bold boxes
diff --git a/regress/eqn/unary/bold.out_ascii b/regress/eqn/unary/bold.out_ascii
index 01ef870a..c20dc638 100644
--- a/regress/eqn/unary/bold.out_ascii
+++ b/regress/eqn/unary/bold.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text ((sin ssiinn)) final text
-OpenBSD June 26, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/unary/diacrit.in b/regress/eqn/unary/diacrit.in
index bb50774b..00e83cbb 100644
--- a/regress/eqn/unary/diacrit.in
+++ b/regress/eqn/unary/diacrit.in
@@ -1,6 +1,7 @@
-.Dd October 10, 2014
+.\" $OpenBSD: diacrit.in,v 1.2 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt UNARY-DIACRIT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm unary-diacrit
.Nd diacritical marks in equations
diff --git a/regress/eqn/unary/diacrit.out_ascii b/regress/eqn/unary/diacrit.out_ascii
index 1e35a8fc..f2c5b0bb 100644
--- a/regress/eqn/unary/diacrit.out_ascii
+++ b/regress/eqn/unary/diacrit.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text _x. _x" _x^ _x~ _x-> _x<-> (_x + _y) (_x + _y)_ final text
-OpenBSD October 10, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/eqn/unary/sqrt.in b/regress/eqn/unary/sqrt.in
index 2bd4a9f5..41086285 100644
--- a/regress/eqn/unary/sqrt.in
+++ b/regress/eqn/unary/sqrt.in
@@ -1,6 +1,7 @@
-.Dd February 12, 2017
+.\" $OpenBSD: sqrt.in,v 1.4 2017/07/04 14:53:23 schwarze Exp $
+.Dd $Mdocdate$
.Dt UNARY-SQRT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm unary-sqrt
.Nd square root
diff --git a/regress/eqn/unary/sqrt.out_ascii b/regress/eqn/unary/sqrt.out_ascii
index 7aa6778e..607a6013 100644
--- a/regress/eqn/unary/sqrt.out_ascii
+++ b/regress/eqn/unary/sqrt.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text _r = sqrt(_x^2 + _y^2) + sqrt(_a + _b) + sqrt() + sqrt final text
-OpenBSD February 12, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
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
diff --git a/regress/mdoc/Ad/font.in b/regress/mdoc/Ad/font.in
index df84458b..3971e2e1 100644
--- a/regress/mdoc/Ad/font.in
+++ b/regress/mdoc/Ad/font.in
@@ -1,6 +1,7 @@
-.Dd November 20, 2014
+.\" $OpenBSD: font.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt AD-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ad-font
.Nd changing fonts inside the address macro
diff --git a/regress/mdoc/Ad/font.out_ascii b/regress/mdoc/Ad/font.out_ascii
index b86ab465..28ea4f6d 100644
--- a/regress/mdoc/Ad/font.out_ascii
+++ b/regress/mdoc/Ad/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k | _a_f_t_e_r: _p_u_n_c_t_u_a_t_i_o_n bboolldd trailing text
-OpenBSD November 20, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ad/font.out_markdown b/regress/mdoc/Ad/font.out_markdown
index ed3b5901..bff31494 100644
--- a/regress/mdoc/Ad/font.out_markdown
+++ b/regress/mdoc/Ad/font.out_markdown
@@ -10,4 +10,4 @@ normal text
*emphasis**bold**back* | *after*: *punctuation* **bold**
trailing text
-OpenBSD - November 20, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ad/noarg.in b/regress/mdoc/Ad/noarg.in
index b0881dc7..f2194dc9 100644
--- a/regress/mdoc/Ad/noarg.in
+++ b/regress/mdoc/Ad/noarg.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: noarg.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt AD-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ad-noarg
.Nd address macro without an argument
diff --git a/regress/mdoc/Ad/noarg.out_ascii b/regress/mdoc/Ad/noarg.out_ascii
index b0703dd0..24250013 100644
--- a/regress/mdoc/Ad/noarg.out_ascii
+++ b/regress/mdoc/Ad/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with address: _0_x_3_b_c_. no address: end of test document
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ad/noarg.out_lint b/regress/mdoc/Ad/noarg.out_lint
index 9bd90a90..688951b3 100644
--- a/regress/mdoc/Ad/noarg.out_lint
+++ b/regress/mdoc/Ad/noarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: Ad
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: noarg.in:9:10: STYLE: no blank before trailing delimiter: Ad 0x3bc.
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: Ad
+mandoc: noarg.in:10:10: STYLE: no blank before trailing delimiter: Ad 0x3bc.
diff --git a/regress/mdoc/Ad/noarg.out_markdown b/regress/mdoc/Ad/noarg.out_markdown
index 285a9711..26307bb8 100644
--- a/regress/mdoc/Ad/noarg.out_markdown
+++ b/regress/mdoc/Ad/noarg.out_markdown
@@ -11,4 +11,4 @@ with address:
no address:
end of test document
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/An/break.in b/regress/mdoc/An/break.in
index 70f5b1b7..0b653c59 100644
--- a/regress/mdoc/An/break.in
+++ b/regress/mdoc/An/break.in
@@ -1,6 +1,7 @@
-.Dd February 5, 2015
+.\" $OpenBSD: break.in,v 1.7 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt AN-BREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm An-break
.Nd line breaking of the author macro
diff --git a/regress/mdoc/An/break.out_ascii b/regress/mdoc/An/break.out_ascii
index 92cec343..3aeaf53c 100644
--- a/regress/mdoc/An/break.out_ascii
+++ b/regress/mdoc/An/break.out_ascii
@@ -26,4 +26,4 @@ AAUUTTHHOORRSS
inline: Kristaps, Ingo, and Joerg. empty trailing .
-OpenBSD February 5, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/An/break.out_lint b/regress/mdoc/An/break.out_lint
index 7951bc38..1f181e19 100644
--- a/regress/mdoc/An/break.out_lint
+++ b/regress/mdoc/An/break.out_lint
@@ -1,16 +1,13 @@
-mandoc: break.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: break.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: break.in:14:2: WARNING: skipping empty macro: An
-mandoc: break.in:16:2: WARNING: skipping empty macro: An
-mandoc: break.in:18:12: WARNING: skipping duplicate argument: An -nosplit
-mandoc: break.in:18:21: ERROR: skipping excess arguments: An ... bogus
-mandoc: break.in:25:2: WARNING: skipping empty macro: An
-mandoc: break.in:27:2: WARNING: skipping empty macro: An
-mandoc: break.in:36:2: WARNING: skipping empty macro: An
-mandoc: break.in:38:2: WARNING: skipping empty macro: An
-mandoc: break.in:39:14: WARNING: skipping duplicate argument: An -split
-mandoc: break.in:39:21: ERROR: skipping excess arguments: An ... bogus
-mandoc: break.in:43:9: STYLE: no blank before trailing delimiter: An Ingo,
-mandoc: break.in:47:2: WARNING: skipping empty macro: An
-mandoc: break.in:49:2: WARNING: skipping empty macro: An
-mandoc: break.in: BASE: RCS id missing: (OpenBSD)
+mandoc: break.in:15:2: WARNING: skipping empty macro: An
+mandoc: break.in:17:2: WARNING: skipping empty macro: An
+mandoc: break.in:19:12: WARNING: skipping duplicate argument: An -nosplit
+mandoc: break.in:19:21: ERROR: skipping excess arguments: An ... bogus
+mandoc: break.in:26:2: WARNING: skipping empty macro: An
+mandoc: break.in:28:2: WARNING: skipping empty macro: An
+mandoc: break.in:37:2: WARNING: skipping empty macro: An
+mandoc: break.in:39:2: WARNING: skipping empty macro: An
+mandoc: break.in:40:14: WARNING: skipping duplicate argument: An -split
+mandoc: break.in:40:21: ERROR: skipping excess arguments: An ... bogus
+mandoc: break.in:44:9: STYLE: no blank before trailing delimiter: An Ingo,
+mandoc: break.in:48:2: WARNING: skipping empty macro: An
+mandoc: break.in:50:2: WARNING: skipping empty macro: An
diff --git a/regress/mdoc/An/break.out_markdown b/regress/mdoc/An/break.out_markdown
index 8605f693..ce40aa68 100644
--- a/regress/mdoc/An/break.out_markdown
+++ b/regress/mdoc/An/break.out_markdown
@@ -44,4 +44,4 @@ empty
trailing
.
-OpenBSD - February 5, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ap/eos.in b/regress/mdoc/Ap/eos.in
index 032cf72a..d51fdc25 100644
--- a/regress/mdoc/Ap/eos.in
+++ b/regress/mdoc/Ap/eos.in
@@ -1,6 +1,7 @@
-.Dd November 16, 2012
+.\" $OpenBSD: eos.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt AP-EOS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ap-eos
.Nd end of sentence handling after the apostrophe macro
diff --git a/regress/mdoc/Ap/eos.out_ascii b/regress/mdoc/Ap/eos.out_ascii
index c91617c6..dcdb4834 100644
--- a/regress/mdoc/Ap/eos.out_ascii
+++ b/regress/mdoc/Ap/eos.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
The first sentence is Ingo's. The second is Kristaps'. No idea about
the third.
-OpenBSD November 16, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ap/eos.out_markdown b/regress/mdoc/Ap/eos.out_markdown
index cefddcf1..4f0791be 100644
--- a/regress/mdoc/Ap/eos.out_markdown
+++ b/regress/mdoc/Ap/eos.out_markdown
@@ -12,4 +12,4 @@ The second is
Kristaps'.
No idea about the third.
-OpenBSD - November 16, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ap/middle.in b/regress/mdoc/Ap/middle.in
index 05f73b3c..fd23c5a1 100644
--- a/regress/mdoc/Ap/middle.in
+++ b/regress/mdoc/Ap/middle.in
@@ -1,6 +1,7 @@
-.Dd May 21, 2017
+.\" $OpenBSD: middle.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt AP-MIDDLE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ap-middle
.Nd apostrophe in the middle of a macro line
diff --git a/regress/mdoc/Ap/middle.out_ascii b/regress/mdoc/Ap/middle.out_ascii
index 0f687a46..44047bb1 100644
--- a/regress/mdoc/Ap/middle.out_ascii
+++ b/regress/mdoc/Ap/middle.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
punctuation and called macros: bboolldd'(bboolldd
-OpenBSD May 21, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ap/middle.out_markdown b/regress/mdoc/Ap/middle.out_markdown
index dd14e8e5..d97fb608 100644
--- a/regress/mdoc/Ap/middle.out_markdown
+++ b/regress/mdoc/Ap/middle.out_markdown
@@ -11,4 +11,4 @@ mandoc(1)'s
punctuation and called macros:
**bold**'(**bold**
-OpenBSD - May 21, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Aq/author.in b/regress/mdoc/Aq/author.in
index 9e007f58..7d1d7e7b 100644
--- a/regress/mdoc/Aq/author.in
+++ b/regress/mdoc/Aq/author.in
@@ -1,6 +1,7 @@
-.Dd November 19, 2014
+.\" $OpenBSD: author.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt AQ-AUTHOR 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Aq-author
.Nd angle brackets after an author name macro
diff --git a/regress/mdoc/Aq/author.out_ascii b/regress/mdoc/Aq/author.out_ascii
index 80775148..27527e96 100644
--- a/regress/mdoc/Aq/author.out_ascii
+++ b/regress/mdoc/Aq/author.out_ascii
@@ -10,4 +10,4 @@ AAUUTTHHOORRSS
Name <_a_d_d_r>
Name <_a_d_d_r>
-OpenBSD November 19, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Aq/author.out_markdown b/regress/mdoc/Aq/author.out_markdown
index 85803ee7..65df8165 100644
--- a/regress/mdoc/Aq/author.out_markdown
+++ b/regress/mdoc/Aq/author.out_markdown
@@ -13,4 +13,4 @@ Name &lt;[addr](mailto:addr)&gt; Name &lt;[addr](mailto:addr)&gt;
Name &lt;[addr](mailto:addr)&gt;
Name &lt;[addr](mailto:addr)&gt;
-OpenBSD - November 19, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Aq/author.out_utf8 b/regress/mdoc/Aq/author.out_utf8
index 28c4faca..5d5eee2f 100644
--- a/regress/mdoc/Aq/author.out_utf8
+++ b/regress/mdoc/Aq/author.out_utf8
@@ -10,4 +10,4 @@ AAUUTTHHOORRSS
Name <_a_d_d_r>
Name <_a_d_d_r>
-OpenBSD November 19, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Aq/empty.in b/regress/mdoc/Aq/empty.in
index 7b2d1681..8d2e90c1 100644
--- a/regress/mdoc/Aq/empty.in
+++ b/regress/mdoc/Aq/empty.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: empty.in,v 1.5 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt AQ-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Aq-empty
.Nd empty implicit enclosure macros
diff --git a/regress/mdoc/Aq/empty.out_ascii b/regress/mdoc/Aq/empty.out_ascii
index 15ef4e6d..c000c83e 100644
--- a/regress/mdoc/Aq/empty.out_ascii
+++ b/regress/mdoc/Aq/empty.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
An empty <> and a full <user@host:> return path. And another <full:> one
bboolldd.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Aq/empty.out_lint b/regress/mdoc/Aq/empty.out_lint
index 670170ca..d0d8401a 100644
--- a/regress/mdoc/Aq/empty.out_lint
+++ b/regress/mdoc/Aq/empty.out_lint
@@ -1,5 +1,2 @@
-mandoc: empty.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: empty.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: empty.in:11:14: STYLE: no blank before trailing delimiter: Aq user@host:
-mandoc: empty.in:14:9: STYLE: no blank before trailing delimiter: Ao full:
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:12:14: STYLE: no blank before trailing delimiter: Aq user@host:
+mandoc: empty.in:15:9: STYLE: no blank before trailing delimiter: Ao full:
diff --git a/regress/mdoc/Aq/empty.out_markdown b/regress/mdoc/Aq/empty.out_markdown
index 752a723b..2860cc38 100644
--- a/regress/mdoc/Aq/empty.out_markdown
+++ b/regress/mdoc/Aq/empty.out_markdown
@@ -14,4 +14,4 @@ return path.
And another
&lt;full:&gt; one **bold**.
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Aq/empty.out_utf8 b/regress/mdoc/Aq/empty.out_utf8
index cb950c95..ea146d68 100644
--- a/regress/mdoc/Aq/empty.out_utf8
+++ b/regress/mdoc/Aq/empty.out_utf8
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
An empty ⟨⟩ and a full ⟨user@host:⟩ return path. And another ⟨full:⟩ one
bboolldd.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ar/font.in b/regress/mdoc/Ar/font.in
index aa14b7d8..16660a68 100644
--- a/regress/mdoc/Ar/font.in
+++ b/regress/mdoc/Ar/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt AR-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ar-font
.Nd changing fonts inside the argument macro
diff --git a/regress/mdoc/Ar/font.out_ascii b/regress/mdoc/Ar/font.out_ascii
index c30d0078..0bd3323a 100644
--- a/regress/mdoc/Ar/font.out_ascii
+++ b/regress/mdoc/Ar/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ar/font.out_markdown b/regress/mdoc/Ar/font.out_markdown
index 8ee329ef..ab7b3921 100644
--- a/regress/mdoc/Ar/font.out_markdown
+++ b/regress/mdoc/Ar/font.out_markdown
@@ -10,4 +10,4 @@ normal text
*emphasis**bold**back*
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ar/punct.in b/regress/mdoc/Ar/punct.in
index 71abc258..c0cda81a 100644
--- a/regress/mdoc/Ar/punct.in
+++ b/regress/mdoc/Ar/punct.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: punct.in,v 1.6 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt AR-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ar-punct
.Nd punctuation handling by the Ar macro
diff --git a/regress/mdoc/Ar/punct.out_ascii b/regress/mdoc/Ar/punct.out_ascii
index e34b3fdc..96ce0c22 100644
--- a/regress/mdoc/Ar/punct.out_ascii
+++ b/regress/mdoc/Ar/punct.out_ascii
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
missing blank: _a_r_g_.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ar/punct.out_lint b/regress/mdoc/Ar/punct.out_lint
index 252ad176..537ecf9c 100644
--- a/regress/mdoc/Ar/punct.out_lint
+++ b/regress/mdoc/Ar/punct.out_lint
@@ -1,4 +1 @@
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: punct.in:45:8: STYLE: no blank before trailing delimiter: Ar arg.
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:46:8: STYLE: no blank before trailing delimiter: Ar arg.
diff --git a/regress/mdoc/Ar/punct.out_markdown b/regress/mdoc/Ar/punct.out_markdown
index ab03a7b5..21920c60 100644
--- a/regress/mdoc/Ar/punct.out_markdown
+++ b/regress/mdoc/Ar/punct.out_markdown
@@ -45,4 +45,4 @@ quoted punctuation:
missing blank:
*arg.*
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/At/invalid.in b/regress/mdoc/At/invalid.in
index 345529ab..fe3a446f 100644
--- a/regress/mdoc/At/invalid.in
+++ b/regress/mdoc/At/invalid.in
@@ -1,6 +1,7 @@
-.Dd June 30, 2010
+.\" $OpenBSD: invalid.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt AT-INVALID 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm At-invalid
.Nd handling of an invalid AT&T UNIX argument
diff --git a/regress/mdoc/At/invalid.out_ascii b/regress/mdoc/At/invalid.out_ascii
index 13e82d3d..1f63ade5 100644
--- a/regress/mdoc/At/invalid.out_ascii
+++ b/regress/mdoc/At/invalid.out_ascii
@@ -12,4 +12,4 @@ DDEESSCCRRIIPPTTIIOONN
end of file
-OpenBSD June 30, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/At/invalid.out_lint b/regress/mdoc/At/invalid.out_lint
index df67eebe..95542f4a 100644
--- a/regress/mdoc/At/invalid.out_lint
+++ b/regress/mdoc/At/invalid.out_lint
@@ -1,4 +1 @@
-mandoc: invalid.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: invalid.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: invalid.in:15:5: WARNING: unknown AT&T UNIX version: At murks
-mandoc: invalid.in: BASE: RCS id missing: (OpenBSD)
+mandoc: invalid.in:16:5: WARNING: unknown AT&T UNIX version: At murks
diff --git a/regress/mdoc/At/invalid.out_markdown b/regress/mdoc/At/invalid.out_markdown
index d76b8fa6..bbd962f4 100644
--- a/regress/mdoc/At/invalid.out_markdown
+++ b/regress/mdoc/At/invalid.out_markdown
@@ -17,4 +17,4 @@ AT&T UNIX murks **bold**
end of file
-OpenBSD - June 30, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/badargs.in b/regress/mdoc/Bd/badargs.in
index 0d8b3f4d..4caf12d8 100644
--- a/regress/mdoc/Bd/badargs.in
+++ b/regress/mdoc/Bd/badargs.in
@@ -1,6 +1,7 @@
-.Dd October 27, 2015
+.\" $OpenBSD: badargs.in,v 1.6 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-BADARGS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bd-badargs
.Nd display block with bad arguments
diff --git a/regress/mdoc/Bd/badargs.out_ascii b/regress/mdoc/Bd/badargs.out_ascii
index 1a123a6c..2749d98d 100644
--- a/regress/mdoc/Bd/badargs.out_ascii
+++ b/regress/mdoc/Bd/badargs.out_ascii
@@ -27,4 +27,4 @@ DDEESSCCRRIIPPTTIIOONN
ragged offset indent
no argument whatsoever: no argument
-OpenBSD October 27, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/badargs.out_lint b/regress/mdoc/Bd/badargs.out_lint
index a003711e..f1137822 100644
--- a/regress/mdoc/Bd/badargs.out_lint
+++ b/regress/mdoc/Bd/badargs.out_lint
@@ -1,15 +1,12 @@
-mandoc: badargs.in:12:2: ERROR: skipping all arguments: Ed tail argument
-mandoc: badargs.in:19:16: ERROR: skipping excess arguments: Bd ... -bogus
-mandoc: badargs.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badargs.in:1:5: BASE: Mdocdate missing: Dd October (OpenBSD)
-mandoc: badargs.in:9:13: WARNING: empty argument, using 0n: Bd -offset
-mandoc: badargs.in:14:34: WARNING: duplicate argument: Bd -compact
-mandoc: badargs.in:14:43: WARNING: duplicate argument: Bd -offset 6n
-mandoc: badargs.in:19:2: WARNING: missing display type, using -ragged: Bd
-mandoc: badargs.in:24:2: WARNING: skipping duplicate display type: Bd -unfilled
-mandoc: badargs.in:28:2: WARNING: skipping duplicate display type: Bd -ragged
-mandoc: badargs.in:33:2: ERROR: NOT IMPLEMENTED: Bd -file
-mandoc: badargs.in:38:2: ERROR: NOT IMPLEMENTED: Bd -file
-mandoc: badargs.in:43:2: ERROR: NOT IMPLEMENTED: Bd -file
-mandoc: badargs.in:48:2: ERROR: skipping display without arguments: Bd
-mandoc: badargs.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badargs.in:13:2: ERROR: skipping all arguments: Ed tail argument
+mandoc: badargs.in:20:16: ERROR: skipping excess arguments: Bd ... -bogus
+mandoc: badargs.in:10:13: WARNING: empty argument, using 0n: Bd -offset
+mandoc: badargs.in:15:34: WARNING: duplicate argument: Bd -compact
+mandoc: badargs.in:15:43: WARNING: duplicate argument: Bd -offset 6n
+mandoc: badargs.in:20:2: WARNING: missing display type, using -ragged: Bd
+mandoc: badargs.in:25:2: WARNING: skipping duplicate display type: Bd -unfilled
+mandoc: badargs.in:29:2: WARNING: skipping duplicate display type: Bd -ragged
+mandoc: badargs.in:34:2: ERROR: NOT IMPLEMENTED: Bd -file
+mandoc: badargs.in:39:2: ERROR: NOT IMPLEMENTED: Bd -file
+mandoc: badargs.in:44:2: ERROR: NOT IMPLEMENTED: Bd -file
+mandoc: badargs.in:49:2: ERROR: skipping display without arguments: Bd
diff --git a/regress/mdoc/Bd/badargs.out_markdown b/regress/mdoc/Bd/badargs.out_markdown
index 49503d25..93c1bc7d 100644
--- a/regress/mdoc/Bd/badargs.out_markdown
+++ b/regress/mdoc/Bd/badargs.out_markdown
@@ -48,4 +48,4 @@ no argument whatsoever:
no
argument
-OpenBSD - October 27, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/beforeNAME.in b/regress/mdoc/Bd/beforeNAME.in
index f264471f..47a8f19b 100644
--- a/regress/mdoc/Bd/beforeNAME.in
+++ b/regress/mdoc/Bd/beforeNAME.in
@@ -1,6 +1,7 @@
-.Dd July 28, 2014
+.\" $OpenBSD: beforeNAME.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-BEFORENAME 1
-.Os OpenBSD
+.Os
.Bd -centered
Building and Debugging NetBSD Kernels
.br
diff --git a/regress/mdoc/Bd/beforeNAME.out_ascii b/regress/mdoc/Bd/beforeNAME.out_ascii
index 3978941d..8adc7f10 100644
--- a/regress/mdoc/Bd/beforeNAME.out_ascii
+++ b/regress/mdoc/Bd/beforeNAME.out_ascii
@@ -10,4 +10,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
some text
-OpenBSD July 28, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/beforeNAME.out_lint b/regress/mdoc/Bd/beforeNAME.out_lint
index 6173d1b9..39e0b714 100644
--- a/regress/mdoc/Bd/beforeNAME.out_lint
+++ b/regress/mdoc/Bd/beforeNAME.out_lint
@@ -1,4 +1 @@
-mandoc: beforeNAME.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: beforeNAME.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: beforeNAME.in: BASE: RCS id missing: (OpenBSD)
-mandoc: beforeNAME.in:4:2: WARNING: content before first section header: Bd
+mandoc: beforeNAME.in:5:2: WARNING: content before first section header: Bd
diff --git a/regress/mdoc/Bd/beforeNAME.out_markdown b/regress/mdoc/Bd/beforeNAME.out_markdown
index 79b9702a..08d737a8 100644
--- a/regress/mdoc/Bd/beforeNAME.out_markdown
+++ b/regress/mdoc/Bd/beforeNAME.out_markdown
@@ -12,4 +12,4 @@ BD-BEFORENAME(1) - General Commands Manual
some text
-OpenBSD - July 28, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/blank.in b/regress/mdoc/Bd/blank.in
index ca95e6da..29a9e760 100644
--- a/regress/mdoc/Bd/blank.in
+++ b/regress/mdoc/Bd/blank.in
@@ -1,6 +1,7 @@
-.Dd January 2, 2011
+.\" $OpenBSD: blank.in,v 1.6 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-BLANK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bd-blank
.Nd handling of blank lines in literal displays
diff --git a/regress/mdoc/Bd/blank.out_ascii b/regress/mdoc/Bd/blank.out_ascii
index de03e318..116063cd 100644
--- a/regress/mdoc/Bd/blank.out_ascii
+++ b/regress/mdoc/Bd/blank.out_ascii
@@ -26,4 +26,4 @@ DDEESSCCRRIIPPTTIIOONN
An empty one-line literal display:
end of test document
-OpenBSD January 2, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/blank.out_lint b/regress/mdoc/Bd/blank.out_lint
index 27d36d75..f5702bdc 100644
--- a/regress/mdoc/Bd/blank.out_lint
+++ b/regress/mdoc/Bd/blank.out_lint
@@ -1,11 +1,8 @@
-mandoc: blank.in:12:1: WARNING: whitespace at end of input line
-mandoc: blank.in:14:1: WARNING: whitespace at end of input line
-mandoc: blank.in:16:1: WARNING: whitespace at end of input line
-mandoc: blank.in:21:36: WARNING: whitespace at end of input line
-mandoc: blank.in:22:37: WARNING: whitespace at end of input line
-mandoc: blank.in:23:32: WARNING: whitespace at end of input line
-mandoc: blank.in:30:8: WARNING: whitespace at end of input line
-mandoc: blank.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: blank.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: blank.in:30:2: WARNING: empty block: Dl
-mandoc: blank.in: BASE: RCS id missing: (OpenBSD)
+mandoc: blank.in:13:1: WARNING: whitespace at end of input line
+mandoc: blank.in:15:1: WARNING: whitespace at end of input line
+mandoc: blank.in:17:1: WARNING: whitespace at end of input line
+mandoc: blank.in:22:36: WARNING: whitespace at end of input line
+mandoc: blank.in:23:37: WARNING: whitespace at end of input line
+mandoc: blank.in:24:32: WARNING: whitespace at end of input line
+mandoc: blank.in:31:8: WARNING: whitespace at end of input line
+mandoc: blank.in:31:2: WARNING: empty block: Dl
diff --git a/regress/mdoc/Bd/blank.out_markdown b/regress/mdoc/Bd/blank.out_markdown
index 5977c6fb..215d045c 100644
--- a/regress/mdoc/Bd/blank.out_markdown
+++ b/regress/mdoc/Bd/blank.out_markdown
@@ -30,4 +30,4 @@ An empty one-line literal display:
end of test document
-OpenBSD - January 2, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/break.in b/regress/mdoc/Bd/break.in
index 7eaf663a..80d90de5 100644
--- a/regress/mdoc/Bd/break.in
+++ b/regress/mdoc/Bd/break.in
@@ -1,6 +1,7 @@
-.Dd November 10, 2012
+.\" $OpenBSD: break.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-BREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bd-break
.Nd display breaking another block
diff --git a/regress/mdoc/Bd/break.out_ascii b/regress/mdoc/Bd/break.out_ascii
index 42f9eb25..a8579492 100644
--- a/regress/mdoc/Bd/break.out_ascii
+++ b/regress/mdoc/Bd/break.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
before bracket [inside both
after display] after both
-OpenBSD November 10, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/break.out_lint b/regress/mdoc/Bd/break.out_lint
index 444dc789..c11535ac 100644
--- a/regress/mdoc/Bd/break.out_lint
+++ b/regress/mdoc/Bd/break.out_lint
@@ -1,4 +1 @@
-mandoc: break.in:12:2: WARNING: blocks badly nested: Bd breaks Bo
-mandoc: break.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: break.in:1:5: BASE: Mdocdate missing: Dd November (OpenBSD)
-mandoc: break.in: BASE: RCS id missing: (OpenBSD)
+mandoc: break.in:13:2: WARNING: blocks badly nested: Bd breaks Bo
diff --git a/regress/mdoc/Bd/break.out_markdown b/regress/mdoc/Bd/break.out_markdown
index 5a11842d..0d16a9b3 100644
--- a/regress/mdoc/Bd/break.out_markdown
+++ b/regress/mdoc/Bd/break.out_markdown
@@ -14,4 +14,4 @@ before both
after display]
after both
-OpenBSD - November 10, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/broken.in b/regress/mdoc/Bd/broken.in
index b7271a67..b4394af0 100644
--- a/regress/mdoc/Bd/broken.in
+++ b/regress/mdoc/Bd/broken.in
@@ -1,6 +1,7 @@
-.Dd November 10, 2012
+.\" $OpenBSD: broken.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-BROKEN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bd-broken
.Nd display broken by another block
diff --git a/regress/mdoc/Bd/broken.out_ascii b/regress/mdoc/Bd/broken.out_ascii
index 5b24c21b..04025bff 100644
--- a/regress/mdoc/Bd/broken.out_ascii
+++ b/regress/mdoc/Bd/broken.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
inside both] after bracket
-OpenBSD November 10, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/broken.out_lint b/regress/mdoc/Bd/broken.out_lint
index cf20b518..d78bb9f2 100644
--- a/regress/mdoc/Bd/broken.out_lint
+++ b/regress/mdoc/Bd/broken.out_lint
@@ -1,4 +1 @@
-mandoc: broken.in:12:2: WARNING: blocks badly nested: Bo breaks Bd
-mandoc: broken.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: broken.in:1:5: BASE: Mdocdate missing: Dd November (OpenBSD)
-mandoc: broken.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken.in:13:2: WARNING: blocks badly nested: Bo breaks Bd
diff --git a/regress/mdoc/Bd/broken.out_markdown b/regress/mdoc/Bd/broken.out_markdown
index f05b702f..21be03e1 100644
--- a/regress/mdoc/Bd/broken.out_markdown
+++ b/regress/mdoc/Bd/broken.out_markdown
@@ -12,4 +12,4 @@ before both
> inside both]
> after bracket
-OpenBSD - November 10, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/centered.in b/regress/mdoc/Bd/centered.in
index d989ddb8..6d8305c2 100644
--- a/regress/mdoc/Bd/centered.in
+++ b/regress/mdoc/Bd/centered.in
@@ -1,6 +1,7 @@
-.Dd July 28, 2014
+.\" $OpenBSD: centered.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-CENTERED 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bd-centered
.Nd centered display blocks
diff --git a/regress/mdoc/Bd/centered.out_ascii b/regress/mdoc/Bd/centered.out_ascii
index 1f0bb194..9a183b3a 100644
--- a/regress/mdoc/Bd/centered.out_ascii
+++ b/regress/mdoc/Bd/centered.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
second line
following text
-OpenBSD July 28, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/centered.out_markdown b/regress/mdoc/Bd/centered.out_markdown
index 9eaadec1..5eb0b5cc 100644
--- a/regress/mdoc/Bd/centered.out_markdown
+++ b/regress/mdoc/Bd/centered.out_markdown
@@ -13,4 +13,4 @@ preceding text
following text
-OpenBSD - July 28, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/empty.in b/regress/mdoc/Bd/empty.in
index 56506e69..44dbac15 100644
--- a/regress/mdoc/Bd/empty.in
+++ b/regress/mdoc/Bd/empty.in
@@ -1,6 +1,7 @@
-.Dd January 2, 2010
+.\" $OpenBSD: empty.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bd-empty
.Nd empty displays
diff --git a/regress/mdoc/Bd/empty.out_ascii b/regress/mdoc/Bd/empty.out_ascii
index fefe8351..2300e9ef 100644
--- a/regress/mdoc/Bd/empty.out_ascii
+++ b/regress/mdoc/Bd/empty.out_ascii
@@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
end of test document
-OpenBSD January 2, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/empty.out_markdown b/regress/mdoc/Bd/empty.out_markdown
index 6263ccca..7d03b4fa 100644
--- a/regress/mdoc/Bd/empty.out_markdown
+++ b/regress/mdoc/Bd/empty.out_markdown
@@ -16,4 +16,4 @@ An empty unfilled display:
end of test document
-OpenBSD - January 2, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/nested.in b/regress/mdoc/Bd/nested.in
index a5455a61..328fbf1d 100644
--- a/regress/mdoc/Bd/nested.in
+++ b/regress/mdoc/Bd/nested.in
@@ -1,6 +1,7 @@
-.Dd November 18, 2012
+.\" $OpenBSD: nested.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-NESTED 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bd-nested
.Nd nested displays and lists
diff --git a/regress/mdoc/Bd/nested.out_ascii b/regress/mdoc/Bd/nested.out_ascii
index 439611d8..58ee55dd 100644
--- a/regress/mdoc/Bd/nested.out_ascii
+++ b/regress/mdoc/Bd/nested.out_ascii
@@ -26,4 +26,4 @@ DDEESSCCRRIIPPTTIIOONN
inner text (2n)
outer text
-OpenBSD November 18, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/nested.out_lint b/regress/mdoc/Bd/nested.out_lint
index e7efa125..d6f7eda2 100644
--- a/regress/mdoc/Bd/nested.out_lint
+++ b/regress/mdoc/Bd/nested.out_lint
@@ -1,5 +1,2 @@
-mandoc: nested.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: nested.in:1:5: BASE: Mdocdate missing: Dd November (OpenBSD)
-mandoc: nested.in:13:2: WARNING: nested displays are not portable: Bd in Bd
-mandoc: nested.in:24:2: WARNING: nested displays are not portable: Bd in Bd
-mandoc: nested.in: BASE: RCS id missing: (OpenBSD)
+mandoc: nested.in:14:2: WARNING: nested displays are not portable: Bd in Bd
+mandoc: nested.in:25:2: WARNING: nested displays are not portable: Bd in Bd
diff --git a/regress/mdoc/Bd/nested.out_markdown b/regress/mdoc/Bd/nested.out_markdown
index f3fca637..d936b9c0 100644
--- a/regress/mdoc/Bd/nested.out_markdown
+++ b/regress/mdoc/Bd/nested.out_markdown
@@ -43,4 +43,4 @@ tag
> outer text
-OpenBSD - November 18, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/offset-empty.in b/regress/mdoc/Bd/offset-empty.in
index 32f2a593..07cba9b1 100644
--- a/regress/mdoc/Bd/offset-empty.in
+++ b/regress/mdoc/Bd/offset-empty.in
@@ -1,6 +1,7 @@
-.Dd November 20, 2014
+.\" $OpenBSD: offset-empty.in,v 1.6 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-OFFSET-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bd-offset-empty
.Nd no argument specified to Bd offset
diff --git a/regress/mdoc/Bd/offset-empty.out_ascii b/regress/mdoc/Bd/offset-empty.out_ascii
index e4e2659c..db4e0072 100644
--- a/regress/mdoc/Bd/offset-empty.out_ascii
+++ b/regress/mdoc/Bd/offset-empty.out_ascii
@@ -20,4 +20,4 @@ DDEESSCCRRIIPPTTIIOONN
Bd literal offset 78n
-OpenBSD November 20, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/offset-empty.out_markdown b/regress/mdoc/Bd/offset-empty.out_markdown
index f5c06a13..74f0114c 100644
--- a/regress/mdoc/Bd/offset-empty.out_markdown
+++ b/regress/mdoc/Bd/offset-empty.out_markdown
@@ -22,4 +22,4 @@ BD-OFFSET-EMPTY(1) - General Commands Manual
Bd literal offset 78n
-OpenBSD - November 20, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/offset-neg.in b/regress/mdoc/Bd/offset-neg.in
index f1d0a2a1..207d5687 100644
--- a/regress/mdoc/Bd/offset-neg.in
+++ b/regress/mdoc/Bd/offset-neg.in
@@ -1,6 +1,7 @@
-.Dd December 24, 2014
+.\" $OpenBSD: offset-neg.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-INDENT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bd-indent
.Nd indenting display blocks
diff --git a/regress/mdoc/Bd/offset-neg.out_ascii b/regress/mdoc/Bd/offset-neg.out_ascii
index 0ecf61cf..3e2b5109 100644
--- a/regress/mdoc/Bd/offset-neg.out_ascii
+++ b/regress/mdoc/Bd/offset-neg.out_ascii
@@ -18,4 +18,4 @@ DDEESSCCRRIIPPTTIIOONN
outer display
regular text
-OpenBSD December 24, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/offset-neg.out_markdown b/regress/mdoc/Bd/offset-neg.out_markdown
index 60cd9195..017d223b 100644
--- a/regress/mdoc/Bd/offset-neg.out_markdown
+++ b/regress/mdoc/Bd/offset-neg.out_markdown
@@ -24,4 +24,4 @@ regular text
regular text
-OpenBSD - December 24, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/spacing.in b/regress/mdoc/Bd/spacing.in
index 95d89935..4b23da75 100644
--- a/regress/mdoc/Bd/spacing.in
+++ b/regress/mdoc/Bd/spacing.in
@@ -1,6 +1,7 @@
-.Dd July 6, 2012
+.\" $OpenBSD: spacing.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-SPACING 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bd-spacing
.Nd vertical spacing around display blocks
diff --git a/regress/mdoc/Bd/spacing.out_ascii b/regress/mdoc/Bd/spacing.out_ascii
index de8bee5c..8efa8b30 100644
--- a/regress/mdoc/Bd/spacing.out_ascii
+++ b/regress/mdoc/Bd/spacing.out_ascii
@@ -11,4 +11,4 @@ DDEESSCCRRIIPPTTIIOONN
compact display block
following text
-OpenBSD July 6, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/spacing.out_markdown b/regress/mdoc/Bd/spacing.out_markdown
index c87b9616..766dda3b 100644
--- a/regress/mdoc/Bd/spacing.out_markdown
+++ b/regress/mdoc/Bd/spacing.out_markdown
@@ -16,4 +16,4 @@ text between displays
following text
-OpenBSD - July 6, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bd/unclosed.in b/regress/mdoc/Bd/unclosed.in
index 17c2c51d..27430efd 100644
--- a/regress/mdoc/Bd/unclosed.in
+++ b/regress/mdoc/Bd/unclosed.in
@@ -1,6 +1,7 @@
-.Dd July 7, 2014
+.\" $OpenBSD: unclosed.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BD-UNCLOSED 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bd-unclosed
.Nd display still open at the end of the file
diff --git a/regress/mdoc/Bd/unclosed.out_ascii b/regress/mdoc/Bd/unclosed.out_ascii
index edea5b09..429cb6ea 100644
--- a/regress/mdoc/Bd/unclosed.out_ascii
+++ b/regress/mdoc/Bd/unclosed.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
inside display
-OpenBSD July 7, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bd/unclosed.out_lint b/regress/mdoc/Bd/unclosed.out_lint
index 8f26f015..9ec05980 100644
--- a/regress/mdoc/Bd/unclosed.out_lint
+++ b/regress/mdoc/Bd/unclosed.out_lint
@@ -1,4 +1 @@
-mandoc: unclosed.in:9:2: ERROR: appending missing end of block: Bd
-mandoc: unclosed.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: unclosed.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: unclosed.in: BASE: RCS id missing: (OpenBSD)
+mandoc: unclosed.in:10:2: ERROR: appending missing end of block: Bd
diff --git a/regress/mdoc/Bd/unclosed.out_markdown b/regress/mdoc/Bd/unclosed.out_markdown
index 644e5d4a..fbb8fb47 100644
--- a/regress/mdoc/Bd/unclosed.out_markdown
+++ b/regress/mdoc/Bd/unclosed.out_markdown
@@ -10,4 +10,4 @@ before display
> inside display
-OpenBSD - July 7, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bf/badargs.in b/regress/mdoc/Bf/badargs.in
index 7752ae75..3508254b 100644
--- a/regress/mdoc/Bf/badargs.in
+++ b/regress/mdoc/Bf/badargs.in
@@ -1,6 +1,7 @@
-.Dd July 4, 2014
+.\" $OpenBSD: badargs.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BF-BADARGS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bf-badargs
.Nd font blocks with bad arguments
diff --git a/regress/mdoc/Bf/badargs.out_ascii b/regress/mdoc/Bf/badargs.out_ascii
index 8d26ac4b..51a003ab 100644
--- a/regress/mdoc/Bf/badargs.out_ascii
+++ b/regress/mdoc/Bf/badargs.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
normal text _e_m_p_h_a_s_i_s no argument _b_a_c_k _t_o _e_m_p_h_a_s_i_s bad argument _b_a_c_k _t_o
_e_m_p_h_a_s_i_s back to normal
-OpenBSD July 4, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bf/badargs.out_lint b/regress/mdoc/Bf/badargs.out_lint
index 9527afff..0dc79df5 100644
--- a/regress/mdoc/Bf/badargs.out_lint
+++ b/regress/mdoc/Bf/badargs.out_lint
@@ -1,6 +1,3 @@
-mandoc: badargs.in:17:2: ERROR: skipping all arguments: Ef tail argument
-mandoc: badargs.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badargs.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: badargs.in:11:2: WARNING: missing font type, using \fR: Bf
-mandoc: badargs.in:15:5: WARNING: unknown font type, using \fR: Bf badarg
-mandoc: badargs.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badargs.in:18:2: ERROR: skipping all arguments: Ef tail argument
+mandoc: badargs.in:12:2: WARNING: missing font type, using \fR: Bf
+mandoc: badargs.in:16:5: WARNING: unknown font type, using \fR: Bf badarg
diff --git a/regress/mdoc/Bf/break.in b/regress/mdoc/Bf/break.in
index 5a905655..74cd8fe0 100644
--- a/regress/mdoc/Bf/break.in
+++ b/regress/mdoc/Bf/break.in
@@ -1,6 +1,7 @@
-.Dd November 10, 2012
+.\" $OpenBSD: break.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BF-BREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bf-break
.Nd font block breaking another block
diff --git a/regress/mdoc/Bf/break.out_ascii b/regress/mdoc/Bf/break.out_ascii
index 6fcd71cf..c2a08e21 100644
--- a/regress/mdoc/Bf/break.out_ascii
+++ b/regress/mdoc/Bf/break.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
before both _b_e_f_o_r_e _b_r_a_c_k_e_t _[_i_n_s_i_d_e _b_o_t_h after font block] after both
-OpenBSD November 10, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bf/break.out_lint b/regress/mdoc/Bf/break.out_lint
index fff682b8..cabc5065 100644
--- a/regress/mdoc/Bf/break.out_lint
+++ b/regress/mdoc/Bf/break.out_lint
@@ -1,4 +1 @@
-mandoc: break.in:13:2: WARNING: blocks badly nested: Bf breaks Bo
-mandoc: break.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: break.in:1:5: BASE: Mdocdate missing: Dd November (OpenBSD)
-mandoc: break.in: BASE: RCS id missing: (OpenBSD)
+mandoc: break.in:14:2: WARNING: blocks badly nested: Bf breaks Bo
diff --git a/regress/mdoc/Bf/broken.in b/regress/mdoc/Bf/broken.in
index 228e4c5f..8f4612d2 100644
--- a/regress/mdoc/Bf/broken.in
+++ b/regress/mdoc/Bf/broken.in
@@ -1,6 +1,7 @@
-.Dd November 10, 2012
+.\" $OpenBSD: broken.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BF-BROKEN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bf-broken
.Nd font block broken by another block
diff --git a/regress/mdoc/Bf/broken.out_ascii b/regress/mdoc/Bf/broken.out_ascii
index 0320ca95..b24a54a0 100644
--- a/regress/mdoc/Bf/broken.out_ascii
+++ b/regress/mdoc/Bf/broken.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
before both [before font block _i_n_s_i_d_e _b_o_t_h] after bracket after both
-OpenBSD November 10, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bf/broken.out_lint b/regress/mdoc/Bf/broken.out_lint
index dce9a431..74f4c4e1 100644
--- a/regress/mdoc/Bf/broken.out_lint
+++ b/regress/mdoc/Bf/broken.out_lint
@@ -1,4 +1 @@
-mandoc: broken.in:12:2: WARNING: blocks badly nested: Bo breaks Bf
-mandoc: broken.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: broken.in:1:5: BASE: Mdocdate missing: Dd November (OpenBSD)
-mandoc: broken.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken.in:13:2: WARNING: blocks badly nested: Bo breaks Bf
diff --git a/regress/mdoc/Bf/multiargs.in b/regress/mdoc/Bf/multiargs.in
index 31837ec5..58aa87c6 100644
--- a/regress/mdoc/Bf/multiargs.in
+++ b/regress/mdoc/Bf/multiargs.in
@@ -1,6 +1,7 @@
-.Dd July 4, 2014
+.\" $OpenBSD: multiargs.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BF-MULTIARGS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bf-multiargs
.Nd font blocks with multiple arguments
diff --git a/regress/mdoc/Bf/multiargs.out_ascii b/regress/mdoc/Bf/multiargs.out_ascii
index 52b89778..a4ef4348 100644
--- a/regress/mdoc/Bf/multiargs.out_ascii
+++ b/regress/mdoc/Bf/multiargs.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
ssyymmbboolliicc bbaaddaarrgg back to normal SSyy --eemmpphhaassiiss back to normal SSyy EEmm back to
normal SSyy EEmm back to normal
-OpenBSD July 4, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bf/multiargs.out_lint b/regress/mdoc/Bf/multiargs.out_lint
index 738f3911..6e0fa48e 100644
--- a/regress/mdoc/Bf/multiargs.out_lint
+++ b/regress/mdoc/Bf/multiargs.out_lint
@@ -1,8 +1,5 @@
-mandoc: multiargs.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: multiargs.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: multiargs.in:13:15: ERROR: skipping excess arguments: Bf ... Em
-mandoc: multiargs.in:17:15: ERROR: skipping excess arguments: Bf ... badarg
-mandoc: multiargs.in:21:8: ERROR: skipping excess arguments: Bf ... -emphasis
-mandoc: multiargs.in:25:8: ERROR: skipping excess arguments: Bf ... Em
-mandoc: multiargs.in:29:8: ERROR: skipping excess arguments: Bf ... badarg
-mandoc: multiargs.in: BASE: RCS id missing: (OpenBSD)
+mandoc: multiargs.in:14:15: ERROR: skipping excess arguments: Bf ... Em
+mandoc: multiargs.in:18:15: ERROR: skipping excess arguments: Bf ... badarg
+mandoc: multiargs.in:22:8: ERROR: skipping excess arguments: Bf ... -emphasis
+mandoc: multiargs.in:26:8: ERROR: skipping excess arguments: Bf ... Em
+mandoc: multiargs.in:30:8: ERROR: skipping excess arguments: Bf ... badarg
diff --git a/regress/mdoc/Bf/nest.in b/regress/mdoc/Bf/nest.in
index 90de861a..33d91bb7 100644
--- a/regress/mdoc/Bf/nest.in
+++ b/regress/mdoc/Bf/nest.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: nest.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BF-NEST 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bf-nest
.Nd nesting font blocks
diff --git a/regress/mdoc/Bf/nest.out_ascii b/regress/mdoc/Bf/nest.out_ascii
index 117a358d..7abc21cf 100644
--- a/regress/mdoc/Bf/nest.out_ascii
+++ b/regress/mdoc/Bf/nest.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
back to Li _b_a_c_k _t_o _E_m bbaacckk ttoo ssyymmbboolliicc back to literal _b_a_c_k _t_o _e_m_p_h_a_s_i_s
back to normal
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bk/badarg.in b/regress/mdoc/Bk/badarg.in
index c3338e70..00981f17 100644
--- a/regress/mdoc/Bk/badarg.in
+++ b/regress/mdoc/Bk/badarg.in
@@ -1,6 +1,7 @@
-.Dd June 30, 2010
+.\" $OpenBSD: badarg.in,v 1.6 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BK-BADARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bk-badarg
.Nd bad arguments after Bk
diff --git a/regress/mdoc/Bk/badarg.out_ascii b/regress/mdoc/Bk/badarg.out_ascii
index 9303d3f0..e3b49331 100644
--- a/regress/mdoc/Bk/badarg.out_ascii
+++ b/regress/mdoc/Bk/badarg.out_ascii
@@ -22,4 +22,4 @@ SSYYNNOOPPSSIISS
DDEESSCCRRIIPPTTIIOONN
Here is an empty keep: End of test document.
-OpenBSD June 30, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bk/badarg.out_lint b/regress/mdoc/Bk/badarg.out_lint
index e5c58ab8..468ffa2e 100644
--- a/regress/mdoc/Bk/badarg.out_lint
+++ b/regress/mdoc/Bk/badarg.out_lint
@@ -1,9 +1,6 @@
-mandoc: badarg.in:13:5: ERROR: skipping excess arguments: Bk ... -badarg
-mandoc: badarg.in:22:5: ERROR: skipping excess arguments: Bk ... -lines
-mandoc: badarg.in:24:2: ERROR: skipping all arguments: Ek tail argument
-mandoc: badarg.in:31:5: ERROR: skipping excess arguments: Bk ... -line
-mandoc: badarg.in:49:12: ERROR: skipping excess arguments: Bk ... -murks
-mandoc: badarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badarg.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: badarg.in:54:2: WARNING: empty block: Bk
-mandoc: badarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badarg.in:14:5: ERROR: skipping excess arguments: Bk ... -badarg
+mandoc: badarg.in:23:5: ERROR: skipping excess arguments: Bk ... -lines
+mandoc: badarg.in:25:2: ERROR: skipping all arguments: Ek tail argument
+mandoc: badarg.in:32:5: ERROR: skipping excess arguments: Bk ... -line
+mandoc: badarg.in:50:12: ERROR: skipping excess arguments: Bk ... -murks
+mandoc: badarg.in:55:2: WARNING: empty block: Bk
diff --git a/regress/mdoc/Bk/break.in b/regress/mdoc/Bk/break.in
index 7fac6532..562882f7 100644
--- a/regress/mdoc/Bk/break.in
+++ b/regress/mdoc/Bk/break.in
@@ -1,6 +1,7 @@
-.Dd December 25, 2013
+.\" $OpenBSD: break.in,v 1.7 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BK-BREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bk-break
.Nd handling of word keeps
diff --git a/regress/mdoc/Bk/break.out_ascii b/regress/mdoc/Bk/break.out_ascii
index d39d64dc..5eb3ef7d 100644
--- a/regress/mdoc/Bk/break.out_ascii
+++ b/regress/mdoc/Bk/break.out_ascii
@@ -27,4 +27,4 @@ DDEESSCCRRIIPPTTIIOONN
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx(_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x _x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x, _x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x_x)
-OpenBSD December 25, 2013 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bk/broken.in b/regress/mdoc/Bk/broken.in
index baa2651a..6e886235 100644
--- a/regress/mdoc/Bk/broken.in
+++ b/regress/mdoc/Bk/broken.in
@@ -1,6 +1,7 @@
-.Dd February 7, 2015
+.\" $OpenBSD: broken.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BK-BROKEN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bk-broken
.Nd word keep broken by another block
diff --git a/regress/mdoc/Bk/broken.out_ascii b/regress/mdoc/Bk/broken.out_ascii
index 4b7eea7a..6ff56c0c 100644
--- a/regress/mdoc/Bk/broken.out_ascii
+++ b/regress/mdoc/Bk/broken.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
CCAAVVEEAATTSS
next section
-OpenBSD February 7, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bk/broken.out_lint b/regress/mdoc/Bk/broken.out_lint
index 891e8bbc..bb1e2e88 100644
--- a/regress/mdoc/Bk/broken.out_lint
+++ b/regress/mdoc/Bk/broken.out_lint
@@ -1,5 +1,2 @@
-mandoc: broken.in:10:2: ERROR: inserting missing end of block: Sh breaks Bk
-mandoc: broken.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: broken.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: broken.in:9:2: WARNING: empty block: Bk
-mandoc: broken.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken.in:11:2: ERROR: inserting missing end of block: Sh breaks Bk
+mandoc: broken.in:10:2: WARNING: empty block: Bk
diff --git a/regress/mdoc/Bk/inputlines.in b/regress/mdoc/Bk/inputlines.in
index 50db65fb..20cc6958 100644
--- a/regress/mdoc/Bk/inputlines.in
+++ b/regress/mdoc/Bk/inputlines.in
@@ -1,6 +1,7 @@
-.Dd December 24, 2010
+.\" $OpenBSD: inputlines.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BK-INPUTLINES 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bk-inputlines
.Nd effect of input lines breaks on word keeps
diff --git a/regress/mdoc/Bk/inputlines.out_ascii b/regress/mdoc/Bk/inputlines.out_ascii
index 448872f6..de28a507 100644
--- a/regress/mdoc/Bk/inputlines.out_ascii
+++ b/regress/mdoc/Bk/inputlines.out_ascii
@@ -34,4 +34,4 @@ SSYYNNOOPPSSIISS
BBkk--iinnppuuttlliinneess _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x _x [a]
b
-OpenBSD December 24, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bk/lines.in b/regress/mdoc/Bk/lines.in
index 4533242c..bf562798 100644
--- a/regress/mdoc/Bk/lines.in
+++ b/regress/mdoc/Bk/lines.in
@@ -1,6 +1,7 @@
-.Dd April 12, 2010
+.\" $OpenBSD: lines.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BK-LINES 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bk-lines
.Nd handling of line keeps
diff --git a/regress/mdoc/Bk/lines.out_ascii b/regress/mdoc/Bk/lines.out_ascii
index 544804e4..eaab6b5c 100644
--- a/regress/mdoc/Bk/lines.out_ascii
+++ b/regress/mdoc/Bk/lines.out_ascii
@@ -81,4 +81,4 @@ DDEESSCCRRIIPPTTIIOONN
39
40
-OpenBSD April 12, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bk/synopsis.in b/regress/mdoc/Bk/synopsis.in
index 6a29cbe6..aa2db7b1 100644
--- a/regress/mdoc/Bk/synopsis.in
+++ b/regress/mdoc/Bk/synopsis.in
@@ -1,6 +1,7 @@
-.Dd December 25, 2013
+.\" $OpenBSD: synopsis.in,v 1.7 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BK-SYNOPSIS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bk-synopsis
.Nd automatic keeps in the synopsis
diff --git a/regress/mdoc/Bk/synopsis.out_ascii b/regress/mdoc/Bk/synopsis.out_ascii
index 5ace7489..de357716 100644
--- a/regress/mdoc/Bk/synopsis.out_ascii
+++ b/regress/mdoc/Bk/synopsis.out_ascii
@@ -24,4 +24,4 @@ DDEESSCCRRIIPPTTIIOONN
kksshh [--++aabbCCeeffhhiikkllmmnnpprruuvvXXxx] [--++oo _o_p_t_i_o_n] [--cc _s_t_r_i_n_g | --ss | _f_i_l_e [_a_r_g_u_m_e_n_t
_._._.]]
-OpenBSD December 25, 2013 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/badargs.in b/regress/mdoc/Bl/badargs.in
index 9c825b5e..b9aa0914 100644
--- a/regress/mdoc/Bl/badargs.in
+++ b/regress/mdoc/Bl/badargs.in
@@ -1,6 +1,7 @@
-.Dd February 4, 2015
+.\" $OpenBSD: badargs.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-BADARGS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-badargs
.Nd list with bad arguments
diff --git a/regress/mdoc/Bl/badargs.out_ascii b/regress/mdoc/Bl/badargs.out_ascii
index ad1707b1..16d99fb0 100644
--- a/regress/mdoc/Bl/badargs.out_ascii
+++ b/regress/mdoc/Bl/badargs.out_ascii
@@ -40,4 +40,4 @@ DDEESSCCRRIIPPTTIIOONN
double arguments:
last wins
-OpenBSD February 4, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/badargs.out_lint b/regress/mdoc/Bl/badargs.out_lint
index e770de4e..8d51123f 100644
--- a/regress/mdoc/Bl/badargs.out_lint
+++ b/regress/mdoc/Bl/badargs.out_lint
@@ -1,21 +1,18 @@
-mandoc: badargs.in:78:2: ERROR: skipping all arguments: El tail argument
-mandoc: badargs.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badargs.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: badargs.in:9:13: WARNING: empty argument, using 0n: Bl -offset
-mandoc: badargs.in:14:13: WARNING: empty argument, using 0n: Bl -width
-mandoc: badargs.in:18:11: WARNING: empty argument, using 0n: Bl -width
-mandoc: badargs.in:27:13: WARNING: empty argument, using 0n: Bl -width
-mandoc: badargs.in:31:11: WARNING: empty argument, using 0n: Bl -width
-mandoc: badargs.in:35:10: WARNING: empty argument, using 0n: Bl -width
-mandoc: badargs.in:41:2: WARNING: skipping duplicate list type: Bl -enum
-mandoc: badargs.in:45:2: WARNING: skipping duplicate list type: Bl -bullet
-mandoc: badargs.in:50:13: ERROR: skipping excess arguments: Bl ... -bogus
-mandoc: badargs.in:54:11: ERROR: skipping excess arguments: Bl ... -bogus
-mandoc: badargs.in:58:12: ERROR: skipping excess arguments: Bl ... -bogus
-mandoc: badargs.in:62:11: ERROR: skipping excess arguments: Bl ... -bogus
-mandoc: badargs.in:66:12: ERROR: skipping excess arguments: Bl ... -bogus
-mandoc: badargs.in:70:20: ERROR: skipping excess arguments: Bl ... -bogus
-mandoc: badargs.in:75:42: WARNING: duplicate argument: Bl -compact
-mandoc: badargs.in:75:51: WARNING: duplicate argument: Bl -offset 2n
-mandoc: badargs.in:75:62: WARNING: duplicate argument: Bl -width 6n
-mandoc: badargs.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badargs.in:79:2: ERROR: skipping all arguments: El tail argument
+mandoc: badargs.in:10:13: WARNING: empty argument, using 0n: Bl -offset
+mandoc: badargs.in:15:13: WARNING: empty argument, using 0n: Bl -width
+mandoc: badargs.in:19:11: WARNING: empty argument, using 0n: Bl -width
+mandoc: badargs.in:28:13: WARNING: empty argument, using 0n: Bl -width
+mandoc: badargs.in:32:11: WARNING: empty argument, using 0n: Bl -width
+mandoc: badargs.in:36:10: WARNING: empty argument, using 0n: Bl -width
+mandoc: badargs.in:42:2: WARNING: skipping duplicate list type: Bl -enum
+mandoc: badargs.in:46:2: WARNING: skipping duplicate list type: Bl -bullet
+mandoc: badargs.in:51:13: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:55:11: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:59:12: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:63:11: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:67:12: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:71:20: ERROR: skipping excess arguments: Bl ... -bogus
+mandoc: badargs.in:76:42: WARNING: duplicate argument: Bl -compact
+mandoc: badargs.in:76:51: WARNING: duplicate argument: Bl -offset 2n
+mandoc: badargs.in:76:62: WARNING: duplicate argument: Bl -width 6n
diff --git a/regress/mdoc/Bl/badargs.out_markdown b/regress/mdoc/Bl/badargs.out_markdown
index 474364d3..624a870c 100644
--- a/regress/mdoc/Bl/badargs.out_markdown
+++ b/regress/mdoc/Bl/badargs.out_markdown
@@ -57,4 +57,4 @@ last
> wins
-OpenBSD - February 4, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/bareIt.in b/regress/mdoc/Bl/bareIt.in
index ad43c4bf..536ca122 100644
--- a/regress/mdoc/Bl/bareIt.in
+++ b/regress/mdoc/Bl/bareIt.in
@@ -1,6 +1,7 @@
-.Dd August 16, 2014
+.\" $OpenBSD: bareIt.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-BAREIT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-bareIt
.Nd item macro outside list
diff --git a/regress/mdoc/Bl/bareIt.out_ascii b/regress/mdoc/Bl/bareIt.out_ascii
index 9c625c74..f93bb382 100644
--- a/regress/mdoc/Bl/bareIt.out_ascii
+++ b/regress/mdoc/Bl/bareIt.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
-- item
final text
-OpenBSD August 16, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/bareIt.out_lint b/regress/mdoc/Bl/bareIt.out_lint
index 840a893d..b6a42654 100644
--- a/regress/mdoc/Bl/bareIt.out_lint
+++ b/regress/mdoc/Bl/bareIt.out_lint
@@ -1,6 +1,3 @@
-mandoc: bareIt.in:9:2: ERROR: skipping item outside list: It argument
-mandoc: bareIt.in:14:2: ERROR: skipping item outside list: It argument
-mandoc: bareIt.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: bareIt.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: bareIt.in:9:2: WARNING: skipping paragraph macro: br before Bl
-mandoc: bareIt.in: BASE: RCS id missing: (OpenBSD)
+mandoc: bareIt.in:10:2: ERROR: skipping item outside list: It argument
+mandoc: bareIt.in:15:2: ERROR: skipping item outside list: It argument
+mandoc: bareIt.in:10:2: WARNING: skipping paragraph macro: br before Bl
diff --git a/regress/mdoc/Bl/bareIt.out_markdown b/regress/mdoc/Bl/bareIt.out_markdown
index f1280770..ab90795e 100644
--- a/regress/mdoc/Bl/bareIt.out_markdown
+++ b/regress/mdoc/Bl/bareIt.out_markdown
@@ -12,4 +12,4 @@ initial text
final text
-OpenBSD - August 16, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/bareTa.in b/regress/mdoc/Bl/bareTa.in
index 12eaf45e..28a1315b 100644
--- a/regress/mdoc/Bl/bareTa.in
+++ b/regress/mdoc/Bl/bareTa.in
@@ -1,6 +1,7 @@
-.Dd November 12, 2012
+.\" $OpenBSD: bareTa.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt TA-BARE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ta-bare
.Nd bare tabular column macro
diff --git a/regress/mdoc/Bl/bareTa.out_ascii b/regress/mdoc/Bl/bareTa.out_ascii
index 831ffee8..cc55a94c 100644
--- a/regress/mdoc/Bl/bareTa.out_ascii
+++ b/regress/mdoc/Bl/bareTa.out_ascii
@@ -15,4 +15,4 @@ DDEESSCCRRIIPPTTIIOONN
a b
final text
-OpenBSD November 12, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/bareTa.out_lint b/regress/mdoc/Bl/bareTa.out_lint
index 3c33f29c..62cb3afc 100644
--- a/regress/mdoc/Bl/bareTa.out_lint
+++ b/regress/mdoc/Bl/bareTa.out_lint
@@ -1,8 +1,5 @@
-mandoc: bareTa.in:9:2: ERROR: skipping column outside column list: Ta
-mandoc: bareTa.in:13:2: ERROR: skipping column outside column list: Ta
-mandoc: bareTa.in:18:5: ERROR: skipping column outside column list: Ta
-mandoc: bareTa.in:25:2: ERROR: skipping item outside list: It ignored arguments
-mandoc: bareTa.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: bareTa.in:1:5: BASE: Mdocdate missing: Dd November (OpenBSD)
-mandoc: bareTa.in:18:2: ERROR: skipping all arguments: It ignored arguments
-mandoc: bareTa.in: BASE: RCS id missing: (OpenBSD)
+mandoc: bareTa.in:10:2: ERROR: skipping column outside column list: Ta
+mandoc: bareTa.in:14:2: ERROR: skipping column outside column list: Ta
+mandoc: bareTa.in:19:5: ERROR: skipping column outside column list: Ta
+mandoc: bareTa.in:26:2: ERROR: skipping item outside list: It ignored arguments
+mandoc: bareTa.in:19:2: ERROR: skipping all arguments: It ignored arguments
diff --git a/regress/mdoc/Bl/bareTa.out_markdown b/regress/mdoc/Bl/bareTa.out_markdown
index d2dd7129..c27ad8ea 100644
--- a/regress/mdoc/Bl/bareTa.out_markdown
+++ b/regress/mdoc/Bl/bareTa.out_markdown
@@ -21,4 +21,4 @@ middle text
final text
-OpenBSD - November 12, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/break.in b/regress/mdoc/Bl/break.in
index 3246fdc7..95a6d92e 100644
--- a/regress/mdoc/Bl/break.in
+++ b/regress/mdoc/Bl/break.in
@@ -1,6 +1,7 @@
-.Dd August 20, 2016
+.\" $OpenBSD: break.in,v 1.7 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-BREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-break
.Nd list breaking another block
diff --git a/regress/mdoc/Bl/break.out_ascii b/regress/mdoc/Bl/break.out_ascii
index 692711c4..35dc7115 100644
--- a/regress/mdoc/Bl/break.out_ascii
+++ b/regress/mdoc/Bl/break.out_ascii
@@ -46,4 +46,4 @@ CCAAVVEEAATTSS
BBUUGGSS
1.
-OpenBSD August 20, 2016 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/break.out_lint b/regress/mdoc/Bl/break.out_lint
index 5a4e5ff0..6ecc78b6 100644
--- a/regress/mdoc/Bl/break.out_lint
+++ b/regress/mdoc/Bl/break.out_lint
@@ -1,21 +1,18 @@
-mandoc: break.in:13:2: WARNING: blocks badly nested: Bl breaks Bo
-mandoc: break.in:21:2: WARNING: blocks badly nested: Bl breaks Bo
-mandoc: break.in:22:2: ERROR: skipping item outside list: It
-mandoc: break.in:32:2: WARNING: blocks badly nested: Bl breaks Bd
-mandoc: break.in:41:2: WARNING: blocks badly nested: Bl breaks Bd
-mandoc: break.in:42:2: ERROR: skipping item outside list: It
-mandoc: break.in:53:2: WARNING: blocks badly nested: Bl breaks Bd
-mandoc: break.in:56:2: WARNING: blocks badly nested: Bl breaks Bd
-mandoc: break.in:58:2: ERROR: inserting missing end of block: Sh breaks Bd
-mandoc: break.in:63:2: WARNING: blocks badly nested: Bl breaks Bd
-mandoc: break.in:64:2: ERROR: skipping column outside column list: Ta
-mandoc: break.in:71:2: WARNING: blocks badly nested: Bl breaks Bo
-mandoc: break.in:73:2: ERROR: inserting missing end of block: Sh breaks Bo
-mandoc: break.in:76:2: WARNING: blocks badly nested: Bl breaks Bo
-mandoc: break.in:75:25: ERROR: appending missing end of block: Bo
-mandoc: break.in:74:2: ERROR: appending missing end of block: Bl
-mandoc: break.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: break.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: break.in:75:2: WARNING: empty list item: Bl -enum It
-mandoc: break.in:75:2: ERROR: skipping all arguments: It before broken block
-mandoc: break.in: BASE: RCS id missing: (OpenBSD)
+mandoc: break.in:14:2: WARNING: blocks badly nested: Bl breaks Bo
+mandoc: break.in:22:2: WARNING: blocks badly nested: Bl breaks Bo
+mandoc: break.in:23:2: ERROR: skipping item outside list: It
+mandoc: break.in:33:2: WARNING: blocks badly nested: Bl breaks Bd
+mandoc: break.in:42:2: WARNING: blocks badly nested: Bl breaks Bd
+mandoc: break.in:43:2: ERROR: skipping item outside list: It
+mandoc: break.in:54:2: WARNING: blocks badly nested: Bl breaks Bd
+mandoc: break.in:57:2: WARNING: blocks badly nested: Bl breaks Bd
+mandoc: break.in:59:2: ERROR: inserting missing end of block: Sh breaks Bd
+mandoc: break.in:64:2: WARNING: blocks badly nested: Bl breaks Bd
+mandoc: break.in:65:2: ERROR: skipping column outside column list: Ta
+mandoc: break.in:72:2: WARNING: blocks badly nested: Bl breaks Bo
+mandoc: break.in:74:2: ERROR: inserting missing end of block: Sh breaks Bo
+mandoc: break.in:77:2: WARNING: blocks badly nested: Bl breaks Bo
+mandoc: break.in:76:25: ERROR: appending missing end of block: Bo
+mandoc: break.in:75:2: ERROR: appending missing end of block: Bl
+mandoc: break.in:76:2: WARNING: empty list item: Bl -enum It
+mandoc: break.in:76:2: ERROR: skipping all arguments: It before broken block
diff --git a/regress/mdoc/Bl/breakingIt.in b/regress/mdoc/Bl/breakingIt.in
index 6e75fcf4..21d37d49 100644
--- a/regress/mdoc/Bl/breakingIt.in
+++ b/regress/mdoc/Bl/breakingIt.in
@@ -1,6 +1,7 @@
-.Dd February 3, 2015
+.\" $OpenBSD: breakingIt.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-BREAKINGIT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-breakingIt
.Nd items breaking other blocks
diff --git a/regress/mdoc/Bl/breakingIt.out_ascii b/regress/mdoc/Bl/breakingIt.out_ascii
index 9c8fd722..447ceb81 100644
--- a/regress/mdoc/Bl/breakingIt.out_ascii
+++ b/regress/mdoc/Bl/breakingIt.out_ascii
@@ -44,4 +44,4 @@ DDEESSCCRRIIPPTTIIOONN
++oo Bullet point.
-OpenBSD February 3, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/breakingIt.out_lint b/regress/mdoc/Bl/breakingIt.out_lint
index f98bb780..8d8259ef 100644
--- a/regress/mdoc/Bl/breakingIt.out_lint
+++ b/regress/mdoc/Bl/breakingIt.out_lint
@@ -1,19 +1,16 @@
-mandoc: breakingIt.in:13:2: ERROR: inserting missing end of block: It breaks Ao
-mandoc: breakingIt.in:20:2: ERROR: inserting missing end of block: It breaks Ao
-mandoc: breakingIt.in:28:2: ERROR: inserting missing end of block: It breaks Ao
-mandoc: breakingIt.in:36:2: ERROR: inserting missing end of block: It breaks Ao
-mandoc: breakingIt.in:44:2: ERROR: inserting missing end of block: It breaks Bd
-mandoc: breakingIt.in:51:2: ERROR: inserting missing end of block: It breaks Bd
-mandoc: breakingIt.in:59:2: ERROR: inserting missing end of block: It breaks Bd
-mandoc: breakingIt.in:67:2: ERROR: inserting missing end of block: It breaks Bd
-mandoc: breakingIt.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: breakingIt.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: breakingIt.in:10:1: WARNING: moving content out of list: text
-mandoc: breakingIt.in:11:2: WARNING: moving content out of list: Ao
-mandoc: breakingIt.in:17:1: WARNING: moving content out of list: text
-mandoc: breakingIt.in:18:2: WARNING: moving content out of list: Ao
-mandoc: breakingIt.in:41:1: WARNING: moving content out of list: text
-mandoc: breakingIt.in:42:2: WARNING: moving content out of list: Bd
-mandoc: breakingIt.in:48:1: WARNING: moving content out of list: text
-mandoc: breakingIt.in:49:2: WARNING: moving content out of list: Bd
-mandoc: breakingIt.in: BASE: RCS id missing: (OpenBSD)
+mandoc: breakingIt.in:14:2: ERROR: inserting missing end of block: It breaks Ao
+mandoc: breakingIt.in:21:2: ERROR: inserting missing end of block: It breaks Ao
+mandoc: breakingIt.in:29:2: ERROR: inserting missing end of block: It breaks Ao
+mandoc: breakingIt.in:37:2: ERROR: inserting missing end of block: It breaks Ao
+mandoc: breakingIt.in:45:2: ERROR: inserting missing end of block: It breaks Bd
+mandoc: breakingIt.in:52:2: ERROR: inserting missing end of block: It breaks Bd
+mandoc: breakingIt.in:60:2: ERROR: inserting missing end of block: It breaks Bd
+mandoc: breakingIt.in:68:2: ERROR: inserting missing end of block: It breaks Bd
+mandoc: breakingIt.in:11:1: WARNING: moving content out of list: text
+mandoc: breakingIt.in:12:2: WARNING: moving content out of list: Ao
+mandoc: breakingIt.in:18:1: WARNING: moving content out of list: text
+mandoc: breakingIt.in:19:2: WARNING: moving content out of list: Ao
+mandoc: breakingIt.in:42:1: WARNING: moving content out of list: text
+mandoc: breakingIt.in:43:2: WARNING: moving content out of list: Bd
+mandoc: breakingIt.in:49:1: WARNING: moving content out of list: text
+mandoc: breakingIt.in:50:2: WARNING: moving content out of list: Bd
diff --git a/regress/mdoc/Bl/breakingIt.out_markdown b/regress/mdoc/Bl/breakingIt.out_markdown
index 5739522d..83b9aa12 100644
--- a/regress/mdoc/Bl/breakingIt.out_markdown
+++ b/regress/mdoc/Bl/breakingIt.out_markdown
@@ -66,4 +66,4 @@ tag2
* Bullet point.
-OpenBSD - February 3, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/breakingTa.in b/regress/mdoc/Bl/breakingTa.in
index 80192b6c..f4523fec 100644
--- a/regress/mdoc/Bl/breakingTa.in
+++ b/regress/mdoc/Bl/breakingTa.in
@@ -1,6 +1,7 @@
-.Dd February 11, 2017
+.\" $OpenBSD: breakingTa.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-BREAKINGTA 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-breakingTa
.Nd tab macro breaking a block
diff --git a/regress/mdoc/Bl/breakingTa.out_ascii b/regress/mdoc/Bl/breakingTa.out_ascii
index 9a0d48aa..a56c1a99 100644
--- a/regress/mdoc/Bl/breakingTa.out_ascii
+++ b/regress/mdoc/Bl/breakingTa.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
it <aq> ta [bo bc] (pq)
final text
-OpenBSD February 11, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/breakingTa.out_markdown b/regress/mdoc/Bl/breakingTa.out_markdown
index 64cdc72d..d3f5422e 100644
--- a/regress/mdoc/Bl/breakingTa.out_markdown
+++ b/regress/mdoc/Bl/breakingTa.out_markdown
@@ -12,4 +12,4 @@ initial text
final text
-OpenBSD - February 11, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/broken.in b/regress/mdoc/Bl/broken.in
index b2cd81e8..d4646681 100644
--- a/regress/mdoc/Bl/broken.in
+++ b/regress/mdoc/Bl/broken.in
@@ -1,6 +1,7 @@
-.Dd February 12, 2015
+.\" $OpenBSD: broken.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-BROKEN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-broken
.Nd list broken by another block
diff --git a/regress/mdoc/Bl/broken.out_ascii b/regress/mdoc/Bl/broken.out_ascii
index 5e6ae847..b72a36fb 100644
--- a/regress/mdoc/Bl/broken.out_ascii
+++ b/regress/mdoc/Bl/broken.out_ascii
@@ -16,4 +16,4 @@ DDEESSCCRRIIPPTTIIOONN
2. next item
after list
-OpenBSD February 12, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/broken.out_lint b/regress/mdoc/Bl/broken.out_lint
index 9b28e561..b0484af7 100644
--- a/regress/mdoc/Bl/broken.out_lint
+++ b/regress/mdoc/Bl/broken.out_lint
@@ -1,6 +1,3 @@
-mandoc: broken.in:13:2: WARNING: blocks badly nested: Bo breaks Bl
-mandoc: broken.in:23:2: WARNING: blocks badly nested: Bo breaks Bd
-mandoc: broken.in:25:2: ERROR: inserting missing end of block: It breaks Bd
-mandoc: broken.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: broken.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: broken.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken.in:14:2: WARNING: blocks badly nested: Bo breaks Bl
+mandoc: broken.in:24:2: WARNING: blocks badly nested: Bo breaks Bd
+mandoc: broken.in:26:2: ERROR: inserting missing end of block: It breaks Bd
diff --git a/regress/mdoc/Bl/broken.out_markdown b/regress/mdoc/Bl/broken.out_markdown
index fb34a052..d581fc29 100644
--- a/regress/mdoc/Bl/broken.out_markdown
+++ b/regress/mdoc/Bl/broken.out_markdown
@@ -24,4 +24,4 @@ after list
after list
-OpenBSD - February 12, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/bullet.in b/regress/mdoc/Bl/bullet.in
index e189df27..22acfac7 100644
--- a/regress/mdoc/Bl/bullet.in
+++ b/regress/mdoc/Bl/bullet.in
@@ -1,6 +1,7 @@
-.Dd December 25, 2014
+.\" $OpenBSD: bullet.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-BULLET 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-bullet
.Nd bullet lists
diff --git a/regress/mdoc/Bl/bullet.out_ascii b/regress/mdoc/Bl/bullet.out_ascii
index e188f799..0db327b3 100644
--- a/regress/mdoc/Bl/bullet.out_ascii
+++ b/regress/mdoc/Bl/bullet.out_ascii
@@ -64,4 +64,4 @@ DDEESSCCRRIIPPTTIIOONN
++oo x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
x x x x x
-OpenBSD December 25, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/bullet.out_markdown b/regress/mdoc/Bl/bullet.out_markdown
index 25febb9b..c500ecaf 100644
--- a/regress/mdoc/Bl/bullet.out_markdown
+++ b/regress/mdoc/Bl/bullet.out_markdown
@@ -43,4 +43,4 @@ BL-BULLET(1) - General Commands Manual
* x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
* x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
-OpenBSD - December 25, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/colNoIt.in b/regress/mdoc/Bl/colNoIt.in
index 7c80cf93..cca36b34 100644
--- a/regress/mdoc/Bl/colNoIt.in
+++ b/regress/mdoc/Bl/colNoIt.in
@@ -1,6 +1,7 @@
-.Dd August 20, 2016
+.\" $OpenBSD: colNoIt.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-COLNOIT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-colNoIt
.Nd column lists without item macros
diff --git a/regress/mdoc/Bl/colNoIt.out_ascii b/regress/mdoc/Bl/colNoIt.out_ascii
index e61c3334..69152adc 100644
--- a/regress/mdoc/Bl/colNoIt.out_ascii
+++ b/regress/mdoc/Bl/colNoIt.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
a b
c d
-OpenBSD August 20, 2016 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/colNoIt.out_markdown b/regress/mdoc/Bl/colNoIt.out_markdown
index d7c9004d..3c98fab7 100644
--- a/regress/mdoc/Bl/colNoIt.out_markdown
+++ b/regress/mdoc/Bl/colNoIt.out_markdown
@@ -12,4 +12,4 @@ BL-COLNOIT(1) - General Commands Manual
a b
c d
-OpenBSD - August 20, 2016
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/column.in b/regress/mdoc/Bl/column.in
index 5f059a8c..93d0b495 100644
--- a/regress/mdoc/Bl/column.in
+++ b/regress/mdoc/Bl/column.in
@@ -1,6 +1,7 @@
-.Dd October 14, 2015
+.\" $OpenBSD: column.in,v 1.10 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-COLUMN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-column
.Nd lists with multiple columns
diff --git a/regress/mdoc/Bl/column.out_ascii b/regress/mdoc/Bl/column.out_ascii
index a7c07d32..732cf2d9 100644
--- a/regress/mdoc/Bl/column.out_ascii
+++ b/regress/mdoc/Bl/column.out_ascii
@@ -71,4 +71,4 @@ DDEESSCCRRIIPPTTIIOONN
aa bb tab at eol
aa bb cc dd
-OpenBSD October 14, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/column.out_lint b/regress/mdoc/Bl/column.out_lint
index dea3ec79..4d64846e 100644
--- a/regress/mdoc/Bl/column.out_lint
+++ b/regress/mdoc/Bl/column.out_lint
@@ -1,10 +1,7 @@
-mandoc: column.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: column.in:1:5: BASE: Mdocdate missing: Dd October (OpenBSD)
-mandoc: column.in:71:2: WARNING: skipping empty macro: It
-mandoc: column.in:72:2: WARNING: wrong number of cells: 2 columns, 1 cells
-mandoc: column.in:74:2: WARNING: skipping empty macro: It
-mandoc: column.in:76:2: WARNING: wrong number of cells: 2 columns, 4 cells
-mandoc: column.in:77:2: WARNING: wrong number of cells: 2 columns, 5 cells
-mandoc: column.in:78:2: WARNING: skipping empty macro: It
-mandoc: column.in:106:18: WARNING: skipping -width argument: Bl -column
-mandoc: column.in: BASE: RCS id missing: (OpenBSD)
+mandoc: column.in:72:2: WARNING: skipping empty macro: It
+mandoc: column.in:73:2: WARNING: wrong number of cells: 2 columns, 1 cells
+mandoc: column.in:75:2: WARNING: skipping empty macro: It
+mandoc: column.in:77:2: WARNING: wrong number of cells: 2 columns, 4 cells
+mandoc: column.in:78:2: WARNING: wrong number of cells: 2 columns, 5 cells
+mandoc: column.in:79:2: WARNING: skipping empty macro: It
+mandoc: column.in:107:18: WARNING: skipping -width argument: Bl -column
diff --git a/regress/mdoc/Bl/column.out_markdown b/regress/mdoc/Bl/column.out_markdown
index c79a98db..6e3e27b2 100644
--- a/regress/mdoc/Bl/column.out_markdown
+++ b/regress/mdoc/Bl/column.out_markdown
@@ -75,4 +75,4 @@ BL-COLUMN(1) - General Commands Manual
aa bb cc dd
-OpenBSD - October 14, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/column_nogroff.in b/regress/mdoc/Bl/column_nogroff.in
index 43f332fa..4cbcb51d 100644
--- a/regress/mdoc/Bl/column_nogroff.in
+++ b/regress/mdoc/Bl/column_nogroff.in
@@ -1,6 +1,7 @@
-.Dd June 29, 2017
+.\" $OpenBSD: column_nogroff.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-COLUMN_NOGROFF 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-column_nogroff
.Nd column lists mishandled by groff
diff --git a/regress/mdoc/Bl/column_nogroff.out_ascii b/regress/mdoc/Bl/column_nogroff.out_ascii
index f86d4d4f..b8a06670 100644
--- a/regress/mdoc/Bl/column_nogroff.out_ascii
+++ b/regress/mdoc/Bl/column_nogroff.out_ascii
@@ -12,4 +12,4 @@ DDEESSCCRRIIPPTTIIOONN
aa bb
-OpenBSD June 29, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/column_nogroff.out_lint b/regress/mdoc/Bl/column_nogroff.out_lint
index df15cf1b..8e712ca5 100644
--- a/regress/mdoc/Bl/column_nogroff.out_lint
+++ b/regress/mdoc/Bl/column_nogroff.out_lint
@@ -1,5 +1,2 @@
-mandoc: column_nogroff.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: column_nogroff.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: column_nogroff.in:10:2: WARNING: missing argument, using next line: Bl -column It
-mandoc: column_nogroff.in:18:2: WARNING: first macro on line: Ta
-mandoc: column_nogroff.in: BASE: RCS id missing: (OpenBSD)
+mandoc: column_nogroff.in:11:2: WARNING: missing argument, using next line: Bl -column It
+mandoc: column_nogroff.in:19:2: WARNING: first macro on line: Ta
diff --git a/regress/mdoc/Bl/column_nogroff.out_markdown b/regress/mdoc/Bl/column_nogroff.out_markdown
index 595236fb..5eef5551 100644
--- a/regress/mdoc/Bl/column_nogroff.out_markdown
+++ b/regress/mdoc/Bl/column_nogroff.out_markdown
@@ -15,4 +15,4 @@ Tab macro at the beginning of a line:
aa bb
-OpenBSD - June 29, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/dash.in b/regress/mdoc/Bl/dash.in
index 37c8ad1a..17bb4351 100644
--- a/regress/mdoc/Bl/dash.in
+++ b/regress/mdoc/Bl/dash.in
@@ -1,6 +1,7 @@
-.Dd December 25, 2014
+.\" $OpenBSD: dash.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-DASH 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-dash
.Nd dash and hyphen lists
diff --git a/regress/mdoc/Bl/dash.out_ascii b/regress/mdoc/Bl/dash.out_ascii
index f6677bee..e6c48b91 100644
--- a/regress/mdoc/Bl/dash.out_ascii
+++ b/regress/mdoc/Bl/dash.out_ascii
@@ -64,4 +64,4 @@ DDEESSCCRRIIPPTTIIOONN
-- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
x x x x x
-OpenBSD December 25, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/dash.out_markdown b/regress/mdoc/Bl/dash.out_markdown
index f478e4aa..25300274 100644
--- a/regress/mdoc/Bl/dash.out_markdown
+++ b/regress/mdoc/Bl/dash.out_markdown
@@ -43,4 +43,4 @@ BL-DASH(1) - General Commands Manual
- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
-OpenBSD - December 25, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/dash.out_utf8 b/regress/mdoc/Bl/dash.out_utf8
index 93abd8d3..0ba3ba9c 100644
--- a/regress/mdoc/Bl/dash.out_utf8
+++ b/regress/mdoc/Bl/dash.out_utf8
@@ -64,4 +64,4 @@ DDEESSCCRRIIPPTTIIOONN
-- x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
x x x x x
-OpenBSD December 25, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/diag.in b/regress/mdoc/Bl/diag.in
index 74421ab5..de09d465 100644
--- a/regress/mdoc/Bl/diag.in
+++ b/regress/mdoc/Bl/diag.in
@@ -1,6 +1,7 @@
-.Dd April 8, 2014
+.\" $OpenBSD: diag.in,v 1.6 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-DIAG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-diag
.Nd section 4 diagnostic lists
diff --git a/regress/mdoc/Bl/diag.out_ascii b/regress/mdoc/Bl/diag.out_ascii
index 9ee7a946..8ed0651c 100644
--- a/regress/mdoc/Bl/diag.out_ascii
+++ b/regress/mdoc/Bl/diag.out_ascii
@@ -36,4 +36,4 @@ DDEESSCCRRIIPPTTIIOONN
OOxx OpenBSD
FFxx FreeBSD
-OpenBSD April 8, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/diag.out_markdown b/regress/mdoc/Bl/diag.out_markdown
index dbde3cfe..22c4aed0 100644
--- a/regress/mdoc/Bl/diag.out_markdown
+++ b/regress/mdoc/Bl/diag.out_markdown
@@ -42,4 +42,4 @@ OpenBSD
Fx
FreeBSD
-OpenBSD - April 8, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/empty.in b/regress/mdoc/Bl/empty.in
index 1ee9c94c..0451aef7 100644
--- a/regress/mdoc/Bl/empty.in
+++ b/regress/mdoc/Bl/empty.in
@@ -1,6 +1,7 @@
-.Dd January 2, 2011
+.\" $OpenBSD: empty.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-empty
.Nd empty lists
diff --git a/regress/mdoc/Bl/empty.out_ascii b/regress/mdoc/Bl/empty.out_ascii
index aba64bbe..a5b61c0d 100644
--- a/regress/mdoc/Bl/empty.out_ascii
+++ b/regress/mdoc/Bl/empty.out_ascii
@@ -17,4 +17,4 @@ DDEESSCCRRIIPPTTIIOONN
tag list:
end of test document
-OpenBSD January 2, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/empty.out_lint b/regress/mdoc/Bl/empty.out_lint
index 7dce350c..8c354787 100644
--- a/regress/mdoc/Bl/empty.out_lint
+++ b/regress/mdoc/Bl/empty.out_lint
@@ -1,14 +1,11 @@
-mandoc: empty.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: empty.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: empty.in:9:2: WARNING: empty block: Bl
-mandoc: empty.in:12:2: WARNING: empty block: Bl
-mandoc: empty.in:15:2: WARNING: empty block: Bl
-mandoc: empty.in:18:2: WARNING: empty block: Bl
-mandoc: empty.in:21:2: WARNING: empty block: Bl
-mandoc: empty.in:24:2: WARNING: empty block: Bl
-mandoc: empty.in:27:2: WARNING: empty block: Bl
-mandoc: empty.in:30:2: WARNING: empty block: Bl
-mandoc: empty.in:33:2: WARNING: empty block: Bl
-mandoc: empty.in:36:2: WARNING: empty block: Bl
-mandoc: empty.in:39:2: WARNING: empty block: Bl
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:10:2: WARNING: empty block: Bl
+mandoc: empty.in:13:2: WARNING: empty block: Bl
+mandoc: empty.in:16:2: WARNING: empty block: Bl
+mandoc: empty.in:19:2: WARNING: empty block: Bl
+mandoc: empty.in:22:2: WARNING: empty block: Bl
+mandoc: empty.in:25:2: WARNING: empty block: Bl
+mandoc: empty.in:28:2: WARNING: empty block: Bl
+mandoc: empty.in:31:2: WARNING: empty block: Bl
+mandoc: empty.in:34:2: WARNING: empty block: Bl
+mandoc: empty.in:37:2: WARNING: empty block: Bl
+mandoc: empty.in:40:2: WARNING: empty block: Bl
diff --git a/regress/mdoc/Bl/empty.out_markdown b/regress/mdoc/Bl/empty.out_markdown
index 048f61a0..59f6f38c 100644
--- a/regress/mdoc/Bl/empty.out_markdown
+++ b/regress/mdoc/Bl/empty.out_markdown
@@ -30,4 +30,4 @@ tag list:
end of test document
-OpenBSD - January 2, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/emptyhead.in b/regress/mdoc/Bl/emptyhead.in
index 7219f969..694acbda 100644
--- a/regress/mdoc/Bl/emptyhead.in
+++ b/regress/mdoc/Bl/emptyhead.in
@@ -1,6 +1,7 @@
-.Dd July 3, 2014
+.\" $OpenBSD: emptyhead.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-EMPTYHEAD 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-emptyhead
.Nd lists with empty item heads
diff --git a/regress/mdoc/Bl/emptyhead.out_ascii b/regress/mdoc/Bl/emptyhead.out_ascii
index 3d0d0108..d5040e1c 100644
--- a/regress/mdoc/Bl/emptyhead.out_ascii
+++ b/regress/mdoc/Bl/emptyhead.out_ascii
@@ -35,4 +35,4 @@ DDEESSCCRRIIPPTTIIOONN
ttaagg text
-OpenBSD July 3, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/emptyhead.out_lint b/regress/mdoc/Bl/emptyhead.out_lint
index f67c6490..3a7cdbe1 100644
--- a/regress/mdoc/Bl/emptyhead.out_lint
+++ b/regress/mdoc/Bl/emptyhead.out_lint
@@ -1,7 +1,4 @@
-mandoc: emptyhead.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: emptyhead.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: emptyhead.in:12:2: WARNING: empty head in list item: Bl -hang It
-mandoc: emptyhead.in:21:2: WARNING: empty head in list item: Bl -ohang It
-mandoc: emptyhead.in:30:2: WARNING: empty head in list item: Bl -inset It
-mandoc: emptyhead.in:39:2: WARNING: empty head in list item: Bl -diag It
-mandoc: emptyhead.in: BASE: RCS id missing: (OpenBSD)
+mandoc: emptyhead.in:13:2: WARNING: empty head in list item: Bl -hang It
+mandoc: emptyhead.in:22:2: WARNING: empty head in list item: Bl -ohang It
+mandoc: emptyhead.in:31:2: WARNING: empty head in list item: Bl -inset It
+mandoc: emptyhead.in:40:2: WARNING: empty head in list item: Bl -diag It
diff --git a/regress/mdoc/Bl/emptyhead.out_markdown b/regress/mdoc/Bl/emptyhead.out_markdown
index 08818932..1d91fa02 100644
--- a/regress/mdoc/Bl/emptyhead.out_markdown
+++ b/regress/mdoc/Bl/emptyhead.out_markdown
@@ -48,4 +48,4 @@ no tag before this text
tag
text
-OpenBSD - July 3, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/emptyitem.in b/regress/mdoc/Bl/emptyitem.in
index e4f85897..99f16c76 100644
--- a/regress/mdoc/Bl/emptyitem.in
+++ b/regress/mdoc/Bl/emptyitem.in
@@ -1,6 +1,7 @@
-.Dd August 10, 2016
+.\" $OpenBSD: emptyitem.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-EMPTYITEM 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-emptyitem
.Nd lists with fixed heads and empty items
diff --git a/regress/mdoc/Bl/emptyitem.out_ascii b/regress/mdoc/Bl/emptyitem.out_ascii
index 5148c3ce..4eabb420 100644
--- a/regress/mdoc/Bl/emptyitem.out_ascii
+++ b/regress/mdoc/Bl/emptyitem.out_ascii
@@ -33,4 +33,4 @@ DDEESSCCRRIIPPTTIIOONN
-- three
-OpenBSD August 10, 2016 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/emptyitem.out_lint b/regress/mdoc/Bl/emptyitem.out_lint
index 0bfe54fe..6be18364 100644
--- a/regress/mdoc/Bl/emptyitem.out_lint
+++ b/regress/mdoc/Bl/emptyitem.out_lint
@@ -1,11 +1,8 @@
-mandoc: emptyitem.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: emptyitem.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: emptyitem.in:10:2: ERROR: skipping all arguments: It head argument
-mandoc: emptyitem.in:12:2: WARNING: empty list item: Bl -bullet It
-mandoc: emptyitem.in:20:2: WARNING: empty list item: Bl -dash It
-mandoc: emptyitem.in:20:2: ERROR: skipping all arguments: It head argument
-mandoc: emptyitem.in:28:2: WARNING: empty list item: Bl -enum It
-mandoc: emptyitem.in:29:2: ERROR: skipping all arguments: It head argument
-mandoc: emptyitem.in:34:2: ERROR: skipping all arguments: It Sy
-mandoc: emptyitem.in:36:2: WARNING: empty list item: Bl -hyphen It
-mandoc: emptyitem.in: BASE: RCS id missing: (OpenBSD)
+mandoc: emptyitem.in:11:2: ERROR: skipping all arguments: It head argument
+mandoc: emptyitem.in:13:2: WARNING: empty list item: Bl -bullet It
+mandoc: emptyitem.in:21:2: WARNING: empty list item: Bl -dash It
+mandoc: emptyitem.in:21:2: ERROR: skipping all arguments: It head argument
+mandoc: emptyitem.in:29:2: WARNING: empty list item: Bl -enum It
+mandoc: emptyitem.in:30:2: ERROR: skipping all arguments: It head argument
+mandoc: emptyitem.in:35:2: ERROR: skipping all arguments: It Sy
+mandoc: emptyitem.in:37:2: WARNING: empty list item: Bl -hyphen It
diff --git a/regress/mdoc/Bl/emptyitem.out_markdown b/regress/mdoc/Bl/emptyitem.out_markdown
index b61ef858..e980dc5f 100644
--- a/regress/mdoc/Bl/emptyitem.out_markdown
+++ b/regress/mdoc/Bl/emptyitem.out_markdown
@@ -38,4 +38,4 @@ hyphen list:
- three
-OpenBSD - August 10, 2016
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/emptytag.in b/regress/mdoc/Bl/emptytag.in
index f155b5c0..0057a7eb 100644
--- a/regress/mdoc/Bl/emptytag.in
+++ b/regress/mdoc/Bl/emptytag.in
@@ -1,6 +1,7 @@
-.Dd July 3, 2014
+.\" $OpenBSD: emptytag.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-EMPTYTAG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-emptytag
.Nd tag lists with empty item heads
diff --git a/regress/mdoc/Bl/emptytag.out_ascii b/regress/mdoc/Bl/emptytag.out_ascii
index 533480b1..2c2f4917 100644
--- a/regress/mdoc/Bl/emptytag.out_ascii
+++ b/regress/mdoc/Bl/emptytag.out_ascii
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
tag text
final text
-OpenBSD July 3, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/emptytag.out_lint b/regress/mdoc/Bl/emptytag.out_lint
index 33532699..663f5417 100644
--- a/regress/mdoc/Bl/emptytag.out_lint
+++ b/regress/mdoc/Bl/emptytag.out_lint
@@ -1,4 +1 @@
-mandoc: emptytag.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: emptytag.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: emptytag.in:12:2: WARNING: empty head in list item: Bl -tag It
-mandoc: emptytag.in: BASE: RCS id missing: (OpenBSD)
+mandoc: emptytag.in:13:2: WARNING: empty head in list item: Bl -tag It
diff --git a/regress/mdoc/Bl/emptytag.out_markdown b/regress/mdoc/Bl/emptytag.out_markdown
index 39db2545..84a94d22 100644
--- a/regress/mdoc/Bl/emptytag.out_markdown
+++ b/regress/mdoc/Bl/emptytag.out_markdown
@@ -20,4 +20,4 @@ tag
final text
-OpenBSD - July 3, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/enum.in b/regress/mdoc/Bl/enum.in
index e5b1c618..5386ad29 100644
--- a/regress/mdoc/Bl/enum.in
+++ b/regress/mdoc/Bl/enum.in
@@ -1,6 +1,7 @@
-.Dd December 25, 2014
+.\" $OpenBSD: enum.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-ENUM 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-enum
.Nd enumerated lists
diff --git a/regress/mdoc/Bl/enum.out_ascii b/regress/mdoc/Bl/enum.out_ascii
index 769dc218..bdf45ccc 100644
--- a/regress/mdoc/Bl/enum.out_ascii
+++ b/regress/mdoc/Bl/enum.out_ascii
@@ -64,4 +64,4 @@ DDEESSCCRRIIPPTTIIOONN
12. x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
x x x x x x
-OpenBSD December 25, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/enum.out_markdown b/regress/mdoc/Bl/enum.out_markdown
index 0c15d67a..eb2180e3 100644
--- a/regress/mdoc/Bl/enum.out_markdown
+++ b/regress/mdoc/Bl/enum.out_markdown
@@ -43,4 +43,4 @@ BL-ENUM(1) - General Commands Manual
11. x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
12. x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x
-OpenBSD - December 25, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/extend.in b/regress/mdoc/Bl/extend.in
index 0b4dce11..64766fee 100644
--- a/regress/mdoc/Bl/extend.in
+++ b/regress/mdoc/Bl/extend.in
@@ -1,6 +1,7 @@
-.Dd April 12, 2010
+.\" $OpenBSD: extend.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-EXTEND 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-extend
.Nd extending block headers
diff --git a/regress/mdoc/Bl/extend.out_ascii b/regress/mdoc/Bl/extend.out_ascii
index 6676ea48..2063ebed 100644
--- a/regress/mdoc/Bl/extend.out_ascii
+++ b/regress/mdoc/Bl/extend.out_ascii
@@ -15,4 +15,4 @@ DDEESSCCRRIIPPTTIIOONN
prefix <prefixed tag>
prefixed text
-OpenBSD April 12, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/extend.out_markdown b/regress/mdoc/Bl/extend.out_markdown
index 7164d854..4714a9ae 100644
--- a/regress/mdoc/Bl/extend.out_markdown
+++ b/regress/mdoc/Bl/extend.out_markdown
@@ -20,4 +20,4 @@ prefix &lt;prefixed tag&gt;
> prefixed text
-OpenBSD - April 12, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/hang.in b/regress/mdoc/Bl/hang.in
index 2b2b7554..5445d76f 100644
--- a/regress/mdoc/Bl/hang.in
+++ b/regress/mdoc/Bl/hang.in
@@ -1,6 +1,7 @@
-.Dd December 25, 2014
+.\" $OpenBSD: hang.in,v 1.8 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-HANG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-hang
.Nd hanged lists
diff --git a/regress/mdoc/Bl/hang.out_ascii b/regress/mdoc/Bl/hang.out_ascii
index 04cce936..e404e081 100644
--- a/regress/mdoc/Bl/hang.out_ascii
+++ b/regress/mdoc/Bl/hang.out_ascii
@@ -82,4 +82,4 @@ DDEESSCCRRIIPPTTIIOONN
tag text
-OpenBSD December 25, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/hang.out_markdown b/regress/mdoc/Bl/hang.out_markdown
index f2f20def..16683cc1 100644
--- a/regress/mdoc/Bl/hang.out_markdown
+++ b/regress/mdoc/Bl/hang.out_markdown
@@ -115,4 +115,4 @@ tag
> text
-OpenBSD - December 25, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/inset.in b/regress/mdoc/Bl/inset.in
index 0376ae63..40cb85ab 100644
--- a/regress/mdoc/Bl/inset.in
+++ b/regress/mdoc/Bl/inset.in
@@ -1,6 +1,7 @@
-.Dd October 28, 2009
+.\" $OpenBSD: inset.in,v 1.5 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-INSET 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-inset
.Nd inset list labels
diff --git a/regress/mdoc/Bl/inset.out_ascii b/regress/mdoc/Bl/inset.out_ascii
index 4927df78..51320009 100644
--- a/regress/mdoc/Bl/inset.out_ascii
+++ b/regress/mdoc/Bl/inset.out_ascii
@@ -34,4 +34,4 @@ DDEESSCCRRIIPPTTIIOONN
a b
-OpenBSD October 28, 2009 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/inset.out_markdown b/regress/mdoc/Bl/inset.out_markdown
index ad2b9728..5dcf3846 100644
--- a/regress/mdoc/Bl/inset.out_markdown
+++ b/regress/mdoc/Bl/inset.out_markdown
@@ -39,4 +39,4 @@ b
a &zwnj;
b
-OpenBSD - October 28, 2009
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/item.in b/regress/mdoc/Bl/item.in
index 672e9dc7..39edd1bd 100644
--- a/regress/mdoc/Bl/item.in
+++ b/regress/mdoc/Bl/item.in
@@ -1,6 +1,7 @@
-.Dd July 10, 2012
+.\" $OpenBSD: item.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-ITEM 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-item
.Nd itemized lists
diff --git a/regress/mdoc/Bl/item.out_ascii b/regress/mdoc/Bl/item.out_ascii
index ae3f4524..fb742e59 100644
--- a/regress/mdoc/Bl/item.out_ascii
+++ b/regress/mdoc/Bl/item.out_ascii
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
second line
third line
-OpenBSD July 10, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/item.out_markdown b/regress/mdoc/Bl/item.out_markdown
index cfceb8d5..2148d066 100644
--- a/regress/mdoc/Bl/item.out_markdown
+++ b/regress/mdoc/Bl/item.out_markdown
@@ -16,4 +16,4 @@ first line
second line
third line
-OpenBSD - July 10, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/multitag.in b/regress/mdoc/Bl/multitag.in
index e316c2d4..05b820fb 100644
--- a/regress/mdoc/Bl/multitag.in
+++ b/regress/mdoc/Bl/multitag.in
@@ -1,6 +1,7 @@
-.Dd April 13, 2010
+.\" $OpenBSD: multitag.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-MULTITAG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-multitag
.Nd lists with multiple successive tags
diff --git a/regress/mdoc/Bl/multitag.out_ascii b/regress/mdoc/Bl/multitag.out_ascii
index 3167b587..a2b07658 100644
--- a/regress/mdoc/Bl/multitag.out_ascii
+++ b/regress/mdoc/Bl/multitag.out_ascii
@@ -39,4 +39,4 @@ DDEESSCCRRIIPPTTIIOONN
fourth
fifth more text
-OpenBSD April 13, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/multitag.out_markdown b/regress/mdoc/Bl/multitag.out_markdown
index cedea6cb..20029055 100644
--- a/regress/mdoc/Bl/multitag.out_markdown
+++ b/regress/mdoc/Bl/multitag.out_markdown
@@ -62,4 +62,4 @@ fifth
> more text
-OpenBSD - April 13, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/multitype.in b/regress/mdoc/Bl/multitype.in
index 48e8dc11..45963040 100644
--- a/regress/mdoc/Bl/multitype.in
+++ b/regress/mdoc/Bl/multitype.in
@@ -1,6 +1,7 @@
-.Dd October 28, 2009
+.\" $OpenBSD: multitype.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-MULTITYPE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-multitype
.Nd list with multiple types
diff --git a/regress/mdoc/Bl/multitype.out_ascii b/regress/mdoc/Bl/multitype.out_ascii
index f22c89cf..57d31232 100644
--- a/regress/mdoc/Bl/multitype.out_ascii
+++ b/regress/mdoc/Bl/multitype.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
-- Some text.
-OpenBSD October 28, 2009 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/multitype.out_markdown b/regress/mdoc/Bl/multitype.out_markdown
index 8f7f058c..53422be9 100644
--- a/regress/mdoc/Bl/multitype.out_markdown
+++ b/regress/mdoc/Bl/multitype.out_markdown
@@ -8,4 +8,4 @@ BL-MULTITYPE(1) - General Commands Manual
- Some text.
-OpenBSD - October 28, 2009
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/nested.in b/regress/mdoc/Bl/nested.in
index 380e2e62..53127415 100644
--- a/regress/mdoc/Bl/nested.in
+++ b/regress/mdoc/Bl/nested.in
@@ -1,6 +1,7 @@
-.Dd May 19, 2013
+.\" $OpenBSD: nested.in,v 1.6 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-NESTED 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-nested
.Nd nested lists
diff --git a/regress/mdoc/Bl/nested.out_ascii b/regress/mdoc/Bl/nested.out_ascii
index 50998896..b15f8c2d 100644
--- a/regress/mdoc/Bl/nested.out_ascii
+++ b/regress/mdoc/Bl/nested.out_ascii
@@ -51,4 +51,4 @@ DDEESSCCRRIIPPTTIIOONN
outer text
final text
-OpenBSD May 19, 2013 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/nested.out_markdown b/regress/mdoc/Bl/nested.out_markdown
index 6bc694dd..d07d04b2 100644
--- a/regress/mdoc/Bl/nested.out_markdown
+++ b/regress/mdoc/Bl/nested.out_markdown
@@ -78,4 +78,4 @@ outer tag (indented 3n)
final text
-OpenBSD - May 19, 2013
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/noIt.in b/regress/mdoc/Bl/noIt.in
index 05835b5d..1c8341a6 100644
--- a/regress/mdoc/Bl/noIt.in
+++ b/regress/mdoc/Bl/noIt.in
@@ -1,6 +1,7 @@
-.Dd October 6, 2013
+.\" $OpenBSD: noIt.in,v 1.4 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-NOIT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-noIt
.Nd list missing item macros
diff --git a/regress/mdoc/Bl/noIt.out_ascii b/regress/mdoc/Bl/noIt.out_ascii
index 5b56cde5..dc159524 100644
--- a/regress/mdoc/Bl/noIt.out_ascii
+++ b/regress/mdoc/Bl/noIt.out_ascii
@@ -12,4 +12,4 @@ DDEESSCCRRIIPPTTIIOONN
++oo Bullet point.
Stray text only.
-OpenBSD October 6, 2013 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/noIt.out_lint b/regress/mdoc/Bl/noIt.out_lint
index 109a1a9d..03a89cc5 100644
--- a/regress/mdoc/Bl/noIt.out_lint
+++ b/regress/mdoc/Bl/noIt.out_lint
@@ -1,11 +1,8 @@
-mandoc: noIt.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noIt.in:1:5: BASE: Mdocdate missing: Dd October (OpenBSD)
-mandoc: noIt.in:9:1: WARNING: moving content out of list: text
-mandoc: noIt.in:10:2: WARNING: moving content out of list: Em
-mandoc: noIt.in:15:1: WARNING: moving content out of list: text
-mandoc: noIt.in:16:2: WARNING: moving content out of list: Sm
-mandoc: noIt.in:17:2: WARNING: moving content out of list: Em
-mandoc: noIt.in:17:10: WARNING: moving content out of list: Sy
-mandoc: noIt.in:17:19: WARNING: moving content out of list: Em
-mandoc: noIt.in:23:1: WARNING: moving content out of list: text
-mandoc: noIt.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noIt.in:10:1: WARNING: moving content out of list: text
+mandoc: noIt.in:11:2: WARNING: moving content out of list: Em
+mandoc: noIt.in:16:1: WARNING: moving content out of list: text
+mandoc: noIt.in:17:2: WARNING: moving content out of list: Sm
+mandoc: noIt.in:18:2: WARNING: moving content out of list: Em
+mandoc: noIt.in:18:10: WARNING: moving content out of list: Sy
+mandoc: noIt.in:18:19: WARNING: moving content out of list: Em
+mandoc: noIt.in:24:1: WARNING: moving content out of list: text
diff --git a/regress/mdoc/Bl/noIt.out_markdown b/regress/mdoc/Bl/noIt.out_markdown
index 96d4b7af..78134efc 100644
--- a/regress/mdoc/Bl/noIt.out_markdown
+++ b/regress/mdoc/Bl/noIt.out_markdown
@@ -20,4 +20,4 @@ Stray text.
Stray text only.
-OpenBSD - October 6, 2013
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/notype.in b/regress/mdoc/Bl/notype.in
index f91583d0..2044b5e7 100644
--- a/regress/mdoc/Bl/notype.in
+++ b/regress/mdoc/Bl/notype.in
@@ -1,6 +1,7 @@
-.Dd August 10, 2016
+.\" $OpenBSD: notype.in,v 1.5 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-NOTYPE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-notype
.Nd lists with late or missing types
diff --git a/regress/mdoc/Bl/notype.out_ascii b/regress/mdoc/Bl/notype.out_ascii
index 0f6b2237..15df4239 100644
--- a/regress/mdoc/Bl/notype.out_ascii
+++ b/regress/mdoc/Bl/notype.out_ascii
@@ -18,4 +18,4 @@ DDEESSCCRRIIPPTTIIOONN
final text
-OpenBSD August 10, 2016 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/notype.out_lint b/regress/mdoc/Bl/notype.out_lint
index 5f3919e2..b7a6cb79 100644
--- a/regress/mdoc/Bl/notype.out_lint
+++ b/regress/mdoc/Bl/notype.out_lint
@@ -1,8 +1,5 @@
-mandoc: notype.in:12:2: ERROR: skipping all arguments: El tail argument
-mandoc: notype.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: notype.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: notype.in:9:2: WARNING: list type is not the first argument: Bl -offset
-mandoc: notype.in:15:2: ERROR: missing list type, using -item: Bl
-mandoc: notype.in:15:20: WARNING: skipping -width argument: Bl -item
-mandoc: notype.in:21:2: ERROR: missing list type, using -item: Bl
-mandoc: notype.in: BASE: RCS id missing: (OpenBSD)
+mandoc: notype.in:13:2: ERROR: skipping all arguments: El tail argument
+mandoc: notype.in:10:2: WARNING: list type is not the first argument: Bl -offset
+mandoc: notype.in:16:2: ERROR: missing list type, using -item: Bl
+mandoc: notype.in:16:20: WARNING: skipping -width argument: Bl -item
+mandoc: notype.in:22:2: ERROR: missing list type, using -item: Bl
diff --git a/regress/mdoc/Bl/notype.out_markdown b/regress/mdoc/Bl/notype.out_markdown
index 739a91cd..09e5168a 100644
--- a/regress/mdoc/Bl/notype.out_markdown
+++ b/regress/mdoc/Bl/notype.out_markdown
@@ -20,4 +20,4 @@ Some text.
final text
-OpenBSD - August 10, 2016
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/offset.in b/regress/mdoc/Bl/offset.in
index 923dd68f..0d5f3c5c 100644
--- a/regress/mdoc/Bl/offset.in
+++ b/regress/mdoc/Bl/offset.in
@@ -1,6 +1,7 @@
-.Dd December 25, 2014
+.\" $OpenBSD: offset.in,v 1.5 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-OFFSET 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-offset
.Nd various arguments for Bl offset
diff --git a/regress/mdoc/Bl/offset.out_ascii b/regress/mdoc/Bl/offset.out_ascii
index 22474aa5..0aaa3f29 100644
--- a/regress/mdoc/Bl/offset.out_ascii
+++ b/regress/mdoc/Bl/offset.out_ascii
@@ -48,4 +48,4 @@ DDEESSCCRRIIPPTTIIOONN
tag Bl tag width Ds offset -0.26i
-OpenBSD December 25, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/offset.out_markdown b/regress/mdoc/Bl/offset.out_markdown
index a58ce6bc..cb78c3e2 100644
--- a/regress/mdoc/Bl/offset.out_markdown
+++ b/regress/mdoc/Bl/offset.out_markdown
@@ -60,4 +60,4 @@ tag
> Bl tag width Ds offset -0.26i
-OpenBSD - December 25, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/ohang.in b/regress/mdoc/Bl/ohang.in
index af4bdf6d..0184e223 100644
--- a/regress/mdoc/Bl/ohang.in
+++ b/regress/mdoc/Bl/ohang.in
@@ -1,6 +1,7 @@
-.Dd July 10, 2012
+.\" $OpenBSD: ohang.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-OHANG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-ohang
.Nd over-hanging lists
diff --git a/regress/mdoc/Bl/ohang.out_ascii b/regress/mdoc/Bl/ohang.out_ascii
index 238958dd..3cd76511 100644
--- a/regress/mdoc/Bl/ohang.out_ascii
+++ b/regress/mdoc/Bl/ohang.out_ascii
@@ -19,4 +19,4 @@ DDEESSCCRRIIPPTTIIOONN
third tag
third line
-OpenBSD July 10, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/ohang.out_markdown b/regress/mdoc/Bl/ohang.out_markdown
index 7c599411..7e257f53 100644
--- a/regress/mdoc/Bl/ohang.out_markdown
+++ b/regress/mdoc/Bl/ohang.out_markdown
@@ -22,4 +22,4 @@ second line
third tag
third line
-OpenBSD - July 10, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/secstart.in b/regress/mdoc/Bl/secstart.in
index bd01e036..5609b4bb 100644
--- a/regress/mdoc/Bl/secstart.in
+++ b/regress/mdoc/Bl/secstart.in
@@ -1,6 +1,7 @@
-.Dd November 10, 2014
+.\" $OpenBSD: secstart.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-SECSTART 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-secstart
.Nd nested lists at the beginning of sections
diff --git a/regress/mdoc/Bl/secstart.out_ascii b/regress/mdoc/Bl/secstart.out_ascii
index 269c92ec..5277a3b3 100644
--- a/regress/mdoc/Bl/secstart.out_ascii
+++ b/regress/mdoc/Bl/secstart.out_ascii
@@ -23,4 +23,4 @@ DDEESSCCRRIIPPTTIIOONN
inner tag
text
-OpenBSD November 10, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/secstart.out_markdown b/regress/mdoc/Bl/secstart.out_markdown
index 478788b0..bd1779e1 100644
--- a/regress/mdoc/Bl/secstart.out_markdown
+++ b/regress/mdoc/Bl/secstart.out_markdown
@@ -31,4 +31,4 @@ outer tag
> > text
-OpenBSD - November 10, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/tag.in b/regress/mdoc/Bl/tag.in
index c7b99822..fdc2e452 100644
--- a/regress/mdoc/Bl/tag.in
+++ b/regress/mdoc/Bl/tag.in
@@ -1,6 +1,7 @@
-.Dd September 21, 2015
+.\" $OpenBSD: tag.in,v 1.18 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-TAG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-tag
.Nd tagged lists
diff --git a/regress/mdoc/Bl/tag.out_ascii b/regress/mdoc/Bl/tag.out_ascii
index 0912d4fa..5fb3f7a4 100644
--- a/regress/mdoc/Bl/tag.out_ascii
+++ b/regress/mdoc/Bl/tag.out_ascii
@@ -131,4 +131,4 @@ DDEESSCCRRIIPPTTIIOONN
second paragraph
-OpenBSD September 21, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/tag.out_lint b/regress/mdoc/Bl/tag.out_lint
index 26ef8aa0..06c06995 100644
--- a/regress/mdoc/Bl/tag.out_lint
+++ b/regress/mdoc/Bl/tag.out_lint
@@ -1,4 +1 @@
-mandoc: tag.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: tag.in:1:5: BASE: Mdocdate missing: Dd September (OpenBSD)
-mandoc: tag.in:131:2: WARNING: missing -width in -tag list, using 6n: Bl -tag
-mandoc: tag.in: BASE: RCS id missing: (OpenBSD)
+mandoc: tag.in:132:2: WARNING: missing -width in -tag list, using 6n: Bl -tag
diff --git a/regress/mdoc/Bl/tag.out_markdown b/regress/mdoc/Bl/tag.out_markdown
index e976e8db..fd9d9fd7 100644
--- a/regress/mdoc/Bl/tag.out_markdown
+++ b/regress/mdoc/Bl/tag.out_markdown
@@ -172,4 +172,4 @@ tag
> second paragraph
-OpenBSD - September 21, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bl/unclosed.in b/regress/mdoc/Bl/unclosed.in
index 2d35a480..74386610 100644
--- a/regress/mdoc/Bl/unclosed.in
+++ b/regress/mdoc/Bl/unclosed.in
@@ -1,6 +1,7 @@
-.Dd January 9, 2011
+.\" $OpenBSD: unclosed.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BL-UNCLOSED 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bl-unclosed
.Nd list lacking an end macro
diff --git a/regress/mdoc/Bl/unclosed.out_ascii b/regress/mdoc/Bl/unclosed.out_ascii
index 3a350004..23005e5c 100644
--- a/regress/mdoc/Bl/unclosed.out_ascii
+++ b/regress/mdoc/Bl/unclosed.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
SSEEEE AALLSSOO
mdoc(7)
-OpenBSD January 9, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bl/unclosed.out_markdown b/regress/mdoc/Bl/unclosed.out_markdown
index 92b6fb74..40f01cc3 100644
--- a/regress/mdoc/Bl/unclosed.out_markdown
+++ b/regress/mdoc/Bl/unclosed.out_markdown
@@ -12,4 +12,4 @@ item
mdoc(7)
-OpenBSD - January 9, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Brq/empty.in b/regress/mdoc/Brq/empty.in
index 4677820d..5d8fa3f5 100644
--- a/regress/mdoc/Brq/empty.in
+++ b/regress/mdoc/Brq/empty.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: empty.in,v 1.5 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BRQ-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Brq-empty
.Nd empty implicit enclosure macros
diff --git a/regress/mdoc/Brq/empty.out_ascii b/regress/mdoc/Brq/empty.out_ascii
index 31cdd9e1..8471f6db 100644
--- a/regress/mdoc/Brq/empty.out_ascii
+++ b/regress/mdoc/Brq/empty.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
An empty {} and a full ({user@host)} quotation. And another ({full)} one
bboolldd.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Brq/empty.out_lint b/regress/mdoc/Brq/empty.out_lint
index 288cd1f4..a7092ae5 100644
--- a/regress/mdoc/Brq/empty.out_lint
+++ b/regress/mdoc/Brq/empty.out_lint
@@ -1,5 +1,2 @@
-mandoc: empty.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: empty.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: empty.in:11:19: STYLE: no blank before trailing delimiter: Brq user@host)
-mandoc: empty.in:14:14: STYLE: no blank before trailing delimiter: Bro full)
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:12:19: STYLE: no blank before trailing delimiter: Brq user@host)
+mandoc: empty.in:15:14: STYLE: no blank before trailing delimiter: Bro full)
diff --git a/regress/mdoc/Brq/empty.out_markdown b/regress/mdoc/Brq/empty.out_markdown
index 82b1dd7e..3483e90b 100644
--- a/regress/mdoc/Brq/empty.out_markdown
+++ b/regress/mdoc/Brq/empty.out_markdown
@@ -14,4 +14,4 @@ quotation.
And another
({full)} one **bold**.
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Bx/args.in b/regress/mdoc/Bx/args.in
index d6f8ff5e..18b96f31 100644
--- a/regress/mdoc/Bx/args.in
+++ b/regress/mdoc/Bx/args.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: args.in,v 1.5 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt BX-ARGS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bx-args
.Nd arguments to the BSD macro
diff --git a/regress/mdoc/Bx/args.out_ascii b/regress/mdoc/Bx/args.out_ascii
index d7c1e769..ad7d2445 100644
--- a/regress/mdoc/Bx/args.out_ascii
+++ b/regress/mdoc/Bx/args.out_ascii
@@ -18,4 +18,4 @@ DDEESSCCRRIIPPTTIIOONN
end of test document
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Bx/args.out_lint b/regress/mdoc/Bx/args.out_lint
index e463b7c2..c4d244d4 100644
--- a/regress/mdoc/Bx/args.out_lint
+++ b/regress/mdoc/Bx/args.out_lint
@@ -1,4 +1 @@
-mandoc: args.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: args.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: args.in:15:9: STYLE: no blank before trailing delimiter: Bx nett.
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:16:9: STYLE: no blank before trailing delimiter: Bx nett.
diff --git a/regress/mdoc/Bx/args.out_markdown b/regress/mdoc/Bx/args.out_markdown
index e2316621..ccfc6f1b 100644
--- a/regress/mdoc/Bx/args.out_markdown
+++ b/regress/mdoc/Bx/args.out_markdown
@@ -26,4 +26,4 @@ more arguments:
end of test document
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Cd/eos.in b/regress/mdoc/Cd/eos.in
index 9f83b8fc..193e086f 100644
--- a/regress/mdoc/Cd/eos.in
+++ b/regress/mdoc/Cd/eos.in
@@ -1,6 +1,7 @@
-.Dd November 17, 2012
+.\" $OpenBSD: eos.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt CD-EOS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Cd-eos
.Nd end of sentence handling after the configuration directive macro
diff --git a/regress/mdoc/Cd/eos.out_ascii b/regress/mdoc/Cd/eos.out_ascii
index 4e0b1bea..93f446be 100644
--- a/regress/mdoc/Cd/eos.out_ascii
+++ b/regress/mdoc/Cd/eos.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
Do not use ooppttiioonnss IINNSSEECCUURREE. It is insecure.
-OpenBSD November 17, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Cd/eos.out_markdown b/regress/mdoc/Cd/eos.out_markdown
index 625016a8..60e292e8 100644
--- a/regress/mdoc/Cd/eos.out_markdown
+++ b/regress/mdoc/Cd/eos.out_markdown
@@ -10,4 +10,4 @@ Do not use
**options INSECURE**.
It is insecure.
-OpenBSD - November 17, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Cd/font.in b/regress/mdoc/Cd/font.in
index 716794eb..e0e044ff 100644
--- a/regress/mdoc/Cd/font.in
+++ b/regress/mdoc/Cd/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt CD-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Cd-font
.Nd changing fonts inside the configuration declaration macro
diff --git a/regress/mdoc/Cd/font.out_ascii b/regress/mdoc/Cd/font.out_ascii
index 8949462b..2534b07d 100644
--- a/regress/mdoc/Cd/font.out_ascii
+++ b/regress/mdoc/Cd/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text bboolldd_e_m_p_h_a_s_i_sbbaacckk trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Cd/font.out_markdown b/regress/mdoc/Cd/font.out_markdown
index 48594b44..eab5d097 100644
--- a/regress/mdoc/Cd/font.out_markdown
+++ b/regress/mdoc/Cd/font.out_markdown
@@ -10,4 +10,4 @@ normal text
**bold*emphasis*back**
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Cd/noarg.in b/regress/mdoc/Cd/noarg.in
index 7190ebea..7877c66d 100644
--- a/regress/mdoc/Cd/noarg.in
+++ b/regress/mdoc/Cd/noarg.in
@@ -1,6 +1,7 @@
-.Dd January 19, 2011
+.\" $OpenBSD: noarg.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt CD-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Cd-noarg
.Nd kernel configuration directive without arguments
diff --git a/regress/mdoc/Cd/noarg.out_ascii b/regress/mdoc/Cd/noarg.out_ascii
index eefae539..e5867766 100644
--- a/regress/mdoc/Cd/noarg.out_ascii
+++ b/regress/mdoc/Cd/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with arguments: wwdd** aatt ppcciiiiddee?? without arguments: end of test document
-OpenBSD January 19, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Cd/noarg.out_lint b/regress/mdoc/Cd/noarg.out_lint
index b80a17ad..bbf1e2db 100644
--- a/regress/mdoc/Cd/noarg.out_lint
+++ b/regress/mdoc/Cd/noarg.out_lint
@@ -1,4 +1 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: Cd
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: Cd
diff --git a/regress/mdoc/Cd/noarg.out_markdown b/regress/mdoc/Cd/noarg.out_markdown
index ce447da0..60d942e9 100644
--- a/regress/mdoc/Cd/noarg.out_markdown
+++ b/regress/mdoc/Cd/noarg.out_markdown
@@ -11,4 +11,4 @@ with arguments:
without arguments:
end of test document
-OpenBSD - January 19, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Cd/punct.in b/regress/mdoc/Cd/punct.in
index 9a072c0c..4d916a39 100644
--- a/regress/mdoc/Cd/punct.in
+++ b/regress/mdoc/Cd/punct.in
@@ -1,6 +1,7 @@
-.Dd August 21, 2014
+.\" $OpenBSD: punct.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt CD-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Cd-punct
.Nd punctuation handling by the Cd macro
diff --git a/regress/mdoc/Cd/punct.out_ascii b/regress/mdoc/Cd/punct.out_ascii
index 88d369dc..090b1cdf 100644
--- a/regress/mdoc/Cd/punct.out_ascii
+++ b/regress/mdoc/Cd/punct.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
quoted punctuation: aa (bb | cc) dd. _i_t_a_l_i_c.
-OpenBSD August 21, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Cd/punct.out_markdown b/regress/mdoc/Cd/punct.out_markdown
index c39ee621..0e6d8b20 100644
--- a/regress/mdoc/Cd/punct.out_markdown
+++ b/regress/mdoc/Cd/punct.out_markdown
@@ -42,4 +42,4 @@ op bracket
quoted punctuation:
**a** (**b** | **c**) **d**. *italic*.
-OpenBSD - August 21, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Cm/basic.in b/regress/mdoc/Cm/basic.in
index 2fba179c..d91e8e62 100644
--- a/regress/mdoc/Cm/basic.in
+++ b/regress/mdoc/Cm/basic.in
@@ -1,6 +1,7 @@
-.Dd July 6, 2012
+.\" $OpenBSD: basic.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt CM-BASIC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Cm-basic
.Nd basic usage of the Cm macro
diff --git a/regress/mdoc/Cm/basic.out_ascii b/regress/mdoc/Cm/basic.out_ascii
index 98899c00..eef45c10 100644
--- a/regress/mdoc/Cm/basic.out_ascii
+++ b/regress/mdoc/Cm/basic.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
middle of line: ppss --oo ppiidd,ccoommmmaanndd
-OpenBSD July 6, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Cm/basic.out_markdown b/regress/mdoc/Cm/basic.out_markdown
index 0822c26a..4c88ee9d 100644
--- a/regress/mdoc/Cm/basic.out_markdown
+++ b/regress/mdoc/Cm/basic.out_markdown
@@ -12,4 +12,4 @@ end of line:
middle of line:
**ps** **-o** **pid**,**command**
-OpenBSD - July 6, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Cm/font.in b/regress/mdoc/Cm/font.in
index db58f6dd..f0dd6ea3 100644
--- a/regress/mdoc/Cm/font.in
+++ b/regress/mdoc/Cm/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt CM-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Cm-font
.Nd changing fonts inside the command modifier macro
diff --git a/regress/mdoc/Cm/font.out_ascii b/regress/mdoc/Cm/font.out_ascii
index ae48e4b1..0ac3d99d 100644
--- a/regress/mdoc/Cm/font.out_ascii
+++ b/regress/mdoc/Cm/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text bboolldd_e_m_p_h_a_s_i_sbbaacckk trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Cm/font.out_markdown b/regress/mdoc/Cm/font.out_markdown
index 2f58f0c0..b9131ce3 100644
--- a/regress/mdoc/Cm/font.out_markdown
+++ b/regress/mdoc/Cm/font.out_markdown
@@ -10,4 +10,4 @@ normal text
**bold*emphasis*back**
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Cm/noarg.in b/regress/mdoc/Cm/noarg.in
index 8347997b..ebba1152 100644
--- a/regress/mdoc/Cm/noarg.in
+++ b/regress/mdoc/Cm/noarg.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: noarg.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt CM-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Cm-noarg
.Nd command modifier macro without arguments
diff --git a/regress/mdoc/Cm/noarg.out_ascii b/regress/mdoc/Cm/noarg.out_ascii
index 2b6dea57..b8530057 100644
--- a/regress/mdoc/Cm/noarg.out_ascii
+++ b/regress/mdoc/Cm/noarg.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
middle of line: ppss --xx --oo ccoommmmaanndd..
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Cm/noarg.out_lint b/regress/mdoc/Cm/noarg.out_lint
index 486fbdfa..fbe2d230 100644
--- a/regress/mdoc/Cm/noarg.out_lint
+++ b/regress/mdoc/Cm/noarg.out_lint
@@ -1,6 +1,3 @@
-mandoc: noarg.in:9:23: WARNING: skipping empty macro: Cm
-mandoc: noarg.in:12:13: WARNING: skipping empty macro: Cm
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: noarg.in:12:31: STYLE: no blank before trailing delimiter: Cm command.
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:10:23: WARNING: skipping empty macro: Cm
+mandoc: noarg.in:13:13: WARNING: skipping empty macro: Cm
+mandoc: noarg.in:13:31: STYLE: no blank before trailing delimiter: Cm command.
diff --git a/regress/mdoc/Cm/noarg.out_markdown b/regress/mdoc/Cm/noarg.out_markdown
index 05ceb960..d1636183 100644
--- a/regress/mdoc/Cm/noarg.out_markdown
+++ b/regress/mdoc/Cm/noarg.out_markdown
@@ -12,4 +12,4 @@ end of line:
middle of line:
**ps** **-x** **-o** **command.**
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Cm/punct.in b/regress/mdoc/Cm/punct.in
index 432e470c..195c9e50 100644
--- a/regress/mdoc/Cm/punct.in
+++ b/regress/mdoc/Cm/punct.in
@@ -1,6 +1,7 @@
-.Dd August 21, 2014
+.\" $OpenBSD: punct.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt Cm-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Cm-punct
.Nd punctuation handling by the Cm macro
diff --git a/regress/mdoc/Cm/punct.out_ascii b/regress/mdoc/Cm/punct.out_ascii
index 7ac1fe76..f3cf5bdb 100644
--- a/regress/mdoc/Cm/punct.out_ascii
+++ b/regress/mdoc/Cm/punct.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
quoted punctuation: aa (bb | cc) dd. _i_t_a_l_i_c.
-OpenBSD August 21, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Cm/punct.out_markdown b/regress/mdoc/Cm/punct.out_markdown
index c924228c..0e9b5d18 100644
--- a/regress/mdoc/Cm/punct.out_markdown
+++ b/regress/mdoc/Cm/punct.out_markdown
@@ -42,4 +42,4 @@ op bracket
quoted punctuation:
**a** (**b** | **c**) **d**. *italic*.
-OpenBSD - August 21, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/D1/spacing.in b/regress/mdoc/D1/spacing.in
index 3303dccc..0f6f83fa 100644
--- a/regress/mdoc/D1/spacing.in
+++ b/regress/mdoc/D1/spacing.in
@@ -1,6 +1,7 @@
-.Dd February 5, 2015
+.\" $OpenBSD: spacing.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt D1-SPACING 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm D1-spacing
.Nd spacing in and around one-line displays
diff --git a/regress/mdoc/D1/spacing.out_ascii b/regress/mdoc/D1/spacing.out_ascii
index becef1b8..40945936 100644
--- a/regress/mdoc/D1/spacing.out_ascii
+++ b/regress/mdoc/D1/spacing.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
empty display:
following text
-OpenBSD February 5, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/D1/spacing.out_lint b/regress/mdoc/D1/spacing.out_lint
index 15d29679..5ac4d0c0 100644
--- a/regress/mdoc/D1/spacing.out_lint
+++ b/regress/mdoc/D1/spacing.out_lint
@@ -1,4 +1 @@
-mandoc: spacing.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: spacing.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: spacing.in:11:2: WARNING: empty block: D1
-mandoc: spacing.in: BASE: RCS id missing: (OpenBSD)
+mandoc: spacing.in:12:2: WARNING: empty block: D1
diff --git a/regress/mdoc/D1/spacing.out_markdown b/regress/mdoc/D1/spacing.out_markdown
index c0ebf104..eac16dfe 100644
--- a/regress/mdoc/D1/spacing.out_markdown
+++ b/regress/mdoc/D1/spacing.out_markdown
@@ -14,4 +14,4 @@ empty display:
following text
-OpenBSD - February 5, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Db/args.in b/regress/mdoc/Db/args.in
index b40d7b0c..e2b50312 100644
--- a/regress/mdoc/Db/args.in
+++ b/regress/mdoc/Db/args.in
@@ -1,6 +1,7 @@
-.Dd November 27, 2014
+.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $
+.Dd $Mdocdate$
.Dt DB-ARGS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Db-args
.Nd obsolete debug macro
diff --git a/regress/mdoc/Db/args.out_ascii b/regress/mdoc/Db/args.out_ascii
index 909b91ba..7a8e6945 100644
--- a/regress/mdoc/Db/args.out_ascii
+++ b/regress/mdoc/Db/args.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
no args one arg two args end of text
-OpenBSD November 27, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Db/args.out_lint b/regress/mdoc/Db/args.out_lint
index 279a031d..05740565 100644
--- a/regress/mdoc/Db/args.out_lint
+++ b/regress/mdoc/Db/args.out_lint
@@ -1,6 +1,3 @@
-mandoc: args.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: args.in:1:5: BASE: Mdocdate missing: Dd November (OpenBSD)
-mandoc: args.in:9:2: WARNING: obsolete macro: Db
-mandoc: args.in:11:2: WARNING: obsolete macro: Db
-mandoc: args.in:13:2: WARNING: obsolete macro: Db
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:10:2: WARNING: obsolete macro: Db
+mandoc: args.in:12:2: WARNING: obsolete macro: Db
+mandoc: args.in:14:2: WARNING: obsolete macro: Db
diff --git a/regress/mdoc/Dd/badarg.in b/regress/mdoc/Dd/badarg.in
index 9891fc4e..07cfe13e 100644
--- a/regress/mdoc/Dd/badarg.in
+++ b/regress/mdoc/Dd/badarg.in
@@ -1,6 +1,7 @@
+.\" $OpenBSD: badarg.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
.Dd "bad date"
.Dt DD-BADARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dd-badarg
.Nd date cannot be parsed
diff --git a/regress/mdoc/Dd/badarg.out_lint b/regress/mdoc/Dd/badarg.out_lint
index d4b4a3f9..f463d775 100644
--- a/regress/mdoc/Dd/badarg.out_lint
+++ b/regress/mdoc/Dd/badarg.out_lint
@@ -1,4 +1,2 @@
-mandoc: badarg.in:1:2: WARNING: cannot parse date, using it verbatim: bad date
-mandoc: badarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badarg.in:1:5: BASE: Mdocdate missing: Dd bad date (OpenBSD)
-mandoc: badarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badarg.in:2:2: WARNING: cannot parse date, using it verbatim: bad date
+mandoc: badarg.in:2:5: STYLE: Mdocdate missing: Dd bad date (OpenBSD)
diff --git a/regress/mdoc/Dd/dupe.in b/regress/mdoc/Dd/dupe.in
index d1a7f827..b72d955e 100644
--- a/regress/mdoc/Dd/dupe.in
+++ b/regress/mdoc/Dd/dupe.in
@@ -1,6 +1,7 @@
+.\" $OpenBSD: dupe.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
.Dd August 1, 2014
.Dt DD-DUPE 1
-.Os OpenBSD
+.Os
.Dd August 3, 2014
.Sh NAME
.Nm Dd-dupe
diff --git a/regress/mdoc/Dd/dupe.out_lint b/regress/mdoc/Dd/dupe.out_lint
index 33493aaf..faa1f835 100644
--- a/regress/mdoc/Dd/dupe.out_lint
+++ b/regress/mdoc/Dd/dupe.out_lint
@@ -1,5 +1,3 @@
-mandoc: dupe.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: dupe.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: dupe.in:4:2: WARNING: duplicate prologue macro: Dd
-mandoc: dupe.in:10:2: WARNING: duplicate prologue macro: Dd
-mandoc: dupe.in: BASE: RCS id missing: (OpenBSD)
+mandoc: dupe.in:2:5: STYLE: Mdocdate missing: Dd August (OpenBSD)
+mandoc: dupe.in:5:2: WARNING: duplicate prologue macro: Dd
+mandoc: dupe.in:11:2: WARNING: duplicate prologue macro: Dd
diff --git a/regress/mdoc/Dd/late.in b/regress/mdoc/Dd/late.in
index 0a8436fb..36fb527a 100644
--- a/regress/mdoc/Dd/late.in
+++ b/regress/mdoc/Dd/late.in
@@ -1,5 +1,6 @@
+.\" $OpenBSD: late.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
.Dt DD-LATE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dd-late
.Nd late date macro
diff --git a/regress/mdoc/Dd/late.out_lint b/regress/mdoc/Dd/late.out_lint
index f038018b..2a8c2a50 100644
--- a/regress/mdoc/Dd/late.out_lint
+++ b/regress/mdoc/Dd/late.out_lint
@@ -1,3 +1 @@
-mandoc: late.in:2:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: late.in:8:2: WARNING: late prologue macro: Dd
-mandoc: late.in: BASE: RCS id missing: (OpenBSD)
+mandoc: late.in:9:2: WARNING: late prologue macro: Dd
diff --git a/regress/mdoc/Dd/long.in b/regress/mdoc/Dd/long.in
index 2538f984..8be2802e 100644
--- a/regress/mdoc/Dd/long.in
+++ b/regress/mdoc/Dd/long.in
@@ -1,6 +1,7 @@
+.\" $OpenBSD: long.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
.Dd 1234567890123456789012345678901234567890123456789012345678901234567890123456789
.Dt DD-LONG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dd-long
.Nd long date string
diff --git a/regress/mdoc/Dd/long.out_lint b/regress/mdoc/Dd/long.out_lint
index 4b7293af..a189560d 100644
--- a/regress/mdoc/Dd/long.out_lint
+++ b/regress/mdoc/Dd/long.out_lint
@@ -1,4 +1,2 @@
-mandoc: long.in:1:2: WARNING: cannot parse date, using it verbatim: 1234567890123456789012345678901234567890123456789012345678901234567890123456789
-mandoc: long.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: long.in:1:5: BASE: Mdocdate missing: Dd 1234567890123456789012345678901234567890123456789012345678901234567890123456789 (OpenBSD)
-mandoc: long.in: BASE: RCS id missing: (OpenBSD)
+mandoc: long.in:2:2: WARNING: cannot parse date, using it verbatim: 1234567890123456789012345678901234567890123456789012345678901234567890123456789
+mandoc: long.in:2:5: STYLE: Mdocdate missing: Dd 1234567890123456789012345678901234567890123456789012345678901234567890123456789 (OpenBSD)
diff --git a/regress/mdoc/Dd/manarg.in b/regress/mdoc/Dd/manarg.in
index 434a7af8..7082d31b 100644
--- a/regress/mdoc/Dd/manarg.in
+++ b/regress/mdoc/Dd/manarg.in
@@ -1,6 +1,7 @@
+.\" $OpenBSD: manarg.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
.Dd 2014-08-07
.Dt DD-MANARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dd-manarg
.Nd date in traditional man format
diff --git a/regress/mdoc/Dd/manarg.out_lint b/regress/mdoc/Dd/manarg.out_lint
index 56a463be..a8f48f44 100644
--- a/regress/mdoc/Dd/manarg.out_lint
+++ b/regress/mdoc/Dd/manarg.out_lint
@@ -1,4 +1,2 @@
-mandoc: manarg.in:1:2: STYLE: legacy man(7) date format: Dd 2014-08-07
-mandoc: manarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: manarg.in:1:5: BASE: Mdocdate missing: Dd 2014-08-07 (OpenBSD)
-mandoc: manarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: manarg.in:2:2: STYLE: legacy man(7) date format: Dd 2014-08-07
+mandoc: manarg.in:2:5: STYLE: Mdocdate missing: Dd 2014-08-07 (OpenBSD)
diff --git a/regress/mdoc/Dd/noarg.in b/regress/mdoc/Dd/noarg.in
index fd904985..18fa2c62 100644
--- a/regress/mdoc/Dd/noarg.in
+++ b/regress/mdoc/Dd/noarg.in
@@ -1,6 +1,7 @@
+.\" $OpenBSD: noarg.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
.Dd
.Dt DD-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dd-noarg
.Nd date macro without an argument
diff --git a/regress/mdoc/Dd/noarg.out_lint b/regress/mdoc/Dd/noarg.out_lint
index 92b1cb1b..e6ccd352 100644
--- a/regress/mdoc/Dd/noarg.out_lint
+++ b/regress/mdoc/Dd/noarg.out_lint
@@ -1,3 +1 @@
-mandoc: noarg.in:1:2: WARNING: missing date, using today's date
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:2:2: WARNING: missing date, using today's date
diff --git a/regress/mdoc/Dd/order.in b/regress/mdoc/Dd/order.in
index e3872cbb..5572e834 100644
--- a/regress/mdoc/Dd/order.in
+++ b/regress/mdoc/Dd/order.in
@@ -1,6 +1,7 @@
+.\" $OpenBSD: order.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
.Dt DD-ORDER 1
.Dd August 5, 2014
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dd-order
.Nd date macro after title macro
diff --git a/regress/mdoc/Dd/order.out_lint b/regress/mdoc/Dd/order.out_lint
index 4f09786a..4eb9d3bd 100644
--- a/regress/mdoc/Dd/order.out_lint
+++ b/regress/mdoc/Dd/order.out_lint
@@ -1,4 +1,2 @@
-mandoc: order.in:2:2: WARNING: prologue macros out of order: Dd after Dt
-mandoc: order.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: order.in:2:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: order.in: BASE: RCS id missing: (OpenBSD)
+mandoc: order.in:3:2: WARNING: prologue macros out of order: Dd after Dt
+mandoc: order.in:3:5: STYLE: Mdocdate missing: Dd August (OpenBSD)
diff --git a/regress/mdoc/Dl/spacing.in b/regress/mdoc/Dl/spacing.in
index cc683872..6120504c 100644
--- a/regress/mdoc/Dl/spacing.in
+++ b/regress/mdoc/Dl/spacing.in
@@ -1,6 +1,7 @@
-.Dd February 5, 2015
+.\" $OpenBSD: spacing.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt DL-SPACING 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dl-spacing
.Nd spacing in and around one-line literal displays
diff --git a/regress/mdoc/Dl/spacing.out_ascii b/regress/mdoc/Dl/spacing.out_ascii
index db5958da..c0928ec0 100644
--- a/regress/mdoc/Dl/spacing.out_ascii
+++ b/regress/mdoc/Dl/spacing.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
empty display:
following text
-OpenBSD February 5, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dl/spacing.out_lint b/regress/mdoc/Dl/spacing.out_lint
index 13ffa8f6..a18ed583 100644
--- a/regress/mdoc/Dl/spacing.out_lint
+++ b/regress/mdoc/Dl/spacing.out_lint
@@ -1,4 +1 @@
-mandoc: spacing.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: spacing.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: spacing.in:11:2: WARNING: empty block: Dl
-mandoc: spacing.in: BASE: RCS id missing: (OpenBSD)
+mandoc: spacing.in:12:2: WARNING: empty block: Dl
diff --git a/regress/mdoc/Dl/spacing.out_markdown b/regress/mdoc/Dl/spacing.out_markdown
index fb4cd5ce..08d15972 100644
--- a/regress/mdoc/Dl/spacing.out_markdown
+++ b/regress/mdoc/Dl/spacing.out_markdown
@@ -14,4 +14,4 @@ empty display:
following text
-OpenBSD - February 5, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dq/empty.in b/regress/mdoc/Dq/empty.in
index 2e0282e4..c6f1575f 100644
--- a/regress/mdoc/Dq/empty.in
+++ b/regress/mdoc/Dq/empty.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: empty.in,v 1.5 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt DQ-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dq-empty
.Nd empty implicit enclosure macros
diff --git a/regress/mdoc/Dq/empty.out_ascii b/regress/mdoc/Dq/empty.out_ascii
index a5614e9e..1c150ae7 100644
--- a/regress/mdoc/Dq/empty.out_ascii
+++ b/regress/mdoc/Dq/empty.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
An empty "" and a full ("user@host)" quotation. And another ("full)" one
bboolldd.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dq/empty.out_lint b/regress/mdoc/Dq/empty.out_lint
index ca06c977..e69de29b 100644
--- a/regress/mdoc/Dq/empty.out_lint
+++ b/regress/mdoc/Dq/empty.out_lint
@@ -1,3 +0,0 @@
-mandoc: empty.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: empty.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
diff --git a/regress/mdoc/Dq/empty.out_markdown b/regress/mdoc/Dq/empty.out_markdown
index 927dacc8..00e82f81 100644
--- a/regress/mdoc/Dq/empty.out_markdown
+++ b/regress/mdoc/Dq/empty.out_markdown
@@ -14,4 +14,4 @@ quotation.
And another
("full)" one **bold**.
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dt/badsec.in b/regress/mdoc/Dt/badsec.in
index 47af859f..58f9ac1d 100644
--- a/regress/mdoc/Dt/badsec.in
+++ b/regress/mdoc/Dt/badsec.in
@@ -1,6 +1,7 @@
-.Dd June 13, 2014
+.\" $OpenBSD: badsec.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt DT-BADSEC foo
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dt-badsec
.Nd unknown manual section
diff --git a/regress/mdoc/Dt/badsec.out_lint b/regress/mdoc/Dt/badsec.out_lint
index ba3a3c17..e6606e8b 100644
--- a/regress/mdoc/Dt/badsec.out_lint
+++ b/regress/mdoc/Dt/badsec.out_lint
@@ -1,4 +1 @@
-mandoc: badsec.in:2:15: WARNING: unknown manual section: Dt ... foo
-mandoc: badsec.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badsec.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: badsec.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badsec.in:3:15: WARNING: unknown manual section: Dt ... foo
diff --git a/regress/mdoc/Dt/case.in b/regress/mdoc/Dt/case.in
index 88b2df3b..b8164d60 100644
--- a/regress/mdoc/Dt/case.in
+++ b/regress/mdoc/Dt/case.in
@@ -1,6 +1,7 @@
-.Dd June 13, 2014
+.\" $OpenBSD: case.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt Dt-case 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dt-case
.Nd document title is not all caps
diff --git a/regress/mdoc/Dt/case.out_ascii b/regress/mdoc/Dt/case.out_ascii
index 0eb21827..0978147d 100644
--- a/regress/mdoc/Dt/case.out_ascii
+++ b/regress/mdoc/Dt/case.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
some text
-OpenBSD June 13, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dt/case.out_lint b/regress/mdoc/Dt/case.out_lint
index 0d75124d..7a39ec2f 100644
--- a/regress/mdoc/Dt/case.out_lint
+++ b/regress/mdoc/Dt/case.out_lint
@@ -1,4 +1 @@
-mandoc: case.in:2:6: WARNING: lower case character in document title: Dt Dt-case
-mandoc: case.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: case.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: case.in: BASE: RCS id missing: (OpenBSD)
+mandoc: case.in:3:6: WARNING: lower case character in document title: Dt Dt-case
diff --git a/regress/mdoc/Dt/case.out_markdown b/regress/mdoc/Dt/case.out_markdown
index d6bc4c45..9739fb3e 100644
--- a/regress/mdoc/Dt/case.out_markdown
+++ b/regress/mdoc/Dt/case.out_markdown
@@ -8,4 +8,4 @@ Dt-case(1) - General Commands Manual
some text
-OpenBSD - June 13, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dt/dupe.in b/regress/mdoc/Dt/dupe.in
index c46e3d77..938e64d7 100644
--- a/regress/mdoc/Dt/dupe.in
+++ b/regress/mdoc/Dt/dupe.in
@@ -1,6 +1,7 @@
-.Dd August 5, 2014
+.\" $OpenBSD: dupe.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt DT-FIRST 2 first_arch
-.Os OpenBSD
+.Os
.Dt DT-DUPE 1
.Sh NAME
.Nm Dt-order
diff --git a/regress/mdoc/Dt/dupe.out_ascii b/regress/mdoc/Dt/dupe.out_ascii
index 0d2ba0e6..09548e72 100644
--- a/regress/mdoc/Dt/dupe.out_ascii
+++ b/regress/mdoc/Dt/dupe.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
inital text final text
-OpenBSD August 5, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dt/dupe.out_lint b/regress/mdoc/Dt/dupe.out_lint
index 1e926412..534a8eec 100644
--- a/regress/mdoc/Dt/dupe.out_lint
+++ b/regress/mdoc/Dt/dupe.out_lint
@@ -1,5 +1,2 @@
-mandoc: dupe.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: dupe.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: dupe.in:4:2: WARNING: duplicate prologue macro: Dt
-mandoc: dupe.in:10:2: WARNING: skipping late title macro: Dt
-mandoc: dupe.in: BASE: RCS id missing: (OpenBSD)
+mandoc: dupe.in:5:2: WARNING: duplicate prologue macro: Dt
+mandoc: dupe.in:11:2: WARNING: skipping late title macro: Dt
diff --git a/regress/mdoc/Dt/dupe.out_markdown b/regress/mdoc/Dt/dupe.out_markdown
index 3dec7eca..16eba874 100644
--- a/regress/mdoc/Dt/dupe.out_markdown
+++ b/regress/mdoc/Dt/dupe.out_markdown
@@ -9,4 +9,4 @@ DT-DUPE(1) - General Commands Manual
inital text
final text
-OpenBSD - August 5, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dt/fourargs.in b/regress/mdoc/Dt/fourargs.in
index 9b4293ae..0a9b4a22 100644
--- a/regress/mdoc/Dt/fourargs.in
+++ b/regress/mdoc/Dt/fourargs.in
@@ -1,6 +1,7 @@
-.Dd February 16, 2015
+.\" $OpenBSD: fourargs.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt DT-FOURARGS 1 amd64 bogus
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dt-fourargs
.Nd too many arguments after the \&Dt macro
diff --git a/regress/mdoc/Dt/fourargs.out_ascii b/regress/mdoc/Dt/fourargs.out_ascii
index 9fc075e1..56660fc1 100644
--- a/regress/mdoc/Dt/fourargs.out_ascii
+++ b/regress/mdoc/Dt/fourargs.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
some text
-OpenBSD February 16, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dt/fourargs.out_lint b/regress/mdoc/Dt/fourargs.out_lint
index 2abe70ea..789af9c7 100644
--- a/regress/mdoc/Dt/fourargs.out_lint
+++ b/regress/mdoc/Dt/fourargs.out_lint
@@ -1,4 +1 @@
-mandoc: fourargs.in:2:25: ERROR: skipping excess arguments: Dt ... bogus
-mandoc: fourargs.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: fourargs.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: fourargs.in: BASE: RCS id missing: (OpenBSD)
+mandoc: fourargs.in:3:25: ERROR: skipping excess arguments: Dt ... bogus
diff --git a/regress/mdoc/Dt/fourargs.out_markdown b/regress/mdoc/Dt/fourargs.out_markdown
index 5d8a6f2f..f31786b7 100644
--- a/regress/mdoc/Dt/fourargs.out_markdown
+++ b/regress/mdoc/Dt/fourargs.out_markdown
@@ -8,4 +8,4 @@ DT-FOURARGS(1) - General Commands Manual (amd64)
some text
-OpenBSD - February 16, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dt/late.in b/regress/mdoc/Dt/late.in
index 2043eebe..85023012 100644
--- a/regress/mdoc/Dt/late.in
+++ b/regress/mdoc/Dt/late.in
@@ -1,5 +1,6 @@
-.Dd August 5, 2014
-.Os OpenBSD
+.\" $OpenBSD: late.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
+.Os
.Sh NAME
.Nm Dt-late
.Nd late title macro
diff --git a/regress/mdoc/Dt/late.out_ascii b/regress/mdoc/Dt/late.out_ascii
index c1830f2b..040aeb5c 100644
--- a/regress/mdoc/Dt/late.out_ascii
+++ b/regress/mdoc/Dt/late.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
inital text final text
-OpenBSD August 5, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dt/late.out_lint b/regress/mdoc/Dt/late.out_lint
index e29d9391..8c109bfb 100644
--- a/regress/mdoc/Dt/late.out_lint
+++ b/regress/mdoc/Dt/late.out_lint
@@ -1,5 +1,2 @@
-mandoc: late.in:2:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: late.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: late.in:8:2: WARNING: skipping late title macro: Dt
+mandoc: late.in:9:2: WARNING: skipping late title macro: Dt
mandoc: late.in: WARNING: missing manual title, using UNTITLED: EOF
-mandoc: late.in: BASE: RCS id missing: (OpenBSD)
diff --git a/regress/mdoc/Dt/late.out_markdown b/regress/mdoc/Dt/late.out_markdown
index 262acf0d..bb325953 100644
--- a/regress/mdoc/Dt/late.out_markdown
+++ b/regress/mdoc/Dt/late.out_markdown
@@ -9,4 +9,4 @@ UNTITLED - LOCAL
inital text
final text
-OpenBSD - August 5, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dt/missing.in b/regress/mdoc/Dt/missing.in
index 997eab63..ead4f381 100644
--- a/regress/mdoc/Dt/missing.in
+++ b/regress/mdoc/Dt/missing.in
@@ -1,5 +1,6 @@
-.Dd August 5, 2014
-.Os OpenBSD
+.\" $OpenBSD: missing.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
+.Os
.Sh NAME
.Nm Dt-missing
.Nd no title macro at all
diff --git a/regress/mdoc/Dt/missing.out_ascii b/regress/mdoc/Dt/missing.out_ascii
index b2dd22a3..54951f7b 100644
--- a/regress/mdoc/Dt/missing.out_ascii
+++ b/regress/mdoc/Dt/missing.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
some text
-OpenBSD August 5, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dt/missing.out_lint b/regress/mdoc/Dt/missing.out_lint
index 5e0efeb2..283a60d5 100644
--- a/regress/mdoc/Dt/missing.out_lint
+++ b/regress/mdoc/Dt/missing.out_lint
@@ -1,4 +1 @@
-mandoc: missing.in:2:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: missing.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
mandoc: missing.in: WARNING: missing manual title, using UNTITLED: EOF
-mandoc: missing.in: BASE: RCS id missing: (OpenBSD)
diff --git a/regress/mdoc/Dt/missing.out_markdown b/regress/mdoc/Dt/missing.out_markdown
index 792db2ad..a0461058 100644
--- a/regress/mdoc/Dt/missing.out_markdown
+++ b/regress/mdoc/Dt/missing.out_markdown
@@ -8,4 +8,4 @@ UNTITLED - LOCAL
some text
-OpenBSD - August 5, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dt/noarg.in b/regress/mdoc/Dt/noarg.in
index 9fddfc6b..c3ffd102 100644
--- a/regress/mdoc/Dt/noarg.in
+++ b/regress/mdoc/Dt/noarg.in
@@ -1,6 +1,7 @@
-.Dd August 5, 2014
+.\" $OpenBSD: noarg.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dt-noarg
.Nd title macro without arguments
diff --git a/regress/mdoc/Dt/noarg.out_ascii b/regress/mdoc/Dt/noarg.out_ascii
index bf6b7ed2..a5fd3fbd 100644
--- a/regress/mdoc/Dt/noarg.out_ascii
+++ b/regress/mdoc/Dt/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
some text
-OpenBSD August 5, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dt/noarg.out_lint b/regress/mdoc/Dt/noarg.out_lint
index c5cd8cfd..6604e632 100644
--- a/regress/mdoc/Dt/noarg.out_lint
+++ b/regress/mdoc/Dt/noarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: noarg.in:2:2: WARNING: missing manual title, using UNTITLED: Dt
-mandoc: noarg.in:2:2: WARNING: missing manual section, using "": Dt UNTITLED
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:3:2: WARNING: missing manual title, using UNTITLED: Dt
+mandoc: noarg.in:3:2: WARNING: missing manual section, using "": Dt UNTITLED
diff --git a/regress/mdoc/Dt/noarg.out_markdown b/regress/mdoc/Dt/noarg.out_markdown
index 81c27a0f..6e4acef1 100644
--- a/regress/mdoc/Dt/noarg.out_markdown
+++ b/regress/mdoc/Dt/noarg.out_markdown
@@ -8,4 +8,4 @@ UNTITLED - LOCAL
some text
-OpenBSD - August 5, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dt/nobody.in b/regress/mdoc/Dt/nobody.in
index cc184f9c..71028948 100644
--- a/regress/mdoc/Dt/nobody.in
+++ b/regress/mdoc/Dt/nobody.in
@@ -1,3 +1,4 @@
-.Dd June 20, 2014
+.\" $OpenBSD: nobody.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt DT-NOBODY 1
-.Os OpenBSD
+.Os
diff --git a/regress/mdoc/Dt/nobody.out_ascii b/regress/mdoc/Dt/nobody.out_ascii
index 1de2b81a..edac8b0b 100644
--- a/regress/mdoc/Dt/nobody.out_ascii
+++ b/regress/mdoc/Dt/nobody.out_ascii
@@ -1,3 +1,3 @@
DT-NOBODY(1) General Commands Manual DT-NOBODY(1)
-OpenBSD June 20, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dt/nobody.out_lint b/regress/mdoc/Dt/nobody.out_lint
index c797a44b..f5439fcd 100644
--- a/regress/mdoc/Dt/nobody.out_lint
+++ b/regress/mdoc/Dt/nobody.out_lint
@@ -1,4 +1 @@
-mandoc: nobody.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: nobody.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: nobody.in: BASE: RCS id missing: (OpenBSD)
mandoc: nobody.in: WARNING: no document body
diff --git a/regress/mdoc/Dt/nobody.out_markdown b/regress/mdoc/Dt/nobody.out_markdown
index 5b86c64c..c85ee61c 100644
--- a/regress/mdoc/Dt/nobody.out_markdown
+++ b/regress/mdoc/Dt/nobody.out_markdown
@@ -1,3 +1,3 @@
DT-NOBODY(1) - General Commands Manual
-OpenBSD - June 20, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dt/nosec.in b/regress/mdoc/Dt/nosec.in
index 6873c46b..c013c053 100644
--- a/regress/mdoc/Dt/nosec.in
+++ b/regress/mdoc/Dt/nosec.in
@@ -1,6 +1,7 @@
-.Dd August 5, 2014
+.\" $OpenBSD: nosec.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt DT-NOSEC
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dt-nosec
.Nd title macro without manual section
diff --git a/regress/mdoc/Dt/nosec.out_ascii b/regress/mdoc/Dt/nosec.out_ascii
index 028db82e..ae2ab8bd 100644
--- a/regress/mdoc/Dt/nosec.out_ascii
+++ b/regress/mdoc/Dt/nosec.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
some text
-OpenBSD August 5, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dt/nosec.out_lint b/regress/mdoc/Dt/nosec.out_lint
index 36ff892f..008819eb 100644
--- a/regress/mdoc/Dt/nosec.out_lint
+++ b/regress/mdoc/Dt/nosec.out_lint
@@ -1,4 +1 @@
-mandoc: nosec.in:2:2: WARNING: missing manual section, using "": Dt DT-NOSEC
-mandoc: nosec.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: nosec.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: nosec.in: BASE: RCS id missing: (OpenBSD)
+mandoc: nosec.in:3:2: WARNING: missing manual section, using "": Dt DT-NOSEC
diff --git a/regress/mdoc/Dt/nosec.out_markdown b/regress/mdoc/Dt/nosec.out_markdown
index cebe8e63..6f67320b 100644
--- a/regress/mdoc/Dt/nosec.out_markdown
+++ b/regress/mdoc/Dt/nosec.out_markdown
@@ -8,4 +8,4 @@ DT-NOSEC - LOCAL
some text
-OpenBSD - August 5, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dt/order.in b/regress/mdoc/Dt/order.in
index 04bbaa51..5c0ea7c1 100644
--- a/regress/mdoc/Dt/order.in
+++ b/regress/mdoc/Dt/order.in
@@ -1,5 +1,6 @@
-.Dd June 13, 2014
-.Os OpenBSD
+.\" $OpenBSD: order.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
+.Os
.Dt DT-ORDER 1
.Sh NAME
.Nm Dt-order
diff --git a/regress/mdoc/Dt/order.out_ascii b/regress/mdoc/Dt/order.out_ascii
index 6524bcab..49bd969e 100644
--- a/regress/mdoc/Dt/order.out_ascii
+++ b/regress/mdoc/Dt/order.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
some text
-OpenBSD June 13, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dt/order.out_lint b/regress/mdoc/Dt/order.out_lint
index e393ccb6..bad1c316 100644
--- a/regress/mdoc/Dt/order.out_lint
+++ b/regress/mdoc/Dt/order.out_lint
@@ -1,4 +1 @@
-mandoc: order.in:2:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: order.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: order.in:3:2: WARNING: prologue macros out of order: Dt after Os
-mandoc: order.in: BASE: RCS id missing: (OpenBSD)
+mandoc: order.in:4:2: WARNING: prologue macros out of order: Dt after Os
diff --git a/regress/mdoc/Dt/order.out_markdown b/regress/mdoc/Dt/order.out_markdown
index 7d55fe99..f4b8afaa 100644
--- a/regress/mdoc/Dt/order.out_markdown
+++ b/regress/mdoc/Dt/order.out_markdown
@@ -8,4 +8,4 @@ DT-ORDER(1) - General Commands Manual
some text
-OpenBSD - June 13, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dv/font.in b/regress/mdoc/Dv/font.in
index 8d9e370b..72a68376 100644
--- a/regress/mdoc/Dv/font.in
+++ b/regress/mdoc/Dv/font.in
@@ -1,6 +1,7 @@
-.Dd October 21, 2011
+.\" $OpenBSD: font.in,v 1.5 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt DV-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dv-font
.Nd formatting of defined variables
diff --git a/regress/mdoc/Dv/font.out_ascii b/regress/mdoc/Dv/font.out_ascii
index 82013346..ce45614f 100644
--- a/regress/mdoc/Dv/font.out_ascii
+++ b/regress/mdoc/Dv/font.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
And with some _e_m_b_e_d_d_e_d string; bboolldd.
-OpenBSD October 21, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dv/font.out_markdown b/regress/mdoc/Dv/font.out_markdown
index 0bf567d8..e61baa31 100644
--- a/regress/mdoc/Dv/font.out_markdown
+++ b/regress/mdoc/Dv/font.out_markdown
@@ -13,4 +13,4 @@ macro.
And with
`some embedded string`; **bold**.
-OpenBSD - October 21, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Dv/noarg.in b/regress/mdoc/Dv/noarg.in
index a2b54d86..2a13f8e4 100644
--- a/regress/mdoc/Dv/noarg.in
+++ b/regress/mdoc/Dv/noarg.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: noarg.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt DV-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Dv-noarg
.Nd defined variable macro without an argument
diff --git a/regress/mdoc/Dv/noarg.out_ascii b/regress/mdoc/Dv/noarg.out_ascii
index 7e934d63..77a945b7 100644
--- a/regress/mdoc/Dv/noarg.out_ascii
+++ b/regress/mdoc/Dv/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with variable: NULL. no variable: end of test document
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Dv/noarg.out_lint b/regress/mdoc/Dv/noarg.out_lint
index 83fe5b5d..620c0e44 100644
--- a/regress/mdoc/Dv/noarg.out_lint
+++ b/regress/mdoc/Dv/noarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: Dv
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: noarg.in:9:9: STYLE: no blank before trailing delimiter: Dv NULL.
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: Dv
+mandoc: noarg.in:10:9: STYLE: no blank before trailing delimiter: Dv NULL.
diff --git a/regress/mdoc/Dv/noarg.out_markdown b/regress/mdoc/Dv/noarg.out_markdown
index 6cb859d1..70e87ebc 100644
--- a/regress/mdoc/Dv/noarg.out_markdown
+++ b/regress/mdoc/Dv/noarg.out_markdown
@@ -11,4 +11,4 @@ with variable:
no variable:
end of test document
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Em/font.in b/regress/mdoc/Em/font.in
index 3e547d63..0f4a6c96 100644
--- a/regress/mdoc/Em/font.in
+++ b/regress/mdoc/Em/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EM-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Em-font
.Nd changing fonts inside the emphasis macro
diff --git a/regress/mdoc/Em/font.out_ascii b/regress/mdoc/Em/font.out_ascii
index f461c7ae..dbe88e9d 100644
--- a/regress/mdoc/Em/font.out_ascii
+++ b/regress/mdoc/Em/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Em/font.out_markdown b/regress/mdoc/Em/font.out_markdown
index fc851fe4..42b8c46a 100644
--- a/regress/mdoc/Em/font.out_markdown
+++ b/regress/mdoc/Em/font.out_markdown
@@ -10,4 +10,4 @@ normal text
*emphasis**bold**back*
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Em/noarg.in b/regress/mdoc/Em/noarg.in
index 9096280a..6e85ed89 100644
--- a/regress/mdoc/Em/noarg.in
+++ b/regress/mdoc/Em/noarg.in
@@ -1,6 +1,7 @@
-.Dd January 19, 2011
+.\" $OpenBSD: noarg.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EM-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Em-noarg
.Nd emphasis macro without arguments
diff --git a/regress/mdoc/Em/noarg.out_ascii b/regress/mdoc/Em/noarg.out_ascii
index 2489797a..465f78bf 100644
--- a/regress/mdoc/Em/noarg.out_ascii
+++ b/regress/mdoc/Em/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with argument _a_r_g no argument end of test document
-OpenBSD January 19, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Em/noarg.out_lint b/regress/mdoc/Em/noarg.out_lint
index 4f977b32..0047f8de 100644
--- a/regress/mdoc/Em/noarg.out_lint
+++ b/regress/mdoc/Em/noarg.out_lint
@@ -1,4 +1 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: Em
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: Em
diff --git a/regress/mdoc/Em/noarg.out_markdown b/regress/mdoc/Em/noarg.out_markdown
index 7c3b984a..3a900974 100644
--- a/regress/mdoc/Em/noarg.out_markdown
+++ b/regress/mdoc/Em/noarg.out_markdown
@@ -11,4 +11,4 @@ with argument
no argument
end of test document
-OpenBSD - January 19, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Em/punct.in b/regress/mdoc/Em/punct.in
index 5d3cc514..d7de84d6 100644
--- a/regress/mdoc/Em/punct.in
+++ b/regress/mdoc/Em/punct.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: punct.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EM-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Em-punct
.Nd punctuation following an emphasis macro
diff --git a/regress/mdoc/Em/punct.out_ascii b/regress/mdoc/Em/punct.out_ascii
index 7ab059cb..4a50b1d3 100644
--- a/regress/mdoc/Em/punct.out_ascii
+++ b/regress/mdoc/Em/punct.out_ascii
@@ -25,4 +25,4 @@ DDEESSCCRRIIPPTTIIOONN
Missing blank: _a_.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Em/punct.out_lint b/regress/mdoc/Em/punct.out_lint
index 8b660de3..5280c87c 100644
--- a/regress/mdoc/Em/punct.out_lint
+++ b/regress/mdoc/Em/punct.out_lint
@@ -1,4 +1,3 @@
-mandoc: punct.in:48:7: WARNING: skipping empty macro: Em
mandoc: punct.in:49:7: WARNING: skipping empty macro: Em
mandoc: punct.in:50:7: WARNING: skipping empty macro: Em
mandoc: punct.in:51:7: WARNING: skipping empty macro: Em
@@ -9,7 +8,7 @@ mandoc: punct.in:55:7: WARNING: skipping empty macro: Em
mandoc: punct.in:56:7: WARNING: skipping empty macro: Em
mandoc: punct.in:57:7: WARNING: skipping empty macro: Em
mandoc: punct.in:58:7: WARNING: skipping empty macro: Em
-mandoc: punct.in:61:7: WARNING: skipping empty macro: Em
+mandoc: punct.in:59:7: WARNING: skipping empty macro: Em
mandoc: punct.in:62:7: WARNING: skipping empty macro: Em
mandoc: punct.in:63:7: WARNING: skipping empty macro: Em
mandoc: punct.in:64:7: WARNING: skipping empty macro: Em
@@ -20,10 +19,8 @@ mandoc: punct.in:68:7: WARNING: skipping empty macro: Em
mandoc: punct.in:69:7: WARNING: skipping empty macro: Em
mandoc: punct.in:70:7: WARNING: skipping empty macro: Em
mandoc: punct.in:71:7: WARNING: skipping empty macro: Em
-mandoc: punct.in:74:7: WARNING: skipping empty macro: Em
+mandoc: punct.in:72:7: WARNING: skipping empty macro: Em
mandoc: punct.in:75:7: WARNING: skipping empty macro: Em
-mandoc: punct.in:83:2: WARNING: skipping empty macro: Em
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: punct.in:86:6: STYLE: no blank before trailing delimiter: Em a.
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:76:7: WARNING: skipping empty macro: Em
+mandoc: punct.in:84:2: WARNING: skipping empty macro: Em
+mandoc: punct.in:87:6: STYLE: no blank before trailing delimiter: Em a.
diff --git a/regress/mdoc/Em/punct.out_markdown b/regress/mdoc/Em/punct.out_markdown
index 114a1ac2..495fe252 100644
--- a/regress/mdoc/Em/punct.out_markdown
+++ b/regress/mdoc/Em/punct.out_markdown
@@ -86,4 +86,4 @@ Quoted:
Missing blank:
*a.*
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Eo/break.in b/regress/mdoc/Eo/break.in
index 001d7ac5..624e9f2e 100644
--- a/regress/mdoc/Eo/break.in
+++ b/regress/mdoc/Eo/break.in
@@ -1,6 +1,7 @@
-.Dd February 1, 2015
+.\" $OpenBSD: break.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EO-BREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Eo-break
.Nd breaking a custom enclosure block
diff --git a/regress/mdoc/Eo/break.out_ascii b/regress/mdoc/Eo/break.out_ascii
index d4a66343..de4f079a 100644
--- a/regress/mdoc/Eo/break.out_ascii
+++ b/regress/mdoc/Eo/break.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
opening only <<[ bc] broken [bo <<eo bc] ec>> no content [bo <<]>> no
opening [bo eo bc] ec>> closing only [bo ]>> final text
-OpenBSD February 1, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Eo/break.out_lint b/regress/mdoc/Eo/break.out_lint
index daff4993..d418f581 100644
--- a/regress/mdoc/Eo/break.out_lint
+++ b/regress/mdoc/Eo/break.out_lint
@@ -1,11 +1,8 @@
-mandoc: break.in:14:2: WARNING: blocks badly nested: Eo breaks Bo
-mandoc: break.in:23:2: WARNING: blocks badly nested: Eo breaks Bo
-mandoc: break.in:29:2: WARNING: blocks badly nested: Eo breaks Bo
-mandoc: break.in:35:2: WARNING: blocks badly nested: Eo breaks Bo
-mandoc: break.in:44:2: WARNING: blocks badly nested: Bo breaks Eo
-mandoc: break.in:51:2: WARNING: blocks badly nested: Bo breaks Eo
-mandoc: break.in:59:2: WARNING: blocks badly nested: Bo breaks Eo
-mandoc: break.in:66:2: WARNING: blocks badly nested: Bo breaks Eo
-mandoc: break.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: break.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: break.in: BASE: RCS id missing: (OpenBSD)
+mandoc: break.in:15:2: WARNING: blocks badly nested: Eo breaks Bo
+mandoc: break.in:24:2: WARNING: blocks badly nested: Eo breaks Bo
+mandoc: break.in:30:2: WARNING: blocks badly nested: Eo breaks Bo
+mandoc: break.in:36:2: WARNING: blocks badly nested: Eo breaks Bo
+mandoc: break.in:45:2: WARNING: blocks badly nested: Bo breaks Eo
+mandoc: break.in:52:2: WARNING: blocks badly nested: Bo breaks Eo
+mandoc: break.in:60:2: WARNING: blocks badly nested: Bo breaks Eo
+mandoc: break.in:67:2: WARNING: blocks badly nested: Bo breaks Eo
diff --git a/regress/mdoc/Eo/break.out_markdown b/regress/mdoc/Eo/break.out_markdown
index be1ea241..681be419 100644
--- a/regress/mdoc/Eo/break.out_markdown
+++ b/regress/mdoc/Eo/break.out_markdown
@@ -40,4 +40,4 @@ closing only
]&gt;&gt;
final text
-OpenBSD - February 1, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Eo/empty.in b/regress/mdoc/Eo/empty.in
index b971b6dc..ea364cc9 100644
--- a/regress/mdoc/Eo/empty.in
+++ b/regress/mdoc/Eo/empty.in
@@ -1,6 +1,7 @@
-.Dd February 1, 2015
+.\" $OpenBSD: empty.in,v 1.5 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EO-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Eo-empty
.Nd empty implicit enclosure macros
diff --git a/regress/mdoc/Eo/empty.out_ascii b/regress/mdoc/Eo/empty.out_ascii
index 96849bb0..344f2bfd 100644
--- a/regress/mdoc/Eo/empty.out_ascii
+++ b/regress/mdoc/Eo/empty.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
closing <<prefix stray closing
>> end of file
-OpenBSD February 1, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Eo/empty.out_markdown b/regress/mdoc/Eo/empty.out_markdown
index 506a4a09..7507d781 100644
--- a/regress/mdoc/Eo/empty.out_markdown
+++ b/regress/mdoc/Eo/empty.out_markdown
@@ -32,4 +32,4 @@ stray closing
&gt;&gt;
end of file
-OpenBSD - February 1, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Eo/obsolete.in b/regress/mdoc/Eo/obsolete.in
index 2640f2aa..40d34177 100644
--- a/regress/mdoc/Eo/obsolete.in
+++ b/regress/mdoc/Eo/obsolete.in
@@ -1,6 +1,7 @@
-.Dd July 2, 2014
+.\" $OpenBSD: obsolete.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EO-OBSOLETE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Eo-obsolete
.Nd obsolete enclosure macros
diff --git a/regress/mdoc/Eo/obsolete.out_ascii b/regress/mdoc/Eo/obsolete.out_ascii
index cba2fc7d..46012dbb 100644
--- a/regress/mdoc/Eo/obsolete.out_ascii
+++ b/regress/mdoc/Eo/obsolete.out_ascii
@@ -11,4 +11,4 @@ DDEESSCCRRIIPPTTIIOONN
initial text after empty Es final text
-OpenBSD July 2, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Eo/obsolete.out_lint b/regress/mdoc/Eo/obsolete.out_lint
index 8d5adc03..649c62a8 100644
--- a/regress/mdoc/Eo/obsolete.out_lint
+++ b/regress/mdoc/Eo/obsolete.out_lint
@@ -1,9 +1,6 @@
-mandoc: obsolete.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: obsolete.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: obsolete.in:8:2: WARNING: obsolete macro: En
-mandoc: obsolete.in:10:2: WARNING: obsolete macro: Es
-mandoc: obsolete.in:12:2: WARNING: obsolete macro: En
-mandoc: obsolete.in:14:2: WARNING: obsolete macro: En
-mandoc: obsolete.in:17:2: WARNING: obsolete macro: Es
-mandoc: obsolete.in:19:2: WARNING: obsolete macro: En
-mandoc: obsolete.in: BASE: RCS id missing: (OpenBSD)
+mandoc: obsolete.in:9:2: WARNING: obsolete macro: En
+mandoc: obsolete.in:11:2: WARNING: obsolete macro: Es
+mandoc: obsolete.in:13:2: WARNING: obsolete macro: En
+mandoc: obsolete.in:15:2: WARNING: obsolete macro: En
+mandoc: obsolete.in:18:2: WARNING: obsolete macro: Es
+mandoc: obsolete.in:20:2: WARNING: obsolete macro: En
diff --git a/regress/mdoc/Eo/obsolete.out_markdown b/regress/mdoc/Eo/obsolete.out_markdown
index 200ea657..8e125547 100644
--- a/regress/mdoc/Eo/obsolete.out_markdown
+++ b/regress/mdoc/Eo/obsolete.out_markdown
@@ -19,4 +19,4 @@ initial text
after empty Es
final text
-OpenBSD - July 2, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Eo/unclosed.in b/regress/mdoc/Eo/unclosed.in
index 59b6d527..0187fb6d 100644
--- a/regress/mdoc/Eo/unclosed.in
+++ b/regress/mdoc/Eo/unclosed.in
@@ -1,6 +1,7 @@
-.Dd February 11, 2015
+.\" $OpenBSD: unclosed.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EO-UNCLOSED 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Eo-unclosed
.Nd unclosed custom enclosure block
diff --git a/regress/mdoc/Eo/unclosed.out_ascii b/regress/mdoc/Eo/unclosed.out_ascii
index 0d32206f..7cef08ff 100644
--- a/regress/mdoc/Eo/unclosed.out_ascii
+++ b/regress/mdoc/Eo/unclosed.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
before block <<
-OpenBSD February 11, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Eo/unclosed.out_lint b/regress/mdoc/Eo/unclosed.out_lint
index e40a41d8..85ca34d1 100644
--- a/regress/mdoc/Eo/unclosed.out_lint
+++ b/regress/mdoc/Eo/unclosed.out_lint
@@ -1,4 +1 @@
-mandoc: unclosed.in:9:2: ERROR: appending missing end of block: Eo
-mandoc: unclosed.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: unclosed.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: unclosed.in: BASE: RCS id missing: (OpenBSD)
+mandoc: unclosed.in:10:2: ERROR: appending missing end of block: Eo
diff --git a/regress/mdoc/Eo/unclosed.out_markdown b/regress/mdoc/Eo/unclosed.out_markdown
index 105f4dc3..17ce6b5c 100644
--- a/regress/mdoc/Eo/unclosed.out_markdown
+++ b/regress/mdoc/Eo/unclosed.out_markdown
@@ -9,4 +9,4 @@ EO-UNCLOSED(1) - General Commands Manual
before block
&lt;&lt;
-OpenBSD - February 11, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Er/font.in b/regress/mdoc/Er/font.in
index 4e3d337b..604ae755 100644
--- a/regress/mdoc/Er/font.in
+++ b/regress/mdoc/Er/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt ER-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Er-font
.Nd changing fonts inside the error code macro
diff --git a/regress/mdoc/Er/font.out_ascii b/regress/mdoc/Er/font.out_ascii
index cfe462bd..ee0a5da9 100644
--- a/regress/mdoc/Er/font.out_ascii
+++ b/regress/mdoc/Er/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text EFONT_e_m_p_h_a_s_i_sEBACK trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Er/font.out_markdown b/regress/mdoc/Er/font.out_markdown
index a901f593..4cc1fe8b 100644
--- a/regress/mdoc/Er/font.out_markdown
+++ b/regress/mdoc/Er/font.out_markdown
@@ -10,4 +10,4 @@ normal text
`EFONTemphasisEBACK`
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Er/noarg.in b/regress/mdoc/Er/noarg.in
index 646d3d54..a2c006b4 100644
--- a/regress/mdoc/Er/noarg.in
+++ b/regress/mdoc/Er/noarg.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: noarg.in,v 1.5 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt ER-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Er-noarg
.Nd error constant macro without an argument
diff --git a/regress/mdoc/Er/noarg.out_ascii b/regress/mdoc/Er/noarg.out_ascii
index ed7b16a9..f881ccde 100644
--- a/regress/mdoc/Er/noarg.out_ascii
+++ b/regress/mdoc/Er/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with error: ENOENT; bboolldd; EIO. no error: end of test document
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Er/noarg.out_lint b/regress/mdoc/Er/noarg.out_lint
index 50946ea2..afed768e 100644
--- a/regress/mdoc/Er/noarg.out_lint
+++ b/regress/mdoc/Er/noarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: noarg.in:12:2: WARNING: skipping empty macro: Er
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: noarg.in:10:8: STYLE: no blank before trailing delimiter: Er EIO.
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:13:2: WARNING: skipping empty macro: Er
+mandoc: noarg.in:11:8: STYLE: no blank before trailing delimiter: Er EIO.
diff --git a/regress/mdoc/Er/noarg.out_markdown b/regress/mdoc/Er/noarg.out_markdown
index 47d378d8..4337d917 100644
--- a/regress/mdoc/Er/noarg.out_markdown
+++ b/regress/mdoc/Er/noarg.out_markdown
@@ -12,4 +12,4 @@ with error:
no error:
end of test document
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ev/font.in b/regress/mdoc/Ev/font.in
index 75237cb0..859295bd 100644
--- a/regress/mdoc/Ev/font.in
+++ b/regress/mdoc/Ev/font.in
@@ -1,6 +1,7 @@
-.Dd October 21, 2011
+.\" $OpenBSD: font.in,v 1.5 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EV-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ev-font
.Nd formatting of environment variables
diff --git a/regress/mdoc/Ev/font.out_ascii b/regress/mdoc/Ev/font.out_ascii
index a5dc5399..44cc5c20 100644
--- a/regress/mdoc/Ev/font.out_ascii
+++ b/regress/mdoc/Ev/font.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
And with some _e_m_b_e_d_d_e_d string; bboolldd..
-OpenBSD October 21, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ev/font.out_markdown b/regress/mdoc/Ev/font.out_markdown
index f2bac6dc..603a15c1 100644
--- a/regress/mdoc/Ev/font.out_markdown
+++ b/regress/mdoc/Ev/font.out_markdown
@@ -13,4 +13,4 @@ variable.
And with
`some embedded string`; **bold.**
-OpenBSD - October 21, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ev/noarg.in b/regress/mdoc/Ev/noarg.in
index 953986b7..7087d9d3 100644
--- a/regress/mdoc/Ev/noarg.in
+++ b/regress/mdoc/Ev/noarg.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: noarg.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EV-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ev-noarg
.Nd environment variable macro without an argument
diff --git a/regress/mdoc/Ev/noarg.out_ascii b/regress/mdoc/Ev/noarg.out_ascii
index f5dc1ad4..82b2b40f 100644
--- a/regress/mdoc/Ev/noarg.out_ascii
+++ b/regress/mdoc/Ev/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with variable: HOME. no variable: end of test document
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ev/noarg.out_lint b/regress/mdoc/Ev/noarg.out_lint
index d29526f3..ded8eeb8 100644
--- a/regress/mdoc/Ev/noarg.out_lint
+++ b/regress/mdoc/Ev/noarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: Ev
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: noarg.in:9:9: STYLE: no blank before trailing delimiter: Ev HOME.
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: Ev
+mandoc: noarg.in:10:9: STYLE: no blank before trailing delimiter: Ev HOME.
diff --git a/regress/mdoc/Ev/noarg.out_markdown b/regress/mdoc/Ev/noarg.out_markdown
index aad020eb..926ce989 100644
--- a/regress/mdoc/Ev/noarg.out_markdown
+++ b/regress/mdoc/Ev/noarg.out_markdown
@@ -11,4 +11,4 @@ with variable:
no variable:
end of test document
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ex/args.in b/regress/mdoc/Ex/args.in
index 39a53b74..36e29875 100644
--- a/regress/mdoc/Ex/args.in
+++ b/regress/mdoc/Ex/args.in
@@ -1,6 +1,7 @@
-.Dd July 29, 2014
+.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EX-ARGS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ex-args
.Nd arguments to the exit value macro
diff --git a/regress/mdoc/Ex/args.out_ascii b/regress/mdoc/Ex/args.out_ascii
index d217c36a..b6bdfe2c 100644
--- a/regress/mdoc/Ex/args.out_ascii
+++ b/regress/mdoc/Ex/args.out_ascii
@@ -13,4 +13,4 @@ EEXXIITT SSTTAATTUUSS
two arguments:
The oonnee and ttwwoo utilities exit 0 on success, and >0 if an error occurs.
-OpenBSD July 29, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ex/args.out_markdown b/regress/mdoc/Ex/args.out_markdown
index 9c70152e..5fe2542d 100644
--- a/regress/mdoc/Ex/args.out_markdown
+++ b/regress/mdoc/Ex/args.out_markdown
@@ -15,4 +15,4 @@ The **one** utility exits&#160;0 on success, and&#160;&gt;0 if an error occurs.
two arguments:
The **one** and **two** utilities exit&#160;0 on success, and&#160;&gt;0 if an error occurs.
-OpenBSD - July 29, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ex/noname.in b/regress/mdoc/Ex/noname.in
index 9aa742f2..41843c0e 100644
--- a/regress/mdoc/Ex/noname.in
+++ b/regress/mdoc/Ex/noname.in
@@ -1,6 +1,7 @@
-.Dd July 29, 2014
+.\" $OpenBSD: noname.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EX-NONAME 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm
.Nd exit value macro without an available name
diff --git a/regress/mdoc/Ex/noname.out_ascii b/regress/mdoc/Ex/noname.out_ascii
index 00da4a6b..b078d8e8 100644
--- a/regress/mdoc/Ex/noname.out_ascii
+++ b/regress/mdoc/Ex/noname.out_ascii
@@ -13,4 +13,4 @@ EEXXIITT SSTTAATTUUSS
two arguments:
The oonnee and ttwwoo utilities exit 0 on success, and >0 if an error occurs.
-OpenBSD July 29, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ex/noname.out_lint b/regress/mdoc/Ex/noname.out_lint
index 5b04c1c6..8097c475 100644
--- a/regress/mdoc/Ex/noname.out_lint
+++ b/regress/mdoc/Ex/noname.out_lint
@@ -1,5 +1,2 @@
-mandoc: noname.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noname.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: noname.in:5:2: ERROR: missing manual name, using "": Nm
-mandoc: noname.in:9:2: WARNING: missing utility name, using "": Ex
-mandoc: noname.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noname.in:6:2: ERROR: missing manual name, using "": Nm
+mandoc: noname.in:10:2: WARNING: missing utility name, using "": Ex
diff --git a/regress/mdoc/Ex/noname.out_markdown b/regress/mdoc/Ex/noname.out_markdown
index 4fad75bb..31310326 100644
--- a/regress/mdoc/Ex/noname.out_markdown
+++ b/regress/mdoc/Ex/noname.out_markdown
@@ -15,4 +15,4 @@ The **one** utility exits&#160;0 on success, and&#160;&gt;0 if an error occurs.
two arguments:
The **one** and **two** utilities exit&#160;0 on success, and&#160;&gt;0 if an error occurs.
-OpenBSD - July 29, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ex/nostd.in b/regress/mdoc/Ex/nostd.in
index 4722cba8..2f31abfe 100644
--- a/regress/mdoc/Ex/nostd.in
+++ b/regress/mdoc/Ex/nostd.in
@@ -1,6 +1,7 @@
-.Dd July 29, 2014
+.\" $OpenBSD: nostd.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt EX-NOSTD 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ex-nostd
.Nd exit value macros without -std arguments
diff --git a/regress/mdoc/Ex/nostd.out_ascii b/regress/mdoc/Ex/nostd.out_ascii
index 04abc9e9..ada3bf15 100644
--- a/regress/mdoc/Ex/nostd.out_ascii
+++ b/regress/mdoc/Ex/nostd.out_ascii
@@ -13,4 +13,4 @@ EEXXIITT SSTTAATTUUSS
two arguments:
The oonnee and ttwwoo utilities exit 0 on success, and >0 if an error occurs.
-OpenBSD July 29, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ex/nostd.out_lint b/regress/mdoc/Ex/nostd.out_lint
index 9a4ab207..0b8ff710 100644
--- a/regress/mdoc/Ex/nostd.out_lint
+++ b/regress/mdoc/Ex/nostd.out_lint
@@ -1,6 +1,3 @@
-mandoc: nostd.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: nostd.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: nostd.in:9:2: WARNING: missing -std argument, adding it: Ex
-mandoc: nostd.in:12:2: WARNING: missing -std argument, adding it: Ex
-mandoc: nostd.in:15:2: WARNING: missing -std argument, adding it: Ex
-mandoc: nostd.in: BASE: RCS id missing: (OpenBSD)
+mandoc: nostd.in:10:2: WARNING: missing -std argument, adding it: Ex
+mandoc: nostd.in:13:2: WARNING: missing -std argument, adding it: Ex
+mandoc: nostd.in:16:2: WARNING: missing -std argument, adding it: Ex
diff --git a/regress/mdoc/Ex/nostd.out_markdown b/regress/mdoc/Ex/nostd.out_markdown
index c3020fcb..e1ba0ed2 100644
--- a/regress/mdoc/Ex/nostd.out_markdown
+++ b/regress/mdoc/Ex/nostd.out_markdown
@@ -15,4 +15,4 @@ The **one** utility exits&#160;0 on success, and&#160;&gt;0 if an error occurs.
two arguments:
The **one** and **two** utilities exit&#160;0 on success, and&#160;&gt;0 if an error occurs.
-OpenBSD - July 29, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fd/break.in b/regress/mdoc/Fd/break.in
index e6fd9023..c97656a3 100644
--- a/regress/mdoc/Fd/break.in
+++ b/regress/mdoc/Fd/break.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2010
+.\" $OpenBSD: break.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FD-BREAK 2
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fd-break
.Nd line break before old-style header include file
diff --git a/regress/mdoc/Fd/break.out_ascii b/regress/mdoc/Fd/break.out_ascii
index fdd6aae4..be1e714d 100644
--- a/regress/mdoc/Fd/break.out_ascii
+++ b/regress/mdoc/Fd/break.out_ascii
@@ -24,4 +24,4 @@ DDEESSCCRRIIPPTTIIOONN
##iinncclluuddee <<uunniissttdd..hh>>
_i_n_t dduupp(_i_n_t _o_l_d_d) _s_s_i_z_e___t wwrriittee(_i_n_t _d, _c_o_n_s_t _v_o_i_d _*_b_u_f, _s_i_z_e___t _n_b_y_t_e_s)
-OpenBSD June 9, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fd/break.out_markdown b/regress/mdoc/Fd/break.out_markdown
index 1d8459a1..8958dcff 100644
--- a/regress/mdoc/Fd/break.out_markdown
+++ b/regress/mdoc/Fd/break.out_markdown
@@ -32,4 +32,4 @@ FD-BREAK(2) - System Calls Manual
*ssize\_t*
**write**(*int d*, *const void \*buf*, *size\_t nbytes*)
-OpenBSD - June 9, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fd/empty.in b/regress/mdoc/Fd/empty.in
index 5951316d..8f9ccc8b 100644
--- a/regress/mdoc/Fd/empty.in
+++ b/regress/mdoc/Fd/empty.in
@@ -1,6 +1,7 @@
-.Dd February 5, 2015
+.\" $OpenBSD: empty.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FD-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fd-empty
.Nd empty preprocessor directive macros
diff --git a/regress/mdoc/Fd/empty.out_ascii b/regress/mdoc/Fd/empty.out_ascii
index d525b482..fe9c1e29 100644
--- a/regress/mdoc/Fd/empty.out_ascii
+++ b/regress/mdoc/Fd/empty.out_ascii
@@ -10,4 +10,4 @@ SSYYNNOOPPSSIISS
DDEESSCCRRIIPPTTIIOONN
leading text trailing text
-OpenBSD February 5, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fd/empty.out_lint b/regress/mdoc/Fd/empty.out_lint
index f1b8b303..991b2dda 100644
--- a/regress/mdoc/Fd/empty.out_lint
+++ b/regress/mdoc/Fd/empty.out_lint
@@ -1,5 +1,2 @@
-mandoc: empty.in:9:2: WARNING: skipping empty macro: Fd
-mandoc: empty.in:13:2: WARNING: skipping empty macro: Fd
-mandoc: empty.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: empty.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:10:2: WARNING: skipping empty macro: Fd
+mandoc: empty.in:14:2: WARNING: skipping empty macro: Fd
diff --git a/regress/mdoc/Fd/empty.out_markdown b/regress/mdoc/Fd/empty.out_markdown
index 9dc71039..bd2ef819 100644
--- a/regress/mdoc/Fd/empty.out_markdown
+++ b/regress/mdoc/Fd/empty.out_markdown
@@ -14,4 +14,4 @@ FD-EMPTY(1) - General Commands Manual
leading text
trailing text
-OpenBSD - February 5, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fd/eos.in b/regress/mdoc/Fd/eos.in
index f2efb028..499d0010 100644
--- a/regress/mdoc/Fd/eos.in
+++ b/regress/mdoc/Fd/eos.in
@@ -1,6 +1,7 @@
-.Dd November 17, 2012
+.\" $OpenBSD: eos.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FD-EOS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fd-eos
.Nd end of sentence handling after the legacy include macro
diff --git a/regress/mdoc/Fd/eos.out_ascii b/regress/mdoc/Fd/eos.out_ascii
index 3d54ac3e..487c6a74 100644
--- a/regress/mdoc/Fd/eos.out_ascii
+++ b/regress/mdoc/Fd/eos.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
Let's use ssttrriinngg..hh ..
And then something else.
-OpenBSD November 17, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fd/eos.out_markdown b/regress/mdoc/Fd/eos.out_markdown
index c415843d..8ec48cbb 100644
--- a/regress/mdoc/Fd/eos.out_markdown
+++ b/regress/mdoc/Fd/eos.out_markdown
@@ -10,4 +10,4 @@ Let's use
**string.h .**
And then something else.
-OpenBSD - November 17, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fd/font.in b/regress/mdoc/Fd/font.in
index a3a0a830..91a24459 100644
--- a/regress/mdoc/Fd/font.in
+++ b/regress/mdoc/Fd/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FD-FONT 2
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fd-font
.Nd changing the font inside the old-style include macro
diff --git a/regress/mdoc/Fd/font.out_ascii b/regress/mdoc/Fd/font.out_ascii
index 7a3428fe..cafe9387 100644
--- a/regress/mdoc/Fd/font.out_ascii
+++ b/regress/mdoc/Fd/font.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
normal text pprreeffiixx_h_e_a_d_e_rssuuffffiixx
trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fd/font.out_markdown b/regress/mdoc/Fd/font.out_markdown
index d90fae68..7636ed4e 100644
--- a/regress/mdoc/Fd/font.out_markdown
+++ b/regress/mdoc/Fd/font.out_markdown
@@ -10,4 +10,4 @@ normal text
**prefix*header*suffix**
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fl/font.in b/regress/mdoc/Fl/font.in
index c7514d31..2f7d9d6a 100644
--- a/regress/mdoc/Fl/font.in
+++ b/regress/mdoc/Fl/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FL-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fl-font
.Nd changing fonts inside the flag macro
diff --git a/regress/mdoc/Fl/font.out_ascii b/regress/mdoc/Fl/font.out_ascii
index 495c8975..a9c06ac4 100644
--- a/regress/mdoc/Fl/font.out_ascii
+++ b/regress/mdoc/Fl/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text --bboolldd_e_m_p_h_a_s_i_sbbaacckk trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fl/font.out_markdown b/regress/mdoc/Fl/font.out_markdown
index cb48c802..73029acf 100644
--- a/regress/mdoc/Fl/font.out_markdown
+++ b/regress/mdoc/Fl/font.out_markdown
@@ -10,4 +10,4 @@ normal text
**-bold*emphasis*back**
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fl/multiarg.in b/regress/mdoc/Fl/multiarg.in
index 77a9068e..aa11d515 100644
--- a/regress/mdoc/Fl/multiarg.in
+++ b/regress/mdoc/Fl/multiarg.in
@@ -1,6 +1,7 @@
-.Dd December 24, 2009
+.\" $OpenBSD: multiarg.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FL-MULTIARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fl-multiarg
.Nd multiple arguments to a Fl macro
diff --git a/regress/mdoc/Fl/multiarg.out_ascii b/regress/mdoc/Fl/multiarg.out_ascii
index 0ad669e2..a2db7caa 100644
--- a/regress/mdoc/Fl/multiarg.out_ascii
+++ b/regress/mdoc/Fl/multiarg.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
Punctuation characters like in [--aa | --bb] get no dash.
-OpenBSD December 24, 2009 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fl/multiarg.out_markdown b/regress/mdoc/Fl/multiarg.out_markdown
index 065c7742..c9a68a0d 100644
--- a/regress/mdoc/Fl/multiarg.out_markdown
+++ b/regress/mdoc/Fl/multiarg.out_markdown
@@ -14,4 +14,4 @@ Punctuation characters like in
\[**-a** | **-b**]
get no dash.
-OpenBSD - December 24, 2009
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fl/noarg.in b/regress/mdoc/Fl/noarg.in
index 0c604dbc..247a733e 100644
--- a/regress/mdoc/Fl/noarg.in
+++ b/regress/mdoc/Fl/noarg.in
@@ -1,6 +1,7 @@
-.Dd August 21, 2014
+.\" $OpenBSD: noarg.in,v 1.6 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FL-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fl-noarg
.Nd Fl macro without arguments
diff --git a/regress/mdoc/Fl/noarg.out_ascii b/regress/mdoc/Fl/noarg.out_ascii
index eb230269..84749744 100644
--- a/regress/mdoc/Fl/noarg.out_ascii
+++ b/regress/mdoc/Fl/noarg.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
Following macros --[flag] follow without white space.
-OpenBSD August 21, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fl/noarg.out_markdown b/regress/mdoc/Fl/noarg.out_markdown
index 7c023597..efd4a959 100644
--- a/regress/mdoc/Fl/noarg.out_markdown
+++ b/regress/mdoc/Fl/noarg.out_markdown
@@ -19,4 +19,4 @@ Following macros
**-**\[flag]
follow without white space.
-OpenBSD - August 21, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fl/parsed.in b/regress/mdoc/Fl/parsed.in
index 4c93e016..b2c99ab8 100644
--- a/regress/mdoc/Fl/parsed.in
+++ b/regress/mdoc/Fl/parsed.in
@@ -1,6 +1,7 @@
-.Dd April 7, 2010
+.\" $OpenBSD: parsed.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FL-PARSED 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fl-parsed
.Nd is the Fl macro parsed?
diff --git a/regress/mdoc/Fl/parsed.out_ascii b/regress/mdoc/Fl/parsed.out_ascii
index 3b6de9d4..86f8f010 100644
--- a/regress/mdoc/Fl/parsed.out_ascii
+++ b/regress/mdoc/Fl/parsed.out_ascii
@@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
--hheellpp
-OpenBSD April 7, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fl/parsed.out_markdown b/regress/mdoc/Fl/parsed.out_markdown
index b99652aa..9f1b0316 100644
--- a/regress/mdoc/Fl/parsed.out_markdown
+++ b/regress/mdoc/Fl/parsed.out_markdown
@@ -18,4 +18,4 @@ versus
**-**&zwnj;**help**
-OpenBSD - April 7, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fl/punct.in b/regress/mdoc/Fl/punct.in
index a4da35fb..bc3acea1 100644
--- a/regress/mdoc/Fl/punct.in
+++ b/regress/mdoc/Fl/punct.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: punct.in,v 1.6 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FL-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fl-punct
.Nd punctuation handling by the Fl macro
diff --git a/regress/mdoc/Fl/punct.out_ascii b/regress/mdoc/Fl/punct.out_ascii
index cf8a15c2..a94900e6 100644
--- a/regress/mdoc/Fl/punct.out_ascii
+++ b/regress/mdoc/Fl/punct.out_ascii
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
trailing delimiter: --aa..
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fl/punct.out_lint b/regress/mdoc/Fl/punct.out_lint
index 4d7e5ca9..2e29f18d 100644
--- a/regress/mdoc/Fl/punct.out_lint
+++ b/regress/mdoc/Fl/punct.out_lint
@@ -1,4 +1 @@
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: punct.in:45:6: STYLE: no blank before trailing delimiter: Fl a.
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:46:6: STYLE: no blank before trailing delimiter: Fl a.
diff --git a/regress/mdoc/Fl/punct.out_markdown b/regress/mdoc/Fl/punct.out_markdown
index 562ff295..96a5f9a8 100644
--- a/regress/mdoc/Fl/punct.out_markdown
+++ b/regress/mdoc/Fl/punct.out_markdown
@@ -45,4 +45,4 @@ quoted punctuation:
trailing delimiter:
**-a.**
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fo/basic.in b/regress/mdoc/Fo/basic.in
index 5572ba63..78801669 100644
--- a/regress/mdoc/Fo/basic.in
+++ b/regress/mdoc/Fo/basic.in
@@ -1,6 +1,7 @@
-.Dd July 7, 2012
+.\" $OpenBSD: basic.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FO-BASIC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fo-basic
.Nd function blocks
diff --git a/regress/mdoc/Fo/basic.out_ascii b/regress/mdoc/Fo/basic.out_ascii
index 7ab11d47..14eb5e23 100644
--- a/regress/mdoc/Fo/basic.out_ascii
+++ b/regress/mdoc/Fo/basic.out_ascii
@@ -13,4 +13,4 @@ SSYYNNOOPPSSIISS
DDEESSCCRRIIPPTTIIOONN
_d_o_u_b_l_e ssiinn(_d_o_u_b_l_e _x) _d_o_u_b_l_e aattaann22(_d_o_u_b_l_e _y, _d_o_u_b_l_e _x)
-OpenBSD July 7, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fo/basic.out_markdown b/regress/mdoc/Fo/basic.out_markdown
index 9ac884d1..c61fa7c5 100644
--- a/regress/mdoc/Fo/basic.out_markdown
+++ b/regress/mdoc/Fo/basic.out_markdown
@@ -19,4 +19,4 @@ FO-BASIC(1) - General Commands Manual
*double*
**atan2**(*double y*, *double x*)
-OpenBSD - July 7, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fo/break.in b/regress/mdoc/Fo/break.in
index 48a0a1a2..f77fb353 100644
--- a/regress/mdoc/Fo/break.in
+++ b/regress/mdoc/Fo/break.in
@@ -1,6 +1,7 @@
-.Dd April 8, 2014
+.\" $OpenBSD: break.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FO-BREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fo-break
.Nd line breaks in function blocks
diff --git a/regress/mdoc/Fo/break.out_ascii b/regress/mdoc/Fo/break.out_ascii
index d8a5df70..33469747 100644
--- a/regress/mdoc/Fo/break.out_ascii
+++ b/regress/mdoc/Fo/break.out_ascii
@@ -45,4 +45,4 @@ DDEESSCCRRIIPPTTIIOONN
mmyy__lloonngg__ffuunnccttiioonn(_m_y___l_o_n_g___t_y_p_e _f_i_r_s_t___a_r_g_u_m_e_n_t,
_m_y___l_o_n_g___t_y_p_e _s_e_c_o_n_d___a_r_g_u_m_e_n_t)
-OpenBSD April 8, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fo/break.out_markdown b/regress/mdoc/Fo/break.out_markdown
index 3a551bf8..9e6d6a3b 100644
--- a/regress/mdoc/Fo/break.out_markdown
+++ b/regress/mdoc/Fo/break.out_markdown
@@ -42,4 +42,4 @@ using Fo and single-argument Fa:
using Fo and multi-argument Fa:
**my\_long\_function**(*my\_long\_type first\_argument*, *my\_long\_type second\_argument*)
-OpenBSD - April 8, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fo/eos.in b/regress/mdoc/Fo/eos.in
index a97e00f9..f71670f6 100644
--- a/regress/mdoc/Fo/eos.in
+++ b/regress/mdoc/Fo/eos.in
@@ -1,6 +1,7 @@
-.Dd November 17, 2012
+.\" $OpenBSD: eos.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FO-EOS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fo-eos
.Nd end of sentence handling after a function block
diff --git a/regress/mdoc/Fo/eos.out_ascii b/regress/mdoc/Fo/eos.out_ascii
index a09113cf..cdd4acdb 100644
--- a/regress/mdoc/Fo/eos.out_ascii
+++ b/regress/mdoc/Fo/eos.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
As an example of a trigonometric function, let us consider ddoouubbllee
ssiinn(_d_o_u_b_l_e _x). Or do you prefer _d_o_u_b_l_e ccooss(_d_o_u_b_l_e, _x). Either will do.
-OpenBSD November 17, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fo/eos.out_markdown b/regress/mdoc/Fo/eos.out_markdown
index 81e0a477..ec3ba6ea 100644
--- a/regress/mdoc/Fo/eos.out_markdown
+++ b/regress/mdoc/Fo/eos.out_markdown
@@ -14,4 +14,4 @@ Or do you prefer
.
Either will do.
-OpenBSD - November 17, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fo/font.in b/regress/mdoc/Fo/font.in
index 6e2c7d86..5611c6fa 100644
--- a/regress/mdoc/Fo/font.in
+++ b/regress/mdoc/Fo/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FO-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fo-font
.Nd font nesting in function blocks
diff --git a/regress/mdoc/Fo/font.out_ascii b/regress/mdoc/Fo/font.out_ascii
index 698a7683..1dfe6436 100644
--- a/regress/mdoc/Fo/font.out_ascii
+++ b/regress/mdoc/Fo/font.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
ffuunnccttiioonn(_p_r_e_f_i_xbboolldd_s_u_f_f_i_x) bboolldd trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fo/font.out_markdown b/regress/mdoc/Fo/font.out_markdown
index 84393910..4771e5d7 100644
--- a/regress/mdoc/Fo/font.out_markdown
+++ b/regress/mdoc/Fo/font.out_markdown
@@ -15,4 +15,4 @@ trailing text
**function**(*prefix**bold**suffix*) **bold**
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fo/noarg.in b/regress/mdoc/Fo/noarg.in
index 24eab004..5e34e84a 100644
--- a/regress/mdoc/Fo/noarg.in
+++ b/regress/mdoc/Fo/noarg.in
@@ -1,6 +1,7 @@
-.Dd July 12, 2012
+.\" $OpenBSD: noarg.in,v 1.6 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FN-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fn-noarg
.Nd function name macro without arguments
diff --git a/regress/mdoc/Fo/noarg.out_ascii b/regress/mdoc/Fo/noarg.out_ascii
index bd895e4a..e67be7bc 100644
--- a/regress/mdoc/Fo/noarg.out_ascii
+++ b/regress/mdoc/Fo/noarg.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
type arguments: aabbss(_i_n_t _i) no type and void function arguments: rraanndd()
rraannddoomm() aarrcc44rraannddoomm() no arguments at all: end of test document
-OpenBSD July 12, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fo/noarg.out_lint b/regress/mdoc/Fo/noarg.out_lint
index eeb7ee5f..2a0a362b 100644
--- a/regress/mdoc/Fo/noarg.out_lint
+++ b/regress/mdoc/Fo/noarg.out_lint
@@ -1,13 +1,10 @@
-mandoc: noarg.in:23:2: WARNING: skipping empty macro: Fa
-mandoc: noarg.in:27:2: WARNING: skipping empty macro: Fn
-mandoc: noarg.in:29:2: WARNING: skipping empty macro: Ft
-mandoc: noarg.in:32:2: WARNING: skipping empty macro: Ft
-mandoc: noarg.in:34:2: WARNING: skipping empty macro: Ft
-mandoc: noarg.in:37:2: WARNING: skipping empty macro: Ft
-mandoc: noarg.in:39:2: WARNING: skipping empty macro: Fa
-mandoc: noarg.in:42:2: WARNING: skipping empty macro: Ft
-mandoc: noarg.in:43:2: WARNING: skipping empty macro: Fn
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: noarg.in:12:10: ERROR: skipping excess arguments: Fo ... bogus
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:24:2: WARNING: skipping empty macro: Fa
+mandoc: noarg.in:28:2: WARNING: skipping empty macro: Fn
+mandoc: noarg.in:30:2: WARNING: skipping empty macro: Ft
+mandoc: noarg.in:33:2: WARNING: skipping empty macro: Ft
+mandoc: noarg.in:35:2: WARNING: skipping empty macro: Ft
+mandoc: noarg.in:38:2: WARNING: skipping empty macro: Ft
+mandoc: noarg.in:40:2: WARNING: skipping empty macro: Fa
+mandoc: noarg.in:43:2: WARNING: skipping empty macro: Ft
+mandoc: noarg.in:44:2: WARNING: skipping empty macro: Fn
+mandoc: noarg.in:13:10: ERROR: skipping excess arguments: Fo ... bogus
diff --git a/regress/mdoc/Fo/noarg.out_markdown b/regress/mdoc/Fo/noarg.out_markdown
index 36a83507..d439067f 100644
--- a/regress/mdoc/Fo/noarg.out_markdown
+++ b/regress/mdoc/Fo/noarg.out_markdown
@@ -29,4 +29,4 @@ no type and void function arguments:
no arguments at all:
end of test document
-OpenBSD - July 12, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fo/nohead.in b/regress/mdoc/Fo/nohead.in
index c41b5e6e..a3890279 100644
--- a/regress/mdoc/Fo/nohead.in
+++ b/regress/mdoc/Fo/nohead.in
@@ -1,6 +1,7 @@
-.Dd February 5, 2015
+.\" $OpenBSD: nohead.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FO-NOHEAD 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fo-nohead
.Nd function block macro without head argument
diff --git a/regress/mdoc/Fo/nohead.out_ascii b/regress/mdoc/Fo/nohead.out_ascii
index c1ad57d7..d0ac0038 100644
--- a/regress/mdoc/Fo/nohead.out_ascii
+++ b/regress/mdoc/Fo/nohead.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text _i_n_t(_i_n_t) final text
-OpenBSD February 5, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fo/nohead.out_lint b/regress/mdoc/Fo/nohead.out_lint
index 680a05fa..0f4661a8 100644
--- a/regress/mdoc/Fo/nohead.out_lint
+++ b/regress/mdoc/Fo/nohead.out_lint
@@ -1,4 +1 @@
-mandoc: nohead.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: nohead.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: nohead.in:10:2: WARNING: missing function name, using "": Fo
-mandoc: nohead.in: BASE: RCS id missing: (OpenBSD)
+mandoc: nohead.in:11:2: WARNING: missing function name, using "": Fo
diff --git a/regress/mdoc/Fo/nohead.out_markdown b/regress/mdoc/Fo/nohead.out_markdown
index 28e9b7db..f22d8a0e 100644
--- a/regress/mdoc/Fo/nohead.out_markdown
+++ b/regress/mdoc/Fo/nohead.out_markdown
@@ -10,4 +10,4 @@ initial text
*int*(*int*)
final text
-OpenBSD - February 5, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fo/obsolete.in b/regress/mdoc/Fo/obsolete.in
index 4901cbd5..69e1a9e8 100644
--- a/regress/mdoc/Fo/obsolete.in
+++ b/regress/mdoc/Fo/obsolete.in
@@ -1,6 +1,7 @@
-.Dd July 2, 2014
+.\" $OpenBSD: obsolete.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FO-OBSOLETE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fo-obsolete
.Nd obsolete function macros
diff --git a/regress/mdoc/Fo/obsolete.out_ascii b/regress/mdoc/Fo/obsolete.out_ascii
index 3e2cc617..e7807a26 100644
--- a/regress/mdoc/Fo/obsolete.out_ascii
+++ b/regress/mdoc/Fo/obsolete.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
function return value _v_a_l_u_e
-OpenBSD July 2, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fo/obsolete.out_lint b/regress/mdoc/Fo/obsolete.out_lint
index 6e5d1428..5a8893b6 100644
--- a/regress/mdoc/Fo/obsolete.out_lint
+++ b/regress/mdoc/Fo/obsolete.out_lint
@@ -1,5 +1,2 @@
-mandoc: obsolete.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: obsolete.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: obsolete.in:9:2: WARNING: obsolete macro: Ot
-mandoc: obsolete.in:12:2: WARNING: obsolete macro: Fr
-mandoc: obsolete.in: BASE: RCS id missing: (OpenBSD)
+mandoc: obsolete.in:10:2: WARNING: obsolete macro: Ot
+mandoc: obsolete.in:13:2: WARNING: obsolete macro: Fr
diff --git a/regress/mdoc/Fo/obsolete.out_markdown b/regress/mdoc/Fo/obsolete.out_markdown
index be3e7f13..9217be66 100644
--- a/regress/mdoc/Fo/obsolete.out_markdown
+++ b/regress/mdoc/Fo/obsolete.out_markdown
@@ -12,4 +12,4 @@ old function type
function return value
*value*
-OpenBSD - July 2, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fo/punct.in b/regress/mdoc/Fo/punct.in
index d17b5330..7e9f0f43 100644
--- a/regress/mdoc/Fo/punct.in
+++ b/regress/mdoc/Fo/punct.in
@@ -1,6 +1,7 @@
-.Dd May 20, 2017
+.\" $OpenBSD: punct.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FO-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fo-punct
.Nd punctuation on function input lines
diff --git a/regress/mdoc/Fo/punct.out_ascii b/regress/mdoc/Fo/punct.out_ascii
index 26c31776..6f0082ac 100644
--- a/regress/mdoc/Fo/punct.out_ascii
+++ b/regress/mdoc/Fo/punct.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
_i_n_t, _f_l_o_a_t_: bboolldd
-OpenBSD May 20, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fo/punct.out_lint b/regress/mdoc/Fo/punct.out_lint
index 6ada62c2..23d0358b 100644
--- a/regress/mdoc/Fo/punct.out_lint
+++ b/regress/mdoc/Fo/punct.out_lint
@@ -1,6 +1,3 @@
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd May (OpenBSD)
-mandoc: punct.in:9:8: STYLE: no blank before trailing delimiter: Fn sin.
-mandoc: punct.in:11:12: STYLE: no blank before trailing delimiter: Fa y:
-mandoc: punct.in:13:18: STYLE: no blank before trailing delimiter: Ft float:
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:10:8: STYLE: no blank before trailing delimiter: Fn sin.
+mandoc: punct.in:12:12: STYLE: no blank before trailing delimiter: Fa y:
+mandoc: punct.in:14:18: STYLE: no blank before trailing delimiter: Ft float:
diff --git a/regress/mdoc/Fo/punct.out_markdown b/regress/mdoc/Fo/punct.out_markdown
index 6e9fe5ff..12a843e7 100644
--- a/regress/mdoc/Fo/punct.out_markdown
+++ b/regress/mdoc/Fo/punct.out_markdown
@@ -13,4 +13,4 @@ FO-PUNCT(1) - General Commands Manual
*int*, *float:* **bold**
-OpenBSD - May 20, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fo/section.in b/regress/mdoc/Fo/section.in
index 7816ca49..4e66528b 100644
--- a/regress/mdoc/Fo/section.in
+++ b/regress/mdoc/Fo/section.in
@@ -1,6 +1,7 @@
-.Dd April 7, 2010
+.\" $OpenBSD: section.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FN-SECTION 3
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fn-section
.Nd special handling of Fn in various sections
diff --git a/regress/mdoc/Fo/section.out_ascii b/regress/mdoc/Fo/section.out_ascii
index 9273ce84..d2db755e 100644
--- a/regress/mdoc/Fo/section.out_ascii
+++ b/regress/mdoc/Fo/section.out_ascii
@@ -56,4 +56,4 @@ CCUUSSTTOOMM
_d_o_u_b_l_e
ssiinn(_d_o_u_b_l_e _x);
-OpenBSD April 7, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fo/section.out_markdown b/regress/mdoc/Fo/section.out_markdown
index 10d3dbb9..9b70883f 100644
--- a/regress/mdoc/Fo/section.out_markdown
+++ b/regress/mdoc/Fo/section.out_markdown
@@ -111,4 +111,4 @@ FN-SECTION(3) - Library Functions Manual
*double*
**sin**(*double x*);
-OpenBSD - April 7, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Fo/warn.in b/regress/mdoc/Fo/warn.in
index d41e658c..bd58dabe 100644
--- a/regress/mdoc/Fo/warn.in
+++ b/regress/mdoc/Fo/warn.in
@@ -1,6 +1,7 @@
-.Dd October 11, 2014
+.\" $OpenBSD: warn.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FO-WARN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Fo-warn
.Nd warnings related to function blocks
diff --git a/regress/mdoc/Fo/warn.out_ascii b/regress/mdoc/Fo/warn.out_ascii
index fd1890b5..85f0b46f 100644
--- a/regress/mdoc/Fo/warn.out_ascii
+++ b/regress/mdoc/Fo/warn.out_ascii
@@ -10,4 +10,4 @@ SSYYNNOOPPSSIISS
_d_o_u_b_l_e
aattaann22(_d_o_u_b_l_e _y_, _d_o_u_b_l_e _x);
-OpenBSD October 11, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Fo/warn.out_lint b/regress/mdoc/Fo/warn.out_lint
index 4b4324c3..3af27fc6 100644
--- a/regress/mdoc/Fo/warn.out_lint
+++ b/regress/mdoc/Fo/warn.out_lint
@@ -1,5 +1,2 @@
-mandoc: warn.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: warn.in:1:5: BASE: Mdocdate missing: Dd October (OpenBSD)
-mandoc: warn.in:9:8: WARNING: parenthesis in function name: sin()
-mandoc: warn.in:13:19: WARNING: comma in function argument: double y, double x
-mandoc: warn.in: BASE: RCS id missing: (OpenBSD)
+mandoc: warn.in:10:8: WARNING: parenthesis in function name: sin()
+mandoc: warn.in:14:19: WARNING: comma in function argument: double y, double x
diff --git a/regress/mdoc/Fo/warn.out_markdown b/regress/mdoc/Fo/warn.out_markdown
index d27be5bc..9d37abba 100644
--- a/regress/mdoc/Fo/warn.out_markdown
+++ b/regress/mdoc/Fo/warn.out_markdown
@@ -12,4 +12,4 @@ FO-WARN(1) - General Commands Manual
*double*
**atan2**(*double y, double x*);
-OpenBSD - October 11, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ft/font.in b/regress/mdoc/Ft/font.in
index 6304aadd..82980075 100644
--- a/regress/mdoc/Ft/font.in
+++ b/regress/mdoc/Ft/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt FT-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ft-font
.Nd changing fonts inside the function return type macro
diff --git a/regress/mdoc/Ft/font.out_ascii b/regress/mdoc/Ft/font.out_ascii
index ded66eca..ea56b241 100644
--- a/regress/mdoc/Ft/font.out_ascii
+++ b/regress/mdoc/Ft/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ft/font.out_markdown b/regress/mdoc/Ft/font.out_markdown
index 658bf4f8..c7ef33c9 100644
--- a/regress/mdoc/Ft/font.out_markdown
+++ b/regress/mdoc/Ft/font.out_markdown
@@ -10,4 +10,4 @@ normal text
*emphasis**bold**back*
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ic/font.in b/regress/mdoc/Ic/font.in
index 26e80298..297bdf51 100644
--- a/regress/mdoc/Ic/font.in
+++ b/regress/mdoc/Ic/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt IC-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ic-font
.Nd changing fonts inside the internal command macro
diff --git a/regress/mdoc/Ic/font.out_ascii b/regress/mdoc/Ic/font.out_ascii
index 6267aed3..ce6a6edb 100644
--- a/regress/mdoc/Ic/font.out_ascii
+++ b/regress/mdoc/Ic/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text bboolldd_e_m_p_h_a_s_i_sbbaacckk trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ic/font.out_markdown b/regress/mdoc/Ic/font.out_markdown
index d8e81013..617ad01c 100644
--- a/regress/mdoc/Ic/font.out_markdown
+++ b/regress/mdoc/Ic/font.out_markdown
@@ -10,4 +10,4 @@ normal text
**bold*emphasis*back**
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ic/noarg.in b/regress/mdoc/Ic/noarg.in
index 2c4bf670..bc30238c 100644
--- a/regress/mdoc/Ic/noarg.in
+++ b/regress/mdoc/Ic/noarg.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: noarg.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt IC-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ic-noarg
.Nd interactive command without an argument
diff --git a/regress/mdoc/Ic/noarg.out_ascii b/regress/mdoc/Ic/noarg.out_ascii
index 8899a951..6722ef56 100644
--- a/regress/mdoc/Ic/noarg.out_ascii
+++ b/regress/mdoc/Ic/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with command: llss.. no command: end of test document
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ic/noarg.out_lint b/regress/mdoc/Ic/noarg.out_lint
index 8541b7df..5f51ea69 100644
--- a/regress/mdoc/Ic/noarg.out_lint
+++ b/regress/mdoc/Ic/noarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: Ic
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: noarg.in:9:7: STYLE: no blank before trailing delimiter: Ic ls.
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: Ic
+mandoc: noarg.in:10:7: STYLE: no blank before trailing delimiter: Ic ls.
diff --git a/regress/mdoc/Ic/noarg.out_markdown b/regress/mdoc/Ic/noarg.out_markdown
index 38162de3..6fd54275 100644
--- a/regress/mdoc/Ic/noarg.out_markdown
+++ b/regress/mdoc/Ic/noarg.out_markdown
@@ -11,4 +11,4 @@ with command:
no command:
end of test document
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ic/punct.in b/regress/mdoc/Ic/punct.in
index a62058b6..a3c143a9 100644
--- a/regress/mdoc/Ic/punct.in
+++ b/regress/mdoc/Ic/punct.in
@@ -1,6 +1,7 @@
-.Dd August 21, 2014
+.\" $OpenBSD: punct.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt Ic-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ic-punct
.Nd punctuation handling by the Ic macro
diff --git a/regress/mdoc/Ic/punct.out_ascii b/regress/mdoc/Ic/punct.out_ascii
index 4c370483..ff10d846 100644
--- a/regress/mdoc/Ic/punct.out_ascii
+++ b/regress/mdoc/Ic/punct.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
quoted punctuation: aa (bb | cc) dd, _i_t_a_l_i_c.
-OpenBSD August 21, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ic/punct.out_markdown b/regress/mdoc/Ic/punct.out_markdown
index 7fd2742f..2f2e786e 100644
--- a/regress/mdoc/Ic/punct.out_markdown
+++ b/regress/mdoc/Ic/punct.out_markdown
@@ -42,4 +42,4 @@ op bracket
quoted punctuation:
**a** (**b** | **c**) **d**, *italic*.
-OpenBSD - August 21, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/In/break.in b/regress/mdoc/In/break.in
index 0e26731b..f603138f 100644
--- a/regress/mdoc/In/break.in
+++ b/regress/mdoc/In/break.in
@@ -1,6 +1,7 @@
-.Dd June 6, 2010
+.\" $OpenBSD: break.in,v 1.6 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt IN-BREAK 2
-.Os OpenBSD
+.Os
.Sh NAME
.Nm In-break
.Nd line break before header include file
diff --git a/regress/mdoc/In/break.out_ascii b/regress/mdoc/In/break.out_ascii
index d6488f81..dd057d34 100644
--- a/regress/mdoc/In/break.out_ascii
+++ b/regress/mdoc/In/break.out_ascii
@@ -23,4 +23,4 @@ DDEESSCCRRIIPPTTIIOONN
<_s_y_s_/_t_y_p_e_s_._h> <_u_n_i_s_t_d_._h> _i_n_t dduupp(_i_n_t _o_l_d_d) _s_s_i_z_e___t wwrriittee(_i_n_t _d, _c_o_n_s_t
_v_o_i_d _*_b_u_f, _s_i_z_e___t _n_b_y_t_e_s)
-OpenBSD June 6, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/In/break.out_markdown b/regress/mdoc/In/break.out_markdown
index dbc1085f..acc86ddd 100644
--- a/regress/mdoc/In/break.out_markdown
+++ b/regress/mdoc/In/break.out_markdown
@@ -32,4 +32,4 @@ IN-BREAK(2) - System Calls Manual
*ssize\_t*
**write**(*int d*, *const void \*buf*, *size\_t nbytes*)
-OpenBSD - June 6, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/In/eos.in b/regress/mdoc/In/eos.in
index 929c2be9..d1c42a6b 100644
--- a/regress/mdoc/In/eos.in
+++ b/regress/mdoc/In/eos.in
@@ -1,6 +1,7 @@
-.Dd November 16, 2012
+.\" $OpenBSD: eos.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt IN-EOS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm In-eos
.Nd end of sentence handling after the include macro
diff --git a/regress/mdoc/In/eos.out_ascii b/regress/mdoc/In/eos.out_ascii
index 4f5a1036..21dd47f4 100644
--- a/regress/mdoc/In/eos.out_ascii
+++ b/regress/mdoc/In/eos.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
Let's use <_s_t_r_i_n_g_._h>. And then something else.
-OpenBSD November 16, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/In/eos.out_markdown b/regress/mdoc/In/eos.out_markdown
index 0597be78..32cf3851 100644
--- a/regress/mdoc/In/eos.out_markdown
+++ b/regress/mdoc/In/eos.out_markdown
@@ -10,4 +10,4 @@ Let's use
&lt;*string.h*>.
And then something else.
-OpenBSD - November 16, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/In/font.in b/regress/mdoc/In/font.in
index 9399325b..b053a1bb 100644
--- a/regress/mdoc/In/font.in
+++ b/regress/mdoc/In/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt IN-FONT 2
-.Os OpenBSD
+.Os
.Sh NAME
.Nm In-font
.Nd changing the font inside the include macro
diff --git a/regress/mdoc/In/font.out_ascii b/regress/mdoc/In/font.out_ascii
index d868a8cd..87519e29 100644
--- a/regress/mdoc/In/font.out_ascii
+++ b/regress/mdoc/In/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text <_p_r_e_f_i_xhheeaaddeerr_s_u_f_f_i_x> | after: punctuation bboolldd trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/In/font.out_markdown b/regress/mdoc/In/font.out_markdown
index 4b99b61e..26fa74aa 100644
--- a/regress/mdoc/In/font.out_markdown
+++ b/regress/mdoc/In/font.out_markdown
@@ -10,4 +10,4 @@ normal text
&lt;*prefix**header**suffix*> | after: punctuation **bold**
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/In/noarg.in b/regress/mdoc/In/noarg.in
index 1952e868..9138af86 100644
--- a/regress/mdoc/In/noarg.in
+++ b/regress/mdoc/In/noarg.in
@@ -1,6 +1,7 @@
-.Dd February 5, 2015
+.\" $OpenBSD: noarg.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt IN-NOARG 2
-.Os OpenBSD
+.Os
.Sh NAME
.Nm In-noarg
.Nd include file macros without argument
diff --git a/regress/mdoc/In/noarg.out_ascii b/regress/mdoc/In/noarg.out_ascii
index 7a4bf173..c7b3272e 100644
--- a/regress/mdoc/In/noarg.out_ascii
+++ b/regress/mdoc/In/noarg.out_ascii
@@ -15,4 +15,4 @@ SSYYNNOOPPSSIISS
DDEESSCCRRIIPPTTIIOONN
<_m_a_t_h_._h_:> _d_o_u_b_l_e ssiinn(_d_o_u_b_l_e _x) _d_o_u_b_l_e ccooss(_d_o_u_b_l_e _x)
-OpenBSD February 5, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/In/noarg.out_lint b/regress/mdoc/In/noarg.out_lint
index c9037ca8..431d09e8 100644
--- a/regress/mdoc/In/noarg.out_lint
+++ b/regress/mdoc/In/noarg.out_lint
@@ -1,6 +1,3 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: In
-mandoc: noarg.in:18:2: WARNING: skipping empty macro: In
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: noarg.in:15:11: STYLE: no blank before trailing delimiter: In math.h:
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: In
+mandoc: noarg.in:19:2: WARNING: skipping empty macro: In
+mandoc: noarg.in:16:11: STYLE: no blank before trailing delimiter: In math.h:
diff --git a/regress/mdoc/In/noarg.out_markdown b/regress/mdoc/In/noarg.out_markdown
index 8a39b83a..5a581472 100644
--- a/regress/mdoc/In/noarg.out_markdown
+++ b/regress/mdoc/In/noarg.out_markdown
@@ -22,4 +22,4 @@ IN-NOARG(2) - System Calls Manual
*double*
**cos**(*double x*)
-OpenBSD - February 5, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Lb/badargs.in b/regress/mdoc/Lb/badargs.in
index 558eef2f..255da1ce 100644
--- a/regress/mdoc/Lb/badargs.in
+++ b/regress/mdoc/Lb/badargs.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: badargs.in,v 1.5 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt LB-BADARGS 3
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Lb-badargs
.Nd bad arguments to the library macro
diff --git a/regress/mdoc/Lb/badargs.out_ascii b/regress/mdoc/Lb/badargs.out_ascii
index db55ffd1..e182e45c 100644
--- a/regress/mdoc/Lb/badargs.out_ascii
+++ b/regress/mdoc/Lb/badargs.out_ascii
@@ -7,4 +7,4 @@ LLIIBBRRAARRYY
library "murks."
library "mylib" another.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Lb/badargs.out_lint b/regress/mdoc/Lb/badargs.out_lint
index cb7639ef..bb56945a 100644
--- a/regress/mdoc/Lb/badargs.out_lint
+++ b/regress/mdoc/Lb/badargs.out_lint
@@ -1,8 +1,5 @@
-mandoc: badargs.in:9:2: WARNING: skipping empty macro: Lb
-mandoc: badargs.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badargs.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: badargs.in:8:10: STYLE: no blank before trailing delimiter: Lb murks.
-mandoc: badargs.in:8:5: WARNING: unknown library name: Lb murks.
-mandoc: badargs.in:10:18: STYLE: no blank before trailing delimiter: Lb ... another.
-mandoc: badargs.in:10:5: WARNING: unknown library name: Lb mylib
-mandoc: badargs.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badargs.in:10:2: WARNING: skipping empty macro: Lb
+mandoc: badargs.in:9:10: STYLE: no blank before trailing delimiter: Lb murks.
+mandoc: badargs.in:9:5: WARNING: unknown library name: Lb murks.
+mandoc: badargs.in:11:18: STYLE: no blank before trailing delimiter: Lb ... another.
+mandoc: badargs.in:11:5: WARNING: unknown library name: Lb mylib
diff --git a/regress/mdoc/Lb/badargs.out_markdown b/regress/mdoc/Lb/badargs.out_markdown
index 9eebe89e..55e31bb1 100644
--- a/regress/mdoc/Lb/badargs.out_markdown
+++ b/regress/mdoc/Lb/badargs.out_markdown
@@ -9,4 +9,4 @@ LB-BADARGS(3) - Library Functions Manual
library &#8220;murks.&#8221;
library &#8220;mylib&#8221; another.
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Lb/break.in b/regress/mdoc/Lb/break.in
index a6c3d1bf..22337477 100644
--- a/regress/mdoc/Lb/break.in
+++ b/regress/mdoc/Lb/break.in
@@ -1,6 +1,7 @@
-.Dd June 30, 2010
+.\" $OpenBSD: break.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt LB-BREAK 3
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Lb-break
.Nd output line breaks after the library macro
diff --git a/regress/mdoc/Lb/break.out_ascii b/regress/mdoc/Lb/break.out_ascii
index a6f0eebf..35103da8 100644
--- a/regress/mdoc/Lb/break.out_ascii
+++ b/regress/mdoc/Lb/break.out_ascii
@@ -10,4 +10,4 @@ LLIIBBRRAARRYY
DDEESSCCRRIIPPTTIIOONN
library "mylib" text
-OpenBSD June 30, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Lb/break.out_markdown b/regress/mdoc/Lb/break.out_markdown
index 0eacb25f..316516a6 100644
--- a/regress/mdoc/Lb/break.out_markdown
+++ b/regress/mdoc/Lb/break.out_markdown
@@ -14,4 +14,4 @@ text
library &#8220;mylib&#8221;
text
-OpenBSD - June 30, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Lb/eos.in b/regress/mdoc/Lb/eos.in
index f48e71a2..50946b47 100644
--- a/regress/mdoc/Lb/eos.in
+++ b/regress/mdoc/Lb/eos.in
@@ -1,6 +1,7 @@
-.Dd November 17, 2012
+.\" $OpenBSD: eos.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt LB-EOS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Lb-eos
.Nd end of sentence handling after the library macro
diff --git a/regress/mdoc/Lb/eos.out_ascii b/regress/mdoc/Lb/eos.out_ascii
index 0db13295..5c57a6c2 100644
--- a/regress/mdoc/Lb/eos.out_ascii
+++ b/regress/mdoc/Lb/eos.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
Let's use the library "mylib". And some other libraries.
-OpenBSD November 17, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Lb/eos.out_markdown b/regress/mdoc/Lb/eos.out_markdown
index 6ee5b086..c9a049dc 100644
--- a/regress/mdoc/Lb/eos.out_markdown
+++ b/regress/mdoc/Lb/eos.out_markdown
@@ -10,4 +10,4 @@ Let's use the
library &#8220;mylib&#8221;.
And some other libraries.
-OpenBSD - November 17, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Li/font.in b/regress/mdoc/Li/font.in
index d15d61bb..f899d2d0 100644
--- a/regress/mdoc/Li/font.in
+++ b/regress/mdoc/Li/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt LI-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Li-font
.Nd changing fonts inside the literal in-line macro
diff --git a/regress/mdoc/Li/font.out_ascii b/regress/mdoc/Li/font.out_ascii
index 4e012881..a844e3d3 100644
--- a/regress/mdoc/Li/font.out_ascii
+++ b/regress/mdoc/Li/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text literal_e_m_p_h_a_s_i_sback trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Li/font.out_markdown b/regress/mdoc/Li/font.out_markdown
index b1b91c60..cd474276 100644
--- a/regress/mdoc/Li/font.out_markdown
+++ b/regress/mdoc/Li/font.out_markdown
@@ -10,4 +10,4 @@ normal text
`literalemphasisback`
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Li/punct.in b/regress/mdoc/Li/punct.in
index 434b7e6f..8b992da9 100644
--- a/regress/mdoc/Li/punct.in
+++ b/regress/mdoc/Li/punct.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: punct.in,v 1.7 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt LI-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Li-punct
.Nd punctuation following a literal macro
diff --git a/regress/mdoc/Li/punct.out_ascii b/regress/mdoc/Li/punct.out_ascii
index da684890..a2489869 100644
--- a/regress/mdoc/Li/punct.out_ascii
+++ b/regress/mdoc/Li/punct.out_ascii
@@ -25,4 +25,4 @@ DDEESSCCRRIIPPTTIIOONN
Missing blank: a.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Li/punct.out_lint b/regress/mdoc/Li/punct.out_lint
index 8161ef43..014743b8 100644
--- a/regress/mdoc/Li/punct.out_lint
+++ b/regress/mdoc/Li/punct.out_lint
@@ -1,4 +1,3 @@
-mandoc: punct.in:48:7: WARNING: skipping empty macro: Li
mandoc: punct.in:49:7: WARNING: skipping empty macro: Li
mandoc: punct.in:50:7: WARNING: skipping empty macro: Li
mandoc: punct.in:51:7: WARNING: skipping empty macro: Li
@@ -9,7 +8,7 @@ mandoc: punct.in:55:7: WARNING: skipping empty macro: Li
mandoc: punct.in:56:7: WARNING: skipping empty macro: Li
mandoc: punct.in:57:7: WARNING: skipping empty macro: Li
mandoc: punct.in:58:7: WARNING: skipping empty macro: Li
-mandoc: punct.in:61:7: WARNING: skipping empty macro: Li
+mandoc: punct.in:59:7: WARNING: skipping empty macro: Li
mandoc: punct.in:62:7: WARNING: skipping empty macro: Li
mandoc: punct.in:63:7: WARNING: skipping empty macro: Li
mandoc: punct.in:64:7: WARNING: skipping empty macro: Li
@@ -20,10 +19,8 @@ mandoc: punct.in:68:7: WARNING: skipping empty macro: Li
mandoc: punct.in:69:7: WARNING: skipping empty macro: Li
mandoc: punct.in:70:7: WARNING: skipping empty macro: Li
mandoc: punct.in:71:7: WARNING: skipping empty macro: Li
-mandoc: punct.in:74:7: WARNING: skipping empty macro: Li
+mandoc: punct.in:72:7: WARNING: skipping empty macro: Li
mandoc: punct.in:75:7: WARNING: skipping empty macro: Li
-mandoc: punct.in:83:2: WARNING: skipping empty macro: Li
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: punct.in:86:6: STYLE: no blank before trailing delimiter: Li a.
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:76:7: WARNING: skipping empty macro: Li
+mandoc: punct.in:84:2: WARNING: skipping empty macro: Li
+mandoc: punct.in:87:6: STYLE: no blank before trailing delimiter: Li a.
diff --git a/regress/mdoc/Li/punct.out_markdown b/regress/mdoc/Li/punct.out_markdown
index fde70399..6d5bfc4a 100644
--- a/regress/mdoc/Li/punct.out_markdown
+++ b/regress/mdoc/Li/punct.out_markdown
@@ -86,4 +86,4 @@ Quoted:
Missing blank:
`a.`
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Lk/font.in b/regress/mdoc/Lk/font.in
index 23af0554..d5b0fe18 100644
--- a/regress/mdoc/Lk/font.in
+++ b/regress/mdoc/Lk/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt LK-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Lk-font
.Nd changing the font inside the hyperlink macro
diff --git a/regress/mdoc/Lk/font.out_ascii b/regress/mdoc/Lk/font.out_ascii
index 846c82f1..58bddfe4 100644
--- a/regress/mdoc/Lk/font.out_ascii
+++ b/regress/mdoc/Lk/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text _O_p_e_nBBSSDD_w_e_b: hhttttpp::////wwwwww.._o_p_e_n_b_s_d..oorrgg// trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Lk/link.in b/regress/mdoc/Lk/link.in
index b5ea4901..07e13dec 100644
--- a/regress/mdoc/Lk/link.in
+++ b/regress/mdoc/Lk/link.in
@@ -1,6 +1,7 @@
-.Dd August 8, 2010
+.\" $OpenBSD: link.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt LK-LINK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Lk-link
.Nd formatting of hyperlinks
diff --git a/regress/mdoc/Lk/link.out_ascii b/regress/mdoc/Lk/link.out_ascii
index e31b483c..0004d1ec 100644
--- a/regress/mdoc/Lk/link.out_ascii
+++ b/regress/mdoc/Lk/link.out_ascii
@@ -13,4 +13,4 @@ SSEEEE AALLSSOO
hhttttpp::////wwwwww..ffrreeeebbssdd..oorrgg// _N_e_t_B_S_D: hhttttpp::////wwwwww..nneettbbssdd..oorrgg// _O_p_e_n_B_S_D:
hhttttpp::////wwwwww..ooppeennbbssdd..oorrgg//
-OpenBSD August 8, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Lk/link.out_markdown b/regress/mdoc/Lk/link.out_markdown
index 05a01564..97f31550 100644
--- a/regress/mdoc/Lk/link.out_markdown
+++ b/regress/mdoc/Lk/link.out_markdown
@@ -18,4 +18,4 @@ Here are some web sites of BSD operating systems:
[NetBSD](http://www.netbsd.org/)
[OpenBSD](http://www.openbsd.org/)
-OpenBSD - August 8, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Lk/noarg.in b/regress/mdoc/Lk/noarg.in
index 19d9d30c..41528d85 100644
--- a/regress/mdoc/Lk/noarg.in
+++ b/regress/mdoc/Lk/noarg.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: noarg.in,v 1.6 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt LK-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Lk-noarg
.Nd hyperlink macro without arguments
diff --git a/regress/mdoc/Lk/noarg.out_ascii b/regress/mdoc/Lk/noarg.out_ascii
index 5347cf7b..dd5ee4de 100644
--- a/regress/mdoc/Lk/noarg.out_ascii
+++ b/regress/mdoc/Lk/noarg.out_ascii
@@ -11,4 +11,4 @@ DDEESSCCRRIIPPTTIIOONN
end of test document
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Lk/noarg.out_lint b/regress/mdoc/Lk/noarg.out_lint
index aac9e785..4ea08e5b 100644
--- a/regress/mdoc/Lk/noarg.out_lint
+++ b/regress/mdoc/Lk/noarg.out_lint
@@ -1,6 +1,3 @@
-mandoc: noarg.in:16:2: WARNING: skipping empty macro: Lk
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: noarg.in:12:33: STYLE: no blank before trailing delimiter: Lk ... mandoc,
-mandoc: noarg.in:14:28: STYLE: no blank before trailing delimiter: Lk http://www.openbsd.org/,
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:17:2: WARNING: skipping empty macro: Lk
+mandoc: noarg.in:13:33: STYLE: no blank before trailing delimiter: Lk ... mandoc,
+mandoc: noarg.in:15:28: STYLE: no blank before trailing delimiter: Lk http://www.openbsd.org/,
diff --git a/regress/mdoc/Lk/noarg.out_markdown b/regress/mdoc/Lk/noarg.out_markdown
index 56964f69..7490af2d 100644
--- a/regress/mdoc/Lk/noarg.out_markdown
+++ b/regress/mdoc/Lk/noarg.out_markdown
@@ -17,4 +17,4 @@ no argument
end of test document
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ms/font.in b/regress/mdoc/Ms/font.in
index 24c2c236..1308da08 100644
--- a/regress/mdoc/Ms/font.in
+++ b/regress/mdoc/Ms/font.in
@@ -1,6 +1,7 @@
-.Dd November 20, 2014
+.\" $OpenBSD: font.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt MS-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ms-font
.Nd changing fonts inside the mathematical symbol macro
diff --git a/regress/mdoc/Ms/font.out_ascii b/regress/mdoc/Ms/font.out_ascii
index 50ca3b2a..441fa6f6 100644
--- a/regress/mdoc/Ms/font.out_ascii
+++ b/regress/mdoc/Ms/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text bboolldd_e_m_p_h_a_s_i_sbbaacckk | aafftteerr: ppuunnccttuuaattiioonn _i_t_a_l_i_c trailing text
-OpenBSD November 20, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ms/font.out_markdown b/regress/mdoc/Ms/font.out_markdown
index b554083a..9c7b4f7d 100644
--- a/regress/mdoc/Ms/font.out_markdown
+++ b/regress/mdoc/Ms/font.out_markdown
@@ -10,4 +10,4 @@ normal text
**bold*emphasis*back** | **after**: **punctuation** *italic*
trailing text
-OpenBSD - November 20, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ms/noarg.in b/regress/mdoc/Ms/noarg.in
index 9c9d83f6..9425ed06 100644
--- a/regress/mdoc/Ms/noarg.in
+++ b/regress/mdoc/Ms/noarg.in
@@ -1,6 +1,7 @@
-.Dd June 19, 2017
+.\" $OpenBSD: noarg.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt MS-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ms-noarg
.Nd mathematical symbol without an argument
diff --git a/regress/mdoc/Ms/noarg.out_ascii b/regress/mdoc/Ms/noarg.out_ascii
index 7f219925..b369829f 100644
--- a/regress/mdoc/Ms/noarg.out_ascii
+++ b/regress/mdoc/Ms/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with symbol: aallpphhaa.. no symbol: end of test document
-OpenBSD June 19, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ms/noarg.out_lint b/regress/mdoc/Ms/noarg.out_lint
index 3658876b..dac31165 100644
--- a/regress/mdoc/Ms/noarg.out_lint
+++ b/regress/mdoc/Ms/noarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: Ms
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: noarg.in:9:10: STYLE: no blank before trailing delimiter: Ms alpha.
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: Ms
+mandoc: noarg.in:10:10: STYLE: no blank before trailing delimiter: Ms alpha.
diff --git a/regress/mdoc/Ms/noarg.out_markdown b/regress/mdoc/Ms/noarg.out_markdown
index 65c8466d..f145f5df 100644
--- a/regress/mdoc/Ms/noarg.out_markdown
+++ b/regress/mdoc/Ms/noarg.out_markdown
@@ -11,4 +11,4 @@ with symbol:
no symbol:
end of test document
-OpenBSD - June 19, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Mt/font.in b/regress/mdoc/Mt/font.in
index 66c5ba1f..656624e2 100644
--- a/regress/mdoc/Mt/font.in
+++ b/regress/mdoc/Mt/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt MT-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Mt-font
.Nd changing fonts inside the mailto macro
diff --git a/regress/mdoc/Mt/font.out_ascii b/regress/mdoc/Mt/font.out_ascii
index f19cc2bf..8f8509de 100644
--- a/regress/mdoc/Mt/font.out_ascii
+++ b/regress/mdoc/Mt/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Mt/simple.in b/regress/mdoc/Mt/simple.in
index 8e7a70ba..3f8ab318 100644
--- a/regress/mdoc/Mt/simple.in
+++ b/regress/mdoc/Mt/simple.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: simple.in,v 1.6 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt MT-SIMPLE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Mt-simple
.Nd mailto
diff --git a/regress/mdoc/Mt/simple.out_ascii b/regress/mdoc/Mt/simple.out_ascii
index 364a6af6..74640da6 100644
--- a/regress/mdoc/Mt/simple.out_ascii
+++ b/regress/mdoc/Mt/simple.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
Do not send mail to _~.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Mt/simple.out_lint b/regress/mdoc/Mt/simple.out_lint
index 37de8d0d..8d91776b 100644
--- a/regress/mdoc/Mt/simple.out_lint
+++ b/regress/mdoc/Mt/simple.out_lint
@@ -1,4 +1 @@
-mandoc: simple.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: simple.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: simple.in:12:26: STYLE: no blank before trailing delimiter: Mt punctuation@localhost.
-mandoc: simple.in: BASE: RCS id missing: (OpenBSD)
+mandoc: simple.in:13:26: STYLE: no blank before trailing delimiter: Mt punctuation@localhost.
diff --git a/regress/mdoc/Mt/simple.out_markdown b/regress/mdoc/Mt/simple.out_markdown
index d00df48d..8138b7df 100644
--- a/regress/mdoc/Mt/simple.out_markdown
+++ b/regress/mdoc/Mt/simple.out_markdown
@@ -15,4 +15,4 @@ Pay attention to
Do not send mail to
[~](mailto:~).
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Nd/broken.in b/regress/mdoc/Nd/broken.in
index 16ac98d9..6fa15eb5 100644
--- a/regress/mdoc/Nd/broken.in
+++ b/regress/mdoc/Nd/broken.in
@@ -1,6 +1,7 @@
-.Dd February 11, 2015
+.\" $OpenBSD: broken.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt ND-BROKEN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Oo
.Nm Nd-broken
diff --git a/regress/mdoc/Nd/broken.out_ascii b/regress/mdoc/Nd/broken.out_ascii
index 12868f55..561fad9e 100644
--- a/regress/mdoc/Nd/broken.out_ascii
+++ b/regress/mdoc/Nd/broken.out_ascii
@@ -16,4 +16,4 @@ DDEESSCCRRIIPPTTIIOONN
Broken together with a child block: <ao [bo - nd (pq bc] ac)> [op] end of
file
-OpenBSD February 11, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nd/broken.out_lint b/regress/mdoc/Nd/broken.out_lint
index 21b84782..32681d8a 100644
--- a/regress/mdoc/Nd/broken.out_lint
+++ b/regress/mdoc/Nd/broken.out_lint
@@ -1,12 +1,9 @@
-mandoc: broken.in:28:11: WARNING: blocks badly nested: Bo breaks Pq
-mandoc: broken.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: broken.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: broken.in:5:2: WARNING: bad NAME section content: Oo
-mandoc: broken.in:9:1: WARNING: bad NAME section content: text
-mandoc: broken.in:4:2: WARNING: NAME section without Nm before Nd
-mandoc: broken.in:4:2: WARNING: NAME section without description
-mandoc: broken.in:16:2: WARNING: description line outside NAME section: Nd
-mandoc: broken.in:13:2: WARNING: moving content out of list: Bl
-mandoc: broken.in:18:1: WARNING: moving content out of list: text
-mandoc: broken.in:27:2: WARNING: description line outside NAME section: Nd
-mandoc: broken.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken.in:29:11: WARNING: blocks badly nested: Bo breaks Pq
+mandoc: broken.in:6:2: WARNING: bad NAME section content: Oo
+mandoc: broken.in:10:1: WARNING: bad NAME section content: text
+mandoc: broken.in:5:2: WARNING: NAME section without Nm before Nd
+mandoc: broken.in:5:2: WARNING: NAME section without description
+mandoc: broken.in:17:2: WARNING: description line outside NAME section: Nd
+mandoc: broken.in:14:2: WARNING: moving content out of list: Bl
+mandoc: broken.in:19:1: WARNING: moving content out of list: text
+mandoc: broken.in:28:2: WARNING: description line outside NAME section: Nd
diff --git a/regress/mdoc/Nd/hyph.in b/regress/mdoc/Nd/hyph.in
index 7922835d..c51615f2 100644
--- a/regress/mdoc/Nd/hyph.in
+++ b/regress/mdoc/Nd/hyph.in
@@ -1,6 +1,7 @@
-.Dd October 5, 2013
+.\" $OpenBSD: hyph.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt ND-HYPH 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Nd-hyph
.Nd when there is already a hyphen within the the word, \
diff --git a/regress/mdoc/Nd/hyph.out_ascii b/regress/mdoc/Nd/hyph.out_ascii
index 8388b664..1bdf9e0f 100644
--- a/regress/mdoc/Nd/hyph.out_ascii
+++ b/regress/mdoc/Nd/hyph.out_ascii
@@ -7,4 +7,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
Even in the document description line in the _N_A_M_E section.
-OpenBSD October 5, 2013 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nd/hyph.out_markdown b/regress/mdoc/Nd/hyph.out_markdown
index c3153de2..f267a7b4 100644
--- a/regress/mdoc/Nd/hyph.out_markdown
+++ b/regress/mdoc/Nd/hyph.out_markdown
@@ -10,4 +10,4 @@ Even in the document description line in the
*NAME*
section.
-OpenBSD - October 5, 2013
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Nd/noarg.in b/regress/mdoc/Nd/noarg.in
index 1c4b619a..5140f8ac 100644
--- a/regress/mdoc/Nd/noarg.in
+++ b/regress/mdoc/Nd/noarg.in
@@ -1,6 +1,7 @@
-.Dd January 2, 2011
+.\" $OpenBSD: noarg.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt ND-ARG0 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Nd-arg0
.Nd
diff --git a/regress/mdoc/Nd/noarg.out_ascii b/regress/mdoc/Nd/noarg.out_ascii
index fc78701f..890627e7 100644
--- a/regress/mdoc/Nd/noarg.out_ascii
+++ b/regress/mdoc/Nd/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
empty description line
-OpenBSD January 2, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nd/noarg.out_lint b/regress/mdoc/Nd/noarg.out_lint
index d3fa554d..27e2ba72 100644
--- a/regress/mdoc/Nd/noarg.out_lint
+++ b/regress/mdoc/Nd/noarg.out_lint
@@ -1,4 +1 @@
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: noarg.in:6:2: WARNING: missing description line, using "": Nd
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:7:2: WARNING: missing description line, using "": Nd
diff --git a/regress/mdoc/Nd/noarg.out_markdown b/regress/mdoc/Nd/noarg.out_markdown
index 567b7c4d..1e4db0fd 100644
--- a/regress/mdoc/Nd/noarg.out_markdown
+++ b/regress/mdoc/Nd/noarg.out_markdown
@@ -8,4 +8,4 @@ ND-ARG0(1) - General Commands Manual
empty description line
-OpenBSD - January 2, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Nd/par.in b/regress/mdoc/Nd/par.in
index b056f754..4c037714 100644
--- a/regress/mdoc/Nd/par.in
+++ b/regress/mdoc/Nd/par.in
@@ -1,6 +1,7 @@
-.Dd February 3, 2015
+.\" $OpenBSD: par.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt ND-PAR 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Nd-par
.Nd paragraph macro
diff --git a/regress/mdoc/Nd/par.out_ascii b/regress/mdoc/Nd/par.out_ascii
index c87847b8..fd3a5904 100644
--- a/regress/mdoc/Nd/par.out_ascii
+++ b/regress/mdoc/Nd/par.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
Back to normal state.
-OpenBSD February 3, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nd/par.out_markdown b/regress/mdoc/Nd/par.out_markdown
index e6a25425..2ec53e65 100644
--- a/regress/mdoc/Nd/par.out_markdown
+++ b/regress/mdoc/Nd/par.out_markdown
@@ -14,4 +14,4 @@ description macro
Back to normal state.
-OpenBSD - February 3, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Nm/badNAME.in b/regress/mdoc/Nm/badNAME.in
index a882c059..a5f8a9fd 100644
--- a/regress/mdoc/Nm/badNAME.in
+++ b/regress/mdoc/Nm/badNAME.in
@@ -1,6 +1,7 @@
-.Dd July 12, 2012
+.\" $OpenBSD: badNAME.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-BADNAME 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bx
.Nd text production macro on the NAME \&Nm line
diff --git a/regress/mdoc/Nm/badNAME.out_ascii b/regress/mdoc/Nm/badNAME.out_ascii
index 3c1ff360..7e2d3b18 100644
--- a/regress/mdoc/Nm/badNAME.out_ascii
+++ b/regress/mdoc/Nm/badNAME.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
SSYYNNOOPPSSIISS
badNAME
-OpenBSD July 12, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/badNAME.out_lint b/regress/mdoc/Nm/badNAME.out_lint
index 21dd2c1b..b35f38b1 100644
--- a/regress/mdoc/Nm/badNAME.out_lint
+++ b/regress/mdoc/Nm/badNAME.out_lint
@@ -1,5 +1,2 @@
-mandoc: badNAME.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badNAME.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: badNAME.in:5:2: ERROR: missing manual name, using "": Nm
-mandoc: badNAME.in:5:5: WARNING: bad NAME section content: Bx
-mandoc: badNAME.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badNAME.in:6:2: ERROR: missing manual name, using "": Nm
+mandoc: badNAME.in:6:5: WARNING: bad NAME section content: Bx
diff --git a/regress/mdoc/Nm/badNAMEuse.in b/regress/mdoc/Nm/badNAMEuse.in
index 0ede18d8..b41614b9 100644
--- a/regress/mdoc/Nm/badNAMEuse.in
+++ b/regress/mdoc/Nm/badNAMEuse.in
@@ -1,6 +1,7 @@
-.Dd July 12, 2012
+.\" $OpenBSD: badNAMEuse.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-BADNAMEUSE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Bx
.Nd text production macro on the NAME \&Nm line, used later
diff --git a/regress/mdoc/Nm/badNAMEuse.out_ascii b/regress/mdoc/Nm/badNAMEuse.out_ascii
index fd3aa7a5..733e4bbb 100644
--- a/regress/mdoc/Nm/badNAMEuse.out_ascii
+++ b/regress/mdoc/Nm/badNAMEuse.out_ascii
@@ -7,4 +7,4 @@ SSYYNNOOPPSSIISS
ssoommee__nnaammee
ssoommee__nnaammee
-OpenBSD July 12, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/badNAMEuse.out_lint b/regress/mdoc/Nm/badNAMEuse.out_lint
index 4c378691..5428b646 100644
--- a/regress/mdoc/Nm/badNAMEuse.out_lint
+++ b/regress/mdoc/Nm/badNAMEuse.out_lint
@@ -1,5 +1,2 @@
-mandoc: badNAMEuse.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badNAMEuse.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: badNAMEuse.in:5:2: ERROR: missing manual name, using "": Nm
-mandoc: badNAMEuse.in:5:5: WARNING: bad NAME section content: Bx
-mandoc: badNAMEuse.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badNAMEuse.in:6:2: ERROR: missing manual name, using "": Nm
+mandoc: badNAMEuse.in:6:5: WARNING: bad NAME section content: Bx
diff --git a/regress/mdoc/Nm/break.in b/regress/mdoc/Nm/break.in
index 203ba98e..dd110d85 100644
--- a/regress/mdoc/Nm/break.in
+++ b/regress/mdoc/Nm/break.in
@@ -1,6 +1,7 @@
-.Dd August 17, 2014
+.\" $OpenBSD: break.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-BREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Nm-break
.Nd name block head breaking another block
diff --git a/regress/mdoc/Nm/break.out_ascii b/regress/mdoc/Nm/break.out_ascii
index 8b94c330..e9a086e2 100644
--- a/regress/mdoc/Nm/break.out_ascii
+++ b/regress/mdoc/Nm/break.out_ascii
@@ -9,4 +9,4 @@ SSYYNNOOPPSSIISS
DDEESSCCRRIIPPTTIIOONN
initial text NNmm--bbrreeaakk final text
-OpenBSD August 17, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/break.out_lint b/regress/mdoc/Nm/break.out_lint
index 69c1cd5a..22cbb8d4 100644
--- a/regress/mdoc/Nm/break.out_lint
+++ b/regress/mdoc/Nm/break.out_lint
@@ -1,4 +1 @@
-mandoc: break.in:9:2: ERROR: inserting missing end of block: Sh breaks Bo
-mandoc: break.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: break.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: break.in: BASE: RCS id missing: (OpenBSD)
+mandoc: break.in:10:2: ERROR: inserting missing end of block: Sh breaks Bo
diff --git a/regress/mdoc/Nm/break.out_markdown b/regress/mdoc/Nm/break.out_markdown
index 686c234f..ccbc4e5a 100644
--- a/regress/mdoc/Nm/break.out_markdown
+++ b/regress/mdoc/Nm/break.out_markdown
@@ -14,4 +14,4 @@ initial text
**Nm-break**
final text
-OpenBSD - August 17, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Nm/broken.in b/regress/mdoc/Nm/broken.in
index 8dfd0166..6566448f 100644
--- a/regress/mdoc/Nm/broken.in
+++ b/regress/mdoc/Nm/broken.in
@@ -1,6 +1,7 @@
-.Dd February 11, 2017
+.\" $OpenBSD: broken.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-BROKEN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Nm-broken
.Nd broken synapsis name block
diff --git a/regress/mdoc/Nm/broken.out_ascii b/regress/mdoc/Nm/broken.out_ascii
index 0035b888..477e47c4 100644
--- a/regress/mdoc/Nm/broken.out_ascii
+++ b/regress/mdoc/Nm/broken.out_ascii
@@ -11,4 +11,4 @@ SSYYNNOOPPSSIISS
-- item
-OpenBSD February 11, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/broken.out_lint b/regress/mdoc/Nm/broken.out_lint
index 89f51c41..81c149c6 100644
--- a/regress/mdoc/Nm/broken.out_lint
+++ b/regress/mdoc/Nm/broken.out_lint
@@ -1,5 +1,2 @@
-mandoc: broken.in:17:2: WARNING: blocks badly nested: Oo breaks Bk
-mandoc: broken.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: broken.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: broken.in:13:2: WARNING: moving content out of list: Oo
-mandoc: broken.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken.in:18:2: WARNING: blocks badly nested: Oo breaks Bk
+mandoc: broken.in:14:2: WARNING: moving content out of list: Oo
diff --git a/regress/mdoc/Nm/broken.out_markdown b/regress/mdoc/Nm/broken.out_markdown
index cb674648..9c66e9a0 100644
--- a/regress/mdoc/Nm/broken.out_markdown
+++ b/regress/mdoc/Nm/broken.out_markdown
@@ -16,4 +16,4 @@ oc]
- item
-OpenBSD - February 11, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Nm/empty.in b/regress/mdoc/Nm/empty.in
index d135c5c0..59494d3f 100644
--- a/regress/mdoc/Nm/empty.in
+++ b/regress/mdoc/Nm/empty.in
@@ -1,6 +1,7 @@
-.Dd June 30, 2010
+.\" $OpenBSD: empty.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-EMPTY 2
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Nm-empty
.Nd handling of empty name macros
diff --git a/regress/mdoc/Nm/empty.out_ascii b/regress/mdoc/Nm/empty.out_ascii
index b01d299e..e2153e08 100644
--- a/regress/mdoc/Nm/empty.out_ascii
+++ b/regress/mdoc/Nm/empty.out_ascii
@@ -10,4 +10,4 @@ SSYYNNOOPPSSIISS
DDEESSCCRRIIPPTTIIOONN
The NNmm--eemmppttyy utility ...
-OpenBSD June 30, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/empty.out_markdown b/regress/mdoc/Nm/empty.out_markdown
index 102b16c3..fad65475 100644
--- a/regress/mdoc/Nm/empty.out_markdown
+++ b/regress/mdoc/Nm/empty.out_markdown
@@ -15,4 +15,4 @@ The
**Nm-empty**
utility ...
-OpenBSD - June 30, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Nm/emptyNAME.in b/regress/mdoc/Nm/emptyNAME.in
index ac635a8c..56b27f02 100644
--- a/regress/mdoc/Nm/emptyNAME.in
+++ b/regress/mdoc/Nm/emptyNAME.in
@@ -1,6 +1,7 @@
-.Dd July 12, 2012
+.\" $OpenBSD: emptyNAME.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-EMPTYNAME 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm
.Nd empty NAME \&Nm line
diff --git a/regress/mdoc/Nm/emptyNAME.out_ascii b/regress/mdoc/Nm/emptyNAME.out_ascii
index 4041e0f8..b51be3a8 100644
--- a/regress/mdoc/Nm/emptyNAME.out_ascii
+++ b/regress/mdoc/Nm/emptyNAME.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
SSYYNNOOPPSSIISS
emptyNAME
-OpenBSD July 12, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/emptyNAMEuse.in b/regress/mdoc/Nm/emptyNAMEuse.in
index 9e75e619..cff872d2 100644
--- a/regress/mdoc/Nm/emptyNAMEuse.in
+++ b/regress/mdoc/Nm/emptyNAMEuse.in
@@ -1,6 +1,7 @@
-.Dd July 12, 2012
+.\" $OpenBSD: emptyNAMEuse.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-EMPTYNAMEUSE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm
.Nd empty NAME \&Nm line, used later
diff --git a/regress/mdoc/Nm/emptyNAMEuse.out_ascii b/regress/mdoc/Nm/emptyNAMEuse.out_ascii
index 452a7e29..89c7b3da 100644
--- a/regress/mdoc/Nm/emptyNAMEuse.out_ascii
+++ b/regress/mdoc/Nm/emptyNAMEuse.out_ascii
@@ -7,4 +7,4 @@ SSYYNNOOPPSSIISS
ssoommee__nnaammee
ssoommee__nnaammee
-OpenBSD July 12, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/font.in b/regress/mdoc/Nm/font.in
index c68a501b..9f81f636 100644
--- a/regress/mdoc/Nm/font.in
+++ b/regress/mdoc/Nm/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Nm-font
.Nd changing fonts inside the name macro
diff --git a/regress/mdoc/Nm/font.out_ascii b/regress/mdoc/Nm/font.out_ascii
index d6516ae5..75607e82 100644
--- a/regress/mdoc/Nm/font.out_ascii
+++ b/regress/mdoc/Nm/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text bboolldd_e_m_p_h_a_s_i_sbbaacckk trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/font.out_markdown b/regress/mdoc/Nm/font.out_markdown
index 1425fb5b..75ac9ef7 100644
--- a/regress/mdoc/Nm/font.out_markdown
+++ b/regress/mdoc/Nm/font.out_markdown
@@ -10,4 +10,4 @@ normal text
**bold*emphasis*back**
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Nm/long.in b/regress/mdoc/Nm/long.in
index 662360e4..7abd05ef 100644
--- a/regress/mdoc/Nm/long.in
+++ b/regress/mdoc/Nm/long.in
@@ -1,6 +1,7 @@
-.Dd April 4, 2014
+.\" $OpenBSD: long.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-LONG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm \&Nm-long
.Nd long \&Nm in the SYNOPSIS
diff --git a/regress/mdoc/Nm/long.out_ascii b/regress/mdoc/Nm/long.out_ascii
index f6792581..fb8f9da3 100644
--- a/regress/mdoc/Nm/long.out_ascii
+++ b/regress/mdoc/Nm/long.out_ascii
@@ -11,4 +11,4 @@ SSYYNNOOPPSSIISS
--oo
_f_i_l_e _._._.
-OpenBSD April 4, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/long.out_markdown b/regress/mdoc/Nm/long.out_markdown
index a421f068..f2002452 100644
--- a/regress/mdoc/Nm/long.out_markdown
+++ b/regress/mdoc/Nm/long.out_markdown
@@ -10,4 +10,4 @@ NM-LONG(1) - General Commands Manual
**-o**
*file&nbsp;...*
-OpenBSD - April 4, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Nm/par.in b/regress/mdoc/Nm/par.in
index 1d5e3ebd..7a7823c0 100644
--- a/regress/mdoc/Nm/par.in
+++ b/regress/mdoc/Nm/par.in
@@ -1,6 +1,7 @@
-.Dd February 3, 2015
+.\" $OpenBSD: par.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-PAR 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Nm-par
.Nd paragraph macro in a synopsis name block
diff --git a/regress/mdoc/Nm/par.out_ascii b/regress/mdoc/Nm/par.out_ascii
index 8943d37f..53568cda 100644
--- a/regress/mdoc/Nm/par.out_ascii
+++ b/regress/mdoc/Nm/par.out_ascii
@@ -8,4 +8,4 @@ SSYYNNOOPPSSIISS
--bb
-OpenBSD February 3, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/par.out_markdown b/regress/mdoc/Nm/par.out_markdown
index c2a355d6..e45e2e2b 100644
--- a/regress/mdoc/Nm/par.out_markdown
+++ b/regress/mdoc/Nm/par.out_markdown
@@ -11,4 +11,4 @@ NM-PAR(1) - General Commands Manual
**-b**
-OpenBSD - February 3, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Nm/parns.in b/regress/mdoc/Nm/parns.in
index 03f2d641..6f922d45 100644
--- a/regress/mdoc/Nm/parns.in
+++ b/regress/mdoc/Nm/parns.in
@@ -1,6 +1,7 @@
-.Dd February 3, 2015
+.\" $OpenBSD: parns.in,v 1.2 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-PAR 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Nm-par
.Nd paragraph macro in a name block
diff --git a/regress/mdoc/Nm/parns.out_ascii b/regress/mdoc/Nm/parns.out_ascii
index daa6331e..be51ead8 100644
--- a/regress/mdoc/Nm/parns.out_ascii
+++ b/regress/mdoc/Nm/parns.out_ascii
@@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
--bb]
-OpenBSD February 3, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/parns.out_markdown b/regress/mdoc/Nm/parns.out_markdown
index 43b96597..8bfc492e 100644
--- a/regress/mdoc/Nm/parns.out_markdown
+++ b/regress/mdoc/Nm/parns.out_markdown
@@ -19,4 +19,4 @@ NM-PAR(1) - General Commands Manual
**-b**]
-OpenBSD - February 3, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Nm/punct.in b/regress/mdoc/Nm/punct.in
index 4cc3574b..7a28c0eb 100644
--- a/regress/mdoc/Nm/punct.in
+++ b/regress/mdoc/Nm/punct.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: punct.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NM-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Nm-punct
.Nd punctuation handling by the Nm macro
diff --git a/regress/mdoc/Nm/punct.out_ascii b/regress/mdoc/Nm/punct.out_ascii
index 76d1c1f6..bb184d57 100644
--- a/regress/mdoc/Nm/punct.out_ascii
+++ b/regress/mdoc/Nm/punct.out_ascii
@@ -11,4 +11,4 @@ DDEESSCCRRIIPPTTIIOONN
Missing blank: NNmm--ppuunncctt..
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Nm/punct.out_lint b/regress/mdoc/Nm/punct.out_lint
index e88b2f57..08436a69 100644
--- a/regress/mdoc/Nm/punct.out_lint
+++ b/regress/mdoc/Nm/punct.out_lint
@@ -1,4 +1 @@
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: punct.in:42:13: STYLE: no blank before trailing delimiter: Nm Nm-punct.
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:43:13: STYLE: no blank before trailing delimiter: Nm Nm-punct.
diff --git a/regress/mdoc/Nm/punct.out_markdown b/regress/mdoc/Nm/punct.out_markdown
index 132275ab..79b81d23 100644
--- a/regress/mdoc/Nm/punct.out_markdown
+++ b/regress/mdoc/Nm/punct.out_markdown
@@ -42,4 +42,4 @@ op bracket
Missing blank:
**Nm-punct.**
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/No/punct.in b/regress/mdoc/No/punct.in
index 06615231..bb10890c 100644
--- a/regress/mdoc/No/punct.in
+++ b/regress/mdoc/No/punct.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: punct.in,v 1.6 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NO-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm No-punct
.Nd punctuation after the normal macro
diff --git a/regress/mdoc/No/punct.out_ascii b/regress/mdoc/No/punct.out_ascii
index 0cf3d7f4..07ca0c5f 100644
--- a/regress/mdoc/No/punct.out_ascii
+++ b/regress/mdoc/No/punct.out_ascii
@@ -25,4 +25,4 @@ DDEESSCCRRIIPPTTIIOONN
Missing blank: a.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/No/punct.out_lint b/regress/mdoc/No/punct.out_lint
index 6550bd3c..e046da6a 100644
--- a/regress/mdoc/No/punct.out_lint
+++ b/regress/mdoc/No/punct.out_lint
@@ -1,4 +1,3 @@
-mandoc: punct.in:48:7: WARNING: skipping empty macro: No
mandoc: punct.in:49:7: WARNING: skipping empty macro: No
mandoc: punct.in:50:7: WARNING: skipping empty macro: No
mandoc: punct.in:51:7: WARNING: skipping empty macro: No
@@ -9,7 +8,7 @@ mandoc: punct.in:55:7: WARNING: skipping empty macro: No
mandoc: punct.in:56:7: WARNING: skipping empty macro: No
mandoc: punct.in:57:7: WARNING: skipping empty macro: No
mandoc: punct.in:58:7: WARNING: skipping empty macro: No
-mandoc: punct.in:61:7: WARNING: skipping empty macro: No
+mandoc: punct.in:59:7: WARNING: skipping empty macro: No
mandoc: punct.in:62:7: WARNING: skipping empty macro: No
mandoc: punct.in:63:7: WARNING: skipping empty macro: No
mandoc: punct.in:64:7: WARNING: skipping empty macro: No
@@ -20,9 +19,7 @@ mandoc: punct.in:68:7: WARNING: skipping empty macro: No
mandoc: punct.in:69:7: WARNING: skipping empty macro: No
mandoc: punct.in:70:7: WARNING: skipping empty macro: No
mandoc: punct.in:71:7: WARNING: skipping empty macro: No
-mandoc: punct.in:74:7: WARNING: skipping empty macro: No
+mandoc: punct.in:72:7: WARNING: skipping empty macro: No
mandoc: punct.in:75:7: WARNING: skipping empty macro: No
-mandoc: punct.in:83:2: WARNING: skipping empty macro: No
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:76:7: WARNING: skipping empty macro: No
+mandoc: punct.in:84:2: WARNING: skipping empty macro: No
diff --git a/regress/mdoc/No/punct.out_markdown b/regress/mdoc/No/punct.out_markdown
index daa2f923..88e7360b 100644
--- a/regress/mdoc/No/punct.out_markdown
+++ b/regress/mdoc/No/punct.out_markdown
@@ -86,4 +86,4 @@ a . b Nm **bold**
Missing blank:
a.
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/No/spacing.in b/regress/mdoc/No/spacing.in
index bfaffe31..83639da6 100644
--- a/regress/mdoc/No/spacing.in
+++ b/regress/mdoc/No/spacing.in
@@ -1,6 +1,7 @@
-.Dd October 1, 2010
+.\" $OpenBSD: spacing.in,v 1.3 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NO-SPACING 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm No-spacing
.Nd spacing around the normal macro
diff --git a/regress/mdoc/No/spacing.out_ascii b/regress/mdoc/No/spacing.out_ascii
index 5a25b4a3..0c9d58d9 100644
--- a/regress/mdoc/No/spacing.out_ascii
+++ b/regress/mdoc/No/spacing.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
the macro. Macros _b_e_f_o_r_e and _a_f_t_e_r the macro on the same line.
Punctuation before ( and ) after the macro. The macro [in] an enclosure.
-OpenBSD October 1, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/No/spacing.out_markdown b/regress/mdoc/No/spacing.out_markdown
index 442a054f..7b72bbb0 100644
--- a/regress/mdoc/No/spacing.out_markdown
+++ b/regress/mdoc/No/spacing.out_markdown
@@ -24,4 +24,4 @@ The macro
\[in]
an enclosure.
-OpenBSD - October 1, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ns/position.in b/regress/mdoc/Ns/position.in
index 56fc5de6..655d908b 100644
--- a/regress/mdoc/Ns/position.in
+++ b/regress/mdoc/Ns/position.in
@@ -1,6 +1,7 @@
-.Dd June 27, 2017
+.\" $OpenBSD: position.in,v 1.6 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NS-POSITION 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ns-position
.Nd effect of the position of the no space macro on the line
diff --git a/regress/mdoc/Ns/position.out_ascii b/regress/mdoc/Ns/position.out_ascii
index 26de0562..fd56211d 100644
--- a/regress/mdoc/Ns/position.out_ascii
+++ b/regress/mdoc/Ns/position.out_ascii
@@ -20,4 +20,4 @@ DDEESSCCRRIIPPTTIIOONN
At the end of partial implicit: [before][after]
-OpenBSD June 27, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ns/position.out_lint b/regress/mdoc/Ns/position.out_lint
index aa1f3275..16f4cdd8 100644
--- a/regress/mdoc/Ns/position.out_lint
+++ b/regress/mdoc/Ns/position.out_lint
@@ -1,5 +1,2 @@
-mandoc: position.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: position.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: position.in:10:2: WARNING: skipping no-space macro
-mandoc: position.in:27:15: WARNING: skipping no-space macro
-mandoc: position.in: BASE: RCS id missing: (OpenBSD)
+mandoc: position.in:11:2: WARNING: skipping no-space macro
+mandoc: position.in:28:15: WARNING: skipping no-space macro
diff --git a/regress/mdoc/Ns/position.out_markdown b/regress/mdoc/Ns/position.out_markdown
index 8b6c509c..6c906883 100644
--- a/regress/mdoc/Ns/position.out_markdown
+++ b/regress/mdoc/Ns/position.out_markdown
@@ -32,4 +32,4 @@ At the end of a macro line:
At the end of partial implicit:
\[before]\[after]
-OpenBSD - June 27, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ns/punct.in b/regress/mdoc/Ns/punct.in
index 20cfe5cc..082dc7e6 100644
--- a/regress/mdoc/Ns/punct.in
+++ b/regress/mdoc/Ns/punct.in
@@ -1,6 +1,7 @@
-.Dd October 1, 2010
+.\" $OpenBSD: punct.in,v 1.4 2017/07/04 14:53:25 schwarze Exp $
+.Dd $Mdocdate$
.Dt NS-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ns-punct
.Nd punctuation after the no space macro
diff --git a/regress/mdoc/Ns/punct.out_ascii b/regress/mdoc/Ns/punct.out_ascii
index 2afbf866..ac761de5 100644
--- a/regress/mdoc/Ns/punct.out_ascii
+++ b/regress/mdoc/Ns/punct.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
Normal words: nons no Opening punctuation: no(ns no Closing punctuation:
nons) no
-OpenBSD October 1, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ns/punct.out_markdown b/regress/mdoc/Ns/punct.out_markdown
index 92a02c26..d67acfb8 100644
--- a/regress/mdoc/Ns/punct.out_markdown
+++ b/regress/mdoc/Ns/punct.out_markdown
@@ -13,4 +13,4 @@ no(ns no
Closing punctuation:
nons) no
-OpenBSD - October 1, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Oo/punct.in b/regress/mdoc/Oo/punct.in
index 80e2da6e..7ca4a6a2 100644
--- a/regress/mdoc/Oo/punct.in
+++ b/regress/mdoc/Oo/punct.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: punct.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt OO-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Oo-punct
.Nd punctuation handling by the Oo macro
diff --git a/regress/mdoc/Oo/punct.out_ascii b/regress/mdoc/Oo/punct.out_ascii
index 23fabbcb..6c4fbfa3 100644
--- a/regress/mdoc/Oo/punct.out_ascii
+++ b/regress/mdoc/Oo/punct.out_ascii
@@ -12,4 +12,4 @@ DDEESSCCRRIIPPTTIIOONN
missing blank: [a.]
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Oo/punct.out_lint b/regress/mdoc/Oo/punct.out_lint
index 7c58b0c8..9f9beaae 100644
--- a/regress/mdoc/Oo/punct.out_lint
+++ b/regress/mdoc/Oo/punct.out_lint
@@ -1,4 +1 @@
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: punct.in:26:6: STYLE: no blank before trailing delimiter: Oo a.
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:27:6: STYLE: no blank before trailing delimiter: Oo a.
diff --git a/regress/mdoc/Oo/punct.out_markdown b/regress/mdoc/Oo/punct.out_markdown
index 6527e5e1..5ad93965 100644
--- a/regress/mdoc/Oo/punct.out_markdown
+++ b/regress/mdoc/Oo/punct.out_markdown
@@ -23,4 +23,4 @@ at the end:
missing blank:
\[a.]
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Op/break.in b/regress/mdoc/Op/break.in
index 5ca7ffe2..d34e6871 100644
--- a/regress/mdoc/Op/break.in
+++ b/regress/mdoc/Op/break.in
@@ -1,6 +1,7 @@
-.Dd July 2, 2014
+.\" $OpenBSD: break.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt OP-BREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Op-break
.Nd partial explicit block broken by partial implicit block
diff --git a/regress/mdoc/Op/break.out_lint b/regress/mdoc/Op/break.out_lint
index e25d975f..a7fee520 100644
--- a/regress/mdoc/Op/break.out_lint
+++ b/regress/mdoc/Op/break.out_lint
@@ -1,6 +1,3 @@
-mandoc: break.in:9:2: WARNING: blocks badly nested: Op breaks Do
-mandoc: break.in:15:7: WARNING: blocks badly nested: Op breaks Do
-mandoc: break.in:15:2: WARNING: blocks badly nested: Op breaks Do
-mandoc: break.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: break.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: break.in: BASE: RCS id missing: (OpenBSD)
+mandoc: break.in:10:2: WARNING: blocks badly nested: Op breaks Do
+mandoc: break.in:16:7: WARNING: blocks badly nested: Op breaks Do
+mandoc: break.in:16:2: WARNING: blocks badly nested: Op breaks Do
diff --git a/regress/mdoc/Op/break.out_markdown b/regress/mdoc/Op/break.out_markdown
index edf3435e..4e920f9d 100644
--- a/regress/mdoc/Op/break.out_markdown
+++ b/regress/mdoc/Op/break.out_markdown
@@ -16,4 +16,4 @@ after both
3"
0
-OpenBSD - July 2, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Op/broken.in b/regress/mdoc/Op/broken.in
index 43574317..d4909b7e 100644
--- a/regress/mdoc/Op/broken.in
+++ b/regress/mdoc/Op/broken.in
@@ -1,6 +1,7 @@
-.Dd July 2, 2014
+.\" $OpenBSD: broken.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt OP-BROKEN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Op-broken
.Nd partial implicit block broken by partial explicit block
diff --git a/regress/mdoc/Op/broken.out_ascii b/regress/mdoc/Op/broken.out_ascii
index 317a0489..5e005e7b 100644
--- a/regress/mdoc/Op/broken.out_ascii
+++ b/regress/mdoc/Op/broken.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
0 "1 [12 [123" 23]] 0
-OpenBSD July 2, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Op/broken.out_lint b/regress/mdoc/Op/broken.out_lint
index 2a4ca2c3..208a050b 100644
--- a/regress/mdoc/Op/broken.out_lint
+++ b/regress/mdoc/Op/broken.out_lint
@@ -1,5 +1,2 @@
-mandoc: broken.in:10:17: WARNING: blocks badly nested: Do breaks Op
-mandoc: broken.in:15:15: WARNING: blocks badly nested: Do breaks Op
-mandoc: broken.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: broken.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: broken.in: BASE: RCS id missing: (OpenBSD)
+mandoc: broken.in:11:17: WARNING: blocks badly nested: Do breaks Op
+mandoc: broken.in:16:15: WARNING: blocks badly nested: Do breaks Op
diff --git a/regress/mdoc/Op/broken.out_markdown b/regress/mdoc/Op/broken.out_markdown
index 13a50141..bd7dac6f 100644
--- a/regress/mdoc/Op/broken.out_markdown
+++ b/regress/mdoc/Op/broken.out_markdown
@@ -16,4 +16,4 @@ after both
\[12 \[123" 23]]
0
-OpenBSD - July 2, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Op/punct.in b/regress/mdoc/Op/punct.in
index 7c09e574..47659310 100644
--- a/regress/mdoc/Op/punct.in
+++ b/regress/mdoc/Op/punct.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: punct.in,v 1.6 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt OP-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Op-punct
.Nd punctuation handling by the Op macro
diff --git a/regress/mdoc/Op/punct.out_ascii b/regress/mdoc/Op/punct.out_ascii
index 3f5b22cd..a60f2b1b 100644
--- a/regress/mdoc/Op/punct.out_ascii
+++ b/regress/mdoc/Op/punct.out_ascii
@@ -16,4 +16,4 @@ DDEESSCCRRIIPPTTIIOONN
Missing blank: [a.]
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Op/punct.out_lint b/regress/mdoc/Op/punct.out_lint
index 0e9bbd8a..26ab6fec 100644
--- a/regress/mdoc/Op/punct.out_lint
+++ b/regress/mdoc/Op/punct.out_lint
@@ -1,4 +1 @@
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: punct.in:34:6: STYLE: no blank before trailing delimiter: Op a.
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:35:6: STYLE: no blank before trailing delimiter: Op a.
diff --git a/regress/mdoc/Op/punct.out_markdown b/regress/mdoc/Op/punct.out_markdown
index 98ee2e72..d5aab324 100644
--- a/regress/mdoc/Op/punct.out_markdown
+++ b/regress/mdoc/Op/punct.out_markdown
@@ -34,4 +34,4 @@ more than one:
Missing blank:
\[a.]
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Os/dupe.in b/regress/mdoc/Os/dupe.in
index a4918bef..df38d04e 100644
--- a/regress/mdoc/Os/dupe.in
+++ b/regress/mdoc/Os/dupe.in
@@ -1,4 +1,5 @@
-.Dd June 18, 2014
+.\" $OpenBSD: dupe.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Os NetBSD
.Dt OS-DUPE 1
.Os FreeBSD
diff --git a/regress/mdoc/Os/dupe.out_ascii b/regress/mdoc/Os/dupe.out_ascii
index 4f76190a..c120c4e1 100644
--- a/regress/mdoc/Os/dupe.out_ascii
+++ b/regress/mdoc/Os/dupe.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text final text
-OpenBSD June 18, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Os/dupe.out_lint b/regress/mdoc/Os/dupe.out_lint
index 6c8d7584..a0914e9d 100644
--- a/regress/mdoc/Os/dupe.out_lint
+++ b/regress/mdoc/Os/dupe.out_lint
@@ -1,7 +1,9 @@
-mandoc: dupe.in:2:5: BASE: operating system explicitly specified: Os NetBSD (NetBSD)
-mandoc: dupe.in:3:2: WARNING: prologue macros out of order: Dt after Os
-mandoc: dupe.in:4:2: WARNING: duplicate prologue macro: Os
-mandoc: dupe.in:4:5: BASE: operating system explicitly specified: Os FreeBSD (NetBSD)
-mandoc: dupe.in:10:2: WARNING: duplicate prologue macro: Os
-mandoc: dupe.in:10:5: BASE: operating system explicitly specified: Os OpenBSD (NetBSD)
-mandoc: dupe.in: BASE: RCS id missing: (NetBSD)
+mandoc: dupe.in:3:5: STYLE: operating system explicitly specified: Os NetBSD (NetBSD)
+mandoc: dupe.in:2:5: STYLE: Mdocdate found: Dd $Mdocdate: (NetBSD)
+mandoc: dupe.in:4:2: WARNING: prologue macros out of order: Dt after Os
+mandoc: dupe.in:5:2: WARNING: duplicate prologue macro: Os
+mandoc: dupe.in:5:5: STYLE: operating system explicitly specified: Os FreeBSD (NetBSD)
+mandoc: dupe.in:2:5: STYLE: Mdocdate found: Dd $Mdocdate: (NetBSD)
+mandoc: dupe.in:11:2: WARNING: duplicate prologue macro: Os
+mandoc: dupe.in:11:5: STYLE: operating system explicitly specified: Os OpenBSD (NetBSD)
+mandoc: dupe.in: STYLE: RCS id missing: (NetBSD)
diff --git a/regress/mdoc/Os/dupe.out_markdown b/regress/mdoc/Os/dupe.out_markdown
index 48556e30..8186cb3d 100644
--- a/regress/mdoc/Os/dupe.out_markdown
+++ b/regress/mdoc/Os/dupe.out_markdown
@@ -9,4 +9,4 @@ OS-DUPE(1) - General Commands Manual
initial text
final text
-OpenBSD - June 18, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Os/late.in b/regress/mdoc/Os/late.in
index fab68da2..20b23e2d 100644
--- a/regress/mdoc/Os/late.in
+++ b/regress/mdoc/Os/late.in
@@ -1,9 +1,10 @@
-.Dd August 5, 2014
+.\" $OpenBSD: late.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt OS-LATE 1
.Sh NAME
.Nm Os-late
.Nd late operating system macro
.Sh DESCRIPTION
initial text
-.Os OpenBSD
+.Os
final text
diff --git a/regress/mdoc/Os/late.out_ascii b/regress/mdoc/Os/late.out_ascii
index 06de3458..a87e2690 100644
--- a/regress/mdoc/Os/late.out_ascii
+++ b/regress/mdoc/Os/late.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text final text
-OpenBSD August 5, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Os/late.out_lint b/regress/mdoc/Os/late.out_lint
index d236b54e..672654fa 100644
--- a/regress/mdoc/Os/late.out_lint
+++ b/regress/mdoc/Os/late.out_lint
@@ -1,3 +1 @@
-mandoc: late.in:8:2: WARNING: late prologue macro: Os
-mandoc: late.in:8:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: late.in: BASE: RCS id missing: (OpenBSD)
+mandoc: late.in:9:2: WARNING: late prologue macro: Os
diff --git a/regress/mdoc/Os/late.out_markdown b/regress/mdoc/Os/late.out_markdown
index 593a8384..6e81da24 100644
--- a/regress/mdoc/Os/late.out_markdown
+++ b/regress/mdoc/Os/late.out_markdown
@@ -9,4 +9,4 @@ OS-LATE(1) - General Commands Manual
initial text
final text
-OpenBSD - August 5, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Os/long.in b/regress/mdoc/Os/long.in
index c4998629..f76dce68 100644
--- a/regress/mdoc/Os/long.in
+++ b/regress/mdoc/Os/long.in
@@ -1,4 +1,5 @@
-.Dd November 20, 2014
+.\" $OpenBSD: long.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt OS-LONG 1
.Os 1234567890123456789012345678901234567890123456789012345678901234567890123456789
.Sh NAME
diff --git a/regress/mdoc/Os/long.out_ascii b/regress/mdoc/Os/long.out_ascii
index 9253e13e..0c54042d 100644
--- a/regress/mdoc/Os/long.out_ascii
+++ b/regress/mdoc/Os/long.out_ascii
@@ -7,5 +7,5 @@ DDEESSCCRRIIPPTTIIOONN
some text
1234567890123456789012345678901234567890123456789012345678901234567890123456789
- November 20, 2014
+ July 4, 2017
1234567890123456789012345678901234567890123456789012345678901234567890123456789
diff --git a/regress/mdoc/Os/long.out_markdown b/regress/mdoc/Os/long.out_markdown
index 0f144930..3770e485 100644
--- a/regress/mdoc/Os/long.out_markdown
+++ b/regress/mdoc/Os/long.out_markdown
@@ -8,4 +8,4 @@ OS-LONG(1) - General Commands Manual
some text
-1234567890123456789012345678901234567890123456789012345678901234567890123456789 - November 20, 2014
+1234567890123456789012345678901234567890123456789012345678901234567890123456789 - July 4, 2017
diff --git a/regress/mdoc/Os/missing.in b/regress/mdoc/Os/missing.in
index 44297adb..0bcbae9a 100644
--- a/regress/mdoc/Os/missing.in
+++ b/regress/mdoc/Os/missing.in
@@ -1,4 +1,5 @@
-.Dd August 5, 2014
+.\" $OpenBSD: missing.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt OS-MISSING 1
.Sh NAME
.Nm Os-missing
diff --git a/regress/mdoc/Os/missing.out_ascii b/regress/mdoc/Os/missing.out_ascii
index 8398c253..adbf88e1 100644
--- a/regress/mdoc/Os/missing.out_ascii
+++ b/regress/mdoc/Os/missing.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
some text
- August 5, 2014
+ July 4, 2017
diff --git a/regress/mdoc/Os/missing.out_markdown b/regress/mdoc/Os/missing.out_markdown
index ae2ee490..a93ba060 100644
--- a/regress/mdoc/Os/missing.out_markdown
+++ b/regress/mdoc/Os/missing.out_markdown
@@ -8,4 +8,4 @@ OS-MISSING(1) - General Commands Manual
some text
- \- August 5, 2014
+ \- July 4, 2017
diff --git a/regress/mdoc/Ox/keep.in b/regress/mdoc/Ox/keep.in
index 2a8bfff0..51bad73e 100644
--- a/regress/mdoc/Ox/keep.in
+++ b/regress/mdoc/Ox/keep.in
@@ -1,6 +1,7 @@
-.Dd January 30, 2011
+.\" $OpenBSD: keep.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt OX-KEEP 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ox-keep
.Nd interaction of unix variant macros and word keeps
diff --git a/regress/mdoc/Ox/keep.out_ascii b/regress/mdoc/Ox/keep.out_ascii
index 9f01890a..9df5b224 100644
--- a/regress/mdoc/Ox/keep.out_ascii
+++ b/regress/mdoc/Ox/keep.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
Because we use a keep,
OpenBSD 4.9 must be at the beginning of a new line.
-OpenBSD January 30, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ox/keep.out_markdown b/regress/mdoc/Ox/keep.out_markdown
index 52e7c2b1..9930e067 100644
--- a/regress/mdoc/Ox/keep.out_markdown
+++ b/regress/mdoc/Ox/keep.out_markdown
@@ -9,4 +9,4 @@ OX-KEEP(1) - General Commands Manual
Because we use a keep,
OpenBSD&nbsp;4.9&nbsp;must&nbsp;be&nbsp;at&nbsp;the&nbsp;beginning&nbsp;of&nbsp;a&nbsp;new&nbsp;line.
-OpenBSD - January 30, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Pa/font.in b/regress/mdoc/Pa/font.in
index ce23f772..839666f1 100644
--- a/regress/mdoc/Pa/font.in
+++ b/regress/mdoc/Pa/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt PA-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Pa-font
.Nd changing fonts inside the path macro
diff --git a/regress/mdoc/Pa/font.out_ascii b/regress/mdoc/Pa/font.out_ascii
index 5cf318ce..9ec6e361 100644
--- a/regress/mdoc/Pa/font.out_ascii
+++ b/regress/mdoc/Pa/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Pa/font.out_markdown b/regress/mdoc/Pa/font.out_markdown
index 0278fd99..cffed413 100644
--- a/regress/mdoc/Pa/font.out_markdown
+++ b/regress/mdoc/Pa/font.out_markdown
@@ -10,4 +10,4 @@ normal text
*emphasis**bold**back*
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Pa/punct.in b/regress/mdoc/Pa/punct.in
index 36dac9e5..f5621b26 100644
--- a/regress/mdoc/Pa/punct.in
+++ b/regress/mdoc/Pa/punct.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: punct.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt PA-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Pa-punct
.Nd punctuation handling by the Pa macro
diff --git a/regress/mdoc/Pa/punct.out_ascii b/regress/mdoc/Pa/punct.out_ascii
index 6dabc348..e32f3114 100644
--- a/regress/mdoc/Pa/punct.out_ascii
+++ b/regress/mdoc/Pa/punct.out_ascii
@@ -12,4 +12,4 @@ DDEESSCCRRIIPPTTIIOONN
missing blank: _a_.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Pa/punct.out_lint b/regress/mdoc/Pa/punct.out_lint
index 6b856085..8c2bdf40 100644
--- a/regress/mdoc/Pa/punct.out_lint
+++ b/regress/mdoc/Pa/punct.out_lint
@@ -1,4 +1 @@
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: punct.in:45:6: STYLE: no blank before trailing delimiter: Pa a.
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:46:6: STYLE: no blank before trailing delimiter: Pa a.
diff --git a/regress/mdoc/Pa/punct.out_markdown b/regress/mdoc/Pa/punct.out_markdown
index 6c6883a6..9f2294bc 100644
--- a/regress/mdoc/Pa/punct.out_markdown
+++ b/regress/mdoc/Pa/punct.out_markdown
@@ -45,4 +45,4 @@ quoted punctuation:
missing blank:
*a.*
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Pf/spacing.in b/regress/mdoc/Pf/spacing.in
index 5a547495..291694ee 100644
--- a/regress/mdoc/Pf/spacing.in
+++ b/regress/mdoc/Pf/spacing.in
@@ -1,6 +1,7 @@
-.Dd November 30, 2014
+.\" $OpenBSD: spacing.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt PF-SPACING 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Pf-spacing
.Nd spacing around the prefix macro
diff --git a/regress/mdoc/Pf/spacing.out_ascii b/regress/mdoc/Pf/spacing.out_ascii
index cd5c96b2..95c41bb9 100644
--- a/regress/mdoc/Pf/spacing.out_ascii
+++ b/regress/mdoc/Pf/spacing.out_ascii
@@ -12,4 +12,4 @@ DDEESSCCRRIIPPTTIIOONN
It makes no sense at the very _e_n_d
-OpenBSD November 30, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Pf/spacing.out_lint b/regress/mdoc/Pf/spacing.out_lint
index 7389a8c5..55d4341f 100644
--- a/regress/mdoc/Pf/spacing.out_lint
+++ b/regress/mdoc/Pf/spacing.out_lint
@@ -1,6 +1,3 @@
-mandoc: spacing.in:24:2: WARNING: nothing follows prefix: Pf prefixed
-mandoc: spacing.in:27:9: WARNING: nothing follows prefix: Pf .
-mandoc: spacing.in:31:9: WARNING: nothing follows prefix: Pf at eol
-mandoc: spacing.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: spacing.in:1:5: BASE: Mdocdate missing: Dd November (OpenBSD)
-mandoc: spacing.in: BASE: RCS id missing: (OpenBSD)
+mandoc: spacing.in:25:2: WARNING: nothing follows prefix: Pf prefixed
+mandoc: spacing.in:28:9: WARNING: nothing follows prefix: Pf .
+mandoc: spacing.in:32:9: WARNING: nothing follows prefix: Pf at eol
diff --git a/regress/mdoc/Pf/spacing.out_markdown b/regress/mdoc/Pf/spacing.out_markdown
index 52349715..b08fef3b 100644
--- a/regress/mdoc/Pf/spacing.out_markdown
+++ b/regress/mdoc/Pf/spacing.out_markdown
@@ -31,4 +31,4 @@ Trailing punctuation still counts as
It makes no sense at the very
*end*
-OpenBSD - November 30, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Pp/arg.in b/regress/mdoc/Pp/arg.in
index 563a4e98..4c7ab5fc 100644
--- a/regress/mdoc/Pp/arg.in
+++ b/regress/mdoc/Pp/arg.in
@@ -1,6 +1,7 @@
-.Dd February 4, 2015
+.\" $OpenBSD: arg.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt PP-ARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Pp-arg
.Nd paragraph macro with arguments
diff --git a/regress/mdoc/Pp/arg.out_ascii b/regress/mdoc/Pp/arg.out_ascii
index 543772f8..a15f1598 100644
--- a/regress/mdoc/Pp/arg.out_ascii
+++ b/regress/mdoc/Pp/arg.out_ascii
@@ -11,4 +11,4 @@ DDEESSCCRRIIPPTTIIOONN
line 4
-OpenBSD February 4, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Pp/arg.out_lint b/regress/mdoc/Pp/arg.out_lint
index 9c89e1a5..f49d27d4 100644
--- a/regress/mdoc/Pp/arg.out_lint
+++ b/regress/mdoc/Pp/arg.out_lint
@@ -1,6 +1,3 @@
-mandoc: arg.in:11:5: ERROR: skipping all arguments: br drop this
-mandoc: arg.in:13:8: ERROR: skipping excess arguments: sp ... drop this
-mandoc: arg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: arg.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: arg.in:9:2: ERROR: skipping all arguments: Pp drop
-mandoc: arg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: arg.in:12:5: ERROR: skipping all arguments: br drop this
+mandoc: arg.in:14:8: ERROR: skipping excess arguments: sp ... drop this
+mandoc: arg.in:10:2: ERROR: skipping all arguments: Pp drop
diff --git a/regress/mdoc/Pp/arg.out_markdown b/regress/mdoc/Pp/arg.out_markdown
index 290c3e0c..17c7753a 100644
--- a/regress/mdoc/Pp/arg.out_markdown
+++ b/regress/mdoc/Pp/arg.out_markdown
@@ -13,4 +13,4 @@ line 3
line 4
-OpenBSD - February 4, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Qq/empty.in b/regress/mdoc/Qq/empty.in
index b7550375..bd3fc189 100644
--- a/regress/mdoc/Qq/empty.in
+++ b/regress/mdoc/Qq/empty.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: empty.in,v 1.5 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt QQ-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Qq-empty
.Nd empty implicit enclosure macros
diff --git a/regress/mdoc/Qq/empty.out_ascii b/regress/mdoc/Qq/empty.out_ascii
index 44f7960d..ceb66819 100644
--- a/regress/mdoc/Qq/empty.out_ascii
+++ b/regress/mdoc/Qq/empty.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
An empty "" and a full ("user@host)" quotation. And another ("full)" one
bboolldd.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Qq/empty.out_lint b/regress/mdoc/Qq/empty.out_lint
index a7d35f92..879cd127 100644
--- a/regress/mdoc/Qq/empty.out_lint
+++ b/regress/mdoc/Qq/empty.out_lint
@@ -1,5 +1,2 @@
-mandoc: empty.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: empty.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: empty.in:11:18: STYLE: no blank before trailing delimiter: Qq user@host)
-mandoc: empty.in:14:13: STYLE: no blank before trailing delimiter: Qo full)
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:12:18: STYLE: no blank before trailing delimiter: Qq user@host)
+mandoc: empty.in:15:13: STYLE: no blank before trailing delimiter: Qo full)
diff --git a/regress/mdoc/Qq/empty.out_markdown b/regress/mdoc/Qq/empty.out_markdown
index f6dd12e7..4088082a 100644
--- a/regress/mdoc/Qq/empty.out_markdown
+++ b/regress/mdoc/Qq/empty.out_markdown
@@ -14,4 +14,4 @@ quotation.
And another
("full)" one **bold**.
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Rs/allch.in b/regress/mdoc/Rs/allch.in
index abffe803..365e41ea 100644
--- a/regress/mdoc/Rs/allch.in
+++ b/regress/mdoc/Rs/allch.in
@@ -1,6 +1,7 @@
-.Dd July 7, 2014
+.\" $OpenBSD: allch.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt RS-ALLCH 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Rs-allch
.Nd reference block using all supported child macros
diff --git a/regress/mdoc/Rs/allch.out_ascii b/regress/mdoc/Rs/allch.out_ascii
index 78b1230d..e1bc4cf4 100644
--- a/regress/mdoc/Rs/allch.out_ascii
+++ b/regress/mdoc/Rs/allch.out_ascii
@@ -18,4 +18,4 @@ SSEEEE AALLSSOO
resource locator, page number, institutional author, city name, date of
publication, optional information.
-OpenBSD July 7, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rs/allch.out_lint b/regress/mdoc/Rs/allch.out_lint
index bd38aeff..0a963265 100644
--- a/regress/mdoc/Rs/allch.out_lint
+++ b/regress/mdoc/Rs/allch.out_lint
@@ -1,9 +1,6 @@
-mandoc: allch.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: allch.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: allch.in:14:1: WARNING: invalid content in Rs block: text
-mandoc: allch.in:19:2: WARNING: invalid content in Rs block: Em
-mandoc: allch.in:20:1: WARNING: invalid content in Rs block: text
-mandoc: allch.in:35:1: WARNING: invalid content in Rs block: text
-mandoc: allch.in:36:2: WARNING: invalid content in Rs block: Em
-mandoc: allch.in:41:1: WARNING: invalid content in Rs block: text
-mandoc: allch.in: BASE: RCS id missing: (OpenBSD)
+mandoc: allch.in:15:1: WARNING: invalid content in Rs block: text
+mandoc: allch.in:20:2: WARNING: invalid content in Rs block: Em
+mandoc: allch.in:21:1: WARNING: invalid content in Rs block: text
+mandoc: allch.in:36:1: WARNING: invalid content in Rs block: text
+mandoc: allch.in:37:2: WARNING: invalid content in Rs block: Em
+mandoc: allch.in:42:1: WARNING: invalid content in Rs block: text
diff --git a/regress/mdoc/Rs/allch.out_markdown b/regress/mdoc/Rs/allch.out_markdown
index 64b891cc..9e10a863 100644
--- a/regress/mdoc/Rs/allch.out_markdown
+++ b/regress/mdoc/Rs/allch.out_markdown
@@ -47,4 +47,4 @@ city name,
date of publication,
optional information.
-OpenBSD - July 7, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Rs/allch.out_utf8 b/regress/mdoc/Rs/allch.out_utf8
index ddfbd7b0..ea5a7378 100644
--- a/regress/mdoc/Rs/allch.out_utf8
+++ b/regress/mdoc/Rs/allch.out_utf8
@@ -18,4 +18,4 @@ SSEEEE AALLSSOO
resource locator, page number, institutional author, city name, date of
publication, optional information.
-OpenBSD July 7, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rs/args.in b/regress/mdoc/Rs/args.in
index 2f292013..06b941b5 100644
--- a/regress/mdoc/Rs/args.in
+++ b/regress/mdoc/Rs/args.in
@@ -1,6 +1,7 @@
-.Dd February 4, 2015
+.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt RS-ARGS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Rs-args
.Nd arguments on a reference block header line
diff --git a/regress/mdoc/Rs/args.out_ascii b/regress/mdoc/Rs/args.out_ascii
index 30cb3c86..cd43aa44 100644
--- a/regress/mdoc/Rs/args.out_ascii
+++ b/regress/mdoc/Rs/args.out_ascii
@@ -10,4 +10,4 @@ SSEEEE AALLSSOO
author name, _b_o_o_k _t_i_t_l_e. final text
-OpenBSD February 4, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rs/args.out_lint b/regress/mdoc/Rs/args.out_lint
index 42b56e6a..7942b392 100644
--- a/regress/mdoc/Rs/args.out_lint
+++ b/regress/mdoc/Rs/args.out_lint
@@ -1,5 +1,2 @@
-mandoc: args.in:9:5: ERROR: skipping all arguments: Rs bogus
-mandoc: args.in:14:5: ERROR: skipping all arguments: Rs Sy
-mandoc: args.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: args.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:10:5: ERROR: skipping all arguments: Rs bogus
+mandoc: args.in:15:5: ERROR: skipping all arguments: Rs Sy
diff --git a/regress/mdoc/Rs/args.out_markdown b/regress/mdoc/Rs/args.out_markdown
index a9416b34..20fda04d 100644
--- a/regress/mdoc/Rs/args.out_markdown
+++ b/regress/mdoc/Rs/args.out_markdown
@@ -16,4 +16,4 @@ author name,
*book title*.
final text
-OpenBSD - February 4, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Rs/break.in b/regress/mdoc/Rs/break.in
index 0e8d0301..bdae33fe 100644
--- a/regress/mdoc/Rs/break.in
+++ b/regress/mdoc/Rs/break.in
@@ -1,6 +1,7 @@
-.Dd April 15, 2014
+.\" $OpenBSD: break.in,v 1.5 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt RS-BREAK 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Rs-break
.Nd line break before reference start
diff --git a/regress/mdoc/Rs/break.out_ascii b/regress/mdoc/Rs/break.out_ascii
index 556c82db..0c962583 100644
--- a/regress/mdoc/Rs/break.out_ascii
+++ b/regress/mdoc/Rs/break.out_ascii
@@ -16,4 +16,4 @@ SSEEEE _A_L_S_O
author, _j_o_u_r_n_a_l, 42.
-OpenBSD April 15, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rs/break.out_markdown b/regress/mdoc/Rs/break.out_markdown
index 361f5bf0..ad6adfb3 100644
--- a/regress/mdoc/Rs/break.out_markdown
+++ b/regress/mdoc/Rs/break.out_markdown
@@ -27,4 +27,4 @@ author,
*journal*,
42\.
-OpenBSD - April 15, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Rs/break.out_utf8 b/regress/mdoc/Rs/break.out_utf8
index 0164c5c0..9cd3bb59 100644
--- a/regress/mdoc/Rs/break.out_utf8
+++ b/regress/mdoc/Rs/break.out_utf8
@@ -16,4 +16,4 @@ SSEEEE _A_L_S_O
author, _j_o_u_r_n_a_l, 42.
-OpenBSD April 15, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rs/empty.in b/regress/mdoc/Rs/empty.in
index 36d80663..701826b3 100644
--- a/regress/mdoc/Rs/empty.in
+++ b/regress/mdoc/Rs/empty.in
@@ -1,6 +1,7 @@
-.Dd February 4, 2015
+.\" $OpenBSD: empty.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt RS-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Rs-empty
.Nd empty reference blocks
diff --git a/regress/mdoc/Rs/empty.out_ascii b/regress/mdoc/Rs/empty.out_ascii
index 9dad8f6a..b87e4ad8 100644
--- a/regress/mdoc/Rs/empty.out_ascii
+++ b/regress/mdoc/Rs/empty.out_ascii
@@ -11,4 +11,4 @@ SSEEEE AALLSSOO
final text
-OpenBSD February 4, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rs/empty.out_lint b/regress/mdoc/Rs/empty.out_lint
index ee4c4d22..52554b25 100644
--- a/regress/mdoc/Rs/empty.out_lint
+++ b/regress/mdoc/Rs/empty.out_lint
@@ -1,5 +1,2 @@
-mandoc: empty.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: empty.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: empty.in:9:2: WARNING: empty reference block: Rs
-mandoc: empty.in:14:2: WARNING: empty reference block: Rs
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:10:2: WARNING: empty reference block: Rs
+mandoc: empty.in:15:2: WARNING: empty reference block: Rs
diff --git a/regress/mdoc/Rs/empty.out_markdown b/regress/mdoc/Rs/empty.out_markdown
index 9c8ff4a1..372bddbb 100644
--- a/regress/mdoc/Rs/empty.out_markdown
+++ b/regress/mdoc/Rs/empty.out_markdown
@@ -15,4 +15,4 @@ initial text
final text
-OpenBSD - February 4, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Rs/empty.out_utf8 b/regress/mdoc/Rs/empty.out_utf8
index 419a5d90..c554bddf 100644
--- a/regress/mdoc/Rs/empty.out_utf8
+++ b/regress/mdoc/Rs/empty.out_utf8
@@ -11,4 +11,4 @@ SSEEEE AALLSSOO
final text
-OpenBSD February 4, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rs/three_authors.in b/regress/mdoc/Rs/three_authors.in
index 6ce73bb0..c2831411 100644
--- a/regress/mdoc/Rs/three_authors.in
+++ b/regress/mdoc/Rs/three_authors.in
@@ -1,6 +1,7 @@
-.Dd May 1, 2009
+.\" $OpenBSD: three_authors.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt RS-THREE_AUTHORS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Rs-three_authors
.Nd listing three authors in a reference block
diff --git a/regress/mdoc/Rs/three_authors.out_ascii b/regress/mdoc/Rs/three_authors.out_ascii
index a267086a..04c0b2dd 100644
--- a/regress/mdoc/Rs/three_authors.out_ascii
+++ b/regress/mdoc/Rs/three_authors.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
AAUUTTHHOORRSS
kristaps, joerg, and ingo, _m_a_n_d_o_c.
-OpenBSD May 1, 2009 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rs/three_authors.out_markdown b/regress/mdoc/Rs/three_authors.out_markdown
index 66456f37..ae5b494d 100644
--- a/regress/mdoc/Rs/three_authors.out_markdown
+++ b/regress/mdoc/Rs/three_authors.out_markdown
@@ -11,4 +11,4 @@ joerg, and
ingo,
*mandoc*.
-OpenBSD - May 1, 2009
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Rs/three_authors.out_utf8 b/regress/mdoc/Rs/three_authors.out_utf8
index 72c10d6d..a174a8fb 100644
--- a/regress/mdoc/Rs/three_authors.out_utf8
+++ b/regress/mdoc/Rs/three_authors.out_utf8
@@ -6,4 +6,4 @@ NNAAMMEE
AAUUTTHHOORRSS
kristaps, joerg, and ingo, _m_a_n_d_o_c.
-OpenBSD May 1, 2009 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rv/args.in b/regress/mdoc/Rv/args.in
index 24f37eab..78341846 100644
--- a/regress/mdoc/Rv/args.in
+++ b/regress/mdoc/Rv/args.in
@@ -1,6 +1,7 @@
-.Dd July 29, 2014
+.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt RV-ARGS 3
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Rv-args
.Nd arguments to the return value macro
diff --git a/regress/mdoc/Rv/args.out_ascii b/regress/mdoc/Rv/args.out_ascii
index d2b92536..106f63ad 100644
--- a/regress/mdoc/Rv/args.out_ascii
+++ b/regress/mdoc/Rv/args.out_ascii
@@ -19,4 +19,4 @@ RREETTUURRNN VVAALLUUEESS
the value -1 is returned and the global variable _e_r_r_n_o is set to indicate
the error.
-OpenBSD July 29, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rv/args.out_markdown b/regress/mdoc/Rv/args.out_markdown
index 017f9b6d..b9070181 100644
--- a/regress/mdoc/Rv/args.out_markdown
+++ b/regress/mdoc/Rv/args.out_markdown
@@ -15,4 +15,4 @@ The **one**() function returns the value&#160;0 if successful; otherwise the val
two arguments:
The **one**() and **two**() functions return the value&#160;0 if successful; otherwise the value&#160;&#45;1 is returned and the global variable *errno* is set to indicate the error.
-OpenBSD - July 29, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Rv/noname.in b/regress/mdoc/Rv/noname.in
index 4bb21cce..d64a32fa 100644
--- a/regress/mdoc/Rv/noname.in
+++ b/regress/mdoc/Rv/noname.in
@@ -1,6 +1,7 @@
-.Dd July 29, 2014
+.\" $OpenBSD: noname.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt RV-NONAME 3
-.Os OpenBSD
+.Os
.Sh NAME
.Nm
.Nd return value macro without an available name
diff --git a/regress/mdoc/Rv/noname.out_ascii b/regress/mdoc/Rv/noname.out_ascii
index 8cdd6a2f..c6454d5a 100644
--- a/regress/mdoc/Rv/noname.out_ascii
+++ b/regress/mdoc/Rv/noname.out_ascii
@@ -19,4 +19,4 @@ RREETTUURRNN VVAALLUUEESS
the value -1 is returned and the global variable _e_r_r_n_o is set to indicate
the error.
-OpenBSD July 29, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rv/noname.out_lint b/regress/mdoc/Rv/noname.out_lint
index 389ccb7e..71652b6f 100644
--- a/regress/mdoc/Rv/noname.out_lint
+++ b/regress/mdoc/Rv/noname.out_lint
@@ -1,4 +1 @@
-mandoc: noname.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noname.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: noname.in:5:2: ERROR: missing manual name, using "": Nm
-mandoc: noname.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noname.in:6:2: ERROR: missing manual name, using "": Nm
diff --git a/regress/mdoc/Rv/nostd.in b/regress/mdoc/Rv/nostd.in
index 0dc9ea12..5fa657e9 100644
--- a/regress/mdoc/Rv/nostd.in
+++ b/regress/mdoc/Rv/nostd.in
@@ -1,6 +1,7 @@
-.Dd July 29, 2014
+.\" $OpenBSD: nostd.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt RV-NOSTD 3
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Rv-nostd
.Nd return value macros without -std arguments
diff --git a/regress/mdoc/Rv/nostd.out_ascii b/regress/mdoc/Rv/nostd.out_ascii
index 320b8b11..1279afe8 100644
--- a/regress/mdoc/Rv/nostd.out_ascii
+++ b/regress/mdoc/Rv/nostd.out_ascii
@@ -19,4 +19,4 @@ RREETTUURRNN VVAALLUUEESS
the value -1 is returned and the global variable _e_r_r_n_o is set to indicate
the error.
-OpenBSD July 29, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Rv/nostd.out_lint b/regress/mdoc/Rv/nostd.out_lint
index e13378c2..881d3c9a 100644
--- a/regress/mdoc/Rv/nostd.out_lint
+++ b/regress/mdoc/Rv/nostd.out_lint
@@ -1,6 +1,3 @@
-mandoc: nostd.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: nostd.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: nostd.in:9:2: WARNING: missing -std argument, adding it: Rv
-mandoc: nostd.in:12:2: WARNING: missing -std argument, adding it: Rv
-mandoc: nostd.in:15:2: WARNING: missing -std argument, adding it: Rv
-mandoc: nostd.in: BASE: RCS id missing: (OpenBSD)
+mandoc: nostd.in:10:2: WARNING: missing -std argument, adding it: Rv
+mandoc: nostd.in:13:2: WARNING: missing -std argument, adding it: Rv
+mandoc: nostd.in:16:2: WARNING: missing -std argument, adding it: Rv
diff --git a/regress/mdoc/Rv/nostd.out_markdown b/regress/mdoc/Rv/nostd.out_markdown
index 5600556d..d2000267 100644
--- a/regress/mdoc/Rv/nostd.out_markdown
+++ b/regress/mdoc/Rv/nostd.out_markdown
@@ -15,4 +15,4 @@ The **one**() function returns the value&#160;0 if successful; otherwise the val
two arguments:
The **one**() and **two**() functions return the value&#160;0 if successful; otherwise the value&#160;&#45;1 is returned and the global variable *errno* is set to indicate the error.
-OpenBSD - July 29, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/badNAME.in b/regress/mdoc/Sh/badNAME.in
index 85ebdbf7..c507f942 100644
--- a/regress/mdoc/Sh/badNAME.in
+++ b/regress/mdoc/Sh/badNAME.in
@@ -1,6 +1,7 @@
-.Dd July 1, 2014
+.\" $OpenBSD: badNAME.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-BADNAME 1
-.Os OpenBSD
+.Os
.Sh NAME
.Em bad NAME section
.Nm Sh-badNAME
diff --git a/regress/mdoc/Sh/badNAME.out_ascii b/regress/mdoc/Sh/badNAME.out_ascii
index 8c329a85..8735f797 100644
--- a/regress/mdoc/Sh/badNAME.out_ascii
+++ b/regress/mdoc/Sh/badNAME.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
The description appears before the name and is not marked up with Nd.
-OpenBSD July 1, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/badNAME.out_lint b/regress/mdoc/Sh/badNAME.out_lint
index 76387c0d..38746e74 100644
--- a/regress/mdoc/Sh/badNAME.out_lint
+++ b/regress/mdoc/Sh/badNAME.out_lint
@@ -1,5 +1,2 @@
-mandoc: badNAME.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badNAME.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: badNAME.in:5:2: WARNING: bad NAME section content: Em
-mandoc: badNAME.in:4:2: WARNING: NAME section without description
-mandoc: badNAME.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badNAME.in:6:2: WARNING: bad NAME section content: Em
+mandoc: badNAME.in:5:2: WARNING: NAME section without description
diff --git a/regress/mdoc/Sh/badNAME.out_markdown b/regress/mdoc/Sh/badNAME.out_markdown
index 449636c0..4593abb9 100644
--- a/regress/mdoc/Sh/badNAME.out_markdown
+++ b/regress/mdoc/Sh/badNAME.out_markdown
@@ -9,4 +9,4 @@ SH-BADNAME(1) - General Commands Manual
The description appears before the name and is not marked up with Nd.
-OpenBSD - July 1, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/before.in b/regress/mdoc/Sh/before.in
index 95b750cc..710d7db2 100644
--- a/regress/mdoc/Sh/before.in
+++ b/regress/mdoc/Sh/before.in
@@ -1,6 +1,7 @@
-.Dd July 7, 2014
+.\" $OpenBSD: before.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-BEFORE 1
-.Os OpenBSD
+.Os
Can
.Xr mandoc 1
on
diff --git a/regress/mdoc/Sh/before.out_ascii b/regress/mdoc/Sh/before.out_ascii
index 246c684a..5f03dfe1 100644
--- a/regress/mdoc/Sh/before.out_ascii
+++ b/regress/mdoc/Sh/before.out_ascii
@@ -8,4 +8,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
some text
-OpenBSD July 7, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/before.out_lint b/regress/mdoc/Sh/before.out_lint
index f92de650..5d5e0f76 100644
--- a/regress/mdoc/Sh/before.out_lint
+++ b/regress/mdoc/Sh/before.out_lint
@@ -1,4 +1 @@
-mandoc: before.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: before.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: before.in: BASE: RCS id missing: (OpenBSD)
-mandoc: before.in:4:1: WARNING: content before first section header: text
+mandoc: before.in:5:1: WARNING: content before first section header: text
diff --git a/regress/mdoc/Sh/before.out_markdown b/regress/mdoc/Sh/before.out_markdown
index 261ebbde..bd184a3e 100644
--- a/regress/mdoc/Sh/before.out_markdown
+++ b/regress/mdoc/Sh/before.out_markdown
@@ -14,4 +14,4 @@ handle this?
some text
-OpenBSD - July 7, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/empty.in b/regress/mdoc/Sh/empty.in
index c830ac62..284a5d2e 100644
--- a/regress/mdoc/Sh/empty.in
+++ b/regress/mdoc/Sh/empty.in
@@ -1,6 +1,7 @@
-.Dd November 21, 2014
+.\" $OpenBSD: empty.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sh-empty
.Nd empty sections
diff --git a/regress/mdoc/Sh/empty.out_ascii b/regress/mdoc/Sh/empty.out_ascii
index d34892ff..bea45206 100644
--- a/regress/mdoc/Sh/empty.out_ascii
+++ b/regress/mdoc/Sh/empty.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
BBUUGGSS
Quite some.
-OpenBSD November 21, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/empty.out_lint b/regress/mdoc/Sh/empty.out_lint
index 1a4bf7ee..3410a719 100644
--- a/regress/mdoc/Sh/empty.out_lint
+++ b/regress/mdoc/Sh/empty.out_lint
@@ -1,4 +1 @@
-mandoc: empty.in:9:2: ERROR: inserting missing end of block: Sh breaks Xo
-mandoc: empty.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: empty.in:1:5: BASE: Mdocdate missing: Dd November (OpenBSD)
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:10:2: ERROR: inserting missing end of block: Sh breaks Xo
diff --git a/regress/mdoc/Sh/empty.out_markdown b/regress/mdoc/Sh/empty.out_markdown
index b71fbfa6..212f51e2 100644
--- a/regress/mdoc/Sh/empty.out_markdown
+++ b/regress/mdoc/Sh/empty.out_markdown
@@ -12,4 +12,4 @@ SH-EMPTY(1) - General Commands Manual
Quite some.
-OpenBSD - November 21, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/emptyNAME.in b/regress/mdoc/Sh/emptyNAME.in
index 621724e5..e9e99f85 100644
--- a/regress/mdoc/Sh/emptyNAME.in
+++ b/regress/mdoc/Sh/emptyNAME.in
@@ -1,6 +1,7 @@
-.Dd July 1, 2014
+.\" $OpenBSD: emptyNAME.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-EMPTYNAME 1
-.Os OpenBSD
+.Os
.Sh NAME
.Sh DESCRIPTION
The NAME section is empty.
diff --git a/regress/mdoc/Sh/emptyNAME.out_ascii b/regress/mdoc/Sh/emptyNAME.out_ascii
index 32336cd9..03137fc7 100644
--- a/regress/mdoc/Sh/emptyNAME.out_ascii
+++ b/regress/mdoc/Sh/emptyNAME.out_ascii
@@ -4,4 +4,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
The NAME section is empty.
-OpenBSD July 1, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/emptyNAME.out_lint b/regress/mdoc/Sh/emptyNAME.out_lint
index 04d45e5e..d676efce 100644
--- a/regress/mdoc/Sh/emptyNAME.out_lint
+++ b/regress/mdoc/Sh/emptyNAME.out_lint
@@ -1,5 +1,2 @@
-mandoc: emptyNAME.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: emptyNAME.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: emptyNAME.in:4:2: WARNING: NAME section without Nm before Nd
-mandoc: emptyNAME.in:4:2: WARNING: NAME section without description
-mandoc: emptyNAME.in: BASE: RCS id missing: (OpenBSD)
+mandoc: emptyNAME.in:5:2: WARNING: NAME section without Nm before Nd
+mandoc: emptyNAME.in:5:2: WARNING: NAME section without description
diff --git a/regress/mdoc/Sh/emptyNAME.out_markdown b/regress/mdoc/Sh/emptyNAME.out_markdown
index b5cf38a5..4ca22daf 100644
--- a/regress/mdoc/Sh/emptyNAME.out_markdown
+++ b/regress/mdoc/Sh/emptyNAME.out_markdown
@@ -6,4 +6,4 @@ SH-EMPTYNAME(1) - General Commands Manual
The NAME section is empty.
-OpenBSD - July 1, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/first.in b/regress/mdoc/Sh/first.in
index f0d4b0b4..7e3e932c 100644
--- a/regress/mdoc/Sh/first.in
+++ b/regress/mdoc/Sh/first.in
@@ -1,5 +1,6 @@
-.Dd July 1, 2014
+.\" $OpenBSD: first.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-FIRST 1
-.Os OpenBSD
+.Os
.Sh DESCRIPTION
The first section is not a NAME section.
diff --git a/regress/mdoc/Sh/first.out_ascii b/regress/mdoc/Sh/first.out_ascii
index 7d2234eb..06f9bdc5 100644
--- a/regress/mdoc/Sh/first.out_ascii
+++ b/regress/mdoc/Sh/first.out_ascii
@@ -3,4 +3,4 @@ SH-FIRST(1) General Commands Manual SH-FIRST(1)
DDEESSCCRRIIPPTTIIOONN
The first section is not a NAME section.
-OpenBSD July 1, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/first.out_lint b/regress/mdoc/Sh/first.out_lint
index a09b5d61..7f440c8e 100644
--- a/regress/mdoc/Sh/first.out_lint
+++ b/regress/mdoc/Sh/first.out_lint
@@ -1,4 +1 @@
-mandoc: first.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: first.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: first.in:4:2: WARNING: first section is not "NAME": Sh DESCRIPTION
-mandoc: first.in: BASE: RCS id missing: (OpenBSD)
+mandoc: first.in:5:2: WARNING: first section is not "NAME": Sh DESCRIPTION
diff --git a/regress/mdoc/Sh/first.out_markdown b/regress/mdoc/Sh/first.out_markdown
index be7ee5a6..40a1e5e8 100644
--- a/regress/mdoc/Sh/first.out_markdown
+++ b/regress/mdoc/Sh/first.out_markdown
@@ -4,4 +4,4 @@ SH-FIRST(1) - General Commands Manual
The first section is not a NAME section.
-OpenBSD - July 1, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/nohead.in b/regress/mdoc/Sh/nohead.in
index d4516cc7..b06da7b6 100644
--- a/regress/mdoc/Sh/nohead.in
+++ b/regress/mdoc/Sh/nohead.in
@@ -1,6 +1,7 @@
-.Dd February 5, 2015
+.\" $OpenBSD: nohead.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-NOHEAD 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sh-nohead
.Nd sections without header lines
diff --git a/regress/mdoc/Sh/nohead.out_ascii b/regress/mdoc/Sh/nohead.out_ascii
index fa42f20c..f711cf4f 100644
--- a/regress/mdoc/Sh/nohead.out_ascii
+++ b/regress/mdoc/Sh/nohead.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
empty section header: empty subsection header: text
-OpenBSD February 5, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/nohead.out_lint b/regress/mdoc/Sh/nohead.out_lint
index 39267b9a..1fe6638f 100644
--- a/regress/mdoc/Sh/nohead.out_lint
+++ b/regress/mdoc/Sh/nohead.out_lint
@@ -1,5 +1,2 @@
-mandoc: nohead.in:9:2: WARNING: skipping empty macro: Sh
-mandoc: nohead.in:11:2: WARNING: skipping empty macro: Ss
-mandoc: nohead.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: nohead.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: nohead.in: BASE: RCS id missing: (OpenBSD)
+mandoc: nohead.in:10:2: WARNING: skipping empty macro: Sh
+mandoc: nohead.in:12:2: WARNING: skipping empty macro: Ss
diff --git a/regress/mdoc/Sh/nohead.out_markdown b/regress/mdoc/Sh/nohead.out_markdown
index 4ec6aa8e..a36c4a2d 100644
--- a/regress/mdoc/Sh/nohead.out_markdown
+++ b/regress/mdoc/Sh/nohead.out_markdown
@@ -10,4 +10,4 @@ empty section header:
empty subsection header:
text
-OpenBSD - February 5, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/order.in b/regress/mdoc/Sh/order.in
index ffab6878..e4ff77aa 100644
--- a/regress/mdoc/Sh/order.in
+++ b/regress/mdoc/Sh/order.in
@@ -1,6 +1,7 @@
-.Dd July 1, 2014
+.\" $OpenBSD: order.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-ORDER 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sh-order
.Nd sections out of conventional order
diff --git a/regress/mdoc/Sh/order.out_ascii b/regress/mdoc/Sh/order.out_ascii
index 0ed56118..4d0b7970 100644
--- a/regress/mdoc/Sh/order.out_ascii
+++ b/regress/mdoc/Sh/order.out_ascii
@@ -11,4 +11,4 @@ SSYYNNOOPPSSIISS
EERRRROORRSS
_i_n_t _e_r_r_n_o
-OpenBSD July 1, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/order.out_lint b/regress/mdoc/Sh/order.out_lint
index c7d4b540..5de894cc 100644
--- a/regress/mdoc/Sh/order.out_lint
+++ b/regress/mdoc/Sh/order.out_lint
@@ -1,6 +1,3 @@
-mandoc: order.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: order.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: order.in:9:2: WARNING: sections out of conventional order: Sh SYNOPSIS
-mandoc: order.in:10:2: WARNING: duplicate section title: Sh SYNOPSIS
-mandoc: order.in:11:2: WARNING: unexpected section: Sh ERRORS for 2, 3, 4, 9 only
-mandoc: order.in: BASE: RCS id missing: (OpenBSD)
+mandoc: order.in:10:2: WARNING: sections out of conventional order: Sh SYNOPSIS
+mandoc: order.in:11:2: WARNING: duplicate section title: Sh SYNOPSIS
+mandoc: order.in:12:2: WARNING: unexpected section: Sh ERRORS for 2, 3, 4, 9 only
diff --git a/regress/mdoc/Sh/order.out_markdown b/regress/mdoc/Sh/order.out_markdown
index 4e3abd1f..8ffc8dbc 100644
--- a/regress/mdoc/Sh/order.out_markdown
+++ b/regress/mdoc/Sh/order.out_markdown
@@ -16,4 +16,4 @@ some text
*int errno*
-OpenBSD - July 1, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/orderNAME.in b/regress/mdoc/Sh/orderNAME.in
index d8fa1452..b0098ec7 100644
--- a/regress/mdoc/Sh/orderNAME.in
+++ b/regress/mdoc/Sh/orderNAME.in
@@ -1,6 +1,7 @@
-.Dd January 7, 2017
+.\" $OpenBSD: orderNAME.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-ORDERNAME 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nd name after description in NAME section
.Ss subsection
diff --git a/regress/mdoc/Sh/orderNAME.out_ascii b/regress/mdoc/Sh/orderNAME.out_ascii
index 5e9e032f..a18e911a 100644
--- a/regress/mdoc/Sh/orderNAME.out_ascii
+++ b/regress/mdoc/Sh/orderNAME.out_ascii
@@ -9,4 +9,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
The order of Nm and Nd is wrong in the NAME section.
-OpenBSD January 7, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/orderNAME.out_lint b/regress/mdoc/Sh/orderNAME.out_lint
index 0f9290f2..da091f8e 100644
--- a/regress/mdoc/Sh/orderNAME.out_lint
+++ b/regress/mdoc/Sh/orderNAME.out_lint
@@ -1,5 +1,2 @@
-mandoc: orderNAME.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: orderNAME.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: orderNAME.in:5:2: WARNING: description not at the end of NAME
-mandoc: orderNAME.in:4:2: WARNING: NAME section without Nm before Nd
-mandoc: orderNAME.in: BASE: RCS id missing: (OpenBSD)
+mandoc: orderNAME.in:6:2: WARNING: description not at the end of NAME
+mandoc: orderNAME.in:5:2: WARNING: NAME section without Nm before Nd
diff --git a/regress/mdoc/Sh/orderNAME.out_markdown b/regress/mdoc/Sh/orderNAME.out_markdown
index 967edbe9..a9ef6a1a 100644
--- a/regress/mdoc/Sh/orderNAME.out_markdown
+++ b/regress/mdoc/Sh/orderNAME.out_markdown
@@ -12,4 +12,4 @@ SH-ORDERNAME(1) - General Commands Manual
The order of Nm and Nd is wrong in the NAME section.
-OpenBSD - January 7, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/parbefore.in b/regress/mdoc/Sh/parbefore.in
index 880f3c41..2be6b4be 100644
--- a/regress/mdoc/Sh/parbefore.in
+++ b/regress/mdoc/Sh/parbefore.in
@@ -1,6 +1,7 @@
-.Dd April 28, 2017
+.\" $OpenBSD: parbefore.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-PARBEFORE 1
-.Os OpenBSD
+.Os
.Pp
.Sh NAME
.Nm Sh-parbefore
diff --git a/regress/mdoc/Sh/parbefore.out_ascii b/regress/mdoc/Sh/parbefore.out_ascii
index e92ae81c..8e8db782 100644
--- a/regress/mdoc/Sh/parbefore.out_ascii
+++ b/regress/mdoc/Sh/parbefore.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
some text
-OpenBSD April 28, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/parbefore.out_lint b/regress/mdoc/Sh/parbefore.out_lint
index a42853d8..058e8ce7 100644
--- a/regress/mdoc/Sh/parbefore.out_lint
+++ b/regress/mdoc/Sh/parbefore.out_lint
@@ -1,4 +1 @@
-mandoc: parbefore.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: parbefore.in:1:5: BASE: Mdocdate missing: Dd April (OpenBSD)
-mandoc: parbefore.in:4:2: WARNING: skipping paragraph macro: Pp before Sh
-mandoc: parbefore.in: BASE: RCS id missing: (OpenBSD)
+mandoc: parbefore.in:5:2: WARNING: skipping paragraph macro: Pp before Sh
diff --git a/regress/mdoc/Sh/parbefore.out_markdown b/regress/mdoc/Sh/parbefore.out_markdown
index 50f77895..948be939 100644
--- a/regress/mdoc/Sh/parbefore.out_markdown
+++ b/regress/mdoc/Sh/parbefore.out_markdown
@@ -8,4 +8,4 @@ SH-PARBEFORE(1) - General Commands Manual
some text
-OpenBSD - April 28, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/parborder.in b/regress/mdoc/Sh/parborder.in
index a909a0cf..8565479a 100644
--- a/regress/mdoc/Sh/parborder.in
+++ b/regress/mdoc/Sh/parborder.in
@@ -1,6 +1,7 @@
-.Dd April 28, 2017
+.\" $OpenBSD: parborder.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-PARBORDER 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sh-parborder
.Nd paragraph macros at the beginning and end of sections
diff --git a/regress/mdoc/Sh/parborder.out_ascii b/regress/mdoc/Sh/parborder.out_ascii
index 9c8d04b2..170d0f30 100644
--- a/regress/mdoc/Sh/parborder.out_ascii
+++ b/regress/mdoc/Sh/parborder.out_ascii
@@ -15,4 +15,4 @@ EEXXAAMMPPLLEESS
AAnnootthheerr ssuubbsseeccttiioonn
more subsection text
-OpenBSD April 28, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/parborder.out_lint b/regress/mdoc/Sh/parborder.out_lint
index 704b4b76..0da9e5df 100644
--- a/regress/mdoc/Sh/parborder.out_lint
+++ b/regress/mdoc/Sh/parborder.out_lint
@@ -1,10 +1,7 @@
-mandoc: parborder.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: parborder.in:1:5: BASE: Mdocdate missing: Dd April (OpenBSD)
-mandoc: parborder.in:8:2: WARNING: skipping paragraph macro: Pp after Sh
-mandoc: parborder.in:10:2: WARNING: skipping paragraph macro: Pp at the end of Sh
-mandoc: parborder.in:12:2: WARNING: skipping paragraph macro: Pp after Sh
-mandoc: parborder.in:16:2: WARNING: skipping paragraph macro: Pp after Ss
-mandoc: parborder.in:18:2: WARNING: skipping paragraph macro: Pp at the end of Ss
-mandoc: parborder.in:14:2: WARNING: skipping paragraph macro: Pp before Ss
-mandoc: parborder.in:21:2: WARNING: skipping paragraph macro: Pp at the end of Ss
-mandoc: parborder.in: BASE: RCS id missing: (OpenBSD)
+mandoc: parborder.in:9:2: WARNING: skipping paragraph macro: Pp after Sh
+mandoc: parborder.in:11:2: WARNING: skipping paragraph macro: Pp at the end of Sh
+mandoc: parborder.in:13:2: WARNING: skipping paragraph macro: Pp after Sh
+mandoc: parborder.in:17:2: WARNING: skipping paragraph macro: Pp after Ss
+mandoc: parborder.in:19:2: WARNING: skipping paragraph macro: Pp at the end of Ss
+mandoc: parborder.in:15:2: WARNING: skipping paragraph macro: Pp before Ss
+mandoc: parborder.in:22:2: WARNING: skipping paragraph macro: Pp at the end of Ss
diff --git a/regress/mdoc/Sh/parborder.out_markdown b/regress/mdoc/Sh/parborder.out_markdown
index 8595760b..eb7dc692 100644
--- a/regress/mdoc/Sh/parborder.out_markdown
+++ b/regress/mdoc/Sh/parborder.out_markdown
@@ -20,4 +20,4 @@ subsection text
more subsection text
-OpenBSD - April 28, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/punctNAME.in b/regress/mdoc/Sh/punctNAME.in
index c34648b5..4b350d6e 100644
--- a/regress/mdoc/Sh/punctNAME.in
+++ b/regress/mdoc/Sh/punctNAME.in
@@ -1,6 +1,7 @@
-.Dd January 7, 2017
+.\" $OpenBSD: punctNAME.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-PUNCTNAME 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sh-punctNAME
.Nm second_name ;
diff --git a/regress/mdoc/Sh/punctNAME.out_ascii b/regress/mdoc/Sh/punctNAME.out_ascii
index 8b74eda5..fe7b8b87 100644
--- a/regress/mdoc/Sh/punctNAME.out_ascii
+++ b/regress/mdoc/Sh/punctNAME.out_ascii
@@ -7,4 +7,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
One comma is missing, and one is misplaced.
-OpenBSD January 7, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/punctNAME.out_lint b/regress/mdoc/Sh/punctNAME.out_lint
index 6c7a0c38..52f5b17a 100644
--- a/regress/mdoc/Sh/punctNAME.out_lint
+++ b/regress/mdoc/Sh/punctNAME.out_lint
@@ -1,7 +1,4 @@
-mandoc: punctNAME.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punctNAME.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: punctNAME.in:6:2: WARNING: missing comma before name: Nm second_name
-mandoc: punctNAME.in:6:17: WARNING: bad NAME section content: text
-mandoc: punctNAME.in:7:2: WARNING: missing comma before name: Nm third_name
-mandoc: punctNAME.in:7:16: WARNING: bad NAME section content: text
-mandoc: punctNAME.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punctNAME.in:7:2: WARNING: missing comma before name: Nm second_name
+mandoc: punctNAME.in:7:17: WARNING: bad NAME section content: text
+mandoc: punctNAME.in:8:2: WARNING: missing comma before name: Nm third_name
+mandoc: punctNAME.in:8:16: WARNING: bad NAME section content: text
diff --git a/regress/mdoc/Sh/punctNAME.out_markdown b/regress/mdoc/Sh/punctNAME.out_markdown
index 823868cd..0c7b62c3 100644
--- a/regress/mdoc/Sh/punctNAME.out_markdown
+++ b/regress/mdoc/Sh/punctNAME.out_markdown
@@ -10,4 +10,4 @@ SH-PUNCTNAME(1) - General Commands Manual
One comma is missing, and one is misplaced.
-OpenBSD - January 7, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sh/subbefore.in b/regress/mdoc/Sh/subbefore.in
index ac800e13..b573df1c 100644
--- a/regress/mdoc/Sh/subbefore.in
+++ b/regress/mdoc/Sh/subbefore.in
@@ -1,6 +1,7 @@
-.Dd July 30, 2014
+.\" $OpenBSD: subbefore.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SH-SUBBEFORE 1
-.Os OpenBSD
+.Os
.Ss Subsection
Can
.Xr mandoc 1
diff --git a/regress/mdoc/Sh/subbefore.out_ascii b/regress/mdoc/Sh/subbefore.out_ascii
index a53bb7dc..67202e1b 100644
--- a/regress/mdoc/Sh/subbefore.out_ascii
+++ b/regress/mdoc/Sh/subbefore.out_ascii
@@ -9,4 +9,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
some text
-OpenBSD July 30, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sh/subbefore.out_lint b/regress/mdoc/Sh/subbefore.out_lint
index 6450e41e..1348f6c5 100644
--- a/regress/mdoc/Sh/subbefore.out_lint
+++ b/regress/mdoc/Sh/subbefore.out_lint
@@ -1,4 +1 @@
-mandoc: subbefore.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: subbefore.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: subbefore.in: BASE: RCS id missing: (OpenBSD)
-mandoc: subbefore.in:4:2: WARNING: content before first section header: Ss
+mandoc: subbefore.in:5:2: WARNING: content before first section header: Ss
diff --git a/regress/mdoc/Sh/subbefore.out_markdown b/regress/mdoc/Sh/subbefore.out_markdown
index 8c196b3f..82667779 100644
--- a/regress/mdoc/Sh/subbefore.out_markdown
+++ b/regress/mdoc/Sh/subbefore.out_markdown
@@ -16,4 +16,4 @@ handle this?
some text
-OpenBSD - July 30, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sm/badarg.in b/regress/mdoc/Sm/badarg.in
index 8684965e..1f120388 100644
--- a/regress/mdoc/Sm/badarg.in
+++ b/regress/mdoc/Sm/badarg.in
@@ -1,6 +1,7 @@
-.Dd July 3, 2014
+.\" $OpenBSD: badarg.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SM-BADARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sm-badarg
.Nd spacing macro with invalid arguments
diff --git a/regress/mdoc/Sm/badarg.out_ascii b/regress/mdoc/Sm/badarg.out_ascii
index 6b65fb9a..1aa8a653 100644
--- a/regress/mdoc/Sm/badarg.out_ascii
+++ b/regress/mdoc/Sm/badarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
--ff _o_n --ff_o_f_f bad --ff _b_a_d (on) bad--ff_b_a_d(off)
-OpenBSD July 3, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sm/badarg.out_lint b/regress/mdoc/Sm/badarg.out_lint
index 4179fa10..5a78aada 100644
--- a/regress/mdoc/Sm/badarg.out_lint
+++ b/regress/mdoc/Sm/badarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: badarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badarg.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: badarg.in:11:5: WARNING: invalid Boolean argument: Sm bad
-mandoc: badarg.in:13:5: WARNING: invalid Boolean argument: Sm bad
-mandoc: badarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badarg.in:12:5: WARNING: invalid Boolean argument: Sm bad
+mandoc: badarg.in:14:5: WARNING: invalid Boolean argument: Sm bad
diff --git a/regress/mdoc/Sm/badarg.out_markdown b/regress/mdoc/Sm/badarg.out_markdown
index 86c8cd6f..903b7f81 100644
--- a/regress/mdoc/Sm/badarg.out_markdown
+++ b/regress/mdoc/Sm/badarg.out_markdown
@@ -11,4 +11,4 @@ SM-BADARG(1) - General Commands Manual
**-f** *bad* (on)
bad**-f**&zwnj;*bad*(off)
-OpenBSD-July 3, 2014
+OpenBSD-July 4, 2017
diff --git a/regress/mdoc/Sm/noarg.in b/regress/mdoc/Sm/noarg.in
index bb777430..8a3a3c59 100644
--- a/regress/mdoc/Sm/noarg.in
+++ b/regress/mdoc/Sm/noarg.in
@@ -1,6 +1,7 @@
-.Dd July 2, 2014
+.\" $OpenBSD: noarg.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SM-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sm-noarg
.Nd spacing macro without arguments
diff --git a/regress/mdoc/Sm/noarg.out_ascii b/regress/mdoc/Sm/noarg.out_ascii
index ea0f2fc6..b7fa7fa2 100644
--- a/regress/mdoc/Sm/noarg.out_ascii
+++ b/regress/mdoc/Sm/noarg.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
--ff _o_n on a new line
-OpenBSD July 2, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sm/noarg.out_markdown b/regress/mdoc/Sm/noarg.out_markdown
index 3b0d089b..8078071d 100644
--- a/regress/mdoc/Sm/noarg.out_markdown
+++ b/regress/mdoc/Sm/noarg.out_markdown
@@ -15,4 +15,4 @@ SM-NOARG(1) - General Commands Manual
**-f** *on*
on a new line
-OpenBSD - July 2, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sm/scope.in b/regress/mdoc/Sm/scope.in
index 76ce050b..19700daf 100644
--- a/regress/mdoc/Sm/scope.in
+++ b/regress/mdoc/Sm/scope.in
@@ -1,6 +1,7 @@
-.Dd January 2, 2010
+.\" $OpenBSD: scope.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SM-SCOPE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sm-scope
.Nd scope of the spacing macro
diff --git a/regress/mdoc/Sm/scope.out_ascii b/regress/mdoc/Sm/scope.out_ascii
index 8a735d1c..e0d7f71b 100644
--- a/regress/mdoc/Sm/scope.out_ascii
+++ b/regress/mdoc/Sm/scope.out_ascii
@@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
In the above modifiers, the `:' can be omitted, ...
-OpenBSD January 2, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sm/scope.out_markdown b/regress/mdoc/Sm/scope.out_markdown
index e184ee52..bfe37263 100644
--- a/regress/mdoc/Sm/scope.out_markdown
+++ b/regress/mdoc/Sm/scope.out_markdown
@@ -28,4 +28,4 @@ In the above modifiers, the
'`:`'
can be omitted, ...
-OpenBSD - January 2, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sm/spacing-No.in b/regress/mdoc/Sm/spacing-No.in
index 35b6b10b..2450e807 100644
--- a/regress/mdoc/Sm/spacing-No.in
+++ b/regress/mdoc/Sm/spacing-No.in
@@ -1,6 +1,7 @@
-.Dd July 4, 2010
+.\" $OpenBSD: spacing-No.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SM-SPACING 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sm-spacing
.Nd basic tests of spacing mode
diff --git a/regress/mdoc/Sm/spacing-No.out_ascii b/regress/mdoc/Sm/spacing-No.out_ascii
index d303e3cf..44fe522e 100644
--- a/regress/mdoc/Sm/spacing-No.out_ascii
+++ b/regress/mdoc/Sm/spacing-No.out_ascii
@@ -23,4 +23,4 @@ DDEESSCCRRIIPPTTIIOONN
macro1 macro2macro3 macro4
-OpenBSD July 4, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sm/spacing-No.out_markdown b/regress/mdoc/Sm/spacing-No.out_markdown
index b2487962..5c18db00 100644
--- a/regress/mdoc/Sm/spacing-No.out_markdown
+++ b/regress/mdoc/Sm/spacing-No.out_markdown
@@ -44,4 +44,4 @@ macro1
macro2macro3
macro4
-OpenBSD - July 4, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sm/spacing-Op.in b/regress/mdoc/Sm/spacing-Op.in
index 9d3716a4..1c394245 100644
--- a/regress/mdoc/Sm/spacing-Op.in
+++ b/regress/mdoc/Sm/spacing-Op.in
@@ -1,6 +1,7 @@
-.Dd July 4, 2010
+.\" $OpenBSD: spacing-Op.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SM-SPACING-OP 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sm-spacing-Op
.Nd spacing mode, demonstrated using the .Op macro
diff --git a/regress/mdoc/Sm/spacing-Op.out_ascii b/regress/mdoc/Sm/spacing-Op.out_ascii
index c5338dce..abbf5838 100644
--- a/regress/mdoc/Sm/spacing-Op.out_ascii
+++ b/regress/mdoc/Sm/spacing-Op.out_ascii
@@ -25,4 +25,4 @@ DDEESSCCRRIIPPTTIIOONN
[macro1]
-OpenBSD July 4, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sm/spacing-Op.out_markdown b/regress/mdoc/Sm/spacing-Op.out_markdown
index 9f4f15ae..bf2d4dfa 100644
--- a/regress/mdoc/Sm/spacing-Op.out_markdown
+++ b/regress/mdoc/Sm/spacing-Op.out_markdown
@@ -46,4 +46,4 @@ text4
\[macro1]
-OpenBSD - July 4, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sm/twoarg.in b/regress/mdoc/Sm/twoarg.in
index 8e7b51d7..ea59d61e 100644
--- a/regress/mdoc/Sm/twoarg.in
+++ b/regress/mdoc/Sm/twoarg.in
@@ -1,6 +1,7 @@
-.Dd November 26, 2014
+.\" $OpenBSD: twoarg.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SM-TWOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sm-twoarg
.Nd spacing macro with multiple arguments
diff --git a/regress/mdoc/Sm/twoarg.out_ascii b/regress/mdoc/Sm/twoarg.out_ascii
index b8276c2f..9981645b 100644
--- a/regress/mdoc/Sm/twoarg.out_ascii
+++ b/regress/mdoc/Sm/twoarg.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
bbaaddttwwoo: bad two --ff _o_f_f
oonn ttwwoo: two --ff _o_n
-OpenBSD November 26, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sm/twoarg.out_lint b/regress/mdoc/Sm/twoarg.out_lint
index a1d3ca00..cc3302fc 100644
--- a/regress/mdoc/Sm/twoarg.out_lint
+++ b/regress/mdoc/Sm/twoarg.out_lint
@@ -1,4 +1 @@
-mandoc: twoarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: twoarg.in:1:5: BASE: Mdocdate missing: Dd November (OpenBSD)
-mandoc: twoarg.in:16:5: WARNING: invalid Boolean argument: Sm bad
-mandoc: twoarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: twoarg.in:17:5: WARNING: invalid Boolean argument: Sm bad
diff --git a/regress/mdoc/Sm/twoarg.out_markdown b/regress/mdoc/Sm/twoarg.out_markdown
index 0951e672..5b64aa6e 100644
--- a/regress/mdoc/Sm/twoarg.out_markdown
+++ b/regress/mdoc/Sm/twoarg.out_markdown
@@ -16,4 +16,4 @@ two**-f**&zwnj;*off*
two
**-f** *on*
-OpenBSD - November 26, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sq/empty.in b/regress/mdoc/Sq/empty.in
index aa521d25..c7f7b768 100644
--- a/regress/mdoc/Sq/empty.in
+++ b/regress/mdoc/Sq/empty.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: empty.in,v 1.5 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SQ-EMPTY 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sq-empty
.Nd empty implicit enclosure macros
diff --git a/regress/mdoc/Sq/empty.out_ascii b/regress/mdoc/Sq/empty.out_ascii
index dc38a8fb..4c67d5ca 100644
--- a/regress/mdoc/Sq/empty.out_ascii
+++ b/regress/mdoc/Sq/empty.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
An empty `' and a full (`user@host)' quotation. And another (`full)' one
bboolldd.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sq/empty.out_lint b/regress/mdoc/Sq/empty.out_lint
index 1fbf21ec..00d8e228 100644
--- a/regress/mdoc/Sq/empty.out_lint
+++ b/regress/mdoc/Sq/empty.out_lint
@@ -1,5 +1,2 @@
-mandoc: empty.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: empty.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: empty.in:11:18: STYLE: no blank before trailing delimiter: Sq user@host)
-mandoc: empty.in:14:13: STYLE: no blank before trailing delimiter: So full)
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:12:18: STYLE: no blank before trailing delimiter: Sq user@host)
+mandoc: empty.in:15:13: STYLE: no blank before trailing delimiter: So full)
diff --git a/regress/mdoc/Sq/empty.out_markdown b/regress/mdoc/Sq/empty.out_markdown
index 76493a30..5c9845fb 100644
--- a/regress/mdoc/Sq/empty.out_markdown
+++ b/regress/mdoc/Sq/empty.out_markdown
@@ -14,4 +14,4 @@ quotation.
And another
('full)' one **bold**.
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/St/badargs.in b/regress/mdoc/St/badargs.in
index e1e35e0a..c3e5788c 100644
--- a/regress/mdoc/St/badargs.in
+++ b/regress/mdoc/St/badargs.in
@@ -1,6 +1,7 @@
-.Dd June 30, 2010
+.\" $OpenBSD: badargs.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt ST-INVALID 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm St-invalid
.Nd handling of invalid standard argument
diff --git a/regress/mdoc/St/badargs.out_ascii b/regress/mdoc/St/badargs.out_ascii
index 70c7418e..d018a823 100644
--- a/regress/mdoc/St/badargs.out_ascii
+++ b/regress/mdoc/St/badargs.out_ascii
@@ -14,4 +14,4 @@ SSTTAANNDDAARRDDSS
end of file
-OpenBSD June 30, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/St/badargs.out_lint b/regress/mdoc/St/badargs.out_lint
index cfa6f53a..2691276b 100644
--- a/regress/mdoc/St/badargs.out_lint
+++ b/regress/mdoc/St/badargs.out_lint
@@ -1,5 +1,2 @@
-mandoc: badargs.in:15:2: WARNING: skipping empty macro: St
-mandoc: badargs.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badargs.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: badargs.in:12:5: ERROR: unknown standard specifier: St -murks
-mandoc: badargs.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badargs.in:16:2: WARNING: skipping empty macro: St
+mandoc: badargs.in:13:5: ERROR: unknown standard specifier: St -murks
diff --git a/regress/mdoc/St/badargs.out_markdown b/regress/mdoc/St/badargs.out_markdown
index 12e4785f..7ecf651e 100644
--- a/regress/mdoc/St/badargs.out_markdown
+++ b/regress/mdoc/St/badargs.out_markdown
@@ -18,4 +18,4 @@ IEEE Std 1003.1-2004 (&#8220;POSIX.1&#8221;) murks
end of file
-OpenBSD - June 30, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/St/call.in b/regress/mdoc/St/call.in
index 26dc494a..8a0faa80 100644
--- a/regress/mdoc/St/call.in
+++ b/regress/mdoc/St/call.in
@@ -1,6 +1,7 @@
-.Dd February 10, 2015
+.\" $OpenBSD: call.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt ST-CALL 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm St-call
.Nd the standard macro calling other macros
diff --git a/regress/mdoc/St/call.out_ascii b/regress/mdoc/St/call.out_ascii
index dc9b55b6..1e70838d 100644
--- a/regress/mdoc/St/call.out_ascii
+++ b/regress/mdoc/St/call.out_ascii
@@ -10,4 +10,4 @@ SSTTAANNDDAARRDDSS
end of file
-OpenBSD February 10, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/St/call.out_lint b/regress/mdoc/St/call.out_lint
index bea3c048..699fc46d 100644
--- a/regress/mdoc/St/call.out_lint
+++ b/regress/mdoc/St/call.out_lint
@@ -1,4 +1 @@
-mandoc: call.in:9:2: WARNING: skipping empty macro: St
-mandoc: call.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: call.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: call.in: BASE: RCS id missing: (OpenBSD)
+mandoc: call.in:10:2: WARNING: skipping empty macro: St
diff --git a/regress/mdoc/St/call.out_markdown b/regress/mdoc/St/call.out_markdown
index 4fb19ce3..e665bb8a 100644
--- a/regress/mdoc/St/call.out_markdown
+++ b/regress/mdoc/St/call.out_markdown
@@ -14,4 +14,4 @@ IEEE Std 1003.1-2004 (&#8220;POSIX.1&#8221;)
end of file
-OpenBSD - February 10, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sx/font.in b/regress/mdoc/Sx/font.in
index 92d95014..fdfdd2be 100644
--- a/regress/mdoc/Sx/font.in
+++ b/regress/mdoc/Sx/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SX-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sx-font
.Nd changing fonts inside the cross reference macro
diff --git a/regress/mdoc/Sx/font.out_ascii b/regress/mdoc/Sx/font.out_ascii
index a3906c38..a67a74ec 100644
--- a/regress/mdoc/Sx/font.out_ascii
+++ b/regress/mdoc/Sx/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sx/font.out_markdown b/regress/mdoc/Sx/font.out_markdown
index 333cdb04..d14ce93f 100644
--- a/regress/mdoc/Sx/font.out_markdown
+++ b/regress/mdoc/Sx/font.out_markdown
@@ -10,4 +10,4 @@ normal text
*emphasis**bold**back*
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sx/noarg.in b/regress/mdoc/Sx/noarg.in
index f2126b7a..bc3c4cf9 100644
--- a/regress/mdoc/Sx/noarg.in
+++ b/regress/mdoc/Sx/noarg.in
@@ -1,6 +1,7 @@
-.Dd January 19, 2011
+.\" $OpenBSD: noarg.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SX-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sx-noarg
.Nd internal cross reference without a target
diff --git a/regress/mdoc/Sx/noarg.out_ascii b/regress/mdoc/Sx/noarg.out_ascii
index e3adc0bc..855532b5 100644
--- a/regress/mdoc/Sx/noarg.out_ascii
+++ b/regress/mdoc/Sx/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with target: _D_E_S_C_R_I_P_T_I_O_N; _i_t_a_l_i_c no target: end of test document
-OpenBSD January 19, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sx/noarg.out_lint b/regress/mdoc/Sx/noarg.out_lint
index 1b6b909b..ca74f65e 100644
--- a/regress/mdoc/Sx/noarg.out_lint
+++ b/regress/mdoc/Sx/noarg.out_lint
@@ -1,4 +1 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: Sx
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: Sx
diff --git a/regress/mdoc/Sx/noarg.out_markdown b/regress/mdoc/Sx/noarg.out_markdown
index d3184519..a6d867de 100644
--- a/regress/mdoc/Sx/noarg.out_markdown
+++ b/regress/mdoc/Sx/noarg.out_markdown
@@ -11,4 +11,4 @@ with target:
no target:
end of test document
-OpenBSD - January 19, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sy/font.in b/regress/mdoc/Sy/font.in
index 3a7bbb06..bc97eabf 100644
--- a/regress/mdoc/Sy/font.in
+++ b/regress/mdoc/Sy/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SY-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sy-font
.Nd changing fonts inside the symbolic font macro
diff --git a/regress/mdoc/Sy/font.out_ascii b/regress/mdoc/Sy/font.out_ascii
index b512ef42..91ae616b 100644
--- a/regress/mdoc/Sy/font.out_ascii
+++ b/regress/mdoc/Sy/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text bboolldd_e_m_p_h_a_s_i_sbbaacckk trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sy/font.out_markdown b/regress/mdoc/Sy/font.out_markdown
index d0af7d2c..c9697262 100644
--- a/regress/mdoc/Sy/font.out_markdown
+++ b/regress/mdoc/Sy/font.out_markdown
@@ -10,4 +10,4 @@ normal text
**bold*emphasis*back**
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sy/noarg.in b/regress/mdoc/Sy/noarg.in
index 03b36675..263723b5 100644
--- a/regress/mdoc/Sy/noarg.in
+++ b/regress/mdoc/Sy/noarg.in
@@ -1,6 +1,7 @@
-.Dd January 19, 2011
+.\" $OpenBSD: noarg.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SY-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sy-noarg
.Nd symbolic macro without arguments
diff --git a/regress/mdoc/Sy/noarg.out_ascii b/regress/mdoc/Sy/noarg.out_ascii
index 53a9f275..6444139c 100644
--- a/regress/mdoc/Sy/noarg.out_ascii
+++ b/regress/mdoc/Sy/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with argument aarrgg no argument end of test document
-OpenBSD January 19, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sy/noarg.out_lint b/regress/mdoc/Sy/noarg.out_lint
index efa9587b..50d23189 100644
--- a/regress/mdoc/Sy/noarg.out_lint
+++ b/regress/mdoc/Sy/noarg.out_lint
@@ -1,4 +1 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: Sy
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: Sy
diff --git a/regress/mdoc/Sy/noarg.out_markdown b/regress/mdoc/Sy/noarg.out_markdown
index e3e1c014..70d2d0ef 100644
--- a/regress/mdoc/Sy/noarg.out_markdown
+++ b/regress/mdoc/Sy/noarg.out_markdown
@@ -11,4 +11,4 @@ with argument
no argument
end of test document
-OpenBSD - January 19, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Sy/punct.in b/regress/mdoc/Sy/punct.in
index 71094c81..bb486ace 100644
--- a/regress/mdoc/Sy/punct.in
+++ b/regress/mdoc/Sy/punct.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: punct.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt SY-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Sy-punct
.Nd punctuation following a symbolic macro
diff --git a/regress/mdoc/Sy/punct.out_ascii b/regress/mdoc/Sy/punct.out_ascii
index bb2a433e..5170d9ff 100644
--- a/regress/mdoc/Sy/punct.out_ascii
+++ b/regress/mdoc/Sy/punct.out_ascii
@@ -25,4 +25,4 @@ DDEESSCCRRIIPPTTIIOONN
Missing blank: aa..
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Sy/punct.out_lint b/regress/mdoc/Sy/punct.out_lint
index cc97329e..76cdccd2 100644
--- a/regress/mdoc/Sy/punct.out_lint
+++ b/regress/mdoc/Sy/punct.out_lint
@@ -1,4 +1,3 @@
-mandoc: punct.in:48:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:49:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:50:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:51:7: WARNING: skipping empty macro: Sy
@@ -9,7 +8,7 @@ mandoc: punct.in:55:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:56:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:57:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:58:7: WARNING: skipping empty macro: Sy
-mandoc: punct.in:61:7: WARNING: skipping empty macro: Sy
+mandoc: punct.in:59:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:62:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:63:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:64:7: WARNING: skipping empty macro: Sy
@@ -20,10 +19,8 @@ mandoc: punct.in:68:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:69:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:70:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:71:7: WARNING: skipping empty macro: Sy
-mandoc: punct.in:74:7: WARNING: skipping empty macro: Sy
+mandoc: punct.in:72:7: WARNING: skipping empty macro: Sy
mandoc: punct.in:75:7: WARNING: skipping empty macro: Sy
-mandoc: punct.in:83:2: WARNING: skipping empty macro: Sy
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: punct.in:86:6: STYLE: no blank before trailing delimiter: Sy a.
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:76:7: WARNING: skipping empty macro: Sy
+mandoc: punct.in:84:2: WARNING: skipping empty macro: Sy
+mandoc: punct.in:87:6: STYLE: no blank before trailing delimiter: Sy a.
diff --git a/regress/mdoc/Sy/punct.out_markdown b/regress/mdoc/Sy/punct.out_markdown
index c198163e..fcacd349 100644
--- a/regress/mdoc/Sy/punct.out_markdown
+++ b/regress/mdoc/Sy/punct.out_markdown
@@ -86,4 +86,4 @@ Quoted:
Missing blank:
**a.**
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Tn/font.in b/regress/mdoc/Tn/font.in
index c854c6de..ec41beb8 100644
--- a/regress/mdoc/Tn/font.in
+++ b/regress/mdoc/Tn/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt TN-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Tn-font
.Nd changing fonts inside the trade name macro
diff --git a/regress/mdoc/Tn/font.out_ascii b/regress/mdoc/Tn/font.out_ascii
index 60a99b3e..fff73c0a 100644
--- a/regress/mdoc/Tn/font.out_ascii
+++ b/regress/mdoc/Tn/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text literal_e_m_p_h_a_s_i_sback trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Tn/font.out_markdown b/regress/mdoc/Tn/font.out_markdown
index 00a02721..0dc7252b 100644
--- a/regress/mdoc/Tn/font.out_markdown
+++ b/regress/mdoc/Tn/font.out_markdown
@@ -10,4 +10,4 @@ normal text
`literalemphasisback`
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Tn/noarg.in b/regress/mdoc/Tn/noarg.in
index 6465042b..446e2709 100644
--- a/regress/mdoc/Tn/noarg.in
+++ b/regress/mdoc/Tn/noarg.in
@@ -1,6 +1,7 @@
-.Dd January 19, 2011
+.\" $OpenBSD: noarg.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt TN-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Tn-noarg
.Nd trade name macro without argument
diff --git a/regress/mdoc/Tn/noarg.out_ascii b/regress/mdoc/Tn/noarg.out_ascii
index 2fc5b4e4..322dd51d 100644
--- a/regress/mdoc/Tn/noarg.out_ascii
+++ b/regress/mdoc/Tn/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with argument IBM, _i_t_a_l_i_c no argument end of test document
-OpenBSD January 19, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Tn/noarg.out_lint b/regress/mdoc/Tn/noarg.out_lint
index 44a0c9f8..c2e3d4ba 100644
--- a/regress/mdoc/Tn/noarg.out_lint
+++ b/regress/mdoc/Tn/noarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: Tn
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: noarg.in:9:2: STYLE: useless macro: Tn
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: Tn
+mandoc: noarg.in:10:2: STYLE: useless macro: Tn
diff --git a/regress/mdoc/Tn/noarg.out_markdown b/regress/mdoc/Tn/noarg.out_markdown
index 2ff512c7..a99dc596 100644
--- a/regress/mdoc/Tn/noarg.out_markdown
+++ b/regress/mdoc/Tn/noarg.out_markdown
@@ -11,4 +11,4 @@ with argument
no argument
end of test document
-OpenBSD - January 19, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ud/arg.in b/regress/mdoc/Ud/arg.in
index b5245a77..e46e887d 100644
--- a/regress/mdoc/Ud/arg.in
+++ b/regress/mdoc/Ud/arg.in
@@ -1,6 +1,7 @@
-.Dd January 11, 2017
+.\" $OpenBSD: arg.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt UD-ARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ud-arg
.Nd obsolete text production macros
diff --git a/regress/mdoc/Ud/arg.out_ascii b/regress/mdoc/Ud/arg.out_ascii
index ec9f73c7..3af2ea17 100644
--- a/regress/mdoc/Ud/arg.out_ascii
+++ b/regress/mdoc/Ud/arg.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
With arg: currently under development. is currently in beta test.
currently under development. is currently in beta test. end
-OpenBSD January 11, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ud/arg.out_lint b/regress/mdoc/Ud/arg.out_lint
index 654620b3..73f00a11 100644
--- a/regress/mdoc/Ud/arg.out_lint
+++ b/regress/mdoc/Ud/arg.out_lint
@@ -1,13 +1,10 @@
-mandoc: arg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: arg.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: arg.in:9:2: STYLE: useless macro: Ud
-mandoc: arg.in:11:2: STYLE: useless macro: Bt
-mandoc: arg.in:15:2: STYLE: useless macro: Ud
-mandoc: arg.in:15:2: ERROR: skipping all arguments: Ud bar
-mandoc: arg.in:16:2: STYLE: useless macro: Bt
-mandoc: arg.in:16:2: ERROR: skipping all arguments: Bt foo
-mandoc: arg.in:17:2: STYLE: useless macro: Ud
-mandoc: arg.in:17:2: ERROR: skipping all arguments: Ud one
-mandoc: arg.in:18:2: STYLE: useless macro: Bt
-mandoc: arg.in:18:2: ERROR: skipping all arguments: Bt one
-mandoc: arg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: arg.in:10:2: STYLE: useless macro: Ud
+mandoc: arg.in:12:2: STYLE: useless macro: Bt
+mandoc: arg.in:16:2: STYLE: useless macro: Ud
+mandoc: arg.in:16:2: ERROR: skipping all arguments: Ud bar
+mandoc: arg.in:17:2: STYLE: useless macro: Bt
+mandoc: arg.in:17:2: ERROR: skipping all arguments: Bt foo
+mandoc: arg.in:18:2: STYLE: useless macro: Ud
+mandoc: arg.in:18:2: ERROR: skipping all arguments: Ud one
+mandoc: arg.in:19:2: STYLE: useless macro: Bt
+mandoc: arg.in:19:2: ERROR: skipping all arguments: Bt one
diff --git a/regress/mdoc/Ud/arg.out_markdown b/regress/mdoc/Ud/arg.out_markdown
index aaf0f70d..21fc093a 100644
--- a/regress/mdoc/Ud/arg.out_markdown
+++ b/regress/mdoc/Ud/arg.out_markdown
@@ -19,4 +19,4 @@ currently under development.
is currently in beta test.
end
-OpenBSD - January 11, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ux/eos.in b/regress/mdoc/Ux/eos.in
index b0713481..3305329a 100644
--- a/regress/mdoc/Ux/eos.in
+++ b/regress/mdoc/Ux/eos.in
@@ -1,6 +1,7 @@
-.Dd December 22, 2013
+.\" $OpenBSD: eos.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt UX-EOS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ux-eos
.Nd end of sentence spacing after Unix macros
diff --git a/regress/mdoc/Ux/eos.out_ascii b/regress/mdoc/Ux/eos.out_ascii
index 16e05df9..3a64d006 100644
--- a/regress/mdoc/Ux/eos.out_ascii
+++ b/regress/mdoc/Ux/eos.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
become BSD. When it dissolved, people started BSD/OS. And NetBSD. And
FreeBSD. And OpenBSD. And DragonFly. By now, it's free for everyone.
-OpenBSD December 22, 2013 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ux/eos.out_markdown b/regress/mdoc/Ux/eos.out_markdown
index 49f3a9ce..c192eb5c 100644
--- a/regress/mdoc/Ux/eos.out_markdown
+++ b/regress/mdoc/Ux/eos.out_markdown
@@ -22,4 +22,4 @@ And
DragonFly.
By now, it's free for everyone.
-OpenBSD - December 22, 2013
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ux/punct.in b/regress/mdoc/Ux/punct.in
index 9cf2b5e4..616ce87b 100644
--- a/regress/mdoc/Ux/punct.in
+++ b/regress/mdoc/Ux/punct.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: punct.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt UX-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ux-punct
.Nd trailing delimiters in Unix macro arguments
diff --git a/regress/mdoc/Ux/punct.out_ascii b/regress/mdoc/Ux/punct.out_ascii
index 123bc9b9..0ea0c405 100644
--- a/regress/mdoc/Ux/punct.out_ascii
+++ b/regress/mdoc/Ux/punct.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
were BSD/OS 5.1, DragonFly 4.8.0, FreeBSD 11.0, NetBSD 7.1, and
OpenBSD 6.1.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ux/punct.out_lint b/regress/mdoc/Ux/punct.out_lint
index eed093e4..4048fd26 100644
--- a/regress/mdoc/Ux/punct.out_lint
+++ b/regress/mdoc/Ux/punct.out_lint
@@ -1,8 +1,5 @@
-mandoc: punct.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: punct.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: punct.in:10:9: STYLE: no blank before trailing delimiter: Bsx 5.1,
-mandoc: punct.in:11:10: STYLE: no blank before trailing delimiter: Dx 4.8.0,
-mandoc: punct.in:12:9: STYLE: no blank before trailing delimiter: Fx 11.0,
-mandoc: punct.in:13:8: STYLE: no blank before trailing delimiter: Nx 7.1,
-mandoc: punct.in:15:8: STYLE: no blank before trailing delimiter: Ox 6.1.
-mandoc: punct.in: BASE: RCS id missing: (OpenBSD)
+mandoc: punct.in:11:9: STYLE: no blank before trailing delimiter: Bsx 5.1,
+mandoc: punct.in:12:10: STYLE: no blank before trailing delimiter: Dx 4.8.0,
+mandoc: punct.in:13:9: STYLE: no blank before trailing delimiter: Fx 11.0,
+mandoc: punct.in:14:8: STYLE: no blank before trailing delimiter: Nx 7.1,
+mandoc: punct.in:16:8: STYLE: no blank before trailing delimiter: Ox 6.1.
diff --git a/regress/mdoc/Ux/punct.out_markdown b/regress/mdoc/Ux/punct.out_markdown
index fd4df824..18cd1519 100644
--- a/regress/mdoc/Ux/punct.out_markdown
+++ b/regress/mdoc/Ux/punct.out_markdown
@@ -15,4 +15,4 @@ NetBSD 7.1,
and
OpenBSD 6.1.
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Ux/spacing.in b/regress/mdoc/Ux/spacing.in
index e78ada3c..0b817ffd 100644
--- a/regress/mdoc/Ux/spacing.in
+++ b/regress/mdoc/Ux/spacing.in
@@ -1,6 +1,7 @@
-.Dd October 20, 2011
+.\" $OpenBSD: spacing.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt UX-SPACING 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Ux-spacing
.Nd spacing around the Unix macro
diff --git a/regress/mdoc/Ux/spacing.out_ascii b/regress/mdoc/Ux/spacing.out_ascii
index be5050c3..c03008f6 100644
--- a/regress/mdoc/Ux/spacing.out_ascii
+++ b/regress/mdoc/Ux/spacing.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
DragonFly and BSD/OS. The system is currently under development. The
system is currently in beta test.
-OpenBSD October 20, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Ux/spacing.out_markdown b/regress/mdoc/Ux/spacing.out_markdown
index 528bee43..4f4236fc 100644
--- a/regress/mdoc/Ux/spacing.out_markdown
+++ b/regress/mdoc/Ux/spacing.out_markdown
@@ -20,4 +20,4 @@ currently under development.
The system
is currently in beta test.
-OpenBSD - October 20, 2011
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Va/basic.in b/regress/mdoc/Va/basic.in
index 5ce4718a..9520842c 100644
--- a/regress/mdoc/Va/basic.in
+++ b/regress/mdoc/Va/basic.in
@@ -1,6 +1,7 @@
-.Dd July 8, 2012
+.\" $OpenBSD: basic.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt VA-BASIC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Va-basic
.Nd basic usage of the variable name macro
diff --git a/regress/mdoc/Va/basic.out_ascii b/regress/mdoc/Va/basic.out_ascii
index a599804a..d2d45aca 100644
--- a/regress/mdoc/Va/basic.out_ascii
+++ b/regress/mdoc/Va/basic.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
Both _c_h_a_r _* _m_a_l_l_o_c___o_p_t_i_o_n_s and _i_n_t _e_r_r_n_o are typical examples of global
variables.
-OpenBSD July 8, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Va/basic.out_markdown b/regress/mdoc/Va/basic.out_markdown
index ec819cd5..a3fe1238 100644
--- a/regress/mdoc/Va/basic.out_markdown
+++ b/regress/mdoc/Va/basic.out_markdown
@@ -14,4 +14,4 @@ and
*errno*
are typical examples of global variables.
-OpenBSD - July 8, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Va/font.in b/regress/mdoc/Va/font.in
index 654ee281..ba552fc5 100644
--- a/regress/mdoc/Va/font.in
+++ b/regress/mdoc/Va/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt VA-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Va-font
.Nd changing fonts inside the variable name macro
diff --git a/regress/mdoc/Va/font.out_ascii b/regress/mdoc/Va/font.out_ascii
index d7e5af1d..4a5f3c84 100644
--- a/regress/mdoc/Va/font.out_ascii
+++ b/regress/mdoc/Va/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Va/font.out_markdown b/regress/mdoc/Va/font.out_markdown
index b58aecd4..8ad52847 100644
--- a/regress/mdoc/Va/font.out_markdown
+++ b/regress/mdoc/Va/font.out_markdown
@@ -10,4 +10,4 @@ normal text
*emphasis**bold**back*
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Va/noarg.in b/regress/mdoc/Va/noarg.in
index 92d35dad..a0f87f6f 100644
--- a/regress/mdoc/Va/noarg.in
+++ b/regress/mdoc/Va/noarg.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: noarg.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt VA-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Va-noarg
.Nd variable name macro without arguments
diff --git a/regress/mdoc/Va/noarg.out_ascii b/regress/mdoc/Va/noarg.out_ascii
index 1992ade4..4221c17b 100644
--- a/regress/mdoc/Va/noarg.out_ascii
+++ b/regress/mdoc/Va/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with arguments _i_n_t _e_r_r_n_o_. no arguments end of test document
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Va/noarg.out_lint b/regress/mdoc/Va/noarg.out_lint
index aa8cac5a..76185aa2 100644
--- a/regress/mdoc/Va/noarg.out_lint
+++ b/regress/mdoc/Va/noarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: noarg.in:12:2: WARNING: skipping empty macro: Va
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: noarg.in:10:10: STYLE: no blank before trailing delimiter: Va errno.
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:13:2: WARNING: skipping empty macro: Va
+mandoc: noarg.in:11:10: STYLE: no blank before trailing delimiter: Va errno.
diff --git a/regress/mdoc/Va/noarg.out_markdown b/regress/mdoc/Va/noarg.out_markdown
index 157cc96f..35123d76 100644
--- a/regress/mdoc/Va/noarg.out_markdown
+++ b/regress/mdoc/Va/noarg.out_markdown
@@ -12,4 +12,4 @@ with arguments
no arguments
end of test document
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Va/punct.in b/regress/mdoc/Va/punct.in
index 198e95ae..2385699c 100644
--- a/regress/mdoc/Va/punct.in
+++ b/regress/mdoc/Va/punct.in
@@ -1,6 +1,7 @@
-.Dd August 21, 2014
+.\" $OpenBSD: punct.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt AR-PUNCT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Va-punct
.Nd punctuation handling by the Va macro
diff --git a/regress/mdoc/Va/punct.out_ascii b/regress/mdoc/Va/punct.out_ascii
index a333c7ee..e5c189fd 100644
--- a/regress/mdoc/Va/punct.out_ascii
+++ b/regress/mdoc/Va/punct.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
quoted punctuation: _a (_b | _c) _d, bboolldd.
-OpenBSD August 21, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Va/punct.out_markdown b/regress/mdoc/Va/punct.out_markdown
index 772793f0..d5b15f66 100644
--- a/regress/mdoc/Va/punct.out_markdown
+++ b/regress/mdoc/Va/punct.out_markdown
@@ -42,4 +42,4 @@ op bracket
quoted punctuation:
*a* (*b* | *c*) *d*, **bold**.
-OpenBSD - August 21, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Vt/child.in b/regress/mdoc/Vt/child.in
index a35aa674..df8ce2a6 100644
--- a/regress/mdoc/Vt/child.in
+++ b/regress/mdoc/Vt/child.in
@@ -1,6 +1,7 @@
-.Dd July 2, 2014
+.\" $OpenBSD: child.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt VT-CHILD 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Vt-child
.Nd the variable type macro does not want children
diff --git a/regress/mdoc/Vt/child.out_ascii b/regress/mdoc/Vt/child.out_ascii
index 500c0e80..57dc30c0 100644
--- a/regress/mdoc/Vt/child.out_ascii
+++ b/regress/mdoc/Vt/child.out_ascii
@@ -9,4 +9,4 @@ SSYYNNOOPPSSIISS
DDEESSCCRRIIPPTTIIOONN
various types, for example _u_n_s_i_g_n_e_d iinntt, _l_o_n_g int and _f_l_o_a_t, _d_o_u_b_l_e
-OpenBSD July 2, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Vt/child.out_markdown b/regress/mdoc/Vt/child.out_markdown
index 49d984e1..1532d22f 100644
--- a/regress/mdoc/Vt/child.out_markdown
+++ b/regress/mdoc/Vt/child.out_markdown
@@ -17,4 +17,4 @@ and
*float*,
*double*
-OpenBSD - July 2, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Vt/font.in b/regress/mdoc/Vt/font.in
index c90692ef..4ac16398 100644
--- a/regress/mdoc/Vt/font.in
+++ b/regress/mdoc/Vt/font.in
@@ -1,6 +1,7 @@
-.Dd July 9, 2012
+.\" $OpenBSD: font.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt VT-FONT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Vt-font
.Nd changing fonts inside the variable type macro
diff --git a/regress/mdoc/Vt/font.out_ascii b/regress/mdoc/Vt/font.out_ascii
index bbc703a0..8df1de6e 100644
--- a/regress/mdoc/Vt/font.out_ascii
+++ b/regress/mdoc/Vt/font.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
normal text _e_m_p_h_a_s_i_sbboolldd_b_a_c_k trailing text
-OpenBSD July 9, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Vt/font.out_markdown b/regress/mdoc/Vt/font.out_markdown
index c210b5ba..0c4e1837 100644
--- a/regress/mdoc/Vt/font.out_markdown
+++ b/regress/mdoc/Vt/font.out_markdown
@@ -10,4 +10,4 @@ normal text
*emphasis**bold**back*
trailing text
-OpenBSD - July 9, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Vt/noarg.in b/regress/mdoc/Vt/noarg.in
index d849b877..eb99b372 100644
--- a/regress/mdoc/Vt/noarg.in
+++ b/regress/mdoc/Vt/noarg.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: noarg.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt VT-NOARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Vt-noarg
.Nd variable type macro without arguments
diff --git a/regress/mdoc/Vt/noarg.out_ascii b/regress/mdoc/Vt/noarg.out_ascii
index 5549bb87..0c79d54f 100644
--- a/regress/mdoc/Vt/noarg.out_ascii
+++ b/regress/mdoc/Vt/noarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
with arguments _s_i_g_n_e_d _i_n_t_. no arguments end of test document
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Vt/noarg.out_lint b/regress/mdoc/Vt/noarg.out_lint
index 410fb096..d0c40e16 100644
--- a/regress/mdoc/Vt/noarg.out_lint
+++ b/regress/mdoc/Vt/noarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: noarg.in:11:2: WARNING: skipping empty macro: Vt
-mandoc: noarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: noarg.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: noarg.in:9:15: STYLE: no blank before trailing delimiter: Vt ... int.
-mandoc: noarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: noarg.in:12:2: WARNING: skipping empty macro: Vt
+mandoc: noarg.in:10:15: STYLE: no blank before trailing delimiter: Vt ... int.
diff --git a/regress/mdoc/Vt/noarg.out_markdown b/regress/mdoc/Vt/noarg.out_markdown
index d47c129c..0a7a51ed 100644
--- a/regress/mdoc/Vt/noarg.out_markdown
+++ b/regress/mdoc/Vt/noarg.out_markdown
@@ -11,4 +11,4 @@ with arguments
no arguments
end of test document
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Vt/spacing.in b/regress/mdoc/Vt/spacing.in
index afb4c70e..438be6db 100644
--- a/regress/mdoc/Vt/spacing.in
+++ b/regress/mdoc/Vt/spacing.in
@@ -1,6 +1,7 @@
-.Dd July 8, 2012
+.\" $OpenBSD: spacing.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt VT-SPACING 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Vt-spacing
.Nd spacing around the variable type macro
diff --git a/regress/mdoc/Vt/spacing.out_ascii b/regress/mdoc/Vt/spacing.out_ascii
index bb5e8441..a061ee6d 100644
--- a/regress/mdoc/Vt/spacing.out_ascii
+++ b/regress/mdoc/Vt/spacing.out_ascii
@@ -10,4 +10,4 @@ SSYYNNOOPPSSIISS
DDEESSCCRRIIPPTTIIOONN
various types, for example _u_n_s_i_g_n_e_d _i_n_t, _l_o_n_g _i_n_t and _f_l_o_a_t, _d_o_u_b_l_e
-OpenBSD July 8, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Vt/spacing.out_markdown b/regress/mdoc/Vt/spacing.out_markdown
index 58bb771d..5c490af5 100644
--- a/regress/mdoc/Vt/spacing.out_markdown
+++ b/regress/mdoc/Vt/spacing.out_markdown
@@ -18,4 +18,4 @@ and
*float*,
*double*
-OpenBSD - July 8, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/Xr/args.in b/regress/mdoc/Xr/args.in
index 74b9e841..ab65a95f 100644
--- a/regress/mdoc/Xr/args.in
+++ b/regress/mdoc/Xr/args.in
@@ -1,6 +1,7 @@
-.Dd June 9, 2017
+.\" $OpenBSD: args.in,v 1.10 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt XR-ARGS 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm Xr-args
.Nd additional arguments to cross references
diff --git a/regress/mdoc/Xr/args.out_ascii b/regress/mdoc/Xr/args.out_ascii
index 10d4b468..7dda3a84 100644
--- a/regress/mdoc/Xr/args.out_ascii
+++ b/regress/mdoc/Xr/args.out_ascii
@@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
Finally, an (echo(1)) without a blank, half an echo, no blank after half
an echo, no echo and no echo at all.
-OpenBSD June 9, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/Xr/args.out_lint b/regress/mdoc/Xr/args.out_lint
index cc734119..a0d0d761 100644
--- a/regress/mdoc/Xr/args.out_lint
+++ b/regress/mdoc/Xr/args.out_lint
@@ -1,9 +1,7 @@
-mandoc: args.in:28:2: WARNING: skipping empty macro: Xr
-mandoc: args.in:30:2: WARNING: skipping empty macro: Xr
-mandoc: args.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: args.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: args.in:22:13: STYLE: no blank before trailing delimiter: Xr ... 1)
-mandoc: args.in:24:2: WARNING: missing section argument: Xr echo
-mandoc: args.in:26:2: WARNING: missing section argument: Xr echo,
-mandoc: args.in:26:9: STYLE: no blank before trailing delimiter: Xr echo,
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:29:2: WARNING: skipping empty macro: Xr
+mandoc: args.in:31:2: WARNING: skipping empty macro: Xr
+mandoc: args.in:23:13: STYLE: no blank before trailing delimiter: Xr ... 1)
+mandoc: args.in:25:2: WARNING: missing section argument: Xr echo
+mandoc: args.in:27:2: WARNING: missing section argument: Xr echo,
+mandoc: args.in:27:9: STYLE: no blank before trailing delimiter: Xr echo,
+mandoc: args.in:23:8: STYLE: referenced manual not found: Xr echo 1)
diff --git a/regress/mdoc/Xr/args.out_markdown b/regress/mdoc/Xr/args.out_markdown
index 0efd2d76..d8cf6cb0 100644
--- a/regress/mdoc/Xr/args.out_markdown
+++ b/regress/mdoc/Xr/args.out_markdown
@@ -29,4 +29,4 @@ no echo
and no
echo at all.
-OpenBSD - June 9, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/blank/comment.in b/regress/mdoc/blank/comment.in
index 8b7b811f..35b0a17d 100644
--- a/regress/mdoc/blank/comment.in
+++ b/regress/mdoc/blank/comment.in
@@ -1,6 +1,7 @@
-.Dd February 17, 2010
+.\" $OpenBSD: comment.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt BLANK-COMMENT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm blank-comment
.Nd normal and bogus comments
diff --git a/regress/mdoc/blank/comment.out_ascii b/regress/mdoc/blank/comment.out_ascii
index 26fde80d..bd07b71f 100644
--- a/regress/mdoc/blank/comment.out_ascii
+++ b/regress/mdoc/blank/comment.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
text text
-OpenBSD February 17, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/blank/comment.out_lint b/regress/mdoc/blank/comment.out_lint
index 33ef6045..abcab924 100644
--- a/regress/mdoc/blank/comment.out_lint
+++ b/regress/mdoc/blank/comment.out_lint
@@ -1,4 +1 @@
-mandoc: comment.in:11:3: WARNING: bad comment style
-mandoc: comment.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: comment.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: comment.in: BASE: RCS id missing: (OpenBSD)
+mandoc: comment.in:12:3: WARNING: bad comment style
diff --git a/regress/mdoc/blank/comment.out_markdown b/regress/mdoc/blank/comment.out_markdown
index 906a0c0b..27785ddf 100644
--- a/regress/mdoc/blank/comment.out_markdown
+++ b/regress/mdoc/blank/comment.out_markdown
@@ -13,4 +13,4 @@ end of text
text
text
-OpenBSD - February 17, 2010
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/blank/line.in b/regress/mdoc/blank/line.in
index f1946c13..44e47fde 100644
--- a/regress/mdoc/blank/line.in
+++ b/regress/mdoc/blank/line.in
@@ -1,6 +1,7 @@
-.Dd February 17, 2010
+.\" $OpenBSD: line.in,v 1.6 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt BLANK-LINE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm blank-line
.Nd handling of blank line
diff --git a/regress/mdoc/blank/line.out_ascii b/regress/mdoc/blank/line.out_ascii
index 7fde5795..7c568733 100644
--- a/regress/mdoc/blank/line.out_ascii
+++ b/regress/mdoc/blank/line.out_ascii
@@ -74,4 +74,4 @@ CCUUSSTTOOMM TTWWOO
SSuubbsseeccttiioonn
End.
-OpenBSD February 17, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/blank/line.out_lint b/regress/mdoc/blank/line.out_lint
index c83e766c..990bb5bd 100644
--- a/regress/mdoc/blank/line.out_lint
+++ b/regress/mdoc/blank/line.out_lint
@@ -1,26 +1,23 @@
-mandoc: line.in:15:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:48:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:50:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:54:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:56:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:60:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:62:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:65:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:16:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:49:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:51:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:55:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:57:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:61:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:63:1: WARNING: blank line in fill mode, using .sp
mandoc: line.in:66:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: line.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: line.in:18:2: WARNING: skipping paragraph macro: br after br
-mandoc: line.in:20:2: WARNING: skipping paragraph macro: br before Pp
-mandoc: line.in:24:2: WARNING: skipping paragraph macro: br after Pp
-mandoc: line.in:26:2: WARNING: skipping paragraph macro: Pp before Pp
-mandoc: line.in:33:2: WARNING: skipping paragraph macro: br after sp
-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:51:2: WARNING: skipping paragraph macro: br after sp
-mandoc: line.in:54:1: WARNING: skipping paragraph macro: sp after Pp
-mandoc: line.in:81:2: WARNING: skipping paragraph macro: sp after Sh
-mandoc: line.in:83:2: WARNING: skipping paragraph macro: Pp at the end of Sh
-mandoc: line.in:85:2: WARNING: skipping paragraph macro: Pp after Sh
-mandoc: line.in:88:2: WARNING: skipping paragraph macro: Pp after Ss
-mandoc: line.in:90:2: WARNING: skipping paragraph macro: Pp at the end of Ss
-mandoc: line.in: BASE: RCS id missing: (OpenBSD)
+mandoc: line.in:67:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:19:2: WARNING: skipping paragraph macro: br after br
+mandoc: line.in:21:2: WARNING: skipping paragraph macro: br before Pp
+mandoc: line.in:25:2: WARNING: skipping paragraph macro: br after Pp
+mandoc: line.in:27:2: WARNING: skipping paragraph macro: Pp before Pp
+mandoc: line.in:34:2: WARNING: skipping paragraph macro: br after sp
+mandoc: line.in:37:2: WARNING: skipping paragraph macro: sp after Pp
+mandoc: line.in:40:2: WARNING: skipping paragraph macro: sp after Pp
+mandoc: line.in:52:2: WARNING: skipping paragraph macro: br after sp
+mandoc: line.in:55:1: WARNING: skipping paragraph macro: sp after Pp
+mandoc: line.in:82:2: WARNING: skipping paragraph macro: sp after Sh
+mandoc: line.in:84:2: WARNING: skipping paragraph macro: Pp at the end of Sh
+mandoc: line.in:86:2: WARNING: skipping paragraph macro: Pp after Sh
+mandoc: line.in:89:2: WARNING: skipping paragraph macro: Pp after Ss
+mandoc: line.in:91:2: WARNING: skipping paragraph macro: Pp at the end of Ss
diff --git a/regress/mdoc/blank/list.in b/regress/mdoc/blank/list.in
index 067e3dcf..07411030 100644
--- a/regress/mdoc/blank/list.in
+++ b/regress/mdoc/blank/list.in
@@ -1,6 +1,7 @@
-.Dd July 17, 2012
+.\" $OpenBSD: list.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt BLANK-LIST 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm blank-list
.Nd handling of blank lines in lists
diff --git a/regress/mdoc/blank/list.out_ascii b/regress/mdoc/blank/list.out_ascii
index 5f0eaa98..918ddd89 100644
--- a/regress/mdoc/blank/list.out_ascii
+++ b/regress/mdoc/blank/list.out_ascii
@@ -39,4 +39,4 @@ DDEESSCCRRIIPPTTIIOONN
End.
-OpenBSD July 17, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/blank/list.out_lint b/regress/mdoc/blank/list.out_lint
index cceaa634..a4eb9206 100644
--- a/regress/mdoc/blank/list.out_lint
+++ b/regress/mdoc/blank/list.out_lint
@@ -1,10 +1,7 @@
-mandoc: list.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: list.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: list.in:19:2: WARNING: skipping paragraph macro: Pp before It
-mandoc: list.in:22:2: WARNING: moving paragraph macro out of list: Pp
-mandoc: list.in:34:2: WARNING: moving paragraph macro out of list: Pp
-mandoc: list.in:34:2: WARNING: skipping paragraph macro: Pp before Pp
-mandoc: list.in:51:2: WARNING: moving paragraph macro out of list: Pp
-mandoc: list.in:63:2: WARNING: moving paragraph macro out of list: Pp
-mandoc: list.in:63:2: WARNING: skipping paragraph macro: Pp before Pp
-mandoc: list.in: BASE: RCS id missing: (OpenBSD)
+mandoc: list.in:20:2: WARNING: skipping paragraph macro: Pp before It
+mandoc: list.in:23:2: WARNING: moving paragraph macro out of list: Pp
+mandoc: list.in:35:2: WARNING: moving paragraph macro out of list: Pp
+mandoc: list.in:35:2: WARNING: skipping paragraph macro: Pp before Pp
+mandoc: list.in:52:2: WARNING: moving paragraph macro out of list: Pp
+mandoc: list.in:64:2: WARNING: moving paragraph macro out of list: Pp
+mandoc: list.in:64:2: WARNING: skipping paragraph macro: Pp before Pp
diff --git a/regress/mdoc/blank/list.out_markdown b/regress/mdoc/blank/list.out_markdown
index 8d92f60f..6a8ede65 100644
--- a/regress/mdoc/blank/list.out_markdown
+++ b/regress/mdoc/blank/list.out_markdown
@@ -47,4 +47,4 @@ item
End.
-OpenBSD - July 17, 2012
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/break/brokenbreaker.in b/regress/mdoc/break/brokenbreaker.in
index b5a23f40..2c476aae 100644
--- a/regress/mdoc/break/brokenbreaker.in
+++ b/regress/mdoc/break/brokenbreaker.in
@@ -1,6 +1,7 @@
-.Dd December 23, 2014
+.\" $OpenBSD: brokenbreaker.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt BREAK-BROKENBREAKER 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm break-brokenbreaker
.Nd a broken block breaking another block
diff --git a/regress/mdoc/break/brokenbreaker.out_ascii b/regress/mdoc/break/brokenbreaker.out_ascii
index 1a8cd75a..3248e66b 100644
--- a/regress/mdoc/break/brokenbreaker.out_ascii
+++ b/regress/mdoc/break/brokenbreaker.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
(po <ao pc) [bo pc ac> bc]
-OpenBSD December 23, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/break/brokenbreaker.out_lint b/regress/mdoc/break/brokenbreaker.out_lint
index 7fbf4a5b..05afa2b0 100644
--- a/regress/mdoc/break/brokenbreaker.out_lint
+++ b/regress/mdoc/break/brokenbreaker.out_lint
@@ -1,6 +1,3 @@
-mandoc: brokenbreaker.in:10:2: WARNING: blocks badly nested: Po breaks Ao
-mandoc: brokenbreaker.in:12:2: ERROR: skipping end of block that is not open: Pc
-mandoc: brokenbreaker.in:13:2: WARNING: blocks badly nested: Ao breaks Bo
-mandoc: brokenbreaker.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: brokenbreaker.in:1:5: BASE: Mdocdate missing: Dd December (OpenBSD)
-mandoc: brokenbreaker.in: BASE: RCS id missing: (OpenBSD)
+mandoc: brokenbreaker.in:11:2: WARNING: blocks badly nested: Po breaks Ao
+mandoc: brokenbreaker.in:13:2: ERROR: skipping end of block that is not open: Pc
+mandoc: brokenbreaker.in:14:2: WARNING: blocks badly nested: Ao breaks Bo
diff --git a/regress/mdoc/break/brokenbreaker.out_markdown b/regress/mdoc/break/brokenbreaker.out_markdown
index ed5868d2..d5779991 100644
--- a/regress/mdoc/break/brokenbreaker.out_markdown
+++ b/regress/mdoc/break/brokenbreaker.out_markdown
@@ -10,4 +10,4 @@ BREAK-BROKENBREAKER(1) - General Commands Manual
&lt;ao pc)
\[bo pc ac&gt; bc]
-OpenBSD - December 23, 2014
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/break/notopen.in b/regress/mdoc/break/notopen.in
index 20a9bf12..b3bd8635 100644
--- a/regress/mdoc/break/notopen.in
+++ b/regress/mdoc/break/notopen.in
@@ -1,6 +1,7 @@
-.Dd August 20, 2016
+.\" $OpenBSD: notopen.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt BREAK-NOTOPEN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm break-notopen
.Nd mismatching end macro inside two open blocks
diff --git a/regress/mdoc/break/notopen.out_ascii b/regress/mdoc/break/notopen.out_ascii
index db71cc41..a3fd59cd 100644
--- a/regress/mdoc/break/notopen.out_ascii
+++ b/regress/mdoc/break/notopen.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
<ao [bo pc bc] ac> tail
-OpenBSD August 20, 2016 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/break/notopen.out_lint b/regress/mdoc/break/notopen.out_lint
index 00ac0ee3..f2cc14a6 100644
--- a/regress/mdoc/break/notopen.out_lint
+++ b/regress/mdoc/break/notopen.out_lint
@@ -1,4 +1 @@
-mandoc: notopen.in:10:2: ERROR: skipping end of block that is not open: Pc
-mandoc: notopen.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: notopen.in:1:5: BASE: Mdocdate missing: Dd August (OpenBSD)
-mandoc: notopen.in: BASE: RCS id missing: (OpenBSD)
+mandoc: notopen.in:11:2: ERROR: skipping end of block that is not open: Pc
diff --git a/regress/mdoc/break/notopen.out_markdown b/regress/mdoc/break/notopen.out_markdown
index 61b8185d..3e8af929 100644
--- a/regress/mdoc/break/notopen.out_markdown
+++ b/regress/mdoc/break/notopen.out_markdown
@@ -11,4 +11,4 @@ BREAK-NOTOPEN(1) - General Commands Manual
ac&gt;
tail
-OpenBSD - August 20, 2016
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/break/tail.in b/regress/mdoc/break/tail.in
index c4984bee..d9e4e3c7 100644
--- a/regress/mdoc/break/tail.in
+++ b/regress/mdoc/break/tail.in
@@ -1,6 +1,7 @@
-.Dd February 11, 2017
+.\" $OpenBSD: tail.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt BREAK-TAIL 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm break-tail
.Nd tail arguments on or after broken blocks
diff --git a/regress/mdoc/break/tail.out_ascii b/regress/mdoc/break/tail.out_ascii
index 3d1dd0ce..0edb3047 100644
--- a/regress/mdoc/break/tail.out_ascii
+++ b/regress/mdoc/break/tail.out_ascii
@@ -21,4 +21,4 @@ DDEESSCCRRIIPPTTIIOONN
After a broken block: closing child on closing macro, then opening child
on closing macro: <ao [bo {bro (po brc} pc) bc] ac> [op]
-OpenBSD February 11, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/break/tail.out_lint b/regress/mdoc/break/tail.out_lint
index 4257cd38..10845513 100644
--- a/regress/mdoc/break/tail.out_lint
+++ b/regress/mdoc/break/tail.out_lint
@@ -1,8 +1,5 @@
-mandoc: tail.in:11:2: WARNING: blocks badly nested: Ao breaks Bo
-mandoc: tail.in:15:2: WARNING: blocks badly nested: Ao breaks Bo
-mandoc: tail.in:20:2: WARNING: blocks badly nested: Aq breaks Bo
-mandoc: tail.in:22:2: WARNING: blocks badly nested: Aq breaks Bo
-mandoc: tail.in:46:2: WARNING: blocks badly nested: Bro breaks Po
-mandoc: tail.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: tail.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: tail.in: BASE: RCS id missing: (OpenBSD)
+mandoc: tail.in:12:2: WARNING: blocks badly nested: Ao breaks Bo
+mandoc: tail.in:16:2: WARNING: blocks badly nested: Ao breaks Bo
+mandoc: tail.in:21:2: WARNING: blocks badly nested: Aq breaks Bo
+mandoc: tail.in:23:2: WARNING: blocks badly nested: Aq breaks Bo
+mandoc: tail.in:47:2: WARNING: blocks badly nested: Bro breaks Po
diff --git a/regress/mdoc/break/tail.out_markdown b/regress/mdoc/break/tail.out_markdown
index 83e8fd0e..4746dbf2 100644
--- a/regress/mdoc/break/tail.out_markdown
+++ b/regress/mdoc/break/tail.out_markdown
@@ -40,4 +40,4 @@ then opening child on closing macro:
(po brc} pc)
bc] ac&gt; \[op]
-OpenBSD - February 11, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/break/twice.in b/regress/mdoc/break/twice.in
index a8dda93f..fb56eae9 100644
--- a/regress/mdoc/break/twice.in
+++ b/regress/mdoc/break/twice.in
@@ -1,6 +1,7 @@
-.Dd February 16, 2017
+.\" $OpenBSD: twice.in,v 1.4 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt BREAK-TWICE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm break-twice
.Nd breaking the same block twice
diff --git a/regress/mdoc/break/twice.out_ascii b/regress/mdoc/break/twice.out_ascii
index 75302910..8113da6d 100644
--- a/regress/mdoc/break/twice.out_ascii
+++ b/regress/mdoc/break/twice.out_ascii
@@ -16,4 +16,4 @@ DDEESSCCRRIIPPTTIIOONN
-- it
-OpenBSD February 16, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/break/twice.out_lint b/regress/mdoc/break/twice.out_lint
index 67faf1c6..cb2de941 100644
--- a/regress/mdoc/break/twice.out_lint
+++ b/regress/mdoc/break/twice.out_lint
@@ -1,14 +1,11 @@
-mandoc: twice.in:12:2: WARNING: blocks badly nested: Bro breaks Ao
-mandoc: twice.in:13:2: WARNING: blocks badly nested: Bo breaks Ao
-mandoc: twice.in:19:12: WARNING: blocks badly nested: Bro breaks Aq
-mandoc: twice.in:19:19: WARNING: blocks badly nested: Bo breaks Aq
-mandoc: twice.in:25:2: WARNING: blocks badly nested: Bo breaks Ao
+mandoc: twice.in:13:2: WARNING: blocks badly nested: Bro breaks Ao
+mandoc: twice.in:14:2: WARNING: blocks badly nested: Bo breaks Ao
+mandoc: twice.in:20:12: WARNING: blocks badly nested: Bro breaks Aq
+mandoc: twice.in:20:19: WARNING: blocks badly nested: Bo breaks Aq
mandoc: twice.in:26:2: WARNING: blocks badly nested: Bo breaks Ao
-mandoc: twice.in:32:11: WARNING: blocks badly nested: Bo breaks Aq
-mandoc: twice.in:32:17: WARNING: blocks badly nested: Bo breaks Aq
-mandoc: twice.in:36:8: WARNING: blocks badly nested: Bq breaks Po
-mandoc: twice.in:36:2: WARNING: blocks badly nested: Aq breaks Po
-mandoc: twice.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: twice.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: twice.in:36:2: WARNING: moving content out of list: Aq
-mandoc: twice.in: BASE: RCS id missing: (OpenBSD)
+mandoc: twice.in:27:2: WARNING: blocks badly nested: Bo breaks Ao
+mandoc: twice.in:33:11: WARNING: blocks badly nested: Bo breaks Aq
+mandoc: twice.in:33:17: WARNING: blocks badly nested: Bo breaks Aq
+mandoc: twice.in:37:8: WARNING: blocks badly nested: Bq breaks Po
+mandoc: twice.in:37:2: WARNING: blocks badly nested: Aq breaks Po
+mandoc: twice.in:37:2: WARNING: moving content out of list: Aq
diff --git a/regress/mdoc/break/twice.out_markdown b/regress/mdoc/break/twice.out_markdown
index 18bf1634..83a833c2 100644
--- a/regress/mdoc/break/twice.out_markdown
+++ b/regress/mdoc/break/twice.out_markdown
@@ -32,4 +32,4 @@ pc)
- it
-OpenBSD - February 16, 2017
+OpenBSD - July 4, 2017
diff --git a/regress/mdoc/break/two.in b/regress/mdoc/break/two.in
index d3071699..68a298b2 100644
--- a/regress/mdoc/break/two.in
+++ b/regress/mdoc/break/two.in
@@ -1,6 +1,7 @@
-.Dd February 12, 2015
+.\" $OpenBSD: two.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt BREAK-TWO 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm break-two
.Nd the same block breaking two other blocks
diff --git a/regress/mdoc/break/two.out_ascii b/regress/mdoc/break/two.out_ascii
index e4db38c4..1a31ff59 100644
--- a/regress/mdoc/break/two.out_ascii
+++ b/regress/mdoc/break/two.out_ascii
@@ -16,4 +16,4 @@ DDEESSCCRRIIPPTTIIOONN
Two of the same kind, implicit: <aq [bo [bo eol>] bc]
-OpenBSD February 12, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/mdoc/break/two.out_lint b/regress/mdoc/break/two.out_lint
index 27929e5f..bea0318e 100644
--- a/regress/mdoc/break/two.out_lint
+++ b/regress/mdoc/break/two.out_lint
@@ -1,11 +1,8 @@
-mandoc: two.in:12:2: WARNING: blocks badly nested: Ao breaks Bro
-mandoc: two.in:17:2: WARNING: blocks badly nested: Aq breaks Bro
-mandoc: two.in:24:2: WARNING: blocks badly nested: Ao breaks Bro
-mandoc: two.in:25:2: WARNING: blocks badly nested: Bo breaks Bro
-mandoc: two.in:29:2: WARNING: blocks badly nested: Aq breaks Bro
-mandoc: two.in:30:2: WARNING: blocks badly nested: Bo breaks Bro
-mandoc: two.in:36:2: WARNING: blocks badly nested: Ao breaks Bo
-mandoc: two.in:41:2: WARNING: blocks badly nested: Aq breaks Bo
-mandoc: two.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: two.in:1:5: BASE: Mdocdate missing: Dd February (OpenBSD)
-mandoc: two.in: BASE: RCS id missing: (OpenBSD)
+mandoc: two.in:13:2: WARNING: blocks badly nested: Ao breaks Bro
+mandoc: two.in:18:2: WARNING: blocks badly nested: Aq breaks Bro
+mandoc: two.in:25:2: WARNING: blocks badly nested: Ao breaks Bro
+mandoc: two.in:26:2: WARNING: blocks badly nested: Bo breaks Bro
+mandoc: two.in:30:2: WARNING: blocks badly nested: Aq breaks Bro
+mandoc: two.in:31:2: WARNING: blocks badly nested: Bo breaks Bro
+mandoc: two.in:37:2: WARNING: blocks badly nested: Ao breaks Bo
+mandoc: two.in:42:2: WARNING: blocks badly nested: Aq breaks Bo
diff --git a/regress/mdoc/break/two.out_markdown b/regress/mdoc/break/two.out_markdown
index ab0aea2e..bc8a68fd 100644
--- a/regress/mdoc/break/two.out_markdown
+++ b/regress/mdoc/break/two.out_markdown
@@ -34,4 +34,4 @@ Two of the same kind, implicit:
&lt;aq \[bo \[bo eol&gt;]
bc]
-OpenBSD - February 12, 2015
+OpenBSD - July 4, 2017
diff --git a/regress/regress.pl b/regress/regress.pl
index 3d06556b..6c37039b 100755
--- a/regress/regress.pl
+++ b/regress/regress.pl
@@ -240,7 +240,7 @@ for my $testname (@regress_testnames) {
$count_ascii++;
$count_total++;
print "@mandoc -T ascii $i\n" if $targets{verbose};
- sysout $o, @mandoc, qw(-T ascii), $i
+ sysout $o, @mandoc, qw(-I os=OpenBSD -T ascii), $i
and fail $subdir, $testname, 'ascii:mandoc';
system @diff, $w, $o
and fail $subdir, $testname, 'ascii:diff';
@@ -251,10 +251,10 @@ for my $testname (@regress_testnames) {
$count_man++;
$count_total++;
print "@mandoc -T man $i\n" if $targets{verbose};
- sysout $m, @mandoc, qw(-T man), $i
+ sysout $m, @mandoc, qw(-I os=OpenBSD -T man), $i
and fail $subdir, $testname, 'man:man';
print "@mandoc -man -T ascii $m\n" if $targets{verbose};
- sysout $mo, @mandoc, qw(-man -T ascii -O mdoc), $m
+ sysout $mo, @mandoc, qw(-man -I os=OpenBSD -T ascii -O mdoc), $m
and fail $subdir, $testname, 'man:mandoc';
system @diff, $w, $mo
and fail $subdir, $testname, 'man:diff';
@@ -279,7 +279,7 @@ for my $testname (@utf8_testnames) {
$count_utf8++;
$count_total++;
print "@mandoc -T utf8 $i\n" if $targets{verbose};
- sysout $o, @mandoc, qw(-T utf8), $i
+ sysout $o, @mandoc, qw(-I os=OpenBSD -T utf8), $i
and fail $subdir, $testname, 'utf8:mandoc';
system @diff, $w, $o
and fail $subdir, $testname, 'utf8:diff';
@@ -321,7 +321,7 @@ for my $testname (@regress_testnames) {
$count_markdown++;
$count_total++;
print "@mandoc -T markdown $i\n" if $targets{verbose};
- sysout $o, @mandoc, qw(-T markdown), $i
+ sysout $o, @mandoc, qw(-I os=OpenBSD -T markdown), $i
and fail $subdir, $testname, 'markdown:mandoc';
system @diff, $w, $o
and fail $subdir, $testname, 'markdown:diff';
@@ -342,7 +342,7 @@ for my $testname (@lint_testnames) {
$count_lint++;
$count_total++;
print "@mandoc -T lint -W all $i\n" if $targets{verbose};
- syslint $o, @mandoc, qw(-T lint -W all), $i
+ syslint $o, @mandoc, qw(-I os=OpenBSD -T lint -W all), $i
and fail $subdir, $testname, 'lint:mandoc';
system @diff, $w, $o
and fail $subdir, $testname, 'lint:diff';
diff --git a/regress/roff/args/man.in b/regress/roff/args/man.in
index 527f1e85..e094cd48 100644
--- a/regress/roff/args/man.in
+++ b/regress/roff/args/man.in
@@ -1,4 +1,5 @@
-.TH ARGS-MAN 1 "November 19, 2014" OpenBSD
+.\" $OpenBSD: man.in,v 1.5 2017/07/04 14:53:26 schwarze Exp $
+.TH ARGS-MAN 1 "November 19, 2014"
.SH NAME
args-man - arguments to man macros
.SH DESCRIPTION
diff --git a/regress/roff/args/man.out_lint b/regress/roff/args/man.out_lint
index 4642e8d2..5b74f59e 100644
--- a/regress/roff/args/man.out_lint
+++ b/regress/roff/args/man.out_lint
@@ -1,10 +1,9 @@
-mandoc: man.in:34:13: WARNING: whitespace at end of input line
-mandoc: man.in:38:14: WARNING: whitespace at end of input line
-mandoc: man.in:42:15: WARNING: whitespace at end of input line
-mandoc: man.in:82:25: WARNING: whitespace at end of input line
-mandoc: man.in:86:26: WARNING: whitespace at end of input line
-mandoc: man.in:90:27: WARNING: whitespace at end of input line
-mandoc: man.in:103:5: WARNING: unterminated quoted argument
-mandoc: man.in:106:9: WARNING: unterminated quoted argument
-mandoc: man.in:130:1: ERROR: escaped character not allowed in a name: IB\(
-mandoc: man.in: BASE: RCS id missing: (OpenBSD)
+mandoc: man.in:35:13: WARNING: whitespace at end of input line
+mandoc: man.in:39:14: WARNING: whitespace at end of input line
+mandoc: man.in:43:15: WARNING: whitespace at end of input line
+mandoc: man.in:83:25: WARNING: whitespace at end of input line
+mandoc: man.in:87:26: WARNING: whitespace at end of input line
+mandoc: man.in:91:27: WARNING: whitespace at end of input line
+mandoc: man.in:104:5: WARNING: unterminated quoted argument
+mandoc: man.in:107:9: WARNING: unterminated quoted argument
+mandoc: man.in:131:1: ERROR: escaped character not allowed in a name: IB\(
diff --git a/regress/roff/args/mdoc.in b/regress/roff/args/mdoc.in
index 0a134816..50313069 100644
--- a/regress/roff/args/mdoc.in
+++ b/regress/roff/args/mdoc.in
@@ -1,6 +1,7 @@
-.Dd November 19, 2014
+.\" $OpenBSD: mdoc.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.Dd $Mdocdate$
.Dt ARGS-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm args-mdoc
.Nd arguments to mdoc macros
diff --git a/regress/roff/args/mdoc.out_ascii b/regress/roff/args/mdoc.out_ascii
index 94a12518..b92ca0dc 100644
--- a/regress/roff/args/mdoc.out_ascii
+++ b/regress/roff/args/mdoc.out_ascii
@@ -31,4 +31,4 @@ DDEESSCCRRIIPPTTIIOONN
escape sequence after macro: --oonnee --ttwwoo text
backslash at eol: --oonnee --ttwwoo
-OpenBSD November 19, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/args/mdoc.out_lint b/regress/roff/args/mdoc.out_lint
index c262f825..d28277a1 100644
--- a/regress/roff/args/mdoc.out_lint
+++ b/regress/roff/args/mdoc.out_lint
@@ -1,16 +1,13 @@
-mandoc: mdoc.in:37:13: WARNING: whitespace at end of input line
-mandoc: mdoc.in:41:14: WARNING: whitespace at end of input line
-mandoc: mdoc.in:45:15: WARNING: whitespace at end of input line
-mandoc: mdoc.in:85:25: WARNING: whitespace at end of input line
-mandoc: mdoc.in:89:26: WARNING: whitespace at end of input line
-mandoc: mdoc.in:93:27: WARNING: whitespace at end of input line
-mandoc: mdoc.in:101:9: WARNING: unterminated quoted argument
-mandoc: mdoc.in:102:13: WARNING: unterminated quoted argument
-mandoc: mdoc.in:106:10: WARNING: unterminated quoted argument
-mandoc: mdoc.in:107:14: WARNING: unterminated quoted argument
-mandoc: mdoc.in:111:11: WARNING: unterminated quoted argument
-mandoc: mdoc.in:112:15: WARNING: unterminated quoted argument
-mandoc: mdoc.in:120:1: ERROR: escaped character not allowed in a name: Fl\(
-mandoc: mdoc.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: mdoc.in:1:5: BASE: Mdocdate missing: Dd November (OpenBSD)
-mandoc: mdoc.in: BASE: RCS id missing: (OpenBSD)
+mandoc: mdoc.in:38:13: WARNING: whitespace at end of input line
+mandoc: mdoc.in:42:14: WARNING: whitespace at end of input line
+mandoc: mdoc.in:46:15: WARNING: whitespace at end of input line
+mandoc: mdoc.in:86:25: WARNING: whitespace at end of input line
+mandoc: mdoc.in:90:26: WARNING: whitespace at end of input line
+mandoc: mdoc.in:94:27: WARNING: whitespace at end of input line
+mandoc: mdoc.in:102:9: WARNING: unterminated quoted argument
+mandoc: mdoc.in:103:13: WARNING: unterminated quoted argument
+mandoc: mdoc.in:107:10: WARNING: unterminated quoted argument
+mandoc: mdoc.in:108:14: WARNING: unterminated quoted argument
+mandoc: mdoc.in:112:11: WARNING: unterminated quoted argument
+mandoc: mdoc.in:113:15: WARNING: unterminated quoted argument
+mandoc: mdoc.in:121:1: ERROR: escaped character not allowed in a name: Fl\(
diff --git a/regress/roff/args/roff.in b/regress/roff/args/roff.in
index 070e4255..1089d0c2 100644
--- a/regress/roff/args/roff.in
+++ b/regress/roff/args/roff.in
@@ -1,4 +1,5 @@
-.TH ARGS-ROFF 1 "February 21, 2015" OpenBSD
+.\" $OpenBSD: roff.in,v 1.5 2017/07/04 14:53:26 schwarze Exp $
+.TH ARGS-ROFF 1 "February 21, 2015"
.SH NAME
args-roff - arguments to roff macros
.SH DESCRIPTION
diff --git a/regress/roff/args/roff.out_lint b/regress/roff/args/roff.out_lint
index d074d13a..d6817400 100644
--- a/regress/roff/args/roff.out_lint
+++ b/regress/roff/args/roff.out_lint
@@ -1,17 +1,16 @@
-mandoc: roff.in:30:15: WARNING: whitespace at end of input line
-mandoc: roff.in:32:16: WARNING: whitespace at end of input line
-mandoc: roff.in:34:17: WARNING: whitespace at end of input line
-mandoc: roff.in:54:27: WARNING: whitespace at end of input line
-mandoc: roff.in:56:28: WARNING: whitespace at end of input line
-mandoc: roff.in:58:29: WARNING: whitespace at end of input line
-mandoc: roff.in:62:7: WARNING: unterminated quoted argument
-mandoc: roff.in:63:11: WARNING: unterminated quoted argument
-mandoc: roff.in:65:7: WARNING: unterminated quoted argument
-mandoc: roff.in:65:12: WARNING: whitespace at end of input line
-mandoc: roff.in:66:11: WARNING: unterminated quoted argument
-mandoc: roff.in:66:16: WARNING: whitespace at end of input line
-mandoc: roff.in:68:7: WARNING: unterminated quoted argument
-mandoc: roff.in:68:13: WARNING: whitespace at end of input line
-mandoc: roff.in:69:11: WARNING: unterminated quoted argument
-mandoc: roff.in:69:17: WARNING: whitespace at end of input line
-mandoc: roff.in: BASE: RCS id missing: (OpenBSD)
+mandoc: roff.in:31:15: WARNING: whitespace at end of input line
+mandoc: roff.in:33:16: WARNING: whitespace at end of input line
+mandoc: roff.in:35:17: WARNING: whitespace at end of input line
+mandoc: roff.in:55:27: WARNING: whitespace at end of input line
+mandoc: roff.in:57:28: WARNING: whitespace at end of input line
+mandoc: roff.in:59:29: WARNING: whitespace at end of input line
+mandoc: roff.in:63:7: WARNING: unterminated quoted argument
+mandoc: roff.in:64:11: WARNING: unterminated quoted argument
+mandoc: roff.in:66:7: WARNING: unterminated quoted argument
+mandoc: roff.in:66:12: WARNING: whitespace at end of input line
+mandoc: roff.in:67:11: WARNING: unterminated quoted argument
+mandoc: roff.in:67:16: WARNING: whitespace at end of input line
+mandoc: roff.in:69:7: WARNING: unterminated quoted argument
+mandoc: roff.in:69:13: WARNING: whitespace at end of input line
+mandoc: roff.in:70:11: WARNING: unterminated quoted argument
+mandoc: roff.in:70:17: WARNING: whitespace at end of input line
diff --git a/regress/roff/br/args.in b/regress/roff/br/args.in
index c2837971..fe73c7cd 100644
--- a/regress/roff/br/args.in
+++ b/regress/roff/br/args.in
@@ -1,4 +1,5 @@
-.TH BR-ARGS 1 "January 17, 2011" OpenBSD
+.\" $OpenBSD: args.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.TH BR-ARGS 1 "January 17, 2011"
.SH NAME
br-args \- arguments to .br macros
.SH DESCRIPTION
diff --git a/regress/roff/br/args.out_lint b/regress/roff/br/args.out_lint
index 79b1ec82..69c9384a 100644
--- a/regress/roff/br/args.out_lint
+++ b/regress/roff/br/args.out_lint
@@ -1,2 +1 @@
-mandoc: args.in:7:5: ERROR: skipping all arguments: br arg1 arg2 arg3
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:8:5: ERROR: skipping all arguments: br arg1 arg2 arg3
diff --git a/regress/roff/cc/basic.in b/regress/roff/cc/basic.in
index ffd1c211..3adc3530 100644
--- a/regress/roff/cc/basic.in
+++ b/regress/roff/cc/basic.in
@@ -1,4 +1,5 @@
-.TH CC-BASIC 1 "July 7, 2012" OpenBSD
+.\" $OpenBSD: basic.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.TH CC-BASIC 1 "July 7, 2012"
.SH NAME
cc-basic \- basic usage of the cc request
.SH DESCRIPTION
diff --git a/regress/roff/cc/basic.out_lint b/regress/roff/cc/basic.out_lint
index cc46cd95..a681fda2 100644
--- a/regress/roff/cc/basic.out_lint
+++ b/regress/roff/cc/basic.out_lint
@@ -1,2 +1 @@
-mandoc: basic.in:12:6: ERROR: skipping excess arguments: cc ... bogus
-mandoc: basic.in: BASE: RCS id missing: (OpenBSD)
+mandoc: basic.in:13:6: ERROR: skipping excess arguments: cc ... bogus
diff --git a/regress/roff/cond/before-Dd.in b/regress/roff/cond/before-Dd.in
index 6701403b..c3cde469 100644
--- a/regress/roff/cond/before-Dd.in
+++ b/regress/roff/cond/before-Dd.in
@@ -1,8 +1,9 @@
+.\" $OpenBSD: before-Dd.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
.if n \{.ds mystring mytext
.\}
-.Dd May 27, 2012
+.Dd $Mdocdate$
.Dt IF-BEFORE-DD 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm if-before-Dd
.Nd end of if block on its own line before Dd
diff --git a/regress/roff/cond/before-Dd.out_ascii b/regress/roff/cond/before-Dd.out_ascii
index 373e920f..de6410e1 100644
--- a/regress/roff/cond/before-Dd.out_ascii
+++ b/regress/roff/cond/before-Dd.out_ascii
@@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
mytext
-OpenBSD May 27, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/cond/close.in b/regress/roff/cond/close.in
index 7fa91423..6bdf3781 100644
--- a/regress/roff/cond/close.in
+++ b/regress/roff/cond/close.in
@@ -1,4 +1,5 @@
-.TH COND-CLOSE 1 2013-06-27 OpenBSD
+.\" $OpenBSD: close.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.TH COND-CLOSE 1 2013-06-27
.SH NAME
cond-close \- closing conditional macros
.SH DESCRIPTION
diff --git a/regress/roff/cond/close.out_lint b/regress/roff/cond/close.out_lint
index a0954774..4387b057 100644
--- a/regress/roff/cond/close.out_lint
+++ b/regress/roff/cond/close.out_lint
@@ -1,3 +1,2 @@
-mandoc: close.in:14:2: ERROR: appending missing end of block: if
-mandoc: close.in:14:9: WARNING: skipping paragraph macro: sp after PP
-mandoc: close.in: BASE: RCS id missing: (OpenBSD)
+mandoc: close.in:15:2: ERROR: appending missing end of block: if
+mandoc: close.in:15:9: WARNING: skipping paragraph macro: sp after PP
diff --git a/regress/roff/cond/ie.in b/regress/roff/cond/ie.in
index f9ab8bc0..bb76765d 100644
--- a/regress/roff/cond/ie.in
+++ b/regress/roff/cond/ie.in
@@ -1,4 +1,5 @@
-.TH IE 1 "December 16, 2014" OpenBSD
+.\" $OpenBSD: ie.in,v 1.5 2017/07/04 14:53:26 schwarze Exp $
+.TH IE 1 "December 16, 2014"
.SH NAME
if \- the roff conditional instruction with else-clause
.SH DESCRIPTION
diff --git a/regress/roff/cond/if.in b/regress/roff/cond/if.in
index f243fbdf..3df3be78 100644
--- a/regress/roff/cond/if.in
+++ b/regress/roff/cond/if.in
@@ -1,4 +1,5 @@
-.TH IF 1 "June 27, 2015" OpenBSD
+.\" $OpenBSD: if.in,v 1.8 2017/07/04 14:53:26 schwarze Exp $
+.TH IF 1 "June 27, 2015"
.SH NAME
if \- the roff conditional instruction
.SH DESCRIPTION
diff --git a/regress/roff/cond/if.out_lint b/regress/roff/cond/if.out_lint
index e0934187..5fb37795 100644
--- a/regress/roff/cond/if.out_lint
+++ b/regress/roff/cond/if.out_lint
@@ -1,3 +1,2 @@
-mandoc: if.in:14:2: WARNING: conditional request controls empty scope: if
-mandoc: if.in:16:2: WARNING: conditional request controls empty scope: if
-mandoc: if.in: BASE: RCS id missing: (OpenBSD)
+mandoc: if.in:15:2: WARNING: conditional request controls empty scope: if
+mandoc: if.in:17:2: WARNING: conditional request controls empty scope: if
diff --git a/regress/roff/cond/numeric.in b/regress/roff/cond/numeric.in
index e96f3087..d29660b9 100644
--- a/regress/roff/cond/numeric.in
+++ b/regress/roff/cond/numeric.in
@@ -1,4 +1,5 @@
-.TH COND-NUMERIC 1 "December 16, 2014" OpenBSD
+.\" $OpenBSD: numeric.in,v 1.5 2017/07/04 14:53:26 schwarze Exp $
+.TH COND-NUMERIC 1 "December 16, 2014"
.SH NAME
cond-numeric \- roff conditions involving numbers
.SH DESCRIPTION
diff --git a/regress/roff/cond/register.in b/regress/roff/cond/register.in
index d8c9629b..44c53a84 100644
--- a/regress/roff/cond/register.in
+++ b/regress/roff/cond/register.in
@@ -1,4 +1,5 @@
-.TH REGISTER 1 "May 31, 2015" OpenBSD
+.\" $OpenBSD: register.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.TH REGISTER 1 "May 31, 2015"
.SH NAME
register \- conditional testing whether a register is defined
.SH DESCRIPTION
diff --git a/regress/roff/cond/strcmp.in b/regress/roff/cond/strcmp.in
index eabe80ff..4888cfa3 100644
--- a/regress/roff/cond/strcmp.in
+++ b/regress/roff/cond/strcmp.in
@@ -1,4 +1,5 @@
-.TH COND-STRCMP 1 "March 8, 2014" OpenBSD
+.\" $OpenBSD: strcmp.in,v 1.2 2017/07/04 14:53:26 schwarze Exp $
+.TH COND-STRCMP 1 "March 8, 2014"
.SH NAME
cond-strcmp \- roff conditions involving string comparison
.SH DESCRIPTION
diff --git a/regress/roff/cond/string.in b/regress/roff/cond/string.in
index 4f27a492..b3bf14b4 100644
--- a/regress/roff/cond/string.in
+++ b/regress/roff/cond/string.in
@@ -1,4 +1,5 @@
-.TH STRING 1 "June 14, 2017" OpenBSD
+.\" $OpenBSD: string.in,v 1.3 2017/07/04 14:53:26 schwarze Exp $
+.TH STRING 1 "June 14, 2017"
.SH NAME
string \- conditional testing whether a string is defined
.SH DESCRIPTION
diff --git a/regress/roff/de/Dd.in b/regress/roff/de/Dd.in
index 4dcbdd2b..20b8e9f9 100644
--- a/regress/roff/de/Dd.in
+++ b/regress/roff/de/Dd.in
@@ -1,9 +1,10 @@
+.\" $OpenBSD$
.de At
BSD
..
-.Dd June 3, 2012
+.Dd $Mdocdate$
.Dt DE-DD 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm de-Dd
.Nd interaction of the Dd macro with de requests
diff --git a/regress/roff/de/Dd.out_ascii b/regress/roff/de/Dd.out_ascii
index 1b04eea9..66b577a6 100644
--- a/regress/roff/de/Dd.out_ascii
+++ b/regress/roff/de/Dd.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
AT&T UNIX
-OpenBSD June 3, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/de/Makefile b/regress/roff/de/Makefile
index 43bcf00f..0d024a23 100644
--- a/regress/roff/de/Makefile
+++ b/regress/roff/de/Makefile
@@ -31,10 +31,10 @@ ascii-diff-opt: TH.mandoc_ascii_opt Dd.mandoc_ascii_opt
@${DIFF} ${.CURDIR}/Dd.out_ascii_opt Dd.mandoc_ascii_opt
TH.mandoc_ascii_opt: TH.in
- @${MANDOC} -Tascii -man ${.ALLSRC} > ${.TARGET}
+ @${MANDOC} -Ios=OpenBSD -Tascii -man ${.ALLSRC} > ${.TARGET}
Dd.mandoc_ascii_opt: Dd.in
- @${MANDOC} -Tascii -mdoc ${.ALLSRC} > ${.TARGET}
+ @${MANDOC} -Ios=OpenBSD -Tascii -mdoc ${.ALLSRC} > ${.TARGET}
ascii-clean-opt:
@rm -f TH.mandoc_ascii_opt Dd.mandoc_ascii_opt
diff --git a/regress/roff/de/TH.in b/regress/roff/de/TH.in
index 50b6401f..5657b884 100644
--- a/regress/roff/de/TH.in
+++ b/regress/roff/de/TH.in
@@ -1,7 +1,8 @@
+.\" $OpenBSD: TH.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
.de BI
.IB \\$1 \\$2 \\$3
..
-.TH DE-TH 1 "June 3, 2012" OpenBSD
+.TH DE-TH 1 "June 3, 2012"
.SH NAME
de-TH - interaction of the TH macro with de requests
.SH DESCRIPTION
diff --git a/regress/roff/de/append.in b/regress/roff/de/append.in
index 9e76f6d0..426b4e38 100644
--- a/regress/roff/de/append.in
+++ b/regress/roff/de/append.in
@@ -1,6 +1,7 @@
-.Dd June 18, 2017
+.\" $OpenBSD: append.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt DE-APPEND 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm de-append
.Nd append to macro definitions
diff --git a/regress/roff/de/append.out_ascii b/regress/roff/de/append.out_ascii
index 6230f3b2..9c584dbc 100644
--- a/regress/roff/de/append.out_ascii
+++ b/regress/roff/de/append.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
append to standard macro: [in brackets] end (appended words)
-OpenBSD June 18, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/de/cond.in b/regress/roff/de/cond.in
index 057ad3a0..7f215392 100644
--- a/regress/roff/de/cond.in
+++ b/regress/roff/de/cond.in
@@ -1,6 +1,7 @@
-.Dd January 7, 2015
+.\" $OpenBSD: cond.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt DE-COND 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm de-cond
.Nd conditional execution of a user-defined macro
diff --git a/regress/roff/de/cond.out_ascii b/regress/roff/de/cond.out_ascii
index 2f946407..fd3f49fb 100644
--- a/regress/roff/de/cond.out_ascii
+++ b/regress/roff/de/cond.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
preceding text This is the text printed by the macro. following text
-OpenBSD January 7, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/de/escname.in b/regress/roff/de/escname.in
index da6d885f..8c346846 100644
--- a/regress/roff/de/escname.in
+++ b/regress/roff/de/escname.in
@@ -1,6 +1,7 @@
-.Dd June 29, 2014
+.\" $OpenBSD: escname.in,v 1.4 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt DE-ESCNAME 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm de-escname
.Nd escape sequences in macro names
diff --git a/regress/roff/de/escname.out_ascii b/regress/roff/de/escname.out_ascii
index 4f9a3a3d..367b5d0f 100644
--- a/regress/roff/de/escname.out_ascii
+++ b/regress/roff/de/escname.out_ascii
@@ -20,4 +20,4 @@ DDEESSCCRRIIPPTTIIOONN
final text
-OpenBSD June 29, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/de/escname.out_lint b/regress/roff/de/escname.out_lint
index 3ad59e77..a3f9396f 100644
--- a/regress/roff/de/escname.out_lint
+++ b/regress/roff/de/escname.out_lint
@@ -1,11 +1,8 @@
-mandoc: escname.in:21:2: ERROR: escaped character not allowed in a name: first\e
-mandoc: escname.in:31:19: ERROR: escaped character not allowed in a name: first\e
-mandoc: escname.in:32:2: ERROR: skipping unknown macro: .first
-mandoc: escname.in:34:2: ERROR: skipping unknown macro: .first\\second
-mandoc: escname.in:37:5: ERROR: skipping excess arguments: .de ... excess arguments
-mandoc: escname.in:40:1: ERROR: escaped character not allowed in a name: witharg\(
-mandoc: escname.in:42:1: ERROR: escaped character not allowed in a name: de\e
-mandoc: escname.in:42:2: WARNING: skipping empty request: de
-mandoc: escname.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: escname.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: escname.in: BASE: RCS id missing: (OpenBSD)
+mandoc: escname.in:22:2: ERROR: escaped character not allowed in a name: first\e
+mandoc: escname.in:32:19: ERROR: escaped character not allowed in a name: first\e
+mandoc: escname.in:33:2: ERROR: skipping unknown macro: .first
+mandoc: escname.in:35:2: ERROR: skipping unknown macro: .first\\second
+mandoc: escname.in:38:5: ERROR: skipping excess arguments: .de ... excess arguments
+mandoc: escname.in:41:1: ERROR: escaped character not allowed in a name: witharg\(
+mandoc: escname.in:43:1: ERROR: escaped character not allowed in a name: de\e
+mandoc: escname.in:43:2: WARNING: skipping empty request: de
diff --git a/regress/roff/de/factorial.in b/regress/roff/de/factorial.in
index 8d83714b..48c2e9a8 100644
--- a/regress/roff/de/factorial.in
+++ b/regress/roff/de/factorial.in
@@ -1,6 +1,7 @@
-.Dd December 30, 2014
+.\" $OpenBSD: factorial.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt FACTORIAL 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm factorial
.Nd factorial sequence
diff --git a/regress/roff/de/factorial.out_ascii b/regress/roff/de/factorial.out_ascii
index cdc019ed..e5423555 100644
--- a/regress/roff/de/factorial.out_ascii
+++ b/regress/roff/de/factorial.out_ascii
@@ -15,4 +15,4 @@ DDEESSCCRRIIPPTTIIOONN
1! = 1
0! = 1
-OpenBSD December 30, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/de/indir.in b/regress/roff/de/indir.in
index 13d10071..65b55e8b 100644
--- a/regress/roff/de/indir.in
+++ b/regress/roff/de/indir.in
@@ -1,6 +1,7 @@
-.Dd July 7, 2014
+.\" $OpenBSD: indir.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt DE-INDIR 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm de-indir
.Nd indirect macro definitions
diff --git a/regress/roff/de/indir.out_ascii b/regress/roff/de/indir.out_ascii
index 4cb592b1..71775d53 100644
--- a/regress/roff/de/indir.out_ascii
+++ b/regress/roff/de/indir.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
dei with undefined first argument: text3
dei without arguments: text4
-OpenBSD July 7, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/de/indir.out_lint b/regress/roff/de/indir.out_lint
index 7f1c7f85..859b1104 100644
--- a/regress/roff/de/indir.out_lint
+++ b/regress/roff/de/indir.out_lint
@@ -1,7 +1,4 @@
-mandoc: indir.in:18:11: WARNING: undefined string, using "": myie
-mandoc: indir.in:25:6: WARNING: undefined string, using "": myim
-mandoc: indir.in:25:2: WARNING: skipping empty request: dei
-mandoc: indir.in:29:2: WARNING: skipping empty request: dei
-mandoc: indir.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: indir.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: indir.in: BASE: RCS id missing: (OpenBSD)
+mandoc: indir.in:19:11: WARNING: undefined string, using "": myie
+mandoc: indir.in:26:6: WARNING: undefined string, using "": myim
+mandoc: indir.in:26:2: WARNING: skipping empty request: dei
+mandoc: indir.in:30:2: WARNING: skipping empty request: dei
diff --git a/regress/roff/de/infinite.in b/regress/roff/de/infinite.in
index b6dac1f7..62f66965 100644
--- a/regress/roff/de/infinite.in
+++ b/regress/roff/de/infinite.in
@@ -1,6 +1,7 @@
-.Dd March 7, 2017
+.\" $OpenBSD: infinite.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt DE-INFINITE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm de-infinite
.Nd inifinte recursion in a user-defined macro
diff --git a/regress/roff/de/infinite.out_ascii b/regress/roff/de/infinite.out_ascii
index 17070a20..452af775 100644
--- a/regress/roff/de/infinite.out_ascii
+++ b/regress/roff/de/infinite.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
initial text [$1 $1] middle text final text
-OpenBSD March 7, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/de/infinite.out_lint b/regress/roff/de/infinite.out_lint
index a125e333..e7beb090 100644
--- a/regress/roff/de/infinite.out_lint
+++ b/regress/roff/de/infinite.out_lint
@@ -1,5 +1,2 @@
-mandoc: infinite.in:13:5: ERROR: input stack limit exceeded, infinite loop?
-mandoc: infinite.in:19:5: ERROR: input stack limit exceeded, infinite loop?
-mandoc: infinite.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: infinite.in:1:5: BASE: Mdocdate missing: Dd March (OpenBSD)
-mandoc: infinite.in: BASE: RCS id missing: (OpenBSD)
+mandoc: infinite.in:14:5: ERROR: input stack limit exceeded, infinite loop?
+mandoc: infinite.in:20:5: ERROR: input stack limit exceeded, infinite loop?
diff --git a/regress/roff/de/startde.in b/regress/roff/de/startde.in
index ca9cfac1..f543239b 100644
--- a/regress/roff/de/startde.in
+++ b/regress/roff/de/startde.in
@@ -1,6 +1,7 @@
-.Dd December 30, 2014
+.\" $OpenBSD: startde.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt DE-STARTDE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm de-startde
.Nd macro starting a macro definition, but not ending it
diff --git a/regress/roff/de/startde.out_ascii b/regress/roff/de/startde.out_ascii
index 05b58e8c..2f6a0819 100644
--- a/regress/roff/de/startde.out_ascii
+++ b/regress/roff/de/startde.out_ascii
@@ -12,4 +12,4 @@ DDEESSCCRRIIPPTTIIOONN
call inner macro: inner macro called; end outer scope. returned from
call of outer macro; end inner scope. returned from call of inner macro.
-OpenBSD December 30, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/ds/append.in b/regress/roff/ds/append.in
index 6efa46ba..51bb86d9 100644
--- a/regress/roff/ds/append.in
+++ b/regress/roff/ds/append.in
@@ -1,6 +1,7 @@
-.Dd February 4, 2014
+.\" $OpenBSD: append.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt DS-APPEND 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm ds-append
.Nd appending to user-defined strings
diff --git a/regress/roff/ds/append.out_ascii b/regress/roff/ds/append.out_ascii
index 47c68aa3..cdb934c8 100644
--- a/regress/roff/ds/append.out_ascii
+++ b/regress/roff/ds/append.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
with third part: first part second part third part
end of test document
-OpenBSD February 4, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/ds/escname.in b/regress/roff/ds/escname.in
index 6394144b..b5ebee42 100644
--- a/regress/roff/ds/escname.in
+++ b/regress/roff/ds/escname.in
@@ -1,6 +1,7 @@
-.Dd June 29, 2014
+.\" $OpenBSD: escname.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt DS-ESCNAME 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm ds-escname
.Nd escape sequences in string names
diff --git a/regress/roff/ds/escname.out_ascii b/regress/roff/ds/escname.out_ascii
index 3648b19b..56cc686e 100644
--- a/regress/roff/ds/escname.out_ascii
+++ b/regress/roff/ds/escname.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
Now \*[esc] is `'.
-OpenBSD June 29, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/ds/nested.in b/regress/roff/ds/nested.in
index a213b157..c85d0531 100644
--- a/regress/roff/ds/nested.in
+++ b/regress/roff/ds/nested.in
@@ -1,6 +1,7 @@
-.Dd April 7, 2010
+.\" $OpenBSD: nested.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt DS-NESTED 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm ds-nested
.Nd nested string expansion
diff --git a/regress/roff/ds/nested.out_ascii b/regress/roff/ds/nested.out_ascii
index 50d51619..b0a453cc 100644
--- a/regress/roff/ds/nested.out_ascii
+++ b/regress/roff/ds/nested.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
This is surprising. This is surprising.
-OpenBSD April 7, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/ds/quoting.in b/regress/roff/ds/quoting.in
index 3e794d09..9a774f01 100644
--- a/regress/roff/ds/quoting.in
+++ b/regress/roff/ds/quoting.in
@@ -1,6 +1,7 @@
-.Dd August 3, 2010
+.\" $OpenBSD: quoting.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt DS-QUOTING 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm ds-quoting
.Nd quote handling by the define string request
diff --git a/regress/roff/ds/quoting.out_ascii b/regress/roff/ds/quoting.out_ascii
index 636743db..e7cb21e0 100644
--- a/regress/roff/ds/quoting.out_ascii
+++ b/regress/roff/ds/quoting.out_ascii
@@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
empty string: xx
end of test document
-OpenBSD August 3, 2010 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/B.in b/regress/roff/esc/B.in
index 97ac39c5..15a69cde 100644
--- a/regress/roff/esc/B.in
+++ b/regress/roff/esc/B.in
@@ -1,6 +1,7 @@
-.Dd July 6, 2014
+.\" $OpenBSD: B.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-B 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-B
.Nd the roff escape B sequence: validate numerical expression
diff --git a/regress/roff/esc/B.out_ascii b/regress/roff/esc/B.out_ascii
index c84490a2..805b0641 100644
--- a/regress/roff/esc/B.out_ascii
+++ b/regress/roff/esc/B.out_ascii
@@ -20,4 +20,4 @@ DDEESSCCRRIIPPTTIIOONN
other delimiter: 1
no closing delimiter: 0
-OpenBSD July 6, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/B.out_lint b/regress/roff/esc/B.out_lint
index 62deca18..f52270a4 100644
--- a/regress/roff/esc/B.out_lint
+++ b/regress/roff/esc/B.out_lint
@@ -1,4 +1 @@
-mandoc: B.in:36:23: WARNING: invalid escape sequence: \B'1+1
-mandoc: B.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: B.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: B.in: BASE: RCS id missing: (OpenBSD)
+mandoc: B.in:37:23: WARNING: invalid escape sequence: \B'1+1
diff --git a/regress/roff/esc/c.in b/regress/roff/esc/c.in
index b7b47bc1..cda05bd6 100644
--- a/regress/roff/esc/c.in
+++ b/regress/roff/esc/c.in
@@ -1,6 +1,7 @@
-.Dd December 2, 2014
+.\" $OpenBSD: c.in,v 1.4 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-C 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-c
.Nd the roff escape c sequence: remove trailing space
diff --git a/regress/roff/esc/c.out_ascii b/regress/roff/esc/c.out_ascii
index 9f8570c4..f6536dbd 100644
--- a/regress/roff/esc/c.out_ascii
+++ b/regress/roff/esc/c.out_ascii
@@ -12,4 +12,4 @@ DDEESSCCRRIIPPTTIIOONN
one
word
-OpenBSD December 2, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/c_man.in b/regress/roff/esc/c_man.in
index 09e1ed3b..c530a472 100644
--- a/regress/roff/esc/c_man.in
+++ b/regress/roff/esc/c_man.in
@@ -1,4 +1,5 @@
-.TH ESC-C_MAN 1 "December 2, 2014" OpenBSD
+.\" $OpenBSD: c_man.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH ESC-C_MAN 1 "December 2, 2014"
.SH NAME
esc-c_man \- the roff escape c sequence: remove trailing space
.SH DESCRIPTION
diff --git a/regress/roff/esc/e.in b/regress/roff/esc/e.in
index c0f87692..030881f2 100644
--- a/regress/roff/esc/e.in
+++ b/regress/roff/esc/e.in
@@ -1,6 +1,7 @@
-.Dd December 3, 2014
+.\" $OpenBSD: e.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-E 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-e
.Nd escaping backslashes
diff --git a/regress/roff/esc/e.out_ascii b/regress/roff/esc/e.out_ascii
index 75665168..04d9c851 100644
--- a/regress/roff/esc/e.out_ascii
+++ b/regress/roff/esc/e.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
In a macro definition: "\$1" and "two"
-OpenBSD December 3, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/f.in b/regress/roff/esc/f.in
index a909ac8a..7d8f9ec0 100644
--- a/regress/roff/esc/f.in
+++ b/regress/roff/esc/f.in
@@ -1,6 +1,7 @@
-.Dd August 7, 2013
+.\" $OpenBSD: f.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-F 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-f
.Nd the roff escape f sequence: font changes
diff --git a/regress/roff/esc/f.out_ascii b/regress/roff/esc/f.out_ascii
index 5ecd6993..fb8520f8 100644
--- a/regress/roff/esc/f.out_ascii
+++ b/regress/roff/esc/f.out_ascii
@@ -8,4 +8,4 @@ DDEESSCCRRIIPPTTIIOONN
letters: bboolldd_i_t_a_l_i_cbbaacckk_bb_oo_ll_dd_ii_tt_aa_ll_ii_ccroman
multiletter: bboolldd_i_t_a_l_i_cbbaacckk_bb_oo_ll_dd_ii_tt_aa_ll_ii_ccroman
-OpenBSD August 7, 2013 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/h.in b/regress/roff/esc/h.in
index 8fa23e7b..23c850f4 100644
--- a/regress/roff/esc/h.in
+++ b/regress/roff/esc/h.in
@@ -1,6 +1,7 @@
-.Dd May 28, 2012
+.\" $OpenBSD: h.in,v 1.6 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-H 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-h
.Nd the roff escape h sequence: horizontal movement
diff --git a/regress/roff/esc/h.out_ascii b/regress/roff/esc/h.out_ascii
index ddfac195..e232670b 100644
--- a/regress/roff/esc/h.out_ascii
+++ b/regress/roff/esc/h.out_ascii
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
escape in the middle: ><
invalid delimiter: ><
-OpenBSD May 28, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/h.out_lint b/regress/roff/esc/h.out_lint
index 7eb4ea9d..b32ea2d2 100644
--- a/regress/roff/esc/h.out_lint
+++ b/regress/roff/esc/h.out_lint
@@ -1,4 +1 @@
-mandoc: h.in:22:21: WARNING: invalid escape sequence: \h-
-mandoc: h.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: h.in:1:5: BASE: Mdocdate missing: Dd May (OpenBSD)
-mandoc: h.in: BASE: RCS id missing: (OpenBSD)
+mandoc: h.in:23:21: WARNING: invalid escape sequence: \h-
diff --git a/regress/roff/esc/ignore.in b/regress/roff/esc/ignore.in
index 4be7fb6c..6ba7cccc 100644
--- a/regress/roff/esc/ignore.in
+++ b/regress/roff/esc/ignore.in
@@ -1,6 +1,7 @@
-.Dd January 1, 2015
+.\" $OpenBSD: ignore.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-IGNORE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-ignore
.Nd ignored roff escape sequences
diff --git a/regress/roff/esc/ignore.out_ascii b/regress/roff/esc/ignore.out_ascii
index 5e41d49a..fa16f389 100644
--- a/regress/roff/esc/ignore.out_ascii
+++ b/regress/roff/esc/ignore.out_ascii
@@ -9,4 +9,4 @@ DDEESSCCRRIIPPTTIIOONN
sizes: abcdef
signed sizes: abcdef
-OpenBSD January 1, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/ignore.out_lint b/regress/roff/esc/ignore.out_lint
index 294b2e86..95eba933 100644
--- a/regress/roff/esc/ignore.out_lint
+++ b/regress/roff/esc/ignore.out_lint
@@ -1,4 +1 @@
-mandoc: ignore.in:14:60: WARNING: invalid escape sequence: \s-
-mandoc: ignore.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: ignore.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: ignore.in: BASE: RCS id missing: (OpenBSD)
+mandoc: ignore.in:15:60: WARNING: invalid escape sequence: \s-
diff --git a/regress/roff/esc/l.in b/regress/roff/esc/l.in
index 59b9b5cf..59bb4e32 100644
--- a/regress/roff/esc/l.in
+++ b/regress/roff/esc/l.in
@@ -1,6 +1,7 @@
-.Dd June 14, 2017
+.\" $OpenBSD: l.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-L 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-l
.Nd the roff escape l sequence: horizontal line
diff --git a/regress/roff/esc/l.out_ascii b/regress/roff/esc/l.out_ascii
index f8ab5d19..fa052d22 100644
--- a/regress/roff/esc/l.out_ascii
+++ b/regress/roff/esc/l.out_ascii
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
rounding: >xxx<
invalid delimiter: ><
-OpenBSD June 14, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/l.out_lint b/regress/roff/esc/l.out_lint
index 39491db3..00a8eaf2 100644
--- a/regress/roff/esc/l.out_lint
+++ b/regress/roff/esc/l.out_lint
@@ -1,4 +1 @@
-mandoc: l.in:22:21: WARNING: invalid escape sequence: \h-
-mandoc: l.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: l.in:1:5: BASE: Mdocdate missing: Dd June (OpenBSD)
-mandoc: l.in: BASE: RCS id missing: (OpenBSD)
+mandoc: l.in:23:21: WARNING: invalid escape sequence: \h-
diff --git a/regress/roff/esc/multi.in b/regress/roff/esc/multi.in
index a2a76db1..798caedf 100644
--- a/regress/roff/esc/multi.in
+++ b/regress/roff/esc/multi.in
@@ -1,6 +1,7 @@
-.Dd May 28, 2012
+.\" $OpenBSD: multi.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-MULTI 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-multi
.Nd roff multi-character escape sequences
diff --git a/regress/roff/esc/multi.out_ascii b/regress/roff/esc/multi.out_ascii
index a7b64602..e88e140b 100644
--- a/regress/roff/esc/multi.out_ascii
+++ b/regress/roff/esc/multi.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
~ +- x -:- 1/2 1/4 3/4
~ +- x -:- 1/2 1/4 3/4
-OpenBSD May 28, 2012 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/o.in b/regress/roff/esc/o.in
index 2976a9d8..99774927 100644
--- a/regress/roff/esc/o.in
+++ b/regress/roff/esc/o.in
@@ -1,6 +1,7 @@
-.Dd January 21, 2015
+.\" $OpenBSD: o.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-O 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-o
.Nd the roff escape o sequence: overstrike
diff --git a/regress/roff/esc/o.out_ascii b/regress/roff/esc/o.out_ascii
index 39dc1b1c..a8c4e0b1 100644
--- a/regress/roff/esc/o.out_ascii
+++ b/regress/roff/esc/o.out_ascii
@@ -11,4 +11,4 @@ DDEESSCCRRIIPPTTIIOONN
wide/narrow/narrow: xO-|x
narrow/narrow/wide: x|-Ox
-OpenBSD January 21, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/one.in b/regress/roff/esc/one.in
index 4d416d2a..910714d1 100644
--- a/regress/roff/esc/one.in
+++ b/regress/roff/esc/one.in
@@ -1,6 +1,7 @@
-.Dd October 27, 2014
+.\" $OpenBSD: one.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-ONE 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-one
.Nd roff one-character escape sequences
diff --git a/regress/roff/esc/one.out_ascii b/regress/roff/esc/one.out_ascii
index 1324e038..bc88dcf2 100644
--- a/regress/roff/esc/one.out_ascii
+++ b/regress/roff/esc/one.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
grave: >`<
normal character: >q<
-OpenBSD October 27, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/p.in b/regress/roff/esc/p.in
index b94ab13a..2352b8c6 100644
--- a/regress/roff/esc/p.in
+++ b/regress/roff/esc/p.in
@@ -1,6 +1,7 @@
-.Dd June 14, 2017
+.\" $OpenBSD: p.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-P 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-p
.Nd line break escape sequence
diff --git a/regress/roff/esc/p.out_ascii b/regress/roff/esc/p.out_ascii
index 488e2c61..94c7d8b4 100644
--- a/regress/roff/esc/p.out_ascii
+++ b/regress/roff/esc/p.out_ascii
@@ -16,4 +16,4 @@ DDEESSCCRRIIPPTTIIOONN
at eol: line one
line two
-OpenBSD June 14, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/two.in b/regress/roff/esc/two.in
index c6ac3eee..13c6298d 100644
--- a/regress/roff/esc/two.in
+++ b/regress/roff/esc/two.in
@@ -1,6 +1,7 @@
-.Dd October 28, 2014
+.\" $OpenBSD: two.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-TWO 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-two
.Nd roff two-character escape sequences
diff --git a/regress/roff/esc/two.out_ascii b/regress/roff/esc/two.out_ascii
index 238adffa..abef08e0 100644
--- a/regress/roff/esc/two.out_ascii
+++ b/regress/roff/esc/two.out_ascii
@@ -23,4 +23,4 @@ DDEESSCCRRIIPPTTIIOONN
greek letters: A B E Z H I K /\ M N O TT P T Y X IY _O a B y d e ,C n -0
i k >\ ,u v ,E o -n p -o ~t u |o x |u w -0 |o +p e s
-OpenBSD October 28, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/w.in b/regress/roff/esc/w.in
index 4a9e79f8..3012df34 100644
--- a/regress/roff/esc/w.in
+++ b/regress/roff/esc/w.in
@@ -1,6 +1,7 @@
-.Dd April 8, 2014
+.\" $OpenBSD: w.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-W 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-w
.Nd the roff escape w sequence: text width
diff --git a/regress/roff/esc/w.out_ascii b/regress/roff/esc/w.out_ascii
index 1d44a2e0..3b8650a1 100644
--- a/regress/roff/esc/w.out_ascii
+++ b/regress/roff/esc/w.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
text: 96
unterminated: 72
-OpenBSD April 8, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/esc/w.out_lint b/regress/roff/esc/w.out_lint
index b31dcdb2..d48495c2 100644
--- a/regress/roff/esc/w.out_lint
+++ b/regress/roff/esc/w.out_lint
@@ -1,4 +1 @@
-mandoc: w.in:16:15: WARNING: invalid escape sequence: \w'foo
-mandoc: w.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: w.in:1:5: BASE: Mdocdate missing: Dd April (OpenBSD)
-mandoc: w.in: BASE: RCS id missing: (OpenBSD)
+mandoc: w.in:17:15: WARNING: invalid escape sequence: \w'foo
diff --git a/regress/roff/esc/z.in b/regress/roff/esc/z.in
index 9d3ad1d5..8dd8822b 100644
--- a/regress/roff/esc/z.in
+++ b/regress/roff/esc/z.in
@@ -1,6 +1,7 @@
-.Dd April 29, 2015
+.\" $OpenBSD: z.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt ESC-Z 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm esc-z
.Nd the roff escape z sequence
diff --git a/regress/roff/esc/z.out_ascii b/regress/roff/esc/z.out_ascii
index 233a4aa5..da268176 100644
--- a/regress/roff/esc/z.out_ascii
+++ b/regress/roff/esc/z.out_ascii
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
single z near the end of the line: ><
double z: >x<
-OpenBSD April 29, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/ft/badargs-mdoc.in b/regress/roff/ft/badargs-mdoc.in
index 06f463b5..3f874baf 100644
--- a/regress/roff/ft/badargs-mdoc.in
+++ b/regress/roff/ft/badargs-mdoc.in
@@ -1,6 +1,7 @@
-.Dd May 5, 2017
+.\" $OpenBSD: badargs-mdoc.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt FT-BADARGS-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm ft-badargs-mdoc
.Nd font request with bad arguments
diff --git a/regress/roff/ft/badargs-mdoc.out_ascii b/regress/roff/ft/badargs-mdoc.out_ascii
index bd4eaa09..24f5bebd 100644
--- a/regress/roff/ft/badargs-mdoc.out_ascii
+++ b/regress/roff/ft/badargs-mdoc.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
default font bboolldd ssttiillll bboolldd _i_t_a_l_i_c bbaacckk ttoo bboolldd _b_a_c_k _t_o _i_t_a_l_i_c
-OpenBSD May 5, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/ft/badargs-mdoc.out_lint b/regress/roff/ft/badargs-mdoc.out_lint
index 2d159e5d..0bda8cf4 100644
--- a/regress/roff/ft/badargs-mdoc.out_lint
+++ b/regress/roff/ft/badargs-mdoc.out_lint
@@ -1,5 +1,2 @@
-mandoc: badargs-mdoc.in:13:7: ERROR: skipping excess arguments: ft ... bogus
-mandoc: badargs-mdoc.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badargs-mdoc.in:1:5: BASE: Mdocdate missing: Dd May (OpenBSD)
-mandoc: badargs-mdoc.in:11:2: WARNING: unknown font, skipping request: ft foo
-mandoc: badargs-mdoc.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badargs-mdoc.in:14:7: ERROR: skipping excess arguments: ft ... bogus
+mandoc: badargs-mdoc.in:12:2: WARNING: unknown font, skipping request: ft foo
diff --git a/regress/roff/ft/badargs.in b/regress/roff/ft/badargs.in
index 2cb01b20..82269609 100644
--- a/regress/roff/ft/badargs.in
+++ b/regress/roff/ft/badargs.in
@@ -1,4 +1,5 @@
-.TH "FT-BADARGS" 1 "July 5, 2014" OpenBSD
+.\" $OpenBSD: badargs.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH "FT-BADARGS" 1 "July 5, 2014"
.SH NAME
ft-badargs \(en font request with bad arguments
.SH DESCRIPTION
diff --git a/regress/roff/ft/badargs.out_lint b/regress/roff/ft/badargs.out_lint
index 7e5957c7..36c8c0bf 100644
--- a/regress/roff/ft/badargs.out_lint
+++ b/regress/roff/ft/badargs.out_lint
@@ -1,3 +1,2 @@
-mandoc: badargs.in:10:7: ERROR: skipping excess arguments: ft ... bogus
-mandoc: badargs.in:8:2: WARNING: unknown font, skipping request: ft foo
-mandoc: badargs.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badargs.in:11:7: ERROR: skipping excess arguments: ft ... bogus
+mandoc: badargs.in:9:2: WARNING: unknown font, skipping request: ft foo
diff --git a/regress/roff/ig/basic.in b/regress/roff/ig/basic.in
index 7e898832..086449e5 100644
--- a/regress/roff/ig/basic.in
+++ b/regress/roff/ig/basic.in
@@ -1,6 +1,7 @@
-.Dd July 7, 2014
+.\" $OpenBSD: basic.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt IG-BASIC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm ig-basic
.Nd ignored blocks
diff --git a/regress/roff/ig/basic.out_ascii b/regress/roff/ig/basic.out_ascii
index d100617a..c7e803bf 100644
--- a/regress/roff/ig/basic.out_ascii
+++ b/regress/roff/ig/basic.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
Here is a stray .. block ending, and then an .ig staying open until the
end of the file:
-OpenBSD July 7, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/ig/basic.out_lint b/regress/roff/ig/basic.out_lint
index 4c07ea8d..2d733a4d 100644
--- a/regress/roff/ig/basic.out_lint
+++ b/regress/roff/ig/basic.out_lint
@@ -1,6 +1,3 @@
-mandoc: basic.in:19:5: ERROR: skipping excess arguments: .ig ... excess
-mandoc: basic.in:24:2: ERROR: skipping end of block that is not open: ..
-mandoc: basic.in:26:2: ERROR: appending missing end of block: ig
-mandoc: basic.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: basic.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: basic.in: BASE: RCS id missing: (OpenBSD)
+mandoc: basic.in:20:5: ERROR: skipping excess arguments: .ig ... excess
+mandoc: basic.in:25:2: ERROR: skipping end of block that is not open: ..
+mandoc: basic.in:27:2: ERROR: appending missing end of block: ig
diff --git a/regress/roff/it/badarg.in b/regress/roff/it/badarg.in
index 78c2893c..52eef2a3 100644
--- a/regress/roff/it/badarg.in
+++ b/regress/roff/it/badarg.in
@@ -1,6 +1,7 @@
-.Dd July 30, 2014
+.\" $OpenBSD: badarg.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt IT-BADARG 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm it-badarg
.Nd input line traps without numeric arguments
diff --git a/regress/roff/it/badarg.out_ascii b/regress/roff/it/badarg.out_ascii
index d4d2bc63..cc27ed37 100644
--- a/regress/roff/it/badarg.out_ascii
+++ b/regress/roff/it/badarg.out_ascii
@@ -6,4 +6,4 @@ NNAAMMEE
DDEESSCCRRIIPPTTIIOONN
line 1 line 2 line 3 line 4 line 5
-OpenBSD July 30, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/it/badarg.out_lint b/regress/roff/it/badarg.out_lint
index 8543a818..ff485d1e 100644
--- a/regress/roff/it/badarg.out_lint
+++ b/regress/roff/it/badarg.out_lint
@@ -1,5 +1,2 @@
-mandoc: badarg.in:12:2: ERROR: skipping request without numeric argument: it mytrap
-mandoc: badarg.in:15:2: ERROR: skipping request without numeric argument: it
-mandoc: badarg.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: badarg.in:1:5: BASE: Mdocdate missing: Dd July (OpenBSD)
-mandoc: badarg.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badarg.in:13:2: ERROR: skipping request without numeric argument: it mytrap
+mandoc: badarg.in:16:2: ERROR: skipping request without numeric argument: it
diff --git a/regress/roff/it/double.in b/regress/roff/it/double.in
index d0a93e1e..299094b6 100644
--- a/regress/roff/it/double.in
+++ b/regress/roff/it/double.in
@@ -1,4 +1,5 @@
-.TH IT-DOUBLE 1 2013-07-13 OpenBSD
+.\" $OpenBSD: double.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH IT-DOUBLE 1 2013-07-13
.SH NAME
it-double \- double input line trap
.SH DESCRIPTION
diff --git a/regress/roff/it/text.in b/regress/roff/it/text.in
index b3384180..028a18f8 100644
--- a/regress/roff/it/text.in
+++ b/regress/roff/it/text.in
@@ -1,6 +1,7 @@
-.Dd February 17, 2015
+.\" $OpenBSD: text.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt IT-TEXT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm it-text
.Nd what an input line trap counts as text
diff --git a/regress/roff/it/text.out_ascii b/regress/roff/it/text.out_ascii
index bfc89842..76d1a76d 100644
--- a/regress/roff/it/text.out_ascii
+++ b/regress/roff/it/text.out_ascii
@@ -13,4 +13,4 @@ DDEESSCCRRIIPPTTIIOONN
first line after .Pp traptext second line after .Pp
-OpenBSD February 17, 2015 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/ll/basic.in b/regress/roff/ll/basic.in
index 9f03a517..f443d4db 100644
--- a/regress/roff/ll/basic.in
+++ b/regress/roff/ll/basic.in
@@ -1,6 +1,7 @@
-.Dd February 5, 2014
+.\" $OpenBSD: basic.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt LL-BASIC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm ll-basic
.Nd changing the line length
diff --git a/regress/roff/ll/basic.out_ascii b/regress/roff/ll/basic.out_ascii
index b5448e24..ab9826bb 100644
--- a/regress/roff/ll/basic.out_ascii
+++ b/regress/roff/ll/basic.out_ascii
@@ -20,4 +20,4 @@ DDEESSCCRRIIPPTTIIOONN
This is a longer text after switching to an invalid line length. In
ASCII mode, it is expected to break at column 78.
-OpenBSD February 5, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/na/args.in b/regress/roff/na/args.in
index 850c8dc7..a1f609bb 100644
--- a/regress/roff/na/args.in
+++ b/regress/roff/na/args.in
@@ -1,4 +1,5 @@
-.TH NA-ARGS 1 "January 17, 2011" OpenBSD
+.\" $OpenBSD: args.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH NA-ARGS 1 "January 17, 2011"
.SH NAME
na-args \- arguments to .na macros
.SH DESCRIPTION
diff --git a/regress/roff/nr/argc.in b/regress/roff/nr/argc.in
index bf204a70..4fa6b580 100644
--- a/regress/roff/nr/argc.in
+++ b/regress/roff/nr/argc.in
@@ -1,6 +1,7 @@
-.Dd December 15, 2013
+.\" $OpenBSD: argc.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt NR-ARGC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm nr-argc
.Nd varying number of arguments to the .nr macro
diff --git a/regress/roff/nr/argc.out_ascii b/regress/roff/nr/argc.out_ascii
index 80d3d0f1..c1e9acbd 100644
--- a/regress/roff/nr/argc.out_ascii
+++ b/regress/roff/nr/argc.out_ascii
@@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
four arguments: 2
-OpenBSD December 15, 2013 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/nr/divzero.in b/regress/roff/nr/divzero.in
index 8f776bf3..45012688 100644
--- a/regress/roff/nr/divzero.in
+++ b/regress/roff/nr/divzero.in
@@ -1,4 +1,5 @@
-.TH NR-DIVZERO 1 "December 18, 2014" OpenBSD
+.\" $OpenBSD: divzero.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH NR-DIVZERO 1 "December 18, 2014"
.SH NAME
nr-divzero \- division by zero in numerical expression
.SH DESCRIPTION
diff --git a/regress/roff/nr/divzero.out_lint b/regress/roff/nr/divzero.out_lint
index 08948ba9..f56d54b0 100644
--- a/regress/roff/nr/divzero.out_lint
+++ b/regress/roff/nr/divzero.out_lint
@@ -1,3 +1,2 @@
-mandoc: divzero.in:6:4: ERROR: divide by zero: 1/0
-mandoc: divzero.in:7:4: ERROR: divide by zero: 1%0
-mandoc: divzero.in: BASE: RCS id missing: (OpenBSD)
+mandoc: divzero.in:7:4: ERROR: divide by zero: 1/0
+mandoc: divzero.in:8:4: ERROR: divide by zero: 1%0
diff --git a/regress/roff/nr/escname.in b/regress/roff/nr/escname.in
index 20454568..f81627e1 100644
--- a/regress/roff/nr/escname.in
+++ b/regress/roff/nr/escname.in
@@ -1,4 +1,5 @@
-.TH NR-ESCNAME 1 "June 29, 2014" OpenBSD
+.\" $OpenBSD: escname.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH NR-ESCNAME 1 "June 29, 2014"
.SH NAME
nr-escname \- escape sequences in register names
.SH DESCRIPTION
diff --git a/regress/roff/nr/escname.out_lint b/regress/roff/nr/escname.out_lint
index 4153d8b4..00c1b5b2 100644
--- a/regress/roff/nr/escname.out_lint
+++ b/regress/roff/nr/escname.out_lint
@@ -1,5 +1,4 @@
-mandoc: escname.in:8:5: ERROR: escaped character not allowed in a name: first\e
-mandoc: escname.in:11:5: ERROR: escaped character not allowed in a name: first\e
-mandoc: escname.in:17:13: WARNING: invalid escape sequence: \n[second
-mandoc: escname.in:17:12: WARNING: whitespace at end of input line
-mandoc: escname.in: BASE: RCS id missing: (OpenBSD)
+mandoc: escname.in:9:5: ERROR: escaped character not allowed in a name: first\e
+mandoc: escname.in:12:5: ERROR: escaped character not allowed in a name: first\e
+mandoc: escname.in:18:13: WARNING: invalid escape sequence: \n[second
+mandoc: escname.in:18:12: WARNING: whitespace at end of input line
diff --git a/regress/roff/nr/eval.in b/regress/roff/nr/eval.in
index 16bf24e3..d8bc3ae8 100644
--- a/regress/roff/nr/eval.in
+++ b/regress/roff/nr/eval.in
@@ -1,4 +1,5 @@
-.TH NR-EVAL 1 "April 7, 2014" OpenBSD
+.\" $OpenBSD: eval.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH NR-EVAL 1 "April 7, 2014"
.SH NAME
nr-eval \- numeric expressions in assignments to number registers
.SH DESCRIPTION
diff --git a/regress/roff/nr/int.in b/regress/roff/nr/int.in
index 3f907697..27f187b3 100644
--- a/regress/roff/nr/int.in
+++ b/regress/roff/nr/int.in
@@ -1,4 +1,5 @@
-.TH NR-INT 1 "October 3, 2013" OpenBSD
+.\" $OpenBSD: int.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH NR-INT 1 "October 3, 2013"
.SH NAME
nr-int \- integer number registers
.SH DESCRIPTION
diff --git a/regress/roff/nr/predef.in b/regress/roff/nr/predef.in
index 3610340d..480a052e 100644
--- a/regress/roff/nr/predef.in
+++ b/regress/roff/nr/predef.in
@@ -1,4 +1,5 @@
-.TH NR-PREDEF 1 "August 29, 2015" OpenBSD
+.\" $OpenBSD: predef.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH NR-PREDEF 1 "August 29, 2015"
.SH NAME
nr-predef \- pre-defined read-only integer number registers
.SH DESCRIPTION
diff --git a/regress/roff/nr/rr.in b/regress/roff/nr/rr.in
index 06ccdf64..6b888f12 100644
--- a/regress/roff/nr/rr.in
+++ b/regress/roff/nr/rr.in
@@ -1,4 +1,5 @@
-.TH NR-RR 1 "April 5, 2014" OpenBSD
+.\" $OpenBSD: rr.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH NR-RR 1 "April 5, 2014"
.SH NAME
nr-rr \- defining and undefining number registers
.SH DESCRIPTION
diff --git a/regress/roff/nr/scale.in b/regress/roff/nr/scale.in
index 6f63c589..7793a585 100644
--- a/regress/roff/nr/scale.in
+++ b/regress/roff/nr/scale.in
@@ -1,4 +1,5 @@
-.TH NR-INT 1 "January 23, 2015" OpenBSD
+.\" $OpenBSD: scale.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH NR-INT 1 "January 23, 2015"
.SH NAME
nr-scale \- scaling units in numeric expressions
.SH DESCRIPTION
diff --git a/regress/roff/po/basic-mdoc.in b/regress/roff/po/basic-mdoc.in
index 082be68c..e445a9f5 100644
--- a/regress/roff/po/basic-mdoc.in
+++ b/regress/roff/po/basic-mdoc.in
@@ -1,6 +1,7 @@
-.Dd June 14, 2017
+.\" $OpenBSD: basic-mdoc.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt PO-BASIC-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm po-basic-mdoc
.Nd the roff page offset request
diff --git a/regress/roff/po/basic-mdoc.out_ascii b/regress/roff/po/basic-mdoc.out_ascii
index 0b35c2bd..c07bfd9d 100644
--- a/regress/roff/po/basic-mdoc.out_ascii
+++ b/regress/roff/po/basic-mdoc.out_ascii
@@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
final text
-OpenBSD June 14, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/ps/ignore.in b/regress/roff/ps/ignore.in
index 439afda5..1c19a8d8 100644
--- a/regress/roff/ps/ignore.in
+++ b/regress/roff/ps/ignore.in
@@ -1,4 +1,5 @@
-.TH PS-IGNORE 1 "Febuary 5, 2011" OpenBSD
+.\" $OpenBSD: ignore.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH PS-IGNORE 1 "Febuary 5, 2011"
.SH NAME
ps-ignore \- ignoreing point size macros
.SH DESCRIPTION
diff --git a/regress/roff/rm/basic.in b/regress/roff/rm/basic.in
index 4e3e2650..e4335eba 100644
--- a/regress/roff/rm/basic.in
+++ b/regress/roff/rm/basic.in
@@ -1,6 +1,7 @@
-.Dd January 11, 2011
+.\" $OpenBSD: basic.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt RM-BASIC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm rm-basic
.Nd the remove macro request
diff --git a/regress/roff/rm/basic.out_ascii b/regress/roff/rm/basic.out_ascii
index 145b85d0..5fd82a7e 100644
--- a/regress/roff/rm/basic.out_ascii
+++ b/regress/roff/rm/basic.out_ascii
@@ -7,4 +7,4 @@ DDEESSCCRRIIPPTTIIOONN
before rm: Hello world!
after rm: !
-OpenBSD January 11, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/rn/append.in b/regress/roff/rn/append.in
index 5ae2cfb1..db346522 100644
--- a/regress/roff/rn/append.in
+++ b/regress/roff/rn/append.in
@@ -1,6 +1,7 @@
-.Dd June 18, 2017
+.\" $OpenBSD: append.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt RN-APPEND 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm rn-append
.Nd append to renamed standard macro
diff --git a/regress/roff/rn/append.out_ascii b/regress/roff/rn/append.out_ascii
index 99b61d79..42457d7a 100644
--- a/regress/roff/rn/append.out_ascii
+++ b/regress/roff/rn/append.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
appending to macro: [more in brackets] (appended words) final text
-OpenBSD June 18, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/scale/horiz.in b/regress/roff/scale/horiz.in
index edba2f75..11e6eef7 100644
--- a/regress/roff/scale/horiz.in
+++ b/regress/roff/scale/horiz.in
@@ -1,4 +1,5 @@
-.TH HORIZ 1 "December 23, 2014" OpenBSD
+.\" $OpenBSD: horiz.in,v 1.5 2017/07/04 14:53:27 schwarze Exp $
+.TH HORIZ 1 "December 23, 2014"
.SH NAME
horiz \- horizontal distances
.SH DESCRIPTION
diff --git a/regress/roff/sp/badargs-man.in b/regress/roff/sp/badargs-man.in
index 0a7eb075..643addea 100644
--- a/regress/roff/sp/badargs-man.in
+++ b/regress/roff/sp/badargs-man.in
@@ -1,4 +1,5 @@
-.TH SP-BADARGS-MAN 1 "December 23, 2014" OpenBSD
+.\" $OpenBSD: badargs-man.in,v 1.5 2017/07/04 14:53:27 schwarze Exp $
+.TH SP-BADARGS-MAN 1 "December 23, 2014"
.SH NAME
sp-badargs-man \- bad arguments to .sp macros in man(7)
.SH DESCRIPTION
diff --git a/regress/roff/sp/badargs-man.out_lint b/regress/roff/sp/badargs-man.out_lint
index c74addc5..70c7884c 100644
--- a/regress/roff/sp/badargs-man.out_lint
+++ b/regress/roff/sp/badargs-man.out_lint
@@ -1,2 +1 @@
-mandoc: badargs-man.in:10:8: ERROR: skipping excess arguments: sp ... 2i
-mandoc: badargs-man.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badargs-man.in:11:8: ERROR: skipping excess arguments: sp ... 2i
diff --git a/regress/roff/sp/badargs-mdoc.in b/regress/roff/sp/badargs-mdoc.in
index 684ee7e3..523e1fa6 100644
--- a/regress/roff/sp/badargs-mdoc.in
+++ b/regress/roff/sp/badargs-mdoc.in
@@ -1,6 +1,7 @@
-.Dd December 23, 2014
+.\" $OpenBSD: badargs-mdoc.in,v 1.5 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt SP-BADARGS-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm sp-badargs-mdoc
.Nd bad arguments to .sp macros in mdoc(7)
diff --git a/regress/roff/sp/badargs-mdoc.out_ascii b/regress/roff/sp/badargs-mdoc.out_ascii
index 3e1f87ed..400f1e68 100644
--- a/regress/roff/sp/badargs-mdoc.out_ascii
+++ b/regress/roff/sp/badargs-mdoc.out_ascii
@@ -22,4 +22,4 @@ DDEESSCCRRIIPPTTIIOONN
end of test document
-OpenBSD December 23, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/sp/negative.in b/regress/roff/sp/negative.in
index 10c6edc9..5dd9a6a6 100644
--- a/regress/roff/sp/negative.in
+++ b/regress/roff/sp/negative.in
@@ -1,4 +1,5 @@
-.TH SP-NEGATIVE 1 "July 12, 2012" OpenBSD
+.\" $OpenBSD: negative.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH SP-NEGATIVE 1 "July 12, 2012"
.SH NAME
sp-negative \- negative vertical spacing
.SH DESCRIPTION
diff --git a/regress/roff/sp/scaling-man.in b/regress/roff/sp/scaling-man.in
index 69318eca..0c7d3a77 100644
--- a/regress/roff/sp/scaling-man.in
+++ b/regress/roff/sp/scaling-man.in
@@ -1,4 +1,5 @@
-.TH SP-SCALING-MAN 1 "December 23, 2014" OpenBSD
+.\" $OpenBSD: scaling-man.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH SP-SCALING-MAN 1 "December 23, 2014"
.SH NAME
sp-scaling-man \- scaled arguments to .sp requests in man(7)
.SH DESCRIPTION
diff --git a/regress/roff/sp/scaling-mdoc.in b/regress/roff/sp/scaling-mdoc.in
index ff4d45c7..928f4399 100644
--- a/regress/roff/sp/scaling-mdoc.in
+++ b/regress/roff/sp/scaling-mdoc.in
@@ -1,6 +1,7 @@
-.Dd December 23, 2014
+.\" $OpenBSD: scaling-mdoc.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt SP-SCALING-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm sp-scaling-mdoc
.Nd scaled arguments to .sp requests in mdoc(7)
diff --git a/regress/roff/sp/scaling-mdoc.out_ascii b/regress/roff/sp/scaling-mdoc.out_ascii
index 625ba7c4..7223cb31 100644
--- a/regress/roff/sp/scaling-mdoc.out_ascii
+++ b/regress/roff/sp/scaling-mdoc.out_ascii
@@ -27,4 +27,4 @@ DDEESSCCRRIIPPTTIIOONN
end of test document
-OpenBSD December 23, 2014 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/string/escape.in b/regress/roff/string/escape.in
index 6f31ccb0..339611e8 100644
--- a/regress/roff/string/escape.in
+++ b/regress/roff/string/escape.in
@@ -1,4 +1,5 @@
-.TH STRING-ESCAPE 1 "December 3, 2010" OpenBSD
+.\" $OpenBSD: escape.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH STRING-ESCAPE 1 "December 3, 2010"
.SH NAME
string-escape - preventing string interpolation
.SH DESCRIPTION
diff --git a/regress/roff/string/infinite.in b/regress/roff/string/infinite.in
index e16c527d..c79b4bda 100644
--- a/regress/roff/string/infinite.in
+++ b/regress/roff/string/infinite.in
@@ -1,4 +1,5 @@
-.TH STRING-INFINITE 1 "December 3, 2010" OpenBSD
+.\" $OpenBSD: infinite.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH STRING-INFINITE 1 "December 3, 2010"
.SH NAME
string-infinite - endless recursion in string expansion
.SH DESCRIPTION
diff --git a/regress/roff/string/name.in b/regress/roff/string/name.in
index a2a524a4..8e872529 100644
--- a/regress/roff/string/name.in
+++ b/regress/roff/string/name.in
@@ -1,6 +1,7 @@
-.Dd January 10, 2011
+.\" $OpenBSD: name.in,v 1.4 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt STRING-NAME 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm string-name
.Nd torturing .ds with weird string names
diff --git a/regress/roff/string/name.out_ascii b/regress/roff/string/name.out_ascii
index 45ebba19..325e28aa 100644
--- a/regress/roff/string/name.out_ascii
+++ b/regress/roff/string/name.out_ascii
@@ -15,4 +15,4 @@ DDEESSCCRRIIPPTTIIOONN
ble:
bl:
-OpenBSD January 10, 2011 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/string/name.out_lint b/regress/roff/string/name.out_lint
index af4b9835..39260cde 100644
--- a/regress/roff/string/name.out_lint
+++ b/regress/roff/string/name.out_lint
@@ -1,20 +1,17 @@
-mandoc: name.in:10:5: ERROR: escaped character not allowed in a name: bs\e
-mandoc: name.in:12:5: ERROR: escaped character not allowed in a name: bl\
-mandoc: name.in:15:29: WARNING: invalid escape sequence: \*[norm
-mandoc: name.in:15:29: WARNING: undefined string, using "": norm
-mandoc: name.in:15:28: WARNING: whitespace at end of input line
-mandoc: name.in:17:7: WARNING: undefined string, using "": quot
-mandoc: name.in:17:6: WARNING: whitespace at end of input line
-mandoc: name.in:25:6: WARNING: undefined string, using "": bse
-mandoc: name.in:25:5: WARNING: whitespace at end of input line
-mandoc: name.in:27:5: WARNING: undefined string, using "": bs
-mandoc: name.in:27:4: WARNING: whitespace at end of input line
-mandoc: name.in:31:7: WARNING: undefined string, using "": bl e
-mandoc: name.in:31:6: WARNING: whitespace at end of input line
-mandoc: name.in:33:6: WARNING: undefined string, using "": ble
-mandoc: name.in:33:5: WARNING: whitespace at end of input line
-mandoc: name.in:35:5: WARNING: undefined string, using "": bl
-mandoc: name.in:35:4: WARNING: whitespace at end of input line
-mandoc: name.in:3:5: BASE: operating system explicitly specified: Os OpenBSD (OpenBSD)
-mandoc: name.in:1:5: BASE: Mdocdate missing: Dd January (OpenBSD)
-mandoc: name.in: BASE: RCS id missing: (OpenBSD)
+mandoc: name.in:11:5: ERROR: escaped character not allowed in a name: bs\e
+mandoc: name.in:13:5: ERROR: escaped character not allowed in a name: bl\
+mandoc: name.in:16:29: WARNING: invalid escape sequence: \*[norm
+mandoc: name.in:16:29: WARNING: undefined string, using "": norm
+mandoc: name.in:16:28: WARNING: whitespace at end of input line
+mandoc: name.in:18:7: WARNING: undefined string, using "": quot
+mandoc: name.in:18:6: WARNING: whitespace at end of input line
+mandoc: name.in:26:6: WARNING: undefined string, using "": bse
+mandoc: name.in:26:5: WARNING: whitespace at end of input line
+mandoc: name.in:28:5: WARNING: undefined string, using "": bs
+mandoc: name.in:28:4: WARNING: whitespace at end of input line
+mandoc: name.in:32:7: WARNING: undefined string, using "": bl e
+mandoc: name.in:32:6: WARNING: whitespace at end of input line
+mandoc: name.in:34:6: WARNING: undefined string, using "": ble
+mandoc: name.in:34:5: WARNING: whitespace at end of input line
+mandoc: name.in:36:5: WARNING: undefined string, using "": bl
+mandoc: name.in:36:4: WARNING: whitespace at end of input line
diff --git a/regress/roff/string/std.in b/regress/roff/string/std.in
index f460b101..0719b3c4 100644
--- a/regress/roff/string/std.in
+++ b/regress/roff/string/std.in
@@ -1,4 +1,5 @@
-.TH STRING-STD 1 "June 18, 2017" OpenBSD
+.\" $OpenBSD: std.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH STRING-STD 1 "June 18, 2017"
.SH NAME
string-std - expanding standard macros as strings
.SH DESCRIPTION
diff --git a/regress/roff/string/std.out_lint b/regress/roff/string/std.out_lint
index 3a746992..95a520ca 100644
--- a/regress/roff/string/std.out_lint
+++ b/regress/roff/string/std.out_lint
@@ -1,3 +1,2 @@
-mandoc: std.in:6:4: WARNING: undefined string, using "": DT
-mandoc: std.in:10:4: WARNING: undefined string, using "": myname
-mandoc: std.in: BASE: RCS id missing: (OpenBSD)
+mandoc: std.in:7:4: WARNING: undefined string, using "": DT
+mandoc: std.in:11:4: WARNING: undefined string, using "": myname
diff --git a/regress/roff/string/zerolength.in b/regress/roff/string/zerolength.in
index d0d3217d..4bab6df5 100644
--- a/regress/roff/string/zerolength.in
+++ b/regress/roff/string/zerolength.in
@@ -1,4 +1,5 @@
-.TH STRING-ZEROLENGTH 1 "December 19, 2010" OpenBSD
+.\" $OpenBSD: zerolength.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH STRING-ZEROLENGTH 1 "December 19, 2010"
.SH NAME
string-zerolength - handling of zero-length user-defined strings
.SH DESCRIPTION
diff --git a/regress/roff/ta/basic-man.in b/regress/roff/ta/basic-man.in
index db0644a7..dd6794ec 100644
--- a/regress/roff/ta/basic-man.in
+++ b/regress/roff/ta/basic-man.in
@@ -1,4 +1,5 @@
-.TH TA-BASIC-MAN 1 "May 7, 2014" OpenBSD
+.\" $OpenBSD: basic-man.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH TA-BASIC-MAN 1 "May 7, 2014"
.SH NAME
ta-basic-man \- setting tabstop positions in man(7)
.SH DESCRIPTION
diff --git a/regress/roff/ta/basic-mdoc.in b/regress/roff/ta/basic-mdoc.in
index 24c83bd4..4bc42061 100644
--- a/regress/roff/ta/basic-mdoc.in
+++ b/regress/roff/ta/basic-mdoc.in
@@ -1,6 +1,7 @@
-.Dd May 7, 2017
+.\" $OpenBSD: basic-mdoc.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt TA-BASIC-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm ta-basic-mdoc
.Nd setting tabstop positions in mdoc(7)
diff --git a/regress/roff/ta/basic-mdoc.out_ascii b/regress/roff/ta/basic-mdoc.out_ascii
index 83feb627..71d2b8bb 100644
--- a/regress/roff/ta/basic-mdoc.out_ascii
+++ b/regress/roff/ta/basic-mdoc.out_ascii
@@ -22,4 +22,4 @@ DDEESSCCRRIIPPTTIIOONN
default unit:
1 2 3 4
-OpenBSD May 7, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/ti/basic-man.in b/regress/roff/ti/basic-man.in
index d4f00a01..f5a251e0 100644
--- a/regress/roff/ti/basic-man.in
+++ b/regress/roff/ti/basic-man.in
@@ -1,4 +1,5 @@
-.TH TI-BASIC-MAN 1 "May 8, 2014" OpenBSD
+.\" $OpenBSD: basic-man.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH TI-BASIC-MAN 1 "May 8, 2014"
.SH NAME
ti-basic-man \- temporary indentation in man(7)
.SH DESCRIPTION
diff --git a/regress/roff/ti/basic-mdoc.in b/regress/roff/ti/basic-mdoc.in
index 0b165bc1..2389a5d7 100644
--- a/regress/roff/ti/basic-mdoc.in
+++ b/regress/roff/ti/basic-mdoc.in
@@ -1,6 +1,7 @@
-.Dd May 8, 2017
+.\" $OpenBSD: basic-mdoc.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt TI-BASIC-MDOC 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm ti-basic-mdoc
.Nd temporary indent in mdoc(7)
diff --git a/regress/roff/ti/basic-mdoc.out_ascii b/regress/roff/ti/basic-mdoc.out_ascii
index a115b02d..3c23b665 100644
--- a/regress/roff/ti/basic-mdoc.out_ascii
+++ b/regress/roff/ti/basic-mdoc.out_ascii
@@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN
Reducing by more than the current offset starts the next line at the physical
left margin.
-OpenBSD May 8, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/roff/tr/args.in b/regress/roff/tr/args.in
index 1ef074d6..fa413710 100644
--- a/regress/roff/tr/args.in
+++ b/regress/roff/tr/args.in
@@ -1,4 +1,5 @@
-.TH TR-BASIC 1 "February 6, 2015" OpenBSD
+.\" $OpenBSD: args.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TR-BASIC 1 "February 6, 2015"
.SH NAME
tr-args \- arguments of the tr request
.SH DESCRIPTION
diff --git a/regress/roff/tr/args.out_lint b/regress/roff/tr/args.out_lint
index d67d8445..47b1ad78 100644
--- a/regress/roff/tr/args.out_lint
+++ b/regress/roff/tr/args.out_lint
@@ -1,4 +1,3 @@
-mandoc: args.in:6:2: WARNING: skipping empty request: tr
-mandoc: args.in:8:5: WARNING: odd number of characters in request: tr x
-mandoc: args.in:14:7: WARNING: odd number of characters in request: tr z
-mandoc: args.in: BASE: RCS id missing: (OpenBSD)
+mandoc: args.in:7:2: WARNING: skipping empty request: tr
+mandoc: args.in:9:5: WARNING: odd number of characters in request: tr x
+mandoc: args.in:15:7: WARNING: odd number of characters in request: tr z
diff --git a/regress/tbl/data/blankline.in b/regress/tbl/data/blankline.in
index dd11433a..f171dcef 100644
--- a/regress/tbl/data/blankline.in
+++ b/regress/tbl/data/blankline.in
@@ -1,4 +1,5 @@
-.TH TBL-DATA-BLANKLINE 1 "January 21, 2015" OpenBSD
+.\" $OpenBSD: blankline.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-DATA-BLANKLINE 1 "January 21, 2015"
.SH NAME
tbl-data-blankline \- blank line in a table
.SH DESCRIPTION
diff --git a/regress/tbl/data/block_unclosed.in b/regress/tbl/data/block_unclosed.in
index 5e3526c4..61a02efd 100644
--- a/regress/tbl/data/block_unclosed.in
+++ b/regress/tbl/data/block_unclosed.in
@@ -1,4 +1,5 @@
-.TH TBL-DATA-BLOCK_UNCLOSED 1 "January 28, 2015" OpenBSD
+.\" $OpenBSD: block_unclosed.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-DATA-BLOCK_UNCLOSED 1 "January 28, 2015"
.SH NAME
tbl-data-block_unclosed \- unclosed text block
.SH DESCRIPTION
diff --git a/regress/tbl/data/block_unclosed.out_lint b/regress/tbl/data/block_unclosed.out_lint
index 8d101cf0..60ce4a50 100644
--- a/regress/tbl/data/block_unclosed.out_lint
+++ b/regress/tbl/data/block_unclosed.out_lint
@@ -1,3 +1,2 @@
-mandoc: block_unclosed.in:6:2: ERROR: data block open at end of tbl: TE
-mandoc: block_unclosed.in:29:2: ERROR: data block open at end of tbl: T&
-mandoc: block_unclosed.in: BASE: RCS id missing: (OpenBSD)
+mandoc: block_unclosed.in:7:2: ERROR: data block open at end of tbl: TE
+mandoc: block_unclosed.in:30:2: ERROR: data block open at end of tbl: T&
diff --git a/regress/tbl/data/block_width.in b/regress/tbl/data/block_width.in
index abff1555..6dfdb959 100644
--- a/regress/tbl/data/block_width.in
+++ b/regress/tbl/data/block_width.in
@@ -1,6 +1,7 @@
-.Dd June 15, 2017
+.\" $OpenBSD: block_width.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt TBL-DATA-BLOCK_WIDTH 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm tbl-data-block_width
.Nd default width of text blocks
diff --git a/regress/tbl/data/block_width.out_ascii b/regress/tbl/data/block_width.out_ascii
index f386feff..7058f54e 100644
--- a/regress/tbl/data/block_width.out_ascii
+++ b/regress/tbl/data/block_width.out_ascii
@@ -63,4 +63,4 @@ DDEESSCCRRIIPPTTIIOONN
leaked tab settings:
b c d e f g h
-OpenBSD June 15, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/tbl/data/block_wrap.in b/regress/tbl/data/block_wrap.in
index dd1837ee..81b3ba1b 100644
--- a/regress/tbl/data/block_wrap.in
+++ b/regress/tbl/data/block_wrap.in
@@ -1,6 +1,7 @@
-.Dd June 12, 2017
+.\" $OpenBSD: block_wrap.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt TBL-DATA-BLOCK_WRAP 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm tbl-data-block_wrap
.Nd line wrapping in text blocks
diff --git a/regress/tbl/data/block_wrap.out_ascii b/regress/tbl/data/block_wrap.out_ascii
index c4dcecd6..1ffeb7f4 100644
--- a/regress/tbl/data/block_wrap.out_ascii
+++ b/regress/tbl/data/block_wrap.out_ascii
@@ -24,4 +24,4 @@ DDEESSCCRRIIPPTTIIOONN
+-----------+------------+
final text
-OpenBSD June 12, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/tbl/data/empty.in b/regress/tbl/data/empty.in
index 2107dcf5..8aff5fe7 100644
--- a/regress/tbl/data/empty.in
+++ b/regress/tbl/data/empty.in
@@ -1,4 +1,5 @@
-.TH TBL-DATA-EMPTY 1 "January 28, 2015" OpenBSD
+.\" $OpenBSD: empty.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-DATA-EMPTY 1 "January 28, 2015"
.SH NAME
tbl-data-empty \- empty table
.SH DESCRIPTION
diff --git a/regress/tbl/data/empty.out_lint b/regress/tbl/data/empty.out_lint
index 5247d59e..b8edd7dd 100644
--- a/regress/tbl/data/empty.out_lint
+++ b/regress/tbl/data/empty.out_lint
@@ -1,2 +1 @@
-mandoc: empty.in:6:2: ERROR: tbl without any data cells
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:7:2: ERROR: tbl without any data cells
diff --git a/regress/tbl/layout/center.in b/regress/tbl/layout/center.in
index f4edc37d..5727ca96 100644
--- a/regress/tbl/layout/center.in
+++ b/regress/tbl/layout/center.in
@@ -1,4 +1,5 @@
-.TH TBL-LAYOUT-CENTER 1 "June 17, 2017" OpenBSD
+.\" $OpenBSD: center.in,v 1.4 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-LAYOUT-CENTER 1 "June 17, 2017"
.SH NAME
tbl-layout-center \- centering of table cells
.SH DESCRIPTION
diff --git a/regress/tbl/layout/complex.in b/regress/tbl/layout/complex.in
index 185c5af2..4372503a 100644
--- a/regress/tbl/layout/complex.in
+++ b/regress/tbl/layout/complex.in
@@ -1,4 +1,5 @@
-.TH TBL-LAYOUT-COMPLEX 1 "January 26, 2015" OpenBSD
+.\" $OpenBSD: complex.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-LAYOUT-COMPLEX 1 "January 26, 2015"
.SH NAME
tbl-layout-complex \- complex table layout
.SH DESCRIPTION
diff --git a/regress/tbl/layout/complex.out_lint b/regress/tbl/layout/complex.out_lint
index 56dea463..cea8740a 100644
--- a/regress/tbl/layout/complex.out_lint
+++ b/regress/tbl/layout/complex.out_lint
@@ -1,6 +1,5 @@
-mandoc: complex.in:8:14: WARNING: skipping vertical bar in tbl layout
-mandoc: complex.in:8:28: WARNING: skipping vertical bar in tbl layout
-mandoc: complex.in:10:7: ERROR: ignoring data in spanned tbl cell: h
-mandoc: complex.in:16:3: WARNING: tbl column starts with span
-mandoc: complex.in:18:3: ERROR: ignoring data in spanned tbl cell: b
-mandoc: complex.in: BASE: RCS id missing: (OpenBSD)
+mandoc: complex.in:9:14: WARNING: skipping vertical bar in tbl layout
+mandoc: complex.in:9:28: WARNING: skipping vertical bar in tbl layout
+mandoc: complex.in:11:7: ERROR: ignoring data in spanned tbl cell: h
+mandoc: complex.in:17:3: WARNING: tbl column starts with span
+mandoc: complex.in:19:3: ERROR: ignoring data in spanned tbl cell: b
diff --git a/regress/tbl/layout/empty.in b/regress/tbl/layout/empty.in
index 3afff955..cf8f7a52 100644
--- a/regress/tbl/layout/empty.in
+++ b/regress/tbl/layout/empty.in
@@ -1,4 +1,5 @@
-.TH TBL-LAYOUT-EMPTY 1 "January 29, 2015" OpenBSD
+.\" $OpenBSD: empty.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-LAYOUT-EMPTY 1 "January 29, 2015"
.SH NAME
tbl-layout-empty \- empty table layout
.SH DESCRIPTION
diff --git a/regress/tbl/layout/empty.out_lint b/regress/tbl/layout/empty.out_lint
index ada6ce94..d5470182 100644
--- a/regress/tbl/layout/empty.out_lint
+++ b/regress/tbl/layout/empty.out_lint
@@ -1,3 +1,2 @@
-mandoc: empty.in:7:2: ERROR: empty tbl layout
-mandoc: empty.in:12:3: ERROR: empty tbl layout
-mandoc: empty.in: BASE: RCS id missing: (OpenBSD)
+mandoc: empty.in:8:2: ERROR: empty tbl layout
+mandoc: empty.in:13:3: ERROR: empty tbl layout
diff --git a/regress/tbl/layout/emptyline.in b/regress/tbl/layout/emptyline.in
index 647b70db..ce2743bc 100644
--- a/regress/tbl/layout/emptyline.in
+++ b/regress/tbl/layout/emptyline.in
@@ -1,4 +1,5 @@
-.TH TBL-LAYOUT-EMPTYLINE 1 "January 29, 2015" OpenBSD
+.\" $OpenBSD: emptyline.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-LAYOUT-EMPTYLINE 1 "January 29, 2015"
.SH NAME
tbl-layout-emptyline \- empty lines in table layouts
.SH DESCRIPTION
diff --git a/regress/tbl/layout/lines-nogroff.in b/regress/tbl/layout/lines-nogroff.in
index 9ed94675..094809c4 100644
--- a/regress/tbl/layout/lines-nogroff.in
+++ b/regress/tbl/layout/lines-nogroff.in
@@ -1,6 +1,7 @@
-.Dd June 15, 2017
+.\" $OpenBSD: lines-nogroff.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt TBL-LAYOUT-LINES-NOGROFF 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm tbl-layout-lines
.Nd table cells containing lines, misformatting with groff
diff --git a/regress/tbl/layout/lines-nogroff.out_ascii b/regress/tbl/layout/lines-nogroff.out_ascii
index f7563208..8473e972 100644
--- a/regress/tbl/layout/lines-nogroff.out_ascii
+++ b/regress/tbl/layout/lines-nogroff.out_ascii
@@ -105,4 +105,4 @@ DDEESSCCRRIIPPTTIIOONN
21 22
-OpenBSD June 15, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/tbl/layout/lines.in b/regress/tbl/layout/lines.in
index cd345f42..635fc4bb 100644
--- a/regress/tbl/layout/lines.in
+++ b/regress/tbl/layout/lines.in
@@ -1,6 +1,7 @@
-.Dd June 15, 2017
+.\" $OpenBSD: lines.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt TBL-LAYOUT-LINES 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm tbl-layout-lines
.Nd table cells containing lines
diff --git a/regress/tbl/layout/lines.out_ascii b/regress/tbl/layout/lines.out_ascii
index 24d07d0d..0b2a1cfe 100644
--- a/regress/tbl/layout/lines.out_ascii
+++ b/regress/tbl/layout/lines.out_ascii
@@ -4752,4 +4752,4 @@ DDOOUUBBLLEEBBOOXX AALLLLBBOOXX
+---+----+
+--------+
-OpenBSD June 15, 2017 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/tbl/layout/numbers.in b/regress/tbl/layout/numbers.in
index 591b5ff2..a8cfbc2d 100644
--- a/regress/tbl/layout/numbers.in
+++ b/regress/tbl/layout/numbers.in
@@ -1,4 +1,5 @@
-.TH TBL-LAYOUT-NUMBERS 1 "January 29, 2017" OpenBSD
+.\" $OpenBSD: numbers.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-LAYOUT-NUMBERS 1 "January 29, 2017"
.SH NAME
tbl-layout-numbers \- alignment of numbers in tables
.SH DESCRIPTION
diff --git a/regress/tbl/layout/span.in b/regress/tbl/layout/span.in
index 9b2d7db7..84a71f8a 100644
--- a/regress/tbl/layout/span.in
+++ b/regress/tbl/layout/span.in
@@ -1,4 +1,5 @@
-.TH TBL-LAYOUT-SPAN 1 "June 17, 2017" OpenBSD
+.\" $OpenBSD: span.in,v 1.5 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-LAYOUT-SPAN 1 "June 17, 2017"
.SH NAME
tbl-layout-span \- alignment of spanned cells
.SH DESCRIPTION
diff --git a/regress/tbl/macro/column.in b/regress/tbl/macro/column.in
index 511025ea..2638bad1 100644
--- a/regress/tbl/macro/column.in
+++ b/regress/tbl/macro/column.in
@@ -1,6 +1,7 @@
-.Dd August 20, 2016
+.\" $OpenBSD: column.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.Dd $Mdocdate$
.Dt TBL-COLUMN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm TBL-column
.Nd tables inside column lists
diff --git a/regress/tbl/macro/column.out_ascii b/regress/tbl/macro/column.out_ascii
index b4428aa6..9bd9f40c 100644
--- a/regress/tbl/macro/column.out_ascii
+++ b/regress/tbl/macro/column.out_ascii
@@ -10,4 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
_c d
-OpenBSD August 20, 2016 OpenBSD
+OpenBSD July 4, 2017 OpenBSD
diff --git a/regress/tbl/macro/man.in b/regress/tbl/macro/man.in
index 3ce5bd0d..0e0e90ce 100644
--- a/regress/tbl/macro/man.in
+++ b/regress/tbl/macro/man.in
@@ -1,4 +1,5 @@
-.TH TBL-MACRO-MAN 1 "December 16, 2014" OpenBSD
+.\" $OpenBSD: man.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-MACRO-MAN 1 "December 16, 2014"
.SH NAME
tbl-macro-man \- man macro in a table
.SH DESCRIPTION
diff --git a/regress/tbl/macro/man.out_lint b/regress/tbl/macro/man.out_lint
index 19a39be7..e2a56755 100644
--- a/regress/tbl/macro/man.out_lint
+++ b/regress/tbl/macro/man.out_lint
@@ -1,3 +1,2 @@
-mandoc: man.in:9:5: ERROR: ignoring extra tbl data cells: stray
-mandoc: man.in:12:2: UNSUPP: ignoring macro in table: SM d
-mandoc: man.in: BASE: RCS id missing: (OpenBSD)
+mandoc: man.in:10:5: ERROR: ignoring extra tbl data cells: stray
+mandoc: man.in:13:2: UNSUPP: ignoring macro in table: SM d
diff --git a/regress/tbl/macro/nested.in b/regress/tbl/macro/nested.in
index 09383f6f..6aa0de15 100644
--- a/regress/tbl/macro/nested.in
+++ b/regress/tbl/macro/nested.in
@@ -1,4 +1,5 @@
-.TH TBL-MACRO-NESTED 1 "December 16, 2014" OpenBSD
+.\" $OpenBSD: nested.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-MACRO-NESTED 1 "December 16, 2014"
.SH NAME
tbl-macro-nested \- nested table
.SH DESCRIPTION
diff --git a/regress/tbl/macro/nested.out_lint b/regress/tbl/macro/nested.out_lint
index ad04d98b..dd044ba7 100644
--- a/regress/tbl/macro/nested.out_lint
+++ b/regress/tbl/macro/nested.out_lint
@@ -1,2 +1 @@
-mandoc: nested.in:12:4: UNSUPP: ignoring macro in table: TS
-mandoc: nested.in: BASE: RCS id missing: (OpenBSD)
+mandoc: nested.in:13:4: UNSUPP: ignoring macro in table: TS
diff --git a/regress/tbl/mod/badfont.in b/regress/tbl/mod/badfont.in
index 4b765aef..2a4f0d0a 100644
--- a/regress/tbl/mod/badfont.in
+++ b/regress/tbl/mod/badfont.in
@@ -1,4 +1,5 @@
-.TH TBL-MOD-BADFONT 1 "February 10, 2015" OpenBSD
+.\" $OpenBSD: badfont.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-MOD-BADFONT 1 "February 10, 2015"
.SH NAME
tbl-mod-badfont \- invalid font modifiers in table layouts
.SH DESCRIPTION
diff --git a/regress/tbl/mod/badfont.out_lint b/regress/tbl/mod/badfont.out_lint
index 9f49eea9..c19bae82 100644
--- a/regress/tbl/mod/badfont.out_lint
+++ b/regress/tbl/mod/badfont.out_lint
@@ -1,3 +1,2 @@
-mandoc: badfont.in:8:7: WARNING: unknown font, skipping request: TS f
-mandoc: badfont.in:9:7: WARNING: unknown font, skipping request: TS f.
-mandoc: badfont.in: BASE: RCS id missing: (OpenBSD)
+mandoc: badfont.in:9:7: WARNING: unknown font, skipping request: TS f
+mandoc: badfont.in:10:7: WARNING: unknown font, skipping request: TS f.
diff --git a/regress/tbl/mod/expand-toowide.in b/regress/tbl/mod/expand-toowide.in
index 7e8a44b8..598f3e1e 100644
--- a/regress/tbl/mod/expand-toowide.in
+++ b/regress/tbl/mod/expand-toowide.in
@@ -1,4 +1,5 @@
-.TH TBL-MOD-EXPAND-TOOWIDE 1 "May 1, 2017" OpenBSD
+.\" $OpenBSD: expand-toowide.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-MOD-EXPAND-TOOWIDE 1 "May 1, 2017"
.SH NAME
tbl-mod-expand-toowide \- try to expand columns in a table
that is already too wide
diff --git a/regress/tbl/mod/expand.in b/regress/tbl/mod/expand.in
index d51cd2a6..99f24646 100644
--- a/regress/tbl/mod/expand.in
+++ b/regress/tbl/mod/expand.in
@@ -1,4 +1,5 @@
-.TH TBL-MOD-EXPAND 1 "January 27, 2015" OpenBSD
+.\" $OpenBSD: expand.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-MOD-EXPAND 1 "January 27, 2015"
.SH NAME
tbl-mod-expand \- expand modifier in table layout
.SH DESCRIPTION
diff --git a/regress/tbl/mod/font.in b/regress/tbl/mod/font.in
index 448c1bf6..6aaae8df 100644
--- a/regress/tbl/mod/font.in
+++ b/regress/tbl/mod/font.in
@@ -1,4 +1,5 @@
-.TH TBL-MOD-FONT 1 "February 10, 2015" OpenBSD
+.\" $OpenBSD: font.in,v 1.4 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-MOD-FONT 1 "February 10, 2015"
.SH NAME
tbl-mod-font \- font modifiers in table layouts
.SH DESCRIPTION
diff --git a/regress/tbl/mod/font.out_lint b/regress/tbl/mod/font.out_lint
index 403b165f..06046a43 100644
--- a/regress/tbl/mod/font.out_lint
+++ b/regress/tbl/mod/font.out_lint
@@ -1,6 +1,5 @@
-mandoc: font.in:8:6: WARNING: unknown font, skipping request: TS fCW|ci
-mandoc: font.in:18:2: WARNING: tab in filled text
-mandoc: font.in:18:4: WARNING: tab in filled text
-mandoc: font.in:18:6: WARNING: tab in filled text
-mandoc: font.in:18:8: WARNING: tab in filled text
-mandoc: font.in: BASE: RCS id missing: (OpenBSD)
+mandoc: font.in:9:6: WARNING: unknown font, skipping request: TS fCW|ci
+mandoc: font.in:19:2: WARNING: tab in filled text
+mandoc: font.in:19:4: WARNING: tab in filled text
+mandoc: font.in:19:6: WARNING: tab in filled text
+mandoc: font.in:19:8: WARNING: tab in filled text
diff --git a/regress/tbl/mod/misalign.in b/regress/tbl/mod/misalign.in
index 1f6bde49..15f52da1 100644
--- a/regress/tbl/mod/misalign.in
+++ b/regress/tbl/mod/misalign.in
@@ -1,4 +1,5 @@
-.TH TBL-MOD-MISALIGN 1 "December 24, 2014" OpenBSD
+.\" $OpenBSD: misalign.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-MOD-MISALIGN 1 "December 24, 2014"
.SH NAME
tbl-mod-misalign \- failing alignment in tables
.SH DESCRIPTION
diff --git a/regress/tbl/mod/spacing.in b/regress/tbl/mod/spacing.in
index 1928d9a2..5e20b606 100644
--- a/regress/tbl/mod/spacing.in
+++ b/regress/tbl/mod/spacing.in
@@ -1,4 +1,5 @@
-.TH TBL-MOD-SPACING 1 "June 27, 2017" OpenBSD
+.\" $OpenBSD: spacing.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-MOD-SPACING 1 "June 27, 2017"
.SH NAME
tbl-mod-spacing \- spacing modifier in table layout
.SH DESCRIPTION
diff --git a/regress/tbl/mod/width.in b/regress/tbl/mod/width.in
index 46306089..6482c750 100644
--- a/regress/tbl/mod/width.in
+++ b/regress/tbl/mod/width.in
@@ -1,4 +1,5 @@
-.TH TBL-MOD-WIDTH 1 "June 8, 2017" OpenBSD
+.\" $OpenBSD: width.in,v 1.3 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-MOD-WIDTH 1 "June 8, 2017"
.SH NAME
tbl-mod-width \- width modifier in table layout
.SH DESCRIPTION
diff --git a/regress/tbl/opt/box.in b/regress/tbl/opt/box.in
index ea255fdc..0ff010be 100644
--- a/regress/tbl/opt/box.in
+++ b/regress/tbl/opt/box.in
@@ -1,4 +1,5 @@
-.TH TBL-OPT-BOX 1 "June 12, 2017" OpenBSD
+.\" $OpenBSD: box.in,v 1.4 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-OPT-BOX 1 "June 12, 2017"
.SH NAME
tbl-opt-box \- box table options
.SH DESCRIPTION
diff --git a/regress/tbl/opt/center.in b/regress/tbl/opt/center.in
index 7c05202c..075dad48 100644
--- a/regress/tbl/opt/center.in
+++ b/regress/tbl/opt/center.in
@@ -1,4 +1,5 @@
-.TH TBL-LAYOUT_CENTER 1 "January 28, 2015" OpenBSD
+.\" $OpenBSD: center.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-LAYOUT_CENTER 1 "January 28, 2015"
.SH NAME
tbl-layout_center \- center a table as a whole
.SH DESCRIPTION
diff --git a/regress/tbl/opt/invalid.in b/regress/tbl/opt/invalid.in
index 24b2fdfd..70df4961 100644
--- a/regress/tbl/opt/invalid.in
+++ b/regress/tbl/opt/invalid.in
@@ -1,4 +1,5 @@
-.TH TBL-OPT 1 "January 25, 2015" OpenBSD
+.\" $OpenBSD: invalid.in,v 1.2 2017/07/04 14:53:27 schwarze Exp $
+.TH TBL-OPT 1 "January 25, 2015"
.SH NAME
tbl-opt \- table options
.SH DESCRIPTION
diff --git a/regress/tbl/opt/invalid.out_lint b/regress/tbl/opt/invalid.out_lint
index 8584bbe5..3ea7f36e 100644
--- a/regress/tbl/opt/invalid.out_lint
+++ b/regress/tbl/opt/invalid.out_lint
@@ -1,6 +1,5 @@
-mandoc: invalid.in:7:5: ERROR: missing tbl option argument: tab
-mandoc: invalid.in:7:19: ERROR: wrong tbl option argument size: decimalpoint want 1 have 2
-mandoc: invalid.in:7:23: ERROR: non-alphabetic character in tbl options: %
-mandoc: invalid.in:7:24: ERROR: skipping unknown tbl option: foo
-mandoc: invalid.in:15:21: UNSUPP: eqn delim option in tbl: $$
-mandoc: invalid.in: BASE: RCS id missing: (OpenBSD)
+mandoc: invalid.in:8:5: ERROR: missing tbl option argument: tab
+mandoc: invalid.in:8:19: ERROR: wrong tbl option argument size: decimalpoint want 1 have 2
+mandoc: invalid.in:8:23: ERROR: non-alphabetic character in tbl options: %
+mandoc: invalid.in:8:24: ERROR: skipping unknown tbl option: foo
+mandoc: invalid.in:16:21: UNSUPP: eqn delim option in tbl: $$