svn commit: r46869 - head/ja_JP.eucJP/htdocs/internal

Fri Jun 26 09:47:09 UTC 2015

Author: ryusuke
Date: Fri Jun 26 09:47:08 2015
New Revision: 46869
URL: https://svnweb.freebsd.org/changeset/doc/46869

Log:
  - Merge the following from the English version:
  
  	r45494 -> r46865	head/ja_JP.eucJP/htdocs/internal/machines.xml

Modified:
  head/ja_JP.eucJP/htdocs/internal/machines.xml

Modified: head/ja_JP.eucJP/htdocs/internal/machines.xml
==============================================================================

--- head/ja_JP.eucJP/htdocs/internal/machines.xml	Thu Jun 25 20:03:57 2015	(r46868)
+++ head/ja_JP.eucJP/htdocs/internal/machines.xml	Fri Jun 26 09:47:08 2015	(r46869)
@@ -4,7 +4,7 @@
 <!ENTITY title "FreeBSD.org ¥Í¥Ã¥È¥ï¡¼¥¯">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r45494 -->
+<!-- Original revision: r46865 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -67,43 +67,15 @@
 </tr>
 
 <tr>
-<td>ref8-amd64</td>
-<td>8-STABLE</td>
+<td>ref[10|9|8]-amd64</td>
+<td>X-STABLE</td>
 <td>amd64</td>
 <td>¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥·¥ó</td>
 </tr>
 
 <tr>
-<td>ref9-amd64</td>
-<td>9-STABLE</td>
-<td>amd64</td>
-<td>¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥·¥ó</td>
-</tr>
-
-<tr>
-<td>ref10-amd64</td>
-<td>10-STABLE</td>
-<td>amd64</td>
-<td>¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥·¥ó</td>
-</tr>
-
-<tr>
-<td>ref10-i386</td>
-<td>10-STABLE</td>
-<td>i386</td>
-<td>¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥·¥ó</td>
-</tr>
-
-<tr>
-<td>ref11-amd64</td>
-<td>11-CURRENT</td>
-<td>amd64</td>
-<td>¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥·¥ó</td>
-</tr>
-
-<tr>
-<td>ref11-i386</td>
-<td>11-CURRENT</td>
+<td>ref[11|10]-i386</td>
+<td>X-STABLE</td>
 <td>i386</td>
 <td>¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥·¥ó</td>
 </tr>
@@ -132,31 +104,6 @@
 </tr>
 
 <tr>
-<td>hub</td>
-<td>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ª¤è¤Ó¥á¡¼¥ë¥µ¡¼¥Ó¥¹</td>
-</tr>
-
-<tr>
-<td>mx1</td>
-<td>ÅþÃå¥á¡¼¥ëÇÛÁ÷¥á¡¼¥ë¥µ¡¼¥Ð</td>
-</tr>
-
-<tr>
-<td>mx2</td>
-<td>³°¸þ¤¥á¡¼¥ëÇÛÁ÷¥á¡¼¥ë¥µ¡¼¥Ð</td>
-</tr>
-
-<tr>
-<td>ns0</td>
-<td>FreeBSD.org DNS ¥³¥ó¥Æ¥ó¥Ä¥µ¡¼¥Ð</td>
-</tr>
-
-<tr>
-<td>ns1, ns2</td>
-<td>FreeBSD.org DNS ¥¥ã¥Ã¥·¥å¥µ¡¼¥Ð</td>
-</tr>
-
-<tr>
 <td>skunkworks</td>
 <td>Perforce ¥µ¡¼¥Ð</td>
 </tr>
@@ -166,11 +113,6 @@
 <td>Subversion ¥Þ¥¹¥¿¥ê¥Ý¥¸¥È¥ê</td>
 </tr>
 
-<tr>
-<td>www</td>
-<td>www.FreeBSD.org ¥¦¥§¥Ö¥µ¡¼¥Ð</td>
-</tr>
-
 </tbody>
 </table>
 
@@ -182,7 +124,6 @@
 <thead>
 <tr>
 <th align="left">¥Û¥¹¥È</th>
-<th align="left">OS</th>
 <th align="left">ÌÜÅª</th>
 </tr>
 </thead>
@@ -190,10 +131,8 @@
 <tbody>
 
 <tr valign="top">
-<td>beefy<em>[1-4]</em></td>
-<td>Intel EM64T MP</td>
-<td>iXsystems iX1204, 2xIntel Xeon X5675 (6x2x3.07GHz), 96GB Memory,
-  4x300Gb SAS disks, Intel PRO/1000 NIC.</td>
+<td>beefy<em>[1-8]</em></td>
+<td>Package ¥Ó¥ë¥É¥Þ¥·¥ó</td>
 </tr>
 
 </tbody>
@@ -205,7 +144,6 @@
 <thead>
 <tr>
 <th align="left">¥Û¥¹¥È</th>
-<th align="left">¥¿¥¤¥×</th>
 <th align="left">¥Ï¡¼¥É¥¦¥§¥¢</th>
 </tr>
 </thead>
@@ -213,96 +151,28 @@
 <tbody>
 
 <tr valign="top">
-<td>flame</td>
-<td>Sun SPARC</td>
-<td>Sun Fire V120, UltraSparc-IIe 648MHz, 2GB Memory, sym SCSI controller,
-2x 36G SCSI-3 disk, 2x Sun ERI 10/100 Ethernet.</td>
-</tr>
-
-<tr valign="top">
 <td>freefall</td>
