summaryrefslogtreecommitdiff
path: root/ja/man/man1
diff options
context:
space:
mode:
authorJun Kuriyama <kuriyama@FreeBSD.org>1998-09-26 06:20:22 +0000
committerJun Kuriyama <kuriyama@FreeBSD.org>1998-09-26 06:20:22 +0000
commit88a4de0fb8b2f6a1345a29a10a324176728b7517 (patch)
treefed6911082b427ce0a2c73c1ab16c30d1c2a57f8 /ja/man/man1
parent1fa6dd730fa26394321c52a534c2e0ceb2db3bae (diff)
Notes
Diffstat (limited to 'ja/man/man1')
-rw-r--r--ja/man/man1/ar.12
-rw-r--r--ja/man/man1/as.11
-rw-r--r--ja/man/man1/at.12
-rw-r--r--ja/man/man1/awk.11350
-rw-r--r--ja/man/man1/basename.13
-rw-r--r--ja/man/man1/bc.1186
-rw-r--r--ja/man/man1/biff.13
-rw-r--r--ja/man/man1/c89.12
-rw-r--r--ja/man/man1/cap_mkdb.12
-rw-r--r--ja/man/man1/cat.13
-rw-r--r--ja/man/man1/catman.110
-rw-r--r--ja/man/man1/cd.12
-rw-r--r--ja/man/man1/cdcontrol.12
-rw-r--r--ja/man/man1/checknr.12
-rw-r--r--ja/man/man1/chflags.12
-rw-r--r--ja/man/man1/chio.12
-rw-r--r--ja/man/man1/chmod.12
-rw-r--r--ja/man/man1/chpass.12
-rw-r--r--ja/man/man1/ci.12
-rw-r--r--ja/man/man1/cksum.12
-rw-r--r--ja/man/man1/cmp.12
-rw-r--r--ja/man/man1/co.12
-rw-r--r--ja/man/man1/colldef.12
-rw-r--r--ja/man/man1/comm.12
-rw-r--r--ja/man/man1/compile_et.12
-rw-r--r--ja/man/man1/cp.12
-rw-r--r--ja/man/man1/crontab.12
-rw-r--r--ja/man/man1/csh.118
-rw-r--r--ja/man/man1/ctm.12
-rw-r--r--ja/man/man1/ctm_rmail.12
-rw-r--r--ja/man/man1/cu.12
-rw-r--r--ja/man/man1/date.12
-rw-r--r--ja/man/man1/dc.1165
-rw-r--r--ja/man/man1/dd.12
-rw-r--r--ja/man/man1/df.16
-rw-r--r--ja/man/man1/dig.1761
-rw-r--r--ja/man/man1/dnsquery.1267
-rw-r--r--ja/man/man1/du.12
-rw-r--r--ja/man/man1/echo.12
-rw-r--r--ja/man/man1/ed.16
-rw-r--r--ja/man/man1/ee.12
-rw-r--r--ja/man/man1/expr.12
-rw-r--r--ja/man/man1/f2c.14
-rw-r--r--ja/man/man1/f77.12
-rw-r--r--ja/man/man1/fdwrite.12
-rw-r--r--ja/man/man1/fetch.12
-rw-r--r--ja/man/man1/file.12
-rw-r--r--ja/man/man1/file2c.12
-rw-r--r--ja/man/man1/find.137
-rw-r--r--ja/man/man1/finger.12
-rw-r--r--ja/man/man1/ftp.12
-rw-r--r--ja/man/man1/gcc.111
-rw-r--r--ja/man/man1/gdb.117
-rw-r--r--ja/man/man1/getNAME.12
-rw-r--r--ja/man/man1/grep.118
-rw-r--r--ja/man/man1/grops.12
-rw-r--r--ja/man/man1/head.114
-rw-r--r--ja/man/man1/hexdump.12
-rw-r--r--ja/man/man1/host.1303
-rw-r--r--ja/man/man1/hostname.12
-rw-r--r--ja/man/man1/id.17
-rw-r--r--ja/man/man1/ident.12
-rw-r--r--ja/man/man1/install-info.16
-rw-r--r--ja/man/man1/install.12
-rw-r--r--ja/man/man1/intro.12
-rw-r--r--ja/man/man1/ipcrm.12
-rw-r--r--ja/man/man1/ipcs.12
-rw-r--r--ja/man/man1/kbdcontrol.12
-rw-r--r--ja/man/man1/kbdmap.12
-rw-r--r--ja/man/man1/kdump.12
-rw-r--r--ja/man/man1/key.12
-rw-r--r--ja/man/man1/keyinfo.12
-rw-r--r--ja/man/man1/kill.12
-rw-r--r--ja/man/man1/killall.12
-rw-r--r--ja/man/man1/ktrace.12
-rw-r--r--ja/man/man1/lastcomm.12
-rw-r--r--ja/man/man1/ld.12
-rw-r--r--ja/man/man1/lex.14
-rw-r--r--ja/man/man1/limits.12
-rw-r--r--ja/man/man1/ln.12
-rw-r--r--ja/man/man1/locate.110
-rw-r--r--ja/man/man1/lockf.12
-rw-r--r--ja/man/man1/login.12
-rw-r--r--ja/man/man1/logname.12
-rw-r--r--ja/man/man1/lp.12
-rw-r--r--ja/man/man1/lpr.12
-rw-r--r--ja/man/man1/ls.115
-rw-r--r--ja/man/man1/lsvfs.12
-rw-r--r--ja/man/man1/m4.12
-rw-r--r--ja/man/man1/mail.12
-rw-r--r--ja/man/man1/mailq.137
-rw-r--r--ja/man/man1/make.14
-rw-r--r--ja/man/man1/makewhatis.19
-rw-r--r--ja/man/man1/merge.12
-rw-r--r--ja/man/man1/mesg.12
-rw-r--r--ja/man/man1/minigzip.12
-rw-r--r--ja/man/man1/mkdir.12
-rw-r--r--ja/man/man1/mkfifo.12
-rw-r--r--ja/man/man1/mktemp.114
-rw-r--r--ja/man/man1/more.15
-rw-r--r--ja/man/man1/mv.12
-rw-r--r--ja/man/man1/ncal.12
-rw-r--r--ja/man/man1/netstat.14
-rw-r--r--ja/man/man1/newaliases.136
-rw-r--r--ja/man/man1/nfsstat.12
-rw-r--r--ja/man/man1/nice.12
-rw-r--r--ja/man/man1/nm.12
-rw-r--r--ja/man/man1/od.12
-rw-r--r--ja/man/man1/opieinfo.14
-rw-r--r--ja/man/man1/opiekey.14
-rw-r--r--ja/man/man1/opiepasswd.14
-rw-r--r--ja/man/man1/passwd.14
-rw-r--r--ja/man/man1/patch.112
-rw-r--r--ja/man/man1/pax.12
-rw-r--r--ja/man/man1/perl.19
-rw-r--r--ja/man/man1/pkg_add.12
-rw-r--r--ja/man/man1/pkg_create.14
-rw-r--r--ja/man/man1/pkg_info.12
-rw-r--r--ja/man/man1/pr.12
-rw-r--r--ja/man/man1/ps.128
-rw-r--r--ja/man/man1/pwd.12
-rw-r--r--ja/man/man1/quota.12
-rw-r--r--ja/man/man1/ranlib.12
-rw-r--r--ja/man/man1/rcp.12
-rw-r--r--ja/man/man1/rcs.12
-rw-r--r--ja/man/man1/rcsclean.12
-rw-r--r--ja/man/man1/rcsdiff.12
-rw-r--r--ja/man/man1/rcsfreeze.12
-rw-r--r--ja/man/man1/rcsintro.12
-rw-r--r--ja/man/man1/rcsmerge.12
-rw-r--r--ja/man/man1/rdist.110
-rw-r--r--ja/man/man1/rlog.12
-rw-r--r--ja/man/man1/rm.14
-rw-r--r--ja/man/man1/rmdir.12
-rw-r--r--ja/man/man1/rtld.12
-rw-r--r--ja/man/man1/rtprio.12
-rw-r--r--ja/man/man1/rup.12
-rw-r--r--ja/man/man1/ruptime.13
-rw-r--r--ja/man/man1/rusers.12
-rw-r--r--ja/man/man1/rwall.12
-rw-r--r--ja/man/man1/sasc.12
-rw-r--r--ja/man/man1/script.12
-rw-r--r--ja/man/man1/sh.120
-rw-r--r--ja/man/man1/shar.12
-rw-r--r--ja/man/man1/sleep.12
-rw-r--r--ja/man/man1/startslip.142
-rw-r--r--ja/man/man1/strip.12
-rw-r--r--ja/man/man1/stty.12
-rw-r--r--ja/man/man1/su.13
-rw-r--r--ja/man/man1/systat.1156
-rw-r--r--ja/man/man1/tar.132
-rw-r--r--ja/man/man1/tconv.12
-rw-r--r--ja/man/man1/tcpdump.156
-rw-r--r--ja/man/man1/tcpslice.1350
-rw-r--r--ja/man/man1/telnet.12
-rw-r--r--ja/man/man1/test.12
-rw-r--r--ja/man/man1/time.120
-rw-r--r--ja/man/man1/top.11
-rw-r--r--ja/man/man1/tput.12
-rw-r--r--ja/man/man1/tty.12
-rw-r--r--ja/man/man1/uniq.12
-rw-r--r--ja/man/man1/units.12
-rw-r--r--ja/man/man1/uucp.12
-rw-r--r--ja/man/man1/uuencode.12
-rw-r--r--ja/man/man1/uulog.12
-rw-r--r--ja/man/man1/uustat.12
-rw-r--r--ja/man/man1/uux.12
-rw-r--r--ja/man/man1/vacation.13
-rw-r--r--ja/man/man1/vidcontrol.12
-rw-r--r--ja/man/man1/w.13
-rw-r--r--ja/man/man1/wait.13
-rw-r--r--ja/man/man1/wc.12
-rw-r--r--ja/man/man1/what.12
-rw-r--r--ja/man/man1/whereis.13
-rw-r--r--ja/man/man1/which.12
-rw-r--r--ja/man/man1/who.12
-rw-r--r--ja/man/man1/whois.12
-rw-r--r--ja/man/man1/write.12
-rw-r--r--ja/man/man1/xten.12
-rw-r--r--ja/man/man1/yacc.12
-rw-r--r--ja/man/man1/ypcat.12
-rw-r--r--ja/man/man1/ypmatch.12
-rw-r--r--ja/man/man1/ypwhich.12
-rw-r--r--ja/man/man1/yyfix.12
184 files changed, 2833 insertions, 1535 deletions
diff --git a/ja/man/man1/ar.1 b/ja/man/man1/ar.1
index 8286323404..9c8968c352 100644
--- a/ja/man/man1/ar.1
+++ b/ja/man/man1/ar.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ar.1 8.1 (Berkeley) 6/29/93
-.\" %Id: ar.1,v 1.2.2.1 1997/06/24 06:35:04 charnier Exp %
+.\" %Id: ar.1,v 1.5 1997/06/23 06:41:29 charnier Exp %
.\" jpman %Id: ar.1,v 1.2 1997/03/29 02:06:03 horikawa Stab %
.\"
.Dd June 29, 1993
diff --git a/ja/man/man1/as.1 b/ja/man/man1/as.1
index 3844608f9a..883bbf0831 100644
--- a/ja/man/man1/as.1
+++ b/ja/man/man1/as.1
@@ -1,6 +1,7 @@
.\" Copyright (c) 1991, 1992 Free Software Foundation
.\" See section COPYING for conditions for redistribution
.TH as 1 "21 January 1992" "cygnus support" "GNU Development Tools"
+.\" %Id: as.1,v 1.8 1997/02/22 15:43:24 peter Exp %
.\" jpman %Id: as.1,v 1.3 1997/10/11 07:37:12 horikawa Stab %
.SH ̾¾Î
diff --git a/ja/man/man1/at.1 b/ja/man/man1/at.1
index 71afa063b4..f4bf220ab2 100644
--- a/ja/man/man1/at.1
+++ b/ja/man/man1/at.1
@@ -1,4 +1,4 @@
-.\" %Id: at.man,v 1.4.2.1 1998/07/16 23:50:39 jkh Exp %
+.\" %Id: at.man,v 1.8 1998/06/04 21:05:53 steve Exp %
.\" jpman %Id: at.1,v 1.3 1997/08/05 18:36:01 george Stab %
.Dd April 12, 1995
.Dt "AT" 1
diff --git a/ja/man/man1/awk.1 b/ja/man/man1/awk.1
index 58b1389537..b32a9500bd 100644
--- a/ja/man/man1/awk.1
+++ b/ja/man/man1/awk.1
@@ -1,10 +1,11 @@
.\" jpman %Id: awk.1,v 1.3 1997/04/17 13:23:21 horikawa Stab %
+.\" WORD: interval exptession ¥¤¥ó¥¿¡¼¥Ð¥ëɽ¸½
.ds PX \s-1POSIX\s+1
.ds UX \s-1UNIX\s+1
.ds AN \s-1ANSI\s+1
-.TH AWK 1 "Apr 18 1994" "Free Software Foundation" "Utility Commands"
+.TH GAWK 1 "Dec 19 1996" "Free Software Foundation" "Utility Commands"
.SH ̾¾Î
-awk \- GNU awk ¥Ñ¥¿¡¼¥ó¸¡º÷¡¦½èÍý¸À¸ì
+gawk \- ¥Ñ¥¿¡¼¥ó¸¡º÷¡¦½èÍý¸À¸ì
.SH ½ñ¼°
.B awk
[ POSIX or GNU style options ]
@@ -14,7 +15,7 @@ awk \- GNU awk ¥Ñ¥¿¡¼¥ó¸¡º÷¡¦½èÍý¸À¸ì
.B \-\^\-
] file .\^.\^.
.br
-.B awk
+.B gawk
[ POSIX or GNU style options ]
[
.B \-\^\-
@@ -26,17 +27,17 @@ file .\^.\^.
¤Ï GNU ¥×¥í¥¸¥§¥¯¥È¤¬¼ÂÁõ¤·¤¿ ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì AWK ¤Î½èÍý·Ï¤Ç¤¹¡£
ËܽèÍý·Ï¤Ï \*(PX 1003.2 ¥³¥Þ¥ó¥É¸À¸ì¤È¥æ¡¼¥Æ¥£¥ê¥Æ¥£µ¬Ìó¤ËÄê¤á¤é¤ì¤¿
¸À¸ì¤ÎÄêµÁ¤ËŬ¹ç¤·¤Æ¤¤¤Þ¤¹¡£
-ËܥС¼¥¸¥ç¥ó¤Ï¤Þ¤¿¡¢Aho¡¢Kernighan¡¢Weinberger ¤ÎÃø½ñ¡Ø
+ËܥС¼¥¸¥ç¥ó¤Ï¤Þ¤¿¡¢Aho, Kernighan, Weinberger ¤ÎÃø½ñ¡Ø
.I The AWK Programming Language
¡Ù¤Îµ­½Ò¤Ë¤â¤È¤Å¤¤¤Æ¤ª¤ê¡¢
System V Release 4 \*(UX ¤Î
.I awk
¤ÎÉղõ¡Ç½¤â´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
.I gawk
-¤Ï¤Þ¤¿¡¢GNU ÆÈ¼«¤Î³ÈÄ¥¤âÄ󶡤·¤Þ¤¹¡£
+¤Ï¤Þ¤¿¡¢¥Ù¥ë¸¦µæ½ê¤Î¿·µ¡Ç½¤ª¤è¤Ó GNU ÆÈ¼«¤Î³ÈÄ¥¤âÄ󶡤·¤Þ¤¹¡£
.PP
¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ï¡¢
-.I awk
+.I gawk
¤Ø¤Î¥ª¥×¥·¥ç¥ó¡¢(¤â¤·
.B \-f
¤Þ¤¿¤Ï
@@ -47,38 +48,32 @@ System V Release 4 \*(UX ¤Î
.BR ARGC ,
.B ARGV
¤òÍѤ¤¤ë¤³¤È¤Ç»²¾È¤Ç¤­¤Þ¤¹¡£
-.SH ¥ª¥×¥·¥ç¥ó
+.SH ¥ª¥×¥·¥ç¥ó¥Õ¥©¡¼¥Þ¥Ã¥È
.PP
.I gawk
-¤Ø¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ÅÁÅýŪ¤Ê \*(PX ·Á¼°¤Î°ìʸ»ú¥ª¥×¥·¥ç¥ó¤È¡¢GNU ·Á¼°¤Î
+¤Ø¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢ÅÁÅýŪ¤Ê \*(PX ·Á¼°¤Î 1 ʸ»ú¥ª¥×¥·¥ç¥ó¤È¡¢GNU ·Á¼°¤Î
¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£
\*(PX ·Á¼°¤Î¥ª¥×¥·¥ç¥ó¤Ïñ°ì¤Î ``\-'' ¤Ç»Ï¤Þ¤ê¡¢°ìÊý GNU ·Á¼°¤Î¤â¤Î
-¤Ï ``\-\^\-'' ¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£GNU ·Á¼°¤Î¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤Ï GNU ¤ÎÆÈ¼«»ÅÍͤÈ
+¤Ï ``\-\^\-'' ¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤Ï GNU ¤ÎÆÈ¼«»ÅÍͤÈ
\*(PX ¤Îɬ¿Ü»ÅÍͤÎξÊý¤Ë¤Ä¤¤¤ÆÍѰդµ¤ì¤Æ¤¤¤Þ¤¹¡£
-¾¤Î¼ÂÁõ¤Ë¤è¤ë AWK ¤Ç¤Ï¡¢ÅÁÅýŪ¤Ê°ìʸ»ú¥ª¥×¥·¥ç¥ó¤Î¤ß¤ò¼õ¤±ÉÕ¤±¤ë¤â¤Î¤¬
-¿¤¤¤è¤¦¤Ç¤¹¡£
.PP
\*(PX ɸ½à¤Ë½¾¤¤¡¢
-.I awk
+.I gawk
ÆÈ¼«»ÅÍͤΥª¥×¥·¥ç¥ó¤Ï
.B \-W
¥ª¥×¥·¥ç¥ó¤Ø¤Î°ú¿ô¤ÇÍ¿¤¨¤Þ¤¹¡£
Ê£¿ô¤Î
.B \-W
-¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤·¡¢
-Ê£¿ô¤Î°ú¿ô¤ò¥³¥ó¥Þ¤Ç¶èÀڤäơ¢¤â¤·¤¯¤Ï°úÍÑÉä¤Ç³ç¤ê¶õÇò¤Ç¶èÀڤ뤳¤È¤Ç
-°ìÅÙ¤Ë¤Þ¤È¤á¤Æ
-.B \-W
-¥ª¥×¥·¥ç¥ó¤ËÍ¿¤¨¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-.B \-W
-¥ª¥×¥·¥ç¥ó¤Ø¤Î°ú¿ô¤Ç¤Ï¡¢Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ϹԤʤï¤ì¤Þ¤»¤ó¡£¸å½Ò¤Î
+¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+¸å½Ò¤Î
¤è¤¦¤Ë¡¢³Æ
.B \-W
-¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢¤½¤ì¤ËÂбþ¤¹¤ë GNU ·Á¼°¤Î¥í¥ó¥°¥ª¥×¥·¥ç¥ó
-¤¬Â¸ºß¤·¤Þ¤¹¡£GNU ·Á¼°¤Î¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤Ø¤Î°ú¿ô¤Ï¡¢¶õÇò¤òÆþ¤ì¤º¤Ë
+¥ª¥×¥·¥ç¥ó¤Ë¤Ï¡¢¤½¤ì¤ËÂбþ¤¹¤ë¥í¥ó¥°¥ª¥×¥·¥ç¥ó
+¤¬Â¸ºß¤·¤Þ¤¹¡£¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤Ø¤Î°ú¿ô¤Ï¡¢¶õÇò¤òÆþ¤ì¤º¤Ë
.B =
¤Ç¤Ä¤Ê¤¤¤Ç»ØÄꤹ¤ë¤«¡¢¤½¤Î¼¡¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤È¤·¤ÆÅϤ¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.PP
+¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤Ï¡¢Ã»½Ì·Á¤¬°ì°Õ¤Ç¤¢¤ë¸Â¤ê¡¢Ã»½Ì¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.SH ¥ª¥×¥·¥ç¥ª¥ó
.I gawk
¤Ï°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£
.TP
@@ -86,7 +81,7 @@ System V Release 4 \*(UX ¤Î
.BI \-F " fs"
.TP
.PD
-.BI \-\^\-field-separator= fs
+.BI \-\^\-field-separator " fs"
ÆþÎÏ¥Õ¥£¡¼¥ë¥É¥»¥Ñ¥ì¡¼¥¿(ÊÑ¿ô
.B FS
¤ÎÃÍ)¤ò
@@ -97,7 +92,7 @@ System V Release 4 \*(UX ¤Î
\fB\-v\fI var\fB\^=\^\fIval\fR
.TP
.PD
-\fB\-\^\-assign=\fIvar\fB\^=\^\fIval\fR
+\fB\-\^\-assign \fIvar\fB\^=\^\fIval\fR
¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë¡¢ÊÑ¿ô
.I var
¤ËÃÍ
@@ -111,9 +106,9 @@ System V Release 4 \*(UX ¤Î
.BI \-f " program-file"
.TP
.PD
-.BI \-\^\-file= program-file
+.BI \-\^\-file " program-file"
.B awk
-¤Ø¤ÎÂè°ì°ú¿ô¤òÍѤ¤¤ë¤«¤ï¤ê¤Ë¡¢AWK ¥×¥í¥°¥é¥à¤ò¥Õ¥¡¥¤¥ë
+¤Ø¤ÎÂè 1 °ú¿ô¤òÍѤ¤¤ë¤«¤ï¤ê¤Ë¡¢AWK ¥×¥í¥°¥é¥à¤ò¥Õ¥¡¥¤¥ë
.I program-file
¤«¤éÆÉ¤ß¹þ¤ß¤Þ¤¹¡£
.B \-f
@@ -123,36 +118,46 @@ System V Release 4 \*(UX ¤Î
ÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.TP
.PD 0
-.BI \-mf= NNN
+.BI \-mf " NNN"
.TP
-.BI \-mr= NNN
+.PD
+.BI \-mr " NNN"
¤µ¤Þ¤¶¤Þ¤Ê¥á¥â¥ê¤ÎÀ©¸ÂÃͤò
.I NNN
¤ËÀßÄꤷ¤Þ¤¹¡£¥Õ¥é¥°
.B f
¤ÏºÇÂç¥Õ¥£¡¼¥ë¥É¿ô¡¢¥Õ¥é¥°
.B r
-¤ÏºÇÂç¥ì¥³¡¼¥É¥µ¥¤¥º¤òÀßÄꤷ¤Þ¤¹¡£¤³¤Î2¤Ä¤Î¥Õ¥é¥°¤È
+¤ÏºÇÂç¥ì¥³¡¼¥É¥µ¥¤¥º¤òÀßÄꤷ¤Þ¤¹¡£¤³¤Î 2 ¤Ä¤Î¥Õ¥é¥°¤È
.B \-m
-¥ª¥×¥·¥ç¥ó¤Ï¡¢AT&T ¥Ù¥ë¸¦µæ½ê¥Ð¡¼¥¸¥ç¥ó¤Î \*(UX
+¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Ù¥ë¸¦µæ½ê¥Ð¡¼¥¸¥ç¥ó¤Î \*(UX
.I awk
¤ËͳÍ褷¤Æ¤¤¤Þ¤¹¡£¤·¤«¤·¡¢
-.I awk
+.I gawk
¤Ë¤Ï¤³¤Î¤è¤¦¤ÊÀ©¸Â¤Ï¤¢¤ê¤Þ¤»¤ó¤Î¤Ç¡¢
-.I awk
+.I gawk
¤Ç¤ÏËÜ¥ª¥×¥·¥ç¥ó¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
-.TP \w'\fB\-\^\-copyright\fR'u+1n
+.TP
+.PD 0
+.B "-W traditional"
+.TP
.PD 0
.B "\-W compat"
.TP
+.PD 0
+.B \-\^\-traditional
+.TP
.PD
.B \-\^\-compat
.I ¸ß´¹
¥â¡¼¥É¤Çưºî¤·¤Þ¤¹¡£¸ß´¹¥â¡¼¥É¤Ç¤Ï¡¢
-.I awk
+.I gawk
¤Ï \*(UX
.I awk
¤ÈÅù²Á¤Êưºî¤ò¹Ô¤¤¡¢GNU ÆÈ¼«³ÈÄ¥¤Ï²ò¼á¤Ç¤­¤Þ¤»¤ó¡£
+¤³¤Î¥ª¥×¥·¥ç¥ó¤Î¾¤Î·Á¼°¤è¤ê¤â¡¢
+.B \-\^\-traditional
+¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¹¥¤Þ¤ì¤Þ¤¹¡£
¾Ü¤·¤¯¤Ï¸å½Ò¤Î
.B "GNU ³ÈÄ¥"
¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
@@ -168,7 +173,8 @@ System V Release 4 \*(UX ¤Î
.TP
.PD
.B \-\^\-copyright
-GNU ¤ÎÃøºî¸¢É½¼¨¤Îû¤¤¥Ð¡¼¥¸¥ç¥ó¤òɸ½à¥¨¥é¡¼½ÐÎϤؽñ¤­½Ð¤·¤Þ¤¹¡£
+GNU ¤ÎÃøºî¸¢É½¼¨¤Îû¤¤¥Ð¡¼¥¸¥ç¥ó¤òɸ½à½ÐÎϤؽñ¤­½Ð¤·¡¢
+À®¸ù¾õÂ֤ǽªÎ»¤·¤Þ¤¹¡£
.TP
.PD 0
.B "\-W help"
@@ -181,18 +187,28 @@ GNU ¤ÎÃøºî¸¢É½¼¨¤Îû¤¤¥Ð¡¼¥¸¥ç¥ó¤òɸ½à¥¨¥é¡¼½ÐÎϤؽñ¤­½Ð¤·¤Þ¤¹¡£
.TP
.PD
.B \-\^\-usage
-û¤á¤Î¥ª¥×¥·¥ç¥ó°ìÍ÷¤òɸ½à¥¨¥é¡¼½ÐÎϤؽñ¤­½Ð¤·¤Þ¤¹¡£GNU ¥³¡¼¥Ç¥£¥ó¥°µ¬Ìó¤Ë
+û¤á¤Î¥ª¥×¥·¥ç¥ó°ìÍ÷¤òɸ½à½ÐÎϤؽñ¤­½Ð¤·¤Þ¤¹¡£
+(GNU ¥³¡¼¥Ç¥£¥ó¥°µ¬Ìó¤Ë
½¾¤¤¡¢ËÜ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È
.I awk
-¤Ï¤¿¤À¤Á¤Ë½ªÎ»¤·¡¢À®¸ù¤ò°ÕÌ£¤¹¤ë½ªÎ»¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£
+¤Ï¤¿¤À¤Á¤Ë½ªÎ»¤·¡¢À®¸ù¤ò°ÕÌ£¤¹¤ë½ªÎ»¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£)
.TP
-.PD 0
+.PD
.B "\-W lint"
.TP
.PD 0
.B \-\^\-lint
¾¤Î AWK ¤Ç¤Î½èÍý¤¬µ¿¤ï¤·¤¤¡¢¤¢¤ë¤¤¤Ï¾¤Î AWK ¤È¤Î¸ß´¹À­¤¬¤Ê¤¤¹½Â¤¤¬
¤¢¤ë¾ì¹ç¤Ë·Ù¹ð¤ò¹Ô¤¤¤Þ¤¹¡£
+.TP
+.PD 0
+.B "\-W lint\-old"
+.TP
+.PD
+.B \-\^\-lint\-old
+¥ª¥ê¥¸¥Ê¥ë¤Î Unix
+.I awk
+¤Ø°Ü¿¢¤Ç¤­¤Ê¤¤¹½Â¤¤Ë´Ø¤·¤Æ·Ù¹ð¤ò¹Ô¤¤¤Þ¤¹¡£
.ig
.\" This option is left undocumented, on purpose.
.TP
@@ -220,6 +236,11 @@ GNU ¤ÎÃøºî¸¢É½¼¨¤Îû¤¤¥Ð¡¼¥¸¥ç¥ó¤òɸ½à¥¨¥é¡¼½ÐÎϤؽñ¤­½Ð¤·¤Þ¤¹¡£
¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤ò²ò¼á¤·¤Þ¤»¤ó¡£
.TP
\(bu
+.B FS
+¤¬Ã±°ì¤Î¶õÇò¤ËÀßÄꤵ¤ì¤¿¾ì¹ç¡¢¶õÇò¤È¥¿¥Ö¤Î¤ß¤¬¥Õ¥£¡¼¥ë¥É¤ò¶èÀڤꡢ
+²þ¹Ô¤Ï¥Õ¥£¡¼¥ë¥É¤ò¶èÀÚ¤ê¤Þ¤»¤ó¡£
+.TP
+\(bu
¥­¡¼¥ï¡¼¥É
.B function
¤ËÂбþ¤¹¤ëÊÌ̾
@@ -236,13 +257,40 @@ GNU ¤ÎÃøºî¸¢É½¼¨¤Îû¤¤¥Ð¡¼¥¸¥ç¥ó¤òɸ½à¥¨¥é¡¼½ÐÎϤؽñ¤­½Ð¤·¤Þ¤¹¡£
¤ä
.B **=
¤òÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£
+.TP
+\(bu
+.B fflush()
+´Ø¿ô¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£
.RE
.TP
.PD 0
-.BI "\-W source=" program-text
+.B "\-W re\-interval"
+.TP
+.PD
+.B \-\^\-re\-interval
+Àµµ¬É½¸½¤Î¥Þ¥Ã¥Á¥ó¥°¤Ç
+.I "¥¤¥ó¥¿¡¼¥Ð¥ëɽ¸½ (interval expressions)"
+¤òÍ­¸ú¤Ë¤·¤Þ¤¹
+(¸å½Ò¤Î
+.BR "Àµµ¬É½¸½"
+¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤)¡£
+¥¤¥ó¥¿¡¼¥Ð¥ëɽ¸½¤ÏÅÁÅýŪ¤Ê AWK ¸À¸ì¤Ç¤ÏÍøÍѤǤ­¤Þ¤»¤ó¤Ç¤·¤¿¡£
+.I awk
+¤È
+.I egrep
+¤¬°ì´ÓÀ­¤ò»ý¤Ä¤è¤¦¤Ë¡¢POSIX ɸ½à¤¬¤³¤ì¤é¤òÄɲä·¤Þ¤·¤¿¡£
+¤·¤«¤·¡¢¤³¤ì¤é¤ò»ÈÍѤ¹¤ë¤È¸Å¤¤ AWK ¥×¥í¥°¥é¥à¤òư¤«¤Ê¤¯¤·¤Æ¤·¤Þ¤¦¤Ç¤·¤ç¤¦¤«¤é¡¢
+¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤ÆÍ׵ᤵ¤ì¤¿¤È¤­¤È¡¢
+.B \-\^\-posix
+¤¬»ØÄꤵ¤ì¤¿¤È¤­¤Ë¡¢
+.I gawk
+¤Ï¤³¤ì¤é¤Îµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£
+.TP
+.PD 0
+.BI "\-W source " program-text
.TP
.PD
-.BI \-\^\-source= program-text
+.BI \-\^\-source " program-text"
.I program-text
¤ò AWK ¥×¥í¥°¥é¥à¤È¤·¤ÆÍѤ¤¤Þ¤¹¡£ËÜ¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¡¢¥é¥¤¥Ö¥é¥ê²½¤µ¤ì¤¿´Ø¿ô(
.B \-f
@@ -252,14 +300,6 @@ GNU ¤ÎÃøºî¸¢É½¼¨¤Îû¤¤¥Ð¡¼¥¸¥ç¥ó¤òɸ½à¥¨¥é¡¼½ÐÎϤؽñ¤­½Ð¤·¤Þ¤¹¡£
´Êñ¤Ë¹çÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
¤³¤ì¤Ï¡¢¼ç¤Ë¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤ÇÍѤ¤¤é¤ì¤ëÃæµ¬ÌϤ«¤éÂ絬ÌÏ¤Ê AWK ¥×¥í¥°¥é¥à
¤Î¤¿¤á¤ËÍѰդµ¤ì¤Þ¤·¤¿¡£
-.sp .5
-.B "\-W source="
-·Á¼°¤Ë¤ª¤¤¤Æ¤Ï¡¢¤½¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤Î»Ä¤ê¤ÎÉôʬ¤ò
-.I program-text
-¤È¤·¤Æ²ò¼á¤·¤Þ¤¹¡£
-¤è¤Ã¤Æ¡¢Æ±¤¸°ú¿ôÆâ¤Ç¤³¤ì°Ê¾å
-.B \-W
-¤Î¥ª¥×¥·¥ç¥ó°ú¿ô¤ò³¤±¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
.TP
.PD 0
.B "\-W version"
@@ -267,25 +307,26 @@ GNU ¤ÎÃøºî¸¢É½¼¨¤Îû¤¤¥Ð¡¼¥¸¥ç¥ó¤òɸ½à¥¨¥é¡¼½ÐÎϤؽñ¤­½Ð¤·¤Þ¤¹¡£
.PD
.B \-\^\-version
¼Â¹Ô¤µ¤ì¤¿
-.I awk
-¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɸ½à¥¨¥é¡¼½ÐÎϤؽñ¤­½Ð¤·¤Þ¤¹¡£¤³¤ì¤Ï¼ç¤Ë¡¢
+.I gawk
+¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɸ½à½ÐÎϤؽñ¤­½Ð¤·¤Þ¤¹¡£¤³¤ì¤Ï¼ç¤Ë¡¢
¤¢¤Ê¤¿¤¬»ÈÍѤ·¤Æ¤¤¤ë
-.I awk
+.I gawk
¥×¥í¥°¥é¥à¤¬ Free Software Foundation ¤¬ÇÛÉÛ¤·¤Æ¤¤
-¤ë¥×¥í¥°¥é¥à¤Î¤¦¤Á¡¢ºÇ¿·¤Î¤â¤Î¤Ç¤¢¤ë¤«¤É¤¦¤«¤òÃΤë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£ËÜ¥ª
-¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢GNU ¥³¡¼¥Ç¥£¥ó¥°µ¬Ìó¤Ë½¾¤¤¡¢
+¤ë¥×¥í¥°¥é¥à¤Î¤¦¤Á¡¢ºÇ¿·¤Î¤â¤Î¤Ç¤¢¤ë¤«¤É¤¦¤«¤òÃΤë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£
+¤Þ¤¿¥Ð¥°¥ì¥Ý¡¼¥È¤Î¤È¤­¤Ë¤âÍ­ÍѤǤ¹¡£
+(ËÜ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢GNU ¥³¡¼¥Ç¥£¥ó¥°µ¬Ìó¤Ë½¾¤¤¡¢
.I awk
-¤Ï¤¿¤À¤Á¤Ë½ªÎ»¤·¡¢À®¸ù¤ò°ÕÌ£¤¹¤ë½ªÎ»¥¹
-¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£
+¤Ï¤¿¤À¤Á¤Ë½ªÎ»¤·¡¢À®¸ù¤ò°ÕÌ£¤¹¤ë½ªÎ»¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£)
.TP
.B \-\^\-
-¥ª¥×¥·¥ç¥ó¤Î½ªÎ»¤ò°ÕÌ£¤·¤Þ¤¹¡£AWK ¤Ë ``\-'' ¤«¤é»Ï¤Þ¤ë¥ª¥×¥·¥ç¥ó¤Ç¤Ï¤Ê¤¤
+¥ª¥×¥·¥ç¥ó¤Î½ªÎ»¤ò°ÕÌ£¤·¤Þ¤¹¡£AWK ¥×¥í¥°¥é¥à¤Ë
+``\-'' ¤«¤é»Ï¤Þ¤ë¥ª¥×¥·¥ç¥ó¤Ç¤Ï¤Ê¤¤
°ú¿ô¤òÍ¿¤¨¤ë¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£
-¤³¤ì¤Ï¼ç¤Ë¡¢Â¾¤Î \*(PX ¥×¥í¥°¥é¥à¤Î¿¤¯¤¬°ú¿ô¤ËÂФ·¤Æ¹Ô
-¤¦²ò¼á¤È°ì´ÓÀ­¤òÊݤĤ¿¤á¤Ë¤¢¤ê¤Þ¤¹¡£
+¤³¤ì¤Ï¡¢¼ç¤Ë¾¤Î \*(PX ¥×¥í¥°¥é¥à¤Î¿¤¯¤¬°ú¿ô¤ËÂФ·¤Æ¹Ô¤¦²ò¼á¤È
+°ì´ÓÀ­¤òÊݤĤ¿¤á¤Ë¤¢¤ê¤Þ¤¹¡£
.PP
-¸ß´¹¥â¡¼¥É¤Ç¤Ï¡¢Â¾¤Î¥ª¥×¥·¥ç¥ó¤ÏÉÔÀµ¤Ç¤¢¤ë¤È¤µ¤ì¤ë¤«¡¢Ìµ»ë¤µ¤ì¤Þ¤¹¡£ÄÌ
-¾ï¤Î¼Â¹Ô¤Ë¤ª¤¤¤Æ¡¢¥×¥í¥°¥é¥à¥Æ¥­¥¹¥È¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢
+¸ß´¹¥â¡¼¥É¤Ç¤Ï¡¢Â¾¤Î¥ª¥×¥·¥ç¥ó¤ÏÉÔÀµ¤Ç¤¢¤ë¤È¤µ¤ì¤ë¤«¡¢Ìµ»ë¤µ¤ì¤Þ¤¹¡£
+Ä̾ï¤Î¼Â¹Ô¤Ë¤ª¤¤¤Æ¡¢¥×¥í¥°¥é¥à¥Æ¥­¥¹¥È¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢
ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó¤Ï¡¢AWK ¥×¥í¥°¥é¥à¤Ë
.B ARGV
ÇÛÎó¤òÄ̤·¤ÆÅϤµ¤ì¤Þ¤¹¡£¤³¤ì
@@ -305,18 +346,18 @@ AWK ¥×¥í¥°¥é¥à¤Ï¡¢¥Ñ¥¿¡¼¥ó¤È¥¢¥¯¥·¥ç¥ó¤ÎÁȤÎÎó¤È¡¢(¤â¤·É¬Íפʤé)´Ø¿ôÄêµÁ¤«
¤Ï¤Þ¤º¡¢
.I program-file
(Ê£¿ô²Ä)¤¬»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¤½¤ì¤«¤é¡¢
-.B "\-W source="
+.B \-\^\-source
¤Î°ú¿ô¤«¤é¡¢¤¢¤ë¤¤¤Ï¡¢ºÇ½é¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï¤Ê¤¤°ú¿ô¤«¤é
¥×¥í¥°¥é¥à¤òÆÉ¤ß¹þ¤ß¤Þ¤¹¡£
.B \-f
¤È
-.B "\-W source="
+.B \-\^\-source
¥ª¥×¥·¥ç¥ó¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇÊ£¿ô²ó»ØÄê¤Ç¤­¤Þ¤¹¡£
.I gawk
¤Ï¡¢¤¹¤Ù¤Æ¤Î
.I program-file
¤È¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤¿¥×¥í¥°¥é¥à¤ò·ë
-¹ç¤·¤Æ»ÈÍѤ·¤Þ¤¹¡£¿·¤·¤¯ºî¤Ã¤¿ AWK ¥×¥í¥°¥é¥à°ì¤Ä°ì¤Ä¤Ë
+¹ç¤·¤Æ»ÈÍѤ·¤Þ¤¹¡£¿·¤·¤¯ºî¤Ã¤¿ AWK ¥×¥í¥°¥é¥à¤Ò¤È¤Ä¤Ò¤È¤Ä¤Ë
AWK ´Ø¿ô¤Î¥é¥¤¥Ö¥é¥ê¤òËä¤á¹þ¤àɬÍפ¬Ìµ¤¤¤Î¤Ç¡¢¤³¤Îµ¡Ç½¤Ï¥é¥¤¥Ö¥é¥ê¤Î¹½ÃÛ¤Ë
ÊØÍø¤Ç¤¹¡£
¤Þ¤¿¡¢¥é¥¤¥Ö¥é¥ê´Ø¿ô¤È¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤¿¥×¥í¥°¥é¥à¤È¤òº®¹ç¤·¤Æ»È
@@ -329,33 +370,27 @@ AWK ´Ø¿ô¤Î¥é¥¤¥Ö¥é¥ê¤òËä¤á¹þ¤àɬÍפ¬Ìµ¤¤¤Î¤Ç¡¢¤³¤Îµ¡Ç½¤Ï¥é¥¤¥Ö¥é¥ê¤Î¹½ÃÛ¤Ë
¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¥Ñ¥¹¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
.B AWKPATH
¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Î¥Ç¥Õ¥©¥ë¥È¥Ñ¥¹¤Ï
-\fB".:/usr/lib/awk:/usr/local/lib/awk"\fR ¤Ç¤¹¡£
+\fB".:/usr/local/share/awk"\fR ¤Ç¤¹¡£
+(¼ÂºÝ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï
+.I gawk
+¤¬¤É¤Î¤è¤¦¤Ë¹½ÃÛ/¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¤«¤Ë°Í¸¤·¤Æ¡¢¤µ¤Þ¤¶¤Þ¤Ê¤â¤Î¤È¤Ê¤ê¤Þ¤¹¡£)
.B \-f
¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë̾¤¬ ``/'' ¤ò´Þ¤ó¤Ç¤¤¤ë¾ì¹ç¤Ï¡¢
¥Ñ¥¹¸¡º÷¤Ï¹Ô¤ï¤ì¤Þ¤»¤ó¡£
.PP
-.I awk
-¤Ï¡¢ AWK ¥×¥í¥°¥é¥à¤ò°Ê²¼¤Î½ç½ø¤Ç¼Â¹Ô¤·¤Þ¤¹¡£
-.RS
-.TP \w'4.'u+1n
-1.
+.I gawk
+¤Ï¡¢ AWK ¥×¥í¥°¥é¥à¤ò¼¡¤Î½ç½ø¤Ç¼Â¹Ô¤·¤Þ¤¹¡£
+¤Þ¤º¡¢
.B \-v
-¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÑ¿ô¤Ø¤ÎÂåÆþ¤ò¤¹¤Ù¤Æ¹Ô¤¦
-.TP
-2.
-¥×¥í¥°¥é¥à¤òÆâÉô·Á¼°¤Ë¥³¥ó¥Ñ¥¤¥ë¤¹¤ë
-.TP
-3.
-(¤â¤·Â¸ºß¤¹¤ì¤Ð)
+¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÑ¿ô¤Ø¤ÎÂåÆþ¤ò¤¹¤Ù¤Æ¹Ô¤¤¤Þ¤¹¡£
+¼¡¤Ë¡¢¥×¥í¥°¥é¥à¤òÆâÉô·Á¼°¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£
+¤½¤·¤Æ¡¢(¤â¤·Â¸ºß¤¹¤ì¤Ð)
.B BEGIN
-¥Ö¥í¥Ã¥¯(Ê£¿ô¸ºß²Ä)¤ò¼Â¹Ô¤¹¤ë
-.TP
-4.
+¥Ö¥í¥Ã¥¯(Ê£¿ô¸ºß²Ä)¤ò¼Â¹Ô¤·¤Þ¤¹¡£
ÇÛÎó
.B ARGV
-¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò½ç¤ËÆÉ¤ß¡¢½èÍý¤ò¹Ô¤¦(¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥Õ¥¡¥¤¥ë̾¤¬
-»ØÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢É¸½àÆþÎϤËÂФ·¤Æ½èÍý¤ò¹Ô¤¦)¡£
-.RE
+¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò½ç¤ËÆÉ¤ß¡¢½èÍý¤ò¹Ô¤¤¤Þ¤¹(¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥Õ¥¡¥¤¥ë̾¤¬
+»ØÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢É¸½àÆþÎϤËÂФ·¤Æ½èÍý¤ò¹Ô¤¤¤Þ¤¹)¡£
.PP
¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤¬
.IB var = val
@@ -369,41 +404,61 @@ AWK ´Ø¿ô¤Î¥é¥¤¥Ö¥é¥ê¤òËä¤á¹þ¤àɬÍפ¬Ìµ¤¤¤Î¤Ç¡¢¤³¤Îµ¡Ç½¤Ï¥é¥¤¥Ö¥é¥ê¤Î¹½ÃÛ¤Ë
.B BEGIN
¥Ö¥í¥Ã¥¯¤ò¼Â¹Ô¤·¤¿¤¢¤È¤Ë¹Ô¤ï¤ì¤Þ¤¹)¡£¥³¥Þ¥ó¥É¥é¥¤¥ó
¤Ç¤ÎÊÑ¿ô¤ÎÂåÆþ¤Ï¡¢AWK ¤¬ÆþÎϤò¥Õ¥£¡¼¥ë¥É¤ä¥ì¥³¡¼¥É¤Ëʬ³ä¤¹¤ë¤¿¤á¤Î¥»¥Ñ¥ì¡¼¥¿
-¤ò¼Â¹Ô»þ¤ËÊѹ¹¤¹¤ë¤Î¤ËÊØÍø¤Ç¤¹¡£¤Þ¤¿¡¢1¤Ä¤Î¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë¤Ë
+¤ò¼Â¹Ô»þ¤ËÊѹ¹¤¹¤ë¤Î¤ËÊØÍø¤Ç¤¹¡£¤Þ¤¿¡¢1 ¤Ä¤Î¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë¤Ë
ÂФ·¿ô²ó½èÍý¤ò¹Ô¤¦É¬Íפ¬¤¢¤ë¾ì¹ç¡¢¾õÂÖ¤ò¥³¥ó¥È¥í¡¼¥ë¤¹¤ë¤Î¤Ë¤âÊØÍø¤Ç¤¹¡£
.PP
ÇÛÎó
.B ARGV
¤ÎÍ×ÁǤ˶õ(\fB""\fR)¤¬¤¢¤ë¾ì¹ç¡¢
-.I awk
+.I gawk
¤Ï¤½¤ÎÍ×ÁǤò̵»ë¤·¤Þ¤¹¡£
.PP
-.I awk
-¤Ï¡¢ÆþÎϤµ¤ì¤¿³Æ¹Ô¤ËÂФ·¤Æ¥Þ¥Ã¥Á¤¹¤ë
+.I gawk
+¤Ï¡¢ÆþÎϤµ¤ì¤¿³Æ¥ì¥³¡¼¥É¤ËÂФ·¤Æ¥Þ¥Ã¥Á¤¹¤ë
.I ¥Ñ¥¿¡¼¥ó
¤¬ AWK ¥×¥í¥°¥é¥àÆâ¤Ë¤¢¤ë¤«¤É¤¦¤«¤ò
-¸¡º÷¤·¤Þ¤¹¡£¤½¤Î¹Ô¤Ë¥Þ¥Ã¥Á¤·¤¿¥Ñ¥¿¡¼¥ó¤¹¤Ù¤Æ¤Ë¤Ä¤¤¤Æ¡¢¤½¤ì¤¾¤ìÂбþ¤¹¤ë
+¸¡º÷¤·¤Þ¤¹¡£¤½¤Î¥ì¥³¡¼¥É¤Ë¥Þ¥Ã¥Á¤·¤¿¥Ñ¥¿¡¼¥ó¤¹¤Ù¤Æ¤Ë¤Ä¤¤¤Æ¡¢¤½¤ì¤¾¤ìÂбþ¤¹¤ë
.I ¥¢¥¯¥·¥ç¥ó
¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
¥Ñ¥¿¡¼¥ó¤Ï¡¢¥×¥í¥°¥é¥à¥Æ¥­¥¹¥È¤Ë½Ð¸½¤·¤¿½ç½ø¤Ç¸¡º÷¤µ¤ì¤Þ¤¹¡£
.PP
-ÆþÎϤ¬¤Ä¤­¤ë¤È¡¢
-.I awk
+ÆþÎϤ¬¿Ô¤­¤ë¤È¡¢
+.I gawk
¤Ï(¤â¤·¤¢¤ì¤Ð)
.B END
¥Ö¥í¥Ã¥¯(Ê£¿ô¸ºß²Ä)¤ò¼Â¹Ô¤·¤Þ¤¹¡£
-.SH ÊÑ¿ô¤È¥Õ¥£¡¼¥ë¥É
+.SH ÊÑ¿ô¡¢¥ì¥³¡¼¥É¡¢¥Õ¥£¡¼¥ë¥É
AWK ¤Ë¤ª¤±¤ëÊÑ¿ô¤ÏưŪ¡¢¤¹¤Ê¤ï¤Á¡¢ºÇ½é¤Ë»ÈÍѤµ¤ì¤¿¤È¤­¤ËÀ¸À®¤µ¤ì¤Þ¤¹¡£
-ÊÑ¿ô¤ÎÃͤϡ¢ÉâÆ°¾®¿ô¤«¡¢Ê¸»úÎ󤫡¢¤¢¤ë¤¤¤ÏξÊý¤Ç¤¹¡£ÊÑ¿ô¤ÎÍѤ¤
+ÊÑ¿ô¤ÎÃͤϡ¢ÉâÆ°¾®¿ôÅÀ¿ô¤«¡¢Ê¸»úÎ󤫡¢¤¢¤ë¤¤¤ÏξÊý¤Ç¤¹¡£ÊÑ¿ô¤ÎÍѤ¤
¤é¤ìÊý¤Ë¤è¤êÊѲ½¤·¤Þ¤¹¡£AWK ¤Ç¤Ï¤Þ¤¿¡¢1¼¡¸µÇÛÎó¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
¿¼¡¸µÇÛÎó
¤â¡¢µ¼»÷Ū¤Ë¤Ç¤Ï¤¢¤ê¤Þ¤¹¤¬¡¢ÍøÍѲÄǽ¤Ç¤¹¡£¥×¥í¥°¥é¥à¼Â¹Ô³«»Ï»þ¤Ë¡¢
¤¤¤¯¤Ä¤«¤ÎÄêµÁºÑ¤ßÊÑ¿ô¤¬ÀßÄꤵ¤ì¤Þ¤¹¡£
+¤³¤ì¤é¤òɬÍפ˱þ¤¸¤ÆÀâÌÀ¤·¡¢°Ê²¼¤Ç¤Þ¤È¤á¤Þ¤¹¡£
+.SS ¥ì¥³¡¼¥É
+Ä̾¥ì¥³¡¼¥É¤Ï²þ¹Ôʸ»ú¤Ë¤è¤ê¶èÀÚ¤é¤ì¤Þ¤¹¡£
+¥ì¥³¡¼¥É¤Î¶èÀÚ¤ê¤Ï¡¢ÁȤ߹þ¤ßÊÑ¿ô
+.B RS
+¤ØÃͤòÂåÆþ¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢À©¸æ¤Ç¤­¤Þ¤¹¡£
+.B RS
+¤¬Ã±°ìʸ»ú¤Î¾ì¹ç¡¢¤½¤Îʸ»ú¤¬¥ì¥³¡¼¥É¤ò¶èÀÚ¤ê¤Þ¤¹¡£
+¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢
+.B RS
+¤ÏÀµµ¬É½¸½¤È¤Ê¤ê¤Þ¤¹¡£
+ÆþÎÏÃæ¤Î¥Æ¥­¥¹¥È¤Ç¡¢¤³¤ÎÀµµ¬É½¸½¤Ë¥Þ¥Ã¥Á¤¹¤ë¤â¤Î¤¬¥ì¥³¡¼¥É¤ò¶èÀÚ¤ê¤Þ¤¹¡£
+¤·¤«¤·¸ß´¹¥â¡¼¥É¤Ç¤Ï¡¢
+ʸ»úÎóÃͤκǽé¤Îʸ»ú¤À¤±¤¬¡¢¥ì¥³¡¼¥É¥»¥Ñ¥ì¡¼¥¿¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
+.B RS
+¤¬¶õʸ»úÎó¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤È¤­¤Ë¤Ï¡¢¥ì¥³¡¼¥É¤Ï¶õ¹Ô¤Ç¶èÀÚ¤é¤ì¤Þ¤¹¡£
+.B RS
+¤¬¶õʸ»úÎó¤ËÀßÄꤵ¤ì¤¿¤È¤­¤Ë¤Ï¡¢
+.B FS
+¤ÎÃͤˤ«¤«¤ï¤é¤º¡¢²þ¹Ôʸ»ú¤Ï¾ï¤Ë¥Õ¥£¡¼¥ë¥É¥»¥Ñ¥ì¡¼¥¿¤È¤Ê¤ê¤Þ¤¹¡£
.SS ¥Õ¥£¡¼¥ë¥É
.PP
-ÆþÎÏ¥Õ¥¡¥¤¥ë¤«¤é1¹Ô¤òÆÉ¤ß¹þ¤à¤È¡¢
-.I awk
-¤Ï¤½¤Î¹Ô¤ò
+ÆþÎϥ쥳¡¼¥É¤òÆÉ¤ß¹þ¤à¤´¤È¤Ë¡¢
+.I gawk
+¤Ï¤½¤Î¥ì¥³¡¼¥É¤ò
.I ¥Õ¥£¡¼¥ë¥É
¤Ëʬ³ä¤·¤Þ
¤¹¡£Ê¬³ä¤¹¤ëºÝ¤Ë¤Ï¡¢ÊÑ¿ô
@@ -411,24 +466,33 @@ AWK ¤Ë¤ª¤±¤ëÊÑ¿ô¤ÏưŪ¡¢¤¹¤Ê¤ï¤Á¡¢ºÇ½é¤Ë»ÈÍѤµ¤ì¤¿¤È¤­¤ËÀ¸À®¤µ¤ì¤Þ¤¹¡£
¤ÎÃͤ¬¥Õ¥£¡¼¥ë¥É¥»¥Ñ¥ì¡¼¥¿¤È¤·¤Æ»²¾È¤µ¤ì¤Þ¤¹¡£
.B FS
¤ÎÃͤ¬1ʸ»ú¤Ê¤é¡¢¤½¤Î
-ʸ»ú¤ò¶­¤Ë¥Õ¥£¡¼¥ë¥É¤¬Ê¬³ä¤µ¤ì¤Þ¤¹¡£1ʸ»ú¤Ç¤Ê¤¤¤Ê¤é¡¢
+ʸ»ú¤ò¶­¤Ë¥Õ¥£¡¼¥ë¥É¤¬Ê¬³ä¤µ¤ì¤Þ¤¹¡£
.B FS
-¤ÏÀµµ¬É½¸½¤Ç¤¢¤ë
+¤¬¶õʸ»úÎó¤Î¾ì¹ç¡¢¸Ä¡¹¤Îʸ»ú¤¬¥Õ¥£¡¼¥ë¥É¥»¥Ñ¥ì¡¼¥¿¤È¤Ê¤ê¤Þ¤¹¡£
+¤¤¤º¤ì¤Ç¤â¤Ê¤¤¾ì¹ç¡¢
+.B FS
+¤Ï´°Á´¤ÊÀµµ¬É½¸½¤Ç¤¢¤ë
¤È²ò¼á¤µ¤ì¤Þ¤¹¡£ÆÃ¼ì¤Ê¾ì¹ç¤È¤·¤Æ
.B FS
¤¬Ã±°ì¤Î¶õÇò¤Î¤È¤­¤Ë¤Ï¡¢¥Õ¥£¡¼¥ë¥É¤Ï
-Ϣ³¤·¤¿¶õÇò¤È¥¿¥Ö¤Ë¤è¤êʬ³ä¤µ¤ì¤Þ¤¹¡£ÊÑ¿ô
+Ϣ³¤·¤¿¶õÇò¡¦¥¿¥Ö¡¦²þ¹Ô¤Ë¤è¤êʬ³ä¤µ¤ì¤Þ¤¹¡£
+(¸å½Ò¤Î
+.BR \-\-posix
+¤ÎµÄÏÀ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤)¡£
+ÊÑ¿ô
.B IGNORECASE
(²¼µ­»²¾È)¤Î
Ãͤϡ¢
.B FS
-¤¬Àµµ¬É½¸½¤Î¾ì¹ç¡¢¥Õ¥£¡¼¥ë¥Éʬ³ä¤Ë¤â±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+¤¬Àµµ¬É½¸½¤Î¾ì¹ç¥Õ¥£¡¼¥ë¥Éʬ³ä¤Ë¤â±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤È¡¢
+.B RS
+¤¬Àµµ¬É½¸½¤Î¾ì¹ç¥ì¥³¡¼¥Éʬ³ä¤Ë¤â±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
.PP
ÊÑ¿ô
.B FIELDWIDTHS
¤ÎÃͤ¬¶õÇò¤Ç¶èÀÚ¤é¤ì¤¿¿ô»ú¤ÎÎó¤Ç¤¢¤ë¾ì¹ç¡¢³Æ¥Õ¥£¡¼¥ë¥É¤Ï
¸ÇÄêŤǤ¢¤ë¤È²ò¼á¤µ¤ì¡¢
-.I awk
+.I gawk
¤Ï»ØÄꤵ¤ì¤¿Éý¤´¤È¤Ë¥Õ¥£¡¼¥ë¥É¤Î
ʬ³ä¤ò¹Ô¤¤¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢
.B FS
@@ -439,14 +503,14 @@ AWK ¤Ë¤ª¤±¤ëÊÑ¿ô¤ÏưŪ¡¢¤¹¤Ê¤ï¤Á¡¢ºÇ½é¤Ë»ÈÍѤµ¤ì¤¿¤È¤­¤ËÀ¸À®¤µ¤ì¤Þ¤¹¡£
.B FIELDWIDTHS
¤Î¸ú²Ì¤òÂǤÁ¾Ã¤·¡¢É¸½à¤Îưºî¤ËÌ᤹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.PP
-³Æ¥Õ¥£¡¼¥ë¥É¤ÎÃͤϡ¢º¸¤«¤é
+ÆþÎϥ쥳¡¼¥ÉÃæ¤Î³Æ¥Õ¥£¡¼¥ë¥É¤ÎÃͤϡ¢º¸¤«¤é
.BR $1 ,
.B $2
Åù¤È¤¤¤¦Ì¾Á°¤Ç»²¾È¤Ç¤­¤Þ¤¹¡£
.B $0
¤Ï
-¹ÔÁ´ÂΤǤ¹¡£¥Õ¥£¡¼¥ë¥É¤ËÃͤòÂåÆþ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¥Õ¥£¡¼¥ë¥É¤ÏÄê¿ô¤À
-¤±¤Ç¤Ê¤¯¡¢ÊÑ¿ô¤Ë¤è¤Ã¤Æ»²¾È¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£°Ê²¼¤ÎÎã¤Ç¤Ï¡¢ÆþÎϹԤΠ5
+¥ì¥³¡¼¥ÉÁ´ÂΤǤ¹¡£¥Õ¥£¡¼¥ë¥É¤ËÃͤòÂåÆþ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¥Õ¥£¡¼¥ë¥É¤ÏÄê¿ô¤À
+¤±¤Ç¤Ê¤¯¡¢ÊÑ¿ô¤Ë¤è¤Ã¤Æ»²¾È¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£°Ê²¼¤ÎÎã¤Ç¤Ï¡¢ÆþÎϥ쥳¡¼¥É¤Î 5
ÈÖÌܤΥե£¡¼¥ë¥É¤ÎÃͤò½ÐÎϤ·¤Þ¤¹¡£
.RS
.PP
@@ -457,7 +521,7 @@ print $n
.ft R
.RE
.PP
-ÊÑ¿ô NF ¤Ï¡¢¼«Æ°Åª¤Ë¤½¤Î¹Ô¤Î¥Õ¥£¡¼¥ë¥É¤Î¿ô¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
+ÊÑ¿ô NF ¤Ï¡¢¼«Æ°Åª¤ËÆþÎϥ쥳¡¼¥É¤Î¥Õ¥£¡¼¥ë¥É¤Î¿ô¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
.PP
¸ºß¤·¤Ê¤¤¥Õ¥£¡¼¥ë¥É(¤¹¤Ê¤ï¤Á¡¢
.B $NF
@@ -472,16 +536,23 @@ print $n
.B $0
¤ÎÃͤϡ¢¥Õ¥£¡¼¥ë¥É¤ÎÃͤòÊÑ¿ô
.B OFS
-¤ÎÃͤǷë¹ç¤·¤¿¤â¤Î¤ËºÆÀßÄꤵ¤ì¤Þ¤¹¡£
+¤ÎÃͤǥե£¡¼¥ë¥É¤ò¶èÀڤ俤â¤Î¤È¤·¤ÆºÆ·×»»¤µ¤ì¤Þ¤¹¡£
Éé¤Î¥Õ¥£¡¼¥ë¥ÉÈÖ¹æ¤Ø¤Î»²¾È¤ÏÃ×̿Ū¥¨¥é¡¼¤È¤Ê¤ê¤Þ¤¹¡£
+.B NF
+¤ò¸º¾¯¤µ¤»¤ë¤È¡¢¿·¤·¤¤Ãͤò±Û¤¨¤ë¥Õ¥£¡¼¥ë¥É¤ÎÃͤϼº¤ï¤ì¤Þ¤¹¡£
+.B $0
+¤ÎÃͤϡ¢¥Õ¥£¡¼¥ë¥É¤ÎÃͤòÊÑ¿ô
+.B OFS
+¤ÎÃͤǥե£¡¼¥ë¥É¤ò¶èÀڤ俤â¤Î¤È¤·¤ÆºÆ·×»»¤µ¤ì¤Þ¤¹¡£
.SS ÁȤ߹þ¤ßÊÑ¿ô
.PP
-AWK ¤ÎÁȤ߹þ¤ßÊÑ¿ô¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
+.I gawk
+¤ÎÁȤ߹þ¤ßÊÑ¿ô¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
.PP
.TP \w'\fBFIELDWIDTHS\fR'u+1n
.B ARGC
¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤Î¸Ä¿ô(
-.I awk
+.I gawk
¤Ø¤Î¥ª¥×¥·¥ç¥ó¤È¡¢¥×¥í¥°¥é¥à»ØÄê¤Ï´Þ¤ß¤Þ
¤»¤ó)¡£
.TP
@@ -504,16 +575,17 @@ AWK ¤ÎÁȤ߹þ¤ßÊÑ¿ô¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
.TP
.B ENVIRON
¸½ºß¤Î´Ä¶­ÊÑ¿ô¤ÎÃͤ«¤é¤Ê¤ëÇÛÎó¡£ÇÛÎó¤Ï¡¢´Ä¶­ÊÑ¿ô̾¤Ë¤è¤ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤µ¤ì
-¡¢³ÆÍ×ÁǤÎÃͤϤ½¤Î´Ä¶­ÊÑ¿ô¤ÎÃͤǤ¹(¤¿¤È¤¨¤Ð¡¢´Ä¶­ÊÑ¿ô
-.B HOME
-¤Ï \fBENVIRON["HOME"]\fP ¤Ç»²¾È¤Ç¤­¤Þ¤¹)¡£ËÜÇÛÎó¤Ë
+¡¢³ÆÍ×ÁǤÎÃͤϤ½¤Î´Ä¶­ÊÑ¿ô¤ÎÃͤǤ¹(Î㤨¤Ð
+\fBENVIRON["HOME"]\fP ¤Ï
+.B /home/arnold
+¤È¤Ê¤ë¤Ç¤·¤ç¤¦)¡£ËÜÇÛÎó¤Ë
ÂåÆþ¤ò¹Ô¤Ã¤Æ¤â¡¢
-.I awk
+.I gawk
¤«¤é¥ê¥À¥¤¥ì¥¯¥È¤ä
.B system()
´Ø¿ô¤Ë¤è¤ê¼Â¹Ô¤µ¤ì¤ë
¥×¥í¥°¥é¥à¤Î´Ä¶­¤Ë¤Ï±Æ¶Á¤òÍ¿¤¨¤Þ¤»¤ó(¤³¤ì¤Ï¡¢¾­Íè¤Î
-.I awk
+.I gawk
¤Ç¤ÏÊѹ¹¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹)¡£
.\" but don't hold your breath...
.TP
@@ -529,14 +601,13 @@ AWK ¤ÎÁȤ߹þ¤ßÊÑ¿ô¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
.TP
.B FIELDWIDTHS
¶õÇò¤Ç¶èÀÚ¤é¤ì¤¿¥Õ¥£¡¼¥ë¥ÉĹ¤Î¥ê¥¹¥È¡£¤â¤·¤³¤ÎÃͤ¬ÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢
-.I awk
+.I gawk
¤Ï
.B FS
¤ÎÃͤòÍѤ¤¤Æ¥Õ¥£¡¼¥ë¥Éʬ³ä¤¹¤ë¤«¤ï¤ê¤Ë¡¢¸ÇÄêĹ¤Î¥Õ¥£¡¼¥ë¥Éʬ³ä¤ò¹Ô
¤¤¤Þ¤¹¡£¸ÇÄêĹ¤Î¥Õ¥£¡¼¥ë¥Éʬ³äµ¡Ç½¤Ï¤Þ¤À¼Â¸³Åª¤Ê¤â¤Î¤Ç¡¢
-.I awk
-¤¬²þÎɤµ¤ì¤ë¤Ë½¾
-¤Ã¤Æ°ÕÌ£¤¬ÊѲ½¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
+.I gawk
+¤¬²þÎɤµ¤ì¤ë¤Ë½¾¤Ã¤Æ°ÕÌ£¤¬ÊѲ½¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
.TP
.B FILENAME
¸½ºß¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë̾¡£¤â¤·¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤
@@ -553,17 +624,23 @@ AWK ¤ÎÁȤ߹þ¤ßÊÑ¿ô¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
.TP
.B FS
ÆþÎÏ¥Õ¥£¡¼¥ë¥É¥»¥Ñ¥ì¡¼¥¿¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ïñ°ì¤Î¶õÇò¤Ç¤¹¡£
+¾å½Ò¤Î
+.B ¥Õ¥£¡¼¥ë¥É
+¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.TP
.B IGNORECASE
-¤¹¤Ù¤Æ¤ÎÀµµ¬É½¸½¤Ë¤ª¤¤¤ÆÂçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤òÀ©¸æ¤·¤Þ¤¹¡£¤â¤·¡¢
+¤¹¤Ù¤Æ¤ÎÀµµ¬É½¸½¤Èʸ»úÎóÁàºî¤Ë¤ª¤¤¤ÆÂçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤òÀ©¸æ¤·¤Þ¤¹¡£¤â¤·¡¢
.B IGNORECASE
-¤¬ 0 ¤Ç¤Ê¤¤ÃͤËÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¥ë¡¼¥ë¤Î¥Ñ¥¿¡¼¥ó¥Þ¥Ã¥Á¡¢
+¤¬ 0 ¤Ç¤Ê¤¤ÃͤËÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢Ê¸»úÎóÈæ³Ó¡¢¥ë¡¼¥ë¤Î¥Ñ¥¿¡¼¥ó¥Þ¥Ã¥Á¡¢
.B FS
¤Ë¤è¤ë¥Õ¥£¡¼¥ë¥Éʬ³ä¡¢
+.B RS
+¤Ë¤è¤ë¥ì¥³¡¼¥Éʬ³ä¡¢
.B ~
¤È
.B !~
¤Ë¤è¤ëÀµµ¬É½¸½¥Þ¥Ã¥Á¡¢ÄêµÁºÑ¤ß´Ø¿ô
+.BR gensub() ,
.BR gsub() ,
.BR index() ,
.BR match() ,
@@ -571,14 +648,22 @@ AWK ¤ÎÁȤ߹þ¤ßÊÑ¿ô¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
.B sub()
¤Ë¤ª¤¤¤ÆÂçʸ»ú¤È¾®Ê¸»ú¤Î°ã¤¤¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢
.B IGNORECASE
-¤¬ 0 °Ê³°¤Î
-Ãͤʤ顢
+¤¬ 0 °Ê³°¤ÎÃͤʤ顢
.B /aB/
-¤Ï \fB"ab"\fP¡¢\fB"aB"\fP¡¢\fB"Ab"\fP¡¢\fB"AB"\fP ¤Î¤¤¤º¤ì¤Ë¤â¥Þ¥Ã¥Á¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
+¤Ï \fB"ab"\fP, \fB"aB"\fP, \fB"Ab"\fP, \fB"AB"\fP
+¤Î¤¤¤º¤ì¤Ë¤â¥Þ¥Ã¥Á¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
¾¤ÎAWK ÊÑ¿ô¤ÈƱÍͤË
.B IGNORECASE
-¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï 0 ¤Ê¤Î¤Ç¡¢Ä̾ï¤Ï
-Àµµ¬É½¸½¤Ë¤ª¤¤¤ÆÂçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤¹¡£
+¤Î½é´üÃÍ¤Ï 0 ¤Ê¤Î¤Ç¡¢Ä̾ï¤Ï
+Àµµ¬É½¸½¤Èʸ»úÎóÁàºî¤Ë¤ª¤¤¤ÆÂçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤¹¡£
+Unix ¤Ç¤Ï¡¢Âçʸ»ú¾®Ê¸»ú¤ò̵»ë¤¹¤ë¾ì¹ç¡¢
+ISO 8859-1 Latin-1 ʸ»ú½¸¹çÁ´¤Æ¤ò»ÈÍѤǤ­¤Þ¤¹¡£
+.B Ãí:
+3.0 °ÊÁ°¤Î
+.I gawk
+¤Ç¤Ï
+.B IGNORECASE
+¤ÏÀµµ¬É½¸½Áàºî¤Î¤ß¤Ë±Æ¶Á¤·¤Þ¤·¤¿¡£¸½ºß¤Ïʸ»úÎóÈæ³Ó¤Ë¤â±Æ¶Á¤·¤Þ¤¹¡£
.TP
.B NF
¸½ºß¤ÎÆþÎϥ쥳¡¼¥É¤Î¥Õ¥£¡¼¥ë¥É¿ô¡£
@@ -597,17 +682,15 @@ AWK ¤ÎÁȤ߹þ¤ßÊÑ¿ô¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
.TP
.B RS
ÆþÎϥ쥳¡¼¥É¥»¥Ñ¥ì¡¼¥¿¡£¥Ç¥Õ¥©¥ë¥È¤Ï²þ¹Ô¤Ç¤¹¡£
+.TP
+.B RT
+¥ì¥³¡¼¥É¥¿¡¼¥ß¥Í¡¼¥¿¡£
+.I gawk
+¤Ï¡¢
.B RS
-¤ÏÎ㳰Ū¤ÊÊÑ¿ô¤Ç¡¢
-Ãͤκǽé¤Î1ʸ»ú¤Î¤ß¤¬¥ì¥³¡¼¥Éʬ³ä¤ËÍѤ¤¤é¤ì¤Þ¤¹(¤³¤ì¤Ï¡¢¾­Íè¥ê¥ê¡¼¥¹¤µ¤ì¤ë
-.I awk
-¤Ç¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó)¡£¤â¤·
-.B RS
-¤¬¶õʸ»úÎó¤ËÀßÄꤵ¤ì¤Æ¤¤¤¿¤Ê¤é¡¢
-¥ì¥³¡¼¥É¤Ï¶õ¹Ô¤Ë¤è¤Ã¤ÆÊ¬³ä¤µ¤ì¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢
-.B FS
-¤ÎÃͤ¬²¿¤Ç¤¢¤í¤¦¤È¤â¡¢²þ¹Ô¤Ï¤Ä¤Í¤Ë¥Õ¥£¡¼¥ë¥É¥»¥Ñ¥ì¡¼¥¿¤È¤·¤Æ¤ÎÌò³ä¤ò
-²Ì¤¿¤·¤Þ¤¹¡£
+¤Ç»ØÄꤵ¤ì¤ëʸ»ú¤Þ¤¿¤ÏÀµµ¬É½¸½¤Ë¥Þ¥Ã¥Á¤¹¤ëÆþÎϥƥ­¥¹¥È¤ò¡¢
+.B RT
+¤ËÀßÄꤷ¤Þ¤¹¡£
.TP
.B RSTART
.B match()
@@ -631,11 +714,11 @@ AWK ¤ÎÁȤ߹þ¤ßÊÑ¿ô¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
.B SUBSEP
¤ÎÃͤò¶èÀÚ¤ê¤È¤·¤Æ
·ë¹ç¤·¤¿Ê¸»úÎó¤ò¥¤¥ó¥Ç¥Ã¥¯¥¹¤È¤·¤ÆÍѤ¤¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢Â¿¼¡¸µÇÛÎó¤ò
-¥·¥ß¥å¥ì¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
+¥·¥ß¥å¥ì¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£Î㤨¤Ð¡¢
.PP
.RS
.ft B
-i = "A" ;\^ j = "B" ;\^ k = "C"
+i = "A";\^ j = "B";\^ k = "C"
.br
x[i, j, k] = "hello, world\en"
.ft R
@@ -671,34 +754,25 @@ if (val in array)
¤Ï¤Þ¤¿¡¢
.B for
¥ë¡¼¥×Ãæ¤Ç¡¢ÇÛÎó¤Î¤¹¤Ù¤Æ¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹ÃͤˤĤ¤¤Æ·«¤êÊÖ¤¹¤¿¤á¤Ë
-ÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£°Ê²¼¤ÎÊýË¡¤Ç¡¢ÇÛÎó¤Î¤¹¤Ù¤Æ¤ÎÍ×ÁǤÎÃͤòɽ¼¨¤¹¤ë
-¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.PP
-.RS
-.ft B
-.nf
-for (i in array)
- print array[i]
-.fi
-.ft
-.RE
+ÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.PP
ÇÛÎó¤ÎÍ×ÁǤϡ¢
.B delete
¥¹¥Æ¡¼¥È¥á¥ó¥È¤òÍѤ¤¤Æºï½ü¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.B delete
¥¹¥Æ¡¼¥È¥á¥ó¥È¤Ï¤Þ¤¿¡¢
-ÇÛÎóÁ´ÂΤòºï½ü¤¹¤ë¤Î¤Ë¤â»È¤¨¤Þ¤¹¡£
+ź»ú¤ò»ØÄꤻ¤º¤ËÇÛÎó̾¤Î¤ß¤ò»ØÄꤹ¤ë¤³¤È¤Ë¤è¤ê¡¢
+ÇÛÎóÁ´ÂΤòºï½ü¤¹¤ë¤¿¤á¤Ë¤â»È¤¨¤Þ¤¹¡£
.SS ÊÑ¿ô¤Î·¿¤ÈÊÑ´¹
.PP
-ÊÑ¿ô¤È¥Õ¥£¡¼¥ë¥É¤Ï¡¢(ÉâÆ°¾®¿ô¤Î)¿ôÃͤޤ¿¤Ïʸ»úÎ󡢤¢¤ë¤¤¤ÏξÊý¤È¤·¤Æ
+ÊÑ¿ô¤È¥Õ¥£¡¼¥ë¥É¤Ï¡¢(ÉâÆ°¾®¿ôÅÀ¿ô¤Î)¿ôÃͤޤ¿¤Ïʸ»úÎ󡢤¢¤ë¤¤¤ÏξÊý¤È¤·¤Æ
°·¤ï¤ì¤Þ¤¹¡£
ÊÑ¿ô¤ÎÃͤ¬¤É¤Î¤è¤¦¤Ë²ò¼á¤µ¤ì¤ë¤«¤Ï¡¢ÊÑ¿ô¤Î»È¤ï¤ìÊý¤Ë¤è¤Ã¤ÆÊѲ½¤·¤Þ¤¹¡£
¿ô¼°Ãæ¤ÇÍѤ¤¤é¤ì¤ì¤ÐÊÑ¿ô¤Ï¿ôÃͤȤ·¤Æ²ò¼á¤µ¤ì¡¢Ê¸»úÎó¤È¤·¤ÆÍѤ¤¤é¤ì¤ì
¤Ðʸ»úÎó¤È¤·¤Æ²ò¼á¤µ¤ì¤Þ¤¹¡£
.PP
-ÊÑ¿ô¤ÎÃͤò¶¯À©Åª¤Ë¿ôÃͤǤ¢¤ë¤È²ò¼á¤µ¤»¤¿¤¤¾ì¹ç¤Ï¡¢ÊÑ¿ô¤Ë 0 ¤ò²Ã¤¨¤Þ¤¹
-(var + 0)¡£Ê¸»úÎó¤È²ò¼á¤µ¤»¤¿¤¤¾ì¹ç¤Ï¶õʸ»úÎó¤ò·ë¹ç¤·¤Þ¤¹(var "")¡£
+ÊÑ¿ô¤ÎÃͤò¶¯À©Åª¤Ë¿ôÃͤǤ¢¤ë¤È²ò¼á¤µ¤»¤¿¤¤¾ì¹ç¤Ï¡¢ÊÑ¿ô¤Ë 0 ¤ò²Ã¤¨¤Þ¤¹¡£
+ʸ»úÎó¤È²ò¼á¤µ¤»¤¿¤¤¾ì¹ç¤Ï¶õʸ»úÎó¤ò·ë¹ç¤·¤Þ¤¹¡£
.PP
ʸ»úÎó¤ò¿ôÃͤËÊÑ´¹¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¡¢ÊÑ´¹¤Ï
.IR atof (3)
@@ -707,9 +781,8 @@ for (i in array)
.B CONVFMT
¤ÎÃͤò¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤È¤·¤ÆÍѤ¤¤Æ¡¢
.IR sprintf (3)
-¤Ë¤è¤ê¹Ô¤ï¤ì¤Þ¤¹¡£AWK ¤Ç¤Ï¤¹¤Ù¤Æ¤Î¿ôÃͤÏÉâÆ°¾®¿ô¤Ç¤¹¤¬¡¢À°¿ôÃͤϤĤͤËÀ°¿ô
+¤Ë¤è¤ê¹Ô¤ï¤ì¤Þ¤¹¡£AWK ¤Ç¤Ï¤¹¤Ù¤Æ¤Î¿ôÃͤÏÉâÆ°¾®¿ôÅÀ¿ô¤Ç¤¹¤¬¡¢À°¿ôÃͤϾï¤ËÀ°¿ô
¤È¤·¤ÆÊÑ´¹¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
-.PP
¤è¤Ã¤Æ¡¢°Ê²¼¤Î¾ì¹ç¡¢
.PP
.RS
@@ -724,44 +797,66 @@ b = a ""
.PP
ÊÑ¿ô
.B b
-¤Ïʸ»úÎóÃÍ \fB"12"\fR ¤È¤Ê¤ê¡¢"12.00" ¤È¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
+¤Ïʸ»úÎóÃÍ \fB"12"\fR ¤È¤Ê¤ê¡¢\fB"12.00"\fR ¤È¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
.PP
.I gawk
¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤ÆÈæ³Ó¤ò¹Ô¤¤¤Þ¤¹:
-2¤Ä¤ÎÊÑ¿ô¤¬¿ôÃͤʤé¿ôÃͤȤ·¤ÆÈæ
+2 ¤Ä¤ÎÊÑ¿ô¤¬¿ôÃͤʤé¿ôÃͤȤ·¤ÆÈæ
³Ó¤·¤Þ¤¹¡£¤â¤·ÊÒÊý¤¬¿ôÃͤÇÊÒÊý¤¬`¿ôÃÍ'ʸ»úÎó¤Ê¤é¡¢¿ôÃͤȤ·¤ÆÈæ³Ó¤µ¤ì¤Þ¤¹¡£
ÊÒÊý¤¬¿ôÃͤǤʤ¤Ê¸»úÎó¤Ê¤é¡¢¿ôÃͤΤۤ¦¤¬Ê¸»úÎó¤ËÊÑ´¹¤µ¤ì¡¢Ê¸»úÎó¤È¤·¤Æ
Èæ³Ó¤µ¤ì¤Þ¤¹¡£Î¾Êý¤È¤âʸ»úÎó¤Ê¤é¡¢Ê¸»úÎó¤È¤·¤ÆÈæ³Ó¤µ¤ì¤Þ¤¹¡£\*(PX ɸ½à¤Ë½¾¤¦
¤Ê¤é¡¢Î¾Êý¤È¤â¿ôÃÍʸ»úÎó¤Î¾ì¹ç¤Ï¿ôÃͤȤ·¤ÆÈæ³Ó¤·¤Þ¤¹¤¬¡¢¤³¤ì¤ÏÌÀ¤é
¤«¤Ë´Ö°ã¤¤¤Ç¤¹¡£
-.I awk
+.I gawk
¤Ï¤½¤Î¤è¤¦¤Êưºî¤ò¤·¤Þ¤»¤ó¡£
.PP
-½é´ü²½¤µ¤ì¤Æ¤¤¤Ê¤¤ÊÑ¿ô¤Ï¡¢¿ôÃͤȤ·¤Æ¤Ï 0 ¤ò¡¢Ê¸»úÎó¤È¤·¤Æ¤Ï¶õʸ»úÎó¤ò»ý¤Á¤Þ¤¹¡£
+\fB"57"\fP ¤Î¤è¤¦¤Êʸ»úÎóÄê¿ô¤Ï¿ôÃÍʸ»úÎó¤Ç¤Ï
+.I ¤Ê¤¯
+¡¢Ê¸»úÎóÄê¿ô¤Ç¤¹¡£¡Ö¿ôÃÍʸ»úÎó¡×¤Î³µÇ°¤Ï¡¢¥Õ¥£¡¼¥ë¥É¡¢
+.B getline
+¤ÎÆþÎÏ¡¢
+.B FILENAME
+¡¢
+.B ARGV
+¤ÎÍ×ÁÇ¡¢
+.B ENVIRON
+¤ÎÍ×ÁÇ¡¢¿ôÃÍʸ»úÎ󤫤é
+.B split()
+¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿ÇÛÎó¤ÎÍ×ÁǤËÂФ·¤Æ¤Î¤ßŬÍѤµ¤ì¤Þ¤¹¡£
+´ðËÜŪ¤Ê¹Í¤¨Êý¤Ç¤Ï¡¢
+.I ¥æ¡¼¥¶ÆþÎÏ
+¡¢¤½¤ì¤â¿ôÃͤ˸«¤¨¤ë¥æ¡¼¥¶ÆþÎϤΤߤ¬¿ôÃͤȤ·¤Æ°·¤ï¤ì¤Þ¤¹¡£
+.PP
+½é´ü²½¤µ¤ì¤Æ¤¤¤Ê¤¤ÊÑ¿ô¤Ï¡¢¿ôÃͤȤ·¤Æ¤Ï 0 ¤ò¡¢Ê¸»úÎó¤È¤·¤Æ¤Ï "" (¶õʸ»úÎó)¤ò
+»ý¤Á¤Þ¤¹¡£
.SH ¥Ñ¥¿¡¼¥ó¤È¥¢¥¯¥·¥ç¥ó
-awk ¤Ï¹Ô»Ø¸þ¤Î¸À¸ì¤Ç¤¹¡£¤Þ¤º¥Ñ¥¿¡¼¥ó¡¢¼¡¤Ë¥¢¥¯¥·¥ç¥ó¤¬Â³¤­¤Þ¤¹¡£¥¢¥¯¥·¥ç
-¥ó¤Ï
+awk ¤Ï¹Ô»Ø¸þ¤Î¸À¸ì¤Ç¤¹¡£¤Þ¤º¥Ñ¥¿¡¼¥ó¡¢¼¡¤Ë¥¢¥¯¥·¥ç¥ó¤¬Â³¤­¤Þ¤¹¡£
+¥¢¥¯¥·¥ç¥ó¤Ï
.B {
¤È
.B }
¤Ç°Ï¤ß¤Þ¤¹¡£¥Ñ¥¿¡¼¥ó¤Þ¤¿¤Ï¥¢¥¯¥·¥ç¥ó¤Ï¾Êά¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
¤â¤Á¤í¤ó¡¢Î¾Êý¤È¤â
¾Êά¤·¤Æ¤·¤Þ¤Ã¤Æ¤Ï°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó¡£
-¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤¾ì¹ç¡¢¥¢¥¯¥·¥ç¥ó¤Ï¤¹¤Ù¤Æ¤ÎÆþÎϹԤË
+¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤¾ì¹ç¡¢¥¢¥¯¥·¥ç¥ó¤Ï¤¹¤Ù¤Æ¤ÎÆþÎϥ쥳¡¼¥É¤Ë
ÂФ·¤ÆÅ¬ÍѤµ¤ì¤Þ¤¹¡£¾Êά¤µ¤ì¤¿¥¢¥¯¥·¥ç¥ó¤Ï°Ê²¼¤ÈÅù²Á¤Ç¤¹¡£
.RS
.PP
.B "{ print }"
.RE
.PP
-¤³¤ì¤Ï¹ÔÁ´ÂΤò½ÐÎϤ·¤Þ¤¹¡£
+¤³¤ì¤Ï¥ì¥³¡¼¥ÉÁ´ÂΤò½ÐÎϤ·¤Þ¤¹¡£
.PP
-¥³¥á¥ó¥È¤Ï ``#'' ¤Ç»Ï¤Þ¤ê¡¢¹ÔËö¤Þ¤Ç³¤­¤Þ¤¹¡£¶õ¹Ô¤Ï¡¢Ê£¿ô¥¹¥Æ¡¼¥È¥á¥ó¥È¤Î
+¥³¥á¥ó¥È¤Ïʸ»ú ``#'' ¤Ç»Ï¤Þ¤ê¡¢¹ÔËö¤Þ¤Ç³¤­¤Þ¤¹¡£¶õ¹Ô¤Ï¡¢Ê£¿ô¥¹¥Æ¡¼¥È¥á¥ó¥È¤Î
´Ö¤ò¤¢¤±¤ë¤Î¤Ë»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
Ä̾¥¹¥Æ¡¼¥È¥á¥ó¥È¤Ï²þ¹Ô¤Ç½ª¤ï¤ê¤Þ¤¹¡£¤¿¤À¤·¡¢
-°Ê²¼¤Îµ­¹æ¤Ç¹Ô¤¬½ª¤ï¤ë¾ì¹ç¤Ë¤Ï¤³¤Î¸Â¤ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó:
-``,'', ``{'', ``?'', ``:'',
-``&&'', ``||''¡£
+¼¡¤Îµ­¹æ¤Ç¹Ô¤¬½ª¤ï¤ë¾ì¹ç¤Ë¤Ï¤³¤Î¸Â¤ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: ``,'',
+.BR { ,
+.BR ? ,
+.BR : ,
+.BR && ,
+.B ||
+¡£
.B do
¤Þ¤¿¤Ï
.B else
@@ -769,9 +864,11 @@ awk ¤Ï¹Ô»Ø¸þ¤Î¸À¸ì¤Ç¤¹¡£¤Þ¤º¥Ñ¥¿¡¼¥ó¡¢¼¡¤Ë¥¢¥¯¥·¥ç¥ó¤¬Â³¤­¤Þ¤¹¡£¥¢¥¯¥·¥ç
¤Î¹Ô¤Ø·Ñ³¤µ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢²þ¹Ô¤ÎľÁ°¤Ë ``\e'' ¤òÃÖ¤¯¤³¤È¤Ç¡¢
¹Ô¤ò·Ñ³¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¤½¤Î²þ¹Ô¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
.PP
-``;'' ¤Ç¶èÀڤ뤳¤È¤Ë¤è¤ê¡¢1¹Ô¤ËÊ£¿ô¤Î¥¹¥Æ¡¼¥È¥á¥ó¥È¤òµ­½Ò¤¹¤ë¤³¤È¤¬¤Ç¤­
-¤Þ¤¹¡£¥¢¥¯¥·¥ç¥óÉô¤Ë¤ª¤±¤ë¥¹¥Æ¡¼¥È¥á¥ó¥È¤À¤±¤Ç¤Ï¤Ê¤¯¡¢
-¥Ñ¥¿¡¼¥ó¤È¥¢¥¯¥·¥ç¥ó¤ÎÂм«ÂΤâ ``;'' ¤Ç¶èÀڤäÆÊ£¿ôÃÖ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+``;'' ¤Ç¶èÀڤ뤳¤È¤Ë¤è¤ê¡¢1¹Ô¤ËÊ£¿ô¤Î¥¹¥Æ¡¼¥È¥á¥ó¥È¤òµ­½Ò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+(Ä̾ï¤Î¤è¤¦¤Ë)
+¥Ñ¥¿¡¼¥ó-¥¢¥¯¥·¥ç¥óÂÐÃæ¤Î¥¢¥¯¥·¥ç¥óÉô¤Ë¤ª¤±¤ë¥¹¥Æ¡¼¥È¥á¥ó¥È¤À¤±¤Ç¤Ï¤Ê¤¯¡¢
+¥Ñ¥¿¡¼¥ó-¥¢¥¯¥·¥ç¥óÂÐ¥¹¥Æ¡¼¥È¥á¥ó¥È¼«¿È¤â¡¢
+ ``;'' ¤Ç¶èÀڤäÆÊ£¿ôÃÖ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.SS ¥Ñ¥¿¡¼¥ó
AWK ¤Î¥Ñ¥¿¡¼¥ó¤Ï¡¢°Ê²¼¤Î¤¦¤Á¤Î¤¤¤º¤ì¤«¤Ç¤¹¡£
.PP
@@ -795,7 +892,11 @@ AWK ¤Î¥Ñ¥¿¡¼¥ó¤Ï¡¢°Ê²¼¤Î¤¦¤Á¤Î¤¤¤º¤ì¤«¤Ç¤¹¡£
.B END
¤ÏÆÃ¼ì¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤¢¤ê¡¢ÆþÎϤÈÈæ³Ó¤µ¤ì¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤¹¤Ù¤Æ¤Î
.B BEGIN
-¥Ñ¥¿¡¼¥ó¤ËÂбþ¤·¤¿¥¢¥¯¥·¥ç¥óÉô¤Ï·ë¹ç¤µ¤ì¤Þ¤¹¡£·ë¹ç¤µ¤ì¤¿¥¢¥¯¥·¥ç¥ó¤Ï
+¥Ñ¥¿¡¼¥ó¤ËÂбþ¤·¤¿¥¢¥¯¥·¥ç¥óÉô¤Ï·ë¹ç¤µ¤ì¡¢
+¤½¤Î¤è¤¦¤Ê¤¹¤Ù¤Æ¤Î¥¢¥¯¥·¥ç¥óÉô¤¬Ã±°ì¤Î
+.B BEGIN
+¥Ö¥í¥Ã¥¯Ãæ¤Ë¤¢¤ë¤«¤Î¤è¤¦¤Ë°·¤ï¤ì¤Þ¤¹¡£
+·ë¹ç¤µ¤ì¤¿¥¢¥¯¥·¥ç¥ó¤Ï¡¢
¤¹¤Ù¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤ÎÆÉ¤ß¹þ¤ß¤ËÀèΩ¤Ã¤Æ¼Â¹Ô¤µ¤ì¤Þ¤¹¡£Æ±Íͤˤ¹¤Ù¤Æ¤Î
.B END
¥Ö¥í¥Ã¥¯¤Ï·ë¹ç¤µ¤ì¡¢¤¹¤Ù¤Æ¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î½èÍý¸å(¤¢¤ë¤¤¤Ï¡¢exit ¥¹¥Æ¡¼¥È¥á¥ó¥È
@@ -810,16 +911,17 @@ AWK ¤Î¥Ñ¥¿¡¼¥ó¤Ï¡¢°Ê²¼¤Î¤¦¤Á¤Î¤¤¤º¤ì¤«¤Ç¤¹¡£
¥Ñ¥¿¡¼¥ó¤Ï¥¢¥¯¥·¥ç¥óÉô¤ò¾Êά¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£
.PP
.BI / "regular expression" /
-¥Ñ¥¿¡¼¥ó¤Ç¤Ï¡¢Àµµ¬É½¸½¤Ë¥Þ¥Ã¥Á¤·¤¿ÆþÎϹԤËÂФ·¤Æ¥¢¥¯¥·¥ç¥ó
+¥Ñ¥¿¡¼¥ó¤Ç¤Ï¡¢Àµµ¬É½¸½(regular expression)
+¤Ë¥Þ¥Ã¥Á¤·¤¿ÆþÎϥ쥳¡¼¥É¤ËÂФ·¤Æ¥¢¥¯¥·¥ç¥ó
¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£Àµµ¬É½¸½¤Ï
.IR egrep (1)
¤ÈƱ¤¸¤â¤Î¤¬»È¤¨¤Þ¤¹¡£¤¢¤È¤ËÍ×Ìó¤ò¼¨¤·¤Þ¤¹¡£
.PP
-´Ø·¸¼°¤Ç¤Ï¡¢¸å½Ò¤Î¥¢¥¯¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤ÎÀá¤Ç¼¨¤¹±é»»»Ò¤òÍѤ¤¤ë¤³¤È¤¬
+.I ´Ø·¸¼°(relational expression)
+¤Ç¤Ï¡¢¸å½Ò¤Î¥¢¥¯¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤ÎÀá¤Ç¼¨¤¹±é»»»Ò¤òÍѤ¤¤ë¤³¤È¤¬
¤Ç¤­¤Þ¤¹¡£
¤³¤ì¤é¤Ï³µ¤·¤Æ¡¢ÆÃÄê¤Î¥Õ¥£¡¼¥ë¥É¤¬Àµµ¬É½¸½¤Ë¥Þ¥Ã¥Á¤¹¤ë¤«¤É¤¦¤«¤ò
-Ä´¤Ù¤ë¤¿¤á¤ËÍѤ¤¤é¤ì¤Þ¤¹
-($2 ~ /foo/ Åù)¡£
+Ä´¤Ù¤ë¤¿¤á¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£
.PP
±é»»»Ò
.BR && ,
@@ -830,7 +932,8 @@ C ¸À¸ì¤ÈƱÍͤˡ¢É¾²ÁÃͤ¬³ÎÄꤷ¤¿»þÅÀ¤Ç°Ê¹ß¤Îɾ²Á¤òÂǤÁÀÚ¤ê¤Þ¤¹¡£
¤³¤ì¤é¤ÏÊ£¿ô¤Î¥Ñ¥¿¡¼¥ó¼°¤ò·ë¹ç¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
¾¤Î¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤ÈƱÍÍ¡¢³ç¸Ì¤Ë¤è¤Ã¤ÆÉ¾²Á½ç½ø¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.PP
-?\^: ±é»»»Ò¤Ï C ¸À¸ì¤Î¤â¤Î¤ÈƱÍͤǤ¹¡£¤â¤·¡¢ºÇ½é¤Î¥Ñ¥¿¡¼¥ó¤¬¿¿¤Ê¤é¡¢
+.B ?\^:
+±é»»»Ò¤Ï C ¸À¸ì¤Î¤â¤Î¤ÈƱÍͤǤ¹¡£¤â¤·¡¢ºÇ½é¤Î¥Ñ¥¿¡¼¥ó¤¬¿¿¤Ê¤é¡¢
¥Æ¥¹¥È¤Î¤¿¤á¤Ë 2 ÈÖÌܤΥѥ¿¡¼¥ó¤¬ÍѤ¤¤é¤ì¡¢¤½¤¦¤Ç¤Ê¤±¤ì¤Ð 3 ÈÖÌܤΥѥ¿¡¼¥ó¤¬
ÍѤ¤¤é¤ì¤Þ¤¹¡£2 ÈÖÌÜ¤È 3 ÈÖÌܤΥѥ¿¡¼¥ó¤Î¤É¤Á¤é¤«¤À¤±¤¬É¾²Á¤µ¤ì¤Þ¤¹¡£
.PP
@@ -841,7 +944,7 @@ C ¸À¸ì¤ÈƱÍͤˡ¢É¾²ÁÃͤ¬³ÎÄꤷ¤¿»þÅÀ¤Ç°Ê¹ß¤Îɾ²Á¤òÂǤÁÀÚ¤ê¤Þ¤¹¡£
.I pattern1
¤Ë¥Þ¥Ã¥Á¤¹¤ë¥ì¥³¡¼¥É¤«¤é¡¢
.I pattern2
-¤Ë¥Þ¥Ã¥Á¤¹¤ë¹Ô¥ì¥³¡¼¥É¤Þ¤Ç¤Î¤¹¤Ù¤Æ¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
+¤Ë¥Þ¥Ã¥Á¤¹¤ë¥ì¥³¡¼¥É¤Þ¤Ç¤Î¤¹¤Ù¤Æ¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
¤³¤Î·Á¼°¤Ï¡¢Â¾¤Î¥Ñ¥¿¡¼¥ó¼°¤Èº®¹ç¤·¤ÆÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
.SS Àµµ¬É½¸½
awk ¤ÎÀµµ¬É½¸½¤Ï
@@ -860,31 +963,39 @@ awk ¤ÎÀµµ¬É½¸½¤Ï
¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
.TP
.B .
-²þ¹Ô°Ê³°¤ÎǤ°Õ¤Î°ìʸ»ú¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
+²þ¹Ô¤ò
+.I ´Þ¤à
+Ǥ°Õ¤Î 1 ʸ»ú¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
.TP
.B ^
-¹ÔƬ¡¢¤Þ¤¿¤Ïʸ»úÎó¤ÎÀèÆ¬¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
+ʸ»úÎó¤ÎÀèÆ¬¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
.TP
.B $
-¹ÔËö¡¢¤Þ¤¿¤Ïʸ»úÎó¤Î½ªÃ¼¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
+ʸ»úÎó¤Î½ªÃ¼¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
.TP
.BI [ abc... ]
-abc... ¤Î¤¤¤º¤ì¤«°ìʸ»ú¤Ë¥Þ¥Ã¥Á¤¹¤ë(ʸ»ú¥¯¥é¥¹)¡£
+ʸ»ú¥ê¥¹¥È¤Ç¤¢¤ê¡¢
+.I abc...
+¤Î¤¤¤º¤ì¤« 1 ʸ»ú¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
.TP
.BI [^ abc... ]
-abc... ¤È²þ¹Ô¤ò½ü¤¯Ç¤°Õ¤Î°ìʸ»ú¤Ë¥Þ¥Ã¥Á¤¹¤ë(ÈÝÄêʸ»ú¥¯¥é¥¹)¡£
+ʸ»ú¥ê¥¹¥È¤ÎµÕ¤Ç¤¢¤ê¡¢
+.I abc...
+°Ê³°¤Î 1 ʸ»ú¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
.TP
.IB r1 | r2
+Áª¸À:
.I r1
¤Þ¤¿¤Ï
.I r2
-¤Ë¥Þ¥Ã¥Á¤¹¤ë(Áª¸À)¡£
+¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
.TP
.I r1r2
+·ë¹ç:
.I r1
¤Îľ¸å¤Ë
.I r2
-¤¬Â³¤¯¤â¤Î¤Ë¥Þ¥Ã¥Á¤¹¤ë(·ë¹ç)¡£
+¤¬Â³¤¯¤â¤Î¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
.TP
.IB r +
.I r
@@ -899,11 +1010,232 @@ abc... ¤È²þ¹Ô¤ò½ü¤¯Ç¤°Õ¤Î°ìʸ»ú¤Ë¥Þ¥Ã¥Á¤¹¤ë(ÈÝÄêʸ»ú¥¯¥é¥¹)¡£
¤Î 0 ²ó¤Þ¤¿¤Ï 1 ²ó¤Î·«¤êÊÖ¤·¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
.TP
.BI ( r )
+¥°¥ë¡¼¥×²½:
+.I r
+¤Ë¥Þ¥Ã¥Á¤¹¤ë¡£
+.TP
+.PD 0
+.IB r { n }
+.TP
+.PD 0
+.IB r { n ,}
+.TP
+.PD
+.IB r { n , m }
+¥Ö¥ì¡¼¥¹Ãæ¤Ë 1 ¤Ä¤« 2 ¤Ä¤Î¿ôÃͤòµ­½Ò¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢
+.I "¥¤¥ó¥¿¡¼¥Ð¥ëɽ¸½"
+¤òɽ¤·¤Þ¤¹¡£¥Ö¥ì¡¼¥¹Ãæ¤Ë¿ôÃͤ¬ 1 ¤Ä¤¢¤ë¾ì¹ç¡¢Ä¾Á°¤ÎÀµµ¬É½¸½
.I r
-¤Ë¥Þ¥Ã¥Á¤¹¤ë(¥°¥ë¡¼¥×²½)¡£
+¤¬
+.I n
+²ó·«¤êÊÖ¤µ¤ì¤Þ¤¹¡£2 ¤Ä¤Î¿ôÃͤ¬¥³¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
+.I r
+¤Ï
+.I n
+²ó¤«¤é
+.I m
+²ó·«¤êÊÖ¤µ¤ì¤Þ¤¹¡£1 ¤Ä¤Î¿ôÃͤ˳¤¤¤Æ¥³¥ó¥Þ¤¬¤¢¤ë¾ì¹ç¡¢
+.I r
+¤Ï¾¯¤Ê¤¯¤È¤â
+.I n
+²ó·«¤êÊÖ¤µ¤ì¤Þ¤¹¡£
+.sp .5
+¥¤¥ó¥¿¡¼¥Ð¥ëɽ¸½¤Ï
+.B \-\^\-posix
+¤Þ¤¿¤Ï
+.B \-\^\-re\-interval
+¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤Æ»ØÄꤵ¤ì¤Æ¤¤¤ë¤È¤­¤Î¤ßÍøÍѲÄǽ¤Ç¤¹¡£
+.TP
+.B \ey
+¸ì¤ÎÀèÆ¬¤Þ¤¿¤ÏËöÈø¤Î¶õʸ»úÎó¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
+.TP
+.B \eB
+¸ì¤ÎÃæ¤Î¶õʸ»úÎó¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
+.TP
+.B \e<
+¸ì¤ÎÀèÆ¬¤Î¶õʸ»úÎó¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
+.TP
+.B \e>
+¸ì¤ÎËöÈø¤Î¶õʸ»úÎó¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
+.TP
+.B \ew
+¸ì¤ò¹½À®¤¹¤ëʸ»ú (¥ì¥¿¡¼¡¢¿ôÃÍ¡¢¥¢¥ó¥À¥¹¥³¥¢) ¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
+.TP
+.B \eW
+¸ì¤ò¹½À®¤¹¤ëʸ»ú°Ê³°¤Îʸ»ú¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
+.TP
+.B \e`
+¥Ð¥Ã¥Õ¥¡ (ʸ»úÎó) ¤ÎÀèÆ¬¤Î¶õʸ»úÎó¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
+.TP
+.B \e'
+¥Ð¥Ã¥Õ¥¡¤ÎËöÈø¤Î¶õʸ»úÎó¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
.PP
ʸ»úÎóÄê¿ôÃæ¤ÇÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹(¸å½Ò»²¾È)¤Ï¡¢
Àµµ¬É½¸½Ãæ¤Ç¤â»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.PP
+.I ʸ»ú¥¯¥é¥¹
+¤Ï POSIX ɸ½à¤ÇƳÆþ¤µ¤ì¤¿¿·µ¡Ç½¤Ç¤¹¡£
+ʸ»ú¥¯¥é¥¹¤ÏÆÃÄê¤Î°À­¤ò»ý¤Äʸ»úÎó¥ê¥¹¥È¤ÎÆÃ¼ìɽ¸½¤Ç¤¹¤¬¡¢
+¼ÂºÝ¤Îʸ»ú½¸¹ç¼«¿È¤Ï¹ñ¤äʸ»ú½¸¹ç¤Ë¤è¤Ã¤ÆÍÍ¡¹¤Ê¤â¤Î¤È¤Ê¤ê¤Þ¤¹¡£
+Î㤨¤Ð¡¢¥¢¥ë¥Õ¥¡¥Ù¥Ã¥Èʸ»ú¤Ï¥¢¥á¥ê¥«¹ç½£¹ñ¤È¥Õ¥é¥ó¥¹¤È¤Ç¤Ï°Û¤Ê¤ê¤Þ¤¹¡£
+.PP
+ʸ»ú¥¯¥é¥¹¤¬Í­¸ú¤Ê¤Î¤Ï¡¢
+ʸ»ú¥ê¥¹¥È¤Î¥Ö¥é¥±¥Ã¥È¤ÎÃæ¤ÎÀµµ¬É½¸½¤À¤±¤Ç¤¹¡£
+ʸ»ú¥¯¥é¥¹¤Ï¡¢
+.B [:
+¤È¡¢¥¯¥é¥¹¤òɽ¸½¤¹¤ë¥­¡¼¥ï¡¼¥É¤È¡¢
+.B :]
+¤Ç¹½À®¤µ¤ì¤Þ¤¹¡£
+°Ê²¼¤Ë POSIX ɽ¸½¤ÇÄêµÁ¤µ¤ì¤ëʸ»ú¥¯¥é¥¹¤ò¼¨¤·¤Þ¤¹¡£
+.TP
+.B [:alnum:]
+¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤È¿ôÃÍʸ»ú¡£
+.TP
+.B [:alpha:]
+¥¢¥ë¥Õ¥¡¥Ù¥Ã¥Èʸ»ú¡£
+.TP
+.B [:blank:]
+¶õÇò¤È¥¿¥Öʸ»ú¡£
+.TP
+.B [:cntrl:]
+À©¸æÊ¸»ú¡£
+.TP
+.B [:digit:]
+¿ôÃÍʸ»ú¡£
+.TP
+.B [:graph:]
+°õ»ú²Äǽ¤Ç²Ä»ë¤Êʸ»ú¡£
+(¶õÇò¤Ï°õ»ú²Äǽ¤Ç¤¹¤¬¸«¤¨¤Þ¤»¤ó¡£°ìÊý
+.B a
+¤Ï°õ»ú²Äǽ¤«¤Ä²Ä»ë¤Ç¤¹¡£)
+.TP
+.B [:lower:]
+¥¢¥ë¥Õ¥¡¥Ù¥Ã¥Èʸ»ú¤Î¾®Ê¸»ú¡£
+.TP
+.B [:print:]
+°õ»ú²Äǽ¤Êʸ»ú (À©¸æÊ¸»ú°Ê³°)¡£
+.TP
+.B [:punct:]
+¶çÆÉÅÀʸ»ú (¥ì¥¿¡¼¡¢¿ôÃÍ¡¢À©¸æÊ¸»ú¡¢¶õÇòʸ»ú¤Î¤¤¤º¤ì¤Ç¤â¤Ê¤¤Ê¸»ú)¡£
+.TP
+.B [:space:]
+¶õÇòʸ»ú (¶õÇò¡¢¥¿¥Ö¡¢¥Õ¥©¡¼¥à¥Õ¥£¡¼¥ÉÅù¤Î¾¯¿ô¤Îʸ»ú¤ò»Ø¤¹)¡£
+.TP
+.B [:upper:]
+¥¢¥ë¥Õ¥¡¥Ù¥Ã¥Èʸ»ú¤ÎÂçʸ»ú¡£
+.TP
+.B [:xdigit:]
+16 ¿Ê¿ô¤Î¿ôÃÍ¡£
+.PP
+Î㤨¤Ð¡¢POSIX ɸ½à°ÊÁ°¤Ç¤Ï¡¢¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤È¿ôÃͤÎʸ»ú¤Ë¥Þ¥Ã¥Á¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
+.B /[A\-Za\-z0\-9]/
+¤È½ñ¤­¤Þ¤·¤¿¡£¤·¤«¤·¡¢Ê̤Υ¢¥ë¥Õ¥¡¥Ù¥Ã¥Èʸ»ú¤¬Ê¸»ú½¸¹ç¤Ë´Þ¤Þ¤ì¤ë¾ì¹ç¡¢
+¤½¤ì¤é¤Ë¤Ï¥Þ¥Ã¥Á¤·¤Þ¤»¤ó¡£
+POSIX ʸ»ú¥¯¥é¥¹¤Ç¤Ï¡¢
+.BR /[[:alnum:]]/
+¤Èµ­½Ò¤¹¤ë¤³¤È¤¬¤Ç¤­¡¢Ê¸»ú½¸¹ç¤Î
+.I ¤¹¤Ù¤Æ
+¤Î¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤È¿ôÃͤ˥ޥåÁ¤·¤Þ¤¹¡£
+.PP
+ʸ»ú¥ê¥¹¥ÈÃæ¤Ë¤Ï¡¢¹¹¤Ë 2 ¤Ä¤ÎÆÃ¼ì¥·¡¼¥±¥ó¥¹¤ò»ÈÍѤǤ­¤Þ¤¹¡£
+¤³¤ì¤é¤Ï¡¢
+Ê£¿ô¤Îʸ»ú¤Ë¤è¤Ã¤ÆÉ½¸½¤µ¤ì¤ëñ°ì¥·¥ó¥Ü¥ë (
+.I ¾È¹çʸ»ú
+¤È¸Æ¤Ð¤ì¤Þ¤¹) ¤ò»ý¤Á¡¢
+Ê£¿ô¤Îʸ»ú¤¬
+.I »²¾È
+¤ä¥½¡¼¥È¤Ë¤ª¤¤¤Æ¤ÏÅù²Á¤Ç¤¢¤ë¤È¤µ¤ì¤ë¡¢Èó ASCII ʸ»ú½¸¹ç¤ËŬÍѤµ¤ì¤Þ¤¹¡£
+(Î㤨¤Ð¡¢¥Õ¥é¥ó¥¹¸ì¤Ç¤Ïñ¤Ê¤ë ``e'' ¤È¥°¥ì¡¼¥Ö¥¢¥¯¥»¥ó¥ÈÉÕ¤­¤Î e\` ¤È¤Ç¤Ï
+Åù²Á¤Ç¤¹¡£)
+.TP
+¾È¹ç¥·¥ó¥Ü¥ë
+»²¾È¥·¥ó¥Ü¥ë¤ÏÊ£¿ôʸ»ú¤Î»²¾ÈÍ×ÁǤǤ¢¤ê¡¢
+.B [.
+¤È
+.B .]
+¤Ç³ç¤ê¤Þ¤¹¡£
+Î㤨¤Ð¡¢
+.B ch
+¤¬»²¾ÈÍ×ÁǤξì¹ç¡¢
+.B [[.ch.]]
+¤ÏÀµµ¬É½¸½¤È¤Ê¤ê¡¢¤³¤Î»²¾ÈÍ×ÁǤ˥ޥåÁ¤·¤Þ¤¹¡£
+°ìÊý¡¢
+.B [ch]
+¤Ï
+.B c
+¤«
+.B h
+¤Ë¥Þ¥Ã¥Á¤¹¤ëÀµµ¬É½¸½¤Ç¤¹¡£
+.TP
+Åù²Á¥¯¥é¥¹
+Åù²Á¥¯¥é¥¹¤Ï
+Åù²Á¤Êʸ»ú¥ê¥¹¥È¤ò»Ø¤¹¥í¥±¡¼¥ë¸ÇÍ­¤Î̾Á°¤Ç¤¹¡£Ì¾Á°¤Ï
+.B [=
+¤È
+.B =]
+¤Ç³ç¤ê¤Þ¤¹¡£
+Î㤨¤Ð¡¢Ì¾Á°
+.B e
+¤Ï ``e,'' ``e\`,'', ``e\`.'' ¤Î¤¹¤Ù¤Æ¤òɽ¸½¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
+¤³¤Î¾ì¹ç¡¢
+.B [[=e=]]
+¤Ï
+.BR e ,
+.BR e\' ,
+.BR e\`
+¤Î¤¤¤º¤ì¤«¤Ë¥Þ¥Ã¥Á¤¹¤ëÀµµ¬É½¸½¤È¤Ê¤ê¤Þ¤¹¡£
+.PP
+¤³¤ì¤é¤Îµ¡Ç½¤Ï±Ñ¸ì°Ê³°¤Î¥í¥±¡¼¥ë¤Ë¤ÆÈó¾ï¤ËÍ­ÍѤǤ¹¡£
+.I gawk
+¤¬Àµµ¬É½¸½¤Î¥Þ¥Ã¥Á¥ó¥°¤Ë»ÈÍѤ¹¤ë¥é¥¤¥Ö¥é¥ê´Ø¿ô¤Ï¡¢
+¸½ºß POSIX ʸ»ú¥¯¥é¥¹¤Î¤ß¤òÍý²ò¤·¡¢
+»²¾È¥·¥ó¥Ü¥ë¤ÈÅù²Á¥¯¥é¥¹¤ÏÍý²ò¤·¤Þ¤»¤ó¡£
+.PP
+.BR \ey ,
+.BR \eB ,
+.BR \e< ,
+.BR \e> ,
+.BR \ew ,
+.BR \eW ,
+.BR \e` ,
+.B \e'
+¤Î±é»»»Ò¤Ï
+.IR gawk
+¸ÇÍ­¤Ç¤¢¤ê¡¢GNU Àµµ¬É½¸½¥é¥¤¥Ö¥é¥ê¤Îµ¡Ç½¤ò¸µ¤Ë¤·¤¿³ÈÄ¥¤Ç¤¹¡£
+.PP
+ÍÍ¡¹¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¡¢Àµµ¬É½¸½Ãæ¤Îʸ»ú¤ò
+.I gawk
+¤¬¤É¤Î¤è¤¦¤Ë²ò¼á¤¹¤ë¤Î¤«¤òÀ©¸æ¤Ç¤­¤Þ¤¹¡£
+.TP
+¥ª¥×¥·¥ç¥ó̵¤·
+¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢
+.I gawk
+¤Ï¾å½Ò¤Î POSIX Àµµ¬É½¸½¤ª¤è¤Ó GNU Àµµ¬É½¸½¤Î¤¹¤Ù¤Æ¤Îµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£
+¤·¤«¤·¤Ê¤¬¤é¡¢¥¤¥ó¥¿¡¼¥Ð¥ëɽ¸½¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó¡£
+.TP
+.B \-\^\-posix
+POSIX Àµµ¬É½¸½¤Î¤ß¤¬¥µ¥Ý¡¼¥È¤µ¤ì¡¢GNU ±é»»»Ò¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó
+(Î㤨¤Ð¡¢
+.B \ew
+¤Ï¥ê¥Æ¥é¥ë
+.B w
+¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹)¡£
+¥¤¥ó¥¿¡¼¥Ð¥ëɽ¸½¤Ïµö¤µ¤ì¤Þ¤¹¡£
+.TP
+.B \-\^\-traditional
+ÅÁÅýŪ¤Ê Unix
+.I awk
+¤ÎÀµµ¬É½¸½¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤¹¡£GNU ±é»»»Ò¡¢¥¤¥ó¥¿¡¼¥Ð¥ëɽ¸½¡¢
+POSIX ʸ»ú¥¯¥é¥¹ (
+.B [[:alnum:]]
+¤Ê¤É) ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó¡£
+8 ¿Ê¤Þ¤¿¤Ï 16 ¿Ê¤Î¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤Çɽ¸½¤µ¤ì¤ëʸ»ú¤Ï¡¢
+Àµµ¬É½¸½¤Î¥á¥¿Ê¸»ú¤òɽ¸½¤¹¤ë¤È¤·¤Æ¤â¡¢
+¥ê¥Æ¥é¥ë¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
+.TP
+.B \-\^\-re\-interval
+.B \-\^\-traditional
+¤¬»ØÄꤵ¤ì¤Æ¤¤¤¿¤È¤·¤Æ¤â¡¢Àµµ¬É½¸½Ãæ¤Ç¥¤¥ó¥¿¡¼¥Ð¥ëɽ¸½¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£
.SS ¥¢¥¯¥·¥ç¥ó
¥¢¥¯¥·¥ç¥ó¤Ï¡¢¥Ö¥ì¡¼¥¹
.B {
@@ -913,52 +1245,32 @@ abc... ¤È²þ¹Ô¤ò½ü¤¯Ç¤°Õ¤Î°ìʸ»ú¤Ë¥Þ¥Ã¥Á¤¹¤ë(ÈÝÄêʸ»ú¥¯¥é¥¹)¡£
¥ë¡¼¥×ʸÅù¤«¤é¤Ê¤ê¤Þ¤¹¡£±é»»»Ò¡¢À©¸æÊ¸¡¢Æþ½ÐÎÏʸ¤Ï C ¸À¸ì¤È¤Û¤ÜƱÍͤǤ¹¡£
.SS ±é»»»Ò
.PP
-AWK ¤Ç¤Î±é»»»Ò¤ò¡¢Í¥Àè½ç°Ì¤ÎÄ㤤¤â¤Î¤«¤é½ç¤Ë¼¨¤·¤Þ¤¹¡£
+AWK ¤Ç¤Î±é»»»Ò¤ò¡¢Í¥Àè½ç°Ì¤Î¹â¤¤¤â¤Î¤«¤é½ç¤Ë¼¨¤·¤Þ¤¹¡£
.PP
.TP "\w'\fB*= /= %= ^=\fR'u+1n"
-.PD 0
-.B "= += \-="
+.BR ( \&... )
+¥°¥ë¡¼¥×²½¡£
.TP
-.PD
-.B "*= /= %= ^="
-ÂåÆþ¡£ÀäÂÐŪ¤ÊÂåÆþ
-.BI ( var " = " value )
-¤È±é»»»ÒÂåÆþ(¤½¤Î¾¤Î·Á¼°)¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+.B $
+¥Õ¥£¡¼¥ë¥É»²¾È¡£
.TP
-.B ?:
-C ¸À¸ì¤Î¾ò·ï¼°¤ÈƱÍͤǤ¹¡£
-.IB expr1 " ? " expr2 " : " expr3\c
-¤Î·Á¼°¤Ç»È¤¤¤Þ¤¹¡£¤â¤·
-.I expr1
-¤¬¿¿¤Ê¤é¼°¤ÎÃͤÏ
-.I expr2
-¤Ë¤Ê¤ê¡¢¤½¤¦¤Ç¤Ê¤±¤ì¤Ð
-.I expr3
-¤Ë¤Ê¤ê¤Þ¤¹¡£
-.I expr2
-¤«
-.I expr3
-¤Î¤¦¤ÁÊÒÊý¤Î¤ß¤¬É¾²Á¤µ¤ì¤Þ¤¹¡£
+.B "++ \-\^\-"
+¥¤¥ó¥¯¥ê¥á¥ó¥È¡¢¥Ç¥¯¥ê¥á¥ó¥È¡£Á°ÃÖ¤â¸åÃÖ¤â²Äǽ¡£
.TP
-.B ||
-ÏÀÍý OR¡£
+.B ^
+¤Ù¤­¾è(\fB**\fR ¤âƱÍͤΰÕÌ£¤Ç»ÈÍѤǤ­¤ë¡£¤Þ¤¿ \fB**=\fR ÂåÆþ±é»»»Ò¤â¸ºß¤¹¤ë)¡£
.TP
-.B &&
-ÏÀÍý AND¡£
+.B "+ \- !"
+ñ¹à¤Î¥×¥é¥¹¡¢¥Þ¥¤¥Ê¥¹¡¢ÏÀÍýÈÝÄê¡£
.TP
-.B "~ !~"
-Àµµ¬É½¸½¥Þ¥Ã¥Á¡¢ÈÝÄê¤Î¥Þ¥Ã¥Á¡£
-.B Ãí°Õ:
-.B ~
-¤È
-.B !~
-¤Îº¸ÊÕ¤ËÀµµ¬É½¸½Äê¿ô
-.RB ( /foo/ Åù)
-¤òÍѤ¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£Àµ
-µ¬É½¸½Äê¿ô¤Ï±¦ÊդˤΤßÃÖ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¼°
-.BI "/foo/ ~ " exp
-¤Ï
-\fB(($0 ~ /foo/) ~ \fIexp\fB)\fR ¤ÈÅù²Á¤Ç¤¢¤ê¡¢¤³¤ì¤ÏÄ̾ï°Õ¿Þ¤¹¤ë¤â¤Î¤È¤Ï°Û¤Ê¤ê¤Þ¤¹¡£
+.B "* / %"
+¾è»»¡¢½ü»»¡¢¾ê;¡£
+.TP
+.B "+ \-"
+²Ã»»¤È¸º»»¡£
+.TP
+.I space
+ʸ»úÎó·ë¹ç¡£
.TP
.PD 0
.B "< >"
@@ -970,26 +1282,50 @@ C ¸À¸ì¤Î¾ò·ï¼°¤ÈƱÍͤǤ¹¡£
.B "!= =="
Ä̾ï¤Î´Ø·¸±é»»»Ò¡£
.TP
-.I blank
-ʸ»úÎó¤Î·ë¹ç¡£
+.B "~ !~"
+Àµµ¬É½¸½¥Þ¥Ã¥Á¡¢ÈÝÄê¤Î¥Þ¥Ã¥Á¡£
+.B Ãí°Õ:
+.B ~
+¤È
+.B !~
+¤Îº¸ÊÕ¤ËÀµµ¬É½¸½Äê¿ô
+.RB ( /foo/ Åù)
+¤òÍѤ¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£Àµµ¬É½¸½Äê¿ô¤Ï±¦ÊդˤΤßÃÖ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¼°
+.BI "/foo/ ~ " exp
+¤Ï
+\fB(($0 ~ /foo/) ~ \fIexp\fB)\fR ¤ÈÅù²Á¤Ç¤¢¤ê¡¢¤³¤ì¤ÏÄ̾ï°Õ¿Þ¤¹¤ë¤â¤Î¤È¤Ï°Û¤Ê¤ê¤Þ¤¹¡£
.TP
-.B "+ \-"
-²Ã»»¡¢¸º»»¡£
+.B in
+ÇÛÎó¤Î¥á¥ó¥Ð¡£
.TP
-.B "* / %"
-¾è»»¡¢½ü»»¡¢¾ê;¡£
+.B &&
+ÏÀÍý AND¡£
.TP
-.B "+ \- !"
-ñ¹à¥×¥é¥¹¡¢Ã±¹à¥Þ¥¤¥Ê¥¹¡¢ÏÀÍýÈÝÄê¡£
+.B ||
+ÏÀÍý OR¡£
.TP
-.B ^
-¤Ù¤­¾è(\fB**\fR ¤âƱÍͤΰÕÌ£¤Ç»ÈÍѤǤ­¤ë¡£¤Þ¤¿ \fB**=\fR ÂåÆþ±é»»»Ò¤â¸ºß¤¹¤ë)¡£
+.B ?:
+C ¸À¸ì¤Î¾ò·ï¼°¤ÈƱÍͤǤ¹¡£
+.IB expr1 " ? " expr2 " : " expr3\c
+¤Î·Á¼°¤Ç»È¤¤¤Þ¤¹¡£¤â¤·
+.I expr1
+¤¬¿¿¤Ê¤é¼°¤ÎÃͤÏ
+.I expr2
+¤Ë¤Ê¤ê¡¢¤½¤¦¤Ç¤Ê¤±¤ì¤Ð
+.I expr3
+¤Ë¤Ê¤ê¤Þ¤¹¡£
+.I expr2
+¤«
+.I expr3
+¤Î¤¦¤ÁÊÒÊý¤Î¤ß¤¬É¾²Á¤µ¤ì¤Þ¤¹¡£
.TP
-.B "++ \-\^\-"
-¥¤¥ó¥¯¥ê¥á¥ó¥È¡¢¥Ç¥¯¥ê¥á¥ó¥È¡£Á°ÃÖ¤â¸åÃÖ¤â²Äǽ¡£
+.PD 0
+.B "= += \-="
.TP
-.B $
-¥Õ¥£¡¼¥ë¥É»²¾È
+.B "*= /= %= ^="
+ÂåÆþ¡£ÀäÂÐÂåÆþ
+.BI ( var " = " value )
+¤È±é»»»ÒÂåÆþ (¾¤Î·Á¼°) ¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
.SS À©¸æ¥¹¥Æ¡¼¥È¥á¥ó¥È
.PP
À©¸æ¥¹¥Æ¡¼¥È¥á¥ó¥È¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
@@ -1014,8 +1350,8 @@ C ¸À¸ì¤Î¾ò·ï¼°¤ÈƱÍͤǤ¹¡£
Æþ½ÐÎÏ¥¹¥Æ¡¼¥È¥á¥ó¥È¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
.PP
.TP "\w'\fBprintf \fI½ñ¼°, ¼°¤ÎÎó\fR'u+1n"
-.BI close( filename )
-¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ñ¥¤¥×(²¼µ­»²¾È)¤ò¥¯¥í¡¼¥º¤·¤Þ¤¹¡£
+.BI close( file )
+¥Õ¥¡¥¤¥ë (¤Þ¤¿¤Ï¥Ñ¥¤¥×¡¢²¼µ­»²¾È) ¤ò¥¯¥í¡¼¥º¤·¤Þ¤¹¡£
.TP
.B getline
¼¡¤Î¥ì¥³¡¼¥É¤ò
@@ -1039,7 +1375,7 @@ C ¸À¸ì¤Î¾ò·ï¼°¤ÈƱÍͤǤ¹¡£
¼¡¤Î¥ì¥³¡¼¥É¤òÊÑ¿ô
.I var
¤ËÆÉ¤ß¹þ¤ß¤Þ¤¹¡£
-.BR NF ,
+.BR NR ,
.B FNR
¤¬ÀßÄꤵ¤ì¤Þ¤¹¡£
.TP
@@ -1058,10 +1394,12 @@ C ¸À¸ì¤Î continue ¤ÈÎà»÷¤·¤¿°ÕÌ£¤ò»ý¤Á¤Þ¤¹¡£
.B END
¥Ö¥í¥Ã¥¯¤¬Â¸ºß¤¹¤ì¤Ð¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
.TP
-.B "next file"
+.B "nextfile"
¸½ºß¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë½èÍý¤ò½ªÎ»¤·¡¢¼¡¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤«¤é¥ì¥³¡¼¥É¤ò
ÆÉ¤ß¹þ¤ß¤Þ¤¹¡£
.B FILENAME
+¤È
+.B ARGIND
¤¬¹¹¿·¤µ¤ì¡¢
.B FNR
¤¬ 1 ¤Ë¥ê¥»¥Ã¥È¤µ¤ì¡¢AWK ¥×¥í¥°¥é¥à¤Î
@@ -1069,9 +1407,17 @@ C ¸À¸ì¤Î continue ¤ÈÎà»÷¤·¤¿°ÕÌ£¤ò»ý¤Á¤Þ¤¹¡£
¤â¤·Â¸ºß¤¹¤ì¤Ð¡¢
.B END
¥Ö¥í¥Ã¥¯¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
+.B Ãí:
+°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Î gawk ¤Ç¤Ï
+.BR "next file"
+¤È 2 ¸ì¤Ç»ÈÍѤµ¤ì¤Æ¤¤¤Þ¤·¤¿¡£¤³¤ÎÍÑË¡¤Ï¤Þ¤Àǧ¼±¤µ¤ì¤Þ¤¹¤¬¡¢
+·Ù¹ð¥á¥Ã¥»¡¼¥¸¤òÀ¸¤¸¤µ¤»¤Þ¤¹¤·¡¢ºÇ½ªÅª¤Ë¤Ï̵¤¯¤Ê¤ëɽ¸½¤Ç¤¹¡£
.TP
.B print
¸½ºß¤Î¥ì¥³¡¼¥É¤ò½ÐÎϤ·¤Þ¤¹¡£
+½ÐÎϥ쥳¡¼¥É¤Ï
+.B ORS
+ÊÑ¿ô¤ÎÃͤˤƽªÃ¼¤µ¤ì¤Þ¤¹¡£
.TP
.BI print " expr-list"
¼°¤ò½ÐÎϤ·¤Þ¤¹¡£³Æ¼°¤Ï
@@ -1104,6 +1450,16 @@ C ¸À¸ì¤Î continue ¤ÈÎà»÷¤·¤¿°ÕÌ£¤ò»ý¤Á¤Þ¤¹¡£
.I cmd-line
¤ò¼Â¹Ô¤·¡¢½ªÎ»¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹(\*(PX ¤ËÂбþ¤·¤Ê¤¤
¥·¥¹¥Æ¥à¤Ç¤Ï»ÈÍѤǤ­¤Ê¤¤¾ì¹ç¤¬¤¢¤ê¤Þ¤¹)¡£
+.TP
+\&\fBfflush(\fR[\fIfile\^\fR]\fB)\fR
+¥ª¡¼¥×¥ó¤µ¤ì¤Æ¤¤¤ë½ÐÎÏ¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ñ¥¤¥×
+.I file
+¤Ë´ØÏ¢¤Å¤±¤é¤ì¤Æ¤¤¤ë¥Ð¥Ã¥Õ¥¡¤ò¥Õ¥é¥Ã¥·¥å¤·¤Þ¤¹¡£
+.I file
+¤ò»ØÄꤷ¤Ê¤¤¤È¡¢É¸½à½ÐÎϤ¬¥Õ¥é¥Ã¥·¥å¤µ¤ì¤Þ¤¹¡£
+.I file
+¤¬¶õʸ»úÎó¤Î¾ì¹ç¡¢¥ª¡¼¥×¥ó¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤È¥Ñ¥¤¥×¤Î¥Ð¥Ã¥Õ¥¡¤ò
+¥Õ¥é¥Ã¥·¥å¤·¤Þ¤¹¡£
.PP
¤½¤Î¾¤Î·Á¼°¤Î¥ê¥À¥¤¥ì¥¯¥È¤È¤·¤Æ°Ê²¼¤Î¤â¤Î¤¬ÍøÍѲÄǽ¤Ç¤¹¡£
.B print
@@ -1128,35 +1484,54 @@ AWK ¤Ç¤Î
.B printf
¥¹¥Æ¡¼¥È¥á¥ó¥È¤È
.B sprintf()
-´Ø¿ô(¸å½Ò»²¾È)¤Ï¡¢°Ê²¼¤ÎÊÑ´¹»ØÄê½ñ¼°¤ò¼õ¤±ÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+´Ø¿ô(¸å½Ò»²¾È)¤Ï¡¢°Ê²¼¤ÎÊÑ´¹»ØÄê½ñ¼°¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£
.TP
.B %c
-1¤Ä¤Î \s-1ASCII\s+1 ʸ»ú¡£
+1 ¤Ä¤Î \s-1ASCII\s+1 ʸ»ú¡£
.B %c
¤ËÂбþ¤¹¤ë°ú¿ô¤¬¿ôÃͤʤ顢¤½¤ÎÃͤò \s-1ASCII\s+1 ¥³¡¼¥É¤È¤ß¤Ê¤·
¤ÆÊ¸»ú¤ËÊÑ´¹¤·¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¡¢°ú¿ô¤Ïʸ»úÎó¤Ç¤¢¤ë¤È²ò¼á¤µ¤ì¡¢¤½¤Î1
ʸ»úÌܤ¬½ÐÎϤµ¤ì¤Þ¤¹¡£
.TP
.B %d
-10¿Ê¿ô(À°¿ôÉôʬ)¡£
+.PD 0
.TP
.B %i
-.B %d
-¤ÈƱ¤¸¤Ç¤¹¡£
+10¿Ê¿ô(À°¿ôÉôʬ)¡£
.TP
+.PD 0
.B %e
-.B [-]d.ddddddE[+-]dd
-¤È¤¤¤¦·Á¼°¤ÎÉâÆ°¾®¿ô¡£
+.TP
+.PD
+.B %E
+.B [-]d.dddddde[+-]dd
+¤È¤¤¤¦·Á¼°¤ÎÉâÆ°¾®¿ôÅÀ¿ô¡£
+.B %E
+·Á¼°¤Ç¤Ï
+.B e
+¤ÎÂå¤ê¤Ë
+.B E
+¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
.TP
.B %f
.B [-]ddd.dddddd
-¤È¤¤¤¦·Á¼°¤ÎÉâÆ°¾®¿ô¡£
+¤È¤¤¤¦·Á¼°¤ÎÉâÆ°¾®¿ôÅÀ¿ô¡£
.TP
+.PD 0
.B %g
+.TP
+.PD
+.B %G
.B %e
¤È
.B %f
-¤Îû¤¤Êý¤Î·Á¼°¤ÎÉâÆ°¾®¿ô¡£Í¾·×¤Ê 0 ¤Ï¾Êά¤µ¤ì¤Þ¤¹¡£
+¤Îû¤¤Êý¤Î·Á¼°¤ÎÉâÆ°¾®¿ôÅÀ¿ô¡£Í¾·×¤Ê 0 ¤Ï¾Êά¤µ¤ì¤Þ¤¹¡£
+.B %G
+·Á¼°¤Ç¤Ï
+.B %e
+¤ÎÂå¤ê¤Ë
+.B %E
+¤ò»ÈÍѤ·¤Þ¤¹¡£
.TP
.B %o
É乿¤Ê¤·¤Î 8 ¿Ê¿ô(À°¿ô)¡£
@@ -1164,14 +1539,16 @@ AWK ¤Ç¤Î
.B %s
ʸ»úÎó¡£
.TP
+.PD 0
.B %x
-É乿¤Ê¤·¤Î 16 ¿Ê¿ô(À°¿ô)¡£
.TP
+.PD
.B %X
-.B %x
-¤ÈƱÍÍ¡£¤¿¤À¤·¡¢
+É乿¤Ê¤·¤Î 16 ¿Ê¿ô(À°¿ô)¡£
+.B %X
+·Á¼°¤Ç¤Ï¡¢
.B abcdef
-¤Î¤«¤ï¤ê¤Ë
+¤ÎÂå¤ê¤Ë
.B ABCDEF
¤òÍѤ¤¤Þ¤¹¡£
.TP
@@ -1181,23 +1558,75 @@ AWK ¤Ç¤Î
¡£°ú¿ô¤Ï»ÈÍѤ·¤Þ¤»¤ó¡£
.PP
.B %
-¤È¾åµ­¤Î¥³¥ó¥È¥í¡¼¥ëʸ»ú¤È¤Î´Ö¤Ë¥ª¥×¥·¥ç¥Ê¥ë¤ÊÄɲäΥѥé¥á¡¼¥¿¤òÃÖ¤¯
+¤È¾åµ­¤ÎÀ©¸æÊ¸»ú¤È¤Î´Ö¤Ë¥ª¥×¥·¥ç¥Ê¥ë¤ÊÄɲäΥѥé¥á¡¼¥¿¤òÃÖ¤¯
¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£°Ê²¼¤Ë¤½¤ì¤é¤ò¼¨¤·¤Þ¤¹¡£
.TP
.B \-
º¸´ó¤»¡£
.TP
+.I ¶õÇò
+¿ôÃÍÊÑ´¹¤Ë¤ª¤¤¤Æ¡¢Àµ¤ÎÃͤΥץì¥Õ¥£¥Ã¥¯¥¹¤Ï¶õÇò¤È¤Ê¤ê¡¢
+Éé¤ÎÃͤΥץì¥Õ¥£¥Ã¥¯¥¹¤Ï¥Þ¥¤¥Ê¥¹µ­¹æ¤È¤Ê¤ê¤Þ¤¹¡£
+.TP
+.B +
+¥×¥é¥¹µ­¹æ¤ÏÉý½¤Àµ»Ò (¸å½Ò) ¤ÎÁ°¤Ë»ÈÍѤ·¡¢
+À°·Á¤µ¤ì¤ë¥Ç¡¼¥¿¤¬Àµ¤Ç¤¢¤Ã¤¿¤È¤·¤Æ¤â¡¢
+¿ôÃÍÊÑ´¹¤ËÂФ·¤Æ¾ï¤ËÉ乿¤òÉÕ¤±¤ë¤³¤È¤ò»Ø¼¨¤·¤Þ¤¹¡£
+.B +
+¤Ï¶õÇò½¤Àµ»Ò¤ËÍ¥À褷¤Þ¤¹¡£
+.TP
+.B #
+¤¢¤ëÀ©¸æ¥ì¥¿¡¼¤ËÂФ·¤Æ¡ÖÊ̤ηÁ¼°¡×¤ò»ÈÍѤ·¤Þ¤¹¡£
+.BR %o
+¤ËÂФ·¤Æ¤ÏÀè¹Ô¤¹¤ë 0 ¤òÍ¿¤¨¡¢
+.BR %x
+¤È
+.BR %X
+¤ËÂФ·¤Æ¤ÏÈó 0 ¤Î·ë²Ì¤ËÂФ·¤ÆÀè¹Ô¤¹¤ë
+.BR 0x
+¤È
+.BR 0X
+¤òÍ¿¤¨¤Þ¤¹¡£
+.BR %e ,
+.BR %E ,
+.B %f
+¤ËÂФ·¤Æ¤Ï·ë²Ì¤Ë¾ï¤Ë¾®¿ôÅÀ¤ò´Þ¤á¤Þ¤¹¡£
+.BR %g ,
+.B %G
+¤ËÂФ·¤Æ¤Ï·ë²Ì¤Î¸åÈø¤«¤é 0 ¤ò¼è¤ê½ü¤­¤Þ¤»¤ó¡£
+.TP
+.B 0
+ÀèÆ¬¤Î
+.B 0
+(¥¼¥í) ¤Ï¥Õ¥é¥°¤È¤·¤ÆÆ°ºî¤·¡¢
+½ÐÎϤò¶õÇò¤Ç¤Ï¤Ê¤¯ 0 ¤Ç¥Ñ¥Ç¥£¥ó¥°¤¹¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
+¤³¤ì¤ÏÈó¿ôÃͤνÐÎϽñ¼°¤ËÂФ·¤Æ¤âŬÍѤµ¤ì¤Þ¤¹¡£
+¤³¤Î¥Õ¥é¥°¤¬Í­¸ú¤Ê¤Î¤Ï¡¢¥Õ¥£¡¼¥ë¥ÉÉý¤¬°õ»ú¤µ¤ì¤ëÃͤÎÉý¤è¤ê¹­¤¤¤È¤­¤À¤±¤Ç¤¹¡£
+.TP
.I width
¥Õ¥£¡¼¥ë¥É¤¬»ØÄꤷ¤¿Éý
.I width
-¤Ë¤Ê¤ë¤è¤¦¤Ë³ÈÄ¥¤µ¤ì¤Þ¤¹¡£¤â¤·¡¢
-.I width
-¤¬ 0 ¤Ç»Ï¤Þ¤ë¿ôÃͤξì¹ç¡¢
-¥Õ¥£¡¼¥ë¥É¤Ï 0 ¤Ë¤è¤Ã¤Æ³ÈÄ¥¤µ¤ì¤Þ¤¹¡£¤µ¤â¤Ê¤±¤ì¤Ð¡¢¶õÇò¤Ç³ÈÄ¥¤µ¤ì¤Þ¤¹¡£
-¤³¤ì¤Ï¿ôÃͤǤϤʤ¤½ÐÎϤËÂФ·¤Æ¤âŬÍѤǤ­¤Þ¤¹¡£
+¤Ë¤Ê¤ë¤è¤¦¤Ë¥Ñ¥Ç¥£¥ó¥°¤µ¤ì¤Þ¤¹¡£¥Õ¥£¡¼¥ë¥É¤ÏÄ̾ï¶õÇò¤Ç¥Ñ¥Ç¥£¥ó¥°¤µ¤ì¤Þ¤¹¡£
+.B 0
+¥Õ¥é¥°¤¬»ÈÍѤµ¤ì¤¿¾ì¹ç¤Ë¤Ï 0 ¤Ç¥Ñ¥Ç¥£¥ó¥°¤µ¤ì¤Þ¤¹¡£
.TP
.BI . prec
-ʸ»úÎó¤ÎºÇÂçĹ¡¢¤Þ¤¿¤Ï¡¢¾®¿ôÅÀ°Ê²¼¤Î·å¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
+°õ»ú¤Ë¤ª¤¤¤Æ»ÈÍѤ¹¤ëÀºÅÙ¤ò¿ôÃͤǻØÄꤷ¤Þ¤¹¡£
+.BR %e ,
+.BR %E ,
+.B %f
+¤Î½ñ¼°¤ËÂФ·¤Æ¤Ï¡¢¾®¿ôÅÀ¤Î±¦Â¦¤Ë°õ»ú¤µ¤ì¤ë¿ô»ú¤Î¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
+.BR %g ,
+.B %G
+¤Î½ñ¼°¤ËÂФ·¤Æ¤Ï¡¢²¾¿ôÉô¤ÎºÇÂç¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
+.BR %d ,
+.BR %o ,
+.BR %i ,
+.BR %u ,
+.BR %x ,
+.B %X
+¤Î½ñ¼°¤ËÂФ·¤Æ¤Ï¡¢°õ»ú¤µ¤ì¤ë¿ô»ú¤ÎºÇ¾®¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
+ʸ»úÎó¤ËÂФ·¤Æ¤Ï¡¢°õ»ú¤µ¤ì¤ëʸ»úÎ󤫤é¤È¤ê¤À¤µ¤ì¤ëºÇÂç¤Îʸ»ú¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
.PP
\*(AN C ¤Î
.B printf()
@@ -1205,8 +1634,11 @@ AWK ¤Ç¤Î
.I width
¤ÈÀºÅÙ
.I prec
-¤Î»ØÄ굡ǽ¤¬»ÈÍѤǤ­¤Þ¤¹¡£Éý¤Þ¤¿¤ÏÀº
-Å٤λØÄêÉôʬ¤Ë
+¤Î»ØÄ굡ǽ¤¬»ÈÍѤǤ­¤Þ¤¹¡£
+.B Éý
+¤Þ¤¿¤Ï
+.B ÀºÅÙ
+¤Î»ØÄêÉôʬ¤Ë
.B *
¤ò»ØÄꤹ¤ë¤³¤È¤Ç¡¢¤½¤ÎÃͤò
.B printf
@@ -1215,27 +1647,31 @@ AWK ¤Ç¤Î
¤Ø¤Î°ú¿ô¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£
.SS ÆÃ¼ì¥Õ¥¡¥¤¥ë̾
.PP
+.B print
+¤ä
+.B printf
+¤Ç½ñ¤­¹þ¤ß¤È¤­¤Ç¤â¡¢
+.B getline
+¤Ç¥Õ¥¡¥¤¥ë¤«¤éÆÉ¤ß¼è¤ë¤È¤­¤Ç¤â¡¢
Æþ½ÐÎÏ¥ê¥À¥¤¥ì¥¯¥È¤ò¹Ô¤¦¾ì¹ç¡¢
-.I awk
-¤¬ÆâÉô¤Ç²ò¼á¤¹¤ëÆÃ¼ì¤Ê¥Õ¥¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤¹¡£
+.I gawk
+¤ÏÆâÉôŪ¤ÊÆÃ¼ì¤Ê¥Õ¥¡¥¤¥ë̾¤ò²ò¼á¤·¤Þ¤¹¡£
¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë̾¤Ë¤è¤ê¡¢¿Æ¥×¥í¥»¥¹(Ä̾ï¤Ï¥·¥§¥ë¤Ç¤¹)¤«¤é¼õ¤±·Ñ¤¤¤À
-¥Õ¥¡¥¤¥ë¥Ç¥£¥¹¥¯¥ê¥×¥¿¤òÍѤ¤¤ÆÆþ½ÐÎϤò¹Ô¤Ã¤¿¤ê¡¢¼Â¹ÔÃæ¤Î
-.I awk
+¥ª¡¼¥×¥ó¾õÂ֤Υե¡¥¤¥ë¥Ç¥£¥¹¥¯¥ê¥×¥¿¤òÍѤ¤¤ÆÆþ½ÐÎϤò¹Ô¤Ã¤¿¤ê¡¢¼Â¹ÔÃæ¤Î
+.I gawk
¥×¥í¥»¥¹¤Ë´Ø¤¹¤ë¾ðÊó¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
ÆÃ¼ì¥Õ¥¡¥¤¥ë̾¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
.TP \w'\fB/dev/stdout\fR'u+1n
.B /dev/pid
-¸½ºß¤Î
-.I awk
-¥×¥í¥»¥¹¤Î¥×¥í¥»¥¹ID(10¿Ê¿ô¤Ç¡¢ºÇ¸å¤Ë²þ¹Ô¤¬ÉÕ¤­¤Þ¤¹)¤ò
+¸½ºß¤Î¥×¥í¥»¥¹¤Î¥×¥í¥»¥¹ID(10¿Ê¿ô¤Ç¡¢ºÇ¸å¤Ë²þ¹Ô¤¬ÉÕ¤­¤Þ¤¹)¤ò
ÆÉ¤ß¹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.TP
.B /dev/ppid
-¿Æ¥×¥í¥»¥¹¤Î¥×¥í¥»¥¹ID(10¿Ê¿ô¤Ç¡¢ºÇ¸å¤Ë²þ¹Ô¤¬ÉÕ¤­¤Þ¤¹)¤ò
+¸½ºß¤Î¥×¥í¥»¥¹¤Î¿Æ¤Î¥×¥í¥»¥¹¤Î¥×¥í¥»¥¹ID(10¿Ê¿ô¤Ç¡¢ºÇ¸å¤Ë²þ¹Ô¤¬ÉÕ¤­¤Þ¤¹)¤ò
ÆÉ¤ß¹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.TP
.B /dev/pgrpid
-¸½ºß¤Î awk ¥×¥í¥»¥¹¤Î¥×¥í¥»¥¹¥°¥ë¡¼¥× ID(10¿Ê¿ô¤Ç¡¢ºÇ¸å¤Ë²þ¹Ô¤¬ÉÕ¤­¤Þ¤¹)
+¸½ºß¤Î¥×¥í¥»¥¹¤Î¥×¥í¥»¥¹¥°¥ë¡¼¥× ID(10¿Ê¿ô¤Ç¡¢ºÇ¸å¤Ë²þ¹Ô¤¬ÉÕ¤­¤Þ¤¹)
¤òÆÉ¤ß¹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.TP
.B /dev/user
@@ -1252,7 +1688,8 @@ AWK ¤Ç¤Î
.B $3
¤Ï
.IR getgid (2)
-¥·¥¹¥Æ¥à¥³¡¼¥ë¤ÎÃÍ¡¢$4
+¥·¥¹¥Æ¥à¥³¡¼¥ë¤ÎÃÍ¡¢
+.B $4
¤Ï
.IR getegid (2)
¥·¥¹¥Æ¥à¥³¡¼¥ë¤ÎÃͤǤ¹¡£¤â¤·¡¢¤µ¤é¤Ë¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ì¤Ð¡¢
@@ -1296,13 +1733,14 @@ print "You blew it!" | "cat 1>&2"
.PP
AWK ¤Ï°Ê²¼¤ÎÄêµÁºÑ¤ß¿ôÃÍ´Ø¿ô¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
.PP
-.TP \w'\fBsrand(\^\fIexpr\^\fB)\fR'u+1n
+.TP \w'\fBsrand(\fR[\fIexpr\^\fR]\fB)\fR'u+1n
.BI atan2( y , " x" )
.I y/x
-¤ÎµÕÀµÀÜ(¥é¥¸¥¢¥óñ°Ì)¡£
+¤ÎµÕÀµÀܤò¥é¥¸¥¢¥ó¤ÇÍ¿¤¨¤Þ¤¹¡£
.TP
.BI cos( expr )
-;¸¹(Í¿¤¨¤ëÃͤϥ饸¥¢¥ó)¡£
+.I expr
+¤Î;¸¹¤ò¥é¥¸¥¢¥ó¤ÇÍ¿¤¨¤Þ¤¹¡£
.TP
.BI exp( expr )
»Ø¿ô´Ø¿ô¡£
@@ -1314,25 +1752,73 @@ AWK ¤Ï°Ê²¼¤ÎÄêµÁºÑ¤ß¿ôÃÍ´Ø¿ô¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
¼«Á³Âпô¡£
.TP
.B rand()
-0 ¤«¤é 1 ¤Î´Ö¤ÎÍð¿ô¡£
+0 ¤«¤é 1 ¤Î´Ö¤ÎÍð¿ô¤òÍ¿¤¨¤Þ¤¹¡£
.TP
.BI sin( expr )
-Àµ¸¹(Í¿¤¨¤ëÃͤϥ饸¥¢¥ó)¡£
+.I expr
+¤ÎÀµ¸¹¤ò¥é¥¸¥¢¥ó¤ÇÍ¿¤¨¤Þ¤¹¡£
.TP
.BI sqrt( expr )
Ê¿Êýº¬¡£
.TP
-.BI srand( expr )
-¼°
+\&\fBsrand(\fR[\fIexpr\^\fR]\fB)\fR
.I expr
¤ÎÃͤòÍð¿ôÀ¸À®´Ø¿ô¤Î¼ï¤È¤·¤ÆÍѤ¤¤Þ¤¹¡£¼°¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢
»þ¹ï¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£Ä¾Á°¤Î¼ï¤ÎÃͤòÊÖ¤·¤Þ¤¹¡£
.SS ʸ»úÎó´Ø¿ô
.PP
-AWK ¤Ï°Ê²¼¤ÎÄêµÁºÑ¤ßʸ»úÎó´Ø¿ô¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
+.I gawk
+¤Ï°Ê²¼¤ÎÄêµÁºÑ¤ßʸ»úÎó´Ø¿ô¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
.PP
.TP "\w'\fBsprintf(\^\fIfmt\fB\^, \fIexpr-list\^\fB)\fR'u+1n"
-\fBgsub(\fIr\fB, \fIs\fB, \fIt\fB)\fR
+\fBgensub(\fIr\fB, \fIs\fB, \fIh \fR[\fB, \fIt\fR]\fB)\fR
+ÂоÝʸ»úÎó
+.I t
+¤«¤éÀµµ¬É½¸½
+.I r
+¤Î¥Þ¥Ã¥Á¤òõ¤·¤Þ¤¹¡£
+.I h
+¤¬
+.B g
+¤Þ¤¿¤Ï
+.B G
+¤Ç³«»Ï¤¹¤ëʸ»úÎó¤Î¾ì¹ç¡¢¥Þ¥Ã¥Á¤¹¤ë
+.I r
+¤ò¤¹¤Ù¤Æ
+.I s
+¤ËÃÖ¤­´¹¤¨¤Þ¤¹¡£
+¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¡¢
+.I h
+¤Ï²¿ÈÖÌܤÎ
+.I r
+¤Î¥Þ¥Ã¥Á¤òÃÖ¤­´¹¤¨¤ë¤Î¤«¤ò¼¨¤·¤Þ¤¹¡£
+.I t
+¤¬Í¿¤¨¤é¤ì¤Ê¤¤¾ì¹ç¡¢Âå¤ê¤Ë
+.B $0
+¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
+ÃÖ´¹¥Æ¥­¥¹¥È
+.I s
+¤Ç¤Ï¡¢¥·¡¼¥±¥ó¥¹
+.BI \e n\fR
+¤¿¤À¤·
+.I n
+¤Ï 1 ¤«¤é 9 ¤Þ¤Ç¤Î¿ô»ú¤ò»ÈÍѤ·¤Æ¡¢
+.I n
+ÈÖÌܤ˥ޥåÁ¤·¤¿³ç¸ÌÉÕ¤­¥µ¥Ö¼°¤ò¼¨¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+¥·¡¼¥±¥ó¥¹
+.B \e0
+¤Ïʸ»ú
+.B &
+¤ÈƱÍÍ¡¢¥Þ¥Ã¥Á¤·¤¿¥Æ¥­¥¹¥ÈÁ´ÂΤòɽ¤·¤Þ¤¹¡£
+.B sub()
+¤ä
+.B gsub()
+¤È¤Ï°Û¤Ê¤ê¡¢½¤Àµ¤µ¤ì¤¿Ê¸»úÎ󤬴ؿô¤Î·ë²Ì¤È¤·¤ÆÊÖ¤µ¤ì¡¢
+¸µ¤ÎÂоݥƥ­¥¹¥È¤ÏÊѹ¹¤µ¤ì
+.I ¤Þ¤»¤ó
+¡£
+.TP "\w'\fBsprintf(\^\fIfmt\fB\^, \fIexpr-list\^\fB)\fR'u+1n"
+\fBgsub(\fIr\fB, \fIs \fR[\fB, \fIt\fR]\fB)\fR
ʸ»úÎó
.I t
Ãæ¤ÇÀµµ¬É½¸½
@@ -1344,6 +1830,21 @@ AWK ¤Ï°Ê²¼¤ÎÄêµÁºÑ¤ßʸ»úÎó´Ø¿ô¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï
.B $0
¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£
+ÃÖ´¹¥Æ¥­¥¹¥È¤Ç¤Ï¡¢
+.B &
+¤Ï¼ÂºÝ¤Ë¥Þ¥Ã¥Á¤·¤¿¥Æ¥­¥¹¥È¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹¡£
+.B \e&
+¤ò»ÈÍѤ¹¤ë¤È¥ê¥Æ¥é¥ë¤Î
+.B &
+¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.BR sub() ,
+.BR gsub() ,
+.B gensub()
+¤Ë¤ª¤±¤ë
+.B &
+¤È¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Ë´Ø¤¹¤ë´°Á´¤ÊµÄÏÀ¤Ï
+.I "AWK Language Programming"
+¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
.TP
.BI index( s , " t" )
ʸ»úÎó
@@ -1354,7 +1855,7 @@ AWK ¤Ï°Ê²¼¤ÎÄêµÁºÑ¤ßʸ»úÎó´Ø¿ô¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
.I t
¤¬´Þ¤Þ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï 0 ¤òÊÖ¤·¤Þ¤¹¡£
.TP
-.BI length( s )
+\fBlength(\fR[\fIs\fR]\fB)
ʸ»úÎó
.I s
¤ÎŤµ¤òÊÖ¤·¤Þ¤¹¡£
@@ -1374,7 +1875,7 @@ AWK ¤Ï°Ê²¼¤ÎÄêµÁºÑ¤ßʸ»úÎó´Ø¿ô¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
.B RLENGTH
¤ÎÃͤ¬ÀßÄꤵ¤ì¤Þ¤¹¡£
.TP
-\fBsplit(\fIs\fB, \fIa\fB, \fIr\fB)\fR
+\fBsplit(\fIs\fB, \fIa \fR[\fB, \fIr\fR]\fB)\fR
ʸ»úÎó
.I s
¤òÀµµ¬É½¸½
@@ -1390,6 +1891,7 @@ AWK ¤Ï°Ê²¼¤ÎÄêµÁºÑ¤ßʸ»úÎó´Ø¿ô¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£ÇÛÎó
.I a
¤ÎÆâÍÆ¤Ï¡¢Ê¬³äÁ°¤Ë¥¯¥ê¥¢¤µ¤ì¤Þ¤¹¡£
+ʬ³ä¤Ï¡¢¾å½Ò¤Î¥Õ¥£¡¼¥ë¥Éʬ³ä¤ÈƱ¤¸Æ°ºî¤ò¹Ô¤¤¤Þ¤¹¡£
.TP
.BI sprintf( fmt , " expr-list" )
½ñ¼°
@@ -1398,16 +1900,16 @@ AWK ¤Ï°Ê²¼¤ÎÄêµÁºÑ¤ßʸ»úÎó´Ø¿ô¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
.I exp-list
¤òÀ°·Áɽ¼¨¤·¡¢·ë²Ì¤Îʸ»úÎó¤òÊÖ¤·¤Þ¤¹¡£
.TP
-\fBsub(\fIr\fB, \fIs\fB, \fIt\fB)\fR
+\fBsub(\fIr\fB, \fIs \fR[\fB, \fIt\fR]\fB)\fR
.B gsub()
¤È»÷¤Æ¤Þ¤¹¤¬¡¢ºÇ½é¤Ë¥Þ¥Ã¥Á¤·¤¿Ê¸»úÎó¤Î¤ß¤¬ÃÖ´¹¤µ¤ì¤Þ¤¹¡£
.TP
-\fBsubstr(\fIs\fB, \fIi\fB, \fIn\fB)\fR
+\fBsubstr(\fIs\fB, \fIi \fR[\fB, \fIn\fR]\fB)\fR
ʸ»úÎó
.I s
¤Î
.I i
-ʸ»úÌܤ«¤é»Ï¤Þ¤ë
+ʸ»úÌܤ«¤é»Ï¤Þ¤ëºÇÂç
.I n
ʸ»ú¤ÎÉôʬʸ»úÎó¤òÊÖ¤·¤Þ¤¹¡£
.I n
@@ -1430,16 +1932,16 @@ AWK ¤Ï°Ê²¼¤ÎÄêµÁºÑ¤ßʸ»úÎó´Ø¿ô¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
.PP
¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò´Þ¤ó¤À¥í¥°¥Õ¥¡¥¤¥ë¤Î½èÍý¤Ï
AWK ¥×¥í¥°¥é¥à¤Î¼ç¤Ê»È¤¤Æ»¤Î1¤Ä¤Ç¤¹¤«¤é¡¢
-.I awk
+.I gawk
¤Ï¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¼è¤ê½Ð¤·¤¿¤ê¡¢¥Õ¥©¡¼¥Þ¥Ã¥È
¤¹¤ë¤¿¤á¤Î 2 ¤Ä¤Î´Ø¿ô¤òÄ󶡤·¤Þ¤¹¡£
.PP
.TP "\w'\fBsystime()\fR'u+1n"
.B systime()
-¥¨¥Ý¥Ã¥¯¤«¤é¤Î·Ð²áÉÿô¤òÊÖ¤·¤Þ¤¹
-(\*(PX ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢¥¨¥Ý¥Ã¥¯¤Ï UTC ¤Ç 1970 ǯ 1 ·î 1 Æü 0:00 ¤Ç¤¹)¡£
+´ð½à»þÅÀ¤«¤é¤Î·Ð²áÉÿô¤òÊÖ¤·¤Þ¤¹
+(\*(PX ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢´ð½à»þÅÀ¤Ï UTC ¤Ç 1970 ǯ 1 ·î 1 Æü 0:00 ¤Ç¤¹)¡£
.TP
-\fBstrftime(\fIformat\fR, \fItimestamp\fB)\fR
+\fBstrftime(\fR[\fIformat \fR[\fB, \fItimestamp\fR]]\fB)\fR
½ñ¼°
.I format
¤Ë½¾¤Ã¤Æ
@@ -1450,24 +1952,23 @@ AWK ¥×¥í¥°¥é¥à¤Î¼ç¤Ê»È¤¤Æ»¤Î1¤Ä¤Ç¤¹¤«¤é¡¢
.B systime()
¤¬ÊÖ¤¹ÃÍ¤ÈÆ±¤¸·Á¼°¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
.I timestamp
-¤¬¾Êά¤µ¤ì¤¿
-¾ì¹ç¡¢¸½ºß¤Î
-.B systime()
-¤ÎÃͤ¬ÍѤ¤¤é¤ì¤Þ¤¹¡£ÍøÍѲÄǽ¤Ê¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¤Ä
-¤¤¤Æ¤Ï¡¢\*(AN C ¤Î
+¤¬¾Êά¤µ¤ì¤¿¾ì¹ç¡¢¸½ºß¤ÎÆüÉÕ¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
+.I format
+¤¬¾Êά¤µ¤ì¤¿¾ì¹ç¡¢
+.IR date (1)
+¤¬½ÐÎϤ˻ÈÍѤ¹¤ë¤â¤Î¤ÈƱ¤¸¥Ç¥Õ¥©¥ë¥È¥Õ¥©¡¼¥Þ¥Ã¥È¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
+ÍøÍѲÄǽ¤Ê¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢\*(AN C ¤Î
.B strftime()
-´Ø¿ô¤Î»ÅÍͤò»²¾È¤·¤Æ²¼¤µ¤¤¡£¥Ñ¥Ö¥ê¥Ã¥¯¥É¥á¥¤¥ó
-¤Ê
+´Ø¿ô¤Î»ÅÍͤò»²¾È¤·¤Æ²¼¤µ¤¤¡£¥Ñ¥Ö¥ê¥Ã¥¯¥É¥á¥¤¥ó¤Ê
.IR strftime (3)
¤È¤½¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤¬
-.I awk
+.I gawk
¤È¤È¤â¤ËÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤â¤·¡¢
-.I awk
+.I gawk
¤òºîÀ®¤¹¤ë¤¿¤á¤Ë¤½¤Î
.B strftime
-¤òÍѤ¤¤¿¾ì¹ç¤Ï¡¢¤½¤Î¥Þ¥Ë¥å¥¢¥ë¤Ëµ­½Ò¤µ
-¤ì¤Æ¤¤¤ëÊÑ´¹½ñ¼°¤¬
-.I awk
+¤òÍѤ¤¤¿¾ì¹ç¤Ï¡¢¤½¤Î¥Þ¥Ë¥å¥¢¥ë¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤ëÊÑ´¹½ñ¼°¤¬
+.I gawk
¤Ç¤âÍøÍѲÄǽ¤Ç¤¹¡£
.SS ʸ»úÎóÄê¿ô
.PP
@@ -1487,7 +1988,7 @@ AWK ¤Ç¤Îʸ»úÎóÄê¿ô¤Ï¡¢¥À¥Ö¥ë¥¯¥©¡¼¥È(\fB"\fR)¤Ë¶¹¤Þ¤ì¤¿Ê¸»ú¤ÎÎó¤Ç¤¹¡£
¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¡£
.TP
.B \ef
-²þ¥Ú¡¼¥¸¡£
+²þ¥Ú¡¼¥¸(¥Õ¥©¡¼¥à¥Õ¥£¡¼¥É)¡£
.TP
.B \en
²þ¹Ô¡£
@@ -1508,19 +2009,27 @@ AWK ¤Ç¤Îʸ»úÎóÄê¿ô¤Ï¡¢¥À¥Ö¥ë¥¯¥©¡¼¥È(\fB"\fR)¤Ë¶¹¤Þ¤ì¤¿Ê¸»ú¤ÎÎó¤Ç¤¹¡£
¤Ë³¤¯¤¹¤Ù¤Æ¤Î 16 ¿Ê¿ô»ú
¤Ï¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤Î°ìÉô¤Ç¤¢¤ë¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£
(¤³¤Îµ¡Ç½¤Ë¤è¤ê¥³¥ß¥Ã¥Æ¥£¤Ë¤è¤ë¸À¸ì¥Ç¥¶¥¤¥ó¤¬Ê¬¤«¤ê¤Þ¤¹¡£)
-¤¿¤È¤¨¤Ð¡¢\fB"\ex1B"\fR ¤Ï
+Î㤨¤Ð¡¢\fB"\ex1B"\fR ¤Ï
\s-1ASCII\s+1 \s-1ESC\s+1 (¥¨¥¹¥±¡¼¥×) ʸ»ú¤Ç¤¹¡£
.TP
.BI \e ddd
-1·å¤«2·å¤«3·å¤Î 8 ¿Ê¿ô¤Çɽ¸½¤µ¤ì¤¿Ê¸»ú¡£¤¿¤È¤¨¤Ð¡¢ \fB"\e033"\fR ¤Ï
+1·å¤«2·å¤«3·å¤Î 8 ¿Ê¿ô¤Çɽ¸½¤µ¤ì¤¿Ê¸»ú¡£Î㤨¤Ð¡¢ \fB"\e033"\fR ¤Ï
\s-1ASCII\s+1 \s-1ESC\s+1 (¥¨¥¹¥±¡¼¥×) ʸ»ú¤Ç¤¹¡£
.TP
.BI \e c
ʸ»ú c ¤½¤Î¤â¤Î¡£
.PP
-¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤ÏÀµµ¬É½¸½Äê¿ôÆâ¤Ç¤âÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹(¤¿¤È¤¨¤Ð¡¢
+¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤ÏÀµµ¬É½¸½Äê¿ôÆâ¤Ç¤âÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹(Î㤨¤Ð¡¢
.B "/[\ \et\ef\en\er\ev]/"
¤Ï¶õÇòʸ»ú¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹)¡£
+.PP
+¸ß´¹¥â¡¼¥É¤Ç¤Ï¡¢8 ¿Ê¤ª¤è¤Ó 16 ¿Ê¤Î¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤Çɽ¸½¤µ¤ì¤ëʸ»ú¤Ï¡¢
+Àµµ¬É½¸½Äê¿ô¤È¤·¤Æ»ÈÍѤµ¤ì¤¿¾ì¹ç¡¢¥ê¥Æ¥é¥ë¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
+¤½¤ì¤æ¤¨¡¢
+.B /a\e52b/
+¤Ï
+.B /a\e*b/
+¤ÈÅù²Á¤Ç¤¹¡£
.SH ´Ø¿ô
AWK ¤Ç¤Ï´Ø¿ô¤ò°Ê²¼¤Î¤è¤¦¤Ë¤·¤ÆÄêµÁ¤·¤Þ¤¹¡£
.PP
@@ -1528,7 +2037,7 @@ AWK ¤Ç¤Ï´Ø¿ô¤ò°Ê²¼¤Î¤è¤¦¤Ë¤·¤ÆÄêµÁ¤·¤Þ¤¹¡£
\fBfunction \fIname\fB(\fIparameter list\fB) { \fIstatements \fB}\fR
.RE
.PP
-´Ø¿ô¤Ï¡¢¥¢¥¯¥·¥ç¥óÉô¤«¤é¸Æ¤Ó½Ð¤µ¤ì¤¿¤È¤­¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
+´Ø¿ô¤Ï¡¢¥Ñ¥¿¡¼¥ó¤Þ¤¿¤Ï¥¢¥¯¥·¥ç¥ó¤Î¼°¤«¤é¸Æ¤Ó½Ð¤µ¤ì¤¿¤È¤­¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
´Ø¿ô¸Æ¤Ó½Ð¤·¤Ë¤ª¤¤¤ÆÍ¿¤¨¤é¤ì¤¿¼Â°ú¿ô¤¬¡¢´Ø¿ôÀë¸À¤Ë¤ª¤±¤ë²¾°ú¿ô¤Ë
¼õ¤±ÅϤµ¤ì¤Þ¤¹¡£
¤³¤Î¤È¤­ÇÛÎó¤Î¾ì¹ç¤Ï»²¾ÈÅϤ·¤¬¹Ô¤ï¤ì¡¢Â¾¤ÎÊÑ¿ô¤Î¾ì¹ç¤ÏÃÍÅϤ·¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£
@@ -1536,14 +2045,16 @@ AWK ¤Ç¤Ï´Ø¿ô¤ò°Ê²¼¤Î¤è¤¦¤Ë¤·¤ÆÄêµÁ¤·¤Þ¤¹¡£
¸µ¡¹ AWK ¤Ë´Ø¿ô¤ÏÈ÷¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿¤Î¤Ç¡¢¶É½êÊÑ¿ô¤Îµ¡¹½¤Ï¤¢¤Þ¤ê
¥¹¥Þ¡¼¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
¶É½êÊÑ¿ô¤Ï°ú¿ô¥ê¥¹¥È¤Î;ʬ¤Ê°ú¿ô¤È¤·¤ÆÀë¸À¤·¤Þ¤¹¡£¶É½êÊÑ¿ô¤È´Ø
-¿ô°ú¿ô¤ò¶èÊ̤¹¤ë¤¿¤á¡¢Í¾Ê¬¤Ê¶õÇò¤Ç¶èÀÚ¤ë¤Î¤¬´·½¬¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¤è
+¿ô°ú¿ô¤ò¶èÊ̤¹¤ë¤¿¤á¡¢Í¾Ê¬¤Ê¶õÇò¤Ç¶èÀÚ¤ë¤Î¤¬´·½¬¤Ç¤¹¡£Î㤨¤Ð¡¢°Ê²¼¤Î¤è
¤¦¤Ë¤·¤Þ¤¹¡£
.PP
.RS
.ft B
.nf
-function f(p, q, a, b) { # a ¤È b ¤Ï¶É½êÊÑ¿ô
- ..... }
+function f(p, q, a, b) # a & b ¤Ï¶É½êÊÑ¿ô
+{
+ \&.....
+}
/abc/ { ... ; f(1, 2) ; ... }
.fi
@@ -1559,11 +2070,17 @@ function f(p, q, a, b) { # a ¤È b ¤Ï¶É½êÊÑ¿ô
¶É½êÊÑ¿ô¤È¤·¤ÆÍѤ¤¤é¤ì¤ë´Ø¿ô°ú¿ô¤Ï¡¢´Ø¿ôµ¯Æ°»þ¤Ë¶õʸ»úÎ󤪤è¤Ó 0
¤Ë½é´ü²½¤µ¤ì¤Þ¤¹¡£
.PP
+.B \-\^\-lint
+¤¬»ØÄꤵ¤ì¤¿¤È¤­¡¢
+.I gawk
+¤Ï¼Â¹Ô»þ¤Ç¤Ï¤Ê¤¯¥Ñ¡¼¥º»þ¤Ë̤ÄêµÁ´Ø¿ô¤Î¸Æ¤Ó½Ð¤·¤Ë´Ø¤·¤Æ·Ù¹ð¤·¤Þ¤¹¡£
+¼Â¹Ô»þ¤Î̤ÄêµÁ´Ø¿ô¤Î¸Æ¤Ó½Ð¤·¤ÏÃ×̿Ū¤Ê¥¨¥é¡¼¤È¤Ê¤ê¤Þ¤¹¡£
+.PP
.B function
¤Î¤«¤ï¤ê¤Ë
.B func
¤òÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.SH Îã
+.SH »ÈÍÑÎã
.nf
``/etc/passwd'' ¤«¤éÁ´¥æ¡¼¥¶¤Î¥í¥°¥¤¥ó̾¤ò¼è¤ê½Ð¤·¡¢¥½¡¼¥È¤·¤Æ½ÐÎϤ¹¤ë¡£
@@ -1606,18 +2123,18 @@ function f(p, q, a, b) { # a ¤È b ¤Ï¶É½êÊÑ¿ô
Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger,
Addison-Wesley, 1988. ISBN 0-201-07981-X.
.PP
-.IR "The AWK Manual" ,
-Edition 0.15, published by the Free Software Foundation, 1993.
+.IR "AWK Language Programming" ,
+Edition 1.0, published by the Free Software Foundation, 1995.
.SH POSIX ¸ß´¹
-.I awk
+.I gawk
¤ÏºÇ¿·ÈǤΠ\*(UX
.I awk
¤È¤Î¸ß´¹À­¤À¤±¤Ç¤Ê¤¯¡¢\*(PX ɸ½à¤È¤Î¸ß´¹À­¤âÄɵᤷ¤Æ¤¤¤Þ¤¹¡£
¤³¤Î¤¿¤á
-.I awk
+.I gawk
¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤Êµ¡Ç½¤¬¼è¤êÆþ¤ì¤é¤ì¤Æ¤¤¤Þ¤¹¡£
¤³¤ì¤é¤Îµ¡Ç½¤Ï AWK ËܤˤϽҤ٤é¤ì¤Æ¤¤¤Þ¤»¤ó¤¬¡¢
-System V Release 4 ¤ª¤è¤Ó \*(PX ɸ½à¤Î
+¥Ù¥ë¸¦µæ½ê¤ª¤è¤Ó \*(PX ɸ½à¤Î
.I awk
¤¬Í­¤·¤Æ¤¤¤ëµ¡Ç½¤Ç¤¹¡£
.PP
@@ -1646,7 +2163,7 @@ AWK Ëܤˤè¤ì¤Ð¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÑ¿ôÂåÆþ¤Ï
¥ª¥×¥·¥ç¥ó¤Ï \*(PX ɸ½à¤Ë½¾¤Ã¤¿¤â¤Î¤Ç¤¹¡£
.PP
°ú¿ô¤ÎÎó¤ËÆÃÊ̤ʥª¥×¥·¥ç¥ó ``\fB\-\^\-\fP'' ¤ò»ØÄꤹ¤ë¤È¡¢
-.I awk
+.I gawk
¤Ï¤½¤³¤¬¥ª¥×¥·¥ç¥ó¤Î½ª¤ï¤ê¤Ç¤¢¤ë¤È²ò¼á¤·¤Þ¤¹¡£
¸ß´¹¥â¡¼¥É¤Ë¤ª¤¤¤Æ¤Ï̤ÄêµÁ¥ª¥×¥·¥ç¥ó¤Ï·Ù¹ð¤¬½ÐÎϤµ¤ì¡¢¤½¤ì°Ê³°¤Î¤â¤Î¤Ï
̵»ë¤µ¤ì¤Þ¤¹¡£
@@ -1655,12 +2172,11 @@ AWK Ëܤˤè¤ì¤Ð¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿ÊÑ¿ôÂåÆþ¤Ï
AWK ËܤÏ
.B srand()
¤ÎÊÖ¤êÃͤòÄêµÁ¤·¤Æ¤¤¤Þ¤»¤ó¡£
-System V Release 4 ÈǤΠ\*(UX
-.I awk
-(¤È \*(PX ɸ½à)
-¤Ç¤Ï¡¢¤½¤Î´Ø¿ô¤¬»È¤Ã¤Æ¤¤¤ë¼ï¤òÊÖ¤·¤Þ¤¹¡£
+\*(PX ɸ½à
+¤Ç¤Ï¡¢¤½¤Î´Ø¿ô¤¬»È¤Ã¤Æ¤¤¤ë¼ï¤òÊÖ¤·¡¢
+Íð¿ô¥·¡¼¥±¥ó¥¹¤òÄÉÀפǤ­¤ë¤è¤¦¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
¤·¤¿¤¬¤Ã¤Æ
-.I awk
+.I gawk
¤Ë¤ª¤±¤ë
.B srand()
¤â¸½ºß¤Î¼ï¤òÊÖ¤¹¤è¤¦¤Ë¤·¤Æ¤¢¤ê¤Þ¤¹¡£
@@ -1676,7 +2192,7 @@ System V Release 4 ÈǤΠ\*(UX
¤È
.B \ev
(
-.I awk
+.I gawk
¤ÇºÇ½é¤Ë¼ÂÁõ¤µ¤ì¡¢AT&T ¤Î
.I awk
¤Ë¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤µ¤ì¤Þ¤·¤¿);
@@ -1692,15 +2208,15 @@ System V Release 4 ÈǤΠ\*(UX
.I gawk
¤Ï \*(PX
.I awk
-¤ËÂФ·¤Æ¤¤¤¯¤Ä¤«¤Î³ÈÄ¥¤¬¹Ô¤Ê¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
+¤ËÂФ·¤ÆÂ¿¤¯¤Î³ÈÄ¥¤¬¹Ô¤Ê¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
¤³¤ÎÀá¤Ç¤Ï¤½¤ì¤é¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡£
-.B "\-W compat"
+.B \-\^\-traditional
¥ª¥×¥·¥ç¥óÉÕ¤­¤Ç
-.I awk
+.I gawk
¤òµ¯Æ°¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢
¤³¤³¤Ç½Ò¤Ù¤é¤ì¤Æ¤¤¤ë³ÈÄ¥µ¡Ç½¤ò¤¹¤Ù¤Æ¶Ø»ß¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.PP
-.I awk
+.I gawk
¤¬»ý¤Ä°Ê²¼¤Îµ¡Ç½¤Ï
\*(PX
.I awk
@@ -1710,23 +2226,30 @@ System V Release 4 ÈǤΠ\*(UX
\(bu
¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹
.B \ex
-¡£
+¡£(
+.B \-\^\-posix
+¤ÇÍ޻ߤǤ­¤Þ¤¹¡£)
+.TP \w'\(bu'u+1n
+\(bu
+.B fflush()
+´Ø¿ô¡£(
+.B \-\^\-posix
+¤ÇÍ޻ߤǤ­¤Þ¤¹¡£)
.TP
\(bu
-´Ø¿ô
-.B systime()
-¤ª¤è¤Ó
-.B strftime()
-¡£
+.BR systime() ,
+.BR strftime() ,
+.B gensub()
+¤Î³Æ´Ø¿ô¡£
.TP
\(bu
-Æþ½ÐÎÏ¥ê¥À¥¤¥ì¥¯¥È¤ÇÍøÍѲÄǽ¤ÊÆÃ¼ì¥Õ¥¡¥¤¥ë̾¡£
+Æþ½ÐÎÏ¥ê¥À¥¤¥ì¥¯¥È¤ÇÍøÍѲÄǽ¤ÊÆÃ¼ì¥Õ¥¡¥¤¥ë̾¤ÏÍý²ò¤µ¤ì¤Þ¤»¤ó¡£
.TP
\(bu
ÊÑ¿ô
-.B ARGIND
-¤ª¤è¤Ó
-.B ERRNO
+.BR ARGIND ,
+.BR ERRNO ,
+.B RT
¤ÏÆÃ¼ìÊÑ¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
.TP
\(bu
@@ -1740,15 +2263,25 @@ System V Release 4 ÈǤΠ\*(UX
¤È¸ÇÄêĹ¥Õ¥£¡¼¥ë¥Éʬ³ä¡£
.TP
\(bu
+.B RS
+¤ÎÀµµ¬É½¸½¤È¤·¤Æ¤Î»ÈÍÑ¡£
+.TP
+\(bu
+.B FS
+¤Ë¶õʸ»úÎó¤òÀßÄꤹ¤ë¤³¤È¤Ë¤è¤ê³ÆÊ¸»ú¤òÀÚ¤ê½Ð¤¹Ç½ÎϤȡ¢
+.B split()
+¤Î 3 ÈÖÌܤΰú¿ô¡£
+.TP
+\(bu
.B \-f
-¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤Ë¤Ä¤¤¤Æ¹Ô¤ï¤ì¤ë¥Ñ¥¹¸¡º÷¡£
+¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤Ë¤Ä¤¤¤Æ¥Ñ¥¹¸¡º÷¤ò¹Ô¤ï¤Ê¤¤¤³¤È¡£
¤è¤Ã¤Æ¡¢´Ä¶­ÊÑ¿ô
.B AWKPATH
¤ÏÆÃ¼ì¤ÊÊÑ¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
.TP
\(bu
¸½ºß¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë½èÍý¤ò½ª¤ï¤é¤»¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë
-.B "next file"
+.B "nextfile"
¡£
.TP
\(bu
@@ -1764,15 +2297,15 @@ AWK Ëܤϴؿô
¤Î
.B close()
¤Ï¡¢¥Õ¥¡¥¤¥ë¤ä¥Ñ¥¤¥×¤ò¥¯¥í¡¼¥º¤¹¤ëºÝ¤Ë¸Æ¤Ó½Ð¤¹
-.IR fclose (3)¡¢
+.IR fclose (3)
¤ä
.IR pclose (3)¡¢
¤«¤é¤ÎÊÖ¤êÃͤòÊÖ¤·¤Þ¤¹¡£
.PP
¥ª¥×¥·¥ç¥ó
-.B "\-W compat"
+.B \-\^\-traditional
ÉÕ¤­¤Ç
-.I awk
+.I gawk
¤òµ¯Æ°¤·
.B \-F
¥ª¥×¥·¥ç¥ó¤Ø¤Î°ú¿ô
@@ -1780,10 +2313,17 @@ AWK Ëܤϴؿô
¤È¤·¤Æ ``t'' ¤òÍ¿¤¨¤¿¾ì¹ç¤Ë¡¢
.B FS
¤ÎÃͤϥ¿¥Öʸ»ú¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
+.B "gawk \-F\et \&..."
+¤È¥¿¥¤¥×¤·¤Æ¤â¡¢¥·¥§¥ë¤¬Ã±¤Ë ``t'' ¤ò¥¯¥©¡¼¥È¤¹¤ë¤Î¤Ç¡¢``\et'' ¤Ï
+.B \-F
+¥ª¥×¥·¥ç¥ó¤ËÅϤµ¤ì¤Þ¤»¤ó¡£
¤³¤ì¤Ï¾¯¡¹¸«¶ì¤·¤¤ÆÃ¼ì»öÎã¤Ç¤¹¤Î¤Ç¡¢¥Ç¥Õ¥©¥ë¥È¤Îưºî¤È¤·¤Æ¤Ï
ºÎÍѤµ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-.B "\-W posix"
+.B \-\^\-posix
¤ò»ØÄꤷ¤¿¾ì¹ç¤Ë¤â¡¢¤³¤Îưºî¤Ï¹Ô¤Ê¤ï¤ì¤Þ¤»¤ó¡£
+¥¿¥Öʸ»ú¤ò¥Õ¥£¡¼¥ë¥É¥»¥Ñ¥ì¡¼¥¿¤È¤·¤Æ»ÈÍѤ·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢
+¥¯¥©¡¼¥È¤ò»ÈÍѤ¹¤ë¤Î¤¬ºÇÎɤǤ¹:
+.BR "gawk \-F'\et' \&..." .
.ig
.PP
If
@@ -1802,21 +2342,21 @@ or
.IR bison (1)
debugging output during program parsing.
This option should only be of interest to the
-.I awk
+.I gawk
maintainers, and may not even be compiled into
-.IR awk .
+.IR gawk .
..
.SH Îò»ËŪµ¡Ç½
-.I awk
-¤ÏÎòÂå¤Î AWK ¤Î¼ÂÁõ¤Ë¤¢¤Ã¤¿Æó¤Ä¤Îµ¡Ç½¤òÈ÷¤¨¤Æ¤¤¤Þ¤¹¡£
-°ì¤Ä¤á¤È¤·¤Æ¡¢ÁȤ߹þ¤ß´Ø¿ô
+.I gawk
+¤ÏÎòÂå¤Î AWK ¤Î¼ÂÁõ¤Ë¤¢¤Ã¤¿ 2 ¤Ä¤Îµ¡Ç½¤òÈ÷¤¨¤Æ¤¤¤Þ¤¹¡£
+1 ¤Ä¤á¤È¤·¤Æ¡¢ÁȤ߹þ¤ß´Ø¿ô
.B length()
¤Ï°ú¿ô̵¤·¤Ç¸Æ¤Ó½Ð¤»¤ë¤À¤±¤Ç¤Ê¤¯¡¢¤µ¤é¤Ë³ç¸Ì̵¤·¤Ç¤â¸Æ¤Ó½Ð¤»¤Þ¤¹!
¤·¤¿¤¬¤Ã¤Æ
.RS
.PP
.ft B
-a = length
+a = length # Holy Algol 60, Batman!
.ft R
.RE
.PP
@@ -1831,17 +2371,18 @@ a = length($0)
.RE
.PP
\*(PX ɸ½à¤Ç¤Ï¤³¤Îµ¡Ç½¤Ï ``deprecated'' ¤ÈÃí°Õ½ñ¤­¤µ¤ì¤Æ¤ª¤ê¡¢
-.I awk
+.I gawk
¤Ç¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç
-.B "\-W lint"
+.B \-\^\-lint
¤ò»ØÄꤷ¤¿¾ì¹ç¤Ë¡¢¤³¤Îµ¡Ç½¤Î»ÈÍѤËÂФ·¤Æ·Ù¹ð¤ò½ÐÎϤ·¤Þ¤¹¡£
.PP
-¤â¤¦°ì¤Ä¤Ï¡¢
-.BR while ¡¢
-.BR for ¡¢
+¤â¤¦ 1 ¤Ä¤Ï¡¢
+.BR while ,
+.BR for ,
.B do
¥ë¡¼¥×ËÜÂΤγ°¤Ç¤â
-.B continue
+.BR continue ,
+.B break
¥¹¥Æ¡¼¥È¥á¥ó¥È¤ò»ÈÍѤǤ­¤ë¤È¤¤¤¦µ¡Ç½¤Ç¤¹¡£
ÅÁÅýŪ¤Ê AWK ¤Î¼ÂÁõ¤Ç¤Ï¡¢¤³¤Î¤è¤¦¤Ë»ÈÍѤ·¤¿
.B continue
@@ -1850,21 +2391,30 @@ a = length($0)
¥¹¥Æ¡¼¥È¥á¥ó¥È¤ÈÅù²Á¤Ê¤â¤Î¤È¤·¤Æ°·¤Ã¤Æ¤­¤Þ¤·¤¿¡£
.I gawk
¤Ç¤Ï
-.B "\-W posix"
-¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¡¢¤³¤Îµ¡Ç½¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.B \-\^\-traditional
+¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¤Ë¡¢¤³¤Îµ¡Ç½¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.SH ´Ä¶­ÊÑ¿ô
´Ä¶­¤Ë
.B POSIXLY_CORRECT
¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢
-.I awk
+.I gawk
¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç
-.B \-\-posix
+.B \-\^\-posix
¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë»þ¤ÈÁ´¤¯Æ±¤¸Æ°ºî¤ò¤·¤Þ¤¹¡£
¤³¤Î¤È¤­
-.B \-\-lint
+.B \-\^\-lint
¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤È
-.I awk
+.I gawk
¤Ï¤³¤ÎºîÍѤˤĤ¤¤Æ¤Î·Ù¹ð¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹¡£
+.PP
+.B AWKPATH
+´Ä¶­ÊÑ¿ô¤ò»ÈÍѤ·¤Æ¡¢
+.I gawk
+¤¬
+.B \-f
+¤ª¤è¤Ó
+.B \-\^\-file
+¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤ò¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
.SH ¥Ð¥°
¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¤ÎÊÑ¿ôÂåÆþµ¡Ç½¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢ÊÑ¿ô¤Ø¤ÎÂåÆþ¤òľÀÜ
¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë½ñ¤±¤Ð¤è¤¯¡¢
@@ -1877,34 +2427,27 @@ a = length($0)
¥Õ¥¡¥¤¥ë
.B /dev/fd
¤ª¤è¤Ó
-.BR /dev/stdin ¡¢
-.BR /dev/stdout ¡¢
+.BR /dev/stdin ,
+.BR /dev/stdout ,
.B /dev/stderr
¤ò¼ÂºÝ¤Ë¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç¤Î
-.I awk
+.I gawk
¤«¤é¤Ï¡¢¤½¤ì¤é¤¬¤Ê¤¤¥·¥¹¥Æ¥à¤È¤Ï°ã¤Ã¤¿½ÐÎϤ¬ÆÀ¤é¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-.I awk
+.I gawk
¤Ï¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤òÆâÉô¤Ç²ò¼á¤¹¤ëºÝ¤Ëɸ½à½ÐÎϤؤνÐÎϤò
.B /dev/stdout
¤Ø¤Î½ÐÎÏ¤ÈÆ±´ü¤µ¤»¤Þ¤¹¤¬¡¢¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò»ý¤Ä¥·¥¹¥Æ¥à¤Ç¤Ï
½ÐÎϤϤ½¤ì¤¾¤ì°Û¤Ê¤ë¥Õ¥¡¥¤¥ë¤Ø¸þ¤±¤é¤ì¤Þ¤¹¡£
ÍøÍѼԤÎÊý¤Çµ¤¤òÉÕ¤±¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤(Caveat Emptor)¡£
+.PP
+ʸˡŪ¤Ë¸í¤Ã¤¿Ã±°ìʸ»ú¥×¥í¥°¥é¥à¤Ï¥Ñ¡¼¥º¥¹¥¿¥Ã¥¯¤ò°î¤ì¤µ¤»¤ë·¹¸þ¤¬¤¢¤ê¡¢
+¤Þ¤Ã¤¿¤¯Ê¬¤«¤é¤Ê¤¤¥á¥Ã¥»¡¼¥¸¤òÀ¸À®¤¹¤ë·¹¸þ¤Ë¤¢¤ê¤Þ¤¹¡£
+¤³¤Î¤è¤¦¤Ê¥×¥í¥°¥é¥à¤Î¿ÇÃǤ϶䯤٤­¤³¤È¤Ë°ìÈÌ¤ËÆñ¤·¤¯¡¢
+¿ÇÃǤÎÅØÎϤϤޤ俤¯Ìµ°ÕÌ£¤Ë¤Ê¤ê¤Þ¤¹¡£
.SH ¥Ð¡¼¥¸¥ç¥ó¾ðÊó
¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤Ï
-.I awk
-¥Ð¡¼¥¸¥ç¥ó 2.15 ¤Ë¤Ä¤¤¤Æ½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
-.PP
-¥Ð¡¼¥¸¥ç¥ó 2.11 ¤Ë¤¢¤Ã¤¿¥ª¥×¥·¥ç¥ó
-.BR \-c ¡¢
-.BR \-V ¡¢
-.BR \-C ¡¢
-.ig
-.BR \-D ¡¢
-..
-.BR \-a ¡¢
-.B \-e
-¤Ï¡¢¥Ð¡¼¥¸¥ç¥ó 2.15 °Ê¹ß¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£
-¥Ð¡¼¥¸¥ç¥ó 2.16 ¤Î¥Þ¥Ë¥å¥¢¥ë¤Ç¤Ï¡¢¤³¤Î»ö¼Â¤Îµ­½Ò¤µ¤¨Ìµ¤¯¤Ê¤ë¤Ç¤·¤ç¤¦¡£
+.IR gawk
+¥Ð¡¼¥¸¥ç¥ó 3.0.2 ¤Ë¤Ä¤¤¤Æµ­ºÜ¤·¤Æ¤¤¤Þ¤¹¡£
.SH ºî¼Ô
\*(UX
.I awk
@@ -1932,7 +2475,60 @@ Pat Rankin ¤Ï VMS ¤Ø¤Î°Ü¿¢¤ò¹Ô¤Ê¤¤¡¢Michal Jaegermann ¤Ï Atari ST ¤Ø¤Î
°Ü¿¢¤ò¹Ô¤Ê¤¤¤Þ¤·¤¿¡£
OS/2 ¤Ø¤Î°Ü¿¢¤Ï Kai Uwe Rommel ¤¬ Darrel Hankerson ¤Î½õ¤±¤ò¼Ú¤ê¤Æ
¹Ô¤Ê¤¤¤Þ¤·¤¿¡£
+Fred Fish ¤¬ Amiga ¥µ¥Ý¡¼¥È¤ÎÄ󶡤ò¹Ô¤¤¤Þ¤·¤¿¡£
+.SH ¥Ð¥°¥ì¥Ý¡¼¥È
+.I gawk
+¤Î¥Ð¥°¤ò¸«ÉÕ¤±¤¿¤é¡¢ÅŻҥ᡼¥ë¤ò
+.B bug-gnu-utils@prep.ai.mit.edu
+°¸¤ËÁ÷¤ë¤È¤È¤â¤Ë¡¢¥«¡¼¥Ü¥ó¥³¥Ô¡¼¤ò
+.B arnold@gnu.ai.mit.edu
+°¸¤ËÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+ÅŻҥ᡼¥ë¤Ë¤Ï¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤È¤½¤Î¥ê¥Ó¥¸¥ç¥ó¡¢
+.I gawk
+¤Î¥ê¥Ó¥¸¥ç¥ó¡¢¥³¥ó¥Ñ¥¤¥ë¤Ë»ÈÍѤ·¤¿ C ¥³¥ó¥Ñ¥¤¥é¡¢
+ÌäÂê¤òºÆ¸½¤¹¤ë¤Ç¤­¤ë¤À¤±¾®¤µ¤Ê¥Æ¥¹¥È¥×¥í¥°¥é¥à¤È¥Ç¡¼¥¿¤òµ­½Ò¤·¤Æ¤¯¤À¤µ¤¤¡£
+.PP
+¥Ð¥°¥ì¥Ý¡¼¥È¤òÁ÷¤ëÁ°¤Ë 2 ¤Ä¤Î¤³¤È¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+Âè 1 ¤Ë¡¢ºÇ¿·¤Î
+.I gawk
+¤ò»ÈÍѤµ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+¿¤¯¤Î (Ä̾ïÈù̯¤Ê) ¥Ð¥°¤¬³Æ¡¹¤Î¥ê¥ê¡¼¥¹¤Ç½¤Àµ¤µ¤ì¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢
+¤´»ÈÍѤΤâ¤Î¤¬¸Å¤¤¾ì¹ç¤Ë¤ÏÌäÂê¤Ï´û¤Ë²ò·è¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
+Âè 2 ¤Ë¡¢¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤È¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥Ë¥å¥¢¥ë¤òÃí°Õ¿¼¤¯ÆÉ¤ß¡¢
+¤¢¤Ê¤¿¤¬¥Ð¥°¤À¤È»×¤¦¤â¤Î¤¬³Î¤«¤Ë¥Ð¥°¤Ç¤¢¤ê¡¢
+Â礭¤¯ÊѤï¤Ã¤¿¸À¸ì»ÅÍͤǤϤʤ¤¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+.PP
+¥Ð¥°¥ì¥Ý¡¼¥È¤ò
+.B comp.lang.awk
+¤ËÅê¹Æ¤¹¤ë¤³¤È¤À¤±¤Ï¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
+.I gawk
+¤Î³«È¯¼Ôã¤Ï»þ¡¹¤³¤Î¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤òÆÉ¤ß¤Þ¤¹¤¬¡¢
+¥Ð¥°¥ì¥Ý¡¼¥È¤ò¤³¤Î¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤ËÅê¹Æ¤·¤Æ¤â
+¥Ð¥°¥ì¥Ý¡¼¥È¤È¤·¤Æ¿®ÍêÀ­¤¬¤¢¤ê¤Þ¤»¤ó¡£
+¾åµ­¤Î¥¢¥É¥ì¥¹¤Ø¤ÎÅŻҥ᡼¥ë¤Ç¤ª´ê¤¤¤·¤Þ¤¹¡£
.SH ¼Õ¼­
¥Ù¥ë¸¦µæ½ê¤Î Brian Kernighan ¤Ï¥Æ¥¹¥È¤ª¤è¤Ó¥Ç¥Ð¥Ã¥°¤Î´Ö¡¢µ®½Å¤Ê½õÎϤò
Ä󶡤·¤Æ²¼¤µ¤¤¤Þ¤·¤¿¡£
´¶¼ÕÃפ·¤Þ¤¹¡£
+.SH Ê£À½µöÂú
+Copyright \(co\) 1996 Free Software Foundation, Inc.
+.PP
+Permission is granted to make and distribute verbatim copies of
+this manual page provided the copyright notice and this permission
+notice are preserved on all copies.
+.ig
+Permission is granted to process this file through troff and print the
+results, provided the printed document carries copying permission
+notice identical to this one except for the removal of this paragraph
+(this paragraph not being relevant to the printed manual page).
+..
+.PP
+Permission is granted to copy and distribute modified versions of this
+manual page under the conditions for verbatim copying, provided that
+the entire resulting derived work is distributed under the terms of a
+permission notice identical to this one.
+.PP
+Permission is granted to copy and distribute translations of this
+manual page into another language, under the above conditions for
+modified versions, except that this permission notice may be stated in
+a translation approved by the Foundation.
diff --git a/ja/man/man1/basename.1 b/ja/man/man1/basename.1
index 382003dfa0..d3f9e93db2 100644
--- a/ja/man/man1/basename.1
+++ b/ja/man/man1/basename.1
@@ -33,8 +33,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)basename.1 8.2 (Berkeley) 4/18/94
+.\" %Id: basename.1,v 1.5 1998/04/14 22:08:48 danny Exp %
+.\"
.\" jpman %Id: basename.1,v 1.2 1997/03/26 15:20:48 jsakai Stab %
-.\" %Id: basename.1,v 1.2.2.1 1998/04/14 22:10:40 danny Exp %
.\"
.Dd April 18, 1994
.Dt BASENAME 1
diff --git a/ja/man/man1/bc.1 b/ja/man/man1/bc.1
index c1f9c36b08..c269c58c41 100644
--- a/ja/man/man1/bc.1
+++ b/ja/man/man1/bc.1
@@ -1,8 +1,8 @@
.\"
.\" bc.1 - the *roff document processor source for the bc manual
.\"
-.\" This file is part of bc written initially for MINIX.
-.\" Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+.\" This file is part of GNU bc.
+.\" Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
.\"
.\" This program is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
@@ -25,30 +25,29 @@
.\" Western Washington University
.\" Bellingham, WA 98226-9062
.\"
-.\" %Id: bc.1,v 1.3.2.1 1996/11/06 09:23:50 phk Exp %
.\" jpman %Id: bc.1,v 1.3 1997/07/26 10:23:05 konuma Stab %
.\"
-.TH bc 1 .\" "Command Manual" v1.03 "Nov 2, 1994"
+.TH bc 1 .\" "Command Manual" v1.04 "June 22, 1995"
.SH ̾¾Î
bc - Ǥ°ÕÀºÅ٤η׻»¸À¸ì
.SH ½ñ¼°
-\fBbc\fR [ \fB-lws\fR ] [ \fI file ...\fR ]
+\fBbc\fR [ \fB-lwsqv\fR ] [long-options] [ \fI file ...\fR ]
.SH ¥Ð¡¼¥¸¥ç¥ó
-¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤Ï GNU bc version 1.03 ¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤Æ¤¢¤ê¤Þ¤¹¡£
+¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤Ï GNU bc version 1.04 ¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤Æ¤¢¤ê¤Þ¤¹¡£
.SH ²òÀâ
\fBbc\fR ¤Ï¡¢Ç¤°Õ¤ÎÀºÅ٤οôÃͤò°·¤¦»ö¤¬¤Ç¤­¡¢¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì C ¤Îʸˡ¤Ë
-¤è¤¯»÷¤¿·Á¤ÎÆþÎϤò¥¤¥ó¥¿¥é¥¯¥Æ¥£¥Ö¤Ë¼Â¹Ô¤¹¤ë¸À¸ì¤Ç¤¹¡£
+¤è¤¯»÷¤¿·Á¤ÎÆþÎϤòÂÐÏÃŪ¤Ë¼Â¹Ô¤¹¤ë¸À¸ì¤Ç¤¹¡£
¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î¥ª¥×¥·¥ç¥ó¤Î»ØÄê¤Ë¤è¤ê¡¢É¸½à¿ô³Ø¥é¥¤¥Ö¥é¥ê¤ò»ÈÍѤ¹¤ë¤³¤È¤â
¤Ç¤­¤Þ¤¹¡£¤³¤ì¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢¤É¤Î¥Õ¥¡¥¤¥ë¤ò½èÍý¤¹¤ë¤è¤ê¤âÁ°¤Ë
¿ô³Ø¥é¥¤¥Ö¥é¥ê¤¬ÄêµÁ¤µ¤ì¤Þ¤¹¡£
\fBbc\fR ¤Ïưºî¤ò³«»Ï¤¹¤ë¤È¤Þ¤ººÇ½é¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤ò
-½ç¤Ë½èÍý¤·¤Þ¤¹¡£Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò½èÍý¤·¤¿¸å¤Ï¡¢\fBbc\fR ¤Ï
-ɸ½àÆþÎϤ«¤é¤ÎÆÉ¤ß¹þ¤ß¤ò¹Ô¤¤¤Þ¤¹¡£Á´¤Æ¤Î¥³¡¼¥É¤Ï¡¢¤½¤ì¤¬ÆÉ¤ß¹þ¤Þ
+½ç¤Ë½èÍý¤·¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò½èÍý¤·¤¿¸å¤Ï¡¢\fBbc\fR ¤Ï
+ɸ½àÆþÎϤ«¤é¤ÎÆÉ¤ß¹þ¤ß¤ò¹Ô¤¤¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤Ï¡¢¤½¤ì¤¬ÆÉ¤ß¹þ¤Þ
¤ì¤¿»þÅÀ¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤­¤Þ¤¹¡£(¤â¤·¡¢¥Õ¥¡¥¤¥ëÃæ¤Ë¥×¥í¥»¥Ã¥µ¤ò»ß¤á¤ë
¥³¥Þ¥ó¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤¿¾ì¹ç¤Ï¡¢É¸½àÆþÎϤ«¤é¤ÎÆÉ¤ß¹þ¤ß¤Ï¹Ô¤ï¤ì¤Þ¤»¤ó¡£)
.PP
-ËܥС¼¥¸¥ç¥ó¤Î \fBbc\fR ¤Ï¡¢ÅÁÅýŪ¤Ê \fBbc\fR ¤Î¥¤¥ó¥×¥ê¥á¥ó¥È¤ª¤è¤Ó POSIX
-¤Î¥É¥é¥Õ¥È¤è¤ê¤â³ÈÄ¥¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¡¢
+ËܥС¼¥¸¥ç¥ó¤Î \fBbc\fR ¤Ï¡¢ÅÁÅýŪ¤Ê \fBbc\fR ¤Î¼ÂÁõ¤ª¤è¤Ó
+POSIX ¤Î¥É¥é¥Õ¥Èµ¬³Ê¤è¤ê¤â³ÈÄ¥¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¡¢
¤³¤ì¤é¤Î³ÈÄ¥¤ËÂФ·¤Æ·Ù¹ð¤òɽ¼¨¤·¤¿¤êµñÀ䤷¤¿¤ê¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£
Ëܥɥ­¥å¥á¥ó¥È¤Ç¤Ï¡¢¤³¤Î¥×¥í¥»¥Ã¥µ¤¬¼õÍý¤¹¤ë¸À¸ì¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
³ÈÄ¥µ¡Ç½¤Ë¤Ä¤¤¤Æ¤Ï¤½¤Î»ÝÌÀµ­¤·¤Þ¤¹¡£
@@ -58,13 +57,27 @@ bc - Ǥ°ÕÀºÅ٤η׻»¸À¸ì
.IP -w
POSIX \fBbc\fR ¤ËÂФ¹¤ë³ÈÄ¥µ¡Ç½¤¬ÆþÎϤµ¤ì¤¿¾ì¹ç¤Ï·Ù¹ð¤ò½Ð¤·¤Þ¤¹¡£
.IP -s
-POSIX \fBbc\fR ¤Î¸À¸ì»ÅÍͤ˽¾¤Ã¤Æ¡¢¸·Ì©¤Ë½èÍý¤·¤Þ¤¹¡£
+POSIX \fBbc\fR ¤Î¸À¸ì»ÅÍͤ˸·Ì©¤Ë½¾¤Ã¤Æ½èÍý¤·¤Þ¤¹¡£
+.IP -q
+GNU bc ƳÆþ¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤»¤ó¡£
+.IP -v
+¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ÈÃøºî¸¢¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£
+.IP --mathlib
+ɸ½à¿ô³Ø¥é¥¤¥Ö¥é¥ê¤òÄêµÁ¤·¤Þ¤¹¡£
+.IP --warn
+POSIX \fBbc\fR ¤ËÂФ¹¤ë³ÈÄ¥µ¡Ç½¤¬ÆþÎϤµ¤ì¤¿¾ì¹ç¤Ï·Ù¹ð¤ò½Ð¤·¤Þ¤¹¡£
+.IP --standard
+POSIX \fBbc\fR ¤Î¸À¸ì»ÅÍͤ˸·Ì©¤Ë½¾¤Ã¤Æ½èÍý¤·¤Þ¤¹¡£
+.IP --quiet
+GNU bc ƳÆþ¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤»¤ó¡£
+.IP --version
+¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ÈÃøºî¸¢¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£
.SS ¿ô
\fBbc\fR ¤Ë¤ª¤±¤ëºÇ¤â´ðËÜŪ¤ÊÍ×ÁÇ¤Ï `¿ô' ¤Ç¤¹¡£¿ô¤Ï¡¢À°¿ôÉô¤È¾®¿ôÉô¤¬¤¢¤ê¡¢
-Ǥ°Õ¤ÎÀºÅÙ¤ò¤È¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Á´¤Æ¤Î¿ô¤Ï¡¢ÆâÉô¤Ç¤Ï 10 ¿Ê¿ô¤Çɽ¸½¤µ¤ì¤Æ¤ª¤ê¡¢
+Ǥ°Õ¤ÎÀºÅÙ¤ò¤È¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¿ô¤Ï¡¢ÆâÉô¤Ç¤Ï 10 ¿Ê¿ô¤Çɽ¸½¤µ¤ì¤Æ¤ª¤ê¡¢
·×»»¤â 10 ¿Ê¿ô¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£(ËܥС¼¥¸¥ç¥ó¤Ç¤Ï¡¢½ü»»¤È¾è»»¤Ç·ë²Ì¤ËÀڼΤƤ¬
µ¯¤³¤ê¤Þ¤¹¡£) ¿ô¤Ë¤Ï length ¤È scale ¤È¤¤¤¦ 2 ¤Ä¤Î°À­¤¬¤¢¤ê¤Þ¤¹¡£
-length ¤Ï 10 ¿Ê¤Ç¤ÎÍ­¸ú·å¿ô¤Ç¡¢ scale ¤Ï¾®¿ôÅÀ°Ê²¼¤Î 10 ¿Ê¤Ç¤ÎÍ­¸ú·å¿ô¤Ç¤¹¡£
+length ¤Ï 10 ¿Ê¤Ç¤ÎÍ­¸ú·å¿ô¤Ç¡¢scale ¤Ï¾®¿ôÅÀ°Ê²¼¤Î 10 ¿Ê¤Ç¤ÎÍ­¸ú·å¿ô¤Ç¤¹¡£
Î㤨¤Ð¡¢
.nf
.RS
@@ -76,7 +89,7 @@ length ¤Ï 10 ¿Ê¤Ç¤ÎÍ­¸ú·å¿ô¤Ç¡¢ scale ¤Ï¾®¿ôÅÀ°Ê²¼¤Î 10 ¿Ê¤Ç¤ÎÍ­¸ú·å¿ô¤Ç¤¹¡£
¿ô¤Ï¡¢Ã±½ãÊÑ¿ô¤ÈÇÛÎó¤Î 2 ¼ïÎà¤ÎÊÑ¿ô¤ËÊݸ¤µ¤ì¤Þ¤¹¡£Ã±½ãÊÑ¿ô¤ÈÇÛÎóÊÑ¿ô¤Ë¤Ï¶¦¤Ë
̾Á°¤¬ÉÕ¤±¤é¤ì¤Þ¤¹¡£¤³¤Î̾Á°¤Ï¡¢ºÇ½é¤Î 1 ʸ»úÌܤ¬¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤Ç¡¢¸å¤Ï¡¢
¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¡¢¿ô»ú¤ª¤è¤Ó¥¢¥ó¥À¥¹¥³¥¢¤òǤ°Õ¤Îʸ»ú¿ôÁȤ߹ç¤ï¤»¤Æ
-»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Á´¤Æ¤Î¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤Ï¾®Ê¸»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
+»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤Ï¾®Ê¸»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
(¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤È¿ô»ú¤ò»È¤Ã¤¿Ì¾Á°¤Îµ¡Ç½¤Ï³ÈÄ¥µ¡Ç½¤Ç¤¹¡£
POSIX \fBbc\fR ¤Ç¤Ï¡¢ÊÑ¿ô¤Ë±Ñ¾®Ê¸»ú 1 ʸ»ú¤·¤«µö¤µ¤ì¤Þ¤»¤ó¡£)
ÇÛÎóÊÑ¿ô¤Î̾Á°¤Ë¤Ïɬ¤º¥Ö¥é¥±¥Ã¥È ([]) ¤¬¤Ä¤¯¤Î¤Ç¡¢ÊÑ¿ô¤Î·¿¤Ïʸ̮¤Ë¤ª¤¤¤Æ
@@ -85,7 +98,7 @@ POSIX \fBbc\fR ¤Ç¤Ï¡¢ÊÑ¿ô¤Ë±Ñ¾®Ê¸»ú 1 ʸ»ú¤·¤«µö¤µ¤ì¤Þ¤»¤ó¡£)
ÆÃ¼ì¤ÊÊÑ¿ô¤È¤·¤Æ \fBscale, ibase, obase, last\fR ¤Î 4 ¤Ä¤ÎÊÑ¿ô¤¬¤¢¤ê¤Þ¤¹¡£
\fBscale\fR ¤Ç·×»»»þ¤Î¾®¿ôÅÀ°Ê²¼¤ÎÍ­¸ú·å¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
\fBscale\fR ¤Î¥Ç¥Õ¥©¥ë¥È¤Ï 0 ¤Ç¤¹¡£
-\fBibase\fR ¤È \fBobase\fR ¤ÇÆþÎϤª¤è¤Ó½ÐÎϤδð¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
+\fBibase\fR ¤È \fBobase\fR ¤ÇÆþÎϤª¤è¤Ó½ÐÎϤÎÊÑ´¹´ð¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢ÆþÎÏ¡¢½ÐÎϤδð¿ô¤Ï¶¦¤Ë 10 ¤Ç¤¹¡£
\fBlast\fR ¤Ï¡¢ºÇ¸å¤Ë \fBbc\fR ¤¬½ÐÎϤ·¤¿¿ô¤òÊÝ»ý¤·¤Æ¤¤¤Þ¤¹
(¤³¤ì¤Ï³ÈÄ¥µ¡Ç½¤Ç¤¹)¡£¤³¤ì¤é¤Ë¤Ä¤¤¤Æ¤Ï¡¢¸å¤ÇŬÀڤʤȤ³¤í¤Ç¾Ü¤·¤¯ÀâÌÀ¤·¤Þ¤¹¡£
@@ -96,10 +109,15 @@ POSIX \fBbc\fR ¤Ç¤Ï¡¢ÊÑ¿ô¤Ë±Ñ¾®Ê¸»ú 1 ʸ»ú¤·¤«µö¤µ¤ì¤Þ¤»¤ó¡£)
(¤³¤ì¤Ë¤è¤ê¡¢¥³¥á¥ó¥È¤Ï¤½¤ÎÁ°¸å¤ÎÆþÎÏ¥¢¥¤¥Æ¥à¤òÀÚ¤êÎ¥¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
ÊÑ¿ô̾¤ÎÅÓÃæ¤Ë¥³¥á¥ó¥È¤òÃÖ¤¯¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£)
¥³¥á¥ó¥È¤ÎÃæ¤Ë¤Ï¤¤¤¯¤Ä²þ¹Ô¤¬¤¢¤Ã¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£
+.PP
+\fBbc\fR ¤ò¥¹¥¯¥ê¥×¥È¤È¤·¤Æ¤â»È¤¨¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¡¢1 ¹Ô¥³¥á¥ó¥È¤¬
+³ÈÄ¥µ¡Ç½¤È¤·¤ÆÄɲ䵤ì¤Þ¤·¤¿¡£1 ¹Ô¥³¥á¥ó¥È¤Ï \fB#\fR ¤Ç»Ï¤Þ¤ê¡¢
+¼¡¤Î²þ¹Ô¤Þ¤ÇÍ­¸ú¤Ç¤¹¡£¤½¤Î²þ¹Ôʸ»ú¼«ÂΤϥ³¥á¥ó¥È¤Î°ìÉô¤È¤Ï¤ß¤Ê¤µ¤ì¤º¡¢
+ÉáÄ̤˽èÍý¤µ¤ì¤Þ¤¹¡£
.SS ¼°
`¿ô' ¤Ï¡¢¼°¤ª¤è¤Óʸ¤Ë¤è¤Ã¤ÆÁàºî¤µ¤ì¤Þ¤¹¡£
-¤³¤Î¸À¸ì¤Ï¥¤¥ó¥¿¥é¥¯¥Æ¥£¥Ö¤Ë¤Ê¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤ë¤¿¤á¡¢
-ʸ¤ª¤è¤Ó¼°¤Ï¨ºÂ¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
+¤³¤Î¸À¸ì¤ÏÂÐÏÃŪ¤Ë¤Ê¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤ë¤¿¤á¡¢
+ʸ¤ª¤è¤Ó¼°¤Ï²Äǽ¤Ê¸Â¤ê¨ºÂ¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
"main" ¥×¥í¥°¥é¥à¤È¤¤¤Ã¤¿¤â¤Î¤Ï¤Ê¤¯¡¢¤½¤Î¤«¤ï¤ê¡¢¥³¡¼¥É¤Ï
¤½¤ì¤Ë½Ð¤¯¤ï¤·¤¿»þÅÀ¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
(¸å¤Ç½Ò¤Ù¤ë`´Ø¿ô'¤Ï¡¢¤½¤ì¤Ë½Ð¤¯¤ï¤·¤¿»þÅÀ¤ÇÄêµÁ¤µ¤ì¤Þ¤¹¡£)
@@ -107,20 +125,21 @@ POSIX \fBbc\fR ¤Ç¤Ï¡¢ÊÑ¿ô¤Ë±Ñ¾®Ê¸»ú 1 ʸ»ú¤·¤«µö¤µ¤ì¤Þ¤»¤ó¡£)
¼°¤ÎºÇ¤âñ½ã¤Ê¤â¤Î¤Ï¡¢¤¿¤À¤ÎÄê¿ô¤Ç¤¹¡£\fBbc\fR ¤Ï¡¢ÆþÎϤµ¤ì¤¿
Äê¿ô¤ò¡¢ÊÑ¿ô \fBibase\fR ¤Ç»ØÄꤵ¤ì¤ë¸½ºß¤Î´ð¿ô¤ò¸µ¤Ë¡¢ÆâÉôŪ¤Ë¤Ï 10 ¿Êɽ¸½¤Î
¿ô¤ËÊÑ´¹¤·¤Þ¤¹¡£(´Ø¿ô¤Î¾ì¹ç¤Ë¤ÏÎã³°¤¬¤¢¤ê¤Þ¤¹¡£)
-\fBibase\fR ¤Ë¤Ï¡¢2 ¤«¤é 16 (F) ¤Þ¤Ç¤¬»ÈÍѤǤ­¤Þ¤¹¡£
+\fBibase\fR ¤Ë¤Ï¡¢2 ¤«¤é 16 ¤Þ¤Ç¤¬»ÈÍѤǤ­¤Þ¤¹¡£
¤³¤ÎÈϰϤò±Û¤¨¤ëÃͤò \fBibase\fR ¤ËÂåÆþ¤·¤è¤¦¤È¤¹¤ë¤È¡¢
2 ¤¢¤ë¤¤¤Ï 16 ¤ò»ØÄꤷ¤¿¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
¿ô¤ÎÆþÎϤˤϡ¢0-9 ¤ª¤è¤Ó A-F ¤Îʸ»ú¤¬ÍøÍѤǤ­¤Þ¤¹¡£(Ãí°Õ:
¤³¤ì¤ÏÂçʸ»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¾®Ê¸»ú¤ÏÊÑ¿ô̾¤Ç¤¹¡£)
1 ·å¤Î¿ô¤Ï \fBibase\fR ¤ÎÃͤ˴ط¸¤Ê¤¯¤½¤ÎÃͤò»ý¤Á¤Þ¤¹ (¤¹¤Ê¤ï¤Á A=10)¡£
-Ê£¿ô·å¤Î¿ô¤Î¾ì¹ç¡¢\fBbc\fR ¤Ï ibase °Ê¾å¤ÎÃͤò¤â¤ÄÁ´¤Æ¤ÎÆþÎÏ·å¤ò
+Ê£¿ô·å¤Î¿ô¤Î¾ì¹ç¡¢\fBbc\fR ¤Ï ibase °Ê¾å¤ÎÃͤò¤â¤Ä¤¹¤Ù¤Æ¤ÎÆþÎÏ·å¤ò
\fBibase\fR-1¤ËÊѹ¹¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¿ô \fBFFF\fR ¤Ï¾ï¤Ë¡¢
¤½¤ÎÆþÎÏ´ð¿ô¤ò»È¤Ã¤Æ 3 ·å¤Çɽ¸½²Äǽ¤ÊºÇÂç¤ÎÃͤòɽ¤·¤Þ¤¹¡£
.PP
-Á´¤Æ¤Î±é»»¼°¤¬¡¢Â¾¤Î¿¤¯¤Î¹âµé¸À¸ì¤Ë»÷¤¿¤â¤Î¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
+¤¹¤Ù¤Æ¤Î±é»»¼°¤¬¡¢Â¾¤Î¿¤¯¤Î¹âµé¸À¸ì¤Ë»÷¤¿¤â¤Î¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
¿ô¤Î·¿¤Ï 1 ¼ïÎष¤«¤Ê¤¤¤¿¤á¡¢·¿ÊÑ´¹¤Îµ¬Â§¤Ï¤¢¤ê¤Þ¤»¤ó¡£
¤½¤Î¤«¤ï¤ê¡¢¼°¤ÎÍ­¸ú·å¿ô¤Ë´Ø¤¹¤ëµ¬Â§¤¬¤¢¤ê¤Þ¤¹¡£
-Á´¤Æ¤Î¼°¤ËÍ­¸ú·å¿ô¤¬¤¢¤ê¡¢¤³¤ì¤Ï¤½¤ÎÈï±é»»¿ô¤ÎÍ­¸ú·å¿ô¤È
+¤¹¤Ù¤Æ¤Î¼°¤ËÍ­¸ú·å¿ô¤¬¤¢¤ê¡¢¤³¤ì¤Ï¤½¤ÎÈï±é»»¿ô¤ÎÍ­¸ú·å¿ô¤È
+»Ü¤µ¤ì¤ë±é»»¡¢¤½¤ì¤Ë¿¤¯¤Î¾ì¹ç¡¢
ÊÑ¿ô \fBscale\fR ¤«¤é·èÄꤵ¤ì¤Þ¤¹¡£\fBscale\fR ¤Ë¤Ï¡¢0 ¤«¤é
C ¤ÎÀ°¿ô¤Çɽ¸½¤Ç¤­¤ëºÇÂç¤ÎÃͤޤǤ¬»ØÄê²Äǽ¤Ç¤¹¡£
.PP
@@ -171,7 +190,7 @@ C ¤ÎÀ°¿ô¤Çɽ¸½¤Ç¤­¤ëºÇÂç¤ÎÃͤޤǤ¬»ØÄê²Äǽ¤Ç¤¹¡£
Éé¤Ê¤é \fBscale\fR ¤Ë¤Ê¤ê¤Þ¤¹¡£¤Ù¤­»Ø¿ô¤¬Àµ¤Ê¤é¡¢
"1 ÈÖÌܤμ°¤Î scale ¤È¤Ù¤­»Ø¿ô¤È¤ÎÀÑ" ¤ª¤è¤Ó
"\fBscale\fR ¤È 1 ÈÖÌܤμ°¤Î scale ¤ÎÂ礭¤¤Êý" ¤Î¤¦¤Á¤Î¾®¤µ¤¤Êý
-(¤Ä¤Þ¤ê¡¢scale(a^b) = min(scale(expr1)*expr2, max(scale, scale(expr1))))
+(¤Ä¤Þ¤ê¡¢scale(a^b) = min(scale(a)*b, max( \fBscale,\fR scale(a))))
¤È¤Ê¤ê¤Þ¤¹¡£
expr^0 ¤Ï¾ï¤Ë 1 ¤òÊÖ¤·¤Þ¤¹¡£
.IP "( expr )"
@@ -201,8 +220,7 @@ expr1 ¤È expr2 ¤¬Åù¤·¤¤¾ì¹ç 1 ¤Ë¤Ê¤ê¤Þ¤¹¡£
expr1 ¤È expr2 ¤¬Åù¤·¤¯¤Ê¤¤¾ì¹ç 1 ¤Ë¤Ê¤ê¤Þ¤¹¡£
.PP
ÏÀÍý±é»»¤â»È¤¨¤Þ¤¹¡£(POSIX \fBbc\fR ¤Ë¤ÏÏÀÍý±é»»¤Ï¤¢¤ê¤Þ¤»¤ó¡£)
-ÏÀÍý±é»»¤â´Ø·¸±é»»¤ÈƱÍÍ¡¢0 ¤È 1 ¤Î 2 ¤Ä¤ÎÃÍ (³Æ¡¹µ¶¤ª¤è¤Ó¿¿)
-¤À¤±¤ò¤È¤ë±é»»¤Ç¤¹¡£
+ÏÀÍý±é»»¤â´Ø·¸±é»»¤ÈƱÍÍ¡¢·ë²Ì¤Ï 0 ¤« 1 (³Æ¡¹µ¶¤ª¤è¤Ó¿¿) ¤Ë¤Ê¤ê¤Þ¤¹¡£
ÏÀÍý±é»»»Ò¤Ï°Ê²¼¤ÎÄ̤ꡣ
.IP "!expr"
expr ¤¬ 0 ¤Ê¤é 1 ¤Ë¤Ê¤ê¤Þ¤¹¡£
@@ -215,16 +233,16 @@ expr1 ¤È expr2 ¤Î¤É¤Á¤é¤«°ìÊý¤¬ 0 ¤Ç¤Ê¤¤¤Ê¤é¡¢1 ¤Ë¤Ê¤ê¤Þ¤¹¡£
(ºÇ½é¤Î¤â¤Î¤Û¤ÉÄ㤯¡¢¸å¤Ë¤¤¤¯¤Û¤É¹â¤¤Í¥Àè½ç°Ì¤ÇÀè¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£)
.nf
.RS
-|| operator, left associative
-&& operator, left associative
-! operator, nonassociative
-Relational operators, left associative
-Assignment operator, right associative
-+ and - operators, left associative
-*, / and % operators, left associative
-^ operator, right associative
-- (ñ¹à¥Þ¥¤¥Ê¥¹), nonassociative
-++ and -- operators, nonassociative
+|| (º¸¤«¤é·ë¹ç)
+&& (º¸¤«¤é·ë¹ç)
+! (·ë¹ç¤»¤º)
+´Ø·¸±é»» (º¸¤«¤é·ë¹ç)
+ÂåÆþ±é»» (±¦¤«¤é·ë¹ç)
++ - (º¸¤«¤é·ë¹ç)
+* / % (º¸¤«¤é·ë¹ç)
+^ (±¦¤«¤é·ë¹ç)
+- (ñ¹à¥Þ¥¤¥Ê¥¹) (·ë¹ç¤»¤º)
+++ -- (·ë¹ç¤»¤º)
.RE
.fi
.PP
@@ -237,7 +255,7 @@ a = 3 < 5
.RE
.PP
C ¥×¥í¥°¥é¥Þ¤Î¤Û¤È¤ó¤É¤Ï¡¢
-``3 < 5'' ¤Î´Ø·¸±é»»¤¬¼Â¹Ô¤µ¤ì¤¿·ë²Ì¤¬ÊÑ¿ô ``a'' ¤ËÂåÆþ¤µ¤ì¤ë¡¢
+``3 < 5'' ¤Î´Ø·¸±é»»¤¬¼Â¹Ô¤µ¤ì¤¿·ë²Ì (¤Ä¤Þ¤ê 1) ¤¬ÊÑ¿ô ``a'' ¤ËÂåÆþ¤µ¤ì¤ë¡¢
¤È¹Í¤¨¤ë¤Ç¤·¤ç¤¦¡£
¤È¤³¤í¤¬ \fBbc\fR ¤Ç¤Ï¡¢¤Þ¤º 3 ¤¬ÊÑ¿ô ``a'' ¤ËÂåÆþ¤µ¤ì¡¢
¤½¤ì¤«¤é 3 ¤È 5 ¤ÎÈæ³Ó¤¬¹Ô¤ï¤ì¤ë¤Î¤Ç¤¹¡£
@@ -272,21 +290,21 @@ expression ¤ËÉé¤ÎÃͤò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢¥é¥ó¥¿¥¤¥à¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹¡£
²þ¹Ô¤¬ÆþÎϤµ¤ì¤¿»þÅÀ¤Ç¡¢¼Â¹Ô²Äǽ¤Êʸ¤¬Â¸ºß¤·¤Æ¤¤¤ì¤Ð¡¢Â¨ºÂ¤Ë¼Â¹Ô¤·¤Þ¤¹¡£
¤³¤Î¤¿¤á \fBbc\fR ¤Ç¤Ï²þ¹Ô¤¬½ÅÍפÊÌò³ä¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
¼ÂºÝ¡¢¥»¥ß¥³¥í¥ó¤È²þ¹Ô¤¬Ê¸¤Î¶èÀÚ¤ê¤È¤·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£
-ÉÔŬÅö¤Ê¾ì½ê¤Ç²þ¹Ô¤òÆþÎϤ¹¤ë¤È¡¢¥·¥ó¥¿¥Ã¥¯¥¹¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹¡£
+ÉÔŬÅö¤Ê¾ì½ê¤Ç²þ¹Ô¤òÆþÎϤ¹¤ë¤È¡¢Ê¸Ë¡¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹¡£
²þ¹Ô¤Ïʸ¤Î¶èÀÚ¤ê¤Ç¤¹¤¬¡¢¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤òÍѤ¤¤Æ²þ¹Ô¤ò±£¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
\fBbc\fR ¤Ë¤È¤Ã¤Æ¡¢"\e<nl>" (<nl>¤Ï²þ¹Ô) ¤Ï²þ¹Ô¤Ç¤Ï¤Ê¤¯¶õÇò¤Ë¸«¤¨¤Þ¤¹¡£
ʸ¤Î¥ê¥¹¥È¤Ï¡¢¥»¥ß¥³¥í¥ó¤È²þ¹Ô¤Ç¶èÀÚ¤é¤ì¤¿Ê¸¤ÎʤӤǤ¹¡£
°Ê²¼¡¢\fBbc\fR ¤Îʸ¤Î¼ïÎà¤È¤½¤Îưºî¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
(¤Ê¤ª¡¢°Ê²¼¤ÎÀâÌÀ¤Ç ([]) ¤Ç³ç¤Ã¤¿Éôʬ¤Ï¾Êά²Äǽ¤Ê¹à¤Ç¤¹¡£)
.IP "±é»»¼°"
-±é»»¼°¤Ë¤Ï¼¡¤Î 2 ¤Ä¤Î¼ïÎब¤¢¤ê¤Þ¤¹¡£
+±é»»¼°¤Ë¤Ï¼¡¤Î 2 ¤Ä¤Î¼ïÎब¤¢¤ê¤Þ¤¹¡£
±é»»¼°¤¬ "<variable> <assignment> ..." ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ì¤Ð¡¢
¤½¤ì¤ÏÂåÆþʸ¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¡¢±é»»¼°¤Ïɾ²Á¤µ¤ì¤Æ½ÐÎϤËɽ¼¨¤µ¤ì¤Þ¤¹¡£
·ë²Ì¤¬É½¼¨¤µ¤ì¤¿¸å¡¢²þ¹Ô¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
Î㤨¤Ð¡¢"a=1" ¤ÏÂåÆþʸ¤Ç¤¢¤ê¡¢
"(a=1)" ¤ÏÂåÆþʸ¤¬Ëä¤á¹þ¤Þ¤ì¤¿±é»»¼°¤Ç¤¹¡£
-ɽ¼¨¤µ¤ì¤ë¿ôÃͤÏÁ´¤Æ¡¢ÊÑ¿ô \fBobase\fR ¤Ç·è¤Þ¤ë´ð¿ô¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£
+ɽ¼¨¤µ¤ì¤ë¿ôÃͤϤ¹¤Ù¤Æ¡¢ÊÑ¿ô \fBobase\fR ¤Ç·è¤Þ¤ë´ð¿ô¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£
\fBobase\fR ¤Ë»ØÄê¤Ç¤­¤ëÃÍ¤Ï 2 ¤«¤é BC_BASE_MAX ¤Þ¤Ç¤Ç¤¹¡£
(¡ÖÀ©¸Â¡×¤Î¾Ï¤ò»²¾È¡£)
´ð¿ô 2 ¤«¤é 16 ¤Þ¤Ç¤Ç¤Ï¡¢Ä̾ï¤Î¿ôɽµ­Ë¡¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£
@@ -308,11 +326,11 @@ expression ¤ËÉé¤ÎÃͤò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢¥é¥ó¥¿¥¤¥à¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹¡£
ÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£)
.IP "string"
ʸ»úÎó string ¤¬½ÐÎϤËɽ¼¨¤µ¤ì¤Þ¤¹¡£
-ʸ»úÎó¤ÏÆó½Å°úÍÑÉä¤Ç»Ï¤Þ¤ê¡¢¼¡¤ÎÆó½Å°úÍÑÉä¤Þ¤Ç¤ÎÁ´¤Æ¤Îʸ»ú¤ò´Þ¤ß¤Þ¤¹¡£
-²þ¹Ô¤ò´Þ¤á¡¢Á´¤Æ¤Îʸ»ú¤Ïʸ»úÄ̤ê¤Ë²ò¼á¤µ¤ì¤Þ¤¹¡£
+ʸ»úÎó¤ÏÆó½Å°úÍÑÉä¤Ç»Ï¤Þ¤ê¡¢¼¡¤ÎÆó½Å°úÍÑÉä¤Þ¤Ç¤Î¤¹¤Ù¤Æ¤Îʸ»ú¤ò´Þ¤ß¤Þ¤¹¡£
+²þ¹Ô¤ò´Þ¤á¡¢¤¹¤Ù¤Æ¤Îʸ»ú¤Ïʸ»úÄ̤ê¤Ë²ò¼á¤µ¤ì¤Þ¤¹¡£
ʸ»úÎó¤Î¸å¤Ë²þ¹Ô¤Ï½ÐÎϤµ¤ì¤Þ¤»¤ó¡£
.IP "\fBprint\fR list"
-print ʸ (¤³¤ì¤Ï³ÈÄ¥µ¡Ç½¤Ç¤¹) ¤Ï¡¢¤â¤¦°ì¤Ä¤Î½ÐÎÏÊýË¡¤Ç¤¹¡£
+print ʸ (¤³¤ì¤Ï³ÈÄ¥µ¡Ç½¤Ç¤¹) ¤Ï¡¢¤â¤¦¤Ò¤È¤Ä¤Î½ÐÎÏÊýË¡¤Ç¤¹¡£
"list" ¤Ï¥³¥ó¥Þ¤Ç¶èÀڤä¿Ê¸»úÎ󤪤è¤Ó±é»»¼°¤Î¥ê¥¹¥È¤Ç¤¢¤ê¡¢
³ÆÊ¸»úÎ󤢤뤤¤Ï±é»»¼°¤¬¥ê¥¹¥È¤Î½ç¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
ºÇ¸å¤Ë²þ¹Ô¤Ï½ÐÎϤµ¤ì¤Þ¤»¤ó¡£
@@ -327,23 +345,23 @@ print Ê¸Ãæ¤Îʸ»úÎó¤Ï½ÐÎϤËɽ¼¨¤µ¤ì¤Þ¤¹¤¬¡¢ÆÃ¼ìʸ»ú¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
¤³¤ì°Ê³°¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
.IP "{ statement_list }"
ʣʸ¤Ç¤¹¡£Ê£¿ô¤Îʸ¤ò 1 ¤Ä¤Î¥°¥ë¡¼¥×¤Ë¤Þ¤È¤á¤Æ¼Â¹Ô¤·¤Þ¤¹¡£
-.IP "\fBif\fR ( expression ) \fBthen\fR statement1 [\fBelse\fR statement2]"
+.IP "\fBif\fR ( expression ) statement1 [\fBelse\fR statement2]"
if ʸ¤Ï±é»»¼° expression ¤òɾ²Á¤·¡¢¤½¤ÎÃͤ˱þ¤¸¤Æ
ʸ statement1 ¤Þ¤¿¤Ïʸ statement2 ¤ò¼Â¹Ô¤·¤Þ¤¹¡£
-expression ¤ÎÃͤ¬¥¼¥í¤Ç¤Ê¤±¤ì¤Ð statement1 ¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
+expression ¤ÎÃͤ¬ 0 ¤Ç¤Ê¤±¤ì¤Ð statement1 ¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
statement2 ¤¬Â¸ºß¤·¡¢expression ¤ÎÃͤ¬ 0 ¤Ê¤é¤Ð¡¢statement2 ¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
(else Àá¤Ï³ÈÄ¥µ¡Ç½¤Ç¤¹¡£)
.IP "\fBwhile\fR ( expression ) statement"
-while ʸ¤Ï expression ¤¬¥¼¥í¤Ç¤Ê¤¤´Ö¡¢·«¤êÊÖ¤· statement ¤ò¼Â¹Ô¤·¤Þ¤¹¡£
+while ʸ¤Ï expression ¤¬ 0 ¤Ç¤Ê¤¤´Ö¡¢·«¤êÊÖ¤· statement ¤ò¼Â¹Ô¤·¤Þ¤¹¡£
statement ¤Î¼Â¹ÔÁ°¤ËËè²ó expression ¤òɾ²Á¤·¤Þ¤¹¡£
-expression ¤ÎÃͤ¬¥¼¥í¤Ë¤Ê¤ë¤«¡¢break ʸ¤ò¼Â¹Ô¤¹¤ë¤È¡¢
+expression ¤ÎÃͤ¬ 0 ¤Ë¤Ê¤ë¤«¡¢break ʸ¤ò¼Â¹Ô¤¹¤ë¤È¡¢
¥ë¡¼¥×¤¬½ªÎ»¤·¤Þ¤¹¡£
.IP "\fBfor\fR ( [expression1] ; [expression2] ; [expression3] ) statement"
for ʸ¤Ï statement ¤Î·«¤êÊÖ¤·¼Â¹Ô¤òÀ©¸æ¤·¤Þ¤¹¡£
expression1 ¤Ï¥ë¡¼¥×¼Â¹Ô¤ÎÁ°¤Ëɾ²Á¤µ¤ì¤Þ¤¹¡£
expression2 ¤Ï statement ¤Î¼Â¹ÔÁ°¤ËËè²óɾ²Á¤µ¤ì¡¢
-¤½¤ÎÃͤ¬¥¼¥í¤Ç¤Ê¤±¤ì¤Ð statement ¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
-expression2 ¤ÎÃͤ¬¥¼¥í¤Ë¤Ê¤ë¤È¡¢¥ë¡¼¥×¤Ï½ªÎ»¤·¤Þ¤¹¡£
+¤½¤ÎÃͤ¬ 0 ¤Ç¤Ê¤±¤ì¤Ð statement ¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
+expression2 ¤ÎÃͤ¬ 0 ¤Ë¤Ê¤ë¤È¡¢¥ë¡¼¥×¤Ï½ªÎ»¤·¤Þ¤¹¡£
³Æ statement ¼Â¹Ô¤Î¸å¡¢ºÆ¤Ó expression2 ¤¬É¾²Á¤µ¤ì¤ëÁ°¤Ë expression3 ¤¬
ɾ²Á¤µ¤ì¤Þ¤¹¡£
expression1 ¤¢¤ë¤¤¤Ï expression3 ¤¬¾Êά¤µ¤ì¤Æ¤¤¤ë¤È¡¢
@@ -352,7 +370,7 @@ expression2 ¤¬¾Êά¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢expression2 ¤¬ 1 ¤Ç¤¢¤ë¤Î¤È
ƱÍͤ˰·¤ï¤ì¤Þ¤¹¡£
(³Æ expression ¤¬¾Êά²Äǽ¤Ê¤Î¤Ï³ÈÄ¥µ¡Ç½¤Ç¤¹¡£
POSIX \fBbc\fR ¤Ç¤Ï¡¢3 ¤Ä¤Î expression ¤Ï¤É¤ì¤â¾Êά¤Ç¤­¤Þ¤»¤ó¡£)
- °Ê²¼¤Ï for ʸ¤ÈÅù²Á¤Ê¥³¡¼¥É¤Ç¤¹:
+°Ê²¼¤Ï for ʸ¤ÈÅù²Á¤Ê¥³¡¼¥É¤Ç¤¹:
.nf
.RS
expression1;
@@ -365,7 +383,7 @@ while (expression2) {
.IP "\fBbreak\fR"
¤½¤ì¤ò´Þ¤àºÇ¤âÆâ¦¤Î while ¤â¤·¤¯¤Ï for ʸ¤Ë¤è¤ë·«¤êÊÖ¤·¤ò¶¯À©Åª¤ËÃæÃǤ·¤Þ¤¹¡£
.IP "\fBcontinue\fR"
-¤½¤ì¤ò´Þ¤àºÇ¤âÆâ¦¤Î for ʸ¤Ë¤è¤ë·«¤êÊÖ¤·¤Ç¡¢ºÇ½é¤Îʸ¤ËÌá¤Ã¤Æ¼Â¹Ô¤ò³¤±¤Þ¤¹¡£
+¤½¤ì¤ò´Þ¤àºÇ¤âÆâ¦¤Î for ʸ¤Ë¤ª¤±¤ë¼¡¤Î·«¤êÊÖ¤·¤Ë¿Ê¤ß¤Þ¤¹¡£
(continue ʸ¤Ï³ÈÄ¥µ¡Ç½¤Ç¤¹)
.IP "\fBhalt\fR"
¼Â¹Ô¤µ¤ì¤ë¤È \fBbc\fR ¥×¥í¥»¥Ã¥µ¤ò½ªÎ»¤µ¤»¤Þ¤¹(³ÈÄ¥µ¡Ç½)¡£
@@ -409,7 +427,7 @@ halt ʸ¤¬¼Â¹Ô¤µ¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£
¤È¤¤¤¦·Á¼°¤Î±é»»¼°¤Ç¤¹¡£
.PP
¥Ñ¥é¥á¡¼¥¿ parameters ¤Ï¿ô¤¢¤ë¤¤¤ÏÇÛÎó (³ÈÄ¥µ¡Ç½) ¤Ç¤¹¡£
-´Ø¿ôÄêµÁ¤Ç¤Ï¡¢¥¼¥í¤¢¤ë¤¤¤Ï 1 ¸Ä°Ê¾å¤Î¥Ñ¥é¥á¡¼¥¿Ì¾¤ò
+´Ø¿ôÄêµÁ¤Ç¤Ï¡¢0 ¤¢¤ë¤¤¤Ï 1 ¸Ä°Ê¾å¤Î¥Ñ¥é¥á¡¼¥¿Ì¾¤ò
¥³¥ó¥Þ¤Ç¶èÀڤäÆÊ¤٤뤳¤È¤ÇÄêµÁ¤·¤Þ¤¹¡£
¿ô¤ÏÃÍÅϤ·(call by value)¤Ç¤Î¤ßÅϤµ¤ì¡¢ÇÛÎó¤ÏÊÑ¿ôÅϤ·(call by variable)¤Ç
¤Î¤ßÅϤµ¤ì¤Þ¤¹¡£
@@ -427,11 +445,11 @@ halt ʸ¤¬¼Â¹Ô¤µ¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£
\fIauto_list\fR ¤Ï¾Êά²Äǽ¤Ç¡¢¥í¡¼¥«¥ëÊÑ¿ô¤È¤·¤Æ»ÈÍѤ¹¤ëÊÑ¿ô¤Î¥ê¥¹¥È
¤Ç¤¹¡£auto_list ¤¬Â¸ºß¤¹¤ë¤Ê¤é¡¢¤½¤Îʸˡ¤Ï
"\fBauto \fIname\fR, ... ;"
-¤È¤Ê¤ê¤Þ¤¹¡£(¥»¥ß¥³¥í¥ó¤Ï¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£)
+¤È¤Ê¤ê¤Þ¤¹¡£(¥»¥ß¥³¥í¥ó¤Ï¾Êά²Äǽ¤Ç¤¹¡£)
³Æ \fIname\fR ¤¬¥í¡¼¥«¥ëÊÑ¿ô¤Î̾Á°¤È¤Ê¤ê¤Þ¤¹¡£
ÇÛÎó¤Ï¥Ñ¥é¥á¡¼¥¿¤ÈƱÍͤÎɽµ­¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£
¤³¤ì¤é¤ÎÊÑ¿ô¤Ï¡¢´Ø¿ô¤ÎºÇ½é¤Ç¤½¤ÎÃͤ¬¥¹¥¿¥Ã¥¯¤Ë¥×¥Ã¥·¥å¤µ¤ì¤¿¤Î¤Á
-ÃÍ¥¼¥í¤Ë½é´ü²½¤µ¤ì¡¢´Ø¿ô¤Î¼Â¹ÔÃæ¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
+ÃÍ 0 ¤Ë½é´ü²½¤µ¤ì¡¢´Ø¿ô¤Î¼Â¹ÔÃæ¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
¤³¤ì¤é¤ÎÊÑ¿ô¤Ï´Ø¿ô½Ð¸ý¤Ë¤Æ¥Ý¥Ã¥×¤µ¤ì¡¢
(´Ø¿ô¸Æ¤Ó½Ð¤·»þ¤Î)¸µ¤ÎÃͤ¬Éü¸µ¤µ¤ì¤Þ¤¹¡£
¥Ñ¥é¥á¡¼¥¿¤Ï¼ÂºÝ¤Ë¤Ï¥í¡¼¥«¥ëÊÑ¿ô¤Ç¤¢¤ê¡¢
@@ -468,15 +486,15 @@ expression ¤ÎÃͤò·×»»¤·¡¢¤½¤ì¤ò¸Æ¤Ó½Ð¤·¸µ¤ËÊÖ¤·¤Þ¤¹¡£
.IP "s (\fIx\fR)"
sin (x ¤Îñ°Ì¤Ï¥é¥¸¥¢¥ó)
.IP "c (\fIx\fR)"
-cos
+cos (x ¤Îñ°Ì¤Ï¥é¥¸¥¢¥ó)
.IP "a (\fIx\fR)"
-atan
+atan (ÊÖ¤êÃͤÎñ°Ì¤Ï¥é¥¸¥¢¥ó)
.IP "l (\fIx\fR)"
log (¼«Á³Âпô)
.IP "e (\fIx\fR)"
-exp
+exp (»Ø¿ô´Ø¿ô)
.IP "j (\fIn,x\fR)"
-¥Ù¥Ã¥»¥ë´Ø¿ô
+À°¿ô n ¼¡¤Î¥Ù¥Ã¥»¥ë´Ø¿ô
.SS »ÈÍÑÎã
¼¡¤ÎÎã¤Ï¡¢/bin/sh ¤Ç¥·¥§¥ëÊÑ¿ô \fBpi\fR ¤Ë ``¥Ñ¥¤'' ¤ÎÃͤòÂåÆþ¤·¤Þ¤¹¡£
.RS
@@ -485,7 +503,7 @@ pi=$(echo "scale=10; 4*a(1)" | bc -l)
\fR
.RE
.PP
-¼¡¤ÎÎã¤Ï¡¢¿ô³Ø¥é¥¤¥Ö¥é¥ê¤Ç»È¤ï¤ì¤Æ¤¤¤ë ``e (x)'' ¤ÎÄêµÁ¤Ç¤¹
+¼¡¤ÎÎã¤Ï¡¢¿ô³Ø¥é¥¤¥Ö¥é¥ê¤Ç»È¤ï¤ì¤Æ¤¤¤ë ``e (x)'' ¤ÎÄêµÁ¤Ç¤¹¡£
¤³¤Î´Ø¿ô¤Ï POSIX \fBbc\fR ¤Çµ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
.nf
.RS
@@ -572,6 +590,17 @@ define f (x) {
\fR
.RE
.fi
+.SS readline ¥ª¥×¥·¥ç¥ó
+GNU \fBbc\fR ¤Ï (configure ¤Î¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ) GNU \fBreadline\fR
+ÆþÎÏ¥¨¥Ç¥£¥¿¥é¥¤¥Ö¥é¥ê¤ò»È¤¦¤è¤¦¤Ë¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤Þ¤¹¡£
+¤³¤ì¤Ï¡¢\fBbc\fR ¤ËÆþÎϤ¹¤ëÁ°¤Ë¡¢¹Ô¤ÎÊÔ½¸¤ò²Äǽ¤Ë¤·¤Þ¤¹¡£
+°ÊÁ°¤ËÆþÎϤ·¤¿¹Ô¤Î¥Ò¥¹¥È¥ê¤âÍøÍѲÄǽ¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç
+¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿ \fBbc\fR ¤Ç¤Ï¡¢¤µ¤é¤Ë 1 ¤Ä¤ÎÆÃ¼ì¤ÊÊÑ¿ô
+\fBhistory\fR ¤¬Äɲ䵤졢¥Ò¥¹¥È¥ê¤ËÊݸ¤µ¤ì¤ë¹Ô¤Î¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
+¤½¤ÎÃͤ¬ -1 (¥Ç¥Õ¥©¥ë¥ÈÃÍ)¤Ê¤é¡¢¥Ò¥¹¥È¥ê¹Ô¤ÏÀ©¸Â¤Ê¤¯Êݸ¤µ¤ì¤Þ¤¹¡£
+Àµ¤Î¿ô¤ò»ØÄꤹ¤ë¤È¡¢¥Ò¥¹¥È¥ê¹Ô¤¬¤½¤Î¿ô¤ËÀ©¸Â¤µ¤ì¤Þ¤¹¡£
+0 ¤Ê¤é¥Ò¥¹¥È¥êµ¡Ç½¤¬Ìµ¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¾Ü¤·¤¯¤Ï¡¢¥æ¡¼¥¶¥Þ¥Ë¥å¥¢¥ë¤Î
+GNU \fBreadline\fR ¤È \fBhistory\fR ¥é¥¤¥Ö¥é¥ê¤ò¤´Í÷²¼¤µ¤¤¡£
.SS Áê°ãÅÀ
¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î
.B bc
@@ -593,7 +622,7 @@ define f (x) {
Áê°ãÅÀ¤È³ÈÄ¥ÅÀ¤Î¥ê¥¹¥È¤ò°Ê²¼¤Ë¼¨¤·¤Þ¤¹¡£
.IP LANG
¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢
-´Ä¶­ÊÑ¿ô LANG ¤ª¤è¤Ó LC_ ¤Ç»Ï¤Þ¤ëÁ´¤Æ¤Î´Ä¶­ÊÑ¿ô¤Î½èÍý¤Ë´Ø¤·¤Æ POSIX ¤Ë
+´Ä¶­ÊÑ¿ô LANG ¤ª¤è¤Ó LC_ ¤Ç»Ï¤Þ¤ë¤¹¤Ù¤Æ¤Î´Ä¶­ÊÑ¿ô¤Î½èÍý¤Ë´Ø¤·¤Æ POSIX ɸ½à¤Ë
½àµò¤·¤Æ¤¤¤Þ¤»¤ó¡£
.IP ̾Á°
ÅÁÅýŪ¤Ê
@@ -602,7 +631,7 @@ define f (x) {
.B bc
¤Ï¡¢´Ø¿ô¡¢ÊÑ¿ô¡¢ÇÛÎó¤Î̾Á°¤È¤·¤ÆÃ±°ì¤Îʸ»ú¤ò»È¤¤¤Þ¤¹¡£
¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢
-ÀèÆ¬¤¬Ê¸»ú¤Ç»Ï¤Þ¤ê¡¢Ê¸»ú¤È¿ô»ú¤È¥¢¥ó¥À¡¼¥¹¥³¥¢¤«¤éÀ®¤ëʸ»ú¤Ç
+ÀèÆ¬¤¬Ê¸»ú¤Ç»Ï¤Þ¤ê¡¢Ê¸»ú¤È¿ô»ú¤È¥¢¥ó¥À¡¼¥¹¥³¥¢¤Ç
¹½À®¤µ¤ì¤ë 2 ʸ»ú°Ê¾å¤Î̾Á°¤¬»È¤¨¤ë¤è¤¦¤Ë³ÈÄ¥¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
.IP ʸ»úÎó
ʸ»úÎó¤Ë¤Ï NUL ʸ»ú¤ò´Þ¤à¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
@@ -615,7 +644,7 @@ POSIX \fBbc\fR ¤Ë¤ÏÊÑ¿ô \fBlast\fR ¤Ï¤¢¤ê¤Þ¤»¤ó¡£
.IP Èæ³Ó
POSIX \fBbc\fR ¤Ç¤Ï¡¢Èæ³Ó¤Ï if ʸ¡¢while ʸ¡¢for ʸ¤ÎÂè 2 ¼°¤ÎÃæ¤Ç¤Î¤ß
ÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-¤Þ¤¿¡¢¤³¤ì¤é¤Îʸ¤ÎÃæ¤Ç¤Ï¤¿¤À°ì¤Ä¤Î´Ø·¸±é»»¤·¤«»È¤¨¤Þ¤»¤ó¡£
+¤Þ¤¿¡¢¤³¤ì¤é¤Îʸ¤ÎÃæ¤Ç¤Ï¤¿¤À 1 ¤Ä¤Î´Ø·¸±é»»¤·¤«»È¤¨¤Þ¤»¤ó¡£
.IP "if ʸ, else Àá"
POSIX \fBbc\fR ¤Ë¤Ï else Àá¤Ï¤¢¤ê¤Þ¤»¤ó¡£
.IP "for ʸ"
@@ -629,8 +658,11 @@ POSIX \fBbc\fR ¤Ë¤Ï print ʸ¤Ï¤¢¤ê¤Þ¤»¤ó¡£
.IP "continue ʸ"
POSIX \fBbc\fR ¤Ë¤Ï continue ʸ¤Ï¤¢¤ê¤Þ¤»¤ó¡£
.IP "ÇÛÎó¥Ñ¥é¥á¡¼¥¿"
-POSIX \fBbc\fR ¤Ç¤ÏÇÛÎó¥Ñ¥é¥á¡¼¥¿¤Ï»È¤¨¤Þ¤»¤ó¡£
-¾¤Î \fBbc\fR ¤Î¼ÂÁõ¤Ç¤Ï¡¢ÃÍÅϤ·¤ÇÇÛÎó¥Ñ¥é¥á¡¼¥¿¤ò»È¤¨¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
+POSIX \fBbc\fR ¤Ç¤Ï (¸½ºß¤Î¤È¤³¤í) ÇÛÎó¥Ñ¥é¥á¡¼¥¿¤Ï´°Á´¤Ë¤Ï»È¤¨¤Þ¤»¤ó¡£
+POSIX ¤Îʸˡ¤Ç¤Ï¡¢´Ø¿ôÄêµÁ¤Ç¤ÏÇÛÎó¤ò»È¤¨¤Þ¤¹¤¬¡¢¼ÂºÝ¤Ë¸Æ¤Ó½Ð¤¹¤È¤­¤Î
+¥Ñ¥é¥á¡¼¥¿¤ËÇÛÎó¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£(¤³¤ì¤Ï¤ª¤½¤é¤¯¡¢Ê¸Ë¡¾å¤Î
+¸«Íî¤È¤·¤Ç¤·¤ç¤¦¡£) ÅÁÅýŪ¤Ê \fBbc\fR ¤Î¼ÂÁõ¤Ç¤Ï¡¢ÇÛÎó¥Ñ¥é¥á¡¼¥¿¤ÏÃÍÅϤ·
+¤Î¤ß¤Ç¤·¤¿¡£
.IP "=+, =-, =*, =/, =%, =^"
POSIX \fBbc\fR ¤Ç¤Ï¤³¤ì¤é¤Î¡Öµì¼°¡×¤ÎÂåÆþ±é»»»Ò¤òÄêµÁ¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¤³¤ì¤é¤Î¡Öµì¼°¡×ÂåÆþ±é»»»Ò¤¬»È¤¨¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£
@@ -677,11 +709,11 @@ b = 2
ÂÐÏÃ¥»¥Ã¥·¥ç¥ó¤Î´Ö¡¢SIGINT ¥·¥°¥Ê¥ë (Ä̾üËö¤«¤é¤Î Control-C ÆþÎϤÇ
ȯÀ¸¤·¤Þ¤¹) ¤Ë¤è¤Ã¤Æ¸½ºß¤Î¼Â¹Ô¥Ö¥í¥Ã¥¯¤Î¼Â¹Ô¤¬ÃæÃǤµ¤ì¡¢
¤É¤Î´Ø¿ô¤¬ÃæÃǤµ¤ì¤¿¤«¤ò¼¨¤¹¡Ö¥é¥ó¥¿¥¤¥à¡×¥¨¥é¡¼¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-¥é¥ó¥¿¥¤¥à¤Î¥Ç¡¼¥¿¹½Â¤¤òÁ´¤Æ¥¯¥ê¥¢¤·¤¿¸å¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¡¢
+¥é¥ó¥¿¥¤¥à¤Î¥Ç¡¼¥¿¹½Â¤¤ò¤¹¤Ù¤Æ¥¯¥ê¥¢¤·¤¿¸å¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¡¢
\fBbc\fR ¤Ï¼¡¤ÎÆþÎϤò¼õ¤±ÉÕ¤±¤ë¾õÂ֤ˤʤ俤³¤È¤ò¼¨¤·¤Þ¤¹¡£
-¤³¤ì¤Þ¤Ç¤ËÄêµÁ¤·¤¿´Ø¿ô¤ÏÁ´¤ÆÄêµÁ¤µ¤ì¤Æ»Ä¤Ã¤Æ¤ª¤ê¡¢
+¤³¤ì¤Þ¤Ç¤ËÄêµÁ¤·¤¿´Ø¿ô¤Ï¤¹¤Ù¤ÆÄêµÁ¤µ¤ì¤Æ»Ä¤Ã¤Æ¤ª¤ê¡¢
¥í¡¼¥«¥ë¤Ç¤Ê¤¤ÊÑ¿ô¤ÎÃͤϳä¤ê¹þ¤ßȯÀ¸»þÅÀ¤ÎÃͤΤޤޤˤʤäƤ¤¤Þ¤¹¡£
-¥í¡¼¥«¥ëÊÑ¿ô¤È´Ø¿ô¥Ñ¥é¥á¡¼¥¿¤ÏÁ´¤Æ¡¢¥¯¥ê¥¢½èÍý¤Ë¤è¤Ã¤Æ¾Ãµî¤µ¤ì¤Þ¤¹¡£
+¥í¡¼¥«¥ëÊÑ¿ô¤È´Ø¿ô¥Ñ¥é¥á¡¼¥¿¤Ï¤¹¤Ù¤Æ¡¢¥¯¥ê¥¢½èÍý¤Ë¤è¤Ã¤Æ¾Ãµî¤µ¤ì¤Þ¤¹¡£
ÈóÂÐÏÃ¥»¥Ã¥·¥ç¥ó¤Ç¤Ï¡¢SIGINT ¥·¥°¥Ê¥ë¤Ç \fBbc\fR ¤Î¼Â¹ÔÁ´ÂΤ¬½ªÎ»¤·¤Þ¤¹¡£
.SS ¸Â³¦
°Ê²¼¤Î¹àÌܤ¬¸½ºß¤Î
@@ -714,8 +746,23 @@ b = 2
.IP ÊÑ¿ô̾
ñ½ãÊÑ¿ô¡¢ÇÛÎó¡¢´Ø¿ô³Æ¡¹¤Ë¤Ä¤¤¤Æ¡¢°ì°Õ¤Ë¼±Ê̤µ¤ì¤ë̾Á°¤Ï 32767 ¸Ä¤Ë
À©¸Â¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+.SH ´Ä¶­ÊÑ¿ô
+\fBbc\fR ¤Ï°Ê²¼¤Î´Ä¶­ÊÑ¿ô¤ò²ò¼á¤·¤Þ¤¹¡£
+.IP "POSIXLY_CORRECT"
+\fB-s\fR ¥ª¥×¥·¥ç¥ó¤ÈƱ¤¸¤Ç¤¹¡£
+.IP "BC_ENV_ARGS"
+¤³¤ì¤Ï \fBbc\fR ¤Ë°ú¤­¿ô¤òÅϤ¹Ê̤ÎÊýË¡¤Ç¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¤­¿ô¤È
+Ʊ¤¸½ñ¼°¤Ç¤¹¡£¤³¤Î°ú¤­¿ô¤¬ºÇ½é¤Ë½èÍý¤µ¤ì¤ë¤Î¤Ç¡¢¤³¤Î´Ä¶­ÊÑ¿ô¤Ç
+»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤è¤ê¤â
+Àè¤Ë½èÍý¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢Ëè²ó \fBbc\fR ¤ò¸Æ¤Ó½Ð¤¹¤´¤È¤Ë
+½èÍý¤¹¤ë¡Öɸ½à¤Î¡×¥ª¥×¥·¥ç¥ó¤ä¥Õ¥¡¥¤¥ë¤òÀßÄê¤Ç¤­¤Þ¤¹¡£¤³¤Î´Ä¶­ÊÑ¿ô¤Ç
+»ØÄꤹ¤ë¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢\fBbc\fR ¤òÁö¤é¤»¤ë¤¿¤Ó¤ËÄêµÁ¤·¤Æ¤ª¤­¤¿¤¤¤è¤¦¤Ê
+´Ø¿ô¤ÎÄêµÁ¤ò½ñ¤¤¤Æ¤ª¤¯¤È¤è¤¤¤Ç¤·¤ç¤¦¡£
+.IP "BC_LINE_LENGTH"
+¿ô»ú¤ò½ÐÎϤ¹¤ë¤È¤­¤Î 1 ¹Ô¤Îʸ»ú¿ô¤òÀ°¿ô¤Ç»ØÄꤷ¤Þ¤¹¡£
+¿ô»ú¤¬Ä¹²á¤®¤ë¤È¡¢¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤È²þ¹Ô¤ò´Þ¤á¤¿½ÐÎϤȤʤê¤Þ¤¹¡£
.SH ´ØÏ¢¥Õ¥¡¥¤¥ë
-¤Û¤È¤ó¤É¤Î¼ÂÁõ¤Ç¤Ï¡¢\fBbc\fR ¤Ï´°Á´¤Ë¼«Ê¬¼«¿È¤ÇÆÈΩ¤·¤Æ¤¤¤Þ¤¹¡£
+¤Û¤È¤ó¤É¤Î¼ÂÁõ¤Ç¤Ï¡¢\fBbc\fR ¤Ï´°Á´¤Ë¼«¸Ê´°·ë¤·¤Æ¤¤¤Þ¤¹¡£
¼Â¹Ô¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤¬½ÅÍ׻뤵¤ì¤ë¾ì¹ç¤ä¡¢
C ¥³¥ó¥Ñ¥¤¥é¤¬Ä¹¤¤Ê¸»úÎó¤ò°·¤¨¤Ê¤¤¾ì¹ç¤Ï¡¢
\fBbc\fR ¤Ï /usr/local/lib/libmath.b ¤«¤éɸ½à¤Î¿ô³Ø¥é¥¤¥Ö¥é¥ê¤òÆÉ¤ß¹þ¤ß¤Þ¤¹¡£
@@ -728,6 +775,11 @@ C ¥³¥ó¥Ñ¥¤¥é¤¬Ä¹¤¤Ê¸»úÎó¤ò°·¤¨¤Ê¤¤¾ì¹ç¤Ï¡¢
¤½¤ì¤é¤Ï¼«¿È¤ÇÍý²ò¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤Ï¤º¤Ç¤¹¡£
.SH ¥Ð¥°
¥¨¥é¡¼¥ê¥«¥Ð¥ê¤¬¤Þ¤À¤¦¤Þ¤¯¤¤¤Ã¤Æ¤¤¤Þ¤»¤ó¡£
+.PP
+¥Ð¥°Êó¹ð¤Ï¡¢
+.BR bug-gnu-utils@prep.ai.mit.edu
+¤ËÅŻҥ᡼¥ë¤Ç¤ª´ê¤¤¤·¤Þ¤¹¡£
+ñ¸ì ``bc'' ¤ò ``Subject:'' ¥Õ¥£¡¼¥ë¥É¤Î¤É¤³¤«¤ËÆþ¤ì¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£
.SH ºî¼Ô
.nf
Philip A. Nelson
diff --git a/ja/man/man1/biff.1 b/ja/man/man1/biff.1
index c6a1865bdb..090d031f6c 100644
--- a/ja/man/man1/biff.1
+++ b/ja/man/man1/biff.1
@@ -30,8 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)biff.1 6.5 (Berkeley) 3/14/91
+.\" %Id: biff.1,v 1.5 1997/06/23 06:45:37 charnier Exp %
+.\"
.\" jpman %Id: biff.1,v 1.2 1997/04/01 07:08:32 mutoh Stab %
-.\" %Id: biff.1,v 1.2.2.1 1997/06/24 06:43:41 charnier Exp %
.\"
.Dd June 6, 1993
.Dt BIFF 1
diff --git a/ja/man/man1/c89.1 b/ja/man/man1/c89.1
index 6498209396..6c092e825e 100644
--- a/ja/man/man1/c89.1
+++ b/ja/man/man1/c89.1
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: c89.1,v 1.2.2.2 1998/01/12 06:21:14 obrien Exp %
+.\" %Id: c89.1,v 1.2 1997/09/18 20:55:48 joerg Exp %
.\" "
.Dd September 17, 1997
.Os
diff --git a/ja/man/man1/cap_mkdb.1 b/ja/man/man1/cap_mkdb.1
index b477d0cc07..d54147e693 100644
--- a/ja/man/man1/cap_mkdb.1
+++ b/ja/man/man1/cap_mkdb.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)cap_mkdb.1 5.4 (Berkeley) 3/6/93
-.\" %Id: cap_mkdb.1,v 1.2.2.1 1997/09/14 20:39:28 jkh Exp %
+.\" %Id: cap_mkdb.1,v 1.5 1997/06/23 04:02:49 steve Exp %
.\" jpman %Id: cap_mkdb.1,v 1.2 1997/05/17 15:50:47 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/cat.1 b/ja/man/man1/cat.1
index dec6797228..d8bedb689e 100644
--- a/ja/man/man1/cat.1
+++ b/ja/man/man1/cat.1
@@ -33,8 +33,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cat.1 8.3 (Berkeley) 5/2/95
+.\" %Id: cat.1,v 1.8 1998/05/13 07:16:36 charnier Exp %
+.\"
.\" jpman %Id: cat.1,v 1.3 1997/08/31 14:09:30 horikawa Stab %
-.\" %Id: cat.1,v 1.3.2.3 1998/07/15 02:01:01 jkh Exp %
.\"
.Dd May 2, 1995
.Dt CAT 1
diff --git a/ja/man/man1/catman.1 b/ja/man/man1/catman.1
index ee2d849caa..562e6d7d77 100644
--- a/ja/man/man1/catman.1
+++ b/ja/man/man1/catman.1
@@ -24,7 +24,7 @@
.\"
.\" /usr/bin/catman - preformat man pages
.\"
-.\" %Id: catman.1,v 1.8.2.2 1998/02/15 16:05:21 jkh Exp %
+.\" %Id: catman.1,v 1.15 1998/03/31 06:52:28 charnier Exp %
.\" jpman %Id: catman.1,v 1.3 1997/04/01 14:14:59 horikawa Stab %
.Dd Mar 12, 1995
.Dt CATMAN 1
@@ -96,14 +96,8 @@ man ·Á¼°¤Î̵¤¤ cat ·Á¼°¡¢
.Pp
²¿¤¬¹Ô¤ï¤ì¤ë¤«¤òɽ¼¨¤¹¤ë¤À¤±¤Ç¤¹¡£
.Sh ´ØÏ¢¥Õ¥¡¥¤¥ë
-.Bl -tag -width /etc/weeklyxxx -compact
-.Pa /etc/weekly
+.Pa /etc/periodic/weekly/330.catman
¤³¤Î¥×¥í¥°¥é¥à¤òµ¯Æ°¤·¤Þ¤¹
-.Po
-¤Þ¤¿¤Ï
-.Pa /etc/daily
-.Pc
-.El
.Sh ÆÃħ
´û¤ËÁ´¤Æ¤Î¥Þ¥Ë¥å¥¢¥ë¤¬¥Õ¥©¡¼¥Þ¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
ưºî¤¬Èó¾ï¤Ë®¤¯¤Ê¤ê¤Þ¤¹¡£
diff --git a/ja/man/man1/cd.1 b/ja/man/man1/cd.1
index d9b54041ee..5a46e0dc8a 100644
--- a/ja/man/man1/cd.1
+++ b/ja/man/man1/cd.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cd.1 8.1 (Berkeley) 6/5/93
-.\" %Id: cd.1,v 1.1.1.1.8.1 1997/03/07 04:17:49 mpp Exp %
+.\" %Id: cd.1,v 1.2 1997/03/07 03:27:49 jmg Exp %
.\" jpman %Id: cd.1,v 1.2 1997/03/26 14:56:29 horikawa Stab %
.\"
.Dd June 5, 1993
diff --git a/ja/man/man1/cdcontrol.1 b/ja/man/man1/cdcontrol.1
index 918f635f2e..d8d36a2932 100644
--- a/ja/man/man1/cdcontrol.1
+++ b/ja/man/man1/cdcontrol.1
@@ -1,4 +1,4 @@
-.\" %Id: cdcontrol.1,v 1.8.2.5 1998/06/13 19:30:22 steve Exp %
+.\" %Id: cdcontrol.1,v 1.16 1998/06/13 19:28:51 steve Exp %
.\" jpman %Id: cdcontrol.1,v 1.3 1997/07/22 09:20:03 mutoh Stab %
.\"
.Dd July 3, 1995
diff --git a/ja/man/man1/checknr.1 b/ja/man/man1/checknr.1
index 170e020daf..789d740aec 100644
--- a/ja/man/man1/checknr.1
+++ b/ja/man/man1/checknr.1
@@ -86,7 +86,7 @@
.It
\esx ... \es0 ¤ò»È¤Ã¤¿¥µ¥¤¥º¤ÎÊѹ¹¡£
.It
- .TS ¤È .TE¥Þ¥¯¥í¤Î¤è¤¦¤Ë¤¤¤Ä¤â¥Ú¥¢¤Ç»È¤ï¤ì¤ë¡¢
+\&.TS ¤È .TE¥Þ¥¯¥í¤Î¤è¤¦¤Ë¤¤¤Ä¤â¥Ú¥¢¤Ç»È¤ï¤ì¤ë¡¢
``³«»Ï...½ªÎ»''·Á¼°¤Î¥Þ¥¯¥í¡£
.El
.Pp
diff --git a/ja/man/man1/chflags.1 b/ja/man/man1/chflags.1
index 737ebd82c1..01dd987399 100644
--- a/ja/man/man1/chflags.1
+++ b/ja/man/man1/chflags.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)chflags.1 8.2 (Berkeley) 3/31/94
-.\" %Id: chflags.1,v 1.2.6.3 1997/06/29 08:48:52 julian Exp %
+.\" %Id: chflags.1,v 1.6 1997/06/24 06:57:11 charnier Exp %
.\" jpman %Id: chflags.1,v 1.3 1997/06/18 14:15:48 jsakai Stab %
.\"
.Dd March 31, 1994
diff --git a/ja/man/man1/chio.1 b/ja/man/man1/chio.1
index 6e578a09c0..25db855e78 100644
--- a/ja/man/man1/chio.1
+++ b/ja/man/man1/chio.1
@@ -30,7 +30,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: chio.1,v 1.1.1.1.2.3 1998/07/15 02:01:03 jkh Exp %
+.\" %Id: chio.1,v 1.6 1998/06/04 21:05:19 steve Exp %
.\"
.\" jpman %Id: chio.1,v 1.3 1997/08/31 14:04:42 horikawa Stab %
.Dd April 2, 1996
diff --git a/ja/man/man1/chmod.1 b/ja/man/man1/chmod.1
index a39d4dc92f..46d6dda687 100644
--- a/ja/man/man1/chmod.1
+++ b/ja/man/man1/chmod.1
@@ -33,8 +33,8 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)chmod.1 8.4 (Berkeley) 3/31/94
+.\" %Id: chmod.1,v 1.10 1998/05/19 06:24:50 jkoshy Exp %
.\" jpman %Id: chmod.1,v 1.2 1997/04/01 01:37:14 mutoh Stab %
-.\" %Id: chmod.1,v 1.4.2.4 1998/07/15 02:01:04 jkh Exp %
.\"
.Dd March 31, 1994
.Dt CHMOD 1
diff --git a/ja/man/man1/chpass.1 b/ja/man/man1/chpass.1
index 6411012672..5a37790750 100644
--- a/ja/man/man1/chpass.1
+++ b/ja/man/man1/chpass.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)chpass.1 8.2 (Berkeley) 12/30/93
-.\" %Id: chpass.1,v 1.7.2.4 1998/08/14 03:38:01 thepish Exp %
+.\" %Id: chpass.1,v 1.11 1998/08/14 03:47:38 thepish Exp %
.\" jpman %Id: chpass.1,v 1.2 1997/03/31 14:06:36 horikawa Stab %
.\"
.Dd December 30, 1993
diff --git a/ja/man/man1/ci.1 b/ja/man/man1/ci.1
index eb08f520d0..1b8c1b0532 100644
--- a/ja/man/man1/ci.1
+++ b/ja/man/man1/ci.1
@@ -2,7 +2,7 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id %Id: ci.1,v 1.3 1996/02/12 04:56:44 mpp Exp %
+.Id %Id: ci.1,v 1.5 1997/02/22 15:47:18 peter Exp %
.ds i \&\s-1ISO\s0
.ds r \&\s-1RCS\s0
.ds u \&\s-1UTC\s0
diff --git a/ja/man/man1/cksum.1 b/ja/man/man1/cksum.1
index 8e0f6ac345..d868b2cbca 100644
--- a/ja/man/man1/cksum.1
+++ b/ja/man/man1/cksum.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cksum.1 8.2 (Berkeley) 4/28/95
-.\" %Id: cksum.1,v 1.1.1.1.8.6 1997/11/09 16:11:13 obrien Exp %
+.\" %Id: cksum.1,v 1.7 1997/11/09 16:08:11 obrien Exp %
.\" jpman %Id: cksum.1,v 1.4 1997/08/10 18:27:42 horikawa Stab %
.\"
.Dd April 28, 1995
diff --git a/ja/man/man1/cmp.1 b/ja/man/man1/cmp.1
index 8f5ad873ad..0e4c9e1c90 100644
--- a/ja/man/man1/cmp.1
+++ b/ja/man/man1/cmp.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cmp.1 8.1 (Berkeley) 6/6/93
-.\" %Id: cmp.1,v 1.2.2.2 1998/05/26 00:40:10 steve Exp %
+.\" %Id: cmp.1,v 1.6 1998/05/26 00:39:12 steve Exp %
.\" jpman %Id: cmp.1,v 1.2 1997/03/26 15:40:44 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/co.1 b/ja/man/man1/co.1
index 0e4b4e8b6f..942e1564b0 100644
--- a/ja/man/man1/co.1
+++ b/ja/man/man1/co.1
@@ -3,7 +3,7 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id %Id: co.1,v 1.3 1995/10/28 21:49:11 peter Exp %
+.Id %Id: co.1,v 1.5 1997/02/22 15:47:21 peter Exp %
.ds i \&\s-1ISO\s0
.ds r \&\s-1RCS\s0
.ds u \&\s-1UTC\s0
diff --git a/ja/man/man1/colldef.1 b/ja/man/man1/colldef.1
index 166fc91663..53e337957c 100644
--- a/ja/man/man1/colldef.1
+++ b/ja/man/man1/colldef.1
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: colldef.1,v 1.3.2.2 1997/06/27 06:19:42 charnier Exp %
+.\" %Id: colldef.1,v 1.5 1997/06/26 11:25:16 charnier Exp %
.\"
.\" jpman %Id: colldef.1,v 1.3 1997/09/04 16:33:17 horikawa Stab %
.\"
diff --git a/ja/man/man1/comm.1 b/ja/man/man1/comm.1
index 5c946239fe..d8e0ba045a 100644
--- a/ja/man/man1/comm.1
+++ b/ja/man/man1/comm.1
@@ -35,7 +35,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)comm.1 8.1 (Berkeley) 6/6/93
-.\" %Id: comm.1,v 1.1.1.1.8.2 1997/09/14 23:20:44 jkh Exp %
+.\" %Id: comm.1,v 1.3 1997/09/07 15:09:17 joerg Exp %
.\" jpman %Id: comm.1,v 1.3 1997/11/11 13:58:57 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/compile_et.1 b/ja/man/man1/compile_et.1
index 47dfd45055..716db23909 100644
--- a/ja/man/man1/compile_et.1
+++ b/ja/man/man1/compile_et.1
@@ -1,7 +1,7 @@
.\" Copyright (c) 1988 Massachusetts Institute of Technology,
.\" Student Information Processing Board. All rights reserved.
.\"
-.\" %Header: /home/ncvs/src/usr.bin/compile_et/compile_et.1,v 1.1.6.2 1997/09/14 23:21:48 jkh Exp %
+.\" %Header: /home/ncvs/src/usr.bin/compile_et/compile_et.1,v 1.2 1997/06/30 06:42:38 charnier Exp %
.\"
.\" jpman %Id: compile_et.1,v 1.3 1997/08/20 12:20:14 horikawa Stab %
.Dd November 22, 1988
diff --git a/ja/man/man1/cp.1 b/ja/man/man1/cp.1
index 043a5590a5..4ab9ba549a 100644
--- a/ja/man/man1/cp.1
+++ b/ja/man/man1/cp.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cp.1 8.3 (Berkeley) 4/18/94
-.\" %Id: cp.1,v 1.6.2.2 1998/07/15 02:01:05 jkh Exp %
+.\" %Id: cp.1,v 1.10 1998/05/06 06:50:19 charnier Exp %
.\" jpman %Id: cp.1,v 1.2 1997/03/26 15:42:56 horikawa Stab %
.\"
.Dd April 18, 1994
diff --git a/ja/man/man1/crontab.1 b/ja/man/man1/crontab.1
index 9dd3c9506a..d2b0fa4cb1 100644
--- a/ja/man/man1/crontab.1
+++ b/ja/man/man1/crontab.1
@@ -15,7 +15,7 @@
.\" * Paul Vixie <paul@vix.com> uunet!decwrl!vixie!paul
.\" */
.\"
-.\" %Id: crontab.1,v 1.1.1.1.8.2 1998/07/18 11:09:14 jkh Exp %
+.\" %Id: crontab.1,v 1.5 1998/03/23 08:21:29 charnier Exp %
.\" jpman %Id: crontab.1,v 1.2 1997/04/18 06:38:25 yugawa Stab %
.\"
.Dd December 29, 1993
diff --git a/ja/man/man1/csh.1 b/ja/man/man1/csh.1
index dcd54f50d8..01260d26d1 100644
--- a/ja/man/man1/csh.1
+++ b/ja/man/man1/csh.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)csh.1 8.2 (Berkeley) 1/21/94
-.\" %Id: csh.1,v 1.5.2.3 1998/07/15 02:01:07 jkh Exp %
+.\" %Id: csh.1,v 1.11 1998/07/27 21:31:19 nectar Exp %
.\" jpman %Id: csh.1,v 1.2 1997/04/08 00:35:51 h-nokubi Stab %
.\"
.\" Japanese translation for jpman-0.2 checked by jpman project 96.12.23
@@ -553,7 +553,7 @@ Substitute
ľÁ°¤Î½¤¾þ»Ò¤ÎºîÍѤò·«¤êÊÖ¤·¤Þ¤¹¡£
.It g
¾åµ­¤Î½¤¾þ»Ò¤ÎľÁ°¤ËÃÖ¤­¡¢Êѹ¹¤ò¡¢³ÆÃ±¸ì¤Ë 1 ²ó¤À¤±µÚ¤Ü¤¹¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£
- Îã) `g&'
+Îã) `g&'
.It a
¾åµ­¤Î½¤¾þ»Ò¤ÎľÁ°¤ËÃÖ¤­¡¢1 ¤Ä¤Îñ¸ì¤ËÂФ·¤Æ²Äǽ¤Ê¸Â¤ê·«¤êÊÖ¤·¤Æ
Êѹ¹¤ò¹Ô¤¤¤Þ¤¹¡£Êѹ¹¤¬Á´Ã±¸ì¤ËµÚ¤Ö¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï `g' ¤ÈÁȤ߹ç¤ï¤»¤Æ»È¤¤¤Þ¤¹¡£
@@ -1466,6 +1466,17 @@ goto label ¤¬¼Â¹Ô¤µ¤ì¤ë¤è¤¦¤ËÀßÄꤷ¤Þ¤¹¡£
ÈÖÌܤÎÍ×ÁǤ¬¼Î¤Æ¤é¤ì¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥È¥ê¡¦¥¹¥¿¥Ã¥¯¤ÎÍ×ÁǤϡ¢
¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤«¤é 0 ¤«¤é½ç¤ËÈֹ椬¤Ä¤±¤é¤ì¤Þ¤¹¡£
.Pp
+.It Ic printf Ar format-string values
+.Ar format-string
+¤È
+.Ar values
+¤òɾ²Á¤·¤¿¸å¡¢ÁȤ߹þ¤ßÈǤÎ
+.Ic printf
+¤òµ¯Æ°¤·¤Þ¤¹¡£
+¾ÜºÙ¤Ï¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸
+.Xr printf 1
+¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+.Pp
.It Ic pushd
.It Ic pushd Ar name
.It Ic pushd Ar n
@@ -1932,7 +1943,7 @@ path ÊÑ¿ô¤Î³ÆÃ±¸ì¤Ï¡¢¥³¥Þ¥ó¥É¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤Ù¤­¥Ç¥£¥ì¥¯¥È¥ê̾¤òɽ¤·¤Þ¤¹¡£
ÊÑ¿ô¤¬ÀßÄꤵ¤ì¤Æ
¤¤¤Ê¤¤¾ì¹ç¡¢¥Õ¥ë¥Ñ¥¹»ØÄê¤Ë¤è¤ë¥³¥Þ¥ó¥É¼Â¹Ô¤Î¤ß¤¬²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£
Ä̾ï¤Î¸¡º÷¥Ñ¥¹¤Ï
- `.', `/bin', `/usr/bin' ¤Ç¤¹¡£¤·¤«¤·¡¢¤³¤ì¤é¤ÎÃͤϥ·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹¡£
+`.', `/bin', `/usr/bin' ¤Ç¤¹¡£¤·¤«¤·¡¢¤³¤ì¤é¤ÎÃͤϥ·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹¡£
¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Î¥Ç¥Õ¥©¥ë¥È¤Î¸¡º÷¥Ñ¥¹¤Ï `/etc', `/bin', `/usr/bin' ¤Ç¤¹¡£
.Fl c
¥ª¥×¥·¥ç¥ó¤â
@@ -2118,6 +2129,7 @@ Cornell University
¥³¥Þ¥ó¥ÉÃÖ´¹¤Î·ë²Ì¤Ï¡¢°ú¿ô¥ê¥¹¥È¤ÈƱ¿ô¤ÎÀ©¸Â¤¬¤¢¤ê¤Þ¤¹¡£
¥ë¡¼¥×¸¡½Ð¤Î¤¿¤á¡¢1 ¹Ô¤ËÂФ¹¤ë¥¨¥¤¥ê¥¢¥¹Å¸³«¤Ï 20 ²ó¤Þ¤Ç¤ËÀ©¸Â¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
.Sh ´ØÏ¢¹àÌÜ
+.Xr printf 1 ,
.Xr sh 1 ,
.Xr su 1 ,
.Xr access 2 ,
diff --git a/ja/man/man1/ctm.1 b/ja/man/man1/ctm.1
index 73aaaf0219..d48c222fe5 100644
--- a/ja/man/man1/ctm.1
+++ b/ja/man/man1/ctm.1
@@ -10,7 +10,7 @@
.\"
.\" CTM and ctm(1) by <phk@login.dknet.dk>
.\"
-.\" %Id: ctm.1,v 1.9.2.3 1998/07/18 11:09:42 jkh Exp %
+.\" %Id: ctm.1,v 1.14 1998/04/20 20:57:16 rnordier Exp %
.\" jpman %Id: ctm.1,v 1.3 1997/09/27 16:26:57 ryo2 Stab %
.\"
.Dd Mar 25, 1995
diff --git a/ja/man/man1/ctm_rmail.1 b/ja/man/man1/ctm_rmail.1
index 4628f5f164..17e1f8d2ba 100644
--- a/ja/man/man1/ctm_rmail.1
+++ b/ja/man/man1/ctm_rmail.1
@@ -497,6 +497,6 @@ Stephen McKay <mckay@FreeBSD.org>
.\" Gosh! No bugs here!
.\" This message brought to you by the Coalition for More Humour in Man Pages.
.\"
-.\" %Id: ctm_rmail.1,v 1.7.2.4 1998/07/18 11:09:52 jkh Exp %
+.\" %Id: ctm_rmail.1,v 1.14 1998/04/08 12:00:48 cracauer Exp %
.Sh ÆüËܸìÌõ
Ìî¼ó ´²¹â(h-nokubi@nmit.mt.nec.co.jp): FreeBSD ÍѤËËÝÌõ
diff --git a/ja/man/man1/cu.1 b/ja/man/man1/cu.1
index 9122d5e51b..70f9b3c0d0 100644
--- a/ja/man/man1/cu.1
+++ b/ja/man/man1/cu.1
@@ -1,4 +1,4 @@
-''' %Id: cu.1,v 1.1 1993/08/04 19:31:53 jtc Exp %
+''' %Id: cu.1,v 1.6 1997/02/22 15:27:05 peter Exp %
.\" jpman %Id: cu.1,v 1.2 1997/03/28 10:54:42 mutoh Stab %
.TH cu 1 "Taylor UUCP 1.06"
.SH ̾¾Î
diff --git a/ja/man/man1/date.1 b/ja/man/man1/date.1
index 69d8e28470..a5b4d7c256 100644
--- a/ja/man/man1/date.1
+++ b/ja/man/man1/date.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)date.1 8.2 (Berkeley) 11/17/93
-.\" %Id: date.1,v 1.8.2.9 1998/07/15 02:01:17 jkh Exp %
+.\" %Id: date.1,v 1.25 1998/05/13 07:56:44 phk Exp %
.\" jpman %Id: date.1,v 1.2 1997/03/31 23:25:55 mutoh Stab %
.\"
.Dd November 17, 1993
diff --git a/ja/man/man1/dc.1 b/ja/man/man1/dc.1
index ff057edc36..10ee296b9b 100644
--- a/ja/man/man1/dc.1
+++ b/ja/man/man1/dc.1
@@ -1,32 +1,52 @@
-.TH DC 1 "07 Apr 1994" "GNU Project"
+.\"
+.\" dc.1 - the *roff document processor source for the dc manual
+.\"
+.\" This file is part of GNU dc.
+.\" Copyright (C) 1994, 1997 Free Software Foundation, Inc.
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License , or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; see the file COPYING. If not, write to
+.\" the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+.\"
.\" jpman %Id: dc.1,v 1.4 1997/07/26 21:29:52 horikawa Stab %
+.\"
+.TH DC 1 "1997-03-25" "GNU Project"
.ds dc \fIdc\fP
.ds Dc \fIDc\fP
.SH ̾¾Î
dc \- Ǥ°ÕÀºÅ٤η׻»µ¡
.SH ½ñ¼°
dc
-.SH
-²òÀâ
+.SH ²òÀâ
.PP
\*(dc ¤Ï¡¢µÕ¥Ý¡¼¥é¥ó¥É·Á¼°¤Î̵¸ÂÀºÅ٤η׻»¤¬¹Ô¤¨¤ëÂî¾å·×»»µ¡¤Ç¤¹¡£
¤³¤ÎÅÅÂî¤Ï¡¢ÄêµÁ¤ä¥Þ¥¯¥í¸Æ¤Ó½Ð¤·¤â¹Ô¤¨¤Þ¤¹¡£
-ÉáÄÌ¡¢ \*(dc ¤Ïɸ½àÆþÎϤ«¤éÆÉ¤ß¹þ¤ß¤Þ¤¹¡£
+ÉáÄÌ¡¢\*(dc ¤Ïɸ½àÆþÎϤ«¤éÆÉ¤ß¹þ¤ß¤Þ¤¹¡£
¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤¬Í¿¤¨¤é¤ì¤¿»þ¤Ï¡¢¤½¤ì¤Ï¥Õ¥¡¥¤¥ë̾¤È¤Ê¤ê¡¢
\*(dc ¤Ï¤½¤Î¥Õ¥¡¥¤¥ë¤òÆÉ¤ß¹þ¤ß¡¢¥Õ¥¡¥¤¥ë¤ÎÆâÍÆ¤ò¼Â¹Ô¤·¤¿¸å¤Ç¡¢
ɸ½àÆþÎϤ«¤éÆþÎϤò¼è¤ê¤Þ¤¹¡£
-Á´¤Æ¤ÎÀµ¾ï¤Ê½ÐÎϤÏɸ½à½ÐÎϤØÁ÷¤é¤ì¤Þ¤¹¡£
-Á´¤Æ¤Î¥¨¥é¡¼½ÐÎϤÏɸ½à½ÐÎϤØÁ÷¤é¤ì¤Þ¤¹¡£
+Ä̾ï¤Î½ÐÎϤϤ¹¤Ù¤ÆÉ¸½à½ÐÎϤء¢¥¨¥é¡¼½ÐÎϤϤ¹¤Ù¤ÆÉ¸½à¥¨¥é¡¼½ÐÎϤØ
+Á÷¤é¤ì¤Þ¤¹¡£
.PP
µÕ¥Ý¡¼¥é¥ó¥Éµ­Ë¡·×»»µ¡¤Ï¡¢¿ô¤ò¥¹¥¿¥Ã¥¯¤ËÊݸ¤·¤Þ¤¹¡£
¿ô»ú¤òÆþÎϤ¹¤ë¤È¡¢¤½¤ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤ߾夲¤Þ¤¹¡£
·×»»Áàºî¤Ï¡¢°ú¿ô¤ò¥¹¥¿¥Ã¥¯¤«¤é¼è¤ê½Ð¤·¡¢·ë²Ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤ߾夲¤Þ¤¹¡£
.PP
¿ô»ú¤ò
-.IR dc
+.IR dc
¤ËÆþÎϤ¹¤ë¤¿¤á¤Ë¤Ï¡¢¿ô»ú (¾®¿ôÅÀ¤¬Í­¤Ã¤Æ¤â¹½¤¤¤Þ¤»¤ó) ¤òÆþÎϤ·¤Þ¤¹¡£
»Ø¿ôɽ¸½¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-Éé¤Î¿ô»ú¤òÆþÎϤ¹¤ë¤¿¤á¤Ë¤Ï¡¢ ``_'' ¤Ç»Ï¤Þ¤ë¿ô»ú¤òÆþÎϤ·¤Þ¤¹¡£
+Éé¤Î¿ô»ú¤òÆþÎϤ¹¤ë¤¿¤á¤Ë¤Ï¡¢``_'' ¤Ç»Ï¤Þ¤ë¿ô»ú¤òÆþÎϤ·¤Þ¤¹¡£
``-'' ¤Ï¸º»»¤ÎÆó¹à±é»»»Ò¤È¤·¤Æ»È¤ï¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
¤³¤Î¤¿¤á¤ËÍøÍѤ¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
°ú¤­Â³¤¤¤Æ 2 ¤Ä¤Î¿ô»ú¤òÆþÎϤ¹¤ë¤¿¤á¤Ë¤Ï¡¢¤¢¤¤¤À¤Ë¶õÇòʸ»ú¤«²þ¹Ôʸ»ú¤ò
@@ -47,7 +67,7 @@ dc
.B f
Êѹ¹¤¹¤ë¤³¤È¤Ê¤¯¡¢
.ig
-Á´¤Æ¤Î¥ì¥¸¥¹¥¿¤ÎÆâÍÆ¤È
+¤¹¤Ù¤Æ¤Î¥ì¥¸¥¹¥¿¤ÎÆâÍÆ¤È
..
¥¹¥¿¥Ã¥¯¤ÎÆâÍÆÁ´Éô¤òɽ¼¨¤·¤Þ¤¹¡£
¤³¤ì¤Ï¡¢Ëº¤ì¤Æ¤·¤Þ¤Ã¤¿»þ¤Ë»È¤Ã¤¿¤ê¡¢¤¢¤ë¥³¥Þ¥ó¥É¤¬¤É¤Î¤è¤¦¤Ê¸ú²Ì¤ò
@@ -57,45 +77,63 @@ dc
·×»»
.TP
.B +
-Æó¤Ä¤ÎÃͤò¥¹¥¿¥Ã¥¯¤«¤é¼è¤ê½Ð¤·¡¢²Ã»»¤ò¹Ô¤¤¡¢·ë²Ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
+2 ¤Ä¤ÎÃͤò¥¹¥¿¥Ã¥¯¤«¤é¼è¤ê½Ð¤·¡¢²Ã»»¤ò¹Ô¤¤¡¢·ë²Ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
·ë²Ì¤ÎÀºÅ٤ϡ¢°ú¿ô¤ÎÃͤˤÀ¤±¤Ë¤è¤Ã¤Æ·è¤Þ¤ê¡¢½½Ê¬Àµ³Î¤Ç¤¹¡£
.TP
.B -
-Æó¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢ºÇ½é¤Ë¼è¤ê½Ð¤·¤¿Ãͤò 2 ÈÖÌܤ˼è¤ê½Ð¤·¤¿Ãͤ«¤é
+2 ¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢ºÇ½é¤Ë¼è¤ê½Ð¤·¤¿Ãͤò 2 ÈÖÌܤ˼è¤ê½Ð¤·¤¿Ãͤ«¤é
°ú¤­¤Þ¤¹¡£¤½¤Î¸å¡¢·ë²Ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
.TP
.B *
-Æó¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢¤«¤±»»¤ò¹Ô¤¤¡¢·ë²Ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
-·ë²Ì¤Î¾®¿ô¤Î·å¿ô¤Ï¡¢¸½ºß¤ÎÀºÅÙÃÍ ( °Ê²¼»²¾È ) ¤Ë¤è¤Ã¤ÆÀ©¸æ¤µ¤ì¡¢
+2 ¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢¤«¤±»»¤ò¹Ô¤¤¡¢·ë²Ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
+·ë²Ì¤Î¾®¿ô¤Î·å¿ô¤Ï¡¢¸½ºß¤ÎÀºÅÙÃÍ (°Ê²¼»²¾È) ¤Ë¤è¤Ã¤ÆÀ©¸æ¤µ¤ì¡¢
¤«¤±»»¤ò¹Ô¤Ã¤¿Ãͤˤϰ͸¤·¤Þ¤»¤ó¡£
.TP
.B /
-Æó¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢ºÇ½é¤Ë¼è¤ê½Ð¤·¤¿Ãͤò 2 ÈÖÌܤ˼è¤ê½Ð¤·¤¿Ãͤdzä¤ê¡¢
+2 ¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢2 ÈÖÌܤ˼è¤ê½Ð¤·¤¿ÃͤòºÇ½é¤Ë¼è¤ê½Ð¤·¤¿Ãͤdzä¤ê¡¢
·ë²Ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
¾®¿ô¤Î·å¿ô¤Ï¡¢ÀºÅÙÃͤˤè¤Ã¤Æ»ØÄꤵ¤ì¤Þ¤¹¡£
.TP
.B %
-Æó¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢
+2 ¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢
.B /
¤Ç·×»»¤µ¤ì¤¿³ä»»¤Î;¤ê¤ò·×»»¤·¡¢·ë²Ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
³ä»»¤Ï¡¢ÀºÅÙÃͤǻØÄꤵ¤ì¤¿¾®¿ô¤Î·å¿ô¤Ç¹Ô¤ï¤ì¡¢
;¤ê¤âƱ¤¸¾®¿ô¤Î·å¿ô¤Ç·×»»¤µ¤ì¤Þ¤¹¡£
.TP
+.B ~
+2 ¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢2 ÈÖÌܤ˼è¤ê½Ð¤·¤¿ÃͤòºÇ½é¤Ë¼è¤ê½Ð¤·¤¿Ãͤdzä¤ê¡¢
+¤½¤Î¾¦¤òÀè¤Ë¥¹¥¿¥Ã¥¯¤ËÀѤߡ¢Â³¤¤¤ÆÍ¾¤ê¤òÀѤߤޤ¹¡£
+³ä»»¤Ë»È¤ï¤ì¤ë¾®¿ô¤Î·å¿ô¤Ï¡¢ÀºÅÙÃͤˤè¤Ã¤Æ»ØÄꤵ¤ì¤Þ¤¹¡£
+(¥¨¥é¡¼¥Á¥§¥Ã¥¯µ¡¹½¤Ï¤ï¤º¤«¤Ë°Û¤Ê¤ê¤Þ¤¹¤¬¡¢Ê¸»úÎó \fBSdSn lnld/ LnLd%\fP
+¤â¤³¤Îµ¡Ç½¤ÈƱÍÍ¤ËÆ¯¤¯¤Ç¤·¤ç¤¦¡£)
+.TP
.B ^
-Æó¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢ºÇ½é¤Ë¼è¤ê½Ð¤·¤¿Ãͤò»Ø¿ô¤È¤·¡¢
+2 ¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢ºÇ½é¤Ë¼è¤ê½Ð¤·¤¿Ãͤò»Ø¿ô¤È¤·¡¢
2 ¤Ä¤á¤ÎÃͤòÄì¤È¤·¤Æ»Ø¿ô·×»»¤·¤Þ¤¹¡£
»Ø¿ô¤Î¾®¿ôÅÀ°Ê²¼¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
ÀºÅÙÃͤϡ¢·ë²Ì¤Î¾®¿ô¤Î·å¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
.TP
+.B |
+3 ¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢¤Ù¤­¾ê; (modular exponentiation) ¤ò·×»»¤·¤Þ¤¹¡£
+ºÇ½é¤Ë¼è¤ê½Ð¤·¤¿ÃͤÏË¡ (reduction modulus) (¤³¤ÎÃÍ¤Ï 0 °Ê³°¤ÎÀ°¿ô¤Ç
+¤Ê¤¯¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£) ¡¢2 ÈÖÌܤ˼è¤ê½Ð¤·¤¿Ãͤϻؿô (¤³¤ÎÃͤÏ
+ÈóÉé¤Î¿ô»ú¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤º¡¢¾®¿ôÅÀ°Ê²¼¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£)¡¢
+3 ÈÖÌܤ˼è¤ê½Ð¤·¤¿ÃͤÏÎ߾褵¤ì¤ëÄì¤È¤·¤ÆÍѤ¤¤é¤ì¤Þ¤¹¡£
+ÀºÅÙÃͤϡ¢·ë²Ì¤Î¾®¿ô¤Î·å¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
+¾®¤µ¤Ê¿ô»ú¤Ë´Ø¤·¤Æ¤Ï¡¢¤³¤Îµ¡Ç½¤Ïʸ»úÎó \fBSm lble^ Lm%\fP ¤Î¤è¤¦¤Ë
+Ư¤­¤Þ¤¹¡£¤·¤«¤·¡¢\fB^\fP ¤ò»È¤¦¾ì¹ç¤È°ã¤¤¡¢¤³¤Î¥³¥Þ¥ó¥É¤Ï»Ø¿ô¤¬
+Èó¾ï¤ËÂ礭¤¯¤Æ¤âƯ¤¯¤Ï¤º¤Ç¤¹¡£
+.TP
.B v
-°ì¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢¼«¾èº¬¤òµá¤á¡¢·ë²Ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
+1 ¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¡¢Ê¿Êýº¬¤òµá¤á¡¢·ë²Ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
ÀºÅÙÃͤϡ¢·ë²Ì¤Î¾®¿ô¤Î·å¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
.PP
-¤Û¤È¤ó¤É¤Î±é»»»Ò¤Ï¡¢ ``ÀºÅÙÃÍ'' ¤Ë±Æ¶Á¤ò¼õ¤±¤Þ¤¹¡£
-``ÀºÅÙÃÍ'' ¤Ï¡¢
+¤Û¤È¤ó¤É¤Î±é»»»Ò¤Ï¡¢``ÀºÅÙÃÍ'' ¤Ë±Æ¶Á¤ò¼õ¤±¤Þ¤¹¡£
+ÀºÅÙÃͤϡ¢
.B k
¥³¥Þ¥ó¥É¤ÇÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-¥Ç¥Õ¥©¥ë¥È¤ÎÀºÅÙÃͤϥ¼¥í¤Ç¤¹¡£¤³¤ì¤Ï¡¢Â­¤·»»¤È°ú¤­»»¤ò½ü¤¯Á´¤Æ¤Î»»½Ñ¤Ï
+¥Ç¥Õ¥©¥ë¥È¤ÎÀºÅÙÃÍ¤Ï 0 ¤Ç¤¹¡£¤³¤ì¤Ï¡¢Â­¤·»»¤È°ú¤­»»¤ò½ü¤¯¤¹¤Ù¤Æ¤Î»»½Ñ¤Ï
À°¿ôÃͤηë²Ì¤ò½Ð¤¹¤³¤È¤ò°ÕÌ£¤·¤Æ¤¤¤Þ¤¹¡£
.PP
¾ê;±é»»
@@ -111,17 +149,20 @@ dc
.TP
.B d
¥¹¥¿¥Ã¥¯ÀèÆ¬¤ÎÃͤòÊ£À½¤·¡¢¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
-¤·¤¿¤¬¤Ã¤Æ¡¢ ``4d*p'' ¤Ï 4 ¤Î¼«¾è¤ò·×»»¤·¡¢É½¼¨¤·¤Þ¤¹¡£
+¤·¤¿¤¬¤Ã¤Æ¡¢``4d*p'' ¤Ï 4 ¤Î¼«¾è¤ò·×»»¤·¡¢É½¼¨¤·¤Þ¤¹¡£
+.TP
+.B r
+¥¹¥¿¥Ã¥¯ÀèÆ¬¤ÎÃÍ¤È 2 ÈÖÌܤÎÃͤνçÈÖ¤òÆþ¤ì´¹¤¨¤Þ¤¹¡£(¸ò´¹¤·¤Þ¤¹¡£)
.SH
¥ì¥¸¥¹¥¿
.PP
\*(dc ¤Ï¡¢256 ¸Ä¤Î¥á¥â¥ê¥ì¥¸¥¹¥¿¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
-³Æ¥ì¥¸¥¹¥¿¤Ï¡¢°ìʸ»ú¤Î̾Á°¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
+³Æ¥ì¥¸¥¹¥¿¤Ï¡¢1 ʸ»ú¤Î̾Á°¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
¿ô»ú¤äʸ»úÎó¤ò¥ì¥¸¥¹¥¿¤ËÊݸ¤·¡¢¸å¤Ç¼è¤ê½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
.TP
.BI s r
¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤«¤éÃͤò¼è¤ê½Ð¤·¡¢¥ì¥¸¥¹¥¿
-.IR r
+.IR r
¤ËÊݸ¤·¤Þ¤¹¡£
.TP
.BI l r
@@ -129,33 +170,33 @@ dc
.I r
¤ÎÃͤòÊ£À½¤·¡¢¤½¤ì¤ò¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
¤³¤ì¤Ï¡¢
-.IR r
+.IR r
¤ÎÆâÍÆ¤òÊѹ¹¤·¤Þ¤»¤ó¡£
.PP
³Æ¥ì¥¸¥¹¥¿¤Ï¡¢¤½¤ì¼«¿È¤Î¥¹¥¿¥Ã¥¯¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
¸½ºß¤Î¥ì¥¸¥¹¥¿Ãͤϡ¢¥ì¥¸¥¹¥¿¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤Ç¤¹¡£
.TP
.BI S r
-( ¥á¥¤¥ó ) ¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤ÎÃͤò¼è¤ê½Ð¤·¡¢¥ì¥¸¥¹¥¿
-.IR r
+(¥á¥¤¥ó) ¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤ÎÃͤò¼è¤ê½Ð¤·¡¢¥ì¥¸¥¹¥¿
+.IR r
¤Î¥¹¥¿¥Ã¥¯¤Ë¤½¤ì¤òÀѤߤޤ¹¡£
¥ì¥¸¥¹¥¿¤Î°ÊÁ°¤ÎÃͤϡ¢¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
.TP
.BI L r
¥ì¥¸¥¹¥¿
-.IR r
+.IR r
¤Î¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤ÎÃͤò¼è¤ê½Ð¤·¡¢¤½¤ì¤ò¥á¥¤¥ó¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£
¥ì¥¸¥¹¥¿
-.IR r
+.IR r
¤Î¥¹¥¿¥Ã¥¯¤Ë¤¢¤Ã¤¿°ÊÁ°¤ÎÃͤ¬¤â¤·¤¢¤ì¤Ð¡¢
.BI l r
¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¥¢¥¯¥»¥¹²Äǽ¤È¤Ê¤ê¤Þ¤¹¡£
.ig
.PP
.B f
-¥³¥Þ¥ó¥É¤Ï¡¢Á´¤Æ¤ÎÆâÍÆ¤¬Êݸ¤µ¤ì¤Æ¤¤¤ë¥ì¥¸¥¹¥¿¤Î¥ê¥¹¥È¤ò¡¢
+¥³¥Þ¥ó¥É¤Ï¡¢¤¹¤Ù¤Æ¤ÎÆâÍÆ¤¬Êݸ¤µ¤ì¤Æ¤¤¤ë¥ì¥¸¥¹¥¿¤Î¥ê¥¹¥È¤ò¡¢
¤½¤ÎÆâÍÆ¤È¤â¤Ëɽ¼¨¤·¤Þ¤¹¡£
-³Æ¥ì¥¸¥¹¥¿¤Î¸½ºß¤ÎÆâÍÆ ( ¤Ä¤Þ¤ê¥ì¥¸¥¹¥¿¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬ )
+³Æ¥ì¥¸¥¹¥¿¤Î¸½ºß¤ÎÆâÍÆ (¤Ä¤Þ¤ê¥ì¥¸¥¹¥¿¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬)
¤À¤±¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
..
.SH
@@ -165,14 +206,14 @@ dc
ÀºÅ٤ȡ¢ÆþÎϤδð¿ô¡¢½ÐÎϤδð¿ô¤Ç¤¹¡£
ÀºÅ٤ϡ¢¤Û¤È¤ó¤É¤Î»»½ÑÁàºî¤Î·ë²Ì¤ÇÊݸ¤µ¤ì¤ë¾®¿ô¤Î·å¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
ÆþÎϤδð¿ô¤Ï¡¢ÆþÎϤµ¤ì¤¿¿ô»ú¤Î²ò¼á¤òÀ©¸æ¤·¤Þ¤¹¡£
-ÆþÎϤµ¤ì¤¿Á´¤Æ¤Î¿ô»ú¤Ï¤³¤Î´ð¿ô¤ò¤Ä¤«¤Ã¤Æ¤¤¤ë¤È¤µ¤ì¤Þ¤¹¡£
+ÆþÎϤµ¤ì¤¿¤¹¤Ù¤Æ¤Î¿ô»ú¤Ï¤³¤Î´ð¿ô¤ò¤Ä¤«¤Ã¤Æ¤¤¤ë¤È¤µ¤ì¤Þ¤¹¡£
½ÐÎϤδð¿ô¤Ï¡¢É½¼¨¤¹¤ë¿ô»ú¤Ç»È¤ï¤ì¤Þ¤¹¡£
.PP
ÆþÎϤȽÐÎϤδð¿ô¤Ï¡¢Ê¬Î¥¤µ¤ì¤¿¥Ñ¥é¥á¡¼¥¿¤Ç¤¹¡£
Åù¤·¤¯ÀßÄꤷ¤Ê¤¯¤Æ¤â¤¤¤¤¤Ç¤¹¤¬¡¢¤³¤ì¤ÏÊØÍø¤À¤Ã¤¿¤êʶ¤é¤ï¤·¤«¤Ã¤¿¤ê¤·¤Þ¤¹¡£
ÆþÎϤδð¿ô¤Ï 2 ¤«¤é 36 ¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
½ÐÎϤδð¿ô¤ÏºÇÄã 2 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-ÀºÅ٤ϥ¼¥í°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
+ÀºÅÙ¤Ï 0 °Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
ÀºÅ٤ϡ¢¸½ºß¤ÎÆþÎÏ´ð¿ô¤ä½ÐÎÏ´ð¿ô¤Ë´Ø·¸¤Ê¤¯¡¢¤¤¤Ä¤â 10 ¿Ê¤Î·å¿ô¤Ç·è¤á¤é¤ì¤Þ¤¹¡£
.TP
.B i
@@ -197,10 +238,10 @@ dc
.PP
\*(dc ¤Ï¡¢¿ô¤ÈƱ¤¸¤è¤¦¤Ëʸ»úÎó¤òÁàºî¤Ç¤­¤Þ¤¹¡£
ʸ»úÎó¤ËÂФ·¤Æ¤Ç¤­¤ëÍ£°ì¤Î¤³¤È¤Ï¡¢¤½¤ì¤òɽ¼¨¤·¡¢¥Þ¥¯¥í¤È¤·¤Æ
-¼Â¹Ô¤¹¤ë¤³¤È¤Ç¤¹¡£
-¥Þ¥¯¥í¤È¤Ï¡¢ \*(dc ¥³¥Þ¥ó¥É¤È¤·¤Æ¼Â¹Ô¤µ¤ì¤ëʸ»úÎó¤ÎÆâÍÆ¤Î¤³¤È¤Ç¤¹¡£
-Á´¤Æ¤Î¥ì¥¸¥¹¥¿¤È¥¹¥¿¥Ã¥¯¤Ïʸ»úÎó¤òÊݸ¤Ç¤­¤Þ¤¹¡£
-¤½¤·¤Æ¡¢ \*(dc ¤Ï¤¤¤Ä¤â¡¢Í¿¤¨¤é¤ì¤¿¥Ç¡¼¥¿¤¬Ê¸»úÎ󤫿ô»ú¤«¤ò
+¼Â¹Ô¤¹¤ë¤³¤È¤Ç¤¹¡£
+¥Þ¥¯¥í¤È¤Ï¡¢\*(dc ¥³¥Þ¥ó¥É¤È¤·¤Æ¼Â¹Ô¤µ¤ì¤ëʸ»úÎó¤ÎÆâÍÆ¤Î¤³¤È¤Ç¤¹¡£
+¤¹¤Ù¤Æ¤Î¥ì¥¸¥¹¥¿¤È¥¹¥¿¥Ã¥¯¤Ïʸ»úÎó¤òÊݸ¤Ç¤­¤Þ¤¹¡£
+¤½¤·¤Æ¡¢\*(dc ¤Ï¤¤¤Ä¤â¡¢Í¿¤¨¤é¤ì¤¿¥Ç¡¼¥¿¤¬Ê¸»úÎ󤫿ô»ú¤«¤ò
ÃΤäƤ¤¤Þ¤¹¡£
»»½ÑÁàºî¤Î¤è¤¦¤Ê¤¤¤¯¤Ä¤«¤Î¥³¥Þ¥ó¥É¤Ï¡¢¿ô¤òɬÍפȤ·¤Æ¤ª¤ê¡¢
ʸ»úÎó¤¬Í¿¤¨¤é¤ì¤¿¾ì¹ç¤Ï¥¨¥é¡¼¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
@@ -225,6 +266,11 @@ dc
.B foo
¤òɽ¼¨¤·¤Þ¤¹ (¤¬¡¢²þ¹Ôʸ»ú¤Ïɽ¼¨¤·¤Þ¤»¤ó)¡£
.TP
+.B a
+¥¹¥¿¥Ã¥¯ÀèÆ¬¤ÎÃͤò¼è¤ê½Ð¤·¡¢¤½¤ì¤¬¿ô»ú¤Ê¤é¡¢¤½¤ÎÄã°Ì¥Ð¥¤¥È¤ò
+ʸ»úÎó¤ËÊÑ´¹¤·¡¢¥¹¥¿¥Ã¥¯¤ËÀѤߤޤ¹¡£Ê¸»úÎó¤Ê¤é¡¢¤½¤ÎºÇ½é¤Îʸ»ú¤¬
+¥¹¥¿¥Ã¥¯¤ËÀѤßÌᤵ¤ì¤Þ¤¹¡£
+.TP
.B x
¥¹¥¿¥Ã¥¯¤«¤éÃͤò¼è¤ê½Ð¤·¡¢¥Þ¥¯¥í¤È¤·¤Æ¼Â¹Ô¤·¤Þ¤¹¡£
ÉáÄÌ¡¢¤³¤ì¤Ïʸ»úÎó¤Ç¤¹¡£¿ô¤Î¾ì¹ç¤Ï¡¢Ã±½ã¤Ë¤½¤ÎÃͤ¬¥¹¥¿¥Ã¥¯¤Ë
@@ -247,7 +293,7 @@ dc
.B 1
¤òɽ¼¨¤¹¤ë¤¿¤á¤Î¥Þ¥¯¥í¤ò
¥ì¥¸¥¹¥¿
-.BR a
+.BR a
¤ËÊݸ¤·¤Þ¤¹¡£
.B lax
¤Ç¤³¤Î¥Þ¥¯¥í¤Ï¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
@@ -260,7 +306,7 @@ dc
¤·¤¿¤¬¤Ã¤Æ¡¢
.B 1 2>a
¤Ï¡¢¥ì¥¸¥¹¥¿
-.BR a
+.BR a
¤ÎÆâÍÆ¤ò¼Â¹Ô¤·¤Þ¤¹¤¬¡¢
.B 2 1>a
¤Ç¤Ï¼Â¹Ô¤·¤Þ¤»¤ó¡£
@@ -269,9 +315,9 @@ dc
»÷¤Æ¤¤¤Þ¤¹¤¬¡¢¤â¤È¤â¤È¤Î¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤¬¾®¤µ¤¤¾ì¹ç¤Ë¥Þ¥¯¥í¤ò¼Â¹Ô¤·¤Þ¤¹¡£
.TP
.BI = r
-»÷¤Æ¤¤¤Þ¤¹¤¬¡¢Æó¤Ä¤Î¼è¤ê½Ð¤µ¤ì¤¿Ãͤ¬Åù¤·¤¤¾ì¹ç¤Ë¥Þ¥¯¥í¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
+»÷¤Æ¤¤¤Þ¤¹¤¬¡¢2 ¤Ä¤Î¼è¤ê½Ð¤µ¤ì¤¿Ãͤ¬Åù¤·¤¤¾ì¹ç¤Ë¥Þ¥¯¥í¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
.ig
-¤³¤ì¤Ï¡¢Æó¤Ä¤Îʸ»úÎó¤ÎÅù²ÁÀ­¤òÈæ³Ó¤¹¤ë¤¿¤á¤Ë¤â»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+¤³¤ì¤Ï¡¢2 ¤Ä¤Îʸ»úÎó¤ÎÅù²ÁÀ­¤òÈæ³Ó¤¹¤ë¤¿¤á¤Ë¤â»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
..
.TP
.B ?
@@ -279,7 +325,7 @@ dc
¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥æ¡¼¥¶¤«¤é¤ÎÆþÎϤòÍ׵᤹¤ë¤¿¤á¤Î¥Þ¥¯¥í¤Ç»È¤¨¤Þ¤¹¡£
.TP
.B q
-¥Þ¥¯¥í¤ò½ªÎ»¤·¡¢¼Â¹Ô¤µ¤ì¤¿¥Þ¥¯¥í¤«¤é¤â½ªÎ»¤·¤Þ¤¹¡£
+¥Þ¥¯¥í¤ò½ªÎ»¤·¡¢¤½¤ì¤ò¸Æ¤Ó½Ð¤·¤¿¥Þ¥¯¥í¤«¤é¤â½ªÎ»¤·¤Þ¤¹¡£
°ìÈÖ¾å¤Î¥ì¥Ù¥ë¤«¡¢°ìÈÖ¾å¤Î¥ì¥Ù¥ë¤«¤éľÀܸƤФ줿¥Þ¥¯¥í¤«¤é¸Æ¤Ð¤ì¤ë¤È¡¢
.B q
¥³¥Þ¥ó¥É¤Ï \*(dc ¤ò½ªÎ»¤·¤Þ¤¹¡£
@@ -289,9 +335,9 @@ dc
¤½¤Î¿ô¤Î¥Þ¥¯¥í¤ò½ªÎ»¤·¤Þ¤¹¡£
¤·¤¿¤¬¤Ã¤Æ¡¢
.B 3Q
-¤Ï¡¢ 3 ¤Ä¤Î¥ì¥Ù¥ë¤ò½ªÎ»¤·¤Þ¤¹¡£
+¤Ï¡¢3 ¤Ä¤Î¥ì¥Ù¥ë¤ò½ªÎ»¤·¤Þ¤¹¡£
.B Q
-¥³¥Þ¥ó¥É¤Ç¤Ï¡¢ \*(dc ¤ò½ªÎ»¤¹¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+¥³¥Þ¥ó¥É¤Ç¤Ï¡¢\*(dc ¤ò½ªÎ»¤¹¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£
.SH
¾õÂÖ¤ÎÌ䤤¹ç¤ï¤»
.TP
@@ -315,22 +361,22 @@ dc
¤½¤Î¾¤Î¤µ¤Þ¤¶¤Þ¤Ê¤³¤È
.TP
.B !
-Í¿¤¨¤é¤ì¤¿¹Ô¤ò¥·¥¹¥Æ¥à¥³¥Þ¥ó¥É¤È¤·¤Æ¼Â¹Ô¤·¤Þ¤¹ ( ¥·¥§¥ë¥¨¥¹¥±¡¼¥× ) ¡£
+¹Ô¤ÎËöÈø¤Þ¤Ç¤ò¤ò¥·¥¹¥Æ¥à¥³¥Þ¥ó¥É¤È¤·¤Æ¼Â¹Ô¤·¤Þ¤¹ (¥·¥§¥ë¥¨¥¹¥±¡¼¥×) ¡£
.\"(ÌõÃí)¥·¥§¥ë¥¨¥¹¥±¡¼¥×¤Ï¡¢Ìõ¼Ô¤¬ÉÕ¤±Â­¤·¤Þ¤·¤¿¡£
.\" 2.2.1R ÂоÝ(1997/05/04) Takeshi MUTOH <mutoh@info.nara-k.ac.jp>
.TP
.B #
-Í¿¤¨¤é¤ì¤¿¹Ô¤ò¥³¥á¥ó¥È¤È¤·¤Æ¼è¤ê°·¤¤¤Þ¤¹¡£
+¹Ô¤ÎËöÈø¤Þ¤Ç¤ò¥³¥á¥ó¥È¤È¤·¤Æ¼è¤ê°·¤¤¤Þ¤¹¡£
.TP
.BI : r
¥¹¥¿¥Ã¥¯¤«¤é 2 ¤Ä¤ÎÃͤò¼è¤ê½Ð¤·¤Þ¤¹¡£
-¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤«¤é 2 ÈÖÌܤÀ¤Ã¤¿ÃͤÇÇÛÎó
-.IR r
-¤ò¥¤¥ó¥Ç¥Ã¥¯¥¹¤·¡¢¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤À¤Ã¤¿Ãͤò¤½¤³¤ËÊݸ¤·¤Þ¤¹¡£
+¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤À¤Ã¤¿ÃͤÇÇÛÎó
+.IR r
+¤ò¥¤¥ó¥Ç¥Ã¥¯¥¹¤·¡¢¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤«¤é 2 ÈÖÌܤÀ¤Ã¤¿Ãͤò¤½¤³¤ËÊݸ¤·¤Þ¤¹¡£
.TP
.BI ; r
¥¹¥¿¥Ã¥¯¤«¤éÃͤò¼è¤ê½Ð¤·¡¢ÇÛÎó
-.IR r
+.IR r
¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤È¤·¤ÆÍøÍѤ·¤Þ¤¹¡£
ÇÛÎ󤫤éÁª¤Ð¤ì¤¿Ãͤϡ¢¤½¤Î¸å¤Ç¥¹¥¿¥Ã¥¯¤ËÀѤޤì¤Þ¤¹¡£
.SH
@@ -341,25 +387,16 @@ dc
¤È
.B ;
¤Ï¡¢ÉáÄÌ
-.IR bc
-¤ÎÎò»ËŪ¤Ê¼ÂÁõ¤À¤±¤Ç»È¤ï¤ì¤Þ¤¹
-( GNU ¤Î
+.IR bc
+¤ÎÅÁÅýŪ¤Ê¼ÂÁõ¤À¤±¤Ç»È¤ï¤ì¤Þ¤¹
+(GNU ¤Î
.I bc
-¤Ï¡¢¼«Ê¬¤Ç¤½¤ì¤ò´Þ¤ó¤Ç¤ª¤ê¡¢ \*(dc ¤ò¼Â¹Ô¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó) ¡£
-¥³¥á¥ó¥ÈÁàºî
-.B #
-¤Ï¡¢Îò»ËŪ¤Ê
-.IR dc
-¤Î¼ÂÁõ¤Ë¤Ï´Þ¤Þ¤ì¤Ê¤¤¡¢¿·¤·¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£
+¤Ï¼«¸Ê´°·ë¤·¤Æ¤ª¤ê¡¢\*(dc ¤ò¼Â¹Ô¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó) ¡£
.SH
¥Ð¥°
.PP
¥Ð¥°Êó¹ð¤Ï¡¢
-.BR bug-gnu-utils@prep.ai.mit.edu
+.BR bug-gnu-utils@prep.ai.mit.edu
¤ËÅŻҥ᡼¥ë¤Ç¤ª´ê¤¤¤·¤Þ¤¹¡£
ñ¸ì ``dc'' ¤ò ``Subject:'' ¥Õ¥£¡¼¥ë¥É¤Î¤É¤³¤«¤ËÆþ¤ì¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£
-.SH Îò»Ë
-.I dc
-¥³¥Þ¥ó¥É¤Ï¡¢
-Version 1 AT&T UNIX
-¤«¤éƳÆþ¤µ¤ì¤Þ¤·¤¿¡£
+
diff --git a/ja/man/man1/dd.1 b/ja/man/man1/dd.1
index cb17d8ae0c..a8f4377529 100644
--- a/ja/man/man1/dd.1
+++ b/ja/man/man1/dd.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)dd.1 8.2 (Berkeley) 1/13/94
-.\" %Id: dd.1,v 1.2.8.4 1998/07/15 02:01:18 jkh Exp %
+.\" %Id: dd.1,v 1.7 1998/05/06 06:51:35 charnier Exp %
.\" jpman %Id: dd.1,v 1.3 1997/05/16 00:16:21 h-nokubi Stab %
.\"
.Dd January 13, 1994
diff --git a/ja/man/man1/df.1 b/ja/man/man1/df.1
index e91fcf8f86..df0aca5a05 100644
--- a/ja/man/man1/df.1
+++ b/ja/man/man1/df.1
@@ -29,11 +29,11 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" @(#)df.1 8.2 (Berkeley) 1/13/94
-.\" %Id: df.1,v 1.4.2.4 1998/07/15 02:01:22 jkh Exp %
+.\" @(#)df.1 8.3 (Berkeley) 5/8/95
+.\" %Id: domainname.1,v 1.6 1998/05/13 07:37:23 charnier Exp %
.\" jpman %Id: df.1,v 1.2 1997/04/07 05:31:08 mutoh Stab %
.\"
-.Dd January 13, 1994
+.Dd May 8, 1995
.Dt DF 1
.Os BSD 4
.Sh ̾¾Î
diff --git a/ja/man/man1/dig.1 b/ja/man/man1/dig.1
index 9697b07b39..ceef0e6b06 100644
--- a/ja/man/man1/dig.1
+++ b/ja/man/man1/dig.1
@@ -1,4 +1,4 @@
-.\" %Id: dig.1,v 8.2 1997/06/01 20:34:33 vixie Exp %
+.\" %Id: dig.1,v 8.3 1998/03/21 01:01:23 halley Exp %
.\" jpman %Id: dig.1,v 1.4 1997/07/26 21:31:55 horikawa Stab %
.\"
.\" ++Copyright++ 1993
@@ -59,296 +59,611 @@
.\"
.\" dig.1 2.0 (USC-ISI) 8/30/90
.\"
-.\" Man page reformatted for this release by Andrew Cherenson
-.\" (arc@sgi.com)
-.\"
-.TH DIG 1 "August 30, 1990"
-.SH ̾¾Î
+.Dd August 30, 1990
+.Dt DIG 1
+.Os BSD 4
+.Sh ̾¾Î
dig \- ¥É¥á¥¤¥ó̾Ì䤤¹ç¤ï¤»¥Ñ¥±¥Ã¥È¤ò¥Í¡¼¥à¥µ¡¼¥Ð¤ËÁ÷¤ë
-.SH ½ñ¼°
-.B dig
-.RI [ @\fIserver\fP ]
-.I domain
-.RI [ "<query-type>" ]
-.RI [ "<query-class>" ]
-.RI [ "+<query-option>" ]
-.RI [ "\-<dig-option>" ]
-.RI [ "%comment" ]
-.SH ²òÀâ
-\fIdig\fP (¥É¥á¥¤¥ó¾ðÊó¼êõ¤ê´ï; domain information groper) ¤Ï¡¢
+.Sh ½ñ¼°
+.Nm dig
+.Op Ic @ Ns Ar server
+.Ar domain
+.Op Aq Ar query-type
+.Op Aq Ar query-class
+.Op Ic + Ns Aq Ar query-option
+.Op Fl Aq Ar dig-option
+.Op Ar %comment
+.Sh ²òÀâ
+.Ic dig
+(¥É¥á¥¤¥ó¾ðÊó¼êõ¤ê´ï; domain information groper) ¤Ï¡¢
DNS (Domain Name System) ¥µ¡¼¥Ð¤«¤é¾ðÊó¤ò½¸¤á¤ë¤¿¤á¤Ë»È¤ï¤ì¤ë
½ÀÆð¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó¥Ä¡¼¥ë¤Ç¤¹¡£
-\fIdig\fP ¤ÏÆó¤Ä¤Î¥â¡¼¥É¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
-¤³¤ì¤Ï¡¢°ì¤Ä¤ÎÌ䤤¹ç¤ï¤»¤ò¹Ô¤¦Ã±½ã¤ÊÂÐÏÃÅªÍøÍѥ⡼¥É¤È¡¢
+.Ic dig
+¤Ï 2 ¤Ä¤Î¥â¡¼¥É¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
+¤³¤ì¤Ï¡¢1 ¤Ä¤ÎÌ䤤¹ç¤ï¤»¤ò¹Ô¤¦Ã±½ã¤ÊÂÐÏÃÅªÍøÍѥ⡼¥É¤È¡¢
¤¤¤¯¤Ä¤«¤ÎÌ䤤¹ç¤ï¤»¹Ô¤Î¥ê¥¹¥ÈÃæ¤Î³ÆÌ䤤¹ç¤ï¤»¤ò¼Â¹Ô¤¹¤ë¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤¹¡£
-Á´¤Æ¤ÎÌ䤤¹ç¤ï¤»¥ª¥×¥·¥ç¥ó¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤éÍøÍѲÄǽ¤Ç¤¹¡£
-.PP
-ÉáÄ̤δÊñ¤Ê \fIdig\fP ¤Î»ÈÍÑÊý¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ê·Á¼°¤Ç¤¹¡£
-.sp 1
- dig @server domain query-type query-class
-.sp 1
+¤¹¤Ù¤Æ¤ÎÌ䤤¹ç¤ï¤»¥ª¥×¥·¥ç¥ó¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤éÍøÍѲÄǽ¤Ç¤¹¡£
+.Pp
+ÉáÄ̤δÊñ¤Ê
+.Ic dig
+¤Î»ÈÍÑË¡¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ê·Á¼°¤Ç¤¹¡£
+.Pp
+.Bd -ragged -offset indent-two
+.Ic dig @ NS Ar server domain query-type query-class
+.Ed
+.Pp
¤³¤³¤Ç¡¢
-.IP \fIserver\fP
+.Bl -tag -width Fl
+.It Ar server
¤Ï¡¢¥É¥á¥¤¥ó̾¤«¥É¥Ã¥Èɽµ­¤Î¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥¢¥É¥ì¥¹¤Î¤É¤Á¤é¤«¤Ç¤¹¡£
-¤â¤·¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¥Õ¥£¡¼¥ë¥É¤¬¾Êά¤µ¤ì¤¿¾ì¹ç¡¢ \fIdig\fP
+¤â¤·¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¥Õ¥£¡¼¥ë¥É¤¬¾Êά¤µ¤ì¤¿¾ì¹ç¡¢
+.Ic dig
¤Ï¡¢¤½¤Î¥Þ¥·¥ó¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥Í¡¼¥à¥µ¡¼¥Ð¤òÍøÍѤ·¤è¤¦¤È¤·¤Þ¤¹¡£
-.sp 1
-\fBÃí°Õ:\fP ¥É¥á¥¤¥ó̾¤¬»ØÄꤵ¤ì¤¿»þ¤Ï¡¢¥É¥á¥¤¥ó̾¥·¥¹¥Æ¥à¥ê¥¾¥ë¥Ð
-(¤Ä¤Þ¤ê¡¢ BIND) ¤ò»È¤¦¤³¤È¤Ç²ò·è¤·¤è¤¦¤È¤·¤Þ¤¹¡£¥·¥¹¥Æ¥à¤¬ DNS ¤ò
+.Pp
+.Em Ãí¼á:
+¥É¥á¥¤¥ó̾¤¬»ØÄꤵ¤ì¤¿»þ¤Ï¡¢¥É¥á¥¤¥ó̾¥·¥¹¥Æ¥à¥ê¥¾¥ë¥Ð
+(¤Ä¤Þ¤ê¡¢BIND) ¤ò»È¤¦¤³¤È¤Ç²ò·è¤·¤è¤¦¤È¤·¤Þ¤¹¡£¥·¥¹¥Æ¥à¤¬ DNS ¤ò
Ä󶡤·¤Æ¤¤¤Ê¤¤»þ¤Ï¡¢¥É¥Ã¥È·Á¼°¤Î¥¢¥É¥ì¥¹¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-¤½¤ÎÂå¤ï¤ê¤Ë¡¢½èÍý¤Ç¤­¤ë¤É¤³¤«¤Ë¥µ¡¼¥Ð¤¬¤¢¤ë¾ì¹ç¤Ï¡¢
-/etc/resolv.conf ¤¬Â¸ºß¤·¡¢¥Ç¥Õ¥©¥ë¥È¥Í¡¼¥à¥µ¡¼¥Ð¤¬¤É¤³¤Ë¤¢¤ë¤«¤¬
-µ­½Ò¤µ¤ì¤Æ¤¤¤ë¡¢¤Ä¤Þ¤ê¡¢ \fIserver\fP ¼«¿È¤¬²ò·è²Äǽ¤Ç¤¢¤ë¤³¤È¤¬
-µá¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£
-/etc/resolv.conf ¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤Ï
-.IR resolver (5)
+ÍøÍѤǤ­¤ë¥µ¡¼¥Ð¤¬¤É¤³¤«¤Ë¤¢¤ë¾ì¹ç¤Ï¡¢É¬Íפʤ³¤È¤Ï
+.Pa /etc/resolv.conf
+¤¬Â¸ºß¤·¡¢
+.Ar server
+¼«¿È¤¬²ò·è¤Ç¤­¤ë¤è¤¦¤Ë¡¢¤½¤Î¥Ç¥Õ¥©¥ë¥È¥Í¡¼¥à¥µ¡¼¥Ð¤¬¤É¤³¤Ë¤¢¤ë¤«¤¬
+µ­½Ò¤µ¤ì¤Æ¤¤¤ë¤³¤È¤À¤±¤Ç¤¹¡£
+.Pa /etc/resolv.conf
+¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤Ï
+.Xr resolver 5
¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-( Ãí°Õ : /etc/resolv.conf ¤òÊѹ¹¤¹¤ë¤È¡¢É¸½à¤Î¥ê¥¾¥ë¥Ð¥é¥¤¥Ö¥é¥ê¤È
-¤½¤ì¤ò»È¤¦¤¤¤¯¤Ä¤«¤Î¥×¥í¥°¥é¥à¤Ë±Æ¶Á¤òÍ¿¤¨¤Þ¤¹¡£)
-¥ª¥×¥·¥ç¥ó¤È¤·¤Æ¡¢¥æ¡¼¥¶¤Ï´Ä¶­ÊÑ¿ô LOCALRES ¤ò
-/etc/resolv.conf ¤ÎÂå¤ï¤ê¤Ë»È¤¦¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤ËÀßÄê¤Ç¤­¤Þ¤¹¡£
-(LOCALRES ÊÑ¿ô¤Ï¡¢ \fIdig\fP ¥ê¥¾¥ë¥Ð¸ÇÍ­¤Î¤â¤Î¤Ç¡¢É¸½à¤Î¥ê¥¾¥ë¥Ð¤Ç¤Ï¡¢
-»²¾È¤µ¤ì¤Þ¤»¤ó¡£) LOCALRES ÊÑ¿ô¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢
-ÀßÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬ÆÉ¤ß¹þ¤á¤Ê¤¤¾ì¹ç¤Ï¡¢ /etc/resolv.conf ¤¬»È¤ï¤ì¤Þ¤¹¡£
-.IP \fIdomain\fP
+.Sy ·Ù¹ð:
+.Pa /etc/resolv.conf
+¤òÊѹ¹¤¹¤ë¤È¡¢É¸½à¤Î¥ê¥¾¥ë¥Ð¥é¥¤¥Ö¥é¥ê¤È
+.Pq ÀøºßŪ¤Ë
+¤½¤ì¤ò»È¤¦¤¤¤¯¤Ä¤«¤Î¥×¥í¥°¥é¥à¤Ë±Æ¶Á¤òÍ¿¤¨¤Þ¤¹¡£
+¥ª¥×¥·¥ç¥ó¤È¤·¤Æ¡¢¥æ¡¼¥¶¤Ï´Ä¶­ÊÑ¿ô
+.Ev LOCALRES
+¤òÀßÄꤷ¡¢
+.Pa /etc/resolv.conf
+¤ÎÂå¤ï¤ê¤Ë»È¤¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
+.Po Ns Ev LOCALRES
+ÊÑ¿ô¤Ï
+.Ic dig
+¥ê¥¾¥ë¥Ð¸ÇÍ­¤Î¤â¤Î¤Ç¡¢É¸½à¤Î¥ê¥¾¥ë¥Ð¤Ç¤Ï
+»²¾È¤µ¤ì¤Þ¤»¤ó
+.Pc ¡£
+.Ev LOCALRES ÊÑ¿ô¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢
+ÀßÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬ÆÉ¤ß¹þ¤á¤Ê¤¤¾ì¹ç¤Ï¡¢
+.Pa /etc/resolv.conf
+¤¬»È¤ï¤ì¤Þ¤¹¡£
+.It Ar domain
¤Ï¡¢¤¢¤Ê¤¿¤¬¾ðÊó¤òÍ׵ᤷ¤Æ¤¤¤ë¥É¥á¥¤¥ó̾¤Ç¤¹¡£
-µÕ¥¢¥É¥ì¥¹¤ÎÌ䤤¹ç¤ï¤»¤Î¤¿¤á¤ÎÊØÍø¤ÊÊýË¡¤Ï¡¢-x ¥ª¥×¥·¥ç¥ó¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£
-.IP \fIquery-type\fP
+µÕ¥¢¥É¥ì¥¹¤ÎÌ䤤¹ç¤ï¤»¤Î¤¿¤á¤ÎÊØÍø¤ÊÊýË¡¤Ï¡¢
+.Fl x
+¥ª¥×¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤(¤³¤ÎÀá¤Î
+.Sx ¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó
+¤Î¹à¤Ç½Ò¤Ù¤é¤ì¤Æ¤¤¤Þ¤¹)¡£
+.It Ar query-type
¤Ï¡¢¤¢¤Ê¤¿¤¬Í׵ᤷ¤Æ¤¤¤ë¾ðÊó¤Î¥¿¥¤¥×(DNS Ì䤤¹ç¤ï¤»¥¿¥¤¥×)¤Ç¤¹¡£
-¾Êά¤µ¤ì¤¿¾ì¹ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¡¢"a" (T_A = ¥¢¥É¥ì¥¹)
+¾Êά¤µ¤ì¤¿¾ì¹ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¡¢
+.Dq Ar a
+.Pq Dv T_A = ¥¢¥É¥ì¥¹
¤¬»È¤ï¤ì¤Þ¤¹¡£°Ê²¼¤Î¥¿¥¤¥×¤¬Ç§¼±¤µ¤ì¤Þ¤¹¡£
-.sp 1
-.ta \w'hinfoXX'u +\w'T_HINFOXX'u
-.nf
-a T_A ¥Í¥Ã¥È¥ï¡¼¥¯¥¢¥É¥ì¥¹
-any T_ANY »ØÄꤵ¤ì¤¿¥É¥á¥¤¥ó¤ÎÁ´¤Æ/Ǥ°Õ¤Î¾ðÊó
-mx T_MX ¥É¥á¥¤¥ó¤Î¥á¡¼¥ë¸ò´¹¾ðÊó (MX)
-ns T_NS ¥Í¡¼¥à¥µ¡¼¥Ð
-soa T_SOA ǧ¾Ú¥ì¥³¡¼¥É¤Î¥¾¡¼¥ó
-hinfo T_HINFO ¥Û¥¹¥È¾ðÊó
-axfr T_AXFR ¥¾¡¼¥óžÁ÷¾ðÊó
- (¸¢°Ò¤ò»ý¤Ã¤¿¥µ¡¼¥Ð¤Ë¿Ò¤Í¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó)
-txt T_TXT Ǥ°Õ¤Î¿ô¤Îʸ»úÎó
-.fi
-.sp 1
+.Pp
+.Bl -hang -width "hinfo T_HINFO " -compact
+.It Ar a\ \ \ \ \ \ Dv T_A
+¥Í¥Ã¥È¥ï¡¼¥¯¥¢¥É¥ì¥¹
+.It Ar any\ \ \ \ Dv T_ANY
+»ØÄꤵ¤ì¤¿¥É¥á¥¤¥ó¤Î¤¹¤Ù¤Æ/Ǥ°Õ¤Î¾ðÊó
+.It Ar mx\ \ \ \ \ Dv T_MX
+¥É¥á¥¤¥ó¤Î¥á¡¼¥ë¸ò´¹¾ðÊó (MX)
+.It Ar ns\ \ \ \ \ Dv T_NS
+¥Í¡¼¥à¥µ¡¼¥Ð
+.It Ar soa\ \ \ \ Dv T_SOA
+¥¾¡¼¥ó¤Î¸¢°Ò¼Ô¤òɽ¤¹¥ì¥³¡¼¥É
+.It Ar hinfo\ \ Dv T_HINFO
+¥Û¥¹¥È¾ðÊó
+.It Ar axfr\ \ \ Dv T_AXFR
+¥¾¡¼¥óžÁ÷¾ðÊó(¸¢°Ò¤ò»ý¤Ã¤¿¥µ¡¼¥Ð¤Ë¿Ò¤Í¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó)
+.It Ar txt\ \ \ \ Dv T_TXT
+Ǥ°Õ¤Î¿ô¤Îʸ»úÎó
+.El
+.Pp
(´°Á´¤Ê¥ê¥¹¥È¤Ï¡¢RFC 1035 ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£)
-.IP \fIquery-class\fP
+.It Ar query-class
¤Ï¡¢Ì䤤¹ç¤ï¤»¤ÇÍ׵ᤵ¤ì¤ë¥Í¥Ã¥È¥ï¡¼¥¯¥¯¥é¥¹¤Ç¤¹¡£
-¾Êά¤µ¤ì¤¿¾ì¹ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¡¢ "in" (C_IN = Internet) ¤Ç¤¹¡£
+¾Êά¤µ¤ì¤¿¾ì¹ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¡¢
+.Dq Ar in
+.Pq Dv C_IN = Internet
+¤Ç¤¹¡£
°Ê²¼¤Î¥¯¥é¥¹¤¬Ç§¼±¤µ¤ì¤Þ¤¹¡£
-.sp 1
-.ta \w'hinfoXX'u +\w'T_HINFOXX'u
-.nf
-in C_IN ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¡¦¥¯¥é¥¹¡¦¥É¥á¥¤¥ó
-any C_ANY Á´¤Æ/Ǥ°Õ¤Î¥¯¥é¥¹¤Î¾ðÊó
-.fi
-.sp 1
-(´°Á´¤Ê¥ê¥¹¥È¤ËÉÕ¤¤¤Æ¤Ï¡¢ RFC 1035 ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£)
-.sp 1
-\fBÃí°Õ:\fP
-"any" ¤Ï¡¢¥¯¥é¥¹¤äÌ䤤¹ç¤ï¤»¤Î¥¿¥¤¥×¤ò»ØÄꤹ¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
-\fIdig\fP ¤Ï¡¢ºÇ½é¤Ë¸½¤ì¤¿ "any" ¤ò query-type = T_ANY ¤È¤·¤Æ²òÀϤ·¤Þ¤¹¡£
-query-class = C_ANY ¤Ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢ "any" ¤ò2ÅÙ»ØÄꤹ¤ë¤«¡¢
-"-c" ¥ª¥×¥·¥ç¥ó(°Ê²¼»²¾È)¤òÍøÍѤ·¤ÆÌ䤤¹ç¤ï¤»¥¯¥é¥¹¤ò
+.Pp
+.Bl -tag -width "hinfo T_HINFO " -compact
+.It Ar in\ \ \ \ \ Dv C_IN
+¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥¯¥é¥¹¥É¥á¥¤¥ó
+.It Ar any\ \ \ \ Dv C_ANY
+¤¹¤Ù¤Æ/Ǥ°Õ¤Î¥¯¥é¥¹¤Î¾ðÊó
+.El
+.Pp
+(´°Á´¤Ê¥ê¥¹¥È¤Ï¡¢RFC 1035 ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£)
+.Pp
+.Em Ãí¼á:
+.Dq Ar any
+¤Ï¡¢
+.Em ¥¯¥é¥¹
+¤äÌ䤤¹ç¤ï¤»¤Î
+.Em ¥¿¥¤¥×
+¤ò»ØÄꤹ¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
+.Ic dig
+¤Ï¡¢ºÇ½é¤Ë¸½¤ì¤¿
+.Dq Ar any
+¤ò
+.Ar query-type = Dv T_ANY
+¤È¤·¤Æ²òÀϤ·¤Þ¤¹¡£
+.Ar query-class = Dv C_ANY
+¤Ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
+.Dq any
+¤ò 2 ÅÙ»ØÄꤹ¤ë¤«¡¢
+.Fl c
+¥ª¥×¥·¥ç¥ó(°Ê²¼»²¾È)¤òÍøÍѤ·¤ÆÌ䤤¹ç¤ï¤»¥¯¥é¥¹¤ò
»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-.SH ¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó
-.IP "%ignored-comment"
-"%" ¤Ï¡¢Ã±¤Ë²òÀϤµ¤ì¤Ê¤¤°ú¿ô¤ò´Þ¤à¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
-¤³¤ì¤Ï¡¢ \fIdig\fP ¤ò¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¼Â¹Ô¤¹¤ë»þ¤ËÍ­¸ú¤Ç¤¹¡£
-Ì䤤¹ç¤ï¤»¥ê¥¹¥ÈÃæ¤ÎÁ´¤Æ¤Î @server-domain-name ¤ò¥ê¥¾¥ë¥Ö¤¹¤ëÂå¤ï¤ê¤Ë¡¢
+.El
+.Ss ¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó
+.Bl -tag -width Fl
+.It % Ns Ar ignored-comment
+.Dq %
+¤Ï¡¢Ã±¤Ë²òÀϤµ¤ì¤Ê¤¤°ú¿ô¤ò´Þ¤à¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
+¤³¤ì¤Ï¡¢
+.Ic dig
+¤ò¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¼Â¹Ô¤¹¤ë»þ¤ËÍ­¸ú¤Ç¤¹¡£
+Ì䤤¹ç¤ï¤»¥ê¥¹¥ÈÃæ¤Î¤¹¤Ù¤Æ¤Î
+.Ar @server-domain-name
+¤ò²ò·è¤¹¤ëÂå¤ï¤ê¤Ë¡¢
¤½¤Î¥ª¡¼¥Ð¥Ø¥Ã¥É¤òÈò¤±¤Ä¤Ä¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Ë¥É¥á¥¤¥ó̾¤ò½ñ¤¯¤³¤È¤¬½ÐÍè¤Þ¤¹¡£
°Ê²¼¤ÎÎã¤ò»²¾È¡£
-.sp 1
- dig @128.9.0.32 %venera.isi.edu mx isi.edu
-.sp 1
-.IP "\-<dig option>"
-"\-" ¤Ï¡¢ \fIdig\fP ¤ÎÁàºî¤Ë±Æ¶Á¤òÍ¿¤¨¤ë¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤¿¤á¤Ë
-»ØÄꤵ¤ì¤Þ¤¹¡£°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤¬¸½ºßÍøÍѲÄǽ¤Ç¤¹
+.Pp
+.Bd -ragged -offset indent-two
+.Ic dig @128.9.0.32 %venera.isi.edu mx isi.edu
+.Ed
+.Pp
+.It Fl Aq Ar dig option
+.Dq Fl
+¤Ï¡¢
+.Ic dig
+¤ÎÁàºî¤Ë±Æ¶Á¤òÍ¿¤¨¤ë¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤¿¤á¤Ë
+»È¤ï¤ì¤Þ¤¹¡£°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤¬¸½ºßÍøÍѲÄǽ¤Ç¤¹
( ÊØÍø¤Ç¤¢¤ë¤«¤É¤¦¤«¤ÏÊݾڤ·¤Þ¤»¤ó )¡£
-.RS
-.IP "\-x \fIdot-notation-address\fP"
+.Bl -tag -width Fl
+.It Fl x Ar dot-notation-address
µÕ¥¢¥É¥ì¥¹ÊÑ´¹¤ò»ØÄꤹ¤ëÊØÍø¤Ê·Á¼°¤Ç¤¹¡£
-"dig 32.0.9.128.in-addr.arpa" ¤ÎÂå¤ï¤ê¤Ë¡¢"dig -x 128.9.0.32"
+.Dq Ic dig 32.0.9.128.in-addr.arpa
+¤ÎÂå¤ï¤ê¤Ë¡¢
+.Dq Ic dig -x 128.9.0.32
¤È»ØÄê¤Ç¤­¤Þ¤¹¡£
-.IP "\-f \fIfile\fP"
-\fIdig\fP ¤Î¥Ð¥Ã¥Á¥â¡¼¥É¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹¡£¥Õ¥¡¥¤¥ë¤Ï¡¢
-¤Ä¤Å¤¤¤Æ¼Â¹Ô¤µ¤ì¤ëÌ䤤¹ç¤ï¤»¤Î»ØÄê (\fIdig\fP ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó) ¤Î
+.It Fl f Ar file
+.Ic dig
+¤Î¥Ð¥Ã¥Á¥â¡¼¥É¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹¡£¥Õ¥¡¥¤¥ë¤Ï¡¢
+¤Ä¤Å¤¤¤Æ¼Â¹Ô¤µ¤ì¤ëÌ䤤¹ç¤ï¤»¤Î»ØÄê (
+.Ns Ic dig
+¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó) ¤Î
¥ê¥¹¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
-';', '#', '\\n' ¤Ç»Ï¤Þ¤ë¹Ô¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢
+.Sq \&; ,
+.Sq # ,
+.Sq \en
+¤Ç»Ï¤Þ¤ë¹Ô¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢
¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¸½¤ì¤ë¤â¤Î¤Ï¡¢¸Ä¡¹¤Î¥Ð¥Ã¥Á¤Ë¤è¤ëÌ䤤¹ç¤ï¤»¤Ç¤â
±Æ¶Á¤¬¤¢¤ê¤Þ¤¹¡£
-.IP "\-T \fItime\fP"
+.It Fl T Ar time
¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¼Â¹Ô¤·¤¿»þ¡¢Ï¢Â³¤·¤¿Ì䤤¹ç¤ï¤»¤Î»Ï¤Þ¤ë»þ´Ö´Ö³Ö¤òÉäÇÍ¿¤¨
-¤Þ¤¹¡£2 ¤Ä°Ê¾å¤Î¥Ð¥Ã¥Á \fIdig\fP ¥³¥Þ¥ó¥É¤Î¼Â¹Ô¤òÂçÂÎÆ±´ü¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë
+¤Þ¤¹¡£2 ¤Ä°Ê¾å¤Î¥Ð¥Ã¥Á
+.Ic dig
+¥³¥Þ¥ó¥É¤Î¼Â¹Ô¤òÂçÂÎÆ±´ü¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë
¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï 0 ¤Ç¤¹¡£
-.IP "\-p \fIport\fP"
+.It Fl p Ar port
¥Ý¡¼¥ÈÈÖ¹æ¤Ç¤¹¡£É¸½à¤Ç¤Ê¤¤¥Ý¡¼¥ÈÈÖ¹æ¤ÇÂԤĥ͡¼¥à¥µ¡¼¥Ð¤ËÌ䤤¹ç¤ï¤»¤Þ¤¹¡£
¥Ç¥Õ¥©¥ë¥È¤Ï 53 ¤Ç¤¹¡£
-.IP "\-P[\fIping-string\fP]"
+.It Fl p Ns Bq Ar ping-string
Ì䤤¹ç¤ï¤»¤«¤é¤«¤¨¤Ã¤Æ¤­¤¿¸å¤Ç¡¢
-.IR ping (8)
+.Xr ping 8
¥³¥Þ¥ó¥É¤ò±þÅú»þ´Ö¤ÎÈæ³Ó¤Î¤¿¤á¤Ë¼Â¹Ô¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢Èþ¤·¤¯¤Ê¤¤¤Î¤Ç¤¹¤¬¡¢
-¥·¥§¥ë¤ò¸Æ½Ð¤·¤Þ¤¹¡£Åý·×¤ÎºÇ¸å¤Î 3 ¹Ô¤¬¥³¥Þ¥ó¥É¤Î¤¿¤á¤Ë
+¥·¥§¥ë¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹¡£Åý·×¤ÎºÇ¸å¤Î 3 ¹Ô¤¬¥³¥Þ¥ó¥É¤Î¤¿¤á¤Ë
ɽ¼¨¤µ¤ì¤Þ¤¹¡£
-.sp 1
- ping \-s server_name 56 3
-.sp 1
-¥ª¥×¥·¥ç¥ó¤Î "ping string" ¤¬Â¸ºß¤·¤¿»þ¤Ï¡¢¥·¥§¥ë¥³¥Þ¥ó¥É¤Ç¤Ï
-"ping \-s" ¤òÃÖ¤­´¹¤¨¤Þ¤¹¡£
-.IP "\-t \fIquery-type\fP"
+.Pp
+.Bd -ragged -offset indent-two
+.Ic ping Fl s server_name 56 3
+.Ed
+.Pp
+¥ª¥×¥·¥ç¥ó¤Î
+.Dq Ar ping-string
+¤¬Â¸ºß¤·¤¿»þ¤Ï¡¢¥·¥§¥ë¥³¥Þ¥ó¥É¤Ç¤Ï
+.Dq Ic ping Fl s
+¤òÃÖ¤­´¹¤¨¤Þ¤¹¡£
+.It Fl t Ar query-type
Ì䤤¹ç¤ï¤»¤Î¥¿¥¤¥×¤ò»ØÄꤷ¤Þ¤¹¡£¥¿¥¤¥×¥Õ¥£¡¼¥ë¥ÉÆâ¤ÎÀ°¿ôÃͤ«¡¢
-¾å¤Ç½Ò¤Ù¤¿¥Ë¡¼¥â¥Ë¥Ã¥¯É½¸½ (¤Ä¤Þ¤ê mx = T_MX) ¤«¤Ç
+¾å¤Ç½Ò¤Ù¤¿¥Ë¡¼¥â¥Ë¥Ã¥¯É½¸½ (¤Ä¤Þ¤ê
+.Ar mx = Dv T_MX
+) ¤«¤Ç
»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.IP "\-c \fIquery-class\fP"
+.It Fl c Ar query-class
Ì䤤¹ç¤ï¤»¤Î¥¯¥é¥¹¤ò»ØÄꤷ¤Þ¤¹¡£¥¯¥é¥¹¥Õ¥£¡¼¥ë¥ÉÆâ¤ÎÀ°¿ôÃͤ«¡¢
¾å¤Ç½Ò¤Ù¤¿¥Ë¡¼¥â¥Ë¥Ã¥¯É½¸½ (¤Ä¤Þ¤ê in = C_IN) ¤Ç
»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.IP "\-envsav"
-¤³¤Î¥Õ¥é¥°¤Ï¡¢Á´¤Æ¤Î°ú¿ô¤¬²òÀϤµ¤ì¤¿¸å¤Ç¡¢
-\fIdig\fP ´Ä¶­ (¥Ç¥Õ¥©¥ë¥È¤äɽ¼¨¥ª¥×¥·¥ç¥óÅù) ¤ò
-¥Ç¥Õ¥©¥ë¥È´Ä¶­¤È¤·¤Æ¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ë¤¿¤á¤Ë»ØÄꤷ¤Þ¤¹¡£
-ɸ½à¤Î¥Ç¥Õ¥©¥ë¥È¤¬µ¤¤ËÆþ¤é¤Ê¤¯¡¢¤¿¤¯¤µ¤ó¤Î¥ª¥×¥·¥ç¥ó¤ò \fIdig\fP ¤ò
-»È¤¦Å٤˻ØÄꤹ¤ë¤³¤È¤¬·ù¤Ê¾ì¹ç¤ÏÊØÍø¤Ç¤¹¡£
-´Ä¶­¤Ï¡¢\fIdig\fP ½ÐÎÏ (°Ê²¼»²¾È) ¤Ç¾Ü¤·¤¯½Ò¤Ù¤é¤ì¤ë¥Õ¥é¥°¤ÈƱ¤¸¤è¤¦¤Ë¡¢
+.It Fl envsav
+¤³¤Î¥Õ¥é¥°¤ò»ØÄꤹ¤ë¤È¡¢¤¹¤Ù¤Æ¤Î°ú¿ô¤¬²òÀϤµ¤ì¤¿¸å¤Ç
+.Ic dig ´Ä¶­ (¥Ç¥Õ¥©¥ë¥È¤äɽ¼¨¥ª¥×¥·¥ç¥óÅù) ¤ò
+¥Ç¥Õ¥©¥ë¥È´Ä¶­¤È¤·¤Æ¥Õ¥¡¥¤¥ë¤ËÊݸ¤·¤Þ¤¹¡£
+ɸ½à¤Î¥Ç¥Õ¥©¥ë¥È¤¬µ¤¤ËÆþ¤é¤º¡¢
+.Ic dig
+¤ò»È¤¦Å٤ˤ¿¤¯¤µ¤ó¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤³¤È¤¬·ù¤Ê¾ì¹ç¤ÏÊØÍø¤Ç¤¹¡£
+´Ä¶­¤Ï¡¢
+.Ic dig
+½ÐÎÏ (°Ê²¼»²¾È) ¤Ç¾Ü¤·¤¯½Ò¤Ù¤é¤ì¤ë¥Õ¥é¥°¤ÈƱ¤¸¤è¤¦¤Ë¡¢
¥ê¥¾¥ë¥Ð¤Î¾õÂÖÊÑ¿ô¥Õ¥é¥°¤ä¡¢¥¿¥¤¥à¥¢¥¦¥È¡¢ºÆ»î¹Ô²ó¿ô¤«¤é¤Ê¤ê¤Þ¤¹¡£
-¥·¥§¥ë´Ä¶­ÊÑ¿ô LOCALDEF ¤¬¥Õ¥¡¥¤¥ë¤Î̾Á°¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
-¤³¤ì¤¬¡¢¥Ç¥Õ¥©¥ë¥È¤Î \fIdig\fP ´Ä¶­¤¬Êݸ¤µ¤ì¤ë¾ì½ê¤È¤Ê¤ê¤Þ¤¹¡£
-¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢¥Õ¥¡¥¤¥ë "DiG.env" ¤¬¸½ºß¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ë
+¥·¥§¥ë´Ä¶­ÊÑ¿ô
+.Ev LOCALDEF
+¤¬¥Õ¥¡¥¤¥ë¤Î̾Á°¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
+¤³¤ì¤¬¡¢¥Ç¥Õ¥©¥ë¥È¤Î
+.Ic dig
+´Ä¶­¤¬Êݸ¤µ¤ì¤ë¾ì½ê¤È¤Ê¤ê¤Þ¤¹¡£
+¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢¥Õ¥¡¥¤¥ë
+.Dq DiG.env
+¤¬¸½ºß¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ë
ºîÀ®¤µ¤ì¤Þ¤¹¡£
-.sp 1
-\fBÃí°Õ:\fP LOCALDEF ¤Ï¡¢ \fIdig\fP ¤Î¥ê¥¾¥ë¥Ð¸ÇÍ­¤Ç¤¢¤ê¡¢
+.Pp
+.Em Ãí¼á:
+.Ev LOCALDEF
+¤Ï¡¢
+.Ic dig
+¤Î¥ê¥¾¥ë¥Ð¸ÇÍ­¤Ç¤¢¤ê¡¢
ɸ½à¤Î¥ê¥¾¥ë¥Ð¥é¥¤¥Ö¥é¥ê¤ÎÁàºî¤Ë¤Ï±Æ¶Á¤òÍ¿¤¨¤Þ¤»¤ó¡£
-.sp 1
-\fIdig\fP ¤¬¼Â¹Ô¤µ¤ì¤ëÅ٤ˡ¢ "./DiG.env" ¤Þ¤¿¤Ï¥·¥§¥ë´Ä¶­ÊÑ¿ô
-LOCALDEF ¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬Ãµ¤µ¤ì¤Þ¤¹¡£¤½¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤¬
+.Pp
+.Ic dig
+¤¬¼Â¹Ô¤µ¤ì¤ëÅ٤ˡ¢
+.Dq ./DiG.env
+¤Þ¤¿¤Ï¥·¥§¥ë´Ä¶­ÊÑ¿ô
+.Ev LOCALDEF
+¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬Ãµ¤µ¤ì¤Þ¤¹¡£¤½¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤¬
¸ºß¤·ÆÉ¤á¤ë¾ì¹ç¤Ï¡¢°ú¿ô¤ò²òÀϤ¹¤ëÁ°¤Ë¤³¤Î¥Õ¥¡¥¤¥ë¤«¤é´Ä¶­¤¬
ÆÉ¤ß¹þ¤Þ¤ì¤Þ¤¹¡£
-.IP "\-envset"
+.It Fl envset
¤³¤Î¥Õ¥é¥°¤Ï¡¢¥Ð¥Ã¥ÁÌ䤤¹ç¤ï¤»¤ò¼Â¹Ô¤¹¤ë»þ¤Ë¤À¤±±Æ¶Á¤¬¤¢¤ê¤Þ¤¹¡£
-\fIdig\fP ¥Ð¥Ã¥Á¥Õ¥¡¥¤¥ëÃæ¤Ç "\-envset" ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢
-¤³¤Î°ú¿ô¤¬²òÀϤµ¤ì¤¿¸å¤Î \fIdig\fP ´Ä¶­¤Ï¡¢
-¥Ð¥Ã¥Á¥Õ¥¡¥¤¥ë¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë´Ö¤â¤·¤¯¤Ï¡¢
-¼¡¤Î "\-envset" ¤¬»ØÄꤵ¤ì¤ë¤Þ¤Ç¤Î´Ö¤Ï
+.Ic dig
+¥Ð¥Ã¥Á¥Õ¥¡¥¤¥ëÃæ¤Ç
+.Dq Fl envset
+¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢
+¤³¤Î°ú¿ô¤¬²òÀϤµ¤ì¤¿¸å¤Î
+.Ic dig
+´Ä¶­¤Ï¡¢¥Ð¥Ã¥Á¥Õ¥¡¥¤¥ë¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë´Ö¤â¤·¤¯¤Ï¡¢¼¡¤Î
+.Dq Fl envset
+¤¬»ØÄꤵ¤ì¤ë¤Þ¤Ç¤Î´Ö¤Ï¡¢
¥Ç¥Õ¥©¥ë¥È¤Î´Ä¶­¤È¤Ê¤ê¤Þ¤¹¡£
-.IP "\-[no]stick"
+.It Xo
+.Fl Op Cm no
+.Ns Cm stick
+.Xc
¤³¤Î¥Õ¥é¥°¤Ï¡¢¥Ð¥Ã¥ÁÌ䤤¹ç¤ï¤»¼Â¹Ô¤Ë¤À¤±±Æ¶Á¤òÍ¿¤¨¤Þ¤¹¡£
-¤³¤ì¤Ï¡¢ \fIdig\fP ´Ä¶­¤ò \fIdig\fP ¥Ð¥Ã¥Á¥Õ¥¡¥¤¥ëÃæ¤Ç¤Î
-³ÆÌ䤤¹ç¤ï¤» (¹Ô) ¤ÎÁ°¤Ë (½é´ü¾õÂ֤⤷¤¯¤Ï¡¢"\-envset" ¤ÇÀßÄꤵ¤ì¤¿)
+¤³¤ì¤Ï¡¢
+.Ic dig
+´Ä¶­¤ò
+.Ic dig
+¥Ð¥Ã¥Á¥Õ¥¡¥¤¥ëÃæ¤Ç¤Î
+³ÆÌ䤤¹ç¤ï¤» (¹Ô) ¤ÎÁ°¤Ë (½é´ü¾õÂ֤⤷¤¯¤Ï¡¢
+.Dq Fl envset
+¤ÇÀßÄꤵ¤ì¤¿)
¸µ¤Î¾õÂÖ¤ËÌ᤹¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£
-¥Ç¥Õ¥©¥ë¥È¤Î "\-nostick" ¤Ï¡¢ \fIdig\fP ´Ä¶­¤ò²óÉü¤·¤Ê¤¤¤È¤¤¤¦°ÕÌ£¤Ç¤¹¤Î¤Ç¡¢
-\fIdig\fP ¥Ð¥Ã¥Á¥Õ¥¡¥¤¥ë¤Î³Æ¹Ô¤Ç»ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥ó¤Ï¡¢
-¸å¤Î¹Ô¤Ç¤â¤½¤Î¸ú²Ì¤¬»Ä¤Ã¤¿¤Þ¤Þ¤Ë¤Ê¤ê¤Þ¤¹ (¤Ä¤Þ¤ê "sticky" ¤Î
-¥Ç¥Õ¥©¥ë¥È¤Ë²óÉü¤µ¤ì¤Þ¤»¤ó)¡£
-
-.RE
-.IP "+<query option>"
-"+" ¤Ï¥Ñ¥±¥Ã¥ÈÌ䤤¹ç¤ï¤»Ãæ¤Î¥ª¥×¥·¥ç¥óÊѹ¹¤ä
-\fIdig\fP ½ÐÎÏ»ÅÍͤòÊѹ¹¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
+¥Ç¥Õ¥©¥ë¥È¤Î
+.Dq Fl nostick
+¤Ï¡¢
+.Ic dig
+´Ä¶­¤ò²óÉü¤·¤Ê¤¤¤È¤¤¤¦°ÕÌ£¤Ç¤¹¤Î¤Ç¡¢
+.Ic dig
+¥Ð¥Ã¥Á¥Õ¥¡¥¤¥ë¤Î³Æ¹Ô¤Ç»ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥ó¤Ï¡¢
+¸å¤Î¹Ô¤Ç¤â¤½¤Î¸ú²Ì¤¬»Ä¤Ã¤¿¤Þ¤Þ¤Ë¤Ê¤ê¤Þ¤¹ (¤Ä¤Þ¤ê
+.Dq sticky
+»þ¤Î¥Ç¥Õ¥©¥ë¥È¤Î¤è¤¦¤Ë¤Ï²óÉü¤µ¤ì¤Þ¤»¤ó)¡£
+.El
+.It Ic + Ns Aq Ar query option
+.Dq +
+¤Ï¥Ñ¥±¥Ã¥ÈÌ䤤¹ç¤ï¤»Ãæ¤Î¥ª¥×¥·¥ç¥óÊѹ¹¤ä
+.Ic dig
+½ÐÎÏ»ÅÍͤòÊѹ¹¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
¤³¤ì¤é¤Î¿¤¯¤Ï¡¢
-.IR nslookup (8)
+.Xr nslookup 8
¤Ç¼õ¤±Æþ¤ì¤é¤ì¤ë¥Ñ¥é¥á¡¼¥¿¤ÈƱ¤¸¤â¤Î¤Ç¤¹¡£
¥ª¥×¥·¥ç¥ó¤¬ÃͤòɬÍפȤ¹¤ë¾ì¹ç¡¢¤½¤Î»ØÄê·Á¼°¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-.sp 1
- +keyword[=value]
-.sp 1
+.Pp
+.Bd -ragged -offset indent-two
+.Ic +
+.Ns Ar keyword
+.Ns Op = Ns Ar value
+.Ed
+.Pp
¤Û¤È¤ó¤É¤Î¥­¡¼¥ï¡¼¥É¤Ï¡¢¾Êά¤¬²Äǽ¤Ç¤¹¡£
-"+" ¥ª¥×¥·¥ç¥ó¤Î²ò¼á¤ÏÈó¾ï¤Ëñ½ã¤Ç¤¹¡£
+.Dq +
+¥ª¥×¥·¥ç¥ó¤Î²ò¼á¤ÏÈó¾ï¤Ëñ½ã¤Ç¤¹¡£
Ãͤϥ­¡¼¥ï¡¼¥É¤È¥¹¥Ú¡¼¥¹¤Ç¶èÀڤäƤϤʤê¤Þ¤»¤ó¡£
°Ê²¼¤Î¥­¡¼¥ï¡¼¥É¤¬¸½ºßÍøÍѲÄǽ¤Ç¤¹¡£
-.sp 1
-.nf
-.ta \w'domain=NAMEXX'u +\w'(deb)XXX'u
+.Pp
+.Pp
¥­¡¼¥ï¡¼¥É ¾Êά·Á °ÕÌ£ [¥Ç¥Õ¥©¥ë¥È]
-
-[no]debug (deb) ¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤òÊѹ¹ [deb]
-[no]d2 ÄɲäΥǥХ尥⡼¥É¤òÊѹ¹ [nod2]
-[no]recurse (rec) ºÆµ¢ÅªÃµº÷¤ò»È¤¦¤«¤É¤¦¤«»ØÄê [rec]
-retry=# (ret) ºÆ»î¹Ô¤Î²ó¿ô¤ò # ¤ËÀßÄê [4]
-time=# (ti) ¥¿¥¤¥à¥¢¥¦¥È»þ´Ö¤ò # ÉäËÀßÄê [4]
-[no]ko ·Ò¤²¤Æ¤ª¤¯¥ª¥×¥·¥ç¥ó(vc ¤ò°ÅÌÛ»ØÄê) [noko]
-[no]vc ²¾ÁÛ²óÀþ¤ò»È¤¦¤«¤É¤¦¤«»ØÄê [novc]
-[no]defname (def) ¥Ç¥Õ¥©¥ë¥È¥É¥á¥¤¥ó̾¤ò»È¤¦¤«¤É¤¦¤«»ØÄê [def]
-[no]search (sea) ¥É¥á¥¤¥ó¥µ¡¼¥Á¥ê¥¹¥È¤ò»È¤¦¤«¤É¤¦¤«»ØÄê [sea]
-domain=NAME (do) ¥Ç¥Õ¥©¥ë¥È¥É¥á¥¤¥ó̾¤ò NAME ¤Ë»ØÄê
-[no]ignore (i) trunc. ¥¨¥é¡¼¤ò̵»ë¤¹¤ë¤«¤É¤¦¤«»ØÄê [noi]
-[no]primary (pr) ¥×¥é¥¤¥Þ¥ê¥µ¡¼¥Ð¤ò»È¤¦¤«¤É¤¦¤«»ØÄê [nopr]
-[no]aaonly (aa) ¸¢°Ò¤ò»ý¤Ã¤¿Ì䤤¹ç¤ï¤»¤Î¤ß¤Î¥Õ¥é¥° [noaa]
-[no]sort (sor) ¥ê¥½¡¼¥¹¥ì¥³¡¼¥É¤òÀ°Îó [nosor]
-[no]cmd ²òÀϤµ¤ì¤¿°ú¿ô¤òɽ¼¨ [cmd]
-[no]stats (st) Ì䤤¹ç¤ï¤»¤ÎÅý·×¤òɽ¼¨ [st]
-[no]Header (H) ´ðËÜŪ¤Ê¥Ø¥Ã¥À¤òɽ¼¨ [H]
-[no]header (he) ¥Ø¥Ã¥À¥Õ¥é¥°¤òɽ¼¨ [he]
-[no]ttlid (tt) TTL ¤òɽ¼¨ [tt]
-[no]cl ¥¯¥é¥¹¾ðÊó¤òɽ¼¨ [nocl]
-[no]qr ½Ð¤Æ¹Ô¤Ã¤¿Ì䤤¹ç¤ï¤»¤òɽ¼¨ [noqr]
-[no]reply (rep) ±þÅúÀá¤òɽ¼¨ [rep]
-[no]ques (qu) ¼ÁÌäÀá¤òɽ¼¨ [qu]
-[no]answer (an) ²òÅúÀá¤òɽ¼¨ [an]
-[no]author (au) ¸¢°ÒÀá¤òɽ¼¨ [au]
-[no]addit (ad) ²Ã¤¨¤é¤ì¤¿Àá¤òɽ¼¨ [ad]
-pfdef ¥Ç¥Õ¥©¥ë¥Èɽ¼¨¥Õ¥é¥°¤òÀßÄê
-pfmin ºÇ¾®¤Î¥Ç¥Õ¥©¥ë¥Èɽ¼¨¥Õ¥é¥°¤òÀßÄê
-pfset=# ɽ¼¨¥Õ¥é¥°¤ò # ¤ËÀßÄê
- (# ¤Ï 16 ¿Ê /8 ¿Ê/10 ¿Ê¤¬²Äǽ¤Ç¤¹)
-pfand=# ɽ¼¨¥Õ¥é¥°¤Ë # ¤È¤Î¥Ó¥Ã¥ÈÏÀÍýÀÑ (and) ŬÍÑ
-pfor=# ɽ¼¨¥Õ¥é¥°¤Ë # ¤È¤Î¥Ó¥Ã¥ÈÏÀÍýÏ (or) ŬÍÑ
-.fi
-.sp 1
-ºÆ»î¹Ô²ó¿ô¤È»þ´Ö¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢Ì䤤¹ç¤ï¤»¥Ç¡¼¥¿¥°¥é¥à¤òÁ÷¤ëºÝ¤Ë¡¢
+.Pp
+.Bl -tag -width "[no]primary (ret) " -compact
+.It Xo
+.Op Cm no
+.Ns Cm debug\ \ \ \
+.Pq Cm deb
+.Xc
+¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤òÊѹ¹
+.Bq Cm deb
+.It Xo
+.Op Cm no
+.Ns Cm d2\ \ \ \ \ \ \ \ \ \
+.Xc
+ÄɲäΥǥХ尥⡼¥É¤òÊѹ¹
+.Bq Cm nod2
+.It Xo
+.Op Cm no
+.Ns Cm recurse\ \
+.Pq Cm rec
+.Xc
+ºÆµ¢ÅªÃµº÷¤ò»È¤¦¤«¤É¤¦¤«»ØÄê
+.Bq Cm rec
+.It Xo
+.Cm retry= Ns Ar #
+.Cm \ \ \ \ \
+.Pq Cm ret
+.Xc
+ºÆ»î¹Ô¤Î²ó¿ô¤ò # ¤ËÀßÄê
+.Bq 4
+.It Xo
+.Cm time= Ns Ar #
+.Cm \ \ \ \ \ \
+.Pq Cm ti
+.Xc
+¥¿¥¤¥à¥¢¥¦¥È»þ´Ö¤ò # ÉäËÀßÄê
+.Bq 4
+.It Xo
+.Op Cm no
+.Ns Cm ko
+.Xc
+·Ò¤²¤Æ¤ª¤¯¥ª¥×¥·¥ç¥ó(vc ¤ò°ÅÌÛ»ØÄê)
+.Bq Cm noko
+.It Xo
+.Op Cm no
+.Ns Cm vc
+.Xc
+²¾ÁÛ²óÀþ¤ò»È¤¦¤«¤É¤¦¤«»ØÄê
+.Bq Cm novc
+.It Xo
+.Op Cm no
+.Ns Cm defname\ \
+.Pq Cm def
+.Xc
+¥Ç¥Õ¥©¥ë¥È¥É¥á¥¤¥ó̾¤ò»È¤¦¤«¤É¤¦¤«»ØÄê
+.Bq Cm def
+.It Xo
+.Op Cm no
+.Ns Cm search\ \ \
+.Pq Cm sea
+.Xc
+¥É¥á¥¤¥ó¥µ¡¼¥Á¥ê¥¹¥È¤ò»È¤¦¤«¤É¤¦¤«»ØÄê
+.Bq Cm sea
+.It Xo
+.Cm domain= Ns Ar NAME\ \
+.Pq Cm do
+.Xc
+¥Ç¥Õ¥©¥ë¥È¥É¥á¥¤¥ó̾¤ò
+.Ar NAME
+¤Ë»ØÄê
+.It Xo
+.Op Cm no
+.Ns Cm ignore\ \ \
+.Pq Cm i
+.Xc
+trunc. ¥¨¥é¡¼¤ò̵»ë¤¹¤ë¤«¤É¤¦¤«»ØÄê
+.Bq Cm noi
+.It Xo
+.Op Cm no
+.Ns Cm primary\ \
+.Pq Cm pr
+.Xc
+¥×¥é¥¤¥Þ¥ê¥µ¡¼¥Ð¤ò»È¤¦¤«¤É¤¦¤«»ØÄê
+.Bq Cm nopr
+.It Xo
+.Op Cm no
+.Ns Cm aaonly\ \ \
+.Pq Cm aa
+.Xc
+¸¢°Ò¤ò»ý¤Ã¤¿Ì䤤¹ç¤ï¤»¤Î¤ß¤Î¥Õ¥é¥°
+.Bq Cm noaa
+.It Xo
+.Op Cm no
+.Ns Cm cmd
+.Xc
+²òÀϤµ¤ì¤¿°ú¿ô¤òɽ¼¨
+.Bq Cm cmd
+.It Xo
+.Op Cm no
+.Ns Cm stats\ \ \ \
+.Pq Cm st
+.Xc
+Ì䤤¹ç¤ï¤»¤ÎÅý·×¤òɽ¼¨
+.Bq Cm st
+.It Xo
+.Op Cm no
+.Ns Cm Header\ \ \
+.Pq Cm H
+.Xc
+´ðËÜŪ¤Ê¥Ø¥Ã¥À¤òɽ¼¨
+.Bq Cm H
+.It Xo
+.Op Cm no
+.Ns Cm header\ \ \
+.Pq Cm he
+.Xc
+¥Ø¥Ã¥À¥Õ¥é¥°¤òɽ¼¨
+.Bq Cm he
+.It Xo
+.Op Cm no
+.Ns Cm ttlid\ \ \ \
+.Pq Cm tt
+.Xc
+TTL ¤òɽ¼¨
+.Bq Cm tt
+.It Xo
+.Op Cm no
+.Ns Cm cl
+.Xc
+¥¯¥é¥¹¾ðÊó¤òɽ¼¨
+.Bq Cm nocl
+.It Xo
+.Op Cm no
+.Ns Cm qr
+.Xc
+½Ð¤Æ¹Ô¤Ã¤¿Ì䤤¹ç¤ï¤»¤òɽ¼¨
+.Bq Cm noqr
+.It Xo
+.Op Cm no
+.Ns Cm reply\ \ \ \
+.Pq Cm rep
+.Xc
+±þÅúÀá¤òɽ¼¨
+.Bq Cm rep
+.It Xo
+.Op Cm no
+.Ns Cm ques\ \ \ \ \
+.Pq Cm qu
+.Xc
+¼ÁÌäÀá¤òɽ¼¨
+.Bq Cm qu
+.It Xo
+.Op Cm no
+.Ns Cm answer\ \ \
+.Pq Cm an
+.Xc
+²óÅúÀá¤òɽ¼¨
+.Bq Cm an
+.It Xo
+.Op Cm no
+.Ns Cm author\ \ \
+.Pq Cm au
+.Xc
+¸¢°ÒÀá¤òɽ¼¨
+.Bq Cm au
+.It Xo
+.Op Cm no
+.Ns Cm addit\ \ \ \
+.Pq Cm ad
+.Xc
+ÄɲÃÀá¤òɽ¼¨
+.Bq Cm ad
+.It Cm pfdef
+¥Ç¥Õ¥©¥ë¥Èɽ¼¨¥Õ¥é¥°¤òÀßÄê
+.It Cm pfmin
+ºÇ¾®¤Î¥Ç¥Õ¥©¥ë¥Èɽ¼¨¥Õ¥é¥°¤òÀßÄê
+.It Cm pfset= Ns Ar #
+ɽ¼¨¥Õ¥é¥°¤ò # ¤ËÀßÄê
+(# ¤Ï 16 ¿Ê /8 ¿Ê/10 ¿Ê¤¬²Äǽ¤Ç¤¹)
+.It Cm pfand= Ns Ar #
+ɽ¼¨¥Õ¥é¥°¤Ë # ¤È¤Î¥Ó¥Ã¥ÈÏÀÍýÀÑ (and) ŬÍÑ
+.It Cm pfor= Ns Ar #
+ɽ¼¨¥Õ¥é¥°¤Ë # ¤È¤Î¥Ó¥Ã¥ÈÏÀÍýÏ (or) ŬÍÑ
+.El
+.Pp
+.Cm ºÆ»î¹Ô²ó¿ô
+¤È
+.Cm »þ´Ö
+¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢Ì䤤¹ç¤ï¤»¥Ç¡¼¥¿¥°¥é¥à¤òÁ÷¤ëºÝ¤Ë¡¢
¥ê¥¾¥ë¥Ð¥é¥¤¥Ö¥é¥ê¤Ë¤è¤Ã¤Æ»È¤ï¤ì¤ëºÆÁ÷Àïά¤Ë±Æ¶Á¤òÍ¿¤¨¤Þ¤¹¡£
¥¢¥ë¥´¥ê¥º¥à¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹
-.sp 1
-.in +5n
-.nf
-for i = 0 to retry \- 1
+.Pp
+.Bd -literal -offset indent
+for i = 0 to retry - 1
for j = 1 to num_servers
send_query
wait((time * (2**i)) / num_servers)
end
end
-.fi
-.in -5n
-.sp 1
-(Ãí°Õ: \fIdig\fP ¤Ï¤¤¤Ä¤â num_servers ¤È¤·¤ÆÃÍ 1 ¤ò»È¤¤¤Þ¤¹¡£)
-.SH ¾ÜºÙ
-\fIdig\fP ¤Ï¡¢¤«¤Ä¤Æ BIND¤Î
-.IR resolver (3)
+.Ed
+.Pp
+(Ãí¼á:
+.Ic dig
+¤Ï¤¤¤Ä¤â
+.Dq Li num_servers
+¤È¤·¤ÆÃÍ 1 ¤ò»È¤¤¤Þ¤¹¡£)
+.El
+.Ss ¾ÜºÙ
+.Ic dig
+¤Ï¡¢¤«¤Ä¤Æ BIND¤Î
+.Xr resolver 3
¥é¥¤¥Ö¥é¥ê¤ÎÊѹ¹ÈǤòÍ׵ᤷ¤Þ¤·¤¿¡£
-BIND ¤Î¥ê¥¾¥ë¥Ð¤Ï¡¢(BIND 4.9¤Î¤è¤¦¤Ë) \fIdig\fP ¤òÀµ¤·¤¯
-ưºî¤µ¤»¤ë¤è¤¦¤Ë¤Ê¤Ã¤ÆÍè¤Æ¤¤¤Þ¤¹¡£ËܼÁŪ¤Ë¡¢ \fIdig\fP ¤Ï¡¢
-°ú¿ô¤Î²ò¼á¤Ë(¤È¤Æ¤âÎɤ¯¤Ï̵¤¤¤Ç¤¹¤¬)ÅØÎϤ·¡¢Å¬Åö¤Ê¥Ñ¥é¥á¡¼¥¿¤ò
-ÀßÄꤷ¤Þ¤¹¡£\fIdig\fP ¤Ï
-¥ê¥¾¥ë¥Ð¤Î´Ø¿ô res_init(), res_mkquery(), res_send() ¤ò»È¤¤¡¢
-¤Þ¤¿ _res ¹½Â¤ÂΤòÁàºî¤·¤Þ¤¹¡£
-.SH ´ØÏ¢¥Õ¥¡¥¤¥ë
-.ta \w'/etc/resolv.confXX'u
-/etc/resolv.conf ½é´ü¾õÂ֤Υɥᥤ¥ó̾¤È¥Í¡¼¥à¥µ¡¼¥Ð
-\&./DiG.env ¥Ç¥Õ¥©¥ë¥È¥ª¥×¥·¥ç¥ó¤òÊݸ¤¹¤ë¥Ç¥Õ¥©¥ë¥È¥Õ¥¡¥¤¥ë
-.br
-.SH ´Ä¶­ÊÑ¿ô
-LOCALRES /etc/resolv.conf ¤ÎÂå¤ï¤ê¤Ë»È¤¦¥Õ¥¡¥¤¥ë
-.br
-LOCALDEF ¥Ç¥Õ¥©¥ë¥È¤Î´Ä¶­¥Õ¥¡¥¤¥ë
-.SH ºî¼Ô
+BIND ¤Î¥ê¥¾¥ë¥Ð¤Ï¡¢(BIND 4.9¤Î¤è¤¦¤Ë)
+.Ic dig
+¤òÀµ¤·¤¯Æ°ºî¤µ¤»¤ë¤è¤¦¤Ë¤Ê¤Ã¤ÆÍè¤Æ¤¤¤Þ¤¹¡£ËܼÁŪ¤Ë¤Ï¡¢
+.Ic dig
+¤Ï¡¢°ú¿ô¤Î²ò¼á¤ÈŬÀڤʥѥé¥á¡¼¥¿ÀßÄê¤ò(¸«»ö¤Ë¤Ç¤Ï¤Ê¤¯)´ľ¤Ë¹Ô¤¦¤â¤Î¤Ç¤¹¡£
+.Ic dig
+¤Ï¥ê¥¾¥ë¥Ð¤Î´Ø¿ô
+.Fn res_init ,
+.Fn res_mkquery ,
+.Fn res_send
+¤ò»È¤¤¡¢¤Þ¤¿
+.Ft _res
+¹½Â¤ÂΤòÁàºî¤·¤Þ¤¹¡£
+.Sh ´Ä¶­ÊÑ¿ô
+.Bl -tag -width "LOCALRES " -compact
+.It Ev LOCALRES
+.Pa /etc/resolv.conf
+¤ÎÂå¤ï¤ê¤Ë»È¤¦¥Õ¥¡¥¤¥ë
+.It Ev LOCALDEF
+¥Ç¥Õ¥©¥ë¥È¤Î´Ä¶­¥Õ¥¡¥¤¥ë
+.El
+.Pp
+¾å½Ò¤·¤¿
+.Fl envsav ,
+.Fl envset ,
+.Xo
+.Fl Op Cm no
+.Ns Cm stick
+.Xc
+¥ª¥×¥·¥ç¥ó¤ÎÀâÌÀ¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+.Sh ´ØÏ¢¥Õ¥¡¥¤¥ë
+.Bl -tag -width "/etc/resolv.conf " -compact
+.It Pa /etc/resolv.conf
+½é´ü¾õÂ֤Υɥᥤ¥ó̾¤È¥Í¡¼¥à¥µ¡¼¥Ð¤Î¥¢¥É¥ì¥¹
+.It Pa \./DiG.env
+¥Ç¥Õ¥©¥ë¥È¥ª¥×¥·¥ç¥ó¤òÊݸ¤¹¤ë¥Ç¥Õ¥©¥ë¥È¥Õ¥¡¥¤¥ë
+.El
+.Sh ´ØÏ¢¹àÌÜ
+.Xr named 8 ,
+.Xr resolver 3 ,
+.Xr resolver 5 ,
+.Xr nslookup 8
+.Sh µ¬³Ê
+RFC 1035
+.Sh ºî¼Ô
Steve Hotz
hotz@isi.edu
-.SH ¼Õ¼­
-\fIdig\fP ¤Ï¡¢ Andrew Cherenson ¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤¿
-.IR nslookup (8)
+.Sh ¼Õ¼­
+.Ic dig
+¤Ï¡¢Andrew Cherenson ¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤¿
+.Xr nslookup 8
¤Î´Ø¿ô¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£
-.SH ¥Ð¥°
-\fIdig\fP ¤Ï "Ç礤²ó¤ëµ¡Ç½¼çµÁ (creeping featurism)" ¤Î¿¼¹ï»öÎã --
+.Sh ¥Ð¥°
+.Ic dig
+¤Ï "Ç礤²ó¤ëµ¡Ç½¼çµÁ (creeping featurism)" ¤Î¿¼¹ï»öÎã --
³«È¯Ãæ¤ËÀøºßŪ¤ÊÍÑÅÓ¤ò¤¤¤¯¤Ä¤«¹Í¤¨¤¿·ë²Ì¤Ç¤¹¡£
¤ª¤½¤é¤¯²×¹ó¤Ê¥À¥¤¥¨¥Ã¥È¤¬Í­¸ú¤Ç¤·¤ç¤¦¡£
ƱÍͤˡ¢É½¼¨¥Õ¥é¥°¤È¹àÌܤÎγÅ٤ϡ¢¤½¤Î¾ì¸Â¤ê¤Ç
À¸¤Þ¤ì¤¿¤â¤Î¤Ç¡¢Â¸ºßÍýͳ¤Ï¤½¤ì¤Û¤É¤¢¤ê¤Þ¤»¤ó¡£
-.PP
+.Pp
ÌäÂ꤬¥ê¥¾¥ë¥ÐÃæ¤Î¤É¤³¤«¤Çµ¯¤³¤Ã¤¿»þ¤Ë¡¢
-\fIdig\fP ¤Ï¡¢ (ŬÀڤʾõÂÖ¤ò»ý¤Ã¤Æ)°ì´ÓÀ­¤Î¤¢¤ë¤è¤¦¤Ë½ªÎ»¤·¤Þ¤»¤ó
-(Ãí°Õ:ÂçÉôʬ¤Î¶¦Ä̤νªÎ»¾õÂ֤ϤÁ¤ã¤ó¤È°·¤¤¤Þ¤¹)¡£
+.Ic dig
+¤Ï¡¢(ŬÀڤʾõÂÖ¤ò»ý¤Ã¤Æ)°ì´ÓÀ­¤Î¤¢¤ë¤è¤¦¤Ë½ªÎ»¤·¤Þ¤»¤ó
+.Po Sy Ãí¼á:
+ÂçÉôʬ¤Î¶¦Ä̤νªÎ»¾õÂ֤ϤÁ¤ã¤ó¤È°·¤¤¤Þ¤¹
+.Pc ¡£
¤³¤ì¤Ï¡¢¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¼Â¹Ô¤·¤Æ¤¤¤ë»þ¤ËÆÃ¤ËǺ¤Þ¤µ¤ì¤Þ¤¹¡£
°Û¾ï½ªÎ»¤·¤¿»þ(¤µ¤é¤Ë¤½¤ì¤òÊá¤Þ¤¨¤é¤ì¤Ê¤«¤Ã¤¿»þ)¡¢¥Ð¥Ã¥ÁÁ´ÂΤ¬½ªÎ»¤·¤Þ¤¹¡£
-¤½¤Î¤è¤¦¤Ê¥¤¥Ù¥ó¥È¤ò¤È¤é¤¨¤¿»þ¡¢ \fIdig\fP ¤Ïñ¤Ë¼¡¤ÎÌ䤤¹ç¤ï¤»¤ò
+¤½¤Î¤è¤¦¤Ê¥¤¥Ù¥ó¥È¤ò¤È¤é¤¨¤¿»þ¡¢
+.Ic dig
+¤Ïñ¤Ë¼¡¤ÎÌ䤤¹ç¤ï¤»¤ò
³¤±¤Þ¤¹¡£
-.SH ´ØÏ¢¹àÌÜ
-named(8), resolver(3), resolver(5), nslookup(8)
diff --git a/ja/man/man1/dnsquery.1 b/ja/man/man1/dnsquery.1
index 90843421bf..2d563a00fc 100644
--- a/ja/man/man1/dnsquery.1
+++ b/ja/man/man1/dnsquery.1
@@ -1,163 +1,180 @@
-.TH DNSQUERY 1 "10 March 1990"
+.\" %Id: dnsquery.1,v 8.2 1997/03/14 02:29:41 vixie Exp %
+.\"
+.\"Copyright (c) 1995, 1996 by Internet Software Consortium
+.\"
+.\"Permission to use, copy, modify, and distribute this software for any
+.\"purpose with or without fee is hereby granted, provided that the above
+.\"copyright notice and this permission notice appear in all copies.
+.\"
+.\"THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+.\"ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+.\"OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+.\"CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+.\"DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+.\"PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+.\"ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+.\"SOFTWARE.
+.\"
.\" jpman %Id: dnsquery.1,v 1.3 1997/08/20 12:21:56 horikawa Stab %
-.UC 6
-.SH ̾¾Î
-dnsquery \- ¥ê¥¾¥ë¥Ð¤òÍѤ¤¤Æ DNS ¤ËÌ䤤¹ç¤ï¤»¤ë
-.SH ½ñ¼°
-.B dnsquery
-[-n
-.I nameserver]
-[-t
-.I type]
-[-c
-.I class]
-[-r
-.I retry]
-[-p
-.I retry period]
-[-d] [-s] [-v] host
-.SH ²òÀâ
-.IR dnsquery
+.\"
+.Dd March 10, 1990
+.Dt DNSQUERY 1
+.Os BSD 4
+.Sh ̾¾Î
+.Nm dnsquery
+.Nd ¥ê¥¾¥ë¥Ð¤òÍѤ¤¤Æ DNS ¤ËÌ䤤¹ç¤ï¤»¤ë
+.Sh ½ñ¼°
+.Nm dnsquery
+.Op Fl n Ar nameserver
+.Op Fl t Ar type
+.Op Fl c Ar class
+.Op Fl r Ar retry
+.Op Fl p Ar period
+.Op Fl d
+.Op Fl s
+.Op Fl v
+.Ar host
+.Sh ²òÀâ
+.Ic dnsquery
¥×¥í¥°¥é¥à¤Ï¡¢BIND ¥ê¥¾¥ë¥Ð¤Î¥é¥¤¥Ö¥é¥ê¸Æ¤Ó½Ð¤·¤Ë¤è¤Ã¤Æ
¥Í¡¼¥à¥µ¡¼¥Ð¤È¤ä¤ê¤È¤ê¤¹¤ë°ìÈÌŪ¤Ê¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤¹¡£
ËÜ¥×¥í¥°¥é¥à¤Ï¥ª¥Ú¥³¡¼¥É QUERY ¤Ë¤è¤ë¥Í¡¼¥à¥µ¡¼¥ÐÌ䤤¹ç¤ï¤»¤ò
¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
ËÜ¥×¥í¥°¥é¥à¤Ï¡¢nstest, nsquery, nslookup ¤Î¤è¤¦¤Ê¥×¥í¥°¥é¥à¤ò
ÃÖ¤­´¹¤¨¤ë¤¢¤ë¤¤¤ÏÊ䤦¤â¤Î¤È¤·¤ÆºîÀ®¤µ¤ì¤Þ¤·¤¿¡£
-.IR host
+.Ar host
¤È
-.IR ns
+.Ar nameserver
°Ê³°¤Î°ú¿ô¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤»¤ó¡£
-.SH ¥ª¥×¥·¥ç¥ó
-.TP 1i
-.B \-n
+.Sh ¥ª¥×¥·¥ç¥ó
+.Bl -tag -width Fl
+.It Fl n Ar nameserver
Ì䤤¹ç¤ï¤»¤ËÍѤ¤¤ë¥Í¡¼¥à¥µ¡¼¥Ð¡£
¥Í¡¼¥à¥µ¡¼¥Ð»ØÄê¤Ï¡¢w.x.y.z ·Á¼°¤Î¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥¢¥É¥ì¥¹É½µ­¤Ç¤â¡¢
¥É¥á¥¤¥ó¥Í¡¼¥àɽµ­¤Ç¤â¹½¤¤¤Þ¤»¤ó¡£
-(¥Ç¥Õ¥©¥ë¥È: /etc/resolv.conf ¤Î»ØÄê)
-.TP 1i
-.B \-t
+(¥Ç¥Õ¥©¥ë¥È:
+.Pa /etc/resolv.conf
+¤Î»ØÄê¡£)
+.It Fl t Ar type
´Ø¿´¤¢¤ë¥ê¥½¡¼¥¹¥ì¥³¡¼¥É·¿¡£·¿¤Ë¤Ï°Ê²¼¤Î¤â¤Î¤¬¤¢¤ê¤Þ¤¹:
-.RS 1.5i
-.TP 1i
-A
+.Bl -tag -width "AFSDB " -compact -offset indent
+.It Ar A
¥¢¥É¥ì¥¹
-.PD 0
-.TP 1i
-NS
+.It Ar NS
¥Í¡¼¥à¥µ¡¼¥Ð
-.TP 1i
-CNAME
+.It Ar CNAME
Àµ¼°Ì¾
-.TP 1i
-PTR
-¥É¥á¥¤¥ó¥Í¡¼¥à¥Ý¥¤¥ó¥¿
-.TP 1i
-SOA
-Start of Authority
-.TP 1i
-WKS
-¤è¤¯ÃΤé¤ì¤¿¥µ¡¼¥Ó¥¹(well-known service)
-.TP 1i
-HINFO
+.It Ar PTR
+¥É¥á¥¤¥ó¥Í¡¼¥à¤Ø¤Î¥Ý¥¤¥ó¥¿
+.It Ar SOA
+¸¢°Ò¤Î³«»Ï (Start of Authority)
+.It Ar WKS
+¤è¤¯ÃΤé¤ì¤¿¥µ¡¼¥Ó¥¹ (well-known service)
+.It Ar HINFO
¥Û¥¹¥È¾ðÊó
-.TP 1i
-MINFO
+.It Ar MINFO
¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¾ðÊó
-.TP 1i
-MX
-¥á¡¼¥ë¸ò´¹(mail exchange)
-.TP 1i
-RP
-responsible person
-.TP 1i
-MG
+.It Ar MX
+¥á¡¼¥ë¥¨¥¯¥¹¥Á¥§¥ó¥¸ (mail exchange)
+.It Ar RP
+ÀÕǤ¼Ô (responsible person)
+.It Ar MG
¥á¡¼¥ë¥°¥ë¡¼¥×¥á¥ó¥Ð
-.TP 1i
-AFSDB
+.It Ar AFSDB
DCE ¤Þ¤¿¤Ï AFS ¥µ¡¼¥Ð
-.TP 1i
-ANY
+.It Ar ANY
¥ï¥¤¥ë¥É¥«¡¼¥É
-.RE
-.PD
-.IP
-Âçʸ»ú¾®Ê¸»ú¤É¤Á¤é¤Ç¤â»ÈÍѤǤ­¤Þ¤¹¡£(¥Ç¥Õ¥©¥ë¥È: ANY)
-.TP 1i
-.B \-c
+.El
+.Pp
+Âçʸ»ú¾®Ê¸»ú¤É¤Á¤é¤Ç¤â»ÈÍѤǤ­¤Þ¤¹¡£(¥Ç¥Õ¥©¥ë¥È:
+.Ar ANY
+)¡£
+.It Fl c Ar class
´Ø¿´¤¢¤ë¥ê¥½¡¼¥¹¥ì¥³¡¼¥É¤Î¥¯¥é¥¹¡£¥¯¥é¥¹¤Ë¤Ï°Ê²¼¤Î¤â¤Î¤¬¤¢¤ê¤Þ¤¹:
-.RS 2i
-.TP 1i
-IN
+.Bl -tag -width "CHAOS " -compact -offset indent
+.It Ar IN
¥¤¥ó¥¿¡¼¥Í¥Ã¥È
-.PD 0
-.TP 1i
-HS
+.It Ar HS
Hesiod
-.TP 1i
-CHAOS
+.It Ar CHAOS
Chaos
-.TP 1i
-ANY
+.It Ar ANY
¥ï¥¤¥ë¥É¥«¡¼¥É
-.RE
-.PD
-.IP
-Âçʸ»ú¾®Ê¸»ú¤É¤Á¤é¤Ç¤â»ÈÍѤǤ­¤Þ¤¹¡£(¥Ç¥Õ¥©¥ë¥È: IN)
-.TP 1i
-.B \-r
+.El
+.Pp
+Âçʸ»ú¾®Ê¸»ú¤É¤Á¤é¤Ç¤â»ÈÍѤǤ­¤Þ¤¹¡£(¥Ç¥Õ¥©¥ë¥È:
+.Ar IN
+)¡£
+.It Fl r Ar retry
¥Í¡¼¥à¥µ¡¼¥Ð¤¬±þÅú¤·¤Ê¤¤¾ì¹ç¤Î¥ê¥È¥é¥¤²ó¿ô¡£(¥Ç¥Õ¥©¥ë¥È: 4)
-.TP 1i
+.It Fl p Ar period
.B \-p
-¥¿¥¤¥à¥¢¥¦¥È»þ´Ö(ÉÃ)¡£ (¥Ç¥Õ¥©¥ë¥È: RES_TIMEOUT)
-.\" °Ê²¼¤Î 2¹Ô¤ÏÁ°¸å¤Î¤Ä¤Ê¤¬¤êÉÔÌÀ¡£±Ñ¸ìÈǤÎÃʳ¬¤Ç·çÍ¤ê?? (jpman ¼ò°æ)
-.\" .IR options
-.\" field. (default: any answer)
-.\" -a ¥ª¥×¥·¥ç¥óºï½ü»þ¤Î¥´¥ß¤À¤È»×¤¤¤Þ¤¹(horikawa@jp.freebsd.org)
-.TP 1i
-.B \-d
+¥¿¥¤¥à¥¢¥¦¥È»þ´Ö(ÉÃ)¡£(¥Ç¥Õ¥©¥ë¥È:
+.Dv RES_TIMEOUT
+)¡£
+.It Fl d
¥Ç¥Ð¥Ã¥°µ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¡£¥ê¥¾¥ë¥Ð¤Î
-.IR options
-¥Õ¥£¡¼¥ë¥É¤Î RES_DEBUG ¥Ó¥Ã¥È¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£(¥Ç¥Õ¥©¥ë¥È: ¥Ç¥Ð¥Ã¥°µ¡Ç½¥ª¥Õ)
-.TP 1i
-.B \-s
+.Ft options
+¥Õ¥£¡¼¥ë¥É¤Î
+.Dv RES_DEBUG
+¥Ó¥Ã¥È¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£(¥Ç¥Õ¥©¥ë¥È: ¥Ç¥Ð¥Ã¥°µ¡Ç½¥ª¥Õ)
+.It Fl s
¥Ñ¥±¥Ã¥È¤Ç¤Ï¤Ê¤¯
-.IR ¥¹¥È¥ê¡¼¥à
+.Em ¥¹¥È¥ê¡¼¥à
¤òÍѤ¤¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥Í¡¼¥à¥µ¡¼¥Ð¤È¤ÎÀܳ¤Ë UDP ¥Ç¡¼¥¿¥°¥é¥à¤Ç¤Ï¤Ê¤¯¡¢
TCP ¥¹¥È¥ê¡¼¥à¤òÍѤ¤¤Þ¤¹¡£¥ê¥¾¥ë¥Ð¤Î
-.IR options
-¥Õ¥£¡¼¥ë¥É¤Î RES_USEVC ¥Ó¥Ã¥È¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£(¥Ç¥Õ¥©¥ë¥È: UDP)
-.TP 1i
-.B \-v
-¥ª¥×¥·¥ç¥ó 's' ¤ÈƱ¤¸°ÕÌ£¤Ç¤¹¡£
-.TP 1i
-.B host
+.Ft options
+¥Õ¥£¡¼¥ë¥É¤Î
+.Dv RES_USEVC
+¥Ó¥Ã¥È¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£(¥Ç¥Õ¥©¥ë¥È: UDP ¥Ç¡¼¥¿¥°¥é¥à)
+.It Fl v
+¥ª¥×¥·¥ç¥ó
+.Dq Fl s
+¤ÈƱ¤¸°ÕÌ£¤Ç¤¹¡£
+.It Ar host
´Ø¿´¤¢¤ë¥Û¥¹¥È̾(¤¢¤ë¤¤¤Ï¥É¥á¥¤¥ó̾)¡£
-.SH ´ØÏ¢¥Õ¥¡¥¤¥ë
-/etc/resolv.conf ¥Ç¥Õ¥©¥ë¥È¤Î¥Í¡¼¥à¥µ¡¼¥Ð¤È¸¡º÷¥ê¥¹¥È
-.br
-<arpa/nameser.h> ÍøÍѤǤ­¤ë RR ¥¿¥¤¥×¤È¥¯¥é¥¹¤Î°ìÍ÷
-.br
-<resolv.h> ¥ê¥¾¥ë¥Ð¤Î¥Õ¥é¥°°ìÍ÷
-.SH ´ØÏ¢¹àÌÜ
-nslookup(8), nstest(1), nsquery(1),
-named(8), resolver(5)
-.SH ¿ÇÃÇ
+.El
+.Sh ´ØÏ¢¥Õ¥¡¥¤¥ë
+.Bl -tag -width "<arpa/nameser.h> " -compact
+.It Pa /etc/resolv.conf
+¥Ç¥Õ¥©¥ë¥È¤Î¥Í¡¼¥à¥µ¡¼¥Ð¤È¸¡º÷¥ê¥¹¥È
+.It Pa <arpa/nameser.h>
+ÍøÍѤǤ­¤ë RR ¥¿¥¤¥×¤È¥¯¥é¥¹¤Î°ìÍ÷
+.It Pa <resolv.h>
+¥ê¥¾¥ë¥Ð¤Î¥Õ¥é¥°°ìÍ÷
+.El
+.Sh ¿ÇÃÇ
¥ê¥¾¥ë¥Ð¤¬Ì䤤¹ç¤ï¤»¤Î²óÅú¤Ë¼ºÇÔ¤·¡¢¥Ç¥Ð¥Ã¥°µ¡Ç½¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢
-.IR dnsquery
+.Ic dnsquery
¤Ïñ¤Ë°Ê²¼¤Î¤è¤¦¤Ê¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹:
-.TP 1i
-Query failed (rc = 1) : Unknown host
-.LP
-¥ê¥¿¡¼¥ó¥³¡¼¥É¤ÎÃÍ¤Ï h_errno ¤«¤éÆÀ¤Þ¤¹¡£
-.SH ¥Ð¥°
-IN °Ê³°¤Î¥¯¥é¥¹¤òÌ䤤¹ç¤ï¤»¤ë¤ÈÌÌÇò¤¤·ë²Ì¤¬ÆÀ¤é¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-¤È¤¤¤¦¤Î¤Ï¡¢¥Í¡¼¥à¥µ¡¼¥Ð¤ÏÉáÄÌ¡¢¥¯¥é¥¹ IN ¤Î¥ê¥½¡¼¥¹¥ì¥³¡¼¥É¤È¤·¤Æ
+.Dl Query failed (rc = 1) : Unknown host
+.Pp
+¥ê¥¿¡¼¥ó¥³¡¼¥É¤ÎÃͤÏ
+.Ft h_errno
+¤«¤éÆÀ¤Þ¤¹¡£
+.Sh ´ØÏ¢¹àÌÜ
+.Xr nslookup 8 ,
+.Xr nstest 1 ,
+.Xr nsquery 1 ,
+.Xr named 8 ,
+.Xr resolver 5
+.Sh ºî¼Ô
+Bryan Beecher
+.Sh ¥Ð¥°
+.Ar IN
+°Ê³°¤Î¥¯¥é¥¹¤òÌ䤤¹ç¤ï¤»¤ë¤ÈÌÌÇò¤¤·ë²Ì¤¬ÆÀ¤é¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+¤È¤¤¤¦¤Î¤Ï¡¢¥Í¡¼¥à¥µ¡¼¥Ð¤ÏÉáÄÌ¡¢¥¯¥é¥¹
+.Ar IN
+¤Î¥ê¥½¡¼¥¹¥ì¥³¡¼¥É¤È¤·¤Æ
¥ë¡¼¥È¥Í¡¼¥à¥µ¡¼¥Ð¤Î¥ê¥¹¥È¤À¤±¤·¤«»ý¤Ã¤Æ¤¤¤Ê¤¤¤«¤é¤Ç¤¹¡£
-.PP
-ËÜ¥³¥Þ¥ó¥É¤Ï¡¢inet_addr() ¤ò¸Æ¤Ó½Ð¤·¤Æ `-n' ¥ª¥×¥·¥ç¥ó¤¬
+.Pp
+ËÜ¥³¥Þ¥ó¥É¤Ï¡¢
+.Fn inet_addr
+¤ò¸Æ¤Ó½Ð¤·¤Æ
+.Dq Fl n
+¥ª¥×¥·¥ç¥ó¤¬
Àµ¤·¤¤¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥¢¥É¥ì¥¹¤«¤É¤¦¤«¤òȽÃǤ·¤Þ¤¹¡£
-»Äǰ¤Ê¤¬¤é¡¢inet_addr() ¤Ï°ìÉô¤Î(Àµ¤·¤¯¤Ê¤¤)¥¢¥É¥ì¥¹(Î㤨¤Ð 1.2.3.4.5)¤Ë
+»Äǰ¤Ê¤¬¤é¡¢
+.Fn inet_addr
+¤Ï°ìÉô¤Î(Àµ¤·¤¯¤Ê¤¤)¥¢¥É¥ì¥¹(Î㤨¤Ð 1.2.3.4.5)¤Ë
ÂФ·¤Æ¥»¥°¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Õ¥©¡¼¥ë¥È¤òµ¯¤³¤¹¤³¤È¤¬¤¢¤ë¤è¤¦¤Ç¤¹¡£
-.SH ºî¼Ô
-Bryan Beecher
diff --git a/ja/man/man1/du.1 b/ja/man/man1/du.1
index 01dc8e86b0..1d58281470 100644
--- a/ja/man/man1/du.1
+++ b/ja/man/man1/du.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)du.1 8.2 (Berkeley) 4/1/94
-.\" %Id: du.1,v 1.6.2.3 1998/07/16 23:51:21 jkh Exp %
+.\" %Id: du.1,v 1.11 1998/05/13 07:57:39 phk Exp %
.\" jpman %Id: du.1,v 1.3 1997/06/18 16:43:08 horikawa Stab %
.\"
.Dd April 1, 1994
diff --git a/ja/man/man1/echo.1 b/ja/man/man1/echo.1
index ffec74b583..2dad7b2f43 100644
--- a/ja/man/man1/echo.1
+++ b/ja/man/man1/echo.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)echo.1 8.1 (Berkeley) 7/22/93
-.\" %Id: echo.1,v 1.3.2.1 1998/07/16 09:35:41 jkh Exp %
+.\" %Id: echo.1,v 1.6 1998/05/13 07:39:07 charnier Exp %
.\" jpman %Id: echo.1,v 1.2 1997/04/02 00:07:04 mutoh Stab %
.\"
.Dd July 22, 1993
diff --git a/ja/man/man1/ed.1 b/ja/man/man1/ed.1
index 45166b70d5..8dd6502f12 100644
--- a/ja/man/man1/ed.1
+++ b/ja/man/man1/ed.1
@@ -1,4 +1,4 @@
-.\" %Id: ed.1,v 1.8.2.4 1998/07/21 06:48:51 jkoshy Exp %
+.\" %Id: ed.1,v 1.14 1998/07/21 04:53:18 jkoshy Exp %
.\" jpman %Id: ed.1,v 1.2 1997/06/09 15:03:56 jsakai Stab %
.Dd May 21, 1993
.Dt ED 1
@@ -534,7 +534,7 @@
¤Îµ­½Ò·Á¼°¤Ï¡¢
.Em g
¥³¥Þ¥ó¥É¤Ç»ØÄꤹ¤ë¤â¤Î¤ÈƱ¤¸¤Ç¤¹¡£²þ¹Ô¤Î¤ß¤Î¾ì¹ç¤Ï¡¢¥³¥Þ¥ó¥É¼Â¹Ô¤ò¤·¤Ê¤¤
- ( ¥Ì¥ë¥³¥Þ¥ó¥É¥ê¥¹¥È¤ò»ØÄꤷ¤¿ ) ¤â¤Î¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£
+( ¥Ì¥ë¥³¥Þ¥ó¥É¥ê¥¹¥È¤ò»ØÄꤷ¤¿ ) ¤â¤Î¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£
`&' ʸ»ú¤Î¤ß¤òÆþÎϤ·¤¿¾ì¹ç¤Ë¤Ï¡¢
ľÁ°¤Ë¼Â¹Ô¤·¤¿ ( ¥Ì¥ë¥³¥Þ¥ó¥É¥ê¥¹¥È¤Ç¤Ï¤Ê¤¤ ) ¥³¥Þ¥ó¥É¤òºÆ¼Â¹Ô¤·¤Þ¤¹¡£
.It H
@@ -577,7 +577,7 @@ ed ¥¹¥¯¥ê¥×¥È¤òºîÀ®¤¹¤ë¾ì¹ç¡¢¥¹¥¯¥ê¥×¥È¤Î¥Ç¥Ð¥Ã¥°¤Î¤¿¤á¤Ë¡¢ËÜ¥³¥Þ¥ó¥É¤ò
¥³¥Þ¥ó¥É¤Î±¦ÊդǻØÄꤷ¤¿¹Ô¤Î¸å¤í¤Ë
°Üư¤µ¤ì¤Þ¤¹¡£°ÜưÀè¤Î¹Ô¤È¤·¤Æ¤Ï¡¢
.Em 0
- (¥¼¥í) ¤¬»ØÄê²Äǽ¤Ç¤¹¡£
+(¥¼¥í) ¤¬»ØÄê²Äǽ¤Ç¤¹¡£
¸½ºß¹ÔÈÖ¹æ¤Ï¡¢°Üư¤µ¤ì¤¿ºÇ¸å¤Î¹Ô¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
.It (.,.)n
»ØÄꤷ¤¿¹Ô¤ÎÆâÍÆ¤ò¡¢¹ÔÈÖ¹æ¤Ä¤­¤Çɽ¼¨¤·¤Þ¤¹¡£
diff --git a/ja/man/man1/ee.1 b/ja/man/man1/ee.1
index 4f991b7ade..75b8f268c2 100644
--- a/ja/man/man1/ee.1
+++ b/ja/man/man1/ee.1
@@ -1,5 +1,5 @@
.\"
-.\" %Id: ee.1,v 1.3.4.2 1998/03/08 08:09:00 jkh Exp %
+.\" %Id: ee.1,v 1.6 1998/02/02 07:09:36 charnier Exp %
.\"
.Dd August 30, 1995
.Dt EE 1
diff --git a/ja/man/man1/expr.1 b/ja/man/man1/expr.1
index d8abe8d978..1e9157656b 100644
--- a/ja/man/man1/expr.1
+++ b/ja/man/man1/expr.1
@@ -28,7 +28,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: expr.1,v 1.4.2.1 1998/07/15 02:01:24 jkh Exp %
+.\" %Id: expr.1,v 1.7 1998/05/13 07:43:56 charnier Exp %
.\" jpman %Id: expr.1,v 1.2 1997/04/03 02:39:40 mutoh Stab %
.\"
.Dd July 3, 1993
diff --git a/ja/man/man1/f2c.1 b/ja/man/man1/f2c.1
index 3ac27fe7b2..18bb5b805e 100644
--- a/ja/man/man1/f2c.1
+++ b/ja/man/man1/f2c.1
@@ -34,7 +34,7 @@
.Nd Fortran 77 ¤«¤é C ¤Þ¤¿¤Ï C++ ¤Ø¤ÎÊÑ´¹
.Sh ½ñ¼°
.Nm f2c
-.Op Fl AaCcEfgpRrsUuw
+.Op Fl AaCcEfgpRrsUuvw
.Op Fl C++
.Op Fl cd
.Op Fl d Ar dir
@@ -213,6 +213,8 @@ Fortran ¥³¡¼¥É¤òɸ½àÆþÎϤ«¤éÆÉ¤ß¹þ¤ó¤Ç¤¤¤ë¾ì¹ç¤Ï¡¢
.It Fl p
¥×¥ê¥×¥í¥»¥Ã¥µÄêµÁ¤ò½ÐÎϤ·¤Æ¡¢
¥³¥â¥ó¥Ö¥í¥Ã¥¯¤Î¥á¥ó¥Ð¤¬¥í¡¼¥«¥ëÊÑ¿ô¤Î¤è¤¦¤Ë¸«¤¨¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
+.It Fl v
+¥³¥ó¥Ñ¥¤¥ëÃæ¤Ë¡¢¥Õ¥¡¥¤¥ë̾¡¢¥×¥í¥°¥é¥à̾¡¢¥×¥í¥·¥¸¥ã̾(Ê£¿ô) ¤òɽ¼¨¤·¤Þ¤¹¡£
.It Fl R
REAL ·¿¤Î´Ø¿ô¤ä±é»»¤ò DOUBLE PRECISION ¤Ë³ÈÄ¥¤·¤Þ¤»¤ó¡£
.Fl !R
diff --git a/ja/man/man1/f77.1 b/ja/man/man1/f77.1
index 00328c3f30..e4e231ded1 100644
--- a/ja/man/man1/f77.1
+++ b/ja/man/man1/f77.1
@@ -1,4 +1,4 @@
-.\" %Id: f77.1,v 1.1.4.1 1998/03/03 06:15:50 jkh Exp %
+.\" %Id: f77.1,v 1.4 1997/02/22 15:45:06 peter Exp %
.\" jpman %Id: f77.1,v 1.3 1997/08/20 12:25:22 horikawa Stab %
.\"
.\"
diff --git a/ja/man/man1/fdwrite.1 b/ja/man/man1/fdwrite.1
index b068e1a634..c6c67524dd 100644
--- a/ja/man/man1/fdwrite.1
+++ b/ja/man/man1/fdwrite.1
@@ -6,7 +6,7 @@
.\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
.\" ----------------------------------------------------------------------------
.\"
-.\" %Id: fdwrite.1,v 1.2.2.4 1998/06/27 21:30:44 steve Exp %
+.\" %Id: fdwrite.1,v 1.9 1998/06/27 21:29:35 steve Exp %
.\" jpman %Id: fdwrite.1,v 1.4 1997/07/26 21:35:54 horikawa Stab %
.\"
.\"
diff --git a/ja/man/man1/fetch.1 b/ja/man/man1/fetch.1
index cdee0b2b2d..55344c1c5a 100644
--- a/ja/man/man1/fetch.1
+++ b/ja/man/man1/fetch.1
@@ -1,4 +1,4 @@
-.\" %Id: fetch.1,v 1.9.2.8 1998/07/16 23:51:46 jkh Exp %
+.\" %Id: fetch.1,v 1.23 1998/05/09 21:39:49 wollman Exp %
.\" jpman %Id: fetch.1,v 1.4 1997/08/15 06:31:28 horikawa Stab %
.Dd July 2, 1996
.Dt FETCH 1
diff --git a/ja/man/man1/file.1 b/ja/man/man1/file.1
index 84021fa29d..a6aa4a2f0f 100644
--- a/ja/man/man1/file.1
+++ b/ja/man/man1/file.1
@@ -1,4 +1,4 @@
-.\" %Id: file.1,v 1.6.2.2 1998/07/16 23:52:05 jkh Exp %
+.\" %Id: file.1,v 1.12 1998/03/23 07:43:13 charnier Exp %
.Dd July 30, 1997
.Dt FILE 1 "Copyright but distributable"
.Os
diff --git a/ja/man/man1/file2c.1 b/ja/man/man1/file2c.1
index a89993e6a3..c9b4522436 100644
--- a/ja/man/man1/file2c.1
+++ b/ja/man/man1/file2c.1
@@ -5,7 +5,7 @@
.\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
.\" ---------------------------------------------------------------------------
.\"
-.\" %Id: file2c.1,v 1.1.6.2 1997/09/15 08:07:08 jkh Exp %
+.\" %Id: file2c.1,v 1.5 1997/07/02 06:30:51 charnier Exp %
.\" jpman %Id: file2c.1,v 1.3 1997/07/27 11:56:01 horikawa Stab %
.\"
.Dd January 28, 1995
diff --git a/ja/man/man1/find.1 b/ja/man/man1/find.1
index 432b680b0f..df03cd1638 100644
--- a/ja/man/man1/find.1
+++ b/ja/man/man1/find.1
@@ -32,11 +32,11 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" @(#)find.1 8.4 (Berkeley) 4/1/94
-.\" %Id: find.1,v 1.4.2.5 1998/05/22 11:03:35 jkoshy Exp %
+.\" @(#)find.1 8.7 (Berkeley) 5/9/95
+.\" %Id: find.1,v 1.15 1998/05/15 11:22:36 jkoshy Exp %
.\" jpman %Id: find.1,v 1.4 1997/09/23 14:13:10 horikawa Stab %
.\"
-.Dd April 1, 1994
+.Dd May 9, 1995
.Dt FIND 1
.Os
.Sh ̾¾Î
@@ -122,6 +122,12 @@ backslash (``\e''), space, tab, newline)
.El
.Sh ¥×¥é¥¤¥Þ¥ê
.Bl -tag -width Ds
+.It Ic -amin Ar n
+ºÇ¸å¤Ë¥Õ¥¡¥¤¥ë¤¬¥¢¥¯¥»¥¹¤µ¤ì¤¿»þ¹ï¤È¡¢
+.Nm find
+¤òµ¯Æ°¤·¤¿»þ¹ï¤È¤Îº¹(1 ʬñ°Ì¤ÇÀÚ¤ê¾å¤²¤Þ¤¹)¤¬
+.Ar n
+ʬ¤Ç¤¢¤ì¤Ð¡¢¿¿¤È¤·¤Þ¤¹¡£
.It Ic -atime Ar n
ºÇ¸å¤Ë¥Õ¥¡¥¤¥ë¤¬¥¢¥¯¥»¥¹¤µ¤ì¤¿»þ¹ï¤È¡¢
.Nm find
@@ -157,13 +163,25 @@ utility ¤â¤·¤¯¤Ï argument ¤Î»ØÄê
¤¬¼Â¹Ô¤µ¤ì¤ë¤È¤­¤Î¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢
.Nm find
¤¬µ¯Æ°¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Î¤Þ¤Þ¤Ç¤¹¡£
+.It Ic -execdir Ar utility Op argument ... ;
+.Ic \&-execdir
+¥×¥é¥¤¥Þ¥ê¤Ï
+.Ic -exec
+¥×¥é¥¤¥Þ¥ê¤ÈƱÍͤǤ¹¤¬¡¢
+.Ar utility
+¤¬¸½ºß¤Î¥Õ¥¡¥¤¥ë¤ò»ý¤Ä¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤ª¤¤¤Æ¼Â¹Ô¤µ¤ì¤ëÅÀ¤¬°Û¤Ê¤ê¤Þ¤¹¡£
+ʸ»úÎó ``{}'' ¤ËÂФ·¤ÆÃÖ´¹¤µ¤ì¤ë¥Õ¥¡¥¤¥ë̾¤ÏŬÀڤǤϤ¢¤ê¤Þ¤»¤ó¡£
.It Ic -fstype Ar type
Âоݥե¡¥¤¥ë¤¬³ÊǼ¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥¿¥¤¥×¤¬¡¢
.Ar type
-¤Ç»ØÄꤵ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¾ì¹ç¤Ë¿¿¤È¤Ê¤ê¤Þ¤¹¡£type ¤È¤·¤Æ¤Ï¡¢
-``local'', ``mfs'', ``nfs'', ``msdos'', ``rdonly'', `'ufs''
-¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-``local'' ¤È ``rdonly'' ¤ÏÆÃÄê¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò»Ø¤¹¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+¤Ç»ØÄꤵ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¾ì¹ç¤Ë¿¿¤È¤Ê¤ê¤Þ¤¹¡£
+.Xr sysctl 8
+¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ¡¢
+¥·¥¹¥Æ¥à¾å¤ÇÍøÍѲÄǽ¤Ê¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:
+.Bd -literal -offset indent
+sysctl vfs
+.Ed
+¤µ¤é¤Ë¡¢2 ¤Ä¤Î µ¼»÷¥¿¥¤¥× ``local'' ¤È ``rdonly'' ¤¬¤¢¤ê¤Þ¤¹¡£
``local'' ¤Ï¡¢
.Nm find
¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¾å¤ËʪÍýŪ
@@ -283,7 +301,10 @@ utility ¤â¤·¤¯¤Ï argument ¤Î»ØÄê
.Ic -ok ,
.Ic -print0
¤Î¤É¤Î¥×¥é¥¤¥Þ¥ê¤â»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢
-Ëܥץ饤¥Þ¥ê¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤â¤Î¤È¤ß¤Ê¤·¤Þ¤¹¡£
+Í¿¤¨¤é¤ì¤¿¼° given expression ¤Ï
+.Cm \&( Ns Ar given\& expression Ns Cm \&)
+.Ic -print
+¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹¡£
.It Ic -print0
.Ic -print
¤È¤Û¤ÜƱ¤¸¤Ç¤¹¤¬¡¢É¸½à½ÐÎϤËÂоݤȤʤäƤ¤¤ë¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹Ì¾¤ò½ÐÎÏ
diff --git a/ja/man/man1/finger.1 b/ja/man/man1/finger.1
index 0591728a6d..4f5bd8f102 100644
--- a/ja/man/man1/finger.1
+++ b/ja/man/man1/finger.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)finger.1 8.3 (Berkeley) 5/5/94
-.\" %Id: finger.1,v 1.5.2.2 1998/03/08 09:07:55 jkh Exp %
+.\" %Id: finger.1,v 1.7 1997/08/01 20:26:47 wollman Exp %
.\" jpman %Id: finger.1,v 1.2 1997/04/07 05:53:49 mutoh Stab %
.\"
.Dd August 1, 1997
diff --git a/ja/man/man1/ftp.1 b/ja/man/man1/ftp.1
index 87f07bf5bc..2a181cf48f 100644
--- a/ja/man/man1/ftp.1
+++ b/ja/man/man1/ftp.1
@@ -1,4 +1,4 @@
-.\" %Id: ftp.1,v 1.4.2.3 1998/03/01 18:59:42 steve Exp %
+.\" %Id: ftp.1,v 1.8 1998/03/01 18:58:03 steve Exp %
.\" %NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp %
.\"
.\" Copyright (c) 1985, 1989, 1990, 1993
diff --git a/ja/man/man1/gcc.1 b/ja/man/man1/gcc.1
index da6233c3e9..27e57d60e1 100644
--- a/ja/man/man1/gcc.1
+++ b/ja/man/man1/gcc.1
@@ -136,6 +136,17 @@ C ¤È C++ ¤Î¥³¥ó¥Ñ¥¤¥é¤ÏÅý¹ç¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤É¤Á¤é¤Î¾ì¹ç¤â¡¢ÆþÎÏ¥Õ¥¡¥¤¥ë
¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤ò¼ïÎàÊ̤Ëʬ¤±¤Æ¤Þ¤È¤á¤Þ¤·¤¿¡£¾Ü¤·¤¤²òÀâ¤Ï
°Ê²¼¤ÎÀá¤Ç¹Ô¤Ê¤¤¤Þ¤¹¡£
.hy 0
+.SH FreeBSD ¸ÇÍ­¤Î¥ª¥×¥·¥ç¥ó
+.TP
+.BI "\-pthread"
+¥¹¥ì¥Ã¥É²½¥æ¡¼¥¶¥×¥í¥»¥¹¤Ë libc ¤ÎÂå¤ê¤Ë libc_r ¤ò¥ê¥ó¥¯¤·¤Þ¤¹¡£
+¥¹¥ì¥Ã¥É²½¥æ¡¼¥¶¥×¥í¥»¥¹¤Ë¥ê¥ó¥¯¤µ¤ì¤ë¥ª¥Ö¥¸¥§¥¯¥È¤Ï -D_THREADSAFE ÉÕ¤­¤Ç
+¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+.TP
+.BI "\-kthread"
+¥¹¥ì¥Ã¥É²½¥«¡¼¥Í¥ë¥×¥í¥»¥¹¤Ë libc ¤Ë²Ã¤¨¤Æ libpthread ¤ò¥ê¥ó¥¯¤·¤Þ¤¹¡£
+¥¹¥ì¥Ã¥É²½¥«¡¼¥Í¥ë¥×¥í¥»¥¹¤Ë¥ê¥ó¥¯¤µ¤ì¤ë¥ª¥Ö¥¸¥§¥¯¥È¤Ï -D_THREADSAFE ÉÕ¤­¤Ç
+¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
.na
.TP
.B Á´ÂÎŪ¤Ê¥ª¥×¥·¥ç¥ó
diff --git a/ja/man/man1/gdb.1 b/ja/man/man1/gdb.1
index 2ed4c1d304..ca5c6e6483 100644
--- a/ja/man/man1/gdb.1
+++ b/ja/man/man1/gdb.1
@@ -1,6 +1,6 @@
.\" Copyright (c) 1991 Free Software Foundation
.\" See section COPYING for conditions for redistribution
-.\" %Id: gdb.1,v 1.2 1994/12/30 23:25:45 jkh Exp %
+.\" %Id: gdb.1,v 1.6 1997/04/27 21:36:49 gj Exp %
.\" jpman %Id: gdb.1,v 1.2 1997/04/08 00:36:23 h-nokubi Stab %
.TH gdb 1 "4nov1991" "GNU Tools" "GNU Tools"
.SH ̾¾Î
@@ -17,6 +17,8 @@ gdb \- GNU ¥Ç¥Ð¥Ã¥¬
.I dir\c
\|]
.RB "[\|" \-f "\|]"
+.RB "[\|" \-k "\|]"
+.RB "[\|" \-wcore "\|]"
.RB "[\|" "\-b\ "\c
.IR bps "\|]"
.RB "[\|" "\-tty="\c
@@ -325,6 +327,19 @@ Emacs ¤¬ GDB ¤ò¥µ¥Ö¥×¥í¥»¥¹¤È¤·¤Æ¼Â¹Ô¤¹¤ëºÝ¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤òÉղä·¤Þ¤¹¡£
\&\|' ʸ»ú¤ò»È¤¦¤³¤È¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤é¤Ç¤¹¡£
.TP
+.B \-kernel
+.TP
+.B \-k
+gdb ¤ò¥«¡¼¥Í¥ë¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤Ç»ÈÍѤ·¤Þ¤¹¡£
+¥×¥í¥ó¥×¥È¤Ï ``(kgdb)'' ¤Ë¤Ê¤ê¤Þ¤¹¡£
+
+.TP
+.B \-wcore
+¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥«¡¼¥Í¥ë¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤Ç
+¡ÖưºîÃæ¤Î¡×¥«¡¼¥Í¥ë¤ò¥Ç¥Ð¥Ã¥°¤·¤Æ¤¤¤ë»þ¤Î¤ß»ÈÍѲÄǽ¤Ç¤¢¤ê¡¢
+¥³¥¢¥Õ¥¡¥¤¥ë (/dev/mem) ¤ò½ñ¤­¹þ¤ß²Äǽ¤Ë¤·¤Þ¤¹¡£
+
+.TP
.BI "\-b " "bps"\c
\&
¥ê¥â¡¼¥È¥Ç¥Ð¥Ã¥°ÍÑ¤Ë GDB ¤¬ÍøÍѤ¹¤ë¥·¥ê¥¢¥ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÎžÁ÷®ÅÙ¤ò
diff --git a/ja/man/man1/getNAME.1 b/ja/man/man1/getNAME.1
index 8fdf3d2ceb..a06ff3aecd 100644
--- a/ja/man/man1/getNAME.1
+++ b/ja/man/man1/getNAME.1
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: getNAME.1,v 1.3.2.2 1998/02/20 17:32:18 jkh Exp %
+.\" %Id: getNAME.1,v 1.7 1997/11/21 07:40:47 charnier Exp %
.\" jpman %Id: getNAME.1,v 1.3 1997/07/22 17:20:08 horikawa Stab %
.Dd July 8, 1996
diff --git a/ja/man/man1/grep.1 b/ja/man/man1/grep.1
index acf488132f..0344107757 100644
--- a/ja/man/man1/grep.1
+++ b/ja/man/man1/grep.1
@@ -1,7 +1,7 @@
.TH GREP 1 "1992 September 10" "GNU Project"
.\" jpman %Id: grep.1,v 1.3 1997/07/21 07:22:12 konuma Stab %
.SH ̾¾Î
-grep, egrep, fgrep \- ¥Ñ¥¿¡¼¥ó¤Ë¥Þ¥Ã¥Á¤¹¤ë¹Ô¤òɽ¼¨¤¹¤ë
+grep, egrep, fgrep, zgrep \- ¥Ñ¥¿¡¼¥ó¤Ë¥Þ¥Ã¥Á¤¹¤ë¹Ô¤òɽ¼¨¤¹¤ë
.SH ½ñ¼°
.B grep
[\-[AB] num]
@@ -55,6 +55,10 @@ files...
¤Ï¡¢
.B "grep\ \-F"
¤ÈƱ¤¸¤Ç¤¹¡£
+.BR zgrep
+¤È¤·¤Æ¸Æ¤Ð¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢
+.BR \-Z
+¥ª¥×¥·¥ç¥ó¤¬²¾Äꤵ¤ì¤Þ¤¹¡£
.PD
.LP
Á´¤Æ¤Î
@@ -156,21 +160,25 @@ FTS ¥é¥¤¥Ö¥é¥ê¤È¤È¤â¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤¿¾ì¹ç¡¢°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤¬
¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òé¤ê¤Þ¤¹
(ÌÚ¤òõº÷¤·¤Æ¤¤¤ë»þ¤ËÁø¶ø¤·¤¿¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤Ïé¤ê¤Þ¤»¤ó) ¡£
.TP
-
.BI \-L
.I \-R
¥ª¥×¥·¥ç¥ó»ØÄê»þ¤Ë¡¢Á´¤Æ¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òé¤ê¤Þ¤¹¡£
.TP
-
.BI \-P
.I \-R
¥ª¥×¥·¥ç¥ó»ØÄê»þ¤Ë¡¢¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òé¤ê¤Þ¤»¤ó¡£
.TP
-
.BI \-R
¥Õ¥¡¥¤¥ë¤Î¤ß¤ò¸¡º÷¤¹¤ëÂå¤ï¤ê¤Ë¡¢¥Õ¥¡¥¤¥ë¤òº¬¤È¤¹¤ë¥Õ¥¡¥¤¥ë³¬Áؤò¸¡º÷¤·¤Þ¤¹¡£
.TP
-
+.LP
+¼¡¤Î¥ª¥×¥·¥ç¥ó¤Ï zlib ¥é¥¤¥Ö¥é¥ê¤È¶¦¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤¿¾ì¹ç¤Î¤ß»ÈÍѲÄǽ¤Ç¤¹:
+.PD 0
+.TP
+.BI \-Z
+.I \-Z
+¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤ë¤È¡¢¸¡º÷Á°¤ËÆþÎÏ¥Õ¥¡¥¤¥ë¤ò¿­Ä¹¤·¤Þ¤¹¡£
+.TP
.PD
.SH "Àµµ¬É½¸½"
.PP
diff --git a/ja/man/man1/grops.1 b/ja/man/man1/grops.1
index 4d9305bdca..8449583714 100644
--- a/ja/man/man1/grops.1
+++ b/ja/man/man1/grops.1
@@ -458,7 +458,7 @@ Zapf Dingbats ¤Ï
¤òÀ¸À®¤Ç¤­¤Þ¤¹¡£
.TP
.BI \eX'ps:\ import\ file\ llx\ lly\ urx\ ury\ width\ \fR[\fP\ height\ \fR]\fP '
-PostScript ¥°¥é¥Õ¥£¥¯¥¹¤ò
+PostScript ¥°¥é¥Õ¥£¥Ã¥¯¥¹¤ò
.I file
¤«¤é¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹¡£
°ú¿ô
diff --git a/ja/man/man1/head.1 b/ja/man/man1/head.1
index 2f39b23ba6..f9ddcc8ab8 100644
--- a/ja/man/man1/head.1
+++ b/ja/man/man1/head.1
@@ -55,7 +55,7 @@
.Ar count
¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î 10 ¹Ô¤òɽ¼¨¤·¤Þ¤¹¡£
.Pp
-1¸Ä°Ê¾å¤Î¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¤Ï¡¢
+Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¤Ï¡¢
.Dq ==> XXX <==
¤È¤¤¤¦·Á¼°¤Îʸ»úÎ󤫤é¤Ê¤ë¥Ø¥Ã¥À¤òÉÕ¤±¤é¤ì¤Þ¤¹¡£¤³¤³¤Ç¡¢
.Dq XXX
@@ -64,20 +64,8 @@
.Nm head
¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¡¢À®¸ù»þ¤Ë¤Ï 0 ¤òÊÖ¤·¡¢¥¨¥é¡¼¤Î¾ì¹ç¤Ï 0 ¤è¤êÂ礭¤¤¿ô¤ò
ÊÖ¤·¤Þ¤¹¡£
-.Sh ¸ß´¹À­
-.\"(ÌõÃí)FreeBSD 2.2.1R¤Îman¤Ë¤Ï¡¢ËÜÀá¤Îµ­½Ò¤Ï̵¤¤¡£
-.\" Á°Ç¤¼Ô¤Î°Õ¸þ¤¬Ê¬¤«¤é¤Ê¤¤¤Î¤Ç¡¢¤³¤Î¤Þ¤Þ»Ä¤¹¡£
-.\" 2.2.1R ÂоÝ(1997/04/10) Takeshi MUTOH <mutoh@info.nara-k.ac.jp>
-ÀΤΠUNIX ¤Î
-.Nm head
-¥³¥Þ¥ó¥É¤Î¥ª¥×¥·¥ç¥ó¤Î½ñ¼°¤È¸ß´¹¤ò¼è¤ë¤¿¤á¡¢¹Ô¿ô»ØÄê¤Î
-¥ª¥×¥·¥ç¥ó¤È¤·¤Æ -count
-¤Îɽµ­¤â¼õ¤±ÉÕ¤±¤Þ¤¹¡£
.Sh ´ØÏ¢¹àÌÜ
.Xr tail 1
-.Sh µ¬³Ê
-.Nm head
-¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï IEEE Std1003.2 (POSIX) ¸ß´¹¤Ç¤¹¡£
.Sh Îò»Ë
.Nm head
¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï
diff --git a/ja/man/man1/hexdump.1 b/ja/man/man1/hexdump.1
index 3b46746b7f..de7d243396 100644
--- a/ja/man/man1/hexdump.1
+++ b/ja/man/man1/hexdump.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)hexdump.1 8.2 (Berkeley) 4/18/94
-.\" %Id: hexdump.1,v 1.5 1996/10/05 22:27:09 wosch Exp %
+.\" %Id: hexdump.1,v 1.7 1997/02/22 19:55:06 peter Exp %
.\" jpman %Id: hexdump.1,v 1.2 1997/03/29 04:26:20 horikawa Stab %
.\"
.Dd April 18, 1994
diff --git a/ja/man/man1/host.1 b/ja/man/man1/host.1
index 43b094d842..332669f92a 100644
--- a/ja/man/man1/host.1
+++ b/ja/man/man1/host.1
@@ -50,151 +50,260 @@
.\" SOFTWARE.
.\" -
.\" --Copyright--
-.\" %Id: host.1,v 8.1 1994/12/15 06:24:10 vixie Exp %
+.\" %Id: host.1,v 8.2 1997/03/14 02:29:44 vixie Exp %
.\" jpman %Id: host.1,v 1.3 1997/08/20 12:10:27 horikawa Stab %
-.TH HOST 1
-.SH ̾¾Î
-host \- ¥É¥á¥¤¥ó¥µ¡¼¥Ð¤ò»È¤Ã¤Æ¥Û¥¹¥È̾¤Î¸¡º÷¤ò¹Ô¤Ê¤¦
-.SH ½ñ¼°
-host [-l] [-v] [-w] [-r] [-d] [-t querytype] [-a] host [ server ]
-.SH ²òÀâ
-.I host
+.Dd December 15, 1994
+.Dt HOST 1
+.Os BSD 4
+.Sh ̾¾Î
+.Nm host
+.Nd ¥É¥á¥¤¥ó¥µ¡¼¥Ð¤ò»È¤Ã¤Æ¥Û¥¹¥È̾¤Î¸¡º÷¤ò¹Ô¤Ê¤¦
+.Sh ½ñ¼°
+.Nm host
+.Op Fl l
+.Op Fl v
+.Op Fl w
+.Op Fl r
+.Op Fl d
+.Op Fl t Ar querytype
+.Op Fl a
+.Ar host
+.Op Ar server
+.Sh ²òÀâ
+.Ic host
¤Ï¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥Û¥¹¥È¤Ë´Ø¤¹¤ë¾ðÊó¤Î¸¡º÷¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£¾ðÊó¤ÏÀ¤³¦Ãæ¤Ë¹­
¤¬¤Ã¤¿Áê¸ß¤ËÀܳ¤µ¤ì¤¿¥µ¡¼¥Ð·²¤«¤éÆÀ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥Û¥¹¥È̾¤È
-¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥¢¥É¥ì¥¹´Ö¤ÎÊÑ´¹¤Î¤ß¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£-t ¤ä -a ¥ª¥×¥·¥ç¥ó¤È¤È¤â
-¤Ë»È¤¦¤È¡¢¤½¤Î¥Û¥¹¥È¤Ë´Ø¤¹¤ë¥É¥á¥¤¥ó¥µ¡¼¥Ð¤Ë¤è¤Ã¤ÆÊݼ餵¤ì¤Æ¤¤¤ë¾ðÊó¤Î
-Á´¤Æ¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.PP
+¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥¢¥É¥ì¥¹´Ö¤ÎÊÑ´¹¤Î¤ß¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
+.Dq Fl t
+¤ä
+.Dq Fl a
+¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ë»È¤¦¤È¡¢¤½¤Î¥Û¥¹¥È¤Ë´Ø¤¹¤ë¥É¥á¥¤¥ó¥µ¡¼¥Ð¤Ë¤è¤Ã¤ÆÊݼé
+¤µ¤ì¤Æ¤¤¤ë¾ðÊó¤Î¤¹¤Ù¤Æ¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.Pp
°ú¿ô¤Ë¤Ï¥Û¥¹¥È̾¤«¥Û¥¹¥ÈÈÖ¹æ¤Î¤¤¤º¤ì¤«¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£ËÜ¥×¥í¥°¥é¥à¤Ï¤Þ
-¤º°ú¿ô¤ò¿ô»ú¤È¤·¤Æ²ò¼á¤ò»î¤ß¤Þ¤¹¡£¤½¤ì¤¬¤¦¤Þ¤¯¹Ô¤«¤Ê¤±¤ì¤Ð¡¢¥Û¥¹¥È̾¤È
+¤º°ú¿ô¤ò¥Û¥¹¥ÈÈÖ¹æ¤È¤·¤Æ²ò¼á¤ò»î¤ß¤Þ¤¹¡£¤½¤ì¤¬¤¦¤Þ¤¯¤¤¤«¤Ê¤±¤ì¤Ð¡¢¥Û¥¹¥È̾¤È
¤·¤Æ°·¤¤¤Þ¤¹¡£¥Û¥¹¥ÈÈÖ¹æ¤Ï 128.6.4.194 ¤Î¤è¤¦¤Ë¥É¥Ã¥È¤Ë¤è¤Ã¤Æ¶èÀÚ¤é¤ì
¤¿ 4 ¤Ä¤Î 10 ¿Ê¿ô¤«¤é¤Ê¤ê¤Þ¤¹¡£
¥Û¥¹¥È̾¤Ï topaz.rutgers.edu ¤Î¤è¤¦¤Ë¥É¥Ã¥È¤Ç¶èÀÚ¤é¤ì¤¿Ê£¿ô¤Î̾Á°¤«¤é
¤Ê¤ê¤Þ¤¹¡£
̾Á°¤¬¥É¥Ã¥È¤Ç½ª¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¥í¡¼¥«¥ë¥É¥á¥¤¥ó¤¬¼«Æ°Åª¤ËËöÈø¤ËÉÕ¤±²Ã
-¤¨¤é¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð Rutgers ¤Î¥æ¡¼¥¶¤Ï "host topaz" ¤È¤¤¤¦¤è¤¦¤Ë»È¤¦
+¤¨¤é¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð Rutgers ¤Î¥æ¡¼¥¶¤Ï
+.Pp
+.D1 Ic host topaz
+.Pp
+¤È¤¤¤¦¤è¤¦¤Ë»È¤¦
¤³¤È¤¬¤Ç¤­¡¢¤³¤ì¤Ï¼ÂºÝ¤Ë¤Ï "topaz.rutgers.edu" ¤¬¸¡º÷¤µ¤ì¤Þ¤¹¡£
-¤³¤ì¤¬¤¦¤Þ¤¯¹Ô¤«¤Ê¤±¤ì¤Ð¡¢Ì¾Á°¤ÏÊѹ¹¤µ¤ì¤º¤Ë (¤³¤ÎÎã¤Ç¤Ï "topaz" ¤È¤·
+¤³¤ì¤¬¤¦¤Þ¤¯¤¤¤«¤Ê¤±¤ì¤Ð¡¢Ì¾Á°¤ÏÊѹ¹¤µ¤ì¤º¤Ë (¤³¤ÎÎã¤Ç¤Ï "topaz" ¤È¤·
¤Æ) »î¤ß¤é¤ì¤Þ¤¹¡£¤³¤Î¤ä¤ê¤«¤¿¤Ï¥á¡¼¥ë¤ä¤½¤Î¾¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥æ¡¼¥Æ¥£¥ê¥Æ¥£
¤Ç¤â»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-¼ÂºÝ¤ËËöÈø¤ËÉÕ¤±²Ã¤¨¤é¤ì¤ëÀÜÈø»Ò¤Ï "hostname" ¥³¡¼¥ë¤Î·ë²Ì¤«¤éÆÀ¤é¤ì¤ë
-¤â¤Î¤ÎºÇ½é¤Î¥É¥Ã¥È°Ê¹ß¤È¤Ê¤ê¤Þ¤¹¡£(¥Û¥¹¥È̾¤Î¸¡º÷¤Î¥«¥¹¥¿¥Þ¥¤¥ºÊýË¡¤Ë
-¤Ä¤¤¤Æ¤Ï²¼µ­¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£)
-.PP
-ºÇ½é¤Î°ú¿ô¤Ï¸¡º÷¤ò¹Ô¤Ê¤¦¥Û¥¹¥È̾¤È¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤¬¿ô»ú¤Î¾ì¹ç¡¢"µÕ°ú¤­"
+¼ÂºÝ¤ËËöÈø¤ËÉÕ¤±²Ã¤¨¤é¤ì¤ëÀÜÈø¼­¤Ï¡¢
+.Xr hostname 1
+¤ò¸Æ¤Ó½Ð¤·¤¿·ë²Ì¤ÎºÇ½é¤Î¥É¥Ã¥È°Ê¹ß¤È¤Ê¤ê¤Þ¤¹¡£(²¼µ­¤Î
+.Sx ¥Û¥¹¥È̾¸¡º÷¤Î¥«¥¹¥¿¥Þ¥¤¥º
+¤ÎÀá¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£)
+.Pp
+ºÇ½é¤Î°ú¿ô¤Ï¸¡º÷¤ò¹Ô¤Ê¤¦¥Û¥¹¥È̾¤È¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤¬¿ô»ú¤Î¾ì¹ç¡¢
+.Dq µÕ°ú¤­
¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¤¹¤Ê¤ï¤Á¥É¥á¥¤¥ó¥·¥¹¥Æ¥à¤Ï¿ô»ú¤ò̾Á°¤ËÊÑ´¹¤¹¤ë¤¿¤á¤ÎÊÌ
¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹·²¤ò»²¾È¤·¤Þ¤¹¡£
-.PP
+.Pp
2 ÈÖÌܤΰú¿ô¤Ï¾Êά²Äǽ¤Ç¤¹¡£¤³¤³¤Ç¤ÏÌ䤤¹ç¤ï¤»¤ò¹Ô¤Ê¤¦¥µ¡¼¥Ð¤ò»ØÄꤹ¤ë
¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î°ú¿ô¤¬»ØÄꤵ¤ì¤Ê¤±¤ì¤Ð¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥µ¡¼¥Ð (Ä̾ï¤Ï
¥í¡¼¥«¥ë¥Þ¥·¥ó) ¤¬»È¤ï¤ì¤Þ¤¹¡£
-.PP
+.Pp
̾Á°¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢3 ¤Ä¤Î°Û¤Ê¤Ã¤¿¼ïÎà¤Î·ë²Ì¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
°Ê²¼¤Ï¤½¤ì¤é¤ÎÎã¤Ç¤¹¡£
-.br
- % host sun4
-.br
- sun4.rutgers.edu is a nickname for ATHOS.RUTGERS.EDU
-.br
- ATHOS.RUTGERS.EDU has address 128.6.5.46
-.br
- ATHOS.RUTGERS.EDU has address 128.6.4.4
-.br
- ATHOS.RUTGERS.EDU mail is handled by ARAMIS.RUTGERS.EDU
-.br
-¤³¤³¤Ç¥æ¡¼¥¶¤Ï¥³¥Þ¥ó¥É "host sun4" ¤òÆþÎϤ·¤Æ¤¤¤Þ¤¹¡£ºÇ½é¤Î¹Ô¤Ï̾Á°
-"sun4.rutgers.edu" ¤Ï¼ÂºÝ¤Ë¤Ï¥Ë¥Ã¥¯¥Í¡¼¥à¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
-Àµ¼°¤Ê¥Û¥¹¥È̾¤Ï "ATHOS.RUTGERS.EDU' ¤Ç¤¹¡£Â³¤¯ 2 ¹Ô¤Ç¤Ï¥¢¥É¥ì¥¹¤¬É½¼¨
+.Pp
+.D1 Ic % host sun4
+.Dl sun4.rutgers.edu is a nickname for ATHOS.RUTGERS.EDU
+.Dl ATHOS.RUTGERS.EDU has address 128.6.5.46
+.Dl ATHOS.RUTGERS.EDU has address 128.6.4.4
+.Dl ATHOS.RUTGERS.EDU mail is handled by ARAMIS.RUTGERS.EDU
+.Pp
+¤³¤³¤Ç¥æ¡¼¥¶¤Ï¥³¥Þ¥ó¥É
+.Dq Ic host sun4
+¤òÆþÎϤ·¤Æ¤¤¤Þ¤¹¡£ºÇ½é¤Î¹Ô¤Ï̾Á°
+.Dq Li sun4.rutgers.edu
+¤Ï¼ÂºÝ¤Ë¤Ï¥Ë¥Ã¥¯¥Í¡¼¥à¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
+Àµ¼°¤Ê¥Û¥¹¥È̾¤Ï
+.Dq Li ATHOS.RUTGERS.EDU
+¤Ç¤¹¡£Â³¤¯ 2 ¹Ô¤Ç¤Ï¥¢¥É¥ì¥¹¤¬É½¼¨
¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤â¤·Ê£¿ô¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò¤â¤Ä¥·¥¹¥Æ¥à¤Ç¤¢
-¤ì¤Ð¡¢¤½¤Î³Æ¡¹¤ÏÊ̤Υ¢¥É¥ì¥¹¤ò»ý¤Á¤Þ¤¹¡£ºÇ¸å¤Î¹Ô¤Ç¤Ï ATHOS.RUTGERS.EDU
+¤ì¤Ð¡¢¤½¤Î³Æ¡¹¤ÏÊ̤Υ¢¥É¥ì¥¹¤ò»ý¤Á¤Þ¤¹¡£ºÇ¸å¤Î¹Ô¤Ç¤Ï
+.Li ATHOS.RUTGERS.EDU
¤Ï¼«Ê¬¤ËÂФ¹¤ë¥á¡¼¥ë¤Ï¼õ¤±¼è¤é¤Ê¤¤¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥Û¥¹¥È°¸¤Æ¤Î
-¥á¡¼¥ë¤Ï ARAMIS.RUTGERS.EDU ¤Ë¤è¤Ã¤Æ¼è¤ê¹þ¤Þ¤ì¤Þ¤¹¡£¤¤¤¯¤Ä¤«¤Î¥·¥¹¥Æ¥à
+¥á¡¼¥ë¤Ï
+.Li ARAMIS.RUTGERS.EDU
+¤Ë¤è¤Ã¤Æ¼è¤ê¹þ¤Þ¤ì¤Þ¤¹¡£¤¤¤¯¤Ä¤«¤Î¥·¥¹¥Æ¥à
¤Ç¤Ï¤½¤Î¥á¡¼¥ë¤ò°·¤¦¥·¥¹¥Æ¥à¤¬Ê£¿ô¸ºß¤¹¤ë¤³¤È¤¬¤¢¤ê¡¢¤½¤Î¾ì¹ç¤Ï¤³¤Î¹Ô
¤Î¤è¤¦¤Ê¾ðÊ󤬤µ¤é¤Ë½ÐÎϤµ¤ì¤Þ¤¹¡£µ»½ÑŪ¤Ë¤Ï¥á¡¼¥ë¤ò¼õ¤±¼è¤ë¤³¤È¤Î¤Ç¤­
-¤ëÁ´¤Æ¤Î¥·¥¹¥Æ¥à¤¬¤³¤Î¤è¤¦¤Ê¥¨¥ó¥È¥ê¤ò»ý¤Ä¤È¹Í¤¨¤é¤ì¤Þ¤¹¡£¤â¤·¥·¥¹¥Æ¥à
-¤¬¤½¤Î¥á¡¼¥ë¤ò¼«Ê¬¼«¿È¤Ç¼õ¤±¼è¤ë¾ì¹ç¡¢"XXX mail is handled by XXX" ¤Î
-¤è¤¦¤Ë¡¢¤½¤Î¥·¥¹¥Æ¥à¼«¿È¤Ë¤Ä¤¤¤Æ¸ÀµÚ¤·¤¿¥¨¥ó¥È¥ê¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¡£¤·¤«¤·¡¢
+¤ë¤¹¤Ù¤Æ¤Î¥·¥¹¥Æ¥à¤¬¤³¤Î¤è¤¦¤Ê¥¨¥ó¥È¥ê¤ò»ý¤Ä¤È¹Í¤¨¤é¤ì¤Þ¤¹¡£¤â¤·¥·¥¹¥Æ¥à
+¤¬¤½¤Î¥á¡¼¥ë¤ò¼«Ê¬¼«¿È¤Ç¼õ¤±¼è¤ë¾ì¹ç¡¢
+.Pp
+.D1 Li XXX mail is handled by XXX
+.Pp
+¤Î¤è¤¦¤Ë¡¢¤½¤Î¥·¥¹¥Æ¥à¼«¿È¤Ë¤Ä¤¤¤Æ¸ÀµÚ¤·¤¿¥¨¥ó¥È¥ê¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¡£¤·¤«¤·¡¢
¥á¡¼¥ë¤ò¼«Ê¬¤Ç¼õ¤±¼è¤ë¿¤¯¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¤ï¤¶¤ï¤¶¤½¤Î»ö¼Â¤Ë¤Ä¤¤¤Æ¸ÀµÚ¤·
-¤Æ¤¤¤Þ¤»¤ó¡£¤â¤·¤¢¤ë¥·¥¹¥Æ¥à¤Ë "mail is handled by" ¤Î¥¨¥ó¥È¥ê¤¬¤¢¤ë¤Î
-¤Ë¥¢¥É¥ì¥¹¤¬¤Ê¤±¤ì¤Ð¡¢¤½¤ì¤ÏËÜÅö¤Ï¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Î¹½À®°÷¤Ç¤Ï¤Ê¤¤¤¬¡¢
+¤Æ¤¤¤Þ¤»¤ó¡£¤â¤·¤¢¤ë¥·¥¹¥Æ¥à¤Ë
+.Dq Li mail is handled by
+¤Î¥¨¥ó¥È¥ê¤¬¤¢¤ë¤Î¤Ë¥¢¥É¥ì¥¹¤¬¤Ê¤±¤ì¤Ð¡¢
+¤½¤ì¤ÏËÜÅö¤Ï¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Î¹½À®°÷¤Ç¤Ï¤Ê¤¤¤¬¡¢
¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¤¢¤ë¥·¥¹¥Æ¥à¤¬¥á¡¼¥ë¤ò¤½¤³¤ËžÁ÷¤·¤Æ¤¯¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
Usenet ¤ä Bitnet ¤ä¤½¤Î¾¤Î¿¤¯¤Î¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¤³¤Î¼ï¤Î
¥¨¥ó¥È¥ê¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
-.PP
+.Sh ¥ª¥×¥·¥ç¥ó
¥Û¥¹¥È̾¤ÎÁ°¤Ë»ØÄê¤Ç¤­¤ë¥ª¥×¥·¥ç¥ó¤ÏÂô»³¤¢¤ê¤Þ¤¹¡£¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Î
¤Û¤È¤ó¤É¤Ï¥É¥á¥¤¥ó¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÊݼ餷¤Æ¤¤¤ë¥¹¥¿¥Ã¥Õ¤Ë¤Î¤ß°ÕÌ£¤Î¤¢¤ë¤â
¤Î¤Ç¤¹¡£
-.PP
-¥ª¥×¥·¥ç¥ó -w ¤ò»ØÄꤹ¤ë¤È¡¢host ¤Ï±þÅú¤¬¤¢¤ë¤Þ¤Ç±Ê±ó¤ËÂÔ¤Á³¤±¤Þ¤¹¡£ÄÌ
-¾ï¤Ï 1 Ê¬Äø¤Ç¥¿¥¤¥à¥¢¥¦¥È¤Ë¤Ê¤ê¤Þ¤¹¡£
-.PP
-¥ª¥×¥·¥ç¥ó -v ¤ò»ØÄꤹ¤ë¤È¡¢"verbose" ·Á¼°¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£¤³¤ì¤ÏÀµ¼°¤Ê
-¥É¥á¥¤¥ó¥Þ¥¹¥¿¤Î¥Õ¥¡¥¤¥ë·Á¼°¤È¤Ê¤ê¤Þ¤¹¡£¤³¤Î·Á¼°¤Ë¤Ä¤¤¤Æ¤Ï "named" ¤Î
-man ¥Ú¡¼¥¸¤Ëʸ½ñ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬¤Ê¤¯¤Æ¤â½ÐÎϤηÁ¼°¤Ï°ì
-ÈÌŪ¤Ê°ÕÌ£¤Ç¤Ï¤³¤ÎÀµ¼°¤Ê·Á¼°¤Ë½àµò¤·¤¿¤â¤Î¤È¤Ê¤ê¤Þ¤¹¤¬¡¢Ä̾ï¤Î¥æ¡¼¥¶¤Ë
-¤È¤Ã¤ÆÊ¬¤«¤ê¤ä¤¹¤¤¤â¤Î¤Ë¤µ¤ì¤Þ¤¹¡£-v ¤¬»ØÄꤵ¤ì¤Ê¤±¤ì¤Ð¡¢"a"¡¢"mx"¡¢
-"cname" ¤Î³Æ¥ì¥³¡¼¥É¤Ï¤½¤ì¤¾¤ì"has address"¡¢"mail is handled by"¡¢
-"is a nickname for" ¤È½ÐÎϤµ¤ì¡¢TTL ¤È¥¯¥é¥¹¥Õ¥£¡¼¥ë¥É¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
-.PP
-¥ª¥×¥·¥ç¥ó -r ¤ò»ØÄꤹ¤ë¤È¡¢ºÆµ¢Åª¤ÊÌ䤤¹ç¤ï¤»¤ò¹Ô¤Ê¤¤¤Þ¤»¤ó¡£¤³¤ì¤Ï
+.Bl -tag -width Fl
+.It Fl w
+¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢
+.Ic host
+¤Ï±þÅú¤¬¤¢¤ë¤Þ¤Ç±Ê±ó¤ËÂÔ¤Á³¤±¤Þ¤¹¡£Ä̾ï¤Ï
+1 Ê¬Äø¤Ç¥¿¥¤¥à¥¢¥¦¥È¤Ë¤Ê¤ê¤Þ¤¹¡£
+.It Fl v
+¡Ö¾éĹ¡×¤Ê (verbose) ·Á¼°¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£¤³¤ì¤ÏÀµ¼°¤Ê
+¥É¥á¥¤¥ó¥Þ¥¹¥¿¤Î¥Õ¥¡¥¤¥ë·Á¼°¤È¤Ê¤ê¤Þ¤¹¡£¤³¤Î·Á¼°¤Ë¤Ä¤¤¤Æ¤Ï
+.Xr named 8
+¤Î man ¥Ú¡¼¥¸¤Ëʸ½ñ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤¬¤Ê¤¯¤Æ¤â½ÐÎϤηÁ¼°¤Ï
+°ìÈÌŪ¤Ê°ÕÌ£¤Ç¤Ï¤³¤ÎÀµ¼°¤Ê·Á¼°¤Ë½àµò¤·¤¿¤â¤Î¤È¤Ê¤ê¤Þ¤¹¤¬¡¢Ä̾ï¤Î¥æ¡¼¥¶¤Ë
+¤È¤Ã¤ÆÊ¬¤«¤ê¤ä¤¹¤¤¤â¤Î¤Ë¤µ¤ì¤Þ¤¹¡£
+.Dq Fl v
+¤¬»ØÄꤵ¤ì¤Ê¤±¤ì¤Ð¡¢"a", "mx", "cname" ¤Î³Æ¥ì¥³¡¼¥É¤Ï
+¤½¤ì¤¾¤ì "has address", "mail is handled by", "is a nickname for"
+¤È½ÐÎϤµ¤ì¡¢TTL ¤È¥¯¥é¥¹¥Õ¥£¡¼¥ë¥É¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
+.It Fl r
+ºÆµ¢Åª¤ÊÌ䤤¹ç¤ï¤»¤ò¹Ô¤Ê¤¤¤Þ¤»¤ó¡£¤³¤ì¤Ï
¥Í¡¼¥à¥µ¡¼¥Ð¤¬¤½¤Î¥µ¡¼¥Ð¼«¿È¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë½ê»ý¤·¤Æ¤¤¤ë¥Ç¡¼¥¿¤Î¤ß¤òÊÖ¤¹¤³
¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£¥µ¡¼¥Ð¤Ï¾¤Î¥µ¡¼¥Ð¤Ë¾ðÊó¤ÎÌ䤤¹ç¤ï¤»¤ò¹Ô¤Ê¤¤¤Þ¤»¤ó¡£
-.PP
-¥ª¥×¥·¥ç¥ó -d ¤ò»ØÄꤹ¤ë¤È¡¢¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤È¤Ê¤ê¤Þ¤¹¡£¥Í¥Ã¥È¥ï¡¼¥¯
-¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤¬¾ÜºÙ¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
-.PP
-¥ª¥×¥·¥ç¥ó -t ¤Ë¤è¤Ã¤ÆÆÃÄê¤Î¥¿¥¤¥×¤Î¾ðÊó¤Î¸¡º÷¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-°ú¿ô¤Ï "named" ¤Î man ¥Ú¡¼¥¸¤Ë¤ª¤¤¤ÆÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¸½ºß¥µ¥Ý¡¼¥È¤µ¤ì
-¤Æ¤¤¤ë¥¿¥¤¥×¤Ë¤Ï a¡¢ns¡¢md¡¢mf¡¢cname¡¢soa¡¢mb¡¢mg¡¢mr¡¢null¡¢wks¡¢ptr¡¢
-hinfo¡¢minfo¡¢mx¡¢uinfo ¤È¥ï¥¤¥ë¥É¥«¡¼¥É (¤³¤ì¤Ï "any" ¤« "*" ¤È¤·¤Æ»Ø
-Äꤵ¤ì¤Þ¤¹) ¤¬¤¢¤ê¤Þ¤¹¡£¥¿¥¤¥×¤Ï¾®Ê¸»ú¤Ç»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏºÇ½é¤Ë "a" ¤¬¸¡º÷¤µ¤ì¡¢¼¡¤Ë "mx" ¤¬¸¡º÷¤µ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢
-"verbose" ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï "a" ¤Î¤ß¤Î¸¡º÷
-¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
-.PP
-¥ª¥×¥·¥ç¥ó -a ("all" ¤Î°Õ) ¤Ï "-v -t any" ¤ÈƱ¤¸¤Ç¤¹¡£
-.PP
-¥ª¥×¥·¥ç¥ó -l ¤ò»ØÄꤹ¤ë¤È´°Á´¤Ê¥É¥á¥¤¥ó¤Î¥ê¥¹¥È¤òɽ¼¨¤·¤Þ¤¹¡£Î㤨¤Ð
-.br
- host -l rutgers.edu
-.br
-¤ò¼Â¹Ô¤¹¤ë¤È¡¢rutgers.edu ¥É¥á¥¤¥ó¤ÎÁ´¤Æ¤Î¥Û¥¹¥È¤Î¥ê¥¹¥È¤òɽ¼¨¤·¤Þ¤¹¡£
--t ¥ª¥×¥·¥ç¥ó¤ò»È¤¦¤³¤È¤Ë¤è¤Ã¤ÆÉ½¼¨¤¹¤ë¾ðÊó¤Ë¥Õ¥£¥ë¥¿¤ò¤«¤±¤ë¤³¤È¤¬¤Ç
+.It Fl d
+¥Ç¥Ð¥Ã¥°¥â¡¼¥É¤È¤Ê¤ê¤Þ¤¹¡£¥Í¥Ã¥È¥ï¡¼¥¯¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤¬¾ÜºÙ¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£
+.It Fl t Ar querytype
+ÆÃÄê¤Î
+.Ar querytype
+¤Î¾ðÊó¤Î¸¡º÷¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+°ú¿ô¤Ï
+.Xr named 8
+¤Î man ¥Ú¡¼¥¸¤Ë¤ª¤¤¤ÆÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¸½ºß¥µ¥Ý¡¼¥È¤µ¤ì
+¤Æ¤¤¤ë¥¿¥¤¥×¤Ë¤Ï°Ê²¼¤Î¤â¤Î¤¬´Þ¤Þ¤ì¤Þ¤¹:
+.Dq Cm a ,
+.Dq Cm ns ,
+.Dq Cm md ,
+.Dq Cm mf ,
+.Dq Cm cname ,
+.Dq Cm soa ,
+.Dq Cm mb ,
+.Dq Cm mg ,
+.Dq Cm mr ,
+.Dq Cm null ,
+.Dq Cm wks ,
+.Dq Cm ptr ,
+.Dq Cm hinfo ,
+.Dq Cm minfo ,
+.Dq Cm mx ,
+.Dq Cm uinfo ,
+.Dq Cm uid ,
+.Dq Cm gid ,
+.Dq Cm unspec
+¤µ¤é¤Ë¡¢¥ï¥¤¥ë¥É¥«¡¼¥É (¤³¤ì¤Ï
+.Dq Cm any
+¤«
+.Dq Cm *
+¤È¤·¤Æ»ØÄꤵ¤ì¤Þ¤¹) ¤¬¤¢¤ê¡¢¾åµ­¤Î¤¹¤Ù¤Æ¤Î¥¿¥¤¥×¤ò»ØÄꤹ¤ë¤¿¤á¤Ë¤Ä¤«¤¤¤Þ¤¹¡£
+¥¿¥¤¥×¤Ï¾®Ê¸»ú¤Ç»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
+¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏºÇ½é¤Ë
+.Dq Cm a
+¤¬¸¡º÷¤µ¤ì¡¢¼¡¤Ë
+.Dq Cm mx
+¤¬¸¡º÷¤µ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢verbose ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï
+.Dq Cm a
+¤Î¤ß¤Î¸¡º÷¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£¥ª¥×¥·¥ç¥ó
+.Dq Fl t
+¤Ï
+.Ic host
+¤¬ÊÖ¤¹¾ðÊó¤Ë¥Õ¥£¥ë¥¿¤ò¤«¤±¤ë¤Î¤ËÆÃ¤ËÍ­¸ú¤Ç¤¹¡£
+¤½¤ì°Ê¾å¤Î¾ðÊó¤Ï²¼µ­¤Î
+.Dq Fl l
+¥ª¥×¥·¥ç¥ó¤ÎÀâÌÀ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+.It Fl a
+.Dq all
+¤Î°Õ¡£
+.Dq Fl v Fl t Cm any
+¤ÈƱ¤¸¤Ç¤¹¡£
+.It Fl l
+´°Á´¤Ê¥É¥á¥¤¥ó¤Î¥ê¥¹¥È¤òɽ¼¨¤·¤Þ¤¹¡£Î㤨¤Ð
+.Pp
+.D1 Ic host -l rutgers.edu
+.Pp
+¤ò¼Â¹Ô¤¹¤ë¤È¡¢rutgers.edu ¥É¥á¥¤¥ó¤Î¤¹¤Ù¤Æ¤Î¥Û¥¹¥È¤Î¥ê¥¹¥È¤òɽ¼¨¤·¤Þ¤¹¡£
+.Dq Fl t
+¥ª¥×¥·¥ç¥ó¤ò»È¤¦¤³¤È¤Ë¤è¤Ã¤ÆÉ½¼¨¤¹¤ë¾ðÊó¤Ë¥Õ¥£¥ë¥¿¤ò¤«¤±¤ë¤³¤È¤¬¤Ç
¤­¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï PTR ¤È NS ¥ì¥³¡¼¥É¤ò´Þ¤ó¤À¥¢¥É¥ì¥¹¾ðÊó¤¬É½¼¨¤µ
¤ì¤Þ¤¹¡£
-.br
- host -l -v -t any rutgers.edu
-.br
-¤Î¥³¥Þ¥ó¥É¤Ç¤Ï rutgers.edu ¤Î´°Á´¤Ê¥¾¡¼¥ó¥Ç¡¼¥¿¤òÀµ¼°¤Ê¥Þ¥¹¥¿¥Õ¥¡¥¤¥ë
+.Pp
+.D1 Ic host -l -v -t any rutgers.edu
+.Pp
+¤³¤Î¥³¥Þ¥ó¥É¤Ç¤Ï rutgers.edu ¤Î´°Á´¤Ê¥¾¡¼¥ó¥Ç¡¼¥¿¤òÀµ¼°¤Ê¥Þ¥¹¥¿¥Õ¥¡¥¤¥ë
¤Î·Á¼°¤Ç¥À¥¦¥ó¥í¡¼¥É¤·¤Þ¤¹¡£(¤·¤«¤·ÉԻ׵ĤÊÍýͳ¤Ë¤è¤ê SOA ¥ì¥³¡¼¥É¤Ï 2
-²ó¥ê¥¹¥È¤µ¤ì¤Þ¤¹¡£) ¥Î¡¼¥È : -l ¥Õ¥é¥°¤Ï´°Á´¤Ê¥¾¡¼¥óžÁ÷¤ò¹Ô¤Ê¤Ã¤¿¸å¡¢
+²ó¥ê¥¹¥È¤µ¤ì¤Þ¤¹¡£)
+.Pp
+.Sy Ãí:
+.Dq Fl l
+¥Õ¥é¥°¤Ï´°Á´¤Ê¥¾¡¼¥óžÁ÷¤ò¹Ô¤Ê¤Ã¤¿¸å¡¢
Í׵ᤷ¤¿¾ðÊó¤ò¥Õ¥£¥ë¥¿¥ê¥ó¥°¤¹¤ë¤è¤¦¤Ë¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï
ÀäÂФËɬÍפʻþ¤Ë¸Â¤Ã¤Æ»È¤¦¤Ù¤­¤Ç¤¹¡£
-.SH ¥Û¥¹¥È̾¸¡º÷¤Î¥«¥¹¥¿¥Þ¥¤¥º
+.Sh ¥Û¥¹¥È̾¸¡º÷¤Î¥«¥¹¥¿¥Þ¥¤¥º
°ìÈ̤˥桼¥¶¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤¿Ì¾Á°¤Ë¥É¥Ã¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢
¥Ç¥Õ¥©¥ë¥È¤Î¥É¥á¥¤¥ó¤¬¤½¤ÎËöÈø¤ËÉÕ¤±²Ã¤¨¤é¤ì¤Þ¤¹¡£¤³¤Î¥É¥á¥¤¥ó¤Ï
-/etc/resolv.conf ¤Ë¤ª¤¤¤ÆÄêµÁ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢Ä̾ï¤Ï¥í¡¼¥«¥ë¤Î
+.Pa /etc/resolv.conf
+¤Ë¤ª¤¤¤ÆÄêµÁ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢Ä̾ï¤Ï¥í¡¼¥«¥ë¤Î
¥Û¥¹¥È̾¤ÎºÇ½é¤Î¥É¥Ã¥È°Ê¹ß¤ò¼è¤ë¤³¤È¤Ë¤è¤Ã¤Æµá¤á¤é¤ì¤Þ¤¹¡£¥æ¡¼¥¶¤Ï´Ä¶­ÊÑ¿ô
-.I LOCALDOMAIN
+.Ev LOCALDOMAIN
¤ò»È¤Ã¤Æ°Û¤Ê¤ë¥Ç¥Õ¥©¥ë¥È¥É¥á¥¤¥ó¤ò»ØÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¤³¤ì¤ò
¥ª¡¼¥Ð¡¼¥é¥¤¥É¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢¥æ¡¼¥¶¤Ï¥Û¥¹¥È̾¤ÎÆÈ¼«¤Îά¾Î¤ò»È¤¦¤³
¤È¤â¤Ç¤­¤Þ¤¹¡£Î¬¾Î¤Ï 1 ¤Ä¤Îά¾Î¤Ë¤Ä¤­ 1 ¹Ô¤«¤é¤Ê¤ë¥Õ¥¡¥¤¥ë¤Ë¤ª¤¤¤Æ»ØÄê
¤·¤Þ¤¹¡£³Æ¹Ô¤Ë¤Ïά¾Î¡¢¥¹¥Ú¡¼¥¹¡¢¤½¤·¤Æ´°Á´¤Ê¥Û¥¹¥È̾¤¬´Þ¤Þ¤ì¤Þ¤¹¡£¤³¤Î
¥Õ¥¡¥¤¥ë¤Ï´Ä¶­ÊÑ¿ô
-.I HOSTALIASES
+.Ev HOSTALIASES
¤Ë¤Æ¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£
-.SH ´ØÏ¢¹àÌÜ
-named (8)
-.SH ¥Ð¥°
+.Sh ´Ä¶­ÊÑ¿ô
+.Bl -tag -width "/etc/resolv.conf " -compress
+.It Ev HOSTALIASES
+.Pq Ar ¥Û¥¹¥È¤ÎÊÌ̾ , ´°Á´¤Ê¥Û¥¹¥È̾
+¤Î¥Ú¥¢¤ò´Þ¤ó¤Ç¤¤¤ë¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë̾
+.El
+.Sh ´ØÏ¢¥Õ¥¡¥¤¥ë
+.Bl -tag -width "/etc/resolv.conf " -compress
+.It Pa /etc/resolv.conf
+.Xr resolver 5
+¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+.It Ev HOSTALIASES
+.Pq Ar ¥Û¥¹¥È¤ÎÊÌ̾ , ´°Á´¤Ê¥Û¥¹¥È̾
+¤Î¥Ú¥¢¤ò´Þ¤ó¤Ç¤¤¤ë¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë̾
+.El
+.Sh ´ØÏ¢¹àÌÜ
+.Xr named 8 ¡¢
+.Xr resolver 5
+.Sh ¥Ð¥°
¥í¡¼¥«¥ë¥É¥á¥¤¥ó¤Ë´Þ¤Þ¤ì¤Ê¤¤Ì¾Á°¤òÆþÎϤ¹¤ë¤Èͽ´ü¤Ç¤­¤Ê¤¤±Æ¶Á¤¬µ¯¤³¤êÆÀ
-¤Þ¤¹¡£Ì¾Á°¤¬¥É¥Ã¥È¤Ç½ª¤Ã¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢¥í¡¼¥«¥ë¥É¥á¥¤¥ó̾¤¬Á´¤Æ¤Î̾Á°¤Î
+¤Þ¤¹¡£Ì¾Á°¤¬¥É¥Ã¥È¤Ç½ª¤Ã¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢¥í¡¼¥«¥ë¥É¥á¥¤¥ó̾¤¬¤¹¤Ù¤Æ¤Î̾Á°¤Î
ËöÈø¤ËÉղ䵤ì¤ë¤³¤È¤ò¤¤¤Ä¤â¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£
¥í¡¼¥«¥ë¥É¥á¥¤¥ó¤ÎÊä´°¤Ë¼ºÇÔ¤·¤¿»þ¤Î¤ß¡¢Ì¾Á°¤ÏÊѹ¹¤µ¤ì¤º¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
-.PP
--l ¥ª¥×¥·¥ç¥ó¤Ç¤ÏÍ׵ᤵ¤ì¤¿¥É¥á¥¤¥ó¤Ë¤ª¤¤¤Æ¥ê¥¹¥È¤µ¤ì¤Æ¤¤¤ëºÇ½é¤Î
+.Pp
+.Dq Fl l
+¥ª¥×¥·¥ç¥ó¤Ç¤ÏÍ׵ᤵ¤ì¤¿¥É¥á¥¤¥ó¤Ë¤ª¤¤¤Æ¥ê¥¹¥È¤µ¤ì¤Æ¤¤¤ëºÇ½é¤Î
¥Í¡¼¥à¥µ¡¼¥Ð¤Ë¤Î¤ßÌ䤤¹ç¤ï¤»¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£¤â¤·¤³¤Î¥µ¡¼¥Ð¤¬»à¤ó¤Ç¤¤¤ì¤Ð¡¢
¥µ¡¼¥Ð¤ò¥Þ¥Ë¥å¥¢¥ë¤Ç»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤¿¤È¤¨¤Ð foo.edu ¤Î¥ê¥¹¥È¤ò
-ÆÀ¤ë¤Ë¤Ï¡¢"host -t ns foo.edu" ¤È»ØÄꤷ¤Æ foo.edu ¤ÎÁ´¤Æ¤Î¥Í¡¼¥à¥µ¡¼¥Ð
-¤Î¥ê¥¹¥È¤òÆÀ¤Æ¤«¤é¡¢Æ°ºî¤¹¤ë¤â¤Î¤¬¸«¤Ä¤«¤ë¤Þ¤Ç¥ê¥¹¥È¤Ë¤¢¤ëÁ´¤Æ¤Î
-¥Í¡¼¥à¥µ¡¼¥Ð¤Ë¤Ä¤¤¤Æ "host -l foo.edu xxx" (¤³¤³¤Ç xxx ¤Ï¥Í¡¼¥à¥µ¡¼¥Ð) ¤ò»î
-¤ß¤ì¤ÐÎɤ¤¤Ç¤·¤ç¤¦¡£
+ÆÀ¤ë¤Ë¤Ï¡¢
+.Pp
+.D1 Ic host -t ns foo.edu
+.Pp
+¤È»ØÄꤷ¤Æ foo.edu ¤Î¤¹¤Ù¤Æ¤Î¥Í¡¼¥à¥µ¡¼¥Ð
+¤Î¥ê¥¹¥È¤òÆÀ¤Æ¤«¤é¡¢Æ°ºî¤¹¤ë¤â¤Î¤¬¸«¤Ä¤«¤ë¤Þ¤Ç¥ê¥¹¥È¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î
+¥Í¡¼¥à¥µ¡¼¥Ð¤Ë¤Ä¤¤¤Æ
+.Pp
+.D1 Ic host -l foo.edu xxx
+.Pp
+(¤³¤³¤Ç
+.Dq Ic xxx
+¤Ï¥Í¡¼¥à¥µ¡¼¥Ð) ¤ò»î¤ß¤ì¤ÐÎɤ¤¤Ç¤·¤ç¤¦¡£
diff --git a/ja/man/man1/hostname.1 b/ja/man/man1/hostname.1
index a31ef11955..c3f39b6b4d 100644
--- a/ja/man/man1/hostname.1
+++ b/ja/man/man1/hostname.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)hostname.1 8.2 (Berkeley) 4/28/95
-.\" %Id: hostname.1,v 1.3.2.4 1998/07/15 02:01:26 jkh Exp %
+.\" %Id: hostname.1,v 1.8 1998/05/13 07:45:46 charnier Exp %
.\" jpman %Id: hostname.1,v 1.2 1997/04/10 07:27:59 mutoh Stab %
.\"
.Dd April 28, 1995
diff --git a/ja/man/man1/id.1 b/ja/man/man1/id.1
index a817f708e7..6123176b65 100644
--- a/ja/man/man1/id.1
+++ b/ja/man/man1/id.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)id.1 8.1 (Berkeley) 6/6/93
-.\" %Id: id.1,v 1.1.1.1.8.3 1998/02/28 22:11:14 alex Exp %
+.\" %Id: id.1,v 1.5 1998/08/21 06:47:58 obrien Exp %
.\" jpman %Id: id.1,v 1.2 1997/03/29 04:26:50 horikawa Stab %
.\"
.Dd June 6, 1993
@@ -49,6 +49,9 @@
.Fl G Op Fl n
.Op Ar user
.Nm id
+.Fl P
+.Op Ar user
+.Nm id
.Fl g Op Fl nr
.Op Ar user
.Nm id
@@ -75,6 +78,8 @@
¥°¥ë¡¼¥× ID
(¼Â¸ú¥°¥ë¡¼¥×¡¢¼Â¥°¥ë¡¼¥×¡¢¤½¤Î¾)¤ò¡¢¶õÇò¤Ç¶èÀڤäÆÎóµó¤·¤Þ¤¹¡£
ɽ¼¨¤¹¤ë½ç½ø¤Ë°ÕÌ£¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+.It Fl P
+id ¤È¤·¤Æ¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¥¨¥ó¥È¥ê¤òɽ¼¨¤·¤Þ¤¹¡£
.It Fl g
¼Â¸ú¥°¥ë¡¼¥× ID ¤ò ID ÈÖ¹æ¤Çɽ¼¨¤·¤Þ¤¹¡£
.It Fl n
diff --git a/ja/man/man1/ident.1 b/ja/man/man1/ident.1
index 009ea79412..c7ff5be5f1 100644
--- a/ja/man/man1/ident.1
+++ b/ja/man/man1/ident.1
@@ -4,7 +4,7 @@
.ds Dt \\$4
.ds iD \\$3 \\$4 \\$5 \\$6 \\$7
..
-.Id %Id: ident.1,v 1.2 1995/10/28 21:49:18 peter Exp %
+.Id %Id: ident.1,v 1.4 1997/02/22 15:47:27 peter Exp %
.ds r \&\s-1RCS\s0
.ds u \&\s-1UTC\s0
.if n .ds - \%--
diff --git a/ja/man/man1/install-info.1 b/ja/man/man1/install-info.1
index ca2d1fd2d9..1318994f7f 100644
--- a/ja/man/man1/install-info.1
+++ b/ja/man/man1/install-info.1
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: install-info.1,v 1.1.2.1 1997/08/29 09:11:26 obrien Exp %
+.\" %Id: install-info.1,v 1.2 1998/04/01 06:29:16 charnier Exp %
.\"
.\" .TH install-info 1
.Dd August 29, 1997
@@ -49,7 +49,9 @@
.Sh ¥Ð¥°
ÃΤé¤ì¤Æ¤¤¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó¡£
.Sh ºî¼Ô
-¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï David O'Brien (obrien@NUXI.com) ¤Ë¤è¤Ã¤Æ
+¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï
+.An David O'Brien Aq obrien@NUXI.com
+¤Ë¤è¤Ã¤Æ
½ñ¤«¤ì¤Þ¤·¤¿¡£
.\" .Sh HISTORY
.\" .Nm
diff --git a/ja/man/man1/install.1 b/ja/man/man1/install.1
index 98acd9e7ae..142bfce14a 100644
--- a/ja/man/man1/install.1
+++ b/ja/man/man1/install.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)install.1 8.1 (Berkeley) 6/6/93
-.\" %Id: install.1,v 1.7.2.2 1998/07/17 07:26:30 jkh Exp %
+.\" %Id: install.1,v 1.13 1998/06/10 07:17:59 peter Exp %
.\"
.\" jpman %Id: install.1,v 1.3 1997/11/12 13:03:24 horikawa Stab %
.Dd September 22, 1996
diff --git a/ja/man/man1/intro.1 b/ja/man/man1/intro.1
index a5dd798ef9..3d155a500f 100644
--- a/ja/man/man1/intro.1
+++ b/ja/man/man1/intro.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)intro.1 8.2 (Berkeley) 12/30/93
-.\" %Id: intro.1,v 1.4.2.3 1997/06/13 21:13:27 max Exp %
+.\" %Id: intro.1,v 1.10 1997/06/13 21:11:27 max Exp %
.\" jpman %Id: intro.1,v 1.2 1997/05/17 15:58:13 horikawa Stab %
.\"
.Dd December 30, 1993
diff --git a/ja/man/man1/ipcrm.1 b/ja/man/man1/ipcrm.1
index e58827bab3..4bfde524fb 100644
--- a/ja/man/man1/ipcrm.1
+++ b/ja/man/man1/ipcrm.1
@@ -21,7 +21,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: ipcrm.1,v 1.1.8.2 1997/09/15 08:32:01 jkh Exp %
+.\" %Id: ipcrm.1,v 1.5 1997/07/15 09:54:34 charnier Exp %
.\" jpman %Id: ipcrm.1,v 1.2 1997/05/04 07:58:04 horikawa Stab %
.\""
.Dd August 8, 1994
diff --git a/ja/man/man1/ipcs.1 b/ja/man/man1/ipcs.1
index 0bf10e84f4..2c85330bc6 100644
--- a/ja/man/man1/ipcs.1
+++ b/ja/man/man1/ipcs.1
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: ipcs.1,v 1.3.2.3 1998/07/17 04:18:20 jkh Exp %
+.\" %Id: ipcs.1,v 1.8 1998/03/23 07:43:36 charnier Exp %
.\" jpman %Id: ipcs.1,v 1.2 1997/05/04 07:59:32 horikawa Stab %
.\"
.Dd June 18, 1994
diff --git a/ja/man/man1/kbdcontrol.1 b/ja/man/man1/kbdcontrol.1
index 0aaa5c5ac0..76c31a5bf4 100644
--- a/ja/man/man1/kbdcontrol.1
+++ b/ja/man/man1/kbdcontrol.1
@@ -38,7 +38,7 @@
°Ê²¼¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ò»ÈÍѲÄǽ¤Ç¤¹:
.Bl -tag -width indent
.It Fl b Ar duration.pitch | Ar belltype
-¥Ù¥ë¤Î»ý³»þ´Ö(duration)µÚ¤Ó¥Ô¥Ã¥Á(pitch)¤òÀßÄꤷ¤Þ¤¹¡£
+¥Ù¥ë¤Î»ý³»þ´Ö(duration)¤ò¥ß¥êÉäǡ¢¥Ô¥Ã¥Á(pitch)¤ò¥Ø¥ë¥Ä¤ÇÀßÄꤷ¤Þ¤¹¡£
Âå¤ï¤ê¤Ë
.Ar belltype
°ú¿ô¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢¤³¤Î°ú¿ô¤Ï
diff --git a/ja/man/man1/kbdmap.1 b/ja/man/man1/kbdmap.1
index 9730fc2e5b..69e6ca2015 100644
--- a/ja/man/man1/kbdmap.1
+++ b/ja/man/man1/kbdmap.1
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: kbdmap.1,v 1.6.2.6 1998/07/18 11:10:31 jkh Exp %
+.\" %Id: kbdmap.1,v 1.14 1998/03/23 08:23:11 charnier Exp %
.\" jpman %Id: kbdmap.1,v 1.3 1997/08/10 18:29:41 horikawa Stab %
.Dd Mar 25, 1995
diff --git a/ja/man/man1/kdump.1 b/ja/man/man1/kdump.1
index 16eb0c5dd7..8f133a754a 100644
--- a/ja/man/man1/kdump.1
+++ b/ja/man/man1/kdump.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)kdump.1 8.1 (Berkeley) 6/6/93
-.\" %Id: kdump.1,v 1.2.2.3 1997/09/15 08:32:05 jkh Exp %
+.\" %Id: kdump.1,v 1.4 1997/07/16 06:49:48 charnier Exp %
.\" jpman %Id: kdump.1,v 1.2 1997/05/16 00:24:29 mutoh Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/key.1 b/ja/man/man1/key.1
index 75057837df..666e18e9a1 100644
--- a/ja/man/man1/key.1
+++ b/ja/man/man1/key.1
@@ -1,5 +1,5 @@
.\" from: @(#)key.1 1.0 (Bellcore) 12/2/91
-.\" %Id: key.1,v 1.2.2.2 1998/07/17 04:18:24 jkh Exp %
+.\" %Id: key.1,v 1.4 1998/03/23 07:43:42 charnier Exp %
.\" jpman %Id: key.1,v 1.3 1997/07/22 17:45:51 horikawa Stab %
.\"
.Dd December 2, 1991
diff --git a/ja/man/man1/keyinfo.1 b/ja/man/man1/keyinfo.1
index 97660fa7cf..357fc7fc8d 100644
--- a/ja/man/man1/keyinfo.1
+++ b/ja/man/man1/keyinfo.1
@@ -1,5 +1,5 @@
.\" from: @(#)keyinfo.1 1.1 (Bellcore) 7/20/93
-.\" %Id: keyinfo.1,v 1.2.2.2 1998/07/17 04:18:28 jkh Exp %
+.\" %Id: keyinfo.1,v 1.6 1998/03/23 07:43:53 charnier Exp %
.\" jpman %Id: keyinfo.1,v 1.2 1997/04/18 07:31:28 mutoh Stab %
.\"
.Dd April 26, 1996
diff --git a/ja/man/man1/kill.1 b/ja/man/man1/kill.1
index 5440845b58..820dface05 100644
--- a/ja/man/man1/kill.1
+++ b/ja/man/man1/kill.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)kill.1 8.2 (Berkeley) 4/28/95
-.\" %Id: kill.1,v 1.3.2.3 1998/07/15 02:01:27 jkh Exp %
+.\" %Id: kill.1,v 1.8 1998/05/18 03:33:07 jkoshy Exp %
.\" jpman %Id: kill.1,v 1.2 1997/04/18 07:37:46 mutoh Stab %
.\"
.Dd April 28, 1995
diff --git a/ja/man/man1/killall.1 b/ja/man/man1/killall.1
index 83cfb21f77..a56b659ab4 100644
--- a/ja/man/man1/killall.1
+++ b/ja/man/man1/killall.1
@@ -22,7 +22,7 @@
.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: killall.1,v 1.6.2.2 1998/07/17 04:18:38 jkh Exp %
+.\" %Id: killall.1,v 1.10 1998/03/23 07:44:10 charnier Exp %
.\" jpman %Id: killall.1,v 1.3 1997/07/22 18:03:26 horikawa Stab %
.\"
.Dd June 25, 1995
diff --git a/ja/man/man1/ktrace.1 b/ja/man/man1/ktrace.1
index bdea6b75f1..e6d45187ab 100644
--- a/ja/man/man1/ktrace.1
+++ b/ja/man/man1/ktrace.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ktrace.1 8.1 (Berkeley) 6/6/93
-.\" %Id: ktrace.1,v 1.4.2.4 1997/12/23 07:25:07 charnier Exp %
+.\" %Id: ktrace.1,v 1.7 1997/11/24 07:23:59 charnier Exp %
.\" jpman %Id: ktrace.1,v 1.2 1997/05/16 00:27:14 mutoh Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/lastcomm.1 b/ja/man/man1/lastcomm.1
index c5b8fba3d6..4fb6bb8b97 100644
--- a/ja/man/man1/lastcomm.1
+++ b/ja/man/man1/lastcomm.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)lastcomm.1 8.1 (Berkeley) 6/6/93
-.\" %Id: lastcomm.1,v 1.3.2.1 1997/07/22 07:16:38 charnier Exp %
+.\" %Id: lastcomm.1,v 1.6 1997/07/21 12:01:45 charnier Exp %
.\" jpman %Id: lastcomm.1,v 1.2 1997/03/29 06:18:35 horikawa Stab %
.\"
.Dd September 18, 1996
diff --git a/ja/man/man1/ld.1 b/ja/man/man1/ld.1
index d53d509e14..70a97c532c 100644
--- a/ja/man/man1/ld.1
+++ b/ja/man/man1/ld.1
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: ld.1,v 1.12.2.4 1998/07/26 04:13:21 jkoshy Exp %
+.\" %Id: ld.1,v 1.20 1998/07/26 04:16:04 jkoshy Exp %
.\" jpman %Id: ld.1,v 1.4 1997/11/12 13:02:08 horikawa Stab %
.\"
.Dd October 14, 1993
diff --git a/ja/man/man1/lex.1 b/ja/man/man1/lex.1
index e5e402fa79..18dab704e6 100644
--- a/ja/man/man1/lex.1
+++ b/ja/man/man1/lex.1
@@ -2924,7 +2924,7 @@ ANSI C ¤Ç¤Ï
.fi
ºÇ½é¤Î¿ô¹Ô¤Ï¡¢
-'o' ¤ËÁ«°Ü¤Ç¤­¤ë¤¬Â¾¤Îʸ»ú¤Ë¤ÏÁ«°Ü¤Ç¤­¤Ê¤¤¾õÂÖ¤¬¤¢¤ê¡¢
+\&'o' ¤ËÁ«°Ü¤Ç¤­¤ë¤¬Â¾¤Îʸ»ú¤Ë¤ÏÁ«°Ü¤Ç¤­¤Ê¤¤¾õÂÖ¤¬¤¢¤ê¡¢
¤½¤Î¾õÂ֤Ǥϸ½ºß¥¹¥­¥ã¥ó¤µ¤ì¤¿¥Æ¥­¥¹¥È¤Ï¾¤Î¥ë¡¼¥ë¤Ë¤Ï¥Þ¥Ã¥Á¤·¤Ê¤¤¤³¤È¤ò
ɽ¤·¤Þ¤¹¡£
¤³¤Î¾õÂÖ¤¬È¯À¸¤·¤¿¤Î¤Ï¡¢
@@ -3214,7 +3214,7 @@ flex ¤Î¼Â¹Ô·Á¼°Ì¾¤¬ '+' ¤Ç½ª¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¼«Æ°Åª¤Ë»ØÄꤵ¤ì¤Þ¤¹¡£
¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
À¸À®¤µ¤ì¤¿¥¹¥­¥ã¥Ê¤Ï
2 ¤Ä¤Î C++ ¥¯¥é¥¹¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄêµÁ¤¹¤ë¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë
-.I FlexLexer.h
+.I g++/FlexLexer.h
¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Þ¤¹¡£
.PP
ºÇ½é¤Î¥¯¥é¥¹
diff --git a/ja/man/man1/limits.1 b/ja/man/man1/limits.1
index b10adfb172..3ed5796de2 100644
--- a/ja/man/man1/limits.1
+++ b/ja/man/man1/limits.1
@@ -17,7 +17,7 @@
.\" 5. Modifications may be freely made to this file providing the above
.\" conditions are met.
.\"
-.\" %Id: limits.1,v 1.2.2.6 1998/07/17 04:18:48 jkh Exp %
+.\" %Id: limits.1,v 1.8 1998/06/04 21:05:58 steve Exp %
.\" jpman %Id: limits.1,v 1.3 1997/06/23 15:04:52 horikawa Stab %
.\"
.Dd January 15, 1996
diff --git a/ja/man/man1/ln.1 b/ja/man/man1/ln.1
index 8498bf8e7c..57a380b7c7 100644
--- a/ja/man/man1/ln.1
+++ b/ja/man/man1/ln.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ln.1 8.2 (Berkeley) 12/30/93
-.\" %Id: ln.1,v 1.3.2.1 1998/07/15 02:01:30 jkh Exp %
+.\" %Id: ln.1,v 1.6 1998/05/15 06:19:02 charnier Exp %
.\" jpman %Id: ln.1,v 1.2 1997/04/15 00:24:41 mutoh Stab %
.\"
.Dd December 30, 1993
diff --git a/ja/man/man1/locate.1 b/ja/man/man1/locate.1
index 26d866cb83..1e40aaad8c 100644
--- a/ja/man/man1/locate.1
+++ b/ja/man/man1/locate.1
@@ -31,7 +31,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)locate.1 8.1 (Berkeley) 6/6/93
-.\" %Id: locate.1,v 1.5.2.3 1998/05/22 11:03:37 jkoshy Exp %
+.\" %Id: locate.1,v 1.11 1998/05/15 11:22:38 jkoshy Exp %
.\" jpman %Id: locate.1,v 1.3 1997/05/19 16:39:18 horikawa Stab %
.\"
.Dd June 6, 1993
@@ -182,13 +182,13 @@ $ zcat database.gz | locate -d - pattern
.Xr stdio 3
¥é¥¤¥Ö¥é¥ê¤ò»È¤¤¤Þ¤¹¡£
.Sh ´ØÏ¢¥Õ¥¡¥¤¥ë
-.Bl -tag -width /usr/libexec/locate.updatedb -compact
+.Bl -tag -width /etc/periodic/weekly/310.locate -compact
.It Pa /var/db/locate.database
locate ¥Ç¡¼¥¿¥Ù¡¼¥¹
.It Pa /usr/libexec/locate.updatedb
locate ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤¹¤ë¤¿¤á¤Î¥¹¥¯¥ê¥×¥È
-.It Pa /etc/weekly
-Ä̾locate.updatedb ¤¬µ¯Æ°¤µ¤ì¤ë¥¹¥¯¥ê¥×¥È
+.It Pa /etc/periodic/weekly/310.locate
+¥Ç¡¼¥¿¥Ù¡¼¥¹ºÆ¹½ÃÛ¤òµ¯Æ°¤¹¤ë¥¹¥¯¥ê¥×¥È
.El
.Sh ´Ä¶­ÊÑ¿ô
.Bl -tag -width LOCATE_PATH -compact
@@ -219,7 +219,7 @@ locate ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤¹¤ë¤¿¤á¤Î¥¹¥¯¥ê¥×¥È
¤³¤ì¤Ï
.Nm
¤¬
-.Pa /etc/weekly
+.Pa /etc/periodic/weekly/310.locate
¥¹¥¯¥ê¥×¥È¤Ç½µ¤Ë°ìÅÙ¹¹¿·¤µ¤ì¤ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é
¾ðÊó¤òÆÀ¤Æ¤¤¤ë¤¿¤á¤Ç¤¹¡£
¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¹½ÃÛ¤Ë
diff --git a/ja/man/man1/lockf.1 b/ja/man/man1/lockf.1
index 5c0b6e8b48..b658a4b775 100644
--- a/ja/man/man1/lockf.1
+++ b/ja/man/man1/lockf.1
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: lockf.1,v 1.1.1.1.2.2 1998/07/08 05:33:44 jdp Exp %
+.\" %Id: lockf.1,v 1.6 1998/07/08 05:29:04 jdp Exp %
.\" jpman %Id: lockf.1,v 1.3 1997/08/20 12:32:03 horikawa Stab %
.\"
.Dd July 7, 1998
diff --git a/ja/man/man1/login.1 b/ja/man/man1/login.1
index 9228d832f5..2d63be0f4b 100644
--- a/ja/man/man1/login.1
+++ b/ja/man/man1/login.1
@@ -32,7 +32,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)login.1 8.2 (Berkeley) 5/5/94
-.\" %Id: login.1,v 1.4.2.4 1998/01/07 10:44:20 obrien Exp %
+.\" %Id: login.1,v 1.10 1998/01/07 10:42:57 obrien Exp %
.\" jpman %Id: login.1,v 1.3 1997/05/19 16:39:53 horikawa Stab %
.\"
.Dd May 5, 1994
diff --git a/ja/man/man1/logname.1 b/ja/man/man1/logname.1
index 61d6f646fa..c3dd7361af 100644
--- a/ja/man/man1/logname.1
+++ b/ja/man/man1/logname.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)logname.1 8.1 (Berkeley) 6/9/93
-.\" %Id: logname.1,v 1.2.2.2 1997/09/15 08:32:19 jkh Exp %
+.\" %Id: logname.1,v 1.4 1997/06/23 04:03:06 steve Exp %
.\" jpman %Id: logname.1,v 1.2 1997/04/24 00:27:29 mutoh Stab %
.\"
.Dd June 9, 1993
diff --git a/ja/man/man1/lp.1 b/ja/man/man1/lp.1
index b25381a2b4..f992b62875 100644
--- a/ja/man/man1/lp.1
+++ b/ja/man/man1/lp.1
@@ -31,7 +31,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: lp.1,v 1.2.2.3 1998/07/18 11:10:42 jkh Exp %
+.\" %Id: lp.1,v 1.7 1998/03/23 08:23:34 charnier Exp %
.\" jpman %Id: lp.1,v 1.3 1997/07/01 19:59:08 ken Stab %
.\"
.Dd January 22, 1995
diff --git a/ja/man/man1/lpr.1 b/ja/man/man1/lpr.1
index 71707752fc..abea91d085 100644
--- a/ja/man/man1/lpr.1
+++ b/ja/man/man1/lpr.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)lpr.1 8.1 (Berkeley) 6/6/93
-.\" %Id: lpr.1,v 1.5.2.1 1997/09/25 06:33:03 charnier Exp %
+.\" %Id: lpr.1,v 1.8 1997/09/24 06:48:07 charnier Exp %
.\" jpman %Id: lpr.1,v 1.3 1997/08/11 14:28:54 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/ls.1 b/ja/man/man1/ls.1
index ce12ac43ea..ec07baeb0c 100644
--- a/ja/man/man1/ls.1
+++ b/ja/man/man1/ls.1
@@ -32,11 +32,11 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" @(#)ls.1 8.6 (Berkeley) 4/18/94
-.\" %Id: ls.1,v 1.5.2.6 1998/07/15 02:01:34 jkh Exp %
+.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
+.\" %Id: ls.1,v 1.24 1998/07/29 00:46:08 hoek Exp %
.\" jpman %Id: ls.1,v 1.3 1997/05/19 17:21:06 horikawa Stab %
.\"
-.Dd April 18, 1994
+.Dd July 29, 1994
.Dt LS 1
.Os
.Sh ̾¾Î
@@ -343,6 +343,15 @@ ID ÈÖ¹æ¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£
¾ÜºÙ¤Ï
.Xr environ 7
¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+.It Ev LS_COLWIDTHS
+¤³¤ÎÊÑ¿ô¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
+¥³¥í¥ó¶èÀÚ¤ê¤Î¥ê¥¹¥È¤Ç³Æ¥Õ¥£¡¼¥ë¥É¤ÎºÇ¾®Éý¤ò»ØÄꤷ¤Æ¤¤¤ë¤â¤Î¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£
+ŬÀڤǤʤ«¤Ã¤¿¤êÉÔ½½Ê¬¤À¤Ã¤¿¤ê¤¹¤ëÉý¤Ï̵»ë¤µ¤ì¤Þ¤¹
+(¤è¤Ã¤Æ 0 ¤ò»ØÄꤹ¤ë¤È¡¢¥Õ¥£¡¼¥ë¥ÉÉý¤¬Æ°Åª¤Ë·è¤Þ¤ê¤Þ¤¹)¡£
+¤¹¤Ù¤Æ¤Î¥Õ¥£¡¼¥ë¥É¤ÎÉý¤òÊѤ¨¤é¤ì¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+¥Õ¥£¡¼¥ë¥É¤Î½ç½ø¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹:
+i¥Î¡¼¥É¡¢¥Ö¥í¥Ã¥¯¿ô¡¢¥ê¥ó¥¯¿ô¡¢¥æ¡¼¥¶Ì¾¡¢¥°¥ë¡¼¥×̾¡¢¥Õ¥é¥°¡¢¥Õ¥¡¥¤¥ë¥µ¥¤¥º¡¢
+¥Õ¥¡¥¤¥ë̾¡£
.El
.Sh ¸ß´¹À­
.St -p1003.2
diff --git a/ja/man/man1/lsvfs.1 b/ja/man/man1/lsvfs.1
index 4b2fb91283..c3598c2341 100644
--- a/ja/man/man1/lsvfs.1
+++ b/ja/man/man1/lsvfs.1
@@ -1,4 +1,4 @@
-.\" %Id: lsvfs.1,v 1.3 1996/01/30 13:49:39 mpp Exp %
+.\" %Id: lsvfs.1,v 1.5 1997/02/22 19:55:59 peter Exp %
.\" jpman %Id: lsvfs.1,v 1.4 1997/08/28 12:09:24 horikawa Stab %
.\" Garrett A. Wollman, September 1994
.\" This file is in the public domain.
diff --git a/ja/man/man1/m4.1 b/ja/man/man1/m4.1
index 3c6b08791c..c2df5d9611 100644
--- a/ja/man/man1/m4.1
+++ b/ja/man/man1/m4.1
@@ -1,5 +1,5 @@
.\"
-.\" @(#) %Id: m4.1,v 1.1.8.3 1998/07/17 04:19:19 jkh Exp %
+.\" @(#) %Id: m4.1,v 1.6 1998/06/26 14:25:18 rnordier Exp %
.\" jpman %Id: m4.1,v 1.3 1997/10/05 12:55:54 horikawa Stab %
.\"
.Dd January 26, 1993
diff --git a/ja/man/man1/mail.1 b/ja/man/man1/mail.1
index fd12c6f100..a96aeb5ce9 100644
--- a/ja/man/man1/mail.1
+++ b/ja/man/man1/mail.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mail.1 8.2 (Berkeley) 12/30/93
-.\" %Id: mail.1,v 1.8.2.5 1998/04/14 01:00:35 steve Exp %
+.\" %Id: mail.1,v 1.15 1998/04/14 00:59:29 steve Exp %
.\" jpman %Id: mail.1,v 1.3 1997/10/30 01:42:49 h-nokubi Stab %
.\"
.Dd December 30, 1993
diff --git a/ja/man/man1/mailq.1 b/ja/man/man1/mailq.1
index bb91e6cfb8..2c3a4db272 100644
--- a/ja/man/man1/mailq.1
+++ b/ja/man/man1/mailq.1
@@ -1,39 +1,18 @@
-.\" Copyright (c) 1983, 1997 Eric P. Allman
+.\" Copyright (c) 1998 Sendmail, Inc. All rights reserved.
+.\" Copyright (c) 1983, 1997 Eric P. Allman. All rights reserved.
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
+.\" By using this file, you agree to the terms and conditions set
+.\" forth in the LICENSE file which can be found at the top level of
+.\" the sendmail distribution.
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
.\"
-.\" @(#)mailq.1 8.5 (Berkeley) 2/1/97
+.\" @(#)mailq.1 8.10 (Berkeley) 5/19/98
+.\"
.\" jpman %Id: mailq.1,v 1.2 1997/03/29 06:21:16 horikawa Stab %
.\"
-.Dd February 1, 1997
+.Dd May 19, 1998
.Dt MAILQ 1
.Os BSD 4
.Sh ̾¾Î
diff --git a/ja/man/man1/make.1 b/ja/man/man1/make.1
index bc96ac8ba3..b54594b033 100644
--- a/ja/man/man1/make.1
+++ b/ja/man/man1/make.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)make.1 8.4 (Berkeley) 3/19/94
-.\" %Id: make.1,v 1.6.2.4 1998/06/04 22:33:18 steve Exp %
+.\" %Id: make.1,v 1.12 1998/05/25 03:28:37 steve Exp %
.\"
.\" this file based on that translated to japanese on NetBSD Japanese Reference
.\" Manual Project, and modefied to fit FreeBSD Reference Manual
@@ -850,7 +850,7 @@ for ¥ë¡¼¥×¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¥ë¡¼¥ë¤ò°ìÏ¢¤Î¥Õ¥¡¥¤¥ë¤ËŬÍѤ¹¤ë¤Î¤Ë¤è¤¯
.\" .It Ic .NOTPARALLEL
.\" ¤³¤Î̾Á°¤Î¥¿¡¼¥²¥Ã¥È¤Ï¡¢ÊÂÎó¥â¡¼¥É¤ò»È¤ï¤¹¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
.\" ¥¿¡¼¥²¥Ã¥È¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤»þ¤Ë¤Ï¡¢Á´¤Æ¤Î¥¿¡¼¥²¥Ã¥È¤¬ÈóÊÂÎó¥â¡¼¥É
- \" ¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
+.\" ¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
.It Ic .NOTPARALLEL
ÊÂÎó¥â¡¼¥É¤ò»È¤¤¤Þ¤»¤ó¡£
.It Ic .NO_PARALLEL
diff --git a/ja/man/man1/makewhatis.1 b/ja/man/man1/makewhatis.1
index 9ff87e1ae7..7e8cde95f0 100644
--- a/ja/man/man1/makewhatis.1
+++ b/ja/man/man1/makewhatis.1
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: makewhatis.1,v 1.6.2.2 1996/12/22 23:05:27 mpp Exp %
+.\" %Id: makewhatis.1,v 1.12 1998/04/01 06:22:28 charnier Exp %
.\" jpman %Id: makewhatis.1,v 1.2 1997/04/01 14:15:46 horikawa Stab %
-.Dd Jan, 12, 1995
+.Dd January 12, 1995
.Dt MAKEWHATIS 1
.Os FreeBSD 2.1
.Sh ̾¾Î
@@ -139,7 +139,7 @@ whatis ¥Ç¡¼¥¿¥Ù¡¼¥¹¡£
.Xr sort 1 ,
.Xr uniq 1 ,
.Xr whatis 1 ,
-.Xr makewhatis.local 8 .
+.Xr makewhatis.local 8
.Sh Îò»Ë
¤³¤Î
.Nm
@@ -147,4 +147,5 @@ whatis ¥Ç¡¼¥¿¥Ù¡¼¥¹¡£
.Fx 2.1
¤«¤éÅо줷¤Þ¤·¤¿¡£
.Sh ºî¼Ô
-Wolfram Schneider, Berlin.
+.An Wolfram Schneider ,
+Berlin.
diff --git a/ja/man/man1/merge.1 b/ja/man/man1/merge.1
index 3a5c9f1465..2424bc47a1 100644
--- a/ja/man/man1/merge.1
+++ b/ja/man/man1/merge.1
@@ -3,7 +3,7 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id %Id: merge.1,v 1.2.2.1 1998/02/16 18:22:13 jkh Exp %
+.Id %Id: merge.1,v 1.5 1997/08/23 15:50:53 steve Exp %
.ds r \&\s-1RCS\s0
.TH MERGE 1 \*(Dt GNU
.SH ̾¾Î
diff --git a/ja/man/man1/mesg.1 b/ja/man/man1/mesg.1
index d8cf0bb439..0c57ff0ef8 100644
--- a/ja/man/man1/mesg.1
+++ b/ja/man/man1/mesg.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mesg.1 8.1 (Berkeley) 6/6/93
-.\" %Id: mesg.1,v 1.2.2.2 1997/07/28 06:50:32 charnier Exp %
+.\" %Id: mesg.1,v 1.6 1997/07/24 06:59:00 charnier Exp %
.\" jpman %Id: mesg.1,v 1.3 1997/05/19 16:43:45 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/minigzip.1 b/ja/man/man1/minigzip.1
index 7f5de7af4d..357671e588 100644
--- a/ja/man/man1/minigzip.1
+++ b/ja/man/man1/minigzip.1
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: minigzip.1,v 1.2.2.2 1998/01/14 14:11:16 tg Exp %
+.\" %Id: minigzip.1,v 1.2 1998/01/05 07:14:54 charnier Exp %
.\"
.Dd December 13, 1997
.Dt MINIGZIP 1
diff --git a/ja/man/man1/mkdir.1 b/ja/man/man1/mkdir.1
index 726f8e7ab2..12a8771850 100644
--- a/ja/man/man1/mkdir.1
+++ b/ja/man/man1/mkdir.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mkdir.1 8.2 (Berkeley) 1/25/94
-.\" %Id: mkdir.1,v 1.3.2.3 1998/07/16 09:35:42 jkh Exp %
+.\" %Id: mkdir.1,v 1.7 1998/05/15 06:23:43 charnier Exp %
.\" jpman %Id: mkdir.1,v 1.2 1997/03/29 06:22:04 horikawa Stab %
.\"
.Dd January 25, 1994
diff --git a/ja/man/man1/mkfifo.1 b/ja/man/man1/mkfifo.1
index 2976ac5900..492b47d97a 100644
--- a/ja/man/man1/mkfifo.1
+++ b/ja/man/man1/mkfifo.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mkfifo.1 8.2 (Berkeley) 1/5/94
-.\" %Id: mkfifo.1,v 1.2.2.3 1997/09/15 09:20:46 jkh Exp %
+.\" %Id: mkfifo.1,v 1.4 1997/04/27 08:45:45 jmg Exp %
.\" jpman %Id: mkfifo.1,v 1.3 1997/09/04 16:41:11 horikawa Stab %
.\"
.Dd January 5, 1994
diff --git a/ja/man/man1/mktemp.1 b/ja/man/man1/mktemp.1
index 50b91501a3..0474f79c9b 100644
--- a/ja/man/man1/mktemp.1
+++ b/ja/man/man1/mktemp.1
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.1.2.1 1998/04/18 10:56:45 obrien Exp %
+.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.2 1998/05/05 06:13:47 charnier Exp %
.\" From: %OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp %
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -46,7 +46,7 @@
.Op Fl u
.Op Ar template ...
.Sh ²òÀâ
-.Nm mktemp
+.Nm
¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¡¢°ú¿ô¤Î¥Õ¥¡¥¤¥ë̾¥Æ¥ó¥×¥ì¡¼¥È¤Î°ì¤Ä°ì¤Ä¤ËÂФ·¤Æ¡¢
¤½¤Î°ìÉô¤ò¾å½ñ¤­¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤·¤Þ¤¹¡£
¤³¤Î¥Õ¥¡¥¤¥ë̾¤Ï¥æ¥Ë¡¼¥¯¤Ç¤¢¤ê¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬»ÈÍѤ¹¤ë¤Î¤ËŬ¤·¤Æ¤¤¤Þ¤¹¡£
@@ -91,7 +91,7 @@
.Fl t
¥Õ¥é¥°¤Î·ë²Ì¤ÎÆâÉô¥Æ¥ó¥×¥ì¡¼¥È¤ò¤â¤È¤Ë¤¹¤ë¤â¤Î¤Ò¤È¤Ä¤â´Þ¤Þ¤ì¤Þ¤¹¡£
.Pp
-.Nm mktemp
+.Nm
¤Ï¡¢¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤¬°ÂÁ´¤Ë°ì»þ¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ¹¤ë¤¿¤á¤ËÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£
ÅÁÅýŪ¤Ë¿¤¯¤Î¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤¬¡¢
¥×¥í¥°¥é¥à̾¤Ë pid ¤òÉÕ¤±¤¿Ì¾Á°¤ò°ì»þ¥Õ¥¡¥¤¥ë̾¤È¤·¤Æ»ÈÍѤ·¤Æ¤¤¤Þ¤¹¡£
@@ -105,8 +105,8 @@
.Nm
¤Î»ÈÍѤò¤ª´«¤á¤·¤Þ¤¹¡£
.Sh ¥ª¥×¥·¥ç¥ó
-.Bl -tag -width indent
»ÈÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤ò°Ê²¼¤Ë¼¨¤·¤Þ¤¹:
+.Bl -tag -width indent
.It Fl d
¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¯¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·¤Þ¤¹¡£
.It Fl q
@@ -124,7 +124,7 @@
¥â¡¼¥É¤ÇÁàºî¤·¤Þ¤¹¡£°ì»þ¥Õ¥¡¥¤¥ë¤Ï
.Nm
¤¬½ªÎ»¤¹¤ëÁ°¤Ë¥¢¥ó¥ê¥ó¥¯¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ï
-.Fn mktemp 3
+.Xr mktemp 3
¤è¤ê¤Ï¾¯¤·¤Þ¤·¤Ç¤¹¤¬¡¢°ÍÁ³¥ì¡¼¥¹¾õÂÖ¤ò°ú¤­µ¯¤³¤·¤Þ¤¹¡£
¤³¤Î¥ª¥×¥·¥ç¥ó¤Î»ÈÍѤϤª´«¤á¤·¤Þ¤»¤ó¡£
.El
@@ -168,5 +168,7 @@ fi
¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï
.Ox 2.1
¤ËÅо줷¤Þ¤·¤¿¡£¤³¤Î¼ÂÁõ¤Ï¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤È¤ÏÆÈΩ¤Ëµ­½Ò¤µ¤ì¤Þ¤·¤¿¡£
-¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï OpenBSD ͳÍè¤Ç¤¹¡£
+¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï
+.Bx Open
+ͳÍè¤Ç¤¹¡£
.\" Our stupid .Ox macro won't allow me to use .Ox alone.
diff --git a/ja/man/man1/more.1 b/ja/man/man1/more.1
index 78dd9d7374..f86a591ae9 100644
--- a/ja/man/man1/more.1
+++ b/ja/man/man1/more.1
@@ -42,11 +42,10 @@
.Nd CRT ¾å¤Ç¥Õ¥¡¥¤¥ë¤ò¥Ú¡¼¥¸Ã±°Ì¤Ë±ÜÍ÷¤¹¤ë
.Sh ½ñ¼°
.Nm
-.Op Fl ceinus
+.Op Fl ceinsu
.Op Fl t Ar tag
.Op Fl x Ar tabs
.Op Fl / Ar pattern
-.Op Fl #
.Op Ar
.Sh ²òÀâ
.Nm
@@ -297,7 +296,7 @@ filename ¤Ç»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤òɽ¼¨Âоݤˤ·¤Þ¤¹¡£
.Xr vi 1
.Sh ¥Ð¥°
CRLF ¤¬²þ¹ÔÉ乿¤Ç¤¢¤ëÉáÄ̤Υե¡¥¤¥ë¤ò¥¢¥¯¥»¥¹¤¹¤ë»þ¡¢
- -u ¥Õ¥é¥°Ìµ¤·¤Ç¤ÏÀµ¤·¤¯¤Ê¤¤½ÐÎϤ¬·ë²Ì¤È¤·¤ÆÆÀ¤é¤ì¤Þ¤¹¡£
+-u ¥Õ¥é¥°Ìµ¤·¤Ç¤ÏÀµ¤·¤¯¤Ê¤¤½ÐÎϤ¬·ë²Ì¤È¤·¤ÆÆÀ¤é¤ì¤Þ¤¹¡£
.Sh ºî¼Ô
¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤Ï
.An Mark Nudleman
diff --git a/ja/man/man1/mv.1 b/ja/man/man1/mv.1
index 1d32c5d790..6ed941e090 100644
--- a/ja/man/man1/mv.1
+++ b/ja/man/man1/mv.1
@@ -35,7 +35,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mv.1 8.1 (Berkeley) 5/31/93
-.\" %Id: mv.1,v 1.7.2.2 1998/07/16 09:35:42 jkh Exp %
+.\" %Id: mv.1,v 1.11 1998/05/15 06:25:16 charnier Exp %
.\" jpman %Id: mv.1,v 1.2 1997/03/29 06:23:50 horikawa Stab %
.\"
.Dd May 31, 1993
diff --git a/ja/man/man1/ncal.1 b/ja/man/man1/ncal.1
index 715994727e..4a9f4d492d 100644
--- a/ja/man/man1/ncal.1
+++ b/ja/man/man1/ncal.1
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: ncal.1,v 1.5.2.3 1998/07/17 04:20:14 jkh Exp %
+.\" %Id: ncal.1,v 1.7 1998/04/26 06:21:29 phk Exp %
.\" jpman %Id: cal.1,v 1.2 1997/05/17 15:48:43 horikawa Stab %
.\".
.Dd December 16, 1997
diff --git a/ja/man/man1/netstat.1 b/ja/man/man1/netstat.1
index 57bf51afeb..f34b063a32 100644
--- a/ja/man/man1/netstat.1
+++ b/ja/man/man1/netstat.1
@@ -233,8 +233,8 @@
¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£
ɽ¼¨¤µ¤ì¤ëʸ»ú¤È¥Õ¥é¥°¤Î´Ö¤ÎÂбþ¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£
.Bl -column XXXX RTF_BLACKHOLE
-1 RTF_PROTO2 ¥ë¡¼¥Æ¥£¥ó¥°¥Õ¥é¥°#1¤Ë¤ÆÆÃÄꤵ¤ì¤ë¥×¥í¥È¥³¥ë
-2 RTF_PROTO1 ¥ë¡¼¥Æ¥£¥ó¥°¥Õ¥é¥°#2¤Ë¤ÆÆÃÄꤵ¤ì¤ë¥×¥í¥È¥³¥ë
+1 RTF_PROTO1 ¥ë¡¼¥Æ¥£¥ó¥°¥Õ¥é¥°#1¤Ë¤ÆÆÃÄꤵ¤ì¤ë¥×¥í¥È¥³¥ë
+2 RTF_PROTO2 ¥ë¡¼¥Æ¥£¥ó¥°¥Õ¥é¥°#2¤Ë¤ÆÆÃÄꤵ¤ì¤ë¥×¥í¥È¥³¥ë
3 RTF_PROTO3 ¥ë¡¼¥Æ¥£¥ó¥°¥Õ¥é¥°#3¤Ë¤ÆÆÃÄꤵ¤ì¤ë¥×¥í¥È¥³¥ë
B RTF_BLACKHOLE ÇË´þ¤µ¤ì¤ë¥Ñ¥±¥Ã¥È
b RTF_BROADCAST ¥Ö¥í¡¼¥É¥­¥ã¥¹¥È¥¢¥É¥ì¥¹¤òɽ¸½¤¹¤ë·ÐÏ©
diff --git a/ja/man/man1/newaliases.1 b/ja/man/man1/newaliases.1
index 9710e662b4..b173312037 100644
--- a/ja/man/man1/newaliases.1
+++ b/ja/man/man1/newaliases.1
@@ -1,39 +1,17 @@
-.\" Copyright (c) 1983, 1997 Eric P. Allman
+.\" Copyright (c) 1998 Sendmail, Inc. All rights reserved.
+.\" Copyright (c) 1983, 1997 Eric P. Allman. All rights reserved.
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
+.\" By using this file, you agree to the terms and conditions set
+.\" forth in the LICENSE file which can be found at the top level of
+.\" the sendmail distribution.
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
.\"
-.\" @(#)newaliases.1 8.5 (Berkeley) 2/1/97
+.\" @(#)newaliases.1 8.10 (Berkeley) 5/19/98
.\" jpman %Id: newaliases.1,v 1.2 1997/05/07 02:31:13 mutoh Stab %
.\"
-.Dd February 1, 1997
+.Dd May 19, 1998
.Dt NEWALIASES 1
.Os BSD 4
.Sh ̾¾Î
diff --git a/ja/man/man1/nfsstat.1 b/ja/man/man1/nfsstat.1
index 839d4261ef..d0e6b362a3 100644
--- a/ja/man/man1/nfsstat.1
+++ b/ja/man/man1/nfsstat.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)nfsstat.1 8.1 (Berkeley) 6/6/93
-.\" %Id: nfsstat.1,v 1.4.2.2 1997/09/15 09:20:54 jkh Exp %
+.\" %Id: nfsstat.1,v 1.7 1997/04/27 08:45:45 jmg Exp %
.\" jpman %Id: nfsstat.1,v 1.3 1997/05/19 16:46:42 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/nice.1 b/ja/man/man1/nice.1
index e2c2c8420e..e0cf036f44 100644
--- a/ja/man/man1/nice.1
+++ b/ja/man/man1/nice.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)nice.1 8.1 (Berkeley) 6/6/93
-.\" %Id: nice.1,v 1.1.1.1.8.4 1998/07/17 04:20:23 jkh Exp %
+.\" %Id: nice.1,v 1.7 1998/03/23 07:45:40 charnier Exp %
.\" jpman %Id: nice.1,v 1.2 1997/05/04 08:01:38 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/nm.1 b/ja/man/man1/nm.1
index 038d314e17..cf3b8366b9 100644
--- a/ja/man/man1/nm.1
+++ b/ja/man/man1/nm.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)nm.1 8.1 (Berkeley) 6/6/93
-.\" %Id: nm.1,v 1.4.2.2 1997/08/01 06:33:52 charnier Exp %
+.\" %Id: nm.1,v 1.8 1997/07/31 06:53:36 charnier Exp %
.\" jpman %Id: nm.1,v 1.2 1997/05/17 16:01:54 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/od.1 b/ja/man/man1/od.1
index 7f78e81c02..76e5220ef7 100644
--- a/ja/man/man1/od.1
+++ b/ja/man/man1/od.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)od.1 8.1 (Berkeley) 6/6/93
-.\" %Id: od.1,v 1.3.2.1 1997/09/15 08:17:22 jkh Exp %
+.\" %Id: od.1,v 1.6 1997/06/23 04:52:04 steve Exp %
.\" jpman %Id: od.1,v 1.4 1997/06/04 03:47:49 jsakai Stab %
.\"
.Dd May 27, 1994
diff --git a/ja/man/man1/opieinfo.1 b/ja/man/man1/opieinfo.1
index 22669faf45..f991092fd2 100644
--- a/ja/man/man1/opieinfo.1
+++ b/ja/man/man1/opieinfo.1
@@ -1,7 +1,7 @@
.\" opieinfo.1: Manual page for the opieinfo(1) program.
.\"
-.\" %%% portions-copyright-cmetz
-.\" Portions of this software are Copyright 1996 by Craig Metz, All Rights
+.\" %%% portions-copyright-cmetz-96
+.\" Portions of this software are Copyright 1996-1997 by Craig Metz, All Rights
.\" Reserved. The Inner Net License Version 2 applies to these portions of
.\" the software.
.\" You should have received a copy of the license with this software. If
diff --git a/ja/man/man1/opiekey.1 b/ja/man/man1/opiekey.1
index 00b1864e21..997ed3b53d 100644
--- a/ja/man/man1/opiekey.1
+++ b/ja/man/man1/opiekey.1
@@ -1,7 +1,7 @@
.\" opiekey.1: Manual page for the opiekey(1) program.
.\"
-.\" %%% portions-copyright-cmetz
-.\" Portions of this software are Copyright 1996 by Craig Metz, All Rights
+.\" %%% portions-copyright-cmetz-96
+.\" Portions of this software are Copyright 1996-1997 by Craig Metz, All Rights
.\" Reserved. The Inner Net License Version 2 applies to these portions of
.\" the software.
.\" You should have received a copy of the license with this software. If
diff --git a/ja/man/man1/opiepasswd.1 b/ja/man/man1/opiepasswd.1
index c9053c1831..36043b11fa 100644
--- a/ja/man/man1/opiepasswd.1
+++ b/ja/man/man1/opiepasswd.1
@@ -1,7 +1,7 @@
.\" opiepasswd.1: Manual page for the opiepasswd(1) program.
.\"
-.\" %%% portions-copyright-cmetz
-.\" Portions of this software are Copyright 1996 by Craig Metz, All Rights
+.\" %%% portions-copyright-cmetz-96
+.\" Portions of this software are Copyright 1996-1997 by Craig Metz, All Rights
.\" Reserved. The Inner Net License Version 2 applies to these portions of
.\" the software.
.\" You should have received a copy of the license with this software. If
diff --git a/ja/man/man1/passwd.1 b/ja/man/man1/passwd.1
index d5eba9d9ea..d26c924d6e 100644
--- a/ja/man/man1/passwd.1
+++ b/ja/man/man1/passwd.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)passwd.1 8.1 (Berkeley) 6/6/93
-.\" %Id: passwd.1,v 1.5.2.3 1998/03/08 12:04:11 jkh Exp %
+.\" %Id: passwd.1,v 1.9 1998/08/24 00:56:20 steve Exp %
.\" jpman %Id: passwd.1,v 1.4 1997/07/21 09:41:51 konuma Stab %
.\"
.Dd June 6, 1993
@@ -47,7 +47,7 @@
.Op Fl l
.Op Fl y
.Op Fl d Ar domain
-.Op Fl s Ar host
+.Op Fl h Ar host
.Op Fl o
.Sh ²òÀâ
.Nm passwd
diff --git a/ja/man/man1/patch.1 b/ja/man/man1/patch.1
index 1aebf0104d..33d240145f 100644
--- a/ja/man/man1/patch.1
+++ b/ja/man/man1/patch.1
@@ -1,9 +1,19 @@
.\" -*- nroff -*-
.rn '' }`
.\" jpman %Id: patch.1,v 1.3 1997/09/10 04:34:14 yugawa Stab %
-'\" %Header: /home/ncvs/src/gnu/usr.bin/patch/patch.1,v 1.5.2.3 1998/01/22 07:45:53 ache Exp %
+'\" %Header: /home/ncvs/src/gnu/usr.bin/patch/patch.1,v 1.9 1998/01/22 07:44:03 ache Exp %
'\"
'\" %Log: patch.1,v %
+'\" Revision 1.9 1998/01/22 07:44:03 ache
+'\" Add PATCH_INDEX_FIRST environment variable to do the same as -I option
+'\"
+'\" Revision 1.8 1998/01/21 15:10:13 ache
+'\" Add -I or --index-first option to take Index: precedence over context diff,
+'\" as it was in hacked FreeBSD version
+'\"
+'\" Revision 1.7 1998/01/21 14:37:21 ache
+'\" Resurrect patch 2.1 without FreeBSD Index: hack
+'\"
'\" Revision 1.5.2.1 1998/01/11 20:45:30 ache
'\" Back out rev1.5 change, Index: precedence restored to historycal behaviour
'\"
diff --git a/ja/man/man1/pax.1 b/ja/man/man1/pax.1
index 73d76ab2c5..965c9aaf4c 100644
--- a/ja/man/man1/pax.1
+++ b/ja/man/man1/pax.1
@@ -34,7 +34,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)pax.1 8.4 (Berkeley) 4/18/94
-.\" %Id: pax.1,v 1.3.2.3 1998/07/16 09:35:43 jkh Exp %
+.\" %Id: pax.1,v 1.8 1998/05/31 22:43:57 steve Exp %
.\" jpman %Id: pax.1,v 1.4 1997/08/25 03:45:37 horikawa Stab %
.\"
.Dd April 18, 1994
diff --git a/ja/man/man1/perl.1 b/ja/man/man1/perl.1
index f16e794d1f..0ce690e653 100644
--- a/ja/man/man1/perl.1
+++ b/ja/man/man1/perl.1
@@ -1,10 +1,13 @@
.rn '' }`
.\" jpman %Id: perl.1,v 1.5 1997/10/11 07:57:22 horikawa Stab %
-''' %RCSfile: perl.1,v %%Revision: 1.3.2.1 %%Date: 1997/10/12 08:11:42 %
+''' %RCSfile: perl.1,v %%Revision: 1.5 %%Date: 1998/06/04 21:05:33 %
'''
''' %Log: perl.1,v %
-''' Revision 1.3.2.1 1997/10/12 08:11:42 jmg
-''' MFC: spelling fixes
+''' Revision 1.5 1998/06/04 21:05:33 steve
+''' Fix a bunch of spelling errors.
+'''
+''' PR: 6856
+''' Submitted by: Josh Gilliam <josh@quick.net>
'''
''' Revision 1.4 1997/08/30 12:22:46 jmg
''' fix a few spelling changes
diff --git a/ja/man/man1/pkg_add.1 b/ja/man/man1/pkg_add.1
index 0f56694470..02565824f4 100644
--- a/ja/man/man1/pkg_add.1
+++ b/ja/man/man1/pkg_add.1
@@ -15,7 +15,7 @@
.\"
.\"
.\" @(#)pkg_add.1
-.\" %Id: pkg_add.1,v 1.17.2.9 1998/07/18 11:11:38 jkh Exp %
+.\" %Id: pkg_add.1,v 1.26 1998/07/14 08:27:58 jkoshy Exp %
.\" jpman %Id: pkg_add.1,v 1.3 1997/06/09 04:19:05 jsakai Stab %
.\"
.Dd November 25, 1994
diff --git a/ja/man/man1/pkg_create.1 b/ja/man/man1/pkg_create.1
index 0153b3c6f6..03fba472e3 100644
--- a/ja/man/man1/pkg_create.1
+++ b/ja/man/man1/pkg_create.1
@@ -15,8 +15,7 @@
.\"
.\"
.\" @(#)pkg_create.1
-.\" %Id: pkg_create.1,v 1.16.2.10 1998/07/18 11:11:43 jkh Exp %
-.\" jpman %Id: pkg_create.1,v 1.3 1997/06/09 10:11:56 jsakai Stab %
+.\" %Id: pkg_create.1,v 1.26 1998/06/26 07:15:37 jkoshy Exp $%
.\"
.\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
.\" added dependency tracking, etc.
@@ -24,6 +23,7 @@
.\" [jkh] Took John's changes back and made some additional extensions for
.\" better integration with FreeBSD's new ports collection.
.\"
+.\" jpman %Id: pkg_create.1,v 1.3 1997/06/09 10:11:56 jsakai Stab %
.Dd April 21, 1995
.Dt pkg_create 1
.Os FreeBSD
diff --git a/ja/man/man1/pkg_info.1 b/ja/man/man1/pkg_info.1
index 0d76a25edc..c741429abd 100644
--- a/ja/man/man1/pkg_info.1
+++ b/ja/man/man1/pkg_info.1
@@ -15,7 +15,7 @@
.\"
.\"
.\" @(#)pkg_info.1
-.\" %Id: pkg_info.1,v 1.11.2.7 1998/07/18 11:11:52 jkh Exp %
+.\" %Id: pkg_info.1,v 1.18 1998/07/14 08:28:15 jkoshy Exp %
.\" jpman %Id: pkg_info.1,v 1.3 1997/06/08 14:11:48 jsakai Stab %
.\"
.Dd November 25, 1994
diff --git a/ja/man/man1/pr.1 b/ja/man/man1/pr.1
index f5e6119713..e90729f11d 100644
--- a/ja/man/man1/pr.1
+++ b/ja/man/man1/pr.1
@@ -34,7 +34,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)pr.1 8.3 (Berkeley) 4/18/94
-.\" %Id: pr.1,v 1.2.2.1 1997/08/05 06:31:54 charnier Exp %
+.\" %Id: pr.1,v 1.5 1997/08/04 06:39:19 charnier Exp %
.\" jpman %Id: pr.1,v 1.3 1997/06/30 16:45:20 horikawa Stab %
.\"
.Dd April 18, 1994
diff --git a/ja/man/man1/ps.1 b/ja/man/man1/ps.1
index fafa2dee95..8398e0f570 100644
--- a/ja/man/man1/ps.1
+++ b/ja/man/man1/ps.1
@@ -30,17 +30,17 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
-.\" %Id: ps.1,v 1.11.2.2 1998/02/18 22:54:59 dima Exp %
+.\" %Id: ps.1,v 1.19 1998/06/04 07:02:59 jkoshy Exp %
.\" jpman %Id: ps.1,v 1.2 1997/05/20 01:19:55 mutoh Stab %
.\"
.Dd April 18, 1994
.Dt PS 1
.Os BSD 4
.Sh ̾¾Î
-.Nm \&ps
+.Nm ps
.Nd ¥×¥í¥»¥¹¤Î¾õÂÖ¤Îɽ¼¨
.Sh ½ñ¼°
-.Nm \&ps
+.Nm ps
.Op Fl aCcefhjlmrSTuvwx
.Op Fl M Ar core
.Op Fl N Ar system
@@ -50,10 +50,10 @@
.Op Fl t Ar tty
.Op Fl W Ar swap
.br
-.Nm \&ps
+.Nm ps
.Op Fl L
.Sh ²òÀâ
-.Nm \&ps
+.Nm ps
¤Ï¡¢À©¸æÃ¼Ëö¤ò»ý¤Ä¼«Ê¬(¤¢¤Ê¤¿)¤Î¥×¥í¥»¥¹¤Î¾ðÊó¤ò¡¢
¥Ø¥Ã¥À¹Ô¤Ë³¤¤¤ÆÉ½¼¨¤·¤Þ¤¹¡£
¤³¤Î¾ðÊó¤Ï¥×¥í¥»¥¹
@@ -91,7 +91,9 @@ cpu »þ´Ö¤ò»È¤¦ÊýË¡¤ËÊѹ¹¤·¤Þ¤¹(Ä̾盧¤ì¤Ï±Æ¶Á¤¢¤ê¤Þ¤»¤ó)¡£
.It Fl e
´Ä¶­(ÊÑ¿ô)¤âƱ»þ¤Ëɽ¼¨¤·¤Þ¤¹¡£
.It Fl f
-¤è¤ê¾Ü¤·¤¤¥×¥í¥»¥¹¾ðÊó¤òÆÀ¤ë¤è¤¦¤Ë¡¢Æ¯¤­¤Þ¤¹¡£
+¥¹¥ï¥Ã¥×¥¢¥¦¥È¤µ¤ì¤¿¥×¥í¥»¥¹¤Ë´Ø¤·¤Æ¡¢
+¥³¥Þ¥ó¥É¥é¥¤¥ó¤È´Ä¶­¤Î¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
+¥æ¡¼¥¶¤Î uid ¤¬ 0 ¤Ç¤¢¤ë¾ì¹ç¤Î¤ß¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤¬Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
.It Fl h
¥Ú¡¼¥¸Ëè¤Ë°ì¤Ä¥Ø¥Ã¥À¤¬Æþ¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
.It Fl j
@@ -105,7 +107,7 @@ uid, pid, ppid, cpu, pri, nice, vsz, rss, wchan, state, tt, time, command¡£
.It Fl M
̾Á°¥ê¥¹¥È¤ÎÃͤò¼è¤ê½Ð¤¹¤È¤­¡¢
¥Ç¥Õ¥©¥ë¥È¤Î
-.Dq Pa /dev/kmem
+.Pa /dev/kmem
¤ÎÂå¤ï¤ê¤Ë¡¢»ØÄꤷ¤¿
.Ar core
¤«¤é¼è¤ê½Ð¤·¤Þ¤¹¡£
@@ -115,7 +117,7 @@ uid, pid, ppid, cpu, pri, nice, vsz, rss, wchan, state, tt, time, command¡£
½ç¤Ç¤Ï¤Ê¤¯¡¢¥á¥â¥ê»ÈÍÑÎ̽ç¤ËÀ°Îó¤·¤Þ¤¹¡£
.It Fl N
¥Ç¥Õ¥©¥ë¥È¤Î
-.Dq Pa /kernel
+.Pa /kernel
¤ÎÂå¤ï¤ê¤Ë¡¢»ØÄꤵ¤ì¤¿
.Ar system
¤«¤é̾Á°¥ê¥¹¥È¤ò¼è¤ê½Ð¤·¤Þ¤¹¡£
@@ -177,14 +179,14 @@ pid, state, time, sl, re, pagein, vsz, rss, lim, tsiz,
¥ª¥×¥·¥ç¥ó¤â°Å¤Ë»ØÄꤷ¤¿¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
.It Fl W
¥Ç¥Õ¥©¥ë¥È¤Î
-.Dq Pa /dev/drum
+.Pa /dev/drum
¤ÎÂå¤ï¤ê¤Ë»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤«¤é¥¹¥ï¥Ã¥×¾ðÊó¤ò¼è¤ê½Ð¤·¤Þ¤¹¡£
.It Fl w
¥Ç¥Õ¥©¥ë¥È¤Î¸½¹Ô¥¦¥£¥ó¥É¥¦Éý¤Ç¤Ï¤Ê¤¯¡¢132·åÉý¤Çɽ¼¨¤·¤Þ¤¹¡£
°ìÅÙ¤è¤ê¿¤¯
.Fl w
¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢
-.Nm \&ps
+.Nm ps
¤Ï¥¦¥£¥ó¥É¥¦Éý¤Ë¤«¤«¤ï¤é¤º¡¢É¬ÍפʤÀ¤±¤ÎÉý¤ò»ÈÍѤ·¤Þ¤¹¡£
.It Fl x
À©¸æÃ¼Ëö¤Î¤Ê¤¤¥×¥í¥»¥¹¤Î¾ðÊó¤âɽ¼¨¤·¤Þ¤¹¡£
@@ -328,8 +330,8 @@ pid, state, time, sl, re, pagein, vsz, rss, lim, tsiz,
.It tt
¤â¤·¤¢¤ì¤Ð¡¢À©¸æÃ¼Ëö¤Î¥Ñ¥¹Ì¾¤Î¾Êά·Á¤Ç¤¹¡£
¾Êά·Á¤Ï
-.Dq Pa /dev/tty
-¤Ë³¤¯2ʸ»ú¤«¡¢¥³¥ó¥½¡¼¥ë¾ì¹ç¤Î ``co'' ¤Ç¤¹¡£
+.Pa /dev/tty
+¤Ë³¤¯3ʸ»ú¤«¡¢¥³¥ó¥½¡¼¥ë¾ì¹ç¤Î ``con'' ¤Ç¤¹¡£
¤â¤Ï¤ä¥×¥í¥»¥¹¤¬¤½¤ÎÀ©¸æÃ¼Ëö¤ËÅþã¤Ç¤­¤Ê¤¤(¨¤Á¡¢revoke ¤µ¤ì¤¿)¾ì¹ç¡¢
¸å¤Ë ``-'' ¤¬ÉÕ¤­¤Þ¤¹¡£
.It wchan
@@ -342,7 +344,7 @@ pid, state, time, sl, re, pagein, vsz, rss, lim, tsiz,
¤¹¤Ç¤Ë½ªÎ»¤·¤Æ¤¤¤ë¤Î¤Ë¿Æ¤¬¤Þ¤À wait ¤·¤Æ¤¯¤ì¤Æ¤¤¤Ê¤¤
¥×¥í¥»¥¹(¨¤Á¥¾¥ó¥Ó)¤Ï ``<defunct>'' ¤Èɽ¼¨¤µ¤ì¤Þ¤¹¡£
½ªÎ»¤·¤è¤¦¤È¤·¤Æ¥Ö¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤ë¥×¥í¥»¥¹¤Ï ``<exiting>'' ¤Èɽ¼¨¤µ¤ì¤Þ¤¹¡£
-.Nm \&ps
+.Nm ps
¤Ï¡¢¥á¥â¥ê¤ä¥¹¥ï¥Ã¥×Îΰè¤ò¸¡ºº¤·¤Æ¡¢
¥×¥í¥»¥¹¤¬À¸À®¤µ¤ì¤¿¤È¤­¤Î¥Õ¥¡¥¤¥ë̾¤ä°ú¿ô¤ò¿ä¬¤·¤Þ¤¹¡£
¤³¤ÎÊýË¡¤Ï¡¢ËܼÁŪ¤Ë¾¯¡¹¿®Íê¤Ç¤­¤ë¤â¤Î¤Ç¤Ï¤Ê¤¯¡¢
diff --git a/ja/man/man1/pwd.1 b/ja/man/man1/pwd.1
index cc42961e19..cce650b158 100644
--- a/ja/man/man1/pwd.1
+++ b/ja/man/man1/pwd.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)pwd.1 8.2 (Berkeley) 4/28/95
-.\" %Id: pwd.1,v 1.2.8.3 1998/07/16 09:35:45 jkh Exp %
+.\" %Id: pwd.1,v 1.6 1998/05/15 06:30:57 charnier Exp %
.\" jpman %Id: pwd.1,v 1.2 1997/04/21 08:09:42 mitchy Stab %
.\"
.Dd April 28, 1995
diff --git a/ja/man/man1/quota.1 b/ja/man/man1/quota.1
index 596f621c0b..d28cc8e7ad 100644
--- a/ja/man/man1/quota.1
+++ b/ja/man/man1/quota.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)quota.1 8.1 (Berkeley) 6/6/93
-.\" %Id: quota.1,v 1.3.2.1 1997/08/05 06:36:34 charnier Exp %
+.\" %Id: quota.1,v 1.6 1997/08/04 06:45:11 charnier Exp %
.\" jpman %Id: quota.1,v 1.2 1997/05/17 16:06:48 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/ranlib.1 b/ja/man/man1/ranlib.1
index 78b3bb310d..60240489c3 100644
--- a/ja/man/man1/ranlib.1
+++ b/ja/man/man1/ranlib.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ranlib.1 8.1 (Berkeley) 6/6/93
-.\" %Id: ranlib.1,v 1.3.2.1 1997/08/05 06:39:14 charnier Exp %
+.\" %Id: ranlib.1,v 1.6 1997/08/04 06:48:23 charnier Exp %
.\" jpman %Id: ranlib.1,v 1.3 1997/08/20 12:40:27 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/rcp.1 b/ja/man/man1/rcp.1
index cf52d22dfb..7f270bc9e7 100644
--- a/ja/man/man1/rcp.1
+++ b/ja/man/man1/rcp.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)rcp.1 8.1 (Berkeley) 5/31/93
-.\" %Id: rcp.1,v 1.2.8.2 1998/07/16 09:35:45 jkh Exp %
+.\" %Id: rcp.1,v 1.6 1998/05/18 06:36:02 charnier Exp %
.\" jpman %Id: rcp.1,v 1.2 1997/05/20 01:30:55 mutoh Stab %
.\"
.Dd May 31, 1993
diff --git a/ja/man/man1/rcs.1 b/ja/man/man1/rcs.1
index 9f07ac0bd5..ca58610edb 100644
--- a/ja/man/man1/rcs.1
+++ b/ja/man/man1/rcs.1
@@ -3,7 +3,7 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id %Id: rcs.1,v 1.2 1995/10/28 21:50:11 peter Exp %
+.Id %Id: rcs.1,v 1.4 1997/02/22 15:47:53 peter Exp %
.ds r \&\s-1RCS\s0
.if n .ds - \%--
.if t .ds - \(em
diff --git a/ja/man/man1/rcsclean.1 b/ja/man/man1/rcsclean.1
index 91883d2611..9f5b54b4f5 100644
--- a/ja/man/man1/rcsclean.1
+++ b/ja/man/man1/rcsclean.1
@@ -3,7 +3,7 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id %Id: rcsclean.1,v 1.2 1995/10/28 21:50:24 peter Exp %
+.Id %Id: rcsclean.1,v 1.4 1997/02/22 15:47:57 peter Exp %
.ds r \&\s-1RCS\s0
.if n .ds - \%--
.if t .ds - \(em
diff --git a/ja/man/man1/rcsdiff.1 b/ja/man/man1/rcsdiff.1
index 1ff9bdb927..2ebd829249 100644
--- a/ja/man/man1/rcsdiff.1
+++ b/ja/man/man1/rcsdiff.1
@@ -3,7 +3,7 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id %Id: rcsdiff.1,v 1.2 1995/10/28 21:50:32 peter Exp %
+.Id %Id: rcsdiff.1,v 1.4 1997/02/22 15:48:00 peter Exp %
.ds r \&\s-1RCS\s0
.if n .ds - \%--
.if t .ds - \(em
diff --git a/ja/man/man1/rcsfreeze.1 b/ja/man/man1/rcsfreeze.1
index 58215c7822..963c6183e1 100644
--- a/ja/man/man1/rcsfreeze.1
+++ b/ja/man/man1/rcsfreeze.1
@@ -3,7 +3,7 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id %Id: rcsfreeze.1,v 1.2 1995/10/28 21:50:42 peter Exp %
+.Id %Id: rcsfreeze.1,v 1.4 1997/02/22 15:48:03 peter Exp %
.ds r \s-1RCS\s0
.TH RCSFREEZE 1 \*(Dt GNU
.SH ̾¾Î
diff --git a/ja/man/man1/rcsintro.1 b/ja/man/man1/rcsintro.1
index 3fd6cdc255..a720e9f566 100644
--- a/ja/man/man1/rcsintro.1
+++ b/ja/man/man1/rcsintro.1
@@ -3,7 +3,7 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id %Id: rcsintro.1,v 1.2 1995/10/28 21:50:20 peter Exp %
+.Id %Id: rcsintro.1,v 1.4 1997/02/22 15:47:55 peter Exp %
.ds r \&\s-1RCS\s0
.if n .ds - \%--
.if t .ds - \(em
diff --git a/ja/man/man1/rcsmerge.1 b/ja/man/man1/rcsmerge.1
index e4970f3554..b7201a55b7 100644
--- a/ja/man/man1/rcsmerge.1
+++ b/ja/man/man1/rcsmerge.1
@@ -3,7 +3,7 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id %Id: rcsmerge.1,v 1.2 1995/10/28 21:50:50 peter Exp %
+.Id %Id: rcsmerge.1,v 1.4 1997/02/22 15:48:06 peter Exp %
.ds r \&\s-1RCS\s0
.if n .ds - \%--
.if t .ds - \(em
diff --git a/ja/man/man1/rdist.1 b/ja/man/man1/rdist.1
index 836e8c155e..56a953817b 100644
--- a/ja/man/man1/rdist.1
+++ b/ja/man/man1/rdist.1
@@ -41,14 +41,14 @@
.Nd ¥ê¥â¡¼¥È¥Õ¥¡¥¤¥ëÇÛÉÛ¥×¥í¥°¥é¥à
.Sh ½ñ¼°
.Nm rdist
-.Op Fl nqbRhivwy
+.Op Fl nqbRhivwyD
.Op Fl P Ar rshcmd
.Op Fl f Ar distfile
.Op Fl d Ar var=value
.Op Fl m Ar host
.Op Ar name ...
.Nm rdist
-.Op Fl nqbRhivwy
+.Op Fl nqbRhivwyD
.Op Fl P Ar rshcmd
.Fl c
.Ar name ...
@@ -199,8 +199,10 @@ YOUNGER¥â¡¼¥É¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£Ä̾¥Õ¥¡¥¤¥ë¤Î¹¹¿·¤Ï¡¢
¤Ï¡¢ÇÛÉÛ¸µ¤Î¥Õ¥¡¥¤¥ë¤è¤ê¿·¤·¤¤¥Õ¥¡¥¤¥ë¤Ï¹¹¿·¤·¤Þ¤»¤ó¡£
Ä̾ïËÜ¥ª¥×¥·¥ç¥ó¤Ï¡¢Â¾¤Î¥Û¥¹¥È¤Ë¸ºß¤¹¤ë¡¢¤è¤ê¿·¤·¤¤¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤Ê¤¤
ÌÜŪ¤ÇÍѤ¤¤é¤ì¤Þ¤¹¡£
-ÇÛÉÛ¸µ¤è¤ê¿·¤·¤¤¥Õ¥¡¥¤¥ë¤¬ÇÛÉÛÀè¤Ë¤¢¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢¤½¤Î»Ý¤òÄÌÃΤ¹¤ë¥á¥Ã¥»¡¼
-¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
+ÇÛÉÛ¸µ¤è¤ê¿·¤·¤¤¥Õ¥¡¥¤¥ë¤¬ÇÛÉÛÀè¤Ë¤¢¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢¤½¤Î»Ý¤òÄÌÃΤ¹¤ë
+¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
+.It Fl D
+¥Ç¥Ð¥Ã¥°¥â¡¼¥É¡£
.El
.Pp
.Ar distfile
diff --git a/ja/man/man1/rlog.1 b/ja/man/man1/rlog.1
index 4f6e2ed633..a92a07031d 100644
--- a/ja/man/man1/rlog.1
+++ b/ja/man/man1/rlog.1
@@ -3,7 +3,7 @@
.ds Rv \\$3
.ds Dt \\$4
..
-.Id %Id: rlog.1,v 1.4.2.1 1997/01/26 07:48:21 mpp Exp %
+.Id %Id: rlog.1,v 1.7 1997/02/22 15:48:10 peter Exp %
.ds i \&\s-1ISO\s0
.ds r \&\s-1RCS\s0
.ds u \&\s-1UTC\s0
diff --git a/ja/man/man1/rm.1 b/ja/man/man1/rm.1
index b4379fdeef..5cb0a5ab41 100644
--- a/ja/man/man1/rm.1
+++ b/ja/man/man1/rm.1
@@ -34,8 +34,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" @(#)rm.1 8.2 (Berkeley) 4/18/94
-.\" %Id: rm.1,v 1.4.2.3 1998/07/16 09:35:46 jkh Exp %
+.\" @(#)rm.1 8.5 (Berkeley) 12/5/94
+.\" %Id: rm.1,v 1.12 1998/05/18 06:37:35 charnier Exp %
.\" jpman %Id: rm.1,v 1.3 1997/05/19 16:49:44 horikawa Stab %
.\"
.Dd April 18, 1994
diff --git a/ja/man/man1/rmdir.1 b/ja/man/man1/rmdir.1
index 82f893a94a..a982e63b34 100644
--- a/ja/man/man1/rmdir.1
+++ b/ja/man/man1/rmdir.1
@@ -35,7 +35,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93
-.\" %Id: rmdir.1,v 1.3.2.3 1998/07/16 09:35:48 jkh Exp %
+.\" %Id: rmdir.1,v 1.7 1998/05/18 06:40:54 charnier Exp %
.\" jpman %Id: rmdir.1,v 1.2 1997/03/29 12:05:03 horikawa Stab %
.\"
.Dd May 31, 1993
diff --git a/ja/man/man1/rtld.1 b/ja/man/man1/rtld.1
index 5dc91b4e9a..2258842696 100644
--- a/ja/man/man1/rtld.1
+++ b/ja/man/man1/rtld.1
@@ -1,4 +1,4 @@
-.\" %Id: rtld.1,v 1.6.2.3 1997/12/25 09:35:56 hoek Exp %
+.\" %Id: rtld.1,v 1.15 1997/09/13 16:01:41 wosch Exp %
.\"
.\" Copyright (c) 1995 Paul Kranenburg
.\" All rights reserved.
diff --git a/ja/man/man1/rtprio.1 b/ja/man/man1/rtprio.1
index ebc0e43115..69888f9a7f 100644
--- a/ja/man/man1/rtprio.1
+++ b/ja/man/man1/rtprio.1
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: rtprio.1,v 1.6.2.6 1998/07/18 11:12:23 jkh Exp %
+.\" %Id: rtprio.1,v 1.15 1998/03/23 08:28:58 charnier Exp %
.\" jpman %Id: rtprio.1,v 1.3 1997/09/23 16:41:42 horikawa Stab %
.\"
.Dd July 23, 1994
diff --git a/ja/man/man1/rup.1 b/ja/man/man1/rup.1
index e5e1419d55..39c878f959 100644
--- a/ja/man/man1/rup.1
+++ b/ja/man/man1/rup.1
@@ -31,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: rup.1,v 1.3.2.1 1997/08/08 12:06:40 charnier Exp %
+.\" %Id: rup.1,v 1.6 1997/08/07 06:50:02 charnier Exp %
.\" jpman %Id: rup.1,v 1.2 1997/05/07 02:31:39 mutoh Stab %
.\"
.Dd June 7, 1993
diff --git a/ja/man/man1/ruptime.1 b/ja/man/man1/ruptime.1
index b99a40748c..60f76edb05 100644
--- a/ja/man/man1/ruptime.1
+++ b/ja/man/man1/ruptime.1
@@ -30,8 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ruptime.1 8.2 (Berkeley) 4/5/94
+.\" %Id: ruptime.1,v 1.4 1997/02/22 19:56:50 peter Exp %
+.\"
.\" jpman %Id: ruptime.1,v 1.2 1997/05/20 01:35:36 mutoh Stab %
-.\" %Id: ruptime.1,v 1.2 1996/09/23 22:24:20 wosch Exp %
.\"
.Dd April 5, 1994
.Dt RUPTIME 1
diff --git a/ja/man/man1/rusers.1 b/ja/man/man1/rusers.1
index 34e6a8b853..ccb1daa9eb 100644
--- a/ja/man/man1/rusers.1
+++ b/ja/man/man1/rusers.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rusers.1 6.7 (Berkeley) 4/23/91
-.\" %Id: rusers.1,v 1.2.2.2 1997/08/11 07:11:23 charnier Exp %
+.\" %Id: rusers.1,v 1.6 1997/08/08 12:12:54 charnier Exp %
.\" jpman %Id: rusers.1,v 1.3 1997/08/20 12:45:29 horikawa Stab %
.\"
.Dd April 23, 1991
diff --git a/ja/man/man1/rwall.1 b/ja/man/man1/rwall.1
index 495138a4b9..7eafcf200b 100644
--- a/ja/man/man1/rwall.1
+++ b/ja/man/man1/rwall.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rwall.1 6.7 (Berkeley) 4/23/91
-.\" %Id: rwall.1,v 1.1.1.1.8.2 1997/08/11 07:13:00 charnier Exp %
+.\" %Id: rwall.1,v 1.5 1997/08/08 12:18:16 charnier Exp %
.\" jpman %Id: rwall.1,v 1.2 1997/05/21 00:38:04 mutoh Stab %
.\"
.Dd April 23, 1991
diff --git a/ja/man/man1/sasc.1 b/ja/man/man1/sasc.1
index b613df2899..5fa5c46382 100644
--- a/ja/man/man1/sasc.1
+++ b/ja/man/man1/sasc.1
@@ -28,7 +28,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: sasc.1,v 1.3.2.2 1998/07/17 04:21:08 jkh Exp %
+.\" %Id: sasc.1,v 1.7 1998/03/23 07:46:41 charnier Exp %
.\" jpman %Id: sasc.1,v 1.3 1997/07/22 17:55:16 horikawa Stab %
.\"
.Dd January 6, 1995
diff --git a/ja/man/man1/script.1 b/ja/man/man1/script.1
index e283a4fd50..8e60a4d80a 100644
--- a/ja/man/man1/script.1
+++ b/ja/man/man1/script.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)script.1 8.1 (Berkeley) 6/6/93
-.\" %Id: script.1,v 1.1.1.1.8.3 1998/07/17 04:21:14 jkh Exp %
+.\" %Id: script.1,v 1.5 1998/06/04 21:06:02 steve Exp %
.\" jpman %Id: script.1,v 1.2 1997/03/29 08:26:02 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/sh.1 b/ja/man/man1/sh.1
index 8d723271ce..b432de5d0c 100644
--- a/ja/man/man1/sh.1
+++ b/ja/man/man1/sh.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" %Id: sh.1,v 1.9.2.10 1998/07/28 14:47:36 thepish Exp %
+.\" %Id: sh.1,v 1.21 1998/07/30 04:47:56 jkoshy Exp %
.\"
.\" jpman %Id: sh.1,v 1.2 1997/05/31 16:40:31 jsakai Stab %
.\" Japanese Translation amended by Norihiro Kumagai, 3/29/96,
@@ -145,6 +145,11 @@ Gnu ¤Î bash ¤ò»È¤¤¤Þ¤·¤ç¤¦)¡£
¥×¥é¥¹µ­¹æ
.Dq +
¤Ç¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤³¤È¤Ï¡¢¤½¤Î¥ª¥×¥·¥ç¥ó¤ò̵¸ú¤Ë¤¹¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
+.Dq --
+¤Þ¤¿¤Ï¡¢Ã±¤Ê¤ë
+.Dq -
+¤Ï¥ª¥×¥·¥ç¥ó½èÍý¤ò½ªÎ»¤µ¤»¡¢
+¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î»Ä¤ê¤Î¸ì¤ò°ú¿ô¤È¤·¤Æ²ò¼á¤¹¤ë¤³¤È¤ò¶¯À©¤·¤Þ¤¹¡£
.Bl -tag -width Ds
.It Fl a Li allexport
Ãͤ¬ÂåÆþ¤µ¤ì¤¿ÊÑ¿ô¤ÎÁ´¤Æ¤ò¥¨¥¯¥¹¥Ý¡¼¥È¤·¤Þ¤¹(̤¼ÂÁõ¤Ç¤¹)¡£
@@ -160,8 +165,7 @@ Gnu ¤Î bash ¤ò»È¤¤¤Þ¤·¤ç¤¦)¡£
.Xr emacs 1
É÷¤Î¥³¥Þ¥ó¥É¹ÔÊÔ½¸µ¡Ç½¤òÍ­¸ú¤Ë¤·¤Þ¤¹ (¤½¤ì°ÊÁ°¤Ë
.Fl V
-¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢¤½¤ì¤ò̵¸ú¤Ë¤·¤Þ¤¹)¡£'set -o emacs' ¤â
-»²¾È¤·¤Æ¤¯¤À¤µ¤¤ (¸å½Ò¤·¤Þ¤¹)¡£
+¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢¤½¤ì¤ò̵¸ú¤Ë¤·¤Þ¤¹)¡£
.It Fl e Li errexit
ÈóÂÐÏÃŪ¥·¥§¥ë¤Ç¡¢¥Æ¥¹¥È¾õÂ֤ˤʤ¤¥³¥Þ¥ó¥É¤Î¼Â¹Ô¤Ë¼ºÇÔ¤·¤¿¾ì¹ç¡¢
ľ¤Á¤Ë¥·¥§¥ë¤ò½ªÎ»¤·¤Þ¤¹¡£
@@ -842,16 +846,6 @@ $((expression))
¥¯¥©¡¼¥Èºï½ü¤òŬÍѤ·¤Þ¤¹¡£
.Pp
¼¡¤Ë¥·¥§¥ë¤Ï¤½¤Î·ë²Ì¤ò¿ô¼°¤È¤·¤Æ°·¤¤¡¢¤½¤ÎÃͤËÃÖ´¹¤·¤Þ¤¹¡£
-.Pp
-¤¢¤ë¤¤¤Ï¡¢¿ô¼°É¾²Á¤ÏÁȤ߹þ¤ß¤Î
-.Xr let 1
-¤Ç¼Â¹Ô²Äǽ¤Ç¤¹¡£¤³¤Îʸˡ¤Ï
-.Xr expr 1
-¤Î¤â¤Î¤ÈƱ¤¸¤Ç¤¹¡£
-.Xr exp 1
-¤Ï
-.Xr let 1
-¤ÎÊÌ̾¤Ç¤¹¡£
.Ss ¶õÇòʸ»ú¤Ë¤è¤ëʬ³ä (¥Õ¥£¡¼¥ë¥Éʬ³ä)
¥Ñ¥é¥á¡¼¥¿Å¸³«¡¢¥³¥Þ¥ó¥ÉÃÖ´¹¡¢¿ô¼°Å¸³«¤Î¤¢¤È¡¢¥·¥§¥ë¤ÏŸ³«·ë²Ì¤òÄ´¤Ù¤Æ¡¢
¥À¥Ö¥ë¥¯¥©¡¼¥È¤Î³°¤Ë¤¢¤ëÉôʬ¤ËÂФ·¤Æ¥Õ¥£¡¼¥ë¥Éʬ³ä¤òŬÍѤ·¤Þ¤¹¡£
diff --git a/ja/man/man1/shar.1 b/ja/man/man1/shar.1
index d2742a25f4..71a2d83b7a 100644
--- a/ja/man/man1/shar.1
+++ b/ja/man/man1/shar.1
@@ -32,7 +32,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)shar.1 8.1 (Berkeley) 6/6/93
-.\" %Id: shar.1,v 1.1.1.1.8.5 1998/03/08 12:13:51 jkh Exp %
+.\" %Id: shar.1,v 1.6 1997/08/11 07:22:04 charnier Exp %
.\" jpman %Id: shar.1,v 1.3 1997/05/19 16:58:30 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/sleep.1 b/ja/man/man1/sleep.1
index 8499883637..ef0afe6eff 100644
--- a/ja/man/man1/sleep.1
+++ b/ja/man/man1/sleep.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)sleep.1 8.3 (Berkeley) 4/18/94
-.\" %Id: sleep.1,v 1.2.8.4 1998/07/16 09:35:51 jkh Exp %
+.\" %Id: sleep.1,v 1.8 1998/05/18 06:46:11 charnier Exp %
.\" jpman %Id: sleep.1,v 1.2 1997/05/04 13:38:26 horikawa Stab %
.\"
.Dd April 18, 1994
diff --git a/ja/man/man1/startslip.1 b/ja/man/man1/startslip.1
index 81d65dd5cb..0f998a95f3 100644
--- a/ja/man/man1/startslip.1
+++ b/ja/man/man1/startslip.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)startslip.1 8.1 (Berkeley) 6/5/93
-.\" %Id: startslip.1,v 1.10.2.2 1998/08/12 06:37:07 charnier Exp %
+.\" %Id: startslip.1,v 1.14 1998/08/03 06:32:57 charnier Exp %
.\"
.\" jpman %Id: startslip.1,v 1.3 1997/08/19 03:06:09 h-nokubi Stab %
.\"
@@ -60,15 +60,14 @@
.Op Fl K Ar keepalive
.Op Fl O Ar outfill
.Op Fl S Ar unit
-.Ar device user passwd
+.Ar device user password
.Sh ²òÀâ
-.Pp
-.Nm startslip
+.Nm
¤Ï»ØÄꤵ¤ì¤¿
.Ar device
¤ò¥ª¡¼¥×¥ó¤·¤Þ¤¹¡£
¤Ò¤È¤¿¤Ó¥­¥ã¥ê¥¢¤¬³Îǧ¤µ¤ì¤ë¤È(¥â¥Ç¥àÀ©¸æ¤¬Í­¸ú¤Ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç)¡¢
-.Nm startslip
+.Nm
¤Ï»ØÄꤵ¤ì¤¿
.Ar user
¤ª¤è¤Ó
@@ -86,27 +85,27 @@ Annex ¥ª¥×¥·¥ç¥ó (
¥­¥ã¥ê¥¢¤¬Íî¤Á¤ë (¥â¥Ç¥àÀ©¸æÍ­¸ú¤Î¾ì¹ç) ¤¢¤ë¤¤¤Ï
.Dv SIGHUP
¥·¥°¥Ê¥ë¤¬¤ËÁ÷¤é¤ì¤ë¤È¡¢
-.Nm startslip
+.Nm
¤Ï device ¤ò¥¯¥í¡¼¥º¤·¡¢
.Ar downscript
¤ò¸Æ¤Ó½Ð¤·¡¢¥À¥¤¥¢¥ë¥¢¥Ã¥×¤È¥í¥°¥¤¥ó¤Î¥·¡¼¥±¥ó¥¹¤ò·«¤êÊÖ¤·»î¤ß¤Þ¤¹¡£
.Dv SIGTERM
¥·¥°¥Ê¥ë¤¬Á÷¤é¤ì¤ë¤È¡¢
-.Nm startslip
+.Nm
¤Ï device ¤ò¥¯¥í¡¼¥º¤·¡¢
.Ar downscript
¤ò¸Æ¤Ó½Ð¤·¡¢¤½¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£
Ʊ°ì device ¤ËÂФ·¤Æ
-.Nm startslip
+.Nm
¤¬ 2 ²ó¸Æ¤Ó½Ð¤µ¤ì¤ë¤È¡¢½èÍý¤ò¹Ô¤¦Á°¤Ë
¤Ò¤È¤Ä¤á¤Î
-.Nm startslip
+.Nm
¤¬
.Dv SIGTERM
¥·¥°¥Ê¥ë¤Ë¤è¤Ã¤Æ kill ¤µ¤ì¤Þ¤¹¡£
.Pp
-ÍøÍѲÄǽ¥ª¥×¥·¥ç¥ó:
-.Bl -tag -width Ar
+°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤òÍøÍѲÄǽ¤Ç¤¹:
+.Bl -tag -width indent
.It Fl d
¹Ô¤ª¤¦¤È¤·¤Æ¤¤¤ë½èÍý¤Ë´Ø¤¹¤ë¥Ç¥Ð¥Ã¥°¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
.It Fl b Ar speed
@@ -137,7 +136,7 @@ Annex ¥ª¥×¥·¥ç¥ó (
Xylogics ¤Î Annex box ¤ËÀܳ¤·¤Æ¤¤¤ë¤â¤Î¤È¤ß¤Ê¤·¡¢°ú¿ô
.Ar user
¤ª¤è¤Ó
-.Ar passwd
+.Ar password
¤òÍѤ¤¤ÆÅ¬ÀڤʥÀ¥¤¥¢¥í¥°¤ò¹Ô¤¤¤Þ¤¹¡£°ú¿ô
.Ar annexname
¤Ï Annex ¥×¥í¥ó¥×¥È¤È¥Þ¥Ã¥Á¤µ¤»¤ÆÀܳ¤¬³ÎΩ¤·¤¿¤³¤È¤òȽÃǤ¹¤ë¤Î¤Ë
@@ -153,7 +152,10 @@ Xylogics ¤Î Annex box ¤ËÀܳ¤·¤Æ¤¤¤ë¤â¤Î¤È¤ß¤Ê¤·¡¢°ú¿ô
¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥â¥Ç¥àÀ©¸æ¤ÏÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
.It Fl U Ar upscript
SLIP ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬Àܳ¤µ¤ì¤¿¤È¤­¤Ë¼Â¹Ô¤¹¤ë¥¹¥¯¥ê¥×¥È¤ò»ØÄꤷ¤Þ¤¹¡£
-¤³¤Î¥¹¥¯¥ê¥×¥È¤Ë¤Ï ifconfig, route ¤½¤Î¾ŬÀڤʥ³¥Þ¥ó¥É¤ò´Þ¤á¤ë¤³¤È¤¬
+¤³¤Î¥¹¥¯¥ê¥×¥È¤Ë¤Ï
+.Xr ifconfig 8 ,
+.Xr route 8
+¤ä¡¢¤½¤Î¾ŬÀڤʥ³¥Þ¥ó¥É¤ò´Þ¤á¤ë¤³¤È¤¬
¤Ç¤­¤Þ¤¹¡£
¥¹¥¯¥ê¥×¥È¤Ë¤Ï "slX up" ¤¬°ú¿ô¤È¤·¤ÆÅϤµ¤ì¤Þ¤¹¡£
¥Ç¥Õ¥©¥ë¥È¤Ï
@@ -167,11 +169,13 @@ SLIP ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬Àܳ¤µ¤ì¤¿¤È¤­¤Ë¼Â¹Ô¤¹¤ë¥¹¥¯¥ê¥×¥È¤ò»ØÄꤷ¤Þ¤¹¡£
.It Fl D Ar downscript
SLIP ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤¬ÀÚÃǤµ¤ì¤¿¤È¤­¤Ë¼Â¹Ô¤¹¤ë¥¹¥¯¥ê¥×¥È¤ò»ØÄꤷ¤Þ¤¹¡£
¥¹¥¯¥ê¥×¥È¤Ë¤Ï°ú¿ô¤È¤·¤Æ "slX down" ¤¬ÅϤµ¤ì¤Þ¤¹¡£
-¥Ç¥Õ¥©¥ë¥È¤Ï "/sbin/ifconfig" ¤Ç¤¹¡£
+¥Ç¥Õ¥©¥ë¥È¤Ï
+.Pa /sbin/ifconfig
+¤Ç¤¹¡£
¥À¥¤¥¢¥ë¥·¡¼¥±¥ó¥¹ÈÖ¹æ (
.Fl s
»²¾È) ¤Ï´Ä¶­ÊÑ¿ô
-.Dv LINE
+.Ev LINE
¤òÄ̤¸¤ÆÅϤµ¤ì¤Þ¤¹¡£
.It Fl K Ar keepalive
SLIP ¤Î "keep alive" ¥¿¥¤¥à¥¢¥¦¥È¤ÎÉÿô¤òÀßÄꤷ¤Þ¤¹¡£
@@ -191,7 +195,7 @@ SLIP ¥æ¥Ë¥Ã¥È¥Ê¥ó¥Ð¤òľÀÜÀßÄꤷ¤Þ¤¹¡£
.It Fl L
UUCP ·Á¼°¤Î¥Ç¥Ð¥¤¥¹¥í¥Ã¥¯¤ò¹Ô¤¤¤Þ¤¹¡£
´û¤Ë UUCP ¥í¥Ã¥¯¤ò¹Ô¤Ã¤Æ¤¤¤ë³°Éô¥×¥í¥°¥é¥à¤«¤é
-.Nm startslip
+.Nm
¤ò¼Â¹Ô¤¹¤ë¾ì¹ç°Ê³°¤Ï¡¢¤³¤ì¤¬É¬ÍפǤ¹¡£
¥Ç¥Õ¥©¥ë¥È¤Î¾ì¹ç¡¢¤½¤Î¤è¤¦¤Ê¥×¥í¥°¥é¥à¤òËþ­¤µ¤»¤ë UUCP ¥í¥Ã¥¯¤Ï¹Ô¤¤¤Þ¤»¤ó¡£
.El
@@ -199,13 +203,13 @@ UUCP ·Á¼°¤Î¥Ç¥Ð¥¤¥¹¥í¥Ã¥¯¤ò¹Ô¤¤¤Þ¤¹¡£
.Bl -tag -width /var/run/startslip.<device>.pid -compact
.It Pa /var/run/startslip.<device>.pid
PID ¤¬¤³¤³¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£
+.It Pa /usr/share/examples/startslip/*
.Sh ´ØÏ¢¹àÌÜ
.Xr uustat 1 ,
.Xr slattach 8 ,
-.Xr sliplogin 8 ,
-/usr/share/examples/startslip
+.Xr sliplogin 8
.Sh Îò»Ë
-.Nm startslip
+.Nm
¤Ï
.Bx 4.4
¤ÇÅо줷¤Þ¤·¤¿¡£
diff --git a/ja/man/man1/strip.1 b/ja/man/man1/strip.1
index 550205ee3e..7f094e159e 100644
--- a/ja/man/man1/strip.1
+++ b/ja/man/man1/strip.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)strip.1 8.1 (Berkeley) 6/6/93
-.\" %Id: strip.1,v 1.3.2.1 1997/08/13 06:37:16 charnier Exp %
+.\" %Id: strip.1,v 1.6 1997/08/12 06:44:56 charnier Exp %
.\" jpman %Id: strip.1,v 1.4 1997/06/05 11:10:48 bobson Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/stty.1 b/ja/man/man1/stty.1
index df205127df..e28e3f8c61 100644
--- a/ja/man/man1/stty.1
+++ b/ja/man/man1/stty.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)stty.1 8.4 (Berkeley) 4/18/94
-.\" %Id: stty.1,v 1.4.2.5 1998/07/16 09:35:52 jkh Exp %
+.\" %Id: stty.1,v 1.10 1998/06/03 04:07:59 jkoshy Exp %
.\" jpman %Id: stty.1,v 1.2 1997/06/05 04:05:59 yugawa Stab %
.\"
.Dd April 18, 1994
diff --git a/ja/man/man1/su.1 b/ja/man/man1/su.1
index 1c150533c2..5e49d7ba36 100644
--- a/ja/man/man1/su.1
+++ b/ja/man/man1/su.1
@@ -30,8 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)su.1 8.2 (Berkeley) 4/18/94
-.\" %Id: su.1,v 1.3.2.9 1998/07/17 04:21:29 jkh Exp %
-.\" %Id: su.1,v 1.3.2.8 1998/06/08 05:44:03 jkoshy Exp %
+.\" %Id: su.1,v 1.14 1998/06/08 05:29:51 jkoshy Exp %
.\" jpman %Id: su.1,v 1.3 1997/05/19 16:52:17 horikawa Stab %
.\"
.\" this is for hilit19's braindeadness: "
diff --git a/ja/man/man1/systat.1 b/ja/man/man1/systat.1
index 9190589b1b..6cf4751ec7 100644
--- a/ja/man/man1/systat.1
+++ b/ja/man/man1/systat.1
@@ -32,7 +32,7 @@
.\" @(#)systat.1 8.2 (Berkeley) 12/30/93
.\" jpman %Id: systat.1,v 1.3 1997/10/05 12:58:19 horikawa Stab %
.\"
-.Dd December 30, 1993
+.Dd September 9, 1997
.Dt SYSTAT 1
.Os BSD 4.3
.Sh ̾¾Î
@@ -65,7 +65,10 @@
.Xr iostat 8
¼°¤Ë)¡¢²¾ÁÛµ­²±¤ÎÅý·×¾ðÊó (
.Xr vmstat 8
-¼°¤Ë)¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤Î ``mbuf'' ÍøÍÑΨ¡¢¥Í¥Ã¥È¥ï¡¼¥¯¥³¥Í¥¯¥·¥ç¥ó (
+¼°¤Ë)¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤Î ``mbuf'' ÍøÍÑΨ¡¢
+.Tn TCP/IP
+Åý·×¾ðÊó¡¢
+¥Í¥Ã¥È¥ï¡¼¥¯¥³¥Í¥¯¥·¥ç¥ó (
.Xr netstat 1
¼°¤Ë) ¤òɽ¼¨¤·¤Þ¤¹¡£
.Pp
@@ -82,12 +85,15 @@
¤Ë³¤±¤Æ
.Ar display
¤È¤·¤Æ°Ê²¼¤Î¤¤¤º¤ì¤«°ì¤Ä¤ò»ØÄꤷ¤Þ¤¹:
-.Ic pigs ,
+.Ic icmp ,
.Ic iostat ,
-.Ic swap ,
+.Ic ip ,
.Ic mbufs ,
-.Ic vmstat ,
-.Ic netstat
+.Ic netstat ,
+.Ic pigs ,
+.Ic swap ,
+.Ic tcp ,
+.Ic vmstat
¡£¤³¤ì¤é¤Îɽ¼¨ÆâÍÆ¤ÏÂÐÏÃŪ¤Ë¤â (
.Dq Fl
̵¤·¤Ë) »ØÄê¤Ç¤­¡¢¤½¤·¤Æ¾ÜºÙ¤Ï°Ê²¼¤ÎÀâÌÀ¤Ë¤¢¤ê¤Þ¤¹¡£
@@ -146,6 +152,53 @@
ɽ¼¨¤·¤Þ¤¹ (¥Ç¥Õ¥©¥ë¥È¤Îɽ¼¨ÆâÍÆ¤Ç¤¹)¡£
¥æ¡¼¥¶¥×¥í¥»¥¹¤Ø¤Î¥×¥í¥»¥Ã¥µ¤Î³äÅö¤¬ 100% ̤Ëþ¤Î»þ¤Ï¡¢
»Ä¤ê¤Ï ``idle'' ¥×¥í¥»¥¹¤Ë³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤ë¤â¤Î¤È°·¤¤¤Þ¤¹¡£
+.It Ic icmp
+²¼¤Î¥¦¥£¥ó¥É¥¦¤Ë¡¢
+Internet Control Message Protocol
+.Pq Dq Tn ICMP
+¤ÇÁ÷¼õ¿®¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ÎÅý·×¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
+¥¹¥¯¥ê¡¼¥ó¤Îº¸È¾Ê¬¤Ë¤Ï¼õ¿®¤·¤¿¥Ñ¥±¥Ã¥È¤Î¾ðÊó¤òɽ¼¨¤·¡¢
+±¦È¾Ê¬¤Ë¤ÏÁ÷¿®¤µ¤ì¤¿¤È¹Í¤¨¤é¤ì¤ë¥Ñ¥±¥Ã¥È¤Î¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
+.Pp
+ɽ¼¨ÆâÍÆ¤¬
+.Ic icmp
+¤Î¾ì¹ç¤Ï 2¤Ä¤Î¥³¥Þ¥ó¥É¤¬ÍøÍѤǤ­¤Þ¤¹:
+.Ic mode
+¤È
+.Ic reset
+¤Ç¤¹¡£
+.Ic mode
+¥³¥Þ¥ó¥É¤ÏÍ¿¤¨¤é¤ì¤¿°ú¿ô¤Ë±þ¤¸¤Æ 4¤Ä¤Îɽ¼¨¥â¡¼¥É¤«¤é 1¤Ä¤òÁª¤Ö¤¿¤á¤Ë»È¤¤¤Þ¤¹:
+.Bl -tag -width absoluteXX -compact
+.It Ic rate :
+¤½¤ì¤¾¤ì¤ÎÃͤÎÊÑÆ°¤òÉÃñ°Ì¤Ë¥Ñ¥±¥Ã¥È¿ô¤Çɽ¼¨¤·¤Þ¤¹ (¥Ç¥Õ¥©¥ë¥È¤Ç¤¹)
+.It Ic delta :
+¤½¤ì¤¾¤ì¤ÎÃͤÎÊÑÆ°¤ò¹¹¿·´Ö³Öñ°Ì¤Ë¥Ñ¥±¥Ã¥È¿ô¤Çɽ¼¨¤·¤Þ¤¹
+.It Ic since :
+ɽ¼¨¤¬ºÇ¸å¤Ë¥ê¥»¥Ã¥È¤µ¤ì¤Æ¤«¤é¤Î¤½¤ì¤¾¤ì¤ÎÃͤÎÊÑÆ°¤ÎÁí·×¤òɽ¼¨¤·¤Þ¤¹
+.It Ic absolute :
+³ÆÅý·×¤ÎÀäÂÐÃͤòɽ¼¨¤·¤Þ¤¹
+.El
+.Pp
+.Ic reset
+¥³¥Þ¥ó¥É¤Ï
+.Ic since
+¥â¡¼¥É¤Î´ðÅÀ¤ò¥ê¥»¥Ã¥È¤·¤Þ¤¹¡£
+°ú¿ô¤Ê¤·¤Î
+.Ic mode
+¥³¥Þ¥ó¥É¤Ï¤½¤Î»þÅÀ¤Î¥â¡¼¥É¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ëɽ¼¨¤·¤Þ¤¹¡£
+.It Ic ip
+.Tn IP
+¤È
+.Tn UDP
+¤ÎÅý·×¾ðÊó¤òɽ¼¨¤¹¤ë¤È¤¤¤¦ÅÀ¤ò½ü¤¤¤Æ
+.Ic icmp
+¤ÈƱ¤¸¤Ç¤¹¡£
+.It Ic tcp
+.Ic icmp
+¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢
+.Tn TCP
+¤ÎÅý·×¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
.It Ic iostat
²¼¤Î¥¦¥£¥ó¥É¥¦¤Ë¡¢¥×¥í¥»¥Ã¥µÍøÍÑΨ¤È¥Ç¥£¥¹¥¯¤Î¥¹¥ë¡¼¥×¥Ã¥È¤Î
Åý·×¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£¥×¥í¥»¥Ã¥µÍøÍÑΨ¤ÎÅý·×¾ðÊó¤Ï
@@ -217,21 +270,19 @@
Áö¹Ô²Äǽ (`r')¡¢¥Ú¡¼¥¸ÂÔ¤ÁÃæ (`p')¡¢
¥Ú¡¼¥¸¥ó¥°°Ê³°¤Î¥Ç¥£¥¹¥¯ÂÔ¤ÁÃæ (`d')¡¢
¥¹¥ê¡¼¥×¾õÂÖ (`s')¡¢¥¹¥ï¥Ã¥×¥¢¥¦¥È¤µ¤ì¤Æ¤¤¤ë¤¬¼Â¹Ô¤µ¤ì¤ë¤Î¤ò
-ÂԤäƤ¤¤ë¾õÂÖ (`w') ¤Ç¤¹¡£¤³¤Î¥­¥å¡¼¤ÎŤµ¤Î¥ê¥¹¥È¤Î²¼¤Ï
+ÂԤäƤ¤¤ë¾õÂÖ (`w') ¤Ç¤¹¡£
+¤³¤Î¹Ô¤Ë¤Ï¥³¥ó¥Æ¥­¥¹¥È¥¹¥¤¥Ã¥Á¤ÎÊ¿¶Ñ²ó¿ô (`Csw')¡¢
+¥È¥é¥Ã¥× (`Trp'; ¥Ú¡¼¥¸¥Õ¥©¥ë¥È¤ò´Þ¤à)¡¢
+¥·¥¹¥Æ¥à¥³¡¼¥ë (`Sys')¡¢³ä¤ê¹þ¤ß (`Int')¡¢
+¥Í¥Ã¥È¥ï¡¼¥¯¥½¥Õ¥È¥¦¥§¥¢³ä¤ê¹þ¤ß (`Sof')¡¢
+¥Ú¡¼¥¸¥Õ¥©¥ë¥È (`Flt') ¤âɽ¼¨¤·¤Þ¤¹¡£
+.Pp
+¤³¤Î¥×¥í¥»¥¹¥­¥å¡¼¤ÎŤµ¤Î¥ê¥¹¥È¤Î²¼¤Ï
»þ´Ö¤ÎÁí·×¤ò¥·¥¹¥Æ¥à (`=' ¤Ç¼¨¤µ¤ì¤Þ¤¹)¡¢³ä¤ê¹þ¤ß (`+' ¤Ç¼¨¤µ¤ì¤Þ¤¹)¡¢
¥æ¡¼¥¶ (`>' ¤Ç¼¨¤µ¤ì¤Þ¤¹)¡¢¥Ê¥¤¥¹ (`-' ¤Ç¼¨¤µ¤ì¤Þ¤¹)¡¢
¥¢¥¤¥É¥ë (` ' ¤Ç¼¨¤µ¤ì¤Þ¤¹) ¤Ë¤Ä¤¤¤Æ¿ôÃͤΥꥹ¥È¤ÈËÀ¥°¥é¥Õ¤Ç
ɽ¤·¤¿Êª¤Ç¤¹¡£
.Pp
-.\" ¤³¤Îʸ¤Ï¸¶Ê¸¤Ç¤Ï ¤â¤Ã¤È¸å¤í¤Ë¤¢¤Ã¤¿¤¬¡¢²èÌ̹½À®¤¬ÊѤï¤Ã¤Æ¤¤¤ë¤è¤¦¤Ê¤Î¤Ç
-.\" °Üư¤·¤¿ (ÌõÃí)
-Ê¿¶Ñ¥×¥í¥»¥¹¿ô¤Î±¦¤Ë¥³¥ó¥Æ¥­¥¹¥È¥¹¥¤¥Ã¥Á (`Csw')¡¢
-¥È¥é¥Ã¥× (`Trp'; ¥Ú¡¼¥¸¥Õ¥©¥ë¥È¤ò´Þ¤à)¡¢
-¥·¥¹¥Æ¥à¥³¡¼¥ë (`Sys')¡¢³ä¤ê¹þ¤ß (`Int')¡¢
-¥Í¥Ã¥È¥ï¡¼¥¯¥½¥Õ¥È¥¦¥§¥¢³ä¤ê¹þ¤ß (`Sof')¡¢
-¥Ú¡¼¥¸¥Õ¥©¥ë¥È (`Flt') ¤Î
-1¹¹¿·´Ö³Ö¤Ç¤ÎÉ䢤¿¤ê¤ÎÊ¿¶Ñ²ó¿ô¤òÊó¹ð¤·¤Þ¤¹¡£
-.Pp
¥×¥í¥»¥¹¾ðÊó¤Î²¼¤Ï¥Õ¥¡¥¤¥ë̾ÊÑ´¹¤ÎÅý·×¾ðÊó¤Ç¤¹¡£
¤³¤ì¤ÏÁ°¤Î¹¹¿·´ü´ÖÃæ¤Ë¹Ô¤ï¤ì¤¿¥Õ¥¡¥¤¥ë̾¤«¤é i¥Î¡¼¥ÉÈÖ¹æ¤Ø¤ÎÊÑ´¹¤Î
²ó¿ô¡¢¥·¥¹¥Æ¥àÁ´ÂΤǶ¦Ä̤ÎÊÑ´¹¥­¥ã¥Ã¥·¥å¤Ç½èÍý¤µ¤ì¤¿Êª¤Î²ó¿ô¤È
@@ -242,8 +293,12 @@
¤³¤³¤Ç¤Ï 1¹¹¿·´Ö³Ö (¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï 5ÉÃ) ¤Î¥·¡¼¥¯²ó¿ô¡¢Å¾Á÷²ó¿ô¡¢
Ê¿¶ÑžÁ÷Î̤ò¥­¥í¥Ð¥¤¥È/ÉäÇÊó¹ð¤·¤Þ¤¹¡£
¥Ç¥£¥¹¥¯¤Ë¤è¤Ã¤Æ¤ÏÊ¿¶Ñ¥·¡¼¥¯»þ´Ö¤ò¥ß¥êÉÃñ°Ì¤ÇÊó¹ð¤·¤Þ¤¹¡£
-¥·¥¹¥Æ¥à¤ÏºÇÂç¤Ç 8Âæ (¤³¤ì¤Ï /sys/dkstat.h ¤ÎÄê¿ô DK_NDRIVE ¤Ç
-·è¤Þ¤ë¥«¡¼¥Í¥ë¤Î¥³¥ó¥Ñ¥¤¥ë»þÄê¿ô¤Ç¤¹) ¤Î¥Ç¥£¥¹¥¯¤Þ¤Ç¤·¤«
+¥·¥¹¥Æ¥à¤ÏºÇÂç¤Ç 8Âæ
+(¤³¤ì¤Ï
+.Aq Pa sys/dkstat.h
+¤ÎÄê¿ô
+.Dv DK_NDRIVE
+¤Ç·è¤Þ¤ë¥«¡¼¥Í¥ë¤Î¥³¥ó¥Ñ¥¤¥ë»þÄê¿ô¤Ç¤¹) ¤Î¥Ç¥£¥¹¥¯¤Þ¤Ç¤·¤«
Åý·×¾ðÊó¤ò´ÉÍý¤·¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ²¼¤µ¤¤¡£
.Pp
±¦¾å¤ÎÆü»þ¤Î²¼¤Ï¥Ú¡¼¥¸¥ó¥°¤È¥¹¥ï¥Ã¥×¤Î²ÔƯ¾õ¶·¤Ç¤¹¡£
@@ -256,25 +311,31 @@
¼¨¤·¤Þ¤¹; ¤³¤Î¾ðÊó¤Î 2¹ÔÌÜ¤Ï 1¹¹¿·´Ö³Ö¤Ç¤ÎÉ䢤¿¤ê¤ÎÊ¿¶ÑžÁ÷¥Ú¡¼¥¸¿ô¤ò
¼¨¤·¤Þ¤¹¡£
.Pp
-.\" ¤³¤Îʸ¤Ï¸¶Ê¸¤¬ VAX 4.3BSD ¤Î¤Þ¤Þ¤Î¤è¤¦¤À¤Ã¤¿¤Î¤Çľ¤·¤¿ (ÌõÃí)
-¥Ú¡¼¥¸¥ó¥°¤ÎÅý·×¾ðÊó¤Î²¼¤Ï
-copy-on-writes ¤¬¹Ô¤ï¤ì¤¿¥Ú¡¼¥¸¿ô (`cow')¡¢
+¥Ú¡¼¥¸¥ó¥°¤ÎÅý·×¾ðÊó¤Î²¼¤Ï²¾ÁÛµ­²±¥·¥¹¥Æ¥à¤Î°Ê²¼¤Î¹àÌܤÎÊ¿¶Ñ¿ô¤ò
+ɽ¼¨¤¹¤ëÎó¤Ç¤¹¡£¤½¤ì¤¾¤ì¡¢
+½ñ¤­¹þ¤ß»þ¤Ë¥³¥Ô¡¼¤¬¹Ô¤ï¤ì¤¿¥Ú¡¼¥¸¿ô (`cow')¡¢
Í×µá»þ 0¥¯¥ê¥¢¤¬¹Ô¤ï¤ì¤¿¥Ú¡¼¥¸¿ô (`zfod')¡¢
-I/OÅù¤Î¤¿¤á¤Ë¥Ú¡¼¥¸¥ó¥°Âоݤ«¤é³°¤µ¤ì¡¢¸ÇÄꤵ¤ì¤Æ¤¤¤ë¥Ú¡¼¥¸¿ô (`wire')¡¢
+¥Ú¡¼¥¸¥ó¥°Âоݤ«¤é³°¤µ¤ì¡¢¸ÇÄꤵ¤ì¤Æ¤¤¤ë¥Ú¡¼¥¸¿ô (`wire')¡¢
ºÇ¶á»²¾È¤µ¤ì¤¿¥Ú¡¼¥¸¿ô (`act')¡¢
¥Ú¡¼¥¸¥ó¥°¤Î¸õÊä¤Ë¤Ê¤Ã¤Æ¤¤¤ë¥Ú¡¼¥¸¿ô (`inact')¡¢
-¥¯¥ê¡¼¥ó¤Ê¾õÂ֤Υ­¥ã¥Ã¥·¥å¥Ú¡¼¥¸¿ô (`cache')¡¢
+¥Ð¥Ã¥Õ¥¡¥­¥ã¥Ã¥·¥å¥­¥å¡¼¤Ë¤¢¤ë¥Ú¡¼¥¸¿ô (`cache')¡¢
¥Õ¥ê¡¼¥Ú¡¼¥¸¿ô (`free')¡¢
-¥Ç¡¼¥â¥ó¤¬²òÊü¤·¤¿¥Ú¡¼¥¸¿ô (`daefr')¡¢
+¥Ú¡¼¥¸¥Ç¡¼¥â¥ó¤¬²òÊü¤·¤¿¥Ú¡¼¥¸¿ô (`daefr')¡¢
¥×¥í¥»¥¹¤¬½ªÎ»¤·¤¿»ö¤Ë¤è¤Ã¤Æ²òÊü¤µ¤ì¤¿¥Ú¡¼¥¸¿ô (`prcfr')¡¢
-¥Õ¥ê¡¼¥ê¥¹¥È¤«¤éºÇ¶á»²¾È¤µ¤ì¤¿¤«¡¢
-¤Þ¤¿¤Ï¥Ú¡¼¥¸¥ó¥°¤Î¸õÊä¤Ë¤Ê¤Ã¤¿¥Ú¡¼¥¸¿ô (`react')¡¢
-¥Ç¡¼¥â¥ó¤¬µ¯¤³¤µ¤ì¤¿²ó¿ô (`pdwak')¡¢
-¥Ç¡¼¥â¥ó¤¬Ä´¤Ù¤¿¥Ú¡¼¥¸¿ô (`pdpgs')¡¢
-¥Õ¥©¥ë¥È¤·¤¿¥Ú¡¼¥¸¤¬ÆÉ¤ß¹þ¤ßÅÓÃæ¤À¤Ã¤¿²ó¿ô (`intrn')¡¢
-¥­¥í¥Ð¥¤¥Èñ°Ì¤Î¥Ð¥Ã¥Õ¥¡¥­¥ã¥Ã¥·¥å¤Î¥µ¥¤¥º (`buf')
+¥Õ¥ê¡¼¥ê¥¹¥È¤«¤éºÆÍ­¸ú²½¤µ¤ì¤¿¥Ú¡¼¥¸¿ô (`react')¡¢
+¥Ú¡¼¥¸¥Ç¡¼¥â¥ó¤¬µ¯¤³¤µ¤ì¤¿²ó¿ô (`pdwak')¡¢
+¥Ú¡¼¥¸¥Ç¡¼¥â¥ó¤¬Ä´¤Ù¤¿¥Ú¡¼¥¸¿ô (`pdpgs')¡¢
+ÆÉ¤ß¹þ¤ßÅÓÃæ¤Ç¥Ú¡¼¥¸¥Õ¥©¥ë¥È¤¬¥Ö¥í¥Ã¥¯¤µ¤ì¤¿²ó¿ô (`intrn')
¤Î 1¹¹¿·´Ö³Ö¤Ç¤ÎÉ䢤¿¤ê¤ÎÊ¿¶ÑÃͤǤ¹¡£
.Pp
+¤³¤ÎÎó¤Î¤¤¤Á¤Ð¤ó²¼¤Ï¡¢°Ê²¼¤ÎÍÑÅӤ˻Ȥï¤ì¤Æ¤¤¤ë
+¥á¥â¥ê¤ÎÁíÎ̤ò¤½¤ì¤¾¤ì¤Ë¤Ä¤¤¤Æ¥­¥í¥Ð¥¤¥Èñ°Ì¤Ç¼¨¤·¤Æ¤¤¤Þ¤¹¡£
+¥Ð¥Ã¥Õ¥¡¥­¥ã¥Ã¥·¥å¤Î¤¿¤á¤Ë»È¤ï¤ì¤Æ¤¤¤ëʬ (`buf')¡¢
+v¥Î¡¼¥É¥­¥ã¥Ã¥·¥å¤Î˾¤Þ¤ì¤ëºÇÂ祵¥¤¥º (`desiredvnodes')
+(¥Í¡¼¥à¥­¥ã¥Ã¥·¥å¤Î¥µ¥¤¥º¤Þ¤Ç¤ò½ü¤¯¤È¡¢ÂçÉôʬ¤Ï̤»ÈÍÑ)¡¢
+¼ÂºÝ¤Ë³ÎÊݤµ¤ì¤¿ v¥Î¡¼¥É¿ô (`numvnodes')¡¢
+³ÎÊݤµ¤ì¤¿ v¥Î¡¼¥É¤Ç¥Õ¥ê¡¼¤Êʪ¤Î¿ô (`freevnodes')
+.Pp
²èÌ̤ᦲ¼¤Ï¥·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ½èÍý¤µ¤ì¤¿³ä¤ê¹þ¤ß¤Î¾ÜºÙ¤Ç¤¹¡£
¥ê¥¹¥È¤Î¥È¥Ã¥×¤Ï¹¹¿·´ü´ÖÃæ¤ÎÉ䢤¿¤ê¤ÎÁí³ä¤ê¹þ¤ß¿ô¤Ç¤¹¡£
Îó¤Î»Ä¤ê¤ÎÉôʬ¤ÏÁí³ä¤ê¹þ¤ß¿ô¤Î¥Ç¥Ð¥¤¥¹Ëè¤Î¾ÜºÙ¤Ç¤¹¡£
@@ -314,9 +375,10 @@ I/OÅù¤Î¤¿¤á¤Ë¥Ú¡¼¥¸¥ó¥°Âоݤ«¤é³°¤µ¤ì¡¢¸ÇÄꤵ¤ì¤Æ¤¤¤ë¥Ú¡¼¥¸¿ô (`wire')¡¢
¥Í¥Ã¥È¥ï¡¼¥¯¥¢¥É¥ì¥¹¤ò¿ô»ú¤Çɽ¼¨¤·¤Þ¤¹¡£
.It Cm names
¥Í¥Ã¥È¥ï¡¼¥¯¥¢¥É¥ì¥¹¤ò¥·¥ó¥Ü¥ë¤Çɽ¼¨¤·¤Þ¤¹¡£
-.It Ar protocol
-»ØÄꤵ¤ì¤¿¥×¥í¥È¥³¥ë¤ò»È¤Ã¤Æ¤¤¤ë¥Í¥Ã¥È¥ï¡¼¥¯¥³¥Í¥¯¥·¥ç¥ó¤Î¤ß¤ò
-ɽ¼¨¤·¤Þ¤¹ (¸½ºß¤Î½ê ``tcp'' ¤« ``udp'' ¤Î¤¤¤º¤ì¤«¤Ç¤¹)¡£
+.It Cm proto Ar protocol
+.Ar protocol
+¤Ç»ØÄꤵ¤ì¤¿¥×¥í¥È¥³¥ë¤ò»È¤Ã¤Æ¤¤¤ë¥Í¥Ã¥È¥ï¡¼¥¯¥³¥Í¥¯¥·¥ç¥ó¤Î¤ß¤ò
+ɽ¼¨¤·¤Þ¤¹ (¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥×¥í¥È¥³¥ë¤Ï ``tcp'',``udp'',``all'')¡£
.It Cm ignore Op Ar items
»ØÄꤵ¤ì¤¿¥Û¥¹¥È¤Þ¤¿¤Ï¥Ý¡¼¥È¤È¤ÎÀܳ¤Ë´Ø¤¹¤ë¾ðÊó¤òɽ¼¨¤·¤Þ¤»¤ó¡£
¥Û¥¹¥È¤È¥Ý¡¼¥È¤Ï̾Á° (``vangogh'' ¤ä ``ftp'')¡¢¤Þ¤¿¤Ï¿ô»ú¤Ç
@@ -368,6 +430,14 @@ I/OÅù¤Î¤¿¤á¤Ë¥Ú¡¼¥¸¥ó¥°Âоݤ«¤é³°¤µ¤ì¡¢¸ÇÄꤵ¤ì¤Æ¤¤¤ë¥Ú¡¼¥¸¿ô (`wire')¡¢
»ØÄꤵ¤ì¤¿¥É¥é¥¤¥Ö¤Ë´Ø¤¹¤ë¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£Ê£¿ô¤Î¥É¥é¥¤¥Ö¤ò
¶õÇò¤Ç¶èÀڤäƻØÄê¤Ç¤­¤Þ¤¹¡£
.El
+.Sh ´ØÏ¢¹àÌÜ
+.Xr iostat 1 ,
+.Xr netstat 1 ,
+.Xr vmstat 1 ,
+.Xr icmp 4 ,
+.Xr ip 4 ,
+.Xr tcp 4 ,
+.Xr udp 4
.Sh ´ØÏ¢¥Õ¥¡¥¤¥ë
.Bl -tag -width /etc/networks -compact
.It Pa /kernel
@@ -388,6 +458,24 @@ I/OÅù¤Î¤¿¤á¤Ë¥Ú¡¼¥¸¥ó¥°Âоݤ«¤é³°¤µ¤ì¡¢¸ÇÄꤵ¤ì¤Æ¤¤¤ë¥Ú¡¼¥¸¿ô (`wire')¡¢
¥×¥í¥°¥é¥à¤Ï
.Bx 4.3
¤Ë½é¤á¤ÆÅо줷¤Þ¤·¤¿¡£
+.Ic icmp ,
+.Ic ip ,
+.Ic tcp
+¤Îɽ¼¨¤Ï
+.Fx 3.0
+¤Ë½é¤á¤ÆÅо줷¤Þ¤·¤¿;
+.Tn ICMP ,
+.Tn IP ,
+.Tn TCP ,
+.Tn UDP
+¤ÎÅý·×¾ðÊó¤Î¤¿¤á¤ËÊ̤Îɽ¼¨¥â¡¼¥É¤òÍѰդ¹¤ë¤È¤¤¤¦¹Í¤¨Êý¤Ï¡¢
+Silicon Graphics ¤Î
+.Tn IRIX
+¥·¥¹¥Æ¥à¤Î
+.Xr netstat 1
+¤Î
+.Fl C
+¥ª¥×¥·¥ç¥ó¤«¤é¼ÚÍѤ·¤Þ¤·¤¿¡£
.Sh ¥Ð¥°
CPU ¤Î 2-10 ¥Ñ¡¼¥»¥ó¥È¤ò¾ÃÈñ¤·¤Þ¤¹¡£
ɽ¼¨ÆâÍÆ¤Ë¤è¤Ã¤Æ¤Ï 1¹Ô¤ËºÇÄã¤Ç 80ʸ»ú¤¬É½¼¨¤Ç¤­¤ë»ö¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£
@@ -396,4 +484,4 @@ CPU ¤Î 2-10 ¥Ñ¡¼¥»¥ó¥È¤ò¾ÃÈñ¤·¤Þ¤¹¡£
(¿·µ¬¤Î¥×¥í¥°¥é¥à¤È¤·¤Æ¤Ç¤Ï¤Ê¤¯ÆÈΩ¤·¤¿É½¼¨²èÌ̤Ȥ·¤ÆÄɲ䵤ì¤Þ¤·¤¿)¡£
.Sh ÆüËܸìÌõ
-Ìî¼ó ´²¹â(h-nokubi@nmit.tmg.nec.co.jp): FreeBSD ÍѤËËÝÌõ
+Ìî¼ó ´²¹â(hnokubi@yyy.or.jp): FreeBSD ÍѤËËÝÌõ
diff --git a/ja/man/man1/tar.1 b/ja/man/man1/tar.1
index 5ab54c2946..786f64c490 100644
--- a/ja/man/man1/tar.1
+++ b/ja/man/man1/tar.1
@@ -4,7 +4,7 @@
.\" Written by John F. Woods <jfw@jfwhome.funhouse.com>
.\" Updated by Robert Eckardt <roberte@mep.ruhr-uni-bochum.de>
.\"
-.\" %Id: tar.1,v 1.6.2.4 1998/07/20 02:30:06 jkoshy Exp %
+.\" %Id: tar.1,v 1.16 1998/07/09 04:28:19 jkoshy Exp %
.\" jpman %Id: tar.1,v 1.2 1997/06/24 07:09:44 bobson Stab %
.\"
.Dd 25 August 1997
@@ -232,7 +232,7 @@ tarfile ¤ÏÄ̾Gµ¤¥Æ¡¼¥×¤ò»Ø¤·¤Þ¤¹¤¬¡¢¥Õ¥í¥Ã¥Ô¥Ç¥£¥¹¥±¥Ã¥È¤ä
¤è¤ê¿·¤·¤¤¥Õ¥¡¥¤¥ë¤À¤±¤òÃê½Ð¤·¤Þ¤¹¡£
.It Fl -newer-mtime Ar date
Êѹ¹»þ´Ö¤¬
- .Ar date
+.Ar date
¤è¤ê¿·¤·¤¤¥Õ¥¡¥¤¥ë¤À¤±¤òÃê½Ð¤·¤Þ¤¹¡£
.It Fl o
.It Fl -old-archive
@@ -465,19 +465,29 @@ tar ¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥Æ¡¼¥×¥É¥é¥¤¥Ö¤òÊѹ¹¤·¤Þ¤¹¡£(¤³¤ì¤Ï¡¢¤µ¤é¤Ë
¥Ñ¥Ö¥ê¥Ã¥¯¥É¥á¥¤¥ó tar ¤¬¸µ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
.Sh ºî¼Ô
¼¡¤Î¿Í¤ò´Þ¤à¡¢ÂçÊÑ¿¤¯¤Î¿Í¡¹¡£[¥½¡¼¥¹¤ÎÃæ¤Î ChangeLog ¥Õ¥¡¥¤¥ë¤Ëµ­
-½Ò¤µ¤ì¤Æ¤¤¤ë¿Í¡¹] John Gilmore (¥ª¥ê¥¸¥Ê¥ë¤Î¥Ñ¥Ö¥ê¥Ã¥¯¥É¥á¥¤¥óÈǤÎ
-ºî¼Ô), Fenlason (ºÇ½é¤Î GNU ºî¼Ô), Joy Kendall, Jim Kingdon, David
-J. MacKenzie, Michael I Bushnell, Noah Friedman, ¤½¤·¤Æ
+½Ò¤µ¤ì¤Æ¤¤¤ë¿Í¡¹]
+.An John Gilmore
+(¥ª¥ê¥¸¥Ê¥ë¤Î¥Ñ¥Ö¥ê¥Ã¥¯¥É¥á¥¤¥óÈǤκî¼Ô),
+.An Jay Fenlason
+(ºÇ½é¤Î GNU ºî¼Ô),
+.An Joy Kendall ,
+.An Jim Kingdon ,
+.An David J. MacKenzie ,
+.An Michael I Bushnell ,
+.An Noah Friedman
+¤½¤·¤Æ
¥Ð¥°¥Õ¥£¥Ã¥¯¥¹¤äÄɲäò¹×¸¥¤·¤Æ¤¯¤ì¤¿Ìµ¿ô¤Î¿Í¡¹¡£
-¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï NetBSD 1.0 release ¤«¤é¡¢FreeBSD ¥°¥ë¡¼¥×¤¬
+¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï NetBSD 1.0 release ¤«¤é¡¢
+.Bx Free
+¥°¥ë¡¼¥×¤¬
¼è¤ê¹þ¤ó¤À¤â¤Î¤Ç¤¹¡£
.Sh ¥Ð¥°
ÆÃħŪ¤Ê
.Fl C
-¥ª¥×¥·¥ç¥ó¤Ï¡¢¤³¤ì¤Þ¤Ç¤Î tar ¥×¥í¥°¥é¥à¤Î¤è¤¦¤Ë¤Ïưºî¤·¤Ê¤¤¤¿¤á¡¢
-¤ª¤½¤é¤¯¿®Íê¤Ç¤­¤Þ¤»¤ó¡£
+¥ª¥×¥·¥ç¥ó¤Îưºî¤Ï¡¢ÅÁÅýŪ¤Ê tar ¥×¥í¥°¥é¥à¤Î¤½¤ì¤È¤Ï°Û¤Ê¤ë¤Î¤Ç¡¢
+¤¢¤Þ¤êÍê¤ê¤Ë¤Ï¤Ç¤­¤Þ¤»¤ó¡£
.Pp
--A ¥³¥Þ¥ó¥É¤Ï¡¢Ç¤°Õ¤Î¿ô¤Î tar ¥¢¡¼¥«¥¤¥Ö¤ò·ë¹ç¤¹¤ë¤è¤¦Æ°¤¯¤Ù¤­¤Ç
-¤¹¤¬¡¢¤½¤¦¤Ïưºî¤·¤Þ¤»¤ó¡£2 ÈÖÌܤ䤽¤ì°Ê¹ß¤Î¥¢¡¼¥«¥¤¥Ö¤Î
-end-of-archive ¥Ö¥í¥Ã¥¯¤ò¼è¤ê½ü¤¯¤³¤È¤ò»î¤ß¤Þ¤¹¡£
+-A ¥³¥Þ¥ó¥É¤ÇǤ°Õ¤Î¿ô¤Î tar ¥¢¡¼¥«¥¤¥Ö¤ò·ë¹ç¤Ç¤­¤ì¤Ð¤¤¤¤¤Î¤Ç¤¹¤¬¡¢
+¤½¤ì¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤³¤ì¤ò¤ä¤í¤¦¤È¤·¤Æ¤â¡¢ 2 ¤ÄÌܰʹߤΥ¢¡¼¥«¥¤¥Ö¤Î
+end-of-archive ¥Ö¥í¥Ã¥¯¤¬ºï½ü¤µ¤ì¤º¤Ë»Ä¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
diff --git a/ja/man/man1/tconv.1 b/ja/man/man1/tconv.1
index 2dbbc2023a..9eeed768cf 100644
--- a/ja/man/man1/tconv.1
+++ b/ja/man/man1/tconv.1
@@ -1,5 +1,5 @@
.\" @(#) mytinfo tconv.1 3.2 92/02/01 public domain, By Ross Ridge
-.\" %Id: tconv.1,v 1.5.2.1 1997/08/14 06:37:58 charnier Exp %
+.\" %Id: tconv.1,v 1.8 1997/08/13 06:58:44 charnier Exp %
.\"
.\" jpman %Id: tconv.1,v 1.3 1997/09/21 06:56:54 konuma Stab %
.Dd February 1, 1992
diff --git a/ja/man/man1/tcpdump.1 b/ja/man/man1/tcpdump.1
index 5f22c63204..b26275c589 100644
--- a/ja/man/man1/tcpdump.1
+++ b/ja/man/man1/tcpdump.1
@@ -1,4 +1,4 @@
-.\" @(#) %Header: tcpdump.1,v 1.61 96/07/14 19:45:00 leres Exp % (LBL)
+.\" @(#) %Header: tcpdump.1,v 1.65 96/11/29 01:03:01 leres Exp % (LBL)
.\" jpman %Id: tcpdump.1,v 1.3 1997/05/23 22:18:59 yugawa Stab %
.\"
.\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996
@@ -21,7 +21,7 @@
.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.\"
-.TH TCPDUMP 1 "14 July 1996"
+.TH TCPDUMP 1 "29 November 1996"
.SH ̾¾Î
tcpdump \- ¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¥È¥é¥Õ¥£¥Ã¥¯¥Ç¡¼¥¿¤ò¥À¥ó¥×¤·¤Þ¤¹
.SH ½ñ¼°
@@ -69,6 +69,7 @@ tcpdump \- ¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¥È¥é¥Õ¥£¥Ã¥¯¥Ç¡¼¥¿¤ò¥À¥ó¥×¤·¤Þ¤¹
\fItcpdump\fP ¤Ï¡¢¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¥Õ¥§¡¼¥¹¾å¤Ç
¼èÆÀ²Äǽ¤Ê¥Ñ¥±¥Ã¥È¤Î¥Ø¥Ã¥À¤Î¤¦¤Á \fIexpression\fP ¤Ë¥Þ¥Ã¥Á¤¹¤ë¤â¤Î¤ò½ÐÎÏ
¤·¤Þ¤¹¡£
+.LP
.B SunOS ¾å¤Î nit ¤Ê¤¤¤· bpf ¤Î¾ì¹ç:
.I tcpdump
¤ò¼Â¹Ô¤¹¤ë¤Ë¤Ï¡¢
@@ -83,7 +84,9 @@ tcpdump \- ¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¥È¥é¥Õ¥£¥Ã¥¯¥Ç¡¼¥¿¤ò¥À¥ó¥×¤·¤Þ¤¹
root ¤« root ¤Ë setuid ¤µ¤ì¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Î¤ß¼Â¹Ô²Äǽ¤Ç¤¹¡£
.B IRIX ¾å¤Î snoop ¤Î¾ì¹ç:
root ¤« root ¤Ë setuid ¤µ¤ì¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Î¤ß¼Â¹Ô²Äǽ¤Ç¤¹¡£
-.B Ultrix ¤Î¾ì¹ç:
+.B Linux ¤Î¾ì¹ç:
+root ¤« root ¤Ë setuid ¤µ¤ì¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Î¤ß¼Â¹Ô²Äǽ¤Ç¤¹¡£
+.B Ultrix ¤ª¤è¤Ó Digital UNIX ¤Î¾ì¹ç:
¥¹¡¼¥Ñ¥æ¡¼¥¶¤¬¡¢
.IR pfconfig (8)
¤òÍѤ¤¤Æ promiscuous-mode ¤Ç¤ÎÁàºî¤òµö²Ä¤·¤Æ¤¤¤ì¤Ð¡¢¤É¤Î¥æ¡¼¥¶¤â
@@ -861,7 +864,18 @@ ack ¥·¡¼¥±¥ó¥¹Èֹ椬¾®¤µ¤¤À°¿ô (1) ¤Ç¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ²¼¤µ¤¤¡£
csam ¤Ï¡¢rtsg ¤Ë 1 ¥Ð¥¤¥È¤Î¥Ç¡¼¥¿¤òÁ÷¿®¤·¤Æ¤Þ¤¹¡£
8 ¹Ô¤á¤È 9 ¹Ô¤á¤Ç¤Ï¡¢csam ¤Ï¶ÛµÞ (urgent) ¤Ç PUSH ¥Õ¥é¥°¤ÎÀßÄꤵ¤ì¤¿
2 ¥Ð¥¤¥È¥Ç¡¼¥¿¤òÁ÷¿®¤·¤Æ¤¤¤Þ¤¹¡£
-.HD
+.LP
+¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤¬¾®¤µ²á¤®¤Æ \fBtcpdump\fP ¤¬
+TCP ¥Ø¥Ã¥ÀÁ´ÂΤòÊᤨ¤Ê¤«¤Ã¤¿¾ì¹ç¡¢
+²Äǽ¤Ê¸Â¤ê¤Î¥Ø¥Ã¥À¤ò²ò¼á¤·¡¢``[|\fItcp\fP]'' ¤òɽ¼¨¤·¤Æ
+»Ä¤ê¤ò²ò¼á¤Ç¤­¤Ê¤«¤Ã¤¿¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
+(û¤«²á¤®¤ë¤Þ¤¿¤Ï¥Ø¥Ã¥À¤ò±Û¤¨¤Æ¤·¤Þ¤¦¤È¤¤¤Ã¤¿) ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó¤ò
+¥Ø¥Ã¥À¤¬»ý¤Ä¾ì¹ç¤Ë¤Ï¡¢tcpdump ¤Ï ``[\fIbad opt\fP]'' ¤òɽ¼¨¤·¤Æ
+»Ä¤ê¤Î¥ª¥×¥·¥ç¥ó¤ò²ò¼á¤·¤Þ¤»¤ó (¤É¤³¤«¤é³«»Ï¤·¤¿¤éÎɤ¤¤Î¤«Ê¬¤«¤é¤Ê¤¤¤«¤é¤Ç¤¹)¡£
+¥Ø¥Ã¥ÀŤˤè¤ê¥ª¥×¥·¥ç¥ó¤¬Â¸ºß¤¹¤ë¤³¤È¤¬Ê¬¤«¤ë¤¬¡¢
+IP ¥Ç¡¼¥¿¥°¥é¥àŤ¬¥ª¥×¥·¥ç¥ó¤¬¤½¤³¤Ë¤¢¤ë¤¿¤á¤Ë½½Ê¬¤ÊŤµ¤Ç¤Ï¤Ê¤¤¾ì¹ç¤Ë¡¢
+tcpdump ¤Ï ``[\fIbad hdr length\fP]'' ¤òɽ¼¨¤·¤Þ¤¹¡£
+HD
.B
UDP ¥Ñ¥±¥Ã¥È
.LP
@@ -1226,33 +1240,19 @@ rtsg.1170 > arizona.ftp-data: . ack 1536 win 2560\fP\s+2
.SH ´ØÏ¢¹àÌÜ
traffic(1C), nit(4P), bpf(4), pcap(3)
.SH ºî¼Ô
-Van Jacobson (van@ee.lbl.gov),
-Craig Leres (leres@ee.lbl.gov) and
-Steven McCanne (mccanne@ee.lbl.gov), all of the
-Lawrence Berkeley Laboratory, University of California, Berkeley, CA.
+Van Jacobson,
+Craig Leres and
+Steven McCanne, all of the
+Lawrence Berkeley National Laboratory, University of California, Berkeley, CA.
+.LP
+.RS
+.I ftp://ftp.ee.lbl.gov/tcpdump.tar.Z
+.RE
.SH ¥Ð¥°
-¥Ð¥°¥ì¥Ý¡¼¥È¤Ï¡¢tcpdump@ee.lbl.gov ¤Þ¤¿¤Ï libpcap@ee.lbl.gov ¤ØÁ÷¤Ã¤Æ²¼¤µ¤¤¡£
+¥Ð¥°¥ì¥Ý¡¼¥È¤Ï¡¢tcpdump@ee.lbl.gov ¤ØÁ÷¤Ã¤Æ²¼¤µ¤¤¡£
.LP
NIT ¤Ç¤Ï¡¢³°¤Ë½Ð¤Æ¤¤¤¯¥È¥é¥Õ¥£¥Ã¥¯¤ò´Ñ»¡¤Ç¤­¤Þ¤»¤ó¡£BPF ¤Ê¤é¤Ç¤­¤Þ¤¹¡£
-tcpdump ¤òÍѤ¤¤ë¾ì¹ç¤Ë¤Ï¡¢¸å¼Ô¤òÍѤ¤¤ë¤³¤È¤ò¿ä¾©¤·¤Þ¤¹¡£
-.LP
-Ultrix ¾å¤Ç \fItcpdump\fP ¤ò»È¤¦¾ì¹ç¤Ë¤Ï¡¢Ultrix ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï 4.0 °Ê¹ß¤Î¤â¤Î
-¤òÍѤ¤¤Æ²¼¤µ¤¤¡£¤³¤Î¾ì¹ç¤Ë¤Ï¡¢\fIpacketfilter\fP ²¾ÁۥǥХ¤¥¹¥É¥é¥¤¥Ð
-¤òÄɲ䷤ơ¢¥«¡¼¥Í¥ë¤ÎºÆ¹½À®¤ò¹Ô¤Ê¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-(
-.IR packetfilter (4)
-»²¾È)¡£
-³°¤Ë½Ð¤ë¥È¥é¥Õ¥£¥Ã¥¯¤â¤·¤¯¤ÏÆþ¤Ã¤Æ¤¯¤ë¥È¥é¥Õ¥£¥Ã¥¯¤Î¤É¤Á¤é¤«¤ò´Æ»ë¤¹¤ë
-¤Ë¤Ï¡¢Ultrix ¤Î¥Ð¡¼¥¸¥ç¥ó 4.2 °Ê¹ß¤¬É¬Íפǡ¢
-.IR pfconfig (8)
-¥³¥Þ¥ó¥É¤òÍѤ¤¤Æ ``copyall'' ¥â¡¼¥É¤Ë¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-.LP
-SunOS 4.1 ¤Ç¤Ï¡¢¥Ñ¥±¥Ã¥È¥­¥ã¥×¥Á¥ã¥³¡¼¥É(¤â¤·¤¯¤Ï Streams NIT)¤Ï¸úΨÎɤ¯
-¤¢¤ê¤Þ¤»¤ó¡£¥È¥é¥Õ¥£¥Ã¥¯¤Î¿¤¤¥Í¥Ã¥È¥ï¡¼¥¯¤ò´Æ»ë¤¹¤ë¾ì
-¹ç¤Ë¤Ï¡¢¤½¤ó¤Ê¤Ë¤Ï¿¤¯¤Î¤³¤È¤ò¹Ô¤Ê¤ï¤Ê¤¤¤Ç²¼¤µ¤¤¡£
-.LP
-SunOS 3.2 °ÊÁ°¤Î¤â¤Î¤Ï¡¢NIT ¤¬Èó¾ï¤ËÉÔ°ÂÄê(buggy)¤Ç¤¹¡£¸Å¤¤¥·¥¹¥Æ¥à¤Ç
-tcpdump ¤òưºî¤µ¤»¤¿¾ì¹ç¡¢¥·¥¹¥Æ¥à¤¬¥¯¥é¥Ã¥·¥å¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
+¸å¼Ô¤òÍѤ¤¤ë¤³¤È¤ò¿ä¾©¤·¤Þ¤¹¡£
.LP
IP ¥Õ¥é¥°¥á¥ó¥È¤òºÆ¹½À®¤¹¤ë¤«¡¢¤â¤·¤¯¤Ï¾¯¤Ê¤¯¤È¤â¾å°Ì¥×¥í¥È¥³¥ë¤ÎÀµ¤·
¤¤¥Ç¡¼¥¿¥µ¥¤¥º¤ò·×»»¤¹¤ë¤è¤¦¤ËÀ߷פ·¤Ê¤ª¤¹É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
diff --git a/ja/man/man1/tcpslice.1 b/ja/man/man1/tcpslice.1
index f017a570a8..699836e09c 100644
--- a/ja/man/man1/tcpslice.1
+++ b/ja/man/man1/tcpslice.1
@@ -20,235 +20,249 @@
.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.\"
-.TH TCPSLICE 1 "14 Oct 1991"
-.SH ̾¾Î
-tcpslice \- tcpdump ¥Õ¥¡¥¤¥ë¤Îʬ³ä/·ë¹ç
-.SH ½ñ¼°
-.na
-.B tcpslice
-[
-.B \-dRrt
-] [
-.B \-w
-.I file
-]
-.br
-.ti +9
-[
-.I start-time
-[
-.I end-time
-] ]
-.I file ...
-.br
-.ad
-.SH ²òÀâ
-.LP
-.I tcpslice
+.Dd October 14, 1991
+.Dt TCPSLICE 1
+.Os
+.Sh ̾¾Î
+.Nm tcpslice
+.Nd tcpdump ¥Õ¥¡¥¤¥ë¤ÎÀÚ¤ê½Ð¤·/·ë¹ç
+.Sh ½ñ¼°
+.Nm tcpslice
+.Op Fl dRrt
+.Op Fl w Ar file
+.Op Ar start-time Op end-time
+.Ar
+.Sh ²òÀâ
+.Nm
¤Ï¡¢
-\fItcpdump(1)\fP
+.Xr tcpdump 1
¤Î
-.B \-w
+.Fl w
¥Õ¥é¥°
¤òÍѤ¤¤ÆºîÀ®¤µ¤ì¤¿¥Ñ¥±¥Ã¥È¥È¥ì¡¼¥¹¥Õ¥¡¥¤¥ë¤Î°ìÉô¤òÀÚ¤ê½Ð¤¹¥×¥í¥°¥é¥à¤Ç¤¹¡£
¤Þ¤¿¡¢°Ê²¼¤Ë¼¨¤¹¤è¤¦¤Ë¡¢Ê£¿ô¤Î¥Ñ¥±¥Ã¥È¥È¥ì¡¼¥¹¥Õ¥¡¥¤¥ë¤ò·ë¹ç¤¹¤ë»ö¤â
¤Ç¤­¤Þ¤¹¡£
-.LP
-.I tcpslice
-¤Î´ðËܵ¡Ç½¤Ï¡¢ÆþÎϤȤʤë¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤ë¥Ñ¥±¥Ã¥È¤Î»þ¹ï¤¬Í¿¤¨¤é¤ì¤¿ÈϰϤË
-¤¢¤ë¤â¤Î¤ò
-.I stdout
-¤Ë¥³¥Ô¡¼¤¹¤ë»ö¤Ç¤¹¡£
+.Pp
+.Nm
+¤Î´ðËܵ¡Ç½¤Ï¡¢ÆþÎÏ¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤ë¥Ñ¥±¥Ã¥È¤Î¤¦¤Á¡¢»ØÄꤵ¤ì¤¿»þ´ÖÆâ¤Î
+¤â¤Î¤ò
+.Pa stdout
+¤Ë½ÐÎϤ¹¤ë»ö¤Ç¤¹¡£
³«»Ï»þ¹ï¤ª¤è¤Ó½ªÎ»»þ¹ï¤ÎÈϰϤϡ¢¥³¥Þ¥ó¥É¹Ô¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£ÈϰϤϻØÄꤷ¤¿
-»þ¹ï¼«¿È¤ò´Þ¤ß¤Þ¤¹¡£³«»Ï»þ¹ï¤Î¥Ç¥Õ¥©¥ë¥È¤ÏºÇ½é¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤Î
-¥Ñ¥±¥Ã¥È¤Î»þ¹ï¤Ç¡¢¤³¤ì¤ò
-.I first time
-¤È¸Æ¤Ó¤Þ¤¹¡£½ªÎ»»þ¹ï¤Î¥Ç¥Õ¥©¥ë¥È¤Ï³«»Ï»þ¹ï¤Î 10 ǯ¸å¤Ç¤¹¡£
+»þ¹ï¼«¿È¤ò´Þ¤ß¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢³«»Ï»þ¹ï¤ÏºÇ½é¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤Î°ì¤ÄÌܤÎ
+¥Ñ¥±¥Ã¥È¤Î»þ¹ï¤Ç¤¹¡£¤³¤Î»þ¹ï¤ò
+.Em first time
+¤È¸Æ¤Ó¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢½ªÎ»»þ¹ï¤Ï³«»Ï»þ¹ï¤Î 10 ǯ¸å¤Ç¤¹¡£
¤·¤¿¤¬¤Ã¤Æ¡¢
-.I tcpslice trace-file
+.Nm
+.Ar trace-file
¤È¤¤¤¦¥³¥Þ¥ó¥É¤Ïñ¤Ë
-.I trace-file
-¤ò \fIstdout\fP ¤Ë¥³¥Ô¡¼¤·¤Þ¤¹(¥Õ¥¡¥¤¥ë¤Ë¤Ï 10 ǯʬ¤Î¥Ç¡¼¥¿¤¬¤Ê¤¤»ö¤ò
+.Ar trace-file
+¤ò
+.Pa stdout
+¤Ë½ÐÎϤ·¤Þ¤¹(¥Õ¥¡¥¤¥ë¤Ë¤Ï 10 ǯʬ¤Î¥Ç¡¼¥¿¤¬¤Ê¤¤»ö¤ò
ÁÛÄꤷ¤Æ¤¤¤Þ¤¹)¡£
-.LP
+.Pp
»þ¹ï¤Î»ØÄê¤Ë¤Ï¤¤¤¯¤Ä¤«¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£¤Ò¤È¤Ä¤Ï
-.I sssssssss.uuuuuu
-¤Î·Á¼°¤Î Unix »þ¹ï·Á¼°¤òÍѤ¤¤ëÊýË¡¤Ç¤¹
-(¤³¤ì¤Ï¡¢\fItcpdump\fP ¤Î
-.B \-tt
+.Em sssssssss.uuuuuu
+¤Î·Á¤ò¤È¤ë Unix »þ¹ï·Á¼°¤òÍѤ¤¤ëÊýË¡¤Ç¤¹
+(¤³¤ì¤Ï¡¢
+.Xr tcpdump 1
+¤Î
+.Fl tt
¥Õ¥é¥°¤Ç»ØÄꤵ¤ì¤ë·Á¼°¤Ç¤¹)¡£
Î㤨¤Ð¡¢
-.B 654321098.7654
+.Em 654321098.7654
¤Ï¡¢1990 ǯ 9 ·î 25 Æü¡¢¸á¸å 8 »þ 51 ʬ (PDT) ¤«¤é¡¢
38 ÉÃ¤È 765,400 ¥Þ¥¤¥¯¥íÉøå¤Î»þ¹ï¤ò¼¨¤·¤Þ¤¹¡£
-.LP
+.Pp
¤³¤Î¥Þ¥Ë¥å¥¢¥ë¤ÎÎã¤ÏÁ´¤Æ PDT ¤Î»þ¹ï¤Ç¼¨¤·¤Þ¤¹¤¬¡¢
°Ê²¼¤Ç¼¨¤¹¤è¤¦¤Ë»þ¹ï¤òɽ¼¨¤·¤¿¤ê²ò¼á¤·¤¿¤ê¤¹¤ë¾ì¹ç¡¢
-.I tcpslice
-¤Ï¡¢\fItcpdump\fP ¤Î¥Õ¥¡¥¤¥ë¤¬¤É¤Î¥¿¥¤¥à¥¾¡¼¥ó¤ÇÀ¸À®¤µ¤ì¤¿¤«¤Ë´Ø¤ï¤é¤º¡¢
+.Nm
+¤Ï¡¢
+.Xr tcpdump 1
+¤Î¥Õ¥¡¥¤¥ë¤¬¤É¤Î¥¿¥¤¥à¥¾¡¼¥ó¤ÇÀ¸À®¤µ¤ì¤¿¤«¤Ë´Ø¤ï¤é¤º¡¢
¥í¡¼¥«¥ë¤Î¥¿¥¤¥à¥¾¡¼¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£
²Æ»þ´Ö¤ÎÀßÄê¤Ï¡¢ÂоݤȤʤëÆü¤Î¥í¡¼¥«¥ë¤Î¥¿¥¤¥à¥¾¡¼¥ó¤ÇŬÀÚ¤Êʪ¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£
-Î㤨¤Ð¡¢²Æµ¨¤Î´ü´Ö¤Î»þ¹ï¤Ï¡¢²Æ»þ´Ö¤Î±Æ¶Á¤òÈ¿±Ç¤·¡¢Åßµ¨¤Î´ü´Ö¤Î»þ¹ï¤Ï
+Î㤨¤Ð¡¢²Æµ¨¤Î»þ¹ï¤Ë¤Ï¡¢²Æ»þ´Ö¤Î±Æ¶Á¤òÈ¿±Ç¤·¡¢Åßµ¨¤Î»þ¹ï¤Ë¤Ï
±Æ¶Á¤·¤Þ¤»¤ó¡£
-.LP
+.Pp
»þ¹ï¤Ï
-Éÿô¤ÎÁ°¤Ë `+' ¤òÉÕ¤±¤Æ»ØÄꤹ¤ë»ö¤Ë¤è¤ê¡¢
-.I first time
-(³«»Ï»þ¹ï¤ò»ØÄꤹ¤ë¾ì¹ç)
-¤ä³«»Ï»þ¹ï(½ªÎ»»þ¹ï¤ò»ØÄꤹ¤ë¾ì¹ç)
-¤«¤é¤ÎÁêÂÐŪ¤Ê»þ¹ï¤È¤·¤Æ»ØÄꤹ¤ë»ö¤â¤Ç¤­¤Þ¤¹¡£
+.Em first time
+¤«¤é(³«»Ï»þ¹ï¤ò»ØÄꤹ¤ë¾ì¹ç)¡¢
+¤¢¤ë¤¤¤Ï³«»Ï»þ¹ï¤«¤é(½ªÎ»»þ¹ï¤ò»ØÄꤹ¤ë¾ì¹ç)
+¤ÎÁêÂÐŪ¤Ê»þ¹ï¤È¤·¤Æ»ØÄꤹ¤ë»ö¤â¤Ç¤­¤Þ¤¹¡£
+»ØÄꤹ¤ë¤Ë¤ÏÉÿô¤ÎÁ°¤Ë `+' ¤òÉÕ¤±¤Þ¤¹¡£
Î㤨¤Ð¡¢
-.B +200
-¤Ï
-.I first time
-¤«¤é 200 Éøå¤ò¼¨¤·¡¢¤Õ¤¿¤Ä¤Î°ú¿ô
-.B +200 +300
+.Em +200
+¤Ï³«»Ï»þ¹ï¤¬
+.Em first time
+¤«¤é 200 Éøå¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¡¢¤Õ¤¿¤Ä¤Î°ú¿ô
+.Em +200 +300
¤Ï
-.I first time
+.Em first time
¤«¤é 200 Éø夫¤é¡¢
-.I first time
-¤«¤é 500 Éøå¤Þ¤Ç¤ò¼¨¤·¤Þ¤¹¡£
-.LP
+.Em first time
+¤«¤é 500 Éøå¤Þ¤Ç¤ÎÈϰϤò¼¨¤·¤Þ¤¹¡£
+.Pp
»þ¹ï¤Ï¡¢Ç¯ (y)¡¢·î (m)¡¢Æü (d)¡¢»þ (h)¡¢Ê¬ (m)¡¢Éà (s)¡¢¥Þ¥¤¥¯¥íÉà (u) ¤Ç
-»ØÄꤹ¤ë»ö¤â¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð¡¢¾åµ­¤Ç¼¨¤·¤¿ Unix »þ¹ï 654321098.7654 ¤Ï¡¢
-.B 90y9m25d20h51m38s765400u
+»ØÄꤹ¤ë»ö¤â¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð¡¢¾åµ­¤Î Unix »þ¹ï 654321098.7654 ¤Ï¡¢
+.Em 90y9m25d20h51m38s765400u
¤È»ØÄꤹ¤ë»ö¤â¤Ç¤­¤Þ¤¹¡£
-.LP
-¤³¤Î·Á¼°¤Ç»þ¹ï¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¾Êά¤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤Î¥Ç¥Õ¥©¥ë¥È¤Ï°Ê²¼¤ÎÍͤË
-¤Ê¤ê¤Þ¤¹¡£¾Êά¤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤¬ºÇ½é¤Ë»ØÄꤵ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤è¤ê
-.I Â礭¤¤
-ñ°Ì¤Ê¤é¤Ð¡¢¤½¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤϡ¢
-.I first time
+.Pp
+¤³¤Î·Á¼°¤Ç»þ¹ï¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¾Êά¤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤϰʲ¼
+¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ºÇ½é¤Ë»ØÄꤵ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤è¤ê
+.Em Â礭¤¤
+ñ°Ì¤Î¾Êά¤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤Ë¤Ä¤¤¤Æ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤϡ¢
+.Em first time
(³«»Ï»þ¹ï¤ò»ØÄꤹ¤ë¾ì¹ç) ¤Þ¤¿¤Ï³«»Ï»þ¹ï(½ªÎ»»þ¹ï¤ò»ØÄꤹ¤ë¾ì¹ç)¤ÈƱ¤¸
ÃͤȤʤê¤Þ¤¹¡£
-¾Êά¤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤¬ºÇ½é¤Ë»ØÄꤵ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤è¤ê
-.I ¾®¤µ¤¤
-ñ°Ì¤Ê¤é¤Ð¡¢¤½¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤϥ¼¥í¤È¤Ê¤ê¤Þ¤¹¡£
+ºÇ½é¤Ë»ØÄꤵ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤è¤ê
+.Em ¾®¤µ¤¤
+ñ°Ì¤Î¾Êά¤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤Ë¤Ä¤¤¤Æ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤϥ¼¥í¤È¤Ê¤ê¤Þ¤¹¡£
Î㤨¤Ð¡¢ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î
-.I first time
-¤Î Unix »þ¹ï¤¬¾åµ­¤ÎÃÍ¡¢¤¹¤Ê¤ï¤Á¡¢1990 ǯ 9 ·î 25 Æü¡¢¸á¸å 8 »þ 51 ʬ (PDT)
+.Em first time
+¤¬ Unix »þ¹ï¤Ç¾åµ­¤ÎÃÍ¡¢¤¹¤Ê¤ï¤Á¡¢1990 ǯ 9 ·î 25 Æü¡¢¸á¸å 8 »þ 51 ʬ (PDT)
¤«¤é 38 ÉÃ¤È 765,400 ¥Þ¥¤¥¯¥íÉøå¤È¤·¤Þ¤·¤ç¤¦¡£¤³¤Î»þ¡¢Æ±¤¸Æü¤Î ¸á¸å 9 »þ
36 ʬ (PDT) ¤Á¤ç¤¦¤É¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢
-.B 21h36m
+.Em 21h36m
¤Èɽ¤¹»ö¤¬¤Ç¤­¤Þ¤¹¡£
¸á¸å 9 »þ 36 ʬ (PDT) ¤«¤éÍâÆü¤Î¸áÁ° 1 »þ 54 ʬ (PDT) ¤Þ¤Ç¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢
-.B 21h36m 26d1h54m
+.Em 21h36m 26d1h54m
¤Èɽ¤¹»ö¤¬¤Ç¤­¤Þ¤¹¡£
-.LP
-.I ymdhmsu
-·Á¼°¤ò»ÈÍѤ¹¤ë»þ¤Ë¤âÁêÂлþ¹ï¤ò»ØÄꤹ¤ë»ö¤¬¤Ç¤­¤Þ¤¹¡£
-¤³¤Î»þ¡¢¾Êά¤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤¬»ØÄꤵ¤ì¤¿ºÇ½é¤Î¥Õ¥£¡¼¥ë¥É¤è¤ê
-.I Â礭¤¤
+.Pp
+.Em ymdhmsu
+·Á¼°¤ò»ÈÍѤ¹¤ë»þ¤Ë¤âÁêÂлþ¹ï¤Ç»ØÄꤹ¤ë»ö¤¬¤Ç¤­¤Þ¤¹¡£
+¤³¤Î»þ¡¢¾Êά¤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤Îñ°Ì¤¬»ØÄꤵ¤ì¤¿ºÇ½é¤Î¥Õ¥£¡¼¥ë¥É¤è¤ê
+.Em Â礭¤¤
ñ°Ì¤Ê¤é¤Ð¡¢¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï 0 ¤È¤Ê¤ê¡¢
-¾Êά¤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤¬»ØÄꤵ¤ì¤¿ºÇ½é¤Î¥Õ¥£¡¼¥ë¥É¤è¤ê
-.I ¾®¤µ¤¤
+¾Êά¤µ¤ì¤¿¥Õ¥£¡¼¥ë¥É¤Îñ°Ì¤¬»ØÄꤵ¤ì¤¿ºÇ½é¤Î¥Õ¥£¡¼¥ë¥É¤è¤ê
+.Em ¾®¤µ¤¤
ñ°Ì¤Ê¤é¤Ð¡¢¥Ç¥Õ¥©¥ë¥ÈÃͤÏ
-.I first time
+.Em first time
¤¢¤ë¤¤¤Ï³«»Ï»þ¹ï¤ÈƱ¤¸ÃͤȤʤê¤Þ¤¹¡£
-.I first time
-¤¬¾åµ­¤Ç¼¨¤·¤¿ Unix »þ¹ï¤À¤Ã¤¿¾ì¹ç¡¢
-.B 22h +1h10m
+.Em first time
+¤¬¾åµ­¤Î Unix »þ¹ï¤À¤Ã¤¿¾ì¹ç¡¢
+.Em 22h +1h10m
¤Ï¤½¤ÎÆü¤Î¸á¸å 10 »þ 00 ʬ (PDT) ¤«¤é ¸á¸å 11 »þ 10 ʬ (PDT) ¤Þ¤Ç¤ò¼¨¤·¡¢
-.B +1h +1h10m
+.Em +1h +1h10m
¤Ï¸á¸å 9 »þ 51 ʬ (PDT) ¤Î 38.7654 Éø夫¤é ¸á¸å 11 »þ 01 ʬ (PDT) ¤Î
38.7654 Éøå¤Þ¤Ç¤ò¼¨¤·¤Þ¤¹¡£
-.B +0 +1h
+.Em +0 +1h
¤È»ØÄꤹ¤ì¤Ð¡¢¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤«¤é 1 »þ´Öʬ¤Î¥Ç¡¼¥¿¤ò¼è¤ê½Ð¤¹»ö¤¬¤Ç¤­¤Þ¤¹¡£
-.LP
-.I ymdhmsu
+.Pp
+.Em ymdhmsu
·Á¼°¤òÍѤ¤¤ë¾ì¹ç¡¢
-.I m
+.Em m
¤¬¡¢`·î' ¤ò¼¨¤¹¤Î¤« `ʬ' ¤ò¼¨¤¹¤Î¤«¤¬Û£Ëæ¤Ë¤Ê¤ê¤Þ¤¹¡£
-¤³¤ÎÛ£Ëæ¤µ¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë·èÄꤵ¤ì¤Þ¤¹¡£¤â¤·¡¢
-.I m
+¤¤¤º¤ì¤Ë¤Ê¤ë¤«¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë·èÄꤵ¤ì¤Þ¤¹¡£
+.Em m
¥Õ¥£¡¼¥ë¥É¤Î¸å¤Ë
-.I d
-¥Õ¥£¡¼¥ë¥É¤¬Í褿¾ì¹ç¡¢¤½¤ì¤Ï·î¤Ç¤¢¤ë¤ÈȽÃǤµ¤ì¡¢¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢
-ʬ¤Ç¤¢¤ë¤ÈȽÃǤµ¤ì¤Þ¤¹¡£
-.LP
+.Em d
+¥Õ¥£¡¼¥ë¥É¤¬Í褿¾ì¹ç¡¢·î¤¬»ØÄꤵ¤ì¤¿¤ÈȽÃǤ·¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢
+ʬ¤¬»ØÄꤵ¤ì¤¿È½ÃǤ·¤Þ¤¹¡£
+.Pp
Ê£¿ô¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢
-.I tcpslice
-¤Ï¤Þ¤º¡¢ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤ÎÍ¿¤¨¤é¤ì¤¿»þ¹ï¤ÎÈϰϤˤ¢¤ë¥Ñ¥±¥Ã¥È¤ò¥³¥Ô¡¼¤·¤Þ¤¹¡£
+.Nm
+¤Ï¤Þ¤º¡¢ºÇ½é¤Î¥Õ¥¡¥¤¥ëÆâ¤Î»ØÄꤵ¤ì¤¿»þ¹ï¤ÎÈϰϤˤ¢¤ë¥Ñ¥±¥Ã¥È¤ò½ÐÎϤ·¤Þ¤¹¡£
¼¡¤Ë¡¢ÈϰϤγ«»Ï»þ¹ï¤òºÇ½é¤Î¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Î¥Ñ¥±¥Ã¥È¤Î»þ¹ï¤Îľ¸å¤ËÊѹ¹¤·¡¢
-¼¡¤Î¥Õ¥¡¥¤¥ë¤ò½èÍý¤·¡¢°Ê¹ß¤³¤ì¤ò·«¤êÊÖ¤·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢»þ´ÖŪ¤Ë
-ʬ»¶¤·¤¿¥Ñ¥±¥Ã¥È¤ò´Þ¤à¤è¤¦¤ÊÊ£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò¤Þ¤È¤á¤ë»ö¤Ï
-.I ¤Ç¤­¤Þ¤»¤ó¡£
+¼¡¤Î¥Õ¥¡¥¤¥ë¤ò½èÍý¤·¡¢°Ê¹ß¤³¤ì¤ò·«¤êÊÖ¤·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢»þ´Ö½ç¤Ë
+¤Ê¤é¤ó¤Ç¤¤¤Ê¤¤¥Ñ¥±¥Ã¥È¤ò´Þ¤àÊ£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò¤Þ¤È¤á¤ë»ö¤Ï
+.Em ¤Ç¤­¤Þ¤»¤ó¡£
Í¿¤¨¤é¤ì¤¿¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¡¢Àè¤Ë½èÍý¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤è¤ê¿·¤·¤¤¥Ñ¥±¥Ã¥È¤ËÂФ·¤Æ
¤Î¤ß½èÍý¤µ¤ì¤Þ¤¹¡£¤³¤Îµ¡¹½¤Ë¤è¤ê¤Ò¤È¤Ä¤Î¥Ñ¥±¥Ã¥È¤¬Ê£¿ô²ó½ÐÎϤ˸½¤ì¤ë
»ö¤òËɤ°»ö¤¬¤Ç¤­¤Þ¤¹¡£
-.SH ¥ª¥×¥·¥ç¥ó
-.LP
-.B \-R,
-.B \-r,
-.B \-t
+.Sh ¥ª¥×¥·¥ç¥ó
+.Pp
+.Fl R ,
+.Fl r ,
+.Fl t
¤Î¤¤¤º¤ì¤«¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢
-.I tcpslice
+.Nm
¤Ï¡¢³ÆÆþÎÏ¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤ª¤è¤ÓºÇ¸å¤Î¥Ñ¥±¥Ã¥È¤Î»þ¹ï¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£
-¤³¤ì¤é¤Î 3 ¸Ä¤Î¥ª¥×¥·¥ç¥ó¤Î¤¦¤Á¡¢¤Ò¤È¤Ä¤À¤±¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.TP
-.B \-d
-»ØÄꤵ¤ì¤¿ÈϰϤγ«»Ï»þ¹ï¤È½ªÎ»»þ¹ï¤ò¥À¥ó¥×¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£
+¤³¤ì¤é¤Î 3 ¸Ä¤Î¥ª¥×¥·¥ç¥ó¤Î¤¦¤Á¡¢1 ¤Ä¤À¤±¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.Pp
+°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄê¤Ç¤­¤Þ¤¹:
+.Bl -tag -width indent
+.It Fl d
+»ØÄꤵ¤ì¤¿ÈϰϤγ«»Ï»þ¹ï¤È½ªÎ»»þ¹ï¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹¡£
¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢»ØÄꤷ¤¿ÈϰϤ¬ÁÛÄꤷ¤Æ¤¤¤ë»þ´Ö¤ÈËÜÅö¤Ë°ìÃפ·¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò
³Îǧ¤¹¤ë¤Î¤ËÍ­¸ú¤Ç¤¹¡£
-.B \-R,
-.B \-r,
-.B \-t
-¤Î¤¤¤º¤ì¤«¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢¤½¤ì¤é¤ËÁêÅö¤¹¤ë·Á¼°¤Ç»þ¹ï¤ò¥À¥ó¥×¤·¤Þ¤¹¡£
-»ØÄ꤬¤Ê¤¤¾ì¹ç¤Ï¡¢²Ã¹©¤·¤Ê¤¤·Á¼° (\fB \-R\fP) ¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
-.TP
-.B \-R
-³ÆÆþÎÏ¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤ª¤è¤ÓºÇ¸å¤Î¥Ñ¥±¥Ã¥È¤Î»þ¹ï¤ò²Ã¹©¤·¤Ê¤¤·Á¼°
-(¤Ä¤Þ¤ê¡¢\fI sssssssss.uuuuuu\fP ¤Î·Á¼°) ¤Ç¥À¥ó¥×¤·¤Þ¤¹¡£
-.TP
-.B \-r
-.B \-R
-¤ÈƱ¤¸¤Ç¤¹¤¬¡¢\fI date(1)\fP ¤Ç»ÈÍѤµ¤ì¤ëʪ¤ÈƱÍͤΡ¢ÆÉ¤ß¤ä¤¹¤¤·Á¼°¤Ç
-»þ¹ï¤ò¥À¥ó¥×¤·¤Þ¤¹¡£
-.TP
-.B \-t
-.B \-R
+.Fl R ,
+.Fl r ,
+.Fl t
+¤Î¤¤¤º¤ì¤«¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢¤½¤ì¤é¤ËÁêÅö¤¹¤ë·Á¼°¤Ç»þ¹ï¤òɽ¼¨¤·¤Þ¤¹¡£
+»ØÄ꤬¤Ê¤¤¾ì¹ç¤Ï¡¢ÆâÉô·Á¼° (
+.Fl R )
+¤È¤Ê¤ê¤Þ¤¹¡£
+.It Fl R
+³ÆÆþÎÏ¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤ª¤è¤ÓºÇ¸å¤Î¥Ñ¥±¥Ã¥È¤Î»þ¹ï¤òÆâÉô·Á¼°
+(¤Ä¤Þ¤ê¡¢
+.Em sssssssss.uuuuuu
+¤Î·Á¼°) ¤Çɽ¼¨¤·¤Þ¤¹¡£
+.It Fl r
+.Fl R
+¤ÈƱ¤¸¤Ç¤¹¤¬¡¢
+.Xr date 1
+¤ÈƱÍͤΡ¢ÆÉ¤ß¤ä¤¹¤¤·Á¼°¤Ç»þ¹ï¤òɽ¼¨¤·¤Þ¤¹¡£
+.It Fl t
+.Fl R
¤ÈƱ¤¸¤Ç¤¹¤¬¡¢»þ¹ï¤ò
-.I tcpslice
+.Nm
·Á¼°¡¢¤¹¤Ê¤ï¤Á¡¢¾åµ­¤Ë¼¨¤·¤¿
-.I ymdhmsu
-¤Î·Á¤Ç¥À¥ó¥×¤·¤Þ¤¹¡£
-.TP
-.B \-w
-·ë²Ì¤ò \fIstdout\fP ¤Ç¤Ï¤Ê¤¯¡¢\fIfile\fR ¤Ë½ÐÎϤ·¤Þ¤¹¡£
-.SH ´ØÏ¢¹àÌÜ
-tcpdump(1)
-.SH ºî¼Ô
-Vern Paxson (vern@ee.lbl.gov), of
-Lawrence Berkeley Laboratory, University of California, Berkeley, CA.
-.SH ¥Ð¥°
+.Em ymdhmsu
+¤Î·Á¤Çɽ¼¨¤·¤Þ¤¹¡£
+.It Fl w Ar file
+½ÐÎϤò
+.Pa stdout
+¤Ç¤Ï¤Ê¤¯¡¢
+.Ar file
+¤È¤·¤Þ¤¹¡£
+.El
+.Sh ´ØÏ¢¹àÌÜ
+.Xr tcpdump 1
+.Sh ºî¼Ô
+.An Vern Paxson Aq vern@ee.lbl.gov ,
+of Lawrence Berkeley Laboratory, University of California, Berkeley, CA.
+.Sh ¥Ð¥°
¿ô»ú¤ä `+' ¤Ç»Ï¤Þ¤ë¥Õ¥¡¥¤¥ë̾¤òÆþÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ØÄꤹ¤ë¤È¡¢
-³«»Ï/½ªÎ»»þ¹ï¤È¶èÊ̤Ǥ­¤Þ¤»¤ó¡£¤³¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë̾¤Ï¡¢¤¿¤È¤¨¤Ð¡¢
-`04Jul76.trace' ¤È¤¤¤¦¥Õ¥¡¥¤¥ë̾¤Ê¤é¤Ð `./04Jul76.trace' ¤Î¤è¤¦¤Ë¡¢
-ÀèÆ¬¤Ë `./' ¤ò¤Ä¤±¤Æ»ØÄꤷ¤Æ²¼¤µ¤¤¡£
-.LP
-.I tcpslice
+³«»Ï/½ªÎ»»þ¹ï¤È´Ö°ã¤¦¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë̾¤Ï¡¢
+ÀèÆ¬¤Ë `./' ¤ò¤Ä¤±¤Æ»ØÄꤷ¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
+`04Jul76.trace' ¤È¤¤¤¦¥Õ¥¡¥¤¥ë̾¤Ê¤é¤Ð `./04Jul76.trace' ¤È¤·¤Þ¤¹¡£
+.Pp
+.Nm
¤Ï¡¢ÆþÎÏ¥Õ¥¡¥¤¥ë¤ò¤¯¤Þ¤Ê¤¯Ãµ¤¹¤¿¤á¤Ë¥é¥ó¥À¥à¥¢¥¯¥»¥¹¤ò»ÈÍѤ¹¤ë¤¿¤á¡¢
-\fIstdin\fP ¤«¤éÆþÎϤòÆÉ¤ß¹þ¤à¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-.LP
-.I tcpslice
-¤Ï¡¢½ÐÎϤò (\fIisatty(3)\fP ¤Ç¼¨¤µ¤ì¤ë) üËö¤Ø½ÐÎϤ·¤è¤¦¤È¤·¤Þ¤»¤ó¡£
-¤³¤ì¤Ï¥Ð¥°¤Ç¤Ï¤Ê¤¯»ÅÍͤǡ¢¥æ¡¼¥¶¤ÎüËö¤Ë¥Ð¥¤¥Ê¥ê¥Ç¡¼¥¿¤ò¤Þ¤­»¶¤é¤¹¤³¤È¤ò
-Ëɤ®¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢\fIstdout\fP ¤ò¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¤«¡¢\fB\-w\fP ¤Ë¤è¤ê
-½ÐÎÏ¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-.LP
-.I tcpslice
-¤Ï¡¢1 ǯ°Ê¾å¤Ë¤ï¤¿¤ë \fItcpdump\fP ¤Î¥Õ¥¡¥¤¥ë¤ä¡¢
+.Pa stdin
+¤«¤éÆþÎϤ¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
+.Pp
+.Nm
+¤Ï¡¢½ÐÎÏÀ褬üËö (
+.Xr isatty 3
+¤Ç¼¨¤µ¤ì¤ë) ¤Ç¤¢¤ë¾ì¹ç¡¢½ÐÎϤ·¤Þ¤»¤ó¡£
+¤³¤ì¤Ï¥Ð¥°¤Ç¤Ï¤Ê¤¯¡¢¥æ¡¼¥¶¤ÎüËö¤Ë¥Ð¥¤¥Ê¥ê¥Ç¡¼¥¿¤ò¤Þ¤­»¶¤é¤¹¤³¤È¤ò
+Ëɤ°¤¿¤á¤Î»ÅÍͤǤ¹¡£¤Ä¤Þ¤ê¡¢
+.Pa stdout
+¤ò¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¤«¡¢
+.Fl w
+¤Ë¤è¤ê½ÐÎÏ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
+.Pp
+.Nm
+¤Ï¡¢1 ǯ°Ê¾å¤Ë¤ï¤¿¤ë
+.Xr tcpdump 1
+¤Î¥Õ¥¡¥¤¥ë¤ä¡¢
¤â¤È¤â¤È¤Î¥Ñ¥±¥Ã¥È¤ÎŤµ¤¬ 65,535 ¥Ð¥¤¥È¤òͤ¨¤ë¤è¤¦¤Ê¥Ñ¥±¥Ã¥È¤Î°ìÉô¤ò
-´Þ¤à¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¡¢3 ¥Ñ¥±¥Ã¥È¤è¤ê¾¯¤Ê¤¤¥Ñ¥±¥Ã¥È¤·¤«¤Ê¤¤¥Õ¥¡¥¤¥ë
+´Þ¤à¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¡¢3 ¥Ñ¥±¥Ã¥È̤Ëþ¤Î¥Ñ¥±¥Ã¥È¤·¤«´Þ¤Þ¤ì¤Ê¤¤¥Õ¥¡¥¤¥ë
¤ËÂФ·¤Æ¤ÏÀµ¤·¤¯Æ¯¤«¤Ê¤¤¤Ç¤·¤ç¤¦¡£
¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò½èÍý¤·¤è¤¦¤È¤¹¤ë¤È¡¢
`couldn't find final packet in file' ¤È¤¤¤¦¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
¤³¤ì¤é¤ÎÌäÂê¤Ï¡¢Â礭¤Ê¥È¥ì¡¼¥¹¥Õ¥¡¥¤¥ë¤ò°·¤¦¾ì¹ç¤Ë¡¢
-.I tcpslice
-¤¬½èÍý®ÅÙ¤òÂ礭¤¯²þÁ±¤¹¤ë¤¿¤á¤Ë»ÈÍѤ·¤Æ¤¤¤ëÊä´Öµ¡Ç½¤Ëµ¯°ø¤·¤Þ¤¹¡£
+.Nm
+¤¬½èÍý®ÅÙ¤òÂ礭¤¯²þÁ±¤¹¤ë¤¿¤á¤Ë»ÈÍѤ·¤Æ¤¤¤ëµ¡¹½¤Ëµ¯°ø¤·¤Þ¤¹¡£
°ìÊý¡¢
-.I tcpslice
+.Nm
¤Ï¡¢Ç¡²¿¤Ê¤ë¥µ¥¤¥º¤Î¥È¥ì¡¼¥¹¥Õ¥¡¥¤¥ë¤Ç¤âÃæ±û¤Î¥¹¥é¥¤¥¹¤ò¸úΨŪ¤Ë¼è¤ê½Ð¤¹
-¤³¤È¤¬¤Ç¤­¡¢Ê¬ÃǤµ¤ì¤¿¥È¥ì¡¼¥¹¥Õ¥¡¥¤¥ë (¥Õ¥¡¥¤¥ë¤ÎÃæ¤ÎºÇ¸å¤Î¥Ñ¥±¥Ã¥È¤¬
-°ìÉô¤·¤«Â¸ºß¤·¤Ê¤¤Íͤʥե¡¥¤¥ë¡¢\fItcpdump\fP ¤¬¶¯À©Åª¤Ë½ªÎ»¤µ¤»¤é¤ì¤¿
-¾ì¹ç¤Ë¤Ç¤­¤ë¾ì¹ç¤¬¤¢¤ë) ¤ËÂФ·¤Æ¤âÀµ¤·¤¯Æ°ºî¤·¤Þ¤¹¡£
+¤³¤È¤¬¤Ç¤­¡¢ÉÔ´°Á´¤Ê¥È¥ì¡¼¥¹¥Õ¥¡¥¤¥ë (Î㤨¤Ð¡¢¥Õ¥¡¥¤¥ëÃæ¤ÎºÇ¸å¤Î¥Ñ¥±¥Ã¥È¤¬
+ÅÓÃæ¤ÇÀÚ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¡¢
+.Xr tcpdump 1
+¤¬¶¯À©Åª¤Ë½ªÎ»¤µ¤»¤é¤ì¤¿
+¾ì¹ç¤Ë¤è¤¯¤Ç¤­¤ë) ¤ËÂФ·¤Æ¤âÀµ¤·¤¯Æ°ºî¤·¤Þ¤¹¡£
diff --git a/ja/man/man1/telnet.1 b/ja/man/man1/telnet.1
index 65c01cf8b2..ae7b13bf84 100644
--- a/ja/man/man1/telnet.1
+++ b/ja/man/man1/telnet.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)telnet.1 8.5 (Berkeley) 3/1/94
-.\" %Id: telnet.1,v 1.3.2.4 1998/03/08 13:48:34 jkh Exp %
+.\" %Id: telnet.1,v 1.9 1997/12/27 18:58:27 steve Exp %
.\" jpman %Id: telnet.1,v 1.2 1997/05/23 00:55:09 mutoh Stab %
.\"
.Dd March 1, 1994
diff --git a/ja/man/man1/test.1 b/ja/man/man1/test.1
index 8fd8cfbc98..6968448942 100644
--- a/ja/man/man1/test.1
+++ b/ja/man/man1/test.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)test.1 8.1 (Berkeley) 5/31/93
-.\" %Id: test.1,v 1.2.8.2 1998/07/16 09:35:53 jkh Exp %
+.\" %Id: test.1,v 1.6 1998/05/18 06:51:56 charnier Exp %
.\" jpman %Id: test.1,v 1.2 1997/03/31 03:43:49 ryo2 Stab %
.\"
.Dd May 31, 1993
diff --git a/ja/man/man1/time.1 b/ja/man/man1/time.1
index c11bcac695..a4b4023ccc 100644
--- a/ja/man/man1/time.1
+++ b/ja/man/man1/time.1
@@ -40,7 +40,8 @@
.Nd ¥³¥Þ¥ó¥É¤Î¼Â¹Ô»þ´Ö¤Î·×¬
.Sh ½ñ¼°
.Nm
-.Op Fl l
+.Op Fl al
+.Op Fl o Ar file
.Ar command
.Sh ²òÀâ
.Nm
@@ -59,10 +60,23 @@
.Pp
»ÈÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó:
.Bl -tag -width Ds
+.It Fl a
+.Fl o
+¤¬»ÈÍѤµ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¾å½ñ¤­¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤ËÄɲä·¤Þ¤¹¡£
+.Fl o
+¤¬»ÈÍѤµ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¸ú²Ì¤¢¤ê¤Þ¤»¤ó¡£
.It Fl l
¥Ç¥Õ¥©¥ë¥È¤Î½ÐÎϤ˲䨡¢
.Em rusage
¹½Â¤ÂÎ¤ÎÆâÍÆ¤òɽ¼¨¤·¤Þ¤¹¡£
+.It Fl o Ar file
+½ÐÎϤòɸ½à¥¨¥é¡¼½ÐÎϤǤϤʤ¯
+.Ar file
+¤ËÂФ·¤Æ¹Ô¤¤¤Þ¤¹¡£
+.Ar file
+¤¬Â¸ºß¤·¡¢
+.Fl a
+¥Õ¥é¥°¤¬»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¥Õ¥¡¥¤¥ë¤Ï¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£
.El
.Pp
.Xr csh 1
@@ -77,10 +91,6 @@
¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ï
.Pa /usr/bin/time
¤È¥¿¥¤¥×¤·¤Æ²¼¤µ¤¤¡£
-.Sh ¥Ð¥°
-¥Þ¥¤¥¯¥í¥×¥í¥»¥Ã¥µ¤Ç°·¤¨¤ë»þ´Ö¤ÎÀºÅÙ¤ÏÄ㤯¡¢
-¤Þ¤¿¡¢É½¼¨¤µ¤ì¤ë»þ´Ö¤Ë¤Ï¡¢¼Â¹Ô»þ´Ö¤ÎÊó¹ð¼«ÂΤËÍפ¹¤ë»þ´Ö¤â´Þ¤Þ¤ì¤Þ¤¹¡£
-¤³¤Î¸íº¹¤Ï¡¢ÉÃñ°Ì¤Ë¤·¤Æ¤ÏÂ礭¤¹¤®¤Þ¤¹¡£
.Sh ´ØÏ¢¹àÌÜ
.Xr csh 1 ,
.Xr getrusage 2 ,
diff --git a/ja/man/man1/top.1 b/ja/man/man1/top.1
index 2010490cf4..1614f82dba 100644
--- a/ja/man/man1/top.1
+++ b/ja/man/man1/top.1
@@ -248,6 +248,7 @@ uid Ãͤò¥æ¡¼¥¶Ì¾¤ËÊÑ´¹¤¹¤ë»þ´Ö¤ò³ä¤«¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£
(¤Þ¤¿¤Ï
.BR I )
¥¢¥¤¥É¥ë¥×¥í¥»¥¹¤Îɽ¼¨Í­Ìµ¤òÀÚ¤êÂØ¤¨¤Þ¤¹¡£
+.TP
.B t
.I top
¤Îɽ¼¨Í­Ìµ¤òÀÚ¤êÂØ¤¨¤Þ¤¹¡£
diff --git a/ja/man/man1/tput.1 b/ja/man/man1/tput.1
index 22dfe3daf1..9e07317df2 100644
--- a/ja/man/man1/tput.1
+++ b/ja/man/man1/tput.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)tput.1 8.2 (Berkeley) 3/19/94
-.\" %Id: tput.1,v 1.1.1.1.8.3 1998/03/08 14:04:57 jkh Exp %
+.\" %Id: tput.1,v 1.3 1997/04/27 08:45:46 jmg Exp %
.\" jpman %Id: tput.1,v 1.3 1997/08/11 14:35:00 horikawa Stab %
.\"
.Dd March 19, 1994
diff --git a/ja/man/man1/tty.1 b/ja/man/man1/tty.1
index bb0cfa11d4..37b08a2aba 100644
--- a/ja/man/man1/tty.1
+++ b/ja/man/man1/tty.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)tty.1 8.1 (Berkeley) 6/6/93
-.\" %Id: tty.1,v 1.2.2.1 1997/08/20 07:22:28 charnier Exp %
+.\" %Id: tty.1,v 1.5 1997/08/18 07:30:14 charnier Exp %
.\" jpman %Id: tty.1,v 1.2 1997/03/29 11:52:12 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/uniq.1 b/ja/man/man1/uniq.1
index 9068d0e731..b7d8ffd57d 100644
--- a/ja/man/man1/uniq.1
+++ b/ja/man/man1/uniq.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)uniq.1 8.1 (Berkeley) 6/6/93
-.\" %Id: uniq.1,v 1.1.1.1.8.2 1998/03/08 14:07:56 jkh Exp %
+.\" %Id: uniq.1,v 1.3 1997/09/07 15:09:22 joerg Exp %
.\" jpman %Id: uniq.1,v 1.2 1997/03/29 11:56:16 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/units.1 b/ja/man/man1/units.1
index f250a9432f..46e047bec9 100644
--- a/ja/man/man1/units.1
+++ b/ja/man/man1/units.1
@@ -1,4 +1,4 @@
-.\" %Id: units.1,v 1.2.2.3 1998/07/17 07:25:36 jkh Exp %
+.\" %Id: units.1,v 1.7 1998/03/23 07:46:50 charnier Exp %
.\" jpman %Id: units.1,v 1.3 1997/07/21 09:42:33 konuma Stab %
.Dd July 14, 1993
.Dt UNITS 1
diff --git a/ja/man/man1/uucp.1 b/ja/man/man1/uucp.1
index 0e5019e19f..4bdd590c65 100644
--- a/ja/man/man1/uucp.1
+++ b/ja/man/man1/uucp.1
@@ -1,4 +1,4 @@
-''' %Id: uucp.1,v 1.4 1995/08/19 21:30:08 ache Exp %
+''' %Id: uucp.1,v 1.6 1997/02/22 15:28:40 peter Exp %
.\" jpman %Id: uucp.1,v 1.3 1997/08/19 00:44:58 h-nokubi Stab %
.TH uucp 1 "Taylor UUCP 1.06"
.SH ̾¾Î
diff --git a/ja/man/man1/uuencode.1 b/ja/man/man1/uuencode.1
index 655b4faa90..1807b42995 100644
--- a/ja/man/man1/uuencode.1
+++ b/ja/man/man1/uuencode.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)uuencode.1 8.1 (Berkeley) 6/6/93
-.\" %Id: uuencode.1,v 1.3.2.2 1998/03/08 14:29:22 jkh Exp %
+.\" %Id: uuencode.1,v 1.7 1998/01/25 19:26:05 wosch Exp %
.\" jpman %Id: uuencode.1,v 1.2 1997/03/29 11:57:08 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/uulog.1 b/ja/man/man1/uulog.1
index e0b6368260..f80bc34525 100644
--- a/ja/man/man1/uulog.1
+++ b/ja/man/man1/uulog.1
@@ -1,4 +1,4 @@
-''' %Id: uulog.1,v 1.1.2.1 1998/03/16 15:11:49 hoek Exp %
+''' %Id: uulog.1,v 1.2 1998/03/16 15:07:50 hoek Exp %
.TH uulog 1 "Taylor UUCP 1.06"
.SH ̾¾Î
uulog \- UUCP ¤Î¥í¥°¤Îµ­½Ò¤òɽ¼¨¤¹¤ë
diff --git a/ja/man/man1/uustat.1 b/ja/man/man1/uustat.1
index 90b9e96521..170450cc66 100644
--- a/ja/man/man1/uustat.1
+++ b/ja/man/man1/uustat.1
@@ -1,4 +1,4 @@
-''' %Id: uustat.1,v 1.6 1996/02/02 00:26:06 mpp Exp %
+''' %Id: uustat.1,v 1.8 1997/02/22 15:28:49 peter Exp %
.\" jpman %Id: uustat.1,v 1.2 1997/03/29 11:58:00 horikawa Stab %
.TH uustat 1 "Taylor UUCP 1.06"
.SH ̾¾Î
diff --git a/ja/man/man1/uux.1 b/ja/man/man1/uux.1
index 9bf6fd31e0..2c14c2bf6a 100644
--- a/ja/man/man1/uux.1
+++ b/ja/man/man1/uux.1
@@ -1,4 +1,4 @@
-''' %Id: uux.1,v 1.4 1995/08/19 21:30:25 ache Exp %
+''' %Id: uux.1,v 1.6 1997/02/22 15:28:53 peter Exp %
.\" jpman %Id: uux.1,v 1.2 1997/03/29 11:58:56 horikawa Stab %
.TH uux 1 "Taylor UUCP 1.06"
.SH ̾¾Î
diff --git a/ja/man/man1/vacation.1 b/ja/man/man1/vacation.1
index ba38a547c9..1ad86129f3 100644
--- a/ja/man/man1/vacation.1
+++ b/ja/man/man1/vacation.1
@@ -30,8 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)vacation.1 8.1 (Berkeley) 6/16/93
+.\" %Id: vacation.1,v 1.6 1997/02/22 19:57:38 peter Exp %
+.\"
.\" jpman %Id: vacation.1,v 1.3 1997/08/19 03:07:07 h-nokubi Stab %
-.\" %Id: vacation.1,v 1.4 1996/09/28 13:37:36 joerg Exp %
.\"
.Dd June 16, 1993
.Dt VACATION 1
diff --git a/ja/man/man1/vidcontrol.1 b/ja/man/man1/vidcontrol.1
index 2c69712733..0e12f22158 100644
--- a/ja/man/man1/vidcontrol.1
+++ b/ja/man/man1/vidcontrol.1
@@ -11,7 +11,7 @@
.\" documentation and/or other materials provided with the distribution.
.\"
.\" @(#)vidcontrol.1
-.\" %Id: vidcontrol.1,v 1.8.2.3 1998/07/18 11:37:51 jkh Exp %
+.\" %Id: vidcontrol.1,v 1.12 1997/10/27 07:52:08 charnier Exp %
.\" jpman %Id: vidcontrol.1,v 1.3 1997/08/04 01:31:25 mitchy Stab %
.\"
.Dd May 22, 1994
diff --git a/ja/man/man1/w.1 b/ja/man/man1/w.1
index e27a3c7a7e..bb1d94d71f 100644
--- a/ja/man/man1/w.1
+++ b/ja/man/man1/w.1
@@ -30,7 +30,8 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)w.1 8.1 (Berkeley) 6/6/93
-.\" %Id: w.1,v 1.2.8.6 1998/03/22 19:17:50 steve Exp %
+.\" %Id: w.1,v 1.10 1998/03/22 17:39:08 steve Exp %
+.\"
.\" jpman %Id: w.1,v 1.2 1997/04/16 01:03:05 mitchy Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/wait.1 b/ja/man/man1/wait.1
index 9eee9847d2..2f0aeb60c4 100644
--- a/ja/man/man1/wait.1
+++ b/ja/man/man1/wait.1
@@ -30,8 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)wait.1 8.1 (Berkeley) 6/5/93
+.\" %Id: wait.1,v 1.2 1997/03/07 03:27:50 jmg Exp %
+.\"
.\" jpman %Id: wait.1,v 1.3 1997/07/20 08:00:43 konuma Stab %
-.\" %Id: wait.1,v 1.1.1.1.8.1 1997/03/07 04:17:49 mpp Exp %
.\"
.Dd June 5, 1993
.Dt WAIT 1
diff --git a/ja/man/man1/wc.1 b/ja/man/man1/wc.1
index 1b6e7d9394..4fecce6e32 100644
--- a/ja/man/man1/wc.1
+++ b/ja/man/man1/wc.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)wc.1 8.2 (Berkeley) 4/19/94
-.\" %Id: wc.1,v 1.2.2.1 1997/08/26 06:52:00 charnier Exp %
+.\" %Id: wc.1,v 1.5 1997/08/25 06:44:58 charnier Exp %
.\" jpman %Id: wc.1,v 1.2 1997/03/29 20:55:21 iwasaki Stab %
.\"
.Dd April 19, 1994
diff --git a/ja/man/man1/what.1 b/ja/man/man1/what.1
index 5313a0894b..e98c78151d 100644
--- a/ja/man/man1/what.1
+++ b/ja/man/man1/what.1
@@ -31,7 +31,7 @@
.\"
.\" @(#)what.1 8.1 (Berkeley) 6/6/93
.\"
-.\" %Id: what.1,v 1.2.2.3 1998/07/17 07:26:00 jkh Exp %
+.\" %Id: what.1,v 1.9 1998/05/04 22:26:55 rnordier Exp %
.\" jpman %Id: what.1,v 1.3 1997/06/14 16:05:25 kubo Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/whereis.1 b/ja/man/man1/whereis.1
index 7944cdb780..abc5196c8e 100644
--- a/ja/man/man1/whereis.1
+++ b/ja/man/man1/whereis.1
@@ -30,8 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)whereis.1 8.2 (Berkeley) 12/30/93
+.\" %Id: whereis.1,v 1.5 1998/05/15 11:22:40 jkoshy Exp %
+.\"
.\" jpman %Id: whereis.1,v 1.3 1997/06/14 16:06:45 kubo Stab %
-.\" %Id: whereis.1,v 1.2.2.1 1998/05/22 11:03:38 jkoshy Exp %
.\"
.Dd June 15, 1996
.Dt WHEREIS 1
diff --git a/ja/man/man1/which.1 b/ja/man/man1/which.1
index a1f21dea03..1d587d80b7 100644
--- a/ja/man/man1/which.1
+++ b/ja/man/man1/which.1
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
.\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: which.1,v 1.6.2.3 1998/07/17 07:26:06 jkh Exp %
+.\" %Id: which.1,v 1.12 1998/05/22 11:09:01 jkoshy Exp %
.\" jpman %Id: which.1,v 1.3 1997/06/14 16:24:02 kubo Stab %
.Dd January 26, 1995
.Dt WHICH 1
diff --git a/ja/man/man1/who.1 b/ja/man/man1/who.1
index 2881c08252..96af8e097c 100644
--- a/ja/man/man1/who.1
+++ b/ja/man/man1/who.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)who.1 8.2 (Berkeley) 12/30/93
-.\" %Id: who.1,v 1.2.2.2 1998/05/25 18:06:39 steve Exp %
+.\" %Id: who.1,v 1.6 1998/04/14 06:42:18 phk Exp %
.\" jpman %Id: who.1,v 1.3 1997/06/14 16:25:35 kubo Stab %
.\"
.Dd December 30, 1993
diff --git a/ja/man/man1/whois.1 b/ja/man/man1/whois.1
index 28195a7d6d..52377f2c86 100644
--- a/ja/man/man1/whois.1
+++ b/ja/man/man1/whois.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)whois.1 8.1 (Berkeley) 6/6/93
-.\" %Id: whois.1,v 1.1.1.1.8.3 1998/02/19 19:10:22 wollman Exp %
+.\" %Id: whois.1,v 1.4 1998/02/19 19:07:49 wollman Exp %
.\" jpman %Id: whois.1,v 1.3 1997/06/14 04:30:33 kubo Stab %
.\"
.Dd February 19, 1998
diff --git a/ja/man/man1/write.1 b/ja/man/man1/write.1
index 4205cbb8de..99c34fefe5 100644
--- a/ja/man/man1/write.1
+++ b/ja/man/man1/write.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)write.1 8.1 (Berkeley) 6/6/93
-.\" %Id: write.1,v 1.2.2.2 1997/08/27 06:23:09 charnier Exp %
+.\" %Id: write.1,v 1.6 1997/08/26 11:23:31 charnier Exp %
.\" jpman %Id: write.1,v 1.3 1997/05/19 16:54:42 horikawa Stab %
.\"
.Dd June 6, 1993
diff --git a/ja/man/man1/xten.1 b/ja/man/man1/xten.1
index 69a7138fcf..884cbb20cb 100644
--- a/ja/man/man1/xten.1
+++ b/ja/man/man1/xten.1
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" %Id: xten.1,v 1.2.2.4 1998/07/18 11:38:07 jkh Exp %
+.\" %Id: xten.1,v 1.8 1998/03/23 08:30:11 charnier Exp %
.\" jpman %Id: xten.1,v 1.3 1997/06/12 17:21:13 kubo Stab %
.\"
.Dd October 30, 1993
diff --git a/ja/man/man1/yacc.1 b/ja/man/man1/yacc.1
index 9dc1032f48..996fd3536a 100644
--- a/ja/man/man1/yacc.1
+++ b/ja/man/man1/yacc.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)yacc.1 5.8 (Berkeley) 5/24/93
-.\" %Id: yacc.1,v 1.1.1.1.8.2 1998/03/08 14:53:14 jkh Exp %
+.\" %Id: yacc.1,v 1.8 1997/08/28 06:33:53 charnier Exp %
.\" jpman %Id: yacc.1,v 1.3 1997/06/12 16:37:49 kubo Stab %
.\"
.Dd May 24, 1993
diff --git a/ja/man/man1/ypcat.1 b/ja/man/man1/ypcat.1
index ff12a216de..89daddc3f2 100644
--- a/ja/man/man1/ypcat.1
+++ b/ja/man/man1/ypcat.1
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: ypcat.1,v 1.3.2.2 1998/07/17 08:19:35 jkh Exp %
+.\" %Id: ypcat.1,v 1.7 1998/03/23 07:48:19 charnier Exp %
.\" jpman %Id: ypcat.1,v 1.3 1997/06/12 16:24:33 kubo Stab %
.\"
.Dd December 3, 1993
diff --git a/ja/man/man1/ypmatch.1 b/ja/man/man1/ypmatch.1
index bfefe540da..def9a787b0 100644
--- a/ja/man/man1/ypmatch.1
+++ b/ja/man/man1/ypmatch.1
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: ypmatch.1,v 1.3.2.2 1998/07/17 08:19:39 jkh Exp %
+.\" %Id: ypmatch.1,v 1.7 1998/03/23 07:48:31 charnier Exp %
.\" jpman %Id: ypmatch.1,v 1.3 1997/06/12 15:46:11 kubo Stab %
.\"
.Dd December 3, 1993
diff --git a/ja/man/man1/ypwhich.1 b/ja/man/man1/ypwhich.1
index 3ce83f8b3f..f39d6ee0f6 100644
--- a/ja/man/man1/ypwhich.1
+++ b/ja/man/man1/ypwhich.1
@@ -28,7 +28,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" %Id: ypwhich.1,v 1.1.2.2 1998/07/17 08:19:43 jkh Exp %
+.\" %Id: ypwhich.1,v 1.3 1998/06/04 21:06:04 steve Exp %
.\"
.Dd February 23, 1994
.Dt YPWHICH 1
diff --git a/ja/man/man1/yyfix.1 b/ja/man/man1/yyfix.1
index 708e9a71cc..7cce78e6ef 100644
--- a/ja/man/man1/yyfix.1
+++ b/ja/man/man1/yyfix.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)yyfix.1 5.4 (Berkeley) 3/23/93
-.\" %Id: yyfix.1,v 1.1.1.1.8.2 1998/03/08 14:53:21 jkh Exp %
+.\" %Id: yyfix.1,v 1.2 1997/04/27 08:45:46 jmg Exp %
.\" jpman %Id: yyfix.1,v 1.3 1997/06/12 14:39:52 kubo Stab %
.\"
.Dd March 23, 1993