www-commits
[Top][All Lists]
Advanced

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

www/philosophy free-sw.ar.html free-sw.nl.html ...


From: GNUN
Subject: www/philosophy free-sw.ar.html free-sw.nl.html ...
Date: Fri, 26 Jul 2013 03:59:34 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     13/07/26 03:59:34

Modified files:
        philosophy     : free-sw.ar.html free-sw.nl.html 
                         free-sw.pt-br.html free-sw.zh-tw.html 
        philosophy/po  : free-sw.ar-diff.html free-sw.pt-br-diff.html 
Added files:
        philosophy/po  : free-sw.nl-diff.html free-sw.zh-tw-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.ar.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.nl.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.pt-br.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.zh-tw.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ar-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pt-br-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.nl-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-tw-diff.html?cvsroot=www&rev=1.1

Patches:
Index: free-sw.ar.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.ar.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- free-sw.ar.html     20 Jul 2013 14:47:34 -0000      1.46
+++ free-sw.ar.html     26 Jul 2013 03:59:31 -0000      1.47
@@ -17,6 +17,13 @@
 
 <!--#include virtual="/philosophy/po/free-sw.translist" -->
 <!--#include virtual="/server/banner.ar.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/philosophy/po/free-sw.ar.po";>
+ http://www.gnu.org/philosophy/po/free-sw.ar.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/free-sw.html" -->
+ <!--#set var="DIFF_FILE" value="/philosophy/po/free-sw.ar-diff.html" -->
+ <!--#set var="OUTDATED_SINCE" value="2013-05-27" -->
+ <!--#include virtual="/server/outdated.ar.html" -->
 <h2>ما هي البرمجيات الحرة؟</h2>
 
 <h3>تعريف البرمجيات الحرة</h3>
@@ -463,7 +470,7 @@
  <p><!-- timestamp start -->
 حُدّثت بتاريخ:
 
-$Date: 2013/07/20 14:47:34 $
+$Date: 2013/07/26 03:59:31 $
 
 <!-- timestamp end -->
 </p>

Index: free-sw.nl.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.nl.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- free-sw.nl.html     28 Feb 2013 19:11:23 -0000      1.17
+++ free-sw.nl.html     26 Jul 2013 03:59:32 -0000      1.18
@@ -17,6 +17,13 @@
 
 <!--#include virtual="/philosophy/po/free-sw.translist" -->
 <!--#include virtual="/server/banner.nl.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/philosophy/po/free-sw.nl.po";>
+ http://www.gnu.org/philosophy/po/free-sw.nl.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/free-sw.html" -->
+ <!--#set var="DIFF_FILE" value="/philosophy/po/free-sw.nl-diff.html" -->
+ <!--#set var="OUTDATED_SINCE" value="2013-05-27" -->
+ <!--#include virtual="/server/outdated.nl.html" -->
 <h2>Wat is vrije software?</h2>
 
 <h3>De Definitie van Vrije Software</h3>
@@ -486,7 +493,7 @@
  <p><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2013/02/28 19:11:23 $
+$Date: 2013/07/26 03:59:32 $
 
 <!-- timestamp end -->
 </p>

Index: free-sw.pt-br.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.pt-br.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- free-sw.pt-br.html  12 Jul 2013 10:37:20 -0000      1.19
+++ free-sw.pt-br.html  26 Jul 2013 03:59:32 -0000      1.20
@@ -17,6 +17,13 @@
 
 <!--#include virtual="/philosophy/po/free-sw.translist" -->
 <!--#include virtual="/server/banner.pt-br.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/philosophy/po/free-sw.pt-br.po";>
+ http://www.gnu.org/philosophy/po/free-sw.pt-br.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/free-sw.html" -->
+ <!--#set var="DIFF_FILE" value="/philosophy/po/free-sw.pt-br-diff.html" -->
+ <!--#set var="OUTDATED_SINCE" value="2013-05-27" -->
+ <!--#include virtual="/server/outdated.pt-br.html" -->
 <h2>O que é o software livre?</h2>
 
 <h3>A Definição de Software Livre</h3>
@@ -518,7 +525,7 @@
  <p><!-- timestamp start -->
 Última atualização: 
 
-$Date: 2013/07/12 10:37:20 $
+$Date: 2013/07/26 03:59:32 $
 
 <!-- timestamp end -->
 </p>

Index: free-sw.zh-tw.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.zh-tw.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- free-sw.zh-tw.html  3 Mar 2013 06:03:18 -0000       1.10
+++ free-sw.zh-tw.html  26 Jul 2013 03:59:32 -0000      1.11
@@ -14,6 +14,13 @@
 
 <!--#include virtual="/philosophy/po/free-sw.translist" -->
 <!--#include virtual="/server/banner.zh-tw.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/philosophy/po/free-sw.zh-tw.po";>
+ http://www.gnu.org/philosophy/po/free-sw.zh-tw.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/free-sw.html" -->
+ <!--#set var="DIFF_FILE" value="/philosophy/po/free-sw.zh-tw-diff.html" -->
+ <!--#set var="OUTDATED_SINCE" value="2013-05-27" -->
+ <!--#include virtual="/server/outdated.zh-tw.html" -->
 <h2>甚麼是自由軟體?</h2>
 
 <h3>自由軟體的定義</h3>
@@ -316,7 +323,7 @@
  <p><!-- timestamp start -->
 更新時間︰
 
-$Date: 2013/03/03 06:03:18 $
+$Date: 2013/07/26 03:59:32 $
 
 <!-- timestamp end -->
 </p>

Index: po/free-sw.ar-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ar-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/free-sw.ar-diff.html     16 Sep 2012 09:24:39 -0000      1.4
+++ po/free-sw.ar-diff.html     26 Jul 2013 03:59:33 -0000      1.5
@@ -11,16 +11,17 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-
-&lt;title&gt;What is free software? - GNU Project - Free Software Foundation 
(FSF)&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.75 
--&gt;</em></ins></span>
+&lt;title&gt;What is free software?
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
 
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;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." /&gt;
 &lt;link rel="alternate" title="What's New" 
