[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Goals/redistribution.xml: 1.5 -> 1.6
以下のページの更新をしました。ツッコミをお願いします。
Goals/redistribution.xml: 1.5 -> 1.6
火曜日までに異議がなければ、 commit します。
> revision 1.6
> date: 2006/04/24 13:28:15; author: jschauma; state: Exp; lines: +6 -6
> nuke <html:pre> within programlisting
以下、訳と原文の差分です。
--- Goals/redistribution.xml.orig 2006-04-24 22:46:33.000000000 +0900
+++ Goals/redistribution.xml 2006-04-24 22:46:33.000000000 +0900
@@ -6,10 +6,10 @@
<webpage id="ja-Goals-redistribution">
<config param="desc" value="NetBSD のライセンスと再配布について"/>
-<config param="cvstag" value="$NetBSD: redistribution.xml,v 1.5 2006/01/04 11:49:19 darcy Exp $"/>
+<config param="cvstag" value="$NetBSD: redistribution.xml,v 1.6 2006/04/24 13:28:15 jschauma Exp $"/>
<!-- Based on english version: -->
-<!-- NetBSD: redistribution.xml,v 1.5 2006/01/04 11:49:19 darcy Exp -->
-<config param="rcsdate" value="$Date: 2006/01/04 11:49:19 $"/>
+<!-- NetBSD: redistribution.xml,v 1.6 2006/04/24 13:28:15 jschauma Exp -->
+<config param="rcsdate" value="$Date: 2006/04/24 13:28:15 $"/>
<head>
<title>NetBSD のライセンスと再配布について</title>
</head>
@@ -45,7 +45,7 @@
で使用されたもので、以下のようなものです:
</para>
-<programlisting><html:pre>
+<programlisting>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -58,7 +58,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.
-</html:pre></programlisting>
+</programlisting>
<para>
日本語に訳すと、以下のようになります(参考):
@@ -122,7 +122,7 @@
その著作権を TNF に譲渡した場合、以下に示すライセンスが使われます:
</para>
-<programlisting><html:pre>
+<programlisting>
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -158,7 +158,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-</html:pre></programlisting>
+</programlisting>
</sect2>
Index: Goals/redistribution.xml
===================================================================
RCS file: /cvsroot/htdocs/Goals/redistribution.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Goals/redistribution.xml 4 Jan 2006 11:49:19 -0000 1.5
+++ Goals/redistribution.xml 24 Apr 2006 13:28:15 -0000 1.6
@@ -6,8 +6,8 @@
<webpage id="Goals-redistribution">
<config param="desc" value="NetBSD Licensing and Redistribution"/>
-<config param="cvstag" value="$NetBSD: redistribution.xml,v 1.5 2006/01/04 11:49:19 darcy Exp $"/>
-<config param="rcsdate" value="$Date: 2006/01/04 11:49:19 $"/>
+<config param="cvstag" value="$NetBSD: redistribution.xml,v 1.6 2006/04/24 13:28:15 jschauma Exp $"/>
+<config param="rcsdate" value="$Date: 2006/04/24 13:28:15 $"/>
<head>
<title>NetBSD Licensing and Redistribution</title>
</head>
@@ -40,7 +40,7 @@
this:
</para>
-<programlisting><html:pre>
+<programlisting>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -53,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.
-</html:pre></programlisting>
+</programlisting>
<para>
The license is preceded by the copyright statement itself, and
@@ -99,7 +99,7 @@
is the license that will be used:
</para>
-<programlisting><html:pre>
+<programlisting>
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -135,7 +135,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-</html:pre></programlisting>
+</programlisting>
</sect2>