From e47af2ae15035d1e61333975a7f535201ced1e04 Mon Sep 17 00:00:00 2001
From: Hideyuki KURASHINA <rushani@FreeBSD.org>
Date: Sat, 11 Oct 2003 12:01:24 +0000
Subject: Merge the following from the English version:

   1.3 -> 1.4	relnotes/alpha/article.sgml
   1.1 -> 1.2	relnotes/amd64/article.sgml
   1.4 -> 1.5	relnotes/i386/article.sgml
   1.1 -> 1.2	relnotes/ia64/article.sgml
   1.1 -> 1.2	relnotes/pc98/article.sgml
   1.3 -> 1.4	relnotes/sparc64/article.sgml
---
 release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml   | 4 +++-
 release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml   | 4 +++-
 release/doc/ja_JP.eucJP/relnotes/i386/article.sgml    | 4 +++-
 release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml    | 4 +++-
 release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml    | 4 +++-
 release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml b/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
index ec32af2a950b4..133a07bdb6dc8 100644
--- a/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/alpha/article.sgml
@@ -3,7 +3,7 @@
 
     $FreeBSD$
 
-    Original revision: 1.3
+    Original revision: 1.4
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -15,6 +15,8 @@
 %authors;
 <!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
 %ja-mlists;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
diff --git a/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
index ad6f9fb2854ac..f74ad3509ff49 100644
--- a/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/amd64/article.sgml
@@ -1,6 +1,6 @@
 <!--
     $FreeBSD$
-    Original revision: 1.1
+    Original revision: 1.2
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -12,6 +12,8 @@
 %authors;
 <!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
 %ja-mlists;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
diff --git a/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml b/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
index 62125f1c72bed..d78e087658c2e 100644
--- a/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/i386/article.sgml
@@ -3,7 +3,7 @@
 
     $FreeBSD$
 
-    Original revision: 1.4
+    Original revision: 1.5
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -15,6 +15,8 @@
 %authors;
 <!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
 %ja-mlists;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
diff --git a/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
index f112c86104a5e..2cfafc9f0e50e 100644
--- a/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/ia64/article.sgml
@@ -3,7 +3,7 @@
 
     $FreeBSD$
 
-    Original revision: 1.1
+    Original revision: 1.2
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -15,6 +15,8 @@
 %authors;
 <!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
 %ja-mlists;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
diff --git a/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml b/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
index d0d545f4d984a..15a94464503a6 100644
--- a/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/pc98/article.sgml
@@ -1,5 +1,5 @@
 <!-- $FreeBSD$ -->
-<!-- Original revision: 1.1 -->
+<!-- Original revision: 1.2 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
@@ -8,6 +8,8 @@
 %authors;
 <!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
 %ja-mlists;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
diff --git a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
index d752f18434ba8..7f4d9c4ef4ada 100644
--- a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
+++ b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.sgml
@@ -3,7 +3,7 @@
 
     $FreeBSD$
 
-    Original revision: 1.3
+    Original revision: 1.4
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -18,6 +18,8 @@
 %authors;
 <!ENTITY % ja-mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
 %ja-mlists;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
-- 
cgit v1.3