rpms/man-pages-ja/devel man-pages-ja-486655-mkfs.8.patch, NONE, 1.1 man-pages-ja-509048-less.1.patch, NONE, 1.1 man-pages-ja-515467-strings.1.patch, NONE, 1.1 man-pages-ja-527638-chgrp.1.patch, NONE, 1.1 man-pages-ja-537103-ip.7.patch, NONE, 1.1 man-pages-ja-fix-configure.perl.patch, NONE, 1.1 man-pages-ja-fix-mdoc.patch, NONE, 1.1 man-pages-ja.spec, 1.75, 1.76 man-pages-ja-20010515-rh.patch, 1.1, NONE man-pages-ja-20011115-fixpipe.patch, 1.1, NONE man-pages-ja-20030415-utf8.patch, 1.1, NONE man-pages-ja-fix-uninitialized-value.patch, 1.1, NONE man-pages-ja-fixpipe.patch, 1.1, NONE man-pages-ja-timestamp.patch, 1.1, NONE

Akira TAGOH tagoh at fedoraproject.org
Thu Dec 24 06:20:57 UTC 2009


Author: tagoh

Update of /cvs/pkgs/rpms/man-pages-ja/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2189

Modified Files:
	man-pages-ja.spec 
Added Files:
	man-pages-ja-486655-mkfs.8.patch 
	man-pages-ja-509048-less.1.patch 
	man-pages-ja-515467-strings.1.patch 
	man-pages-ja-527638-chgrp.1.patch 
	man-pages-ja-537103-ip.7.patch 
	man-pages-ja-fix-configure.perl.patch 
	man-pages-ja-fix-mdoc.patch 
Removed Files:
	man-pages-ja-20010515-rh.patch 
	man-pages-ja-20011115-fixpipe.patch 
	man-pages-ja-20030415-utf8.patch 
	man-pages-ja-fix-uninitialized-value.patch 
	man-pages-ja-fixpipe.patch man-pages-ja-timestamp.patch 
Log Message:
* Thu Dec 24 2009 Akira TAGOH <tagoh at redhat.com> - 20091215-1
- updates to 20091215.
- apply some patches to correct typos:
  - man-pages-ja-486655-mkfs.8.patch
  - man-pages-ja-509048-less.1.patch
  - man-pages-ja-515467-strings.1.patch
  - man-pages-ja-527638-chgrp.1.patch
  - man-pages-ja-537103-ip.7.patch
  - man-pages-ja-fix-mdoc.patch
- clean up the spec file.

man-pages-ja-486655-mkfs.8.patch:
 mkfs.8 |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE man-pages-ja-486655-mkfs.8.patch ---
--- man-pages-ja-20060815/manual/util-linux/man8/mkfs.8.orig	2009-02-20 15:50:00.000000000 -0500
+++ man-pages-ja-20060815/manual/util-linux/man8/mkfs.8	2009-02-20 15:49:55.000000000 -0500
@@ -32,8 +32,6 @@
 .I filesys
 ¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤òºîÀ®¤¹¤ë¥Ç¥Ð¥¤¥¹¤Î̾Á°
 .RI ( /dev/hda1 , /dev/sdb2
-¤Ê¤É) ¤Þ¤¿¤Ï¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È
-.RI ( / , /usr , /home
 ¤Ê¤É) ¤Ç¤¢¤ë¡£
 .I blocks
 ¤ÏºîÀ®¤¹¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ö¥í¥Ã¥¯¿ô¤Ç¤¢¤ë¡£

man-pages-ja-509048-less.1.patch:
 less.1 |  268 +++++++++++++++++------------------------------------------------
 1 file changed, 74 insertions(+), 194 deletions(-)

--- NEW FILE man-pages-ja-509048-less.1.patch ---
--- man-pages-ja-20060815.orig/manual/GNU_less/man1/less.1	2006-08-15 00:07:06.000000000 +0900
+++ man-pages-ja-20060815/manual/GNU_less/man1/less.1	2009-11-17 17:53:46.000000000 +0900
@@ -34,17 +34,15 @@
 .br
 .B "less --version"
 .br
-.B "less [-[+]aBcCdeEfgGiImMnNqQrsSuUVWwXZ]"
+.B "less [-[+]aBcCdeEfFgGiIJKLmMnNqQrRsSuUVwWX~]"
 .br
-.B "     [-b \fIbufs\fP] [-h \fIlines\fP] [-j \fIline\fP] [-k \fIkeyfile\fP]"
+.B "     [-b \fIspace\fP] [-h \fIlines\fP] [-j \fIline\fP] [-k \fIkeyfile\fP]"
 .br
-.B "     [-K \fIcharacter set\fP] [-{oO} \fIlogfile\fP]"
+.B "     [-{oO} \fIlogfile\fP] [-p \fIpattern\fP] [-P \fIprompt\fP] [-t \fItag\fP]"
 .br
-.B "     [-p \fIpattern\fP] [-P \fIprompt\fP] [-t \fItag\fP]"
+.B "     [-T \fItagsfile\fP] [-x \fItab\fP,...] [-y \fIlines\fP] [-[z] \fIlines\fP]"
 .br
-.B "     [-T \fItagsfile\fP] [-x \fItab\fP] [-y \fIlines\fP] [-[z] \fIlines\fP]"
-.br
-.B "     [+[+]\fIcmd\fP] [--] [\fIfilename\fP]..."
+.B "     [-# \fIshift\fP] [+[+]\fIcmd\fP] [--] [\fIfilename\fP]..."
 .br
 (Ť¤¥ª¥×¥·¥ç¥ó̾¤ò»È¤¦Ê̤νñ¼°¤Ë¤Ä¤¤¤Æ¤Ï¡¢
 ¥ª¥×¥·¥ç¥ó¤Î¥»¥¯¥·¥ç¥ó¤ò»²¾È¤¹¤ë¤³¤È¡£)
@@ -297,17 +295,16 @@
 ¿ô»ú N ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë»þ¤Ï¡¢Âè N ÈÖÌܤΥե¡¥¤¥ë¤òÆɤ߹þ¤à¡£
 .IP ":d"
 ¸½ºß¤Î¥Õ¥¡¥¤¥ë¤ò¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤«¤é¼è¤ê½ü¤¯¡£
+.IP t
+¸½ºß¤Î¥¿¥°¤Ë 1 ¤Ä°Ê¾å¥Þ¥Ã¥Á¤¹¤ë¤â¤Î¤¬¤¢¤ì¤Ð¡¢¼¡¤Î¥¿¥°¤Ø°ÜÆ°¤¹¤ë¡£
+¥¿¥°¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ¤Ï -t ¥ª¥×¥·¥ç¥ó¤ò»²¾È¡£
+.IP T
+¸½ºß¤Î¥¿¥°¤Ë 1 ¤Ä°Ê¾å¥Þ¥Ã¥Á¤¹¤ë¤â¤Î¤¬¤¢¤ì¤Ð¡¢Á°¤Î¥¿¥°¤Ø°ÜÆ°¤¹¤ë¡£
 .IP "= ¤Þ¤¿¤Ï ^G ¤Þ¤¿¤Ï :f"
 ±ÜÍ÷Ãæ¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¡¢¥Õ¥¡¥¤¥ë̾¡¦
 ɽ¼¨Ãæ¤ÎºÇ½ª¹Ô¤Î¹ÔÈֹ桦¥Ð¥¤¥È¥ª¥Õ¥»¥Ã¥È¤È¤¤¤Ã¤¿¾ðÊó¤òɽ¼¨¤¹¤ë¡£
 ²Äǽ¤Ê¾ì¹ç¤Ë¤Ï¡¢¥Õ¥¡¥¤¥ë¤ÎŤµ¡¦¥Õ¥¡¥¤¥ë¤Î¹Ô¿ô¡¦
 ɽ¼¨¤µ¤ì¤Æ¤¤¤ëºÇ½ª¹Ô¤Þ¤Ç¤Î¥Ñ¡¼¥»¥ó¥È¤âɽ¼¨¤¹¤ë¡£
-.IP "@"
-¸½ºß¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¡¢¥³¡¼¥Éǧ¼±Ë¡¤ò½çÈÖ¤ËÊѹ¹¤¹¤ë¡£
-³ÈÄ¥¤·¤¿
-.I less
-¤Ë¤Ï¡¢(´Ä¶­ÊÑ¿ô JLESSCHARSET ¤ÇÁª¤Ð¤ì¤ë) ¥Ç¥Õ¥©¥ë¥È, japanese, ujis, sjis,
-iso8, noconv, none ¤È¤¤¤¦ 7 ¼ïÎà¤Î¥³¡¼¥Éǧ¼±Ë¡¤¬¤¢¤ë¡£
 .IP \-
 ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥óʸ»ú (²¼µ­¤Î¥ª¥×¥·¥ç¥ó¤ò»²¾È) ¤Î¤¦¤Á¤Î 1 ¤Ä¤ò
 ³¤±¤ÆÆþÎϤ¹¤ë¤³¤È¤Ç¡¢
