www-commits
[Top][All Lists]
Advanced

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

www/philosophy bill-gates-and-other-communists....


From: Therese Godefroy
Subject: www/philosophy bill-gates-and-other-communists....
Date: Sat, 11 Sep 2021 05:37:23 -0400 (EDT)

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 21/09/11 05:37:23

Modified files:
        philosophy     : bill-gates-and-other-communists.html 
                         can-you-trust.html categories.html 
                         compromise.html computing-progress.html 
                         danger-of-software-patents.html 
                         drdobbs-letter.html ebooks.html 
                         floss-and-foss.html 
                         free-software-for-freedom.html 
                         free-software-intro.html free-sw.html 
                         fs-translations.html 

Log message:
        Changes that shouldn't affect translations: non-free > nonfree, quotes,
        dashes, copyright comment, etc.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/bill-gates-and-other-communists.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/can-you-trust.html?cvsroot=www&r1=1.64&r2=1.65
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.html?cvsroot=www&r1=1.106&r2=1.107
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/compromise.html?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/computing-progress.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/danger-of-software-patents.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/drdobbs-letter.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/ebooks.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/floss-and-foss.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-software-for-freedom.html?cvsroot=www&r1=1.66&r2=1.67
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-software-intro.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.html?cvsroot=www&r1=1.178&r2=1.179
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.html?cvsroot=www&r1=1.171&r2=1.172

Patches:
Index: bill-gates-and-other-communists.html
===================================================================
RCS file: /webcvs/www/www/philosophy/bill-gates-and-other-communists.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- bill-gates-and-other-communists.html        5 Sep 2021 07:59:44 -0000       
1.8
+++ bill-gates-and-other-communists.html        11 Sep 2021 09:37:22 -0000      
1.9
@@ -92,7 +92,7 @@
 <blockquote>
 <p>If people had understood how patents would be granted when
 most of today's ideas were invented and had taken out patents, the
-industry would be at a complete stand-still today...A future start-up
+industry would be at a complete stand-still today. &hellip; A future start-up
 with no patents of its own will be forced to pay whatever price the
 giants choose to impose.</p>
 </blockquote>
@@ -176,7 +176,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/09/05 07:59:44 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: can-you-trust.html
===================================================================
RCS file: /webcvs/www/www/philosophy/can-you-trust.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- can-you-trust.html  20 Aug 2021 20:25:37 -0000      1.64
+++ can-you-trust.html  11 Sep 2021 09:37:22 -0000      1.65
@@ -10,17 +10,16 @@
 <!--#include virtual="/philosophy/ph-breadcrumb.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
 <h2>Can You Trust Your Computer?</h2>
 
 <address class="byline">by <a href="https://www.stallman.org/";>Richard
 Stallman</a></address>
 
-<div class="article">
 <p>
 Who should your computer take its orders from?  Most people think
 their computers should obey them, not obey someone else.  With a plan
