Commit drafts of man-1.6g posted at [JM:00185] to [JM:00190]

diff --git a/manual/man/ChangeLog b/manual/man/ChangeLog
index eba8932..8455951 100644 (file)
--- a/manual/man/ChangeLog
+++ b/manual/man/ChangeLog
@@ -1,3 +1,28 @@
+Thu Mar 24 10:41:43 JST 2011  JM ML to Git Gateway
+
+       * translation_list: [JM:00190]
+       * draft/man5/man.conf.5: [JM:00190]
+
+Thu Mar 24 10:41:41 JST 2011  JM ML to Git Gateway
+
+       * translation_list: [JM:00189]
+       * draft/man8/makewhatis.8: [JM:00189]
+
+Thu Mar 24 10:41:04 JST 2011  JM ML to Git Gateway
+
+       * translation_list: [JM:00188]
+       * draft/man1/whatis.1: [JM:00188]
+
+Thu Mar 24 10:41:01 JST 2011  JM ML to Git Gateway
+
+       * translation_list: [JM:00187]
+       * draft/man1/apropos.1: [JM:00187]
+
+Thu Mar 24 10:40:55 JST 2011  JM ML to Git Gateway
+
+       * translation_list: [JM:00185]
+       * draft/man1/man.1: [JM:00185]
+
 Wed Mar 16 03:01:27 JST 2011  JM ML to Git Gateway
 
        * translation_list: [JM:00153]

diff --git a/manual/man/draft/man1/apropos.1 b/manual/man/draft/man1/apropos.1
index 889427f..68ad212 100644 (file)
--- a/manual/man/draft/man1/apropos.1
+++ b/manual/man/draft/man1/apropos.1
@@ -16,6 +16,13 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
+.\" Japanese Version Copyright (c) 1996 Tanoshima Hidetohsi
+.\"         all rights reserved.
+.\" Dec 31, 1996   Tanoshima Hidetoshi <tano@sainet.or.jp>
+.\"
+.\" Modified Thu Jan 29 01:53:11 JST 1998
+.\"         by HANATAKA Shinya <hanataka@abyss.rim.or.jp>
+.\"
 .\" Updated Fri 4 Mar 2011 by TACHIBANA Akira <tati@kc5.so-net.ne.jp>
 .\"
 .TH apropos 1 "September 19, 2005" 
@@ -23,7 +30,7 @@
 .\"O .SH NAME
 .\"O apropos \- search the whatis database for strings
 .SH ̾Á°
-apropos \- whatis ¥Ç¡¼¥¿¥Ù¡¼¥¹¤è¤êʸ»úÎó¤ò¸¡º÷¤¹¤ë¡£
+apropos \- whatis ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òʸ»úÎó¤Ç¸¡º÷¤¹¤ë¡£
 .\"O .SH SYNOPSIS
 .\"O .BI apropos
 .\"O keyword ...
@@ -35,8 +42,8 @@ keyword ...
 .\"O of system commands for keywords and displays the result on the
 .\"O standard output.
 .SH ÀâÌÀ
-apropos ¥³¥Þ¥ó¥É¤Ï¡¢¥·¥¹¥Æ¥à¡¦¥³¥Þ¥ó¥É¤Î´Êñ¤Ê²òÀ⤬¤¢¤ë
-¥Ç¡¼¥¿¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤«¤é¥­¡¼¥ï¡¼¥É¤ò¸¡º÷¤·¡¢
+apropos ¥³¥Þ¥ó¥É¤Ï¡¢¥·¥¹¥Æ¥à¡¦¥³¥Þ¥ó¥É¤Ê¤É¤Î´Êñ¤ÊÀâÌÀ¤ò¼ý¤á¤¿
+¥Ç¡¼¥¿¥Ù¡¼¥¹¡¦¥Õ¥¡¥¤¥ë¤ò¥­¡¼¥ï¡¼¥É¤Ç¸¡º÷¤·¡¢
 ¤½¤Î·ë²Ì¤òɸ½à½ÐÎϤËɽ¼¨¤¹¤ë¡£
 .\"O .SH AUTHOR
 .\"O John W. Eaton was the original author of 
@@ -45,7 +52,7 @@ apropos 
 .\"O Federico Lucifredi <flucifredi@acm.org> is the current maintainer.
 .SH Ãø¼Ô
 .B "man"
-¥Ñ¥Ã¥±¡¼¥¸¤Î¸¶Ãø¼Ô¤Ï John W. Eaton ¤Ç¤¢¤ë¡£
+¥Ñ¥Ã¥±¡¼¥¸¤Î¸¶ºî¼Ô¤Ï John W. Eaton ¤Ç¤¢¤ë¡£
 Zeyd M. Ben-Halim ¤¬ man 1.2 ¤ò¥ê¥ê¡¼¥¹¤·¡¢°ú¤­Â³¤¤¤Æ Andries Brouwer ¤¬
 versions 1.3 ¤«¤é 1.5p ¤Þ¤Ç¤ò¥ê¥ê¡¼¥¹¤·¤¿¡£
 ¸½ºß¤Î¥á¥ó¥Æ¥Ê¡¼¤Ï Federico Lucifredi <flucifredi@acm.org> ¤Ç¤¢¤ë¡£

diff --git a/manual/man/draft/man1/man.1 b/manual/man/draft/man1/man.1
index 4c07ad9..6997b69 100644 (file)
--- a/manual/man/draft/man1/man.1
+++ b/manual/man/draft/man1/man.1
@@ -110,7 +110,8 @@ man \- 
 .\"O See below for a description of where 
 .\"O .B man
 .\"O looks for the manual page files.
-man ¥Ú¡¼¥¸¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ä¤¤¤Æ¤ÎÀâÌÀ¤Ï¡¢
+.B man
+¤¬ man ¥Ú¡¼¥¸¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ä¤¤¤Æ¤ÎÀâÌÀ¤Ï¡¢
 °Ê²¼¤ò»²¾È¤¹¤ë¤³¤È¡£
  
 .\"O .SH MANUAL SECTIONS
@@ -166,7 +167,7 @@ C 
 .B /usr/share/misc/man.conf
 ¤Ç¤¢¤ë
 .RB ( man.conf (5)
-¤ò¸«¤è)¡£
+¤ò»²¾È¤¹¤ë¤³¤È)¡£
 .TP
 .B \-\^M " path"
 .\"O Specify the list of directories to search for man pages.
@@ -179,7 +180,7 @@ man 
 ¥Ç¥£¥ì¥¯¥È¥ê¤ò¥³¥í¥ó¤Ç¶èÀڤäƻØÄꤹ¤ë¡£
 ¥ê¥¹¥È¤¬¶õ¤Î¾ì¹ç¤Ï¡¢
 .B \-M
-¤ò»ØÄꤷ¤Ê¤¤¤Î¤ÈƱ¤¸¤Ç¤¢¤ë¡£
+¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Î¤ÈƱ¤¸¤Ç¤¢¤ë¡£
 .RB ¡Ö "MAN ¥Ú¡¼¥¸¤Î¸¡º÷¥Ñ¥¹" ¡×
 ¤ò»²¾È¤¹¤ë¤³¤È¡£
 .TP
@@ -197,6 +198,7 @@ man 
 ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï´Ä¶­ÊÑ¿ô
 .B MANPAGER
 ¤è¤êÍ¥À褵¤ì¤ë¡£¤µ¤é¤Ë¤³¤Î´Ä¶­ÊÑ¿ô¤Ï
+´Ä¶­ÊÑ¿ô
 .B PAGER
 ¤è¤ê¤âÍ¥À褵¤ì¤ë¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï
 .B man
@@ -221,7 +223,7 @@ HTML
 .B "/usr/bin/less -is"
 ¤òÍѤ¤¤ë¡£
 .TP
-.\"O .B \-\^H
+.B \-\^H
 .\"O Specify a command that renders HTML files as text. 
 .\"O This option overrides the
 .\"O .B HTMLPAGER
@@ -229,7 +231,7 @@ HTML
 .\"O .B man
 .\"O uses
 .\"O .BR /bin/cat ,
-HTML¥Õ¥¡¥¤¥ë¤ò¥Æ¥­¥¹¥È¤Ë²ò¼á¤¹¤ë¥³¥Þ¥ó¥É¤ò»ØÄꤹ¤ë¡£
+HTML¥Õ¥¡¥¤¥ë¤ò¥Æ¥­¥¹¥È¤ËÊÑ´¹¤¹¤ë¤¹¤ë¥³¥Þ¥ó¥É¤ò»ØÄꤹ¤ë¡£
 ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï´Ä¶­ÊÑ¿ô
 .B HTMLPAGER
 ¤è¤êÍ¥À褵¤ì¤ë¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï
@@ -243,7 +245,7 @@ HTML
 .\"O This option overrides the
 .\"O .B MANSECT
 .\"O environment variable.
-¥Þ¥Ë¥å¥¢¥ë¤òõ¤¹¥»¥¯¥·¥ç¥ó¤ò»ØÄꤹ¤ë¥³¥í¥ó¶èÀÚ¤ê¤Î¥ê¥¹¥È¡£
+¥Þ¥Ë¥å¥¢¥ë¤òõ¤¹¥»¥¯¥·¥ç¥ó¤ò»ØÄꤹ¤ë¥³¥í¥ó¶èÀÚ¤ê¤Î¥ê¥¹¥È¤Ç¤¢¤ë¡£
 ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï´Ä¶­ÊÑ¿ô
 .B MANSECT
 ¤è¤êÍ¥À褵¤ì¤ë¡£
