[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www education/edu-schools.ca.html education/po/...
|
From: |
GNUN |
|
Subject: |
www education/edu-schools.ca.html education/po/... |
|
Date: |
Mon, 29 Feb 2016 22:58:31 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 16/02/29 22:58:30
Modified files:
education : edu-schools.ca.html
education/po : edu-schools.ca-diff.html
gnu : linux-and-gnu.ca.html linux-and-gnu.el.html
gnu/po : linux-and-gnu.ca-diff.html
philosophy : free-sw.zh-cn.html javascript-trap.hr.html
selling-exceptions.pl.html selling.ca.html
selling.el.html the-danger-of-ebooks.hr.html
the-danger-of-ebooks.ml.html
the-danger-of-ebooks.pl.html
the-danger-of-ebooks.pt-br.html
philosophy/po : selling.ca-diff.html selling.el-diff.html
the-danger-of-ebooks.hr-diff.html
the-danger-of-ebooks.ml-diff.html
the-danger-of-ebooks.pl-diff.html
Added files:
gnu/po : linux-and-gnu.el-diff.html
philosophy/po : free-sw.zh-cn-diff.html
javascript-trap.hr-diff.html
selling-exceptions.pl-diff.html
the-danger-of-ebooks.pt-br-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-schools.ca.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.ca-diff.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.ca.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.el.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ca-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.el-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/javascript-trap.hr.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/selling-exceptions.pl.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/selling.ca.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/selling.el.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/the-danger-of-ebooks.hr.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/the-danger-of-ebooks.ml.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/the-danger-of-ebooks.pl.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/the-danger-of-ebooks.pt-br.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.ca-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.el-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/the-danger-of-ebooks.hr-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/the-danger-of-ebooks.ml-diff.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/the-danger-of-ebooks.pl-diff.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/javascript-trap.hr-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling-exceptions.pl-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/the-danger-of-ebooks.pt-br-diff.html?cvsroot=www&rev=1.1
Patches:
Index: education/edu-schools.ca.html
===================================================================
RCS file: /web/www/www/education/edu-schools.ca.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- education/edu-schools.ca.html 7 Sep 2015 06:29:47 -0000 1.20
+++ education/edu-schools.ca.html 29 Feb 2016 22:58:29 -0000 1.21
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/education/edu-schools.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/education/po/edu-schools.ca.po">
+ http://www.gnu.org/education/po/edu-schools.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/education/edu-schools.html"
+ --><!--#set var="DIFF_FILE" value="/education/po/edu-schools.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/education/edu-schools.en.html" -->
<!--#include virtual="/server/header.ca.html" -->
<!-- Parent-Version: 1.77 -->
@@ -32,6 +37,7 @@
escoles haurien d'utilitzar exclusivament programari lliure</p>
<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/outdated.ca.html" -->
<!--#if expr="$OUTDATED_SINCE" -->
<!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -219,7 +225,7 @@
<p class="unprintable"><!-- timestamp start -->
Updated:
-$Date: 2015/09/07 06:29:47 $
+$Date: 2016/02/29 22:58:29 $
<!-- timestamp end -->
</p>
Index: education/po/edu-schools.ca-diff.html
===================================================================
RCS file: /web/www/www/education/po/edu-schools.ca-diff.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- education/po/edu-schools.ca-diff.html 1 Aug 2015 12:57:06 -0000
1.6
+++ education/po/edu-schools.ca-diff.html 29 Feb 2016 22:58:30 -0000
1.7
@@ -50,8 +50,8 @@
<p>by <a href="http://www.stallman.org/">Richard
Stallman</a></p>
-<p>Educational <span class="removed"><del><strong>activities (including
schools)</strong></del></span> <span class="inserted"><ins><em>activities,
including schools of all levels from
-kindergarten to university,</em></ins></span> have a moral duty
+<p>Educational activities, including schools of all levels from
+kindergarten to university, have a moral duty
to <a href="/education/education.html">teach only free
software.</a></p>
@@ -98,8 +98,8 @@
dependence on their products, like tobacco companies distributing
gratis cigarettes to school children<a href="#note2">(2)</a>. They
will not give gratis copies to these students once they've graduated,
-nor to the companies that they go to work <span
class="removed"><del><strong>for.</p></strong></del></span> <span
class="inserted"><ins><em>for. Once you're dependent,
-you're expected to pay.</p></em></ins></span>
+nor to the companies that they go to work for. Once you're dependent,
+you're expected to <span
class="removed"><del><strong>pay.</p></strong></del></span> <span
class="inserted"><ins><em>pay, and future upgrades may be
expensive.</p></em></ins></span>
<p>Free software permits students to learn how software works. Some
students, natural-born programmers, on reaching their teens yearn to
@@ -203,18 +203,17 @@
information on coordinating and submitting translations of this
article.</p>
</div>
-<p>Copyright © 2003, 2009, <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Richard
Stallman</p>
+<p>Copyright © 2003, 2009, 2014, <span
class="removed"><del><strong>2015</strong></del></span> <span
class="inserted"><ins><em>2015, 2016</em></ins></span> Richard
Stallman</p>
<p>This page is licensed under a <a rel="license"
-<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
-<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
-Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
+Commons Attribution-NoDerivatives 4.0 International
License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/08/01 12:57:06 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
</div>
Index: gnu/linux-and-gnu.ca.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.ca.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- gnu/linux-and-gnu.ca.html 1 Dec 2014 09:58:53 -0000 1.42
+++ gnu/linux-and-gnu.ca.html 29 Feb 2016 22:58:30 -0000 1.43
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/gnu/po/linux-and-gnu.ca.po">
+ http://www.gnu.org/gnu/po/linux-and-gnu.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/gnu/linux-and-gnu.html"
+ --><!--#set var="DIFF_FILE" value="/gnu/po/linux-and-gnu.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
<!--#include virtual="/server/header.ca.html" -->
<!-- Parent-Version: 1.77 -->
@@ -13,6 +18,7 @@
<!--#include virtual="/gnu/po/linux-and-gnu.translist" -->
<!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/server/outdated.ca.html" -->
<h2>Linux i el Sistema GNU</h2>
<p><strong>per <a href="http://www.stallman.org/";>Richard
Stallman</a></strong></p>
@@ -317,7 +323,7 @@
<p class="unprintable"><!-- timestamp start -->
Updated:
-$Date: 2014/12/01 09:58:53 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
Index: gnu/linux-and-gnu.el.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.el.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gnu/linux-and-gnu.el.html 9 May 2015 06:29:51 -0000 1.14
+++ gnu/linux-and-gnu.el.html 29 Feb 2016 22:58:30 -0000 1.15
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/gnu/po/linux-and-gnu.el.po">
+ http://www.gnu.org/gnu/po/linux-and-gnu.el.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/gnu/linux-and-gnu.html"
+ --><!--#set var="DIFF_FILE" value="/gnu/po/linux-and-gnu.el-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/gnu/linux-and-gnu.en.html" -->
<!--#include virtual="/server/header.el.html" -->
<!-- Parent-Version: 1.77 -->
@@ -14,6 +19,7 @@
<!--#include virtual="/gnu/po/linux-and-gnu.translist" -->
<!--#include virtual="/server/banner.el.html" -->
+<!--#include virtual="/server/outdated.el.html" -->
<h2>Το Linux και Ïο ÏÏÏÏημα GNU</h2>
<p><strong>αÏÏ Ïον <a href="http://www.stallman.org/";>Richard
@@ -349,7 +355,7 @@
<p class="unprintable"><!-- timestamp start -->
ÎνημεÏÏθηκε:
-$Date: 2015/05/09 06:29:51 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
Index: gnu/po/linux-and-gnu.ca-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ca-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/po/linux-and-gnu.ca-diff.html 17 Nov 2014 20:57:04 -0000 1.4
+++ gnu/po/linux-and-gnu.ca-diff.html 29 Feb 2016 22:58:30 -0000 1.5
@@ -169,9 +169,7 @@
Linux rather than that of GNU. But there are also
<a href="/distros/">completely free GNU/Linux distros</a>. The FSF
supports computer facilities
-for <span class="removed"><del><strong>two of these
-distributions, <a href="http://proyecto.ututo.net/cmsd/">Ututo</a>
-and</strong></del></span> <a
href="http://gnewsense.org/">gNewSense</a>.</p>
+for <a href="http://gnewsense.org/">gNewSense</a>.</p>
<p>Making a free GNU/Linux distribution is not just a matter of
eliminating various non-free programs. Nowadays, the usual version of
@@ -197,8 +195,11 @@
reference, <a
href="http://foldoc.org/linux">http://foldoc.org/linux</a>
is a good URL to use.</p>
+<span
class="inserted"><ins><em><h3>Postscripts</h3></em></ins></span>
+
<p>
-Addendum: Aside from GNU, one other project has independently produced
+<span class="removed"><del><strong>Addendum:</strong></del></span>
+Aside from GNU, one other project has independently produced
a free Unix-like operating system. This system is known as BSD, and
it was developed at UC Berkeley. It was non-free in the 80s, but
became free in the early 90s. A free operating system that exists
@@ -221,9 +222,9 @@
<ol>
<li>
<a id="unexciting"></a>These unexciting but essential components
-include the GNU <span class="removed"><del><strong>assembler,
GAS</strong></del></span> <span class="inserted"><ins><em>assembler
(GAS)</em></ins></span> and the <span class="removed"><del><strong>linker,
GLD,</strong></del></span> <span class="inserted"><ins><em>linker
(GLD),</em></ins></span> both
+include the GNU assembler (GAS) and the linker (GLD), both
are now part of the <a href="/software/binutils/">GNU Binutils</a>
-package, <a href="/software/tar/">GNU tar</a>, and <span
class="inserted"><ins><em>many</em></ins></span> more.</li>
+package, <a href="/software/tar/">GNU tar</a>, and many
more.</li>
<li>
<a id="nottools"></a>For instance, The Bourne Again SHell (BASH),
@@ -288,7 +289,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -304,17 +305,18 @@
Information document, www.gnu.org/prep/maintain. -->
<p>Copyright © 1997, 1998, 1999, 2000, 2001, 2002,
-2007, 2014 Richard M. Stallman</p>
+2007, <span class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015, 2016</em></ins></span> Richard M.
Stallman</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/11/17 20:57:04 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/free-sw.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/free-sw.zh-cn.html 29 Sep 2015 08:28:28 -0000 1.5
+++ philosophy/free-sw.zh-cn.html 29 Feb 2016 22:58:30 -0000 1.6
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/free-sw.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/free-sw.zh-cn.po">
+ http://www.gnu.org/philosophy/po/free-sw.zh-cn.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/free-sw.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/free-sw.zh-cn-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/free-sw.en.html" -->
<!--#include virtual="/server/header.zh-cn.html" -->
<!-- Parent-Version: 1.77 -->
@@ -12,6 +17,7 @@
<!--#include virtual="/philosophy/po/free-sw.translist" -->
<!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/server/outdated.zh-cn.html" -->
<h2>ä»ä¹æ¯èªç±è½¯ä»¶ï¼</h2>
<!--#include virtual="/licenses/fsf-licensing.zh-cn.html" -->
@@ -402,7 +408,7 @@
<p class="unprintable"><!-- timestamp start -->
æ´æ°
-$Date: 2015/09/29 08:28:28 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
Index: philosophy/javascript-trap.hr.html
===================================================================
RCS file: /web/www/www/philosophy/javascript-trap.hr.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/javascript-trap.hr.html 23 May 2015 06:10:55 -0000 1.9
+++ philosophy/javascript-trap.hr.html 29 Feb 2016 22:58:30 -0000 1.10
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/javascript-trap.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/javascript-trap.hr.po">
+ http://www.gnu.org/philosophy/po/javascript-trap.hr.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/javascript-trap.html"
+ --><!--#set var="DIFF_FILE"
value="/philosophy/po/javascript-trap.hr-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/javascript-trap.en.html" -->
<!--#include virtual="/server/header.hr.html" -->
<!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/philosophy/po/javascript-trap.translist" -->
<!--#include virtual="/server/banner.hr.html" -->
+<!--#include virtual="/server/outdated.hr.html" -->
<h2>Zamka JavaScripta</h2>
<p>napisao <a href="http://www.stallman.org/";>Richard Stallman</a></p>
@@ -331,7 +337,7 @@
<p class="unprintable"><!-- timestamp start -->
Zadnji put promijenjeno:
-$Date: 2015/05/23 06:10:55 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
Index: philosophy/selling-exceptions.pl.html
===================================================================
RCS file: /web/www/www/philosophy/selling-exceptions.pl.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- philosophy/selling-exceptions.pl.html 6 Sep 2014 05:04:07 -0000
1.25
+++ philosophy/selling-exceptions.pl.html 29 Feb 2016 22:58:30 -0000
1.26
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/selling-exceptions.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/selling-exceptions.pl.po">
+ http://www.gnu.org/philosophy/po/selling-exceptions.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/selling-exceptions.html"
+ --><!--#set var="DIFF_FILE"
value="/philosophy/po/selling-exceptions.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/selling-exceptions.en.html" -->
<!--#include virtual="/server/header.pl.html" -->
<!-- Parent-Version: 1.77 -->
@@ -10,6 +15,7 @@
<!--#include virtual="/philosophy/po/selling-exceptions.translist" -->
<!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
<h2>Sprzedaż na innej licencji</h2>
<p><a href="http://www.stallman.org/";>Richard Stallman</a></p>
@@ -237,7 +243,7 @@
<p class="unprintable"><!-- timestamp start -->
Aktualizowane:
-$Date: 2014/09/06 05:04:07 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
Index: philosophy/selling.ca.html
===================================================================
RCS file: /web/www/www/philosophy/selling.ca.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- philosophy/selling.ca.html 25 May 2015 09:27:19 -0000 1.30
+++ philosophy/selling.ca.html 29 Feb 2016 22:58:30 -0000 1.31
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/selling.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/selling.ca.po">
+ http://www.gnu.org/philosophy/po/selling.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/selling.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/selling.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/selling.en.html" -->
<!--#include virtual="/server/header.ca.html" -->
<!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/philosophy/po/selling.translist" -->
<!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/server/outdated.ca.html" -->
<h2>Vendre programari lliure</h2>
<p><em>També podeu conèixer <a
@@ -256,7 +262,7 @@
<p class="unprintable"><!-- timestamp start -->
Updated:
-$Date: 2015/05/25 09:27:19 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
Index: philosophy/selling.el.html
===================================================================
RCS file: /web/www/www/philosophy/selling.el.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- philosophy/selling.el.html 3 May 2015 19:57:27 -0000 1.30
+++ philosophy/selling.el.html 29 Feb 2016 22:58:30 -0000 1.31
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/selling.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/selling.el.po">
+ http://www.gnu.org/philosophy/po/selling.el.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/selling.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/selling.el-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/selling.en.html" -->
<!--#include virtual="/server/header.el.html" -->
<!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/philosophy/po/selling.translist" -->
<!--#include virtual="/server/banner.el.html" -->
+<!--#include virtual="/server/outdated.el.html" -->
<h2>ΠοÏ
λÏνÏÎ±Ï ÎµÎ»ÎµÏθεÏο λογιÏμικÏ</h2>
<p><em><a href="/philosophy/selling-exceptions.html">ÎεÏικÎÏ
ÏκÎÏÎµÎ¹Ï ÏÎ¬Î½Ï ÏÏιÏ
@@ -275,7 +281,7 @@
<p class="unprintable"><!-- timestamp start -->
ÎνημεÏÏθηκε:
-$Date: 2015/05/03 19:57:27 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
Index: philosophy/the-danger-of-ebooks.hr.html
===================================================================
RCS file: /web/www/www/philosophy/the-danger-of-ebooks.hr.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/the-danger-of-ebooks.hr.html 23 May 2015 06:11:05 -0000
1.10
+++ philosophy/the-danger-of-ebooks.hr.html 29 Feb 2016 22:58:30 -0000
1.11
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/the-danger-of-ebooks.en.html"
-->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/the-danger-of-ebooks.hr.po">
+ http://www.gnu.org/philosophy/po/the-danger-of-ebooks.hr.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/the-danger-of-ebooks.html"
+ --><!--#set var="DIFF_FILE"
value="/philosophy/po/the-danger-of-ebooks.hr-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/the-danger-of-ebooks.en.html" -->
<!--#include virtual="/server/header.hr.html" -->
<!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
<!--#include virtual="/server/banner.hr.html" -->
+<!--#include virtual="/server/outdated.hr.html" -->
<h2>Opasnosti e-knjiga</h2>
<blockquote class="note">
@@ -154,7 +160,7 @@
<p class="unprintable"><!-- timestamp start -->
Vrijeme zadnje izmjene:
-$Date: 2015/05/23 06:11:05 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
Index: philosophy/the-danger-of-ebooks.ml.html
===================================================================
RCS file: /web/www/www/philosophy/the-danger-of-ebooks.ml.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/the-danger-of-ebooks.ml.html 10 May 2014 08:27:56 -0000
1.4
+++ philosophy/the-danger-of-ebooks.ml.html 29 Feb 2016 22:58:30 -0000
1.5
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/the-danger-of-ebooks.en.html"
-->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/the-danger-of-ebooks.ml.po">
+ http://www.gnu.org/philosophy/po/the-danger-of-ebooks.ml.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/the-danger-of-ebooks.html"
+ --><!--#set var="DIFF_FILE"
value="/philosophy/po/the-danger-of-ebooks.ml-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/the-danger-of-ebooks.en.html" -->
<!--#include virtual="/server/header.ml.html" -->
<!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
<!--#include virtual="/server/banner.ml.html" -->
+<!--#include virtual="/server/outdated.ml.html" -->
<h2>à´-à´¬àµà´àµà´àµà´à´³à´¿à´²àµ à´
à´ªà´à´à´</h2>
<blockquote class="note">
@@ -164,7 +170,7 @@
<p class="unprintable"><!-- timestamp start -->
à´ªàµà´¤àµà´àµà´à´¿à´¯à´¤àµ:
-$Date: 2014/05/10 08:27:56 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
Index: philosophy/the-danger-of-ebooks.pl.html
===================================================================
RCS file: /web/www/www/philosophy/the-danger-of-ebooks.pl.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- philosophy/the-danger-of-ebooks.pl.html 6 Sep 2014 05:04:07 -0000
1.29
+++ philosophy/the-danger-of-ebooks.pl.html 29 Feb 2016 22:58:30 -0000
1.30
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/the-danger-of-ebooks.en.html"
-->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/the-danger-of-ebooks.pl.po">
+ http://www.gnu.org/philosophy/po/the-danger-of-ebooks.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/the-danger-of-ebooks.html"
+ --><!--#set var="DIFF_FILE"
value="/philosophy/po/the-danger-of-ebooks.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/the-danger-of-ebooks.en.html" -->
<!--#include virtual="/server/header.pl.html" -->
<!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
<!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
<h2>NiebezpieczeÅstwo e-booków</h2>
<blockquote class="note">
@@ -162,7 +168,7 @@
<p class="unprintable"><!-- timestamp start -->
Aktualizowane:
-$Date: 2014/09/06 05:04:07 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
Index: philosophy/the-danger-of-ebooks.pt-br.html
===================================================================
RCS file: /web/www/www/philosophy/the-danger-of-ebooks.pt-br.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/the-danger-of-ebooks.pt-br.html 27 Feb 2015 22:26:57 -0000
1.4
+++ philosophy/the-danger-of-ebooks.pt-br.html 29 Feb 2016 22:58:30 -0000
1.5
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/the-danger-of-ebooks.en.html"
-->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/the-danger-of-ebooks.pt-br.po">
+ http://www.gnu.org/philosophy/po/the-danger-of-ebooks.pt-br.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/the-danger-of-ebooks.html"
+ --><!--#set var="DIFF_FILE"
value="/philosophy/po/the-danger-of-ebooks.pt-br-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-12-31" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/the-danger-of-ebooks.en.html" -->
<!--#include virtual="/server/header.pt-br.html" -->
<!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
<!--#include virtual="/server/banner.pt-br.html" -->
+<!--#include virtual="/server/outdated.pt-br.html" -->
<h2>O perigo dos e-books</h2>
<blockquote class="note">
@@ -158,7 +164,7 @@
<p class="unprintable"><!-- timestamp start -->
Ãltima atualização:
-$Date: 2015/02/27 22:26:57 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
Index: philosophy/po/selling.ca-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/selling.ca-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/selling.ca-diff.html 18 Oct 2013 11:40:39 -0000 1.1
+++ philosophy/po/selling.ca-diff.html 29 Feb 2016 22:58:30 -0000 1.2
@@ -11,21 +11,13 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<span class="inserted"><ins><em><!-- Parent-Version: 1.75
--></em></ins></span>
+<!-- Parent-Version: 1.77 -->
<title>Selling Free Software
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title></em></ins></span>
+- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/selling.translist" -->
<!--#include virtual="/server/banner.html" -->
<h2>Selling Free Software</h2>
-<span class="removed"><del><strong><!-- This document uses XHTML 1.0
Strict, but may be served as -->
-<!-- text/html. Please ensure that markup style considers -->
-<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
-
-<!-- Please ensure links are consistent with Apache's MultiView. -->
-<!-- Change include statements to be consistent with the relevant -->
-<!-- language, where necessary. --></strong></del></span>
-
<p><em><a href="/philosophy/selling-exceptions.html">Some
views on the
ideas of selling exceptions to free software licenses, such as the GNU
GPL</a> are also available.</em></p>
@@ -33,14 +25,15 @@
<p>
Many people believe that the spirit of the GNU Project is that you
should not charge money for distributing copies of software, or that
-you should charge as little as possible — just enough to cover
+you should charge as little as possible—just enough to cover
the cost. This is a misunderstanding.</p>
<p>
Actually, we encourage people who redistribute
-<a href="/philosophy/free-sw.html">free software</a>
-to charge as much as they wish or can. If this seems surprising to
-you, please read on.</p>
+<a href="/philosophy/free-sw.html">free software</a> to charge as
much
+as they wish or can. If a license does not permit users to make
+copies and sell them, it is a nonfree license. If this seems
+surprising to you, please read on.</p>
<p>
The word “free” has two legitimate general meanings; it can refer
@@ -60,7 +53,7 @@
<a href="/philosophy/categories.html#ProprietarySoftware">Nonfree
programs</a>
are usually sold for a high price, but sometimes a store will give you
a copy at no charge. That doesn't make it free software, though.
-Price or no price, the program is nonfree because users don't have
+Price or no price, the program is nonfree because its users are denied
freedom.</p>
<p>
@@ -95,7 +88,7 @@
People sometimes worry that a high distribution fee will put free
software out of range for users who don't have a lot of money. With
<a href="/philosophy/categories.html#ProprietarySoftware">proprietary
-software</a>, a high price does exactly that — but free software
+software</a>, a high price does exactly that—but free software
is different.</p>
<p>
@@ -124,7 +117,7 @@
users, or that a low price is likely to encourage users.</p>
<p>
-This is true for proprietary software — but free software is
+This is true for proprietary software—but free software is
different. With so many ways to get copies, the price of distribution
service has less effect on popularity.</p>
@@ -185,8 +178,8 @@
Without a limit on the fee for the source code, they would be able set
a fee too large for anyone to pay—such as a billion
dollars—and thus pretend to release source code while in truth
-concealing it. So <span class="removed"><del><strong>in</strong></del></span>
<span class="inserted"><ins><em><a
href="/licenses/gpl.html#section6">in</em></ins></span> this case we
-have to limit the <span class="removed"><del><strong>fee</strong></del></span>
<span class="inserted"><ins><em>fee</a></em></ins></span> for source in
order
+concealing it. So <a href="/licenses/gpl.html#section6">in this case we
+have to limit the fee</a> for source in order
to ensure the user's freedom. In ordinary situations, however, there
is no such justification for limiting distribution fees, so we do not
limit them.</p>
@@ -200,31 +193,16 @@
distracted by side issues such as how much of a distribution fee is
charged. Freedom is the issue, the whole issue, and the only issue.</p>
-
-<span class="removed"><del><strong><!-- If needed, change the copyright
block at the bottom. In general, -->
-<!-- all pages on the GNU web server should have the section about -->
-<!-- verbatim copying. Please do NOT remove this without talking -->
-<!-- with the webmasters first. -->
-<!-- Please make sure the copyright date is consistent with the document
-->
-<!-- and that it is like this "2001, 2002" not this "2001-2002."
--></strong></del></span>
-
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
+<div class="unprintable">
-<span class="removed"><del><strong><p>
-Please</strong></del></span>
-
-<span class="inserted"><ins><em><p>Please</em></ins></span> send <span
class="inserted"><ins><em>general</em></ins></span> FSF & GNU inquiries to
-<a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.</strong></del></span>
<span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</em></ins></span>
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<span class="removed"><del><strong><br />
-Please send broken</strong></del></span> <span
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
-to <a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.
-</p>
-
-<p></strong></del></span> <span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</p>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
replace it with the translation of these two:
@@ -238,19 +216,16 @@
<p>For information on coordinating and submitting translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
- README</a>. --></em></ins></span>
+ README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
README</a> for information on coordinating and submitting translations
-of this <span class="removed"><del><strong>article.
-</p>
-
-<p>
-Copyright</strong></del></span> <span
class="inserted"><ins><em>article.</p>
+of this article.</p>
+</div>
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -265,21 +240,19 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright</em></ins></span> © 1996, 1997, 1998, 2001, <span
class="removed"><del><strong>2007</strong></del></span> <span
class="inserted"><ins><em>2007, 2013</em></ins></span>
-Free Software Foundation, <span class="removed"><del><strong>Inc.,
-</p>
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110,
USA</address></strong></del></span> <span
class="inserted"><ins><em>Inc.</p></em></ins></span>
+<p>Copyright © 1996, 1997, 1998, 2001, 2007, <span
class="removed"><del><strong>2013, 2015</strong></del></span> <span
class="inserted"><ins><em>2015, 2016</em></ins></span>
+Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States <span
class="removed"><del><strong>License</a>.
-</p></strong></del></span> <span
class="inserted"><ins><em>License</a>.</p></em></ins></span>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<p>Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2013/10/18 11:40:39 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/selling.el-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/selling.el-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/selling.el-diff.html 28 Apr 2015 20:59:41 -0000 1.8
+++ philosophy/po/selling.el-diff.html 29 Feb 2016 22:58:30 -0000 1.9
@@ -31,8 +31,8 @@
<p>
Actually, we encourage people who redistribute
<a href="/philosophy/free-sw.html">free software</a> to charge as
much
-as they wish or can. If <span class="inserted"><ins><em>a license does not
permit users to make
-copies and sell them, it is a nonfree license. If</em></ins></span> this seems
+as they wish or can. If a license does not permit users to make
+copies and sell them, it is a nonfree license. If this seems
surprising to you, please read on.</p>
<p>
@@ -53,7 +53,7 @@
<a href="/philosophy/categories.html#ProprietarySoftware">Nonfree
programs</a>
are usually sold for a high price, but sometimes a store will give you
a copy at no charge. That doesn't make it free software, though.
-Price or no price, the program is nonfree because <span
class="inserted"><ins><em>its</em></ins></span> users <span
class="removed"><del><strong>don't have</strong></del></span> <span
class="inserted"><ins><em>are denied</em></ins></span>
+Price or no price, the program is nonfree because its users are denied
freedom.</p>
<p>
@@ -225,7 +225,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -240,18 +240,19 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1996, 1997, 1998, 2001, 2007, <span
class="removed"><del><strong>2013</strong></del></span> <span
class="inserted"><ins><em>2013, 2015</em></ins></span>
+<p>Copyright © 1996, 1997, 1998, 2001, 2007, <span
class="removed"><del><strong>2013, 2015</strong></del></span> <span
class="inserted"><ins><em>2015, 2016</em></ins></span>
Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/04/28 20:59:41 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/the-danger-of-ebooks.hr-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/the-danger-of-ebooks.hr-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/the-danger-of-ebooks.hr-diff.html 13 Dec 2013 05:31:28
-0000 1.1
+++ philosophy/po/the-danger-of-ebooks.hr-diff.html 29 Feb 2016 22:58:30
-0000 1.2
@@ -10,15 +10,17 @@
span.inserted { background-color: #2f2; color: #000; }
</style></head>
<body><pre>
-<span class="removed"><del><strong><!-- Parent-Version: 1.57
--></strong></del></span><!--#include virtual="/server/header.html" -->
-<span class="inserted"><ins><em><!-- Parent-Version: 1.75
--></em></ins></span>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
<title>The Danger of E-Books
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
<!--#include virtual="/server/banner.html" -->
<h2>The Danger of E-Books</h2>
-<div style="text-align: center; font-size: 110%;text-shadow: 0 0 0.2em
#fff; width: 300px; float: right; margin: 12px; background-color: #a0f112;
color: #353831; padding: 1em;"><a
href="http://defectivebydesign.org/ebooks.html">Join our mailing list about
the dangers of eBooks</a>.</div>
+<blockquote class="note">
+<p><a href="http://defectivebydesign.org/ebooks.html">Join our
mailing list about the dangers of eBooks</a>.</p>
+</blockquote>
<p>In an age where business dominates our governments and writes our
laws,
every technological advance offers business an opportunity to impose new
@@ -47,7 +49,7 @@
e-book.</li>
<li>The format is secret, and only proprietary user-restricting software
can
read it at all.</li>
-<li>An ersatz <span
class="removed"><del><strong>"lending"</strong></del></span> <span
class="inserted"><ins><em>“lending”</em></ins></span> is allowed
for some books, for a limited time, but
+<li>An ersatz “lending” is allowed for some books, for a
limited time, but
only by specifying by name another user of the same system. No giving or
selling.</li>
<li>To copy the e-book is impossible due to
@@ -70,9 +72,9 @@
<ul>
<li>To distribute tax funds to authors based on the cube root of each
-author's popularity. See
+author's <span class="removed"><del><strong>popularity. See
<a href="http://stallman.org/articles/internet-sharing-license.en.html">
-http://stallman.org/articles/internet-sharing-license.en.html</a>.</li>
+http://stallman.org/articles/internet-sharing-license.en.html</a>.</li></strong></del></span>
<span class="inserted"><ins><em>popularity.<a
href="#footnote1">[1]</a></li></em></ins></span>
<li>To design players so users can send authors anonymous voluntary
payments.</li>
</ul>
@@ -83,27 +85,28 @@
at <a href="http://DefectiveByDesign.org/ebooks.html">
http://DefectiveByDesign.org/ebooks.html</a>.</p>
-<span class="removed"><del><strong><!-- If needed, change the copyright
block at the bottom. In general,
- all pages on the GNU web server should have the section about
- verbatim copying. Please do NOT remove this without talking
- with the webmasters first.
- Please make sure the copyright date is consistent with the document
- and that it is like this: "2001, 2002", not this: "2001-2002".
--></strong></del></span>
+<span class="inserted"><ins><em><h4>Footnotes</h4>
+<ol>
+<li id="footnote1">See both my speech
+<a href="/philosophy/copyright-versus-community.html">“Copyright
+versus Community in the Age of Computer Networks”</a>
+and <a
href="http://stallman.org/articles/internet-sharing-license.en.html">my
+2012 open letter to the President of the Brazilian Senate</a>, Senator
+José Sarney, for more on this.</li>
+</ol></em></ins></span>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
+<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
<a href="mailto:address@hidden"><address@hidden></a>.
There are also <a href="/contact/">other ways to contact</a>
-the <span class="removed"><del><strong>FSF.<br />
-Please send broken</strong></del></span> <span class="inserted"><ins><em>FSF.
Broken</em></ins></span> links and other corrections or suggestions <span
class="inserted"><ins><em>can be sent</em></ins></span>
+the FSF. Broken links and other corrections or suggestions can be sent
to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
-<span class="removed"><del><strong><p>Please</strong></del></span>
-
-<span class="inserted"><ins><em><p><!-- TRANSLATORS: Ignore the
original text in this paragraph,
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
replace it with the translation of these two:
We work hard and do our best to provide accurate, good quality
@@ -116,14 +119,15 @@
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
-Please</em></ins></span> see the <a
+Please see the <a
href="/server/standards/README.translations.html">Translations
README</a> for information on coordinating and submitting translations
of this article.</p>
+</div>
-<span class="inserted"><ins><em><!-- Regarding copyright, in general,
standalone pages (as opposed to
+<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -136,19 +140,20 @@
being publicly visible on the web or in a revision control system).
There is more detail about copyright years in the GNU Maintainers
- Information document, www.gnu.org/prep/maintain. --></em></ins></span>
+ Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2011 Richard Stallman</p>
+<p>Copyright © <span
class="removed"><del><strong>2011</strong></del></span> <span
class="inserted"><ins><em>2011, 2014, 2015, 2016</em></ins></span> Richard
Stallman</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<p>Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2013/12/13 05:31:28 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/the-danger-of-ebooks.ml-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/the-danger-of-ebooks.ml-diff.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/the-danger-of-ebooks.ml-diff.html 9 May 2014 15:30:37
-0000 1.6
+++ philosophy/po/the-danger-of-ebooks.ml-diff.html 29 Feb 2016 22:58:30
-0000 1.7
@@ -10,19 +10,17 @@
span.inserted { background-color: #2f2; color: #000; }
</style></head>
<body><pre>
-<span class="removed"><del><strong><!-- Parent-Version: 1.57
--></strong></del></span><!--#include virtual="/server/header.html" -->
-<span class="inserted"><ins><em><!-- Parent-Version: 1.77
--></em></ins></span>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
<title>The Danger of E-Books
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
<!--#include virtual="/server/banner.html" -->
<h2>The Danger of E-Books</h2>
-<span class="removed"><del><strong><div style="text-align: center;
font-size: 110%;text-shadow: 0 0 0.2em #fff; width: 300px; float: right;
margin: 12px; background-color: #a0f112; color: #353831; padding:
1em;"><a</strong></del></span>
-
-<span class="inserted"><ins><em><blockquote class="note">
-<p><a</em></ins></span>
href="http://defectivebydesign.org/ebooks.html">Join our mailing list about
the dangers of <span
class="removed"><del><strong>eBooks</a>.</div></strong></del></span>
<span class="inserted"><ins><em>eBooks</a>.</p>
-</blockquote></em></ins></span>
+<blockquote class="note">
+<p><a href="http://defectivebydesign.org/ebooks.html">Join our
mailing list about the dangers of eBooks</a>.</p>
+</blockquote>
<p>In an age where business dominates our governments and writes our
laws,
every technological advance offers business an opportunity to impose new
@@ -51,7 +49,7 @@
e-book.</li>
<li>The format is secret, and only proprietary user-restricting software
can
read it at all.</li>
-<li>An ersatz <span
class="removed"><del><strong>"lending"</strong></del></span> <span
class="inserted"><ins><em>“lending”</em></ins></span> is allowed
for some books, for a limited time, but
+<li>An ersatz “lending” is allowed for some books, for a
limited time, but
only by specifying by name another user of the same system. No giving or
selling.</li>
<li>To copy the e-book is impossible due to
@@ -74,9 +72,9 @@
<ul>
<li>To distribute tax funds to authors based on the cube root of each
-author's popularity. See
+author's <span class="removed"><del><strong>popularity. See
<a href="http://stallman.org/articles/internet-sharing-license.en.html">
-http://stallman.org/articles/internet-sharing-license.en.html</a>.</li>
+http://stallman.org/articles/internet-sharing-license.en.html</a>.</li></strong></del></span>
<span class="inserted"><ins><em>popularity.<a
href="#footnote1">[1]</a></li></em></ins></span>
<li>To design players so users can send authors anonymous voluntary
payments.</li>
</ul>
@@ -87,28 +85,28 @@
at <a href="http://DefectiveByDesign.org/ebooks.html">
http://DefectiveByDesign.org/ebooks.html</a>.</p>
-<span class="removed"><del><strong><!-- If needed, change the copyright
block at the bottom. In general,
- all pages on the GNU web server should have the section about
- verbatim copying. Please do NOT remove this without talking
- with the webmasters first.
- Please make sure the copyright date is consistent with the document
- and that it is like this: "2001, 2002", not this: "2001-2002".
--></strong></del></span>
+<span class="inserted"><ins><em><h4>Footnotes</h4>
+<ol>
+<li id="footnote1">See both my speech
+<a href="/philosophy/copyright-versus-community.html">“Copyright
+versus Community in the Age of Computer Networks”</a>
+and <a
href="http://stallman.org/articles/internet-sharing-license.en.html">my
+2012 open letter to the President of the Brazilian Senate</a>, Senator
+José Sarney, for more on this.</li>
+</ol></em></ins></span>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
-<span class="inserted"><ins><em><div
class="unprintable"></em></ins></span>
+<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
<a href="mailto:address@hidden"><address@hidden></a>.
There are also <a href="/contact/">other ways to contact</a>
-the <span class="removed"><del><strong>FSF.<br />
-Please send broken</strong></del></span> <span class="inserted"><ins><em>FSF.
Broken</em></ins></span> links and other corrections or suggestions <span
class="inserted"><ins><em>can be sent</em></ins></span>
+the FSF. Broken links and other corrections or suggestions can be sent
to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
-<span class="removed"><del><strong><p>Please</strong></del></span>
-
-<span class="inserted"><ins><em><p><!-- TRANSLATORS: Ignore the
original text in this paragraph,
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
replace it with the translation of these two:
We work hard and do our best to provide accurate, good quality
@@ -121,15 +119,15 @@
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
-Please</em></ins></span> see the <a
+Please see the <a
href="/server/standards/README.translations.html">Translations
README</a> for information on coordinating and submitting translations
of this article.</p>
-<span class="inserted"><ins><em></div>
+</div>
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -142,21 +140,20 @@
being publicly visible on the web or in a revision control system).
There is more detail about copyright years in the GNU Maintainers
- Information document, www.gnu.org/prep/maintain. --></em></ins></span>
+ Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2011 Richard Stallman</p>
+<p>Copyright © <span
class="removed"><del><strong>2011</strong></del></span> <span
class="inserted"><ins><em>2011, 2014, 2015, 2016</em></ins></span> Richard
Stallman</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<span class="removed"><del><strong><p>Updated:</strong></del></span>
-
-<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/05/09 15:30:37 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/the-danger-of-ebooks.pl-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/the-danger-of-ebooks.pl-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/the-danger-of-ebooks.pl-diff.html 6 Jan 2014 04:32:21
-0000 1.2
+++ philosophy/po/the-danger-of-ebooks.pl-diff.html 29 Feb 2016 22:58:30
-0000 1.3
@@ -10,15 +10,17 @@
span.inserted { background-color: #2f2; color: #000; }
</style></head>
<body><pre>
-<span class="removed"><del><strong><!-- Parent-Version: 1.57
--></strong></del></span><!--#include virtual="/server/header.html" -->
-<span class="inserted"><ins><em><!-- Parent-Version: 1.75
--></em></ins></span>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
<title>The Danger of E-Books
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
<!--#include virtual="/server/banner.html" -->
<h2>The Danger of E-Books</h2>
-<div style="text-align: center; font-size: 110%;text-shadow: 0 0 0.2em
#fff; width: 300px; float: right; margin: 12px; background-color: #a0f112;
color: #353831; padding: 1em;"><a
href="http://defectivebydesign.org/ebooks.html">Join our mailing list about
the dangers of eBooks</a>.</div>
+<blockquote class="note">
+<p><a href="http://defectivebydesign.org/ebooks.html">Join our
mailing list about the dangers of eBooks</a>.</p>
+</blockquote>
<p>In an age where business dominates our governments and writes our
laws,
every technological advance offers business an opportunity to impose new
@@ -47,7 +49,7 @@
e-book.</li>
<li>The format is secret, and only proprietary user-restricting software
can
read it at all.</li>
-<li>An ersatz <span
class="removed"><del><strong>"lending"</strong></del></span> <span
class="inserted"><ins><em>“lending”</em></ins></span> is allowed
for some books, for a limited time, but
+<li>An ersatz “lending” is allowed for some books, for a
limited time, but
only by specifying by name another user of the same system. No giving or
selling.</li>
<li>To copy the e-book is impossible due to
@@ -70,9 +72,9 @@
<ul>
<li>To distribute tax funds to authors based on the cube root of each
-author's popularity. See
+author's <span class="removed"><del><strong>popularity. See
<a href="http://stallman.org/articles/internet-sharing-license.en.html">
-http://stallman.org/articles/internet-sharing-license.en.html</a>.</li>
+http://stallman.org/articles/internet-sharing-license.en.html</a>.</li></strong></del></span>
<span class="inserted"><ins><em>popularity.<a
href="#footnote1">[1]</a></li></em></ins></span>
<li>To design players so users can send authors anonymous voluntary
payments.</li>
</ul>
@@ -83,27 +85,28 @@
at <a href="http://DefectiveByDesign.org/ebooks.html">
http://DefectiveByDesign.org/ebooks.html</a>.</p>
-<span class="removed"><del><strong><!-- If needed, change the copyright
block at the bottom. In general,
- all pages on the GNU web server should have the section about
- verbatim copying. Please do NOT remove this without talking
- with the webmasters first.
- Please make sure the copyright date is consistent with the document
- and that it is like this: "2001, 2002", not this: "2001-2002".
--></strong></del></span>
+<span class="inserted"><ins><em><h4>Footnotes</h4>
+<ol>
+<li id="footnote1">See both my speech
+<a href="/philosophy/copyright-versus-community.html">“Copyright
+versus Community in the Age of Computer Networks”</a>
+and <a
href="http://stallman.org/articles/internet-sharing-license.en.html">my
+2012 open letter to the President of the Brazilian Senate</a>, Senator
+José Sarney, for more on this.</li>
+</ol></em></ins></span>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
+<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
<a href="mailto:address@hidden"><address@hidden></a>.
There are also <a href="/contact/">other ways to contact</a>
-the <span class="removed"><del><strong>FSF.<br />
-Please send broken</strong></del></span> <span class="inserted"><ins><em>FSF.
Broken</em></ins></span> links and other corrections or suggestions <span
class="inserted"><ins><em>can be sent</em></ins></span>
+the FSF. Broken links and other corrections or suggestions can be sent
to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
-<span class="removed"><del><strong><p>Please</strong></del></span>
-
-<span class="inserted"><ins><em><p><!-- TRANSLATORS: Ignore the
original text in this paragraph,
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
replace it with the translation of these two:
We work hard and do our best to provide accurate, good quality
@@ -116,14 +119,15 @@
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
-Please</em></ins></span> see the <a
+Please see the <a
href="/server/standards/README.translations.html">Translations
README</a> for information on coordinating and submitting translations
of this article.</p>
+</div>
-<span class="inserted"><ins><em><!-- Regarding copyright, in general,
standalone pages (as opposed to
+<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -136,19 +140,20 @@
being publicly visible on the web or in a revision control system).
There is more detail about copyright years in the GNU Maintainers
- Information document, www.gnu.org/prep/maintain. --></em></ins></span>
+ Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2011 Richard Stallman</p>
+<p>Copyright © <span
class="removed"><del><strong>2011</strong></del></span> <span
class="inserted"><ins><em>2011, 2014, 2015, 2016</em></ins></span> Richard
Stallman</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<p>Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/01/06 04:32:21 $
+$Date: 2016/02/29 22:58:30 $
<!-- timestamp end -->
</p>
</div>
Index: gnu/po/linux-and-gnu.el-diff.html
===================================================================
RCS file: gnu/po/linux-and-gnu.el-diff.html
diff -N gnu/po/linux-and-gnu.el-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/po/linux-and-gnu.el-diff.html 29 Feb 2016 22:58:30 -0000 1.1
@@ -0,0 +1,326 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/gnu/linux-and-gnu.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>Linux and GNU
+- GNU Project - Free Software Foundation</title>
+<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation,
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU
HURD, Hurd" />
+<meta http-equiv="Description" content="Since 1983, developing the free
Unix style operating system GNU, so that computer users can have the freedom to
share and improve the software they use." />
+<!--#include virtual="/gnu/po/linux-and-gnu.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Linux and the GNU System</h2>
+
+<p><strong>by <a href="http://www.stallman.org/">Richard
Stallman</a></strong></p>
+
+<div class="announcement">
+ <blockquote><p>For more information see also
+the <a href="/gnu/gnu-linux-faq.html">GNU/Linux FAQ</a>,
+and <a href="/gnu/why-gnu-linux.html">Why GNU/Linux?</a></p>
+ </blockquote>
+</div>
+
+<p>
+Many computer users run a modified version of
+<a href="/philosophy/categories.html#TheGNUsystem">the GNU
system</a>
+every day, without realizing it. Through a peculiar turn of events,
+the version of GNU which is widely used today is often called
+“Linux”, and many of its users
+are <a href="/gnu/gnu-users-never-heard-of-gnu.html"> not aware</a>
+that it is basically the GNU system, developed by the
+<a href="/gnu/gnu-history.html">GNU Project</a>.</p>
+
+<p>
+There really is a Linux, and these people are using it, but it is just
+a part of the system they use. Linux is the kernel: the program in
+the system that allocates the machine's resources to the other
+programs that you run. The kernel is an essential part of an
+operating system, but useless by itself; it can only function in the
+context of a complete operating system. Linux is normally used in
+combination with the GNU operating system: the whole system is
+basically GNU with Linux added, or GNU/Linux. All the so-called
+“Linux” distributions are really distributions of
+GNU/Linux.</p>
+
+<p>
+Many users do not understand the difference between the kernel, which
+is Linux, and the whole system, which they also call
+“Linux”. The ambiguous use of the name doesn't help
+people understand. These users often think that Linus Torvalds
+developed the whole operating system in 1991, with a bit of help.</p>
+
+<p>
+Programmers generally know that Linux is a kernel. But since they
+have generally heard the whole system called “Linux” as well, they
+often envisage a history that would justify naming the whole system
+after the kernel. For example, many believe that once Linus Torvalds
+finished writing Linux, the kernel, its users looked around for other
+free software to go with it, and found that (for no particular reason)
+most everything necessary to make a Unix-like system was already
+available.</p>
+
+<p>
+What they found was no accident—it was the not-quite-complete GNU
+system. The available <a href="/philosophy/free-sw.html">free
+software</a> added up to a complete system because the GNU Project
+had been working since 1984 to make one. In
+the <a href="/gnu/manifesto.html"> The GNU Manifesto</a> we set
forth
+the goal of developing a free Unix-like
+system, called GNU. The <a href="/gnu/initial-announcement.html">
+Initial Announcement</a> of the GNU Project also outlines some of the
+original plans for the GNU system. By the time Linux was started, GNU
+was almost finished.</p>
+
+<p>
+Most free software projects have the goal of developing a particular
+program for a particular job. For example, Linus Torvalds set out to
+write a Unix-like kernel (Linux); Donald Knuth set out to write a text
+formatter (TeX); Bob Scheifler set out to develop a window system (the
+X Window System). It's natural to measure the contribution of this
+kind of project by specific programs that came from the project.</p>
+
+<p>
+If we tried to measure the GNU Project's contribution in this way,
+what would we conclude? One CD-ROM vendor found that in their “Linux
+distribution”, <a
href="/philosophy/categories.html#GNUsoftware">GNU
+software</a> was the largest single contingent, around 28% of the
+total source code, and this included some of the essential major
+components without which there could be no system. Linux itself was
+about 3%. (The proportions in 2008 are similar: in the “main”
+repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
+So if you were going to pick a name for the system based on
+who wrote the programs in the system, the most appropriate single
+choice would be “GNU”.</p>
+
+<p>
+But that is not the deepest way to consider the question. The GNU
+Project was not, is not, a project to develop specific software
+packages. It was not a project <a href="/software/gcc/"> to
+develop a C compiler</a>, although we did that. It was not a project
+to develop a text editor, although we developed one. The GNU Project
+set out to develop <em>a complete free Unix-like system</em>:
GNU.</p>
+
+<p>
+Many people have made major contributions to the free software in the
+system, and they all deserve credit for their software. But the
+reason it is <em>an integrated system</em>—and not just a
+collection of useful programs—is because the GNU Project set out
+to make it one. We made a list of the programs needed to make
+a <em>complete</em> free system, and we systematically found,
wrote,
+or found people to write everything on the list. We wrote essential
+but unexciting
+<a href="#unexciting">(1)</a> components because you can't have a
system
+without them. Some of our system components, the programming tools,
+became popular on their own among programmers, but we wrote many
+components that are not tools <a href="#nottools">(2)</a>. We
even
+developed a chess game, GNU Chess, because a complete system needs
+games too.</p>
+
+<p>
+By the early 90s we had put together the whole system aside from the
+kernel. We had also started a kernel, the
+<a href="/software/hurd/hurd.html">GNU Hurd</a>, which runs on top
of
+Mach. Developing this kernel has been a lot harder than we expected;
+<a href="/software/hurd/hurd/documentation/hurd-and-linux.html">the
+GNU Hurd started working reliably in 2001</a>, but it is a long way
+from being ready for people to use in general.</p>
+
+<p>
+Fortunately, we didn't have to wait for the Hurd, because of Linux.
+Once Torvalds freed Linux in 1992, it fit into the last major gap in
+the GNU system. People could
+then <a
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01">
+combine Linux with the GNU system</a> to make a complete free system
+— a version of the GNU system which also contained Linux. The
+GNU/Linux system, in other words.</p>
+
+<p>
+Making them work well together was not a trivial job. Some GNU
+components<a href="#somecomponents">(3)</a> needed substantial
change
+to work with Linux. Integrating a complete system as a distribution
+that would work “out of the box” was a big job, too. It
+required addressing the issue of how to install and boot the
+system—a problem we had not tackled, because we hadn't yet
+reached that point. Thus, the people who developed the various system
+distributions did a lot of essential work. But it was work that, in
+the nature of things, was surely going to be done by someone.</p>
+
+<p>
+The GNU Project supports GNU/Linux systems as well as <em>the</em>
GNU
+system. The <a href="http://fsf.org/">FSF</a> funded the
rewriting of
+the Linux-related extensions to the GNU C library, so that now they
+are well integrated, and the newest GNU/Linux systems use the current
+library release with no changes. The FSF also funded an early stage
+of the development of Debian GNU/Linux.</p>
+
+<p>
+Today there are many different variants of the GNU/Linux system (often
+called “distros”). Most of them include non-free
+software—their developers follow the philosophy associated with
+Linux rather than that of GNU. But there are also
+<a href="/distros/">completely free GNU/Linux distros</a>. The FSF
+supports computer facilities
+for <a href="http://gnewsense.org/">gNewSense</a>.</p>
+
+<p>Making a free GNU/Linux distribution is not just a matter of
+eliminating various non-free programs. Nowadays, the usual version of
+Linux contains non-free programs too. These programs are intended to
+be loaded into I/O devices when the system starts, and they are
+included, as long series of numbers, in the "source code" of Linux.
+Thus, maintaining free GNU/Linux distributions now entails maintaining
+a <a href="http://directory.fsf.org/project/linux"> free version of
+Linux</a> too.</p>
+
+<p>Whether you use GNU/Linux or not, please don't confuse the public
+by using the name “Linux” ambiguously. Linux is the
+kernel, one of the essential major components of the system. The
+system as a whole is basically the GNU system, with Linux added. When
+you're talking about this combination, please call it
+“GNU/Linux”.</p>
+
+<p>
+If you want to make a link on “GNU/Linux” for further
+reference, this page and <a href="/gnu/the-gnu-project.html">
+http://www.gnu.org/gnu/the-gnu-project.html</a> are good choices. If
+you mention Linux, the kernel, and want to add a link for further
+reference, <a
href="http://foldoc.org/linux">http://foldoc.org/linux</a>
+is a good URL to use.</p>
+
+<span
class="inserted"><ins><em><h3>Postscripts</h3></em></ins></span>
+
+<p>
+<span class="removed"><del><strong>Addendum:</strong></del></span>
+Aside from GNU, one other project has independently produced
+a free Unix-like operating system. This system is known as BSD, and
+it was developed at UC Berkeley. It was non-free in the 80s, but
+became free in the early 90s. A free operating system that exists
+today<a href="#newersystems">(4)</a> is almost certainly either a
+variant of the GNU system, or a kind of BSD system.</p>
+
+<p>
+People sometimes ask whether BSD too is a version of GNU, like
+GNU/Linux. The BSD developers were inspired to make their code free
+software by the example of the GNU Project, and explicit appeals from
+GNU activists helped persuade them, but the code had little overlap
+with GNU. BSD systems today use some GNU programs, just as the GNU
+system and its variants use some BSD programs; however, taken as
+wholes, they are two different systems that evolved separately. The
+BSD developers did not write a kernel and add it to the GNU system,
+and a name like GNU/BSD would not fit the situation.<a
+href="#gnubsd">(5)</a></p>
+
+<h3>Notes:</h3>
+<ol>
+<li>
+<a id="unexciting"></a>These unexciting but essential components
+include the GNU assembler (GAS) and the linker (GLD), both
+are now part of the <a href="/software/binutils/">GNU Binutils</a>
+package, <a href="/software/tar/">GNU tar</a>, and many
more.</li>
+
+<li>
+<a id="nottools"></a>For instance, The Bourne Again SHell (BASH),
+the PostScript interpreter
+<a href="/software/ghostscript/ghostscript.html">Ghostscript</a>,
and the
+<a href="/software/libc/libc.html">GNU C library</a> are not
+programming tools. Neither are GNUCash, GNOME, and GNU Chess.</li>
+
+<li>
+<a id="somecomponents"></a>For instance, the
+<a href="/software/libc/libc.html">GNU C library</a>.</li>
+
+<li>
+<a id="newersystems"></a>Since that was written, a nearly-all-free
+Windows-like system has been developed, but technically it is not at
+all like GNU or Unix, so it doesn't really affect this issue. Most of
+the kernel of Solaris has been made free, but if you wanted to make a
+free system out of that, aside from replacing the missing parts of the
+kernel, you would also need to put it into GNU or BSD.</li>
+
+<li>
+<a id="gnubsd"></a>On the other hand, in the years since this
article
+was written, the GNU C Library has been ported to several versions of
+the BSD kernel, which made it straightforward to combine the GNU system
+with that kernel. Just as with GNU/Linux, these are indeed variants of
+GNU, and are therefore called, for instance, GNU/kFreeBSD and
+GNU/kNetBSD depending on the kernel of the system. Ordinary users on
+typical desktops can hardly distinguish between GNU/Linux and
+GNU/*BSD.</li>
+
+</ol>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © 1997, 1998, 1999, 2000, 2001, 2002,
+2007, <span class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015, 2016</em></ins></span> Richard M.
Stallman</p>
+
+<p>This page is licensed under a <a rel="license"
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2016/02/29 22:58:30 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
Index: philosophy/po/free-sw.zh-cn-diff.html
===================================================================
RCS file: philosophy/po/free-sw.zh-cn-diff.html
diff -N philosophy/po/free-sw.zh-cn-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/po/free-sw.zh-cn-diff.html 29 Feb 2016 22:58:30 -0000
1.1
@@ -0,0 +1,589 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/philosophy/free-sw.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>What is free software?
+- GNU Project - Free Software Foundation</title>
+
+<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation,
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU
HURD, Hurd" />
+<meta http-equiv="Description" content="Since 1983, developing the free
Unix style operating system GNU, so that computer users can have the freedom to
share and improve the software they use." />
+
+<!--#include virtual="/philosophy/po/free-sw.translist" -->
+<!--#include virtual="/server/banner.html" -->
+
+<h2>What is free software?</h2>
+<!--#include virtual="/licenses/fsf-licensing.html" -->
+
+<h3>The Free Software Definition</h3>
+
+<blockquote>
+<p>
+The free software definition presents the criteria for whether a
+particular software program qualifies as free software. From time to
+time we revise this definition, to clarify it or to resolve questions
+about subtle issues. See the <a href="#History">History
section</a>
+below for a list of changes that affect the definition of free
+software.
+</p>
+</blockquote>
+
+<p>
+“Free software” means software that respects users'
+freedom and community. Roughly, it means that <b>the users have the
+freedom to run, copy, distribute, study, change and improve the
+software</b>. Thus, “free software” is a matter of
+liberty, not price. To understand the concept, you should think of
+“free” as in “free speech,” not as in
+“free beer”. We sometimes call it “libre
+software” to show we do not mean it is gratis.
+</p>
+
+<p>
+We campaign for these freedoms because everyone deserves them. With
+these freedoms, the users (both individually and collectively) control
+the program and what it does for them. When users don't control the
+program, we call it a “nonfree” or
+“proprietary” program. The nonfree program controls the
+users, and the developer controls the program; this makes the
+program <a href="/philosophy/free-software-even-more-important.html">
+an instrument of unjust power</a>.
+</p>
+
+<p>
+A program is free software if the program's users have the
+four essential freedoms:
+</p>
+
+<ul>
+ <li>The freedom to run the program as you wish,
+ for any purpose (freedom 0).</li>
+ <li>The freedom to study how the program works, and change it so it
+ does your computing as you wish (freedom 1). Access to the source
+ code is a precondition for this.
+ </li>
+ <li>The freedom to redistribute copies so you can help your neighbor
+ (freedom 2).
+ </li>
+ <li>The freedom to distribute copies of your modified versions
+ to others (freedom 3). By doing this you can give the whole
+ community a chance to benefit from your changes.
+ Access to the source code is a precondition for this.
+ </li>
+</ul>
+
+<p>
+A program is free software if it gives users adequately all of these
+freedoms. Otherwise, it is nonfree. While we can distinguish various
+nonfree distribution schemes in terms of how far they fall short of
+being free, we consider them all equally unethical.</p>
+
+<p>In any given scenario, these freedoms must apply to whatever code
+we plan to make use of, or lead others to make use of. For instance,
+consider a program A which automatically launches a program B to
+handle some cases. If we plan to distribute A as it stands, that
+implies users will need B, so we need to judge whether both A and B
+are free. However, if we plan to modify A so that it doesn't use B,
+only A needs to be free; we can ignore B.</p>
+
+<p>The rest of this page clarifies certain points about what makes
+specific freedoms adequate or not.</p>
+
+<p>Freedom to distribute (freedoms 2 and 3) means you are free to
+redistribute copies, either with or without modifications, either
+gratis or charging a fee for distribution, to
+<a href="#exportcontrol">anyone anywhere</a>. Being free to do
these
+things means (among other things) that you do not have to ask or pay
+for permission to do so.
+</p>
+
+<p>
+You should also have the freedom to make modifications and use them
+privately in your own work or play, without even mentioning that they
+exist. If you do publish your changes, you should not be required to
+notify anyone in particular, or in any particular way.
+</p>
+
+<p>
+The freedom to run the program means the freedom for any kind of person
+or organization to use it on any kind of computer system, for any kind of
+overall job and purpose, without being required to communicate about it
+with the developer or any other specific entity. In this freedom, it is
+the <em>user's</em> purpose that matters, not the
<em>developer's</em>
+purpose; you as a user are free to run the program for your purposes,
+and if you distribute it to someone else, she is then free to run it
+for her purposes, but you are not entitled to impose your purposes on her.
+</p>
+
+<p>
+The freedom to run the program as you wish means that you are not
+forbidden or stopped from doing so. It has nothing to do with what
+functionality the program has, or whether it is useful for what you
+want to do.</p>
+
+<p>
+The freedom to redistribute copies must include binary or executable
+forms of the program, as well as source code, for both modified and
+unmodified versions. (Distributing programs in runnable form is necessary
+for conveniently installable free operating systems.) It is OK if there
+is no way to produce a binary or executable form for a certain program
+(since some languages don't support that feature), but you must have the
+freedom to redistribute such forms should you find or develop a way to
+make them.
+</p>
+
+<p>
+In order for freedoms 1 and 3 (the freedom to make changes and the
+freedom to publish the changed versions) to be meaningful, you must have
+access to the source code of the program. Therefore, accessibility of
+source code is a necessary condition for free software. Obfuscated
+“source code” is not real source code and does not count
+as source code.
+</p>
+
+<p>
+Freedom 1 includes the freedom to use your changed version in place of
+the original. If the program is delivered in a product designed to
+run someone else's modified versions but refuse to run yours — a
+practice known as “tivoization” or “lockdown”,
+or (in its practitioners' perverse terminology) as “secure
+boot” — freedom 1 becomes an empty pretense rather than a
+practical reality. These binaries are not free
+software even if the source code they are compiled from is free.
+</p>
+
+<p>
+One important way to modify a program is by merging in available free
+subroutines and modules. If the program's license says that you
+cannot merge in a suitably licensed existing module — for instance, if it
+requires you to be the copyright holder of any code you add — then the
+license is too restrictive to qualify as free.
+</p>
+
+<p>
+Freedom 3 includes the freedom to release your modified versions
+as free software. A free license may also permit other ways of
+releasing them; in other words, it does not have to be
+a <a href="/copyleft/copyleft.html">copyleft</a> license.
However, a
+license that requires modified versions to be nonfree does not qualify
+as a free license.
+</p>
+
+<p>
+In order for these freedoms to be real, they must be permanent and
+irrevocable as long as you do nothing wrong; if the developer of the
+software has the power to revoke the license, or retroactively add
+restrictions to its terms, without your doing anything wrong to give
+cause, the software is not free.
+</p>
+
+<p>
+However, certain kinds of rules about the manner of distributing free
+software are acceptable, when they don't conflict with the central
+freedoms. For example, <a
href="/copyleft/copyleft.html">copyleft</a>
+(very simply stated) is the rule that when redistributing the program,
+you cannot add restrictions to deny other people the central freedoms.
+This rule does not conflict with the central freedoms; rather it
+protects them.
+</p>
+
+<p>
+In the GNU project, we use copyleft to protect the four freedoms
+legally for everyone. We believe there are important reasons why
+<a href="/philosophy/pragmatic.html">it is better to use
+copyleft</a>. However,
+<a href="/philosophy/categories.html#Non-CopyleftedFreeSoftware">
+noncopylefted free software</a> is ethical
+too. See <a href="/philosophy/categories.html">Categories of Free
+Software</a> for a description of how “free software,”
+“copylefted software” and other categories of software
+relate to each other.
+</p>
+
+<p>
+“Free software” does not mean “noncommercial”. A free
+program must be available for commercial use, commercial development,
+and commercial distribution. Commercial development of free software
+is no longer unusual; such free commercial software is very important.
+You may have paid money to get copies of free software, or you may have
+obtained copies at no charge. But regardless of how you got your copies,
+you always have the freedom to copy and change the software, even to
+<a href="/philosophy/selling.html">sell copies</a>.
+</p>
+
+<p>
+Whether a change constitutes an improvement is a subjective matter.
+If your right to modify a program is limited, in substance, to changes that
+someone else considers an improvement, that program is not free.
+</p>
+
+<p>
+However, rules about how to package a modified version are acceptable,
+if they don't substantively limit your freedom to release modified
+versions, or your freedom to make and use modified versions privately.
+Thus, it is acceptable for the license to require that you change the
+name of the modified version, remove a logo, or identify your
+modifications as yours. As long as these requirements are not so
+burdensome that they effectively hamper you from releasing your
+changes, they are acceptable; you're already making other changes to
+the program, so you won't have trouble making a few more.
+</p>
+
+<p>
+Rules that “if you make your version available in this way, you
+must make it available in that way also” can be acceptable too,
+on the same condition. An example of such an acceptable rule is one
+saying that if you have distributed a
+modified version and a previous developer asks for a copy of it, you
+must send one. (Note that such a rule still leaves you the choice of
+whether to distribute your version at all.) Rules that require release
+of source code to the users for versions that you put into public use
+are also acceptable.
+</p>
+
+<p>
+A special issue arises when a license requires changing the name by
+which the program will be invoked from other programs. That
+effectively hampers you from releasing your changed version so that it
+can replace the original when invoked by those other programs. This
+sort of requirement is acceptable only if there's a suitable aliasing
+facility that allows you to specify the original program's name as an
+alias for the modified version.</p>
+
+<p>
+Sometimes government <a id="exportcontrol">export control
regulations</a>
+and trade sanctions can constrain your freedom to distribute copies of
+programs internationally. Software developers do not have the power to
+eliminate or override these restrictions, but what they can and must do
+is refuse to impose them as conditions of use of the program. In this
+way, the restrictions will not affect activities and people outside the
+jurisdictions of these governments. Thus, free software licenses
+must not require obedience to any nontrivial export regulations as a
+condition of exercising any of the essential freedoms.
+</p>
+
+<p>
+Merely mentioning the existence of export regulations, without making
+them a condition of the license itself, is acceptable since it does
+not restrict users. If an export regulation is actually trivial for
+free software, then requiring it as a condition is not an actual
+problem; however, it is a potential problem, since a later change in
+export law could make the requirement nontrivial and thus render the
+software nonfree.
+</p>
+
+<p>
+A free license may not require compliance with the license of a
+nonfree program. Thus, for instance, if a license requires you to
+comply with the licenses of “all the programs you use”, in
+the case of a user that runs nonfree programs this would require
+compliance with the licenses of those nonfree programs; that makes the
+license nonfree.
+</p>
+
+<p>
+It is acceptable for a free license to specify which jurisdiction's
+law applies, or where litigation must be done, or both.
+</p>
+
+<p>
+Most free software licenses are based on copyright, and there are limits
+on what kinds of requirements can be imposed through copyright. If a
+copyright-based license respects freedom in the ways described above, it
+is unlikely to have some other sort of problem that we never anticipated
+(though this does happen occasionally). However, some free software
+licenses are based on contracts, and contracts can impose a much larger
+range of possible restrictions. That means there are many possible ways
+such a license could be unacceptably restrictive and nonfree.
+</p>
+
+<p>
+We can't possibly list all the ways that might happen. If a
+contract-based license restricts the user in an unusual way that
+copyright-based licenses cannot, and which isn't mentioned here as
+legitimate, we will have to think about it, and we will probably conclude
+it is nonfree.
+</p>
+
+<p>
+When talking about free software, it is best to avoid using terms
+like “give away” or “for free,” because those terms
imply that
+the issue is about price, not freedom. Some common terms such
+as “piracy” embody opinions we hope you won't endorse. See
+<a href="/philosophy/words-to-avoid.html">Confusing Words and Phrases
that
+are Worth Avoiding</a> for a discussion of these terms. We also have
+a list of proper <a href="/philosophy/fs-translations.html">translations
of
+“free software”</a> into various languages.
+</p>
+
+<p>
+Finally, note that criteria such as those stated in this free software
+definition require careful thought for their interpretation. To decide
+whether a specific software license qualifies as a free software license,
+we judge it based on these criteria to determine whether it fits their
+spirit as well as the precise words. If a license includes unconscionable
+restrictions, we reject it, even if we did not anticipate the issue
+in these criteria. Sometimes a license requirement raises an issue
+that calls for extensive thought, including discussions with a lawyer,
+before we can decide if the requirement is acceptable. When we reach
+a conclusion about a new issue, we often update these criteria to make
+it easier to see why certain licenses do or don't qualify.
+</p>
+
+<p>
+If you are interested in whether a specific license qualifies as a free
+software license, see our <a href="/licenses/license-list.html">list
+of licenses</a>. If the license you are concerned with is not
+listed there, you can ask us about it by sending us email at
+<a href="mailto:address@hidden"><address@hidden></a>.
+</p>
+
+<p>
+If you are contemplating writing a new license, please contact the
+Free Software Foundation first by writing to that address. The
+proliferation of different free software licenses means increased work
+for users in understanding the licenses; we may be able to help you
+find an existing free software license that meets your needs.
+</p>
+
+<p>
+If that isn't possible, if you really need a new license, with our
+help you can ensure that the license really is a free software license
+and avoid various practical problems.
+</p>
+
+<h3 id="beyond-software">Beyond Software</h3>
+
+<p>
+<a href="/philosophy/free-doc.html">Software manuals must be
free</a>,
+for the same reasons that software must be free, and because the
+manuals are in effect part of the software.
+</p>
+
+<p>
+The same arguments also make sense for other kinds of works of
+practical use — that is to say, works that embody useful knowledge,
+such as educational works and reference
+works. <a href="http://wikipedia.org">Wikipedia</a> is the
best-known
+example.
+</p>
+
+<p>
+Any kind of work <em>can</em> be free, and the definition of free
software
+has been extended to a definition of <a
href="http://freedomdefined.org/">
+free cultural works</a> applicable to any kind of works.
+</p>
+
+<h3 id="open-source">Open Source?</h3>
+
+<p>
+Another group <span class="removed"><del><strong>has started
using</strong></del></span> <span
class="inserted"><ins><em>uses</em></ins></span> the term “open
source” to mean
+something close (but not identical) to “free software”. We
+prefer the term “free software” because, once you have heard that
+it refers to freedom rather than price, it calls to mind freedom. The
+word “open” <a
href="/philosophy/open-source-misses-the-point.html">
+never refers to freedom</a>.
+</p>
+
+<h3 id="History">History</h3>
+
+<p>From time to time we revise this Free Software Definition. Here is
+the list of substantive changes, along with links to show exactly what
+was changed.</p>
+
+<ul>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.140&r2=1.141">Version
+1.141</a>: Clarify which code needs to be free.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.134&r2=1.135">Version
+1.135</a>: Say each time that freedom 0 is the freedom to run the program
+as you wish.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.133&r2=1.134">Version
+1.134</a>: Freedom 0 is not a matter of the program's
functionality.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.130&r2=1.131">Version
+1.131</a>: A free license may not require compliance with a nonfree
license
+of another program.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.128&r2=1.129">Version
+1.129</a>: State explicitly that choice of law and choice of forum
+specifications are allowed. (This was always our policy.)</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.121&r2=1.122">Version
+1.122</a>: An export control requirement is a real problem if the
+requirement is nontrivial; otherwise it is only a potential problem.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.117&r2=1.118">Version
+1.118</a>: Clarification: the issue is limits on your right to modify,
+not on what modifications you have made. And modifications are not limited
+to “improvements”</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.110&r2=1.111">Version
+1.111</a>: Clarify 1.77 by saying that only
+retroactive <em>restrictions</em> are unacceptable. The copyright
+holders can always grant additional <em>permission</em> for use of
the
+work by releasing the work in another way in parallel.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.104&r2=1.105">Version
+1.105</a>: Reflect, in the brief statement of freedom 1, the point
+(already stated in version 1.80) that it includes really using your modified
+version for your computing.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.91&r2=1.92">Version
+1.92</a>: Clarify that obfuscated code does not qualify as source
code.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.89&r2=1.90">Version
+1.90</a>: Clarify that freedom 3 means the right to distribute copies
+of your own modified or improved version, not a right to participate
+in someone else's development project.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.88&r2=1.89">Version
+1.89</a>: Freedom 3 includes the right to release modified versions as
+free software.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.79&r2=1.80">Version
+1.80</a>: Freedom 1 must be practical, not just theoretical;
+i.e., no tivoization.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.76&r2=1.77">Version
+1.77</a>: Clarify that all retroactive changes to the license are
+unacceptable, even if it's not described as a complete
+replacement.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.73&r2=1.74">Version
+1.74</a>: Four clarifications of points not explicit enough, or stated
+in some places but not reflected everywhere:
+<ul>
+<li>"Improvements" does not mean the license can
+substantively limit what kinds of modified versions you can release.
+Freedom 3 includes distributing modified versions, not just changes.</li>
+<li>The right to merge in existing modules
+refers to those that are suitably licensed.</li>
+<li>Explicitly state the conclusion of the point about export
controls.</li>
+<li>Imposing a license change constitutes revoking the old
license.</li>
+</ul>
+</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.56&r2=1.57">Version
+1.57</a>: Add "Beyond Software" section.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.45&r2=1.46">Version
+1.46</a>: Clarify whose purpose is significant in the freedom to run
+the program for any purpose.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.40&r2=1.41">Version
+1.41</a>: Clarify wording about contract-based licenses.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.39&r2=1.40">Version
+1.40</a>: Explain that a free license must allow to you use other
+available free software to create your modifications.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.38&r2=1.39">Version
+1.39</a>: Note that it is acceptable for a license to require you to
+provide source for versions of the software you put into public
+use.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.30&r2=1.31">Version
+1.31</a>: Note that it is acceptable for a license to require you to
+identify yourself as the author of modifications. Other minor
+clarifications throughout the text.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.22&r2=1.23">Version
+1.23</a>: Address potential problems related to contract-based
+licenses.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.15&r2=1.16">Version
+1.16</a>: Explain why distribution of binaries is important.</li>
+
+<li><a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.10&r2=1.11">Version
+1.11</a>: Note that a free license may require you to send a copy of
+versions you distribute to the author.</li>
+
+</ul>
+
+<p>There are gaps in the version numbers shown above because there are
+other changes in this page that do not affect the definition or its
+interpretations. For instance, the list does not include changes in
+asides, formatting, spelling, punctuation, or other parts of the page.
+You can review the complete list of changes to the page through
+the <a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&view=log">cvsweb
+interface</a>.</p>
+
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © <span
class="removed"><del><strong>1996-2002,</strong></del></span> <span
class="inserted"><ins><em>1996, 2002,</em></ins></span> 2004-2007, <span
class="removed"><del><strong>2009, 2010, 2012, 2013, 2015</strong></del></span>
<span class="inserted"><ins><em>2009-2016</em></ins></span>
+Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
+Commons Attribution-NoDerivatives 4.0 International
License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2016/02/29 22:58:30 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
Index: philosophy/po/javascript-trap.hr-diff.html
===================================================================
RCS file: philosophy/po/javascript-trap.hr-diff.html
diff -N philosophy/po/javascript-trap.hr-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/po/javascript-trap.hr-diff.html 29 Feb 2016 22:58:30 -0000
1.1
@@ -0,0 +1,341 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/philosophy/javascript-trap.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>The JavaScript Trap</title>
+<!--#include virtual="/philosophy/po/javascript-trap.translist" -->
+<!--#include virtual="/server/banner.html" -->
+
+<h2>The JavaScript Trap</h2>
+
+<p>by <a href="http://www.stallman.org/">Richard
Stallman</a></p>
+
+<p><strong>You may be running nonfree programs on your computer
every
+day without realizing it—through your web
browser.</strong></p>
+
+<p>In the free software community, the idea that nonfree programs
+mistreat their users is familiar. Some of us refuse entirely to
+install proprietary software, and many others consider nonfreedom a
+strike against the program. Many users are aware that this issue
+applies to the plug-ins that browsers offer to install, since they can
+be free or nonfree.</p>
+
+<p>But browsers run other nonfree programs which they don't ask you
+about or even tell you about—programs that web pages contain or
+link to. These programs are most often written in JavaScript, though
+other languages are also used.</p>
+
+<p>JavaScript (officially called ECMAScript, but few use that name) was
+once used for minor frills in web pages, such as cute but inessential
+navigation and display features. It was acceptable to consider these
+as mere extensions of HTML markup, rather than as true software; they
+did not constitute a significant issue.</p>
+
+<p>Many sites still use JavaScript that way, but some use it for major
+programs that do large jobs. For instance, Google Docs <span
class="removed"><del><strong>downloads</strong></del></span> <span
class="inserted"><ins><em>tries to download</em></ins></span> into
+your machine a JavaScript program which measures half a megabyte, in a
+compacted form that we could call Obfuscript because it has no
+comments and hardly any whitespace, and the method names are one
+letter long. The source code of a program is the preferred form for
+modifying it; the compacted code is not source code, and the real
+source code of this program is not available to the user.</p>
+
+<p>Browsers don't normally tell you when they load JavaScript
+programs.
+<span class="removed"><del><strong>Most</strong></del></span> <span
class="inserted"><ins><em>Some</em></ins></span> browsers have a way to turn
off JavaScript entirely,
+but <span class="removed"><del><strong>none of
+them can check for JavaScript programs that are nontrivial and
+nonfree. Even</strong></del></span> <span
class="inserted"><ins><em>even</em></ins></span> if you're aware of this issue,
it would take you considerable
+trouble to identify <span class="inserted"><ins><em>the nontrivial nonfree
programs</em></ins></span> and <span
class="removed"><del><strong>then</strong></del></span> block <span
class="removed"><del><strong>those programs.</strong></del></span> <span
class="inserted"><ins><em>them.</em></ins></span>
+However, even in the free software community most users are not aware
+of this issue; the browsers' silence tends to conceal it.</p>
+
+<p>It is possible to release a JavaScript program as free software, by
+distributing the source code under a free software license. <span
class="inserted"><ins><em>If the
+program is self-contained—if its functioning and purpose are
+independent of the page it came in—that is fine; you can copy it
+to a file on your machine, modify it, and visit that file with a
+browser to run it.</em></ins></span> But <span class="inserted"><ins><em>that
is an unusual case.</p>
+
+<p>In the usual case, JavaScript programs are meant to work with a
+particular page or site, and the page or site depends on them to
+function. Then another problem arises:</em></ins></span> even if the
program's source
+is available, <span class="removed"><del><strong>there is no easy way to run
your
+modified version instead of the original. Current free</strong></del></span>
browsers do not offer a <span
class="removed"><del><strong>facility</strong></del></span> <span
class="inserted"><ins><em>way</em></ins></span> to run your <span
class="removed"><del><strong>own</strong></del></span> modified version
+instead of the
+<span class="removed"><del><strong>one delivered in the
page.</strong></del></span> <span class="inserted"><ins><em>original when
visiting that page or site.</em></ins></span> The effect
+is comparable to tivoization, although <span class="inserted"><ins><em>in
principle</em></ins></span> not quite so hard
+to overcome.</p>
+
+<p>JavaScript is not the only language web sites use for programs sent
+to the user. Flash supports programming through an extended variant
+of
+<span class="removed"><del><strong>JavaScript. We</strong></del></span> <span
class="inserted"><ins><em>JavaScript; if we ever have a sufficiently complete
free Flash
+player, we</em></ins></span> will need to <span
class="removed"><del><strong>study</strong></del></span> <span
class="inserted"><ins><em>deal with</em></ins></span> the issue of <span
class="inserted"><ins><em>nonfree</em></ins></span> Flash <span
class="removed"><del><strong>to make suitable
+recommendations.</strong></del></span> <span
class="inserted"><ins><em>programs.</em></ins></span>
+Silverlight seems likely to create a problem similar to Flash, except
+worse, since Microsoft uses it as a platform for nonfree codecs. A
+free replacement for Silverlight does not do the job for the free
+world unless it normally comes with free replacement codecs.</p>
+
+<p>Java applets also run in the browser, and raise similar issues. In
+general, any sort of applet system poses this sort of problem. Having
+a free execution environment for an applet only brings us far enough
+to encounter the problem.</p>
+
+<span class="inserted"><ins><em><p>It is theoretically possible to
program in HTML and CSS, but in
+practice this capability is limited and inconvenient; merely to make
+it do something is an impressive hack. Such programs ought to be
+free, but CSS is not a serious problem for users' freedom as of
+2016.</p></em></ins></span>
+
+<p>A strong movement has developed that calls for web sites to
+communicate only through formats and protocols that are free (some say
+"open"); that is to say, whose documentation is published and which
+anyone is free to implement. With the presence of programs in web
+pages, that criterion is necessary, but not sufficient. JavaScript
+itself, as a format, is free, and use of JavaScript in a web site is
+not necessarily bad. However, as we've seen above, it also isn't
+necessarily OK. When the site transmits a program to the user, it is
+not enough for the program to be written in a documented and
+unencumbered language; that program must be free, too. “Only free
+programs transmitted to the user” must become part of the criterion
+for proper behavior by web sites.</p>
+
+<p>Silently loading and running nonfree programs is one among several
+issues raised by "web applications". The term "web
+application" was designed to disregard the fundamental
+distinction between software delivered to users and software running
+on <span class="removed"><del><strong>the</strong></del></span> <span
class="inserted"><ins><em>a</em></ins></span> server. It can refer to a
specialized client program running
+in a browser; it can refer to specialized server software; it can
+refer to a specialized client program that works hand in hand with
+specialized server software. The client and server sides raise
+different ethical issues, even if they are so closely integrated that
+they arguably form parts of a single program. This article addresses
+only the issue of the client-side software. We are addressing the
+server issue separately.</p>
+
+<p>In practical terms, how can we deal with the problem of nonfree
+JavaScript programs in web sites? The first step is to avoid running
+it.</p>
+
+<p>What do we mean by "nontrivial"? It is a matter of
+degree, so this is a matter of designing a simple criterion that gives
+good results, rather than finding the one correct answer.</p>
+<p>
+Our tentative policy is to consider a JavaScript program nontrivial
if:</p>
+
+<ul>
+ <li>it makes an AJAX request or is loaded along with scripts that make
+ an AJAX request,</li>
+
+ <li>it loads external scripts dynamically or is loaded along with
+ scripts that do,</li>
+
+ <li>it defines functions or methods and either loads an external script
+ (from html) or is loaded as one,</li>
+
+ <li>it uses dynamic JavaScript constructs that are difficult to analyze
+ without interpreting the program, or is loaded along with scripts
+ that use such constructs. These constructs are:
+ <ul>
+ <li>using the eval function,</li>
+ <li>calling methods with the square bracket notation,</li>
+ <li>using any other construct than a string literal with
+ certain methods (Obj.write, Obj.createElement, ...).</li>
+ </ul>
+ </li>
+</ul>
+
+<p>How do we tell whether the JavaScript code is free? At the end of
+this article we propose a convention by which a nontrivial JavaScript
+program in a web page can state the URL where its source code is
+located, and can state its license too, using stylized comments.</p>
+
+<p>Finally, we need to change free browsers to detect and block
+nontrivial nonfree JavaScript in web pages. The program
+<a href="/software/librejs/">LibreJS</a> detects nonfree,
+nontrivial JavaScript in pages you visit, and blocks it. LibreJS is
+an add-on for IceCat and IceWeasel (and Firefox).</p>
+
+<p>Browser users also need a convenient facility to specify JavaScript
+code to use <em>instead</em> of the JavaScript in a certain page.
+(The specified code might be total replacement, or a modified version
+of the free JavaScript program in that page.) Greasemonkey comes close
+to being able to do this, but not quite, since it doesn't guarantee to
+modify the JavaScript code in a page before that program starts to
+execute. Using a local proxy works, but is too inconvenient now to be
+a real solution. We need to construct a solution that is reliable and
+convenient, as well as sites for sharing changes. The GNU Project
+would like to recommend sites which are dedicated to free changes
+only.</p>
+
+<p>These features will make it possible for a JavaScript program included
+in a web page to be free in a real and practical sense. JavaScript
+will no longer be a particular obstacle to our freedom—no more than
+C and Java are now. We will be able to reject and even replace the
+nonfree nontrivial JavaScript programs, just as we reject and replace
+nonfree packages that are offered for installation in the usual way.
+Our campaign for web sites to free their JavaScript can then begin.</p>
+
+<p>In the mean time, there's one case where it is acceptable to run a
+nonfree JavaScript program: to send a complaint to the website
+operators saying they should free or remove the JavaScript code in the
+site. Please don't hesitate to enable JavaScript temporarily to do
+that—but remember to disable it again afterwards.</p>
+
+<p><strong>Thank you to <a
href="/people/people.html#mattlee">Matt Lee</a>
+and <a href="http://ejohn.org">John Resig</a> for their help in
+defining our proposed criterion, and to David Parunakian for
+helping to make me aware of the problem.</strong></p>
+
+<h3 id="AppendixA">Appendix A: a convention for releasing free
JavaScript programs</h3>
+
+<p>For references to corresponding source code, we recommend</p>
+<pre dir="ltr">
+
+ // @source:
+
+</pre>
+
+<p>followed by the URL. This satisfies the GNU GPL's requirement to
+distribute source code. If the source is on a different site, you
+must take care
+to <a href="/licenses/gpl-faq.html#SourceAndBinaryOnDifferentSites">
+handle that properly</a>. Source code is necessary for the program to
+be free.
+</p>
+
+<p>To indicate the license of the JavaScript code embedded in a page, we
+recommend putting the license notice between two notes of this form:</p>
+<pre dir="ltr">
+<!--TRANSLATORS: Do not translate these license notices. The <pre>
+ elements have dir="ltr" explicitly set to cater for RTL languages.-->
+ @licstart The following is the entire license notice for the
+ JavaScript code in this page.
+ ...
+ @licend The above is the entire license notice
+ for the JavaScript code in this page.
+
+</pre>
+<p>Of course, all of this should be contained in a multiline
comment.</p>
+
+<p>The <a href="/licenses/gpl.html">GNU GPL</a>, like many
other free
+software licenses, requires distribution of a copy of the license with
+both source and binary forms of the program. However, the GNU GPL is
+long enough that including it in a page with a JavaScript program can
+be inconvenient. You can remove that requirement, for code that you
+have the copyright on, with a license notice like this:</p>
+<pre dir="ltr">
+
+ Copyright (C) YYYY Developer
+
+ The JavaScript code in this page is free software: you can
+ redistribute it and/or modify it under the terms of the GNU
+ General Public License (GNU GPL) as published by the Free Software
+ Foundation, either version 3 of the License, or (at your option)
+ any later version. The code is distributed WITHOUT ANY WARRANTY;
+ without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
+
+ As additional permission under GNU GPL version 3 section 7, you
+ may distribute non-source (e.g., minimized or compacted) forms of
+ that code without the copy of the GNU GPL normally required by
+ section 4, provided you include this license notice and a URL
+ through which recipients can access the Corresponding Source.
+
+</pre>
+
+<p>I thank Jaffar Rumith for bringing this issue to my
attention.</p>
+
+<h3 id="AppendixB">Appendix B: Publishing free JavaScript programs as
+ a webmaster</h3>
+
+<p>If you're a webmaster deploying free JavaScript software
+ on your site, clearly and consistently publishing information about
+ those files' licenses and source code helps your visitors make
+ sure that they're running free software, and help you comply with
+ license conditions.</p>
+
+<p>One method of stating the licenses is the one described above in
+ <a href="#AppendixA">Appendix A</a>. A second
+ method, <a href="/licenses/javascript-labels.html"> JavaScript
+ license web labels</a>, can be more convenient for libraries of
+ minified JavaScript code, especially when you didn't write them.</p>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © <span class="removed"><del><strong>2009,
2010</strong></del></span> <span class="inserted"><ins><em>2009-2013,
2016</em></ins></span> Richard Stallman</p>
+
+<p>This page is licensed under a <a rel="license"
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2016/02/29 22:58:30 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
Index: philosophy/po/selling-exceptions.pl-diff.html
===================================================================
RCS file: philosophy/po/selling-exceptions.pl-diff.html
diff -N philosophy/po/selling-exceptions.pl-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/po/selling-exceptions.pl-diff.html 29 Feb 2016 22:58:30
-0000 1.1
@@ -0,0 +1,210 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/philosophy/selling-exceptions.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>Selling Exceptions <span class="inserted"><ins><em>to the GNU
GPL</em></ins></span>
+- GNU Project - Free Software Foundation</title>
+<link rel="canonical"
href="http://www.fsf.org/blogs/rms/selling-exceptions"; />
+<!--#include virtual="/philosophy/po/selling-exceptions.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Selling <span
class="removed"><del><strong>Exceptions</h2></strong></del></span> <span
class="inserted"><ins><em>Exceptions to the GNU GPL</h2></em></ins></span>
+
+<p>by <a href="http://www.stallman.org/">Richard
Stallman</a></p>
+
+<p><em>The practice of selling license exceptions became a hot
topic
+when I co-signed Knowledge Ecology International's letter warning that
+Oracle's purchase of MySQL (plus the rest of Sun) might not be good
+for MySQL.</em></p>
+
+<p><em>As the following article explains, my feelings about selling
+license exceptions are mixed. Clearly it is possible to develop
+powerful and complex software packages under the GNU GPL without
+selling exceptions, and we do this. MySQL can be developed this way
+too. However, selling exceptions has been used by MySQL developers.
+Who should decide whether to continue this? I don't think it is wise
+to give major decisions about a free software project to a large
+proprietary competitor, which might naturally prefer that the project
+develop less rather than more.</em></p>
+
+<p><em>One thing that makes no sense at all is the idea of changing
+the license of MySQL to something non-copyleft. That would eliminate
+the possibility of selling exceptions, but allow all sorts of
+proprietary modified versions. Wherever MySQL should go, it isn't
+there.</em></p>
+
+<h3>On Selling Exceptions to the GNU GPL</h3>
+
+<p>When I co-signed
+the <a href="/philosophy/ec_letter_mysql_oct19.pdf">letter objecting
+to Oracle's planned purchase of
+MySQL</a><sup><a href="#footnote">1</a></sup>
(along with the rest of
+Sun), some free software supporters were surprised that I approved of
+the practice of selling license exceptions which the MySQL developers
+have used. They expected me to condemn the practice outright. This
+article explains what I think of the practice, and why.</p>
+
+<p>Selling exceptions means that the copyright holder of the code
+releases it to the public under a free software license, then lets
+customers pay for permission to use the same code under different
+terms, for instance allowing its inclusion in proprietary
+applications.</p>
+
+<p>We must distinguish the practice of selling exceptions from something
+crucially different: purely proprietary extensions or versions of
+a free program. These two activities, even if practiced
+simultaneously by one company, are different issues. In selling
+exceptions, the same code that the exception applies to is available
+to the general public as free software. An extension or a modified
+version that is only available under a proprietary license is
+proprietary software, pure and simple, and no better than any other
+proprietary software. This article is concerned with cases that
+involve strictly and only the sale of exceptions.</p>
+
+<p>I've considered selling exceptions acceptable since the 1990s, and on
+occasion I've suggested it to companies. Sometimes this approach has
+made it possible for important programs to become free software.</p>
+
+<p>The KDE desktop was developed in the 90s based on the Qt library. Qt
+was proprietary software, and TrollTech charged for permission to
+embed it in proprietary applications. TrollTech allowed gratis use of
+Qt in free applications, but this did not make it free/libre software.
+Completely free operating systems therefore could not include Qt, so
+they could not use KDE either.</p>
+
+<p>In 1998, the management of TrollTech recognized that they could
+make Qt free software and continue charging for permission to embed it
+in proprietary software. I do not recall whether the suggestion came
+from me, but I certainly was happy to see the change, which made it
+possible to use Qt and thus KDE in the free software world.</p>
+
+<p>Initially, they used their own license, the Q Public License
+(QPL)—quite restrictive as free software licenses go, and
+incompatible with the GNU GPL. Later they switched to the GNU GPL; I
+think I had explained to them that it would work for the purpose.</p>
+
+<p>Selling exceptions depends fundamentally on using a copyleft
+license, such as the GNU GPL, for the free software release. A
+copyleft license permits embedding in a larger program only if the
+whole combined program is released under that license; this is how it
+ensures extended versions will also be free. Thus, users that want to
+make the combined program proprietary need special permission. Only
+the copyright holder can grant that, and selling exceptions is one
+style of doing so. Someone else, who received the code under the GNU
+GPL or another copyleft license, cannot grant an exception.</p>
+
+<p>When I first heard of the practice of selling exceptions, I asked
+myself whether the practice is ethical. If someone buys an exception
+to embed a program in a larger proprietary program, he's doing
+something wrong (namely, making proprietary software). Does it follow
+that the developer that sold the exception is doing something wrong
+too?</p>
+
+<p>If that implication is valid, it would also apply to releasing the
+same program under a noncopyleft free software license, such as the
+X11 license. That also permits such embedding. So either we have to
+conclude that it's wrong to release anything under the X11
+license—a conclusion I find unacceptably extreme—or reject
+this implication. Using a noncopyleft license is weak, and usually an
+inferior choice, but it's not wrong.</p>
+
+<p>In other words, selling exceptions permits limited embedding of the
+code in proprietary software, but the X11 license goes even further,
+permitting unlimited use of the code (and modified versions of it) in
+proprietary software. If this doesn't make the X11 license
+unacceptable, it doesn't make selling exceptions unacceptable.</p>
+
+<p>There are three reasons why the FSF doesn't practice selling
+exceptions. One is that it doesn't lead to the FSF's goal: assuring
+freedom for each user of our software. That's what we wrote the GNU
+GPL for, and the way to achieve this most thoroughly is to release
+under GPL version 3-or-later and not allow embedding in proprietary
+software. Selling exceptions wouldn't achieve this, just as release
+under the X11 license wouldn't. So normally we don't do either of
+those things. We release under the GPL only.</p>
+
+<p>Another reason we release only under the GPL is so as not to permit
+proprietary extensions that would present practical advantages over
+our free programs. Users for whom freedom is not a value might choose
+those non-free versions rather than the free programs they are based
+on—and lose their freedom. We don't want to encourage that.</p>
+
+<p>But there are occasional cases where, for specific reasons of
+strategy, we decide that using a more permissive license on a certain
+program is better for the cause of freedom. In those cases, we
+release the program to everyone under that permissive license.</p>
+
+<p>This is because of another ethical principle that the FSF follows:
+to treat all users the same. An idealistic campaign for freedom
+should not discriminate, so the FSF is committed to giving the same
+license to all users. The FSF never sells exceptions; whatever
+license or licenses we release a program under, that is available to
+everyone.</p>
+
+<p>But we need not insist that companies follow that principle. I
+consider selling exceptions an acceptable thing for a company to do,
+and I will suggest it where appropriate as a way to get programs
+freed.</p>
+
+<h4>Footnotes</h4>
+
+<p id="footnote">This is a local copy of the document
+from <a
href="http://keionline.org/sites/default/files/ec_letter_mysql_oct19.pdf">its
+original location</a>.</p>
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to <a
+href="mailto:address@hidden"><address@hidden></a>. There are
also <a
+href="/contact/">other ways to contact</a> the FSF. Broken links and
other
+corrections or suggestions can be sent to <a
+href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
README</a> for
+information on coordinating and submitting translations of this
article.</p>
+</div>
+
+<p>Copyright © 2009, <span
class="removed"><del><strong>2010</strong></del></span> <span
class="inserted"><ins><em>2010, 2015, 2016</em></ins></span> Richard
Stallman</p>
+
+<p>This page is licensed under a <a rel="license"
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2016/02/29 22:58:30 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
Index: philosophy/po/the-danger-of-ebooks.pt-br-diff.html
===================================================================
RCS file: philosophy/po/the-danger-of-ebooks.pt-br-diff.html
diff -N philosophy/po/the-danger-of-ebooks.pt-br-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/po/the-danger-of-ebooks.pt-br-diff.html 29 Feb 2016 22:58:30
-0000 1.1
@@ -0,0 +1,163 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/philosophy/the-danger-of-ebooks.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>The Danger of E-Books
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>The Danger of E-Books</h2>
+
+<blockquote class="note">
+<p><a href="http://defectivebydesign.org/ebooks.html">Join our
mailing list about the dangers of eBooks</a>.</p>
+</blockquote>
+
+<p>In an age where business dominates our governments and writes our
laws,
+every technological advance offers business an opportunity to impose new
+restrictions on the public. Technologies that could have empowered us are
+used to chain us instead.</p>
+
+<p>With printed books,</p>
+<ul>
+<li>You can buy one with cash, anonymously.</li>
+<li>Then you own it.</li>
+<li>You are not required to sign a license that restricts your use of
it.</li>
+<li>The format is known, and no proprietary technology is needed to read
the
+book.</li>
+<li>You can give, lend or sell the book to another.</li>
+<li>You can, physically, scan and copy the book, and it's sometimes
lawful
+under copyright.</li>
+<li>Nobody has the power to destroy your book.</li>
+</ul>
+
+<p>Contrast that with Amazon e-books (fairly typical):</p>
+<ul>
+<li>Amazon requires users to identify themselves to get an
e-book.</li>
+<li>In some countries, including the US, Amazon says the user cannot
+own the e-book.</li>
+<li>Amazon requires the user to accept a restrictive license on use of
the
+e-book.</li>
+<li>The format is secret, and only proprietary user-restricting software
can
+read it at all.</li>
+<li>An ersatz “lending” is allowed for some books, for a
limited time, but
+only by specifying by name another user of the same system. No giving or
+selling.</li>
+<li>To copy the e-book is impossible due to
+<a href="/philosophy/right-to-read.html">Digital Restrictions
Management</a>
+in the player and prohibited by the license, which is more restrictive than
+copyright law.</li>
+<li>Amazon can remotely delete the e-book using a back door. It used
this
+back door in 2009 to delete thousands of copies of George Orwell's
1984.</li>
+</ul>
+
+<p>Even one of these infringements makes e-books a step backward from
+printed books. We must reject e-books until they respect our freedom.</p>
+
+<p>The e-book companies say denying our traditional freedoms is
+necessary to continue to pay authors. The current copyright system
+supports those companies handsomely and most authors badly. We can
+support authors better in other ways that don't require curtailing our
+freedom, and even legalize sharing. Two methods I've suggested
+are:</p>
+
+<ul>
+<li>To distribute tax funds to authors based on the cube root of each
+author's <span class="removed"><del><strong>popularity. See
+<a href="http://stallman.org/articles/internet-sharing-license.en.html">
+http://stallman.org/articles/internet-sharing-license.en.html</a>.</li></strong></del></span>
<span class="inserted"><ins><em>popularity.<a
href="#footnote1">[1]</a></li></em></ins></span>
+<li>To design players so users can send authors anonymous voluntary
payments.</li>
+</ul>
+
+<p>E-books need not attack our freedom (Project Gutenberg's e-books
don't),
+but they will if companies get to decide. It's up to us to stop them.</p>
+
+<p>Join the fight: sign up
+at <a href="http://DefectiveByDesign.org/ebooks.html">
+http://DefectiveByDesign.org/ebooks.html</a>.</p>
+
+<span class="inserted"><ins><em><h4>Footnotes</h4>
+<ol>
+<li id="footnote1">See both my speech
+<a href="/philosophy/copyright-versus-community.html">“Copyright
+versus Community in the Age of Computer Networks”</a>
+and <a
href="http://stallman.org/articles/internet-sharing-license.en.html">my
+2012 open letter to the President of the Brazilian Senate</a>, Senator
+José Sarney, for more on this.</li>
+</ol></em></ins></span>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © <span
class="removed"><del><strong>2011</strong></del></span> <span
class="inserted"><ins><em>2011, 2014, 2015, 2016</em></ins></span> Richard
Stallman</p>
+
+<p>This page is licensed under a <a rel="license"
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2016/02/29 22:58:30 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www education/edu-schools.ca.html education/po/...,
GNUN <=