From 7f2400b466554a8a7ab98a597ac8ac7dbcebe724 Mon Sep 17 00:00:00 2001
From: Jun Kuriyama
Date: Sun, 9 Aug 1998 16:22:19 +0000
Subject: [PATCH] Changes in the English version are merged:
Makefile: 1.36 --> 1.42
applications.sgml: 1.7 --> 1.8
doc.hdr: 1.6 --> 1.7
doc.sgml: 1.47 --> 1.50
includes.sgml: 1.20 --> 1.21
index.html: 1.48 --> 1.53
internet.sgml: 1.11 --> 1.12
publish.sgml: 1.10 --> 1.12
support.sgml: 1.89 --> 1.92
where.sgml: 1.25 --> 1.26
alpha/Makefile: 1.1 --> 1.2
commercial/commercial.sgml: 1.25 --> 1.26
commercial/Makefile: --> 1.3
copyright/daemon.sgml: 1.6 --> 1.8
copyright/license.sgml: 1.2 --> 1.3
copyright/Makefile: --> 1.1
docproj/Makefile: 1.2 --> 1.4
docproj/docproj.sgml: 1.11 --> 1.12
docproj/translations.sgml: 1.3 --> 1.5
gallery/Makefile: --> 1.3
gallery/gallery.sgml: 1.36 --> 1.39
internal/Makefile: --> 1.7
internal/about.sgml: 1.14 --> 1.18
internal/mirror.sgml: 1.5 --> 1.6
internal/machines.sgml: 1.3 --> 1.5
internal/resignation.sgml: 1.1 --> 1.2
news/Makefile: 1.2 --> 1.3
news/newsflash.sgml: 1.89 --> 1.91
news/press.sgml: 1.12 --> 1.15
projects/Makefile: --> 1.3
projects/mozilla.sgml: 1.2 --> 1.4
projects/newvies.sgml: 1.3 --> 1.5
release/2.2.6R/announce.sgml: 1.1 --> 1.2
release/2.2.7R/announce.sgml: 1.3 --> 1.4
release/index.sgml: 1.21 --> 1.22
search/Makefile: 1.36 --> 1.2 (???)
search/index-site.sgml: 1.15 --> 1.16
search/search.sgml: 1.32 --> 1.33
search/search-mid.sgml: 1.3 --> 1.4
search/searchhints.sgml: 1.3 --> 1.4
search/web.atoz: 1.34 --> 1.38
security/Makefile: 1.1 --> 1.2
Submitted by: Motoyuki Konno
---
ja/Makefile | 59 ++++++++++++++++++--------------
ja/alpha/Makefile | 8 +++--
ja/applications.sgml | 6 ++--
ja/commercial/Makefile | 10 +++++-
ja/commercial/commercial.sgml | 6 ++--
ja/copyright/Makefile | 6 +++-
ja/copyright/daemon.sgml | 6 ++--
ja/copyright/license.sgml | 6 ++--
ja/doc.hdr | 4 +--
ja/docproj/Makefile | 17 +++++----
ja/docproj/docproj.sgml | 6 ++--
ja/docproj/translations.sgml | 8 ++---
ja/docs.sgml | 6 ++--
ja/gallery/Makefile | 7 ++--
ja/gallery/gallery.sgml | 6 ++--
ja/includes.sgml | 4 +--
ja/index.html | 9 ++---
ja/internal/Makefile | 19 +++++++---
ja/internal/about.sgml | 8 ++---
ja/internal/machines.sgml | 8 ++---
ja/internal/mirror.sgml | 6 ++--
ja/internal/resignation.sgml | 6 ++--
ja/internet.sgml | 6 ++--
ja/news/Makefile | 4 +--
ja/news/newsflash.sgml | 6 ++--
ja/news/press.sgml | 12 +++++--
ja/projects/Makefile | 7 +++-
ja/projects/mozilla.sgml | 6 ++--
ja/projects/newbies.sgml | 6 ++--
ja/publish.sgml | 8 ++---
ja/releases/2.2.6R/announce.sgml | 8 ++---
ja/releases/2.2.7R/announce.sgml | 8 ++---
ja/releases/index.sgml | 6 ++--
ja/search/Makefile | 7 ++--
ja/search/index-site.sgml | 6 ++--
ja/search/search-mid.sgml | 6 ++--
ja/search/search.sgml | 6 ++--
ja/search/searchhints.sgml | 6 ++--
ja/search/web.atoz | 4 +--
ja/security/Makefile | 6 ++--
ja/support.sgml | 12 ++++---
ja/where.sgml | 6 ++--
42 files changed, 205 insertions(+), 152 deletions(-)
diff --git a/ja/Makefile b/ja/Makefile
index f46f70766a..1796c0efad 100644
--- a/ja/Makefile
+++ b/ja/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.25 1998-08-04 13:57:19 wosch Exp $
+# $Id: Makefile,v 1.26 1998-08-09 16:22:14 kuriyama Exp $
# The FreeBSD Japanese Documentation Project
-# Original revision: 1.36
+# Original revision: 1.42
.if exists(Makefile.conf)
.include "Makefile.conf"
@@ -8,44 +8,53 @@
# These are turned into validated, normalized HTML files.
-DOCS= applications.sgml auditors.sgml availability.sgml branch.sgml
+DOCS= applications.sgml
+DOCS+= auditors.sgml
+DOCS+= availability.sgml
+DOCS+= branch.sgml
DOCS+= docs.sgml
-DOCS+= features.sgml register.sgml
+DOCS+= features.sgml
+DOCS+= register.sgml
DOCS+= internet.sgml
DOCS+= mailto.sgml
DOCS+= publish.sgml
-DOCS+= send-pr.sgml support.sgml where.sgml
-DOCS+= y2kbug.sgml
-
+DOCS+= send-pr.sgml
+DOCS+= support.sgml
+DOCS+= where.sgml
+DOCS+= y2kbug.sgml
+
# Japanese-only file
DOCS+= jabout.sgml
-# Not available in Japanese version.
-#DOCS+= cgallery.sgml npgallery.sgml pgallery.sgml
-
CLEANFILES+=atoz.sgml site.sgml
# These will be directly installed.
DATA= index.html
-
# Subdirectories
-#SUBDIR= security cgi commercial docproj gifs ports releases tutorials
-#SUBDIR+= news alpha projects
-SUBDIR= security
-SUBDIR+= docproj
-SUBDIR+= ports
-SUBDIR+= releases
-SUBDIR+= news
-SUBDIR+= alpha
-SUBDIR+= copyright
-SUBDIR+= internal
-SUBDIR+= search
-SUBDIR+= projects
-SUBDIR+= commercial
-SUBDIR+= gallery
+# SGML
+
+SUBDIR= security
+SUBDIR+= commercial
+SUBDIR+= docproj
+SUBDIR+= news
+SUBDIR+= alpha
+SUBDIR+= internal
+SUBDIR+= copyright
+SUBDIR+= search
+SUBDIR+= gallery
+SUBDIR+= ports
+SUBDIR+= projects
+SUBDIR+= releases
+
+# Non-SGML
+#SUBDIR+= gifs
+#SUBDIR+= cgi
+
+# Extern
+#SUBDIR+= tutorials
# Subdirectories that have linuxdoc docs and makefiles that use
# .
diff --git a/ja/alpha/Makefile b/ja/alpha/Makefile
index f8acc817d0..e3df610534 100644
--- a/ja/alpha/Makefile
+++ b/ja/alpha/Makefile
@@ -1,10 +1,12 @@
-# $Id: Makefile,v 1.1 1998-07-30 02:35:20 hanai Exp $
+# $Id: Makefile,v 1.2 1998-08-09 16:22:16 kuriyama Exp $
# The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
DOCS= alpha.sgml
# DOCS+= current.sgml
# DOCS+= bootstrapping.sgml
-
+
+INDEXLINK=alpha.html
+
.include "../../web.mk"
diff --git a/ja/applications.sgml b/ja/applications.sgml
index 40af0561ed..a4f1346e1a 100644
--- a/ja/applications.sgml
+++ b/ja/applications.sgml
@@ -1,11 +1,11 @@
+
%includes;
]>
-
+
-
+
&header;
diff --git a/ja/commercial/Makefile b/ja/commercial/Makefile
index 142e9e98b8..70c0828cf9 100644
--- a/ja/commercial/Makefile
+++ b/ja/commercial/Makefile
@@ -1,5 +1,13 @@
-# $Id: Makefile,v 1.2 1998-08-04 12:31:46 wosch Exp $
+# $Id: Makefile,v 1.3 1998-08-09 16:22:16 kuriyama Exp $
+# The FreeBSD Japanese Documentation Project
+# Original revision: 1.3
DOCS = commercial.sgml
+# DOCS+= consulting.sgml
+# DOCS+= hardware.sgml
+# DOCS+= misc.sgml
+# DOCS+= software.sgml
+
+INDEXLINK=commercial.html
.include "../../web.mk"
diff --git a/ja/commercial/commercial.sgml b/ja/commercial/commercial.sgml
index 97823ec0f5..0bfee1e351 100644
--- a/ja/commercial/commercial.sgml
+++ b/ja/commercial/commercial.sgml
@@ -1,12 +1,12 @@
-
+
%includes;
]>
-
+
-
+
&header;
diff --git a/ja/copyright/Makefile b/ja/copyright/Makefile
index 7abdd0598b..70fab882ed 100644
--- a/ja/copyright/Makefile
+++ b/ja/copyright/Makefile
@@ -1,6 +1,10 @@
-# $Id: Makefile,v 1.2 1998-08-04 12:32:36 wosch Exp $
+# $Id: Makefile,v 1.3 1998-08-09 16:22:16 kuriyama Exp $
+# The FreeBSD Japanese Documentation Project
+# Original revision: 1.1
DOCS= license.sgml
DOCS+= daemon.sgml
+# DATA+= COPYING COPYING.LIB
+
.include "../../web.mk"
diff --git a/ja/copyright/daemon.sgml b/ja/copyright/daemon.sgml
index d4495fb9eb..922ce81139 100644
--- a/ja/copyright/daemon.sgml
+++ b/ja/copyright/daemon.sgml
@@ -1,12 +1,12 @@
-
+
%includes;
]>
-
+
-
+
&header;
diff --git a/ja/copyright/license.sgml b/ja/copyright/license.sgml
index c7ac2ef911..fae468207d 100644
--- a/ja/copyright/license.sgml
+++ b/ja/copyright/license.sgml
@@ -1,12 +1,12 @@
-
+
%includes;
]>
-
+
-
+
&header;
diff --git a/ja/doc.hdr b/ja/doc.hdr
index 58d67561f3..d0ef0d222f 100644
--- a/ja/doc.hdr
+++ b/ja/doc.hdr
@@ -1,6 +1,6 @@
-
+
-
+
diff --git a/ja/releases/2.2.7R/announce.sgml b/ja/releases/2.2.7R/announce.sgml
index 9cce86f0ca..8d556f5c88 100644
--- a/ja/releases/2.2.7R/announce.sgml
+++ b/ja/releases/2.2.7R/announce.sgml
@@ -1,12 +1,12 @@
-
+
%includes;
]>
-
+
-
+
&header;
@@ -70,7 +70,7 @@ Concord CA, 94520 USA
Phone: +1 925 674-0783
Fax: +1 925 674-0821
Tech Support: +1 925 603-1234
-Email: info@cdrom.com
+Email: info@cdrom.com
WWW: http://www.cdrom.com/
diff --git a/ja/releases/index.sgml b/ja/releases/index.sgml
index e7c584b311..b1f036ac09 100644
--- a/ja/releases/index.sgml
+++ b/ja/releases/index.sgml
@@ -1,12 +1,12 @@
-
+
%includes;
]>
-
+
-
+
&header;
diff --git a/ja/search/Makefile b/ja/search/Makefile
index 970db8e942..0aae0126d6 100644
--- a/ja/search/Makefile
+++ b/ja/search/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.1 1998-08-03 16:44:13 wosch Exp $
+# $Id: Makefile,v 1.2 1998-08-09 16:22:18 kuriyama Exp $
# The FreeBSD Japanese Documentation Project
-# Original revision: 1.36
+# Original revision: 1.2
# These are turned into validated, normalized HTML files.
@@ -9,7 +9,7 @@ DOCS+= search.sgml
DOCS+= searchhints.sgml
DOCS+= search-mid.sgml
-
+INDEXLINK= search.html
CLEANFILES+=atoz.sgml site.sgml
index-site.sgml: atoz.sgml site.sgml
@@ -19,4 +19,3 @@ site.sgml: ../../en/search/site.map
perl ../../en/search/site.pl < ${.ALLSRC} > ${.TARGET}
.include "../../web.mk"
-
diff --git a/ja/search/index-site.sgml b/ja/search/index-site.sgml
index 09c4661219..c3b257fbe6 100644
--- a/ja/search/index-site.sgml
+++ b/ja/search/index-site.sgml
@@ -1,14 +1,14 @@
-
+
%includes;
]>
-
+
-
+
&header;
diff --git a/ja/search/search-mid.sgml b/ja/search/search-mid.sgml
index 9706c98bf4..7f54d1edd8 100644
--- a/ja/search/search-mid.sgml
+++ b/ja/search/search-mid.sgml
@@ -1,14 +1,14 @@
-
+
%includes;
]>
-
+
-
+
&header;
diff --git a/ja/search/search.sgml b/ja/search/search.sgml
index c919c41e30..c778901208 100644
--- a/ja/search/search.sgml
+++ b/ja/search/search.sgml
@@ -1,12 +1,12 @@
-
+
%includes;
]>
-
+
-
+
&header;
diff --git a/ja/search/searchhints.sgml b/ja/search/searchhints.sgml
index 50e09589b6..e5b3fc105d 100644
--- a/ja/search/searchhints.sgml
+++ b/ja/search/searchhints.sgml
@@ -1,12 +1,12 @@
-
+
%includes;
]>
-
+
-
+
&header;
diff --git a/ja/search/web.atoz b/ja/search/web.atoz
index 1613115476..c9c3e52f9f 100644
--- a/ja/search/web.atoz
+++ b/ja/search/web.atoz
@@ -4,10 +4,10 @@
# With the format `|'.
# Empty lines or comments are ignored.
#
-# $Id: web.atoz,v 1.8 1998-08-06 14:37:13 wosch Exp $
+# $Id: web.atoz,v 1.9 1998-08-09 16:22:18 kuriyama Exp $
#
# The FreeBSD Japanese Documentation Project
-# Original revision: 1.34
+# Original revision: 1.38
# about.sgml
Usage statistics for this server|../internal/about.html
diff --git a/ja/security/Makefile b/ja/security/Makefile
index b1ce3b5097..a307681e01 100644
--- a/ja/security/Makefile
+++ b/ja/security/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.5 1998-07-27 08:39:09 hanai Exp $
+# $Id: Makefile,v 1.6 1998-08-09 16:22:19 kuriyama Exp $
# The FreeBSD Japanese Documentation Project
-# Original revision: 1.1
+# Original revision: 1.2
.if exists(Makefile.conf)
.include "Makefile.conf"
@@ -11,4 +11,6 @@ DOCS+= programmers.sgml
DOCS+= security.sgml
DOCS+= secure.sgml
+INDEXLINK= security.html
+
.include "../../web.mk"
diff --git a/ja/support.sgml b/ja/support.sgml
index fd2595a797..28e2622a77 100644
--- a/ja/support.sgml
+++ b/ja/support.sgml
@@ -1,11 +1,11 @@
+
%includes;
]>
-
+
-
+
&header;
@@ -20,7 +20,8 @@
freebsd-questions@FreeBSD.ORG に (訳注: 英語で) 投稿してください.
メーリングリストのアーカイブを
www.freebsd.org にて
-
+ 検索 することも
+ できます.
いくつかの英語以外のメーリングリストもあります:
diff --git a/ja/where.sgml b/ja/where.sgml
index af31adaed7..8bd2bd179e 100644
--- a/ja/where.sgml
+++ b/ja/where.sgml
@@ -1,11 +1,11 @@
+
%includes;
]>
-
+
-
+
&header;