@@ -270,7 +272,7 @@ HTML
 .\"O with a different number of columns, or if the preformatted page
 .\"O is corrupted.
 ºÇ¿·¤Î cat ·Á¼°¤Î¥Ú¡¼¥¸¤¬¤¢¤Ã¤Æ¤â man ¥Ú¡¼¥¸¤Î¥½¡¼¥¹¤ò
-À°·Á¤·¤Ê¤ª¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï cat ¥Ú¡¼¥¸¤¬Ã¼Ëö¤È°ã¤Ã¤¿Éý¤Ç
+À°·Á¤·¤Ê¤ª¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï cat ¥Ú¡¼¥¸¤¬¸½ºß»îÍѤ·¤Æ¤¤¤ëüËö¤È°ã¤Ã¤¿Éý¤Ç
 À°·Á¤µ¤ì¤Æ¤¤¤ë¤È¤­¤ä²õ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ê¤É¤ËÍ­ÍѤǤ¢¤ë¡£
 .TP
 .B \-\^d
@@ -291,7 +293,7 @@ man 
 .\"O .BR \-\^F " or " \-\-preformat
 .\"O Format only - do not display.
 .BR \-\^F " ¤Þ¤¿¤Ï " \-\-preformat
-¥Õ¥©¡¼¥Þ¥Ã¥È¤Î¤ß¹Ô¤¤¡¢É½¼¨¤Ï¤·¤Ê¤¤¡£
+À°·Á¤Î¤ß¹Ô¤¤¡¢É½¼¨¤Ï¤·¤Ê¤¤¡£
 .TP
 .B \-\^h
 .\"O Print a help message and exit.
@@ -309,14 +311,18 @@ man 
 .\"O (Just to give a rough idea, on my machine this takes about a minute
 .\"O per 500 man pages.)
 ¡ÖÁ´¤Æ¤Î¡×man ¥Ú¡¼¥¸¤«¤é»ØÄꤷ¤¿Ê¸»úÎó¤òõ¤¹¡£·Ù¹ð: ¤³¤ì¤Ï
-Èó¾ï¤ËÃÙ¤¤¤Î¤Ç ¥»¥¯¥·¥ç¥ó¤ò»ØÄꤷ¤¿Êý¤¬Îɤ¤¡£
+¤¿¤¤¤Æ¤¤Èó¾ï¤ËÃÙ¤¤¤Î¤Ç ¥»¥¯¥·¥ç¥ó¤ò»ØÄꤷ¤¿Êý¤¬Îɤ¤¡£
 (¤À¤¤¤¿¤¤¤ÎÌܰ¤Ȥ·¤Æ¡¢»ä¤Î¥Þ¥·¥ó¤Ç¤Ï
 500 ¥Ú¡¼¥¸¤ò¸¡º÷¤¹¤ë¤Î¤Ë 1 ʬ¤«¤«¤ë¡£)
 .TP
 .B \-\^m " system"
 .\"O Specify an alternate set of man pages to search based on the system
 .\"O name given.
-Ê̤Υ·¥¹¥Æ¥à¤Î¤³¤È¤òµ­½Ò¤·¤¿ man ¥Ú¡¼¥¸·²¤ò¸¡º÷¤¹¤ë¤è¤¦¤Ë»ØÄꤹ¤ë¡£
+.\"O Ê̤Υ·¥¹¥Æ¥à¤Î¤³¤È¤òµ­½Ò¤·¤¿ man ¥Ú¡¼¥¸·²¤ò¸¡º÷¤¹¤ë¤è¤¦¤Ë»ØÄꤹ¤ë¡£
+(¸½ºß¤Î¥·¥¹¥Æ¥à¤«¤é¡¢Â¾¤Î¥·¥¹¥Æ¥à¤Ë¤Ä¤¤¤Æ¤Î¥Þ¥Ë¥å¥¢¥ë¤Ë¥¢¥¯¥»¥¹
+¤Ç¤­¤ë¾ì¹ç¤Ë¤Ï) Ê̤Υ·¥¹¥Æ¥à¤Î¤³¤È¤òµ­½Ò¤·¤¿ man ¥Ú¡¼¥¸·²¤ò
+¸¡º÷¤¹¤ë¤è¤¦¡¢¤½¤Î¥·¥¹¥Æ¥à̾¤ò»ØÄꤹ¤ë¡£
+
 .TP
 .B \-\^p " string"
 .\"O Specify the sequence of preprocessors to run before
@@ -337,6 +343,9 @@ man 
 ¥×¥ê¥×¥í¥»¥Ã¥µ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡£¤¤¤¯¤Ä
 ¤«¤Î¥×¥ê¥×¥í¥»¥Ã¥µ¤È¤½¤ì¤ò»Ø¤·¼¨¤¹Ê¸»ú¤Ï¼¡¤Î¤È¤ª¤ê¡§
 eqn (e), grap (g), pic (p), tbl (t), vgrind (v), refer (r)¡£
+(ÌõÃí:½çÈ֤λØÄêÊýË¡¤Ï 
+.B \-\^p "egpt"
+¤Ç¤¢¤ë)
 ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï´Ä¶­ÊÑ¿ô
 .B MANROFFSEQ
 ¤è¤êÍ¥À褵¤ì¤ë¡£
@@ -364,11 +373,12 @@ man 
 .B /usr/bin/groff \-Tps \-mandoc
 ¤Î¥Ç¥Õ¥©¥ë¥È¤Î½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï PostScript ¤Ç¤¢¤ë¤Î¤Ç¡¢
 Ê̤νÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È¤òÁª¤Ö¤ä¤êÊý¤Ï
-.B /usr/bin/groff \-Tps \-mandoc
-¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤¹¤ë¤³¤È¡£
+.\"O .B /usr/bin/groff \-Tps \-mandoc
+.BR groff (1)
+¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸ (¤ÎÍøÍѲÄǽ¤Ê¥Ç¥Ð¥¤¥¹)¤ò»²¾È¤¹¤ë¤³¤È¡£
 .PP
 Áª¤Ð¤ì¤¿½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È¤È°õºþÁõÃÖ¤ÎǽÎϤ˱þ¤¸¤Æ¡¢
-½ÐÎϤϰõºþ¤¹¤ëÁ°¤Ë¤Ê¤ó¤é¤«¤Î¥Õ¥£¥ë¥¿¡¼¤ʤɤòÄ̤¹É¬Íפ¬¤¢¤ë¤À¤í¤¦¡£
+½ÐÎϤϰõºþ¤¹¤ëÁ°¤Ë¤Ê¤ó¤é¤«¤Î¥Õ¥£¥ë¥¿¡¼¤òÄ̤¹É¬Íפ¬¤¢¤ë¤À¤í¤¦¡£
 .TP
 .\"O .B \-\^w \fRor\fP \-\-path
 .\"O Don't actually display the man pages, but do print the location(s) of
@@ -379,13 +389,15 @@ man 
 .\"O .B manpath
 .\"O is a link to man, then "manpath" is equivalent to "man --path".
 .B \-\^w \fR¤Þ¤¿¤Ï\fP \-\-path
-¼ÂºÝ¤Ë¤Ï man ¥Ú¡¼¥¸¤òɽ¼¨¤»¤º¡¢
-¥Õ¥©¡¼¥Þ¥Ã¥È¤µ¤ì¤ë¥Ú¡¼¥¸¤äɽ¼¨¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òɽ¼¨¤¹¤ë¡£
+man ¥Ú¡¼¥¸¤òɽ¼¨¤»¤º¡¢
+À°·Á¤Ê¤¤¤·É½¼¨¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òɽ¼¨¤¹¤ë¡£
 °ú¿ô¤òÍ¿¤¨¤Ê¤¤¤È
 .B man
 ¤¬ man ¥Ú¡¼¥¸¤ò¸¡º÷¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤òɸ½à½ÐÎϤËɽ¼¨¤¹¤ë¡£
 .B manpath
-¤¬ man ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë¤È¤­¤Ï "manpath" ¤Ï "man --path" ¤È
+¤¬
+.B man
+¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë¤È¤­¤Ï "manpath" ¤Ï "man --path" ¤È
 Ʊ¤¸¤Ë¤Ê¤ë¡£
 .TP
 .B \-\^W
@@ -418,10 +430,12 @@ man 
 ¼¡¤Ë¤½¤Î¥Ú¡¼¥¸¤¬É¬Íפˤʤ俤Ȥ­¤ÎÀ°·Á»þ´Ö¤ÎÀáÌó¤Î¤¿¤á¤ËÊݸ¤·¤è¤¦¤È¤¹¤ë¡£
 ÅÁÅýŪ¤Ë¡¢DIR/manX ¤ÎÀ°·ÁºÑ¤ß¥Þ¥Ë¥å¥¢¥ë¤Ï DIR/catX ¤Ë
 ¥»¡¼¥Ö¤µ¤ì¤ë¤¬¡¢
