summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/groff/tmac/doc-common59
-rw-r--r--contrib/groff/tmac/doc-syms2
-rw-r--r--contrib/groff/tmac/groff_mdoc.man36
-rw-r--r--gnu/usr.bin/groff/tmac/mdoc.local7
4 files changed, 84 insertions, 20 deletions
diff --git a/contrib/groff/tmac/doc-common b/contrib/groff/tmac/doc-common
index ff99165..26dcc56 100644
--- a/contrib/groff/tmac/doc-common
+++ b/contrib/groff/tmac/doc-common
@@ -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,10 @@
.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-Darwin-8.0.0 8.0.0
.ds doc-operating-system-Darwin-8.1.0 8.1.0
@@ -540,6 +577,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 +610,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 +626,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 +646,7 @@
. ds doc-operating-system \$1
. if !"\$2"" \
. as doc-operating-system " \$2
-. \}\}\}\}\}\}
+. \}\}\}\}\}\}\}\}
..
.
.
diff --git a/contrib/groff/tmac/doc-syms b/contrib/groff/tmac/doc-syms
index 7e96a65..d2a070d 100644
--- a/contrib/groff/tmac/doc-syms
+++ b/contrib/groff/tmac/doc-syms
@@ -637,6 +637,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
diff --git a/contrib/groff/tmac/groff_mdoc.man b/contrib/groff/tmac/groff_mdoc.man
index 174030b..309bf1b 100644
--- a/contrib/groff/tmac/groff_mdoc.man
+++ b/contrib/groff/tmac/groff_mdoc.man
@@ -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 constructed from a basic template:
.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 constructed from a basic template:
.
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 and
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
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index 51ebcdd..8e0b6be 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -74,17 +74,10 @@
.ds doc-default-operating-system FreeBSD\~9.0
.
.\" FreeBSD releases not found in doc-common
-.ds doc-operating-system-FreeBSD-7.2 7.2
-.ds doc-operating-system-FreeBSD-7.3 7.3
-.ds doc-operating-system-FreeBSD-7.4 7.4
-.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-FreeBSD-9.0 9.0
.
.\" Definitions not (yet) in doc-syms
-.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])
.
.ec
.
OpenPOWER on IntegriCloud