Re: mdoc(7) update

[Francis Gudin <fgudin@xxxxxxxxx>]

OK, the discussion on docs@ went to this agreement: we'll maintain two
digits versioning, both for RELEASEs and DEVELOPMENT (i.e. 1.0, 1.1,
1.2, 1.3, 1.4 and 1.5 for now).

Here's the last version of the patch:

# HG changeset patch
# User doudou@xxxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 9a1cc63d0b8d22bffbd36884e46cf2e95ce7758b
# Parent  9e29131af0ec093e5264a0c890631752475741da
Update to groff_mdoc(7) to include the DragonFly macro (Dx)                                                                                                           

It also updates DragonFly known versions data.

diff -r 9e29131af0ec -r 9a1cc63d0b8d gnu/usr.bin/groff/tmac/Makefile
--- a/gnu/usr.bin/groff/tmac/Makefile	Fri Mar  3 20:25:46 2006
+++ b/gnu/usr.bin/groff/tmac/Makefile	Tue Mar  7 01:01:08 2006
@@ -49,7 +49,7 @@
 SPECIALFILES=	an.tmac man.tmac s.tmac ms.tmac www.tmac
 STRIPFILES=	e.tmac doc.tmac mdoc.local
 MDOCFILES=	doc-common doc-ditroff doc-nroff doc-syms \
-		fr.ISO8859-1 ru.KOI8-R
+		fr.ISO8859-1 groff_mdoc.man ru.KOI8-R
 
 all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} ${NORMALFILES:S/$/-s/}
 
--- a/gnu/usr.bin/groff/tmac/mdoc.local	Fri Mar  3 20:25:46 2006
+++ b/gnu/usr.bin/groff/tmac/mdoc.local	Tue Mar  7 01:01:08 2006
@@ -77,14 +77,9 @@
 .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.0 1.3.0
-.ds doc-operating-system-DragonFly-1.3.1 1.3.1
-.ds doc-operating-system-DragonFly-1.3.2 1.3.2
-.ds doc-operating-system-DragonFly-1.3.3 1.3.3
-.ds doc-operating-system-DragonFly-1.3.4 1.3.4
-.ds doc-operating-system-DragonFly-1.3.5 1.3.5
-.ds doc-operating-system-DragonFly-1.3.6 1.3.6
-.ds doc-operating-system-DragonFly-1.3.7 1.3.7
+.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
 .
 .\" FreeBSD releases not found in doc-common.
 .ds doc-operating-system-FreeBSD-4.11 4.11

diff -r 9e29131af0ec -r 9a1cc63d0b8d gnu/usr.bin/groff/tmac/patches/groff_mdoc.man.patch
--- /dev/null	Fri Mar  3 20:25:46 2006
+++ b/gnu/usr.bin/groff/tmac/patches/groff_mdoc.man.patch	Tue Mar  7 01:01:08 2006
@@ -0,0 +1,46 @@
+--- ../../../../contrib/groff-1.19/tmac/groff_mdoc.man	2006-02-13 16:06:01.000000000 +0100
++++ groff_mdoc.man	2006-03-07 01:54:13.000000000 +0100
+@@ -183,6 +183,7 @@
+ .    It "BSD Macro"
+ .    It "NetBSD Macro"
+ .    It "FreeBSD Macro"
++.    It "DragonFly Macro"
+ .    It "OpenBSD Macro"
+ .    It "BSD/OS Macro"
+ .    It "UNIX Macro"
+@@ -869,6 +870,9 @@
+ 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, 5.0, 5.1, 5.2,
+ 5.2.1, 5.3
++.It DragonFly
++1.0, 1.1, 1.2, 1.3.0, 1.3.1, 1.3.2, 1.3.3, 1.3.4, 1.3.5, 1.3.6, 1.3.7, 1.4,                                                                                         
++1.5.0, 1.5.1
+ .El
+ .Ed
+ .Pp
+@@ -2148,6 +2152,25 @@
+ command above in section
+ .Sx "TITLE MACROS" .
+ .
++.Ss "DragonFly Macro"
++.
++.Pp
++.Dl Usage: .Dx Oo Ao version Ac Oc ...
++.Pp
++.Bl -tag -width ".Li .Dx\ 1.4\ ." -compact -offset 15n
++.It Li .Dx
++.Dx
++.It Li ".Dx 1.4 ."
++.Dx 1.4 .
++.El
++.Pp
++For possible values of
++.Ao version Ac
++see the description of the
++.Ql .Os
++command above in section
++.Sx "TITLE MACROS" .
++.
+ .Ss "FreeBSD Macro"
+ .
+ .Pp