-man ¥Ç¥£¥ì¥¯¥È¥ê¤«¤é cat ¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥Þ¥Ã¥Ô¥ó¥°ÊýË¡¤È¤·¤Æ¡¢°Û¤Ê¤ëÃͤò
+man ¥Ç¥£¥ì¥¯¥È¥ê¤È cat ¥Ç¥£¥ì¥¯¥È¥ê¤ÎÊ̤Υޥåԥó¥°(ÂбþÉÕ¤±)¤ò
 .B /usr/share/misc/man.conf
-¤Ë»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤ë¡£
-¥Õ¥©¡¼¥Þ¥Ã¥È¤µ¤ì¤¿ cat ¥Ú¡¼¥¸¤Î 1 ¹Ô¤Îʸ»ú¿ô¤¬ 80 ʸ»ú¤Ç¤Ê¤¤¾ì¹ç¡¢
+¤Ç»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤ë¡£
+»ØÄꤵ¤ì¤¿ cat ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¡¢
+cat ¥Ú¡¼¥¸¤Ï¥»¡¼¥Ö¤µ¤ì¤Ê¤¤¡£
+À°·Á¤µ¤ì¤¿ cat ¥Ú¡¼¥¸¤Î 1 ¹Ô¤Îʸ»ú¿ô¤¬ 80 ʸ»ú¤Ç¤Ê¤¤¾ì¹ç¡¢
 cat ¥Ú¡¼¥¸¤Ï¥»¡¼¥Ö¤µ¤ì¤Ê¤¤¡£
 man.conf ¤Ë NOCACHE ¤È½ñ¤«¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
 cat ¥Ú¡¼¥¸¤Ï¥»¡¼¥Ö¤µ¤ì¤Ê¤¤¡£
@@ -437,17 +451,17 @@ cat 
 .\"O is not made suid, then a cat directory should have mode 0777
 .\"O if all users should be able to leave cat pages there.
 .B man
-¥³¥Þ¥ó¥É¤ò¥æ¡¼¥¶¡¼ man ¤Ë suid ¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
-¤½¤¦¤¹¤ë¤È¡¢ cat ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ª¡¼¥Ê¡¼¤¬ man ¤«¤Ä¥â¡¼¥É¤¬ 0755
-(¥æ¡¼¥¶¡¼ man ¤À¤±¤¬½ñ¤­¹þ¤ß²Ä) ¤Ç¡¢
-cat ¥Õ¥¡¥¤¥ë¤Î¥ª¡¼¥Ê¡¼¤¬ man ¤«¤Ä¥â¡¼¥É¤¬ 0644 ¤Þ¤¿¤Ï 0444
+¥³¥Þ¥ó¥É¤ò¥æ¡¼¥¶¡¼ man ¤Ë suid ¤¹¤ë¤³¤È¤â¤Ç¤­¤ë¡£
+¤½¤Î¾ì¹ç¡¢ cat ¥Ç¥£¥ì¥¯¥È¥ê¤ò½êÍ­¼Ô man¡¢¥â¡¼¥É¤ò 0755
+(¥æ¡¼¥¶¡¼ man ¤À¤±¤¬½ñ¤­¹þ¤ß²Ä) ¤È¤·¡¢
+cat ¥Õ¥¡¥¤¥ë¤ò½êÍ­¼Ô man¡¢¥â¡¼¥É¤ò 0644 ¤Þ¤¿¤Ï 0444
 (¥æ¡¼¥¶¡¼ man ¤À¤±¤¬½ñ¤­¹þ¤ß²Ä¡¢¤Þ¤¿¤Ï¥æ¡¼¥¶¡¼¤¹¤Ù¤Æ¤¬½ñ¤­¹þ¤ßÉÔ²Ä)
-¤Î¤È¤­¡¢
-ÉáÄ̤Υ桼¥¶¡¼¤Ï cat ¥Ú¡¼¥¸¤òÊѹ¹¤·¤¿¤ê¡¢
-¾¤Î¥Õ¥¡¥¤¥ë¤ò cat ¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤¤¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¯¤Ê¤ë¡£
-man ¥³¥Þ¥ó¥É¤¬ suid ¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢
-¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¡¼¤¬ cat ¥Ú¡¼¥¸¤ò cat ¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤±¤ë¤è¤¦¤Ë¡¢
-cat ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥â¡¼¥É¤ò 0777 ¤Ë¤¹¤ëɬÍפ¬¤¢¤ë¡£
+¤È¤·¤Æ¤ª¤±¤Ð¡¢
+°ìÈ̥桼¥¶¡¼¤Ï(man ¥³¥Þ¥ó¥É¤ò»È¤ï¤º¤Ë) cat ¥Ú¡¼¥¸¤òÊѹ¹¤·¤¿¤ê¡¢
+¾¤Î(´Ø·¸¤Ê¤¤)¥Õ¥¡¥¤¥ë¤ò cat ¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤¤¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¯¤Ê¤ë¡£
+man ¥³¥Þ¥ó¥É¤¬ suid ¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢
+¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¡¼¤¬ cat ¥Ú¡¼¥¸¤ò cat ¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤±¤ë¤è¤¦¤Ë¤·¤¿¤¤¤Î¤Ê¤é¡¢
+cat ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥â¡¼¥É¤ò 0777 ¤Ë¤¹¤ë¤Ù¤­¤Ç¤¢¤ë¡£
 .PP
 .\"O The option
 .\"O .B \-c
@@ -465,13 +479,16 @@ cat 
 .\"O .IR /usr/share/man/htmlman1/ls.1.html .
 .SH "HTML ¥Ú¡¼¥¸"
 .B man
-¥³¥Þ¥ó¥É¤Ï¥»¥¯¥·¥ç¥ó³ÈÄ¥»Ò¤Î¸å¤Ë 'html' ¤È¤Ä¤¯¥Õ¥¡¥¤¥ë¤ò¡¢
-HTML ¥Ú¡¼¥¸¤È¤·¤Æ¸«¤Ä¤±¤ë¡£
-¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ÎºÇ¸å¤Ï ".html' ¤¬´üÂÔ¤µ¤ì¡¢¤·¤¿¤¬¤Ã¤Æ
+¥³¥Þ¥ó¥É¤Ï 'html' ¤Î¸å¤Ë¥»¥¯¥·¥ç¥óÈֹ椬³¤¯¤è¤¦¤Ê̾Á°¤ò»ý¤Ä
+¥Ç¥£¥ì¥¯¥È¥ê¤ÎÃæ¤Ë HTML ÈǤΠman ¥Ú¡¼¥¸¤¬¤¢¤ì¤Ð¡¢¤½¤ì¤ò¸«¤Ä¤±½Ð¤¹¡£
+¥Õ¥¡¥¤¥ë̾¤ÎËöÈø¤ËÉÕ¤¯³ÈÄ¥»Ò¤Ï¡¢ÅöÁ³¤Ê¤¬¤é¡¢".html" ¤Ç¤¢¤ë(³ÈÄ¥»Ò¤Ï ".html" ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤)¡£
+¤·¤¿¤¬¤Ã¤Æ¡¢
 .BR ls (1)
-¤Î man ¥Ú¡¼¥¸¤ÎHTMLÈǤÏ
-.I /usr/share/man/htmlman1/ls.1.html
-¤Ç¤¢¤ë¡£
+¤Î man ¥Ú¡¼¥¸¤Î HTML ÈǤ¬¤¢¤ì¤Ð¡¢¤½¤ÎÍ­¸ú¤Ê̾Á°¤Ï¡¢
+.\"O ¢­¤Î¥Ñ¥¹¤Ï´Ö°ã¤¤
+.\"O .I /usr/share/man/htmlman1/ls.1.html
+.I /usr/share/man/html1/ls.1.html
+¤È¤¤¤Ã¤¿¤â¤Î¤Ë¤Ê¤ë¤À¤í¤¦¡£
 
 .\"O .SH "SEARCH PATH FOR MANUAL PAGES"
 .SH "MAN ¥Ú¡¼¥¸¤Î¸¡º÷¥Ñ¥¹"
@@ -481,10 +498,10 @@ HTML 
 .\"O .B /usr/share/misc/man.conf 
 .\"O configuration file, and some built in conventions and heuristics.
 .B man
-¤Ï¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¸«ÉÕ¤±¤ë¤¿¤á¤ËÀöÎý¤µ¤ì¤¿ÊýË¡¤òÍѤ¤¤ë¡£
-¤³¤ì¤Ë¤Ï¡¢µ¯Æ°¥ª¥×¥·¥ç¥ó¡¦´Ä¶­ÊÑ¿ô¡¦ÀßÄê¥Õ¥¡¥¤¥ë
+¤Ï¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤ß¤Ä¤±¤ë¤¿¤á¤ËÀöÎý¤µ¤ì¤¿ÊýË¡¤òÍѤ¤¤ë¡£
+¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤ß¤Ä¤±¤ë¤¿¤á¤Ë¡¢µ¯Æ°¥ª¥×¥·¥ç¥ó¡¦´Ä¶­ÊÑ¿ô¡¦ÀßÄê¥Õ¥¡¥¤¥ë
 .B /usr/share/misc/man.conf 
