summaryrefslogtreecommitdiffstats
path: root/regress/mdoc/Sh
diff options
context:
space:
mode:
Diffstat (limited to 'regress/mdoc/Sh')
-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
48 files changed, 87 insertions, 111 deletions
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