www-commits
[Top][All Lists]
Advanced

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

www/philosophy categories.html fs-translations....


From: Therese Godefroy
Subject: www/philosophy categories.html fs-translations....
Date: Wed, 21 Jul 2021 16:05:58 -0400 (EDT)

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 21/07/21 16:05:58

Modified files:
        philosophy     : categories.html fs-translations.html 
                         wipo-PublicAwarenessOfCopyright-2002.html 
                         why-call-it-the-swindle.html 

Log message:
        Add breadcrumb, update to boilerplate 1.96. 
        As needed: use byline class for author; reduce line width,
        http > https, remove irrelevant years from copyright notice.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.html?cvsroot=www&r1=1.103&r2=1.104
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.html?cvsroot=www&r1=1.169&r2=1.170
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/wipo-PublicAwarenessOfCopyright-2002.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/why-call-it-the-swindle.html?cvsroot=www&r1=1.10&r2=1.11

Patches:
Index: categories.html
===================================================================
RCS file: /webcvs/www/www/philosophy/categories.html,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- categories.html     21 Feb 2019 01:56:25 -0000      1.103
+++ categories.html     21 Jul 2021 20:05:57 -0000      1.104
@@ -1,5 +1,8 @@
 <!--#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="term" -->
+<!--#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">
@@ -10,7 +13,11 @@
 </style>
 <!--#include virtual="/philosophy/po/categories.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>Categories of free and nonfree software</h2>
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="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>
@@ -180,7 +187,7 @@
        a <a href="#ProprietarySoftware">proprietary</a> software
        product.</p>
 
-       <p>The <a href="http://www.x.org";>X Window System</a>
+       <p>The <a href="https://www.x.org/wiki/";>X Window System</a>
        illustrates this.  The X Consortium released X11 with
        distribution terms that made it noncopylefted free
        software, and subsequent developers have mostly followed the
@@ -252,8 +259,8 @@
 <h3 id="GNUsoftware">GNU software</h3>
 
        <p><a href="/software/software.html">GNU software</a> is
-       software that is released under the auspices of the <a href=
-       "/gnu/gnu-history.html">GNU Project</a>. If a program is GNU
+       software that is released under the auspices of the <a
+       href="/gnu/gnu-history.html">GNU Project</a>. If a program is GNU
        software, we also say that it is a GNU program or a GNU
        package.  The README or manual of a GNU package should say it
        is one; also, the <a href="/directory">Free Software
@@ -264,9 +271,9 @@
        all GNU software must be <a href="/philosophy/free-sw.html">free
        software</a>.</p>
 
