www-commits
[Top][All Lists]
Advanced

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

www/philosophy philosophy.fa.html philosophy.sq...


From: GNUN
Subject: www/philosophy philosophy.fa.html philosophy.sq...
Date: Sun, 1 Aug 2021 07:01:10 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/08/01 07:01:10

Modified files:
        philosophy     : philosophy.fa.html philosophy.sq.html 
        philosophy/po  : philosophy.fa-diff.html philosophy.sq-diff.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/philosophy.fa.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/philosophy.sq.html?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.fa-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.sq-diff.html?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: philosophy.fa.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy.fa.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy.fa.html  1 Jun 2021 09:43:42 -0000       1.6
+++ philosophy.fa.html  1 Aug 2021 11:01:09 -0000       1.7
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/philosophy.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/philosophy.fa.po">
+ https://www.gnu.org/philosophy/po/philosophy.fa.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/philosophy.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/philosophy.fa-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-06-02" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/philosophy.en.html" -->
 
 <!--#include virtual="/server/header.fa.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -16,6 +21,7 @@
 
 <!-- id="education-content" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/outdated.fa.html" -->
 <!--#include virtual="/server/top-addendum.fa.html" -->
 <h2>فلسفه پروژه گنو</h2>
 
@@ -150,7 +156,7 @@
 <p class="unprintable"><!-- timestamp start -->
 آخرین به‌روزرسانی:
 
-$Date: 2021/06/01 09:43:42 $
+$Date: 2021/08/01 11:01:09 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy.sq.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy.sq.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- philosophy.sq.html  1 Jun 2021 09:43:42 -0000       1.41
+++ philosophy.sq.html  1 Aug 2021 11:01:10 -0000       1.42
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/philosophy.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/philosophy.sq.po">
+ https://www.gnu.org/philosophy/po/philosophy.sq.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/philosophy.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/philosophy.sq-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-06-02" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/philosophy.en.html" -->
 
 <!--#include virtual="/server/header.sq.html" -->
 <!-- Parent-Version: 1.86 -->
@@ -16,6 +21,7 @@
 
 <!-- id="education-content" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/outdated.sq.html" -->
 <!--#include virtual="/server/top-addendum.sq.html" -->
 <h2>Filozofia e Projektit GNU</h2>
 
@@ -158,7 +164,7 @@
 <p class="unprintable"><!-- timestamp start -->
 U përditësua më:
 
-$Date: 2021/06/01 09:43:42 $
+$Date: 2021/08/01 11:01:10 $
 
 <!-- timestamp end -->
 </p>

Index: po/philosophy.fa-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.fa-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/philosophy.fa-diff.html  15 Dec 2018 14:46:40 -0000      1.4
+++ po/philosophy.fa-diff.html  1 Aug 2021 11:01:10 -0000       1.5
@@ -11,34 +11,42 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.86</em></ins></span> --&gt;
+&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</em></ins></span> --&gt;
 &lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;
-
 &lt;title&gt;Philosophy of the GNU Project
 - GNU Project - Free Software Foundation&lt;/title&gt;
-
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+@media (min-width: 55em) {
+  .table { display: table; }
+  .left-column {
+    display: table-cell;
+    width: 65%;
+    vertical-align: top;
+    padding-right: 1em;
+  }
+  .right-column { padding: 5em 0 0 2em; }
+}
+--&gt;&lt;/style&gt;</em></ins></span>
 &lt;!--#include virtual="/philosophy/po/philosophy.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 
-&lt;div id="education-content"&gt;
-
+<span class="removed"><del><strong>&lt;div 
id="education-content"&gt;</strong></del></span>
 &lt;!--#include virtual="/philosophy/philosophy-menu.html" --&gt;
 
-&lt;/div&gt; &lt;!-- id="education-content" --&gt;
+<span class="removed"><del><strong>&lt;/div&gt; &lt;!-- id="education-content" 
--&gt;</strong></del></span>
 &lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
-&lt;!--#if expr="$OUTDATED_SINCE" --&gt;&lt;!--#else --&gt;
-&lt;!--#if expr="$LANGUAGE_SUFFIX" --&gt;
-&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="no" --&gt;
 &lt;!--#include virtual="/server/top-addendum.html" --&gt;
-&lt;!--#endif --&gt;
-&lt;!--#endif --&gt;
 &lt;h2&gt;Philosophy of the GNU Project&lt;/h2&gt;
 
-&lt;blockquote&gt;&lt;p&gt;
+<span class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;
 See &lt;a href="http://audio-video.gnu.org/"&gt;audio-video.gnu.org&lt;/a&gt;
 for recordings of Richard Stallman's speeches.
-&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;div class="thin"&gt;&lt;/div&gt;
 
