www-commits
[Top][All Lists]
Advanced

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

www manual/allgnupkgs.fr.html philosophy/amazon...


From: GNUN
Subject: www manual/allgnupkgs.fr.html philosophy/amazon...
Date: Tue, 14 Sep 2021 06:02:25 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/09/14 06:02:25

Modified files:
        manual         : allgnupkgs.fr.html 
        philosophy     : amazon.zh-cn.html free-sw.it.html 
                         free-sw.nl.html free-sw.pl.html 
        philosophy/po  : amazon.zh-cn-en.html free-sw.it-diff.html 
                         free-sw.nl-diff.html free-sw.pl-diff.html 
        server         : home-pkgblurbs.fr.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/manual/allgnupkgs.fr.html?cvsroot=www&r1=1.151&r2=1.152
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/amazon.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.it.html?cvsroot=www&r1=1.93&r2=1.94
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.nl.html?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.pl.html?cvsroot=www&r1=1.121&r2=1.122
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/amazon.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.it-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.nl-diff.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pl-diff.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/server/home-pkgblurbs.fr.html?cvsroot=www&r1=1.163&r2=1.164

Patches:
Index: manual/allgnupkgs.fr.html
===================================================================
RCS file: /web/www/www/manual/allgnupkgs.fr.html,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- manual/allgnupkgs.fr.html   14 Sep 2021 01:04:04 -0000      1.151
+++ manual/allgnupkgs.fr.html   14 Sep 2021 10:02:24 -0000      1.152
@@ -462,8 +462,8 @@
 <dd>Dessin en 3D avec sortie en MetaPost. [<a
 href="/software/3dldf/">3dldf – accueil</a>]</dd>
 <dt id="dia"><a 
href="https://wiki.gnome.org/Apps/Dia/Documentation";>Dia</a></dt>
-<dd>GNU program for drawing diagrams.  [<a
-href="/software/dia/">dia&nbsp;home</a>]</dd>
+<dd>Création de diagrammes pour GNOME. [<a
+href="/software/dia/">dia – accueil</a>]</dd>
 <dt id="gift"><a href="/software/gift/">GIFT</a></dt>
 <dd>Outil GNU de recherche d'image, avec requête par l'exemple. [<a
 href="/software/gift/">gift – accueil</a>]</dd>

Index: philosophy/amazon.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/amazon.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/amazon.zh-cn.html        15 Jul 2020 09:31:55 -0000      1.2
+++ philosophy/amazon.zh-cn.html        14 Sep 2021 10:02:24 -0000      1.3
@@ -1,23 +1,30 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/amazon.en.html" -->
 
 <!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays laws patents" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>(正式)抵制亚马逊!- GNU 工程 - 
自由软件基金会</title>
 
 <!--#include virtual="/philosophy/po/amazon.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<div class="article reduced-width">
 <h2>(正式)抵制亚马逊!</h2>
 
-<div class="comment">
+<div class="infobox">
 <p>
-FSF 决定在 2002 年 9 
月结束对亚马逊的抵制活动。(当时我们忘了修改此页面。)我们æ—
 æ³•å‘Šè¯‰å¤§å®¶é’ˆå¯¹ Barnes &amp; Noble
-的官司的最后结局究竟怎样,但是看起来并没有对辩方造
成很大的伤害。亚马逊也没有再攻击其他人。</p>
+<i>FSF 决定在 2002 年 9 
月结束对亚马逊的抵制活动。(当时我们忘了修改此页面。)我们æ—
 æ³•å‘Šè¯‰å¤§å®¶é’ˆå¯¹ Barnes &amp; Noble
+的官司的最后结局究竟怎样,但是看起来并没有对辩方造
成很大的伤害。亚马逊也没有再攻击其他人。</i></p>
 <p>
-亚马逊从那以后还取得了一些å…
¶ä»–有威胁的专利,但是尚未使用它们做出攻击。也许它不再这么做了。如果它还做,我们会看看如何来谴责它。</p>
+<i>亚马逊从那以后还取得了一些å…
¶ä»–有威胁的专利,但是尚未使用它们做出攻击。也许它不再这么做了。如果它还做,我们会看看如何来谴责它。</i></p>
 <p>
-本页的其他内容还是 2001 年抵制在实行时的内容。</p>
+<i>本页的其他内容还是 2001 年抵制在实行时的内容。</i></p>
 </div>
 
 <hr class="thin" />
@@ -100,11 +107,11 @@
 
 <p>
 Tim O'Reilly 已经发送 <a
-href="http://www.oreilly.com/pub/a/oreilly/ask_tim/2000/amazon_patent.html";>å…
¬å¼€ä¿¡</a>
+href="https://www.oreilly.com/pub/a/oreilly/ask_tim/2000/amazon_patent.html";>å…
¬å¼€ä¿¡</a>
 
给亚马逊,强势表明不同意使用上述专利的立场,虽然他们也不愿意停止和亚马逊继续生意来往。</p>
 
 <p>
-<a href="http://www.stallman.org/";>Richard M. Stallman</a> 写 <a
+<a href="https://www.stallman.org/";>Richard M. Stallman</a> 写 <a
 href="/philosophy/amazon-rms-tim.html">信给 Tim O'Reilly</a> 就亚马逊 
<abbr
 title="Chief Executive Officer">CEO</abbr> Jeff Bezos å…
³äºŽæè¯·è½¯ä»¶ä¸“利保持 3 年或 5
 年的声明进行交流。</p>
@@ -122,14 +129,15 @@
 
href="https://web.archive.org/web/20140610154715/http://www.salon.com/1999/10/28/amazon_3/";>å
…¶ä»–可憎的动作</a>。</p>
 
 <p>
-请参看 <a 
href="http://endsoftpatents.org";>http://endsoftpatents.org</a>更多有关<a
+请参看 <a 
href="https://endsoftpatents.org";>http://endsoftpatents.org</a>更多有关<a
 
href="https://web.archive.org/web/20150329143651/http://progfree.org/Patents/patents.html";>
 软件专利</a> 的信息。</p>
 
 <p>
 <a
-href="http://web.archive.org/web/20010430183216/http://www.cpsr.org/links/bookstore/";>Computer
+href="https://web.archive.org/web/20010430183216/http://www.cpsr.org/links/bookstore/";>Computer
 Professionals for Social Responsibility 中止和亚马逊的合作</a>。</p>
+</div>
 
 <div class="translators-notes">
 
@@ -139,7 +147,7 @@
 
 <!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.zh-cn.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>请将有关自由软件基金会(FSF) &amp; 
GNU的一般性问题发送到<a
@@ -158,13 +166,13 @@
 
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
 我们尽最大努力来提供精准和高质量的翻译,但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方面有评论或一般性的建议,请发送至
 <a
 
href="mailto:web-translators@gnu.org";>&lt;web-translators@gnu.org&gt;</a>。</p><p>å
…³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信息参见
-<a href="/server/standards/README.translators.html">《译者
指南》</a>。</p>
+<a href="/server/standards/README.translations.html">《译者
指南》</a>。</p>
 </div>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -183,8 +191,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1999, 2001, 2007, 2008, 2013, 2014, 2015, 2018, 2019, 2020
-Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1999, 2001, 2002, 2004, 2021 Free Software Foundation, 
Inc.</p>
 
 <p>本页面使用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -195,12 +202,12 @@
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译团队</b>:<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2020。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2020,2021。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2020/07/15 09:31:55 $
+$Date: 2021/09/14 10:02:24 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/free-sw.it.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.it.html,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- philosophy/free-sw.it.html  27 Jun 2021 08:59:48 -0000      1.93
+++ philosophy/free-sw.it.html  14 Sep 2021 10:02:24 -0000      1.94
@@ -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.it.po">
+ https://www.gnu.org/philosophy/po/free-sw.it.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/free-sw.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/free-sw.it-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-16" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/free-sw.en.html" -->
 
 <!--#include virtual="/server/header.it.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -21,6 +26,7 @@
 
 <!--#include virtual="/philosophy/po/free-sw.translist" -->
 <!--#include virtual="/server/banner.it.html" -->
+<!--#include virtual="/server/outdated.it.html" -->
 <h2>Cos'è il Software Libero?</h2>
 
 <div class="article">
@@ -758,7 +764,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Ultimo aggiornamento:
 
-$Date: 2021/06/27 08:59:48 $
+$Date: 2021/09/14 10:02:24 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/free-sw.nl.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.nl.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- philosophy/free-sw.nl.html  31 May 2021 09:06:19 -0000      1.40
+++ philosophy/free-sw.nl.html  14 Sep 2021 10:02:24 -0000      1.41
@@ -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.nl.po">
+ https://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="2021-07-16" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/free-sw.en.html" -->
 
 <!--#include virtual="/server/header.nl.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -21,6 +26,7 @@
 
 <!--#include virtual="/philosophy/po/free-sw.translist" -->
 <!--#include virtual="/server/banner.nl.html" -->
+<!--#include virtual="/server/outdated.nl.html" -->
 <h2>Wat is vrije software?</h2>
 
 <div class="article">
@@ -737,7 +743,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2021/05/31 09:06:19 $
+$Date: 2021/09/14 10:02:24 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/free-sw.pl.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.pl.html,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- philosophy/free-sw.pl.html  19 Mar 2021 23:29:45 -0000      1.121
+++ philosophy/free-sw.pl.html  14 Sep 2021 10:02:24 -0000      1.122
@@ -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.pl.po">
+ https://www.gnu.org/philosophy/po/free-sw.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/free-sw.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/free-sw.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-07-16" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/free-sw.en.html" -->
 
 <!--#include virtual="/server/header.pl.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -20,6 +25,7 @@
 
 <!--#include virtual="/philosophy/po/free-sw.translist" -->
 <!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
 <h2>Co to wolne oprogramowanie?</h2>
 
 <div class="article">
@@ -786,7 +792,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2021/03/19 23:29:45 $
+$Date: 2021/09/14 10:02:24 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/amazon.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/amazon.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/amazon.zh-cn-en.html  15 Jul 2020 09:31:56 -0000      1.2
+++ philosophy/po/amazon.zh-cn-en.html  14 Sep 2021 10:02:25 -0000      1.3
@@ -1,24 +1,31 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays laws patents" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>(Formerly) Boycott Amazon! - GNU Project - Free Software 
Foundation</title>
 <!--#include virtual="/philosophy/po/amazon.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="article reduced-width">
 <h2>(Formerly) Boycott Amazon!</h2>
 
-<div class="comment">
+<div class="infobox">
 <p>
