Merge the following from the English version:

1.114 -> 1.133 www/ja/Makefile 1.1 -> 1.7 www/ja/freebsd.css 1.13 -> 1.15 www/ja/copyright/Makefile 1.38 -> 1.49 www/ja/internal/Makefile 1.48 -> 1.54 www/ja/internal/about.sgml Submitted by: Hiroo Ono <hiroo _at_ jp dot FreeBSD dot org> References: [doc-jp-work 1497, 1504, 1518]
svn path=/www/; revision=37074
2011-03-17 13:21:37 +00:00 · 2011-03-17 13:21:37 +00:00 · fe43f4affc · 2020-12-08 03:00:23 +00:00
commit fe43f4affc
parent 391080fe80
6 changed files with 119 additions and 51 deletions
--- a/ja/Makefile
+++ b/ja/Makefile
@ -1,6 +1,6 @@
-# $FreeBSD: www/ja/Makefile,v 1.78 2010/05/07 12:37:15 ryusuke Exp $
+# $FreeBSD: www/ja/Makefile,v 1.79 2010/07/05 17:00:55 ryusuke Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.114
+# Original revision: 1.133

 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@ -23,7 +23,6 @@ DOCS+= publish.sgml
 DOCS+= relnotes.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
-#DOCS+= usergroups.sgml
 DOCS+= where.sgml 
 DOCS+= y2kbug.sgml 

@ -44,50 +43,55 @@ DEPENDSET.community=usergroups events
 # These will be directly installed.

 #DATA=	favicon.ico
-#DATA+=	robots.txt
 DATA+=	freebsd.css
-#DATA+=  vendors.html
+#DATA+=	robots.txt
+#DATA+= vendors.html

 # Subdirectories
 # SGML
-SUBDIR=	 security
+SUBDIR= FAQ
+#SUBDIR+= advocacy
 SUBDIR+= commercial
 SUBDIR+= community
+SUBDIR+= copyright
+SUBDIR+= developers
 SUBDIR+= docproj
 SUBDIR+= docs
-SUBDIR+= developers
-SUBDIR+= news
-#SUBDIR+= advocacy
-
+#SUBDIR+= donations
 SUBDIR+= events
-SUBDIR+= FAQ
+#SUBDIR+= gnome
 SUBDIR+= handbook
-SUBDIR+= tutorials
 SUBDIR+= internal
 SUBDIR+= java
-SUBDIR+= copyright
-SUBDIR+= search
+#SUBDIR+= kse
+#SUBDIR+= layout
+#SUBDIR+= marketing
+SUBDIR+= news
+SUBDIR+= platforms
+#SUBDIR+= portmgr
 SUBDIR+= projects
 SUBDIR+= prstats
-SUBDIR+= platforms
 SUBDIR+= releases
 #SUBDIR+= releng
+SUBDIR+= search
+SUBDIR+= security
 SUBDIR+= smp
+#SUBDIR+= snapshots
 SUBDIR+= support
-#SUBDIR+= kse
-#SUBDIR+= gnome
-#SUBDIR+= donations
+SUBDIR+= tutorials
+
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
-SUBDIR+= ports
 SUBDIR+= doc
+SUBDIR+= ports
 # .endif
 # .if defined(BUILD_RELNOTES)
 # SUBDIR+= relnotes
 .endif

 # Non-SGML
-#SUBDIR+= gifs
 #SUBDIR+= cgi
+#SUBDIR+= gifs
+#SUBDIR+= layout

 WEBDIR?=	data/ja

--- a/ja/copyright/Makefile
+++ b/ja/copyright/Makefile
@ -1,6 +1,6 @@
-# $FreeBSD: www/ja/copyright/Makefile,v 1.16 2001/11/18 22:33:58 hrs Exp $
+# $FreeBSD: www/ja/copyright/Makefile,v 1.17 2003/11/02 07:36:56 rushani Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.13
+# Original revision: 1.15

 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@ -9,10 +9,11 @@
 .include "../Makefile.inc"
 .endif

