svn commit: r39390 - head/ja_JP.eucJP/books/handbook/eresources

Ryusuke SUZUKI ryusuke at FreeBSD.org
Fri Aug 17 16:27:07 UTC 2012


Author: ryusuke
Date: Fri Aug 17 16:27:06 2012
New Revision: 39390
URL: http://svn.freebsd.org/changeset/doc/39390

Log:
  - Merge the following from the English version:
  
  	r16428 -> r16502	head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml

Modified:
  head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml

Modified: head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml	Fri Aug 17 15:08:21 2012	(r39389)
+++ head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml	Fri Aug 17 16:27:06 2012	(r39390)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r16428
+     Original revision: r16502
      $FreeBSD$
 -->
 
@@ -78,80 +78,75 @@
 
 	  <tbody>
 	    <row>
-	      <entry>freebsd-advocacy</entry>
+	      <entry>&a.advocacy.name;</entry>
 	      <entry>FreeBSD ¤ÎÊ¡²»ÅÁÆ»</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-announce</entry>
+	      <entry>&a.announce.name;</entry>
 	      <entry>½ÅÍפʥ¤¥Ù¥ó¥È¤ä¥×¥í¥¸¥§¥¯¥È¤Î¥Þ¥¤¥ë¥¹¥È¥ó</entry>
 	    </row>
 
  	    <row>
-	      <entry>freebsd-arch</entry>
+	      <entry>&a.arch.name;</entry>
 	      <entry>¥¢¡¼¥­¥Æ¥¯¥Á¥ã¡¢À߷פ˴ؤ¹¤ëµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-bugbusters</entry>
+	      <entry>&a.bugbusters.name;</entry>
 	      <entry>FreeBSD
 		¾ã³²Êó¹ð¥Ç¡¼¥¿¥Ù¡¼¥¹¤ª¤è¤Ó´ØÏ¢¤¹¤ë¥Ä¡¼¥ë¤Î´ÉÍý¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-bugs</entry>
+	      <entry>&a.bugs.name;</entry>
 	      <entry>¥Ð¥°¥ì¥Ý¡¼¥È</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-chat</entry>
+	      <entry>&a.chat.name;</entry>
 	      <entry>FreeBSD
 		¥³¥ß¥å¥Ë¥Æ¥£¤Ë´ØÏ¢¤¹¤ëµ»½ÑŪ¤Ç¤Ï¤Ê¤¤ÏÃÂê</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-config</entry>
-	      <entry>FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ÈÀßÄêÍѤΥġ¼¥ë¤Î³«È¯¤Ë´Ø¤¹¤ëÏÃÂê</entry>
-	    </row>
-
-	    <row>
-	      <entry>freebsd-current</entry>
+	      <entry>&a.current.name;</entry>
 	      <entry>&os.current; ¤Î»ÈÍѤ˴ØÏ¢¤¹¤ëµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-isp</entry>
+	      <entry>&a.isp.name;</entry>
 	      <entry>FreeBSD ¤òÍѤ¤¤Æ¤¤¤ë
 		¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤ÎÏÃÂê</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-jobs</entry>
+	      <entry>&a.jobs.name;</entry>
 	      <entry>FreeBSD ´ØÏ¢¤Î¸ÛÍѵ¡²ñ¤Ë´Ø¤¹¤ëÏÃÂê</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-newbies</entry>
+	      <entry>&a.newbies.name;</entry>
 	      <entry>FreeBSD ½é¿´¼Ô¥æ¡¼¥¶¤Î³èÆ°¤ÈµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-questions</entry>
+	      <entry>&a.questions.name;</entry>
 	      <entry>¥æ¡¼¥¶¤«¤é¤Î¼ÁÌä¤Èµ»½Ñ¥µ¥Ý¡¼¥È</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-security-notifications</entry>
+	      <entry>&a.security-notifications.name;</entry>
 	      <entry>¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ëÄÌÃÎ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-stable</entry>
+	      <entry>&a.stable.name;</entry>
 	      <entry>&os.stable; ¤Î»ÈÍѤ˴ØÏ¢¤¹¤ëµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-test</entry>
+	      <entry>&a.test.name;</entry>
 	      <entry>¥á¥Ã¥»¡¼¥¸¤ÎÁ÷¿®»î¸³¤ò¹Ô¤Ê¤¦¤¿¤á¤Ë¡¢
                 ¼ÂºÝ¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÎÂå¤ï¤ê¤Ë»È¤¦¥¢¥É¥ì¥¹</entry>
 	    </row>
@@ -177,47 +172,47 @@
 
 	  <tbody>
 	    <row>
-	      <entry>freebsd-afs</entry>
+	      <entry>&a.afs.name;</entry>
 	      <entry>FreeBSD ¤Ø¤ÎAFS¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-aic7xxx</entry>
+	      <entry>&a.aic7xxx.name;</entry>
 	      <entry>Adaptec AIC 7xxx Íѥɥ饤¥Ð¤Î³«È¯</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-alpha</entry>
+	      <entry>&a.alpha.name;</entry>
 	      <entry>FreeBSD ¤Î Alpha ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-arm</entry>
+	      <entry>&a.arm.name;</entry>
 	      <entry>FreeBSD ¤Î ARM ¥×¥í¥»¥Ã¥µ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-atm</entry>
+	      <entry>&a.atm.name;</entry>
 	      <entry>FreeBSD ¤Ç¤Î ATM ¥Í¥Ã¥È¥ï¡¼¥¯»ÈÍѤ˴ؤ¹¤ëÏÃÂê</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-binup</entry>
