Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Jun 2011 12:55:19 +0000 (UTC)
From:      Ruslan Ermilov <ru@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org
Subject:   svn commit: r222749 - vendor/groff/dist/tmac
Message-ID:  <201106061255.p56CtJqm031854@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ru
Date: Mon Jun  6 12:55:19 2011
New Revision: 222749
URL: http://svn.freebsd.org/changeset/base/222749

Log:
  Cherry-pick vendor changes to mdoc:
  
  : 2011-04-08  Michail Vidiassov  <master@iaas.msu.ru>
  :
  :         mdoc: Update various strings related to Mac OS X and FreeBSD.
  :
  :         * tmac/doc-common: Add strings for FreeBSD 8.2 and Darwin 9.7-11.0.
  :         * tmac/doc-syms: Add strings -lbsm and -lSystem.
  :
  : 2011-03-29  Ingo Schwarze  <schwarze@usta.de>
  :
  :         Add another POSIX standard.
  :
  :         * tmac/doc-syms: Add POSIX 1003.1b.
  :
  : 2011-03-04  Werner LEMBERG  <wl@gnu.org>
  :
  :         [mdoc] Within .An, .Aq, .Ao, and .Ac now use `<' and `>'.
  :         Problem reported by Ulrich Spörlein <uqs@spoerlein.net>
  :
  :         * tmac/doc.tmac (Aq, Ao, Ac): Implement it to follow RFC 822 and RFC
  :         2822.
  :
  : 2010-11-02  Ulrich Spörlein  <uqs@spoerlein.net>
  :
  :         [mdoc]: Complete previous patch and document OpenBSD releases.
  :
  :         * tmac/doc-common (doc-operating-system-NetBSD): Add versions 5.0,
  :         5.0.1, and 5.0.2.
  :         (doc-operating-system-OpenBSD-*): New strings.
  :         (doc-operating-system-FreeBSD-*): Add version 8.1.
  :         (doc-operating-system-DragonFly-*): Add versions 2.2, 2.4, 2.6, and
  :         2.8.
  :         (Os): Handle DragonFly and OpenBSD.
  :
  :         * tmac/groff_mdoc.man: Document OpenBSD releases.
  :         Add DragonFly release 2.8.
  :
  : 2010-11-02  Ulrich Spörlein  <uqs@spoerlein.net>
  :
  :         [mdoc]: Improve man page.
  :
  :         * tmac/groff_mdoc.man: Fix prologue macro order.
  :         Update NetBSD, FreeBSD, and DragonflyBSD version numbers.
  :         Other minor layout improvements.
  :
  :
  : 2010-02-24  Colin Watson  <cjwatson@debian.org>
  :
  :         Add new FreeBSD and Posix versions.
  :
  :         * tmac/doc-common: Add FreeBSD versions 7.2, 7.3, and 8.0
  :         * tmac/doc-syms: Add Posix 2008.
  :         * tmac/groff_mdoc.man: Document it.

Modified:
  vendor/groff/dist/tmac/doc-common
  vendor/groff/dist/tmac/doc-syms
  vendor/groff/dist/tmac/doc.tmac
  vendor/groff/dist/tmac/groff_mdoc.man

Modified: vendor/groff/dist/tmac/doc-common
==============================================================================
--- vendor/groff/dist/tmac/doc-common	Mon Jun  6 12:55:02 2011	(r222748)
+++ vendor/groff/dist/tmac/doc-common	Mon Jun  6 12:55:19 2011	(r222749)
@@ -454,6 +454,39 @@
 .ds doc-operating-system-NetBSD-3.1   3.1
 .ds doc-operating-system-NetBSD-4.0   4.0
 .ds doc-operating-system-NetBSD-4.0.1 4.0.1
