start catching up with recent code changes, but no new files yet

41 files changed, 110 insertions, 83 deletions

diff --git a/regress/usr.bin/mandoc/Makefile.inc b/regress/usr.bin/mandoc/Makefile.inc
index dfb89dd6450..1f744ddc151 100644
--- a/regress/usr.bin/mandoc/Makefile.inc
+++ b/regress/usr.bin/mandoc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2014/07/02 06:35:26 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2014/08/11 04:18:18 schwarze Exp $
 
 .include "Makefile.sub"
 
@@ -57,31 +57,31 @@ lint: lint-clean ${_LINTDIFFS}
 		.out_ascii .out_lint .out_utf8
 
 .in.mandoc_ascii:
-	@echo "${MANDOC} -Tascii ${.IMPSRC:T} > ${.TARGET}"
-	@${MANDOC} -Tascii ${.IMPSRC} > ${.TARGET}
+	@echo "${MANDOC} ${MOPTS} -Tascii ${.IMPSRC:T} > ${.TARGET}"
+	@${MANDOC} ${MOPTS} -Tascii ${.IMPSRC} > ${.TARGET}
 
 .mandoc_ascii.diff_ascii:
 	@echo "${DIFF} ${.IMPSRC:S/mandoc_ascii$/out_ascii/} ${.IMPSRC}"
 	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_ascii$/out_ascii/} ${.IMPSRC}
 
 .in.mandoc_utf8:
-	@echo "${MANDOC} -Tutf8 ${.IMPSRC:T} > ${.TARGET}"
-	@${MANDOC} -Tutf8 ${.IMPSRC} > ${.TARGET}
+	@echo "${MANDOC} ${MOPTS} -Tutf8 ${.IMPSRC:T} > ${.TARGET}"
+	@${MANDOC} ${MOPTS} -Tutf8 ${.IMPSRC} > ${.TARGET}
 
 .mandoc_utf8.diff_utf8:
 	@echo "${DIFF} ${.IMPSRC:S/mandoc_utf8$/out_utf8/} ${.IMPSRC}"
 	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_utf8$/out_utf8/} ${.IMPSRC}
 
 .in.in_man:
-	@echo "${MANDOC} -Tman ${.IMPSRC:T} > ${.TARGET}"
-	@${MANDOC} -Tman ${.IMPSRC} > ${.TARGET}
+	@echo "${MANDOC} ${MOPTS} -Tman ${.IMPSRC:T} > ${.TARGET}"
+	@${MANDOC} ${MOPTS} -Tman ${.IMPSRC} > ${.TARGET}
 
 .in_man.mandoc_man:
-	${MANDOC} -Tascii -Omdoc ${.IMPSRC} > ${.TARGET}
+	${MANDOC} -man -Tascii -Omdoc ${.IMPSRC} > ${.TARGET}
 
 .in.mandoc_lint:
-	@echo "${MANDOC} -Tlint ${.IMPSRC:T} > ${.TARGET} 2>&1"
-	@-${MANDOC} -Tlint ${.IMPSRC} 2>&1 | \
+	@echo "${MANDOC} ${MOPTS} -Tlint ${.IMPSRC:T} > ${.TARGET} 2>&1"
+	@-${MANDOC} ${MOPTS} -Tlint ${.IMPSRC} 2>&1 | \
 		sed -E 's/^mandoc: \/[^:]+\//mandoc: /' > ${.TARGET}
 
 .mandoc_lint.diff_lint:
@@ -150,7 +150,13 @@ lint-clean:
 
 # --- the groff program ---
 
-NROFF = /usr/local/bin/nroff -c -mandoc
+NROFF	 = /usr/local/bin/nroff -c
+
+.ifdef MOPTS
+NOPTS	?= ${MOPTS}
+.else
+NOPTS	?= -mandoc
+.endif
 
 # --- the list of targets ---
 
