From dda122d3970f5d31aad1a2b10e2d3a7276737224 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sun, 5 Jan 2003 21:20:35 +0000
Subject: [PATCH] - Merge the following from the English version:

	1.3   -> 1.4  	hardware/i386/article.sgml

- Add new translations and activate them:

	1.3   -> 1.5  	hardware/Makefile
	1.3   -> 1.4  	hardware/common/hw.ent
	1.1   -> 1.2  	hardware/sparc64/Makefile
	1.2   -> 1.3  	hardware/sparc64/article.sgml
	(new) -> 1.5  	hardware/sparc64/proc-sparc64.sgml

Submitted by:	Hideyuki KURASHINA <rushani@jp.FreeBSD.org>
References:	[doc-jp-work 549]
---
 release/doc/ja_JP.eucJP/hardware/Makefile     |   6 +-
 .../doc/ja_JP.eucJP/hardware/common/hw.ent    |   3 +-
 .../ja_JP.eucJP/hardware/i386/article.sgml    |   6 +-
 .../doc/ja_JP.eucJP/hardware/sparc64/Makefile |   3 +-
 .../ja_JP.eucJP/hardware/sparc64/article.sgml |  16 +-
 .../hardware/sparc64/proc-sparc64.sgml        | 144 ++++++++++++++++++
 6 files changed, 155 insertions(+), 23 deletions(-)
 create mode 100644 release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml

diff --git a/release/doc/ja_JP.eucJP/hardware/Makefile b/release/doc/ja_JP.eucJP/hardware/Makefile
index b9be2e75238..6e0e38bb861 100644
--- a/release/doc/ja_JP.eucJP/hardware/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/Makefile
@@ -1,11 +1,13 @@
 # $FreeBSD$
-# Original revision: 1.3
+# Original revision: 1.5
 
 RELN_ROOT?= ${.CURDIR}/../..
 
 SUBDIR = alpha
+SUBDIR+= ia64
 SUBDIR+= i386
-#SUBDIR+= sparc64
+SUBDIR+= sparc64
+#SUBDIR+= pc98
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/release/doc/ja_JP.eucJP/hardware/common/hw.ent b/release/doc/ja_JP.eucJP/hardware/common/hw.ent
index a3e32836b7a..9e80609f77f 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/hw.ent
+++ b/release/doc/ja_JP.eucJP/hardware/common/hw.ent
@@ -1,7 +1,7 @@
 <!-- -*- sgml -*- -->
 <!--
     $FreeBSD$
-    Original revision: 1.3
+    Original revision: 1.4
 -->
 
 <!-- Text constants which probably don't need to be changed.-->
@@ -14,4 +14,5 @@
 <!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.sgml">
 <!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.sgml">
 <!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.sgml">
+<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.sgml">
 <!ENTITY sect.dev SYSTEM "../common/dev.sgml">
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/article.sgml b/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
index 8e3e17745a1..16f36db0dc2 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/article.sgml
@@ -1,6 +1,6 @@
 <!--
     $FreeBSD$
-    Original revision: 1.3
+    Original revision: 1.4
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -10,8 +10,6 @@
 %ja-authors;
 <!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
 <!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
 %ja-mlists;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
@@ -21,7 +19,7 @@
 <!-- Architecture-specific customization -->
 
 <!ENTITY arch "i386">
-<!ENTITY arch.print "IA-32">
+<!ENTITY arch.print "i386">
 
 ]>
 
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile b/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
index 7da99e3e49e..8a534a30494 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-# Original revision: 1.1
+# Original revision: 1.2
 
 RELN_ROOT?= ${.CURDIR}/../../..
 
@@ -13,7 +13,6 @@ JADEFLAGS+=	-V %generate-article-toc%
 # SGML content
 SRCS+=	article.sgml 
 SRCS+=	proc-sparc64.sgml 
-SRCS+=	dev-sparc64.sgml 
 SRCS+=	../common/hw.ent
 SRCS+=	../common/artheader.sgml
 
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml b/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
index 794f4a7dcb1..8bf3e003319 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml
@@ -1,6 +1,6 @@
 <!--
     $FreeBSD$