+	      <entry>&a.binup.name;</entry>
 	      <entry>¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥Ç¡¼¥È¥·¥¹¥Æ¥à¤ÎÀ߷פȳ«È¯</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-cluster</entry>
+	      <entry>&a.cluster.name;</entry>
 	      <entry>FreeBSD ¤Î¥¯¥é¥¹¥¿´Ä¶­¤Ç¤ÎÍøÍÑ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-cvsweb</entry>
+	      <entry>&a.cvsweb.name;</entry>
 	      <entry>CVSweb ¤Î´ÉÍý</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-database</entry>
+	      <entry>&a.database.name;</entry>
 	      <entry>FreeBSD
 		¾å¤Ç¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÍøÍѤ䳫ȯ¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
 	    </row>
@@ -228,107 +223,102 @@
 	    </row>
 
 	    <row>
-	      <entry>freebsd-doc</entry>
+	      <entry>&a.doc.name;</entry>
 	      <entry>FreeBSD ´ØÏ¢¥É¥­¥å¥á¥ó¥È¤ÎºîÀ®</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-emulation</entry>
+	      <entry>&a.emulation.name;</entry>
 	      <entry>Linux/DOS/Windows
 		¤Î¤è¤¦¤Ê¾¤Î¥·¥¹¥Æ¥à¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-firewire</entry>
+	      <entry>&a.firewire.name;</entry>
 	      <entry>FreeBSD Firewire (iLink, IEEE 1394)
 		¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-fs</entry>
+	      <entry>&a.fs.name;</entry>
 	      <entry>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-gnome</entry>
+	      <entry>&a.gnome.name;</entry>
 	      <entry><application>GNOME</application> ¤ª¤è¤Ó
 		<application>GNOME</application> ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-hackers</entry>
+	      <entry>&a.hackers.name;</entry>
 	      <entry>°ìÈÌŪ¤Êµ»½Ñ¤ÎµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-hardware</entry>
+	      <entry>&a.hardware.name;</entry>
 	      <entry>FreeBSD ¤ÎÁö¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÈÌŪ¤ÊµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-i18n</entry>
+	      <entry>&a.i18n.name;</entry>
 	      <entry>FreeBSD ¤Î¹ñºÝ²½</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-ia32</entry>
+	      <entry>&a.ia32.name;</entry>
 	      <entry>FreeBSD ¤Î IA-32 (Intel x86) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-ia64</entry>
+	      <entry>&a.ia64.name;</entry>
 	      <entry>FreeBSD ¤Î Intel ¤¬³«È¯Ãæ¤Î IA64 ¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-ipfw</entry>
+	      <entry>&a.ipfw.name;</entry>
 	      <entry>IP firewall ¥³¡¼¥É¤ÎºÆÀ߷פ˴ؤ¹¤ëµ»½ÑŪµÄÏÀ</entry>
 	    </row>
 	    
 	    <row>
-	      <entry>freebsd-isdn</entry>
+	      <entry>&a.isdn.name;</entry>
 	      <entry>ISDN ³«È¯¼Ô</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-java</entry>
+	      <entry>&a.java.name;</entry>
 	      <entry>Java ³«È¯¼Ô¤ä¡¢FreeBSD ¤Ø JDK
 		¤ò°Ü¿¢¤¹¤ë¿Í¤¿¤Á</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-lfs</entry>
+	      <entry>&a.lfs.name;</entry>
 	      <entry>LFS ¤Î FreeBSD ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-libh</entry>
-	      <entry>Âè 2 À¤Âå¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢¥Ñ¥Ã¥±¡¼¥¸¥·¥¹¥Æ¥à</entry>
-	    </row>
-
-	    <row>
-	      <entry>freebsd-mips</entry>
+	      <entry>&a.mips.name;</entry>
 	      <entry>FreeBSD ¤Î MIPS ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 	    
 	    <row>
-	      <entry>freebsd-mobile</entry>
+	      <entry>&a.mobile.name;</entry>
 	      <entry>¥â¡¼¥Ð¥¤¥ë¥³¥ó¥Ô¥å¡¼¥Æ¥£¥ó¥°¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-mozilla</entry>
+	      <entry>&a.mozilla.name;</entry>
 	      <entry><application>Mozilla</application> ¤Î
 		FreeBSD ¤Ø¤Î°Ü¿¢¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
 	    </row>
 
  	    <row>
-	      <entry>freebsd-new-bus</entry>
+	      <entry>&a.newbus.name;</entry>
 	      <entry>¥Ð¥¹¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-net</entry>
+	      <entry>&a.net.name;</entry>
 	      <entry>¥Í¥Ã¥È¥ï¡¼¥¯¤ª¤è¤Ó TCP/IP
 		¥½¡¼¥¹¥³¡¼¥É¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
 	    </row>
@@ -339,24 +329,23 @@
 	    </row>
 
 	    <row>
-	      <entry>freebsd-openoffice</entry>
-	      <entry><application>OpenOffice.org</application> ¤ª¤è¤Ó
-		<application>StarOffice</application> ¤Î FreeBSD ¤Ø¤Î°Ü¿¢</entry>
+	      <entry>&a.office.name;</entry>
+	      <entry>FreeBSD ¤Ç¤Î¥ª¥Õ¥£¥¹¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-performance</entry>
+	      <entry>&a.performance.name;</entry>
 	      <entry>¥Ï¥¤¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹ /
 		¹âÉé²Ù¤Ç¤ÎƳÆþ¤Î¤¿¤á¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¥Á¥å¡¼¥Ë¥ó¥°¤Ë´Ø¤¹¤ë¼ÁÌä</entry>
 	    </row>
 	    
 	    <row>