@@ -187,7 +193,7 @@ lint-out: obj-check ${_LINTOUTFILES}
 .  if empty(SKIP_ASCII:M${t}) && empty(SKIP_ASCII:MALL)
 .    if empty(SKIP_GROFF:M${t})
 ${t}.out_ascii: ${t}.in
-	${NROFF} -Tascii ${.ALLSRC} > ${.TARGET}
+	${NROFF} ${NOPTS} -Tascii ${.ALLSRC} > ${.TARGET}
 .    else
 .PHONY: ${t}.out_ascii
 ${t}.out_ascii:
@@ -199,7 +205,7 @@ ${t}.out_ascii:
 .for t in ${UTF8_TARGETS}
 .  if empty(SKIP_GROFF:M${t})
 ${t}.out_utf8: ${t}.in
-	${NROFF} -Tutf8 ${.ALLSRC} > ${.TARGET}
+	${NROFF} ${NOPTS} -Tutf8 ${.ALLSRC} > ${.TARGET}
 .  else
 .PHONY: ${t}.out_utf8
 ${t}.out_utf8:
@@ -209,7 +215,7 @@ ${t}.out_utf8:
 
 .for t in ${LINT_TARGETS}
 ${t}.out_lint: ${t}.in
-	-${MANDOC} -Tlint ${.ALLSRC} > ${.TARGET} 2>&1
+	-${MANDOC} ${MOPTS} -Tlint ${.ALLSRC} > ${.TARGET} 2>&1
 .endfor
 
 # --- phony targets ---
diff --git a/regress/usr.bin/mandoc/man/TH/case.out_lint b/regress/usr.bin/mandoc/man/TH/case.out_lint
index 8e91330c763..b154fc160e6 100644
--- a/regress/usr.bin/mandoc/man/TH/case.out_lint
+++ b/regress/usr.bin/mandoc/man/TH/case.out_lint
@@ -1 +1 @@
-mandoc: case.in:1:8: WARNING: lower case character in document title: TH-case
+mandoc: case.in:1:8: WARNING: lower case character in document title: TH TH-case
diff --git a/regress/usr.bin/mandoc/man/TH/emptydate.out_lint b/regress/usr.bin/mandoc/man/TH/emptydate.out_lint
index 60e5394d4d0..757fda6caf0 100644
--- a/regress/usr.bin/mandoc/man/TH/emptydate.out_lint
+++ b/regress/usr.bin/mandoc/man/TH/emptydate.out_lint
@@ -1 +1 @@
-mandoc: emptydate.in:1:20: WARNING: missing date, using today's date
+mandoc: emptydate.in:1:20: WARNING: missing date, using today's date: TH
diff --git a/regress/usr.bin/mandoc/man/TH/noTH.out_lint b/regress/usr.bin/mandoc/man/TH/noTH.out_lint
index 6b7977668d3..01b7b045d95 100644
--- a/regress/usr.bin/mandoc/man/TH/noTH.out_lint
+++ b/regress/usr.bin/mandoc/man/TH/noTH.out_lint
@@ -1,2 +1,2 @@
-mandoc: noTH.in: WARNING: missing .TH macro, using "unknown 1"
+mandoc: noTH.in: WARNING: missing manual title, using ""
 mandoc: noTH.in: WARNING: missing date, using today's date
diff --git a/regress/usr.bin/mandoc/man/TH/twoargs.out_lint b/regress/usr.bin/mandoc/man/TH/twoargs.out_lint
index eafb0ede867..ce7c74eb6bc 100644
--- a/regress/usr.bin/mandoc/man/TH/twoargs.out_lint
+++ b/regress/usr.bin/mandoc/man/TH/twoargs.out_lint
@@ -1,2 +1,2 @@
-mandoc: twoargs.in:1:2: ERROR: argument count wrong: line arguments >= 2 (have 1)
-mandoc: twoargs.in:1:2: WARNING: missing date, using today's date
+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
diff --git a/regress/usr.bin/mandoc/man/TP/eof.out_ascii b/regress/usr.bin/mandoc/man/TP/eof.out_ascii
index 78f0868a7b8..6b59a71bbec 100644
--- a/regress/usr.bin/mandoc/man/TP/eof.out_ascii
+++ b/regress/usr.bin/mandoc/man/TP/eof.out_ascii
@@ -10,5 +10,4 @@ DDEESSCCRRIIPPTTIIOONN
 
 
 