@@ -411,7 +408,7 @@
 ¤½¤ì°Ê¹ß¤Îʸ»ú¤ÏÂçʸ»ú¤Ç¤â¾®Ê¸»ú¤Ç¤â¹½¤ï¤Ê¤¤¡£
 Î㤨¤Ð¡¢--Quit-at-eof ¤Ï --QUIT-AT-EOF ¤ÈÅù¤·¤¤¡£
 .PP
-´Ä¶­ÊÑ¿ô "LESS" ¤È "JLESS" ¤ÎÃͤ⥪¥×¥·¥ç¥ó¤È¤·¤Æ»È¤ï¤ì¤ë¡£
+´Ä¶­ÊÑ¿ô "LESS" ¤ÎÃͤ⥪¥×¥·¥ç¥ó¤È¤·¤Æ»È¤ï¤ì¤ë¡£
 Î㤨¤Ð¡¢
 .I less
 ¤òµ¯Æ°¤¹¤ë¤¿¤Ó¤Ë "less -options ..." ¤È¥¿¥¤¥×¤¹¤ë¤Î¤òÈò¤±¤ë¤¿¤á¤Ë¡¢
@@ -431,8 +428,8 @@
 ¥Ñ¡¼¥»¥ó¥Èµ­¹æ¤ò 2 ¤Ä¤Î¥Ñ¡¼¥»¥ó¥Èµ­¹æ¤ËÃÖ¤­´¹¤¨¤ëɬÍפ¬¤¢¤ë¡£
 .sp
 ´Ä¶­ÊÑ¿ô¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó¤è¤êÀè¤Ë²òÀϤµ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
-¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ï´Ä¶­ÊÑ¿ô LESS ¤ª¤è¤Ó JLESS ¤ò¾å½ñ¤­¤¹¤ë¡£
-¤â¤·¡¢¤¢¤ë¥ª¥×¥·¥ç¥ó¤¬´Ä¶­ÊÑ¿ô LESS ¤Þ¤¿¤Ï JLESS ¤Ë¤¢¤Ã¤Æ¤â¡¢
+¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ï´Ä¶­ÊÑ¿ô LESS ¤ò¾å½ñ¤­¤¹¤ë¡£
+¤â¤·¡¢¤¢¤ë¥ª¥×¥·¥ç¥ó¤¬´Ä¶­ÊÑ¿ô LESS ¤Ë¤¢¤Ã¤Æ¤â¡¢
 ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó "\-+" ¤Çµ¯Æ°¤¹¤ì¤Ð¡¢
 ¤½¤Î¥ª¥×¥·¥ç¥ó¤ò¥Ç¥Õ¥©¥ë¥È¤ÎÃͤ˥ꥻ¥Ã¥È¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
 .sp
@@ -567,10 +564,18 @@
 ¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¢¤½¤ì¤â
 .I lesskey
 ¥Õ¥¡¥¤¥ë¤È¤·¤Æ»È¤ï¤ì¤ë¡£
-.IP -K\fIcharset\fP
+.IP "-K ¤Þ¤¿¤Ï --quit-on-intr"
+¥¤¥ó¥¿¥é¥×¥Èʸ»ú (Ä̾ï¤Ï ^C) ¤òÆþÎϤ·¤¿»þ¡¢¤¹¤°¤µ¤Þ
+.I less
+¤ò½ªÎ»¤µ¤»¤ë¡£Ä̾磻¥ó¥¿¥é¥×¥Èʸ»ú¤Ï²¿¤ò¤·¤Æ¤¤¤è¤¦¤È¤â
 .I less
-¤Ë¡¢´Ä¶­ÊÑ¿ô JLESSCHARSET ¤â¤·¤¯¤Ï LESSCHARSET ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë
-ʸ»ú¥»¥Ã¥È¤ÎÂå¤ï¤ê¤È¤·¤Æ¡¢»ØÄꤷ¤¿Ê¸»ú¥»¥Ã¥È¤ò»È¤ï¤»¤ë¡£
+¤òÄä»ß¤µ¤»¡¢¥³¥Þ¥ó¥É¥×¥í¥ó¥×¥È¤òÊÖ¤¹¡£
+.IP "-L ¤Þ¤¿¤Ï --no-lessopen"
+´Ä¶­ÊÑ¿ô LESSOPEN ¤ò̵»ë¤¹¤ë (°Ê²¼¤Î¡ÖÆþÎÏ¥×¥ê¥×¥í¥»¥Ã¥µ¡×¥»¥¯¥·¥ç¥ó¤ò»²¾È)¡£
+¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï
+.I less
+¤ÎÃ椫¤éÀßÄê²Äǽ¤À¤¬¡¢¤½¤ì°Ê¹ß³«¤¤¤¿¥Õ¥¡¥¤¥ë¤Ë¤Î¤ßŬÍѤµ¤ì¡¢
+¸½ºß³«¤¤¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Ë¤ÏŬÍѤµ¤ì¤Ê¤¤¡£
 .IP "-m ¤Þ¤¿¤Ï --long-prompt"
 .I less
 ¤Ë¡¢(\fImore\fP ¤Î¤è¤¦¤Ë) ¾ÜºÙ¤Ê¥Ñ¡¼¥»¥ó¥Èɽ¼¨¤Î¥×¥í¥ó¥×¥È¤ò½Ð¤µ¤»¤ë¡£
@@ -625,8 +630,8 @@
 ¤³¤Î¥ª¥×¥·¥ç¥ó¤ÏÄ̾
 .I less
 ¥³¥Þ¥ó¥É¤ò¸Æ¤Ó½Ð¤¹¤¿¤Ó¤ËÂǤÁ¹þ¤ó¤À¤ê¤»¤º¤Ë¡¢
-´Ä¶­ÊÑ¿ô LESS ¤ª¤è¤Ó JLESS ¤Ç»ØÄꤹ¤ë¡£
-¤½¤Î¤è¤¦¤Ê¥ª¥×¥·¥ç¥ó¤Ï¡¢´Ä¶­ÊÑ¿ô LESS ¤ª¤è¤Ó JLESS ¤ÎÃæ¤Ç
+´Ä¶­ÊÑ¿ô LESS ¤Ç»ØÄꤹ¤ë¡£
+¤½¤Î¤è¤¦¤Ê¥ª¥×¥·¥ç¥ó¤Ï¡¢´Ä¶­ÊÑ¿ô LESS ¤ÎÃæ¤Ç
 ºÇ¸å¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¡¢
 ¤â¤·¤¯¤Ï¡¢¥À¥é¡¼µ­¹æ¤Ç½ªÎ»¤·¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
 -Ps ¤Î¸å¤Ëʸ»úÎó¤ò³¤±¤ë¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î (û¤¤) ¥×¥í¥ó¥×¥È¤ò
@@ -731,13 +736,20 @@
 ɽ¼¨¤Ç¤­¤Ê¤¤¸í¤Ã¤¿Ê¸»ú¤òɽ¼¨¤¹¤ë¤¿¤á¤Ë¡¢
 ¥Þ¡¼¥¯Ê¸»ú (¢®) ¤¬»È¤ï¤ì¤ë¤è¤¦¤Ë¤¹¤ë¡£
 ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¤½¤Î¤è¤¦¤Êɽ¼¨¤Ç¤­¤Ê¤¤¸í¤Ã¤¿Ê¸»ú¤Ï¡¢¥Ð¥¤¥Ê¥ê¤È¤·¤Æɽ¼¨¤µ¤ì¤ë¡£
-.IP "-x\fIn\fP ¤Þ¤¿¤Ï --tabs=\fIn\fP"
-¥¿¥Ö¥¹¥È¥Ã¥×¤ò \fIn\fP ʸ»ú¤ËÀßÄꤹ¤ë¡£
+.IP "-x\fIn\fP,... ¤Þ¤¿¤Ï --tabs=\fIn\fP,..."
+¥¿¥Ö¥¹¥È¥Ã¥×¤ò \fIn\fP ʸ»ú¤ËÀßÄꤹ¤ë¡£\fIn\fP ¤ò¤Ò¤È¤Ä¤À¤±»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢
+\fIn\fP ¤ÎÇÜ¿ô¤Ç¥¿¥Ö¥¹¥È¥Ã¥×¤¬ÀßÄꤵ¤ì¤ë¡£¥³¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤¿Ê£¿ô¤ÎÃͤò»ØÄꤷ¤¿¾ì¹ç¡¢
+¤½¤ì¤é¤Î°ÌÃ֤˥¿¥Ö¥¹¥È¥Ã¥×¤ÏÀßÄꤵ¤ì¡¢ºÇ¸å¤ÎÆó¤Ä¤ÈƱ¤¸´Ö³Ö¤Ç³¤¯¡£Î㤨¤Ð¡¢
+\fI\-x9,17\fP ¤Ï 9, 17, 25, 33 ¤Î¤è¤¦¤Ê°ÌÃ֤ǥ¿¥Ö¤¬ÀßÄꤵ¤ì¤ë¡£
 \fIn\fP ¤Î¥Ç¥Õ¥©¥ë¥È¤Ï 8 ¤Ç¤¢¤ë¡£
 .IP "-X ¤Þ¤¿¤Ï --no-init"
 üËö¤Ë¡¢termcap ½é´ü²½Ê¸»úÎó¤ÈÈó½é´ü²½Ê¸»úÎó¤òÁ÷¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¡£
 ¤³¤ì¤Ï¡¢²èÌ̤ò¥¯¥ê¥¢¤¹¤ë¤È¤­¤Î¤è¤¦¤ËÈó½é´ü²½Ê¸»úÎó¤¬ÉÔɬÍפʾì¹ç¤Ë¤Ï¡¢
 ˾¤Þ¤·¤¤¤³¤È¤¬¤¢¤ë¡£
