svn commit: r39658 - in head/ja_JP.eucJP: books/handbook/eresources share/xml

Ryusuke SUZUKI ryusuke at FreeBSD.org
Fri Oct 5 11:51:24 UTC 2012


Author: ryusuke
Date: Fri Oct  5 11:51:24 2012
New Revision: 39658
URL: http://svn.freebsd.org/changeset/doc/39658

Log:
  - Merge the following from the English version:
  
  	r17036 -> r18976, r39631 -> r39651
  				head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml
  
  	r39281 -> r39651	head/ja_JP.eucJP/books/handbook/eresources/chapter.sgml

Modified:
  head/ja_JP.eucJP/books/handbook/eresources/chapter.xml
  head/ja_JP.eucJP/share/xml/mailing-lists.ent

Modified: head/ja_JP.eucJP/books/handbook/eresources/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Thu Oct  4 18:39:41 2012	(r39657)
+++ head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Fri Oct  5 11:51:24 2012	(r39658)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r17036
+     Original revision: r18976
      $FreeBSD$
 -->
 
@@ -179,7 +179,7 @@
 
 	    <row>
 	      <entry>&a.aic7xxx.name;</entry>
-	      <entry>Adaptec AIC 7xxx Íѥɥ饤¥Ð¤Î³«È¯</entry>
+	      <entry>&adaptec; AIC 7xxx Íѥɥ饤¥Ð¤Î³«È¯</entry>
 	    </row>
 
 	    <row>
@@ -188,18 +188,18 @@
 	    </row>
 
 	    <row>
-	      <entry>&a.arm.name;</entry>
-	      <entry>FreeBSD ¤Î ARM ¥×¥í¥»¥Ã¥µ¤Ø¤Î°Ü¿¢</entry>
+	      <entry>&a.amd64.name;</entry>
+	      <entry>FreeBSD ¤Î AMD64 ¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>&a.atm.name;</entry>
-	      <entry>FreeBSD ¤Ç¤Î ATM ¥Í¥Ã¥È¥ï¡¼¥¯»ÈÍѤ˴ؤ¹¤ëÏÃÂê</entry>
+	      <entry>&a.arm.name;</entry>
+	      <entry>FreeBSD ¤Î &arm; ¥×¥í¥»¥Ã¥µ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
-	      <entry>&a.binup.name;</entry>
-	      <entry>¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥Ç¡¼¥È¥·¥¹¥Æ¥à¤ÎÀ߷פȳ«È¯</entry>
+	      <entry>&a.atm.name;</entry>
+	      <entry>FreeBSD ¤Ç¤Î ATM ¥Í¥Ã¥È¥ï¡¼¥¯»ÈÍѤ˴ؤ¹¤ëÏÃÂê</entry>
 	    </row>
 
 	    <row>
@@ -230,13 +230,13 @@
 
 	    <row>
 	      <entry>&a.emulation.name;</entry>
-	      <entry>Linux/DOS/Windows
+	      <entry>Linux/DOS/&windows;
 		¤Î¤è¤¦¤Ê¾¤Î¥·¥¹¥Æ¥à¤Î¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.firewire.name;</entry>
-	      <entry>FreeBSD Firewire (iLink, IEEE 1394)
+	      <entry>FreeBSD &firewire; (iLink, IEEE 1394)
 		¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ</entry>
 	    </row>
 
@@ -268,7 +268,7 @@
 
 	    <row>
 	      <entry>&a.ia32.name;</entry>
-	      <entry>FreeBSD ¤Î IA-32 (Intel x86) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢</entry>
+	      <entry>FreeBSD ¤Î IA-32 (&intel; x86) ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
@@ -288,7 +288,7 @@
 
 	    <row>
 	      <entry>&a.java.name;</entry>
-	      <entry>Java ³«È¯¼Ô¤ä¡¢FreeBSD ¤Ø JDK
+	      <entry>&java; ³«È¯¼Ô¤ä¡¢FreeBSD ¤Ø &jdk;
 		¤ò°Ü¿¢¤¹¤ë¿Í¤¿¤Á</entry>
 	    </row>
 
@@ -305,7 +305,7 @@
 
 	    <row>
 	      <entry>&a.mips.name;</entry>
-	      <entry>FreeBSD ¤Î MIPS ¤Ø¤Î°Ü¿¢</entry>
+	      <entry>FreeBSD ¤Î &mips; ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
@@ -368,7 +368,7 @@
 
 	    <row>
 	      <entry>&a.ppc.name;</entry>
-	      <entry>FreeBSD ¤Î PowerPC ¤Ø¤Î°Ü¿¢</entry>
+	      <entry>FreeBSD ¤Î &powerpc; ¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
@@ -404,12 +404,12 @@
 
 	    <row>
 	      <entry>&a.sparc.name;</entry>