+&lt;div class="table"&gt;
+&lt;div class="left-column"&gt;</em></ins></span>
 &lt;p&gt;&lt;em&gt;Free software&lt;/em&gt; means that the software's users 
have
 freedom.  (The issue is not about price.)  We developed the GNU
 operating system so that users can have freedom in their
@@ -56,19 +64,33 @@
 believe a program's users should be free to take advantage of them,
 not solely its developer.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="comment"&gt;</em></ins></span>
 &lt;p&gt;For further reading, please select a section
 from the menu above.&lt;/p&gt;
 
 &lt;p&gt;We also maintain a list of &lt;a
 href="/philosophy/latest-articles.html"&gt;most recently added 
articles&lt;/a&gt;.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
+&lt;/div&gt;
+
+&lt;div class="right-column comment"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p class="announcement"&gt;
+See &lt;a href="http://audio-video.gnu.org/"&gt;audio-video.gnu.org&lt;/a&gt;
+for recordings of Richard Stallman's speeches.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;h3 id="introduction"&gt;Introduction&lt;/h3&gt;
 
+<span class="inserted"><ins><em>&lt;div class="table"&gt;
+&lt;div class="left-column"&gt;</em></ins></span>
 &lt;ul&gt;
   &lt;li&gt;&lt;a href="/philosophy/free-sw.html"&gt;What is Free 
Software?&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/philosophy/free-software-even-more-important.html"&gt;
       Why we must insist on free software&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a <span 
class="removed"><del><strong>href="/philosophy/proprietary.html"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="/proprietary/proprietary.html"&gt;</em></ins></span>
+  &lt;li&gt;&lt;a href="/proprietary/proprietary.html"&gt;
       Proprietary software is often malware&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/gnu/gnu.html"&gt;History of 
GNU/Linux&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/philosophy/pragmatic.html"&gt;Copyleft: Pragmatic 
Idealism&lt;/a&gt;&lt;/li&gt;
@@ -80,33 +102,30 @@
   Dystopian Short Story&lt;/a&gt; by &lt;a href="http://www.stallman.org/"&gt;
   Richard Stallman&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/philosophy/open-source-misses-the-point.html"&gt;Why
-       <span class="removed"><del><strong>"Open Source"</strong></del></span>
-       <span class="inserted"><ins><em>&ldquo;Open 
Source&rdquo;</em></ins></span> misses the point of Free 
Software&lt;/a&gt;&lt;/li&gt;
+       &ldquo;Open Source&rdquo; misses the point of Free 
Software&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a 
href="/philosophy/when-free-software-isnt-practically-superior.html"&gt;When
        Free Software Isn't (Practically) Superior&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/philosophy/government-free-software.html"&gt;Measures
        governments can use to promote free software&lt;/a&gt;&lt;/li&gt;       
   &lt;li&gt;&lt;a href="/education/education.html"&gt;Free software in 
education&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
-
-<span class="removed"><del><strong>&lt;p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
 &lt;!-- please leave both these ID attributes here. ... --&gt;
-<span class="removed"><del><strong>&lt;a 
id="TOCFreedomOrganizations"&gt;We&lt;/a&gt;
-&lt;a id="FreedomOrganizations"&gt;also&lt;/a&gt;</strong></del></span>
 &lt;!-- ... we removed this as an H$ section as it was duplicating the  --&gt;
 &lt;!-- same information on links.html, but it's possible that some users 
--&gt;
 &lt;!-- have the URLs bookmarked or on their pages. -len --&gt;
-<span class="inserted"><ins><em>&lt;div id="TOCFreedomOrganizations"&gt;
-&lt;p id="FreedomOrganizations"&gt;We also</em></ins></span> keep a list of
+&lt;div <span 
class="removed"><del><strong>id="TOCFreedomOrganizations"&gt;</strong></del></span>
 <span class="inserted"><ins><em>id="TOCFreedomOrganizations" 
class="right-column comment"&gt;</em></ins></span>
+&lt;p <span 
class="removed"><del><strong>id="FreedomOrganizations"&gt;We</strong></del></span>
 <span class="inserted"><ins><em>id="FreedomOrganizations" 
class="announcement"&gt;We</em></ins></span> also keep a list of
 &lt;a href="/links/links.html#FreedomOrganizations"&gt;Organizations
 that Work for Freedom in
 Computer Development and Electronic Communications&lt;/a&gt;.&lt;/p&gt;
+&lt;/div&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
@@ -124,13 +143,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;
 
