trans-coord-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

trans-coord/gnun licenses/license-list.html phi...


From: Yavor Doganov
Subject: trans-coord/gnun licenses/license-list.html phi...
Date: Sat, 21 Apr 2012 18:10:20 +0000

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   12/04/21 18:10:19

Modified files:
        gnun/licenses  : license-list.html 
        gnun/philosophy: words-to-avoid.html 
        gnun/server    : banner.ja.html 

Log message:
        Automatic sync from the master www repository.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/license-list.html?cvsroot=trans-coord&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/words-to-avoid.html?cvsroot=trans-coord&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/banner.ja.html?cvsroot=trans-coord&r1=1.2&r2=1.3

Patches:
Index: licenses/license-list.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/license-list.html,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- licenses/license-list.html  1 Mar 2012 19:10:23 -0000       1.76
+++ licenses/license-list.html  21 Apr 2012 18:10:19 -0000      1.77
@@ -18,7 +18,7 @@
       GPL-Compatible Free Software Licenses</a></li>
   <li><a href="#GPLIncompatibleLicenses">
       GPL-Incompatible Free Software Licenses</a></li>
-  <li><a href="#NonFreeSoftwareLicenses">Non-Free Software Licenses</a></li>
+  <li><a href="#NonFreeSoftwareLicenses">Nonfree Software Licenses</a></li>
   </ul>
 </li>
 
@@ -26,7 +26,7 @@
   <ul>
   <li><a href="#FreeDocumentationLicenses">Free Documentation Licenses</a></li>
   <li><a href="#NonFreeDocumentationLicenses">
-      Non-Free Documentation Licenses</a></li>
+      Nonfree Documentation Licenses</a></li>
   </ul>
 </li>
 