-
 OpenBSD                          July 7, 2014                        TP-EOF(1)
diff --git a/regress/usr.bin/mandoc/man/TP/eof.out_lint b/regress/usr.bin/mandoc/man/TP/eof.out_lint
index b74b2a8cb21..62d6ff8679f 100644
--- a/regress/usr.bin/mandoc/man/TP/eof.out_lint
+++ b/regress/usr.bin/mandoc/man/TP/eof.out_lint
@@ -1 +1 @@
-mandoc: eof.in: WARNING: line scope broken: at end of file
+mandoc: eof.in:6:2: WARNING: line scope broken: EOF breaks TP
diff --git a/regress/usr.bin/mandoc/man/nf/dupe.out_lint b/regress/usr.bin/mandoc/man/nf/dupe.out_lint
index b42e2b8cf41..b33d44c68fc 100644
--- a/regress/usr.bin/mandoc/man/nf/dupe.out_lint
+++ b/regress/usr.bin/mandoc/man/nf/dupe.out_lint
@@ -1,2 +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:7:2: WARNING: fill mode already enabled, skipping: fi
+mandoc: dupe.in:14:2: WARNING: fill mode already disabled, skipping: nf
diff --git a/regress/usr.bin/mandoc/mdoc/An/break.in b/regress/usr.bin/mandoc/mdoc/An/break.in
index 5e6d596475b..933639aca9f 100644
--- a/regress/usr.bin/mandoc/mdoc/An/break.in
+++ b/regress/usr.bin/mandoc/mdoc/An/break.in
@@ -1,4 +1,4 @@
-.Dd July 8, 2012
+.Dd July 31, 2014
 .Dt AN-BREAK 1
 .Os OpenBSD
 .Sh NAME
@@ -11,7 +11,7 @@ inline is the default:
 and
 .An Joerg .
 .Pp
-.An -split
+.An -split -nosplit
 split mode:
 .An Kristaps
 .An Ingo
@@ -22,7 +22,7 @@ split mode is the default:
 .An Kristaps
 .An Ingo
 .An Joerg
-.An -nosplit
+.An -nosplit -split
 .Pp
 inline:
 .An Kristaps ,
diff --git a/regress/usr.bin/mandoc/mdoc/An/break.out_ascii b/regress/usr.bin/mandoc/mdoc/An/break.out_ascii
index 68035c9581e..176a3bdd493 100644
--- a/regress/usr.bin/mandoc/mdoc/An/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/An/break.out_ascii
@@ -18,4 +18,4 @@ AAUUTTHHOORRSS
 
      inline: Kristaps, Ingo, and Joerg.
 
-OpenBSD                          July 8, 2012                          OpenBSD
+OpenBSD                          July 31, 2014                         OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/At/invalid.out_lint b/regress/usr.bin/mandoc/mdoc/At/invalid.out_lint
index d9ae9e94ca6..00744a14f5c 100644
--- a/regress/usr.bin/mandoc/mdoc/At/invalid.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/At/invalid.out_lint
@@ -1 +1 @@
-mandoc: invalid.in:15:5: WARNING: unknown AT&T UNIX version: murks
+mandoc: invalid.in:15:5: WARNING: unknown AT&T UNIX version: At murks
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint
index d295d9f3457..2d45ea2a173 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint
@@ -2,6 +2,6 @@ mandoc: badargs.in:9:20: WARNING: empty argument, using 0n: Bd -offset
 mandoc: badargs.in:12:2: ERROR: skipping all arguments: Ed tail argument
 mandoc: badargs.in:14:43: WARNING: duplicate argument: Bd -compact
 mandoc: badargs.in:14:51: WARNING: duplicate argument: Bd -offset 6n