href="http://www.gnu.org/rss/whatsnew.rss"; type="application/rss+xml" /&gt;
 &lt;link rel="alternate" title="New Free Software" 
href="http://www.gnu.org/rss/quagga.rss"; type="application/rss+xml" /&gt;
 
-&lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;!--#include virtual="/philosophy/po/free-sw.translist" --&gt;
+&lt;!--#include virtual="/server/banner.html" --&gt;
 
 &lt;h2&gt;What is free software?&lt;/h2&gt;
 
@@ -119,7 +120,7 @@
 
 &lt;p&gt;
 In order for freedoms 1 and 3 (the freedom to make changes and the
-freedom to publish <span 
class="removed"><del><strong>improved</strong></del></span> <span 
class="inserted"><ins><em>the changed</em></ins></span> versions) to be 
meaningful, you must have
+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
 &ldquo;source code&rdquo; is not real source code and does not count
@@ -185,8 +186,8 @@
 
 &lt;p&gt;
 Whether a change constitutes an improvement is a subjective matter.
-If your <span class="removed"><del><strong>modifications 
are</strong></del></span> <span class="inserted"><ins><em>right to modify a 
program is</em></ins></span> limited, in substance, to changes that
-someone else considers an improvement, that <span 
class="inserted"><ins><em>program</em></ins></span> is not <span 
class="removed"><del><strong>freedom.</strong></del></span> <span 
class="inserted"><ins><em>free.</em></ins></span>
+If your right to modify a program is limited, in substance, to changes that
+someone else considers an improvement, that program is not free.
 &lt;/p&gt;
 
 &lt;p&gt;
@@ -202,7 +203,7 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-A special issue arises when a license requires changing the name by
+<span class="removed"><del><strong>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
@@ -210,7 +211,7 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.&lt;/p&gt;
 
-&lt;p&gt;
+&lt;p&gt;</strong></del></span>
 Rules that &ldquo;if you make your version available in this way, you
 must make it available in that way also&rdquo; can be acceptable too,
 on the same condition.  An example of such an acceptable rule is one
@@ -223,6 +224,15 @@
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>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.&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
 In the GNU project, we use 
 &lt;a href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;
 to protect these freedoms legally for everyone.  But 
@@ -241,11 +251,21 @@
 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 export regulations as a condition of
-any of the essential freedoms.
+must not require obedience to any <span 
class="inserted"><ins><em>nontrivial</em></ins></span> export regulations as a
+condition of <span class="inserted"><ins><em>exercising</em></ins></span> any 
of the essential freedoms.
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>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.
+&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
 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
@@ -347,12 +367,16 @@
 &lt;h3 id="History"&gt;History&lt;/h3&gt;
 
 &lt;p&gt;From time to time we revise this Free Software Definition.  Here is
-the list of changes, along with links to show exactly what was
-changed.&lt;/p&gt;
+the list of <span class="inserted"><ins><em>substantive</em></ins></span> 
changes, along with links to show exactly what
+was changed.&lt;/p&gt;
 
 &lt;ul&gt;
 
-&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111"&gt;Version
+&lt;li&gt;&lt;a <span 
class="inserted"><ins><em>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122"&gt;Version
+1.122&lt;/a&gt;: An export control requirement is a real problem if the
+requirement is nontrivial; otherwise it is only a potential problem.&lt;/li&gt;
+
+&lt;li&gt;&lt;a</em></ins></span> 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111"&gt;Version
 1.111&lt;/a&gt;: Clarify 1.77 by saying that only
 retroactive &lt;em&gt;restrictions&lt;/em&gt; are unacceptable.  The copyright
 holders can always grant additional &lt;em&gt;permission&lt;/em&gt; for use of 
the
@@ -442,49 +466,84 @@
 the &lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb
 interface&lt;/a&gt;.&lt;/p&gt;
 
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
 
-&lt;!--#include virtual="/server/footer.html" --&gt;
 
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for id="content", starts 
in the include above --&gt;</em></ins></span>
+&lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
 
-&lt;p&gt;
-Please send FSF &amp; GNU inquiries to 
+<span class="removed"><del><strong>&lt;p&gt;
+Please</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
 &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt; 
 the FSF.
-&lt;br /&gt;
-Please send broken links and other corrections or suggestions to
-&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+<span class="removed"><del><strong>&lt;br /&gt;
+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 &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- 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 &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;</em></ins></span>
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this <span class="removed"><del><strong>article.
 &lt;/p&gt;
 
 &lt;p&gt;
-Please see the 
-&lt;a href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting
-translations of this article.
-&lt;/p&gt;
+Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+
+&lt;!-- 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
+     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. --&gt;
+
+&lt;p&gt;Copyright</em></ins></span> &copy; 1996-2002, 2004-2007, 2009, 2010, 
<span class="removed"><del><strong>2012</strong></del></span> <span 
class="inserted"><ins><em>2012, 2013</em></ins></span>
+Free Software Foundation, <span class="removed"><del><strong>Inc.
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Inc.&lt;/p&gt;</em></ins></span>
 
-&lt;p&gt;
-Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software 
-Foundation, Inc.
-&lt;/p&gt;
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.
-&lt;/p&gt;
+Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
-&lt;p&gt;
-Updated:
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2012/09/16 09:24:39 $
+$Date: 2013/07/26 03:59:33 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-
-
 &lt;/div&gt;
-
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: po/free-sw.pt-br-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pt-br-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/free-sw.pt-br-diff.html  16 Sep 2012 09:24:39 -0000      1.4
+++ po/free-sw.pt-br-diff.html  26 Jul 2013 03:59:33 -0000      1.5
@@ -11,16 +11,17 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-
-&lt;title&gt;What is free software? - GNU Project - Free Software Foundation 
(FSF)&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.75 
--&gt;</em></ins></span>
+&lt;title&gt;What is free software?
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
 
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;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." /&gt;
 &lt;link rel="alternate" title="What's New" 