+.IP "--no-keypad"
+üËö¤Ë¡¢keypad ½é´ü²½Ê¸»úÎó¤ÈÈó½é´ü²½Ê¸»úÎó¤òÁ÷¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¡£
+¤³¤ì¤Ï¡¢¥Æ¥ó¥­¡¼¤ò¹½À®¤¹¤ë keypad ʸ»úÎ󤬹¥¤Þ¤·¤¯¤Ê¤¤¤ä¤êÊý¤Ç¿¶¤ëÉñ¤¦¾ì¹ç¤Ë¤Ï¡¢
+˾¤Þ¤·¤¤¤³¤È¤¬¤¢¤ë¡£
 .IP "-y\fIn\fP ¤Þ¤¿¤Ï --max-forw-scroll=\fIn\fP"
 Á°Êý¤Ë¿Ê¤àºÇÂç¹Ô¿ô¤ò»ØÄꤹ¤ë¡£
 ¤â¤·¡¢\fIn\fP ¹Ô¤ò¾å²ó¤Ã¤ÆÁ°Êý¤Ë¿Ê¤àɬÍפ¬¤¢¤ë¾ì¹ç¤Ï¡¢
@@ -760,10 +772,6 @@
 ¥¦¥¤¥ó¥É¥¦¤ò 20 ¹Ô¤ËÀßÄꤹ¤ë¤³¤È¤ò°ÕÌ£¤·¤Æ¤¤¤ë¡£
 ¤µ¤é¤Ë¡¢²èÌÌ¥µ¥¤¥º¤¬ 40 ¹Ô¤ËÊѹ¹¤µ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢
 ¼«Æ°Åª¤Ë¥¹¥¯¥í¡¼¥ë¥¦¥¤¥ó¥É¥¦¤Ï 36 ¹Ô¤ËÊѹ¹¤µ¤ì¤ë¡£
-.IP -Z
-´Ä¶­ÊÑ¿ô JLESSCHARSET ¤Ç "japanese" ¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
-UJIS ¤è¤ê¤â SJIS ¤ÎÍ¥ÀèÅÙ¤ò¹â¤¯¤¹¤ë¡£
-¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢SJIS ¤è¤ê¤â UJIS ¤ÎÍ¥ÀèÅÙ¤¬¹â¤¤¡£
 .IP -"\fIcc\fP\ or\ --quotes=\fIcc\fP
 ¥Õ¥¡¥¤¥ë̾¤ò°úÍѤ¹¤ëʸ»ú¤òÊѹ¹¤¹¤ë¡£
 ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥¹¥Ú¡¼¥¹¤È¥À¥Ö¥ë¥¯¥©¡¼¥Æ¡¼¥·¥ç¥ó¥Þ¡¼¥¯¤ÎξÊý¤ò´Þ¤à̾Á°¤ò
@@ -1051,14 +1059,7 @@
 .PP
 ¡Öʸ»ú¥»¥Ã¥È¡×¤È¤Ï¡¢´Ê·é¤Ë¤¤¤¦¤È¡¢¤É¤Îʸ»ú¤¬¥Î¡¼¥Þ¥ëʸ»ú¡¦À©¸æʸ»ú¡¦¥Ð¥¤¥Ê¥ê
 ʸ»ú¤È¤µ¤ì¤ë¤«¡¢¤È¤¤¤¦¤³¤È¤Ç¤¢¤ë¡£
-´Ä¶­ÊÑ¿ô JLESSCHARSET ¤È LESSCHARSET ¤¬Ê¸»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¤Î¤Ë»È¤ï¤ì¤ë¡£
-.I less
-¤Î¥×¥í¥°¥é¥àÃæ¤Ç¡¢¤³¤Î 2 ¤Ä¤Î´Ä¶­ÊÑ¿ô¤Ë°ã¤¤¤Ï¤Ê¤¤¤¬¡¢
-´Ä¶­ÊÑ¿ô JLESSCHARSET ¤ò»È¤¦¤³¤È¤ò´«¤á¤ë¡£
-¤Ê¤¼¤Ê¤é¡¢´Ä¶­ÊÑ¿ô LESSCHARSET ¤Ë³Èĥʸ»ú¥»¥Ã¥È¤òÀßÄꤷ¤Æ¤¤¤ë¤È¡¢
-³Èĥʸ»ú¥»¥Ã¥È¤Î»È¤¨¤Ê¤¤
-.I less
-¤¬¥¨¥é¡¼¤òµ¯¤³¤¹¤«¤é¤Ç¤¢¤ë¡£
+´Ä¶­ÊÑ¿ô LESSCHARSET ¤¬Ê¸»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¤Î¤Ë»È¤ï¤ì¤ë¡£
 ¤³¤Î´Ä¶­ÊÑ¿ô¤ËÀßÄê¤Ç¤­¤ëÃͤò°Ê²¼¤Ë¼¨¤¹¡£
 .IP ascii
 BS, TAB, NL, CR, formfeed ¤¬À©¸æʸ»ú¤Ç¤¢¤ë¡£
@@ -1068,159 +1069,22 @@
 160 ¤«¤é 255 ¤Þ¤Ç¤Îʸ»ú¤¬¥Î¡¼¥Þ¥ë¤È¤·¤Æ°·¤ï¤ì¤ë°Ê³°¤Ï¡¢ASCII ¤ÈƱ¤¸¤Ç¤¢¤ë¡£
 .IP latin1
 iso8859 ¤ÈƱ¤¸¡£
+.IP latin9
+iso8859 ¤ÈƱ¤¸¡£
 .IP dos
 MS-DOS ÍѤÎʸ»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¡£
 .IP ebcdic
 EBCDIC ʸ»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¡£
+.IP IBM-1047
+OS/390 Unix¥µ¡¼¥Ó¥¹¤Ç»È¤ï¤ì¤ë EBCDIC ʸ»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¡£¤³¤ì¤Ï latin1 ¤ÎÎà»÷ʪ¤Ç¤¢¤ë¡£LESSCHARSET=IBM-1047 ¤¢¤ë¤¤¤Ï LC_CTYPE=en_US ¤Î¤É¤Á¤é¤«¤òÀßÄꤹ¤ë¤³¤È¤Ë¤è¤ê¡¢»÷¤¿¤è¤¦¤Ê·ë²Ì¤ò¤â¤¿¤é¤¹¡£
 .IP koi8-r
 ¥í¥·¥¢¸ìʸ»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¡£
 .IP next
 NeXT ·×»»µ¡ÍѤÎʸ»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¡£
 .IP utf-8
 ISO 10646 ʸ»ú¥»¥Ã¥È¤Î UTF-8 ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤òÁªÂò¤¹¤ë¡£
