[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnu-pl] wwwgnudiff - raport nr 316
|
From: |
Wojciech Kotwica |
|
Subject: |
[gnu-pl] wwwgnudiff - raport nr 316 |
|
Date: |
Thu, 10 Jun 2004 05:34:57 +0200 |
---------- NOWE PLIKI --------
Nowy plik: http://www.gnu.org/keepingup.pl.html
------------------------------
--- prev/www/home.html Sat Jun 5 05:26:59 2004
+++ curr/www/home.html Thu Jun 10 05:27:09 2004
@@ -218,5 +218,5 @@
<ul>
<li><strong>World wide</strong>:
-<a href="/server/takeaction.html#wipo">Raise awareness of dangers of WIPO
Broadcat Treaty</a></li>
+<a href="/server/takeaction.html#wipo">Raise awareness of dangers of WIPO
Broadcast Treaty</a></li>
<li><strong>US citizens</strong>:
<a href="/server/takeaction.html#hr3261">Oppose HR 3261</a></li>
@@ -355,5 +355,5 @@
Updated:
<!-- timestamp start -->
-$Date: 2004/06/04 21:45:12 $ $Author: sinuhe $
+$Date: 2004/06/09 13:14:36 $ $Author: corey $
<!-- timestamp end -->
</p>
--- prev/www/home.pl.html Wed Jun 9 05:27:07 2004
+++ curr/www/home.pl.html Thu Jun 10 05:27:09 2004
@@ -177,5 +177,5 @@
<tr>
<td class="td_con">
-<a href="/keepingup.html">B±d¼ na bie¿±co</a><br />
+<a href="/keepingup.pl.html">Na bie¿±co</a><br />
<a href="/server/list-mirrors.pl.html">Serwery lustrzane</a><br />
<a href="/people/speakers.html">Prelegenci GNU</a><br />
@@ -370,5 +370,5 @@
Aktualizowane:
<!-- timestamp start -->
-$Date: 2004/06/08 12:25:24 $ $Author: wkotwica $
+$Date: 2004/06/09 11:22:10 $ $Author: wkotwica $
<!-- timestamp end -->
</p>
--- prev/www/licenses/license-list.html Fri Jun 4 05:29:21 2004
+++ curr/www/licenses/license-list.html Thu Jun 10 05:30:40 2004
@@ -119,6 +119,6 @@
<dl>
-<dt>The <a id="GNUGPL" href="/licenses/gpl.html">GNU General Public
- License</a>, or GNU GPL for short.</dt>
+<dt><a id="GNUGPL" href="/licenses/gpl.html">GNU General Public
+ License</a>, or GNU GPL for short.</dt>
<dd>
This is a free software license, and a copyleft license. We recommend
@@ -127,6 +127,6 @@
-<dt>The <a href="/copyleft/lesser.html">GNU Lesser General Public
- License</a>, or GNU LGPL for short.</dt>
+<dt><a href="/copyleft/lesser.html">GNU Lesser General Public
+ License</a>, or GNU LGPL for short.</dt>
<dd>
This is a free software license, but not a strong copyleft license,
@@ -143,5 +143,5 @@
-<dt>The license of Guile.</dt>
+<dt><u>License of Guile</u></dt>
<dd>
This consists of the GNU GPL plus a special statement giving blanket
@@ -153,5 +153,5 @@
-<dt>The license of the run-time units of the GNU Ada compiler.</dt>
+<dt><u>License of the run-time units of the GNU Ada compiler</u></dt>
<dd>
This is much like that of Guile.
@@ -159,27 +159,18 @@
-<dt><a name="X11License" href="http://www.x.org/Downloads_terms.html";>The X11
-license</a>.</dt>
+<dt><a id="X11License" href="http://www.x.org/Downloads_terms.html";>X11
License</a></dt>
<dd>
This is a simple, permissive non-copyleft free software license,
compatible with the GNU GPL. Older versions of XFree86 used the same
-license, and some of the current variants of XFree86 also do.
+license, and some of the current variants of XFree86 also do. Later
+versions of XFree86 are distributed under the XFree86 1.1 license (which is
+GPL-incompatible).
<p>
This license is sometimes called the "MIT" license, but that term is
misleading, since MIT has used many licenses for software.</p></dd>
-<dt><a NAME="XFree861.1License">The XFree86 1.1 license</a>.</dt>
-
-<dd>This is a simple, permissive non-copyleft free software license,
-incompatible with the GNU GPL because of its requirements that
-apply to all documentation in the distribution that contain
-acknowledgements.
-<p>There are currently several variants of XFree86, and only
-some of them use this license. Some continue to use the X11 license.</p>
-</dd>
-<dt><a id="Expat" href="http://www.jclark.com/xml/copying.txt";>Expat
- license</a>.</dt>
+<dt><a id="Expat" href="http://www.jclark.com/xml/copying.txt";>Expat
License</a>.</dt>
<dd>
This is a simple, permissive non-copyleft free software license,
@@ -189,7 +180,6 @@
-<dt><a id="StandardMLofNJ"
- href="http://cm.bell-labs.com/cm/cs/what/smlnj/license.html";>Standard
- ML of New Jersey Copyright License</a>.</dt>
+<dt><a id="StandardMLofNJ"
href="http://cm.bell-labs.com/cm/cs/what/smlnj/license.html";>
+Standard ML of New Jersey Copyright License</a></dt>
<dd>
This is a simple, permissive non-copyleft free software license,
@@ -198,5 +188,5 @@
-<dt><a id="PublicDomain">Public Domain</a>.</dt>
+<dt><a id="PublicDomain"><u>Public Domain</u></a></dt>
<dd>
Being in the public domain is not a license--rather, it means the
@@ -208,6 +198,6 @@
-<dt><a id="CryptixGeneralLicense"
href="http://www.cryptix.org/docs/license.html";>The Cryptix
- General License</a>.</dt>
+<dt><a id="CryptixGeneralLicense"
href="http://www.cryptix.org/docs/license.html";>
+Cryptix General License</a></dt>
<dd>
This is a simple, permissive non-copyleft free software license,
@@ -216,6 +206,6 @@
-<dt><a id="ModifiedBSD"
href="http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5";>The modified
- BSD license</a>.</dt>
+<dt><a id="ModifiedBSD" href="http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5";>
+Modified BSD license</a></dt>
<dd>
(Note: on the preceding link, the modified BSD license is
@@ -236,6 +226,6 @@
-<dt><a href="http://www.gzip.org/zlib/zlib_license.html";>The
- license of ZLib</a>.</dt>
+<dt><a href="http://www.gzip.org/zlib/zlib_license.html";>
+License of ZLib</a></dt>
<dd>
This is a free software license, and compatible with the GPL.
@@ -243,5 +233,5 @@
-<dt>The license of the iMatix Standard Function Library.</dt>
+<dt><u>License of the iMatix Standard Function Library</u></dt>
<dd>
This is a free software license and is GPL compatible.
@@ -249,6 +239,6 @@
-<dt><a
href="http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231";>The
W3C Software Notice and License</a>.</dt>
-
+<dt><a
href="http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231";>
+W3C Software Notice and License</a></dt>
<dd>
This is a free software license and is GPL compatible.
@@ -256,6 +246,6 @@
-<dt><a href="http://www.sleepycat.com/download/oslicense.html";>The Berkeley
Database
- License</a> (aka the Sleepycat Software Product License).</dt>
+<dt><a href="http://www.sleepycat.com/download/oslicense.html";>Berkeley
Database
+License</a> (aka the Sleepycat Software Product License)</dt>
<dd>
This is a free software license and is compatible with the GNU GPL.
@@ -263,6 +253,6 @@
-<dt><a href="http://www.openldap.org/software/release/license.html";
- id="newOpenLDAP"> The OpenLDAP License, Version 2.7</a>.</dt>
+<dt><a href="http://www.openldap.org/software/release/license.html";
id="newOpenLDAP">
+OpenLDAP License, Version 2.7</a></dt>
<dd>
This is a permissive non-copyleft free software license that is
@@ -271,6 +261,6 @@
-<dt><a href="http://www.python.org/doc/Copyright.html";>The License of
- Python 1.6a2 and earlier versions</a>.</dt>
+<dt><a href="http://www.python.org/doc/Copyright.html";>
+License of Python 1.6a2 and earlier versions</a></dt>
<dd>
This is a free software license and is compatible with the GNU
@@ -280,6 +270,6 @@
-<dt><a href="http://www.python.org/2.0.1/license.html";>The License of
- Python 2.0.1, 2.1.1, and newer versions</a>.</dt>
+<dt><a href="http://www.python.org/2.0.1/license.html";>
+License of Python 2.0.1, 2.1.1, and newer versions</a></dt>
<dd>
This is a free software license and is compatible with the GNU GPL.
@@ -290,5 +280,5 @@
-<dt><a id="PerlLicense">The license of Perl</a>.</dt>
+<dt><a id="PerlLicense"><u>License of Perl</u></a></dt>
<dd>
This license is the disjunction of the
@@ -307,6 +297,6 @@
-<dt><a
href="http://www.statistica.unimib.it/utenti/dellavedova/software/artistic2.html";>The
- Clarified Artistic License</a>.</dt>
+<dt><a
href="http://www.statistica.unimib.it/utenti/dellavedova/software/artistic2.html";>
+Clarified Artistic License</a></dt>
<dd>
This license is a free software license, compatible with the GPL. It
@@ -316,5 +306,5 @@
-<dt><a href="http://dev.perl.org/rfc/346.html";>The Artistic License
2.0</a></dt>
+<dt><a href="http://dev.perl.org/rfc/346.html";>Artistic License 2.0</a></dt>
<dd>
This license is a free software license, compatible with the GPL. It
@@ -329,5 +319,6 @@
-<dt><a href="http://www.zope.org/Resources/ZPL";>The Zope Public License
version 2.0</a>.</dt>
+<dt><a href="http://www.zope.org/Resources/ZPL";>
+Zope Public License version 2.0</a></dt>
<dd>
This is a simple, permissive non-copyleft free software license
@@ -336,6 +327,6 @@
-<dt><a
href="http://www.opensource.org/licenses/intel-open-source-license.html";>The
- Intel Open Source License (as published by OSI)</a></dt>
+<dt><a
href="http://www.opensource.org/licenses/intel-open-source-license.html";>
+Intel Open Source License (as published by OSI)</a></dt>
<dd>
This is a Free Software license, compatible with the GNU GPL.
@@ -343,5 +334,5 @@
-<dt>The license of Netscape Javascript.</dt>
+<dt><u>License of Netscape Javascript</u></dt>
<dd>
This is the disjunction of the <a href="#NPL">Netscape Public
@@ -359,5 +350,5 @@
</dd>
-<dt><a href="http://www.gnu.org/licenses/ecos-license.html";>The eCos license
version 2.0</a></dt>
+<dt><a href="http://www.gnu.org/licenses/ecos-license.html";>eCos license
version 2.0</a></dt>
<dd>
The eCos license version 2.0 is a GPL-compatible Free Software license.
@@ -369,6 +360,6 @@
-<dt><a href="/licenses/eiffel-forum-license-2.html">The Eiffel Forum License,
- version 2</a></dt>
+<dt><a href="/licenses/eiffel-forum-license-2.html">
+Eiffel Forum License, version 2</a></dt>
<dd>
This is a Free Software license, compatible with the GNU GPL.
@@ -378,8 +369,8 @@
<p></p></dd>
-<dt><a href="http://www.vim.org/htmldoc/uganda.html";>The license of
<code>Vim</code>, Version 6.1 or later</a></dt>
+<dt><a href="http://www.vim.org/htmldoc/uganda.html";>
+License of Vim, Version 6.1 or later</a></dt>
<dd>
-This is a free
-software license, partially copyleft but not really. It is compatible
+This is a free software license, partially copyleft but not really. It is
compatible
with the GPL, by an explicit conversion clause.
<p></p></dd>
@@ -390,6 +381,6 @@
<hr />
-<h3><a id="GPLIncompatibleLicenses"
- href="#TOCGPLIncompatibleLicenses">GPL-Incompatible, Free Software
Licenses</a></h3>
+<h3><a id="GPLIncompatibleLicenses" href="#TOCGPLIncompatibleLicenses">
+GPL-Incompatible, Free Software Licenses</a></h3>
<p>
@@ -400,7 +391,15 @@
<dl>
+<dt><a id="XFree861.1License"><u>XFree86 1.1 License</u></a></dt>
+<dd>This is a simple, permissive non-copyleft free software license,
+incompatible with the GNU GPL because of its requirements that
+apply to all documentation in the distribution that contain
+acknowledgements.
+<p>There are currently several variants of XFree86, and only
+some of them use this license. Some continue to use the X11 license.</p>
+</dd>
-<dt><a href="http://www.affero.org/oagpl.html";>The Affero General
-Public License</a></dt>
+<dt><a href="http://www.affero.org/oagpl.html";>
+Affero General Public License</a></dt>
<dd>
The Affero General Public License is a free software license,
@@ -416,5 +415,6 @@
-<dt><a
href="http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE";>The Arphic
Public License</a>.</dt>
+<dt><a href="http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE";>
+Arphic Public License</a></dt>
<dd>
This is a copyleft free software license, incompatible with the
@@ -424,6 +424,6 @@
-<dt><a id="OriginalBSD"
href="http://www.xfree86.org/3.3.6/COPYRIGHT2.html#6";>The original
- BSD license</a>.</dt>
+<dt><a id="OriginalBSD" href="http://www.xfree86.org/3.3.6/COPYRIGHT2.html#6";>
+Original BSD license</a></dt>
<dd>
(Note: on the preceding link, the original BSD license is
@@ -445,6 +445,6 @@
-<dt><a id="OpenSSL" href="http://www.sdisw.com/openssl.htm";>The
- OpenSSL license</a>.</dt>
+<dt><a id="OpenSSL" href="http://www.sdisw.com/openssl.htm";>
+OpenSSL license</a></dt>
<dd>
The license of OpenSSL is a conjunction of two licenses, One of
@@ -460,6 +460,6 @@
-<dt><a href="http://opensource.org/licenses/academic.php";> The
- Academic Free License, version 1.1</a>.</dt>
+<dt><a href="http://opensource.org/licenses/academic.php";>
+Academic Free License, version 1.1</a>.</dt>
<dd>
The Academic Free License, version 1.1, is a free software
@@ -485,6 +485,6 @@
-<dt><a href="http://www.rosenlaw.com/osl.html";> The
- Open Software License, version 1.0</a>.</dt>
+<dt><a href="http://www.rosenlaw.com/osl.html";>
+Open Software License, version 1.0</a></dt>
<dd>
The Open Software License, version 1.0, is a free software
@@ -499,6 +499,6 @@
-<dt><a href="http://www.apache.org/LICENSE-1.0";>The Apache License,
- Version 1.0</a>.</dt>
+<dt><a href="http://www.apache.org/LICENSE-1.0";>
+Apache License, Version 1.0</a></dt>
<dd>
This is a simple, permissive non-copyleft free software license with <a
@@ -508,6 +508,6 @@
-<dt><a href="http://www.apache.org/LICENSE-1.1";>The Apache License,
- Version 1.1</a>.</dt>
+<dt><a href="http://www.apache.org/LICENSE-1.1";>
+Apache License, Version 1.1</a></dt>
<dd>
This is a permissive non-copyleft free software license with a few
@@ -520,6 +520,6 @@
-<dt><a href="http://www.apache.org/licenses/LICENSE-2.0";>The Apache
- Software License, version 2.0</a></dt>
+<dt><a href="http://www.apache.org/licenses/LICENSE-2.0";>
+Apache Software License, version 2.0</a></dt>
<dd>
This is a free software license but it is incompatible with the
@@ -532,5 +532,6 @@
-<dt><a href="http://www.zope.org/Resources/ZPL";>The Zope Public License
version 1</a>.</dt>
+<dt><a href="http://www.zope.org/Resources/ZPL";>
+Zope Public License version 1</a></dt>
<dd>
This is a simple, fairly permissive non-copyleft free software license
@@ -547,6 +548,5 @@
-<dt><a id="xinetd" href="http://www.xinetd.org/license";>The
- license of <code>xinetd</code></a></dt>
+<dt><a id="xinetd" href="http://www.xinetd.org/license";>License of
xinetd</a></dt>
<dd>
This is a copyleft free software license, incompatible with the GPL.
@@ -557,7 +557,6 @@
-<dt><a id="PythonOld"
- href="http://www.handle.net/python_licenses/python1.6_9-5-00.html";>The
- License of Python 1.6b1 and later versions, through 2.0 and
2.1</a>.</dt>
+<dt><a id="PythonOld"
href="http://www.handle.net/python_licenses/python1.6_9-5-00.html";>
+License of Python 1.6b1 and later versions, through 2.0 and 2.1</a></dt>
<dd>
This is a free software license but is incompatible with the GNU GPL.
@@ -568,5 +567,5 @@
-<dt>The old OpenLDAP License, Version 2.3.</dt>
+<dt><u>Old OpenLDAP License, Version 2.3</u></dt>
<dd>
This is a permissive non-copyleft free software license with a few
@@ -582,6 +581,6 @@
-<dt><a
href="http://oss.software.ibm.com/developerworks/opensource/license10.html";>IBM
- Public License, Version 1.0</a></dt>
+<dt><a
href="http://oss.software.ibm.com/developerworks/opensource/license10.html";>
+IBM Public License, Version 1.0</a></dt>
<dd>
This is a free software license but it is incompatible with the <a
@@ -600,6 +599,6 @@
<dt><a href="http://www.eclipse.org/legal/cpl-v10.html";>Common Public License
Version 1.0</a></dt>
<dd>
-This is a free software license but it is incompatible with the <a
-href="/copyleft/gpl.html">GPL</a>.
+This is a free software license but it is incompatible with the
+<a href="/copyleft/gpl.html">GPL</a>.
<p>
The Common Public License is incompatible with the GPL because it has
@@ -612,5 +611,6 @@
-<dt><a href="http://phorum.org/license.txt";>The Phorum License, Version
2.0</a></dt>
+<dt><a href="http://phorum.org/license.txt";>
+Phorum License, Version 2.0</a></dt>
<dd>
This is a free software license but it is incompatible with the <a
@@ -620,5 +620,5 @@
-<dt>The LaTeX Project Public License.</dt>
+<dt><u>LaTeX Project Public License</u></dt>
<dd>
This license is an incomplete statement of the distribution terms for
@@ -655,6 +655,6 @@
-<dt><a id="MPL" href="http://www.mozilla.org/MPL/MPL-1.1.html";>The Mozilla
- Public License (MPL)</a>.</dt>
+<dt><a id="MPL" href="http://www.mozilla.org/MPL/MPL-1.1.html";>
+Mozilla Public License (MPL)</a></dt>
<dd>
This is a free software license which is not a strong copyleft; unlike
@@ -673,6 +673,6 @@
-<dt><a href="http://bits.netizen.com.au/licenses/NOSL/nosl.txt";>The Netizen
- Open Source License (NOSL), Version 1.0</a>.</dt>
+<dt><a href="http://bits.netizen.com.au/licenses/NOSL/nosl.txt";>
+Netizen Open Source License (NOSL), Version 1.0</a></dt>
<dd>
This is a free software license that is essentially the same as the
@@ -684,5 +684,6 @@
-<dt><a
href="http://www.borland.com/devsupport/interbase/opensource/IPL.html";>The
Interbase Public License, Version 1.0</a>.</dt>
+<dt><a href="http://www.borland.com/devsupport/interbase/opensource/IPL.html";>
+Interbase Public License, Version 1.0</a></dt>
<dd>
This is a free software license that is essentially the same as
@@ -695,6 +696,6 @@
-<dt><a href="http://www.netbeans.org/spl.html";>The Sun Public
- License</a>.</dt>
+<dt><a href="http://www.netbeans.org/spl.html";>
+Sun Public License</a></dt>
<dd>
This is essentially the same as the Mozilla Public License: a free
@@ -705,5 +706,5 @@
-<dt>The Nokia Open Source License.</dt>
+<dt><u>Nokia Open Source License</u></dt>
<dd>
This is similar to the Mozilla Public License: a free
@@ -712,6 +713,6 @@
-<dt><a id="NPL" href="http://www.mozilla.org/NPL/NPL-1.0.html";>The
- Netscape Public License (NPL)</a></dt>
+<dt><a id="NPL" href="http://www.mozilla.org/NPL/NPL-1.0.html";>
+Netscape Public License (NPL)</a></dt>
<dd>
This is a free software license, not a strong copyleft, and incompatible
@@ -724,5 +725,5 @@
-<dt>The Jabber Open Source License, Version 1.0</dt>
+<dt><u>Jabber Open Source License, Version 1.0</u></dt>
<dd>
The license is a free software license, incompatible with the GPL.
@@ -734,5 +735,6 @@
-<dt><a href="http://www.openoffice.org/licenses/sissl_license.html";>The Sun
Industry Standards Source License 1.0</a></dt>
+<dt><a href="http://www.openoffice.org/licenses/sissl_license.html";>
+Sun Industry Standards Source License 1.0</a></dt>
<dd>
This is a free software license, not a strong copyleft, which is
@@ -742,6 +744,6 @@
-<dt><a href="http://www.trolltech.com/developer/licensing/qpl.html";>The
- Q Public License (QPL), Version 1.0</a>.</dt>
+<dt><a href="http://www.trolltech.com/developer/licensing/qpl.html";>
+Q Public License (QPL), Version 1.0</a></dt>
<dd>
This is a non-copyleft free software license which is incompatible with
@@ -774,6 +776,7 @@
</dd>
-<dt><a href="http://www.php.net/license/3_0.txt";>The PHP License, Version
-3.0</a>.</dt>
+
+<dt><a href="http://www.php.net/license/3_0.txt";>
+PHP License, Version 3.0</a></dt>
<dd>This license is used by most of PHP4. It is a non-copyleft free software
@@ -784,5 +787,6 @@
</dd>
-<dt>The Zend License, Version 2.0.</dt>
+
+<dt><u>Zend License, Version 2.0</u></dt>
<dd>
This license is used by one part of PHP4. It is a non-copyleft
@@ -795,6 +799,6 @@
-<dt>The <a href="http://www.vitanuova.com/inferno/liblicence.txt";>
- Vita Nuova Liberal Source License</a></dt>
+<dt><a href="http://www.vitanuova.com/inferno/liblicence.txt";>
+Vita Nuova Liberal Source License</a></dt>
<dd>
This is a copyleft free software license, incompatible with the GNU GPL.
@@ -803,5 +807,6 @@
<p></p></dd>
-<dt>The <a href="http://plan9.bell-labs.com/plan9dist/license.html";>
+
+<dt><a href="http://plan9.bell-labs.com/plan9dist/license.html";>
Plan 9 License as of June 2003</a></dt>
<dd>
@@ -812,5 +817,6 @@
-<dt><a id="apsl2" href="http://www.opensource.apple.com/apsl/2.0.txt/";>The
Apple Public Source License (APSL), version 2</a>.</dt>
+<dt><a id="apsl2" href="http://www.opensource.apple.com/apsl/2.0.txt/";>
+Apple Public Source License (APSL), version 2</a></dt>
<dd>
This is a free software license, incompatible with the GNU GPL.
@@ -827,6 +833,6 @@
<hr />
-<h3><a id="NonFreeSoftwareLicense"
- href="#TOCNonFreeSoftwareLicenses">Non-Free Software Licenses</a></h3>
+<h3><a id="NonFreeSoftwareLicense" href="#TOCNonFreeSoftwareLicenses">
+Non-Free Software Licenses</a></h3>
<p>
@@ -857,7 +863,6 @@
-<dt><a id="ArtisticLicense"
- href="http://www.perl.com/language/misc/Artistic.html";>The (Original)
Artistic
- License</a>.</dt>
+<dt><a id="ArtisticLicense"
href="http://www.perl.com/language/misc/Artistic.html";>
+(Original) Artistic License</a></dt>
<dd>
We cannot say that this is a free software license because it is too
@@ -868,5 +873,5 @@
The problems are matters of wording, not substance. There is a
revised version of the Artistic License (dubbed
-"<a href="http://dev.perl.org/rfc/346.html";>The Artistic License 2.0</a>")
+"<a href="http://dev.perl.org/rfc/346.html";>Artistic License 2.0</a>")
which is a free software license, and even compatible with the GNU
GPL. This license is being considered for use in Perl 6. If you are
@@ -877,5 +882,6 @@
-<dt><a href="http://www.opensource.apple.com/apsl/1.2.txt";>The Apple Public
Source License (APSL), version 1.x</a>.</dt>
+<dt><a href="http://www.opensource.apple.com/apsl/1.2.txt";>
+Apple Public Source License (APSL), version 1.x</a></dt>
<dd>
Versions 1.0, 1.1 and 1.2 are
@@ -887,5 +893,6 @@
-<dt><a href="http://oss.sgi.com/projects/FreeB/";>The SGI Free Software License
B, version 1.1</a></dt>
+<dt><a href="http://oss.sgi.com/projects/FreeB/";>
+SGI Free Software License B, version 1.1</a></dt>
<dd>
The SGI Free Software License B is not a Free Software License,
@@ -902,6 +909,6 @@
-<dt><a id="SunCommunitySourceLicense">The Sun Community Source
- License</a>.</dt>
+<dt><a id="SunCommunitySourceLicense">
+<u>Sun Community Source License</u></a></dt>
<dd>
This is not a free software license; it lacks essential freedoms such as
@@ -911,6 +918,5 @@
-<dt>The Old Plan 9 License</dt>
-
+<dt><u>Old Plan 9 License</u></dt>
<dd>This is not a free software license; it lacks essential freedoms
such as the right to make and use private changes. Of course you
@@ -927,6 +933,6 @@
-<dt><a href="http://koala.ilog.fr/jackaroo/OPL_1_0.TXT";>Open
- Public License</a></dt>
+<dt><a href="http://koala.ilog.fr/jackaroo/OPL_1_0.TXT";>
+Open Public License</a></dt>
<dd>
<p>
@@ -945,5 +951,6 @@
-<dt>The <a href="http://www.cs.utah.edu/~gk/teem/txt/LICENSE.txt";>University
of Utah Public License</a></dt>
+<dt><a href="http://www.cs.utah.edu/~gk/teem/txt/LICENSE.txt";>
+University of Utah Public License</a></dt>
<dd>
The University of Utah Public License is a non-free license
@@ -969,5 +976,5 @@
-<dt>eCos Public License, version 1.1</dt>
+<dt><u>eCos Public License, version 1.1</u></dt>
<dd>
This was the old license of eCos. It is not a free software
@@ -982,5 +989,5 @@
-<dt>The Sun Solaris Source Code (Foundation Release) License, Version 1.1</dt>
+<dt><u>Sun Solaris Source Code (Foundation Release) License, Version
1.1</u></dt>
<dd>
This is not a free software license. The license prohibits
@@ -990,5 +997,5 @@
-<dt>The YaST License</dt>
+<dt><u>YaST License</u></dt>
<dd>
This is not a free software license. The license prohibits
@@ -1003,5 +1010,5 @@
-<dt>Daniel Bernstein's licenses</dt>
+<dt><u>Daniel Bernstein's licenses</u></dt>
<dd>
These licenses are not free software licenses because they
@@ -1010,5 +1017,5 @@
-<dt>The "Aladdin Free Public License"</dt>
+<dt><u>Aladdin Free Public License</u></dt>
<dd>
Despite its name, this is not a free software license because it
@@ -1019,5 +1026,5 @@
-<dt>The Scilab license</dt>
+<dt><u>Scilab license</u></dt>
<dd>
This is not a free software license because it does not
@@ -1026,20 +1033,20 @@
-<dt>The AT&T Public License</dt>
+<dt><u>AT&T Public License</u></dt>
<dd>
The AT&T Public License is a non-free license. It has several
serious problems:
<ol>
- <li>The patent license is voided by any modification, no matter how
+<li>The patent license is voided by any modification, no matter how
small, of the pertinent code.</li>
- <li>You must demand a written agreement when you distribute the
+<li>You must demand a written agreement when you distribute the
sources or patches.</li>
- <li>It requires notifying AT&T if you distribute a patch.</li>
- <li>Your license can be terminated through no fault of yours, under
+<li>It requires notifying AT&T if you distribute a patch.</li>
+<li>Your license can be terminated through no fault of yours, under
section 8/3.</li>
- <li>It makes compliance with export control laws a condition
+<li>It makes compliance with export control laws a condition
of the license.</li>
- <li>Some versions of the license require you to provide support.</li>
- <li>Some versions of the license say you cannot sell a copy of the
+<li>Some versions of the license require you to provide support.</li>
+<li>Some versions of the license say you cannot sell a copy of the
software for more than the expense of distribution.</li>
</ol>
@@ -1047,7 +1054,7 @@
The license has two other obnoxious features:</p>
<ol>
- <li>It has a very broad reverse license to AT&T, which goes far
beyond
+<li>It has a very broad reverse license to AT&T, which goes far beyond
the use of your code, even your code modified.</li>
- <li>It asserts one needs a license from AT&T to make a link to their
+<li>It asserts one needs a license from AT&T to make a link to their
web site. This is not an immediate practical problem, since the
license says it gives permission to make such a link. (Anyway, people
@@ -1058,5 +1065,5 @@
-<dt><a href="http://www.jahia.org/jahia/Jahia/pid/145";>The Jahia Community
Source License</a></dt>
+<dt><a href="http://www.jahia.org/jahia/Jahia/pid/145";>Jahia Community Source
License</a></dt>
<dd>
The Jahia Community Source License is not a free software license. Use
@@ -1065,5 +1072,5 @@
-<dt>The license of ksh93</dt>
+<dt>License of ksh93</dt>
<dd>
The license of ksh93 is not a free software license. One reason for
@@ -1075,5 +1082,5 @@
-<dt>The license of Qmail</dt>
+<dt>License of Qmail</dt>
<dd>
The license of Qmail is not a free software license because it mostly
@@ -1082,5 +1089,6 @@
-<dt><a
href="http://msdn.microsoft.com/msdn-files/027/001/901/ShSourceCLIbetaLicense.htm";>Microsoft's
Shared Source License</a></dt>
+<dt><a
href="http://msdn.microsoft.com/msdn-files/027/001/901/ShSourceCLIbetaLicense.htm";>
+Microsoft's Shared Source License</a></dt>
<dd>
This license does not permit commercial distribution, and only allows
commercial use under certain circumstances.
@@ -1088,6 +1096,6 @@
-<dt>The <a href="http://www.hacktivismo.com/hessla.html";> Hacktivismo
- Enhanced-Source Software License Agreement</a> (HESSLA).</dt>
+<dt><a href="http://www.hacktivismo.com/hessla.html";>
+Hacktivismo Enhanced-Source Software License Agreement</a> (HESSLA)</dt>
<dd>
This is not a free software license, because it <a
@@ -1098,5 +1106,5 @@
-<dt>The <a href="http://squeak.org/license.html";>Squeek license</a>.</dt>
+<dt><a href="http://squeak.org/license.html";>Squeek license</a></dt>
<dd>
As applied to software, this is not a free software license because
@@ -1125,6 +1133,5 @@
id="TOC2FreeDocumentationLicenses">Free Documentation Licenses</a></li>
<li><a href="#NonFreeDocumentationLicenses"
- id="TOC2NonFreeDocumentationLicenses">Non-Free Documentation
-Licenses</a></li>
+ id="TOC2NonFreeDocumentationLicenses">Non-Free Documentation
Licenses</a></li>
<!-- PLEASE UPDATE THE almost IDENTICAL 2nd Level Table of Contents ABOVE TOO!
-->
<!-- But change here the -->
@@ -1146,5 +1153,5 @@
<dl>
-<dt>The <a href="/copyleft/fdl.html">GNU Free Documentation License</a>.</dt>
+<dt><a href="/copyleft/fdl.html">GNU Free Documentation License</a></dt>
<dd>
This is a license intended for use on copylefted free
@@ -1156,6 +1163,6 @@
-<dt>The <a
href="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ln16.html";>
- FreeBSD Documentation License</a></dt>
+<dt><a
href="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ln16.html";>
+FreeBSD Documentation License</a></dt>
<dd>
This is a permissive non-copyleft Free Documentation license that is
@@ -1164,5 +1171,5 @@
-<dt>The <a href="http://www.opensource.apple.com/cdl/";>
+<dt><a href="http://www.opensource.apple.com/cdl/";>
Apple's Common Documentation License, Version 1.0</a></dt>
<dd>
@@ -1174,7 +1181,6 @@
-<dt><a id="RealOPL"
- href="http://opencontent.org/openpub/";>Open Publication License,
- Version 1.0</a>.</dt>
+<dt><a id="RealOPL" href="http://opencontent.org/openpub/";>
+Open Publication License, Version 1.0</a></dt>
<dd>
This license <strong>can</strong> be used as a free documentation
@@ -1215,6 +1221,5 @@
<h3><a id="NonFreeDocumentationLicenses"
-href="#TOCNonFreeDocumentationLicenses">Non-Free Documentation
-Licenses</a></h3>
+href="#TOCNonFreeDocumentationLicenses">Non-Free Documentation
Licenses</a></h3>
<p><strong>The following licenses <em>do not qualify</em>
@@ -1224,7 +1229,6 @@
-<dt><a id="OCL">The</a>
- <a href="http://opencontent.org/opl.shtml";>Open
- Content License, Version 1.0</a>.</dt>
+<dt><a id="OCL" href="http://opencontent.org/opl.shtml";>
+Open Content License, Version 1.0</a></dt>
<dd>
This license does not qualify as free, because there are restrictions on
@@ -1239,6 +1243,5 @@
-<dt>The <a href="http://dmoz.org/license.html";>Open Directory License (aka
- The dmoz.org License)</a>.</dt>
+<dt><a href="http://dmoz.org/license.html";>Open Directory License (aka
dmoz.org License)</a></dt>
<dd>
This is not a free documentation license. The primary problems are that
@@ -1259,5 +1262,5 @@
<dl>
-<dt>The <a href="/licenses/gpl.html">GNU General Public License</a>.</dt>
+<dt><a href="/licenses/gpl.html">GNU General Public License</a></dt>
<dd>
The GNU GPL <strong>can</strong> be used for general data which is not
@@ -1269,5 +1272,5 @@
-<dt>The <a href="/copyleft/fdl.html">GNU Free Documentation License</a>.</dt>
+<dt><a href="/copyleft/fdl.html">GNU Free Documentation License</a></dt>
<dd>
The GNU FDL is recommended for textbooks and teaching
@@ -1279,5 +1282,5 @@
-<dt><a href="/licenses/dsl.html">The Design Science License</a></dt>
+<dt><a href="/licenses/dsl.html">Design Science License</a></dt>
<dd>
This is a free and copyleft license meant for general data.
@@ -1288,5 +1291,5 @@
-<dt><a href="http://artlibre.org/licence/lalgb.html";>The Free Art
License</a></dt>
+<dt><a href="http://artlibre.org/licence/lalgb.html";>Free Art License</a></dt>
<dd>
This is a free and copyleft license meant for artistic works. It
@@ -1375,5 +1378,5 @@
Updated:
<!-- timestamp start -->
-$Date: 2004/06/03 14:20:53 $ $Author: rms $
+$Date: 2004/06/09 20:52:24 $ $Author: corey $
<!-- timestamp end -->
</p>
--- prev/www/philosophy/basic-freedoms.pl.html Fri Apr 30 05:28:45 2004
+++ curr/www/philosophy/basic-freedoms.pl.html Thu Jun 10 05:33:06 2004
@@ -2,5 +2,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="pl" lang="pl">
<head>
@@ -14,5 +14,5 @@
</head>
-<body xml:lang="pl" lang="pl">
+<body>
<p><a href="#translations">T³umaczenia</a> tej strony</p>
@@ -30,7 +30,10 @@
Fundacja Wolnego Oprogramowania popiera wolno¶æ s³owa, prasy
i stowarzyszania siê w Internecie. Prosimy o zapoznanie siê:</p>
<ul>
- <li>W najbli¿szym czasie S±d Najwy¿szy Stanów Zjednoczonych wyda
orzeczenie w sprawie zarzutów prawnych wobec „Prawa o normach
przyzwoito¶ci w telekomunikacji” (Communications Decency Act, CDA).
Odwied¼cie <a href="http://www.ciec.org/";>Citizens Internet Empowerment
Coalition</a>, gdzie znajdziecie naj¶wie¿sze informacje w tej
sprawie.<p></p></li>
+ <li><a href="http://www.ciec.org/";>Citizens Internet Empowerment
Coalition</a> powsta³a, ¿eby przeciwstawiæ siê pierwszej podjêtej przez Kongres
Stanów Zjednoczonych próbie regulacji prawnej tre¶ci umieszczanych
w Internecie – „Ustawy o normach przyzwoito¶ci
w telekomunikacji” (Communications Decency Act, CDA), któr± S±d
Najwy¿szy USA uzna³ 26 czerwca 1997 roku za niekonstytucyjn±. Witrynê
Koalicji Obywatelskiej zachowano jako ¼ród³o materia³ów na temat prze³omu, jaki
stanowi³ przypadek CDA.
+<p></p></li>
+<!-- removing this link.. site is dead as of June 07 2004
<li><a href="http://www.vtw.org/";>Voters Telecommunications Watch</a>
i ich doskona³a elektroniczna pocztowa lista og³oszeniowa.<p></p></li>
+-->
<li>Artyku³ <a href="/philosophy/censoring-emacs.pl.html">Cenzurowanie
GNU Emacsa</a> opisuje, jak przepisy CDA zmusi³y projekt GNU do ocenzurowania
GNU Emacsa, i jak, paradoksalnie, wywar³o to przeciwny do zamierzonego
przez cenzorów skutek.<p></p></li>
@@ -40,5 +43,7 @@
<li>Kampania „Niebieska wst±¿ka” (<a
href="http://www.eff.org/blueribbon.html";>Blue Ribbon Campaign</a>) na rzecz
wolno¶ci s³owa, druku i zrzeszania siê w Sieci.<p></p></li>
+<!-- removing this link.. site is dead as of June 07 2004
<li>Mo¿ecie przeczytaæ <a
href="http://www.vtw.org/speech/index.html#decision";>decyzjê s±du apelacyjnego
USA z czerwca 1996</a> odrzucaj±c± cenzurowanie Internetu. Pamiêtajcie
jednak, ¿e ta decyzja <em>nie</em> jest ostateczna! Najpierw, S±d Najwy¿szy
mo¿e siê z ni± zgodziæ lub nie; pó¼niej Kongres dostanie szansê
rozgl±dniêcia siê za inn± metod± cenzury.<p></p></li>
+-->
<!-- savetheweb.org is a dead link -->
@@ -89,5 +94,6 @@
</p>
<p>
-Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.,
+Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111, USA
<br />
@@ -108,5 +114,5 @@
Aktualizowane:
<!-- timestamp start -->
-$Date: 2004/04/29 10:16:40 $ $Author: wkotwica $
+$Date: 2004/06/09 10:02:15 $ $Author: wkotwica $
<!-- timestamp end -->
</p>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnu-pl] wwwgnudiff - raport nr 316,
Wojciech Kotwica <=