From 12e8a2608e0b21c2610c3b54a3e6483246a78187 Mon Sep 17 00:00:00 2001 From: Ryusuke SUZUKI Date: Tue, 3 Jan 2012 12:11:50 +0000 Subject: [PATCH] Merge the following from the English version: 1.4 -> 1.7 www/ja/releases/4.6R/Makefile 1.2 -> 1.6 www/ja/releases/4.6R/announce.sgml 1.1 -> 1.3 www/ja/releases/4.6R/hardware.sgml 1.1 -> 1.3 www/ja/releases/4.6R/relnotes.sgml --- ja/releases/4.6R/Makefile | 24 ++++++++++++++++-------- ja/releases/4.6R/announce.sgml | 5 +++-- ja/releases/4.6R/hardware.sgml | 7 ++++--- ja/releases/4.6R/relnotes.sgml | 6 ++++-- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/ja/releases/4.6R/Makefile b/ja/releases/4.6R/Makefile index e1f3da97d8..1009612d2c 100644 --- a/ja/releases/4.6R/Makefile +++ b/ja/releases/4.6R/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ -# Original revision: 1.4 +# $FreeBSD: www/ja/releases/4.6R/Makefile,v 1.1 2002/06/23 20:44:39 hrs Exp $ +# Original revision: 1.7 .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -8,16 +8,24 @@ .include "../Makefile.inc" .endif -#DOCS= announce.sgml contents.sgml DOCS= announce.sgml -#DOCS+= hardware.sgml relnotes.sgml qa.sgml schedule.sgml -DOCS+= hardware.sgml relnotes.sgml +#DOCS+= contents.sgml +DOCS+= hardware.sgml +#DOCS+= installation.sgml +#DOCS+= qa.sgml +DOCS+= relnotes.sgml +#DOCS+= schedule.sgml DATA= docbook.css #DATA+= errata.html -#DATA+= hardware-alpha.html hardware-i386.html -DATA+= relnotes-alpha.html relnotes-i386.html -DATA+= cd1.txt cd2.txt cd3.txt cd4.txt mini.txt +#DATA+= installation-alpha.html +#DATA+= installation-i386.html +#DATA+= hardware-alpha.html +#DATA+= hardware-i386.html +DATA+= relnotes-alpha.html +DATA+= relnotes-i386.html + +DATA+= cd1.txt cd2.txt cd3.txt cd4.txt mini.txt ### Revision checking REVCHECK= YES diff --git a/ja/releases/4.6R/announce.sgml b/ja/releases/4.6R/announce.sgml index 880c880faa..9904fbc573 100644 --- a/ja/releases/4.6R/announce.sgml +++ b/ja/releases/4.6R/announce.sgml @@ -1,11 +1,11 @@ - + ]> - + &header; @@ -218,5 +218,6 @@ (For the FreeBSD Release Engineering Team)

&footer; + diff --git a/ja/releases/4.6R/hardware.sgml b/ja/releases/4.6R/hardware.sgml index b000502f7f..35b93aeeb8 100644 --- a/ja/releases/4.6R/hardware.sgml +++ b/ja/releases/4.6R/hardware.sgml @@ -1,11 +1,11 @@ - + ]> - + &header; @@ -28,5 +28,6 @@ のページをご覧ください。

&footer; - + + diff --git a/ja/releases/4.6R/relnotes.sgml b/ja/releases/4.6R/relnotes.sgml index f9538ae0a7..30358fda88 100644 --- a/ja/releases/4.6R/relnotes.sgml +++ b/ja/releases/4.6R/relnotes.sgml @@ -1,10 +1,10 @@ - + ]> - + &header; @@ -25,4 +25,6 @@ のページをご覧ください。

&footer; + +