-¡¦¥×¥í¥°¥é¥à¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¤³¤ì¤Þ¤Ç¤Î´·ÎãŪ¤Ê¸¡º÷Ë¡¤ä
+¡¦¥×¥í¥°¥é¥à¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¤³¤ì¤Þ¤Ç¤ÎÅÁÅýŪ¤Ê¸¡º÷Ë¡¤ä
 ȯ¸«Åª¤ÊÊýË¡¤¬»È¤ï¤ì¤ë¡£
 .PP
 .\"O First of all, when the 
@@ -496,13 +513,13 @@ HTML 
 .\"O .B man
 .\"O assumes it is a file specification itself,
 .\"O and there is no searching involved.
-¤Þ¤ººÇ½é¤Ë
+¤Þ¤ººÇ½é¤Ë¡¢
 .B man
 ¤Î°ú¤­¿ô
 .I name
 ¤Ë¥¹¥é¥Ã¥·¥å
 .RB ( / )
-¤¬¤¢¤ë¾ì¹ç¤Ï¡¢
+¤¬¤¢¤ë¾ì¹ç¤Ï
 .B man
 ¤Ï¥Õ¥¡¥¤¥ë¤Î»ØÄê¤Ç¤¢¤ë¤È²ò¼á¤·¤Æ¡¢¸¡º÷¤ò¹Ô¤ï¤Ê¤¤¡£
 .PP
@@ -512,7 +529,7 @@ HTML 
 .\"O .B man
 .\"O searches a variety of directories for a file that could be a manual page
 .\"O for the topic named.
-¤¿¤À¤·¡¢
+¤·¤«¤·
 .I name
 ¤Ë¥¹¥é¥Ã¥·¥å¤¬´Þ¤Þ¤ì¤Æ¤¤¤Ê¤¤Ä̾ï¤Î¾ì¹ç¡¢
 .B man
@@ -527,12 +544,13 @@ HTML 
 .\"O .B man 
 .\"O searches.
 .BI "-M " pathlist
-¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¾ì¹ç¡¢
+¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢
 .I pathlist
-¤Ï
+¤¬
 .B man
-¤¬¸¡º÷¤ò¹Ô¤¦¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤Ç¤¢¤ê¡¢
-¥Ç¥£¥ì¥¯¥È¥ê¤ò¥³¥í¥ó¤Ç¶èÀڤäƻØÄꤹ¤ë¡£
+¤¬¸¡º÷¤ò¹Ô¤¦ÂоݤȤʤ롣
+.I pathlist
+¤Ï¥³¥í¥ó¤Ç¶èÀڤ俥ǥ£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤Ç¤¢¤ë¡£
 .PP
 .\"O If you don't specify
 .\"O .B -M
@@ -545,7 +563,7 @@ HTML 
 .B -M
 ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¤¬¡¢´Ä¶­ÊÑ¿ô
 .B MANPATH
-¤ÏÀßÄꤷ¤Æ¤¢¤ë¤È¤¤¤¦¾ì¹ç¡¢¤³¤Î´Ä¶­ÊÑ¿ô¤ÎÃͤÏ
+¤ÏÀßÄꤷ¤Æ¤¢¤ë¾ì¹ç¤Ï¡¢¤³¤Î´Ä¶­ÊÑ¿ô¤ÎÃͤ¬
 .B man
 ¤¬¸¡º÷¤ò¹Ô¤¦¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤Ç¤¢¤ë¡£
 .PP
@@ -562,16 +580,16 @@ HTML 
 .\"O statements in the configuration file identify particular directories to 
 .\"O include in the search path.
 .B -M
-¤Þ¤¿¤Ï
+¤ä
 .B MANPATH
 ¤Ç¥Ñ¥¹¤Î¥ê¥¹¥È¤òÌÀ¼¨Åª¤Ë»ØÄꤷ¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢
 .B man
 ¤ÏÀßÄê¥Õ¥¡¥¤¥ë
-.B /usr/lib/man.conf
+.B /usr/share/misc/man.conf
 ¤ÎÆâÍƤ˴ð¤Å¤¤¤Æ¥Ñ¥¹¤Î¥ê¥¹¥È¤òºîÀ®¤¹¤ë¡£
 ÀßÄê¥Õ¥¡¥¤¥ë¤Î
 .B MANPATH
-¥¹¥Æ¡¼¥È¥á¥ó¥È¤Ë¤è¤ê¡¢ÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¸¡º÷¥Ñ¥¹¤ËÄɲ乤롣
+¥¹¥Æ¡¼¥È¥á¥ó¥È¤Ë¤è¤ê¡¢ÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¸¡º÷¥Ñ¥¹¤ËÄɲ乤ë¤Î¤À¡£
 .PP
 .\"O Furthermore, the 
 .\"O .B MANPATH_MAP 
@@ -594,28 +612,30 @@ HTML 
 .\"O you get a manual page for the program that would run if you issued the
 .\"O command 
 .\"O .BR xyz .
-¤µ¤é¤Ë¡¢
+¤µ¤é¤Ë
 .B MANPATH_MAP
-¥¹¥Æ¡¼¥È¥á¥ó¥È¤Ï¡¢¥³¥Þ¥ó¥É¸¡º÷¥Ñ¥¹
+¥¹¥Æ¡¼¥È¥á¥ó¥È¤Ë¤è¤Ã¤Æ¡¢¥³¥Þ¥ó¥É¸¡º÷¥Ñ¥¹
 (¤¹¤Ê¤ï¤Á¡¢¥æ¡¼¥¶¡¼¤Î
 .B PATH
-´Ä¶­ÊÑ¿ô) ¤Ë±þ¤¸¤¿¸¡º÷¥Ñ¥¹¤òÄɲ乤롣
+´Ä¶­ÊÑ¿ô) ¤Ë±þ¤¸¤¿¸¡º÷¥Ñ¥¹¤¬Äɲ䵤ì¤ë¡£
 ¥³¥Þ¥ó¥É¸¡º÷¥Ñ¥¹¤Ë¤¢¤ë³Æ¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ·¤Æ¡¢
-1 ¤Ä¤Î
 .B MANPATH_MAP
-¤Ç 1 ¤Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¡¢
-man ¥Ú¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥Ñ¥¹¤ËÄɲ乤롣
+¥¹¥Æ¡¼¥È¥á¥ó¥È¤¬ man ¥Ú¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥Ñ¥¹¤ËÄɲ乤٤­
+¥Ç¥£¥ì¥¯¥È¥ê¤ò°ì¤Ä¤Å¤Ä»ØÄꤹ¤ë¡£
 .B man
 ¤Ï
 .B PATH
-ÊÑ¿ô¤òÄ´¤Ù¤Æ¡¢Âбþ¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò man ¥Ú¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥Ñ¥¹¤ËÄɲ乤롣
-¤è¤Ã¤Æ¡¢
+ÊÑ¿ô¤òÄ´¤Ù¤Æ¡¢(
 .B MANPATH_MAP
-¤òÀµ¤·¤¯»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë
+¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë)Âбþ¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò man ¥Ú¡¼¥¸¥Õ¥¡¥¤¥ë¤Î¸¡º÷¥Ñ¥¹¤Ë
+Äɲ乤ë¤Î¤Ç¤¢¤ë¡£
+¤·¤¿¤¬¤Ã¤Æ¡¢
+.B MANPATH_MAP
+¤òŬÀڤ˻ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
 .B "man xyz"
-¤ò¼Â¹Ô¤¹¤ì¤Ð¡¢¥³¥Þ¥ó¥É
+¤ò¼Â¹Ô¤¹¤ë¤È¡¢¥³¥Þ¥ó¥É
 .B xyz
-¤ò¼Â¹Ô¤·¤¿¤È¤­¤ËÆ°ºî¤¹¤ë¥×¥í¥°¥é¥à¤Î man ¥Ú¡¼¥¸¤¬ÆÀ¤é¤ì¤ë¡£
+¤ò¼Â¹Ô¤·¤¿¤È¤­¤ËÆ°ºî¤¹¤ë¥×¥í¥°¥é¥à¤Î man ¥Ú¡¼¥¸¤¬É½¼¨¤µ¤ì¤ë¤³¤È¤Ë¤Ê¤ë¡£
 .PP
 .\"O In addition, for each directory in the command search path (we'll call
 .\"O it a "command directory") for which you do
@@ -627,24 +647,26 @@ man 
 .\"O automatically looks for a manual page directory "nearby"
 .\"O namely as a subdirectory in the command directory itself or
 .\"O in the parent directory of the command directory.
-¤Þ¤¿¡¢¥³¥Þ¥ó¥É¸¡º÷¥Ñ¥¹¤Î³Æ¥Ç¥£¥ì¥¯¥È¥ê
-(¡Ö¥³¥Þ¥ó¥É¥Ç¥£¥ì¥¯¥È¥ê¡×¤È¸Æ¤Ö¤³¤È¤Ë¤¹¤ë) ¤ËÂФ·¤Æ¡¢
+¤Ê¤ª¡¢¥³¥Þ¥ó¥É¸¡º÷¥Ñ¥¹¤Î¥Ç¥£¥ì¥¯¥È¥ê
+(¡Ö¥³¥Þ¥ó¥É¥Ç¥£¥ì¥¯¥È¥ê¡×¤È¸Æ¤Ö¤³¤È¤Ë¤¹¤ë) ¤ËÂФ·¤Æ
 .B MANPATH_MAP
