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

Subject: Misc/disclaimer.xml: 1.1 -> 1.6
From: kano@na.rim.or.jp (OKANO Takayoshi)
To: www-changes-ja@jp.NetBSD.org
Date: Tue, 11 Jul 2006 00:46:12 +0900 (JST)
Message-Id: <200607101546.AAA49591@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.1 -> 1.6

> revision 1.6
> date: 2004/11/08 14:13:54;  author: jschauma;  state: Exp;  lines: +3 -3
> s/Paul A/&./
> ----------------------------
> revision 1.5
> date: 2004/10/31 23:55:21;  author: wiz;  state: Exp;  lines: +3 -3
> Fix typo reported by Stefan Verhaegh.
> ----------------------------
> revision 1.4
> date: 2004/10/30 22:33:36;  author: jschauma;  state: Exp;  lines: +17 -3
> 
> Live from EuroBSDCon 2004:  we have a new logo!
> 
> Tadaa!
> ----------------------------
> revision 1.3
> date: 2004/05/14 08:26:45;  author: darcy;  state: Exp;  lines: +3 -3
> Update copyright date.
> ----------------------------
> revision 1.2
> date: 2003/07/16 17:16:24;  author: jrf;  state: Exp;  lines: +8 -8
> Changed Shawn Mueller contact information.

# 1.4 で追加された NetBSD Flag Copyright の節は、
# 今後の更新で書き換えられるので、訳してありません。

訳文に影響がない変更のみなのですぐに commit します。

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

--- Misc/disclaimer.xml.orig	2006-07-11 00:42:25.000000000 +0900
+++ Misc/disclaimer.xml	2006-07-11 00:42:25.000000000 +0900
@@ -6,10 +6,10 @@
 
 <webpage id="ja-disclaimer">
 <config param="desc" value="否認声明と著作権についての情報"/>
-<config param="cvstag" value="$NetBSD: disclaimer.xml,v 1.1 2003/04/26 23:21:39 grant Exp $"/>
+<config param="cvstag" value="$NetBSD: disclaimer.xml,v 1.6 2004/11/08 14:13:54 jschauma Exp $"/>
 <!-- Based on english version: -->
-<!-- NetBSD: disclaimer.xml,v 1.1 2003/04/26 23:21:39 grant Exp   -->
-<config param="rcsdate" value="$Date: 2003/04/26 23:21:39 $"/>
+<!-- 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 $"/>
 <head>
 <title>否認声明と著作権についての情報</title>
 </head>
@@ -21,7 +21,7 @@
 このサーバー (訳註: www.NetBSD.org) 上のコンテンツは NetBSD プロジェクトが
 管理しています。サーバーのマシン自体は
 <ulink url="http://www.isc.org/">Internet Software Consortium (ISC)</ulink>
-にあって、 Paul A Vixie、 Michael Graff、 Philip A. Nelson が管理しています。
+にあって、 Paul A. Vixie、 Michael Graff、 Philip A. Nelson が管理しています。
 <emphasis>NetBSD プロジェクトおよび ISC は、ここで提供している情報の新しさ、
 正確さ、品質について、一切の保証をしません。</emphasis>
 誤り・不適切な情報がある場合、お知らせいただければ、
@@ -48,13 +48,27 @@
 <title>NetBSD WWW サイトの著作権</title>
 <para>
 Except where otherwise noted, the contents of this server are copyright
-1994-2003 by The NetBSD Foundation, Inc.  All rights reserved.
+1994-2004 by The NetBSD Foundation, Inc.  All rights reserved.
 <html:br/>
 (訳註: 特に断りのある場合を除き、このサーバー上のコンテンツは、
 The NetBSD Foundation Inc. が著作権を有します。)
 </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>.
+</para>
+</sect2>
+
 <sect2 id="netbsd-daemons">
 <title>NetBSD デーモンの著作権</title>
 <para>
@@ -70,14 +84,14 @@
 </para>
 
 <address>
-Shawn Mueller
-<email>muel2997@mach1.wlu.ca</email>
-c/o Dept. of Geography &amp; Environmental Studies
-Wilfrid Laurier University
-Waterloo, ON CANADA
-N2L 3C5
+Shawn Mueller (BA, BSc, MES)
+<email>mullrs@yahoo.com</email>
+c/o #202, 817 - 5 Street N.E.
+Calgary, AB CANADA
+T2E 3W9
 </address>
 
+
 </sect2>
 
 <sect2 id="bsd-daemon">
Index: Misc/disclaimer.xml
===================================================================
RCS file: /cvsroot/htdocs/Misc/disclaimer.xml,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -r1.1 -r1.6
--- Misc/disclaimer.xml	26 Apr 2003 23:21:39 -0000	1.1
+++ Misc/disclaimer.xml	8 Nov 2004 14:13:54 -0000	1.6
@@ -6,8 +6,8 @@
 
 <webpage id="disclaimer">
 <config param="desc" value="Disclaimers and Copyright Information"/>
-<config param="cvstag" value="$NetBSD: disclaimer.xml,v 1.1 2003/04/26 23:21:39 grant Exp $"/>
-<config param="rcsdate" value="$Date: 2003/04/26 23:21:39 $"/>
+<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 $"/>
 <head>
 <title>Disclaimers and Copyright Information</title>
 </head>
@@ -18,7 +18,7 @@
 <para>
 The content on this server is maintained by The NetBSD Project.  The
 server machine itself is hosted by <ulink url="http://www.isc.org/">Internet
-Software Consortium (ISC)</ulink> and managed by Paul A Vixie, Michael Graff
+Software Consortium (ISC)</ulink> and managed by Paul A. Vixie, Michael Graff
 and Philip A. Nelson.
 <emphasis>Neither The NetBSD Project nor ISC make any
 guarantees as to the currency, accuracy, or quality of information
@@ -46,7 +46,21 @@
 <title>NetBSD WWW Site Copyright</title>
 <para>
 Except where otherwise noted, the contents of this server are copyright
-1994-2003 by The NetBSD Foundation, Inc.  All rights reserved.
+1994-2004 by The NetBSD Foundation, Inc.  All rights reserved.
+</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>.
 </para>
 </sect2>
 
@@ -62,18 +76,18 @@
 </para>
 
 <address>
-Shawn Mueller
-<email>muel2997@mach1.wlu.ca</email>
-c/o Dept. of Geography &amp; Environmental Studies
-Wilfrid Laurier University
-Waterloo, ON CANADA
-N2L 3C5
+Shawn Mueller (BA, BSc, MES)
+<email>mullrs@yahoo.com</email>
+c/o #202, 817 - 5 Street N.E.
+Calgary, AB CANADA
+T2E 3W9
 </address>
 
+
 </sect2>
 
 <sect2 id="bsd-daemon">
-<title>BSD Daemons Copyright</title>
+<title>BSD Daemon Copyright</title>
 <para>
 BSD Daemon Copyright 1988 by Marshall Kirk McKusick.
 All Rights Reserved.
Prev by Date: CVS commit: htdocs
Next by Date: CVS commit: htdocs
Prev by thread: Documentation/mirror.xml: 1.7 -> 1.8
Next by thread: Misc/disclaimer.xml: 1.6 -> 1.10
Index(es):
- Date
- Thread