13 files changed, 21 insertions, 20 deletions
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