@@ -151,7 +170,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; 2013, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2017, 2018</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2013, <span class="removed"><del><strong>2015, 2016, 
2017, 2018,</strong></del></span> <span 
class="inserted"><ins><em>2015-2018,</em></ins></span> 2021 Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -161,12 +180,11 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/12/15 14:46:40 $
+$Date: 2021/08/01 11:01:10 $
 &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: po/philosophy.sq-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.sq-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/philosophy.sq-diff.html  31 Aug 2013 20:13:00 -0000      1.4
+++ po/philosophy.sq-diff.html  1 Aug 2021 11:01:10 -0000       1.5
@@ -11,25 +11,42 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.75 
--&gt;</em></ins></span>
+&lt;!-- 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</em></ins></span> --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --&gt;
 &lt;title&gt;Philosophy of the GNU Project
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
-
+- GNU Project - Free Software Foundation&lt;/title&gt;
+<span class="inserted"><ins><em>&lt;style type="text/css" 
media="print,screen"&gt;&lt;!--
+@media (min-width: 55em) {
+  .table { display: table; }
+  .left-column {
+    display: table-cell;
+    width: 65%;
+    vertical-align: top;
+    padding-right: 1em;
+  }
+  .right-column { padding: 5em 0 0 2em; }
+}
+--&gt;&lt;/style&gt;</em></ins></span>
 &lt;!--#include virtual="/philosophy/po/philosophy.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
 
-&lt;div id="education-content"&gt;
-&lt;h2&gt;Philosophy of the GNU Project&lt;/h2&gt;
-
+<span class="removed"><del><strong>&lt;div 
id="education-content"&gt;</strong></del></span>
 &lt;!--#include virtual="/philosophy/philosophy-menu.html" --&gt;
 
-&lt;/div&gt; &lt;!-- id="education-content" --&gt;
+<span class="removed"><del><strong>&lt;/div&gt; &lt;!-- id="education-content" 
--&gt;</strong></del></span>
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;h2&gt;Philosophy of the GNU Project&lt;/h2&gt;
 
-<span class="inserted"><ins><em>&lt;blockquote&gt;&lt;p&gt;
+<span class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;
 See &lt;a href="http://audio-video.gnu.org/"&gt;audio-video.gnu.org&lt;/a&gt;
 for recordings of Richard Stallman's speeches.
-&lt;/p&gt;&lt;/blockquote&gt;</em></ins></span>
+&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;div class="thin"&gt;&lt;/div&gt;
 
+&lt;div class="table"&gt;
+&lt;div class="left-column"&gt;</em></ins></span>
 &lt;p&gt;&lt;em&gt;Free software&lt;/em&gt; means that the software's users 
have
 freedom.  (The issue is not about price.)  We developed the GNU
 operating system so that users can have freedom in their
@@ -47,22 +64,35 @@
 believe a program's users should be free to take advantage of them,
 not solely its developer.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="comment"&gt;</em></ins></span>
 &lt;p&gt;For further reading, please select a section
 from the menu above.&lt;/p&gt;
 
-&lt;p&gt;We also maintain a list of &lt;a 
href="/philosophy/latest-articles.html"&gt;most recently added 
articles&lt;/a&gt;.&lt;/p&gt;
+&lt;p&gt;We also maintain a list of &lt;a
+href="/philosophy/latest-articles.html"&gt;most recently added 
articles&lt;/a&gt;.&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;
+&lt;/div&gt;
 
-&lt;h3 id="introduction"&gt;Introduction&lt;/h3&gt;
+&lt;div class="right-column comment"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p class="announcement"&gt;
+See &lt;a href="http://audio-video.gnu.org/"&gt;audio-video.gnu.org&lt;/a&gt;
+for recordings of Richard Stallman's speeches.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;
+&lt;/div&gt;</em></ins></span>
 
-&lt;!-- I don't think it's good idea to link specific translation --&gt;
-&lt;!-- (e.g. foo.fr.html) from here.  It would be better to link them --&gt;
-&lt;!-- from philosophy.fr.html and the original documents. -mhatta --&gt;
+&lt;h3 id="introduction"&gt;Introduction&lt;/h3&gt;
 
+<span class="inserted"><ins><em>&lt;div class="table"&gt;
+&lt;div class="left-column"&gt;</em></ins></span>
 &lt;ul&gt;
   &lt;li&gt;&lt;a href="/philosophy/free-sw.html"&gt;What is Free 
Software?&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/philosophy/free-software-even-more-important.html"&gt;
+      Why we must insist on free software&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/proprietary/proprietary.html"&gt;
+      Proprietary software is often malware&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/gnu/gnu.html"&gt;History of 
GNU/Linux&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/philosophy/why-free.html"&gt;Why
-       Software Should Not Have Owners&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/philosophy/pragmatic.html"&gt;Copyleft: Pragmatic 
Idealism&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/philosophy/free-doc.html"&gt;Why Free Software Needs
       Free Documentation&lt;/a&gt;&lt;/li&gt;
