Pull up latest mdoc(7) changes.

2 files changed, 113 insertions, 57 deletions

diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common
index 0d819ced..88157ad 100644
--- a/contrib/groff/tmac/doc-common
+++ b/contrib/groff/tmac/doc-common
@@ -256,42 +256,65 @@
 .als doc-volume-ds-MMI doc-volume-ds-IND
 .als doc-volume-ds-LOC doc-volume-ds-LOCAL
 .
-.ds doc-volume-as-alpha    Alpha
+.ds doc-volume-as-alpha        alpha
 .als doc-volume-as-Alpha doc-volume-as-alpha
-.ds doc-volume-as-amiga    Amiga
-.ds doc-volume-as-arc      Arc
-.ds doc-volume-as-arm26    ARM26
-.ds doc-volume-as-arm32    ARM32
-.ds doc-volume-as-atari    Atari
-.ds doc-volume-as-bebox    BEbox
-.ds doc-volume-as-cobalt   Cobalt
-.ds doc-volume-as-evbsh3   Evbsh3
-.ds doc-volume-as-hp300    HP300
-.ds doc-volume-as-hpcmips  HPcmips
-.ds doc-volume-as-i386     i386
-.ds doc-volume-as-luna68k  luna68k
-.ds doc-volume-as-m68k     m68k
-.ds doc-volume-as-mac68k   mac68k
-.ds doc-volume-as-macppc   macppc
-.ds doc-volume-as-mips     MIPS
-.ds doc-volume-as-mmeye    mmeye
-.ds doc-volume-as-mvme68k  mvme68k
-.ds doc-volume-as-news68k  news68k
-.ds doc-volume-as-newsmips newsmips
-.ds doc-volume-as-next68k  next68k
-.ds doc-volume-as-ofppc    ofppc
-.ds doc-volume-as-pc532    pc532
-.ds doc-volume-as-pmax     pmax
-.ds doc-volume-as-powerpc  powerpc
-.ds doc-volume-as-prep     prep
-.ds doc-volume-as-sgimips  sgimips
-.ds doc-volume-as-sh3      sh3
-.ds doc-volume-as-sparc    SPARC
-.ds doc-volume-as-sparc64  sparc64
-.ds doc-volume-as-sun3     sun3
-.ds doc-volume-as-tahoe    Tahoe
-.ds doc-volume-as-vax      VAX
-.ds doc-volume-as-x68k     x68k
+.ds doc-volume-as-acorn26      acorn26
+.ds doc-volume-as-acorn32      acorn32
+.ds doc-volume-as-algor        algor
+.ds doc-volume-as-amd64        amd64
+.ds doc-volume-as-amiga        amiga
+.ds doc-volume-as-arc          arc
+.ds doc-volume-as-arm26        arm26
+.ds doc-volume-as-arm32        arm32
+.ds doc-volume-as-atari        atari
+.ds doc-volume-as-bebox        bebox
+.ds doc-volume-as-cats         cats
+.ds doc-volume-as-cesfic       cesfic
+.ds doc-volume-as-cobalt       cobalt
+.ds doc-volume-as-dreamcast    dreamcast
+.ds doc-volume-as-evbarm       evbarm
+.ds doc-volume-as-evbmips      evbmips
+.ds doc-volume-as-evbppc       evbppc
+.ds doc-volume-as-evbsh3       evbsh3
+.ds doc-volume-as-hp300        hp300
+.ds doc-volume-as-hp700        hp700
+.ds doc-volume-as-hpcarm       hpcarm
+.ds doc-volume-as-hpcmips      hpcmips
+.ds doc-volume-as-hpcsh        hpcsh
+.ds doc-volume-as-i386         i386
+.ds doc-volume-as-luna68k      luna68k
+.ds doc-volume-as-m68k         m68k
+.ds doc-volume-as-mac68k       mac68k
+.ds doc-volume-as-macppc       macppc
+.ds doc-volume-as-mips         mips
+.ds doc-volume-as-mipsco       mipsco
+.ds doc-volume-as-mmeye        mmeye
+.ds doc-volume-as-mvme68k      mvme68k
+.ds doc-volume-as-mvmeppc      mvmeppc
+.ds doc-volume-as-netwinder    netwinder
+.ds doc-volume-as-news68k      news68k
+.ds doc-volume-as-newsmips     newsmips
+.ds doc-volume-as-next68k      next68k
+.ds doc-volume-as-ofppc        ofppc
+.ds doc-volume-as-pc532        pc532
+.ds doc-volume-as-playstation2 playstation2
+.ds doc-volume-as-pmax         pmax
+.ds doc-volume-as-pmppc        pmppc
+.ds doc-volume-as-powerpc      powerpc
+.ds doc-volume-as-prep         prep
+.ds doc-volume-as-sandpoint    sandpoint
+.ds doc-volume-as-sbmips       sbmips
+.ds doc-volume-as-sgimips      sgimips
+.ds doc-volume-as-sh3          sh3
+.ds doc-volume-as-shark        shark
+.ds doc-volume-as-sparc        sparc
+.ds doc-volume-as-sparc64      sparc64
+.ds doc-volume-as-sun2         sun2
+.ds doc-volume-as-sun3         sun3
+.ds doc-volume-as-tahoe        tahoe
+.ds doc-volume-as-vax          vax
+.ds doc-volume-as-x68k         x68k
+.ds doc-volume-as-x86_64       x86_64
 .
 .de Dt
 .  \" reset default arguments