href="http://www.gnu.org/rss/whatsnew.rss"; type="application/rss+xml" /&gt;
 &lt;link rel="alternate" title="New Free Software" 
href="http://www.gnu.org/rss/quagga.rss"; type="application/rss+xml" /&gt;
 
-&lt;!--#include virtual="/server/banner.html" --&gt;
 &lt;!--#include virtual="/philosophy/po/free-sw.translist" --&gt;
+&lt;!--#include virtual="/server/banner.html" --&gt;
 
 &lt;h2&gt;What is free software?&lt;/h2&gt;
 
@@ -119,7 +120,7 @@
 
 &lt;p&gt;
 In order for freedoms 1 and 3 (the freedom to make changes and the
-freedom to publish <span 
class="removed"><del><strong>improved</strong></del></span> <span 
class="inserted"><ins><em>the changed</em></ins></span> versions) to be 
meaningful, you must have
+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
 &ldquo;source code&rdquo; is not real source code and does not count
@@ -185,8 +186,8 @@
 
 &lt;p&gt;
 Whether a change constitutes an improvement is a subjective matter.
-If your <span class="removed"><del><strong>modifications 
are</strong></del></span> <span class="inserted"><ins><em>right to modify a 
program is</em></ins></span> limited, in substance, to changes that
-someone else considers an improvement, that <span 
class="inserted"><ins><em>program</em></ins></span> is not <span 
class="removed"><del><strong>freedom.</strong></del></span> <span 
class="inserted"><ins><em>free.</em></ins></span>
+If your right to modify a program is limited, in substance, to changes that
+someone else considers an improvement, that program is not free.
 &lt;/p&gt;
 
 &lt;p&gt;
@@ -202,7 +203,7 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-A special issue arises when a license requires changing the name by
+<span class="removed"><del><strong>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
@@ -210,7 +211,7 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.&lt;/p&gt;
 
-&lt;p&gt;
+&lt;p&gt;</strong></del></span>
 Rules that &ldquo;if you make your version available in this way, you
 must make it available in that way also&rdquo; can be acceptable too,
 on the same condition.  An example of such an acceptable rule is one
@@ -223,6 +224,15 @@
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>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.&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
 In the GNU project, we use 
 &lt;a href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;
 to protect these freedoms legally for everyone.  But 
@@ -241,11 +251,21 @@
 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 export regulations as a condition of
-any of the essential freedoms.
+must not require obedience to any <span 
class="inserted"><ins><em>nontrivial</em></ins></span> export regulations as a
+condition of <span class="inserted"><ins><em>exercising</em></ins></span> any 
of the essential freedoms.
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>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.
+&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
 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
@@ -311,9 +331,7 @@
 and avoid various practical problems.
 &lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h2</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;h3</em></ins></span> 
id="beyond-software"&gt;Beyond <span 
class="removed"><del><strong>Software&lt;/h2&gt;</strong></del></span> <span 
class="inserted"><ins><em>Software&lt;/h3&gt;</em></ins></span>
+&lt;h3 id="beyond-software"&gt;Beyond Software&lt;/h3&gt;
 
 &lt;p&gt;
 &lt;a href="/philosophy/free-doc.html"&gt;Software manuals must be 
free&lt;/a&gt;,
@@ -335,9 +353,7 @@
 free cultural works&lt;/a&gt; applicable to any kind of works.
 &lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h2</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;h3</em></ins></span> 
id="open-source"&gt;Open <span 
class="removed"><del><strong>Source?&lt;/h2&gt;</strong></del></span> <span 
class="inserted"><ins><em>Source?&lt;/h3&gt;</em></ins></span>
+&lt;h3 id="open-source"&gt;Open Source?&lt;/h3&gt;
 
 &lt;p&gt;
 Another group has started using the term &ldquo;open source&rdquo; to mean
@@ -348,17 +364,19 @@
 never refers to freedom&lt;/a&gt;.
 &lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;h2 
id="History"&gt;History&lt;/h2&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;h3 
id="History"&gt;History&lt;/h3&gt;</em></ins></span>
+&lt;h3 id="History"&gt;History&lt;/h3&gt;
 
 &lt;p&gt;From time to time we revise this Free Software Definition.  Here is
-the list of changes, along with links to show exactly what was
-changed.&lt;/p&gt;
+the list of <span class="inserted"><ins><em>substantive</em></ins></span> 
changes, along with links to show exactly what
+was changed.&lt;/p&gt;
 
 &lt;ul&gt;
 
-&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111"&gt;Version
+&lt;li&gt;&lt;a <span 
class="inserted"><ins><em>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122"&gt;Version
+1.122&lt;/a&gt;: An export control requirement is a real problem if the
+requirement is nontrivial; otherwise it is only a potential problem.&lt;/li&gt;
+
+&lt;li&gt;&lt;a</em></ins></span> 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111"&gt;Version
 1.111&lt;/a&gt;: Clarify 1.77 by saying that only
 retroactive &lt;em&gt;restrictions&lt;/em&gt; are unacceptable.  The copyright
 holders can always grant additional &lt;em&gt;permission&lt;/em&gt; for use of 
the
@@ -448,50 +466,84 @@
 the &lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb
 interface&lt;/a&gt;.&lt;/p&gt;
 
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
 
-&lt;!--#include virtual="/server/footer.html" --&gt;
 
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for id="content", starts 
in the include above --&gt;</em></ins></span>
+&lt;!--#include virtual="/server/footer.html" --&gt;
 &lt;div id="footer"&gt;
 
-&lt;p&gt;
-Please send FSF &amp; GNU inquiries to 
+<span class="removed"><del><strong>&lt;p&gt;
+Please</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
 &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt; 
 the FSF.