-.PP
-JLESSCHARSET ¤Ë¤Î¤ßÀßÄê²Äǽ¤ÊÃͤò°Ê²¼¤Ë¼¨¤¹¡£
-.IP iso7
-7 ¥Ó¥Ã¥È¤ò²¾Äꤷ¤¿ ISO 2022 ¥³¡¼¥É³ÈÄ¥¤Ë¤è¤ëÊ£¿ôʸ»ú¥»¥Ã¥È¡£
-128 ¤«¤é 225 ¤ÎÃͤò»ý¤Äʸ»ú¤¬¥Ð¥¤¥Ê¥ê¤È¤·¤Æ°·¤ï¤ì¤ë¡£
-.I less
-¤Î¼ÂÁõ¥ì¥Ù¥ë¤Ï¡¢ISO 2022 ¤Î level 3 ¤Ç¤¢¤ë¡£
-.IP iso8
-8 ¥Ó¥Ã¥È¤ò²¾Äꤷ¤¿ ISO 2022 ¥³¡¼¥É³ÈÄ¥¤Ë¤è¤ëÊ£¿ôʸ»ú¥»¥Ã¥È¡£
-.I less
-¤Î¼ÂÁõ¥ì¥Ù¥ë¤Ï¡¢ISO 2022 ¤Î level 3 ¤Ç¤¢¤ë¡£
-.IP jis
-7 ¥Ó¥Ã¥È¤ò²¾Äꤷ¤¿ ISO 2022 ¥³¡¼¥É³ÈÄ¥¤Ë¤è¤ëÆüËܸìʸ»ú¥»¥Ã¥È¤Î¤ß¡£
-.IP ujis
-ʸ»ú¤¬ 32 ¤«¤é 127 ¤ÎÃͤò»ý¤Ä¾ì¹ç¡¢ASCII ʸ»úÎó¤ò²¾Äꤹ¤ë¡£
-ʸ»ú¤¬ 162 ¤«¤é 254 ¤ÎÃͤò»ý¤Ä¾ì¹ç¡¢JISX 0208 ʸ»ú¥»¥Ã¥È¡¦
-JISX 0201 ʸ»ú¥»¥Ã¥È¤Î±¦È¾Ê¬¡¦UJIS ¥³¡¼¥Ç¥£¥ó¥°¤ò¤·¤¿
-JISX 0212 ʸ»ú¥»¥Ã¥È¤ò²¾Äꤹ¤ë¡£
-¤½¤ì°Ê³°¤Îʸ»ú¤Ï¥Ð¥¤¥Ê¥ê¤È¤·¤Æ°·¤ï¤ì¤ë¡£
-.IP euc
-ujis ¤ÈƱ¤¸¡£
-.IP sjis
-ʸ»ú¤¬ 32 ¤«¤é 127 ¤ÎÃͤò»ý¤Ä¾ì¹ç¡¢ASCII ʸ»úÎó¤ò²¾Äꤹ¤ë¡£
-ʸ»ú¤¬ 128 ¤«¤é 252 ¤ÎÃͤò»ý¤Ä¾ì¹ç¡¢
-JISX 0208 ʸ»ú¥»¥Ã¥È¤È JISX 0201 ʸ»ú¥»¥Ã¥È¤Î±¦È¾Ê¬¤ò²¾Äꤹ¤ë¡£
-¤½¤ì°Ê³°¤Îʸ»ú¤Ï¥Ð¥¤¥Ê¥ê¤È¤·¤Æ°·¤ï¤ì¤ë¡£
-.IP japanese
-ÆþÎϤÏÁ´¤Æ¤ÎÆüËܸìʸ»ú¥»¥Ã¥È¡¢jis, ujis, sjis ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï jis ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.PP
-ÆüËܸì¤Ë¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¥³¡¼¥É¥»¥Ã¥È (ʸ»ú¥»¥Ã¥È¤Ç¤Ï¤Ê¤¤) ¤¬Â¸ºß¤¹¤ë¡£
-¤è¤Ã¤Æ¡¢
-.I less
-¤Ï¡¢¤½¤ì¤òÀµ¤·¤¯É½¼¨¤¹¤ë¤¿¤á¤Ë¥³¡¼¥É¥»¥Ã¥È´Ö¤ÎÊÑ´¹¤ò¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
-ÊÑ´¹¤ò¤µ¤»¤ë¤¿¤á¤ËÀßÄê¤Ç¤­¤ë JLESSCHARSET ¤ÎÃͤò°Ê²¼¤Ë¼¨¤¹¡£
-.IP ujis-iso7
-ÆþÎÏ¤Ï ujis ¤È iso7 ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï iso7 ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.IP euc-iso7
-ujis-iso7 ¤ÈƱ¤¸¡£
-.IP sjis-iso7
-ÆþÎÏ¤Ï sjis ¤È iso7 ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï iso7 ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.IP ujis-jis
-ÆþÎÏ¤Ï ujis ¤È jis ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï jis ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.IP euc-jis
-ujis-jis ¤ÈƱ¤¸¡£
-.IP sjis-jis
-ÆþÎÏ¤Ï sjis ¤È jis ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï jis ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.IP jis-ujis
-ÆþÎÏ¤Ï jis ¤È ujis ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï ujis ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.IP jis-euc
-jis-ujis ¤ÈƱ¤¸¡£
-.IP jis-sjis
-ÆþÎÏ¤Ï jis ¤È sjis ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï sjis ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.IP japanese-iso7
-ÆþÎÏ¤Ï japanese ¤È iso7 ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï iso7 ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.IP japanese-jis
-ÆþÎÏ¤Ï japanese ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï jis ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-japanese ¤ÈƱ¤¸¡£
-.IP japanese-ujis
-ÆþÎÏ¤Ï japanese ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï ujis ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.IP japanese-euc
-japanese-ujis ¤ÈƱ¤¸¡£
-.IP japanese-sjis
-ÆþÎÏ¤Ï japanese ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï sjis ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.IP ujis-sjis
-ÆþÎÏ¤Ï ujis ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï sjis ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.IP euc-sjis
-ujis-sjis ¤ÈƱ¤¸¡£
-.IP sjis-ujis
-ÆþÎÏ¤Ï sjis ¤ò²¾Äꤹ¤ë¡£
-.I less
-¤Ï ujis ¤Î¤ß¤ò½ÐÎϤ¹¤ë¡£
-.IP sjis-euc
-sjis-ujis ¤ÈƱ¤¸¡£
-.PP
-ʸ»ú¥»¥Ã¥È¤òÀßÄꤹ¤ë¤â¤¦°ì¤ÄÊýË¡¤Ï¡¢´Ä¶­ÊÑ¿ô LANG ¤ò»È¤¦¤³¤È¤Ç¤¢¤ë¡£
-"ja_JP" ¤Þ¤¿¤Ï¡¢"japan" ¤Ç»Ï¤Þ¤ë´Ä¶­ÊÑ¿ô LANG ¤Ç¤¢¤ë¤È¤­¡¢
-.I less
-¤Ï¡¢Á´¤Æ¤ÎÆüËܸ쥳¡¼¥Éʸ»ú¤òÆüËܸìʸ»ú¥»¥Ã¥È¤È¤·¤ÆÆɤߡ¢
-´Ä¶­ÊÑ¿ô LANG ¤Î»Ä¤ê¤ÎÉôʬ¤Ç½ÐÎϤΥ³¡¼¥Ç¥£¥ó¥°¤ò»ØÄꤹ¤ë¡£
-.PP
-ISO 2022 ¥³¡¼¥É³ÈÄ¥¥Æ¥¯¥Ë¥Ã¥¯¤Ç¤Ï¡¢Â¿¤¯¤Îʸ»ú¥»¥Ã¥È¤ò
-´Êñ¤Ëɽ¼¨¤µ¤»¤ë¤¿¤á¤Ë4¤Ä¤Î¥×¥ì¡¼¥ó¤òÄêµÁ¤·¤Æ¤¤¤ë¡£
-´Ä¶­ÊÑ¿ô JLESSPLANESET ¤Ë¤è¤ê¥Ç¥Õ¥©¥ë¥È¤Î¥×¥ì¡¼¥ó¤òÀßÄꤹ¤ë¡£
-´Ä¶­ÊÑ¿ô JLESSPLANESET ¤¬¡¢"japanese", "ujis", "euc" ¤Î¤È¤­¡¢
-.I less
-¤Ï¡¢g1 ¥×¥ì¡¼¥ó¤ò JISX 0208¡¢g2 ¥×¥ì¡¼¥ó¤ò JISX 0201 ¤Î±¦È¾Ê¬¡¢
-g3 ¥×¥ì¡¼¥ó¤ò JISX 0212 ¤È¤·¤Æ°·¤¦¡£
-´Ä¶­ÊÑ¿ô JLESSPLANESET ¤¬¡¢"latin1", "latin2", "latin3", "latin4",
-"greek", "alabic", "hebrew", "cyrillic", "latin5" ¤Î¤È¤­¡¢
-.I less 
-¤Ï¡¢g1 ¥×¥ì¡¼¥ó¤ò ISO 8859 ¤Î°ì¤Ä¤È¤·¤Æ°·¤¦¡£
-¤½¤ì°Ê³°¤Î¾ì¹ç¡¢
-.I less 
-¤Ï¡¢´Ä¶­ÊÑ¿ô JLESSPLANESET ¤ò
-ÀßÄê¤Î¤¿¤á¤Î¼ÂºÝ¤Î¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤È¤·¤Æ²òÀϤ·¤è¤¦¤È»î¤ß¤ë¡£
-²òÀϤκݡ¢JLESSPLANESET ¤Ë¤ª¤±¤ë "\\e" ¤Ï¥¨¥¹¥±¡¼¥×¥³¡¼¥É¤È¤·¤Æ°·¤ï¤ì¤ë¡£
-.PP
-.I less
-¤Ï¡¢ISO 2022 ¥³¡¼¥É³ÈÄ¥¥Æ¥¯¥Ë¥Ã¥¯¤Ë´Þ¤Þ¤ì¤ëʸ»ú¥»¥Ã¥È¤Î
-¤Û¤È¤ó¤ÉÁ´¤Æ¤Î¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤òÍý²ò¤¹¤ë¡£
-ʸ»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¤¿¤á¤Î¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤Ï¿¿ô¸ºß¤¹¤ë¡£
-°ìÊý¤Ç¡¢
-.I less
-¤Ï¡¢Ê¸»úÎ󥻥åȤòÁªÂò¤¹¤ë¤¿¤á¤Ë¡¢
-'^[(', '^[-', '^[$(', '^[$-', '^N', '^O' ¤È¤¤¤¦¡¢
-6 ¤Ä¤Î¥¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹¤·¤«½ÐÎϤ·¤Ê¤¤¡£
-¤³¤ì¤Ï¡¢
-.I less
-¤¬Ã¼Ëö¤ÈüËö¥¨¥ß¥å¥ì¡¼¥¿¡¼¤Ë¤È¤Ã¤Æ»È¤¤¤ä¤¹¤¤¤È¤¤¤¦¤³¤È¤Ç¤¢¤ë¡£
-.PP
-¥­¡¼¥Ü¡¼¥ÉÆþÎϤΤ¿¤á¤ÎÆÃÊ̤ʡÖʸ»ú¥»¥Ã¥È¡×¤â¤¢¤ë¡£
-´Ä¶­ÊÑ¿ô JLESSKEYCHARSET ¤Ï¡¢¤³¤Îʸ»ú¥»¥Ã¥È¤òÀßÄꤹ¤ë¤¿¤á¤Ë»È¤ï¤ì¤ë¡£
-JLESSKEYCHARSET ¤¬»ý¤Ä¤³¤È¤Î¤Ç¤­¤ëÃͤϡ¢´Ä¶­ÊÑ¿ô JLESSCHARSET 
-¤ÈƱ¤¸¤Ç¤¢¤ë¡£
-.PP
-LESSCHARSET ´Ä¶­ÊÑ¿ô¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢
-¥Ç¥Õ¥©¥ë¥È¤Îʸ»ú¥»¥Ã¥È¤Ï latin1 ¤Ç¤¢¤ë¡£
-¤·¤«¤·¡¢´Ä¶­ÊÑ¿ô LC_ALL, LC_CTYPE, LANG ¤Î¤¤¤º¤ì¤«¤Ë
-"UTF-8" ¤È¤¤¤¦Ê¸»úÎ󤬤¢¤ë¾ì¹ç¡¢¥Ç¥Õ¥©¥ë¥È¤Îʸ»ú¥»¥Ã¥È¤Ï utf-8 ¤Ë¤Ê¤ë¡£
+.IP windows
+Microsoft Windows¤ËŬÀÚ¤Êʸ»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¡£(cp1251)
 .PP
 Æüì¤Ê¥±¡¼¥¹¤È¤·¤Æ¡¢
 LESSCHARSET ¤Ç»ØÄê¤Ç¤­¤ë¸ÂÄꤵ¤ì¤¿Ê¸»ú¥»¥Ã¥È¤Ç¤Ï¤Ê¤¯¡¢
