svn commit: r46659 - head/ja_JP.eucJP/htdocs/platforms

[Ryusuke SUZUKI]

Author: ryusuke
Date: Thu May  7 09:54:43 2015
New Revision: 46659
URL: https://svnweb.freebsd.org/changeset/doc/46659

Log:
  - Merge the following from the English version:
  
  	r41246 -> r45480	head/ja_JP.eucJP/htdocs/platforms/amd64.xml

Modified:
  head/ja_JP.eucJP/htdocs/platforms/amd64.xml

Modified: head/ja_JP.eucJP/htdocs/platforms/amd64.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/platforms/amd64.xml	Wed May  6 17:42:02 2015	(r46658)
+++ head/ja_JP.eucJP/htdocs/platforms/amd64.xml	Thu May  7 09:54:43 2015	(r46659)
@@ -23,29 +23,33 @@
       href="http://www.intel.com/info/em64t">Intel®
     64</a> ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ø¤Î
     FreeBSD ¤Î°Ü¿¢¤Ë´Ø¤¹¤ë¾ðÊó¤ò¤Þ¤È¤á¤¿¤â¤Î¤Ç¤¹¡£
-    AMD64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï¡¢°ÊÁ°¤Ï <q>Hammer</q> ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤·¤¿¡£
+    ¤³¤ì¤é¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ï
+    <q>x86-64</q> ¤Þ¤¿¤Ï <q>x64</q> ¤È¤·¤Æ¤âÃΤé¤ì¤Æ¤¤¤Þ¤¹¡£
+    &os;/amd64; ¤Ï¡¢ºÇ¶á¤Î AMD ¤ª¤è¤Ó Intel CPU ¤Î¤¹¤Ù¤Æ¤ËŬ¤·¤Æ¤¤¤Þ¤¹¡£</p>
+    
+  <p>AMD64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï¡¢°ÊÁ°¤Ï <q>Hammer</q> ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤·¤¿¡£
     Intell 64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï¡¢°ÊÁ°¤Ï
     Yamhill, Clackamas Techchnology (CT), IA-32e¡¢¤ª¤è¤Ó
-    EM64T (Extended Memory 64-bit Technology) ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤·¤¿¡£
-    °ìÈÌŪ¤Ë¡¢¤³¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ï
-    <q>x86-64</q> ¤â¤·¤¯¤Ï <q>x64</q> ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-  <p>AMD Opteron™, AMD Athlon™ 64, AMD Turion™ 64
-    ¤ª¤è¤Ó¡¢¿·¤·¤¤ AMD Sempron™ ¥×¥í¥»¥Ã¥µ¤Ï AMD64
-    ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£</p>
+    EM64T (Extended Memory 64-bit Technology) ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤·¤¿¡£</p>
+
+  <p>¿·¤·¤¤ AMD Sempron™,
+    AMD Opteron™, AMD Athlon™
+    64, AMD Turion™ ¤ª¤è¤Ó AMD Phenom™ ¥×¥í¥»¥Ã¥µ¡¢¤½¤·¤Æ
+    AMD <q>Bulldozer</q> ¤ª¤è¤Ó <q>Bobcat</q>
+    ¥³¥¢¤Î¥×¥í¥»¥Ã¥µ¤Ï¤¹¤Ù¤Æ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£</p>
 
   <p>Intel vPro™, Intel Celeron D (°ìÉô¤Î¥â¥Ç¥ë¤Ï <q>Prescott</q> ¤òºÎÍÑ),
     Intel Centrino® Duo, Intel Centrino® Pro,
     Intel Viiv™, Intel Core™2 Extreme, Intel Core™2 Quad,
-    Intel Core™2 Duo, Intel Xeon (3000 ·Ï¡¢5000 ·Ï¡¢¤ª¤è¤Ó 7000 ·Ï)
-    ¥×¥í¥»¥Ã¥µ¤Ï¡¢Intel®64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£</p>
+    Intel Core™2 Duo, Intel Xeon (3000 ·Ï¡¢5000 ·Ï¡¢¤ª¤è¤Ó 7000 ·Ï)¡¢
+    ¤½¤·¤Æ Intel Core™ i ¥×¥í¥»¥Ã¥µ¤Ï¡¢Intel®64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£</p>
 
   <h3>¸½¾õ</h3>
 
   <p>FreeBSD/amd64 ¤Ïñ°ì¥×¥í¥»¥Ã¥µ¥â¡¼¥É¡¢¥Þ¥ë¥Á¥×¥í¥»¥Ã¥µ¥â¡¼¥É¤ÎξÊý¤Ë¤ª¤¤¤Æ¡¢
     64 ¥Ó¥Ã¥È¤Î¥Þ¥ë¥Á¥æ¡¼¥¶¡¼¥â¡¼¥É¤ÇÆ°ºî¤·¤Þ¤¹¡£</p>
 
-  <p>AMD64 ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ï¸½ºß¡¢<a
+  <p>AMD64 ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ï¡¢<a
       href="&enbase;/doc/en_US.ISO8859-1/articles/committers-guide/archs.html">Tier
       1</a> FreeBSD ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤¹¡£</p>