-&lt;br /&gt;
-Please send broken links and other corrections or suggestions to
-&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+<span class="removed"><del><strong>&lt;br /&gt;
+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 &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- 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 &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;</em></ins></span>
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this <span class="removed"><del><strong>article.
 &lt;/p&gt;
 
 &lt;p&gt;
-Please see the 
-&lt;a href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting
-translations of this article.
-&lt;/p&gt;
+Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+
+&lt;!-- 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
+     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. --&gt;
+
+&lt;p&gt;Copyright</em></ins></span> &copy; 1996-2002, 2004-2007, 2009, 2010, 
<span class="removed"><del><strong>2012</strong></del></span> <span 
class="inserted"><ins><em>2012, 2013</em></ins></span>
+Free Software Foundation, <span class="removed"><del><strong>Inc.
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Inc.&lt;/p&gt;</em></ins></span>
 
-&lt;p&gt;
-Copyright &copy; <span class="removed"><del><strong>1996, 1997, 1998, 1999, 
2000, 2001, 2002, 2004,
-2005, 2006, 2007,</strong></del></span> <span 
class="inserted"><ins><em>1996-2002, 2004-2007,</em></ins></span> 2009, <span 
class="removed"><del><strong>2010</strong></del></span> <span 
class="inserted"><ins><em>2010, 2012</em></ins></span> Free Software 
-Foundation, Inc.
-&lt;/p&gt;
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States License&lt;/a&gt;.
-&lt;/p&gt;
+Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
-&lt;p&gt;
-Updated:
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2012/09/16 09:24:39 $
+$Date: 2013/07/26 03:59:33 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-
-
 &lt;/div&gt;