-<td>Intel EM64T MP</td>
-<td>HP Proliant DL160 G6, 2xIntel Xeon X5650 (6x2x2.67GHz), 24GB Memory,
-  4x1TB SATA disks, Intel PRO/1000 NIC.</td>
-</tr>
-
-<tr valign="top">
-<td>ftp-master</td>
-<td>Intel EM64T MP</td>
-<td>HP Proliant DL160 G6, 2xIntel Xeon X5650 (6x2x2.67GHz), 24GB Memory,
-  4x1TB SATA disks, Intel PRO/1000 NIC.</td>
-</tr>
-
-<tr valign="top">
-<td>hub</td>
-<td>Intel EM64T MP</td>
-<td>HP Proliant DL160 G6, 2xIntel Xeon X5650 (6x2x2.67GHz), 48GB Memory,
-  4x1TB SATA disks, Intel PRO/1000 NIC.</td>
-</tr>
-
-<tr valign="top">
-<td>mx1, mx2</td>
-<td>AMD64</td>
-<td>PowerEdge R415, 2xAMD Opteron 4180 (2x6x2.6GHz), 16GB Memory,
-  Dell PERC H700 RAID controller, 3x300GB SAS disks in XFS mirror,
-  QLogic NetXtreme II Gigabit Ethernet adapter.</td>
-</tr>
-
-<tr valign="top">
-<td>ns0, ns1, ns2</td>
-<td>Intel x86</td>
-<td>2.8GHz Xeon, 1GB Memory, Compaq Smart Array 5i RAID controller,
-  2x34GB SCSI Disks in RAID1, Broadcom Gigabit Ethernet.</td>
-</tr>
-
-<tr valign="top">
-<td>pluto</td>
-<td>IA-64 MP</td>
-<td>2x900MHz Itanium2 (McKinley) - HP zx1 (pluto) chipset,
-2GB Memory, LSILogic 1030 U320 SCSI controller (mpt),
-1x36GB 10K RPM U160 SCSI drive, Broadcom BCM5701 Gigabit NIC.</td>
+<td><tt>dmesg(8)</tt> ¤Ç³ÎÇ§¤·¤Æ¤¯¤À¤µ¤¤¡£</td>
 </tr>
 
 <tr valign="top">
 <td>ref<em>[8-11]</em>-amd64</td>
-<td>Intel EM64T MP</td>
-<td>HP Proliant DL160 G6, 2xIntel Xeon X5650 (6x2x2.67GHz), 24GB Memory,
-  4x1TB SATA disks, Intel PRO/1000 NIC.</td>
-</tr>
-
-<tr valign="top">
-<td>ref10-i386</td>
-<td>Intel EM64T MP</td>
-<td>Dell PowerEdge 2950, 2xIntel Xeon L5320 (4x1.86GHz), 8/16GB Memory,
-  PERC 5/i RAID controller, 6x136GB SAS disks, Broadcom NetXtreme II
-  BCM5708 NIC.</td>
-</tr>
-
-<tr valign="top">
-<td>ref11-i386</td>
-<td>Intel EM64T MP</td>
-<td>Dell PowerEdge 2950, 2xIntel Xeon E5320 (4x1.86GHz), 32GB Memory, PERC 5/i RAID
-  controller,6x136GB SAS disks, Broadcom NetXtreme II BCM5708
-  NIC.</td>
+<td><tt>dmesg(8)</tt> ¤Ç³ÎÇ§¤·¤Æ¤¯¤À¤µ¤¤¡£</td>
 </tr>
 
 <tr valign="top">
-<td>www</td>
-<td>Intel x86</td>
-<td>2x dual-core 2.80GHz Xeon, 1.5GB Memory, Compaq Smart Array 5i RAID controller,
-  2x34GB SCSI Disks in RAID1, 2x Broadcom Gigabit Ethernet NIC.</td>
+<td>ref<em>[10-11]</em>-i386</td>
+<td><tt>dmesg(8)</tt> ¤Ç³ÎÇ§¤·¤Æ¤¯¤À¤µ¤¤¡£</td>
 </tr>
 
 </tbody>
 </table>
 
 <p>¤Û¤È¤ó¤É¤Î¥Þ¥·¥ó¤Ï¡¢
-¾éÄ¹¹½À®¤Î¥®¥¬¥Ó¥Ã¥È¥¢¥Ã¥×¥ê¥ó¥¯¤ò»ý¤ÄÀìÍÑ¤Î¥¹¥¤¥Ã¥Á¤Ë
-1Gbit/sec Á´Æó½Å¤ÇÀÜÂ³¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ø¤ÎÀÜÂ³¤È¥³¥í¥±¡¼¥·¥ç¥ó¤Ï <a href="http://www.yahoo.com/">
-Yahoo!</a> ¤Ë¤è¤êÄó¶¡¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-¤¹¤Ù¤Æ¤Î¥·¥¹¥Æ¥à¤Ï¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤Ç·Ò¤¬¤Ã¤Æ¤¤¤Æ¡¢
-¥ê¥â¡¼¥È¤«¤éÅÅ¸»´ÉÍý¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</p>
+  ¾éÄ¹¹½À®¤Î¥®¥¬¥Ó¥Ã¥È¥¢¥Ã¥×¥ê¥ó¥¯¤ò»ý¤ÄÀìÍÑ¤Î¥¹¥¤¥Ã¥Á¤Ë
+  1Gbit/sec Á´Æó½Å¤ÇÀÜÂ³¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+  ¤¹¤Ù¤Æ¤Î¥·¥¹¥Æ¥à¤Ï¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤Ç·Ò¤¬¤Ã¤Æ¤¤¤Æ¡¢
+  ¥ê¥â¡¼¥È¤«¤éÅÅ¸»´ÉÍý¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹¡£</p>
 
 <h2>´ÉÍýÊý¿Ë</h2>
 