-	      <entry>FreeBSD ¤Î SPARC ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢</entry>
+	      <entry>FreeBSD ¤Î &sparc; ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Ø¤Î°Ü¿¢</entry>
 	    </row>
 
 	    <row>
 	      <entry>&a.standards.name;</entry>
-	      <entry>C99 ¤ª¤è¤Ó POSIX ɸ½à¤Ø¤Î FreeBSD ¤ÎŬ¹ç¤Ë¤Ä¤¤¤Æ</entry>
+	      <entry>C99 ¤ª¤è¤Ó &posix; ɸ½à¤Ø¤Î FreeBSD ¤ÎŬ¹ç¤Ë¤Ä¤¤¤Æ</entry>
 	    </row>
 
 	    <row>
@@ -423,6 +423,11 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.x11.name;</entry>
+	      <entry>FreeBSD ¤Ç¤Î X11 ¤Î¥á¥ó¥Æ¥Ê¥ó¥¹¤È¥µ¥Ý¡¼¥È</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.xfce.name;</entry>
 	      <entry><application>XFCE</application> ¤Î &os; ¤Ø¤Î°Ü¿¢¤äÊݼé¤Ë¤Ä¤¤¤Æ</entry>
 	    </row>
@@ -823,21 +828,6 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>&a.binup.name;</term>
-
-	  <listitem>
-	    <para><emphasis>FreeBSD ¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥Ç¡¼¥È¥×¥í¥¸¥§¥¯¥È</emphasis></para>
-
-	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥Ç¡¼¥È¥·¥¹¥Æ¥à
-	      (¤Þ¤¿¤Ï <application>binup</application>) ¤Ë´Ø¤¹¤ëµÄÏÀ¤Î¾ì¤òÄ󶡤·¤Þ¤¹¡£
-	      Àß·×¾å¤ÎÌä
-	      Âê¡¢¼ÂÁõ¤Î¾ÜºÙ¡¢¥Ñ¥Ã¥Á¡¢¥Ð¥°Êó¹ð¡¢¾õ¶·Êó¹ð¡¢µ¡Ç½¤ÎÍ×˾¡¢
-	      ¥³¥ß¥Ã¥È¥í¥°¡¢¤½¤Î¾ <application>binup</application>
-	      ¤Ë´ØÏ¢¤¹¤ë¤â¤í¤â¤í¤¬³Ê¹¥¤ÎÏÃÂê¤È¤Ê¤ê¤Þ¤¹¡£</para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
 	  <term>&a.bugbusters.name;</term>
 
 	  <listitem>
@@ -962,10 +952,10 @@
 	  <term>&a.firewire.name;</term>
 
 	  <listitem>
-	    <para><emphasis>Firewire (iLink, IEEE 1394)</emphasis></para>
+	    <para><emphasis>&firewire; (iLink, IEEE 1394)</emphasis></para>
 
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢FreeBSD ¤Ë¤ª¤±¤ë
-	      Firewire (IEEE 1394, iLink)
+	      &firewire; (IEEE 1394, iLink)
 	      ¥µ¥Ö¥·¥¹¥Æ¥à¤ÎÀ߷פȼÂÁõ¤Ë¤Ä¤¤¤ÆµÄÏÀ¤ò¹Ô¤¦¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
 	      ɸ½à²½¡¢¥Ð¥¹¥Ç¥Ð¥¤¥¹¤È¤½¤Î¥×¥í¥È¥³¥ë¡¢
 	      ¥¢¥À¥×¥¿¥Ü¡¼¥É/¥«¡¼¥É/¥Á¥Ã¥×¥»¥Ã¥È¡¢¤½¤·¤Æ¡¢
@@ -1038,9 +1028,9 @@
 	  <term>&a.java.name;</term>
 
 	  <listitem>
-	    <para><emphasis>Java ¤Î³«È¯</emphasis></para>
+	    <para><emphasis>&java; ¤Î³«È¯</emphasis></para>
 	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢FreeBSD
-	      ¸þ¤±¤Î½ÅÍ×¤Ê Java ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î³«È¯¤ä¡¢JDK
+	      ¸þ¤±¤Î½ÅÍ×¤Ê &java; ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î³«È¯¤ä¡¢&jdk;
 	      ¤Î°Ü¿¢¤ä¥á¥ó¥Æ¥Ê¥ó¥¹¤Î
 	      µÄÏÀ¤ò¤¹¤ë¿Í¤Î¤¿¤á¤Î¤â¤Î¤Ç¤¹¡¥</para>
 	  </listitem>
@@ -1386,6 +1376,79 @@
 	</varlistentry>
       </variablelist>
     </sect2>