+.ds doc-operating-system-NetBSD-5.0   5.0
+.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-OpenBSD-2.0  2.0
+.ds doc-operating-system-OpenBSD-2.1  2.1
+.ds doc-operating-system-OpenBSD-2.2  2.2
+.ds doc-operating-system-OpenBSD-2.3  2.3
+.ds doc-operating-system-OpenBSD-2.4  2.4
+.ds doc-operating-system-OpenBSD-2.5  2.5
+.ds doc-operating-system-OpenBSD-2.6  2.6
+.ds doc-operating-system-OpenBSD-2.7  2.7
+.ds doc-operating-system-OpenBSD-2.8  2.8
+.ds doc-operating-system-OpenBSD-2.9  2.9
+.ds doc-operating-system-OpenBSD-3.0  3.0
+.ds doc-operating-system-OpenBSD-3.1  3.1
+.ds doc-operating-system-OpenBSD-3.2  3.2
+.ds doc-operating-system-OpenBSD-3.3  3.3
+.ds doc-operating-system-OpenBSD-3.4  3.4
+.ds doc-operating-system-OpenBSD-3.5  3.5
+.ds doc-operating-system-OpenBSD-3.6  3.6
+.ds doc-operating-system-OpenBSD-3.7  3.7
+.ds doc-operating-system-OpenBSD-3.8  3.8
+.ds doc-operating-system-OpenBSD-3.9  3.9
+.ds doc-operating-system-OpenBSD-4.0  4.0
+.ds doc-operating-system-OpenBSD-4.1  4.1
+.ds doc-operating-system-OpenBSD-4.2  4.2
+.ds doc-operating-system-OpenBSD-4.3  4.3
+.ds doc-operating-system-OpenBSD-4.4  4.4
+.ds doc-operating-system-OpenBSD-4.5  4.5
+.ds doc-operating-system-OpenBSD-4.6  4.6
+.ds doc-operating-system-OpenBSD-4.7  4.7
+.ds doc-operating-system-OpenBSD-4.8  4.8
 .
 .ds doc-operating-system-FreeBSD-1.0     1.0
 .ds doc-operating-system-FreeBSD-1.1     1.1
@@ -506,6 +539,11 @@
 .ds doc-operating-system-FreeBSD-6.4     6.4
 .ds doc-operating-system-FreeBSD-7.0     7.0
 .ds doc-operating-system-FreeBSD-7.1     7.1
+.ds doc-operating-system-FreeBSD-7.2     7.2
+.ds doc-operating-system-FreeBSD-7.3     7.3
+.ds doc-operating-system-FreeBSD-8.0     8.0
+.ds doc-operating-system-FreeBSD-8.1     8.1
+.ds doc-operating-system-FreeBSD-8.2     8.2
 .
 .ds doc-operating-system-Darwin-8.0.0  8.0.0
 .ds doc-operating-system-Darwin-8.1.0  8.1.0
@@ -526,6 +564,17 @@
 .ds doc-operating-system-Darwin-9.4.0  9.4.0
 .ds doc-operating-system-Darwin-9.5.0  9.5.0
 .ds doc-operating-system-Darwin-9.6.0  9.6.0
+.ds doc-operating-system-Darwin-9.7.0  9.7.0
+.ds doc-operating-system-Darwin-9.8.0  9.8.0
+.ds doc-operating-system-Darwin-10.6.0 10.6.0
+.ds doc-operating-system-Darwin-10.1.0 10.1.0
+.ds doc-operating-system-Darwin-10.2.0 10.2.0
+.ds doc-operating-system-Darwin-10.3.0 10.3.0
+.ds doc-operating-system-Darwin-10.4.0 10.4.0
+.ds doc-operating-system-Darwin-10.5.0 10.5.0
+.ds doc-operating-system-Darwin-10.6.0 10.6.0
+.ds doc-operating-system-Darwin-10.7.0 10.7.0
+.ds doc-operating-system-Darwin-11.0.0 11.0.0
 .
 .ds doc-operating-system-DragonFly-1.0    1.0
 .ds doc-operating-system-DragonFly-1.1    1.1
@@ -540,6 +589,10 @@
 .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-2.0    2.0
+.ds doc-operating-system-DragonFly-2.2    2.2
+.ds doc-operating-system-DragonFly-2.4    2.4
+.ds doc-operating-system-DragonFly-2.6    2.6
+.ds doc-operating-system-DragonFly-2.8    2.8
 .
 .de Os
 .  ds doc-command-name