@@ -1250,6 +1114,9 @@
 .br
 	\ \ \ \ \ \ 	9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b.
 .br
+	IBM-1047	4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc
+	\ \ \ \ \ \	191.b
+.br
 	iso8859	8bcccbcc18b95.33b.
 .br
 	koi8-r	8bcccbcc18b95.b128.
@@ -1258,14 +1125,22 @@
 .br
 	next\ \ 	8bcccbcc18b95.bb125.bb
 .PP
-LESSCHARSET ¤È LESSCHARDEF ¤Î¤É¤Á¤é¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤â¡¢
-¥·¥¹¥Æ¥à¤¬
+LESSCHARSET ¤È LESSCHARDEF ¤Î¤É¤Á¤é¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤â¡¢LC_ALL, LC_CTYPE ¤¢¤ë¤¤¤Ï
+LANG ´Ä¶­ÊÑ¿ô¤Ë "UTF-8", "UTF8", "utf-8" ¤¢¤ë¤¤¤Ï "utf8" ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
+¥Ç¥Õ¥©¥ë¥Èʸ»ú¥»¥Ã¥È¤Ï utf-8 ¤Ë¤Ê¤ë¡£
+.PP
+¤³¤Îʸ»ú¤¬¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¡¢¥·¥¹¥Æ¥à¤¬
 .I setlocale
 ¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ì¤Ð¡¢
 .I less
 ¤Ïʸ»ú¥»¥Ã¥È¤ò·èÄꤹ¤ë¤Î¤Ë setlocale ¤ò»ÈÍѤ¹¤ë¡£
 setlocale ¤Ï´Ä¶­ÊÑ¿ô LANG ¤â¤·¤¯¤Ï LC_CTYPE ¤ÇÀ©¸æ¤µ¤ì¤ë¡£
 .PP
+ºÇ¸å¤Ë¡¢¤â¤·
+.I setlocale
+¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤¬ÍøÍѲÄǽ¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Îʸ»ú¥»¥Ã¥È¤Ï
+latin1 ¤Ë¤Ê¤ë¡£
+.PP
 À©¸æʸ»ú¤È¥Ð¥¤¥Ê¥ê¥­¥ã¥é¥¯¥¿¤ÏÌÜΩ¤¿¤»¤Æ (ȿž¤·¤Æ) ɽ¼¨¤µ¤ì¤ë¡£
 ¤³¤ì¤é¤Îʸ»ú¤Ï¡¢²Äǽ¤Ç¤¢¤ë¤Ê¤é¤Ð (control-A ¤ò ^A ¤È¤¤¤¦¤è¤¦¤Ë) 
 ¥­¥ã¥ì¥Ã¥Èɽµ­¤Çɽ¼¨¤µ¤ì¤ë¡£
@@ -1281,7 +1156,19 @@
 (% ¤È x, X, o, d ¤Ê¤É) ¤ò´Þ¤àʸ»úÎó¤Ç¤¢¤ë¡£
 LESSBINFMT ¤¬ "*u[%x]" ¤Î¾ì¹ç¡¢¥Ð¥¤¥Ê¥ê¥­¥ã¥é¥¯¥¿¤Ï
 Âç³ç¸Ì¤Ç°Ï¤Þ¤ì¤¿ 16 ¿Ê¿ô¤Ë²¼Àþ¤ò¤·¤Æɽ¼¨¤µ¤ì¤ë¡£
-LESSBINFMT ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¡¢"*s<%X>" ¤Ë»ØÄꤵ¤ì¤Æ¤¤¤ë¡£
+LESSBINFMT ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¡¢"*s<%02X>" ¤Ç¤¢¤ë¡£
+Ãí°Õ: LESSBINFMT ¤ò·Ð¤Æʸ»ú¤ò³ÈÄ¥¤·¤¿·ë²Ì¤Ï¡¢31ʸ»ú¤è¤ê¾¯¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¡£
+.PP
+ʸ»ú¥»¥Ã¥È¤¬ utf-8 ¤Î¾ì¹ç¡¢´Ä¶­ÊÑ¿ô LESSUTFBINFMT ¤Ï LESSBINFMT ¤ÈƱÍͤ˿¶¤ëÉñ¤¦¤¬¡¢
+Àµ¾ï¤ËÊ£¹ç¤µ¤ì¡¢É½¼¨¤¹¤ë¤Î¤ËÉÔŬÅö¤Ê Unicode ¥³¡¼¥É¥Ý¥¤¥ó¥È¤Î¤ß¤ËŬÍѤµ¤ì¤ë
+(Î㤨¤Ð¡¢Ì¤³ä¤êÅö¤Æ¤Î¥³¡¼¥É¥Ý¥¤¥ó¥È)¡£¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï "<U+%04lX>" ¤Ç¤¢¤ë¡£
+LESSUTFBINFMT ¤ä LESSBINFMT ¤Ïɽ¼¨Â°À­ÀßÄê ("*x") ¤ò¶¦Í­¤¹¤ë¤³¤È¤ËÃí°Õ¡£¤Ä¤Þ¤ê
+²¿¤«¤ò»ØÄꤹ¤ë¤ÈÁÐÊý¤ËŬÍѤµ¤ì¤ë; LESSUTFBINFMT ¤Ï LESSBINFMT ¤Î¸å¤ËÆɤ߹þ¤Þ¤ì¡¢ÀßÄꤵ¤ì¤ë¡£
+¤â¤·¤¢¤ì¤Ð¡¢Í¥ÀèÅÙ¤ò»ý¤Ä¤³¤È¤Ë¤Ê¤ë¡£
+UTF-8 ¥Õ¥¡¥¤¥ëÆâ¤ÎÌäÂê¤Î¤¢¤ë¥ª¥¯¥Æ¥Ã¥È (ÉÔ´°Á´¤Ê¥·¡¼¥±¥ó¥¹¤Î¥ª¥¯¥Æ¥Ã¥È¡¢
+´°Á´¤Ç¤Ï¤¢¤ë¤¬¡¢non-shortest form¥·¡¼¥±¥ó¥¹¤Î¥ª¥¯¥Æ¥Ã¥È¡¢ÉÔÀµ¤Ê¥ª¥¯¥Æ¥Ã¥È¡¢¤½¤·¤Æstray trailing ¥ª¥¯¥Æ¥Ã¥È)
+¤¬ LESSBINFMT »È¤¤¸ÄÊ̤Ëɽ¼¨¤µ¤ì¤ë¡£¤³¤ì¤Ï UTF-8 ¥Õ¥¡¥¤¥ë¤¬ÉÔŬÀڤ˹½À®¤µ¤ì¤Æ¤¤¤ë¤«¤Î
+¿ÇÃǤòÍưפˤ¹¤ë¡£
 
 .SH "¥×¥í¥ó¥×¥È"
 -P ¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¡¢¥×¥í¥ó¥×¥È¤ò¼«Ê¬¤Î¹¥¤ß¤ËÄ´À°¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¡£