-¥¹¥Æ¡¼¥È¥á¥ó¥È¤¬\fI¤Ê¤¤\fR¾ì¹ç¡¢
-.B man
-¤Ï¡Ö¶áÀܤ¹¤ë¡×¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¥Ç¥£¥ì¥¯¥È¥ê¤ò¼«Æ°Åª¤Ë¸¡º÷¤¹¤ë¡£
-¶áÀܤ¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤È¤Ï¡¢¥³¥Þ¥ó¥É¥Ç¥£¥ì¥¯¥È¥ê¼«¿È¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ä¡¢
-¥³¥Þ¥ó¥É¥é¥¤¥ó¥Ç¥£¥ì¥¯¥È¥ê¤Î¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¢¤ë¡£
+¥¹¥Æ¡¼¥È¥á¥ó¥È¤¬\fI¸ºß¤·¤Ê¤¤\fR¾ì¹ç¡¢
+.Bman
+¤Ï¤½¤¦¤·¤¿¥³¥Þ¥ó¥É¥Ç¥£¥ì¥¯¥È¥ê¤Î°ì¤Ä°ì¤Ä¤ËÂФ·¤Æ¡¢
+¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò¼«Æ°Åª¤Ë¡Ö¶áÎ٤ξì½ê¡×¤Ç
+¸¡º÷¤¹¤ë¡£¡Ö¶áÎ٤ξì½ê¡×¤È¤¤¤¦¤Î¤Ï¡¢¥³¥Þ¥ó¥É¥Ç¥£¥ì¥¯¥È¥ê
+¤½¤Î¤â¤Î¤ä¥³¥Þ¥ó¥É¥Ç¥£¥ì¥¯¥È¥ê¤Î¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¡¢¥µ¥Ö
+¥Ç¥£¥ì¥¯¥È¥ê¤È¤¤¤Ã¤¿¾ì½ê¤Ç¤¢¤ë¡£
 .PP
 .\"O You can disable the automatic "nearby" searches by including a
 .\"O .B NOAUTOPATH
 .\"O statement in 
 .\"O .BR /usr/share/misc/man.conf .
-¡Ö¶áÀܡץǥ£¥ì¥¯¥È¥ê¤Î¼«Æ°¸¡º÷¤ò̵¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢
+¡Ö¶áÎ٤ξì½ê¡×¤Î¼«Æ°¸¡º÷¤ò̵¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢
 .B NOAUTOPATH
 ¥¹¥Æ¡¼¥È¥á¥ó¥È¤ò
 .B /usr/share/misc/man.conf
-¤ËÆþ¤ì¤ì¤Ð¤è¤¤¡£
+¤Ë»ØÄꤹ¤ì¤Ð¤è¤¤¡£
 .PP
 .\"O In each directory in the search path as described above, 
 .\"O .B man
@@ -671,14 +693,15 @@ man 
 .\"O .BR .gz ),
 .\"O .B man
 .\"O assumes it is gzipped.
-¾åµ­¤Î¸¡º÷¥Ñ¥¹¤Ë¤¢¤ë³Æ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ä¤¤¤Æ¡¢
+¾åµ­¤Î¸¡º÷¥Ñ¥¹¤Ë¤¢¤ë³Æ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤ª¤¤¤Æ¡¢
 .B man
 ¤Ï
 .IB topic . section\fR,
 ¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤òõ¤¹¡£
-¤³¤ì¤Ë¤Ï¥ª¥×¥·¥ç¥ó¤È¤·¤Æ¥»¥¯¥·¥ç¥óÈÖ¹æ¤È
-°µ½Ì¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤¬ÉÕ¤¤¤Æ¤â¤è¤¤¡£
-¤³¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤¬¸«ÉÕ¤«¤é¤Ê¤¤¾ì¹ç¡¢
+¤³¤Î¥»¥¯¥·¥ç¥óÈÖ¹æ¤Ë¤Ï (1x ¤Î x ¤Î¤è¤¦¤Ê)
+ÀÜÈø¼­¤¬¤¢¤Ã¤Æ¤â¤è¤¤¤·¡¢°µ½Ì¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë¤³¤È¤ò¼¨¤¹³ÈÄ¥»Ò¤¬
+¤µ¤é¤Ë³¤¤¤Æ¤â¤è¤¤¡£
+¤³¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤¬¤ß¤Ä¤«¤é¤Ê¤¤¾ì¹ç¡¢
 .BI man N
 ¤Þ¤¿¤Ï
 .BI cat N
@@ -690,15 +713,15 @@ man 
 .BI cat N
 ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¾ì¹ç¡¢
 .B man
-¤Ï¥Õ¥©¡¼¥Þ¥Ã¥ÈºÑ¤ß¤Î man ¥Ú¡¼¥¸¥Õ¥¡¥¤¥ë (cat ¥Ú¡¼¥¸) ¤Ç¤¢¤ë¤È²¾Äꤹ¤ë¡£
+¤ÏÀ°·ÁºÑ¤ß¤Î man ¥Ú¡¼¥¸¥Õ¥¡¥¤¥ë (cat ¥Ú¡¼¥¸) ¤Ç¤¢¤ë¤È¤ß¤Ê¤¹¡£
 ¤½¤ì°Ê³°¤Î¾ì¹ç¡¢
 .B man
-¤Ï̤¥Õ¥©¡¼¥Þ¥Ã¥È¤Î man ¥Ú¡¼¥¸¤Ç¤¢¤ë¤È²¾Äꤹ¤ë¡£
+¤Ï̤À°·Á¤Î man ¥Ú¡¼¥¸¤Ç¤¢¤ë¤È¤ß¤Ê¤¹¡£
 ¤É¤Á¤é¤Î¾ì¹ç¤Ç¤â¡¢¥Õ¥¡¥¤¥ë̾¤Ë
 .RB ( .gz
 ¤Î¤è¤¦¤Ê) ´ûÃΤΰµ½Ì¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤¬ÉÕ¤¤¤Æ¤¤¤ì¤Ð¡¢
 .B man
-¤Ï gzip ¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë¤È²¾Äꤹ¤ë¡£
+¤Ï gzip ¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë¤È¹Í¤¨¤ë¡£
 .PP
 .\"O If you want to see where (or if)
 .\"O .B man
@@ -707,7 +730,7 @@ man 
 .\"O option.
 .B man
 ¤¬ÆÃÄê¤Î¥È¥Ô¥Ã¥¯¤Î man ¥Ú¡¼¥¸¤ò
-¤É¤³¤Ç¸«ÉÕ¤±¤ë¤« (¤Þ¤¿¤Ï¸«ÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¤Î¤«) ¤òÃΤꤿ¤¤¤È¤­¤Ï¡¢
+¤É¤³¤Ç¤ß¤Ä¤±¤ë¤« (¤Þ¤¿¤Ï¤ß¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¤Î¤«) ¤òÃΤꤿ¤¤¤È¤­¤Ï¡¢
 .BR "--path " ( -w )
 ¥ª¥×¥·¥ç¥ó¤ò»È¤¦¤³¤È¡£
 
@@ -761,6 +784,9 @@ man 
 ¤ä
 .B troff
 ¤ÎÁ°¤Ë¼Â¹Ô¤¹¤ë¥×¥ê¥×¥í¥»¥Ã¥µ¤¬¡¢¤³¤ÎÃͤò¤â¤È¤Ë¤·¤Æ·èÄꤵ¤ì¤ë¡£
+(ÌõÃí:ÀßÄêÊýË¡¤Ï 
+\&'MANROFFSEQ=egpt'
+¤Ç¤¢¤ë)
 ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢man ¥Ú¡¼¥¸¤Ï
 .B nroff
 ¤Î¤Þ¤¨¤Ë tbl ÍѤΥץê¥×¥í¥»¥Ã¥µ¤ËÄ̤µ¤ì¤ë¡£
@@ -795,6 +821,7 @@ man 
 .B MANPAGER
 ¤òÀßÄꤹ¤ë¤È¡¢man ¥Ú¡¼¥¸¤òɽ¼¨¤¹¤ë¥×¥í¥°¥é¥à¤È¤·¤Æ»ÈÍѤ¹¤ë¡£
 »ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢
+´Ä¶­ÊÑ¿ô
 .B PAGER
 ¤¬»ÈÍѤµ¤ì¤ë¡£¤É¤Á¤é¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï
 .B /usr/bin/less -is
@@ -811,7 +838,7 @@ HTML
 .B HTMLPAGER
 .\"O The command to use for rendering HTML manual pages as text.  If
 .\"O it is not set, /bin/cat is used.
-HTML¥Õ¥¡¥¤¥ë¤ò¥Æ¥­¥¹¥È¤Ë²ò¼á¤¹¤ë¥³¥Þ¥ó¥É¡£
+HTML¥Õ¥¡¥¤¥ë¤ò¥Æ¥­¥¹¥È¤ËÊÑ´¹¤¹¤ë¥³¥Þ¥ó¥É¡£
 ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï
 .B /bin/cat
 ¤¬»È¤ï¤ì¤ë¡£