-	      <entry>freebsd-platforms</entry>
+	      <entry>&a.platforms.name;</entry>
 	      <entry>Intel °Ê³°¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-ports</entry>
+	      <entry>&a.ports.name;</entry>
 	      <entry>Ports Collection ¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
 	    </row>
 
@@ -366,63 +355,63 @@
 	    </row>
 
 	    <row>
-	      <entry>freebsd-ppc</entry>
+	      <entry>&a.ports-bugs.name;</entry>
+	      <entry>ports ¤Î¥Ð¥°¤ä PR ¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ</entry>
+	    </row>
+
+	    <row>
+	      <entry>&a.ppc.name;</entry>
 	      <entry>FreeBSD ¤Î PowerPC ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-qa</entry>
+	      <entry>&a.qa.name;</entry>
 	      <entry>ÉʼÁÊÝ¾Ú (Ä̾ï¤Ï¥ê¥ê¡¼¥¹¤ÎÊÝα) ¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-realtime</entry>
+	      <entry>&a.realtime.name;</entry>
 	      <entry>FreeBSD ÍѤΥꥢ¥ë¥¿¥¤¥à³ÈÄ¥¤Î³«È¯¤Ë´Ø¤¹¤ëÏÃÂê</entry>
 	    </row>
 	    
 	    <row>
-	      <entry>freebsd-scsi</entry>
+	      <entry>&a.scsi.name;</entry>
 	      <entry>SCSI ¥µ¥Ö¥·¥¹¥Æ¥à</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-security</entry>
+	      <entry>&a.security.name;</entry>
 	      <entry>¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ëÏÃÂê</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-small</entry>
+	      <entry>&a.small.name;</entry>
 	      <entry>ÁȤ߹þ¤ß¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤ª¤±¤ë FreeBSD ¤ÎÍøÍÑ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-smp</entry>
+	      <entry>&a.smp.name;</entry>
 	      <entry>ÂоΠ/ ÈóÂоΤÎ
 		¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¤ÎÀ߷פ˴ؤ¹¤ëµÄÏÀ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-sparc</entry>
+	      <entry>&a.sparc.name;</entry>
 	      <entry>FreeBSD ¤Î SPARC ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-standards</entry>
+	      <entry>&a.standards.name;</entry>
 	      <entry>C99 ¤ª¤è¤Ó POSIX ɸ½à¤Ø¤Î FreeBSD ¤ÎŬ¹ç¤Ë¤Ä¤¤¤Æ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-threads</entry>
+	      <entry>&a.threads.name;</entry>
 	      <entry>FreeBSD ¤Î¥¹¥ì¥Ã¥É¤Ë¤Ä¤¤¤Æ</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-testing</entry>
-	      <entry>FreeBSD ¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ª¤è¤Ó°ÂÄêÀ­¤Ë´Ø¤¹¤ë»î¸³</entry>
-	    </row>
-
-	    <row>
-	      <entry>freebsd-tokenring</entry>
+	      <entry>&a.tokenring.name;</entry>
 	      <entry>FreeBSD ¤Ç¤Î¥È¡¼¥¯¥ó¥ê¥ó¥°¤Î¥µ¥Ý¡¼¥È</entry>
 	    </row>
 
@@ -464,28 +453,23 @@
 	    </row>
 
 	    <row>
-	      <entry>freebsd-hubs</entry>
+	      <entry>&a.hubs.name;</entry>
 	      <entry>¥ß¥é¡¼¥µ¥¤¥È¤ò±¿±Ä¤·¤Æ¤¤¤ë¿Íã
 		(´ðÈפΥµ¥Ý¡¼¥È)</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-install</entry>
-	      <entry>¥¤¥ó¥¹¥È¡¼¥ë´Ø·¸¤Î³«È¯</entry>
-	    </row>
-
-	    <row>
-	      <entry>freebsd-user-groups</entry>
+	      <entry>&a.usergroups.name;</entry>
 	      <entry>¥æ¡¼¥¶¥°¥ë¡¼¥×¤ÎÄ´À°</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-user-vendors</entry>
+	      <entry>&a.vendors.name;</entry>
 	      <entry>¥×¥ì¥ê¥ê¡¼¥¹¤Ë´Ø¤¹¤ë¥Ù¥ó¥À¤È¤ÎÄ´À°</entry>
 	    </row>
 
 	    <row>
-	      <entry>freebsd-www</entry>
+	      <entry>&a.www.name;</entry>
 	      <entry><ulink url="../../../../ja/index.html">www.FreeBSD.org
 		</ulink> ¤Î´ÉÍý¼Ô</entry>
 	    </row>
@@ -494,87 +478,9 @@
       </informaltable>
 
       <para><emphasis>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥À¥¤¥¸¥§¥¹¥ÈÈÇ:</emphasis> 
