PERFORCE change 127213 for review
John Birrell
jb at FreeBSD.org
Thu Oct 4 19:13:10 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127213
Change 127213 by jb at jb_freebsd1 on 2007/10/05 02:12:39
IF6
Affected files ...
.. //depot/projects/dtrace6/src/contrib/groff/tmac/doc-common#2 integrate
.. //depot/projects/dtrace6/src/contrib/groff/tmac/doc-syms#2 integrate
.. //depot/projects/dtrace6/src/contrib/groff/tmac/groff_mdoc.man#2 integrate
.. //depot/projects/dtrace6/src/crypto/openssl/ssl/ssl_lib.c#2 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate
.. //depot/projects/dtrace6/src/sbin/adjkerntz/adjkerntz.c#2 integrate
.. //depot/projects/dtrace6/src/sys/alpha/isa/isa.c#2 integrate
.. //depot/projects/dtrace6/src/sys/alpha/pci/apecs_pci.c#2 integrate
.. //depot/projects/dtrace6/src/sys/alpha/pci/lca_pci.c#2 integrate
.. //depot/projects/dtrace6/src/sys/alpha/pci/pcibus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/dtrace6/src/sys/arm/arm/nexus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/dtrace6/src/sys/arm/xscale/i80321/obio.c#2 integrate
.. //depot/projects/dtrace6/src/sys/conf/files.amd64#3 integrate
.. //depot/projects/dtrace6/src/sys/conf/files.i386#3 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/eth_z8e.dat.gz.uu#2 delete
.. //depot/projects/dtrace6/src/sys/dev/mxge/eth_z8e.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 delete
.. //depot/projects/dtrace6/src/sys/dev/mxge/ethp_z8e.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/mcp_gen_header.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_eth_z8e.c#1 branch
.. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_ethp_z8e.c#1 branch
.. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_lro.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_mcp.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/dtrace6/src/sys/i386/i386/nexus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/ia64/ia64/nexus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/modules/mxge/mxge_eth_z8e/Makefile#2 integrate
.. //depot/projects/dtrace6/src/sys/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/powermac/macio.c#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/psim/iobus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/ebus/ebus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/vm/vnode_pager.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/Makefile#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/atalk.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/bpf.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/inet.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/inet6.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/ipsec.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/ipx.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/main.c#3 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/mbuf.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/mroute.c#3 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/mroute6.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/netgraph.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/netstat.h#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/pfkey.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/route.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/unix.c#2 integrate
Differences ...
==== //depot/projects/dtrace6/src/contrib/groff/tmac/doc-common#2 (text+ko) ====
@@ -431,11 +431,13 @@
.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-1.6.3 1.6.3
.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.1 2.1
.ds doc-operating-system-NetBSD-3.0 3.0
+.ds doc-operating-system-NetBSD-4.0 4.0
.
.ds doc-operating-system-FreeBSD-1.0 1.0
.ds doc-operating-system-FreeBSD-1.1 1.1
@@ -480,13 +482,25 @@
.ds doc-operating-system-FreeBSD-5.2.1 5.2.1
.ds doc-operating-system-FreeBSD-5.3 5.3
.ds doc-operating-system-FreeBSD-5.4 5.4
+.ds doc-operating-system-FreeBSD-5.5 5.5
.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-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
.
.de Os
. ie "\$1"" \
==== //depot/projects/dtrace6/src/contrib/groff/tmac/doc-syms#2 (text+ko) ====
@@ -204,13 +204,13 @@
.as doc-str-At-v7 " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
.ds doc-str-At-V \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V
.as doc-str-At-V " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.1
+.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~1
.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
+.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~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
+.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~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
+.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~4
.as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
.
.de At
@@ -260,6 +260,70 @@
..
.
.
+.\" NS Dx user macro
+.\" NS print DragonFly
+.\" NS
+.\" NS modifies:
+.\" NS doc-arg-ptr
+.\" NS doc-curr-font
+.\" NS doc-curr-size
+.\" NS doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS doc-str-Dx
+.\" NS doc-str-Dx1
+.\" NS
+.\" NS width register `Dx' defined in doc-common
+.
+.\" we use the doc-operating-system-DragonFly-* strings defined in doc-common
+.
+.de Dx
+. nr doc-curr-font \n[.f]
+. nr doc-curr-size \n[.ps]
+. ds doc-str-Dx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
+.
+. \" default value if no argument
+. ds doc-str-Dx1 \*[doc-Tn-font-size]\%DragonFly\*[doc-str-Dx]
+.
+. if !\n[doc-arg-limit] \
+. if \n[.$] \{\
+. ds doc-macro-name Dx
+. doc-parse-args \$@
+. \}
+.
+. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+. nr doc-arg-ptr +1
+. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\
+. ie d doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]] \
+. as doc-str-Dx1 \~\*[doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]]]
+. el \{\
+. tmc mdoc warning: .Dx: Unknown DragonFly version
+. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c])
+. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]]
+. \}\}
+. el \
+. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]]
+. \}
+. el \
+. nr doc-arg-ptr -1
+. \}
+.
+. \" replace current argument with result
+. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Dx1]
+. nr doc-type\n[doc-arg-ptr] 2
+. ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+. \" recompute space vector for remaining arguments
+. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+. nr doc-arg-limit \n[doc-arg-ptr]
+. if \n[doc-num-args] \
+. doc-parse-space-vector
+.
+. doc-print-recursive
+..
+.
+.
.\" NS Fx user macro
.\" NS print FreeBSD
.\" NS
@@ -543,6 +607,12 @@
.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])
+.ds doc-str-St--isoC-amd1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995
+.as doc-str-St--isoC-amd1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq])
+.ds doc-str-St--isoC-tcor1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994
+.as doc-str-St--isoC-tcor1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq])
+.ds doc-str-St--isoC-tcor2 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995
+.as doc-str-St--isoC-tcor2 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq])
.
.\" POSIX Part 1: System API
.ds doc-str-St--p1003.1 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1
@@ -604,6 +674,8 @@
.
.\" Miscellaneous
.ds doc-str-St--ieee754 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 754-1985
+.ds doc-str-St--ieee1275-94 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994
+.as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
.ds doc-str-St--iso8802-3 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 8802-3:1989
.
.de St
==== //depot/projects/dtrace6/src/contrib/groff/tmac/groff_mdoc.man#2 (text+ko) ====
@@ -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"
@@ -812,9 +813,9 @@
Local, OS-specific additions might be found in the file
.Pa mdoc.local ;
look for strings named
-.Ql volume-ds-XXX
+.Ql volume\-ds\-XXX
(for the former type) and
-.Ql volume-as-XXX
+.Ql volume\-as\-XXX
(for the latter type);
.Ql XXX
then denotes the keyword to be used with the
@@ -847,7 +848,7 @@
local additions might be defined in
.Pa mdoc.local ;
look for strings named
-.Ql operating-system-XXX-YYY ,
+.Ql operating\-system\-XXX\-YYY ,
where
.Ql XXX
is the acronym for the operating system and
@@ -868,9 +869,11 @@
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, 6.0, 6.1
+5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 7.0
+.It DragonFly
+1.0, 1.1, 1.2, 1.3, 1.4, 1.5
.It Darwin
-8.0.0, 8.1.0, 8.2.0, 8.3.0
+8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0
.El
.Ed
.Pp
@@ -1199,7 +1202,7 @@
If this is not desirable,
.
.Bd -literal -offset indent
-\&.An -nosplit
+\&.An \-nosplit
.Ed
.Pp
.
@@ -1207,7 +1210,7 @@
To turn splitting back on, write
.
.Bd -literal -offset indent
-\&.An -split
+\&.An \-split
.Ed
.
.Ss "Arguments"
@@ -1577,10 +1580,10 @@
.Sx RETURN VALUES
section.
.Pp
-.Dl Usage: .Rv Oo -std Oc Op Ao function Ac ...
+.Dl Usage: .Rv Oo \-std Oc Op Ao function Ac ...
.Pp
For example,
-.Ql ".Rv -std atexit"
+.Ql ".Rv \-std atexit"
produces:
.
.Bd -ragged -offset -indent
@@ -1607,10 +1610,10 @@
.Sx DIAGNOSTICS
section.
.Pp
-.Dl Usage: .Ex Oo -std Oc Op Ao utility Ac ...
+.Dl Usage: .Ex Oo \-std Oc Op Ao utility Ac ...
.Pp
For example,
-.Ql ".Ex -std cat"
+.Ql ".Ex \-std cat"
produces:
.
.Bd -ragged -offset -indent
@@ -1734,7 +1737,7 @@
Local, OS-specific additions might be found in the file
.Pa mdoc.local ;
look for strings named
-.Ql str-Lb-XXX .
+.Ql str\-Lb\-XXX .
.Ql XXX
then denotes the keyword to be used with the
.Ql .Lb
@@ -1752,16 +1755,16 @@
The
.Ql .Li
literal macro may be used for special characters, variable constants, etc.\&
--- anything which should be displayed as it would be typed.
+\- anything which should be displayed as it would be typed.
.Pp
.Dl Usage: .Li Ao argument Ac ...
.Pp
-.Bl -tag -width ".Li .Li\ cntrl-D\ )\ ," -compact -offset 15n
+.Bl -tag -width ".Li .Li\ cntrl\-D\ )\ ," -compact -offset 15n
.It Li ".Li \een"
.Li \en
.It Li ".Li M1 M2 M3 ;"
.Li M1 M2 M3 ;
-.It Li ".Li cntrl-D ) ,"
+.It Li ".Li cntrl\-D ) ,"
.Li cntrl-D ) ,
.It Li ".Li 1024 ..."
.Li 1024 ...
@@ -1809,7 +1812,7 @@
.Bl -tag -width ".Li .Nm\ groff_mdoc" -compact -offset 15n
.It Li ".Nm groff_mdoc"
.Nm groff_mdoc
-.It Li ".Nm \e-mdoc"
+.It Li ".Nm \e\-mdoc"
.Nm \-mdoc
.It Li ".Nm foo ) ) ,"
.Nm foo ) ) ,
@@ -1927,16 +1930,16 @@
.Pp
.Tn ANSI/ISO C
.Pp
-.Bl -tag -width ".Li -iso9945-1-90" -compact -offset indent
-.It Li -ansiC
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-ansiC
.St -ansiC
-.It Li -ansiC-89
+.It Li \-ansiC\-89
.St -ansiC-89
-.It Li -isoC
+.It Li \-isoC
.St -isoC
-.It Li -isoC-90
+.It Li \-isoC\-90
.St -isoC-90
-.It Li -isoC-99
+.It Li \-isoC\-99
.St -isoC-99
.El
.Pp
@@ -1944,30 +1947,30 @@
.Tn POSIX
Part 1: System API
.Pp
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
-.It Li -iso9945-1-90
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-iso9945\-1\-90
.St -iso9945-1-90
-.It Li -iso9945-1-96
+.It Li \-iso9945\-1\-96
.St -iso9945-1-96
-.It Li -p1003.1
+.It Li \-p1003.1
.St -p1003.1
-.It Li -p1003.1-88
+.It Li \-p1003.1\-88
.St -p1003.1-88
-.It Li -p1003.1-90
+.It Li \-p1003.1\-90
.St -p1003.1-90
-.It Li -p1003.1-96
+.It Li \-p1003.1\-96
.St -p1003.1-96
-.It Li -p1003.1b-93
+.It Li \-p1003.1b\-93
.St -p1003.1b-93
-.It Li -p1003.1c-95
+.It Li \-p1003.1c\-95
.St -p1003.1c-95
-.It Li -p1003.1g-2000
+.It Li \-p1003.1g\-2000
.St -p1003.1g-2000
-.It Li -p1003.1i-95
+.It Li \-p1003.1i\-95
.St -p1003.1i-95
-.It Li -p1003.1-2001
+.It Li \-p1003.1\-2001
.St -p1003.1-2001
-.It Li -p1003.1-2004
+.It Li \-p1003.1\-2004
.St -p1003.1-2004
.El
.Pp
@@ -1975,52 +1978,52 @@
.Tn POSIX
Part 2: Shell and Utilities
.Pp
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
-.It Li -iso9945-2-93
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-iso9945\-2\-93
.St -iso9945-2-93
-.It Li -p1003.2
+.It Li \-p1003.2
.St -p1003.2
-.It Li -p1003.2-92
+.It Li \-p1003.2\-92
.St -p1003.2-92
-.It Li -p1003.2a-92
+.It Li \-p1003.2a\-92
.St -p1003.2a-92
.El
.Pp
.
X/Open
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
.Pp
-.It Li -susv2
+.It Li \-susv2
.St -susv2
-.It Li -svid4
+.It Li \-svid4
.St -svid4
-.It Li -xbd5
+.It Li \-xbd5
.St -xbd5
-.It Li -xcu5
+.It Li \-xcu5
.St -xcu5
-.It Li -xcurses4.2
+.It Li \-xcurses4.2
.St -xcurses4.2
-.It Li -xns5
+.It Li \-xns5
.St -xns5
-.It Li -xns5.2
+.It Li \-xns5.2
.St -xns5.2
-.It Li -xpg3
+.It Li \-xpg3
.St -xpg3
-.It Li -xpg4
+.It Li \-xpg4
.St -xpg4
-.It Li -xpg4.2
+.It Li \-xpg4.2
.St -xpg4.2
-.It Li -xsh5
+.It Li \-xsh5
.St -xsh5
.El
.Pp
.
Miscellaneous
.Pp
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
-.It Li -ieee754
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-ieee754
.St -ieee754
-.It Li -iso8802-3
+.It Li \-iso8802\-3
.St -iso8802-3
.El
.
@@ -2110,7 +2113,7 @@
.Ss "BSD Macro"
.
.Pp
-.Dl "Usage: .Bx" Bro -alpha | -beta | -devel Brc ...
+.Dl "Usage: .Bx" Bro \-alpha | \-beta | \-devel Brc ...
.Dl " .Bx" Oo Ao version Ac Oo Ao release Ac Oc Oc ...
.Pp
.Bl -tag -width ".Li .Bx\ -devel" -compact -offset 15n
@@ -2169,6 +2172,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 "OpenBSD Macro"
.
.Pp
@@ -2362,7 +2384,7 @@
.Dq
.It Li ".Dq string abc ."
.Dq string abc .
-.It Li ".Dq \'^[A-Z]\'"
+.It Li ".Dq \'^[A\-Z]\'"
.Dq \'^[A-Z]\'
.It Li ".Ql man mdoc"
.Ql man mdoc
@@ -2555,7 +2577,7 @@
\&.%A "Matthew Bar"
\&.%A "John Foo"
\&.%T "Implementation Notes on foobar(1)"
-\&.%R "Technical Report ABC-DE-12-345"
+\&.%R "Technical Report ABC\-DE\-12\-345"
\&.%Q "Drofnats College, Nowhere"
\&.%D "April 1991"
\&.Re
@@ -2728,7 +2750,7 @@
.Pp
.Ql .Nd
first prints
-.Ql - ,
+.Ql \- ,
then all its arguments.
.
.It Li ".Sh LIBRARY"
@@ -3135,10 +3157,10 @@
.Ql .Dl
is parsed but not callable.
.Pp
-.Dl % ls -ldg /usr/local/bin
+.Dl % ls \-ldg /usr/local/bin
.Pp
The above was produced by:
-.Li ".Dl % ls -ldg /usr/local/bin" .
+.Li ".Dl % ls \e\-ldg /usr/local/bin" .
.
.It Li .Bd
Begin display.
@@ -3210,7 +3232,7 @@
macros, so one is guaranteed the two types of displays will line up.
The indentation value is normally set to\~6n or about two thirds of an inch
(six constant width characters).
-.It Ar indent-two
+.It Ar indent\-two
Indent two times the default indent value.
.It Ar right
This
@@ -3305,7 +3327,7 @@
A bullet list.
.
.Bd -literal -offset indent
-\&.Bl -bullet -offset indent -compact
+\&.Bl \-bullet \-offset indent \-compact
\&.It
Bullet one goes here.
\&.It
@@ -3329,7 +3351,7 @@
A dash list.
.
.Bd -literal -offset indent
-\&.Bl -dash -offset indent -compact
+\&.Bl \-dash \-offset indent \-compact
\&.It
Dash one goes here.
\&.It
@@ -3353,7 +3375,7 @@
An enumerated list.
.
.Bd -literal -offset indent
-\&.Bl -enum -offset indent -compact
+\&.Bl \-enum \-offset indent \-compact
\&.It
Item one goes here.
\&.It
@@ -3378,10 +3400,10 @@
flag (starting with the second-level list):
.
.Bd -literal -offset indent
-\&.Bl -enum -offset indent -compact
+\&.Bl \-enum \-offset indent \-compact
\&.It
Item one goes here
-\&.Bl -enum -nested -compact
+\&.Bl \-enum \-nested \-compact
\&.It
Item two goes here.
\&.It
@@ -3416,7 +3438,7 @@
without list markers.
.
.Bd -literal -offset indent
-\&.Bl -item -offset indent
+\&.Bl \-item \-offset indent
\&.It
Item one goes here.
Item one goes here.
@@ -3470,7 +3492,7 @@
The raw text:
.
.Bd -literal -offset indent
-\&.Bl -tag -width "PPID" -compact -offset indent
+\&.Bl \-tag \-width "PPID" \-compact \-offset indent
\&.It SL
sleep time of the process (seconds blocked)
\&.It PAGEIN
@@ -3479,10 +3501,10 @@
resulting from references by the process
to pages not loaded in core.
\&.It UID
-numerical user-id of process owner
+numerical user\-id of process owner
\&.It PPID
numerical id of parent of process priority
-(non-positive when in non-interruptible wait)
+(non\-positive when in non\-interruptible wait)
\&.El
.Ed
.Pp
@@ -3497,7 +3519,7 @@
Example:
.
.Bd -literal -offset indent
-\&.Bl -diag
+\&.Bl \-diag
\&.It You can't use Sy here.
The message says all.
\&.El
@@ -3527,7 +3549,7 @@
And the unformatted text which created it:
.
.Bd -literal -offset indent
-\&.Bl -hang -offset indent
+\&.Bl \-hang \-offset indent
\&.It Em Hanged
labels appear similar to tagged lists when the
label is smaller than the label width.
@@ -3561,7 +3583,7 @@
The raw text:
.
.Bd -literal -offset indent
-\&.Bl -ohang -offset indent
+\&.Bl \-ohang \-offset indent
\&.It Sy SL
sleep time of the process (seconds blocked)
\&.It Sy PAGEIN
@@ -3570,10 +3592,10 @@
resulting from references by the process
to pages not loaded in core.
\&.It Sy UID
-numerical user-id of process owner
+numerical user\-id of process owner
\&.It Sy PPID
numerical id of parent of process priority
-(non-positive when in non-interruptible wait)
+(non\-positive when in non\-interruptible wait)
\&.El
.Ed
.Pp
@@ -3606,7 +3628,7 @@
Here is the source text which produced the above example:
.
.Bd -literal -offset indent
-\&.Bl -inset -offset indent
+\&.Bl \-inset \-offset indent
\&.It Em Tag
The tagged list (also called a tagged paragraph)
is the most common type of list used in the
@@ -3671,12 +3693,18 @@
was produced by:
.
.Bd -literal
-\&.Bl -column -offset indent ".Sy String" ".Sy Nroff" ".Sy Troff"
+\&.Bl \-column \-offset indent ".Sy String" ".Sy Nroff" ".Sy Troff"
\&.It Sy String Ta Sy Nroff Ta Sy Troff
\&.It Li <= Ta <= Ta \e*(<=
\&.It Li >= Ta >= Ta \e*(>=
\&.El
.Ed
+.Pp
+.
+Don't abuse this list type!
+For more complicated cases it might be far better and easier to use
+.Xr tbl 1 ,
+the table preprocessor.
.El
.Pp
.
@@ -3698,7 +3726,7 @@
Example:
.
.Bd -literal -offset indent
-\&.Bl -tag -width ".Fl test Ao Ar string Ac"
+\&.Bl \-tag \-width ".Fl test Ao Ar string Ac"
\&.It Fl test Ao Ar string Ac
This is a longer sentence to show how the
\&.Fl width
@@ -4007,19 +4035,19 @@
.Xr groff 1 ,
resulting in multiple pages instead of a single, very long page:
.Pp
-.Dl groff -Tlatin1 -rcR=0 -mdoc foo.man > foo.txt
+.Dl groff \-Tlatin1 \-rcR=0 \-mdoc foo.man > foo.txt
.Pp
For double-sided printing, set register
.Ql D
to\~1:
.Pp
-.Dl groff -Tps -rD1 -mdoc foo.man > foo.ps
+.Dl groff \-Tps \-rD1 \-mdoc foo.man > foo.ps
.Pp
To change the document font size to 11pt or 12pt, set register
.Ql S
accordingly:
.Pp
-.Dl groff -Tdvi -rS11 -mdoc foo.man > foo.dvi
+.Dl groff \-Tdvi \-rS11 \-mdoc foo.man > foo.dvi
.Pp
Register
.Ql S
@@ -4033,7 +4061,7 @@
.Ql LT ,
respectively:
.Pp
-.Dl groff -Tutf8 -rLL=100n -rLT=100n -mdoc foo.man | less
+.Dl groff \-Tutf8 \-rLL=100n \-rLT=100n \-mdoc foo.man | less
.Pp
If not set, both registers default to 78n for TTY devices and 6.5i
otherwise.
==== //depot/projects/dtrace6/src/crypto/openssl/ssl/ssl_lib.c#2 (text+ko) ====
@@ -1149,7 +1149,6 @@
char *SSL_get_shared_ciphers(SSL *s,char *buf,int len)
{
char *p;
- const char *cp;
STACK_OF(SSL_CIPHER) *sk;
SSL_CIPHER *c;
int i;
@@ -1162,20 +1161,21 @@
sk=s->session->ciphers;
for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
{
- /* Decrement for either the ':' or a '\0' */
- len--;
+ int n;
+
c=sk_SSL_CIPHER_value(sk,i);
- for (cp=c->name; *cp; )
+ n=strlen(c->name);
+ if (n+1 > len)
{
- if (len-- <= 0)
- {
- *p='\0';
- return(buf);
- }
- else
- *(p++)= *(cp++);
+ if (p != buf)
+ --p;
+ *p='\0';
+ return buf;
}
+ strcpy(p,c->name);
+ p+=n;
*(p++)=':';
+ len-=n+1;
}
p[-1]='\0';
return(buf);
==== //depot/projects/dtrace6/src/gnu/usr.bin/groff/tmac/mdoc.local#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.48.2.9 2006/09/16 01:31:48 kensmith Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.48.2.11 2007/10/04 04:56:41 ru Exp $
.\"
.\" %beginstrip%
.
@@ -58,13 +58,14 @@
.ds doc-str-Lb-libugidfw File System Firewall Interface Library (libugidfw, \-lugidfw)
.ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl)
.
+.\" FreeBSD architectures not found in doc-common
+.ds doc-volume-as-arm arm
+.
.\" Default .Os value
.ds doc-default-operating-system FreeBSD\~6.2
.
.\" FreeBSD releases not found in doc-common
-.ds doc-operating-system-FreeBSD-5.5 5.5
-.ds doc-operating-system-FreeBSD-6.2 6.2
-.ds doc-operating-system-FreeBSD-7.0 7.0
+.ds doc-operating-system-FreeBSD-6.3 6.3
.
.ec
.
==== //depot/projects/dtrace6/src/sbin/adjkerntz/adjkerntz.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.29 2004/04/27 14:43:03 ghelmer Exp $");
+__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.29.8.1 2007/10/02 05:44:53 ru Exp $");
/*
* Andrey A. Chernov <ache at astral.msk.su> Dec 20 1993
@@ -127,7 +127,13 @@
(void) signal(SIGHUP, SIG_IGN);
- if (init && daemon(0, 1)) {
+ if (init && daemon(0,
+#ifdef DEBUG
+ 1
+#else
+ 0
+#endif
+ )) {
syslog(LOG_ERR, "daemon: %m");
return 1;
}
==== //depot/projects/dtrace6/src/sys/alpha/isa/isa.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.1 2006/03/10 19:37:30 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.2 2007/10/03 20:41:32 jhb Exp $");
#define __RMAN_RESOURCE_VISIBLE
#include <sys/param.h>
@@ -232,6 +232,7 @@
res = rman_reserve_resource(&isa_drq_rman, start, start, 1,
0, child);
+ rman_set_rid(res, *rid);
if (res && !passthrough) {
rle = resource_list_find(rl, type, *rid);
rle->start = rman_get_start(res);
==== //depot/projects/dtrace6/src/sys/alpha/pci/apecs_pci.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15.10.1 2007/10/03 20:41:33 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,12 +79,17 @@
apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid,
u_long start, u_long end, u_long count, u_int flags)
{
+ struct resource *rv = NULL;
+
if ((hwrpb->rpb_type == ST_DEC_2100_A50) &&
(type == SYS_RES_IRQ))
- return isa_alloc_intr(bus, child, start);
+ rv = isa_alloc_intr(bus, child, start);
else
- return alpha_pci_alloc_resource(bus, child, type, rid,
- start, end, count, flags);
+ rv = alpha_pci_alloc_resource(bus, child, type, rid,
+ start, end, count, flags);
+ if (rv != NULL)
+ rman_set_rid(rv, *rid);
+ return (rv);
}
static int
==== //depot/projects/dtrace6/src/sys/alpha/pci/lca_pci.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17.10.1 2007/10/03 20:41:33 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,11 +78,16 @@
lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid,
u_long start, u_long end, u_long count, u_int flags)
{
+ struct resource *rv = NULL;
+
if (type == SYS_RES_IRQ)
- return isa_alloc_intr(bus, child, start);
+ rv = isa_alloc_intr(bus, child, start);
else
- return alpha_pci_alloc_resource(bus, child, type, rid,
- start, end, count, flags);
+ rv = alpha_pci_alloc_resource(bus, child, type, rid,
+ start, end, count, flags);
+ if (rv != NULL)
+ rman_set_rid(rv, *rid);
+ return (rv);
}
static int
==== //depot/projects/dtrace6/src/sys/alpha/pci/pcibus.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36 2005/01/05 20:05:52 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36.2.1 2007/10/03 20:41:33 jhb Exp $");
#include "opt_isa.h"
@@ -97,7 +97,12 @@
alpha_platform_alloc_ide_intr(int chan)
{
int irqs[2] = { 14, 15 };
- return isa_alloc_intr(0, 0, irqs[chan]);
+ struct resource *rv;
+
+ rv = isa_alloc_intr(0, 0, irqs[chan]);
+ if (rv != NULL)
+ rman_set_rid(rv, *rid);
+ return (rv);
}
int
@@ -230,9 +235,11 @@
#ifdef DEV_ISA
if((start >= ISA_IRQ_OFFSET) &&
(end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) {
- return isa_alloc_intrs(bus, child,
- start - ISA_IRQ_OFFSET,
- end - ISA_IRQ_OFFSET);
+ rv = isa_alloc_intrs(bus, child,
+ start - ISA_IRQ_OFFSET, end - ISA_IRQ_OFFSET);
+ if (rv != NULL)
+ rman_set_rid(rv, *rid);
+ return (rv);
}
else
#endif
@@ -252,6 +259,7 @@
if (rv == 0)
return 0;
+ rman_set_rid(rv, *rid);
rman_set_bustag(rv, ALPHAPCI_GET_BUSTAG(bus, type));
rman_set_bushandle(rv, rv->r_start);
switch (type) {
==== //depot/projects/dtrace6/src/sys/amd64/amd64/nexus.c#2 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list