@@ -569,6 +622,14 @@
 .      el \
 .        tm mdoc warning: .Os: Unknown FreeBSD version `\$2' (#\n[.c])
 .  \}\}
+.  el \{ .ie "\$1"DragonFly" \{\
+.    ds doc-operating-system DragonFly
+.    if \A\$2 \{\
+.      ie d doc-operating-system-DragonFly-\$2 \
+.        as doc-operating-system \~\*[doc-operating-system-DragonFly-\$2]
+.      el \
+.        tm mdoc warning: .Os: Unknown DragonFly version `\$2' (#\n[.c])
+.  \}\}
 .  el \{ .ie "\$1"NetBSD" \{\
 .    ds doc-operating-system NetBSD
 .    if \A\$2 \{\
@@ -577,6 +638,14 @@
 .      el \
 .        tm mdoc warning: .Os: Unknown NetBSD version `\$2' (#\n[.c])
 .  \}\}
+.  el \{ .ie "\$1"OpenBSD" \{\
+.    ds doc-operating-system OpenBSD
+.    if \A\$2 \{\
+.      ie d doc-operating-system-OpenBSD-\$2 \
+.        as doc-operating-system \~\*[doc-operating-system-OpenBSD-\$2]
+.      el \
+.        tm mdoc warning: .Os: Unknown OpenBSD version `\$2' (#\n[.c])
+.  \}\}
 .  el \{ .ie "\$1"Darwin" \{\
 .    ds doc-operating-system Darwin
 .    if \A\$2 \{\
@@ -589,7 +658,7 @@
 .    ds doc-operating-system \$1
 .    if !"\$2"" \
 .      as doc-operating-system " \$2
-.  \}\}\}\}\}\}
+.  \}\}\}\}\}\}\}\}
 ..
 .
 .

Modified: vendor/groff/dist/tmac/doc-syms
==============================================================================
--- vendor/groff/dist/tmac/doc-syms	Mon Jun  6 12:55:02 2011	(r222748)
+++ vendor/groff/dist/tmac/doc-syms	Mon Jun  6 12:55:19 2011	(r222749)
@@ -617,6 +617,8 @@
 .\" POSIX Part 1: System API
 .ds doc-str-St--p1003.1        \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1
 .as doc-str-St--p1003.1        " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1b       \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1b
+.as doc-str-St--p1003.1b       " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .ds doc-str-St--p1003.1-88     \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-1988
 .as doc-str-St--p1003.1-88     " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .ds doc-str-St--p1003.1-90     \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-1:1990
@@ -637,6 +639,8 @@
 .as doc-str-St--p1003.1-2001   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .ds doc-str-St--p1003.1-2004   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2004
 .as doc-str-St--p1003.1-2004   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1-2008   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008
+.as doc-str-St--p1003.1-2008   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .
 .\" POSIX Part 2: Shell and Utilities
 .ds doc-str-St--p1003.2        \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2
@@ -752,6 +756,7 @@
 .
 .ds doc-str-Lb-libarm      ARM Architecture Library (libarm, \-larm)
 .ds doc-str-Lb-libarm32    ARM32 Architecture Library (libarm32, \-larm32)
+.ds doc-str-Lb-libbsm      Basic Security Module Library (libbsm, \-lbsm)
 .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)
@@ -777,6 +782,7 @@
 .ds doc-str-Lb-libpthread  \*[Px] \*[doc-str-Lb]Threads Library (libpthread, \-lpthread)
 .ds doc-str-Lb-libresolv   DNS Resolver Library (libresolv, \-lresolv)
 .ds doc-str-Lb-librt       \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt)
+.ds doc-str-Lb-libSystem   System Library (libSystem, \-lSystem)
 .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)

Modified: vendor/groff/dist/tmac/doc.tmac
==============================================================================
--- vendor/groff/dist/tmac/doc.tmac	Mon Jun  6 12:55:02 2011	(r222748)
+++ vendor/groff/dist/tmac/doc.tmac	Mon Jun  6 12:55:19 2011	(r222749)
@@ -1197,8 +1197,14 @@
 .  if !\n[doc-arg-limit] \
 .    ds doc-macro-name Aq
 .
-.  ds doc-quote-left \[la]
-.  ds doc-quote-right \[ra]
+.  ie "\*[doc-macro-name]"An" \{\
+.    ds doc-quote-left <
+.    ds doc-quote-right >
+.  \}
+.  el \{\
+.    ds doc-quote-left \[la]
+.    ds doc-quote-right \[ra]
+.  \}
 .
 .  doc-enclose-string \$@
 ..
@@ -1527,7 +1533,10 @@
 .  if !\n[doc-arg-limit] \
 .    ds doc-macro-name Ao
 .
-.  ds doc-quote-left \[la]
+.  ie "\*[doc-macro-name]"An" \
+.    ds doc-quote-left <
+.  el \
+.    ds doc-quote-left \[la]
 .
 .  doc-enclose-open \$@
 ..
@@ -1546,7 +1555,10 @@
 .  if !\n[doc-arg-limit] \
 .    ds doc-macro-name Ac
 .
-.  ds doc-quote-right \[ra]
+.  ie "\*[doc-macro-name]"An" \
+.    ds doc-quote-right >
+.  el \
+.    ds doc-quote-right \[ra]
 .
 .  doc-enclose-close \$@
 ..