@@ -384,24 +407,34 @@
 .als doc-operating-system-BSD-4.3r doc-operating-system-BSD-4.3R
 .ds doc-operating-system-BSD-4.4  4.4BSD
 .
-.ds doc-operating-system-NetBSD-0.8  0.8
-.ds doc-operating-system-NetBSD-0.8a 0.8A
-.ds doc-operating-system-NetBSD-0.9  0.9
-.ds doc-operating-system-NetBSD-0.9a 0.9A
-.ds doc-operating-system-NetBSD-1.0  1.0
-.ds doc-operating-system-NetBSD-1.0a 1.0A
-.ds doc-operating-system-NetBSD-1.1  1.1
-.ds doc-operating-system-NetBSD-1.2  1.2
-.ds doc-operating-system-NetBSD-1.2a 1.2A
-.ds doc-operating-system-NetBSD-1.2b 1.2B
-.ds doc-operating-system-NetBSD-1.2c 1.2C
-.ds doc-operating-system-NetBSD-1.2d 1.2D
-.ds doc-operating-system-NetBSD-1.2e 1.2E
-.ds doc-operating-system-NetBSD-1.3  1.3
-.ds doc-operating-system-NetBSD-1.3a 1.3A
-.ds doc-operating-system-NetBSD-1.4  1.4
-.ds doc-operating-system-NetBSD-1.5  1.5
-.ds doc-operating-system-NetBSD-1.6  1.6
+.ds doc-operating-system-NetBSD-0.8   0.8
+.ds doc-operating-system-NetBSD-0.8a  0.8A
+.ds doc-operating-system-NetBSD-0.9   0.9
+.ds doc-operating-system-NetBSD-0.9a  0.9A
+.ds doc-operating-system-NetBSD-1.0   1.0
+.ds doc-operating-system-NetBSD-1.0a  1.0A
+.ds doc-operating-system-NetBSD-1.1   1.1
+.ds doc-operating-system-NetBSD-1.2   1.2
+.ds doc-operating-system-NetBSD-1.2a  1.2A
+.ds doc-operating-system-NetBSD-1.2b  1.2B
+.ds doc-operating-system-NetBSD-1.2c  1.2C
+.ds doc-operating-system-NetBSD-1.2d  1.2D
+.ds doc-operating-system-NetBSD-1.2e  1.2E
+.ds doc-operating-system-NetBSD-1.3   1.3
+.ds doc-operating-system-NetBSD-1.3a  1.3A
+.ds doc-operating-system-NetBSD-1.4   1.4
+.ds doc-operating-system-NetBSD-1.4.1 1.4.1
+.ds doc-operating-system-NetBSD-1.4.2 1.4.2
+.ds doc-operating-system-NetBSD-1.4.3 1.4.3
+.ds doc-operating-system-NetBSD-1.5   1.5
+.ds doc-operating-system-NetBSD-1.5.1 1.5.1
+.ds doc-operating-system-NetBSD-1.5.2 1.5.2
+.ds doc-operating-system-NetBSD-1.5.3 1.5.3
+.ds doc-operating-system-NetBSD-1.6   1.6
+.ds doc-operating-system-NetBSD-1.6.1 1.6.1
+.ds doc-operating-system-NetBSD-1.6.2 1.6.2
+.ds doc-operating-system-NetBSD-2.0   2.0
+.ds doc-operating-system-NetBSD-2.1   2.1
 .
 .ds doc-operating-system-FreeBSD-1.0     1.0
 .ds doc-operating-system-FreeBSD-1.1     1.1