-	¾å½Ò¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¿¤¯¤Ç¥À¥¤¥¸¥§¥¹¥ÈÈǤ¬ÍøÍѤǤ­¤Þ¤¹¡£
-	¥À¥¤¥¸¥§¥¹¥ÈÈǤǤϥ᡼¥ê¥ó¥°¥ê¥¹¥È¤Ë¿·¤¿¤ËÅê¹Æ¤µ¤ì¤¿µ­»ö¤¬½¸¤á¤é¤ì¡¢
-	100&nbsp;KB ¤òĶ¤¨¤¿¥á¥Ã¥»¡¼¥¸¤ò¼õ¤±¼è¤ë¤È°ìÄ̤Υ᡼¥ë¤È¤·¤ÆÁ÷¿®¤µ¤ì¤Þ¤¹¡£
-	¥À¥¤¥¸¥§¥¹¥ÈÈǤ¬ÍøÍѤǤ­¤ë¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
-
-      <informaltable frame="none">
-	<tgroup cols="1">
-	  <thead>
-	    <row>
-	      <entry>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</entry>
-	    </row>
-	  </thead>
-	  
-	  <tbody>
-	    <row>
-	      <entry>freebsd-afs-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-alpha-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-arm-digest</entry>
-	    </row>
-
-	    <row>
-	      <entry>freebsd-chat-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-current-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-database-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-hackers-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-ia32-digest</entry>
-	    </row>
-
-	    <row>
-	      <entry>freebsd-ia64-digest</entry>
-	    </row>
-
-	    <row>
-	      <entry>freebsd-isdn-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-java-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-questions-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-security-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-sparc-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-stable-digest</entry>
-	    </row>
-	    
-	    <row>
-	      <entry>freebsd-test-digest</entry>
-	    </row>
-	    
-	  </tbody>
-	</tgroup>
-      </informaltable>
+	¾å½Ò¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¤¹¤Ù¤Æ¤Ç¥À¥¤¥¸¥§¥¹¥ÈÈǤòÍøÍѤǤ­¤Þ¤¹¡£
+	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅÐÏ¿¤¹¤ë¤È¡¢¥¢¥«¥¦¥ó¥È¤Î¥ª¥×¥·¥ç¥ó¥»¥¯¥·¥ç¥ó¤Ç¡¢
+	¥À¥¤¥¸¥§¥¹¥È¤Î¥ª¥×¥·¥ç¥ó¤òÊѹ¹¤Ç¤­¤Þ¤¹¡£</para>
 
       <para><emphasis>SVN ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È:</emphasis>
 	°Ê²¼¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¥½¡¼¥¹¥Ä¥ê¡¼¤Î
@@ -750,53 +656,27 @@
     <sect2 id="eresources-subscribe">
       <title>»²²ÃÊýË¡</title>
 
-      <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤¹¤ë¤Ë¤Ï¡¢
+      <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤¹¤ë¤Ë¤Ï¡¢¾åµ­¤Î¥ê¥¹¥È¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤«¡¢
+	&a.mailman.lists.link;
+	¤Ë¿Ê¤ó¤Ç¶½Ì£¤ò»ý¤Ã¤Æ¤¤¤ë¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥Ú¡¼¥¸¤Ë¤Ï¡¢ÅÐÏ¿¤ËɬÍפʼê½ç¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
         
-        <programlisting>subscribe &lt;listname&gt; [&lt;optional address&gt;]</programlisting>
-	
-        ¤È¤¤¤¦ÆâÍƤò¥á¥Ã¥»¡¼¥¸¤ÎËÜʸ¤Ë´Þ¤à¥á¡¼¥ë¤ò &a.majordomo;
-	¤ËÁ÷¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢<literal>freebsd-announce</literal>
-	¤Ë»²²Ã¤·¤¿¤¤¾ì¹ç¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
-
-      <screen>&prompt.user; <userinput>mail majordomo at FreeBSD.org</userinput>
-subscribe freebsd-announce
-^D</screen>
-
       <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¥á¡¼¥ë¤òÁ÷¤ë¤Ë¤Ï¡¢¤¿¤À
 	&lt;<replaceable>listname</replaceable>@FreeBSD.org&gt;
 	¤Ë¥á¡¼¥ë¤òÁ÷¤ë¤À¤±¤Ç¤¹¡£¤¹¤ë¤È¡¢
-	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ëÀ¤³¦Ãæ¤Î¥á¥ó¥Ð¤ËºÆÇÛÉÛ¤µ¤ì¤Þ¤¹¡£
-	ÅÐÏ¿¤Ë´Ø¤¹¤ë¥á¡¼¥ë¤Ï¡¢&a.majordomo; ¤ËÁ÷¤ê¡¢
-	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤½¤Î¤â¤Î¤Ë¤ÏÁ÷¤é¤Ê¤¤¤è¤¦
-	<emphasis>Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤</emphasis>¡£</para>
-
-      <para>¤â¤·¡¢¤¢¤Ê¤¿¤¬¡¢¼«Ê¬¼«¿È¤ò°ã¤¦Ì¾Á° (¥á¡¼¥ë¥¢¥É¥ì¥¹)
-	¤ÇÅÐÏ¿¤·¤¿¤¤¾ì¹ç¡¢¤¢¤ë¤¤¤Ï¡¢¥í¡¼¥«¥ë¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È
-	(¤â¤·¤¢¤Ê¤¿¤Î¥µ¥¤¥È¤Ë¡¢¶½Ì£¤ò»ý¤Ã¤¿Ãç´Ö¤¬¤¤¤ë¤Ê¤é¡¢
-	¤³¤ì¤Ï¤è¤êÍ­¸ú¤Ç¤¹¤·¡¢»ä¤¿¤Á¤Ë¤È¤Ã¤Æ¤âÈó¾ï¤Ë´ò¤·¤¤¤³¤È¤Ç¤¹¡£)
-	¤òÅÐÏ¿¤¹¤ë¿½¤·¹þ¤ß¤ò¤ª¤³¤Ê¤¤¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹:
-      </para>
+	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ëÀ¤³¦Ãæ¤Î¥á¥ó¥Ð¤ËºÆÇÛÉÛ¤µ¤ì¤Þ¤¹¡£</para>
 