@@ -829,11 +856,11 @@ HTML
 .B man
 ¥³¥Þ¥ó¥É¤Ï¤Þ¤º¤½¤Î̾Á°¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤«¤é man ¥Ú¡¼¥¸¤òõ¤¹¡£
 ¤·¤¿¤¬¤Ã¤Æ¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é 'LANG=dk man 1 foo'
-¤ÈÂǤĤȡ¢
+¤ÈÂǤÁ¹þ¤à¤È¡¢
 .B man
 ¥³¥Þ¥ó¥É¤Ï¤Þ¤º .../dk/man1/foo.1 ¤òõ¤·¡¢
 ¸«¤Ä¤«¤é¤Ê¤±¤ì¤Ð .../man1/foo.1
-¤òõ¤¹¡£¤³¤Î ... ¤Ï¥µ¡¼¥Á¥Ñ¥¹¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¢¤ë¡£
+¤òõ¤¹¡£¤³¤Î ... ¤Ï¸¡º÷¥Ñ¥¹¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¢¤ë¡£
 .TP
 .B "NLSPATH, LC_MESSAGES, LANG"
 .\"O The environment variables
@@ -860,8 +887,8 @@ HTML
 ±Ñ¸ì¤Î¥«¥¿¥í¥°¤ÏɬÍפʤ¤)
 man ¤Ë¸Æ¤Ó½Ð¤µ¤ì¤ë
 .BR col (1)
-¤Î¤è¤¦¤Ê¥×¥í¥°¥é¥à¤â¡¢¤¿¤È¤¨¤Ð LC_CTYPE
-¤Ê¤É¤ò»È¤¦¤³¤È¤ËÃí°Õ¤¹¤ë¤³¤È¡£
+¤Î¤è¤¦¤Ê¥×¥í¥°¥é¥à¤Ï¡¢LC_CTYPE
+¤È¤¤¤Ã¤¿ÊÑ¿ô¤â¤Þ¤¿»È¤¦¤³¤È¤ËÃí°Õ¤¹¤ë¤³¤È¡£
 .TP
 .B PATH
 .\"O .B PATH
@@ -879,7 +906,10 @@ man 
 .\"O .B \-m
 .\"O option). 
 .B SYSTEM
-¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥·¥¹¥Æ¥à̾¤òÆÀ¤ë¤Î¤Ë»È¤ï¤ì¤ë
+¤Ï
+(¸½ºß¤Î¥·¥¹¥Æ¥à¤«¤é¡¢Â¾¤Î¥·¥¹¥Æ¥à¤Ë¤Ä¤¤¤Æ¤Î¥Þ¥Ë¥å¥¢¥ë¤Ë¥¢¥¯¥»¥¹
+¤Ç¤­¤ë¾ì¹ç¤Ë¤Ï) Ê̤Υ·¥¹¥Æ¥à¤Î¤³¤È¤òµ­½Ò¤·¤¿ man ¥Ú¡¼¥¸·²¤ò
+¸¡º÷¤¹¤ë¾ì¹ç¤Ë¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥·¥¹¥Æ¥à̾¤òÆÀ¤ë¤Î¤Ë»È¤ï¤ì¤ë
 .RB ( \-m
 ¥ª¥×¥·¥ç¥ó¤È°ì½ï¤Ë»È¤¦¤â¤Î¤ÈƱ¤¸)
 .\"O .SH BUGS
@@ -891,16 +921,16 @@ man 
 .\"O put `LESSCHARSET=latin1' in your environment.
 .SH ¥Ð¥°
 .B \-t
-¥ª¥×¥·¥ç¥ó¤Ï troff ¥é¥¤¥¯¤Ê¥×¥í¥°¥é¥à¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
+¥ª¥×¥·¥ç¥ó¤Ï troff ¤ä¤½¤ì¤ÈƱÅù¤Ê¥×¥í¥°¥é¥à¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
 ¾ì¹ç¤Î¤ßÍ­¸ú¤Ç¤¢¤ë¡£
 .br
 ¤â¤·¥Ï¥¤¥Õ¥ó¤Î¤«¤ï¤ê¤Ë¡¢ÅÀÌǤ¹¤ë \e255 ¤ä <AD> ¤¬É½¼¨¤µ¤ì¤¿¾ì¹ç¤Ë¤Ï
 ´Ä¶­ÊÑ¿ô¤Ë 'LESSCHARSET=latin1' ¤òÀßÄꤹ¤ë¤ÈÎɤ¤¡£
 .PP
-(ÌõÃí: ÆüËܸì¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï
+ÌõÃí: ÆüËܸì¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï
 \&'JLESSCHARSET=japanese-euc' ¤Þ¤¿¤Ï 'LESSCHARSET=japanese-euc'
 ¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¡¢¤³¤ÎÊýË¡¤Ç¤ÏÂбþ¤Ç¤­¤Ê¤¤¡£groff ¤Î¥ª¥×¥·¥ç¥ó¤Ç
-\-Tnippon ¤Þ¤¿ \-Tascii ¤ò»ÈÍѤ¹¤ë¤³¤È¡£)
+\-Tnippon ¤Þ¤¿ \-Tascii ¤ò»ÈÍѤ¹¤ë¤³¤È¡£
 .\"O .SH TIPS
 .\"O If you add the line
 .\"O 
@@ -938,7 +968,7 @@ man 
 .\"O Federico Lucifredi <flucifredi@acm.org> is the current maintainer.
 .SH Ãø¼Ô
 .B "man"
-¥Ñ¥Ã¥±¡¼¥¸¤Î¸¶Ãø¼Ô¤Ï John W. Eaton ¤Ç¤¢¤ë¡£
+¥Ñ¥Ã¥±¡¼¥¸¤Î¸¶ºî¼Ô¤Ï John W. Eaton ¤Ç¤¢¤ë¡£
 Zeyd M. Ben-Halim ¤¬ man 1.2 ¤ò¥ê¥ê¡¼¥¹¤·¡¢°ú¤­Â³¤¤¤Æ Andries Brouwer ¤¬
 versions 1.3 ¤«¤é 1.5p ¤Þ¤Ç¤ò¥ê¥ê¡¼¥¹¤·¤¿¡£
 ¸½ºß¤Î¥á¥ó¥Æ¥Ê¡¼¤Ï Federico Lucifredi <flucifredi@acm.org> ¤Ç¤¢¤ë¡£

diff --git a/manual/man/draft/man1/whatis.1 b/manual/man/draft/man1/whatis.1
index 1a1796a..e689135 100644 (file)
--- a/manual/man/draft/man1/whatis.1
+++ b/manual/man/draft/man1/whatis.1
@@ -29,7 +29,7 @@
 .\"O .SH NAME
 .\"O whatis \- search the whatis database for complete words.
 .SH ̾Á°
-whatis \- whatis ¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é´°Á´¤Êñ¸ì¤ò¸¡º÷¤¹¤ë
+whatis \- whatis ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò´°Á´¤Ë°ìÃפ¹¤ëñ¸ì¤Ç¸¡º÷¤¹¤ë
 .\"O .SH SYNOPSIS
 .\"O .BI whatis
 .\"O keyword ...
@@ -44,9 +44,9 @@ keyword ...
 .\"O The whatis database is created using the command /usr/sbin/makewhatis.
 .SH ÀâÌÀ
 .B whatis
-¤Ï¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥»¥Ã¥È¤ò¸¡º÷¤··ë²Ì¤òɸ½à½ÐÎϤËɽ¼¨¤¹¤ë¡£
-¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¤Ï¥·¥¹¥Æ¥à¤Î¥³¥Þ¥ó¥É¤Ë´Ø¤¹¤ëÀâÌÀ¤È¥­¡¼¥ï¡¼¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¡£
-´°Á´¤Ë¥Þ¥Ã¥Á¤·¤¿Ã±¸ì¤Î¤ß¤¬É½¼¨¤µ¤ì¤ë¡£
+¤Ï¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¸¡º÷¤··ë²Ì¤òɸ½à½ÐÎϤËɽ¼¨¤¹¤ë¡£
+¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¤Ï¥·¥¹¥Æ¥à¡¦¥³¥Þ¥ó¥É¤Ê¤É¤Ë´Ø¤¹¤ëÀâÌÀ¤È¥­¡¼¥ï¡¼¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¡£
+ɽ¼¨¤¹¤ë¤Î¤Ï¡¢¥³¥Þ¥ó¥É¤Ê¤É¤Î̾Á°¤¬¥­¡¼¥ï¡¼¥É¤È´°Á´¤Ë°ìÃפ¹¤ë¹àÌܤÀ¤±¤Ç¤¢¤ë¡£
 
 whatis ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï /usr/sbin/makewhatis ¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤ÆºîÀ®¤¹¤ë¡£
 .\"O .SH AUTHOR
@@ -56,7 +56,7 @@ whatis 
 .\"O Federico Lucifredi <flucifredi@acm.org> is the current maintainer.
 .SH Ãø¼Ô
 .B "man"