+
+    <sect2 id="eresources-mailfiltering">
+      <title>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Î¥Õ¥£¥ë¥¿¥ê¥ó¥°</title>
+
+      <para>&os; ¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢¥¹¥Ñ¥à¡¢
+	¥¦¥£¥ë¥¹¤ª¤è¤Ó¾¤ÎÉÔÍפʥ᡼¥ë¤òÇÛÉÛ¤·¤Æ¤·¤Þ¤ï¤Ê¤¤¤è¤¦¡¢
+	¤¤¤¯¤Ä¤«¤ÎÊýË¡¤Ç¥Õ¥£¥ë¥¿¥ê¥ó¥°¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
+	¤³¤ÎÀá¤ÇÀâÌÀ¤¹¤ë¥Õ¥£¥ë¥¿¥ê¥ó¥°¤Ï¡¢
+	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò¼é¤ë¤¿¤á¤Ë»È¤ï¤ì¤Æ¤¤¤ëÊýË¡¤Î¤¹¤Ù¤Æ¤È¤¤¤¦¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
+
+      <para>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¤Ï¡¢°Ê²¼¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤òÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+	°Ê²¼¤Î°ìÍ÷°Ê³°¤Î MIME content type ¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤ò´Þ¤à¥Õ¥¡¥¤¥ë¤Ï¡¢
+	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ëή¤ì¤ëÁ°¤Ë¼è¤ê½ü¤«¤ì¤Þ¤¹¡£</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para>application/octet-stream</para>
+	</listitem>
+
+	<listitem>
+	  <para>application/pdf</para>
+	</listitem>
+
+	<listitem>
+	  <para>application/pgp-signature</para>
+	</listitem>
+
+	<listitem>
+	  <para>application/x-pkcs7-signature</para>
+	</listitem>
+
+	<listitem>
+	  <para>message/rfc822</para>
+	</listitem>
+
+	<listitem>
+	  <para>multipart/alternative</para>
+	</listitem>
+
+	<listitem>
+	  <para>multipart/related</para>
+	</listitem>
+
+	<listitem>
+	  <para>multipart/signed</para>
+	</listitem>
+
+	<listitem>
+	  <para>text/html</para>
+	</listitem>
+
+	<listitem>
+	  <para>text/plain</para>
+	</listitem>
+
+	<listitem>
+	  <para>text/x-diff</para>
+	</listitem>
+
+	<listitem>
+	  <para>text/x-patch</para>
+	</listitem>
+      </itemizedlist>
+
+      <note>
+	<para>¾¤Î MIME content type ¤ÎźÉÕ¤òµö²Ä¤¹¤ë¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤â¤¢¤ê¤Þ¤¹¤¬¡¢
+	  ¾å¤Î°ìÍ÷¤Ë´Þ¤Þ¤ì¤ë¤â¤Î¤Ç¤¢¤ì¤Ð¡¢¤Û¤È¤ó¤É¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ÇŬÍѤǤ­¤Þ¤¹¡£</para>
+      </note>
+
+      <para>HTML ¤È plain ¥Æ¥­¥¹¥È¤òξÊý´Þ¤à¥á¡¼¥ë¤Ç¤Ï¡¢
+	HTML ¤ÎÉôʬ¤¬ºï½ü¤µ¤ì¤Þ¤¹¡£
+	HTML ¤Î¤ß¤ò´Þ¤à¥á¡¼¥ë¤Ï¡¢plain ¥Æ¥­¥¹¥È¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£</para>
+    </sect2>
   </sect1>
 
   <sect1 id="eresources-news">
@@ -1420,7 +1483,7 @@
     </sect2>
 
     <sect2>
-      <title>´ØÏ¢¤¹¤ë¾¤Î Unix ¤Î¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×</title>
+      <title>´ØÏ¢¤¹¤ë¾¤Î &unix; ¤Î¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×</title>
 
       <itemizedlist>
 	<listitem>

Modified: head/ja_JP.eucJP/share/xml/mailing-lists.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/mailing-lists.ent	Thu Oct  4 18:39:41 2012	(r39657)
+++ head/ja_JP.eucJP/share/xml/mailing-lists.ent	Fri Oct  5 11:51:24 2012	(r39658)
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39281
+     Original revision: r39651
      $FreeBSD$
 -->
 
@@ -52,10 +52,6 @@
 <!ENTITY a.atm "<ulink url='&a.atm.url;'>FreeBSD ATM networking ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</ulink>">
 <!ENTITY a.atm.name "<ulink url='&a.atm.url;'>freebsd-atm</ulink>">
 
-<!ENTITY a.binup.url "&a.mailman.listinfo;/freebsd-binup">
-<!ENTITY a.binup "<ulink url='&a.binup.url;'>FreeBSD binary update system ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</ulink>">
-<!ENTITY a.binup.name "<ulink url='&a.binup.url;'>freebsd-binup</ulink>">
-
 <!ENTITY a.bluetooth.url "&a.mailman.listinfo;/freebsd-bluetooth">
 <!ENTITY a.bluetooth "<ulink url='&a.bluetooth.url;'>FreeBSD Bluetooth ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</ulink>">
 <!ENTITY a.bluetooth.name "<ulink url='&a.bluetooth.url;'>freebsd-bluetooth</ulink>">


More information about the svn-doc-all mailing list