-    Original revision: 1.2
+    Original revision: 1.3
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -20,23 +20,11 @@
 
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
-<!ENTITY unsupported "<emphasis>(̤Âбþ)</emphasis>">
-<!ENTITY perforce "<emphasis>(̤¥³¥ß¥Ã¥È - Perforce ¥Ä¥ê¡¼¤ÇÂбþ¤º¤ß</emphasis>">
-<!ENTITY sect.dev.sparc64 SYSTEM "./dev-sparc64.sgml">
 ]>
 
 <article>
   &artheader;
   &sect.intro;
   &sect.proc.sparc64;
-  &sect.dev.sparc64;
-  <sect1>
-    <title>¼Õ¼­</title>
-
-    <para>¤³¤Îʸ½ñ¤Ï &os;/Alpha ¤È
-      NetBSD/sparc64 ¥ê¥ê¡¼¥¹Ê¸½ñ¤ò¸µ¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
-      ³Æ¥·¥¹¥Æ¥à¥â¥Ç¥ë¤ËÆÃÍ­¤Î¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï
-      <ulink url="http://www.sun.com">Sun</ulink> ¤Î¾ðÊó¤ò»²¹Í¤Ë¤·¤Þ¤·¤¿¡£</para>
-
-  </sect1>
+  &sect.dev;
 </article>
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml
new file mode 100644
index 00000000000..4465c3cbe2c
--- /dev/null
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml
@@ -0,0 +1,144 @@
+<!--
+    $FreeBSD$
+    Original revision: 1.5
+-->
+<sect1>
+  <title>Âбþ¥·¥¹¥Æ¥à</title>
+
+  <para>¤³¤ÎÀá¤Ë¤Ï¡¢&arch.print; ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÈÇ &os;
+    ¤Ç¡¢¸½ºßÆ°ºî¤¹¤ë¤³¤È¤¬³Îǧ¤µ¤ì¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
+    ¥Ï¡¼¥É¥¦¥§¥¢¹½À®¤ÎͽÈ÷Ãμ±¤Ë¤Ä¤¤¤Æ¤Ï
+    <ulink url="http://sunsolve.sun.com/handbook_pub/">Sun System Handbook</ulink>
+    ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+  <para>Ê£¿ô¤Î¥×¥í¥»¥Ã¥µ¤òÅëºÜ¤·¤¿¤¹¤Ù¤Æ¤Î¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë
+    SMP µ¡Ç½¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+
+  <para>¤³¤³¤ËºÜ¤Ã¤Æ¤¤¤Ê¤¤¥·¥¹¥Æ¥à¤Ï»î¸³¤µ¤ì¤Æ¤¤¤Ê¤¤¤À¤±¤Ç¡¢
+    Æ°ºî¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£¤â¤·¤½¤Î¤è¤¦¤Ê¥·¥¹¥Æ¥à¤¬¤¢¤ê¤Þ¤·¤¿¤é¡¢
+    <ulink url="freebsd-sparc@freebsd.org">¤ï¤¿¤·¤¿¤Á</ulink>¤Ë¤ªÃΤ餻¤¯¤À¤µ¤¤¡£</para>
+
+  <sect2>
+    <title>´°Á´Âбþ¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à</title>
+
+    <para>&os; ¤¬´°Á´Âбþ¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ï¡¢°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
+
+    <para>
+      <itemizedlist>
+        <listitem>
+          <para>Blade 100</para>
+        </listitem>
+        <listitem>
+          <para>Blade 150</para>
+        </listitem>
+        <listitem>
+          <para>Enterprise 220R</para>
+        </listitem>
+        <listitem>
+          <para>Enterprise 250</para>
+        </listitem>
+        <listitem>
+          <para>Enterprise 420R</para>
+        </listitem>
+        <listitem>
+          <para>Fire V100</para>
+        </listitem>
+        <listitem>
+          <para>Fire V120</para>
+        </listitem>
+        <listitem>
+          <para>Netra t1 105</para> 
+        </listitem>
+        <listitem>
+          <para>Netra T1 AC200/DC200</para> 
+        </listitem>
+        <listitem>
+          <para>Netra t 1100</para>
+        </listitem>
+        <listitem>
+          <para>Netra t 1120</para>
+        </listitem>
+        <listitem>
+          <para>Netra t 1125</para>
+        </listitem>
+        <listitem>
+          <para>Netra t 1400/1405</para>
+        </listitem>
+        <listitem>
+          <para>Netra 120</para>
+        </listitem>
+        <listitem>
+          <para>Netra X1</para>
+        </listitem>
+        <listitem>
+          <para>SPARCEngine Ultra AXi</para>
+        </listitem>
+        <listitem>
+          <para>SPARCEngine Ultra AXmp</para>
+        </listitem>
+        <listitem>
+          <para>Ultra 5</para>
+        </listitem>
+        <listitem>
+          <para>Ultra 10</para>
+        </listitem>
+        <listitem>
+          <para>Ultra 30</para>
+        </listitem>
+        <listitem>
+          <para>Ultra 60</para>
+        </listitem>
+        <listitem>
+          <para>Ultra 80</para>
+        </listitem>
+      </itemizedlist>
+    </para>
+  </sect2>
+
+  <sect2>
+    <title>Âбþ¤ËÀ©¸Â¤Î¤¢¤ë¥·¥¹¥Æ¥à</title>
+
+    <para>&os; ¤Ï°Ê²¼¤Î¥·¥¹¥Æ¥à¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¤¬¡¢
+      °ìÉô¤Îµ¡Ç½¤ËÀ©¸Â¤¬¤¢¤ê¤Þ¤¹¡£
+      Æäˡ¢sbus ¥·¥¹¥Æ¥à¤Î¥ª¥ó¥Ü¡¼¥É SCSI ¥³¥ó¥È¥í¡¼¥é¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£ </para>
+
+    <para>
+      <itemizedlist>
+        <listitem>
+          <para>Enterprise 4500</para>
+        </listitem>
+        <listitem>
+          <para>Ultra 1E</para>
+        </listitem>
+        <listitem>
+          <para>Ultra 2</para>
+        </listitem>
+      </itemizedlist>
+    </para>
+  </sect2>
+
+  <sect2>
+    <title>̤Âбþ¤Î¥·¥¹¥Æ¥à</title>
+
+    <para>&os; ¤Ï°Ê²¼¤Î¥·¥¹¥Æ¥à¤ËÂбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£
+      ¤³¤ì¤Ï¡¢
+      (UltraSPARC III ¤Î¤è¤¦¤Ë) ¥×¥í¥»¥Ã¥µ¤½¤Î¤â¤Î¤ËÂбþ¤·¤Æ¤¤¤Ê¤¤¡¢
+      ¤¢¤ë¤¤¤Ï¥·¥¹¥Æ¥à¤ÎÆâÉôÀß·×¤Ë &os; ¤òÉÔ°ÂÄê¤Ë¤¹¤ë¤è¤¦¤ÊÈù̯¤ÊÆȼ«Éôʬ¤¬¤¢¤ë¡¢
+      &os; ¤ò»È¤¦ºÝ¤ËɬÍפȤʤ륪¥ó¥Ü¡¼¥É¥Ç¥Ð¥¤¥¹¤Ø¤ÎÂбþ¤¬ÉÔ½½Ê¬¤Ç¤¢¤ë¤Ê¤É¤Î
+      Íýͳ¤Ë¤è¤ë¤â¤Î¤Ç¤¹¡£</para>
+
+    <para>
+      <itemizedlist>
+        <listitem>
+          <para>UltraSPARC III ¥×¥í¥»¥Ã¥µ¤òÅëºÜ¤·¤¿¥·¥¹¥Æ¥à¤¹¤Ù¤Æ</para>
+        </listitem>
+        <listitem>
+          <para>Enterprise 450</para>
+        </listitem>
+        <listitem>
+          <para>Ultra 1</para>
+        </listitem>
+      </itemizedlist>
+    </para>
+  </sect2>
+</sect1>
-- 
2.45.2