-      <screen>&prompt.user; <userinput>mail majordomo at FreeBSD.org</userinput>
-subscribe freebsd-announce local-announce at example.com
-^D</screen>
-
-      <para>ºÇ¸å¤Ë¡¢majordomo ¤ËÂФ·¤Æ
-	¾¤Î¥¿¥¤¥×¤Î¥³¥ó¥È¥í¡¼¥ë¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ë¤³¤È¤Ç
-	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤«¤éæÂष¤¿¤ê¡¢
-	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¾¤Î¥á¥ó¥Ð¤Î¥ê¥¹¥È¤òÆÀ¤¿¤ê¡¢
-	ºÆ¤Ó¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥ê¥¹¥È¤ò¸«¤¿¤ê¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
-	ÍøÍѤǤ­¤ë¥³¥Þ¥ó¥É¤Î´°Á´¤Ê¥ê¥¹¥È¤òÆþ¼ê¤¹¤ë¤Ë¤Ï¡¢
-	¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹: </para>
-
-      <screen>&prompt.user; <userinput>mail majordomo at FreeBSD.org</userinput>
-help
-^D</screen>
+      <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤«¤éÅÐÏ¿¤ò²ò½ü¤¹¤ë¾ì¹ç¤Ï¡¢
+	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÇÇÛ¿®¤µ¤ì¤Æ¤¤¤ë¥á¡¼¥ë¤ÎºÇ¸å¤Ë¤¢¤ë
+	URL ¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¤Þ¤¿¤Ï¡¢
+	freebsd-[¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î̾Á°]-unsubscribe at FreeBSD.org
+	¤Ë¥á¡¼¥ë¤òÁ÷¿®¤¹¤ë¤³¤È¤Ç¤âÅÐÏ¿¤ò²ò½ü¤Ç¤­¤Þ¤¹¡£</para>
 
       <para>ºÆÅÙ¸À¤¤¤Þ¤¹¤¬¡¢
 	»ä¤¿¤Á¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤Ïµ»½ÑŪ¤ÊµÄÏÀ¤òÊݤĤ褦
 	Í׵ᤷ¤Þ¤¹¡£¤â¤·¡¢½ÅÍפʥ¢¥Ê¥¦¥ó¥¹¤Ë¤Î¤ß¶½Ì£¤¬¤¢¤ë¤Ê¤é¡¢
-        freebsd-announce ¤Ø¤Î»²²Ã¤ò¤ª´«¤á¤·¤Þ¤¹¡£
+        &a.announce.name; ¤Ø¤Î»²²Ã¤ò¤ª´«¤á¤·¤Þ¤¹¡£
 	¤³¤ì¤Ë¤Ï¡¢¤¢¤Þ¤ê¤¿¤¯¤µ¤ó¤Î¥á¡¼¥ë¤Ïή¤ì¤Þ¤»¤ó¡£</para>
     </sect2>
 
@@ -879,7 +759,8 @@ help
       <para><emphasis>¸Ä¡¹¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î·û¾Ï:</emphasis></para>
 
       <variablelist>
-	<varlistentry><term>FREEBSD-AFS</term>
+ 	<varlistentry>
+	  <term>&a.afs.name;</term>
 	  <listitem>
 	    <para><emphasis>Andrew ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à</emphasis></para>
 	    <para>¤³¤Î¥ê¥¹¥È¤Ï¡¢CMU/Transarc ¤Î AFS
@@ -887,7 +768,8 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-ANNOUNCE</term>
+	<varlistentry>
+	  <term>&a.announce.name;</term>
 	  <listitem>
 	    <para><filename>½ÅÍפʥ¤¥Ù¥ó¥È/¥Þ¥¤¥ë¥¹¥È¥ó</filename></para>
 	    <para>¤³¤ì¤Ï¡¢Ã±¤Ë¤¿¤Þ¤Ëȯɽ¤µ¤ì¤ë½ÅÍ×¤Ê freebsd
@@ -902,7 +784,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-ARCH</term>
+	<varlistentry>
+	  <term>&a.arch.name;</term>
+
 	  <listitem>
 	    <para><emphasis>¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ÈÀ߷פεÄÏÀ</emphasis></para>
 	    <para>¤³¤ì¤Ï¡¢FreeBSD
@@ -937,7 +821,7 @@ help
 	</varlistentry>
 
 	<varlistentry>
-	  <term>FREEBSD-BINUP</term>
+	  <term>&a.binup.name;</term>
 
 	  <listitem>
 	    <para><emphasis>FreeBSD ¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥Ç¡¼¥È¥×¥í¥¸¥§¥¯¥È</emphasis></para>
@@ -952,7 +836,7 @@ help
 	</varlistentry>
 
 	<varlistentry>
-	  <term>FREEBSD-BUGBUSTERS</term>
+	  <term>&a.bugbusters.name;</term>
 
 	  <listitem>
 	    <para><emphasis>¾ã³²Êó¹ð¤Î¼è¤ê°·¤¤¤Ë´Ø¤¹¤ëÄ´À°</emphasis></para>
@@ -963,7 +847,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-BUGS</term>
+	<varlistentry>
+	  <term>&a.bugs.name;</term>
+
 	  <listitem>
 	    <para><emphasis>¥Ð¥°¥ì¥Ý¡¼¥È</emphasis></para>
 	    <para>¤³¤ì¤Ï¡¢FreeBSD
