Pull up vendor changes up to 2014-01-29

- move local overrides into mdoc.local
- syncs us with git commit 819839b66c80e8dabe6cb24ea6319c26c9a2be14

Discussed with: ru
MFC after: 2 weeks

4 files changed, 180 insertions, 74 deletions

diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common
index 6372a23..2d91c7c 100644
--- a/contrib/groff/tmac/doc-common
+++ b/contrib/groff/tmac/doc-common
@@ -37,6 +37,7 @@
 .
 .nr %A 1
 .nr %B 1
+.nr %C 1
 .nr %D 1
 .nr %I 1
 .nr %J 1
@@ -484,7 +485,15 @@
 .ds doc-operating-system-NetBSD-5.0.1 5.0.1
 .ds doc-operating-system-NetBSD-5.0.2 5.0.2
 .ds doc-operating-system-NetBSD-5.1   5.1
+.ds doc-operating-system-NetBSD-5.1.2 5.1.2
+.ds doc-operating-system-NetBSD-5.1.3 5.1.3
+.ds doc-operating-system-NetBSD-5.2   5.2
+.ds doc-operating-system-NetBSD-5.2.1 5.2.1
 .ds doc-operating-system-NetBSD-6.0   6.0
+.ds doc-operating-system-NetBSD-6.0.1 6.0.1
+.ds doc-operating-system-NetBSD-6.0.2 6.0.2
+.ds doc-operating-system-NetBSD-6.0.3 6.0.3
+.ds doc-operating-system-NetBSD-6.1   6.1
 .
 .ds doc-operating-system-OpenBSD-2.0  2.0
 .ds doc-operating-system-OpenBSD-2.1  2.1
@@ -517,6 +526,10 @@
 .ds doc-operating-system-OpenBSD-4.8  4.8
 .ds doc-operating-system-OpenBSD-4.9  4.9
 .ds doc-operating-system-OpenBSD-5.0  5.0
+.ds doc-operating-system-OpenBSD-5.1  5.1
+.ds doc-operating-system-OpenBSD-5.2  5.2
+.ds doc-operating-system-OpenBSD-5.3  5.3
+.ds doc-operating-system-OpenBSD-5.4  5.4
 .
 .ds doc-operating-system-FreeBSD-1.0     1.0
 .ds doc-operating-system-FreeBSD-1.1     1.1
@@ -535,6 +548,7 @@
 .ds doc-operating-system-FreeBSD-2.2.6   2.2.6
 .ds doc-operating-system-FreeBSD-2.2.7   2.2.7
 .ds doc-operating-system-FreeBSD-2.2.8   2.2.8
+.ds doc-operating-system-FreeBSD-2.2.9   2.2.9
 .ds doc-operating-system-FreeBSD-3.0     3.0
 .ds doc-operating-system-FreeBSD-3.1     3.1
 .ds doc-operating-system-FreeBSD-3.2     3.2
@@ -575,6 +589,7 @@
 .ds doc-operating-system-FreeBSD-8.1     8.1
 .ds doc-operating-system-FreeBSD-8.2     8.2
 .ds doc-operating-system-FreeBSD-9.0     9.0
+.ds doc-operating-system-FreeBSD-10.0    10.0
 .
 .ds doc-operating-system-Darwin-8.0.0  8.0.0
 .ds doc-operating-system-Darwin-8.1.0  8.1.0
@@ -613,21 +628,37 @@
 .ds doc-operating-system-DragonFly-1.4    1.4
 .ds doc-operating-system-DragonFly-1.5    1.5
 .ds doc-operating-system-DragonFly-1.6    1.6
+.ds doc-operating-system-DragonFly-1.7    1.7
 .ds doc-operating-system-DragonFly-1.8    1.8
 .ds doc-operating-system-DragonFly-1.8.1  1.8.1
+.ds doc-operating-system-DragonFly-1.9    1.9
 .ds doc-operating-system-DragonFly-1.10   1.10
+.ds doc-operating-system-DragonFly-1.11   1.11
 .ds doc-operating-system-DragonFly-1.12   1.12
 .ds doc-operating-system-DragonFly-1.12.2 1.12.2
+.ds doc-operating-system-DragonFly-1.13   1.13
 .ds doc-operating-system-DragonFly-2.0    2.0
+.ds doc-operating-system-DragonFly-2.1    2.1
 .ds doc-operating-system-DragonFly-2.2    2.2
+.ds doc-operating-system-DragonFly-2.3    2.3
 .ds doc-operating-system-DragonFly-2.4    2.4
