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

Ryusuke SUZUKI <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.doc
Message-ID <[email protected]>
Author: ryusuke
Date: Wed Jul  9 11:02:35 2014
New Revision: 45235
URL: http://svnweb.freebsd.org/changeset/doc/45235

Log:
  - Merge the following from the English version:
  
  	r44720 -> r45223	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	Wed Jul  9 01:20:34 2014	(r45234)
+++ head/ja_JP.eucJP/htdocs/internal/machines.xml	Wed Jul  9 11:02:35 2014	(r45235)
@@ -4,7 +4,7 @@
 <!ENTITY title "FreeBSD.org ¥Í¥Ã¥È¥ï¡¼¥¯">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r44720 -->
+<!-- Original revision: r45223 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -40,7 +40,7 @@
 
 <tr>
 <td>eris</td>
-<td>11-CURRENT</td>
+<td>10-STABLE</td>
 <td>ia64</td>
 <td>¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥·¥ó</td>
 </tr>
@@ -56,7 +56,7 @@
 <td>freefall</td>
 <td>11-CURRENT</td>
 <td>amd64</td>
-<td>GNATS/shell ¥í¥°¥¤¥ó</td>
+<td>¥·¥§¥ë¥í¥°¥¤¥ó</td>
 </tr>
 
 <tr>
@@ -174,6 +174,7 @@
 </tbody>
 </table>
 
+<!--
 <h2>Ports ¥Ó¥ë¥É¥¯¥é¥¹¥¿</h2>
 
 <p>ports ¥Ó¥ë¥É¥¯¥é¥¹¥¿¤Ï¡¢¼ç¤Ë Ports Management team (portmgr) ¤¬´ÉÍý¤·¤Æ¤¤¤Þ¤¹¡£</p>
@@ -187,34 +188,10 @@
 </tr>
 </thead>
 
-<tbody>
-<tr>
-<td>pointyhat</td>
-<td>9-CURRENT</td>
-<td>¤¹¤Ù¤Æ¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤΠpackage ¥Ó¥ë¥É¥Þ¥¹¥¿</td>
-</tr>
-
-<tr>
-<td>gohan10-13</td>
-<td>9-STABLE</td>
-<td>amd64 package ¥Ó¥ë¥É¥¯¥é¥¹¥¿</td>
-</tr>
-
-<tr>
-<td>gohan18</td>
-<td>8-STABLE</td>
-<td>portmgr Íѥƥ¹¥È¥Ù¥Ã¥É</td>
-</tr>
-
-<tr>
-<td>gohan61-62</td>
-<td>9-STABLE</td>
-<td>amd64 package ¥Ó¥ë¥É¥¯¥é¥¹¥¿</td>
-</tr>
-
+</tbody>
 </tbody>
 </table>
-
+-->
 
 <h2>¥Ï¡¼¥É¥¦¥§¥¢¹½À®</h2>
 
@@ -238,61 +215,31 @@
 
 <tr valign="top">
 <td>freefall</td>