-DOCS=	license.sgml
-DOCS+=	freebsd-license.sgml
+DOCS=	copyright.sgml
 DOCS+=	daemon.sgml
-DOCS+=	copyright.sgml
+#DOCS+=	freebsd-doc-license.sgml
+DOCS+=	freebsd-license.sgml
+DOCS=	license.sgml
 DOCS+=	trademarks.sgml

 INDEXLINK= copyright.html
--- a/ja/freebsd.css
+++ b/ja/freebsd.css
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002 The FreeBSD Documentation Project
+ * Copyright (c) 2002,2004-2005 The FreeBSD Documentation Project
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -23,12 +23,12 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- * $FreeBSD$
+ * $FreeBSD: www/ja/freebsd.css,v 1.1 2003/11/17 20:23:58 rushani Exp $
 */

 /*
 * The FreeBSD Japanese Documentation Project
- * Original revision: 1.1
+ * Original revision: 1.7
 */

 DIV.EXAMPLE P B {
@ -38,3 +38,46 @@ DIV.EXAMPLE P B {
 .FILENAME {
 	color: #007a00;
 }
+
+h1, h2, h3 {
+	color: #660000;
+}
+
+table.tasklist {
+}
+
+tr.heading {
+	font-size: 15px;
+	background-color: #cbd2ec;
+}
+
+table.tasklist td {
+	font-size: 13px;
+}
+
+table.tasklist td.section {
+	font-size: 15px;
+	font-weight: bold;
+	background-color: #e7e9f7;
+}
+
+tbody.comparison tr {
+	vertical-align: top;
+}
+
+tbody.comparison tr td.category {
+	font-size: 16px;
+	font-weight: bold;
+	margin-top: 20px;
+}
+
+label {
+	font-weight: bold;
+	cursor: pointer;
+}
+
+/* Errors from www/en/cgi/dosendpr.cgi */
+.prerror {
+	font-weight: bold;
+}
+
--- a/ja/internal/Makefile
+++ b/ja/internal/Makefile
@ -1,6 +1,6 @@
-# $FreeBSD: www/ja/internal/Makefile,v 1.20 2002/05/13 20:09:04 hrs Exp $
+# $FreeBSD: www/ja/internal/Makefile,v 1.21 2004/01/10 18:37:58 rushani Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.38
+# Original revision: 1.49

 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@ -9,25 +9,41 @@
 .include "../Makefile.inc"
 .endif

-# DOCS=   photos.sgml     
-DOCS+=  internal.sgml   
 DOCS+=  about.sgml
+#DOCS+=	bylaws.sgml
+#DOCS+=	core-vote.sgml
+DOCS+=	developer.sgml
+#DOCS+=	doceng.sgml
+#DOCS+=	expire-bits.sgml
+#DOCS+=	fortunes.sgml
+#DOCS+=	i18n.sgml
+DOCS+=  internal.sgml   
 DOCS+=  machines.sgml
 DOCS+=  mirror.sgml
 #DOCS+=	new-account.sgml
-DOCS+=	statistic.sgml
-DOCS+=	developer.sgml
-#DOCS+=	bylaws.sgml
+#DOCS+=	policies.sgml
 #DOCS+=	releng.sgml
-#DOCS+=	expire-bits.sgml
-#DOCS+=	core-vote.sgml
-#DOCS+=	trb-dispute.sgml
-#DOCS+=	doceng.sgml
-#DOCS+=	rtp.sgml
+DOCS+=	statistic.sgml

 INDEXLINK=	internal.html

-# DATA+=  README.mirror
+# build the list of personal homepages of FreeBSD developers only 
+# on the main FreeBSD machines
+#hostname!= hostname
+#.if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org" || ${hostname} == "www.freebsd.org"
+#DOCS+=	homepage.sgml
+#
+#.if !make(install)
+#.PHONY: homepage.inc
+#.endif
+#homepage.inc: homepage.pl
+#	${PERL} ${.CURDIR}/homepage.pl > ${.TARGET}
+#
+#homepage.html:  homepage.inc
+#CLEANFILES+=	homepage.inc
+#.endif
+#
+#DATA+=	README.mirror ssh-keys.asc

 ### Revision checking
 REVCHECK=	yes
--- a/ja/internal/about.sgml
+++ b/ja/internal/about.sgml
@ -1,19 +1,19 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/internal/about.sgml,v 1.34 2005/10/04 16:21:46 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/internal/about.sgml,v 1.35 2006/08/19 21:24:41 hrs Exp $">
 <!ENTITY title "About the FreeBSD WWW Server">
 <!ENTITY % navinclude.docs "INCLUDE">
 ]>
-<!-- $FreeBSD: www/ja/internal/about.sgml,v 1.34 2005/10/04 16:21:46 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/internal/about.sgml,v 1.35 2006/08/19 21:24:41 hrs Exp $ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.48 -->
+<!-- Original revision: 1.54 -->

 <html>
 &header;

 <h2>マシン</h2>

-    <img src="&enbase;/gifs/powerlogo.gif" alt="" align="right">
+    <img src="&enbase;/gifs/powerlogo.gif" alt="Powered by FreeBSD" align="right">
    <p><tt>www.FreeBSD.org</tt> は、<tt>freefall.FreeBSD.org</tt> も
      兼ねるマシンで、600MHz デュアル Pentium III および、1024MB
      の RAM と約 70 GB のディスクから構成されています。
@ -40,7 +40,7 @@

 <h2>ソフトウェア</h2>

-    <img src="&enbase;/gifs/apachepower.gif" alt="" align="right"><p>
+    <img src="&enbase;/gifs/apachepower.gif" alt="Powered by FreeBSD" align="right"><p>
      このページは多機能で効率のよい
      <a href="http://www.apache.org/">Apache http サーバ</a>
      で提供しています。さらに、いくらかの手製の 
@ -53,7 +53,7 @@

 <h2>ページ</h2>

-    <img src="&enbase;/gifs/lynx.gif" alt="" align="right">
+    <img src="&enbase;/gifs/lynx.gif" alt="Lynx Friendly logo" align="right">
    <p>これらの Webページは、FreeBSDコミュニティや<b>あなた
       </b>からの情報提供を John Fieber<a
 	href="http://people.FreeBSD.org/~jfieber/">&lt;jfieber@FreeBSD.org&gt;</a> 
@ -73,7 +73,7 @@
    Megan McCormack</A> が担当しました。
    </p>

-<h2><a href="http://wolfram.schneider.org/papers/webbuild.html">
+<h2><a href="&enbase;/doc/en_US.ISO8859-1/books/fdp-primer/the-website-build.html">
 FreeBSD Web ページの構築と更新</a></h2>

 &webbuild;
@ -84,7 +84,7 @@ FreeBSD Web

    <table class="tblbasic">
    <tr>
-      <th>»þ¹ï (PST/PDT)</th>
+      <th>時刻 (UTC)</th>
      <th>構築の種類</th>
    </tr>
    <tr>
@ -113,6 +113,10 @@ FreeBSD Web
    </tr>
    </table>

+    <p>直近のビルド状況を <a
+      href="http://www.freebsd.org/build/index.cgi">ここ</a>
+      で確認できます。</p>
+
 <h2>FreeBSD Web ページのミラー</h2>
    <p>www.FreeBSD.org の FreeBSD Web ページを <a href="mirror.html">
    ミラー</a>することができます (奨励されています)。</p>
--- a/ja/internal/internal.sgml
+++ b/ja/internal/internal.sgml
@ -1,11 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/ja/internal/internal.sgml,v 1.23 2005/10/04 16:21:46 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ja/internal/internal.sgml,v 1.24 2006/08/19 21:24:41 hrs Exp $">
 <!ENTITY title "FreeBSD Internal">
 <!ENTITY % navinclude.docs "INCLUDE">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.26 -->
+<!-- Original revision: 1.38 -->

 <html>
 &header;