-¥Ñ¥Ã¥±¡¼¥¸¤Î¸¶Ãø¼Ô¤Ï John W. Eaton ¤Ç¤¢¤ë¡£
+¥Ñ¥Ã¥±¡¼¥¸¤Î¸¶ºî¼Ô¤Ï John W. Eaton ¤Ç¤¢¤ë¡£
 Zeyd M. Ben-Halim ¤¬ man 1.2 ¤ò¥ê¥ê¡¼¥¹¤·¡¢°ú¤­Â³¤¤¤Æ Andries Brouwer ¤¬
 versions 1.3 ¤«¤é 1.5p ¤Þ¤Ç¤ò¥ê¥ê¡¼¥¹¤·¤¿¡£
 ¸½ºß¤Î¥á¥ó¥Æ¥Ê¡¼¤Ï Federico Lucifredi <flucifredi@acm.org> ¤Ç¤¢¤ë¡£

diff --git a/manual/man/draft/man5/man.conf.5 b/manual/man/draft/man5/man.conf.5
index 119b025..7d0f6fb 100644 (file)
--- a/manual/man/draft/man5/man.conf.5
+++ b/manual/man/draft/man5/man.conf.5
@@ -27,10 +27,13 @@ man.conf \- man 
 .\"O An alternative version of this file can be specified with
 ¤³¤Î¥Õ¥¡¥¤¥ë¤Ï
 .BR man (1)
-¥³¥Þ¥ó¥É¤ËÆɤ߹þ¤Þ¤ì¡¢(a) man ¤Î¤¿¤á¸¡º÷¥Ñ¥¹¤ò¤É¤Î¤ä¤Ã¤Æ¹½ÃÛ¤¹¤ë¤«¤Î¾ðÊó¡¢
+¥³¥Þ¥ó¥É¤ËÆɤ߹þ¤Þ¤ì¤ë¡£
+¤½¤ÎÆâÍƤÏ
+(a) man ¤Î¤¿¤á¤Î¸¡º÷¥Ñ¥¹¤ò¤É¤¦¤ä¤Ã¤Æ¹½ÃÛ¤¹¤ë¤«¤Î¾ðÊó¡¢
 (b) nroff, eqn, tbl ¤Ê¤É¤Î¤è¤¦¤Ê man ¤Ë¤è¤Ã¤Æ»ÈÍѤµ¤ì¤ë¤¤¤¯¤Ä¤«¤Î
-¥×¥í¥°¥é¥à¤Î´°Á´¤Ê¥Ñ¥¹Ì¾¡¢(c) ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤´¤È¤ÎŸ³«ÊýË¡¡¢¤Ê¤É¤Î
-¾ðÊó¤ò´Þ¤ó¤Ç¤¤¤ë¡£¤³¤Î¥Õ¥¡¥¤¥ë¤ÎÊ̤ΥС¼¥¸¥ç¥ó¤ò°Ê²¼¤Î¤è¤¦¤Ë
+¥×¥í¥°¥é¥à¤Î´°Á´¤Ê¥Ñ¥¹Ì¾¡¢
+(c) ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤´¤È¤ÎŸ³«ÊýË¡¡¢
+¤«¤é¤Ê¤Ã¤Æ¤¤¤ë¡£¤³¤Î¥Õ¥¡¥¤¥ë¤ÎÊ̤ΥС¼¥¸¥ç¥ó¤ò°Ê²¼¤Î¤è¤¦¤Ë
 »ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
 .LP
 .RS
@@ -39,8 +42,11 @@ man -C private_man.conf ...
 .LP
 .\"O The command names may be provided with options. 
 .\"O Useful options to nroff can be found in grotty(1).
-¥³¥Þ¥ó¥É̾¤Ë¤Ï¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
-nroff ¤Ë´Ø¤·¤Æ¤ÎÊØÍø¤Ê¥ª¥×¥·¥ç¥ó¤ò grotty(1) ¤Ë¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
+.B man.conf
+¤ÎÃæ¤Ç»ØÄꤹ¤ë¥³¥Þ¥ó¥É¤Ë¤Ï¡¢¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
+.BR grotty(1)
+¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¸«¤ì¤Ð¡¢nroff ¤ËÅϤ¹¤È
+ÊØÍø¤Ê¥ª¥×¥·¥ç¥ó¤¬¸«¤Ä¤«¤ë¤À¤í¤¦¡£
 .\"O For example, instead of the default line
 Î㤨¤Ð¡¢¥Ç¥Õ¥©¥ë¥È¤Î
 .LP
@@ -60,7 +66,7 @@ NROFF /usr/bin/groff -mandoc -Tlatin1 -P-u -P-b
 .RE
 .LP
 .\"O in order to suppress underlining and overstriking.
-¤È½ñ¤­¹þ¤à¤³¤È¤¬¤Ç¤­¡¢²¼Àþ¤ä½Å¤ÍÂǤÁ¤òÍÞÀ©¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
+¤È½ñ¤­¹þ¤á¤Ð¡¢²¼Àþ¤ä½Å¤ÍÂǤÁ¤òÍÞÀ©¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
 .\"O .SH FILES
 .SH ¥Õ¥¡¥¤¥ë
 .I "/usr/share/misc/man.conf"
@@ -71,7 +77,7 @@ NROFF /usr/bin/groff -mandoc -Tlatin1 -P-u -P-b
 .\"O Federico Lucifredi <flucifredi@acm.org> is the current maintainer.
 .SH Ãø¼Ô
 .B "man"
-¥Ñ¥Ã¥±¡¼¥¸¤Î¸¶Ãø¼Ô¤Ï John W. Eaton ¤Ç¤¢¤ë¡£
+¥Ñ¥Ã¥±¡¼¥¸¤Î¸¶ºî¼Ô¤Ï John W. Eaton ¤Ç¤¢¤ë¡£
 Zeyd M. Ben-Halim ¤¬ man 1.2 ¤ò¥ê¥ê¡¼¥¹¤·¡¢°ú¤­Â³¤¤¤Æ Andries Brouwer ¤¬
 versions 1.3 ¤«¤é 1.5p ¤Þ¤Ç¤ò¥ê¥ê¡¼¥¹¤·¤¿¡£
 ¸½ºß¤Î¥á¥ó¥Æ¥Ê¡¼¤Ï Federico Lucifredi <flucifredi@acm.org> ¤Ç¤¢¤ë¡£

diff --git a/manual/man/draft/man8/makewhatis.8 b/manual/man/draft/man8/makewhatis.8
index 46bff30..e979ec9 100644 (file)
--- a/manual/man/draft/man8/makewhatis.8
+++ b/manual/man/draft/man8/makewhatis.8
@@ -50,13 +50,13 @@ makewhatis \- whatis 
 .\"O NAME section of the manual page.
 .SH ÀâÌÀ
 .B makewhatis
-¤Ï°ú¿ô¤ÇÍ¿¤¨¤é¤ì¤¿ \fImanpath\fP ¤Î¤¦¤Á¤Î \fIsections\fP
-¤Ë¤¢¤ëÁ´¤Æ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ä¡¢ \fIcatpath\fP ¤Î¤¦¤Á¤Î
-\fIsections\fP ¤Ë¤¢¤ëÁ´¤Æ¤Î¥Õ¥©¡¼¥Þ¥Ã¥ÈºÑ¤ß¥Ú¡¼¥¸¤òÆɤ߹þ¤à¡£
+¤Ï°ú¿ô¤ÇÍ¿¤¨¤é¤ì¤¿¡¢ \fImanpath\fP Ãæ¤Î \fIsections\fP
+¤Ë¤¢¤ëÁ´¤Æ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ä¡¢ \fIcatpath\fP Ãæ¤Î
+\fIsections\fP ¤Ë¤¢¤ëÁ´¤Æ¤ÎÀ°·ÁºÑ¤ß¥Ú¡¼¥¸¤òÆɤ߹þ¤à¡£
 ¤½¤ì¤¾¤ì¤Î¥Ú¡¼¥¸¤ËÂФ·¡¢
 .B makewhatis
-¤Ï°ì¤Ä¤Î¹Ô¤ò whatis ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë½ñ¤­¹þ¤à¡£
-³Æ¹Ô¤Ë¤Ï¥Ú¡¼¥¸¤Î̾Á°¤Èû¤¤ÀâÌÀ¤¬¡¢¥À¥Ã¥·¥å (\-) ¤Ç¶èÀÚ¤é¤ì¤¿¤«¤¿¤Á¤Ç
+¤Ï°ì¹Ô¤Î¾ðÊó¤ò whatis ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë½ñ¤­¹þ¤à¡£
+³Æ¹Ô¤Ë¤Ï¥Ú¡¼¥¸¤Î̾Á°¤È´Êñ¤ÊÀâÌÀ¤¬¡¢¥À¥Ã¥·¥å (\-) ¤Ç¶èÀÚ¤é¤ì¤¿¤«¤¿¤Á¤Ç
 µ­½Ò¤µ¤ì¤ë¡£ÀâÌÀ¤Ï¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Î NAME (̾Á°¡¦Ì¾¾Î) ¥»¥¯¥·¥ç¥ó
 ¤ÎÆâÍƤ«¤éÃê½Ð¤µ¤ì¤ë¡£
 .LP
@@ -64,10 +64,12 @@ makewhatis \- whatis 
 .\"O .B makewhatis
 .\"O recognizes the equivalent terms in Czech, Italian, Finnish, French,
 .\"O German and Spanish.