@@ -1312,7 +1199,7 @@
 .IP "%E"
 ¥¨¥Ç¥£¥¿¤Î̾Á° (´Ä¶­ÊÑ¿ô VISUAL¡¢VISUAL ¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ï
 ´Ä¶­ÊÑ¿ô EDITOR) ¤ËÃÖ¤­´¹¤¨¤é¤ì¤ë¡£
-°Ê¹ß¤Î¡¢JLESSEDIT ¤ÎÆÃħ¤Ë´Ø¤¹¤ëÏÃÂê¤ò»²¾È¡£
+°Ê¹ß¤Î¡¢LESSEDIT ¤ÎÆÃħ¤Ë´Ø¤¹¤ëÏÃÂê¤ò»²¾È¡£
 .IP "%f"
 ¸½ºß¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë̾¤ËÃÖ¤­´¹¤¨¤é¤ì¤ë¡£
 .IP "%i"
@@ -1339,9 +1226,6 @@
 Ä̾ï¤Ïʸ»úÎó¤Î¸å¤Ë»È¤ï¤ì¤ë¤¬¡¢¤É¤³¤ËÃÖ¤¤¤Æ¤â¤è¤¤¡£
 .IP "%x"
 ¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Î¤¦¤Á¤Î¼¡¤ÎÆþÎÏ¥Õ¥¡¥¤¥ë̾¤ÇÃÖ¤­´¹¤¨¤é¤ì¤ë¡£
-.IP "%K"
-ÆþÎÏ¥Õ¥¡¥¤¥ë¤ÎÃæ¤ÇºÇ¤âºÇ¶á¸½¤ì¤¿¡¢Èó ASCII ʸ»ú¥»¥Ã¥È¤Þ¤¿¤Ï
-Èó ASCII ¥³¡¼¥É¥»¥Ã¥È¤ÇÃÖ¤­´¹¤¨¤é¤ì¤ë¡£
 .PP
 ¤â¤·¡¢(ÆþÎϤ¬¥Ñ¥¤¥×¤Î¤¿¤á¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤¬Ê¬¤«¤é¤Ê¤¤¾ì¹ç¤Ê¤É) 
 ¹àÌܤ¬ÉÔÌÀ¤Î¤È¤­¤Ï¡¢Âå¤ï¤ê¤Ë¥¯¥¨¥¹¥Á¥ç¥ó¥Þ¡¼¥¯¤¬É½¼¨¤µ¤ì¤ë¡£
@@ -1516,23 +1400,14 @@
 .IP LESS
 .I less
 ¤Ë¼«Æ°Åª¤ËÅϤµ¤ì¤ë¥ª¥×¥·¥ç¥ó¡£
-.IP JLESS
-´Ä¶­ÊÑ¿ô LESS ¤ÈƱ¤¸¡£
 .IP LESSANSIENDCHARS
 ANSI ¥«¥é¡¼¥·¡¼¥±¥ó¥¹¤Î½ª¤ê¤È¤·¤Æ»È¤ï¤ì¤ëʸ»ú (¥Ç¥Õ¥©¥ë¥È¤Ï "m")¡£
 .IP LESSBINFMT
 °õ»ú²Äǽʸ»ú¤Ç¤â¤Ê¤¯¡¢À©¸æʸ»ú¤Ç¤â¤Ê¤¤Ê¸»ú¤òɽ¼¨¤¹¤ëºÝ¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¡£
 .IP LESSCHARDEF
 ʸ»ú¥»¥Ã¥È¤òÄêµÁ¤¹¤ë¡£
-.IP JLESSCHARSET
-¤¢¤é¤«¤¸¤áÄêµÁ¤µ¤ì¤¿Ê¸»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¡£
 .IP LESSCHARSET
-JLESSCHARSET ¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¡¢
 ¤¢¤é¤«¤¸¤áÄêµÁ¤µ¤ì¤¿Ê¸»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¡£
-.IP JLESSKEYCHARSET
-¥­¡¼¥Ü¡¼¥ÈÆþÎϤΤ¿¤á¤Î¤¢¤é¤«¤¸¤áÄêµÁ¤µ¤ì¤¿Ê¸»ú¥»¥Ã¥È¤òÁªÂò¤¹¤ë¡£
-.IP JLESSPLANESET
-¤¢¤é¤«¤¸¤áÄêµÁ¤µ¤ì¤¿ ISO 2022 ¥³¡¼¥É³ÈÄ¥¥Æ¥¯¥Ë¥Ã¥¯¤Î¥×¥ì¡¼¥ó¥»¥Ã¥È¤òÁªÂò¤¹¤ë¡£
 .IP LESSCLOSE
 (¥ª¥×¥·¥ç¥ó¤Î) ÆþÎϥݥ¹¥È¥×¥í¥»¥Ã¥µ¤ò¸Æ¤Ó½Ð¤¹¤¿¤á¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¡£
 .IP LESSECHO
@@ -1542,6 +1417,11 @@
 .IP LESSEDIT
 (v ¥³¥Þ¥ó¥É¤Ç»È¤ï¤ì¤ë) ¥¨¥Ç¥£¥¿¤Î¥×¥í¥È¥¿¥¤¥×ʸ»úÎó¡£
 ¡Ö¥×¥í¥ó¥×¥È¡×¥»¥¯¥·¥ç¥ó¤Ç¤ÎÏÃÂê¤ò»²¾È¡£
+.IP LESSGLOBALTAGS
+¥°¥í¡¼¥Ð¥ë¥¿¥°¤òõ¤¹¤¿¤á¤Î -t ¥ª¥×¥·¥ç¥ó¤Ç»È¤ï¤ì¤ë¥³¥Þ¥ó¥É¤Î̾Á°¡£
+.I global
+(1) ¥³¥Þ¥ó¥É¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢Ä̾ï "global" ¤¬ÀßÄꤵ¤ì¤ë¤Ù¤­¡£
+ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥°¥í¡¼¥Ð¥ë¥¿¥°¤Ï»È¤ï¤ì¤Ê¤¤¡£
 .IP LESSKEY
 ¥Ç¥Õ¥©¥ë¥È¤Î lesskey(1) ¥Õ¥¡¥¤¥ë¤Î̾Á°¡£
 .IP LESSKEY_SYSTEM

man-pages-ja-515467-strings.1.patch:
 strings.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-ja-515467-strings.1.patch ---
--- man-pages-ja-20060815.orig/manual/GNU_binutils/man1/strings.1	2006-08-15 00:07:05.000000000 +0900
+++ man-pages-ja-20060815/manual/GNU_binutils/man1/strings.1	2009-11-13 18:42:32.000000000 +0900
@@ -91,7 +91,7 @@
 .TP
 .B "\-\fImin\-len\fP"
 .TP
-.B "\-bytes=\fImin\-len\fP"
+.B "\-\-bytes=\fImin\-len\fP"
 .I min\-len
 °Ê¾å¤ÎŤµ¤ò»ý¤Äʸ»ú¤Î¥·¡¼¥±¥ó¥¹¤òɽ¼¨¤¹¤ë¡£¥Ç¥Õ¥©¥ë¥È¤Ï 4¡£
 

man-pages-ja-527638-chgrp.1.patch:
 chgrp.1 |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE man-pages-ja-527638-chgrp.1.patch ---
--- man-pages-ja-20060815/manual/gnumaniak/man1/chgrp.1.original	2009-10-07 09:53:07.000000000 +0900
+++ man-pages-ja-20060815/manual/gnumaniak/man1/chgrp.1	2009-10-07 09:52:11.000000000 +0900
@@ -45,14 +45,13 @@
 ¤½¤ì¤¾¤ì¤Ë¤Ä¤¤¤Æ¤ÎÆ°ºî¤ò¾ÜºÙ¤Ëɽ¼¨¤¹¤ë¡£
 .TP
 .B "\-\-dereference"
-¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¼«¿È¤Ç¤Ï¤Ê¤¯¡¢¤½¤ì¤¬»Ø¤·¤Æ¤¤¤ëÀè¤òÊѹ¹¤¹¤ë¡£
+¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¼«¿È¤Ç¤Ï¤Ê¤¯¡¢¤½¤ì¤¬»Ø¤·¤Æ¤¤¤ëÀè¤òÊѹ¹¤¹¤ë¡£¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¢¤ë¡£
 .TP
 .B "\-f, \-\-silent, \-\-quiet"
 ¥°¥ë¡¼¥×¤òÊѹ¹¤Ç¤­¤Ê¤«¤Ã¤¿¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¤Î¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Ê¤¤¡£
 .TP
 .B "\-h, \-\-no\-dereference"
 »Ø¤·¤Æ¤¤¤ëÀè¤Ç¤Ï¤Ê¤¯¡¢¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤½¤ì¼«¿È¤òÊѹ¹¤¹¤ë¡£
-¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¢¤ë¡£
 .B lchown (2)
 ¥·¥¹¥Æ¥à¥³¡¼¥ë¤¬Ä󶡤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢\fBchown\fR ¤Ï¼ºÇÔ¤¹¤ë¡£
 ºÆµ¢Åª¤Ëé¤Ã¤Æ¤¤¤ë¤È¤­¤Ë¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤¬¸«¤Ä¤«¤ê¡¢

man-pages-ja-537103-ip.7.patch:
 ip.7 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-pages-ja-537103-ip.7.patch ---
--- man-pages-ja-20060815.orig/manual/LDP_man-pages/man7/ip.7	2006-08-15 00:07:11.000000000 +0900
+++ man-pages-ja-20060815/manual/LDP_man-pages/man7/ip.7	2009-11-13 18:56:28.000000000 +0900
@@ -662,7 +662,7 @@
 ¤ÈƱÍͤË
 .I ip_mreqn
 ¤Þ¤¿¤Ï
-.I ip_mreq
+.I in_addr
 ¹½Â¤ÂΤǤ¢¤ë¡£
 .IP
 ÉÔÀµ¤Ê¥½¥±¥Ã¥È¥ª¥×¥·¥ç¥ó¤¬ÅϤµ¤ì¤ë¤È¡¢

man-pages-ja-fix-configure.perl.patch:
 configure.perl |   45 +++++++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 12 deletions(-)

--- NEW FILE man-pages-ja-fix-configure.perl.patch ---
diff -pruN man-pages-ja-20091215.orig/script/configure.perl man-pages-ja-20091215/script/configure.perl
--- man-pages-ja-20091215.orig/script/configure.perl	2002-08-31 04:27:01.000000000 +0900
+++ man-pages-ja-20091215/script/configure.perl	2009-12-24 15:09:50.000000000 +0900
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+use IO::Handle;
 use Env qw (PATH LANG);
 use strict 'vars';
 
