svn commit: r218671 - in stable/7: contrib/groff/font/devutf8
contrib/groff/tmac gnu/usr.bin/groff/tmac
Ulrich Spoerlein
uqs at FreeBSD.org
Sun Feb 13 22:09:33 UTC 2011
Author: uqs
Date: Sun Feb 13 22:09:33 2011
New Revision: 218671
URL: http://svn.freebsd.org/changeset/base/218671
Log:
MFH r202358,217595:
Pull up vendor changes. The following local changes made obsolete:
- Addition of several FreeBSD versions.
- r192561 that attempted to fix UTF-8 issues.
Update groff manpage and symbols with what has been submitted upstream.
Also remove local overrides that are now in the contrib tree.
Modified:
stable/7/contrib/groff/font/devutf8/R.proto
stable/7/contrib/groff/tmac/an-old.tmac
stable/7/contrib/groff/tmac/doc-common
stable/7/contrib/groff/tmac/doc-old.tmac
stable/7/contrib/groff/tmac/doc-syms
stable/7/contrib/groff/tmac/doc.tmac
stable/7/contrib/groff/tmac/groff_mdoc.man
stable/7/gnu/usr.bin/groff/tmac/mdoc.local (contents, props changed)
Directory Properties:
stable/7/contrib/groff/ (props changed)
stable/7/gnu/usr.bin/groff/ (props changed)
Modified: stable/7/contrib/groff/font/devutf8/R.proto
==============================================================================
--- stable/7/contrib/groff/font/devutf8/R.proto Sun Feb 13 21:52:26 2011 (r218670)
+++ stable/7/contrib/groff/font/devutf8/R.proto Sun Feb 13 22:09:33 2011 (r218671)
@@ -726,7 +726,7 @@ st 24 0 0x220B
product 24 0 0x220F
coproduct 24 0 0x2210
sum 24 0 0x2211
-\- 24 0 0x002D
+\- 24 0 0x2212
mi "
-+ 24 0 0x2213
** 24 0 0x2217
Modified: stable/7/contrib/groff/tmac/an-old.tmac
==============================================================================
--- stable/7/contrib/groff/tmac/an-old.tmac Sun Feb 13 21:52:26 2011 (r218670)
+++ stable/7/contrib/groff/tmac/an-old.tmac Sun Feb 13 22:09:33 2011 (r218671)
@@ -630,6 +630,18 @@
. hy \n[HY]
.\}
.
+.\" For UTF-8, map some characters conservatively for the sake
+.\" of easy cut and paste.
+.
+.if '\*[.T]'utf8' \{\
+. rchar \- - ' `
+.
+. char \- \N'45'
+. char - \N'45'
+. char ' \N'39'
+. char ` \N'96'
+.\}
+.
.\" Load local modifications.
.mso man.local
.
Modified: stable/7/contrib/groff/tmac/doc-common
==============================================================================
--- stable/7/contrib/groff/tmac/doc-common Sun Feb 13 21:52:26 2011 (r218670)
+++ stable/7/contrib/groff/tmac/doc-common Sun Feb 13 22:09:33 2011 (r218671)
@@ -46,6 +46,7 @@
.nr %Q 1
.nr %R 1
.nr %T 1
+.nr %U 1
.nr %V 1
.nr Ac 3
.nr Ad 12n
@@ -77,6 +78,7 @@
.nr Dq 12n
.nr Ds 6n\" many manpages still use this as a -width value
.nr Dv 12n
+.nr Dx 1
.nr Ec 3
.nr Ef 8n\" ?
.nr Ek 8n\" ?
@@ -219,6 +221,7 @@
.\" NS doc-document-title
.\" NS doc-section
.\" NS doc-volume
+.\" NS doc-command-name
.\" NS
.\" NS local variables:
.\" NS doc-volume-as-XXX
@@ -319,6 +322,7 @@
. ds doc-document-title UNTITLED
. ds doc-volume LOCAL
. ds doc-section Null
+. ds doc-command-name
.
. if !"\$1"" \
. ds doc-document-title "\$1
@@ -357,6 +361,12 @@
. if !"\$3"" \
. if "\*[doc-volume]"LOCAL" \
. ds doc-volume \$3
+.
+. if !\n[cR] \
+. if \n[nl] \{\
+ . doc-setup-header
+. bp
+. \}
..
.
.
@@ -379,6 +389,7 @@
.\" NS
.\" NS modifies:
.\" NS doc-operating-system
+.\" NS doc-command-name
.\" NS
.\" NS local variables:
.\" NS doc-operating-system-XXX-XXX
@@ -435,9 +446,47 @@
.ds doc-operating-system-NetBSD-2.0 2.0
.ds doc-operating-system-NetBSD-2.0.1 2.0.1
.ds doc-operating-system-NetBSD-2.0.2 2.0.2
+.ds doc-operating-system-NetBSD-2.0.3 2.0.3
.ds doc-operating-system-NetBSD-2.1 2.1
.ds doc-operating-system-NetBSD-3.0 3.0
+.ds doc-operating-system-NetBSD-3.0.1 3.0.1
+.ds doc-operating-system-NetBSD-3.0.2 3.0.2
+.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
@@ -486,23 +535,56 @@
.ds doc-operating-system-FreeBSD-6.0 6.0
.ds doc-operating-system-FreeBSD-6.1 6.1
.ds doc-operating-system-FreeBSD-6.2 6.2
+.ds doc-operating-system-FreeBSD-6.3 6.3
+.ds doc-operating-system-FreeBSD-6.4 6.4
.ds doc-operating-system-FreeBSD-7.0 7.0
-.
-.ds doc-operating-system-Darwin-8.0.0 8.0.0
-.ds doc-operating-system-Darwin-8.1.0 8.1.0
-.ds doc-operating-system-Darwin-8.2.0 8.2.0
-.ds doc-operating-system-Darwin-8.3.0 8.3.0
-.ds doc-operating-system-Darwin-8.4.0 8.4.0
-.ds doc-operating-system-Darwin-8.5.0 8.5.0
-.
-.ds doc-operating-system-DragonFly-1.0 1.0
-.ds doc-operating-system-DragonFly-1.1 1.1
-.ds doc-operating-system-DragonFly-1.2 1.2
-.ds doc-operating-system-DragonFly-1.3 1.3
-.ds doc-operating-system-DragonFly-1.4 1.4
-.ds doc-operating-system-DragonFly-1.5 1.5
+.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
+.ds doc-operating-system-Darwin-8.2.0 8.2.0
+.ds doc-operating-system-Darwin-8.3.0 8.3.0
+.ds doc-operating-system-Darwin-8.4.0 8.4.0
+.ds doc-operating-system-Darwin-8.5.0 8.5.0
+.ds doc-operating-system-Darwin-8.6.0 8.6.0
+.ds doc-operating-system-Darwin-8.7.0 8.7.0
+.ds doc-operating-system-Darwin-8.8.0 8.8.0
+.ds doc-operating-system-Darwin-8.9.0 8.9.0
+.ds doc-operating-system-Darwin-8.10.0 8.10.0
+.ds doc-operating-system-Darwin-8.11.0 8.11.0
+.ds doc-operating-system-Darwin-9.0.0 9.0.0
+.ds doc-operating-system-Darwin-9.1.0 9.1.0
+.ds doc-operating-system-Darwin-9.2.0 9.2.0
+.ds doc-operating-system-Darwin-9.3.0 9.3.0
+.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-DragonFly-1.0 1.0
+.ds doc-operating-system-DragonFly-1.1 1.1
+.ds doc-operating-system-DragonFly-1.2 1.2
+.ds doc-operating-system-DragonFly-1.3 1.3
+.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.8 1.8
+.ds doc-operating-system-DragonFly-1.8.1 1.8.1
+.ds doc-operating-system-DragonFly-1.10 1.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
+.
. ie "\$1"" \
. ds doc-operating-system "\*[doc-default-operating-system]
. el \{ .ie "\$1"ATT" \{\
@@ -528,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 \{\
@@ -536,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 \{\
@@ -548,7 +646,7 @@
. ds doc-operating-system \$1
. if !"\$2"" \
. as doc-operating-system " \$2
-. \}\}\}\}\}\}
+. \}\}\}\}\}\}\}\}
..
.
.
@@ -563,6 +661,7 @@
.\" NS
.\" NS modifies:
.\" NS doc-date-string
+.\" NS doc-command-name
.\" NS
.\" NS local variables:
.\" NS doc-date-XXX
@@ -583,6 +682,8 @@
.ds doc-date-12 December
.
.de Dd
+. ds doc-command-name
+.
. ie \n[.$] \{\
. ie (\n[.$] == 3) \
. ds doc-date-string \$1\~\$2 \$3
@@ -1128,6 +1229,8 @@
. tm doc-reference-title-count == \n[doc-reference-title-count]
. tm doc-reference-title-name == `\*[doc-reference-title-name]'
. tm doc-reference-title-name-for-book == `\*[doc-reference-title-name-for-book]'
+. tm doc-url-count == \n[doc-url-count]
+. tm doc-url-name == `\*[doc-url-name]'
. tm doc-volume-count == \n[doc-volume-count]
. tm doc-volume-name == `\*[doc-volume-name]'
. tm doc-have-author == \n[doc-have-author]
Modified: stable/7/contrib/groff/tmac/doc-old.tmac
==============================================================================
--- stable/7/contrib/groff/tmac/doc-old.tmac Sun Feb 13 21:52:26 2011 (r218670)
+++ stable/7/contrib/groff/tmac/doc-old.tmac Sun Feb 13 22:09:33 2011 (r218671)
@@ -40,7 +40,7 @@
.ds aD \fI
.\" Argument Reference Style
.ds aR \f(CO
-.\" Interactive Comand Modifier (flag)
+.\" Interactive Command Modifier (flag)
.ds cM \f(CB
.\" Emphasis (in the English sense - usually italics)
.ds eM \fI
Modified: stable/7/contrib/groff/tmac/doc-syms
==============================================================================
--- stable/7/contrib/groff/tmac/doc-syms Sun Feb 13 21:52:26 2011 (r218670)
+++ stable/7/contrib/groff/tmac/doc-syms Sun Feb 13 22:09:33 2011 (r218671)
@@ -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
@@ -651,6 +653,8 @@
.\" X/Open
.ds doc-str-St--susv2 Version\~2 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification
.as doc-str-St--susv2 " (\*[Lq]\*[doc-Tn-font-size]SUSv2\*[doc-str-St]\*[Rq])
+.ds doc-str-St--susv3 Version\~3 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification
+.as doc-str-St--susv3 " (\*[Lq]\*[doc-Tn-font-size]SUSv3\*[doc-str-St]\*[Rq])
.ds doc-str-St--svid4 System\~V Interface Definition, Fourth Edition
.as doc-str-St--svid4 " (\*[Lq]\*[doc-Tn-font-size]SVID\*[doc-str-St]\^4\*[Rq])
.ds doc-str-St--xbd5 \*[doc-Tn-font-size]X/Open\*[doc-str-St] System Interface Definitions Issue\~5
Modified: stable/7/contrib/groff/tmac/doc.tmac
==============================================================================
--- stable/7/contrib/groff/tmac/doc.tmac Sun Feb 13 21:52:26 2011 (r218670)
+++ stable/7/contrib/groff/tmac/doc.tmac Sun Feb 13 22:09:33 2011 (r218671)
@@ -356,10 +356,10 @@
. ds doc-macro-name Fl
. doc-parse-args \$@
.
-. if !\n[.$] \{\
-. \" no arguments
+. \" no arguments
+. if !\n[.$] \
. nop \|\-\|\f[]\s[0]
-. \}\}
+. \}
.
. if !\n[doc-arg-limit] \
. return
@@ -481,8 +481,8 @@
. el \{\
. nr doc-reg-dpr \n[doc-arg-ptr]
.
+. \" the `\%' prevents hyphenation on a dash (`-')
. ie (\n[doc-reg-dpr1] == 2) \
-. \" the `\%' prevents hyphenation on a dash (`-')
. nop \%\*[doc-str-dpr]\&\c
. el \{\
. \" punctuation character
@@ -595,10 +595,10 @@
. ds doc-macro-name Ar
. doc-parse-args \$@
.
-. if !\n[.$] \{\
-. \" no argument
+. \" no argument
+. if !\n[.$] \
. nop \)\*[doc-str-Ar-default]\&\f[]\s[0]
-. \}\}
+. \}
.
. if !\n[doc-arg-limit] \
. return
@@ -1034,10 +1034,10 @@
. ds doc-macro-name Pa
. doc-parse-args \$@
.
-. if !\n[.$] \{\
-. \" default value
+. \" default value
+. if !\n[.$] \
. nop \*[doc-Pa-font]~\f[]\s[0]
-. \}\}
+. \}
.
. if !\n[doc-arg-limit] \
. return
@@ -3430,6 +3430,8 @@
. nr doc-reference-title-count-saved \n[doc-reference-title-count]
. ds doc-reference-title-name-saved "\*[doc-reference-title-name]
. ds doc-reference-title-name-for-book-saved "\*[doc-reference-title-name-for-book]
+. nr doc-url-count-saved \n[doc-url-count]
+. ds doc-url-name-saved "\*[doc-url-name]
. nr doc-volume-count-saved \n[doc-volume-count]
. ds doc-volume-name-saved "\*[doc-volume-name]
. nr doc-have-author-saved \n[doc-have-author]
@@ -3570,6 +3572,8 @@
. nr doc-reference-title-count \n[doc-reference-title-count-saved]
. ds doc-reference-title-name "\*[doc-reference-title-name-saved]
. ds doc-reference-title-name-for-book "\*[doc-reference-title-name-for-book-saved]
+. nr doc-url-count \n[doc-url-count-saved]
+. ds doc-url-name "\*[doc-url-name-saved]
. nr doc-volume-count \n[doc-volume-count-saved]
. ds doc-volume-name "\*[doc-volume-name-saved]
. nr doc-have-author \n[doc-have-author-saved]
@@ -5194,6 +5198,8 @@
.\" NS doc-reference-title-name-for-book
.\" NS doc-report-count
.\" NS doc-report-name
+.\" NS doc-url-count
+.\" NS doc-url-name
.\" NS doc-volume-count
.\" NS doc-volume-name
.
@@ -5208,6 +5214,7 @@
. nr doc-corporate-count 0
. nr doc-report-count 0
. nr doc-reference-title-count 0
+. nr doc-url-count 0
. nr doc-volume-count 0
. nr doc-date-count 0
. nr doc-page-number-count 0
@@ -5222,6 +5229,7 @@
. ds doc-report-name
. ds doc-reference-title-name
. ds doc-reference-title-name-for-book
+. ds doc-url-name
. ds doc-volume-name
. ds doc-date
. ds doc-page-number-string
@@ -5316,6 +5324,13 @@
. doc-finish-reference \n[doc-volume-count]
. \}
.
+. if \n[doc-url-count] \{\
+. unformat doc-url-name
+. chop doc-url-name
+. nop \*[doc-url-name]\c
+. doc-finish-reference \n[doc-url-count]
+. \}
+.
. if \n[doc-page-number-count] \{\
. unformat doc-page-number-string
. chop doc-page-number-string
@@ -6019,6 +6034,18 @@
..
.
.
+.\" NS doc-url-count global register
+.\" NS counter of hypertext references
+.
+.nr doc-url-count 0
+.
+.
+.\" NS doc-url-name global box
+.\" NS string of collected hypertext references
+.
+.ds doc-url-name
+.
+.
.\" NS doc-volume-count global register
.\" NS counter of reference title references
.
@@ -6031,6 +6058,48 @@
.ds doc-volume-name
.
.
+.\" NS %U user macro
+.\" NS hypertext reference
+.\" NS
+.\" NS modifies:
+.\" NS doc-arg-ptr
+.\" NS doc-curr-font
+.\" NS doc-curr-size
+.\" NS doc-macro-name
+.\" NS doc-reference-count
+.\" NS doc-url-count
+.\" NS
+.\" NS local variables:
+.\" NS doc-env-%U
+.\" NS
+.\" NS width register `%U' set in doc-common
+.
+.de %U
+. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+. tm Usage: .%U URL ... (#\n[.c])
+. return
+. \}
+.
+. nr doc-url-count +1
+. nr doc-reference-count +1
+.
+. ds doc-macro-name %U
+. 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-url-name
+. ev doc-env-%U
+. evc 0
+. in 0
+. nf
+. doc-do-references
+..
+.
+.
.\" NS %V user macro
.\" NS reference volume
.\" NS
@@ -6039,7 +6108,7 @@
.\" NS doc-curr-font
.\" NS doc-curr-size
.\" NS doc-macro-name
-.\" NS doc-reference-title-count
+.\" NS doc-reference-count
.\" NS doc-volume-count
.\" NS
.\" NS local variables:
@@ -6428,6 +6497,19 @@
.ec
.
.
+.\" For UTF-8, map some characters conservatively for the sake
+.\" of easy cut and paste.
+.
+.if '\*[.T]'utf8' \{\
+. rchar \- - ' `
+.
+. char \- \N'45'
+. char - \N'45'
+. char ' \N'39'
+. char ` \N'96'
+.\}
+.
+.
.\" load local modifications
.mso mdoc.local
.
Modified: stable/7/contrib/groff/tmac/groff_mdoc.man
==============================================================================
--- stable/7/contrib/groff/tmac/groff_mdoc.man Sun Feb 13 21:52:26 2011 (r218670)
+++ stable/7/contrib/groff/tmac/groff_mdoc.man Sun Feb 13 22:09:33 2011 (r218671)
@@ -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
@@ -864,16 +864,23 @@ the release ID.
.It NetBSD
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, 2.0, 2.0.1, 2.0.2, 2.1, 3.0
+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, 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, 7.0
+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.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.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
.El
.Ed
.Pp
@@ -1586,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
@@ -1616,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
@@ -1784,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
@@ -1972,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
.
@@ -1991,10 +2005,12 @@ 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
+.St -susv3
.It Li \-svid4
.St -svid4
.It Li \-xbd5
@@ -2552,6 +2568,8 @@ Corporate or foreign author.
Report name.
.It Li .%T
Title of article.
+.It Li .%U
+Optional hypertext reference.
.It Li .%V
Volume.
.El
@@ -4086,11 +4104,12 @@ Definitions used for all other devices.
.It Pa mdoc.local
Local additions and customizations.
.It Pa andoc.tmac
-This file checks whether the
+Use this file if you don't know whether the
.Nm \-mdoc
or the
.Nm \-man
package should be used.
+Multiple man pages (in either format) can be handled.
.El
.
.
Modified: stable/7/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- stable/7/gnu/usr.bin/groff/tmac/mdoc.local Sun Feb 13 21:52:26 2011 (r218670)
+++ stable/7/gnu/usr.bin/groff/tmac/mdoc.local Sun Feb 13 22:09:33 2011 (r218671)
@@ -67,14 +67,6 @@
.ds doc-default-operating-system FreeBSD\~7.4
.
.\" FreeBSD releases not found in doc-common
-.ds doc-operating-system-FreeBSD-6.3 6.3
-.ds doc-operating-system-FreeBSD-6.4 6.4
-.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-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
.
More information about the svn-src-stable-7
mailing list