@@ -157,7 +157,7 @@
       (<a href="#LGPL">#LGPLv3</a>)</span></dt>
 <dd>
 <p>This is the latest version of the LGPL: a free software license, but not
-a strong copyleft license, because it permits linking with non-free
+a strong copyleft license, because it permits linking with nonfree
 modules.  It is compatible with GPLv3.  We recommend it for <a
 href="/licenses/why-not-lgpl.html">special circumstances
 only</a>.</p>
@@ -178,7 +178,7 @@
 <dd>
 <p>This is the previous version of the LGPL: a free software license,
 but not a strong copyleft license, because it permits linking with
-non-free modules.  It is compatible with GPLv2 and GPLv3.  We
+nonfree modules.  It is compatible with GPLv2 and GPLv3.  We
 generally recommend <a href="#LGPL">the latest version of the
 LGPL</a>, <a href="/licenses/why-not-lgpl.html">for special
 circumstances only</a>.  To learn more about how LGPLv2.1 is
@@ -329,10 +329,10 @@
 GNU GPL.</p>
 
 <p>The text of the CeCILL uses a couple of biased terms that ought to be
-avoided: &ldquo;intellectual property&rdquo; (see <a
-href="/philosophy/not-ipr.xhtml">this article</a>) and
-&ldquo;protection&rdquo; (see <a
-href="/philosophy/words-to-avoid.html">this article</a>); this decision
+avoided: <a
+href="/philosophy/not-ipr.html">&ldquo;intellectual property&rdquo;</a>
+and <a href="/philosophy/words-to-avoid.html#Protection">
+&ldquo;protection&rdquo;</a>; this decision
 was unfortunate, because reading the license tends to spread the
 presuppositions of those terms.  However, this does not cause any
 particular problem for the programs released under the CeCILL.</p>
@@ -949,7 +949,7 @@
 
 <p>This is a simple, permissive non-copyleft free software license with
 a serious flaw: the &ldquo;obnoxious BSD advertising clause&rdquo;.  The
-flaw is not fatal; that is, it does not render the software non-free.
+flaw is not fatal; that is, it does not render the software nonfree.
 But it does cause <a
 href="/philosophy/bsd.html">practical problems</a>,
 including incompatibility with the GNU GPL.</p>
@@ -1006,7 +1006,7 @@
        (<a href="#Condor">#Condor</a>)</span></dt>
 <dd>
 <p>Recent versions of Condor (from 6.9.5 on) are released under the <a
-href="#Apache2">Apache License 2.0</a>.  Only older versions of Condor
+href="#apache2">Apache License 2.0</a>.  Only older versions of Condor
 use this license.</p>
 
 <p>The Condor Public License is a free software license.  It has a
@@ -1110,7 +1110,7 @@
 bar when file foo is requested&rdquo;.  With this facility, the
 requirement is merely annoying; without the facility, the same
 requirement would be a serious obstacle, and we would have to conclude
-it makes the program non-free.</p>
+it makes the program nonfree.</p>
 
 <p>This condition may cause trouble with some major modifications.
 For example, if you wanted to port an LPPL-covered work to another
@@ -1122,7 +1122,7 @@
 the original context.</p>
 
 <p>The LPPL says that some files, in certain versions of LaTeX, may have
-additional restrictions, which could render them non-free.  For this
+additional restrictions, which could render them nonfree.  For this
 reason, it may take some careful checking to produce a version of
 LaTeX that is free software.</p>
 
@@ -1272,8 +1272,9 @@
 <p>The license of OpenSSL is a conjunction of two licenses, one of them
 being the license of SSLeay.  You must follow both.  The combination
 results in a copyleft free software license that is incompatible with
-the GNU GPL.  It also has an advertising clause like the original BSD
-license and the Apache license.</p>
+the GNU GPL.  It also has an advertising clause like the <a
+href="#OriginalBSD">original BSD license</a> and the <a
+href="#apache1">Apache&nbsp;1 license</a>.</p>
 
 <p>We recommend using GNUTLS instead of OpenSSL in software you write.
 However, there is no reason not to use OpenSSL and applications that
@@ -1453,20 +1454,20 @@
 <hr />    <!-- first id is singular, leave for compatibility: -->
 <h3><a id="NonFreeSoftwareLicense"></a>
     <a id="NonFreeSoftwareLicenses">
-    Non-Free Software Licenses</a>
+    Nonfree Software Licenses</a>
     <span class="anchor-reference-id">
      (<a href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
 </h3>
 
 <p><strong>The following licenses <em>do not qualify</em> as <a
 href="/philosophy/free-sw.html">free software</a>
-licenses.  A non-free license is automatically incompatible with the <a
+licenses.  A nonfree license is automatically incompatible with the <a
 href="#GNUGPL">GNU GPL</a>.</strong></p>
 
-<p>Of course, we urge you to avoid using non-free software licenses, and
-to avoid non-free software in general.</p>
+<p>Of course, we urge you to avoid using nonfree software licenses, and
+to avoid nonfree software in general.</p>
 
-<p>There is no way we could list all the known non-free software
+<p>There is no way we could list all the known nonfree software
 licenses here; after all, every proprietary software company has its
 own.  We focus here on licenses that are often mistaken for free
 software licenses but are, in fact, <strong>not</strong> free software
@@ -1474,8 +1475,8 @@
 
 <p>We have provided links to these licenses when we can do so without
 violating our general policy: that we do not make links to sites that
-promote, encourage or facilitate the use of non-free software packages.
-The last thing we want to do is give any non-free program some gratis
+promote, encourage or facilitate the use of nonfree software packages.
+The last thing we want to do is give any nonfree program some gratis
 publicity that might encourage more people to use it.  For the same
 reason, we have avoided naming the programs for which a license is used,
 unless we think that for specific reasons it won't backfire.</p>
@@ -1499,7 +1500,7 @@
 <dd>
 <p>Versions 1.0, 1.1 and 1.2 are <a
 href="/philosophy/historical-apsl.html">not free
-software licenses (follow the link for more explanation)</a>.  Please
+software licenses</a>.  Please
 don't use these licenses, and we urge you to avoid any software that has
 been released under them.  <a href="#apsl2">Version 2.0 of the APSL</a>
 is a free software license.</p></dd>
@@ -1519,7 +1520,7 @@
     <span class="anchor-reference-id">
        (<a href="#ATTPublicLicense">#ATTPublicLicense</a>)</span></dt>
 <dd>
-<p>The AT&amp;T Public License is a non-free license.  It has several
+<p>The AT&amp;T Public License is a nonfree license.  It has several
 serious problems:</p>
 
 <ol>
@@ -1544,7 +1545,7 @@
 <li>It asserts one needs a license from AT&amp;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
-shouldn't make links to sites about non-free software.)  But such
+shouldn't make links to sites about nonfree software.)  But such
 a claim should not be made or propagated.</li>
 </ol><p></p></dd>
 
@@ -1570,7 +1571,7 @@
 problematic.</p>
 
 <p>Today <a href="#eCos20">eCos is available</a> under the GNU GPL with
-additional permission for linking with non-free programs.</p></dd>
+additional permission for linking with nonfree programs.</p></dd>
 
 
 <dt><a id="GPL-PA"
@@ -1581,7 +1582,7 @@
 <dd>
 <p>The GPL-PA (whose original name in Portuguese is
 &ldquo;Licen&ccedil;a P&uacute;blica Geral para
-Administra&ccedil;&atilde;o P&uacute;blica&rdquo;) is non-free for
+Administra&ccedil;&atilde;o P&uacute;blica&rdquo;) is nonfree for
 several reasons:</p>
 
 <ul>
@@ -1638,7 +1639,7 @@
     License of Lha</a>
     <span class="anchor-reference-id">(<a href="#Lha">#Lha</a>)</span></dt>
 <dd>
-<p>The lha license must be considered non-free because it is so vague that
+<p>The lha license must be considered nonfree because it is so vague that
 you cannot be sure what permissions you have.</p></dd>
 
 
@@ -1715,7 +1716,7 @@
     Reciprocal Public License</a>
     <span class="anchor-reference-id">(<a href="#RPL">#RPL</a>)</span></dt>
 <dd>
-<p>The Reciprocal Public License is a non-free license because of three
+<p>The Reciprocal Public License is a nonfree license because of three
 problems.  1.&nbsp;It puts limits on prices charged for an initial copy.
 2.&nbsp;It requires notification of the original developer for
 publication of a modified version.  3.&nbsp;It requires publication of
@@ -1735,7 +1736,7 @@
 <dt><a id="SML" href="http://www.simplemachines.org/about/license.php";>
     Simple Machines License</a>
     <span class="anchor-reference-id">(<a href="#SML">#SML</a>)</span></dt>
-<dd><p>Despite the name, this is a software license, and it's non-free
+<dd><p>Despite the name, this is a software license, and it's nonfree
 for several reasons:</p>
 <ul><li>You must get the licensor's permission before distributing the
 software.</li>
@@ -1797,15 +1798,15 @@
 
 
 <dt><a id="SystemC-3.0" href="http://www.systemc.org/about/org_docs/license/";>
-    SystemC &quot;Open Source&quot; License, Version 3.0</a>
+    SystemC &ldquo;Open Source&rdquo; License, Version 3.0</a>
     <span class="anchor-reference-id">
        (<a href="#SystemC-3.0">#SystemC-3.0</a>)</span></dt>
 <dd>
 <p>This license requires all recipients to proactively help the licensor
 enforce its trademarks.  This is an unreasonable condition to place on
-users' rights, so the license is non-free.  It also has other practical
+users' rights, so the license is nonfree.  It also has other practical
 problems: some of the requirements are vague, and it uses the term <a
-href="/philosophy/not-ipr.xhtml">&ldquo;intellectual
+href="/philosophy/not-ipr.html">&ldquo;intellectual
 property&rdquo;</a>.</p>
 
 <p>Despite the name, this license has not been approved as an open
@@ -1818,7 +1819,7 @@
     <span class="anchor-reference-id">
        (<a href="#UtahPublicLicense">#UtahPublicLicense</a>)</span></dt>
 <dd>
-<p>The University of Utah Public License is a non-free license because
+<p>The University of Utah Public License is a nonfree license because
 it does not allow commercial redistribution.  It also purports to
 restrict commercially running the software and even commercially giving
 consultation about it.  Those restrictions are probably not legally
@@ -1846,13 +1847,13 @@
 <p>This is not a free software license.  The license prohibits
 distribution for a fee, and that makes it impossible for the software to
 be included in the many CD-ROM free software collections that are sold
-by companies and by organizations such as the FSF.</p>
+by companies and by organizations.</p>
 
 <p>There may be another problem in section 2a, but a word seems to be
 missing there, so it is hard to be sure what meaning is really
 intended.</p>
 
-<p>(The YaST software itself no longer uses this non-free YaST license;
+<p>(The YaST software itself no longer uses this nonfree YaST license;
 happily, it is now free software, released under the GNU GPL.)</p></dd>
 
 </dl>
@@ -1889,7 +1890,7 @@
     Apple's Common Documentation License, Version 1.0</a>
     <span class="anchor-reference-id">(<a href="#ACDL">#ACDL</a>)</span></dt>
 <dd>
-<p>This is a Free Documentation license that is incompatible with the
+<p>This is a free documentation license that is incompatible with the
 GNU FDL.  It is incompatible because Section&nbsp;(2c) says &ldquo;You
 add no other terms or conditions to those of this License&rdquo;, and
 the GNU FDL has additional terms not accounted for in the Common
@@ -1917,19 +1918,19 @@
 <strong>provided</strong> the copyright holder does not exercise any of
 the &ldquo;LICENSE OPTIONS&rdquo; listed in Section VI of the license.
 But if either of the options is invoked, the license becomes
-non-free.  In any case, it is incompatible with the GNU FDL.</p>
+nonfree.  In any case, it is incompatible with the GNU FDL.</p>
 
 <p>This creates a practical pitfall in using or recommending this
 license: if you recommend &ldquo;Use the Open Publication License, Version
 1.0 but don't enable the options&rdquo;, it would be easy for the second
 half of that recommendation to get forgotten; someone might use the
-license with the options, making a manual non-free, and yet think he
+license with the options, making a manual nonfree, and yet think he
 or she is following your advice.</p>
 
 <p>Likewise, if you use this license without either of the options to
 make your manual free, someone else might decide to imitate you, then
 change his or her mind about the options thinking that that is just a
-detail; the result would be that his or her manual is non-free.</p>
+detail; the result would be that his or her manual is nonfree.</p>
 
 <p>Thus, while manuals published under this license do qualify as free
 documentation if neither license option was used, it is better to use the
@@ -1948,7 +1949,7 @@
 
 <hr />
 <h3><a id="NonFreeDocumentationLicenses">
-    Non-Free Documentation Licenses</a>
+    Nonfree Documentation Licenses</a>
     <span class="anchor-reference-id">
     (<a href="#NonFreeDocumentationLicenses">#NonFreeDocumentationLicenses</a>)
     </span>
@@ -2215,7 +2216,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/03/01 19:10:23 $
+$Date: 2012/04/21 18:10:19 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/words-to-avoid.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/words-to-avoid.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- philosophy/words-to-avoid.html      20 Apr 2012 18:10:35 -0000      1.42
+++ philosophy/words-to-avoid.html      21 Apr 2012 18:10:19 -0000      1.43
@@ -606,8 +606,8 @@
 Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind
 of slide presentation.  &ldquo;PowerPoint&rdquo; is just the name of
 one particular proprietary program to make presentations, and there
-are plenty of free alternatives, such as TeX's <tt>beamer</tt> class
-and OpenOffice.org's Impress.</p>
+are plenty of free program for presentations, such as TeX's <tt>beamer</tt> 
+class and OpenOffice.org's Impress.</p>
 
 
 <h4 id="Protection">&ldquo;Protection&rdquo;</h4>
@@ -782,7 +782,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/04/20 18:10:35 $
+$Date: 2012/04/21 18:10:19 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/banner.ja.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/banner.ja.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/banner.ja.html       29 Mar 2012 18:10:17 -0000      1.2
+++ server/banner.ja.html       21 Apr 2012 18:10:19 -0000      1.3
@@ -8,6 +8,12 @@
 
 <!--#include virtual="/server/body-include-2.ja.html" -->
 
+<p style="text-align: center; margin-top: 1em;">
+  <a href="http://dayagainstdrm.org/";>
+    <img src="//static.fsf.org/nosvn/dbd/2012/day-against-drm/banner-1.png"
+  width="975" height="121" alt="Pledge to take action on May 4th 2012 -- Day 
Against DRM" /></a>
+</p>
+
 <div id="content" class="inner">
 <!--#include virtual="/server/top-addendum.ja.html" -->
 <!-- end of banner.ja.html -->



reply via email to

[Prev in Thread] Current Thread [Next in Thread]