[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Misc/disclaimer.xml: 1.6 -> 1.10

Subject: Misc/disclaimer.xml: 1.6 -> 1.10
From: kano@na.rim.or.jp (OKANO Takayoshi)
To: www-changes-ja@jp.NetBSD.org
Date: Tue, 11 Jul 2006 00:56:48 +0900 (JST)
Message-Id: <200607101556.AAA52199@shell.rim.or.jp>
Delivered-To: mailing list www-changes-ja@jp.netbsd.org
Mailing-List: contact www-changes-ja-help@jp.netbsd.org; run by ezmlm-idx
以下のページの更新をしました。ツッコミをお願いします。

Misc/disclaimer.xml: 1.6 -> 1.10

> revision 1.10
> date: 2005/05/05 08:09:08;  author: hrs;  state: Exp;  lines: +4 -4
> Switch to PUBLIC "-//NetBSD//DTD Website-based NetBSD Extension//EN".
> ----------------------------
> revision 1.9
> date: 2005/02/26 19:22:50;  author: jschauma;  state: Exp;  lines: +12 -3
> add a link to the licensing information
> ----------------------------
> revision 1.8
> date: 2004/11/21 21:59:56;  author: jschauma;  state: Exp;  lines: +4 -4
> Use explicit id's in all sections, so that subsequent regen's don't
> create random IDs.
> ----------------------------
> revision 1.7
> date: 2004/11/09 14:36:31;  author: jschauma;  state: Exp;  lines: +11 -11
> Improve grammar a bit, following suggestions from Danny Beaudoin and
> Jeremey C. Reed.

水曜日までに異議がなければ、 commit します。

以下、訳と原文それぞれの新旧の差分です。

--- Misc/disclaimer.xml.orig	2006-07-11 00:54:29.000000000 +0900
+++ Misc/disclaimer.xml	2006-07-11 00:54:29.000000000 +0900
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="ISO-2022-JP"?>
 <!DOCTYPE webpage
-  PUBLIC "-//Norman Walsh//DTD Website V2.2//EN"
-         "http://docbook.sourceforge.net/release/website/2.2/website.dtd" [
+  PUBLIC "-//NetBSD//DTD Website-based NetBSD Extension//EN"
+         "http://www.NetBSD.org/XML/htdocs/lang/share/xml/website-netbsd.dtd" [
 ]>
 
 <webpage id="ja-disclaimer">
 <config param="desc" value="否認声明と著作権についての情報"/>
-<config param="cvstag" value="$NetBSD: disclaimer.xml,v 1.6 2004/11/08 14:13:54 jschauma Exp $"/>
+<config param="cvstag" value="$NetBSD: disclaimer.xml,v 1.10 2005/05/05 08:09:08 hrs Exp $"/>
 <!-- Based on english version: -->
-<!-- NetBSD: disclaimer.xml,v 1.6 2004/11/08 14:13:54 jschauma Exp   -->
-<config param="rcsdate" value="$Date: 2004/11/08 14:13:54 $"/>
+<!-- NetBSD: disclaimer.xml,v 1.10 2005/05/05 08:09:08 hrs Exp   -->
+<config param="rcsdate" value="$Date: 2005/05/05 08:09:08 $"/>
 <head>
 <title>否認声明と著作権についての情報</title>
 </head>
 
-<sect1>
+<sect1 id="top">
 <title>否認声明</title>
 
 <para>
@@ -41,31 +41,40 @@
 </para>
 </sect1>
 
-<sect1>
+<sect1 id="copyright-information">
 <title>著作権についての情報</title>
 
 <sect2 id="netbsd-site">
 <title>NetBSD WWW サイトの著作権</title>
 <para>
 Except where otherwise noted, the contents of this server are copyright
-1994-2004 by The NetBSD Foundation, Inc.  All rights reserved.
+1994-2005 by The NetBSD Foundation, Inc.  All rights reserved.
 <html:br/>
 (訳註: 特に断りのある場合を除き、このサーバー上のコンテンツは、
 The NetBSD Foundation Inc. が著作権を有します。)
 </para>
 </sect2>
 
+<sect2 id="code">
+<title>コードの著作権とライセンスについての情報</title>
+<para>
+The NetBSD Foundation
+がリリースしたコードの著作権およびライセンスに関する詳細は、
+<ulink url="../Goals/redistribution.html">このページ</ulink>をご覧ください。
+</para>
+</sect2>
+
 <sect2 id="netbsd-flag">
 <title>NetBSD の旗の著作権</title>
 <para>
-The NetBSD Flag image, and any parts thereof, were drawn as an entry in
-the NetBSD logo contest.  Ownership of the image was transferred to The
-NetBSD Foundation, and the image is Copyright (&copy;) 2004 by The NetBSD
-Foundation. All rights reserved. Non-commercial and personal use of the
-image is permitted, provided that it remains unmodified. Mass production,
-commercial use, or use of a modified copy of the image requires explicit
-written permission. Permission may be obtained by writing to The NetBSD
-Foundation at <email>board@NetBSD.org</email>.
+The NetBSD Flag image was drawn as an entry in the NetBSD logo contest.
+Ownership of the image was transferred to The NetBSD Foundation, and the
+image and any parts thereof are Copyright (&copy;) 2004 by The NetBSD
+Foundation. All rights reserved. Non-commercial and personal use of the image
+is permitted, provided that it remains unmodified. Mass production, commercial
+use, or use of a modified copy of the image requires explicit written
+permission. Permission may be obtained by writing to The NetBSD Foundation at
+<email>board@NetBSD.org</email>.
 </para>
 </sect2>
 
Index: Misc/disclaimer.xml
===================================================================
RCS file: /cvsroot/htdocs/Misc/disclaimer.xml,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -r1.6 -r1.10
--- Misc/disclaimer.xml	8 Nov 2004 14:13:54 -0000	1.6
+++ Misc/disclaimer.xml	5 May 2005 08:09:08 -0000	1.10
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!DOCTYPE webpage
-  PUBLIC "-//Norman Walsh//DTD Website V2.2//EN"
-         "http://docbook.sourceforge.net/release/website/2.2/website.dtd" [
+  PUBLIC "-//NetBSD//DTD Website-based NetBSD Extension//EN"
+         "http://www.NetBSD.org/XML/htdocs/lang/share/xml/website-netbsd.dtd" [
 ]>
 
 <webpage id="disclaimer">
 <config param="desc" value="Disclaimers and Copyright Information"/>
-<config param="cvstag" value="$NetBSD: disclaimer.xml,v 1.6 2004/11/08 14:13:54 jschauma Exp $"/>
-<config param="rcsdate" value="$Date: 2004/11/08 14:13:54 $"/>
+<config param="cvstag" value="$NetBSD: disclaimer.xml,v 1.10 2005/05/05 08:09:08 hrs Exp $"/>
+<config param="rcsdate" value="$Date: 2005/05/05 08:09:08 $"/>
 <head>
 <title>Disclaimers and Copyright Information</title>
 </head>
 
-<sect1>
+<sect1 id="top">
 <title>Disclaimers</title>
 
 <para>
@@ -39,35 +39,44 @@
 </para>
 </sect1>
 
-<sect1>
+<sect1 id="copyright-information">
 <title>Copyright Information</title>
 
 <sect2 id="netbsd-site">
 <title>NetBSD WWW Site Copyright</title>
 <para>
 Except where otherwise noted, the contents of this server are copyright
-1994-2004 by The NetBSD Foundation, Inc.  All rights reserved.
+1994-2005 by The NetBSD Foundation, Inc.  All rights reserved.
+</para>
+</sect2>
+
+<sect2 id="code">
+<title>Code Copyright and Licensing information</title>
+<para>
+Please see <ulink url="../Goals/redistribution.html">this page</ulink> for
+details regarding the copyright and licensing terms under which The NetBSD
+Foundation releases their code.
 </para>
 </sect2>
 
 <sect2 id="netbsd-flag">
 <title>NetBSD Flag Copyright</title>
 <para>
-The NetBSD Flag image, and any parts thereof, were drawn as an entry in
-the NetBSD logo contest.  Ownership of the image was transferred to The
-NetBSD Foundation, and the image is Copyright (&copy;) 2004 by The NetBSD
-Foundation. All rights reserved. Non-commercial and personal use of the
-image is permitted, provided that it remains unmodified. Mass production,
-commercial use, or use of a modified copy of the image requires explicit
-written permission. Permission may be obtained by writing to The NetBSD
-Foundation at <email>board@NetBSD.org</email>.
+The NetBSD Flag image was drawn as an entry in the NetBSD logo contest.
+Ownership of the image was transferred to The NetBSD Foundation, and the
+image and any parts thereof are Copyright (&copy;) 2004 by The NetBSD
+Foundation. All rights reserved. Non-commercial and personal use of the image
+is permitted, provided that it remains unmodified. Mass production, commercial
+use, or use of a modified copy of the image requires explicit written
+permission. Permission may be obtained by writing to The NetBSD Foundation at
+<email>board@NetBSD.org</email>.
 </para>
 </sect2>
 
 <sect2 id="netbsd-daemons">
 <title>NetBSD Daemons Copyright</title>
 <para>
-The NetBSD Daemons image, and any parts thereof, are copyright
+The NetBSD Daemons image and any parts thereof are copyright
 1994 by Shawn Mueller.  All rights reserved.  Non-commercial and personal
 use of the images is permitted, provided that it remains unmodified.
 Mass production, commercial use, or use of a modified copy of the
Prev by Date: CVS commit: htdocs
Next by Date: CVS commit: htdocs
Prev by thread: Misc/disclaimer.xml: 1.1 -> 1.6
Next by thread: People/developers.xml: 1.51 -> 1.107
Index(es):
- Date
- Thread