-mandoc: badargs.in:19:2: WARNING: missing display type, using -ragged
-mandoc: badargs.in:24:2: WARNING: skipping duplicate display type: unfilled
-mandoc: badargs.in:28:2: WARNING: skipping duplicate display type: ragged
+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
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_lint
index 74c5b7ae8af..eb96330ee03 100644
--- a/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_lint
@@ -1,3 +1,3 @@
-mandoc: badargs.in:11:2: WARNING: missing font type, using \fR
+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:17:2: ERROR: skipping all arguments: Ef tail argument
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint
index 5e92d00527f..417d9988f27 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint
@@ -4,8 +4,8 @@ mandoc: badargs.in:18:17: WARNING: empty argument, using 0n: Bl -width
 mandoc: badargs.in:27:19: WARNING: empty argument, using 0n: Bl -width
 mandoc: badargs.in:31:17: WARNING: empty argument, using 0n: Bl -width
 mandoc: badargs.in:35:16: WARNING: empty argument, using 0n: Bl -width
-mandoc: badargs.in:41:2: WARNING: skipping duplicate list type: enum
-mandoc: badargs.in:45:2: WARNING: skipping duplicate list type: bullet
+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:51: WARNING: duplicate argument: Bl -compact
 mandoc: badargs.in:50:59: WARNING: duplicate argument: Bl -offset 2n
 mandoc: badargs.in:50:69: WARNING: duplicate argument: Bl -width 6n
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_lint
index 469e1023531..e663e421f8e 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_lint
@@ -1,4 +1,4 @@
-mandoc: bareTa.in:9:2: ERROR: skipping column outside column list
-mandoc: bareTa.in:13:2: ERROR: skipping column outside column list
-mandoc: bareTa.in:18:5: ERROR: skipping column outside column list
+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:18:2: ERROR: skipping all arguments: It ignored arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/column.in b/regress/usr.bin/mandoc/mdoc/Bl/column.in
index b1198a0602a..29706fade2c 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/column.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/column.in
@@ -62,3 +62,15 @@
 .It a 	b
 .It a  	b
 .El
+.\" Wrong number of columns.
+.Bl -column "a" "b"
+.It "a"
+.It "a" Ta "b"
+.It "a" Ta "b" Ta "c"
+.It "a" Ta "b" Ta "c" Ta "d"
+.It "a" Ta "b" Ta "c" Ta "d" Ta "e"
+.El
+.\" Interrupted column list
+.Bl -column "aa" -width 6n -compact "bb" "cc"
+.It aa Ta bb Ta cc Ta dd
+.El
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii
index ec2dae599c3..6a16b9956a8 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/column.out_ascii
@@ -41,4 +41,11 @@ DDEESSCCRRIIPPTTIIOONN
      a       b
      a       b
 
+     a
+     a    b
+     a    b    c
+     a    b    cd
+     a    b    cde
+     aa    bb    cc    dd
+
 OpenBSD                        December 24, 2009                       OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/emptyhead.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/emptyhead.out_lint
index 9ccdd840157..2d158b7284d 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/emptyhead.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/emptyhead.out_lint
@@ -1,4 +1,4 @@
-mandoc: emptyhead.in:12:2: WARNING: empty head in list item: hang
-mandoc: emptyhead.in:21:2: WARNING: empty head in list item: ohang
-mandoc: emptyhead.in:30:2: WARNING: empty head in list item: inset
-mandoc: emptyhead.in:39:2: WARNING: empty head in list item: diag
+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
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/emptyitem.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/emptyitem.out_lint
index 737fc273f96..c737a0271a5 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/emptyitem.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/emptyitem.out_lint
@@ -1,8 +1,8 @@
 mandoc: emptyitem.in:10:2: ERROR: skipping all arguments: It head argument