@@ -976,7 +862,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-CHAT</term>
+	<varlistentry>
+	  <term>&a.chat.name;</term>
+
 	  <listitem>
 	    <para><emphasis>FreeBSD¤Î¥³¥ß¥å¥Ë¥Æ¥£¤Ë´Ø¤¹¤ë
 		µ»½ÑŪ¤Ç¤Ï¤Ê¤¤ÏÃÂê</emphasis></para>
@@ -996,7 +884,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-CORE</term>
+	<varlistentry>
+	  <term>freebsd-core</term>
+
 	  <listitem>
 	    <para><emphasis>FreeBSD¥³¥¢¥Á¡¼¥à</emphasis></para>
 	    <para>¤³¤ì¤Ï¡¢¥³¥¢¥á¥ó¥Ð¤¬»È¤¦ÆâÉô¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
@@ -1006,7 +896,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-CURRENT</term>
+	<varlistentry>
+	  <term>&a.current.name;</term>
+
 	  <listitem>
 	    <para><emphasis>&os.current; ¤Î»ÈÍѤ˴ؤ¹¤ëµÄÏÀ
 	      </emphasis></para>
@@ -1025,19 +917,16 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-CURRENT-DIGEST</term>
+	<varlistentry>
+	  <term>&a.cvsweb.name;</term>
+
 	  <listitem>
-	    <para><emphasis>&os.current; ¤Î»ÈÍѤ˴ؤ¹¤ëµÄÏÀ
-	      </emphasis></para>
-	    <para>freebsd-current
-	      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥À¥¤¥¸¥§¥¹¥ÈÈǤǤ¹¡£
-              ¤³¤Î¥À¥¤¥¸¥§¥¹¥È¤Ï freebsd-current
-	      ¤ËÁ÷¤é¤ì¤¿¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò¤Þ¤È¤á¤¿¤â¤Î¤ò¡¢
-	      1 ¤Ä¤Î¥á¡¼¥ë¤Ë¤·¤ÆÁ÷¤ê½Ð¤·¤Þ¤¹¡£
-              ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï<emphasis>ÆɤßÀìÍÑ</emphasis>¤Ç¤¹¡£
-	      ¥á¡¼¥ë¤òÁ÷¤ë¤è¤¦¤Ê»ö¤Ï¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
-	  </listitem>
-	</varlistentry>
+	    <para><emphasis>FreeBSD CVSweb ¥×¥í¥¸¥§¥¯¥È</emphasis></para>
+
+	    <para>FreeBSD-CVSweb
+	      ¤ÎÍøÍÑ¡¢³«È¯¤ª¤è¤Ó´ÉÍý¤Ë¤Ä¤¤¤Æ¤Îµ»½ÑŪ¤ÊµÄÏÀ¤Î¾ì¤Ç¤¹¡£</para>
+ 	  </listitem>
+ 	</varlistentry>
 
 	<varlistentry>
 	  <term>&a.desktop.name;</term>
@@ -1052,18 +941,9 @@ help
  	</varlistentry>
 
 	<varlistentry>
-	  <term>FREEBSD-CVSWEB</term>
+	  <term>&a.doc.name;</term>
 
 	  <listitem>
-	    <para><emphasis>FreeBSD CVSweb ¥×¥í¥¸¥§¥¯¥È</emphasis></para>
-
-	    <para>FreeBSD-CVSweb
-	      ¤ÎÍøÍÑ¡¢³«È¯¤ª¤è¤Ó´ÉÍý¤Ë¤Ä¤¤¤Æ¤Îµ»½ÑŪ¤ÊµÄÏÀ¤Î¾ì¤Ç¤¹¡£</para>
- 	  </listitem>
- 	</varlistentry>
-
-	<varlistentry><term>FREEBSD-DOC</term>
-	  <listitem>
 	    <para><emphasis>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</emphasis></para>
             
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï FreeBSD
@@ -1077,7 +957,7 @@ help
 	</varlistentry>
 
 	<varlistentry>
-	  <term>FREEBSD-FIREWIRE</term>
+	  <term>&a.firewire.name;</term>
 
 	  <listitem>
 	    <para><emphasis>Firewire (iLink, IEEE 1394)</emphasis></para>
@@ -1092,7 +972,8 @@ help
 	</varlistentry>
 
 	<varlistentry>
-	  <term>FREEBSD-FS</term>
+	  <term>&a.fs.name;</term>
+
 	  <listitem>
 	    <para><emphasis>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à</emphasis></para>
 	    <para>FreeBSD ¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë´Ø¤¹¤ëµÄÏÀ
@@ -1102,7 +983,7 @@ help
 	</varlistentry>
 
 	<varlistentry>
-	  <term>FREEBSD-GNOME</term>
+	  <term>&a.gnome.name;</term>
 
 	  <listitem>
 	    <para><emphasis>GNOME</emphasis></para>
@@ -1115,7 +996,7 @@ help
 	</varlistentry>
 
 	<varlistentry>
-	  <term>FREEBSD-IPFW</term>
+	  <term>&a.ipfw.name;</term>
 	  
 	  <listitem>
 	    <para><emphasis>IP Firewall</emphasis></para>
@@ -1128,7 +1009,7 @@ help
 	</varlistentry>
 	
 	<varlistentry>
-	  <term>FREEBSD-IA64</term>
+	  <term>&a.ia64.name;</term>
 
 	  <listitem>
 	    <para><emphasis>FreeBSD ¤Î IA64 ¤Ø¤Î°Ü¿¢</emphasis></para>