-<td>Intel x86</td>
-<td>2x dual-core 2.80GHz Xeon (Pentium-IV family), 2GB Memory,
-Compaq Smart Array 5i SCSI RAID controller, 138 GB SCSI local storage,
-Broadcom-based Compaq NC7781 Gigabit Server Adapter NIC.</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 x86</td>
-<td>2x dual-core 2.80GHz Xeon, 4GB Memory, LSI Logic PERC 4e/Di RAID
-  adapter, 1.14T disk, 2x Intel PRO/1000 Ethernet NIC.</td>
-</tr>
-
-<tr valign="top">
-<td>gohan10-13</td>
-<td>Intel x86</td>
-<td>2x1.8GHz quad-core Xeon L5320, 8GB Memory, Intel 63XXESB2 SATA300
-controller, 1x160GB SAT300 drive, 2xIntel PRO/1000 NIC.</td>
-</tr>
-
-<tr valign="top">
-<td>gohan18</td>
-<td>Intel x86</td>
-<td>2x1.8GHz quad-core Xeon L5320, 8GB Memory, LSILogic SAS/SATA controller,
-1x160GB SAT300 drive, 2x Broadcom NetXtreme Gigabit Ethernet NIC.</td>
-</tr>
-
-<tr valign="top">
-<td>gohan61-62</td>
-<td>Intel x86</td>
-<td>2x2.0GHz quad-core Intel Xeon L5335, 32GB Memory, Dell PERC 6 Megaraid
-SAS controller, 418GB local storage, 2x Broadcom NetXtreme II BCM5708
-1000Base-T Ethernet NIC.</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>AMD64 MP</td>
-<td>4x2.2GHz (dual CPU, dual core), 3GB Memory, Adaptec RAID Controller,
-4x36GB U160 SCSI Disk, Broadcom Gigabit Ethernet.</td>
-</tr>
-
-<tr valign="top">
-<td>mx1</td>
-<td>Intel x86 MP</td>
-<td>8x1.86GHz Xeon (dual CPU, quad core), 8GB Memory, Dell PERC 5/i
-  RAID controller, 2x136GB SAS disks in RAID1, Broadcom NetXtreme
-  Gigabit Ethernet adapter.</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>mx2</td>
-<td>Intel x86 MP</td>
-<td>2x2.8GHz Xeon, 1GB Memory, Compaq Smart Array 5i RAID controller,
-  2x34GB SCSI Disks in RAID1, Broadcom Gigabit Ethernet.</td>
+<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">
@@ -311,31 +258,24 @@ SAS controller, 418GB local storage, 2x 
 </tr>
 
 <tr valign="top">
-<td>pointyhat</td>
+<td>ref<em>[8-11]</em>-amd64</td>
 <td>Intel EM64T MP</td>
-<td>2x2.8GHz Intel Xeon (dualcore), 4GB Memory, Dell PERC 4 RAID controller,
-  1.1TB storage, Intel PRO/1000 Gigabitq NIC.</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>ref<em>[7-10]</em>-(amd64|i386)</td>
+<td>ref10-i386</td>
 <td>Intel EM64T MP</td>
-<td>Dell PowerEdge 2950, 2xIntel Xeon L5320 (8x1.86GHz), 8/16GB Memory,
+<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-amd64</td>
-<td>Intel EM64T MP</td>
-<td>HP Proliant, 2xIntel Xeon X5650 (6x2x2.67GHz), 24GB Memory,
-  4x1TB SATA disks, Intel PRO/1000 NIC.</td>
-</tr>
-
-<tr valign="top">
 <td>ref11-i386</td>
 <td>Intel EM64T MP</td>
-<td>Dell, 2xIntel Xeon E5320 (4x1.86GHz), 32GB Memory, PERC 5/i RAID
+<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>
 </tr>
@@ -350,8 +290,9 @@ SAS controller, 418GB local storage, 2x 
 </tbody>
 </table>
 
-<p>¤¹¤Ù¤Æ¤Î¥Þ¥·¥ó¤Ï¡¢¾éĹ¹½À®¤Î¥®¥¬¥Ó¥Ã¥È¥¢¥Ã¥×¥ê¥ó¥¯¤ò»ý¤ÄÀìÍѤÎ
-Cisco 2948G ¥¹¥¤¥Ã¥Á¤Ë 100Mbit/sec Á´Æó½Å¤ÇÀܳ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+<p>¤Û¤È¤ó¤É¤Î¥Þ¥·¥ó¤Ï¡¢
+¾éĹ¹½À®¤Î¥®¥¬¥Ó¥Ã¥È¥¢¥Ã¥×¥ê¥ó¥¯¤ò»ý¤ÄÀìÍѤΥ¹¥¤¥Ã¥Á¤Ë
+1Gbit/sec Á´Æó½Å¤ÇÀܳ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ø¤ÎÀܳ¤È¥³¥í¥±¡¼¥·¥ç¥ó¤Ï <a href="http://www.yahoo.com/">
 Yahoo!</a> ¤Ë¤è¤êÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 ¤¹¤Ù¤Æ¤Î¥·¥¹¥Æ¥à¤Ï¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤Ç·Ò¤¬¤Ã¤Æ¤¤¤Æ¡¢

_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.