-       <p>Some GNU software was written by <a href=
-       "http://www.fsf.org/about/staff/";>staff</a> of
-       the <a href="http://www.fsf.org/";>Free Software
+       <p>Some GNU software was written by <a
+       href="https://www.fsf.org/about/staff/";>staff</a> of
+       the <a href="https://www.fsf.org/";>Free Software
        Foundation</a>, but most GNU software comes from many
        <a href="/people/people.html">volunteers</a>.  (Some of these
        volunteers are paid by companies or universities, but they are
@@ -402,16 +409,11 @@
        software is possible. You can do this by making an effort not
        to say &ldquo;commercial&rdquo; when you mean
        &ldquo;proprietary.&rdquo;</p>
+</div>
 
-<!-- If needed, change the copyright block at the bottom. In general, -->
-<!-- all pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
 </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 <a
@@ -429,16 +431,16 @@
         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 of this article.</p>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010, 2014, 
2015, 2016, 2017, 2018, 2019 Free
+<p>Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019 Free
 Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -449,7 +451,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/02/21 01:56:25 $
+$Date: 2021/07/21 20:05:57 $
 <!-- timestamp end -->
 </p>
 </div>

Index: fs-translations.html
===================================================================
RCS file: /webcvs/www/www/philosophy/fs-translations.html,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -b -r1.169 -r1.170
--- fs-translations.html        3 May 2021 17:07:17 -0000       1.169
+++ fs-translations.html        21 Jul 2021 20:05:57 -0000      1.170
@@ -1,5 +1,8 @@
 <!--#include virtual="/server/html5-header.html" -->
 <!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Translations of the term &ldquo;free software&rdquo;
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/fs-translations.translist" -->
@@ -11,6 +14,9 @@
 --><!--#endif -->
 </style>
 <!--#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">
 <h2>Translations of the term &ldquo;free software&rdquo;</h2>
 <div class="thin"></div>
@@ -1066,9 +1072,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
-Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 1999-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
@@ -1078,7 +1082,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/05/03 17:07:17 $
+$Date: 2021/07/21 20:05:57 $
 <!-- timestamp end -->
 </p>
 </div>

Index: wipo-PublicAwarenessOfCopyright-2002.html
===================================================================
RCS file: /webcvs/www/www/philosophy/wipo-PublicAwarenessOfCopyright-2002.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- wipo-PublicAwarenessOfCopyright-2002.html   12 Apr 2014 12:40:49 -0000      
1.18
+++ wipo-PublicAwarenessOfCopyright-2002.html   21 Jul 2021 20:05:57 -0000      
1.19
@@ -1,16 +1,23 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Public Awareness of Copyright, WIPO
 - GNU Project - Free Software Foundation</title>
-
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, WIPO, 
Intellectual Property" />
-
 <!--#include 
virtual="/philosophy/po/wipo-PublicAwarenessOfCopyright-2002.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">
 <h2>Public Awareness of Copyright, WIPO, June 2002</h2>
 
-<p>by <a href="http://www.stallman.org";>Richard Stallman</a></p>
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
 
+<div class="article">
 <p>Geofrey Yu, Assistant Director General in charge of Copyright at
 WIPO, said this in a paper &ldquo;Public Awareness of
 Copyright&rdquo;, in June 2002.  It is interesting that WIPO is
@@ -85,10 +92,12 @@
 starting to backfire on WIPO, this does not mean we should use that
 term ourselves.  If we did, we would be spreading WIPO-style
 hypocrisy, whether we intended to or not.</p>
+</div>
+</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
@@ -106,19 +115,19 @@
         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>
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 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
@@ -133,21 +142,20 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2001, 2003, 2004, 2008, 2014 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 2004 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 12:40:49 $
+$Date: 2021/07/21 20:05:57 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: why-call-it-the-swindle.html
===================================================================
RCS file: /webcvs/www/www/philosophy/why-call-it-the-swindle.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- why-call-it-the-swindle.html        15 Dec 2018 14:02:39 -0000      1.10
+++ why-call-it-the-swindle.html        21 Jul 2021 20:05:57 -0000      1.11
@@ -1,15 +1,22 @@
 <!--#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="term" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Why call it the Swindle  
 - GNU Project - Free Software Foundation</title>
  <!--#include virtual="/philosophy/po/why-call-it-the-swindle.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">
 <h2>Why Call It The Swindle?</h2>
 
-<p>by <a href="http://www.stallman.org/";><strong>Richard
-Stallman</strong></a></p>
+<address class="byline">by <a href="https://www.stallman.org/";>Richard
+Stallman</a></address>
 
+<div class="article">
 <p>I go out of my way to call nasty things by names that criticize
 them. I call Apple's user-subjugating computers the
 &ldquo;iThings,&rdquo; and Amazon's abusive e-reader the
@@ -103,8 +110,9 @@
 pressure against such &ldquo;digression&rdquo; push you into
 insufficiently criticizing the nasty things you mention, because that
 would have the effect of legitimizing them.</p>
+</div>
 
-<h3>Footnotes</h3>
+<h3 class="footnote">Footnotes</h3>
 
 <ol>
 <li id="f1">Take action against these products:
@@ -115,10 +123,11 @@
 </li>
 <li id="f2"><a href="https://u.fsf.org/drm";>u.fsf.org/drm</a></li>
 </ol>
+</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
@@ -136,13 +145,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>
 
@@ -163,7 +172,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2013, 2018 Richard Stallman</p>
+<p>Copyright &copy; 2013 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -173,7 +182,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/15 14:02:39 $
+$Date: 2021/07/21 20:05:57 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

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