-mandoc: emptyitem.in:12:2: WARNING: empty list item: bullet
-mandoc: emptyitem.in:20:2: WARNING: empty list item: dash
+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: enum
+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 head argument
-mandoc: emptyitem.in:36:2: WARNING: empty list item: hyphen
+mandoc: emptyitem.in:36:2: WARNING: empty list item: Bl -hyphen It
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/emptytag.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/emptytag.out_lint
index fc263308240..72d9d28771f 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/emptytag.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/emptytag.out_lint
@@ -1 +1 @@
-mandoc: emptytag.in:12:2: WARNING: empty head in list item: tag
+mandoc: emptytag.in:12:2: WARNING: empty head in list item: Bl -tag It
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/notype.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/notype.out_lint
index b0faa945b2c..ec90ae56602 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/notype.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/notype.out_lint
@@ -1,3 +1,3 @@
-mandoc: notype.in:9:2: WARNING: list type is not the first argument: offset
+mandoc: notype.in:9:2: WARNING: list type is not the first argument: Bl -offset
 mandoc: notype.in:12:2: ERROR: skipping all arguments: El tail argument
-mandoc: notype.in:14:2: ERROR: missing list type, using -item
+mandoc: notype.in:14:2: ERROR: missing list type, using -item: Bl
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/badarch.out_lint b/regress/usr.bin/mandoc/mdoc/Dt/badarch.out_lint
index 8e33ece69ca..e78bef1bee8 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/badarch.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Dt/badarch.out_lint
@@ -1 +1 @@
-mandoc: badarch.in:2:18: WARNING: unknown manual volume or arch: Cray
+mandoc: badarch.in:2:18: WARNING: unknown manual volume or arch: Dt ... Cray
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/badsec.out_lint b/regress/usr.bin/mandoc/mdoc/Dt/badsec.out_lint
index eb7bfcf22d9..b78a0333ed5 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/badsec.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Dt/badsec.out_lint
@@ -1 +1 @@
-mandoc: badsec.in:2:15: WARNING: unknown manual section: foo
+mandoc: badsec.in:2:15: WARNING: unknown manual section: Dt ... foo
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/case.out_lint b/regress/usr.bin/mandoc/mdoc/Dt/case.out_lint
index ad3b4beb954..cf85b606cc5 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/case.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Dt/case.out_lint
@@ -1 +1 @@
-mandoc: case.in:2:6: WARNING: lower case character in document title: Dt-case
+mandoc: case.in:2:6: WARNING: lower case character in document title: Dt Dt-case
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/dupe.in b/regress/usr.bin/mandoc/mdoc/Dt/dupe.in
index cc6b742750d..c46e3d773ca 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/dupe.in
+++ b/regress/usr.bin/mandoc/mdoc/Dt/dupe.in
@@ -1,9 +1,11 @@
-.Dd June 13, 2014
-.Dt DT-DUPE 1
-.Dt DT-DUPE 1
+.Dd August 5, 2014
+.Dt DT-FIRST 2 first_arch
 .Os OpenBSD
+.Dt DT-DUPE 1
 .Sh NAME
 .Nm Dt-order
 .Nd duplicate prologue macro
 .Sh DESCRIPTION
-some text
+inital text
+.Dt DT-LAST 3 last_arch
+final text
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_ascii b/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_ascii
index aaa8ba20d33..3cfc96d74b9 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_ascii
@@ -4,6 +4,6 @@ NNAAMMEE
      DDtt--oorrddeerr - duplicate prologue macro
 
 DDEESSCCRRIIPPTTIIOONN
-     some text
+     inital text final text
 