@@ -11,6 +12,13 @@ my ($MANROOT, $PACK, $OWNER, $GROUP,
 my $PKGLIST = "script/pkgs.list";
 my @pack_method = ("none", "gzip", "bzip2", "compress");
 my $podsec = "1";
+my @stdin;
+my $pipeflag = 0;
+
+if ( -p STDIN ) {
+    $pipeflag = 1;
+    @stdin = STDIN->getlines;
+}
 
 #
 # ¥¤¥ó¥¹¥È¡¼¥ë¾ðÊó
@@ -21,7 +29,7 @@ print "(just Return if you accept defaul
 do{
     $MANROOT = "/usr/share/man/$LANG";
     print "   Install directory   [$MANROOT] ?: ";
-    $ans = <STDIN>; chomp $ans;
+    $ans = &get_from_stdin; chomp $ans;
     if ($ans ne "") {$MANROOT = $ans;}
 
     print "   compress manual with..\n";
@@ -29,19 +37,19 @@ do{
 	print "      $i: $pack_method[$i]\n";
     }
     print "   select [0..$#pack_method] : ";
-    $ans = <STDIN>; chomp $ans;
+    $ans = &get_from_stdin; chomp $ans;
     if  ($ans eq "") {$ans = 0;}
     if ($ans < 0 || $ans > $#pack_method) {$PACK = $pack_method[0]}
     else {$PACK = $pack_method[$ans]}
 
     $OWNER = "root";
     print "   uname of page owner [$OWNER] ?: ";
-    $ans = <STDIN>; chomp $ans;
+    $ans = &get_from_stdin; chomp $ans;
     if ($ans ne "") {$OWNER = $ans;}
 
     $GROUP = "root";
     print "   group of page owner [$GROUP] ?: ";
-    $ans = <STDIN>; chomp $ans;
+    $ans = &get_from_stdin; chomp $ans;
     if ($ans ne "") {$GROUP = $ans;}
 
     print "\n";
@@ -51,7 +59,7 @@ do{
     print "\n";
     do {
 	print "All OK? (Yes, [C]ontinue / No, [R]eselect) : ";
-	$ans = <STDIN>; chomp $ans;
+	$ans = &get_from_stdin; chomp $ans;
     } until ($ans =~ /^[yYnNcCrR]/);
 
 } until ($ans =~ /^[yYcC]/);
@@ -90,14 +98,14 @@ do{
     for $i (0 .. $#pl){
 	my $qstr = ($main::pw{$pl[$i]} > -1) ? "[Y/n]" : "[y/N]";
 	printf "   [%2d/%2d] %-15s %s ?: ", $i, $#pl, $pl[$i], $qstr;
-	$ans = <STDIN>; chomp $ans;
+	$ans = &get_from_stdin; chomp $ans;
 	if ($ans =~ /[Yy].*/) { $main::pw{$pl[$i]} = $i;}
 	if ($ans =~ /[Nn].*/) { $main::pw{$pl[$i]} = -1;}
     }
 
     do {
 	print "All OK? (Yes, [C]ontinue / No, [R]eselect) : ";
-	$ans = <STDIN>; chomp $ans;
+	$ans = &get_from_stdin; chomp $ans;
     } until ($ans =~ /[yYnNcCrR].*/);
 
 } until ($ans =~ /^[yYcC]/);
@@ -111,6 +119,7 @@ while(<TL>) {
     chomp;
     my @l = split /:/;
     $l[1] =~ s/ /_/e;
+    unless (exists $main::pw{$l[1]} && defined $main::pw{$l[1]}) {die "Missing `$l[1]' in pkg.list";}
     if ($main::pw{$l[1]} == -1) {next;}
     (my $sec, my $osec) =  split /=>/, $l[5];
     if ($sec eq "pod"){$sec = $podsec;}
@@ -161,7 +170,7 @@ do{
 	}
 	print "   Which to install? (0..$cf) : ";
 
-	$ans = <STDIN>; chomp $ans;
+	$ans = &get_from_stdin; chomp $ans;
 	if ($ans eq "") {$ans = 0};
 	if ($ans < 0 || $ans > $cf) { $ans = 0 };
 
@@ -176,7 +185,7 @@ do{
 
     do {
 	print "All OK? (Yes, [C]ontinue / No, [R]eselect) : ";
-	$ans = <STDIN>; chomp $ans;
+	$ans = &get_from_stdin; chomp $ans;
     } until ($ans =~ /^[yYnNcCrR]/);
 
 } until ($ans =~ /^[yYcC]/);
@@ -191,10 +200,8 @@ open (ISS, ">installman.sh") || die "can
 print ISS "#!/bin/sh\n";
 
 print ISS "mkdir -p $MANROOT;";
-print ISS "chown $OWNER.$GROUP $MANROOT\n";
 for $i (1..9){
     print ISS "mkdir -p $MANROOT/man$i;";
-    print ISS "chown $OWNER.$GROUP $MANROOT/man$i\n";
 }
 print ISS "\n";
 
@@ -205,7 +212,10 @@ foreach my $key (sort keys %ppage) {
     my $mandst = "$MANROOT/man$sec";
 
     print ISS "echo -n install $pkg: $name.$sec .. \n";
-    print ISS "install -o $OWNER -g $GROUP -m 644 $mansrc $mandst\n";
+    print ISS "install -p -m 644 $mansrc $mandst\n";
+
+    print ISS "echo -n converting to UTF-8 .. \n";
+    print ISS "iconv -f euc-jp -t utf-8 $mandst/$name.$sec > $mandst/$name.$sec.tmp && mv $mandst/$name.$sec.tmp $mandst/$name.$sec || exit 1\n";
 
     if ($PACK ne "none"){
 	print ISS "echo -n $PACK .. \n";
@@ -231,3 +241,14 @@ sub by_sec_name {
 	($af[2] <=> $bf[2]) || ($af[1] cmp $bf[1]);
 }
 
+sub get_from_stdin {
+    my $retval;
+
+    if ( $pipeflag ) {
+        $retval = shift (@stdin);
+    } else {
+        $retval = scalar (<STDIN>);
+    }
+    return $retval;
+}
+

man-pages-ja-fix-mdoc.patch:
 translation_list |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE man-pages-ja-fix-mdoc.patch ---
--- man-pages-ja-20060815.orig/manual/GNU_groff/translation_list	2006-08-15 00:07:02.000000000 +0900
+++ man-pages-ja-20060815/manual/GNU_groff/translation_list	2009-11-18 17:07:09.000000000 +0900
@@ -29,7 +29,6 @@
 £Ã:GNU groff:1.17.2:2000/05/24:groff:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
 £Ã:GNU groff:1.17.2:2000/05/19:groff_char:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
 £Ã:GNU groff:1.17.2:2000/05/22:groff_man:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
-£Ã:GNU groff:1.17.2:1997/11/24:mdoc:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
 £Ã:GNU groff:1.17.2:2000/02/06:groff_me:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
 £Ã:GNU groff:1.17.2:2000/06/05:groff_mm:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/
 £Ã:GNU groff:1.17.2:2000/02/22:groff_mmse:7:2002/01/05::man-jp at jp.FreeBSD.org:FreeBSD jpman project:http://www.jp.freebsd.org/man-jp/


Index: man-pages-ja.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-pages-ja/devel/man-pages-ja.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- man-pages-ja.spec	10 Nov 2009 05:51:55 -0000	1.75
+++ man-pages-ja.spec	24 Dec 2009 06:20:56 -0000	1.76
@@ -1,7 +1,5 @@
-%define	use_utf8	1
-
 Name: man-pages-ja
-Version: 20091015
+Version: 20091215
 Release: 1%{?dist}
 # Actual license for each Japanese manpages is the same to the original English manpages' license.
 License: Freely redistributable without restriction
@@ -11,14 +9,10 @@ URL: http://www.linux.or.jp/JM/
 
 Source: http://www.linux.or.jp/JM/%{name}-%{version}.tar.gz
 Source1: rh-man-pages-ja.pl
-Patch: man-pages-ja-20010515-rh.patch
-Patch1: man-pages-ja-fixpipe.patch
-Patch2: man-pages-ja-20030415-utf8.patch
+Patch0: man-pages-ja-fix-configure.perl.patch
 Patch9: man-pages-ja-20060815-204667-nfs.5.patch
 Patch11: man-pages-ja-20060815-178955-at.1.patch
 Patch12: man-pages-ja-missing-pkglist.patch
-Patch13: man-pages-ja-fix-uninitialized-value.patch
-Patch14: man-pages-ja-timestamp.patch
 Patch15: man-pages-ja-358081-sysctl-warn.patch
 Patch16: man-pages-ja-connect.2.patch
 Patch18: man-pages-ja-433692-printf.1.patch
@@ -32,6 +26,12 @@ Patch25: man-pages-ja-454419-echo.1.patc
 Patch26: man-pages-ja-457361-wall.1.patch
 Patch27: man-pages-ja-20090615-vmstat.8.patch
 Patch28: man-pages-ja-493783-edquota.8.patch
+Patch29: man-pages-ja-486655-mkfs.8.patch
+Patch30: man-pages-ja-509048-less.1.patch
+Patch31: man-pages-ja-515467-strings.1.patch
+Patch32: man-pages-ja-527638-chgrp.1.patch
+Patch33: man-pages-ja-537103-ip.7.patch
+Patch34: man-pages-ja-fix-mdoc.patch
 
 Summary: Japanese man (manual) pages from the Japanese Manual Project
 Group: Documentation
@@ -40,29 +40,29 @@ Japanese Manual pages, translated by JM-
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1 -b .jp
-%patch1 -p1 -b .pipe
-%if %{use_utf8}
-%patch2 -p1 -b .utf8
-%endif
-%patch9 -p1 -b .nfs
-%patch11 -p1 -b .at
-%patch12 -p1 -b .pkglist
-%patch13 -p1 -b .uninitval
-%patch14 -p1 -b .timestamp
-%patch15 -p1 -b .sysctl
-%patch16 -p1 -b .connect
-%patch18 -p1 -b .printf
-%patch19 -p1 -b .bash-continue
-%patch20 -p1 -b .bash-suspend
-%patch21 -p1 -b .top
-%patch22 -p1 -b .bash-source
-%patch23 -p1 -b .sysctl
-%patch24 -p1 -b .bash-hex
-%patch25 -p1 -b .echo
-%patch26 -p1 -b .wall
-%patch27 -p1 -b .vmstat
-%patch28 -p1 -b .edquota
+%patch0 -p1 -b .0-configure.perl
+%patch9 -p1 -b .9-nfs
+%patch11 -p1 -b .11-at
+%patch12 -p1 -b .12-pkglist
+%patch15 -p1 -b .15-sysctl
+%patch16 -p1 -b .16-connect
+%patch18 -p1 -b .18-printf
+%patch19 -p1 -b .19-bash-continue
+%patch20 -p1 -b .20-bash-suspend
+%patch21 -p1 -b .21-top
+%patch22 -p1 -b .22-bash-source
+%patch23 -p1 -b .23-sysctl
+%patch24 -p1 -b .24-bash-hex
+%patch25 -p1 -b .25-echo
+%patch26 -p1 -b .26-wall
+%patch27 -p1 -b .27-vmstat
+%patch28 -p1 -b .28-edquota
+%patch29 -p1 -b .29-mkfs
+%patch30 -p1 -b .30-less
+%patch31 -p1 -b .31-strings
+%patch32 -p1 -b .32-chgrp
+%patch33 -p1 -b .33-ip
+%patch34 -p1 -b .34-mdoc
 
 %build
 perl %{SOURCE1} '$DESTDIR' | make
@@ -80,38 +80,22 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man8/
 # fix su(1) man page.
 if [ -f $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_sh-utils/man1/su.1 ]; then
 	rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/su.1*
-%if %{use_utf8}
 	iconv -f euc-jp -t utf-8 $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_sh-utils/man1/su.1 > $RPM_BUILD_ROOT%{_mandir}/ja/man1/su.1
-%else
-	cp -a $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_sh-utils/man1/su.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/
-%endif
 fi
 # fix kill(1) man page.
 if [ -f $RPM_BUILD_DIR/%{name}-%{version}/manual/util-linux/man1/kill.1 ]; then
 	rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/kill.1*
-%if %{use_utf8}
 	iconv -f euc-jp -t utf-8 $RPM_BUILD_DIR/%{name}-%{version}/manual/util-linux/man1/kill.1 > $RPM_BUILD_ROOT%{_mandir}/ja/man1/kill.1
-%else
-	cp -a $RPM_BUILD_DIR/%{name}-%{version}/manual/util-linux/man1/kill.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/
-%endif
 fi
 # fix chown(1) man page.
 if [ -f $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_fileutils/man1/chown.1 ]; then
 	rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/chown.1*
-%if %{use_utf8}
 	iconv -f euc-jp -t utf-8 $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_fileutils/man1/chown.1 > $RPM_BUILD_ROOT%{_mandir}/ja/man1/chown.1
-%else
-	cp -a $RPM_BUILD_DIR/%{name}-%{version}/manual/GNU_fileutils/man1/chown.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/
-%endif
 fi
 # fix hostname(1) man page.
 if [ -f $RPM_BUILD_DIR/%{name}-%{version}/manual/net-tools/man1/hostname.1 ]; then
 	rm -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/hostname.1*
-%if %{use_utf8}
 	iconv -f euc-jp -t utf-8 $RPM_BUILD_DIR/%{name}-%{version}/manual/net-tools/man1/hostname.1 > $RPM_BUILD_ROOT%{_mandir}/ja/man1/hostname.1
-%else
-	cp -a $RPM_BUILD_DIR/%{name}-%{version}/manual/net-tools/man1/hostname.1 $RPM_BUILD_ROOT%{_Mandir}/ja/man1/
-%endif
 fi
 # For Bug#128612
 mv $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.telned.8.gz $RPM_BUILD_ROOT%{_mandir}/ja/man8/in.telnetd.8.gz
@@ -125,11 +109,7 @@ for i in `find -type f -name translation
 	package=`basename \`dirname $i\``;
 	name=`basename $i`;
 	if [ -s $i ]; then
-%if %{use_utf8}
 		iconv -f euc-jp -t utf-8 $i > $RPM_BUILD_DIR/%{name}-%{version}/translation_lists/$package.$name;
-%else
-		cp -a $i $RPM_BUILD_DIR/%{name}-%{version}/translation_lists/$package.$name;
-%endif
 	fi
 done
 )
@@ -144,6 +124,17 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 24 2009 Akira TAGOH <tagoh at redhat.com> - 20091215-1
+- updates to 20091215.
+- apply some patches to correct typos:
+  - man-pages-ja-486655-mkfs.8.patch
+  - man-pages-ja-509048-less.1.patch
+  - man-pages-ja-515467-strings.1.patch
+  - man-pages-ja-527638-chgrp.1.patch
+  - man-pages-ja-537103-ip.7.patch
+  - man-pages-ja-fix-mdoc.patch
+- clean up the spec file.
+
 * Tue Nov 10 2009 Akira TAGOH <tagoh at redhat.com> - 20091015-1
 - updates to 20091015.
 - use the corect man page for hostname(1).


--- man-pages-ja-20010515-rh.patch DELETED ---


--- man-pages-ja-20011115-fixpipe.patch DELETED ---


--- man-pages-ja-20030415-utf8.patch DELETED ---


--- man-pages-ja-fix-uninitialized-value.patch DELETED ---


--- man-pages-ja-fixpipe.patch DELETED ---


--- man-pages-ja-timestamp.patch DELETED ---




More information about the fedora-extras-commits mailing list