11 files changed, 21 insertions, 24 deletions
diff --git a/regress/mdoc/Em/font.in b/regress/mdoc/Em/font.in
index 3e547d63..c9a8878e 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: July 4 2017 $
 .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..544ab740 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: July 4 2017 $
 .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..5cba8870 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: July 4 2017 $
 .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