[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Goals/redistribution.xml: 1.1 -> 1.4

Subject: Goals/redistribution.xml: 1.1 -> 1.4
From: kano@na.rim.or.jp (OKANO Takayoshi)
To: www-changes-ja@jp.NetBSD.org
Date: Fri, 16 Dec 2005 22:27:46 +0900 (JST)
Message-Id: <200512161327.WAA35881@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
以下のページの更新をしました。ツッコミをお願いします。

Goals/redistribution.xml: 1.1 -> 1.4

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

以下、訳と原文の差分です。

--- redistribution.xml.orig	Sat Sep 17 19:05:14 2005
+++ redistribution.xml	Fri Dec 16 22:14:46 2005
@@ -1,30 +1,33 @@
 <?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-redistribution">
+<webpage id="ja-Goals-redistribution">
 <config param="desc" value="NetBSD のライセンスと再配布について"/>
-<config param="cvstag" value="$NetBSD: redistribution.xml,v 1.1 2004/03/26 12:16:03 daniel Exp $"/>
+<config param="cvstag" value="$NetBSD: redistribution.xml,v 1.4 2005/07/16 17:13:37 heinz Exp $"/>
 <!-- based on english translation: -->
-<!-- NetBSD: redistribution.xml,v 1.1 2004/03/26 12:16:03 daniel Exp   -->
-<config param="rcsdate" value="$Date: 2004/03/26 12:16:03 $"/>
+<!-- NetBSD: redistribution.xml,v 1.4 2005/07/16 17:13:37 heinz Exp   -->
+<config param="rcsdate" value="$Date: 2005/07/16 17:13:37 $"/>
 <head>
 <title>NetBSD のライセンスと再配布について</title>
 </head>
 
 <para>
 このページでは、
-<xref linkend="copyright-info">著作権に関する背景</xref>を述べることによって、
+<ulink url="#copyright-info">著作権に関する背景</ulink>を述べることによって、
 NetBSD オペレーティングシステムの多くの部分の配布条件となっている
-<xref linkend="terms">NetBSD のライセンス条項</xref>について説明し、さらに
-<xref linkend="why">なぜ私たちがこのライセンス条項を選択したのか</xref>を説明します。
+<ulink url="#terms">NetBSD のライセンス条項</ulink>について説明し、さらに
+<ulink url="#why">なぜ私たちがこのライセンス条項を選択したのか</ulink>を説明します。
 </para>
 
 <sect1 id="terms">
 <title>NetBSD の著作権とライセンス条項</title>
 
+<sect2 id="berkeley">
+<title>伝統的なバークレーライセンス</title>
+
 <para>
 NetBSD オペレーティングシステムを構成するソフトウェアの多くの部分は
 パブリックドメインではありません; 作者は、それぞれの著作権を保持しています。
@@ -42,7 +45,7 @@
 で使用されたもので、以下のようなものです:
 </para>
 
-<literallayout>
+<programlisting><html:pre>
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
@@ -55,13 +58,13 @@
   3. Neither the name of the University nor the names of its contributors
      may be used to endorse or promote products derived from this software
      without specific prior written permission.
-</literallayout>
+</html:pre></programlisting>
 
 <para>
 日本語に訳すと、以下のようになります(参考):
 </para>
 
-<literallayout>
+<programlisting><html:pre>
 ソースおよびバイナリー形式の再配布および使用を、変更の有無にかかわらず、
 以下の条件を満たす場合に認める:
 
@@ -72,7 +75,7 @@
      させること。
   3. 事前の文書による許可なしに、当大学の名前やその協力者の名前を、
      このソフトウェアから派生した製品の促進に使用しないこと。
-</literallayout>
+</html:pre></programlisting>
 
 <para>
 このライセンスの前には著作権表示そのものが付きます。
@@ -108,6 +111,57 @@
 他の人々にライセンス条項を変更させることはできませんし、
 必要な全てのソフトウェアを書き直すための無限の時間もありません。
 </para>
+</sect2>
+
+<sect2 id="default">
+<title>The NetBSD Foundation に譲渡されたすべてのコードのデフォルトのライセンス</title>
+<para>
+The NetBSD Foundation (TNF) のライセンスは、<quote>4 条項</quote>の<ulink
+url="#berkeley">バークレースタイル</ulink>ライセンスであり、
+TNF に寄贈されたすべてのコードに使われます。もしあなたがコードを書き、
+その著作権を TNF に譲渡した場合、以下に示すライセンスが使われます:
+</para>
+
+<programlisting><html:pre>
+/*-
+ * Copyright (c) 2005 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+</html:pre></programlisting>
+
+</sect2>
+
 </sect1>
 
 <sect1 id="why">
Index: Goals/redistribution.xml
===================================================================
RCS file: /cvsroot/htdocs/Goals/redistribution.xml,v
retrieving revision 1.1
retrieving revision 1.4
diff -u -r1.1 -r1.4
--- Goals/redistribution.xml	26 Mar 2004 12:16:03 -0000	1.1
+++ Goals/redistribution.xml	16 Jul 2005 17:13:37 -0000	1.4
@@ -1,28 +1,31 @@
 <?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="redistribution">
+<webpage id="Goals-redistribution">
 <config param="desc" value="NetBSD Licensing and Redistribution"/>
-<config param="cvstag" value="$NetBSD: redistribution.xml,v 1.1 2004/03/26 12:16:03 daniel Exp $"/>
-<config param="rcsdate" value="$Date: 2004/03/26 12:16:03 $"/>
+<config param="cvstag" value="$NetBSD: redistribution.xml,v 1.4 2005/07/16 17:13:37 heinz Exp $"/>
+<config param="rcsdate" value="$Date: 2005/07/16 17:13:37 $"/>
 <head>
 <title>NetBSD Licensing and Redistribution</title>
 </head>
 
 <para>
 This page exists to give you a bit of
-<xref linkend="copyright-info">background information about copyright</xref>,
-to <xref linkend="terms">explain the licensing terms</xref> that most of
+<ulink url="#copyright-info">background information about copyright</ulink>,
+to <ulink url="#terms">explain the licensing terms</ulink> that most of
 the NetBSD operating system is distributed under, and to
-<xref linkend="why">explain why we chose those licensing terms</xref>.
+<ulink url="#why">explain why we chose those licensing terms</ulink>.
 </para>
 
 <sect1 id="terms">
 <title>NetBSD's copyright and licensing terms</title>
 
+<sect2 id="berkeley">
+<title>The traditional Berkeley license</title>
+
 <para>
 For the most part, the software constituting the NetBSD operating
 system is not in the public domain; its authors retain their copyright.
@@ -37,7 +40,7 @@
 this:
 </para>
 
-<literallayout>
+<programlisting><html:pre>
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
@@ -50,7 +53,7 @@
   3. Neither the name of the University nor the names of its contributors
      may be used to endorse or promote products derived from this software
      without specific prior written permission.
-</literallayout>
+</html:pre></programlisting>
 
 <para>
 The license is preceded by the copyright statement itself, and
@@ -85,6 +88,57 @@
 have an infinite amount of time to rewrite all of the software that
 we need.
 </para>
+</sect2>
+
+<sect2 id="default">
+<title>Default license for all code assigned to The NetBSD Foundation</title>
+<para>
+The NetBSD Foundation's (TNF) license is a <quote>4 clause</quote> <ulink
+url="#berkeley">Berkeley-style</ulink> license, which is used for all code
+contributed to TNF.  If you write code and assign the copyright to TNF, this
+is the license that will be used:
+</para>
+
+<programlisting><html:pre>
+/*-
+ * Copyright (c) 2005 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by 
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+</html:pre></programlisting>
+
+</sect2>
+
 </sect1>
 
 <sect1 id="why">
Prev by Date: Goals/portability.xml: 1.1 -> 1.5
Next by Date: CVS commit: htdocs
Prev by thread: Goals/portability.xml: 1.1 -> 1.5
Next by thread: Packages.txt: 1.199 -> 1.200
Index(es):
- Date
- Thread