From 6fa884b2e25e840036525b4deacac05e17d3d2b8 Mon Sep 17 00:00:00 2001 From: Ryusuke SUZUKI Date: Mon, 20 Feb 2012 14:10:46 +0000 Subject: [PATCH] Merge the following from the English version: 1.99 -> 1.100 www/ja/internal/machines.sgml --- ja/internal/machines.sgml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ja/internal/machines.sgml b/ja/internal/machines.sgml index 4c83ac8386..8c671e38c1 100644 --- a/ja/internal/machines.sgml +++ b/ja/internal/machines.sgml @@ -1,11 +1,11 @@ - + ]> - + &header; @@ -69,13 +69,6 @@ FTP リファレンスマシン; ia64 package ビルド - -ref6-amd64 -6-STABLE -amd64 -リファレンスマシン - - ref7-amd64 7-STABLE @@ -92,14 +85,21 @@ FTP ref9-amd64 -9-CURRENT +9-STABLE amd64 リファレンスマシン -ref9-i386 -9-CURRENT +ref10-amd64 +10-CURRENT +amd64 +リファレンスマシン + + + +ref10-i386 +10-CURRENT i386 リファレンスマシン @@ -355,10 +355,10 @@ SAS controller, 418GB local storage, 2x Broadcom NetXtreme II BCM5708 -ref[6-9]-(amd64|i386) - -Dell PowerEdge 2950, 2xIntel Xeon L5320 (8x1.86GHz), 8GB Memory, - PERC 5/i RAID controller, 2x136GB SAS disks, Broadcom NetXtreme II +ref[7-10]-(amd64|i386) +Intel EM64T MP +Dell PowerEdge 2950, 2xIntel Xeon L5320 (8x1.86GHz), 8/16GB Memory, + PERC 5/i RAID controller, 6x136GB SAS disks, Broadcom NetXtreme II BCM5708 NIC.