@@ -1140,7 +1021,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-ISDN</term>
+	<varlistentry>
+	  <term>&a.isdn.name;</term>
+
 	  <listitem>
 	    <para><emphasis>ISDN¥³¥ß¥å¥Ë¥±¡¼¥·¥ç¥ó</emphasis></para>
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢
@@ -1149,7 +1032,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-JAVA</term>
+	<varlistentry>
+	  <term>&a.java.name;</term>
+
 	  <listitem>
 	    <para><emphasis>Java ¤Î³«È¯</emphasis></para>
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢FreeBSD
@@ -1159,7 +1044,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-HACKERS</term>
+	<varlistentry>
+	  <term>&a.hackers.name;</term>
+
 	  <listitem>
 	    <para><emphasis>µ»½ÑŪ¤ÊµÄÏÀ</emphasis></para>
 	    <para>¤³¤ì¤Ï FreeBSD ¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ¤Î¤¿¤á¤Î
@@ -1174,29 +1061,21 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-HACKERS-DIGEST</term>
-	  <listitem>
-	    <para><emphasis>µ»½ÑŪ¤ÊµÄÏÀ</emphasis></para>
-	    <para>freebsd-hackers¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥À¥¤¥¸¥§¥¹¥ÈÈǤǤ¹¡£
-	      ¤³¤Î¥À¥¤¥¸¥§¥¹¥È¤Ï freebsd-hackers
-	      ¤ËÁ÷¤é¤ì¤¿¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò¤Þ¤È¤á¤¿¤â¤Î¤ò¡¢1 ¤Ä¤Î¥á¡¼
-	      ¥ë¤Ë¤·¤ÆÁ÷¤ê½Ð¤·¤Þ¤¹¡£
-	      ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï<emphasis>ÆɤßÀìÍÑ</emphasis>¤Ç¤¹¡£
-	      ¥á¡¼¥ë¤òÁ÷¤ë¤è¤¦¤Ê»ö¤Ï¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
-	  </listitem>
-	</varlistentry>
+	<varlistentry>
+	  <term>&a.hardware.name;</term>
 
-	<varlistentry><term>FREEBSD-HARDWARE</term>
 	  <listitem>
-	    <para><emphasis>FreeBSD¤Î¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÈÌŪ¤ÊµÄÏÀ
+	    <para><emphasis>FreeBSD ¤Î¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÈÌŪ¤ÊµÄÏÀ
 	      </emphasis></para>
-	    <para>FreeBSD¤¬Áö¤Ã¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î¥¿¥¤¥×¤ä¡¢
+	    <para>FreeBSD ¤¬Áö¤Ã¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î¥¿¥¤¥×¤ä¡¢
 	      ²¿¤òÇã¤Ã¤¿¤êÈò¤±¤¿¤ê¤¹¤ë¤«¤Ë´Ø¤¹¤ëÍÍ¡¹¤ÊÌäÂê¤ä¡¢
 	      Äó°Æ¤Ë´Ø¤¹¤ëµÄÏÀ¡£</para>
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-HUBS</term>
+	<varlistentry>
+	  <term>&a.hubs.name;</term>
+
 	  <listitem>
 	    <para><emphasis>¥ß¥é¡¼¥µ¥¤¥È</emphasis></para>
 	    <para>FreeBSD ¥ß¥é¡¼¥µ¥¤¥È¤ò±¿ÍѤ·¤Æ¤¤¤ë¿Íã¸þ¤±¤Î¡¢
@@ -1205,16 +1084,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-INSTALL</term>
-	  <listitem>
-	    <para><emphasis>¥¤¥ó¥¹¥È¡¼¥ë¤Ë´Ø¤¹¤ëµÄÏÀ</emphasis></para>
-	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¾­Íè¤Î¥ê¥ê¡¼¥¹¤Î
-	      ¥¤¥ó¥¹¥È¡¼¥ë¤Ë´Ø¤¹¤ë³«È¯¤ÎµÄÏÀ¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
-             </para>
-	  </listitem>
-	</varlistentry>
+	<varlistentry>
+	  <term>&a.isp.name;</term>
 
-	<varlistentry><term>FREEBSD-ISP</term>
 	  <listitem>
 	    <para><emphasis>
 		¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤Î¤Ë¤Ä¤¤¤Æ¤ÎÏÃÂê
@@ -1227,7 +1099,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-NEWBIES</term>
+	<varlistentry>
+	  <term>&a.newbies.name;</term>
+
 	  <listitem>
 	    <para><emphasis>½é¿´¼Ô¤Î³èÆ°¤ÎµÄÏÀ</emphasis></para>
 	    <para>¤É¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤â°·¤ï¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿
@@ -1247,19 +1121,18 @@ help
 	</varlistentry>
 
 	<varlistentry>
-	  <term>FREEBSD-OPENOFFICE</term>
+	  <term>&a.office.name;</term>
 
 	  <listitem>
-	    <para><emphasis>OpenOffice.org</emphasis></para>
+	    <para><emphasis>FreeBSD ¤Ç¤Î¥ª¥Õ¥£¥¹¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</emphasis></para>
 
-	    <para><application>OpenOffice.org</application> ¤ª¤è¤Ó
-	      <application>StarOffice</application>
-	      ¤Î°Ü¿¢¤È´ÉÍý¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ¤Î¾ì¤Ç¤¹¡£</para>
+	    <para>FreeBSD ¤Ë¤ª¤±¤ë¥ª¥Õ¥£¥¹¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢
+	      ³«È¯¤ª¤è¤Ó¥µ¥Ý¡¼¥È¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ¤Î¾ì¤Ç¤¹¡£</para>
 	   </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>FREEBSD-PERFORMANCE</term>