-
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: po/free-sw.nl-diff.html
===================================================================
RCS file: po/free-sw.nl-diff.html
diff -N po/free-sw.nl-diff.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ po/free-sw.nl-diff.html     26 Jul 2013 03:59:33 -0000      1.1
@@ -0,0 +1,549 @@
+<!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>
+&lt;!--#include virtual="/server/header.html" --&gt;
+<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.75 
--&gt;</em></ins></span>
+&lt;title&gt;What is free software?
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
+
+&lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
+&lt;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." /&gt;
+&lt;link rel="alternate" title="What's New" 
href="http://www.gnu.org/rss/whatsnew.rss"; type="application/rss+xml" /&gt;
+&lt;link rel="alternate" title="New Free Software" 
href="http://www.gnu.org/rss/quagga.rss"; type="application/rss+xml" /&gt;
+
+&lt;!--#include virtual="/philosophy/po/free-sw.translist" --&gt;
+&lt;!--#include virtual="/server/banner.html" --&gt;
+
+&lt;h2&gt;What is free software?&lt;/h2&gt;
+
+&lt;h3&gt;The Free Software Definition&lt;/h3&gt;
+
+&lt;blockquote&gt;
+&lt;p&gt;
+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 &lt;a href="#History"&gt;History 
section&lt;/a&gt;
+below for a list of changes that affect the definition of free
+software.
+&lt;/p&gt;
+&lt;/blockquote&gt;
+
+&lt;p&gt;
+&ldquo;Free software&rdquo; means software that respects users'
+freedom and community.  Roughly, &lt;b&gt;the users have the freedom to run,
+copy, distribute, study, change and improve the software&lt;/b&gt;.  With these
+freedoms, the users (both individually and collectively) control the
+program and what it does for them.
+&lt;/p&gt;
+
+&lt;p&gt;
+When users don't control the program, the program controls the users.
+The developer controls the program, and through it controls the users.
+This nonfree or &ldquo;proprietary&rdquo; program is therefore an
+instrument of unjust power.
+&lt;/p&gt;
+
+&lt;p&gt;
+Thus, &ldquo;free software&rdquo; is a matter of liberty, not price.
+To understand the concept, you should think of &ldquo;free&rdquo; as
+in &ldquo;free speech,&rdquo; not as in &ldquo;free beer&rdquo;.
+&lt;/p&gt;
+
+&lt;p&gt;
+A program is free software if the program's users have the
+four essential freedoms:
+&lt;/p&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;The freedom to run the program, for any purpose (freedom 
0).&lt;/li&gt;
+  &lt;li&gt;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.
+  &lt;/li&gt;
+  &lt;li&gt;The freedom to redistribute copies so you can help your neighbor
+      (freedom 2).
+  &lt;/li&gt;
+  &lt;li&gt;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.
+  &lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;
+A program is free software if users have all of these freedoms.  Thus,
+you should be free to redistribute copies, either with or without
+modifications, either gratis or charging a fee for distribution, to
+&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
+things means (among other things) that you do not have to ask or pay
+for permission to do so.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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 &lt;em&gt;user's&lt;/em&gt; purpose that matters, not the 
&lt;em&gt;developer's&lt;/em&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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
+&ldquo;source code&rdquo; is not real source code and does not count
+as source code.
+&lt;/p&gt;
+
+&lt;p&gt;
+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 &mdash; a
+practice known as &ldquo;tivoization&rdquo; or &ldquo;lockdown&rdquo;,
+or (in its practitioners' perverse terminology) as &ldquo;secure
+boot&rdquo; &mdash; freedom 1 becomes a theoretical fiction rather
+than a practical freedom.  This is not sufficient.  In other words,
+these binaries are not free software even if the source code they are
+compiled from is free.
+&lt;/p&gt;
+
+&lt;p&gt;
+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 &mdash; for instance, if it
+requires you to be the copyright holder of any code you add &mdash; then the
+license is too restrictive to qualify as free.
+&lt;/p&gt;
+
+&lt;p&gt;
+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 &lt;a href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt; license.  
However, a
+license that requires modified versions to be nonfree does not qualify
+as a free license.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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, copyleft (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.
+&lt;/p&gt;
+
+&lt;p&gt;
+&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  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 
+&lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+<span class="removed"><del><strong>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.&lt;/p&gt;
+
+&lt;p&gt;</strong></del></span>
+Rules that &ldquo;if you make your version available in this way, you
+must make it available in that way also&rdquo; 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.
+&lt;/p&gt;
+
+&lt;p&gt;
+<span class="inserted"><ins><em>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.&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
+In the GNU project, we use 
+&lt;a href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;
+to protect these freedoms legally for everyone.  But 
+&lt;a 
href="/philosophy/categories.html#Non-CopyleftedFreeSoftware"&gt;noncopylefted
+free software&lt;/a&gt; also exists.  We believe there are important reasons 
why
+&lt;a href="/philosophy/pragmatic.html"&gt;it is better to use 
copyleft&lt;/a&gt;,
+but if your program is noncopylefted free software, it is still basically
+ethical. (See &lt;a href="/philosophy/categories.html"&gt;Categories of Free 
Software&lt;/a&gt; for a description of how &ldquo;free software,&rdquo; 
&ldquo;copylefted software&rdquo; and other categories of software relate to 
each other.)
+&lt;/p&gt;
+
+&lt;p&gt;
+Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
+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 <span 
class="inserted"><ins><em>nontrivial</em></ins></span> export regulations as a
+condition of <span class="inserted"><ins><em>exercising</em></ins></span> any 
of the essential freedoms.
+&lt;/p&gt;
+
+&lt;p&gt;
+<span class="inserted"><ins><em>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.
+&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+When talking about free software, it is best to avoid using terms
+like &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms 
imply that
+the issue is about price, not freedom.  Some common terms such
+as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See 
+&lt;a href="/philosophy/words-to-avoid.html"&gt;Confusing Words and Phrases 
that
+are Worth Avoiding&lt;/a&gt; for a discussion of these terms.  We also have
+a list of proper &lt;a href="/philosophy/fs-translations.html"&gt;translations 
of
+&ldquo;free software&rdquo;&lt;/a&gt; into various languages.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+If you are interested in whether a specific license qualifies as a free
+software license, see our &lt;a href="/licenses/license-list.html"&gt;list
+of licenses&lt;/a&gt;.  If the license you are concerned with is not
+listed there, you can ask us about it by sending us email at 
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+&lt;/p&gt; 
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;h3 id="beyond-software"&gt;Beyond Software&lt;/h3&gt;
+
+&lt;p&gt;
+&lt;a href="/philosophy/free-doc.html"&gt;Software manuals must be 
free&lt;/a&gt;,
+for the same reasons that software must be free, and because the
+manuals are in effect part of the software.
+&lt;/p&gt;
+
+&lt;p&gt;
+The same arguments also make sense for other kinds of works of
+practical use &mdash; that is to say, works that embody useful knowledge,
+such as educational works and reference
+works.  &lt;a href="http://wikipedia.org"&gt;Wikipedia&lt;/a&gt; is the 
best-known
+example.
+&lt;/p&gt;
+
+&lt;p&gt;
+Any kind of work &lt;em&gt;can&lt;/em&gt; be free, and the definition of free 
software
+has been extended to a definition of &lt;a 
href="http://freedomdefined.org/"&gt;
+free cultural works&lt;/a&gt; applicable to any kind of works.
+&lt;/p&gt;
+
+&lt;h3 id="open-source"&gt;Open Source?&lt;/h3&gt;
+
+&lt;p&gt;
+Another group has started using the term &ldquo;open source&rdquo; to mean
+something close (but not identical) to &ldquo;free software&rdquo;.  We
+prefer the term &ldquo;free software&rdquo; because, once you have heard that
+it refers to freedom rather than price, it calls to mind freedom.  The
+word &ldquo;open&rdquo; &lt;a 
href="/philosophy/open-source-misses-the-point.html"&gt;
+never refers to freedom&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;h3 id="History"&gt;History&lt;/h3&gt;
+
+&lt;p&gt;From time to time we revise this Free Software Definition.  Here is
+the list of <span class="inserted"><ins><em>substantive</em></ins></span> 
changes, along with links to show exactly what
+was changed.&lt;/p&gt;
+
+&lt;ul&gt;
+
+&lt;li&gt;&lt;a <span 
class="inserted"><ins><em>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122"&gt;Version
+1.122&lt;/a&gt;: An export control requirement is a real problem if the
+requirement is nontrivial; otherwise it is only a potential problem.&lt;/li&gt;
+
+&lt;li&gt;&lt;a</em></ins></span> 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111"&gt;Version
+1.111&lt;/a&gt;: Clarify 1.77 by saying that only
+retroactive &lt;em&gt;restrictions&lt;/em&gt; are unacceptable.  The copyright
+holders can always grant additional &lt;em&gt;permission&lt;/em&gt; for use of 
the
+work by releasing the work in another way in parallel.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.104&amp;r2=1.105"&gt;Version
+1.105&lt;/a&gt;: 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.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.91&amp;r2=1.92"&gt;Version
+1.92&lt;/a&gt;: Clarify that obfuscated code does not qualify as source 
code.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.89&amp;r2=1.90"&gt;Version
+1.90&lt;/a&gt;: 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.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.88&amp;r2=1.89"&gt;Version
+1.89&lt;/a&gt;: Freedom 3 includes the right to release modified versions as
+free software.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.79&amp;r2=1.80"&gt;Version
+1.80&lt;/a&gt;: Freedom 1 must be practical, not just theoretical;
+i.e., no tivoization.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.76&amp;r2=1.77"&gt;Version
+1.77&lt;/a&gt;: Clarify that all retroactive changes to the license are
+unacceptable, even if it's not described as a complete
+replacement.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.73&amp;r2=1.74"&gt;Version
+1.74&lt;/a&gt;: Four clarifications of points not explicit enough, or stated
+in some places but not reflected everywhere:
+&lt;ul&gt;
+&lt;li&gt;"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.&lt;/li&gt;
+&lt;li&gt;The right to merge in existing modules
+refers to those that are suitably licensed.&lt;/li&gt;
+&lt;li&gt;Explicitly state the conclusion of the point about export 
controls.&lt;/li&gt;
+&lt;li&gt;Imposing a license change constitutes revoking the old 
license.&lt;/li&gt;
+&lt;/ul&gt;
+&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.56&amp;r2=1.57"&gt;Version
+1.57&lt;/a&gt;: Add &quot;Beyond Software&quot; section.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.45&amp;r2=1.46"&gt;Version
+1.46&lt;/a&gt;: Clarify whose purpose is significant in the freedom to run
+the program for any purpose.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.40&amp;r2=1.41"&gt;Version
+1.41&lt;/a&gt;: Clarify wording about contract-based licenses.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.39&amp;r2=1.40"&gt;Version
+1.40&lt;/a&gt;: Explain that a free license must allow to you use other
+available free software to create your modifications.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.38&amp;r2=1.39"&gt;Version
+1.39&lt;/a&gt;: Note that it is acceptable for a license to require you to
+provide source for versions of the software you put into public
+use.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.30&amp;r2=1.31"&gt;Version
+1.31&lt;/a&gt;: 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.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23"&gt;Version
+1.23&lt;/a&gt;: Address potential problems related to contract-based
+licenses.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.15&amp;r2=1.16"&gt;Version
+1.16&lt;/a&gt;: Explain why distribution of binaries is important.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.10&amp;r2=1.11"&gt;Version
+1.11&lt;/a&gt;: Note that a free license may require you to send a copy of
+versions you distribute to the author.&lt;/li&gt;
+
+&lt;/ul&gt;
+
+&lt;p&gt;There are gaps in the version numbers shown above because there are
+other changes in this page that do not affect the definition as such.
+These changes are in other parts of the page.  You can review the
+complete list of changes to the page through
+the &lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb
+interface&lt;/a&gt;.&lt;/p&gt;
+
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+
+
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for id="content", starts 
in the include above --&gt;</em></ins></span>
+&lt;!--#include virtual="/server/footer.html" --&gt;
+&lt;div id="footer"&gt;
+
+<span class="removed"><del><strong>&lt;p&gt;
+Please</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
+the FSF.
+<span class="removed"><del><strong>&lt;br /&gt;
+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 &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- 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 &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;</em></ins></span>
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this <span class="removed"><del><strong>article.
+&lt;/p&gt;
+
+&lt;p&gt;
+Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+
+&lt;!-- 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
+     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. --&gt;
+
+&lt;p&gt;Copyright</em></ins></span> &copy; 1996-2002, 2004-2007, 2009, 2010, 
<span class="removed"><del><strong>2012</strong></del></span> <span 
class="inserted"><ins><em>2012, 2013</em></ins></span>
+Free Software Foundation, <span class="removed"><del><strong>Inc.
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Inc.&lt;/p&gt;</em></ins></span>
+
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
+Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p&gt;Updated:
+&lt;!-- timestamp start --&gt;
+$Date: 2013/07/26 03:59:33 $
+&lt;!-- timestamp end --&gt;
+&lt;/p&gt;
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre></body></html>

Index: po/free-sw.zh-tw-diff.html
===================================================================
RCS file: po/free-sw.zh-tw-diff.html
diff -N po/free-sw.zh-tw-diff.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ po/free-sw.zh-tw-diff.html  26 Jul 2013 03:59:33 -0000      1.1
@@ -0,0 +1,549 @@
+<!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>
+&lt;!--#include virtual="/server/header.html" --&gt;
+<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.75 
--&gt;</em></ins></span>
+&lt;title&gt;What is free software?
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
+
+&lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
+&lt;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." /&gt;
+&lt;link rel="alternate" title="What's New" 
href="http://www.gnu.org/rss/whatsnew.rss"; type="application/rss+xml" /&gt;
+&lt;link rel="alternate" title="New Free Software" 
href="http://www.gnu.org/rss/quagga.rss"; type="application/rss+xml" /&gt;
+
+&lt;!--#include virtual="/philosophy/po/free-sw.translist" --&gt;
+&lt;!--#include virtual="/server/banner.html" --&gt;
+
+&lt;h2&gt;What is free software?&lt;/h2&gt;
+
+&lt;h3&gt;The Free Software Definition&lt;/h3&gt;
+
+&lt;blockquote&gt;
+&lt;p&gt;
+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 &lt;a href="#History"&gt;History 
section&lt;/a&gt;
+below for a list of changes that affect the definition of free
+software.
+&lt;/p&gt;
+&lt;/blockquote&gt;
+
+&lt;p&gt;
+&ldquo;Free software&rdquo; means software that respects users'
+freedom and community.  Roughly, &lt;b&gt;the users have the freedom to run,
+copy, distribute, study, change and improve the software&lt;/b&gt;.  With these
+freedoms, the users (both individually and collectively) control the
+program and what it does for them.
+&lt;/p&gt;
+
+&lt;p&gt;
+When users don't control the program, the program controls the users.
+The developer controls the program, and through it controls the users.
+This nonfree or &ldquo;proprietary&rdquo; program is therefore an
+instrument of unjust power.
+&lt;/p&gt;
+
+&lt;p&gt;
+Thus, &ldquo;free software&rdquo; is a matter of liberty, not price.
+To understand the concept, you should think of &ldquo;free&rdquo; as
+in &ldquo;free speech,&rdquo; not as in &ldquo;free beer&rdquo;.
+&lt;/p&gt;
+
+&lt;p&gt;
+A program is free software if the program's users have the
+four essential freedoms:
+&lt;/p&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;The freedom to run the program, for any purpose (freedom 
0).&lt;/li&gt;
+  &lt;li&gt;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.
+  &lt;/li&gt;
+  &lt;li&gt;The freedom to redistribute copies so you can help your neighbor
+      (freedom 2).
+  &lt;/li&gt;
+  &lt;li&gt;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.
+  &lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;p&gt;
+A program is free software if users have all of these freedoms.  Thus,
+you should be free to redistribute copies, either with or without
+modifications, either gratis or charging a fee for distribution, to
+&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
+things means (among other things) that you do not have to ask or pay
+for permission to do so.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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 &lt;em&gt;user's&lt;/em&gt; purpose that matters, not the 
&lt;em&gt;developer's&lt;/em&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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
+&ldquo;source code&rdquo; is not real source code and does not count
+as source code.
+&lt;/p&gt;
+
+&lt;p&gt;
+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 &mdash; a
+practice known as &ldquo;tivoization&rdquo; or &ldquo;lockdown&rdquo;,
+or (in its practitioners' perverse terminology) as &ldquo;secure
+boot&rdquo; &mdash; freedom 1 becomes a theoretical fiction rather
+than a practical freedom.  This is not sufficient.  In other words,
+these binaries are not free software even if the source code they are
+compiled from is free.
+&lt;/p&gt;
+
+&lt;p&gt;
+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 &mdash; for instance, if it
+requires you to be the copyright holder of any code you add &mdash; then the
+license is too restrictive to qualify as free.
+&lt;/p&gt;
+
+&lt;p&gt;
+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 &lt;a href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt; license.  
However, a
+license that requires modified versions to be nonfree does not qualify
+as a free license.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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, copyleft (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.
+&lt;/p&gt;
+
+&lt;p&gt;
+&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  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 
+&lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+<span class="removed"><del><strong>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.&lt;/p&gt;
+
+&lt;p&gt;</strong></del></span>
+Rules that &ldquo;if you make your version available in this way, you
+must make it available in that way also&rdquo; 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.
+&lt;/p&gt;
+
+&lt;p&gt;
+<span class="inserted"><ins><em>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.&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
+In the GNU project, we use 
+&lt;a href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;
+to protect these freedoms legally for everyone.  But 
+&lt;a 
href="/philosophy/categories.html#Non-CopyleftedFreeSoftware"&gt;noncopylefted
+free software&lt;/a&gt; also exists.  We believe there are important reasons 
why
+&lt;a href="/philosophy/pragmatic.html"&gt;it is better to use 
copyleft&lt;/a&gt;,
+but if your program is noncopylefted free software, it is still basically
+ethical. (See &lt;a href="/philosophy/categories.html"&gt;Categories of Free 
Software&lt;/a&gt; for a description of how &ldquo;free software,&rdquo; 
&ldquo;copylefted software&rdquo; and other categories of software relate to 
each other.)
+&lt;/p&gt;
+
+&lt;p&gt;
+Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
+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 <span 
class="inserted"><ins><em>nontrivial</em></ins></span> export regulations as a
+condition of <span class="inserted"><ins><em>exercising</em></ins></span> any 
of the essential freedoms.
+&lt;/p&gt;
+
+&lt;p&gt;
+<span class="inserted"><ins><em>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.
+&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+When talking about free software, it is best to avoid using terms
+like &ldquo;give away&rdquo; or &ldquo;for free,&rdquo; because those terms 
imply that
+the issue is about price, not freedom.  Some common terms such
+as &ldquo;piracy&rdquo; embody opinions we hope you won't endorse.  See 
+&lt;a href="/philosophy/words-to-avoid.html"&gt;Confusing Words and Phrases 
that
+are Worth Avoiding&lt;/a&gt; for a discussion of these terms.  We also have
+a list of proper &lt;a href="/philosophy/fs-translations.html"&gt;translations 
of
+&ldquo;free software&rdquo;&lt;/a&gt; into various languages.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+If you are interested in whether a specific license qualifies as a free
+software license, see our &lt;a href="/licenses/license-list.html"&gt;list
+of licenses&lt;/a&gt;.  If the license you are concerned with is not
+listed there, you can ask us about it by sending us email at 
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+&lt;/p&gt; 
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;p&gt;
+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.
+&lt;/p&gt;
+
+&lt;h3 id="beyond-software"&gt;Beyond Software&lt;/h3&gt;
+
+&lt;p&gt;
+&lt;a href="/philosophy/free-doc.html"&gt;Software manuals must be 
free&lt;/a&gt;,
+for the same reasons that software must be free, and because the
+manuals are in effect part of the software.
+&lt;/p&gt;
+
+&lt;p&gt;
+The same arguments also make sense for other kinds of works of
+practical use &mdash; that is to say, works that embody useful knowledge,
+such as educational works and reference
+works.  &lt;a href="http://wikipedia.org"&gt;Wikipedia&lt;/a&gt; is the 
best-known
+example.
+&lt;/p&gt;
+
+&lt;p&gt;
+Any kind of work &lt;em&gt;can&lt;/em&gt; be free, and the definition of free 
software
+has been extended to a definition of &lt;a 
href="http://freedomdefined.org/"&gt;
+free cultural works&lt;/a&gt; applicable to any kind of works.
+&lt;/p&gt;
+
+&lt;h3 id="open-source"&gt;Open Source?&lt;/h3&gt;
+
+&lt;p&gt;
+Another group has started using the term &ldquo;open source&rdquo; to mean
+something close (but not identical) to &ldquo;free software&rdquo;.  We
+prefer the term &ldquo;free software&rdquo; because, once you have heard that
+it refers to freedom rather than price, it calls to mind freedom.  The
+word &ldquo;open&rdquo; &lt;a 
href="/philosophy/open-source-misses-the-point.html"&gt;
+never refers to freedom&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;h3 id="History"&gt;History&lt;/h3&gt;
+
+&lt;p&gt;From time to time we revise this Free Software Definition.  Here is
+the list of <span class="inserted"><ins><em>substantive</em></ins></span> 
changes, along with links to show exactly what
+was changed.&lt;/p&gt;
+
+&lt;ul&gt;
+
+&lt;li&gt;&lt;a <span 
class="inserted"><ins><em>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122"&gt;Version
+1.122&lt;/a&gt;: An export control requirement is a real problem if the
+requirement is nontrivial; otherwise it is only a potential problem.&lt;/li&gt;
+
+&lt;li&gt;&lt;a</em></ins></span> 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111"&gt;Version
+1.111&lt;/a&gt;: Clarify 1.77 by saying that only
+retroactive &lt;em&gt;restrictions&lt;/em&gt; are unacceptable.  The copyright
+holders can always grant additional &lt;em&gt;permission&lt;/em&gt; for use of 
the
+work by releasing the work in another way in parallel.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.104&amp;r2=1.105"&gt;Version
+1.105&lt;/a&gt;: 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.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.91&amp;r2=1.92"&gt;Version
+1.92&lt;/a&gt;: Clarify that obfuscated code does not qualify as source 
code.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.89&amp;r2=1.90"&gt;Version
+1.90&lt;/a&gt;: 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.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.88&amp;r2=1.89"&gt;Version
+1.89&lt;/a&gt;: Freedom 3 includes the right to release modified versions as
+free software.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.79&amp;r2=1.80"&gt;Version
+1.80&lt;/a&gt;: Freedom 1 must be practical, not just theoretical;
+i.e., no tivoization.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.76&amp;r2=1.77"&gt;Version
+1.77&lt;/a&gt;: Clarify that all retroactive changes to the license are
+unacceptable, even if it's not described as a complete
+replacement.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.73&amp;r2=1.74"&gt;Version
+1.74&lt;/a&gt;: Four clarifications of points not explicit enough, or stated
+in some places but not reflected everywhere:
+&lt;ul&gt;
+&lt;li&gt;"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.&lt;/li&gt;
+&lt;li&gt;The right to merge in existing modules
+refers to those that are suitably licensed.&lt;/li&gt;
+&lt;li&gt;Explicitly state the conclusion of the point about export 
controls.&lt;/li&gt;
+&lt;li&gt;Imposing a license change constitutes revoking the old 
license.&lt;/li&gt;
+&lt;/ul&gt;
+&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.56&amp;r2=1.57"&gt;Version
+1.57&lt;/a&gt;: Add &quot;Beyond Software&quot; section.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.45&amp;r2=1.46"&gt;Version
+1.46&lt;/a&gt;: Clarify whose purpose is significant in the freedom to run
+the program for any purpose.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.40&amp;r2=1.41"&gt;Version
+1.41&lt;/a&gt;: Clarify wording about contract-based licenses.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.39&amp;r2=1.40"&gt;Version
+1.40&lt;/a&gt;: Explain that a free license must allow to you use other
+available free software to create your modifications.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.38&amp;r2=1.39"&gt;Version
+1.39&lt;/a&gt;: Note that it is acceptable for a license to require you to
+provide source for versions of the software you put into public
+use.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.30&amp;r2=1.31"&gt;Version
+1.31&lt;/a&gt;: 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.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23"&gt;Version
+1.23&lt;/a&gt;: Address potential problems related to contract-based
+licenses.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.15&amp;r2=1.16"&gt;Version
+1.16&lt;/a&gt;: Explain why distribution of binaries is important.&lt;/li&gt;
+
+&lt;li&gt;&lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.10&amp;r2=1.11"&gt;Version
+1.11&lt;/a&gt;: Note that a free license may require you to send a copy of
+versions you distribute to the author.&lt;/li&gt;
+
+&lt;/ul&gt;
+
+&lt;p&gt;There are gaps in the version numbers shown above because there are
+other changes in this page that do not affect the definition as such.
+These changes are in other parts of the page.  You can review the
+complete list of changes to the page through
+the &lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb
+interface&lt;/a&gt;.&lt;/p&gt;
+
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+
+
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for id="content", starts 
in the include above --&gt;</em></ins></span>
+&lt;!--#include virtual="/server/footer.html" --&gt;
+&lt;div id="footer"&gt;
+
+<span class="removed"><del><strong>&lt;p&gt;
+Please</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
+&lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
+the FSF.
+<span class="removed"><del><strong>&lt;br /&gt;
+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 &lt;a <span 
class="removed"><del><strong>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+&lt;p&gt;&lt;!-- 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 &lt;a href="mailto:address@hidden"&gt;
+        &lt;address@hidden&gt;&lt;/a&gt;.&lt;/p&gt;
+
+        &lt;p&gt;For information on coordinating and submitting translations of
+        our web pages, see &lt;a
+        href="/server/standards/README.translations.html"&gt;Translations
+        README&lt;/a&gt;. --&gt;</em></ins></span>
+Please see the &lt;a
+href="/server/standards/README.translations.html"&gt;Translations
+README&lt;/a&gt; for information on coordinating and submitting translations
+of this <span class="removed"><del><strong>article.
+&lt;/p&gt;
+
+&lt;p&gt;
+Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+
+&lt;!-- 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
+     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. --&gt;
+
+&lt;p&gt;Copyright</em></ins></span> &copy; 1996-2002, 2004-2007, 2009, 2010, 
<span class="removed"><del><strong>2012</strong></del></span> <span 
class="inserted"><ins><em>2012, 2013</em></ins></span>
+Free Software Foundation, <span class="removed"><del><strong>Inc.
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>Inc.&lt;/p&gt;</em></ins></span>
+
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
+Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+
+&lt;!--#include virtual="/server/bottom-notes.html" --&gt;
+
+&lt;p&gt;Updated:
+&lt;!-- timestamp start --&gt;
+$Date: 2013/07/26 03:59:33 $
+&lt;!-- timestamp end --&gt;
+&lt;/p&gt;
+&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
+</pre></body></html>



reply via email to

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