Modified: vendor/groff/dist/tmac/groff_mdoc.man
==============================================================================
--- vendor/groff/dist/tmac/groff_mdoc.man	Mon Jun  6 12:55:02 2011	(r222748)
+++ vendor/groff/dist/tmac/groff_mdoc.man	Mon Jun  6 12:55:19 2011	(r222749)
@@ -44,9 +44,9 @@
 .\" for an already extremely slow package.
 .\"
 .
-.Dd January 5, 2006
-.Os
+.Dd November 2, 2010
 .Dt GROFF_MDOC 7
+.Os
 .
 .
 .Sh NAME
@@ -563,8 +563,8 @@ The body of a man page is easily constru
 .Bd -literal -offset indent
 \&.\e" The following commands are required for all man pages.
 \&.Dd Month day, year
-\&.Os [OPERATING_SYSTEM] [version/release]
 \&.Dt DOCUMENT_TITLE [section number] [architecture/volume]
+\&.Os [OPERATING_SYSTEM] [version/release]
 \&.Sh NAME
 \&.Nm name
 \&.Nd one line description of name
@@ -600,9 +600,9 @@ The body of a man page is easily constru
 .
 The first items in the template are the commands
 .Ql .Dd ,
-.Ql .Os ,
+.Ql .Dt ,
 and
-.Ql .Dt ;
+.Ql .Os ;
 the document date, the operating system the man page or subject source is
 developed or modified for, and the man page title (in
 .Em upper case )
@@ -856,7 +856,7 @@ is the acronym for the operating system 
 the release ID.
 .
 .Bd -ragged -compact
-.Bl -tag -width ".No FreeBSD" -offset indent
+.Bl -tag -width ".No DragonFly" -offset indent
 .It ATT
 7th, 7, III, 3, V, V.2, V.3, V.4
 .It BSD
@@ -865,14 +865,19 @@ the release ID.
 0.8, 0.8a, 0.9, 0.9a, 1.0, 1.0a, 1.1, 1.2, 1.2a, 1.2b, 1.2c, 1.2d, 1.2e,
 1.3, 1.3a, 1.4, 1.4.1, 1.4.2, 1.4.3, 1.5, 1.5.1, 1.5.2, 1.5.3, 1.6, 1.6.1,
 1.6.2, 1.6.3, 2.0, 2.0.1, 2.0.2, 2.0.3, 2.1, 3.0, 3.0.1, 3.0.2, 3.1, 4.0,
-4.0.1
+4.0.1, 5.0, 5.0.1, 5.0.2
 .It FreeBSD
 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1,
 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1,
 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1,
-5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1
+5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1, 7.2, 7.3, 8.0,
+8.1
+.It OpenBSD
+2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4,
+3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8
 .It DragonFly
-1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0
+1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0, 2.2,
+2.4, 2.6, 2.8
 .It Darwin
 8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0, 8.6.0, 8.7.0, 8.8.0, 8.9.0,
 8.10.0, 8.11.0, 9.0.0, 9.1.0, 9.2.0, 9.3.0, 9.4.0, 9.5.0, 9.6.0
@@ -1588,7 +1593,7 @@ For example,
 .Ql ".Rv \-std atexit"
 produces:
 .
-.Bd -ragged -offset -indent
+.Bd -ragged -offset indent
 \# a small hack to suppress a warning message
 .ds section-old "\*[section]
 .ds section 3
@@ -1618,7 +1623,7 @@ For example,
 .Ql ".Ex \-std cat"
 produces:
 .
-.Bd -ragged -offset -indent
+.Bd -ragged -offset indent
 \# a small hack to suppress a warning message
 .ds section-old "\*[section]
 .ds section 1
@@ -1786,6 +1791,11 @@ When called without arguments,
 .Ql .Nm
 regurgitates this initial name for the sole purpose of making less work for
 the author.
+.Ql .Nm
+causes a line break within the
+.Sx SYNOPSIS
+section.
+.Pp
 Note: A section two or three document function name is addressed with the
 .Ql .Nm
 in the
@@ -1974,6 +1984,8 @@ Part 1: System API
 .St -p1003.1-2001
 .It Li \-p1003.1\-2004
 .St -p1003.1-2004
+.It Li \-p1003.1\-2008
+.St -p1003.1-2008
 .El
 .Pp
 .
@@ -1993,8 +2005,8 @@ Part 2: Shell and Utilities
 .Pp
 .
 X/Open
-.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
 .Pp
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
 .It Li \-susv2
 .St -susv2
 .It Li \-susv3



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106061255.p56CtJqm031854>