@@ -437,7 +470,13 @@
 .ds doc-operating-system-FreeBSD-4.6.2   4.6.2
 .ds doc-operating-system-FreeBSD-4.7     4.7
 .ds doc-operating-system-FreeBSD-4.8     4.8
+.ds doc-operating-system-FreeBSD-4.9     4.9
+.ds doc-operating-system-FreeBSD-4.10    4.10
 .ds doc-operating-system-FreeBSD-5.0     5.0
+.ds doc-operating-system-FreeBSD-5.1     5.1
+.ds doc-operating-system-FreeBSD-5.2     5.2
+.ds doc-operating-system-FreeBSD-5.2.1   5.2.1
+.ds doc-operating-system-FreeBSD-5.3     5.3
 .
 .de Os
 .  ie "\$1"" \
diff --git a/contrib/groff/tmac/doc-syms b/contrib/groff/tmac/doc-syms
index 2c4d56b..800b0f5 100644
--- a/contrib/groff/tmac/doc-syms
+++ b/contrib/groff/tmac/doc-syms
@@ -210,6 +210,8 @@
 .as doc-str-At-V.1 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
 .ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.2
 .as doc-str-At-V.2 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
+.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.3
+.as doc-str-At-V.3 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
 .ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.4
 .as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
 .
@@ -536,10 +538,11 @@
 .
 .\" ANSI/ISO C
 .ds doc-str-St--ansiC-89       \*[Ai] \*[doc-str-St]X\^3.159-1989
-.as doc-str-St--ansiC-89       " (\*[Lq]\)\*[Ai]\~C\*[doc-str-St]\*[Rq])
+.as doc-str-St--ansiC-89       " (\*[Lq]\)\*[Ai]\~C89\*[doc-str-St]\*[Rq])
 .als doc-str-St--ansiC doc-str-St--ansiC-89
 .ds doc-str-St--isoC           \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1990
-.as doc-str-St--isoC           " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^89\*[doc-str-St]\*[Rq])
+.as doc-str-St--isoC           " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St]\*[Rq])
+.als doc-str-St--isoC-90 doc-str-St--isoC
 .ds doc-str-St--isoC-99        \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1999
 .as doc-str-St--isoC-99        " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq])
 .
@@ -584,7 +587,7 @@
 .as doc-str-St--xbd5           " (\*[Lq]\*[doc-Tn-font-size]XBD\*[doc-str-St]\^5\*[Rq])
 .ds doc-str-St--xcu5           \*[doc-Tn-font-size]X/Open\*[doc-str-St] Commands and Utilities Issue\~5
 .as doc-str-St--xcu5           " (\*[Lq]\*[doc-Tn-font-size]XCU\*[doc-str-St]\^5\*[Rq])
-.ds doc-str-St--xcurses4.2     \*[doc-Tn-font-size]X/Open\*[doc-str-St] Curses Issue\~4.2
+.ds doc-str-St--xcurses4.2     \*[doc-Tn-font-size]X/Open\*[doc-str-St] Curses Issue\~4, Version\~2
 .as doc-str-St--xcurses4.2     " (\*[Lq]\*[doc-Tn-font-size]XCURSES\*[doc-str-St]\^4.2\*[Rq])
 .ds doc-str-St--xns5           \*[doc-Tn-font-size]X/Open\*[doc-str-St] Networking Services Issue\~5
 .as doc-str-St--xns5           " (\*[Lq]\*[doc-Tn-font-size]XNS\*[doc-str-St]\^5\*[Rq])