-OpenBSD                          June 13, 2014                         OpenBSD
+OpenBSD                         August 5, 2014                         OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint b/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint
index b64844b9c67..cdbb93be873 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint
@@ -1 +1,3 @@
-mandoc: dupe.in:3:2: WARNING: duplicate prologue macro: Dt
+mandoc: dupe.in:2:16: WARNING: unknown manual volume or arch: Dt ... first_arch
+mandoc: dupe.in:4:2: WARNING: duplicate prologue macro: Dt
+mandoc: dupe.in:10:2: WARNING: skipping late title macro: Dt DT-LAST 3 last_arch
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/order.out_lint b/regress/usr.bin/mandoc/mdoc/Dt/order.out_lint
index bf213328718..5700ef89359 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/order.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Dt/order.out_lint
@@ -1,2 +1 @@
-mandoc: order.in:2:2: WARNING: prologue macros out of order: Os
-mandoc: order.in:3:2: WARNING: prologue macros out of order: Dt
+mandoc: order.in:3:2: WARNING: prologue macros out of order: Dt after Os
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/Makefile b/regress/usr.bin/mandoc/mdoc/Nm/Makefile
index 5a0ab026ce3..8ec5dd751d2 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Nm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2014/06/20 18:32:51 schwarze Exp $
+# $OpenBSD: Makefile,v 1.8 2014/08/11 04:18:18 schwarze Exp $
 
 REGRESS_TARGETS = empty font emptyNAME emptyNAMEuse badNAME badNAMEuse long
 
 LINT_TARGETS = badNAME badNAMEuse
 
-SKIP_GROFF = emptyNAME emptyNAMEuse badNAME badNAMEuse
+SKIP_GROFF = emptyNAMEuse badNAMEuse
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_ascii
index fbf001d4153..473bb08fba5 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_ascii
@@ -1,7 +1,7 @@
 NM-BADNAME(1)              OpenBSD Reference Manual              NM-BADNAME(1)
 
 NNAAMMEE
-     UUNNKKNNOOWWNN BSD - text production macro on the NAME Nm line
+     BSD - text production macro on the NAME Nm line
 
 SSYYNNOOPPSSIISS
      badNAME
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_lint b/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_lint
index 11642436afa..c64b2006e83 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Nm/badNAME.out_lint
@@ -1,2 +1,2 @@
-mandoc: badNAME.in:5:2: ERROR: manual name not yet set
+mandoc: badNAME.in:5:2: ERROR: missing manual name, using "": Nm
 mandoc: badNAME.in:5:5: WARNING: bad NAME section contents: Bx
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_ascii
index 1046835ecf0..1bf5d5d7d2b 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_ascii
@@ -1,10 +1,10 @@
 NM-BADNAMEUSE(1)           OpenBSD Reference Manual           NM-BADNAMEUSE(1)
 
 NNAAMMEE
-     UUNNKKNNOOWWNN BSD - text production macro on the NAME Nm line, used later
+     ssoommee__nnaammee BSD - text production macro on the NAME Nm line, used later
 
 SSYYNNOOPPSSIISS
      ssoommee__nnaammee
-     UUNNKKNNOOWWNN
+     ssoommee__nnaammee
 
 OpenBSD                          July 12, 2012                         OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_lint b/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_lint
index 365eaaaa02a..6bc1f6fe6fa 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Nm/badNAMEuse.out_lint
@@ -1,2 +1,2 @@
-mandoc: badNAMEuse.in:5:2: ERROR: manual name not yet set
+mandoc: badNAMEuse.in:5:2: ERROR: missing manual name, using "": Nm
 mandoc: badNAMEuse.in:5:5: WARNING: bad NAME section contents: Bx
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/emptyNAME.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/emptyNAME.out_ascii
index a639b346c66..becaca756ef 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/emptyNAME.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/emptyNAME.out_ascii
@@ -1,7 +1,7 @@
 NM-EMPTYNAME(1)            OpenBSD Reference Manual            NM-EMPTYNAME(1)
 
 NNAAMMEE
-     UUNNKKNNOOWWNN - empty NAME Nm line
+     - empty NAME Nm line
 
 SSYYNNOOPPSSIISS
      emptyNAME
diff --git a/regress/usr.bin/mandoc/mdoc/Nm/emptyNAMEuse.out_ascii b/regress/usr.bin/mandoc/mdoc/Nm/emptyNAMEuse.out_ascii
index cfcf2b0a75f..5f9cabfda9d 100644
--- a/regress/usr.bin/mandoc/mdoc/Nm/emptyNAMEuse.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Nm/emptyNAMEuse.out_ascii
@@ -1,10 +1,10 @@
 NM-EMPTYNAMEUSE(1)         OpenBSD Reference Manual         NM-EMPTYNAMEUSE(1)
 
 NNAAMMEE
