PERFORCE change 56724 for review
Peter Wemm
peter at FreeBSD.org
Wed Jul 7 18:49:14 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=56724
Change 56724 by peter at peter_daintree on 2004/07/08 01:48:21
IFC @56723
Affected files ...
.. //depot/projects/hammer/etc/services#9 integrate
.. //depot/projects/hammer/gnu/usr.bin/Makefile#9 integrate
.. //depot/projects/hammer/lib/Makefile#36 integrate
.. //depot/projects/hammer/lib/libc/gen/ftw.3#2 integrate
.. //depot/projects/hammer/lib/libc/net/eui64.3#2 integrate
.. //depot/projects/hammer/lib/libc/stdlib/getenv.3#5 integrate
.. //depot/projects/hammer/lib/libc/sys/pathconf.2#4 integrate
.. //depot/projects/hammer/lib/libutil/humanize_number.3#2 integrate
.. //depot/projects/hammer/libexec/tftpd/tftpd.8#3 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#10 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#6 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#8 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#4 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#4 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#72 integrate
.. //depot/projects/hammer/sbin/devd/devd.8#9 integrate
.. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#3 integrate
.. //depot/projects/hammer/sbin/geom/class/label/glabel.8#3 integrate
.. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#3 integrate
.. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#3 integrate
.. //depot/projects/hammer/sbin/geom/core/geom.8#2 integrate
.. //depot/projects/hammer/sbin/md5/md5.1#5 integrate
.. //depot/projects/hammer/sbin/pfctl/Makefile#3 integrate
.. //depot/projects/hammer/share/examples/mdoc/example.3#4 integrate
.. //depot/projects/hammer/share/man/man3/pthread_spin_lock.3#3 integrate
.. //depot/projects/hammer/share/man/man3/queue.3#4 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#44 integrate
.. //depot/projects/hammer/share/man/man4/acpi.4#26 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/cp.4#4 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#12 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/fe.4#4 integrate
.. //depot/projects/hammer/share/man/man4/pcm.4#9 integrate
.. //depot/projects/hammer/share/man/man5/bluetooth.hosts.5#2 integrate
.. //depot/projects/hammer/share/man/man5/bluetooth.protocols.5#2 integrate
.. //depot/projects/hammer/share/man/man5/eui64.5#2 integrate
.. //depot/projects/hammer/share/man/man5/make.conf.5#21 integrate
.. //depot/projects/hammer/share/man/man5/nsswitch.conf.5#4 integrate
.. //depot/projects/hammer/share/man/man8/rc.8#5 integrate
.. //depot/projects/hammer/share/man/man9/BUS_ADD_CHILD.9#2 integrate
.. //depot/projects/hammer/share/man/man9/BUS_CONFIG_INTR.9#4 integrate
.. //depot/projects/hammer/share/man/man9/VOP_CREATE.9#6 integrate
.. //depot/projects/hammer/share/man/man9/VOP_LISTEXTATTR.9#5 integrate
.. //depot/projects/hammer/share/man/man9/VOP_LOOKUP.9#5 integrate
.. //depot/projects/hammer/share/man/man9/VOP_RDWR.9#5 integrate
.. //depot/projects/hammer/share/man/man9/VOP_RENAME.9#6 integrate
.. //depot/projects/hammer/share/man/man9/alq.9#2 integrate
.. //depot/projects/hammer/share/man/man9/hexdump.9#4 integrate
.. //depot/projects/hammer/share/man/man9/ieee80211.9#3 integrate
.. //depot/projects/hammer/share/man/man9/ieee80211_crypto.9#2 integrate
.. //depot/projects/hammer/share/man/man9/ieee80211_input.9#2 integrate
.. //depot/projects/hammer/share/man/man9/ieee80211_ioctl.9#2 integrate
.. //depot/projects/hammer/share/man/man9/ieee80211_node.9#3 integrate
.. //depot/projects/hammer/share/man/man9/ieee80211_output.9#2 integrate
.. //depot/projects/hammer/share/man/man9/ieee80211_proto.9#2 integrate
.. //depot/projects/hammer/share/man/man9/ieee80211_radiotap.9#3 integrate
.. //depot/projects/hammer/share/man/man9/mbpool.9#5 integrate
.. //depot/projects/hammer/share/man/man9/mbuf.9#16 integrate
.. //depot/projects/hammer/share/man/man9/pci.9#4 integrate
.. //depot/projects/hammer/share/man/man9/runqueue.9#2 integrate
.. //depot/projects/hammer/share/man/man9/sema.9#3 integrate
.. //depot/projects/hammer/share/man/man9/swi.9#5 integrate
.. //depot/projects/hammer/share/man/man9/utopia.9#6 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#28 integrate
.. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#13 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#29 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#93 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#30 integrate
.. //depot/projects/hammer/sys/amd64/amd64/nexus.c#27 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#88 integrate
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#25 integrate
.. //depot/projects/hammer/sys/amd64/include/float.h#10 integrate
.. //depot/projects/hammer/sys/boot/common/loader.8#12 integrate
.. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#11 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#15 integrate
.. //depot/projects/hammer/sys/conf/files.alpha#15 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#49 integrate
.. //depot/projects/hammer/sys/conf/files.i386#35 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc.c#6 integrate
.. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#1 branch
.. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#1 branch
.. //depot/projects/hammer/sys/dev/fdc/fdcvar.h#1 branch
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#18 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#9 integrate
.. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#18 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#43 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#21 integrate
.. //depot/projects/hammer/sys/kern/vfs_init.c#7 integrate
.. //depot/projects/hammer/sys/modules/fdc/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/netgraph/Makefile#10 integrate
.. //depot/projects/hammer/sys/sys/mount.h#20 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#23 integrate
.. //depot/projects/hammer/tools/install.sh#3 integrate
.. //depot/projects/hammer/usr.bin/Makefile#33 integrate
.. //depot/projects/hammer/usr.bin/cut/cut.1#5 integrate
.. //depot/projects/hammer/usr.bin/find/find.1#12 integrate
.. //depot/projects/hammer/usr.bin/getopt/getopt.1#4 integrate
.. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.8#3 integrate
.. //depot/projects/hammer/usr.bin/lex/lex.1#3 integrate
.. //depot/projects/hammer/usr.bin/paste/paste.1#5 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#50 integrate
.. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.8#6 integrate
.. //depot/projects/hammer/usr.sbin/daemon/daemon.8#4 integrate
.. //depot/projects/hammer/usr.sbin/fdread/fdutil.c#4 integrate
.. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.8#5 integrate
.. //depot/projects/hammer/usr.sbin/watchdogd/watchdog.8#4 integrate
Differences ...
==== //depot/projects/hammer/etc/services#9 (text+ko) ====
@@ -16,7 +16,7 @@
# Kerberos services are for Kerberos v4, and are unofficial. Sites running
# v5 should uncomment v5 entries and comment v4 entries.
#
-# $FreeBSD: src/etc/services,v 1.99 2004/05/27 23:42:26 mlaier Exp $
+# $FreeBSD: src/etc/services,v 1.100 2004/07/07 06:15:32 cperciva Exp $
# From: @(#)services 5.8 (Berkeley) 5/9/91
#
# WELL KNOWN PORT NUMBERS
@@ -1073,10 +1073,10 @@
acp 599/udp #Aeolon Core Protocol
ipcserver 600/tcp #Sun IPC server
ipcserver 600/udp #Sun IPC server
+urm 606/tcp #Cray Unified Resource Manager
+urm 606/udp #Cray Unified Resource Manager
nqs 607/tcp
nqs 607/udp
-urm 606/tcp #Cray Unified Resource Manager
-urm 606/udp #Cray Unified Resource Manager
sift-uft 608/tcp #Sender-Initiated/Unsolicited File Transfer
sift-uft 608/udp #Sender-Initiated/Unsolicited File Transfer
npmp-trap 609/tcp
@@ -1908,11 +1908,11 @@
ospfd 2604/tcp #OSPFd vty
bgpd 2605/tcp #BGPd vty
ospf6d 2606/tcp #OSPF6d vty
+dict 2628/tcp #RFC 2229
+dict 2628/udp #RFC 2229
listen 2766/tcp #System V listener port
www-dev 2784/tcp #world wide web - development
www-dev 2784/udp #world wide web - development
-dict 2628/tcp #RFC 2229
-dict 2628/udp #RFC 2229
eppc 3031/tcp #Remote AppleEvents/PPC Toolbox
eppc 3031/udp #Remote AppleEvents/PPC Toolbox
NSWS 3049/tcp
@@ -1925,27 +1925,27 @@
dec-notes 3333/tcp #DEC Notes
dec-notes 3333/udp #DEC Notes
rdp 3389/tcp #Microsoft Remote Desktop Protocol
-rsvp-encap 3455/udp #RSVP encapsulated in UDP
-nut 3493/tcp #Network UPS Tools
-nut 3493/udp #Network UPS Tools
-mapper-nodemgr 3984/tcp #MAPPER network node manager
-mapper-nodemgr 3984/udp #MAPPER network node manager
-mapper-mapethd 3985/tcp #MAPPER TCP/IP server
-mapper-mapethd 3985/udp #MAPPER TCP/IP server
-mapper-ws_ethd 3986/tcp #MAPPER workstation server
-mapper-ws_ethd 3986/udp #MAPPER workstation server
bmap 3421/tcp #Bull Apprise portmapper
bmap 3421/udp #Bull Apprise portmapper
prsvp 3455/tcp #RSVP Port
prsvp 3455/udp #RSVP Port
+rsvp-encap 3455/udp #RSVP encapsulated in UDP
vat 3456/tcp #VAT default data
vat 3456/udp #VAT default data
vat-control 3457/tcp #VAT default control
vat-control 3457/udp #VAT default control
+nut 3493/tcp #Network UPS Tools
+nut 3493/udp #Network UPS Tools
svn 3690/tcp #Subversion
svn 3690/udp #Subversion
udt_os 3900/tcp #Unidata UDT OS
udt_os 3900/udp #Unidata UDT OS
+mapper-nodemgr 3984/tcp #MAPPER network node manager
+mapper-nodemgr 3984/udp #MAPPER network node manager
+mapper-mapethd 3985/tcp #MAPPER TCP/IP server
+mapper-mapethd 3985/udp #MAPPER TCP/IP server
+mapper-ws_ethd 3986/tcp #MAPPER workstation server
+mapper-ws_ethd 3986/udp #MAPPER workstation server
netcheque 4008/tcp #NetCheque accounting
netcheque 4008/udp #NetCheque accounting
lockd 4045/udp # NFS lock daemon/manager
@@ -2080,10 +2080,10 @@
afs3-rmtsys 7009/udp #remote cache manager service
afs3-resserver 7010/tcp #MR-AFS residence server
afs3-resserver 7010/udp #MR-AFS residence server
+ups-onlinet 7010/tcp #onlinet uninterruptable power supplies
+ups-onlinet 7010/udp #onlinet uninterruptable power supplies
afs3-remio 7011/tcp #MR-AFS remote IO server
afs3-remio 7011/udp #MR-AFS remote IO server
-ups-onlinet 7010/tcp #onlinet uninterruptable power supplies
-ups-onlinet 7010/udp #onlinet uninterruptable power supplies
font-service 7100/tcp #X Font Service
font-service 7100/udp #X Font Service
fodms 7200/tcp #FODMS FLIP
@@ -2104,14 +2104,14 @@
isode-dua 17007/udp
biimenu 18000/tcp #Beckman Instruments, Inc.
biimenu 18000/udp #Beckman Instruments, Inc.
-dbbrowse 47557/tcp #Databeam Corporation
-dbbrowse 47557/udp #Databeam Corporation
wnn4 22273/tcp #Wnn4 (Japanese input)
+wnn6 22273/tcp #Wnn6 (Japanese input)
wnn4_Cn 22289/tcp #Wnn4 (Chinese input)
+wnn6_Cn 22289/tcp #Wnn6 (Chinese input)
+wnn4_Kr 22305/tcp #Wnn4 (Korean input)
+wnn6_Kr 22305/tcp #Wnn6 (Korean input)
wnn4_Tw 22321/tcp #Wnn4 (Taiwanse input)
-wnn4_Kr 22305/tcp #Wnn4 (Korean input)
-wnn6 22273/tcp #Wnn6 (Japanese input)
-wnn6_Cn 22289/tcp #Wnn6 (Chinese input)
wnn6_Tw 22321/tcp #Wnn6 (Taiwanse input)
-wnn6_Kr 22305/tcp #Wnn6 (Korean input)
wnn6_DS 26208/tcp #Wnn6 (Dserver)
+dbbrowse 47557/tcp #Databeam Corporation
+dbbrowse 47557/udp #Databeam Corporation
==== //depot/projects/hammer/gnu/usr.bin/Makefile#9 (text+ko) ====
@@ -1,29 +1,49 @@
-# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.81 2004/06/25 07:15:13 marcel Exp $
+# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.82 2004/07/07 17:24:30 ru Exp $
-SUBDIR= bc ${_binutils} ${_cc} cpio dc dialog diff diff3 ${_gdb} \
- ${_gperf} grep gzip man patch rcs sdiff send-pr sort tar texinfo
-
+SUBDIR= bc \
+ ${_binutils} \
+ ${_cc} \
+ cpio \
+ ${_cvs} \
+ dc \
+ dialog \
+ diff \
+ diff3 \
+ ${_gdb} \
+ ${_gperf} \
+ grep \
+ ${_groff} \
+ gzip \
+ man \
+ patch \
+ rcs \
+ sdiff \
+ send-pr \
+ sort \
+ tar \
+ texinfo
+
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc"
NO_GDB= not yet
.endif
-.if !defined(NO_TOOLCHAIN)
-_cc=cc
-_binutils=binutils
-.if !defined(NO_GDB)
-_gdb=gdb
-.endif
-.endif
-
.if !defined(NO_CXX)
.if ${MACHINE_ARCH} != "powerpc"
-_gperf=gperf
+_gperf= gperf
.endif
-SUBDIR+=groff
+_groff= groff
.endif
.if !defined(NO_CVS)
-SUBDIR+=cvs
+_cvs= cvs
+.endif
+
+.if !defined(NO_TOOLCHAIN)
+_binutils= binutils
+_cc= cc
+.if !defined(NO_GDB)
+_gdb= gdb
+.endif
.endif
.include <bsd.subdir.mk>
==== //depot/projects/hammer/lib/Makefile#36 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.185 2004/05/14 19:52:35 bde Exp $
+# $FreeBSD: src/lib/Makefile,v 1.186 2004/07/07 22:48:30 emax Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -51,11 +51,12 @@
_libbind= libbind
.endif
-.if ${MACHINE_ARCH} == "i386"
.if !defined(NO_BLUETOOTH)
_libbluetooth= libbluetooth
_libsdp= libsdp
.endif
+
+.if ${MACHINE_ARCH} == "i386"
_compat= compat
_libncp= libncp
_libsmb= libsmb
==== //depot/projects/hammer/lib/libc/gen/ftw.3#2 (text+ko) ====
@@ -18,31 +18,30 @@
.\" Agency (DARPA) and Air Force Research Laboratory, Air Force
.\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
.\"
-.\" $FreeBSD: src/lib/libc/gen/ftw.3,v 1.1 2004/07/05 23:12:11 das Exp $
+.\" $FreeBSD: src/lib/libc/gen/ftw.3,v 1.2 2004/07/07 20:11:35 ru Exp $
.\"
.Dd July 5, 2004
.Dt FTW 3
.Os
.Sh NAME
-.Nm ftw, nftw
+.Nm ftw , nftw
.Nd traverse (walk) a file tree
.Sh SYNOPSIS
-.Fd #include <ftw.h>
+.In ftw.h
.Ft int
.Fo ftw
.Fa "const char *path"
-.Fa "int (*fn)(const char *, const struct stat *, int)"
+.Fa "int \*[lp]*fn\*[rp]\*[lp]const char *, const struct stat *, int\*[rp]"
.Fa "int maxfds"
.Fc
.Ft int
.Fo nftw
.Fa "const char *path"
-.Fa "int (*fn)(const\ char\ *, const\ struct\ stat\ *, int, struct\ FTW\ *)"
+.Fa "int \*[lp]*fn\*[rp]\*[lp](const char *, const struct stat *, int, struct FTW *\*[rp]"
.Fa "int maxfds"
.Fa "int flags"
.Fc
.Sh DESCRIPTION
-.Pp
The
.Fn ftw
and
@@ -54,15 +53,19 @@
.Fa fn .
The
.Fn ftw
-function passes this function a pointer to a NUL-terminated string containing
-the name of the object, a pointer to a stat structure corresponding to the
+function passes this function a pointer to a
+.Dv NUL Ns
+-terminated string containing
+the name of the object, a pointer to a
+.Vt stat
+structure corresponding to the
object, and an integer flag.
The
.Fn nftw
function passes the aforementioned arguments plus a pointer to a
-.Dv FTW
+.Vt FTW
structure as defined by
-.Aq Pa ftw.h
+.In ftw.h
(shown below):
.Bd -literal
struct FTW {
@@ -74,7 +77,7 @@
Possible values for the flag passed to
.Fa fn
are:
-.Bl -tag -width FTW_DNR
+.Bl -tag -width ".Dv FTW_DNR"
.It Dv FTW_F
A regular file.
.It Dv FTW_D
@@ -84,18 +87,20 @@
The directory will not be descended into.
.It Dv FTW_DP
A directory being visited in post-order
-.No ( Ns Fn nftw
+.Fn ( nftw
only).
.It Dv FTW_NS
A file for which no
.Xr stat 2
information was available.
-The contents of the stat structure are undefined.
+The contents of the
+.Vt stat
+structure are undefined.
.It Dv FTW_SL
A symbolic link.
.It Dv FTW_SLN
A symbolic link with a non-existent target
-.No ( Ns Fn nftw
+.Fn ( nftw
only).
.El
.Pp
@@ -115,9 +120,9 @@
function has an additional
.Fa flags
argument with the following possible values:
-.Bl -tag -width FTW_MOUNT
+.Bl -tag -width ".Dv FTW_MOUNT"
.It Dv FTW_PHYS
-Physical walk, don't follow symbolic links.
+Physical walk, do not follow symbolic links.
.It Dv FTW_MOUNT
The walk will not cross a mount point.
.It FTW_DEPTH
@@ -199,7 +204,8 @@
functions conform to
.St -p1003.1-2001 .
.Sh HISTORY
-These functions first appeared in System V Release 3.
+These functions first appeared in
+.At V.3 .
Their first
.Fx
appearance was in
==== //depot/projects/hammer/lib/libc/net/eui64.3#2 (text+ko) ====
@@ -54,9 +54,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/net/eui64.3,v 1.2 2004/06/01 19:30:13 brooks Exp $
+.\" $FreeBSD: src/lib/libc/net/eui64.3,v 1.3 2004/07/07 20:15:31 ru Exp $
.\"
-.Dd March 4 2004
+.Dd March 4, 2004
.Dt EUI64 3
.Os
.Sh NAME
@@ -198,7 +198,9 @@
.Sh NIS INTERACTION
If the
.Pa /etc/eui64
-contains a line with a single + in it, the
+contains a line with a single
+.Ql +
+in it, the
.Fn eui64_ntohost
and
.Fn eui64_hostton
==== //depot/projects/hammer/lib/libc/stdlib/getenv.3#5 (text+ko) ====
@@ -34,7 +34,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)getenv.3 8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.15 2004/07/06 23:21:36 hmp Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.16 2004/07/07 19:57:13 ru Exp $
.\"
.Dd December 11, 1993
.Dt GETENV 3
@@ -113,8 +113,9 @@
.Sh RETURN VALUES
The
.Fn getenv
-function returns the value of the environment variable as a nul terminated
-string.
+function returns the value of the environment variable as a
+.Dv NUL Ns
+-terminated string.
If the variable
.Fa name
is not in the current environment,
==== //depot/projects/hammer/lib/libc/sys/pathconf.2#4 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)pathconf.2 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/sys/pathconf.2,v 1.15 2003/01/07 05:06:27 keramida Exp $
+.\" $FreeBSD: src/lib/libc/sys/pathconf.2,v 1.16 2004/07/07 20:47:42 alfred Exp $
.\"
.Dd November 4, 2002
.Dt PATHCONF 2
@@ -94,7 +94,7 @@
.Xr chown 2
system call, otherwise 0.
.It Li _PC_NO_TRUNC
-Return 1 if file names longer than KERN_NAME_MAX are truncated.
+Return 1 if file names longer than _POSIX_NAME_MAX are truncated.
.It Li _PC_VDISABLE
Returns the terminal character disabling value.
.It Li _PC_ASYNC_IO
==== //depot/projects/hammer/lib/libutil/humanize_number.3#2 (text+ko) ====
@@ -1,5 +1,5 @@
.\" $NetBSD: humanize_number.3,v 1.4 2003/04/16 13:34:37 wiz Exp $
-.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.3 2004/05/25 20:11:50 pjd Exp $
+.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.4 2004/07/07 20:25:54 ru Exp $
.\"
.\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -46,17 +46,21 @@
.Sh SYNOPSIS
.In libutil.h
.Ft int
-.Fn humanize_number "char *buf" "size_t len" "int64_t number" "const char *suffix" "int scale" "int flags"
+.Fo humanize_number
+.Fa "char *buf" "size_t len" "int64_t number" "const char *suffix"
+.Fa "int scale" "int flags"
+.Fc
.Sh DESCRIPTION
The
.Fn humanize_number
-function formats the signed 64 bit quantity given in
+function formats the signed 64-bit quantity given in
.Fa number
into
.Fa buffer .
A space and then
.Fa suffix
is appended to the end.
+The buffer pointed to by
.Fa buffer
must be at least
.Fa len
@@ -76,12 +80,12 @@
The prefixes are:
.Bl -column "Prefix" "Description" "Multiplier" -offset indent
.It Sy "Prefix" Ta Sy "Description" Ta Sy "Multiplier"
-.It k kilo 1024
-.It M mega 1048576
-.It G giga 1073741824
-.It T tera 1099511627776
-.It P peta 1125899906842624
-.It E exa 1152921504606846976
+.It Li k Ta No kilo Ta 1024
+.It Li M Ta No mega Ta 1048576
+.It Li G Ta No giga Ta 1073741824
+.It Li T Ta No tera Ta 1099511627776
+.It Li P Ta No peta Ta 1125899906842624
+.It Li E Ta No exa Ta 1152921504606846976
.El
.Pp
The
@@ -92,14 +96,14 @@
.Fa buffer .
To use a specific prefix, specify this as
.Fa scale
-(Multiplier = 1024 ^ scale).
-This can not be combined with any of the
+(multiplier = 1024 ^ scale).
+This cannot be combined with any of the
.Fa scale
flags below.
.Pp
The following flags may be passed in
-.Pa scale :
-.Bl -tag -width Dv -offset indent
+.Fa scale :
+.Bl -tag -width ".Dv HN_DIVISOR_1000" -offset indent
.It Dv HN_AUTOSCALE
Format the buffer using the lowest multiplier possible.
.It Dv HN_GETSCALE
@@ -109,8 +113,8 @@
.El
.Pp
The following flags may be passed in
-.Pa flags :
-.Bl -tag -width Dv -offset indent
+.Fa flags :
+.Bl -tag -width ".Dv HN_DIVISOR_1000" -offset indent
.It Dv HN_DECIMAL
If the final result is less than 10, display it using one digit.
.It Dv HN_NOSPACE
@@ -118,7 +122,9 @@
.Fa number
and the prefix.
.It Dv HN_B
-Use 'B' (bytes) as prefix if the original result does not have a prefix.
+Use
+.Ql B
+(bytes) as prefix if the original result does not have a prefix.
.It Dv HN_DIVISOR_1000
Divide
.Fa number
@@ -129,7 +135,9 @@
.Fn humanize_number
function returns the number of characters stored in
.Fa buffer
-(excluding the terminating NUL) upon success, or \-1 upon failure.
+(excluding the terminating
+.Dv NUL )
+upon success, or \-1 upon failure.
If
.Dv HN_GETSCALE
is specified, the prefix index number will be returned instead.
==== //depot/projects/hammer/libexec/tftpd/tftpd.8#3 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.17 2004/05/24 22:56:15 mdodd Exp $
+.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.18 2004/07/07 19:57:14 ru Exp $
.\"
.Dd September 14, 2000
.Dt TFTPD 8
@@ -167,9 +167,12 @@
.It Fl U Ar umask
Set the
.Ar umask
-for newly created files. The default is 022 (S_IWGRP|S_IWOTH).
+for newly created files.
+The default is 022
+.Pq Dv S_IWGRP | S_IWOTH .
.It Fl w
-Allow writes requests to create new files. By default
+Allow writes requests to create new files.
+By default
.Nm
requires that the file specified in a write request exist.
.El
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#10 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.65 2004/04/19 19:47:03 wilko Exp $ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml,v 1.66 2004/07/07 13:11:58 den Exp $ -->
<sect1 id="support-proc">
<sect1info>
@@ -2794,7 +2794,7 @@
<para>ALI M1543C Ultra DMA66 IDE interface</para>
</listitem>
<listitem>
- <para>expansion: 2 64 bit PCI buses
+ <para>expansion: 2 64 bit PCI buses</para>
</listitem>
</itemizedlist>
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#6 (text+ko) ====
@@ -1,5 +1,5 @@
<!--
- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.8 2004/04/04 21:33:16 phantom Exp $
+ $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.9 2004/07/07 13:11:59 den Exp $
-->
<sect1 id="proc-ia64">
<title>Supported Processors and Motherboards</title>
@@ -15,7 +15,7 @@
<ulink url="http://perforce.FreeBSD.org/">Perforce repository</ulink>)</para>
</listitem>
<listitem>
- <para>HP i2000
+ <para>HP i2000</para>
</listitem>
<listitem>
<para>Intel 460GX</para>
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#8 (text+ko) ====
@@ -1,6 +1,6 @@
<!--
-$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/install.sgml,v 1.25 2004/06/07 22:57:05 murray Exp $
+$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/install.sgml,v 1.26 2004/07/07 13:11:59 den Exp $
install.sgml
@@ -70,6 +70,7 @@
installation menu unless you've adequately backed up any
important data first.</para>
</important>
+ </sect2>
<sect2>
<title>Hardware Requirements</title>
@@ -116,7 +117,7 @@
<!-- amd64 text starts here -->
<para arch="amd64">&os; for the &arch.print; requires an
- Athlon64, Athlon64-FX, Opteron or better processor to run.
+ Athlon64, Athlon64-FX, Opteron or better processor to run.</para>
<para arch="amd64">If you have an machine based on an
nVidia nForce3 Pro-150, you MUST use the BIOS setup to
@@ -816,6 +817,7 @@
is the port number of the proxy FTP server.</para>
</listitem>
</itemizedlist>
+ </para>
</sect4>
</sect3>
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#4 (text+ko) ====
@@ -1,5 +1,5 @@
<!--
- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/layout.sgml,v 1.6 2002/11/09 20:01:33 bmah Exp $
+ $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/layout.sgml,v 1.7 2004/07/07 13:11:59 den Exp $
This section contains the contents of the old LAYOUT.TXT file.
-->
@@ -48,7 +48,7 @@
<listitem>
<para><filename>docbook.css</filename> is a Cascading Style
Sheet (CSS) file used by some Web browsers for formatting the
- HTML documentation.
+ HTML documentation.</para>
</listitem>
<listitem>
<para>The <filename>base</filename>,
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#4 (text+ko) ====
@@ -1,5 +1,5 @@
<!--
- $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml,v 1.11 2003/03/08 09:56:08 markm Exp $
+ $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml,v 1.12 2004/07/07 13:11:59 den Exp $
This section contains the contents of the old UPGRADE.TXT
file.
@@ -36,7 +36,7 @@
a &os; 4-STABLE whose presence can be disruptive, but are not
removed by a binary upgrade. One notable example is that an old
<filename>/usr/include/g++</filename> directory will cause C++
- programs to compile incorrectly (or not at all).<para>
+ programs to compile incorrectly (or not at all).</para>
<para>These upgrade instructions are provided for the use of users
upgrading from relatively recent &os; &release.branch;
@@ -218,6 +218,6 @@
<para><filename>/usr/src/UPDATING</filename> contains important
information on updating a &os; system from source code. It lists
various issues resulting from changes in &os; that may affect an
- upgrade.<para>
+ upgrade.</para>
</sect2>
</sect1>
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#72 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The FreeBSD Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.750 2004/07/03 08:45:20 josef Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.751 2004/07/07 13:11:59 den Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -1169,7 +1169,7 @@
<filename>gtar</filename>.</para>
<para><application>Heimdal Kerberos</application> has been
- updated from 0.6 to 0.6.1.
+ updated from 0.6 to 0.6.1.</para>
<para>The <application>ISC DHCP</application> client has been
updated from 3.0.1 RC10 to 3.0.1 RC14.</para>
@@ -1202,7 +1202,7 @@
OpenBSD 3.5, has been imported into &os; source tree and is now installed
by default. A new user <username>proxy</username>, and two new
groups <username>authpf</username> and <username>proxy</username>,
- which <application>pf</application> needs, are added as well.
+ which <application>pf</application> needs, are added as well.</para>
<note>
<para>On upgrading from the source, these user accounts must be
==== //depot/projects/hammer/sbin/devd/devd.8#9 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/devd/devd.8,v 1.11 2004/07/01 07:24:18 imp Exp $
+.\" $FreeBSD: src/sbin/devd/devd.8,v 1.12 2004/07/07 19:57:14 ru Exp $
.\"
.Dd October 17, 2002
.Dt DEVD 8
@@ -112,7 +112,9 @@
.Pp
All messages that
.Nm
-receives are forwarded to the unix domain socket at
+receives are forwarded to the
+.Ux
+domain socket at
.Pa /var/run/devd.pipe .
.Sh SEE ALSO
.Xr devctl 4 ,
==== //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/concat/gconcat.8,v 1.5 2004/07/05 21:16:37 pjd Exp $
+.\" $FreeBSD: src/sbin/geom/class/concat/gconcat.8,v 1.6 2004/07/07 21:00:56 ru Exp $
.\"
.Dd May 21, 2004
.Dt GCONCAT 8
@@ -83,7 +83,7 @@
device has to be configured by hand every time it is needed.
The
.Dq automatic
-method use on-disk metadata to detect devices.
+method uses on-disk metadata to detect devices.
Once devices are labeled, they will be automatically detected and
configured.
.Pp
@@ -112,7 +112,7 @@
.It Cm stop
Turn off existing concatenate device by its
.Ar name .
-This command doesn't touch on-disk metadata!
+This command does not touch on-disk metadata!
.It Cm destroy
Same as
.Cm stop .
==== //depot/projects/hammer/sbin/geom/class/label/glabel.8#3 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/label/glabel.8,v 1.3 2004/07/05 21:16:37 pjd Exp $
+.\" $FreeBSD: src/sbin/geom/class/label/glabel.8,v 1.4 2004/07/07 21:00:56 ru Exp $
.\"
-.Dd Jul 2, 2004
+.Dd July 2, 2004
.Dt GLABEL 8
.Os
.Sh NAME
@@ -69,7 +69,7 @@
The
.Nm
utility is used for GEOM providers labelization.
-A label can be setup on a GEOM provider in two ways:
+A label can be set up on a GEOM provider in two ways:
.Dq manual
or
.Dq automatic .
@@ -85,7 +85,7 @@
This class also provides volume label detection for file systems.
Those labels cannot be set with
.Nm ,
-but must be set with the appropriate file system utility, e.g. for UFS
+but must be set with the appropriate file system utility, e.g.\& for UFS
the file system label is set with
.Xr tunefs 8 .
Currently supported file systems are:
@@ -123,7 +123,7 @@
.Pa geom_label.ko
will be loaded if it is not loaded already.
.It Cm label
-Setup a label
+Set up a label
.Ar name
for the given provider.
This is the
@@ -135,7 +135,7 @@
.It Cm stop
Turn off the given label by its
.Ar name .
-This command doesn't touch on-disk metadata!
+This command does not touch on-disk metadata!
.It Cm destroy
Same as
.Cm stop .
@@ -161,7 +161,8 @@
Be more verbose.
.El
.Sh EXAMPLES
-The following example shows how to setup a label for disk da2,
+The following example shows how to set up a label for disk
+.Dq Li da2 ,
create a file system on it, and mount it:
.Bd -literal -offset indent
glabel label -v usr /dev/da2
@@ -173,7 +174,7 @@
glabel unload
.Ed
.Pp
-The next example shows how to setup a label for a UFS file system:
+The next example shows how to set up a label for a UFS file system:
.Bd -literal -offset indent
tunefs -L data /dev/da4s1a
mount /dev/ufs/data /mnt/data
==== //depot/projects/hammer/sbin/geom/class/nop/gnop.8#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/nop/gnop.8,v 1.7 2004/07/06 18:18:20 pjd Exp $
+.\" $FreeBSD: src/sbin/geom/class/nop/gnop.8,v 1.8 2004/07/07 21:00:56 ru Exp $
.\"
.Dd May 21, 2004
.Dt GNOP 8
@@ -70,14 +70,15 @@
indicates an action to be performed:
.Bl -tag -width ".Cm configure"
.It Cm create
-Setup a transparent provider on the given devices.
+Set up a transparent provider on the given devices.
If operation succeded, new provider should appear with name
-.Pa /dev/<dev>.nop .
+.Pa /dev/ Ns Ao Ar dev Ac Ns Pa .nop .
The kernel module
.Pa geom_nop.ko
will be loaded if it is not loaded already.
.It Cm configure
-Configure existing transparent provider. At the moment it is only used
+Configure existing transparent provider.
+At the moment it is only used
for changing failure probability.
The kernel module
.Pa geom_nop.ko
==== //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.6 2004/07/05 21:16:37 pjd Exp $
+.\" $FreeBSD: src/sbin/geom/class/stripe/gstripe.8,v 1.7 2004/07/07 21:00:57 ru Exp $
.\"
.Dd May 21, 2004
.Dt GSTRIPE 8
@@ -85,7 +85,7 @@
device has to be configured by hand every time it is needed.
The
.Dq automatic
-method use on-disk metadata to detect devices.
+method uses on-disk metadata to detect devices.
Once devices are labeled, they will be automatically detected and
configured.
.Pp
@@ -94,7 +94,7 @@
indicates an action to be performed:
.Bl -tag -width ".Cm destroy"
.It Cm create
-Setup a striped device from the given devices with specified
+Set up a striped device from the given devices with specified
.Ar name .
This is the
.Dq manual
@@ -103,7 +103,7 @@
.Pa geom_stripe.ko
will be loaded if it is not loaded already.
.It Cm label
-Setup a striped device from the given devices with the specified
+Set up a striped device from the given devices with the specified
.Ar name .
This is the
.Dq automatic
@@ -114,7 +114,7 @@
.It Cm stop
Turn off existing striped device by its
.Ar name .
-This command doesn't touch on-disk metadata!
+This command does not touch on-disk metadata!
.It Cm destroy
Same as
.Cm stop .
@@ -142,7 +142,7 @@
Be more verbose.
.El
.Sh EXAMPLES
-The following example shows how to setup striped device from four disks
+The following example shows how to set up striped device from four disks
for automatic configuration, create a file system on it, and mount it:
.Bd -literal -offset indent
gstripe label -v -s 65536 data /dev/da0 /dev/da1 /dev/da2 /dev/da3
==== //depot/projects/hammer/sbin/geom/core/geom.8#2 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list