@@ -594,7 +597,7 @@
 .as doc-str-St--xpg3           " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^3\*[Rq])
 .ds doc-str-St--xpg4           \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4
 .as doc-str-St--xpg4           " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^4\*[Rq])
-.ds doc-str-St--xpg4.2         \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4.2
+.ds doc-str-St--xpg4.2         \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4, Version\~2
 .as doc-str-St--xpg4.2         " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^4.2\*[Rq])
 .ds doc-str-St--xsh5           \*[doc-Tn-font-size]X/Open\*[doc-str-St] System Interfaces and Headers Issue\~5
 .as doc-str-St--xsh5           " (\*[Lq]\*[doc-Tn-font-size]XSH\*[doc-str-St]\^5\*[Rq])
@@ -672,22 +675,36 @@
 .\" NS
 .\" NS width register `Lb' defined in doc-common
 .
+.ds doc-str-Lb-libarm      ARM Architecture Library (libarm, \-larm)
 .ds doc-str-Lb-libarm32    ARM32 Architecture Library (libarm32, \-larm32)
 .ds doc-str-Lb-libc        Standard C\~Library (libc, \-lc)
+.ds doc-str-Lb-libcdk      Curses Development Kit Library (libcdk, \-lcdk)
 .ds doc-str-Lb-libcompat   Compatibility Library (libcompat, \-lcompat)
 .ds doc-str-Lb-libcrypt    Crypt Library (libcrypt, \-lcrypt)
 .ds doc-str-Lb-libcurses   Curses Library (libcurses, \-lcurses)
 .ds doc-str-Lb-libedit     Command Line Editor Library (libedit, \-ledit)
+.ds doc-str-Lb-libevent    Event Notification Library (libevent, \-levent)
+.ds doc-str-Lb-libform     Curses Form Library (libform, \-lform)
 .ds doc-str-Lb-libi386     i386 Architecture Library (libi386, \-li386)
+.ds doc-str-Lb-libintl     Internationalized Message Handling Library (libintl, \-lintl)
 .ds doc-str-Lb-libipsec    IPsec Policy Control Library (libipsec, \-lipsec)
 .ds doc-str-Lb-libkvm      Kernel Data Access Library (libkvm, \-lkvm)
 .ds doc-str-Lb-libm        Math Library (libm, \-lm)
+.ds doc-str-Lb-libm68k     m68k Architecture Library (libm68k, \-lm68k)
+.ds doc-str-Lb-libmagic    Magic Number Recognition Library (libmagic, \-lmagic)
 .ds doc-str-Lb-libmenu     Curses Menu Library (libmenu, \-lmenu)
 .ds doc-str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio)
+.ds doc-str-Lb-libpcap     Packet Capture Library (libpcap, \-lpcap)
+.ds doc-str-Lb-libpci      PCI Bus Access Library (libpci, \-lpci)
+.ds doc-str-Lb-libpmc      Performance Counters Library (libpmc, \-lpmc)
 .ds doc-str-Lb-libposix    \*[Px] Compatibility Library (libposix, \-lposix)
+.ds doc-str-Lb-libpthread  POSIX Threads Library (libpthread, \-lpthread)
 .ds doc-str-Lb-libresolv   DNS Resolver Library (libresolv, \-lresolv)
+.ds doc-str-Lb-librt       POSIX Real-time Library (librt, \-lrt)
 .ds doc-str-Lb-libtermcap  Termcap Access Library (libtermcap, \-ltermcap)
+.ds doc-str-Lb-libusbhid   USB Human Interface Devices Library (libusbhid, \-lusbhid)
 .ds doc-str-Lb-libutil     System Utilities Library (libutil, \-lutil)
+.ds doc-str-Lb-libx86_64   x86_64 Architecture Library (libx86_64, \-lx86_64)
 .ds doc-str-Lb-libz        Compression Library (libz, \-lz)
 .
 .de Lb