MFC: all recent mdoc(7) fixes.

5 files changed, 46 insertions, 43 deletions

diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common
index bf560ccea7fd..cf7a08a5a4ed 100644
--- a/contrib/groff/tmac/doc-common
+++ b/contrib/groff/tmac/doc-common
@@ -131,6 +131,7 @@
 .nr z: 3
 .nr z; 3
 .nr z? 3
+.nr z! 3
 .nr z( 4
 .nr z) 3
 .nr z[ 4
@@ -482,6 +483,7 @@
 .if "\\$1"libc_r" \&Reentrant C Library (libc_r, -pthread)
 .if "\\$1"libcalendar" \&Calendar Arithmetic Library (libcalendar, -lcalendar)
 .if "\\$1"libcam" \&Common Access Method User Library (libcam, -lcam)
+.if "\\$1"libcipher" \&FreeSec Crypt Library (libcipher, -lcipher)
 .if "\\$1"libcompat" \&Compatibility Library (libcompat, -lcompat)
 .if "\\$1"libcrypt" \&Crypt Library (libcrypt, -lcrypt)
 .if "\\$1"libdevstat" \&Device Statistics Library (libdevstat, -ldevstat)
diff --git a/contrib/groff/tmac/doc-ditroff b/contrib/groff/tmac/doc-ditroff
index bbc36b35d28b..86185905009b 100644
--- a/contrib/groff/tmac/doc-ditroff
+++ b/contrib/groff/tmac/doc-ditroff
@@ -65,7 +65,7 @@
 .ds nO \fR\s10
 .ds nT \s0
 .ds pA \fC\s10
-.ds Pu \fR{\ .\ ,\ :\ ;\ ?\ (\ )\ [\ ]\ \fR}
+.ds Pu \fR{\ .\ ,\ :\ ;\ ?\ !\ (\ )\ [\ ]\ \fR}
 .ds rA \fR\s10
 .ds rT \f(CO\s10
 .ds sH \fB\s10
diff --git a/contrib/groff/tmac/doc-nroff b/contrib/groff/tmac/doc-nroff
index 252d1665b805..d27a492e5881 100644
--- a/contrib/groff/tmac/doc-nroff
+++ b/contrib/groff/tmac/doc-nroff
@@ -62,7 +62,7 @@
 .ds nM \fB
 .ds nO \fR
 .ds pA \fI
-.ds Pu {\ .\ ,\ :\ ;\ ?\ (\ )\ [\ ]}
+.ds Pu {\ .\ ,\ :\ ;\ ?\ !\ (\ )\ [\ ]}
 .ds rA \fR
 .ds rT \fI
 .ds sH \fB
diff --git a/contrib/groff/tmac/doc-syms b/contrib/groff/tmac/doc-syms
index 9e81546a2112..07753de8541b 100644
--- a/contrib/groff/tmac/doc-syms
+++ b/contrib/groff/tmac/doc-syms
@@ -318,11 +318,11 @@
 .       \}
 .       if "\\*(A\\n(aP"-ansiC" \{\
 .		ds b1 \&\\*(tNISO \\*(aa9899:1990\\*(sV
-.		as b1 (``\\*(tNISO C\\*(aa'')
+.		as b1 (``\\*(tNISO\~C\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-isoC" \{\
 .		ds b1 \&\\*(tNISO \\*(aa9899:1990\\*(sV
-.		as b1 (``\\*(tNISO C\\*(aa'')
+.		as b1 (``\\*(tNISO\~C\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-isoC-99" \{\
 .		ds b1 \&\\*(tNISO/IEC \\*(aa9899:1999\\*(sV
@@ -330,11 +330,11 @@
 .       \}
 .       if "\\*(A\\n(aP"-iso9899" \{\
 .		ds b1 \&\\*(tNISO \\*(aa9899:1990\\*(sV
-.		as b1 (``\\*(tNISO C\\*(aa'')
+.		as b1 (``\\*(tNISO\~C\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-ansiC-89" \{\
-.		ds b1 \&\\*(tNANSI \\*(aaX3.159-1989\\*(sV
-.		as b1 (``\\*(tNANSI C\\*(aa'')
+.		ds b1 \&\\*(tNANSI \\*(aaX\~3.159-1989\\*(sV
+.		as b1 (``\\*(tNANSI\~C\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-ieee754" \{\
 .		ds b1 \&\\*(tNIEEE Std \\*(aa754-1985
@@ -342,22 +342,22 @@
 .       if "\\*(A\\n(aP"-iso8802-3" \{\
 .		ds b1 \&\\*(tNISO \\*(aa8802-3:1989
 .\" .		ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
-.\" .		as b1 (``\\*(tNANSI C\\*(aa'')
+.\" .		as b1 (``\\*(tNANSI\~C\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-xpg3" \{\
-.		ds b1 \&\\*(tNX/Open Portability Guide Issue 3\\*(aa\\*(sV
+.		ds b1 \&\\*(tNX/Open Portability Guide Issue\~3\\*(aa\\*(sV
 .		as b1 (``\\*(tNXPG3\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-xpg4" \{\
-.		ds b1 \&\\*(tNX/Open Portability Guide Issue 4\\*(aa\\*(sV
+.		ds b1 \&\\*(tNX/Open Portability Guide Issue\~4\\*(aa\\*(sV
 .		as b1 (``\\*(tNXPG4\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-xpg4.2" \{\
-.		ds b1 \&\\*(tNX/Open Portability Guide Issue 4.2\\*(aa\\*(sV
+.		ds b1 \&\\*(tNX/Open Portability Guide Issue\~4.2\\*(aa\\*(sV
 .		as b1 (``\\*(tNXPG4.2\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-susv2" \{\
-.		ds b1 \&\\*(tNVersion 2 of the Single UNIX Specification\\*(aa
+.		ds b1 \&\\*(tNVersion\~2 of the Single UNIX Specification\\*(aa
 .       \}
 .	ie \\n(aC>\\n(aP \{\
 .		nr aP \\n(aP+1
diff --git a/contrib/groff/tmac/tmac.doc b/contrib/groff/tmac/tmac.doc
index 5f47a894af7d..0532bff5222c 100644
--- a/contrib/groff/tmac/tmac.doc
+++ b/contrib/groff/tmac/tmac.doc
@@ -406,15 +406,15 @@
 .\}
 .el \{\
 .	nr jN \\n(aP
-.	ie \\n(jM==2 .as b1 \&\\*(A\\n(aP
-.	el .as b1 \&\f\\n(cF\s\\n(cZ\\*(A\\n(aP\fP\s0
+.	ie \\n(jM==2 .as b1 \&\%\\*(A\\n(aP\&
+.	el .as b1 \)\f\\n(cF\s\\n(cZ\\*(A\\n(aP\fP\s0
 .	ie \\n(aC==\\n(aP \{\
 .		as b1 \f\\n(cF\s\\n(cZ
 .		aZ
 .	\}
 .	el \{\
 .		nr aP \\n(aP+1
-.		as b1 \&\\*(S\\n(jN
+.		as b1 \)\\*(S\\n(jN
 .		nR
 .	\}
 .\}
@@ -426,7 +426,7 @@
 .as b1 \\*(aR
 .if \\n(aC==0 \{\
 .       ie \\n(.$==0 \{\
-.		as b1 file\ ...\fP\s0
+.		as b1 file\ ...\&\fP\s0
 .		pB
 .	\}
 .	el \{\
@@ -436,20 +436,20 @@
 .\}
 .if \\n(aC>0 \{\
 .	ie (\\n(aC-\\n(aP)==0 \{\
-.		as b1 \&file\ ...\fP\s0
+.		as b1 file\ ...\&\fP\s0
 .		aZ
 .	\}
 .	el \{\
 .		nr aP \\n(aP+1
 .		ie \\n(C\\n(aP==1 \{\
-.			as b1 \&file\ ...\fP\s0
+.			as b1 file\ ...\&\fP\s0
 .			\\*(A\\n(aP
 .               \}
 .               el \{\
 .                       nr cF \\n(.f
 .			nr cZ \\n(.s
 .			if \\n(C\\n(aP==3 \{\
-.				as b1 \&file\ ...
+.				as b1 file\ ...\&
 .			\}
 .                       nR
 .		\}
@@ -1595,6 +1595,7 @@
 .		nr iD \\n(iD+1
 .               ds d\\n(dP dR
 .		na
+.		br
 .       \}
 .       if "\\$1"-unfilled" \{\
 .		nr iD \\n(iD+1
@@ -2025,7 +2026,7 @@
 .lX
 .nr bb \\n(w\\n(lCu+\\n(lSu
 .ti -\\n(bbu
-.ie \w\\*(b1u>=(\\n(w\\n(lCu) \&\\*(b1
+.ie \w\\*(b1u>(\\n(w\\n(lCu) \&\\*(b1
 .el \&\\*(b1\h'|\\n(bbu'\c
 .nr oM \\n(oM-1
 .ds b1
@@ -2253,6 +2254,7 @@
 .nr v1 0
 .nr tY 1
 .\" NS Xr macro - cross reference (man page only)
+.\" NS jM local register
 .de Xr
 .if \\n(aC==0 \{\
 .	ie \\n(.$==0 .tm Usage: .Xr manpage_name [section#] \\*(Pu (#\\n(.c)
@@ -2263,21 +2265,20 @@
 .\}
 .if \\n(aC>\\n(aP \{\
 .	nr aP \\n(aP+1
-.	ie \\n(C\\n(aP==1 .tm Usage: .Xr manpage_name [section#] \\*(Pu (#\\n(.c)
+.	ie !\\n(C\\n(aP==2 .tm Usage: .Xr manpage_name [section#] \\*(Pu (#\\n(.c)
 .	el \{\
-.		ie \\n(C\\n(aP>2 .y\\n(C\\n(aP
-.		el \{\
-.			as b1 \&\\*(xR\\*(A\\n(aP\fP\s0
-.			nr aP \\n(aP+1
-.			if \\n(aC>=\\n(aP \{\
-.				if \\n(C\\n(aP==2 \{\
-.					as b1 \&(\\*(A\\n(aP)
-.					nr aP \\n(aP+1
-.				\}
+.		ds A\\n(aP \\*(xR\\*(A\\n(aP\fP\s0
+.		if \\n(aC>\\n(aP \{\
+.			nr jM \\n(aP+1
+.			if \\n(C\\n(jM==2 \{\
+.				ds A\\n(jM \\*(lp\\*(A\\n(jM\\*(rp
+.				ds S\\n(aP
 .			\}
-.			ie \\n(aC>=\\n(aP .c\\n(C\\n(aP
-.			el .aZ
+.			rr jM
 .		\}
+.		nr cF \\n(.f
+.		nr cZ \\n(.s
+.		nR
 .       \}
 .\}
 ..
@@ -2902,11 +2903,9 @@
 ..
 .\" NS rZ macro - reference print
 .de rZ
-.if \\n(uK \{\&\\*(U1,
-.	nr aK 1
-.	if (\\n(uK>1 \{\
-.		aK
-.	\}
+.nh
+.if \\n(uK \{\
+.	aK
 .	nr Kl -\\n(uK
 .\}
 .if \\n(tK \{\
@@ -2970,15 +2969,18 @@
 .	if \\n(Kl>0 \&\\*(oK,
 .\}
 .if \\n(Kl>0 .tm unresolved reference problem
+.hy
 ..
 .\" NS aK macro - print out reference authors
 .de aK
-.nr aK \\n(aK+1
-.ie (\\n(uK-\\n(aK)==0 \{\&and \\*(U\\n(aK,
-.\}
-.el \{\&\\*(U\\n(aK,
-.	aK
+.nr aK 1
+.while (\\n(aK<\\n(uK) \{\
+.ie (\\n(uK>2) \&\\*(U\\n(aK,
+.el            \&\\*(U\\n(aK
+.nr aK +1
 .\}
+.if (\\n(uK>1) \&and
+\&\\*(U\\n(aK,
 ..
 .\" NS %A macro - reference author(s)
 .\" NS uK register - reference author(s) counter
@@ -3316,7 +3318,6 @@
 .\" NS jM local register
 .\" NS jN local register
 .de rR
-.nh
 .nr jM \\n(C\\n(aP
 .ie \\n(jM==1 \{\
 .\" .	as b1 \&\f\\n(cF\s\\n(cZ