From 09778f8cad2dbf8ed0c95fd3d27e1e1984873aeb Mon Sep 17 00:00:00 2001
From: rushani <rushani@FreeBSD.org>
Date: Thu, 29 May 2003 00:10:11 +0000
Subject: Merge the following from the English version:

	1.155 -> 1.156	hardware/common/dev.sgml
	1.572 -> 1.573	relnotes/common/new.sgml

Approved by:	re (bmah)
---
 release/doc/ja_JP.eucJP/hardware/common/dev.sgml | 26 ++++++++++++------------
 release/doc/ja_JP.eucJP/relnotes/common/new.sgml |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'release/doc')

diff --git a/release/doc/ja_JP.eucJP/hardware/common/dev.sgml b/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
index 06dda37..957d54b 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/common/dev.sgml
@@ -29,7 +29,7 @@
 	build.
 
         $FreeBSD$
-        Original revision: 1.155
+        Original revision: 1.156
 -->
 
 <sect1 id="support">
@@ -696,7 +696,7 @@
 	  <para>ICM PSC-2401 SCSI</para>
         </listitem>
 	<listitem>
-	  <para>Melco IFC-SC</para>
+	  <para>MELCO IFC-SC</para>
         </listitem>
 	<listitem>
 	  <para>RATOC REX-5536, REX-5536AM, REX-5536M,
@@ -1289,7 +1289,7 @@
             (PCMPC100 V2)</para>
         </listitem>
 	<listitem>
-	  <para>Melco LPC-T/LPC2-T/LPC2-CLT/LPC2-TX/LPC3-TX/LPC3-CLX</para>
+	  <para>MELCO LPC-T/LPC2-T/LPC2-CLT/LPC2-TX/LPC3-TX/LPC3-CLX</para>
         </listitem>
 	<listitem>
 	  <para>NDC Ethernet Instant-Link</para>
@@ -1628,7 +1628,7 @@
 	  <para>LinkSys USB10T, USB10TA, USB10TX, USB100TX, USB100H1</para>
         </listitem>
         <listitem>
-	  <para>Melco LUA-TX, LUA2-TX</para>
+	  <para>MELCO LUA-TX, LUA2-TX</para>
         </listitem>
         <listitem>
 	  <para>Planex UE-200TX</para>
@@ -1719,7 +1719,7 @@
           <para>GREEN HOUSE GH-USB100B</para>
         </listitem>
         <listitem>
-          <para>Melco LUA-KTX</para>
+          <para>MELCO LUA-KTX</para>
         </listitem>
       </itemizedlist>
     </para>
@@ -2367,7 +2367,7 @@
           <para>ICOM SL-1100</para>
 	</listitem>
 	<listitem>
-	  <para>Melco Airconnect WLI-PCM-S11, WLI-PCM-L11</para>
+	  <para>MELCO Airconnect WLI-PCM-S11, WLI-PCM-L11</para>
 	</listitem>
         <listitem>
 	  <para>NCR WaveLAN/IEEE 802.11</para>
@@ -2452,7 +2452,7 @@
 	  <para>Icom SL-200</para>
 	</listitem>
         <listitem>
-	  <para>Melco WLI-PCM</para>
+	  <para>MELCO WLI-PCM</para>
 	</listitem>
         <listitem>
 	  <para>NEL SSMagic</para>
@@ -3338,21 +3338,21 @@
 	  <para>Matshita CF-VFDU03 フロッピドライブ</para>
 	</listitem>
 	<listitem>
-	  <para>Melco USB2.0 MO ドライブ MO-CH640U2</para>
+	  <para>MELCO USB2.0 MO ドライブ MO-CH640U2</para>
 	</listitem>
 	<listitem>
-	  <para>Melco USB/IEEE1394 ポータブル HD ドライブ HDP-i30P/CI, HDP-i40P/CI</para>
+	  <para>I-O DATA USB/IEEE1394 ポータブル HD ドライブ HDP-i30P/CI, HDP-i40P/CI</para>
 	</listitem>
 	<listitem>
-	  <para>Melco USB フラッシュディスク <quote>PetitDrive</quote>,
+	  <para>MELCO USB フラッシュディスク <quote>PetitDrive</quote>,
 	    RUF-32M, -64M, -128M, -256M</para>
 	</listitem>
 	<listitem>
-	  <para>Melco USB2.0 フラッシュディスク <quote>PetitDrive2</quote>,
+	  <para>MELCO USB2.0 フラッシュディスク <quote>PetitDrive2</quote>,
 	    RUF-256M/U2, -512M/U2</para>
 	</listitem>
 	<listitem>
-	  <para>Melco USB フラッシュディスク <quote>ClipDrive</quote>,
+	  <para>MELCO USB フラッシュディスク <quote>ClipDrive</quote>,
 	    RUF-C32M, -C64M, -C128M, -C256M, -C512M</para>
 	</listitem>
 	<listitem>
@@ -3552,7 +3552,7 @@
     <para arch="i386,pc98">FAX モデム/PCCARD
       <itemizedlist>
         <listitem>
-	  <para>Melco IGM-PCM56K/IGM-PCM56KH</para>
+	  <para>MELCO IGM-PCM56K/IGM-PCM56KH</para>
 	</listitem>
         <listitem>
 	  <para>Nokia Card Phone 2.0 (gsm900/dcs1800 HSCSD terminal)</para>
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/new.sgml b/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
index e2fade8..9b55a3a 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/common/new.sgml
@@ -3,7 +3,7 @@
 
     $FreeBSD$
 
-    Original revision: 1.572
+    Original revision: 1.573
 -->
 
 <articleinfo>
-- 
cgit v1.1