-The FSF decided to end its boycott of Amazon in September 2002.  (We
+<i>The FSF decided to end its boycott of Amazon in September 2002.  (We
 forgot to edit this page at the time.)  We could not tell the precise
 result of the lawsuit against Barnes &amp; Noble, but it did not seem to
 be very harmful to the defendant.  And Amazon had not attacked anyone
-else.</p>
+else.</i></p>
 <p>
-Amazon has got a number of other menacing patents since then, but has
+<i>Amazon has got a number of other menacing patents since then, but has
 not as yet used them for aggression.  Perhaps it will not do so.  If
-it does, we will take a look at how to denounce it.</p>
+it does, we will take a look at how to denounce it.</i></p>
 <p>
-The rest of this page is as it was in 2001 while the boycott
-was active.</p>
+<i>The rest of this page is as it was in 2001 while the boycott
+was active.</i></p>
 </div>
 
 <hr class="thin" />
@@ -40,7 +47,7 @@
 E-commerce: an idea sometimes known as one-click purchasing.  The idea
 is that your command in a web browser to buy a certain item can carry
 along information about your identity.  (It works by sending the
-server a &ldquo;cookie&rdquo;, a kind of ID code that your browser
+server a &ldquo;cookie,&rdquo; a kind of ID code that your browser
 received previously from the same server.)</p>
 <p>
 Amazon has sued to block the use of this simple idea, showing that
@@ -173,14 +180,14 @@
 
 <p>
 Tim O'Reilly has sent Amazon an
-<a 
href="http://www.oreilly.com/pub/a/oreilly/ask_tim/2000/amazon_patent.html";>open
+<a 
href="https://web.archive.org/web/20131114095827/http://www.oreilly.com/pub/a/oreilly/ask_tim/2000/amazon_patent.html";>open
 letter</a>
 disapproving of the use of this patent,
 stating the position about as forcefully as possible given an
 unwillingness to stop doing business with them.</p>
 
 <p>
-<a href="http://www.stallman.org/";>Richard M. Stallman</a> has written a
+<a href="https://www.stallman.org/";>Richard M. Stallman</a> has written a
 <a href="/philosophy/amazon-rms-tim.html">letter to Tim O'Reilly</a>
 in regard to the statement by Jeff Bezos, <abbr title="Chief
 Executive Officer">CEO</abbr> of Amazon, which called for software
@@ -204,19 +211,20 @@
 
 <p>
 See <a
-href="http://endsoftpatents.org";>http://endsoftpatents.org</a> for
+href="https://endsoftpatents.org";>endsoftpatents.org</a> for
 more information about the broader issue of
 <a 
href="https://web.archive.org/web/20150329143651/http://progfree.org/Patents/patents.html";>
 software patents</a>.</p>
 
 <p>
-<a 
href="http://web.archive.org/web/20010430183216/http://www.cpsr.org/links/bookstore/";>
+<a 
href="https://web.archive.org/web/20010430183216/http://www.cpsr.org/links/bookstore/";>
 Computer Professionals for
 Social Responsibility have dropped their affiliation with Amazon</a>.</p>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -234,13 +242,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -261,8 +269,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1999, 2001, 2007, 2008, 2013, 2014, 2015, 2018, 2019, 2020
-Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1999, 2001, 2002, 2004, 2021 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
@@ -272,7 +279,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/07/15 09:31:56 $
+$Date: 2021/09/14 10:02:25 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/free-sw.it-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.it-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/free-sw.it-diff.html  27 Jun 2021 08:30:54 -0000      1.5
+++ philosophy/po/free-sw.it-diff.html  14 Sep 2021 10:02:25 -0000      1.6
@@ -11,34 +11,40 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: 1.86 --&gt;
-&lt;title&gt;What is free software?
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="essays aboutfs principles" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;What is <span class="removed"><del><strong>free 
software?</strong></del></span> <span class="inserted"><ins><em>Free 
Software?</em></ins></span>
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;style type="text/css" media="print,screen"&gt;&lt;!--
-.note { margin-left: 6%; margin-right: 6%; }
-@media (min-width: 48em) {
-   .note { margin-top: .8em; }
-}
+<span class="removed"><del><strong>.note</strong></del></span>
+<span class="inserted"><ins><em>.toc &gt; ul &gt; li</em></ins></span> { <span 
class="removed"><del><strong>margin-left: 6%; margin-right: 
6%;</strong></del></span> <span class="inserted"><ins><em>list-style-type: 
none; font-weight: bold;</em></ins></span> }
+<span class="removed"><del><strong>@media (min-width: 48em) {
+   .note</strong></del></span>
+<span class="inserted"><ins><em>.toc ul</em></ins></span> { <span 
class="removed"><del><strong>margin-top: .8em;</strong></del></span> <span 
class="inserted"><ins><em>font-weight: normal;</em></ins></span> }
+<span class="inserted"><ins><em>#History ~ p, #History ~ ul { font-size: 
1rem;</em></ins></span> }
 --&gt;&lt;/style&gt;
 &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;!--#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;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;What is <span class="removed"><del><strong>free software?&lt;/h2&gt;
 
 &lt;div class="article"&gt;
-&lt;h3&gt;The Free Software Definition&lt;/h3&gt;
+&lt;h3&gt;The</strong></del></span> Free <span 
class="removed"><del><strong>Software Definition&lt;/h3&gt;
 
 &lt;blockquote class="note" id="fsf-licensing"&gt;&lt;p style="font-size: 
80%"&gt;
 Have a question about free software licensing not answered here?
 See our other &lt;a href="http://www.fsf.org/licensing"&gt;licensing 
resources&lt;/a&gt;,
 and if necessary contact the FSF Compliance Lab
 at &lt;a 
href="mailto:licensing@fsf.org"&gt;licensing@fsf.org&lt;/a&gt;.&lt;/p&gt;
-&lt;/blockquote&gt;
-
-&lt;div class="comment"&gt;
+&lt;/blockquote&gt;</strong></del></span> <span 
class="inserted"><ins><em>Software?&lt;/h2&gt;</em></ins></span>
+&lt;div <span class="removed"><del><strong>class="comment"&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
 particular software program qualifies as free software.  From time to
@@ -56,8 +62,9 @@
 difference in &lt;a href="/philosophy/open-source-misses-the-point.html"&gt;
 Why &ldquo;Open Source&rdquo; misses the point of Free Software&lt;/a&gt;.
 &lt;/p&gt;
-&lt;/div&gt;
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="thin"&gt;&lt;/div&gt;
 
+&lt;div class="important"&gt;</em></ins></span>
 &lt;p&gt;
 &ldquo;Free software&rdquo; means software that respects users'
 freedom and community.  Roughly, it means that &lt;b&gt;the users have the
@@ -65,13 +72,21 @@
 software&lt;/b&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;.  We sometimes call it &ldquo;libre
+&ldquo;free <span 
class="removed"><del><strong>beer&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>beer.&rdquo;</em></ins></span>  We sometimes call it 
&ldquo;libre
 software,&rdquo; borrowing the French or Spanish word for
 &ldquo;free&rdquo; as in freedom, to show we do not mean the software
 is gratis.
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>You may have paid money to get copies of a 
free program, 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;/div&gt;
+
+&lt;p&gt;</em></ins></span>
 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
@@ -82,8 +97,78 @@
 an instrument of unjust power&lt;/a&gt;.
 &lt;/p&gt;
 
-&lt;h4&gt; The four essential freedoms&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;
+&ldquo;Open source&rdquo; is something different: it has a very
+different philosophy based on different values.  Its practical
+definition is different too, but nearly all open source programs are
+in fact free.  We explain the
+difference in &lt;a href="/philosophy/open-source-misses-the-point.html"&gt;
+Why &ldquo;Open Source&rdquo; misses the point of Free Software&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of contents&lt;/h3&gt;
+&lt;ul&gt;
+ &lt;li&gt;&lt;a href="#fs-definition"&gt;The Free Software 
Definition&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#four-freedoms"&gt;The four essential 
freedoms&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#selling"&gt;Free software &lt;em&gt;can&lt;/em&gt; 
be commercial&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#clarifying"&gt;Clarifying the Boundary Between Free 
and Nonfree&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#run-the-program"&gt;The freedom to run the program 
as you
+     wish&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#make-changes"&gt;The freedom to study the source 
code and make
+     changes&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#redistribute"&gt;The freedom to redistribute if you 
wish:
+     basic requirements&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#copyleft"&gt;Copyleft&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#packaging"&gt;Rules about packaging and distribution
+     details&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#exportcontrol"&gt;Export 
regulations&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#legal-details"&gt;Legal 
considerations&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#contracts"&gt;Contract-based 
licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#in-practice"&gt;The Free Software Definition in 
Practice&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#interpretation"&gt;How we interpret these 
criteria&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#get-help"&gt;Get help with free 
licenses&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#terminology"&gt;Use the right words when talking 
about free
+     software&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#beyond-software"&gt;Beyond 
Software&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#History"&gt;History&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;/div&gt;
+
+&lt;div class="edu-note" id="fsf-licensing" role="complementary"&gt;
+&lt;p style="font-size:80%"&gt;
+Have a question about free software licensing not answered here?
+See our other &lt;a href="http://www.fsf.org/licensing"&gt;licensing 
resources&lt;/a&gt;,
+and if necessary contact the FSF Compliance Lab
+at &lt;a 
href="mailto:licensing@fsf.org"&gt;licensing@fsf.org&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;
+
+
+&lt;h3 id="fs-definition"&gt;The Free Software Definition&lt;/h3&gt;
+
+&lt;p&gt;</em></ins></span>
+The <span class="inserted"><ins><em>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;h4 id="four-freedoms"&gt;The</em></ins></span> four essential 
freedoms&lt;/h4&gt;
 &lt;p&gt;
 A program is free software if the program's users have the
 four essential freedoms: &lt;a href="#f1"&gt;[1]&lt;/a&gt;
@@ -120,10 +205,13 @@
 are free.  However, if we plan to modify A so that it doesn't use B,
 only A needs to be free; B is not pertinent to that plan.&lt;/p&gt;
 
+
+<span class="inserted"><ins><em>&lt;h4 id="selling"&gt;Free software 
&lt;em&gt;can&lt;/em&gt; be commercial&lt;/h4&gt;</em></ins></span>
+
 &lt;p&gt;
-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  <span 
class="removed"><del><strong>A</strong></del></span>
-<span class="inserted"><ins><em>On the contrary, a</em></ins></span> free 
program must be available for commercial use,
-commercial development, and commercial distribution.  <span 
class="inserted"><ins><em>This policy is
+&ldquo;Free software&rdquo; does not mean <span 
class="removed"><del><strong>&ldquo;noncommercial&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;noncommercial.&rdquo;</em></ins></span>
+On the contrary, a free program must be available for commercial use,
+commercial development, and commercial distribution.  This policy is
 of fundamental importance&mdash;without this, free software could not
 achieve its aims.
 &lt;/p&gt;
@@ -135,46 +223,47 @@
 programs, but they can't do that if businesses are forbidden to use
 them.  We want commercial products that contain software to include
 the GNU system, and that would constitute commercial distribution for
-a price.</em></ins></span>  Commercial development of free software is no 
longer
-unusual; such free commercial software is very important.
-<span class="removed"><del><strong>You may have paid money to get copies 
of</strong></del></span>  <span class="inserted"><ins><em>Paid,
-professional support for</em></ins></span> free <span 
class="removed"><del><strong>software,</strong></del></span> <span 
class="inserted"><ins><em>software fills an important need.
+a price.  Commercial development of free software is no longer
+unusual; such free commercial software is very important.  Paid,
+professional support for free software fills an important need.
 &lt;/p&gt;
 
 &lt;p&gt;
-Thus, to exclude commercial use, commercial development</em></ins></span> or 
<span class="removed"><del><strong>you may have
-obtained copies at no charge.  But regardless of how you got your copies,
-you always have</strong></del></span> <span 
class="inserted"><ins><em>commercial
-distribution would hobble</em></ins></span> the <span 
class="removed"><del><strong>freedom to copy</strong></del></span> <span 
class="inserted"><ins><em>free software community</em></ins></span> and <span 
class="removed"><del><strong>change the software, even</strong></del></span> 
<span class="inserted"><ins><em>obstruct its
-path</em></ins></span> to 
-<span class="removed"><del><strong>&lt;a 
href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.</strong></del></span> 
<span class="inserted"><ins><em>success.  We must conclude that a program 
licensed with such
-restrictions does not qualify as free software.</em></ins></span>
+Thus, to exclude commercial use, commercial development or commercial
+distribution would hobble the free software community and obstruct its
+path to success.  We must conclude that a program licensed with such
+restrictions does not qualify as free software.
 &lt;/p&gt;
 
 &lt;p&gt;
-A free program must offer the four freedoms to any <span 
class="inserted"><ins><em>would-be</em></ins></span> user that
-obtains a copy of the software, <span class="removed"><del><strong>provided 
the user</strong></del></span> <span 
class="inserted"><ins><em>who</em></ins></span> has complied thus far with the
-conditions of the free license covering the <span 
class="removed"><del><strong>software.</strong></del></span> <span 
class="inserted"><ins><em>software in any previous
-distribution of it.</em></ins></span>  Putting some of the freedoms off limits 
to some
+A free program must offer the four freedoms to any would-be user that
+obtains a copy of the software, who has complied thus far with the
+conditions of the free license covering the software in any previous
+distribution of it.  Putting some of the freedoms off limits to some
 users, or requiring that users pay, in money or in kind, to exercise
 them, is tantamount to not granting the freedoms in question, and thus
 renders the program nonfree.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;
+<span class="removed"><del><strong>&lt;p&gt;
 You may have paid money to get copies of a free program, 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;</em></ins></span>
+&lt;/p&gt;
+
+&lt;h3&gt;Clarifying</strong></del></span>
+
 
-&lt;h3&gt;Clarifying the <span class="removed"><del><strong>line at various 
points&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>boundary between free and 
nonfree&lt;/h3&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;h3 
id="clarifying"&gt;Clarifying</em></ins></span> the <span 
class="removed"><del><strong>boundary between free</strong></del></span> <span 
class="inserted"><ins><em>Boundary Between Free</em></ins></span> and <span 
class="removed"><del><strong>nonfree&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>Nonfree&lt;/h3&gt;</em></ins></span>
 
 &lt;p&gt;In the rest of this article we explain more precisely how far the
 various freedoms need to extend, on various issues, in order for a
 program to be free.&lt;/p&gt;
 
-&lt;h4&gt;The freedom to run the program as you wish&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="run-the-program"&gt;The</em></ins></span> freedom to run the program as you 
wish&lt;/h4&gt;
 
 &lt;p&gt;
 The freedom to run the program means the freedom for any kind of person
@@ -203,11 +292,13 @@
 communities to make and distribute modified versions without the
 arbitrary nuisance code.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;&ldquo;As you wish&rdquo; includes, 
optionally, &ldquo;not at
+&lt;p&gt;&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at
 all&rdquo; if that is what you wish.  So there is no need for a
-separate &ldquo;freedom not to run a 
program.&rdquo;&lt;/p&gt;</em></ins></span>
+separate &ldquo;freedom not to run a program.&rdquo;&lt;/p&gt;
+
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
 
-&lt;h4&gt;The freedom to study the source code and make changes&lt;/h4&gt;
+<span class="inserted"><ins><em>&lt;h4 
id="make-changes"&gt;The</em></ins></span> freedom to study the source code and 
make changes&lt;/h4&gt;
 
 &lt;p&gt;
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -221,10 +312,11 @@
 &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;,
+run someone else's modified versions but refuse to run <span 
class="removed"><del><strong>yours &mdash; a</strong></del></span> <span 
class="inserted"><ins><em>yours&mdash;a</em></ins></span>
+practice known as &ldquo;tivoization&rdquo; or <span 
class="removed"><del><strong>&ldquo;lockdown&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;lockdown,&rdquo;</em></ins></span>
 or (in its practitioners' perverse terminology) as &ldquo;secure
-boot&rdquo; &mdash; freedom 1 becomes an empty pretense rather than a
+<span class="removed"><del><strong>boot&rdquo; &mdash; 
freedom</strong></del></span>
+<span class="inserted"><ins><em>boot&rdquo;&mdash;freedom</em></ins></span> 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.
 &lt;/p&gt;
@@ -232,8 +324,8 @@
 &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
+cannot merge in a suitably licensed existing <span 
class="removed"><del><strong>module &mdash; for</strong></del></span> <span 
class="inserted"><ins><em>module&mdash;for</em></ins></span> instance, if it
+requires you to be the copyright holder of any code you <span 
class="removed"><del><strong>add &mdash; then</strong></del></span> <span 
class="inserted"><ins><em>add&mdash;then</em></ins></span> the
 license is too restrictive to qualify as free.
 &lt;/p&gt;
 
@@ -243,13 +335,16 @@
 someone else considers an improvement, that program is not free.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;
+&lt;p&gt;
 One special case of freedom 1 is to delete the program's code so it
 returns after doing nothing, or make it invoke some other program.
 Thus, freedom 1 includes the &ldquo;freedom to delete the program.&rdquo;
-&lt;/p&gt;</em></ins></span>
+&lt;/p&gt;
+
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
 
-&lt;h4&gt;The freedom to redistribute if you wish: basic 
requirements&lt;/h4&gt;
+<span class="inserted"><ins><em>&lt;h4 
id="redistribute"&gt;The</em></ins></span> freedom to redistribute if you wish: 
basic
+requirements&lt;/h4&gt;
 
 &lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you are free to
 redistribute copies, either with or without modifications, either
@@ -270,7 +365,7 @@
 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
+a &lt;a <span 
class="removed"><del><strong>href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/copyleft.html"&gt;copyleft&lt;/a&gt;</em></ins></span>
 license.  However, a
 license that requires modified versions to be nonfree does not qualify
 as a free license.
 &lt;/p&gt;
@@ -286,12 +381,14 @@
 make them.
 &lt;/p&gt;
 
-&lt;h4&gt;Copyleft&lt;/h4&gt;
+<span 
class="removed"><del><strong>&lt;h4&gt;Copyleft&lt;/h4&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="copyleft"&gt;Copyleft&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 Certain kinds of rules about the manner of distributing free
 software are acceptable, when they don't conflict with the central
-freedoms.  For example, &lt;a 
href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;
+freedoms.  For example, &lt;a <span 
class="removed"><del><strong>href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/copyleft.html"&gt;copyleft&lt;/a&gt;</em></ins></span>
 (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
@@ -311,7 +408,9 @@
 relate to each other.
 &lt;/p&gt;
 
-&lt;h4&gt;Rules about packaging and distribution details&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Rules</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="packaging"&gt;Rules</em></ins></span> about packaging and distribution 
details&lt;/h4&gt;
 
 &lt;p&gt;
 Rules about how to package a modified version are acceptable,
@@ -346,10 +445,12 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.&lt;/p&gt;
 
-&lt;h4&gt;Export regulations&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Export</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="exportcontrol"&gt;Export</em></ins></span> regulations&lt;/h4&gt;
 
 &lt;p&gt;
-Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
+Sometimes government <span class="removed"><del><strong>&lt;a 
id="exportcontrol"&gt;export</strong></del></span> <span 
class="inserted"><ins><em>export</em></ins></span> control <span 
class="removed"><del><strong>regulations&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>regulations</em></ins></span>
 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
@@ -370,7 +471,9 @@
 software nonfree.
 &lt;/p&gt;
 
-&lt;h4&gt;Legal considerations&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Legal</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="legal-details"&gt;Legal</em></ins></span> considerations&lt;/h4&gt;
 
 &lt;p&gt;
 In order for these freedoms to be real, they must be permanent and
@@ -383,7 +486,7 @@
 &lt;p&gt;
 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 &ldquo;all the programs you use&rdquo;, in
+comply with the licenses of &ldquo;all the programs you <span 
class="removed"><del><strong>use&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>use,&rdquo;</em></ins></span> 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.
@@ -394,7 +497,9 @@
 law applies, or where litigation must be done, or both.
 &lt;/p&gt;
 
-&lt;h4&gt;Contract-based licenses&lt;/h4&gt;
+<span 
class="removed"><del><strong>&lt;h4&gt;Contract-based</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="contracts"&gt;Contract-based</em></ins></span> licenses&lt;/h4&gt;
 
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
@@ -415,7 +520,7 @@
 it is nonfree.
 &lt;/p&gt;
 
-&lt;h4&gt;Use the right words when talking about free software&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Use the right words when talking 
about free software&lt;/h4&gt;
 
 &lt;p&gt;
 When talking about free software, it is best to avoid using terms
@@ -428,10 +533,15 @@
 &ldquo;free software&rdquo;&lt;/a&gt; into various languages.
 &lt;/p&gt;
 
-&lt;h4&gt;How we interpret these criteria&lt;/h4&gt;
+&lt;h4&gt;How</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 id="in-practice"&gt;The Free Software 
Definition in Practice&lt;/h3&gt;
+
+&lt;h4 id="interpretation"&gt;How</em></ins></span> we interpret these 
criteria&lt;/h4&gt;
 
 &lt;p&gt;
-Finally, note that criteria such as those stated in this free software
+<span class="removed"><del><strong>Finally, note</strong></del></span>
+<span class="inserted"><ins><em>Note</em></ins></span> 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
@@ -444,7 +554,9 @@
 it easier to see why certain licenses do or don't qualify.
 &lt;/p&gt;
 
-&lt;h4&gt;Get help with free licenses&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Get</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 id="get-help"&gt;Get</em></ins></span> 
help with free licenses&lt;/h4&gt;
 
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
@@ -468,6 +580,27 @@
 and avoid various practical problems.
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4 id="terminology"&gt;Use the right words 
when talking about free software&lt;/h4&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 id="open-source"&gt;
+Another group uses 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; never refers to freedom.
+&lt;/p&gt;</em></ins></span>
+
 &lt;h3 id="beyond-software"&gt;Beyond Software&lt;/h3&gt;
 
 &lt;p&gt;
@@ -478,9 +611,9 @@
 
 &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,
+practical <span class="removed"><del><strong>use &mdash; 
that</strong></del></span> <span 
class="inserted"><ins><em>use&mdash;that</em></ins></span> 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
+works.  &lt;a <span 
class="removed"><del><strong>href="http://wikipedia.org"&gt;Wikipedia&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://wikipedia.org"&gt;Wikipedia&lt;/a&gt;</em></ins></span>
 is the best-known
 example.
 &lt;/p&gt;
 
@@ -490,7 +623,7 @@
 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;h3 <span class="removed"><del><strong>id="open-source"&gt;Open 
Source?&lt;/h3&gt;
 
 &lt;p&gt;
 Another group uses the term &ldquo;open source&rdquo; to mean
@@ -502,7 +635,7 @@
 &lt;/p&gt;
 &lt;/div&gt;
 
-&lt;h3 id="History"&gt;History&lt;/h3&gt;
+&lt;h3</strong></del></span> 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 substantive changes, along with links to show exactly what
@@ -510,80 +643,80 @@
 
 &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.168&amp;r2=1.169"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.168&amp;r2=1.169"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.168&amp;r2=1.169"&gt;Version</em></ins></span>
 1.169&lt;/a&gt;: Explain more clearly why the four freedoms must apply
 to commercial activity.  Explain why the four freedoms imply the
 freedom not to run the program and the freedom to delete it, so there
 is no need to state those as separate requirements.&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.164&amp;r2=1.165"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.164&amp;r2=1.165"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.164&amp;r2=1.165"&gt;Version</em></ins></span>
 1.165&lt;/a&gt;: Clarify that arbitrary annoyances in the code do not
 negate freedom 0, and that freedoms 1 and 3 enable users to remove 
them.&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.152&amp;r2=1.153"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153"&gt;Version</em></ins></span>
 1.153&lt;/a&gt;: Clarify that freedom to run the program means nothing stops
 you from making it run.&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.140&amp;r2=1.141"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.140&amp;r2=1.141"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.140&amp;r2=1.141"&gt;Version</em></ins></span>
 1.141&lt;/a&gt;: Clarify which code needs to be free.&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.134&amp;r2=1.135"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135"&gt;Version</em></ins></span>
 1.135&lt;/a&gt;: Say each time that freedom 0 is the freedom to run the program
 as you wish.&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.133&amp;r2=1.134"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.133&amp;r2=1.134"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.133&amp;r2=1.134"&gt;Version</em></ins></span>
 1.134&lt;/a&gt;: Freedom 0 is not a matter of the program's 
functionality.&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.130&amp;r2=1.131"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.130&amp;r2=1.131"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.130&amp;r2=1.131"&gt;Version</em></ins></span>
 1.131&lt;/a&gt;: A free license may not require compliance with a nonfree 
license
 of another program.&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.128&amp;r2=1.129"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.128&amp;r2=1.129"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.128&amp;r2=1.129"&gt;Version</em></ins></span>
 1.129&lt;/a&gt;: State explicitly that choice of law and choice of forum
 specifications are allowed.  (This was always our policy.)&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.121&amp;r2=1.122"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122"&gt;Version</em></ins></span>
 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 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118"&gt;Version</em></ins></span>
 1.118&lt;/a&gt;: Clarification: the issue is limits on your right to modify,
 not on what modifications you have made.  And modifications are not limited
 to &ldquo;improvements&rdquo;&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.110&amp;r2=1.111"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.104&amp;r2=1.105"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.91&amp;r2=1.92"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.89&amp;r2=1.90"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.88&amp;r2=1.89"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.79&amp;r2=1.80"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.76&amp;r2=1.77"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.73&amp;r2=1.74"&gt;Version</em></ins></span>
 1.74&lt;/a&gt;: Four clarifications of points not explicit enough, or stated
 in some places but not reflected everywhere:
 &lt;ul&gt;
@@ -597,38 +730,38 @@
 &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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.56&amp;r2=1.57"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.45&amp;r2=1.46"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.40&amp;r2=1.41"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.39&amp;r2=1.40"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.38&amp;r2=1.39"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.30&amp;r2=1.31"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.15&amp;r2=1.16"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.10&amp;r2=1.11"&gt;Version</em></ins></span>
 1.11&lt;/a&gt;: Note that a free license may require you to send a copy of
 versions you distribute to previous developers on request.&lt;/li&gt;
 
@@ -639,10 +772,11 @@
 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 &lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb
+the &lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb</em></ins></span>
 interface&lt;/a&gt;.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;div 
class="column-limit"&gt;&lt;/div&gt;</em></ins></span>
 
-&lt;h3 style="font-size:1em"&gt;Footnote&lt;/h3&gt;
+&lt;h3 <span 
class="removed"><del><strong>style="font-size:1em"&gt;Footnote&lt;/h3&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>class="footnote"&gt;Footnote&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
 &lt;li id="f1"&gt;The reason they are numbered 0, 1, 2 and 3 is historical. 
Around
 1990 there were three freedoms, numbered 1, 2 and 3. Then we realized that
@@ -650,10 +784,11 @@
 It was clearly more basic than the other three, so it properly should
 precede them. Rather than renumber the others, we made it 
freedom&nbsp;0.&lt;/li&gt;
 &lt;/ol&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -671,13 +806,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&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
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -698,7 +833,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 2002, 2004-2007, <span 
class="removed"><del><strong>2009-2019</strong></del></span> <span 
class="inserted"><ins><em>2009-2019, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996, 2002, 
2004-2007, 2009-2019,</strong></del></span> <span 
class="inserted"><ins><em>1996-2002, 2004-2019,</em></ins></span> 2021
 Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -709,7 +844,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/27 08:30:54 $
+$Date: 2021/09/14 10:02:25 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy/po/free-sw.nl-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.nl-diff.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- philosophy/po/free-sw.nl-diff.html  3 Feb 2021 13:03:03 -0000       1.46
+++ philosophy/po/free-sw.nl-diff.html  14 Sep 2021 10:02:25 -0000      1.47
@@ -11,34 +11,40 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: 1.86 --&gt;
-&lt;title&gt;What is free software?
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="essays aboutfs principles" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;What is <span class="removed"><del><strong>free 
software?</strong></del></span> <span class="inserted"><ins><em>Free 
Software?</em></ins></span>
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;style type="text/css" media="print,screen"&gt;&lt;!--
-.note { margin-left: 6%; margin-right: 6%; }
-@media (min-width: 48em) {
-   .note { margin-top: .8em; }
-}
+<span class="removed"><del><strong>.note</strong></del></span>
+<span class="inserted"><ins><em>.toc &gt; ul &gt; li</em></ins></span> { <span 
class="removed"><del><strong>margin-left: 6%; margin-right: 
6%;</strong></del></span> <span class="inserted"><ins><em>list-style-type: 
none; font-weight: bold;</em></ins></span> }
+<span class="removed"><del><strong>@media (min-width: 48em) {
+   .note</strong></del></span>
+<span class="inserted"><ins><em>.toc ul</em></ins></span> { <span 
class="removed"><del><strong>margin-top: .8em;</strong></del></span> <span 
class="inserted"><ins><em>font-weight: normal;</em></ins></span> }
+<span class="inserted"><ins><em>#History ~ p, #History ~ ul { font-size: 
1rem;</em></ins></span> }
 --&gt;&lt;/style&gt;
 &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;!--#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;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;What is <span class="removed"><del><strong>free software?&lt;/h2&gt;
 
 &lt;div class="article"&gt;
-&lt;h3&gt;The Free Software Definition&lt;/h3&gt;
+&lt;h3&gt;The</strong></del></span> Free <span 
class="removed"><del><strong>Software Definition&lt;/h3&gt;
 
 &lt;blockquote class="note" id="fsf-licensing"&gt;&lt;p style="font-size: 
80%"&gt;
 Have a question about free software licensing not answered here?
 See our other &lt;a href="http://www.fsf.org/licensing"&gt;licensing 
resources&lt;/a&gt;,
 and if necessary contact the FSF Compliance Lab
 at &lt;a 
href="mailto:licensing@fsf.org"&gt;licensing@fsf.org&lt;/a&gt;.&lt;/p&gt;
-&lt;/blockquote&gt;
-
-&lt;div class="comment"&gt;
+&lt;/blockquote&gt;</strong></del></span> <span 
class="inserted"><ins><em>Software?&lt;/h2&gt;</em></ins></span>
+&lt;div <span class="removed"><del><strong>class="comment"&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
 particular software program qualifies as free software.  From time to
@@ -56,8 +62,9 @@
 difference in &lt;a href="/philosophy/open-source-misses-the-point.html"&gt;
 Why &ldquo;Open Source&rdquo; misses the point of Free Software&lt;/a&gt;.
 &lt;/p&gt;
-&lt;/div&gt;
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="thin"&gt;&lt;/div&gt;
 
+&lt;div class="important"&gt;</em></ins></span>
 &lt;p&gt;
 &ldquo;Free software&rdquo; means software that respects users'
 freedom and community.  Roughly, it means that &lt;b&gt;the users have the
@@ -65,13 +72,21 @@
 software&lt;/b&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;.  We sometimes call it &ldquo;libre
+&ldquo;free <span 
class="removed"><del><strong>beer&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>beer.&rdquo;</em></ins></span>  We sometimes call it 
&ldquo;libre
 software,&rdquo; borrowing the French or Spanish word for
 &ldquo;free&rdquo; as in freedom, to show we do not mean the software
 is gratis.
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>You may have paid money to get copies of a 
free program, 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;/div&gt;
+
+&lt;p&gt;</em></ins></span>
 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
@@ -82,8 +97,78 @@
 an instrument of unjust power&lt;/a&gt;.
 &lt;/p&gt;
 
-&lt;h4&gt; The four essential freedoms&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;
+&ldquo;Open source&rdquo; is something different: it has a very
+different philosophy based on different values.  Its practical
+definition is different too, but nearly all open source programs are
+in fact free.  We explain the
+difference in &lt;a href="/philosophy/open-source-misses-the-point.html"&gt;
+Why &ldquo;Open Source&rdquo; misses the point of Free Software&lt;/a&gt;.
+&lt;/p&gt;
+
+&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of contents&lt;/h3&gt;
+&lt;ul&gt;
+ &lt;li&gt;&lt;a href="#fs-definition"&gt;The Free Software 
Definition&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#four-freedoms"&gt;The four essential 
freedoms&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#selling"&gt;Free software &lt;em&gt;can&lt;/em&gt; 
be commercial&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#clarifying"&gt;Clarifying the Boundary Between Free 
and Nonfree&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#run-the-program"&gt;The freedom to run the program 
as you
+     wish&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#make-changes"&gt;The freedom to study the source 
code and make
+     changes&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#redistribute"&gt;The freedom to redistribute if you 
wish:
+     basic requirements&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#copyleft"&gt;Copyleft&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#packaging"&gt;Rules about packaging and distribution
+     details&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#exportcontrol"&gt;Export 
regulations&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#legal-details"&gt;Legal 
considerations&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#contracts"&gt;Contract-based 
licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#in-practice"&gt;The Free Software Definition in 
Practice&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#interpretation"&gt;How we interpret these 
criteria&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#get-help"&gt;Get help with free 
licenses&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#terminology"&gt;Use the right words when talking 
about free
+     software&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#beyond-software"&gt;Beyond 
Software&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#History"&gt;History&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;/div&gt;
+
+&lt;div class="edu-note" id="fsf-licensing" role="complementary"&gt;
+&lt;p style="font-size:80%"&gt;
+Have a question about free software licensing not answered here?
+See our other &lt;a href="http://www.fsf.org/licensing"&gt;licensing 
resources&lt;/a&gt;,
+and if necessary contact the FSF Compliance Lab
+at &lt;a 
href="mailto:licensing@fsf.org"&gt;licensing@fsf.org&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;
+
+
+&lt;h3 id="fs-definition"&gt;The Free Software Definition&lt;/h3&gt;
 
+&lt;p&gt;</em></ins></span>
+The <span class="inserted"><ins><em>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;h4 id="four-freedoms"&gt;The</em></ins></span> four essential 
freedoms&lt;/h4&gt;
 &lt;p&gt;
 A program is free software if the program's users have the
 four essential freedoms: &lt;a href="#f1"&gt;[1]&lt;/a&gt;
@@ -120,10 +205,13 @@
 are free.  However, if we plan to modify A so that it doesn't use B,
 only A needs to be free; B is not pertinent to that plan.&lt;/p&gt;
 
+
+<span class="inserted"><ins><em>&lt;h4 id="selling"&gt;Free software 
&lt;em&gt;can&lt;/em&gt; be commercial&lt;/h4&gt;</em></ins></span>
+
 &lt;p&gt;
-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.  <span 
class="removed"><del><strong>A</strong></del></span>
-<span class="inserted"><ins><em>On the contrary, a</em></ins></span> free 
program must be available for commercial use,
-commercial development, and commercial distribution.  <span 
class="inserted"><ins><em>This policy is
+&ldquo;Free software&rdquo; does not mean <span 
class="removed"><del><strong>&ldquo;noncommercial&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;noncommercial.&rdquo;</em></ins></span>
+On the contrary, a free program must be available for commercial use,
+commercial development, and commercial distribution.  This policy is
 of fundamental importance&mdash;without this, free software could not
 achieve its aims.
 &lt;/p&gt;
@@ -135,8 +223,8 @@
 programs, but they can't do that if businesses are forbidden to use
 them.  We want commercial products that contain software to include
 the GNU system, and that would constitute commercial distribution for
-a price.</em></ins></span>  Commercial development of free software is no 
longer
-unusual; such free commercial software is very important.  <span 
class="inserted"><ins><em>Paid,
+a price.  Commercial development of free software is no longer
+unusual; such free commercial software is very important.  Paid,
 professional support for free software fills an important need.
 &lt;/p&gt;
 
@@ -157,23 +245,25 @@
 renders the program nonfree.
 &lt;/p&gt;
 
-&lt;p&gt;</em></ins></span>
-You may have paid money to get copies of <span 
class="inserted"><ins><em>a</em></ins></span> free <span 
class="removed"><del><strong>software,</strong></del></span> <span 
class="inserted"><ins><em>program,</em></ins></span> or you may
+<span class="removed"><del><strong>&lt;p&gt;
+You may have paid money to get copies of a free program, 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;
 
-<span class="removed"><del><strong>&lt;p&gt;The</strong></del></span>
+&lt;h3&gt;Clarifying</strong></del></span>
+
+
+<span class="inserted"><ins><em>&lt;h3 
id="clarifying"&gt;Clarifying</em></ins></span> the <span 
class="removed"><del><strong>boundary between free</strong></del></span> <span 
class="inserted"><ins><em>Boundary Between Free</em></ins></span> and <span 
class="removed"><del><strong>nonfree&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>Nonfree&lt;/h3&gt;</em></ins></span>
 
-<span class="inserted"><ins><em>&lt;h3&gt;Clarifying the boundary between free 
and nonfree&lt;/h3&gt;
+&lt;p&gt;In the rest of this article we explain more precisely how far the
+various freedoms need to extend, on various issues, in order for a
+program to be free.&lt;/p&gt;
 
-&lt;p&gt;In the</em></ins></span> rest of this <span 
class="removed"><del><strong>page clarifies certain points about what makes
-specific</strong></del></span> <span class="inserted"><ins><em>article we 
explain more precisely how far the
-various</em></ins></span> freedoms <span class="removed"><del><strong>adequate 
or not.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>need to 
extend, on various issues, in order for a
-program to be free.&lt;/p&gt;</em></ins></span>
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
 
-&lt;h4&gt;The freedom to run the program as you wish&lt;/h4&gt;
+<span class="inserted"><ins><em>&lt;h4 
id="run-the-program"&gt;The</em></ins></span> freedom to run the program as you 
wish&lt;/h4&gt;
 
 &lt;p&gt;
 The freedom to run the program means the freedom for any kind of person
@@ -193,7 +283,7 @@
 functioning in any given environment, or whether it is useful for any
 particular computing activity.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;For example, if the code arbitrarily 
rejects certain meaningful
+&lt;p&gt;For example, if the code arbitrarily rejects certain meaningful
 inputs&mdash;or even fails unconditionally&mdash;that may make the
 program less useful, perhaps even totally useless, but it does not
 deny users the freedom to run the program, so it does not conflict
@@ -204,13 +294,15 @@
 
 &lt;p&gt;&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at
 all&rdquo; if that is what you wish.  So there is no need for a
-separate &ldquo;freedom not to run a 
program.&rdquo;&lt;/p&gt;</em></ins></span>
+separate &ldquo;freedom not to run a program.&rdquo;&lt;/p&gt;
 
-&lt;h4&gt;The freedom to study the source code and make changes&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="make-changes"&gt;The</em></ins></span> freedom to study the source code and 
make changes&lt;/h4&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 <span 
class="removed"><del><strong>must</strong></del></span> <span 
class="inserted"><ins><em>need to</em></ins></span> have
+freedom to publish the changed versions) to be meaningful, you need to 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
@@ -220,10 +312,11 @@
 &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;,
+run someone else's modified versions but refuse to run <span 
class="removed"><del><strong>yours &mdash; a</strong></del></span> <span 
class="inserted"><ins><em>yours&mdash;a</em></ins></span>
+practice known as &ldquo;tivoization&rdquo; or <span 
class="removed"><del><strong>&ldquo;lockdown&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;lockdown,&rdquo;</em></ins></span>
 or (in its practitioners' perverse terminology) as &ldquo;secure
-boot&rdquo; &mdash; freedom 1 becomes an empty pretense rather than a
+<span class="removed"><del><strong>boot&rdquo; &mdash; 
freedom</strong></del></span>
+<span class="inserted"><ins><em>boot&rdquo;&mdash;freedom</em></ins></span> 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.
 &lt;/p&gt;
@@ -231,8 +324,8 @@
 &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
+cannot merge in a suitably licensed existing <span 
class="removed"><del><strong>module &mdash; for</strong></del></span> <span 
class="inserted"><ins><em>module&mdash;for</em></ins></span> instance, if it
+requires you to be the copyright holder of any code you <span 
class="removed"><del><strong>add &mdash; then</strong></del></span> <span 
class="inserted"><ins><em>add&mdash;then</em></ins></span> the
 license is too restrictive to qualify as free.
 &lt;/p&gt;
 
@@ -242,13 +335,16 @@
 someone else considers an improvement, that program is not free.
 &lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;
+&lt;p&gt;
 One special case of freedom 1 is to delete the program's code so it
 returns after doing nothing, or make it invoke some other program.
 Thus, freedom 1 includes the &ldquo;freedom to delete the program.&rdquo;
-&lt;/p&gt;</em></ins></span>
+&lt;/p&gt;
 
-&lt;h4&gt;The freedom to redistribute if you wish: basic 
requirements&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="redistribute"&gt;The</em></ins></span> freedom to redistribute if you wish: 
basic
+requirements&lt;/h4&gt;
 
 &lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you are free to
 redistribute copies, either with or without modifications, either
@@ -269,7 +365,7 @@
 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
+a &lt;a <span 
class="removed"><del><strong>href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/copyleft.html"&gt;copyleft&lt;/a&gt;</em></ins></span>
 license.  However, a
 license that requires modified versions to be nonfree does not qualify
 as a free license.
 &lt;/p&gt;
@@ -285,12 +381,14 @@
 make them.
 &lt;/p&gt;
 
-&lt;h4&gt;Copyleft&lt;/h4&gt;
+<span 
class="removed"><del><strong>&lt;h4&gt;Copyleft&lt;/h4&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="copyleft"&gt;Copyleft&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 Certain kinds of rules about the manner of distributing free
 software are acceptable, when they don't conflict with the central
-freedoms.  For example, &lt;a 
href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;
+freedoms.  For example, &lt;a <span 
class="removed"><del><strong>href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/copyleft.html"&gt;copyleft&lt;/a&gt;</em></ins></span>
 (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
@@ -310,7 +408,9 @@
 relate to each other.
 &lt;/p&gt;
 
-&lt;h4&gt;Rules about packaging and distribution details&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Rules</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="packaging"&gt;Rules</em></ins></span> about packaging and distribution 
details&lt;/h4&gt;
 
 &lt;p&gt;
 Rules about how to package a modified version are acceptable,
@@ -345,10 +445,12 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.&lt;/p&gt;
 
-&lt;h4&gt;Export regulations&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Export</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="exportcontrol"&gt;Export</em></ins></span> regulations&lt;/h4&gt;
 
 &lt;p&gt;
-Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
+Sometimes government <span class="removed"><del><strong>&lt;a 
id="exportcontrol"&gt;export</strong></del></span> <span 
class="inserted"><ins><em>export</em></ins></span> control <span 
class="removed"><del><strong>regulations&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>regulations</em></ins></span>
 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
@@ -369,7 +471,9 @@
 software nonfree.
 &lt;/p&gt;
 
-&lt;h4&gt;Legal considerations&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Legal</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="legal-details"&gt;Legal</em></ins></span> considerations&lt;/h4&gt;
 
 &lt;p&gt;
 In order for these freedoms to be real, they must be permanent and
@@ -382,7 +486,7 @@
 &lt;p&gt;
 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 &ldquo;all the programs you use&rdquo;, in
+comply with the licenses of &ldquo;all the programs you <span 
class="removed"><del><strong>use&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>use,&rdquo;</em></ins></span> 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.
@@ -393,7 +497,9 @@
 law applies, or where litigation must be done, or both.
 &lt;/p&gt;
 
-&lt;h4&gt;Contract-based licenses&lt;/h4&gt;
+<span 
class="removed"><del><strong>&lt;h4&gt;Contract-based</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="contracts"&gt;Contract-based</em></ins></span> licenses&lt;/h4&gt;
 
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
@@ -414,7 +520,7 @@
 it is nonfree.
 &lt;/p&gt;
 
-&lt;h4&gt;Use the right words when talking about free software&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Use the right words when talking 
about free software&lt;/h4&gt;
 
 &lt;p&gt;
 When talking about free software, it is best to avoid using terms
@@ -427,10 +533,15 @@
 &ldquo;free software&rdquo;&lt;/a&gt; into various languages.
 &lt;/p&gt;
 
-&lt;h4&gt;How we interpret these criteria&lt;/h4&gt;
+&lt;h4&gt;How</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 id="in-practice"&gt;The Free Software 
Definition in Practice&lt;/h3&gt;
+
+&lt;h4 id="interpretation"&gt;How</em></ins></span> we interpret these 
criteria&lt;/h4&gt;
 
 &lt;p&gt;
-Finally, note that criteria such as those stated in this free software
+<span class="removed"><del><strong>Finally, note</strong></del></span>
+<span class="inserted"><ins><em>Note</em></ins></span> 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
@@ -443,7 +554,9 @@
 it easier to see why certain licenses do or don't qualify.
 &lt;/p&gt;
 
-&lt;h4&gt;Get help with free licenses&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Get</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 id="get-help"&gt;Get</em></ins></span> 
help with free licenses&lt;/h4&gt;
 
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
@@ -467,6 +580,27 @@
 and avoid various practical problems.
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4 id="terminology"&gt;Use the right words 
when talking about free software&lt;/h4&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 id="open-source"&gt;
+Another group uses 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; never refers to freedom.
+&lt;/p&gt;</em></ins></span>
+
 &lt;h3 id="beyond-software"&gt;Beyond Software&lt;/h3&gt;
 
 &lt;p&gt;
@@ -477,9 +611,9 @@
 
 &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,
+practical <span class="removed"><del><strong>use &mdash; 
that</strong></del></span> <span 
class="inserted"><ins><em>use&mdash;that</em></ins></span> 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
+works.  &lt;a <span 
class="removed"><del><strong>href="http://wikipedia.org"&gt;Wikipedia&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://wikipedia.org"&gt;Wikipedia&lt;/a&gt;</em></ins></span>
 is the best-known
 example.
 &lt;/p&gt;
 
@@ -489,7 +623,7 @@
 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;h3 <span class="removed"><del><strong>id="open-source"&gt;Open 
Source?&lt;/h3&gt;
 
 &lt;p&gt;
 Another group uses the term &ldquo;open source&rdquo; to mean
@@ -501,7 +635,7 @@
 &lt;/p&gt;
 &lt;/div&gt;
 
-&lt;h3 id="History"&gt;History&lt;/h3&gt;
+&lt;h3</strong></del></span> 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 substantive changes, along with links to show exactly what
@@ -509,80 +643,80 @@
 
 &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.168&amp;r2=1.169"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.168&amp;r2=1.169"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.168&amp;r2=1.169"&gt;Version</em></ins></span>
 1.169&lt;/a&gt;: Explain more clearly why the four freedoms must apply
 to commercial activity.  Explain why the four freedoms imply the
 freedom not to run the program and the freedom to delete it, so there
 is no need to state those as separate requirements.&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.164&amp;r2=1.165"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.164&amp;r2=1.165"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.164&amp;r2=1.165"&gt;Version</em></ins></span>
 1.165&lt;/a&gt;: Clarify that arbitrary annoyances in the code do not
 negate freedom 0, and that freedoms 1 and 3 enable users to remove 
them.&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.152&amp;r2=1.153"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153"&gt;Version</em></ins></span>
 1.153&lt;/a&gt;: Clarify that freedom to run the program means nothing stops
 you from making it run.&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.140&amp;r2=1.141"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.140&amp;r2=1.141"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.140&amp;r2=1.141"&gt;Version</em></ins></span>
 1.141&lt;/a&gt;: Clarify which code needs to be free.&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.134&amp;r2=1.135"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135"&gt;Version</em></ins></span>
 1.135&lt;/a&gt;: Say each time that freedom 0 is the freedom to run the program
 as you wish.&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.133&amp;r2=1.134"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.133&amp;r2=1.134"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.133&amp;r2=1.134"&gt;Version</em></ins></span>
 1.134&lt;/a&gt;: Freedom 0 is not a matter of the program's 
functionality.&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.130&amp;r2=1.131"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.130&amp;r2=1.131"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.130&amp;r2=1.131"&gt;Version</em></ins></span>
 1.131&lt;/a&gt;: A free license may not require compliance with a nonfree 
license
 of another program.&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.128&amp;r2=1.129"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.128&amp;r2=1.129"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.128&amp;r2=1.129"&gt;Version</em></ins></span>
 1.129&lt;/a&gt;: State explicitly that choice of law and choice of forum
 specifications are allowed.  (This was always our policy.)&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.121&amp;r2=1.122"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122"&gt;Version</em></ins></span>
 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 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118"&gt;Version</em></ins></span>
 1.118&lt;/a&gt;: Clarification: the issue is limits on your right to modify,
 not on what modifications you have made.  And modifications are not limited
 to &ldquo;improvements&rdquo;&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.110&amp;r2=1.111"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.104&amp;r2=1.105"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.91&amp;r2=1.92"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.89&amp;r2=1.90"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.88&amp;r2=1.89"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.79&amp;r2=1.80"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.76&amp;r2=1.77"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.73&amp;r2=1.74"&gt;Version</em></ins></span>
 1.74&lt;/a&gt;: Four clarifications of points not explicit enough, or stated
 in some places but not reflected everywhere:
 &lt;ul&gt;
@@ -596,38 +730,38 @@
 &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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.56&amp;r2=1.57"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.45&amp;r2=1.46"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.40&amp;r2=1.41"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.39&amp;r2=1.40"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.38&amp;r2=1.39"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.30&amp;r2=1.31"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.15&amp;r2=1.16"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.10&amp;r2=1.11"&gt;Version</em></ins></span>
 1.11&lt;/a&gt;: Note that a free license may require you to send a copy of
 versions you distribute to previous developers on request.&lt;/li&gt;
 
@@ -638,10 +772,11 @@
 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 &lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb
+the &lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb</em></ins></span>
 interface&lt;/a&gt;.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;div 
class="column-limit"&gt;&lt;/div&gt;</em></ins></span>
 
-&lt;h3 style="font-size:1em"&gt;Footnote&lt;/h3&gt;
+&lt;h3 <span 
class="removed"><del><strong>style="font-size:1em"&gt;Footnote&lt;/h3&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>class="footnote"&gt;Footnote&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
 &lt;li id="f1"&gt;The reason they are numbered 0, 1, 2 and 3 is historical. 
Around
 1990 there were three freedoms, numbered 1, 2 and 3. Then we realized that
@@ -649,10 +784,11 @@
 It was clearly more basic than the other three, so it properly should
 precede them. Rather than renumber the others, we made it 
freedom&nbsp;0.&lt;/li&gt;
 &lt;/ol&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -670,13 +806,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&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
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -697,7 +833,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 2002, 2004-2007, <span 
class="removed"><del><strong>2009-2018</strong></del></span> <span 
class="inserted"><ins><em>2009-2019, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996, 2002, 
2004-2007, 2009-2019,</strong></del></span> <span 
class="inserted"><ins><em>1996-2002, 2004-2019,</em></ins></span> 2021
 Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -708,7 +844,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/02/03 13:03:03 $
+$Date: 2021/09/14 10:02:25 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: philosophy/po/free-sw.pl-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pl-diff.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/free-sw.pl-diff.html  30 Jul 2019 10:30:35 -0000      1.19
+++ philosophy/po/free-sw.pl-diff.html  14 Sep 2021 10:02:25 -0000      1.20
@@ -11,38 +11,40 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.86</em></ins></span> --&gt;
-&lt;title&gt;What is free software?
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="essays aboutfs principles" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
+&lt;title&gt;What is <span class="removed"><del><strong>free 
software?</strong></del></span> <span class="inserted"><ins><em>Free 
Software?</em></ins></span>
 - GNU Project - Free Software Foundation&lt;/title&gt;
-<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
-.note { margin-left: 6%; margin-right: 6%; }
-@media (min-width: 48em) {
-   .note { margin-top: .8em; }
-}
---&gt;&lt;/style&gt;</em></ins></span>
+&lt;style type="text/css" media="print,screen"&gt;&lt;!--
+<span class="removed"><del><strong>.note</strong></del></span>
+<span class="inserted"><ins><em>.toc &gt; ul &gt; li</em></ins></span> { <span 
class="removed"><del><strong>margin-left: 6%; margin-right: 
6%;</strong></del></span> <span class="inserted"><ins><em>list-style-type: 
none; font-weight: bold;</em></ins></span> }
+<span class="removed"><del><strong>@media (min-width: 48em) {
+   .note</strong></del></span>
+<span class="inserted"><ins><em>.toc ul</em></ins></span> { <span 
class="removed"><del><strong>margin-top: .8em;</strong></del></span> <span 
class="inserted"><ins><em>font-weight: normal;</em></ins></span> }
+<span class="inserted"><ins><em>#History ~ p, #History ~ ul { font-size: 
1rem;</em></ins></span> }
+--&gt;&lt;/style&gt;
 &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;!--#include virtual="/philosophy/po/free-sw.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;What is <span class="removed"><del><strong>free software?&lt;/h2&gt;
 
-&lt;h2&gt;What is free software?&lt;/h2&gt;
-
-<span class="inserted"><ins><em>&lt;div class="article"&gt;
-&lt;h3&gt;The Free Software Definition&lt;/h3&gt;</em></ins></span>
+&lt;div class="article"&gt;
+&lt;h3&gt;The</strong></del></span> Free <span 
class="removed"><del><strong>Software Definition&lt;/h3&gt;
 
 &lt;blockquote class="note" id="fsf-licensing"&gt;&lt;p style="font-size: 
80%"&gt;
 Have a question about free software licensing not answered here?
 See our other &lt;a href="http://www.fsf.org/licensing"&gt;licensing 
resources&lt;/a&gt;,
 and if necessary contact the FSF Compliance Lab
 at &lt;a 
href="mailto:licensing@fsf.org"&gt;licensing@fsf.org&lt;/a&gt;.&lt;/p&gt;
-&lt;/blockquote&gt;
-
-<span class="removed"><del><strong>&lt;h3&gt;The Free Software 
Definition&lt;/h3&gt;
-
-&lt;blockquote&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;div class="comment"&gt;</em></ins></span>
+&lt;/blockquote&gt;</strong></del></span> <span 
class="inserted"><ins><em>Software?&lt;/h2&gt;</em></ins></span>
+&lt;div <span class="removed"><del><strong>class="comment"&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
 particular software program qualifies as free software.  From time to
@@ -51,9 +53,8 @@
 below for a list of changes that affect the definition of free
 software.
 &lt;/p&gt;
-<span class="removed"><del><strong>&lt;/blockquote&gt;</strong></del></span>
 
-<span class="inserted"><ins><em>&lt;p&gt;
+&lt;p&gt;
 &ldquo;Open source&rdquo; is something different: it has a very
 different philosophy based on different values.  Its practical
 definition is different too, but nearly all open source programs are
@@ -61,8 +62,9 @@
 difference in &lt;a href="/philosophy/open-source-misses-the-point.html"&gt;
 Why &ldquo;Open Source&rdquo; misses the point of Free Software&lt;/a&gt;.
 &lt;/p&gt;
-&lt;/div&gt;</em></ins></span>
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="thin"&gt;&lt;/div&gt;
 
+&lt;div class="important"&gt;</em></ins></span>
 &lt;p&gt;
 &ldquo;Free software&rdquo; means software that respects users'
 freedom and community.  Roughly, it means that &lt;b&gt;the users have the
@@ -70,13 +72,21 @@
 software&lt;/b&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;.  We sometimes call it &ldquo;libre
+&ldquo;free <span 
class="removed"><del><strong>beer&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>beer.&rdquo;</em></ins></span>  We sometimes call it 
&ldquo;libre
 software,&rdquo; borrowing the French or Spanish word for
 &ldquo;free&rdquo; as in freedom, to show we do not mean the software
 is gratis.
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>You may have paid money to get copies of a 
free program, 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;/div&gt;
+
+&lt;p&gt;</em></ins></span>
 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
@@ -87,23 +97,91 @@
 an instrument of unjust power&lt;/a&gt;.
 &lt;/p&gt;
 
-&lt;h4&gt; The four essential freedoms&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;p&gt;
+&ldquo;Open source&rdquo; is something different: it has a very
+different philosophy based on different values.  Its practical
+definition is different too, but nearly all open source programs are
+in fact free.  We explain the
+difference in &lt;a href="/philosophy/open-source-misses-the-point.html"&gt;
+Why &ldquo;Open Source&rdquo; misses the point of Free Software&lt;/a&gt;.
+&lt;/p&gt;
 
+&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of contents&lt;/h3&gt;
+&lt;ul&gt;
+ &lt;li&gt;&lt;a href="#fs-definition"&gt;The Free Software 
Definition&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#four-freedoms"&gt;The four essential 
freedoms&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#selling"&gt;Free software &lt;em&gt;can&lt;/em&gt; 
be commercial&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#clarifying"&gt;Clarifying the Boundary Between Free 
and Nonfree&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#run-the-program"&gt;The freedom to run the program 
as you
+     wish&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#make-changes"&gt;The freedom to study the source 
code and make
+     changes&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#redistribute"&gt;The freedom to redistribute if you 
wish:
+     basic requirements&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#copyleft"&gt;Copyleft&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#packaging"&gt;Rules about packaging and distribution
+     details&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#exportcontrol"&gt;Export 
regulations&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#legal-details"&gt;Legal 
considerations&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#contracts"&gt;Contract-based 
licenses&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#in-practice"&gt;The Free Software Definition in 
Practice&lt;/a&gt;
+  &lt;ul&gt;
+   &lt;li&gt;&lt;a href="#interpretation"&gt;How we interpret these 
criteria&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#get-help"&gt;Get help with free 
licenses&lt;/a&gt;&lt;/li&gt;
+   &lt;li&gt;&lt;a href="#terminology"&gt;Use the right words when talking 
about free
+     software&lt;/a&gt;&lt;/li&gt;
+  &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;&lt;a href="#beyond-software"&gt;Beyond 
Software&lt;/a&gt;&lt;/li&gt;
+ &lt;li&gt;&lt;a href="#History"&gt;History&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+&lt;/div&gt;
+
+&lt;div class="edu-note" id="fsf-licensing" role="complementary"&gt;
+&lt;p style="font-size:80%"&gt;
+Have a question about free software licensing not answered here?
+See our other &lt;a href="http://www.fsf.org/licensing"&gt;licensing 
resources&lt;/a&gt;,
+and if necessary contact the FSF Compliance Lab
+at &lt;a 
href="mailto:licensing@fsf.org"&gt;licensing@fsf.org&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;
+
+
+&lt;h3 id="fs-definition"&gt;The Free Software Definition&lt;/h3&gt;
+
+&lt;p&gt;</em></ins></span>
+The <span class="inserted"><ins><em>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;h4 id="four-freedoms"&gt;The</em></ins></span> four essential 
freedoms&lt;/h4&gt;
 &lt;p&gt;
 A program is free software if the program's users have the
-four essential freedoms: <span class="inserted"><ins><em>&lt;a 
href="#f1"&gt;[1]&lt;/a&gt;</em></ins></span>
+four essential freedoms: &lt;a href="#f1"&gt;[1]&lt;/a&gt;
 &lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;ul&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;ul class="important"&gt;</em></ins></span>
+&lt;ul class="important"&gt;
   &lt;li&gt;The freedom to run the program as you wish,
       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 <span 
class="removed"><del><strong>your neighbor</strong></del></span> <span 
class="inserted"><ins><em>others</em></ins></span>
+  &lt;li&gt;The freedom to redistribute copies so you can help others
       (freedom 2).
   &lt;/li&gt;
   &lt;li&gt;The freedom to distribute copies of your modified versions
@@ -127,36 +205,65 @@
 are free.  However, if we plan to modify A so that it doesn't use B,
 only A needs to be free; B is not pertinent to that plan.&lt;/p&gt;
 
+
+<span class="inserted"><ins><em>&lt;h4 id="selling"&gt;Free software 
&lt;em&gt;can&lt;/em&gt; be commercial&lt;/h4&gt;</em></ins></span>
+
 &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;.
+&ldquo;Free software&rdquo; does not mean <span 
class="removed"><del><strong>&ldquo;noncommercial&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;noncommercial.&rdquo;</em></ins></span>
+On the contrary, a free program must be available for commercial use,
+commercial development, and commercial distribution.  This policy is
+of fundamental importance&mdash;without this, free software could not
+achieve its aims.
 &lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;The</strong></del></span>
+&lt;p&gt;
+We want to invite everyone to use the GNU system, including businesses
+and their workers.  That requires allowing commercial use.  We hope
+that free replacement programs will supplant comparable proprietary
+programs, but they can't do that if businesses are forbidden to use
+them.  We want commercial products that contain software to include
+the GNU system, and that would constitute commercial distribution for
+a price.  Commercial development of free software is no longer
+unusual; such free commercial software is very important.  Paid,
+professional support for free software fills an important need.
+&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;
-A free program must offer the four freedoms to any user that obtains a
-copy of the software, provided the user has complied thus far with the
-conditions of the free license covering the software.  Putting some of
-the freedoms off limits to some users, or requiring that users pay, in
-money or in kind, to exercise them, is tantamount to not granting the
-freedoms in question, and thus renders the program nonfree.
-&lt;/p&gt;
-
-&lt;h3&gt;Clarifying the line at various points&lt;/h3&gt;
-
-&lt;p&gt;In the</em></ins></span> rest of this <span 
class="removed"><del><strong>page clarifies certain points about what makes
-specific</strong></del></span> <span class="inserted"><ins><em>article we 
explain more precisely how far the
-various</em></ins></span> freedoms <span class="removed"><del><strong>adequate 
or not.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>need to 
extend, on various issues, in order for a
-program to be free.&lt;/p&gt;</em></ins></span>
+&lt;p&gt;
+Thus, to exclude commercial use, commercial development or commercial
+distribution would hobble the free software community and obstruct its
+path to success.  We must conclude that a program licensed with such
+restrictions does not qualify as free software.
+&lt;/p&gt;
+
+&lt;p&gt;
+A free program must offer the four freedoms to any would-be user that
+obtains a copy of the software, who has complied thus far with the
+conditions of the free license covering the software in any previous
+distribution of it.  Putting some of the freedoms off limits to some
+users, or requiring that users pay, in money or in kind, to exercise
+them, is tantamount to not granting the freedoms in question, and thus
+renders the program nonfree.
+&lt;/p&gt;
+
+<span class="removed"><del><strong>&lt;p&gt;
+You may have paid money to get copies of a free program, 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;h3&gt;Clarifying</strong></del></span>
+
+
+<span class="inserted"><ins><em>&lt;h3 
id="clarifying"&gt;Clarifying</em></ins></span> the <span 
class="removed"><del><strong>boundary between free</strong></del></span> <span 
class="inserted"><ins><em>Boundary Between Free</em></ins></span> and <span 
class="removed"><del><strong>nonfree&lt;/h3&gt;</strong></del></span> <span 
class="inserted"><ins><em>Nonfree&lt;/h3&gt;</em></ins></span>
+
+&lt;p&gt;In the rest of this article we explain more precisely how far the
+various freedoms need to extend, on various issues, in order for a
+program to be free.&lt;/p&gt;
+
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
 
-&lt;h4&gt;The freedom to run the program as you wish&lt;/h4&gt;
+<span class="inserted"><ins><em>&lt;h4 
id="run-the-program"&gt;The</em></ins></span> freedom to run the program as you 
wish&lt;/h4&gt;
 
 &lt;p&gt;
 The freedom to run the program means the freedom for any kind of person
@@ -176,20 +283,26 @@
 functioning in any given environment, or whether it is useful for any
 particular computing activity.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;p&gt;For example, if the code arbitrarily 
rejects certain meaningful
+&lt;p&gt;For example, if the code arbitrarily rejects certain meaningful
 inputs&mdash;or even fails unconditionally&mdash;that may make the
 program less useful, perhaps even totally useless, but it does not
 deny users the freedom to run the program, so it does not conflict
 with freedom 0.  If the program is free, the users can overcome the
 loss of usefulness, because freedoms 1 and 3 permit users and
 communities to make and distribute modified versions without the
-arbitrary nuisance code.&lt;/p&gt;</em></ins></span>
+arbitrary nuisance code.&lt;/p&gt;
 
-&lt;h4&gt;The freedom to study the source code and make changes&lt;/h4&gt;
+&lt;p&gt;&ldquo;As you wish&rdquo; includes, optionally, &ldquo;not at
+all&rdquo; if that is what you wish.  So there is no need for a
+separate &ldquo;freedom not to run a program.&rdquo;&lt;/p&gt;
+
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="make-changes"&gt;The</em></ins></span> freedom to study the source code and 
make changes&lt;/h4&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 <span 
class="removed"><del><strong>must</strong></del></span> <span 
class="inserted"><ins><em>need to</em></ins></span> have
+freedom to publish the changed versions) to be meaningful, you need to 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
@@ -199,10 +312,11 @@
 &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;,
+run someone else's modified versions but refuse to run <span 
class="removed"><del><strong>yours &mdash; a</strong></del></span> <span 
class="inserted"><ins><em>yours&mdash;a</em></ins></span>
+practice known as &ldquo;tivoization&rdquo; or <span 
class="removed"><del><strong>&ldquo;lockdown&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;lockdown,&rdquo;</em></ins></span>
 or (in its practitioners' perverse terminology) as &ldquo;secure
-boot&rdquo; &mdash; freedom 1 becomes an empty pretense rather than a
+<span class="removed"><del><strong>boot&rdquo; &mdash; 
freedom</strong></del></span>
+<span class="inserted"><ins><em>boot&rdquo;&mdash;freedom</em></ins></span> 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.
 &lt;/p&gt;
@@ -210,8 +324,8 @@
 &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
+cannot merge in a suitably licensed existing <span 
class="removed"><del><strong>module &mdash; for</strong></del></span> <span 
class="inserted"><ins><em>module&mdash;for</em></ins></span> instance, if it
+requires you to be the copyright holder of any code you <span 
class="removed"><del><strong>add &mdash; then</strong></del></span> <span 
class="inserted"><ins><em>add&mdash;then</em></ins></span> the
 license is too restrictive to qualify as free.
 &lt;/p&gt;
 
@@ -221,7 +335,16 @@
 someone else considers an improvement, that program is not free.
 &lt;/p&gt;
 
-&lt;h4&gt;The freedom to redistribute if you wish: basic 
requirements&lt;/h4&gt;
+&lt;p&gt;
+One special case of freedom 1 is to delete the program's code so it
+returns after doing nothing, or make it invoke some other program.
+Thus, freedom 1 includes the &ldquo;freedom to delete the program.&rdquo;
+&lt;/p&gt;
+
+<span class="removed"><del><strong>&lt;h4&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="redistribute"&gt;The</em></ins></span> freedom to redistribute if you wish: 
basic
+requirements&lt;/h4&gt;
 
 &lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you are free to
 redistribute copies, either with or without modifications, either
@@ -242,7 +365,7 @@
 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
+a &lt;a <span 
class="removed"><del><strong>href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/copyleft.html"&gt;copyleft&lt;/a&gt;</em></ins></span>
 license.  However, a
 license that requires modified versions to be nonfree does not qualify
 as a free license.
 &lt;/p&gt;
@@ -258,12 +381,14 @@
 make them.
 &lt;/p&gt;
 
-&lt;h4&gt;Copyleft&lt;/h4&gt;
+<span 
class="removed"><del><strong>&lt;h4&gt;Copyleft&lt;/h4&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="copyleft"&gt;Copyleft&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 Certain kinds of rules about the manner of distributing free
 software are acceptable, when they don't conflict with the central
-freedoms.  For example, &lt;a 
href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;
+freedoms.  For example, &lt;a <span 
class="removed"><del><strong>href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/licenses/copyleft.html"&gt;copyleft&lt;/a&gt;</em></ins></span>
 (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
@@ -283,7 +408,9 @@
 relate to each other.
 &lt;/p&gt;
 
-&lt;h4&gt;Rules about packaging and distribution details&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Rules</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="packaging"&gt;Rules</em></ins></span> about packaging and distribution 
details&lt;/h4&gt;
 
 &lt;p&gt;
 Rules about how to package a modified version are acceptable,
@@ -318,10 +445,12 @@
 facility that allows you to specify the original program's name as an
 alias for the modified version.&lt;/p&gt;
 
-&lt;h4&gt;Export regulations&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Export</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="exportcontrol"&gt;Export</em></ins></span> regulations&lt;/h4&gt;
 
 &lt;p&gt;
-Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
+Sometimes government <span class="removed"><del><strong>&lt;a 
id="exportcontrol"&gt;export</strong></del></span> <span 
class="inserted"><ins><em>export</em></ins></span> control <span 
class="removed"><del><strong>regulations&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>regulations</em></ins></span>
 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
@@ -342,7 +471,9 @@
 software nonfree.
 &lt;/p&gt;
 
-&lt;h4&gt;Legal considerations&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Legal</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="legal-details"&gt;Legal</em></ins></span> considerations&lt;/h4&gt;
 
 &lt;p&gt;
 In order for these freedoms to be real, they must be permanent and
@@ -355,7 +486,7 @@
 &lt;p&gt;
 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 &ldquo;all the programs you use&rdquo;, in
+comply with the licenses of &ldquo;all the programs you <span 
class="removed"><del><strong>use&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>use,&rdquo;</em></ins></span> 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.
@@ -366,7 +497,9 @@
 law applies, or where litigation must be done, or both.
 &lt;/p&gt;
 
-&lt;h4&gt;Contract-based licenses&lt;/h4&gt;
+<span 
class="removed"><del><strong>&lt;h4&gt;Contract-based</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 
id="contracts"&gt;Contract-based</em></ins></span> licenses&lt;/h4&gt;
 
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
@@ -387,7 +520,7 @@
 it is nonfree.
 &lt;/p&gt;
 
-&lt;h4&gt;Use the right words when talking about free software&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Use the right words when talking 
about free software&lt;/h4&gt;
 
 &lt;p&gt;
 When talking about free software, it is best to avoid using terms
@@ -400,10 +533,15 @@
 &ldquo;free software&rdquo;&lt;/a&gt; into various languages.
 &lt;/p&gt;
 
-&lt;h4&gt;How we interpret these criteria&lt;/h4&gt;
+&lt;h4&gt;How</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h3 id="in-practice"&gt;The Free Software 
Definition in Practice&lt;/h3&gt;
+
+&lt;h4 id="interpretation"&gt;How</em></ins></span> we interpret these 
criteria&lt;/h4&gt;
 
 &lt;p&gt;
-Finally, note that criteria such as those stated in this free software
+<span class="removed"><del><strong>Finally, note</strong></del></span>
+<span class="inserted"><ins><em>Note</em></ins></span> 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
@@ -416,7 +554,9 @@
 it easier to see why certain licenses do or don't qualify.
 &lt;/p&gt;
 
-&lt;h4&gt;Get help with free licenses&lt;/h4&gt;
+<span class="removed"><del><strong>&lt;h4&gt;Get</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4 id="get-help"&gt;Get</em></ins></span> 
help with free licenses&lt;/h4&gt;
 
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
@@ -440,6 +580,27 @@
 and avoid various practical problems.
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4 id="terminology"&gt;Use the right words 
when talking about free software&lt;/h4&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 id="open-source"&gt;
+Another group uses 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; never refers to freedom.
+&lt;/p&gt;</em></ins></span>
+
 &lt;h3 id="beyond-software"&gt;Beyond Software&lt;/h3&gt;
 
 &lt;p&gt;
@@ -450,9 +611,9 @@
 
 &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,
+practical <span class="removed"><del><strong>use &mdash; 
that</strong></del></span> <span 
class="inserted"><ins><em>use&mdash;that</em></ins></span> 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
+works.  &lt;a <span 
class="removed"><del><strong>href="http://wikipedia.org"&gt;Wikipedia&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://wikipedia.org"&gt;Wikipedia&lt;/a&gt;</em></ins></span>
 is the best-known
 example.
 &lt;/p&gt;
 
@@ -462,7 +623,7 @@
 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;h3 <span class="removed"><del><strong>id="open-source"&gt;Open 
Source?&lt;/h3&gt;
 
 &lt;p&gt;
 Another group uses the term &ldquo;open source&rdquo; to mean
@@ -472,9 +633,9 @@
 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;
-<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
+&lt;/div&gt;
 
-&lt;h3 id="History"&gt;History&lt;/h3&gt;
+&lt;h3</strong></del></span> 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 substantive changes, along with links to show exactly what
@@ -482,74 +643,80 @@
 
 &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.164&amp;r2=1.165"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.168&amp;r2=1.169"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.168&amp;r2=1.169"&gt;Version</em></ins></span>
+1.169&lt;/a&gt;: Explain more clearly why the four freedoms must apply
+to commercial activity.  Explain why the four freedoms imply the
+freedom not to run the program and the freedom to delete it, so there
+is no need to state those as separate requirements.&lt;/li&gt;
+
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.164&amp;r2=1.165"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.164&amp;r2=1.165"&gt;Version</em></ins></span>
 1.165&lt;/a&gt;: Clarify that arbitrary annoyances in the code do not
 negate freedom 0, and that freedoms 1 and 3 enable users to remove 
them.&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.152&amp;r2=1.153"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153"&gt;Version</em></ins></span>
 1.153&lt;/a&gt;: Clarify that freedom to run the program means nothing stops
 you from making it run.&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.140&amp;r2=1.141"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.140&amp;r2=1.141"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.140&amp;r2=1.141"&gt;Version</em></ins></span>
 1.141&lt;/a&gt;: Clarify which code needs to be free.&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.134&amp;r2=1.135"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135"&gt;Version</em></ins></span>
 1.135&lt;/a&gt;: Say each time that freedom 0 is the freedom to run the program
 as you wish.&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.133&amp;r2=1.134"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.133&amp;r2=1.134"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.133&amp;r2=1.134"&gt;Version</em></ins></span>
 1.134&lt;/a&gt;: Freedom 0 is not a matter of the program's 
functionality.&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.130&amp;r2=1.131"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.130&amp;r2=1.131"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.130&amp;r2=1.131"&gt;Version</em></ins></span>
 1.131&lt;/a&gt;: A free license may not require compliance with a nonfree 
license
 of another program.&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.128&amp;r2=1.129"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.128&amp;r2=1.129"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.128&amp;r2=1.129"&gt;Version</em></ins></span>
 1.129&lt;/a&gt;: State explicitly that choice of law and choice of forum
 specifications are allowed.  (This was always our policy.)&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.121&amp;r2=1.122"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122"&gt;Version</em></ins></span>
 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 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118"&gt;Version</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118"&gt;Version</em></ins></span>
 1.118&lt;/a&gt;: Clarification: the issue is limits on your right to modify,
 not on what modifications you have made.  And modifications are not limited
 to &ldquo;improvements&rdquo;&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.110&amp;r2=1.111"&gt;Version
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.104&amp;r2=1.105"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.91&amp;r2=1.92"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.89&amp;r2=1.90"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.88&amp;r2=1.89"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.79&amp;r2=1.80"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.76&amp;r2=1.77"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.73&amp;r2=1.74"&gt;Version</em></ins></span>
 1.74&lt;/a&gt;: Four clarifications of points not explicit enough, or stated
 in some places but not reflected everywhere:
 &lt;ul&gt;
@@ -563,38 +730,38 @@
 &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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.56&amp;r2=1.57"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.45&amp;r2=1.46"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.40&amp;r2=1.41"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.39&amp;r2=1.40"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.38&amp;r2=1.39"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.30&amp;r2=1.31"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.15&amp;r2=1.16"&gt;Version</em></ins></span>
 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
+&lt;li&gt;&lt;a <span 
class="removed"><del><strong>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</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.10&amp;r2=1.11"&gt;Version</em></ins></span>
 1.11&lt;/a&gt;: Note that a free license may require you to send a copy of
 versions you distribute to previous developers on request.&lt;/li&gt;
 
@@ -605,21 +772,23 @@
 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 &lt;a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb
+the &lt;a <span 
class="removed"><del><strong>href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb</strong></del></span>
 <span 
class="inserted"><ins><em>href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log"&gt;cvsweb</em></ins></span>
 interface&lt;/a&gt;.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;div 
class="column-limit"&gt;&lt;/div&gt;</em></ins></span>
 
-<span class="inserted"><ins><em>&lt;h3 
style="font-size:1em"&gt;Footnote&lt;/h3&gt;
+&lt;h3 <span 
class="removed"><del><strong>style="font-size:1em"&gt;Footnote&lt;/h3&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>class="footnote"&gt;Footnote&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
 &lt;li id="f1"&gt;The reason they are numbered 0, 1, 2 and 3 is historical. 
Around
 1990 there were three freedoms, numbered 1, 2 and 3. Then we realized that
 the freedom to run the program needed to be mentioned explicitly.
 It was clearly more basic than the other three, so it properly should
 precede them. Rather than renumber the others, we made it 
freedom&nbsp;0.&lt;/li&gt;
-&lt;/ol&gt;</em></ins></span>
+&lt;/ol&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
 &lt;div class="unprintable"&gt;
 
 &lt;p&gt;Please send general FSF &amp; GNU inquiries to
@@ -637,13 +806,13 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
         README&lt;/a&gt;. --&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
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
 of this article.&lt;/p&gt;
 &lt;/div&gt;
 
@@ -664,7 +833,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 1996, 2002, 2004-2007, <span 
class="removed"><del><strong>2009-2017</strong></del></span> <span 
class="inserted"><ins><em>2009-2019</em></ins></span>
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996, 2002, 
2004-2007, 2009-2019,</strong></del></span> <span 
class="inserted"><ins><em>1996-2002, 2004-2019,</em></ins></span> 2021
 Free Software Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -675,12 +844,11 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2019/07/30 10:30:35 $
+$Date: 2021/09/14 10:02:25 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
+&lt;/div&gt;&lt;!-- for class="inner", starts in the banner include --&gt;
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: server/home-pkgblurbs.fr.html
===================================================================
RCS file: /web/www/www/server/home-pkgblurbs.fr.html,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- server/home-pkgblurbs.fr.html       14 Sep 2021 01:04:07 -0000      1.163
+++ server/home-pkgblurbs.fr.html       14 Sep 2021 10:02:25 -0000      1.164
@@ -713,12 +713,14 @@
   <a href="/software/dia/">Dia</a></h4>
 <p>
 <!-- TRANSLATORS: stale -->
-Dia is a GNU program for drawing diagrams.  It is a versatile diagramming
-tool with a modular design that allows development of custom shape packages
-for drawing various kinds of diagrams by writing XML files, and has support
-for UML diagrams, flowcharts, network diagrams, circuit diagrams, and many
-more.  Dia can export diagrams to a number of formats, including EPS, SVG,
-PNG, and more.  <small>(<a href="/manual/manual.html#dia">doc</a>)</small></p>
+Dia est un programme GNU qui sert à dessiner des diagrammes. C'est un outil
+de programmation versatile de conception modulaire qui s'appuie sur des
+fichiers XML et permet de créer des ensembles de formes nouvelles destinées
+à divers types de diagrammes. Il prend en charge les diagrammes UML, les
+organigrammes de programmation <i>[flowcharts]</i>, les diagrammes de
+réseau, les schémas de circuits et plus encore. Dia peut exported les
+diagrammes dans de nombreux formats, entre autres EPS, SVG et PNG.
+<small>(<a href="/manual/manual.html#dia">doc</a>)</small></p>
 
 <!--#endif -->
 <!--#if expr="$pkg_selection = /:(dico|ALL):/" -->



reply via email to

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