@@ -72,46 +102,37 @@
   Dystopian Short Story&lt;/a&gt; by &lt;a href="http://www.stallman.org/"&gt;
   Richard Stallman&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="/philosophy/open-source-misses-the-point.html"&gt;Why
-       "Open Source" misses the point of Free Software&lt;/a&gt;&lt;/li&gt;
- &lt;li&gt;&lt;a 
href="/philosophy/when_free_software_isnt_practically_better.html"&gt;When Free 
Software Isn't (Practically) Better&lt;/a&gt;&lt;/li&gt;
-  &lt;li&gt;&lt;a href="/philosophy/government-free-software.html"&gt;Measures 
governments can use to promote free software&lt;/a&gt;&lt;/li&gt;       
+       &ldquo;Open Source&rdquo; misses the point of Free 
Software&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a 
href="/philosophy/when-free-software-isnt-practically-superior.html"&gt;When
+       Free Software Isn't (Practically) Superior&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="/philosophy/government-free-software.html"&gt;Measures
+       governments can use to promote free software&lt;/a&gt;&lt;/li&gt;       
+  &lt;li&gt;&lt;a href="/education/education.html"&gt;Free software in 
education&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
-&lt;p&gt;
 &lt;!-- please leave both these ID attributes here. ... --&gt;
-&lt;a id="TOCFreedomOrganizations"&gt;We&lt;/a&gt;
-&lt;a id="FreedomOrganizations"&gt;also&lt;/a&gt;
 &lt;!-- ... we removed this as an H$ section as it was duplicating the  --&gt;
 &lt;!-- same information on links.html, but it's possible that some users 
--&gt;
 &lt;!-- have the URLs bookmarked or on their pages. -len --&gt;
-keep a list of
+&lt;div <span 
class="removed"><del><strong>id="TOCFreedomOrganizations"&gt;</strong></del></span>
 <span class="inserted"><ins><em>id="TOCFreedomOrganizations" 
class="right-column comment"&gt;</em></ins></span>
+&lt;p <span 
class="removed"><del><strong>id="FreedomOrganizations"&gt;We</strong></del></span>
 <span class="inserted"><ins><em>id="FreedomOrganizations" 
class="announcement"&gt;We</em></ins></span> also keep a list of
 &lt;a href="/links/links.html#FreedomOrganizations"&gt;Organizations
 that Work for Freedom in
 Computer Development and Electronic Communications&lt;/a&gt;.&lt;/p&gt;
-
-<span class="removed"><del><strong>&lt;!-- If needed, change the copyright 
block at the bottom. In general,
-     pages on the GNU web server should be under CC BY-ND 3.0 US.
-     Please do NOT change or remove this without talking
-     with the webmasters or licensing team first.
-     Please make sure the copyright date is consistent with the document
-     and that it is like this: "2001, 2002", not this: "2001-2002". 
--&gt;</strong></del></span>
+&lt;/div&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;
-<span class="removed"><del><strong>&lt;p&gt;
-Please</strong></del></span>
+&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;
 
-<span class="inserted"><ins><em>&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
 &lt;a href="mailto:gnu@gnu.org"&gt;&lt;gnu@gnu.org&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
-the FSF.
-<span class="removed"><del><strong>&lt;br /&gt;
-Please send broken</strong></del></span>  <span 
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections 
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
-to &lt;a <span 
class="removed"><del><strong>href="mailto:webmasters@gnu.org"&gt;&lt;webmasters@gnu.org&gt;&lt;/a&gt;.
-&lt;/p&gt;
-
-&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:webmasters@gnu.org"&gt;&lt;webmasters@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:webmasters@gnu.org"&gt;&lt;webmasters@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -122,22 +143,19 @@
         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;</em></ins></span>
+        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
-of this <span class="removed"><del><strong>article.
-&lt;/p&gt;
-
-&lt;p&gt;
-Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+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;
 
 &lt;!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     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
@@ -152,22 +170,21 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright</em></ins></span> &copy; <span 
class="removed"><del><strong>2011</strong></del></span> <span 
class="inserted"><ins><em>2013</em></ins></span> Free Software Foundation, 
Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2013, <span class="removed"><del><strong>2015, 2016, 
2017, 2018,</strong></del></span> <span 
class="inserted"><ins><em>2015-2018,</em></ins></span> 2021 Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
+Commons Attribution-NoDerivatives 4.0 International 
License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
-&lt;p&gt;Updated:
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2013/08/31 20:13:00 $
+$Date: 2021/08/01 11:01:10 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+&lt;/div&gt;&lt;!-- for class="inner", starts in the banner include --&gt;
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>



reply via email to

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