-±Ñ¸ì°Ê³°¤Î¸À¸ì¤Ç¤Ï NAME °Ê³°¤ÎÍѸì¤ò¥»¥¯¥·¥ç¥ó̾¤ËÍѤ¤¤ë¤¿¤á¡¢
+±Ñ¸ì°Ê³°¤Î¸À¸ì¤Ç¤Ï NAME °Ê³°¤ÎÍѸì¤ò¥»¥¯¥·¥ç¥ó̾¤ËÍѤ¤¤ë
+(¸À¸ì¤Ë¤è¤Ã¤Æ NAME ¥»¥¯¥·¥ç¥ó¤Î¸«½Ð¤·¤Ë»È¤¦ÍѸ줬°Û¤Ê¤Ã¤Æ¤¤¤ë)¡£
+¤½¤³¤Ç
 .B makewhatis
-¤Ï¤³¤ì¤ËÅù²Á¤Êñ¸ì¤ò¥Á¥§¥³¸ì¡¢¥¤¥¿¥ê¥¢¸ì¡¢¥Õ¥£¥ó¥é¥ó¥É¸ì¡¢¥Õ¥é¥ó¥¹¸ì¡¢
-¥É¥¤¥Ä¸ì¡¢¥¹¥Ú¥¤¥ó¸ì¤ËÂФ·¤Æǧ¼±¤¹¤ë¡£
+¤Ï±Ñ¸ì¤Î NAME ¤ËÁêÅö¤¹¤ë¡¢¥Á¥§¥³¸ì¡¢¥¤¥¿¥ê¥¢¸ì¡¢¥Õ¥£¥ó¥é¥ó¥É¸ì¡¢¥Õ¥é¥ó¥¹¸ì¡¢
+¥É¥¤¥Ä¸ì¡¢¥¹¥Ú¥¤¥ó¸ì¤Îñ¸ì¤òǧ¼±¤¹¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¡£
 .LP
 .BR ÌõÃí :
 JM ¤Ë¤¢¤ëÆüËܸì¥Ñ¥Ã¥Á¤òÅö¤Æ¤¿ makewhatis ¤Ï¡¢
@@ -79,7 +81,7 @@ JM 
 .\"O .I /usr/man
 .\"O is assumed by default.
 .I manpath
-°ú¿ô¤¬Í¿¤¨¤é¤ì¤Ê¤±¤ì¤Ð¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï
+°ú¿ô¤¬»ØÄꤵ¤ì¤Ê¤±¤ì¤Ð¡¢¥Ç¥Õ¥©¥ë¥È¤Î
 .I /usr/man
 ¤òÍѤ¤¤ë¡£
 .\"O .SH OPTIONS
@@ -89,7 +91,7 @@ JM 
 .\"O Update database with new pages.
 ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ú¡¼¥¸¤Î¾ðÊó¤Ç¹¹¿·¤¹¤ë¡£
 .TP
-.\"O .B -v
+.B -v
 Verbose output
 ñÁÀå¤Ê½ÐÎϤò¤¹¤ë¡£
 .TP
@@ -107,9 +109,9 @@ manpath 
 .IR manpath " ¤Þ¤¿¤Ï " catpath
 ¤Î
 .I sections
-¤ò¤ß¤ë¡£
+¤ò¸«¤ë¡£
 ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò¾Êά¤¹¤ë¤È¡¢MANSECT ´Ä¶­ÊÑ¿ô¤¬ÍѤ¤¤é¤ì¤ë¡£
-MANSECT ´Ä¶­ÊÑ¿ô¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢man.conf ¤Ë¤¢¤ë MANSECT ¤Î
+MANSECT ´Ä¶­ÊÑ¿ô¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢man.conf ¤Ë¤¢¤ë MANSECT ¤Î
 ÀßÄ꤬ÍѤ¤¤é¤ì¤ë¡£
 .TP 
 .BI -c " catpath"
@@ -119,10 +121,10 @@ MANSECT 
 .\"O first existing directory between
 .\"O .IR /usr/man/preformat " and " /usr/man .
 .I catpath
-¤ËÃÖ¤«¤ì¤¿¥Õ¥©¡¼¥Þ¥Ã¥ÈºÑ¤ß¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¥¹¥­¥ã¥ó¤¹¤ë¡£
-¤³¤Î°ú¿ô¤ò¾Êά¤¹¤ë¤È¡¢
+¤ËÃÖ¤«¤ì¤¿À°·ÁºÑ¤ß¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¥¹¥­¥ã¥ó¤¹¤ë¡£
+¤³¤Î¥ª¥×¥·¥ç¥ó¤Î°ú¿ô¤ò¾Êά¤¹¤ë¤È¡¢
 .IR /usr/man/preformat " ¤È " /usr/man
-¤ÎÀè¤Ë¸«ÉÕ¤«¤Ã¤¿¤Û¤¦¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬²¾Äꤵ¤ì¤ë¡£
+¤Î¤¦¤Á¡¢Â¸ºß¤¹¤ëºÇ½é¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬²¾Äꤵ¤ì¤ë¡£
 .\"O .SH EXAMPLES
 .SH Îã
 .PP
@@ -150,7 +152,7 @@ LANGUAGE=fi:fr:it makewhatis -w
 .PP
 .B makewhatis
 .\"O does not work on preformatted translations.
-¤ÏËÝÌõÈǤΥե©¡¼¥Þ¥Ã¥ÈºÑ¤ß¥Ú¡¼¥¸¤Ë¤ÏÆ°ºî¤Ç¤­¤Ê¤¤¡£
+¤ÏËÝÌõÈǤÎÀ°·ÁºÑ¤ß¥Ú¡¼¥¸¤Ë¤ÏÆ°ºî¤Ç¤­¤Ê¤¤¡£
 .\"O .SH AUTHOR
 .\"O John W. Eaton was the original author of 
 .\"O .BR "man" . 
@@ -158,7 +160,7 @@ LANGUAGE=fi:fr:it makewhatis -w
 .\"O Federico Lucifredi <flucifredi@acm.org> is the current maintainer.
 .SH Ãø¼Ô
 .B "man"
-¥Ñ¥Ã¥±¡¼¥¸¤Î¸¶Ãø¼Ô¤Ï John W. Eaton ¤Ç¤¢¤ë¡£
+¥Ñ¥Ã¥±¡¼¥¸¤Î¸¶ºî¼Ô¤Ï John W. Eaton ¤Ç¤¢¤ë¡£
 Zeyd M. Ben-Halim ¤¬ man 1.2 ¤ò¥ê¥ê¡¼¥¹¤·¡¢°ú¤­Â³¤¤¤Æ Andries Brouwer ¤¬
 versions 1.3 ¤«¤é 1.5p ¤Þ¤Ç¤ò¥ê¥ê¡¼¥¹¤·¤¿¡£
 ¸½ºß¤Î¥á¥ó¥Æ¥Ê¡¼¤Ï Federico Lucifredi <flucifredi@acm.org> ¤Ç¤¢¤ë¡£

diff --git a/manual/man/translation_list b/manual/man/translation_list
index 771972e..83eacb2 100644 (file)
--- a/manual/man/translation_list
+++ b/manual/man/translation_list
@@ -1,8 +1,8 @@
-◆:man:1.5j=>1.6g:2005/09/19:apropos:1:2011/03/04::tati@kc5.so-net.ne.jp:TACHIBANA Akira:
+◆:man:1.5j=>1.6g:2005/09/19:apropos:1:2011/03/24::tati@kc5.so-net.ne.jp:TACHIBANA Akira:
 ○:man:1.6g:1998/01/19:hman:1:1999/12/06::nakano@apm.seikei.ac.jp:NAKANO Takeo:
-◆:man:1.5j=>1.6g:2005/09/19:man:1:2011/03/04::tati@kc5.so-net.ne.jp:TACHIBANA Akira:
+◆:man:1.5j=>1.6g:2005/09/19:man:1:2011/03/23::tati@kc5.so-net.ne.jp:TACHIBANA Akira:
 ☆:man:1.5j=>1.6g:1998/01/01:man2html:1:1998/03/05::nakano@apm.seikei.ac.jp:NAKANO Takeo:
 ☆:man:1.5j=>1.6g:1999/07/14:manlint:1:2002/01/15::ysato@h4.dion.ne.jp:Yuichi SATO:
-◆:man:1.5j=>1.6g:2005/09/19:whatis:1:2011/03/04::tati@kc5.so-net.ne.jp:TACHIBANA Akira:
-◆:man:1.5j=>1.6g:2005/09/19:man.conf:5:2011/03/04::tati@kc5.so-net.ne.jp:TACHIBANA Akira:
-◆:man:1.5j=>1.6g:2005/09/19:makewhatis:8:2011/03/04::tati@kc5.so-net.ne.jp:TACHIBANA Akira:
+◆:man:1.5j=>1.6g:2005/09/19:whatis:1:2011/03/24::tati@kc5.so-net.ne.jp:TACHIBANA Akira:
+◆:man:1.5j=>1.6g:2005/09/19:man.conf:5:2011/03/24::tati@kc5.so-net.ne.jp:TACHIBANA Akira:
+◆:man:1.5j=>1.6g:2005/09/19:makewhatis:8:2011/03/24::tati@kc5.so-net.ne.jp:TACHIBANA Akira: