MFH r261319,261345,261742 mdoc changes to stable/10

josla972 · Mar 1, 2014 · 31ed6da · 31ed6da
1 parent bcdab28
commit 31ed6da
Show file tree

Hide file tree

Showing 5 changed files with 184 additions and 74 deletions.
diff --git 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
@@ -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
@@ -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
 .