-they call &ldquo;trusted computing&rdquo;, large media corporations
+they call &ldquo;trusted computing,&rdquo; large media corporations
 (including the movie companies and record companies), together with
 computer companies such as Microsoft and Intel, are planning to make
 your computer obey them instead of you.  (Microsoft's version of this
@@ -220,9 +219,9 @@
 context of Palladium.</p>
 <p>
 The presentation made frequent use of other terms that we frequently
-associate with the context of security, such as &ldquo;attack&rdquo;,
-&ldquo;malicious code&rdquo;, &ldquo;spoofing&rdquo;, as well as
-&ldquo;trusted&rdquo;.  None of them means what it normally means.
+associate with the context of security, such as &ldquo;attack,&rdquo;
+&ldquo;malicious code,&rdquo; &ldquo;spoofing,&rdquo; as well as
+&ldquo;trusted.&rdquo;  None of them means what it normally means.
 &ldquo;Attack&rdquo; doesn't mean someone trying to hurt you, it means
 you trying to copy music.  &ldquo;Malicious code&rdquo; means code
 installed by you to do what someone else doesn't want your machine to
@@ -270,7 +269,6 @@
 is harmless only because it failed in the attempt to make remote
 attestation feasible.  We must not presume that all future attempts
 will fail too.</p>
-</div>
 
 <hr class="no-display" />
 <div class="edu-note c"><p id="fsfs">This essay is published in
@@ -308,6 +306,23 @@
 information on coordinating and contributing translations of this article.</p>
 </div>
 
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
 <p>Copyright &copy; 2002, 2007, 2015, 2021 Richard Stallman</p>
   
 <p>This page is licensed under a <a rel="license"
@@ -318,7 +333,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/20 20:25:37 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: categories.html
===================================================================
RCS file: /webcvs/www/www/philosophy/categories.html,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- categories.html     19 Aug 2021 07:36:44 -0000      1.106
+++ categories.html     11 Sep 2021 09:37:22 -0000      1.107
@@ -5,35 +5,36 @@
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Categories of Free and Nonfree Software
 - GNU Project - Free Software Foundation</title>
-<style type="text/css" media="screen">
-<!--
-#content #diagram { overflow: auto; margin: 2em 0; }
-#diagram img { width: 31.7em; }
--->
-</style>
+<style type="text/css" media="screen"><!--
+#diagram { width: 32em; max-width: 100%; margin: 2.5em auto 2em; }
+#diagram img { width: 29.9em; height: auto; overflow: auto; }
+#diagram p { font-size: .88em; text-align: justify; }
+--></style>
 <!--#include virtual="/philosophy/po/categories.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="reduced-width">
+<div class="article reduced-width">
 <h2>Categories of Free and Nonfree Software</h2>
 
-<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
-       Words which You Might Want to Avoid</a>.</p>
-
 <!-- GNUN: localize URL /philosophy/category.png -->
-<p id="diagram" class="c">
+<div id="diagram" class="c" role="figure" aria-labelledby="caption">
 <img src="/philosophy/category.png" alt=" [Categories of software] " />
-</p>
-
-      <p>This diagram, originally by Chao-Kuei and updated by several
+      <p id="caption">
+      This diagram, originally by Chao-Kuei and updated by several
       others since, explains the different categories of software. It's
       available as a <a href="/philosophy/category.svg">Scalable Vector
       Graphic</a> and as an <a href="/philosophy/category.fig">XFig
       document</a>, under the terms of any of the GNU GPL v2 or later,
       the GNU FDL v1.2 or later, or the Creative Commons
       Attribution-Share Alike v2.0 or later.</p>
+</div>
+
+<div class="announcement" role="complementary">
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
+       Words which You Might Want to Avoid</a>.</p>
+</div>
 
 <h3 id="FreeSoftware">Free software</h3>
 
@@ -76,7 +77,7 @@
        <p>Many languages have two separate words for
        &ldquo;free&rdquo; as in freedom and &ldquo;free&rdquo; as in
        zero price. For example, French has &ldquo;libre&rdquo; and
-       &ldquo;gratuit&rdquo;. Not so English; there is a word
+       &ldquo;gratuit.&rdquo; Not so English; there is a word
        &ldquo;gratis&rdquo; that refers unambiguously to price, but
        no common adjective that refers unambiguously to freedom. So
        if you are speaking another language, we suggest you translate
@@ -129,7 +130,7 @@
        mean <a href="#FreeSoftware">&ldquo;free&rdquo;</a> or
        &ldquo;available gratis.&rdquo; However, &ldquo;public
        domain&rdquo; is a legal term and means, precisely, &ldquo;not
-       copyrighted&rdquo;. For clarity, we recommend using
+       copyrighted.&rdquo; For clarity, we recommend using
        &ldquo;public domain&rdquo; for that meaning only, and using
        other terms to convey the other meanings.</p>
 
@@ -169,7 +170,7 @@
        However, in actual practice nearly all copylefted software uses the
        <a href="/licenses/gpl.html">GNU General Public
        License</a>. Two different copyleft licenses are usually
-       &ldquo;incompatible&rdquo;, which means it is illegal to merge
+       &ldquo;incompatible,&rdquo; which means it is illegal to merge
        the code using one license with the code using the other
        license; therefore, it is good for the community if people use
        a single copyleft license.</p>
@@ -254,7 +255,7 @@
        <p>&ldquo;GNU programs&rdquo; is equivalent
        to <a href="#GNUsoftware">GNU software.</a> A program Foo is a
        GNU program if it is GNU software.  We also sometimes say it
-       is a &ldquo;GNU package&rdquo;.</p>
+       is a &ldquo;GNU package.&rdquo;</p>
 
 <h3 id="GNUsoftware">GNU software</h3>
 
@@ -305,9 +306,9 @@
 
        <p>Proprietary software is another name for nonfree software.
        In the past we subdivided nonfree software into
-       &ldquo;semifree software&rdquo;, which could be modified and
+       &ldquo;semifree software,&rdquo; which could be modified and
        redistributed noncommercially, and &ldquo;proprietary
-       software&rdquo;, which could not be.  But we have dropped that
+       software,&rdquo; which could not be.  But we have dropped that
        distinction and now use &ldquo;proprietary software&rdquo; as
        synonymous with nonfree software.</p>
 
@@ -440,6 +441,23 @@
 information on coordinating and contributing translations of this article.</p>
 </div>
 
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
 <p>Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 
Free
 Software Foundation, Inc.</p>
 
@@ -451,7 +469,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/19 07:36:44 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: compromise.html
===================================================================
RCS file: /webcvs/www/www/philosophy/compromise.html,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- compromise.html     19 Aug 2021 07:36:44 -0000      1.50
+++ compromise.html     11 Sep 2021 09:37:22 -0000      1.51
@@ -16,16 +16,15 @@
 <!--#include virtual="/philosophy/ph-breadcrumb.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
 <h2>Avoiding Ruinous Compromises</h2>
 
 <address class="byline">by Richard Stallman</address>
 
-<div class="article">
-<p class="comment">Twenty-five years
+<p class="introduction">Twenty-five years
 ago <a href="/gnu/initial-announcement.html">on September 27, 1983, I
 announced a plan</a> to create a completely free operating system
-called GNU&mdash;for &ldquo;GNU's Not Unix&rdquo;.  As part of the
+called GNU&mdash;for &ldquo;GNU's Not Unix.&rdquo;  As part of the
 25th anniversary of the GNU system, I have written this article on how
 our community can avoid ruinous compromises.  In addition to avoiding
 such compromises, there are many ways you can <a href="/help/help.html">
@@ -128,7 +127,7 @@
 <p>To establish a free community fully and lastingly, we need to do
 more than get people to use some free software.  We need to spread the
 idea of judging software (and other things) on &ldquo;citizen
-values&rdquo;, based on whether it respects users' freedom and
+values,&rdquo; based on whether it respects users' freedom and
 community, not just in terms of convenience.  Then people will not
 fall into the trap of a proprietary program baited by an attractive,
 convenient feature.</p>
@@ -200,7 +199,6 @@
 but beware of compromises that lead away from the goal.</p>
 
 <hr class="column-limit"/>
-</div>
 
 <p>
 For a similar point in a different area of life,
@@ -239,6 +237,23 @@
 information on coordinating and contributing translations of this article.</p>
 </div>
 
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
 <p>Copyright &copy; 2008, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -249,7 +264,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/19 07:36:44 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: computing-progress.html
===================================================================
RCS file: /webcvs/www/www/philosophy/computing-progress.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- computing-progress.html     2 Sep 2021 10:38:03 -0000       1.25
+++ computing-progress.html     11 Sep 2021 09:37:22 -0000      1.26
@@ -92,8 +92,8 @@
 
 <p>
 My vision of the world is different.  I would like to see a world in
-which all the software in our computers &mdash; in our desktop PCs, our
-laptops, our handhelds, our phones &mdash; is under our control and
+which all the software in our computers&mdash;in our desktop PCs, our
+laptops, our handhelds, our phones&mdash;is under our control and
 respects our freedom.  In other words, a world where all software is
 <a href="/philosophy/free-sw.html"><em>free</em></a> software.</p>
 
@@ -164,6 +164,23 @@
 information on coordinating and contributing translations of this article.</p>
 </div>
 
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
 <p>Copyright &copy; 2007, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -174,7 +191,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/09/02 10:38:03 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: danger-of-software-patents.html
===================================================================
RCS file: /webcvs/www/www/philosophy/danger-of-software-patents.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- danger-of-software-patents.html     20 Aug 2021 20:25:37 -0000      1.37
+++ danger-of-software-patents.html     11 Sep 2021 09:37:22 -0000      1.38
@@ -10,7 +10,7 @@
 <!--#include virtual="/philosophy/ph-breadcrumb.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
 <h2>The Danger of Software Patents</h2>
 
 <address class="byline">by <a href="https://www.stallman.org/";>Richard
@@ -22,7 +22,6 @@
 </div>
 <hr class="thin" />
 
-<div class="article">
 <dl>
 <dt>SF:</dt>
 <dd><p>My name is Susy Frankel and on behalf of myself and Meredith
@@ -613,7 +612,7 @@
 himself in his attic coming up with a better way to do whatever it is.
 And now that it's ready, he wants to start a business and mass-produce
 this thing; and because his idea is so good his company will
-inevitably succeed&mdash; except for one thing: the big companies will
+inevitably succeed&mdash;except for one thing: the big companies will
 compete with him and take all his market the away.  And because of
 this, his business will almost certainly fail, and then he will
 starve.</p>
@@ -1413,7 +1412,6 @@
 you Richard.</dd>
 
 </dl>
-</div>
 
 <hr class="no-display" />
 <div class="edu-note c"><p id="fsfs">This speech is published in
@@ -1479,7 +1477,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/20 20:25:37 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: drdobbs-letter.html
===================================================================
RCS file: /webcvs/www/www/philosophy/drdobbs-letter.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- drdobbs-letter.html 2 Sep 2021 08:55:39 -0000       1.31
+++ drdobbs-letter.html 11 Sep 2021 09:37:22 -0000      1.32
@@ -19,7 +19,7 @@
 </p>
 <p>
 I am sure you don't realize how ironic it is to associate me and Tim
-O'Reilly with &ldquo;open source&rdquo;.
+O'Reilly with &ldquo;open source.&rdquo;
 </p>
 <p>
 If the House Un-American Activities Committee asked me, &ldquo;Are you
@@ -41,7 +41,7 @@
 </p>
 <p>
 Years later, in 1998, another group began operating under the term
-&ldquo;open source&rdquo;.  They have contributed to the free software
+&ldquo;open source.&rdquo;  They have contributed to the free software
 community in practical ways, but they stand for very different views.
 They studiously avoid the issues of freedom and principle that we
 raise in the free software movement; they cite only short-term
@@ -144,7 +144,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/09/02 08:55:39 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: ebooks.html
===================================================================
RCS file: /webcvs/www/www/philosophy/ebooks.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- ebooks.html 2 Sep 2021 08:55:39 -0000       1.37
+++ ebooks.html 11 Sep 2021 09:37:22 -0000      1.38
@@ -30,8 +30,6 @@
 as intended, with little burden on the public. It did its job
 well&mdash;back then.</p>
 
-
-
 <p>Then a new way of distributing information came about: computers
 and networks. The advantage of digital information technology is
 that it facilitates copying and manipulating information, including
@@ -76,7 +74,7 @@
 
 <p>We still have the same old freedoms in using paper books. But if
 e-books replace printed books, that exception will do little good.
-With &ldquo;electronic ink&rdquo;, which makes it possible to download
+With &ldquo;electronic ink,&rdquo; which makes it possible to download
 new text onto an apparently printed piece of paper, even newspapers
 could become ephemeral. Imagine: no more used book stores; no more
 lending a book to your friend; no more borrowing one from the public
@@ -114,7 +112,7 @@
 <p>Eventually, when computer networks provide an easy way to send
 someone a small amount of money, the whole rationale for restricting
 verbatim copying will go away. If you like a book, and it pops up a
-box saying, &ldquo;Click here to give the author one dollar&rdquo;,
+box saying, &ldquo;Click here to give the author one dollar,&rdquo;
 wouldn't you click? Copyright for books and music, as it applies to
 distributing verbatim unmodified copies, will be entirely obsolete.
 And not a moment too soon!</p>
@@ -126,7 +124,7 @@
 increase our freedom, not decrease it</a>.</p>
 </div>
 
-<div class="infobox">
+<div class="infobox extra" role="complementary">
 <hr />
 <p>This is a slightly modified version of an article published in
 <cite>Technology Review</cite> in 2000.</p>
@@ -162,6 +160,23 @@
 information on coordinating and contributing translations of this article.</p>
 </div>
 
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
 <p>Copyright &copy; 2000, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -172,7 +187,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/09/02 08:55:39 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: floss-and-foss.html
===================================================================
RCS file: /webcvs/www/www/philosophy/floss-and-foss.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- floss-and-foss.html 19 Aug 2021 07:36:44 -0000      1.19
+++ floss-and-foss.html 11 Sep 2021 09:37:22 -0000      1.20
@@ -9,12 +9,11 @@
 <!--#include virtual="/philosophy/ph-breadcrumb.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
 <h2>FLOSS and FOSS</h2>
 
 <address class="byline">by Richard Stallman</address>
 
-<div class="article">
 <p>The two political camps in the free software community are the free
 software movement and open source.  The free software movement is a
 campaign
@@ -61,9 +60,8 @@
 <p>We in the free software movement don't use either of these terms,
 because we don't want to be neutral on the political question.  We
 stand for freedom, and we show it every time&mdash;by saying
-&ldquo;free&rdquo; and &ldquo;libre&rdquo;&mdash; or &ldquo;free
-(libre)&rdquo;.</p>
-</div>
+&ldquo;free&rdquo; and &ldquo;libre&rdquo;&mdash;or &ldquo;free
+(libre).&rdquo;</p>
 </div>
 
 </div><!-- for id="content", starts in the include above -->
@@ -97,6 +95,23 @@
 of this article.</p>
 </div>
 
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
 <p>Copyright &copy; 2013, 2015, 2016, 2021 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -107,7 +122,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/19 07:36:44 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: free-software-for-freedom.html
===================================================================
RCS file: /webcvs/www/www/philosophy/free-software-for-freedom.html,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- free-software-for-freedom.html      5 Sep 2021 07:59:45 -0000       1.66
+++ free-software-for-freedom.html      11 Sep 2021 09:37:22 -0000      1.67
@@ -258,8 +258,8 @@
 official definition, said this:</p>
 
 <blockquote><p>
-As is common in the open source community, users of the ...
-technology will also be able to collaborate with IBM ...
+As is common in the open source community, users of the &hellip;
+technology will also be able to collaborate with IBM&hellip;
 </p></blockquote>
 
 <p>
@@ -440,6 +440,23 @@
 information on coordinating and contributing translations of this article.</p>
 </div>
 
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
 <p>Copyright &copy; 1998-2003, 2007, 2010, 2021 Free Software Foundation,
 Inc.</p>
 
@@ -451,7 +468,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/09/05 07:59:45 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: free-software-intro.html
===================================================================
RCS file: /webcvs/www/www/philosophy/free-software-intro.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- free-software-intro.html    19 Aug 2021 07:36:44 -0000      1.32
+++ free-software-intro.html    11 Sep 2021 09:37:22 -0000      1.33
@@ -10,10 +10,9 @@
 <!--#include virtual="/philosophy/ph-breadcrumb.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
 <h2>Free Software Movement</h2>
 
-<div class="article">
 <p>
 People use free software operating systems such
 as <a href="/gnu/linux-and-gnu.html">GNU/Linux</a> for various
@@ -69,10 +68,9 @@
 <p>
 If you think that freedom and community are important for their own
 sake, please join us in proudly using the term &ldquo;free
-software&rdquo;, and help spread the word.
+software,&rdquo; and help spread the word.
 </p>
 </div>
-</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -131,7 +129,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/19 07:36:44 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: free-sw.html
===================================================================
RCS file: /webcvs/www/www/philosophy/free-sw.html,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -b -r1.178 -r1.179
--- free-sw.html        31 Aug 2021 11:39:00 -0000      1.178
+++ free-sw.html        11 Sep 2021 09:37:22 -0000      1.179
@@ -29,7 +29,7 @@
 software</b>.  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 beer.&rdquo;  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.
@@ -164,7 +164,7 @@
 <h4 id="selling">Free software <em>can</em> be commercial</h4>
 
 <p>
-&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial&rdquo;.
+&ldquo;Free software&rdquo; does not mean &ldquo;noncommercial.&rdquo;
 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
@@ -254,10 +254,10 @@
 <p>
 Freedom 1 includes the freedom to use your changed version in place of
 the original.  If the program is delivered in a product designed to
-run someone else's modified versions but refuse to run yours &mdash; a
-practice known as &ldquo;tivoization&rdquo; or &ldquo;lockdown&rdquo;,
+run someone else's modified versions but refuse to run yours&mdash;a
+practice known as &ldquo;tivoization&rdquo; or &ldquo;lockdown,&rdquo;
 or (in its practitioners' perverse terminology) as &ldquo;secure
-boot&rdquo; &mdash; freedom 1 becomes an empty pretense rather than a
+boot&rdquo;&mdash;freedom 1 becomes an empty pretense rather than a
 practical reality.  These binaries are not free
 software even if the source code they are compiled from is free.
 </p>
@@ -265,8 +265,8 @@
 <p>
 One important way to modify a program is by merging in available free
 subroutines and modules.  If the program's license says that you
-cannot merge in a suitably licensed existing module &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 module&mdash;for instance, if it
+requires you to be the copyright holder of any code you add&mdash;then the
 license is too restrictive to qualify as free.
 </p>
 
@@ -417,7 +417,7 @@
 <p>
 A free license may not require compliance with the license of a
 nonfree program.  Thus, for instance, if a license requires you to
-comply with the licenses of &ldquo;all the programs you use&rdquo;, in
+comply with the licenses of &ldquo;all the programs you use,&rdquo; 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.
@@ -506,7 +506,7 @@
 
 <p id="open-source">
 Another group uses the term &ldquo;open source&rdquo; to mean
-something close (but not identical) to &ldquo;free software&rdquo;.  We
+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.
@@ -522,7 +522,7 @@
 
 <p>
 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 use&mdash;that is to say, works that embody useful knowledge,
 such as educational works and reference
 works.  <a href="https://wikipedia.org";>Wikipedia</a> is the best-known
 example.
@@ -743,7 +743,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/31 11:39:00 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: fs-translations.html
===================================================================
RCS file: /webcvs/www/www/philosophy/fs-translations.html,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -b -r1.171 -r1.172
--- fs-translations.html        19 Aug 2021 07:36:44 -0000      1.171
+++ fs-translations.html        11 Sep 2021 09:37:22 -0000      1.172
@@ -1,4 +1,4 @@
-<!--#include virtual="/server/html5-header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
 <!--#set var="TAGS" value="essays term" -->
@@ -26,8 +26,8 @@
 href="/philosophy/open-source-misses-the-point.html">free as in
 freedom</a>) into various languages.</p>
 
-<p>We also provide translations of &ldquo;gratis software&rdquo;,
-&ldquo;proprietary software&rdquo;, and &ldquo;commercial software&rdquo;
+<p>We also provide translations of &ldquo;gratis software,&rdquo;
+&ldquo;proprietary software,&rdquo; and &ldquo;commercial software&rdquo;
 to show how to make the contrast in various languages.</p>
 
 <p>If you know a correction or addition to the list, please email it to
@@ -1082,7 +1082,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/19 07:36:44 $
+$Date: 2021/09/11 09:37:22 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

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