+	  <term>&a.platforms.name;</term>
 
 	  <listitem>
 	    <para><emphasis>FreeBSD
@@ -1282,7 +1155,8 @@ help
 	</varlistentry>
 
 	<varlistentry>
-	  <term>FREEBSD-PLATFORMS</term>
+	  <term>&a.platforms.name;</term>
+
 	  <listitem>
 	    <para><emphasis>Intel °Ê³°¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢
 	      </emphasis></para>
@@ -1294,14 +1168,15 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-PORTS</term>
+	<varlistentry>
+	  <term>&a.ports.name;</term>
+
 	  <listitem>
 	    <para><emphasis><quote>ports</quote> ¤ÎµÄÏÀ</emphasis></para>
 	    <para>FreeBSD <quote>Ports Collection</quote>
 	      (<filename>/usr/ports</filename>)
               ¤Ë´ØÏ¢¤¹¤ëÏÃÂê¤ä¡¢
-              ¿·¤¿¤Ê ports ¤ÎÄó°Æ¡¢Ports
-              Collection ¤Î´ðÈפÎÊѹ¹¤ª¤è¤Ó°ìÈÌŪ¤Ê¹½À®¤ÎÀ°È÷³èÆ°¤Ë´Ø¤¹¤ëµÄÏÀ¡£
+              Ports Collection ¤Î´ðÈפª¤è¤Ó ports ¤Î°ìÈÌŪ¤Ê¹½À®¤ÎÀ°È÷³èÆ°¤Ë´Ø¤¹¤ëµÄÏÀ¡£
 	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
 	      ¸·Ì©¤Ëµ»½ÑŪ¤ÊÆâÍƤΤߤ¬°·¤ï¤ì¤Þ¤¹¡£</para>
 	  </listitem>
@@ -1325,29 +1200,37 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-QUESTIONS</term>
+ 	<varlistentry>
+	  <term>&a.ports-bugs.name;</term>
+ 
+ 	  <listitem>
+	    <para><emphasis><quote>ports</quote>
+		¤Î¥Ð¥°¤Ë´Ø¤¹¤ëµÄÏÀ</emphasis></para>
+
+	    <para><quote>Ports Collection</quote> (<filename
+		role="directory">/usr/ports</filename>) ¤Î¾ã³²Êó¹ð¤ä
+	      ¿·¤¿¤Ê ports ¤äÊѹ¹¤Ë¤Ä¤¤¤Æ¤ÎÄó°Æ¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ¡£
+	      ¤³¤ì¤Ïµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ê¤Î¤Ç¡¢
+	      ¸·Ì©¤Ëµ»½ÑŪ¤ÊÆâÍƤΤߤ¬°·¤ï¤ì¤Þ¤¹¡£</para>
+ 	  </listitem>
+ 	</varlistentry>
+
+	<varlistentry>
+	  <term>&a.questions.name;</term>
+
 	  <listitem>
 	    <para><emphasis>¥æ¡¼¥¶¤«¤é¤Î¼ÁÌä</emphasis></para>
+
 	    <para>FreeBSD ¤Ë´Ø¤¹¤ë¼ÁÌä¤Î¤¿¤á¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤¹¡£
 	      ¤½¤Î¼ÁÌ䤬¤«¤Ê¤êµ»½ÑŪ¤À¤È»×¤ï¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
 	      <quote>¤É¤Î¤è¤¦¤Ë¤·¤Æ</quote>
-	      ¤È¤¤¤¦¼ÁÌä¤òµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë
-	      Á÷¤ë¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
+	      ¤È¤¤¤¦¼ÁÌä¤òµ»½ÑŪ¤Ê¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÁ÷¤ë¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-QUESTIONS-DIGEST</term>
-	  <listitem>
-	    <para><emphasis>¥æ¡¼¥¶¤«¤é¤Î¼ÁÌä</emphasis></para>
-	    <para>freebsd-questions
-	      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥À¥¤¥¸¥§¥¹¥ÈÈǤǤ¹¡£¤³¤Î¥À¥¤¥¸¥§¥¹¥È¤Ï
-	      freebsd-questions
-	      ¤ËÁ÷¤é¤ì¤¿¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò¤Þ¤È¤á¤¿¤â¤Î¤ò¡¢
-	      1 ¤Ä¤Î¥á¡¼¥ë¤Ë¤·¤ÆÁ÷¤ê½Ð¤·¤Þ¤¹¡£</para>
-	  </listitem>
-	</varlistentry>
+	<varlistentry>
+	  <term>&a.scsi.name;</term>
 
-	<varlistentry><term>FREEBSD-SCSI</term>
 	  <listitem>
 	    <para><emphasis>SCSI ¥µ¥Ö¥·¥¹¥Æ¥à</emphasis></para>
 	    <para>¤³¤ì¤Ï FreeBSD ¤Î¤¿¤á¤Î SCSI
@@ -1357,7 +1240,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-SECURITY</term>
+	<varlistentry>
+	  <term>&a.security.name;</term>
+
 	  <listitem>
 	    <para><emphasis>¥»¥­¥å¥ê¥Æ¥£¤Î´ØÏ¢¤ÎÏÃÂê</emphasis></para>
 	    <para>FreeBSD¥³¥ó¥Ô¥å¡¼¥¿¤Î¥»¥­¥å¥ê¥Æ¥£¤ÎÏÃÂê (DES,
@@ -1371,7 +1256,9 @@ help
 	  </listitem>
 	</varlistentry>
 
-	<varlistentry><term>FREEBSD-SECURITY-NOTIFICATIONS</term>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-doc-all mailing list