+.ds doc-operating-system-DragonFly-2.5    2.5
 .ds doc-operating-system-DragonFly-2.6    2.6
+.ds doc-operating-system-DragonFly-2.7    2.7
 .ds doc-operating-system-DragonFly-2.8    2.8
 .ds doc-operating-system-DragonFly-2.9    2.9
 .ds doc-operating-system-DragonFly-2.9.1  2.9.1
 .ds doc-operating-system-DragonFly-2.10   2.10
 .ds doc-operating-system-DragonFly-2.10.1 2.10.1
 .ds doc-operating-system-DragonFly-2.11   2.11
+.ds doc-operating-system-DragonFly-3.0    3.0
+.ds doc-operating-system-DragonFly-3.1    3.1
+.ds doc-operating-system-DragonFly-3.2    3.2
+.ds doc-operating-system-DragonFly-3.3    3.3
+.ds doc-operating-system-DragonFly-3.4    3.4
+.ds doc-operating-system-DragonFly-3.5    3.5
+.ds doc-operating-system-DragonFly-3.6    3.6
+.ds doc-operating-system-DragonFly-3.7    3.7
 .
 .de Os
 .  ds doc-command-name
diff --git a/contrib/groff/tmac/doc-syms b/contrib/groff/tmac/doc-syms
index 0b67ad9..dfb09b3 100644
--- a/contrib/groff/tmac/doc-syms
+++ b/contrib/groff/tmac/doc-syms
@@ -812,7 +812,6 @@
 .ds doc-str-Lb-librpcsec_gss RPC GSS-API Authentication Library (librpcsec_gss, \-lrpcsec_gss)
 .ds doc-str-Lb-librpcsvc   RPC Service Library (librpcsvc, \-lrpcsvc)
 .ds doc-str-Lb-librt       \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt)
-.ds doc-str-Lb-libsbuf     Safe String Composition Library (libsbuf, \-lsbuf)
 .ds doc-str-Lb-libsdp      Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp)
 .ds doc-str-Lb-libssp      Buffer Overflow Protection Library (libssp, \-lssp)
 .ds doc-str-Lb-libSystem   System Library (libSystem, \-lSystem)
diff --git a/contrib/groff/tmac/doc.tmac b/contrib/groff/tmac/doc.tmac
index bbec7c5..e434eaf6 100644
--- a/contrib/groff/tmac/doc.tmac
+++ b/contrib/groff/tmac/doc.tmac
@@ -3423,6 +3423,8 @@
 .
 .  nr doc-book-count-saved \n[doc-book-count]
 .  ds doc-book-name-saved "\*[doc-book-name]
+.  nr doc-city-count-saved \n[doc-city-count]
+.  ds doc-city-name-saved "\*[doc-city-name]
 .  nr doc-date-count-saved \n[doc-date-count]
 .  ds doc-date-saved "\*[doc-date]
 .  nr doc-publisher-count-saved \n[doc-publisher-count]
@@ -3565,6 +3567,8 @@
 .
 .  nr doc-book-count \n[doc-book-count-saved]
 .  ds doc-book-name "\*[doc-book-name-saved]
+.  nr doc-city-count \n[doc-city-count-saved]
+.  ds doc-city-name "\*[doc-city-name-saved]
 .  nr doc-date-count \n[doc-date-count-saved]
 .  ds doc-date "\*[doc-date-saved]
 .  nr doc-publisher-count \n[doc-publisher-count-saved]
@@ -5190,6 +5194,8 @@
 .\" NS   doc-author-nameXXX
 .\" NS   doc-book-count
 .\" NS   doc-book-name
+.\" NS   doc-city-count
+.\" NS   doc-city-name
 .\" NS   doc-corporate-count
 .\" NS   doc-corporate-name
 .\" NS   doc-date
@@ -5228,6 +5234,7 @@
 .  nr doc-reference-title-count 0
 .  nr doc-url-count 0
 .  nr doc-volume-count 0
+.  nr doc-city-count 0
 .  nr doc-date-count 0
 .  nr doc-page-number-count 0
 .  nr doc-book-count 0
@@ -5243,6 +5250,7 @@
 .  ds doc-reference-title-name-for-book
 .  ds doc-url-name
 .  ds doc-volume-name
+.  ds doc-city-name
 .  ds doc-date
 .  ds doc-page-number-string
 .  ds doc-book-name
@@ -5357,6 +5365,13 @@
 .    doc-finish-reference \n[doc-corporate-count]
 .  \}
 .