-     UUNNKKNNOOWWNN - empty NAME Nm line, used later
+     ssoommee__nnaammee - empty NAME Nm line, used later
 
 SSYYNNOOPPSSIISS
      ssoommee__nnaammee
-     UUNNKKNNOOWWNN
+     ssoommee__nnaammee
 
 OpenBSD                          July 12, 2012                         OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/first.out_lint b/regress/usr.bin/mandoc/mdoc/Sh/first.out_lint
index 8e44f6fef62..df39e0d0956 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/first.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Sh/first.out_lint
@@ -1 +1 @@
-mandoc: first.in:4:2: WARNING: first section is not "NAME": DESCRIPTION
+mandoc: first.in:4:2: WARNING: first section is not "NAME": Sh DESCRIPTION
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/order.out_lint b/regress/usr.bin/mandoc/mdoc/Sh/order.out_lint
index 817be0caa8d..67aa5db89c6 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/order.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Sh/order.out_lint
@@ -1,3 +1,3 @@
-mandoc: order.in:9:2: WARNING: sections out of conventional order: SYNOPSIS
-mandoc: order.in:10:2: WARNING: duplicate section title: SYNOPSIS
-mandoc: order.in:11:2: WARNING: unexpected section: ERRORS for 2, 3, 4, 9 only
+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
diff --git a/regress/usr.bin/mandoc/mdoc/St/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/St/badargs.out_lint
index f4ebc6e7ef3..25062125154 100644
--- a/regress/usr.bin/mandoc/mdoc/St/badargs.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/St/badargs.out_lint
@@ -1,2 +1,2 @@
-mandoc: badargs.in:12:5: ERROR: unknown standard specifier: -murks
+mandoc: badargs.in:12:5: ERROR: unknown standard specifier: St -murks
 mandoc: badargs.in:15:2: WARNING: skipping empty macro: St
diff --git a/regress/usr.bin/mandoc/roff/de/escname.out_lint b/regress/usr.bin/mandoc/roff/de/escname.out_lint
index fa41ec2e606..b4dd49a0867 100644
--- a/regress/usr.bin/mandoc/roff/de/escname.out_lint
+++ b/regress/usr.bin/mandoc/roff/de/escname.out_lint
@@ -1,8 +1,8 @@
-mandoc: escname.in:21:1: ERROR: escaped character not allowed in a name
-mandoc: escname.in:31:19: ERROR: escaped character not allowed in a name
+mandoc: escname.in:21:1: 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
-mandoc: escname.in:42:1: ERROR: escaped character not allowed in a name
+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:1: WARNING: skipping empty request: de
diff --git a/regress/usr.bin/mandoc/roff/nr/escname.out_lint b/regress/usr.bin/mandoc/roff/nr/escname.out_lint
index cd9227aece6..66bfad3580d 100644
--- a/regress/usr.bin/mandoc/roff/nr/escname.out_lint
+++ b/regress/usr.bin/mandoc/roff/nr/escname.out_lint
@@ -1,4 +1,4 @@
-mandoc: escname.in:8:5: ERROR: escaped character not allowed in a name
-mandoc: escname.in:11:5: ERROR: escaped character not allowed in a name
+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
diff --git a/regress/usr.bin/mandoc/roff/string/name.out_lint b/regress/usr.bin/mandoc/roff/string/name.out_lint
index 0d9b3c2d0c7..c4c757f5010 100644
--- a/regress/usr.bin/mandoc/roff/string/name.out_lint
+++ b/regress/usr.bin/mandoc/roff/string/name.out_lint
@@ -1,5 +1,5 @@
-mandoc: name.in:10:5: ERROR: escaped character not allowed in a name
-mandoc: name.in:12:5: ERROR: escaped character not allowed in a name
+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