+.  if \n[doc-city-count] \{\
+.    unformat doc-city-name
+.    chop doc-city-name
+.    nop \*[doc-city-name]\c
+.    doc-finish-reference \n[doc-city-count]
+.  \}
+.
 .  if \n[doc-date-count] \{\
 .    unformat doc-date
 .    chop doc-date
@@ -5528,6 +5543,60 @@
 ..
 .
 .
+.\" NS doc-city-count global register
+.\" NS   counter of city references
+.
+.nr doc-city-count 0
+.
+.
+.\" NS doc-city-name global box
+.\" NS   string of collected city references
+.
+.ds doc-city-name
+.
+.
+.\" NS %C user macro
+.\" NS   [reference] city
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-city-count
+.\" NS   doc-macro-name
+.\" NS   doc-reference-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%C
+.\" NS
+.\" NS width register `%C' set in doc-common
+.
+.de %C
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%C city_name ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-city-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %C
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-city-name
+.  ev doc-env-%C
+.  evc 0
+.  in 0
+.  nf
+.  doc-do-references
+..
+.
+.
 .\" NS doc-date-count global register
 .\" NS   counter of date references
 .
diff --git a/contrib/groff/tmac/groff_mdoc.man b/contrib/groff/tmac/groff_mdoc.man
index 279dedd..c3ad6b4 100644
--- a/contrib/groff/tmac/groff_mdoc.man
+++ b/contrib/groff/tmac/groff_mdoc.man
@@ -1,3 +1,4 @@
+.\" t
 .\" groff_mdoc.man
 .\"
 .\"   A complete reference of the mdoc macro package for GNU troff.
@@ -613,10 +614,10 @@ These commands identify the page and are discussed below in
 The remaining items in the template are section headers
 .Pf ( Li .Sh ) ;
 of which
-.Sx NAME ,
-.Sx SYNOPSIS ,
+.Em NAME ,
+.Em SYNOPSIS ,
 and
-.Sx DESCRIPTION
+.Em DESCRIPTION
 are mandatory.
 The headers are discussed in
 .Sx "PAGE STRUCTURE DOMAIN" ,
@@ -723,34 +724,36 @@ Under
 .Tn \*[operating-system] ,
 the following sections are defined:
 .Pp
-.Bl -column LOCAL -offset indent -compact
-.It Li 1   Ta "\*[volume-operating-system] \*[volume-ds-1]"
-.It Li 2   Ta "\*[volume-operating-system] \*[volume-ds-2]"
-.It Li 3   Ta "\*[volume-operating-system] \*[volume-ds-3]"
-.It Li 4   Ta "\*[volume-operating-system] \*[volume-ds-4]"
-.It Li 5   Ta "\*[volume-operating-system] \*[volume-ds-5]"
-.It Li 6   Ta "\*[volume-operating-system] \*[volume-ds-6]"
-.It Li 7   Ta "\*[volume-operating-system] \*[volume-ds-7]"
-.It Li 8   Ta "\*[volume-operating-system] \*[volume-ds-8]"
-.It Li 9   Ta "\*[volume-operating-system] \*[volume-ds-9]"
-.El
+.TS
+l l l.
+1	\*[volume-operating-system] \*[volume-ds-1]
+2	\*[volume-operating-system] \*[volume-ds-2]
+3	\*[volume-operating-system] \*[volume-ds-3]
+4	\*[volume-operating-system] \*[volume-ds-4]
+5	\*[volume-operating-system] \*[volume-ds-5]
+6	\*[volume-operating-system] \*[volume-ds-6]
+7	\*[volume-operating-system] \*[volume-ds-7]
+8	\*[volume-operating-system] \*[volume-ds-8]
+9	\*[volume-operating-system] \*[volume-ds-9]
+.TE
 .Pp
 .
 A volume name may be arbitrary or one of the following:
 .
 .Pp
-.Bl -column LOCAL -offset indent -compact
-.It Li USD   Ta "\*[volume-ds-USD]"
-.It Li PS1   Ta "\*[volume-ds-PS1]"
-.It Li AMD   Ta "\*[volume-ds-AMD]"
-.It Li SMM   Ta "\*[volume-ds-SMM]"
-.It Li URM   Ta "\*[volume-ds-URM]"
-.It Li PRM   Ta "\*[volume-ds-PRM]"
-.It Li KM    Ta "\*[volume-ds-KM]"
-.It Li IND   Ta "\*[volume-ds-IND]"
-.It Li LOCAL Ta "\*[volume-ds-LOCAL]"
-.It Li CON   Ta "\*[volume-ds-CON]"
-.El
+.TS
+l l.
+USD	\*[volume-ds-USD]
+PS1	\*[volume-ds-PS1]
+AMD	\*[volume-ds-AMD]
+SMM	\*[volume-ds-SMM]
+URM	\*[volume-ds-URM]
+PRM	\*[volume-ds-PRM]
+KM 	\*[volume-ds-KM]
+IND	\*[volume-ds-IND]
+LOCAL	\*[volume-ds-LOCAL]
+CON	\*[volume-ds-CON]
+.TE
 .Pp
 .
 For compatibility,
@@ -1208,7 +1211,7 @@ documented, or the name of the author of the actual manual page.
 The default width is 12n.
 .Pp
 In the
-.Sx AUTHORS
+.Em AUTHORS
 section, the
 .Ql .An
 command causes a line break allowing each new name to appear on its own
@@ -1834,7 +1837,7 @@ then denotes the keyword to be used with the
 macro.
 .Pp
 In the
-.Sx LIBRARY
+.Em LIBRARY
 section an
 .Ql .Lb
 command causes a line break before and after its arguments are printed.
@@ -1882,7 +1885,7 @@ section.
 Note: A section two or three document function name is addressed with the
 .Ql .Nm
 in the
-.Sx NAME
+.Em NAME
 section, and with
 .Ql .Fn
 in the
@@ -2398,20 +2401,20 @@ respectively.
 .if t \
 .  ne 10
 .
-.Bd -filled -offset 4n
-.Bl -column "quote" "close" "open" "Angle Bracket Enclosure" "`string' or string"
-.Em Quote Ta Em Open Ta Em Close Ta Em Function               Ta Em Result
-.No .Aq   Ta    .Ao  Ta    .Ac   Ta "Angle Bracket Enclosure" Ta Ao string Ac
-.No .Bq   Ta    .Bo  Ta    .Bc   Ta "Bracket Enclosure"       Ta Bo string Bc
-.No .Brq  Ta    .Bro Ta    .Brc  Ta "Brace Enclosure"         Ta Bro string Brc
-.No .Dq   Ta    .Do  Ta    .Dc   Ta "Double Quote"            Ta Do string Dc
-.No .Eq   Ta    .Eo  Ta    .Ec   Ta "Enclose String (in XX)"  Ta XXstringXX
-.No .Pq   Ta    .Po  Ta    .Pc   Ta "Parenthesis Enclosure"   Ta Po string Pc
-.No .Ql   Ta         Ta          Ta "Quoted Literal"          Ta So string Sc or Li string
-.No .Qq   Ta    .Qo  Ta    .Qc   Ta "Straight Double Quote"   Ta Qo string Qc
-.No .Sq   Ta    .So  Ta    .Sc   Ta "Single Quote"            Ta So string Sc
-.El
-.Ed
+.TS
+lb lb lb lb lb
+l l l l l.
+Quote	Open	Close	Function	Result
+\&.Aq	.Ao	.Ac	Angle Bracket Enclosure	<string>
+\&.Bq	.Bo	.Bc	Bracket Enclosure	[string]
+\&.Brq	.Bro	.Brc	Brace Enclosure	{string}
+\&.Dq	.Do	.Dc	Double Quote	"string"
+\&.Eq	.Eo	.Ec	Enclose String (in XX)	XXstring
+\&.Pq	.Po	.Pc	Parenthesis Enclosure	(string)
+\&.Ql			Quoted Literal	\*[Lq]string\*[Rq] or string
+\&.Qq	.Qo	.Qc	Straight Double Quote	"string"
+\&.Sq	.So	.Sc	Single Quote	'string'
+.TE
 .Pp
 All macros ending with
 .Sq q
@@ -2634,7 +2637,7 @@ Reference author name; one name per invocation.
 .It Li .%B
 Book title.
 .It Li .%C
-City/place (not implemented yet).
+City/place.
 .It Li .%D
 Date.
 .It Li .%I
@@ -2681,7 +2684,8 @@ Example:
 \&.%A "John Foo"
 \&.%T "Implementation Notes on foobar(1)"
 \&.%R "Technical Report ABC\-DE\-12\-345"
-\&.%Q "Drofnats College, Nowhere"
+\&.%Q "Drofnats College"
+\&.%C "Nowhere"
 \&.%D "April 1991"
 \&.Re
 .Ed
@@ -2694,7 +2698,8 @@ produces
 .%A "John Foo"
 .%T "Implementation Notes on foobar(1)"
 .%R "Technical Report ABC-DE-12-345"
-.%Q "Drofnats College, Nowhere"
+.%Q "Drofnats College"
+.%C "Nowhere"
 .%D "April 1991"
 .Re
 .Ed
@@ -2839,7 +2844,7 @@ macro is mandatory.
 If not specified, headers, footers and page layout defaults will not be set
 and things will be rather unpleasant.
 The
-.Sx NAME
+.Em NAME
 section consists of at least three items.
 The first is the
 .Ql .Nm
@@ -2949,7 +2954,7 @@ They are listed in the order in which they would be used.
 .Bl -tag -width ".Li .Sh\ COMPATIBILITY"
 .It Li ".Sh ENVIRONMENT"
 The
-.Sx ENVIRONMENT
+.Em ENVIRONMENT
 section should reveal any related environment variables and clues to their
 behavior and/or usage.
 .
@@ -2964,7 +2969,7 @@ section.
 .It Li ".Sh EXAMPLES"
 There are several ways to create examples.
 See the
-.Sx EXAMPLES
+.Em EXAMPLES
 section below for details.
 .
 .It Li ".Sh DIAGNOSTICS"
@@ -3019,7 +3024,7 @@ or
 this should be noted here.
 If the command does not adhere to any standard, its history should be noted
 in the
-.Sx HISTORY
+.Em HISTORY
 section.
 .
 .It Li ".Sh HISTORY"
@@ -4045,28 +4050,30 @@ It is neither callable nor parsed and takes no arguments.
 .
 The following strings are predefined:
 .Pp
-.Bl -column String infinity "Troff " "straight double quote" -offset indent
-.It Sy String Ta Sy Nroff Ta Sy Troff Ta Sy Meaning
-.It Li <=     Ta <=       Ta \*[<=]   Ta "less equal"
-.It Li >=     Ta >=       Ta \*[>=]   Ta "greater equal"
-.It Li Rq     Ta ''       Ta \*[Rq]   Ta "right double quote"
-.It Li Lq     Ta ``       Ta \*[Lq]   Ta "left double quote"
-.It Li ua     Ta ^        Ta \*[ua]   Ta "upwards arrow"
-.It Li aa     Ta \'       Ta \*[aa]   Ta "acute accent"
-.It Li ga     Ta \`       Ta \*[ga]   Ta "grave accent"
-.It Li q      Ta \&"      Ta \*[q]    Ta "straight double quote"
-.It Li Pi     Ta pi       Ta \*[Pi]   Ta "greek pi"
-.It Li Ne     Ta !=       Ta \*[Ne]   Ta "not equal"
-.It Li Le     Ta <=       Ta \*[Le]   Ta "less equal"
-.It Li Ge     Ta >=       Ta \*[Ge]   Ta "greater equal"
-.It Li Lt     Ta <        Ta \*[Lt]   Ta "less than"
-.It Li Gt     Ta >        Ta \*[Gt]   Ta "greater than"
-.It Li Pm     Ta +\-      Ta \*[Pm]   Ta "plus minus"
-.It Li If     Ta infinity Ta \*[If]   Ta "infinity"
-.It Li Am     Ta \*[Am]   Ta \*[Am]   Ta "ampersand"
-.It Li Na     Ta \*[Na]   Ta \*[Na]   Ta "not a number"
-.It Li Ba     Ta \*[Ba]   Ta \*[Ba]   Ta "vertical bar"
-.El
+.TS
+lb lb lb lb
+l l l l.
+String	Nroff	Troff	Meaning
+<=	<=  	\*[<=]	less equal
+>=	>=  	\*[>=]	greater equal
+Rq	''  	\*[Rq]	right double quote
+Lq	``  	\*[Lq]	left double quote
+ua	^   	\*[ua]	upwards arrow
+aa	\'  	\*[aa]	acute accent
+ga	\`  	\*[ga]	grave accent
+q 	\&" 	\*[q] 	straight double quote
+Pi	pi  	\*[Pi]	greek pi
+Ne	!=  	\*[Ne]	not equal
+Le	<=  	\*[Le]	less equal
+Ge	>=  	\*[Ge]	greater equal
+Lt	<   	\*[Lt]	less than
+Gt	>   	\*[Gt]	greater than
+Pm	+\- 	\*[Pm]	plus minus
+If	infinity	\*[If]	infinity
+Am	\*[Am]	\*[Am]	ampersand
+Na	\*[Na]	\*[Na]	not a number
+Ba	\*[Ba]	\*[Ba]	vertical bar
+.TE
 .Pp
 The names of the columns
 .Sy Nroff
@@ -4212,7 +4219,7 @@ Section 3f has not been added to the header routines.
 .Pp
 .Ql \&.Nm
 font should be changed in
-.Sx NAME
+.Em NAME
 section.
 .Pp
 .Ql \&.Fn