www-commits
[Top][All Lists]
Advanced

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

www/server/staging edu-cases.html education.htm...


From: Therese Godefroy
Subject: www/server/staging edu-cases.html education.htm...
Date: Wed, 1 Jan 2020 11:21:50 -0500 (EST)

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 20/01/01 11:21:50

Modified files:
        server/staging : edu-cases.html education.html edu-contents.html 
                         edu-faq.html edu-free-learning-resources.html 
                         edu-projects.html edu-resources.html 
                         edu-team.html free-distros.html 
                         free-software-for-education.html 
                         philosophy.html 

Log message:
        Update to version currently in line (2020-1-1).

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-cases.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-contents.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-faq.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-free-learning-resources.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-projects.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-resources.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-team.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/free-distros.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/free-software-for-education.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/philosophy.html?cvsroot=www&r1=1.3&r2=1.4

Patches:
Index: edu-cases.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-cases.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- edu-cases.html      1 Jan 2020 05:32:45 -0000       1.7
+++ edu-cases.html      1 Jan 2020 16:21:50 -0000       1.8
@@ -1,4 +1,4 @@
-<!--#include virtual="/server/staging/layout/header.html" -->
+<!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.79 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
@@ -94,7 +94,7 @@
 of this article.</p>
 </div>
 
-<p>Copyright &copy; 2011, 2016, 2019, 2020 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2016 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
@@ -104,7 +104,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/01/01 05:32:45 $
+$Date: 2020/01/01 16:21:50 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/education.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- education.html      10 Jun 2012 08:08:11 -0000      1.4
+++ education.html      1 Jan 2020 16:21:50 -0000       1.5
@@ -1,125 +1,53 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="author" href="mailto:address@hidden"; />
-<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
-<meta name="ICBM" content="42.256233,-71.006581" />
-<!-- Parent-Version: 1.57 -->
-<title>Free Software and Education - GNU Project - Free Software 
-Foundation</title>
-<!-- start of server/banner.html -->
-<!-- start of head-include-2.html -->
-
-<link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout.css" media="screen" />
-
-<link rel="stylesheet" href="mini.css" media="handheld" />
-
-<link rel="stylesheet" href="print.css" media="print" />
-<!-- end of head-include-2.html -->
-</head>
-<body>
-<!-- start of server/body-include-1.html -->
-<div id="toplinks"><span class="netscape4"><a href="#content">Skip to 
content</a> | <a href="#navigation">Skip to navigation</a> | <a 
href="#searcher">Skip to search</a>| </span><a 
href="#translations">Translations of this page</a> | <a 
href="/accessibility/">Accessibility</a></div>
-<!-- end of server/body-include-1.html -->
-
-<div id="null-wrapper">
-
-<!-- start of server/body-include-2 -->
-      <div id="header">
-        <div class="inner" style="position: relative;">
-
-        <h1 id="logo"><a href="/">The GNU Operating System</a></h1>
+<!--#include virtual="/server/html5-header.html" -->
+<!-- Parent-Version: 1.79 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+
+<title>Free Software and Education 
+- GNU Project - Free Software Foundation</title>
+
+<!--#include virtual="/education/po/education.translist" -->
+
+<style type="text/css" media="screen">
+<!--
+#video-container {
+   width: 40em; max-width: 100%;
+   margin: 1.5em auto;
+}
+#video-container p { text-align: justify; }
+#rms-movie { width: 100%; }
+@media (min-width: 48em) {
+   #content .edu-note {
+      float: right;
+      max-width: 40%;
+      margin: 3.2em 0 2.5em 1.5em;
+   }
+}-->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
+<!--
+@media (min-width: 48em) {
+   #content .edu-note {
+      float: left;
+      margin: 3.4em 1.5em 2.5em 0;
+   }
+}-->
+<!--#endif -->
+</style>
+<!--#include virtual="/server/banner.html" -->
+
+<!--#include virtual="/education/education-menu.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
 
+<h2 class="c">Free Software and Education</h2>
 
+<h3>How Does Free Software Relate to Education?</h3>
 
-       <div id="fssbox">
-         <h4>Sign up for the <a href="http://www.fsf.org/fss";>Free Software 
Supporter</a></h4>
-         <p>A monthly email newsletter about GNU and Free Software</p>
-         <form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
-<div><input name="postURL" type="hidden" value="" />
-<input type="hidden" name="group[25]" value="1" />
-
-<input name="cancelURL" type="hidden" 
value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-<input name="_qf_default" type="hidden" value="Edit:cancel" />
-</div>
-
-         <p><label>Enter your email address (e.g. 
address@hidden)</label></p><p><input type="text" id="frmEmail" 
name="email-Primary" size="15" maxlength="80" /> &nbsp; <input type="submit" 
name="_qf_Edit_next" value="Ok" /></p>
-         </form>
-       </div>
-       </div>
-      </div>
-
-<div id="navigation">
- <div class="inner">
-
-  <div id="searcher">
-   <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
-    <div><label class="netscape4" for="phrase">Search:</label>
-    <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
-           value="Why GNU/Linux?" onfocus="this.value=''" />
-    <input type="submit" value="Search" /></div><!-- unnamed label -->
-   </form>
-  </div><!-- /searcher -->
-
-  <ul>
-   <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
-   <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
-   <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
-   <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
-   <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
-   <li id="joinfsftab"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join&nbsp;the&nbsp;FSF!</a></li>
-  </ul>
-
- </div><!-- /inner -->
- 
- <!-- begin edu navigation bar -->
-<ul id="sub-nav">
-                               <li><a href="edu-contents.html">Education 
Contents</a></li>
-                               <li><a href="edu-cases.html">Case 
Studies</a></li>
-                               <li><a href="edu-resources.html">Educational 
Resources</a></li>
-                               <li><a href="edu-projects.html">Education 
Projects</a></li>
-                               <li><a href="edu-faq.html">FAQ</a></li>
-                               <li><a href="edu-team.html">The Education 
Team</a></li>
-</ul>
-<!-- end edu navigation bar -->
- 
-</div><!--  /navigation -->
-<!-- end of server/body-include-2 -->
-
-<div id="content" class="inner">
-<!-- end of server/banner.html -->
-<!-- begin translinks file -->
-<div id="translations">
-<ul class="translations-list">
-<!-- Catalan -->
-<li><a href="/education/education.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li>
-<!-- German -->
-<li><a href="/education/education.de.html">Deutsch</a>&nbsp;[de]</li>
-<!-- English -->
-<li><a href="/education/education.html">English</a>&nbsp;[en]</li>
-<!-- Spanish -->
-<li><a href="/education/education.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li>
-<!-- Polish -->
-<li><a href="/education/education.pl.html">polski</a>&nbsp;[pl]</li>
-</ul>
-</div> <!-- id="translations" -->
-<!-- end translinks file -->
-
-<div id="education-content">           
-<h2>Free Software and Education</h2>
-
-
-
-</div> <!-- id="education-content" -->
-               
-<div class="center">
-<h3>What Does Free Software Have To Do With Education?</h3>
-</div>
-
-<p>Software freedom has an especially important role in education. 
+<p>Software freedom plays a fundamental role in education. 
 Educational institutions of all levels should use and teach Free 
 Software because it is the only software that allows them to accomplish 
 their essential missions: to disseminate human knowledge and to prepare 
@@ -142,146 +70,120 @@
 <a href="/philosophy/shouldbefree.html">why software should be free</a>
 (as in freedom).</p>
                
-<div class="yui-gc">
-                  <div class="yui-u first">
-                       
-<h2>The Basics</h2>
+<h3>The Basics</h3>
+<p>The GNU Project was 
+<a href="/gnu/initial-announcement.html">launched</a> in 1983 by 
+Richard Stallman to develop a Free Libre operating system: the GNU 
+operating system. As a result, today it is possible for anyone to use a 
+computer in freedom.</p>
 
 <p>In this six-minutes video 
 <a href="http://www.fsf.org/about/leadership/#rms";>Richard Stallman</a> 
 explains briefly and to the point the principles of Free Software and 
 how they connect to education.</p>
 
-<p>
-Transcriptions of this video are available in
-<!-- TRANSLATORS: please add the link to your language here in the first 
place, followed by a comma. -->
-
-<a href="/education/misc/rms-education-es-translation-to-en.txt">English</a>, 
-<a href="/education/misc/rms-education-es-transcription.txt">Spanish</a>, and 
-<a href="/education/misc/edu-misc.html#transcriptions">other languages</a>. 
-</p>
-
-<p> SubRip subtitle files are also available for download in
-<!-- TRANSLATORS: please add the link to your language here in the first 
place, followed by a comma. --> 
-
-<a href="/education/misc/rms-education-es-sub-en.srt">English</a>, 
-<a href="/education/misc/rms-education-es-sub-es.srt">Spanish</a>, and
-<a href="/education/misc/edu-misc.html#subtitles">other languages</a>. 
-</p>
-
-<video id="rms-movie" width="512" height="288" controls="controls">
+<div id="video-container">
+<!-- GNUN: localize URL /education/rms-education-es.ogv -->
+<video  id="rms-movie" controls="controls">
   <source
-    src="http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv"; 
+    src="http://www.gnu.org/education/rms-education-es.ogv";
     type='video/ogg; codecs="theora, vorbis"' />
 </video>
                                
-<p>Download video as 
-<a href="http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv";>
-Ogg Theora</a>.</p>
+<div class="emph-box"><p>
+<!-- TRANSLATORS: Please replace the link to the video with subtitles in
+     English with a link to the video with subtitles in your language, 
+     if it exists. --> 
+<a 
+href="http://audio-video.gnu.org/video/rms-education-es-high-sub.en.ogv";>
+Download and watch the video</a> at a higher definition in the Ogg Theora 
+(ogv) free format.<span class="gnun-split"></span>
 
-<p>The GNU Project was 
-<a href=" /gnu/initial-announcement.html">launched</a> in 1983 by 
-Richard Stallman to develop a Free Libre operating system: the GNU 
-operating system. As a result, today it is possible for anyone to use a 
-computer in freedom.</p>
+<!-- TRANSLATORS: please add the link to your language here in the first 
+     place, followed by a comma. -->
 
-</div>
-<div class="yui-u">
-
-<h2 id="indepth">In Depth</h2>
+Transcriptions of this video are available in
 
-<p>Learn about the <a href="/education/edu-why.html">Reasons Why</a> 
-educational institutions should use and teach exclusively Free Software.</p>
+<a href="/education/misc/rms-education-es-translation-to-en.txt">English</a>, 
+<a href="/education/misc/rms-education-es-transcription.txt">Spanish</a>, and 
+<a href="/education/misc/edu-misc.html#transcription-rms-education">
+   other languages</a>. 
+<span class="gnun-split"></span>
+
+<!-- TRANSLATORS: please add the link to your language here in the first 
+     place, followed by a comma. --> 
+
+SubRip subtitle files are also available for download in
+<a href="/education/misc/rms-education-es-sub.en.srt">English</a>, 
+<a href="/education/misc/rms-education-es-sub.es.srt">Spanish</a>, and
+<a href="/education/misc/edu-misc.html#subtitles-rms-education">other 
+   languages</a>. 
+</p></div> <!-- /.emph-box -->
+</div>
+
+<div class="edu-note"><p>
+We are looking for free educational games, or information about free games 
+that can be used for educational purposes. Contact 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p></div>
+
+<h3 id="indepth">In Depth</h3>
+<ul>
+<li>Learn about the <a href="/education/edu-why.html">Reasons Why</a> 
+educational institutions should use and teach exclusively Free Software.</li>
 
-<p>An article by Richard Stallman:
+<li>An article by Richard Stallman:
 <a href="/education/edu-schools.html">Why Schools Should Exclusively Use 
-Free Software</a></p>
-
-<p>An article by Dr. V. Sasi Kumar on the
-<a href="/education/edu-system-india.html">education system in India.</a></p>
-
-</div>
-</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". -->
+Free Software</a></li>
 
+<li>An article by Dr. V. Sasi Kumar on the
+<a href="/education/edu-system-india.html">education system in India.</a></li>
+</ul>
 </div> <!-- for id="content", starts in the include above -->
 
-
-              <!-- begin server/footer-text.html -->
-<div class="inner">
-    
-<div class="yui-g" id="fsf-links">
-       <ul>
-               <li><a href="/">GNU&nbsp;home&nbsp;page</a></li>
-               <li><a 
href="http://www.fsf.org/";>FSF&nbsp;home&nbsp;page</a></li>
-               <li><a href="/graphics/graphics.html">GNU&nbsp;Art</a></li>
-               <li><a href="/fun/fun.html">GNU&nbsp;Fun</a></li>
-               <li><a href="/people/people.html">GNU's&nbsp;Who?</a></li>
-               <li><a 
href="http://directory.fsf.org";>Free&nbsp;Software&nbsp;Directory</a></li>
-               <li><a href="/server/sitemap.html">Site&nbsp;map</a></li>
-       </ul>
-</div>
-
-<div class="yui-g" id="mission-statement">
-
-<p><small>The <a href="http://www.fsf.org";>Free Software
-Foundation</a> is the principal organizational sponsor of the <a
-href="http://www.gnu.org/";>GNU Operating System</a>. <strong>Our
-mission is to preserve, protect and promote the freedom to use, study,
-copy, modify, and redistribute computer software, and to defend the
-rights of Free Software users.</strong> Support GNU and the FSF by <a
-href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
-href="http://www.fsf.org/join";>joining the FSF as an associate
-member</a> or by making a
-donation, either <a href="http://donate.fsf.org/";>directly to the FSF</a> 
-or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via 
Flattr</a>.</small></p>
-
-<p id="backtotop"><a href="#header">back to top</a></p>
-
-
-
-
-</div>
-
-
-</div>
-<!-- end server/footer-text.html -->
-
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
+<div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>Please see the <a
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting 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>
+</div>
 
-<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2014, 2016 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>
 
-<p>Updated:
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2012/06/10 08:08:11 $
+$Date: 2020/01/01 16:21:50 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>
-

Index: edu-contents.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-contents.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edu-contents.html   10 Jun 2012 08:08:10 -0000      1.4
+++ edu-contents.html   1 Jan 2020 16:21:50 -0000       1.5
@@ -1,128 +1,30 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="author" href="mailto:address@hidden"; />
-<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
-<meta name="ICBM" content="42.256233,-71.006581" />
-<!-- Parent-Version: 1.57 -->
-<title>Free Software and Education - Table of Contents - 
-       GNU Project - Free Software Foundation</title> 
-<!-- start of server/banner.html -->
-<!-- start of head-include-2.html -->
-
-<link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout.css" media="screen" />
-
-<link rel="stylesheet" href="mini.css" media="handheld" />
-
-<link rel="stylesheet" href="print.css" media="print" />
-<!-- end of head-include-2.html -->
-</head>
-<body>
-<!-- start of server/body-include-1.html -->
-<div id="toplinks"><span class="netscape4"><a href="#content">Skip to 
content</a> | <a href="#navigation">Skip to navigation</a> | <a 
href="#searcher">Skip to search</a>| </span><a 
href="#translations">Translations of this page</a> | <a 
href="/accessibility/">Accessibility</a></div>
-<!-- end of server/body-include-1.html -->
-
-<div id="null-wrapper">
-
-<!-- start of server/body-include-2 -->
-      <div id="header">
-        <div class="inner" style="position: relative;">
-
-        <h1 id="logo"><a href="/">The GNU Operating System</a></h1>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.87 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Free Software and Education - Table of Contents
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/education/po/edu-contents.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/education/education-menu.html" -->
 
-
-
-       <div id="fssbox">
-         <h4>Sign up for the <a href="http://www.fsf.org/fss";>Free Software 
Supporter</a></h4>
-         <p>A monthly email newsletter about GNU and Free Software</p>
-         <form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
-<div><input name="postURL" type="hidden" value="" />
-<input type="hidden" name="group[25]" value="1" />
-
-<input name="cancelURL" type="hidden" 
value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-<input name="_qf_default" type="hidden" value="Edit:cancel" />
-</div>
-
-         <p><label>Enter your email address (e.g. 
address@hidden)</label></p><p><input type="text" id="frmEmail" 
name="email-Primary" size="15" maxlength="80" /> &nbsp; <input type="submit" 
name="_qf_Edit_next" value="Ok" /></p>
-         </form>
-       </div>
-       </div>
-      </div>
-
-<div id="navigation">
- <div class="inner">
-
-  <div id="searcher">
-   <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
-    <div><label class="netscape4" for="phrase">Search:</label>
-    <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
-           value="Why GNU/Linux?" onfocus="this.value=''" />
-    <input type="submit" value="Search" /></div><!-- unnamed label -->
-   </form>
-  </div><!-- /searcher -->
-
-  <ul>
-   <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
-   <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
-   <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
-   <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
-   <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
-   <li id="joinfsftab"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join&nbsp;the&nbsp;FSF!</a></li>
-  </ul>
-
- </div><!-- /inner -->
- 
- <!-- begin edu navigation bar -->
-<ul id="sub-nav">
-                               <li class="selected"><a 
href="edu-contents.html">Education Contents</a></li>
-                               <li><a href="edu-cases.html">Case 
Studies</a></li>
-                               <li><a href="edu-resources.html">Educational 
Resources</a></li>
-                               <li><a href="edu-projects.html">Education 
Projects</a></li>
-                               <li><a href="edu-faq.html">FAQ</a></li>
-                               <li><a href="edu-team.html">The Education 
Team</a></li>
-</ul>
-<!-- end edu navigation bar -->
- 
-</div><!--  /navigation -->
-<!-- end of server/body-include-2 -->
-
-<div id="content" class="inner">
-<!-- end of server/banner.html -->
-<!-- begin translinks file -->
-<div id="translations">
-<ul class="translations-list">
-<!-- Catalan -->
-<li><a href="/education/education.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li>
-<!-- German -->
-<li><a href="/education/education.de.html">Deutsch</a>&nbsp;[de]</li>
-<!-- English -->
-<li><a href="/education/education.html">English</a>&nbsp;[en]</li>
-<!-- Spanish -->
-<li><a href="/education/education.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li>
-<!-- Polish -->
-<li><a href="/education/education.pl.html">polski</a>&nbsp;[pl]</li>
-</ul>
-</div> <!-- id="translations" -->
-<!-- end translinks file -->
-
-<div id="education-content">           
+<p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
+Education Contents</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
 
 <h2>Free Software and Education - Table of Contents</h2>
 
-</div> <!-- id="education-content" -->
-
-<p class="edu-breadcrumb"><a href="education.html">Education</a> &rarr; 
-Education Contents</p>
-               
 <p>The Education section of the GNU Project is about the importance of 
-using and teaching exclusively Free Software in all educational 
+using and teaching exclusively free software in all educational 
 institutions. It presents articles on the subject, cases of success in 
-implementing Free Software in schools and universities around the world, 
-examples of Free programs used in the classroom to the benefit of 
-teachers and students alike, and Free Software education projects 
+implementing free software in schools and universities around the world, 
+examples of free programs used in the classroom to the benefit of 
+teachers and students alike, and free software education projects 
 carried out by organizations and governments worldwide.</p>
 
 <h3>Table of Contents</h3>
@@ -136,124 +38,98 @@
                                <ul>
                                                <li><a href= 
"/education/edu-cases-argentina-ecen.html">Escuela 
           Cristiana Evang&eacute;lica de Neuqu&eacute;n</a></li>
-                               </ul>
-                                        </li>
+    </ul><!-- end list of cases in Argentina -->
+  </li><!-- end of Argentina -->
+
                        <li><a href="/education/edu-cases-india.html">India</a>
                                        <ul>
                                                        <li><a 
href="/education/edu-cases-india-ambedkar.html">Ambedkar 
            Community Computer Center</a></li>
        <li><a href="/education/edu-cases-india-irimpanam.html">VHSS 
            Irimpanam</a></li>
-                                               </ul>
-                               </li>
-</ul>
-                                                       
-<p><a href="/education/edu-resources.html">Free Learning Resources</a></p>
+    </ul><!-- end list of cases in India -->
+  </li><!-- end of India -->
+</ul><!-- end of Case Studies -->
 
-<p><a href="/education/edu-software.html">Educational Free Software</a></p>
+<p><a href="/education/edu-resources.html">Educational Resources</a></p>
                                        
 <ul>
+  <li><a href="/education/edu-software.html">Educational Free Software</a>
+    <ul>
                <li><a 
href="/education/edu-software-gcompris.html">GCompris</a></li>
+      <li><a href="/education/edu-software-gimp.html">GIMP</a></li>
   <li><a href="/education/edu-software-tuxpaint.html">Tux Paint</a></li>
-</ul>  
+    </ul><!-- end list of educational free software -->        
+  </li><!-- end educational free software -->  
 
-<p><a href="/education/edu-projects.html">Other Education Groups 
-Projects</a></p>
+  <li><a href="/education/edu-projects.html">Groups and Projects</a></li>
+  <li><a href="/education/edu-free-learning-resources.html">Free Learning 
Resources</a></li>
+</ul><!-- end list of educational resources -->        
 
-<p><a href="/education/edu-team.html">The Education Team</a> </p>
+<p><a href="/education/edu-faq.html">Frequently Asked Questions</a></p>
+<p><a href="/education/edu-team.html">The Education Team</a></p>
 
-<p><strong>Articles</strong></p>
+<p><strong>In Depth</strong></p>
                        
 <ul>
-               <li><a href="/education/edu-why.html">Reasons Why</a> 
educational 
-institutions should use and teach exclusively Free Software.</li>
+  <li><a href="/education/edu-why.html">Why Educational 
+      Institutions Should Use and Teach Exclusively Free Software</a>.</li>
   
   <li><a href="/education/edu-schools.html">Why Schools Should 
-Exclusively Use Free Software</a></li>
+      Exclusively Use Free Software</a></li>
 
   <li><a href="/education/edu-system-india.html">The Education System in
-India</a>.</li>
-</ul>
-
-<!-- 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 -->
-
+      India</a>.</li>
+</ul><!-- end list of articles -->
 
-              <!-- begin server/footer-text.html -->
-<div class="inner">
-    
-<div class="yui-g" id="fsf-links">
-       <ul>
-               <li><a href="/">GNU&nbsp;home&nbsp;page</a></li>
-               <li><a 
href="http://www.fsf.org/";>FSF&nbsp;home&nbsp;page</a></li>
-               <li><a href="/graphics/graphics.html">GNU&nbsp;Art</a></li>
-               <li><a href="/fun/fun.html">GNU&nbsp;Fun</a></li>
-               <li><a href="/people/people.html">GNU's&nbsp;Who?</a></li>
-               <li><a 
href="http://directory.fsf.org";>Free&nbsp;Software&nbsp;Directory</a></li>
-               <li><a href="/server/sitemap.html">Site&nbsp;map</a></li>
-       </ul>
-</div>
-
-<div class="yui-g" id="mission-statement">
-
-<p><small>The <a href="http://www.fsf.org";>Free Software
-Foundation</a> is the principal organizational sponsor of the <a
-href="http://www.gnu.org/";>GNU Operating System</a>. <strong>Our
-mission is to preserve, protect and promote the freedom to use, study,
-copy, modify, and redistribute computer software, and to defend the
-rights of Free Software users.</strong> Support GNU and the FSF by <a
-href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
-href="http://www.fsf.org/join";>joining the FSF as an associate
-member</a> or by making a
-donation, either <a href="http://donate.fsf.org/";>directly to the FSF</a> 
-or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via 
Flattr</a>.</small></p>
-
-<p id="backtotop"><a href="#header">back to top</a></p>
-
-
-
-
-</div>
+<p><a href="/education/misc/edu-misc.html">Education Miscellaneous 
+   Materials</a></p>
 
+</div><!-- for id="content", starts in the include above -->
 
-</div>
-<!-- end server/footer-text.html -->
-
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
+<div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
 
-<p>Please see the <a
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting 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>
+</div>
 
-<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2012, 2016, 2019 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>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2012/06/10 08:08:10 $
+$Date: 2020/01/01 16:21:50 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>
-

Index: edu-faq.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-faq.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edu-faq.html        10 Jun 2012 08:08:10 -0000      1.4
+++ edu-faq.html        1 Jan 2020 16:21:50 -0000       1.5
@@ -1,270 +1,141 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="author" href="mailto:address@hidden"; />
-<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
-<meta name="ICBM" content="42.256233,-71.006581" />
-<!-- Parent-Version: 1.57 -->
-<title>Educational Frequently Asked Questions - GNU Project - Free Software 
Foundation</title>
-<!-- start of server/banner.html -->
-<!-- start of head-include-2.html -->
-
-<link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout.css" media="screen" />
-
-<link rel="stylesheet" href="mini.css" media="handheld" />
-
-<link rel="stylesheet" href="print.css" media="print" />
-<!-- end of head-include-2.html -->
-</head>
-<body>
-<!-- start of server/body-include-1.html -->
-<div id="toplinks"><span class="netscape4"><a href="#content">Skip to 
content</a> | <a href="#navigation">Skip to navigation</a> | <a 
href="#searcher">Skip to search</a>| </span><a 
href="#translations">Translations of this page</a> | <a 
href="/accessibility/">Accessibility</a></div>
-<!-- end of server/body-include-1.html -->
-
-<div id="null-wrapper">
-
-<!-- start of server/body-include-2 -->
-      <div id="header">
-        <div class="inner" style="position: relative;">
-
-        <h1 id="logo"><a href="/">The GNU Operating System</a></h1>
-
-
-
-       <div id="fssbox">
-         <h4>Sign up for the <a href="http://www.fsf.org/fss";>Free Software 
Supporter</a></h4>
-         <p>A monthly email newsletter about GNU and Free Software</p>
-         <form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
-<div><input name="postURL" type="hidden" value="" />
-<input type="hidden" name="group[25]" value="1" />
-
-<input name="cancelURL" type="hidden" 
value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-<input name="_qf_default" type="hidden" value="Edit:cancel" />
-</div>
-
-         <p><label>Enter your email address (e.g. 
address@hidden)</label></p><p><input type="text" id="frmEmail" 
name="email-Primary" size="15" maxlength="80" /> &nbsp; <input type="submit" 
name="_qf_Edit_next" value="Ok" /></p>
-         </form>
-       </div>
-       </div>
-      </div>
-
-<div id="navigation">
- <div class="inner">
-
-  <div id="searcher">
-   <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
-    <div><label class="netscape4" for="phrase">Search:</label>
-    <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
-           value="Why GNU/Linux?" onfocus="this.value=''" />
-    <input type="submit" value="Search" /></div><!-- unnamed label -->
-   </form>
-  </div><!-- /searcher -->
-
-  <ul>
-   <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
-   <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
-   <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
-   <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
-   <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
-   <li id="joinfsftab"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join&nbsp;the&nbsp;FSF!</a></li>
-  </ul>
-
- </div><!-- /inner -->
- 
- <!-- begin edu navigation bar -->
-<ul id="sub-nav">
-                               <li><a href="edu-contents.html">Education 
Contents</a></li>
-                               <li><a href="edu-cases.html">Case 
Studies</a></li>
-                               <li><a href="edu-resources.html">Educational 
Resources</a></li>
-                               <li><a href="edu-projects.html">Education 
Projects</a></li>
-                               <li class="selected"><a 
href="edu-faq.html">FAQ</a></li>
-                               <li><a href="edu-team.html">The Education 
Team</a></li>
-</ul>
-<!-- end edu navigation bar -->
- 
-</div><!--  /navigation -->
-<!-- end of server/body-include-2 -->
-
-<div id="content" class="inner">
-<!-- end of server/banner.html -->
-<!-- begin translinks file -->
-<div id="translations">
-<ul class="translations-list">
-<!-- Catalan -->
-<li><a href="/education/education.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li>
-<!-- German -->
-<li><a href="/education/education.de.html">Deutsch</a>&nbsp;[de]</li>
-<!-- English -->
-<li><a href="/education/education.html">English</a>&nbsp;[en]</li>
-<!-- Spanish -->
-<li><a href="/education/education.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li>
-<!-- Polish -->
-<li><a href="/education/education.pl.html">polski</a>&nbsp;[pl]</li>
-</ul>
-</div> <!-- id="translations" -->
-<!-- end translinks file -->
-
-<div id="education-content">           
-<h2>Educational Frequently Asked Questions</h2>
-</div> <!-- id="edu-content" -->
-       
-<p class="edu-breadcrumb"><a href="education.html">Education</a> &rarr; 
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.79 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+
+<title>Frequently Asked Questions About Free Software and Education
+- GNU Project - Free Software Foundation</title>
+
+<!--#include virtual="/education/po/edu-faq.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/education/education-menu.html" -->
+<p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
 FAQ</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
+<h2>Frequently Asked Questions About Free Software and Education</h2>
                
 <p>Many Free Software advocates encounter difficulties when talking to 
 the administrators of educational institutions about the advantages of 
 using and teaching Free Software. Often school administrators have never 
-heard of Free Software or have heard only about Open Source, so they 
-raise many doubts. Here we put together some of the most common 
+heard of Free Software or have heard only about &ldquo;open source&rdquo;, 
+so they raise many doubts. Here we put together some of the most common 
 questions and the best possible answers to eliminate uncertainties.</p>
 
 <dl>
-                <dt>As a teacher, I've been trying hard to explain to the 
-                       school's administrators the advantages that Open Source 
software can 
-                       bring to our school, but they don't  seem to be 
interested.</dt>
+  <dt>As a teacher, I've been trying hard to explain to the school's 
+  administrators the advantages that open source software can bring to our 
+  school, but they don't  seem to be interested.</dt>
                        
                        <dd>
-                               <p>Open Source refers only to the technical 
advantages of software. 
-                               Schools may not be interested in that aspect 
since most probably 
-                               technical requirements are already satisfied by 
the proprietary 
-                               software in use. You need to talk to them in 
terms of Free Libre 
-                 Software, not Open Source, so that you can explain to them 
the 
-                 philosophical and ethical reasons why educational 
institutions 
-                 should reject proprietary software.</p>
-                               <p>See the <a 
href="/education/edu-why.html">Reasons 
-                               Why</a> educational institutions should use and 
teach 
-                               exclusively Free Software.</p>
+      <p>&ldquo;Open source&rdquo; refers only to the technical advantages 
+      of software. Schools may not be interested in that aspect since most 
+      probably technical requirements are already satisfied by the 
+      proprietary software in use. You need to talk to them in terms of 
+      Free Libre Software, not &ldquo;open source&rdquo;, so that you can 
+      explain to them the philosophical and ethical reasons why educational 
+      institutions should reject proprietary software.</p>
+
+      <p>See the reasons <a href="/education/edu-why.html">why educational 
+      institutions should use and teach exclusively Free Software.</a> </p>
                        </dd>
                        
-                       <dt>I would love to see all schools migrate to Free 
Software, but I 
-                       think it's hopeless. Proprietary software companies 
have too much 
-                       power, even over schools. The situation is 
discouraging.</dt>
+  <dt>I would love to see all schools migrate to Free Software, but I think 
+  it's hopeless. Proprietary software companies have too much power, even 
+  over schools. The situation is discouraging.</dt>
                        
                        <dd>
                                <p>While it is true that proprietary software 
corporations have
                                managed to impose their products on society by 
using schools as
-                               propaganda agents, it is also true that many 
schools around the
-                               world have adopted Free Software with excellent 
results.  See our
-                               <a href="/education/edu-cases.html">Case 
Studies</a> section 
-                               for some examples.</p>
+      propaganda agents, it is also true that many schools around the world 
+      have adopted Free Software with excellent results.  See our
+      <a href="/education/edu-cases.html">Case Studies</a> section for some 
+      examples.</p>
                                
                                <p>When we started the GNU Project back in 
1983, the situation was 
                                very discouraging for us too. We started from 
zero, and today 
                                millions of people around the world use Free 
Libre Software.</p>                
                        </dd>
                        
-                       <dt>I am the head of a technical institute and I would 
like to teach 
-                       our students the use and administration of a Free Libre 
platform, but 
-                       I have to comply with the curriculum established by the 
Ministry of 
-                       Education, which requires the teaching of proprietary 
platforms and 
-                       programs.</dt>
+  <dt>I am the head of a technical institute and I would like to teach our 
+  students the use and administration of a Free Libre platform, but I have 
+  to comply with the curriculum established by the Ministry of Education, 
+  which requires the teaching of proprietary platforms and programs.</dt>
                        
                        <dd>
     <p>If you are literally forced to teach nonfree software, you should
-    tell the students that you consider this software unethical, that 
+    tell your students that you consider this software unethical, that 
     you are doing this only because you are being forced, and that you 
     will do as little of it as possible so that you can move on to 
     freedom-respecting software.</p>                           
 
-    <p>We must not forget that schools have a great influence on 
-                               society, so making our students aware of the 
advantages of Free 
-                               Software is a way of putting pressure on 
decision makers. You can 
-    start by telling your students about Free Software and its ethical 
-    values, as they might never have heard of it. With your endorsement 
-    and support, this may lead to the formation of a Free Software Group 
+    <p>We must not forget that schools have a great influence on society, 
+    so making our students aware of the advantages of Free Software is a 
+    way of putting pressure on decision makers. You can start by telling 
+    your students about Free Software and its ethical values, as they might 
+    never have heard of it. With your endorsement and support, this may 
+    lead to the formation of a <a 
+    href="http://libreplanet.org/wiki/Group_list";>Free Software Group</a> 
     in your school. Then the group can make its voice heard by writing 
-    letters to the Ministry, holding events to promote Free Software, 
-    and other similar activities.</p>
+    letters to the Ministry, holding events to promote Free Software, and 
+    other similar activities.</p>
                                
-                               <p>When computer users will start demanding 
their rights, 
-    Governments will have to issue their laws accordingly. That is why 
-    political and social awareness are fundamental aspects which cannot 
-    be left aside when talking about Free Software.</p>
+    <p>When computer users will start demanding their rights, Governments 
+    will have to issue their laws accordingly. That is why political and 
+    social awareness is a fundamental aspect which cannot be left aside 
+    when talking about Free Software.</p>
                        </dd>
 </dl>
 
-<!-- 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 -->
-
-
-              <!-- begin server/footer-text.html -->
-<div class="inner">
-    
-<div class="yui-g" id="fsf-links">
-       <ul>
-               <li><a href="/">GNU&nbsp;home&nbsp;page</a></li>
-               <li><a 
href="http://www.fsf.org/";>FSF&nbsp;home&nbsp;page</a></li>
-               <li><a href="/graphics/graphics.html">GNU&nbsp;Art</a></li>
-               <li><a href="/fun/fun.html">GNU&nbsp;Fun</a></li>
-               <li><a href="/people/people.html">GNU's&nbsp;Who?</a></li>
-               <li><a 
href="http://directory.fsf.org";>Free&nbsp;Software&nbsp;Directory</a></li>
-               <li><a href="/server/sitemap.html">Site&nbsp;map</a></li>
-       </ul>
-</div>
-
-<div class="yui-g" id="mission-statement">
-
-<p><small>The <a href="http://www.fsf.org";>Free Software
-Foundation</a> is the principal organizational sponsor of the <a
-href="http://www.gnu.org/";>GNU Operating System</a>. <strong>Our
-mission is to preserve, protect and promote the freedom to use, study,
-copy, modify, and redistribute computer software, and to defend the
-rights of Free Software users.</strong> Support GNU and the FSF by <a
-href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
-href="http://www.fsf.org/join";>joining the FSF as an associate
-member</a> or by making a
-donation, either <a href="http://donate.fsf.org/";>directly to the FSF</a> 
-or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via 
Flattr</a>.</small></p>
-
-<p id="backtotop"><a href="#header">back to top</a></p>
-
-
-
-
-</div>
-
-
-</div>
-<!-- end server/footer-text.html -->
+</div><!-- for id="content", starts in the include above -->
 
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
+<div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
 
-<p>Please see the <a
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting 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>
+</div>
 
-<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2016 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>
 
-<p>Updated:
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2012/06/10 08:08:10 $
+$Date: 2020/01/01 16:21:50 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>
-

Index: edu-free-learning-resources.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-free-learning-resources.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-free-learning-resources.html    11 Apr 2019 21:54:17 -0000      1.1
+++ edu-free-learning-resources.html    1 Jan 2020 16:21:50 -0000       1.2
@@ -5,7 +5,7 @@
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/education/po/edu-resources.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<!--#include virtual="/server/staging/education-menu.html" -->
+<!--#include virtual="/education/education-menu.html" -->
 <p class="edu-breadcrumb">
 <a href="/education/education.html">Education</a> &rarr; 
 Free Learning Resources</p>
@@ -152,7 +152,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/04/11 21:54:17 $
+$Date: 2020/01/01 16:21:50 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-projects.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-projects.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edu-projects.html   10 Jun 2012 08:08:10 -0000      1.4
+++ edu-projects.html   1 Jan 2020 16:21:50 -0000       1.5
@@ -1,142 +1,49 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="author" href="mailto:address@hidden"; />
-<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
-<meta name="ICBM" content="42.256233,-71.006581" />
-<!-- Parent-Version: 1.57 -->
-<title>Other Education Groups and Projects - GNU Project - Free Software 
Foundation</title>
-<!-- start of server/banner.html -->
-<!-- start of head-include-2.html -->
-
-<link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout.css" media="screen" />
-
-<link rel="stylesheet" href="mini.css" media="handheld" />
-
-<link rel="stylesheet" href="print.css" media="print" />
-<!-- end of head-include-2.html -->
-</head>
-<body>
-<!-- start of server/body-include-1.html -->
-<div id="toplinks"><span class="netscape4"><a href="#content">Skip to 
content</a> | <a href="#navigation">Skip to navigation</a> | <a 
href="#searcher">Skip to search</a>| </span><a 
href="#translations">Translations of this page</a> | <a 
href="/accessibility/">Accessibility</a></div>
-<!-- end of server/body-include-1.html -->
-
-<div id="null-wrapper">
-
-<!-- start of server/body-include-2 -->
-      <div id="header">
-        <div class="inner" style="position: relative;">
-
-        <h1 id="logo"><a href="/">The GNU Operating System</a></h1>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.87 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+
+<title>Groups and Projects - GNU Project - Free Software Foundation</title>
+<!--#include virtual="/education/po/edu-projects.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/education/education-menu.html" -->
+
+<p class="edu-breadcrumb">
+<a href="/education/education.html">Education</a> &rarr; 
+<a href="/education/edu-resources.html">Educational Resources</a> &rarr;
+Groups and Projects</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
 
-
-
-       <div id="fssbox">
-         <h4>Sign up for the <a href="http://www.fsf.org/fss";>Free Software 
Supporter</a></h4>
-         <p>A monthly email newsletter about GNU and Free Software</p>
-         <form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
-<div><input name="postURL" type="hidden" value="" />
-<input type="hidden" name="group[25]" value="1" />
-
-<input name="cancelURL" type="hidden" 
value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-<input name="_qf_default" type="hidden" value="Edit:cancel" />
-</div>
-
-         <p><label>Enter your email address (e.g. 
address@hidden)</label></p><p><input type="text" id="frmEmail" 
name="email-Primary" size="15" maxlength="80" /> &nbsp; <input type="submit" 
name="_qf_Edit_next" value="Ok" /></p>
-         </form>
-       </div>
-       </div>
-      </div>
-
-<div id="navigation">
- <div class="inner">
-
-  <div id="searcher">
-   <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
-    <div><label class="netscape4" for="phrase">Search:</label>
-    <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
-           value="Why GNU/Linux?" onfocus="this.value=''" />
-    <input type="submit" value="Search" /></div><!-- unnamed label -->
-   </form>
-  </div><!-- /searcher -->
-
-  <ul>
-   <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
-   <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
-   <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
-   <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
-   <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
-   <li id="joinfsftab"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join&nbsp;the&nbsp;FSF!</a></li>
-  </ul>
-
- </div><!-- /inner -->
- 
- <!-- begin edu navigation bar -->
-<ul id="sub-nav">
-                               <li><a href="edu-contents.html">Education 
Contents</a></li>
-                               <li><a href="edu-cases.html">Case 
Studies</a></li>
-                               <li><a href="edu-resources.html">Educational 
Resources</a></li>
-                               <li class="selected"><a 
href="edu-projects.html">Education Projects</a></li>
-                               <li><a href="edu-faq.html">FAQ</a></li>
-                               <li><a href="edu-team.html">The Education 
Team</a></li>
-</ul>
-<!-- end edu navigation bar -->
- 
-</div><!--  /navigation -->
-<!-- end of server/body-include-2 -->
-
-<div id="content" class="inner">
-<!-- end of server/banner.html -->
-<!-- begin translinks file -->
-<div id="translations">
-<ul class="translations-list">
-<!-- Catalan -->
-<li><a href="/education/education.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li>
-<!-- German -->
-<li><a href="/education/education.de.html">Deutsch</a>&nbsp;[de]</li>
-<!-- English -->
-<li><a href="/education/education.html">English</a>&nbsp;[en]</li>
-<!-- Spanish -->
-<li><a href="/education/education.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li>
-<!-- Polish -->
-<li><a href="/education/education.pl.html">polski</a>&nbsp;[pl]</li>
-</ul>
-</div> <!-- id="translations" -->
-<!-- end translinks file -->
-
-<div id="education-content">           
-<h2>Other Education Groups and Projects</h2>
-</div> <!-- id="edu-content" -->
-               
-<p class="edu-breadcrumb"><a href="education.html">Education</a> &rarr; 
-Education Projects</p>
+<h2>Groups and Projects</h2>
                
 <p>There are several groups and organizations around the world who 
-follow the GNU Philosophy and are working on projects aimed at bringing 
-Free Software to the education field. A few of them are listed below. If 
-your project supports only Free Software and it is not listed here, 
+follow the GNU philosophy and are working on projects aimed at bringing 
+free software to the education field. A few of them are listed below. If 
+your project supports only free software and it is not listed here, 
 please contact us at <a href="mailto:address@hidden";>
 &lt;address@hidden&gt;</a> to let us know.</p>
                
-<!-- Add new entries in alphabetical order except for projects directly 
related to GNU who should be listed first -->
+<!-- Add new entries in alphabetical order except for projects directly 
related to GNU, which should be listed first -->
                
 <dl>
   <dt><a href="http://fsfeurope.org/projects/education/education.en.html";>
   FSFE Education Project</a></dt>
   
-  <dd>"FSFE's Education Team exists to raise awareness and bring the
-  benefits of Free Software to all groups involved in education. It aims
-  for a legal framework that prohibits discrimination against Free
-  Software and its users."</dd>
+  <dd>&ldquo;The FSFE's Education Team exists to raise awareness and bring the
+  benefits of free software to all groups involved in education. It aims
+  for a legal framework that prohibits discrimination against free
+  software and its users.&rdquo;</dd>
        
                        <dt><a href="http://guri.hipatia.net/";>GURI</a></dt>
                        
                        <dd>Guri is a group which was born inside an Italian 
High School as 
                        the result of a program carried out by NGO Hipatia to 
raise awareness 
-                       about the role of Free Software in the education field. 
Guri opposes 
+  about the role of free software in the education field. Guri opposes 
                        the growing practice of treating knowledge as if it 
were a tangible 
                        object subject to ownership. It fights to change the 
mainstream 
                        cultural framework in Italy which prevents the exercise 
of some of 
@@ -145,7 +52,7 @@
                        adoption of proprietary, subjugating software.
 
    <p>The goals of the Guri project are to convert the educational 
-   system so that it is based exclusively on Free Software and to extend 
+   system so that it is based exclusively on free software and to extend 
    the freedoms it grants to every field of knowledge. Guri believes in 
    the power of education to shape a better society by teaching students 
    the values of sharing and cooperation. It advocates and works towards 
@@ -155,7 +62,7 @@
 
    <p>To achieve its goals, the group takes action mainly in High School 
    and University environments, organizing workshops and courses to 
-   promote awareness about the ethical principles of Free Software.</p>
+   promote awareness about the ethical principles of free software.</p>
    </dd>
 
    <dt><a href="http://hipatia.net/";>Hipatia</a></dt>
@@ -163,9 +70,9 @@
    <dd>Hipatia is an international NGO (non-governmental organization) 
    that upholds the right of all human beings to access, use, create,
    modify and distribute knowledge. It is formed by people from all 
-   around the world who advocate the ideals of the Free Software 
+   around the world who advocate the ideals of the free software 
    movement and work towards putting those principles into practice.
-   Hipatia emphasizes the importance of using Free Software in education;
+   Hipatia emphasizes the importance of using free software in education;
    to that end, its members often conduct workshops in educational
    institutions, specially in primary and secondary level schools.
   
@@ -173,8 +80,7 @@
    <a href="http://en.wikipedia.org/wiki/Hypatia";>Hypatia.</a></p>
    </dd>
     
-   
-   <dt><a href="https://www.itschool.gov.in";>IT@School</a></dt>
+   <dt><a href="https://itschool.gov.in/otherprograms.php";>IT@School</a></dt>
    
    <dd>IT@School is a project of the government of Kerala, India, 
    started in 2001 to introduce Information Communication Technologies 
@@ -184,7 +90,7 @@
    Software was imparted to thousands of teachers, school coordinators 
    and students.</dd> 
    
-   <dt><a href="http://www.ofset.org";>OFSET</a></dt>
+   <dt><a 
href="https://web.archive.org/web/20150420025426/http://www.ofset.org/tiki-index.php";>OFSET</a></dt>
    
    <dd>OFSET promotes the development and enhancement of Free 
    Software for the educational system and the classroom. It was born in 
@@ -195,9 +101,9 @@
    to the success of OFSET's activities.
    
    <p>One important achievement of the OFSET group is 
-   <a href="http://community.ofset.org/index.php/DrGeo";>Dr. Geo</a>, a
+   <a href="/software/dr-geo/">Dr. Geo</a>, a
    program widely used for teaching geometry. OFSET has also developed
-   <a href="http://community.ofset.org/index.php/Freeduc-USB";>
+   <a href="https://usb.freeduc.org/index-en.html";>
    Freeduc-USB</a>, a bootable USB stick that contains useful 
    applications for the classroom.</p>
    </dd>
@@ -211,85 +117,51 @@
     educational environments.</dd> 
 </dl>
 
-<!-- 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 -->
-
-
-              <!-- begin server/footer-text.html -->
-<div class="inner">
-    
-<div class="yui-g" id="fsf-links">
-       <ul>
-               <li><a href="/">GNU&nbsp;home&nbsp;page</a></li>
-               <li><a 
href="http://www.fsf.org/";>FSF&nbsp;home&nbsp;page</a></li>
-               <li><a href="/graphics/graphics.html">GNU&nbsp;Art</a></li>
-               <li><a href="/fun/fun.html">GNU&nbsp;Fun</a></li>
-               <li><a href="/people/people.html">GNU's&nbsp;Who?</a></li>
-               <li><a 
href="http://directory.fsf.org";>Free&nbsp;Software&nbsp;Directory</a></li>
-               <li><a href="/server/sitemap.html">Site&nbsp;map</a></li>
-       </ul>
-</div>
-
-<div class="yui-g" id="mission-statement">
-
-<p><small>The <a href="http://www.fsf.org";>Free Software
-Foundation</a> is the principal organizational sponsor of the <a
-href="http://www.gnu.org/";>GNU Operating System</a>. <strong>Our
-mission is to preserve, protect and promote the freedom to use, study,
-copy, modify, and redistribute computer software, and to defend the
-rights of Free Software users.</strong> Support GNU and the FSF by <a
-href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
-href="http://www.fsf.org/join";>joining the FSF as an associate
-member</a> or by making a
-donation, either <a href="http://donate.fsf.org/";>directly to the FSF</a> 
-or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via 
Flattr</a>.</small></p>
-
-<p id="backtotop"><a href="#header">back to top</a></p>
-
-
-
-
-</div>
-
-
-</div>
-<!-- end server/footer-text.html -->
+</div><!-- for id="content", starts in the include above -->
 
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
+<div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>Please see the <a
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting 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>
+</div>
 
-<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2016, 2018, 2019 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>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2012/06/10 08:08:10 $
+$Date: 2020/01/01 16:21:50 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>
-

Index: edu-resources.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-resources.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- edu-resources.html  11 Apr 2019 21:54:18 -0000      1.6
+++ edu-resources.html  1 Jan 2020 16:21:50 -0000       1.7
@@ -1,11 +1,12 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!-- Parent-Version: 1.87 -->
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-<title>Free Educational Resources
+<title>Educational Resources
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/education/po/edu-resources.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<!--#include virtual="/server/staging/education-menu.html" -->
+<!--#include virtual="/education/education-menu.html" -->
+
 <p class="edu-breadcrumb">
 <a href="/education/education.html">Education</a> &rarr; 
 Educational Resources</p>
@@ -19,92 +20,23 @@
 
 <h2>Educational Resources</h2>
 
-<p>This section will help you find a variety of resources related 
-to education.</p>  
+<p>This section will help you find a variety of resources related to 
+education, such as: free study materials, free programs for 
+educational institutions of all levels, educational institutions that 
+offer courses on the philosophical and technical aspects of free 
+software, projects that develop free programs and platforms for 
+education, groups of people who follow the principles of the GNU 
+Project to promote the use of free software in the educational field, 
+and more.</p> 
+
+<h3>Table of Contents</h3>
 
 <ul>
    <li><a href="/education/edu-software.html">Educational Free 
Software</a></li>
-   <li><a href="/education/edu-projects.html">Educational Groups and 
Projects</a></li>
-   <li><a href="#learning-resources">Free Learning Resources</a></li>
+   <li><a href="/education/edu-projects.html">Groups and Projects</a></li>
+   <li><a href="/education/edu-free-learning-resources.html">Free Learning 
Resources</a></li>
 </ul>
 
-<h3 id="learning-resources">Free Learning Resources</h3>
-
-<p>Free learning resources, like free software, is a matter of freedom, 
-not price. It's about bringing the principles of free software to 
-general knowledge and educational materials. Knowledge should be usable 
-and accessible to all without restrictions and should not be treated as 
-property. It is not an article of consumer goods that decays over time or 
-wears out with use like a pair of shoes. Knowledge is a naturally abundant 
-resource that improves with usage: the more it is used and passed around, 
-the more it grows for the benefit of all. The introduction of measures 
-designed to favor the ownership of knowledge, tailored to prevent people 
-from accessing, using or sharing knowledge, is a conspiracy to inhibit 
-human progress.</p>
-
-<p>These principles on the freedom of knowledge have always been in the 
-spirit of the GNU Project. In 1999 it formally introduced the concept of a 
-<a href="/encyclopedia/free-encyclopedia.html">Free Universal Encyclopedia 
-and Learning Resource</a>, which was fulfilled by the Wikipedia project.</p>
-
-<dl>
-<dt><a href="http://www.wikipedia.org";>Wikipedia</a></dt>
-
-<dd>Written in collaboration by thousands of volunteers from all over 
-the world, Wikipedia is nowadays the best example of knowledge made 
-available to and usable by anyone without restrictions. Wikipedia readers 
-are allowed to copy, use, and adapt the articles, provided that the source 
-is mentioned and that eventual derivative works are released under the same 
-terms (see <a href="/licenses/copyleft.html">Copyleft</a>).</dd> 
-
-<dt><a href="http://www.gutenberg.org/wiki/Main_Page";>Project
-Gutenberg</a></dt>
-
-<dd>This project offers general knowledge books that are free as in freedom. 
-It publishes plain text digital versions of public-domain works. If you are 
-looking for a copy of a classic book, your search should start here.
-
-<p>They have a very clear explanation about the
-<a href="http://www.gutenberg.org/wiki/Gutenberg:No_Cost_or_Freedom%3f";>
-difference between free as in price and free as in freedom</a> related to 
-printed material.</p>
-</dd>
-
-<dt>GNU Project</dt>
-
-<dd>We maintain a list of <a href="/doc/other-free-books.html">free books</a> 
-mainly related to free software documentation, and we make
-<a href="/manual/manual.html">GNU manuals</a> available online. All books 
-published by the
-<a href="http://shop.fsf.org/category/books/";>Free Software Foundation</a> 
-are free as in freedom.</dd>
-
-<dt><a href="http://ftacademy.org/";>Free Technology Academy</a></dt>
-
-<dd>The Free Technology Academy (FTA) is a joint initiative from 
-several educational institutions in various countries. It aims to 
-contribute to a society that permits all users to study, participate and 
-build upon existing knowledge without restrictions. The FTA offers an 
-online master level programme with course modules about free 
-technologies. These courses are taught completely online in a virtual 
-campus based on the Campus Project interoperability framework.
-
-<p>The FTA is a collaboration between the Free Knowledge Institute, the 
-Open University of Catalonia (Spain) and the Open University of the 
-Netherlands. A larger group of Associate Partners adds to the founding 
-base with a network of organisations that share a common interest in 
-offering courses in the area of free technology. The FTA is extending 
-the current network of partners and collaborations continuously and 
-encourages both individuals and organizations to contribute to the 
-community.</p></dd>
-</dl>
-
-<div class="edu-note"><p>
-We are looking for free educational games, or information about free games 
-that can be used for educational purposes. Contact 
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p></div>
-
 </div><!-- for id="content", starts in the include above -->
 
 <!--#include virtual="/server/footer.html" -->
@@ -163,7 +95,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/04/11 21:54:18 $
+$Date: 2020/01/01 16:21:50 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-team.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-team.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edu-team.html       10 Jun 2012 08:08:11 -0000      1.4
+++ edu-team.html       1 Jan 2020 16:21:50 -0000       1.5
@@ -1,119 +1,23 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="author" href="mailto:address@hidden"; />
-<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
-<meta name="ICBM" content="42.256233,-71.006581" />
-<!-- Parent-Version: 1.57 -->
-<title>The Education Team - GNU Project - Free Software Foundation</title>
-<!-- start of server/banner.html -->
-<!-- start of head-include-2.html -->
-
-<link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout.css" media="screen" />
-
-<link rel="stylesheet" href="mini.css" media="handheld" />
-
-<link rel="stylesheet" href="print.css" media="print" />
-<!-- end of head-include-2.html -->
-</head>
-<body>
-<!-- start of server/body-include-1.html -->
-<div id="toplinks"><span class="netscape4"><a href="#content">Skip to 
content</a> | <a href="#navigation">Skip to navigation</a> | <a 
href="#searcher">Skip to search</a>| </span><a 
href="#translations">Translations of this page</a> | <a 
href="/accessibility/">Accessibility</a></div>
-<!-- end of server/body-include-1.html -->
-
-<div id="null-wrapper">
-
-<!-- start of server/body-include-2 -->
-      <div id="header">
-        <div class="inner" style="position: relative;">
-
-        <h1 id="logo"><a href="/">The GNU Operating System</a></h1>
-
-
-
-       <div id="fssbox">
-         <h4>Sign up for the <a href="http://www.fsf.org/fss";>Free Software 
Supporter</a></h4>
-         <p>A monthly email newsletter about GNU and Free Software</p>
-         <form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post">
-<div><input name="postURL" type="hidden" value="" />
-<input type="hidden" name="group[25]" value="1" />
-
-<input name="cancelURL" type="hidden" 
value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
-<input name="_qf_default" type="hidden" value="Edit:cancel" />
-</div>
-
-         <p><label>Enter your email address (e.g. 
address@hidden)</label></p><p><input type="text" id="frmEmail" 
name="email-Primary" size="15" maxlength="80" /> &nbsp; <input type="submit" 
name="_qf_Edit_next" value="Ok" /></p>
-         </form>
-       </div>
-       </div>
-      </div>
-
-<div id="navigation">
- <div class="inner">
-
-  <div id="searcher">
-   <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
-    <div><label class="netscape4" for="phrase">Search:</label>
-    <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
-           value="Why GNU/Linux?" onfocus="this.value=''" />
-    <input type="submit" value="Search" /></div><!-- unnamed label -->
-   </form>
-  </div><!-- /searcher -->
-
-  <ul>
-   <li id="tabPhilosophy"><a href="philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
-   <li id="tabEducation" class="selected"><a 
href="education.html">Education</a></li>
-   <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
-   <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
-   <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
-   <li id="joinfsftab"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join&nbsp;the&nbsp;FSF!</a></li>
-  </ul>
-
- </div><!-- /inner -->
- 
- <!-- begin edu navigation bar -->
-<ul id="sub-nav">
-                               <li><a href="edu-contents.html">Education 
Contents</a></li>
-                               <li><a href="edu-cases.html">Case 
Studies</a></li>
-                               <li><a href="edu-resources.html">Educational 
Resources</a></li>
-                               <li><a href="edu-projects.html">Education 
Projects</a></li>
-                               <li><a href="edu-faq.html">FAQ</a></li>
-                               <li class="selected"><a 
href="edu-team.html">The Education Team</a></li>
-</ul>
-<!-- end edu navigation bar -->
- 
-</div><!--  /navigation -->
-<!-- end of server/body-include-2 -->
-
-<div id="content" class="inner">
-<!-- end of server/banner.html -->
-<!-- begin translinks file -->
-<div id="translations">
-<ul class="translations-list">
-<!-- Catalan -->
-<li><a href="/education/education.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li>
-<!-- German -->
-<li><a href="/education/education.de.html">Deutsch</a>&nbsp;[de]</li>
-<!-- English -->
-<li><a href="/education/education.html">English</a>&nbsp;[en]</li>
-<!-- Spanish -->
-<li><a href="/education/education.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li>
-<!-- Polish -->
-<li><a href="/education/education.pl.html">polski</a>&nbsp;[pl]</li>
-</ul>
-</div> <!-- id="translations" -->
-<!-- end translinks file -->
-
-<div id="education-content">           
-<h2>The Education Team</h2>
-
-</div> <!-- id="edu-content" -->
-               
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.79 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+
+<title>The Education Team
+- GNU Project - Free Software Foundation</title>
+
+<!--#include virtual="/education/po/edu-team.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/education/education-menu.html" -->
 <p class="edu-breadcrumb">
-<a href="education.html">Education</a> &rarr; The Education Team</p>
+<a href="/education/education.html">Education</a> &rarr; The Education Team</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
+<h2>The Education Team</h2>
                
 <p>The Education Team was initially created to carry out the task of 
 building a section within the gnu.org website to specifically address 
@@ -175,85 +79,51 @@
 implemented Free Software, please drop us a note at 
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<!-- 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 -->
-
-
-              <!-- begin server/footer-text.html -->
-<div class="inner">
-    
-<div class="yui-g" id="fsf-links">
-       <ul>
-               <li><a href="/">GNU&nbsp;home&nbsp;page</a></li>
-               <li><a 
href="http://www.fsf.org/";>FSF&nbsp;home&nbsp;page</a></li>
-               <li><a href="/graphics/graphics.html">GNU&nbsp;Art</a></li>
-               <li><a href="/fun/fun.html">GNU&nbsp;Fun</a></li>
-               <li><a href="/people/people.html">GNU's&nbsp;Who?</a></li>
-               <li><a 
href="http://directory.fsf.org";>Free&nbsp;Software&nbsp;Directory</a></li>
-               <li><a href="/server/sitemap.html">Site&nbsp;map</a></li>
-       </ul>
-</div>
-
-<div class="yui-g" id="mission-statement">
-
-<p><small>The <a href="http://www.fsf.org";>Free Software
-Foundation</a> is the principal organizational sponsor of the <a
-href="http://www.gnu.org/";>GNU Operating System</a>. <strong>Our
-mission is to preserve, protect and promote the freedom to use, study,
-copy, modify, and redistribute computer software, and to defend the
-rights of Free Software users.</strong> Support GNU and the FSF by <a
-href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
-href="http://www.fsf.org/join";>joining the FSF as an associate
-member</a> or by making a
-donation, either <a href="http://donate.fsf.org/";>directly to the FSF</a> 
-or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via 
Flattr</a>.</small></p>
-
-<p id="backtotop"><a href="#header">back to top</a></p>
-
-
-
-
-</div>
-
-
-</div>
-<!-- end server/footer-text.html -->
+</div><!-- for id="content", starts in the include above -->
 
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
+<div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
 
-<p>Please see the <a
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting 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>
+</div>
 
-<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2011, 2016 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>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2012/06/10 08:08:11 $
+$Date: 2020/01/01 16:21:50 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>
-

Index: free-distros.html
===================================================================
RCS file: /webcvs/www/www/server/staging/free-distros.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- free-distros.html   20 May 2019 15:12:48 -0000      1.12
+++ free-distros.html   1 Jan 2020 16:21:50 -0000       1.13
@@ -8,10 +8,6 @@
 <style type="text/css" media="screen"><!--
 h2 { margin-bottom: 1.5em; }
 h3 { margin: 1.8em 0 1.3em; }
-.basic { color: blue }
-.interm { color: purple }
-.advanced { color: red }
-.my-comment { color: green }
 .summary {
    padding-top: .7em; padding-bottom: 1.2em;
    margin-top: 0;
@@ -23,16 +19,7 @@
    margin-bottom: 0;
 }
 table.listing { margin-bottom: 3em; }
-table.listing td.text { text-align: left; } -->
-<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
-<!--
-td.text { text-align: right; }
--->
-<!--#endif -->
-<!--
-table.listing td.icon {
-   width: 20%; 
-   text-align: center; }
+td.icon { width: 20%; }
 td.icon img { max-width: 100%; max-height: 4em; }
 @media (max-width: 48em) {
    .note, .summary { width: 30em; max-width: 93%; }
@@ -110,8 +97,7 @@
 workstations</h3>
 
 <p>The distributions that follow are installable to a computer's hard
-drive and/or can be run live. They are tagged (between brackets) according
-to how much knowledge of the GNU/Linux system is expected from users.</p>
+drive and/or can be run live.</p>
 
 <!-- Do not add or remove anything from this list without a lot of
      discussion, following the usual process, and confirmation by RMS. See 
@@ -127,95 +113,66 @@
     <td class="icon"><a href="https://dragora.org/en/index.html";>
        <img src="/graphics/distros-dragora.png"
             alt="Dragora GNU/Linux-Libre" /></a></td>
-    <td class="text"><span class="advanced">[Advanced]</span>&nbsp;
-       <em>Dragora GNU/Linux-Libre</em>&nbsp;&mdash;
-       an independent distribution based on concepts of simplicity.
-       <span class="my-comment">
-       No installer yet.</span></td>
-  </tr>
+   <td>Dragora GNU/Linux-Libre, an independent GNU/Linux distribution
+       based on concepts of simplicity.</td></tr>
 
   <tr class="odd">
     <td class="icon"><a href="https://www.dyne.org/software/dynebolic/";>
        <img src="/graphics/distros-dyen.png" alt="Dyne:bolic" /></a></td>
-    <td class="text"><span class="basic">[Basic?]</span>&nbsp;
-       <em>Dyne:bolic</em>&nbsp;&mdash;
-       a &ldquo;static&rdquo; distro, normally run from a live DVD, with
-       special emphasis on audio and video editing. Since it will
-       not receive security updates, it should be used offline.
-       <span class="my-comment">
-       It may not run on recent hardware.</span></td>
-  </tr>
+   <td>Dyne:bolic, a GNU/Linux distribution with special emphasis on audio 
+       and video editing. This is a &ldquo;static&rdquo; distro, normally
+       run from a live CD. Since it will not receive security updates, it
+       should be used offline.</td></tr>
 
   <tr class="even">
     <td class="icon"><a href="http://www.gnewsense.org/";>
        <img src="/graphics/distros-gnewsense.png" alt="gNewSense" /></a></td>
-    <td class="text"><span class="basic">[Basic]</span>&nbsp;
-       <em>gNewSense</em> &mdash;
-       a Debian-based distro, sponsored by the FSF.
-       <span class="my-comment">
-       It may not run on recent hardware, but can be installed
-       from a &ldquo;net-install&rdquo; CD on very old machines.</span></td>
-  </tr>
+   <td>gNewSense, a GNU/Linux distribution based on Debian, with
+       sponsorship from the FSF.</td></tr>
 
   <tr class="odd">
     <td class="icon"><a href="/software/guix/">
        <img src="/software/guix/static/base/img/Guix.png" alt="guix" 
/></a></td>
-    <td class="text"><span class="advanced">[Advanced]</span>&nbsp;
-       <em>Guix System</em>&nbsp;&mdash;
-       an advanced distro built
+   <td>Guix System, an advanced GNU/Linux distro built
        on top of GNU Guix (pronounced &ldquo;geeks&rdquo;), a purely
-       functional package manager for the GNU system.</td>
-  </tr>
+       functional package manager for the GNU system. </td></tr>
 
   <tr class="even">
-    <td class="icon"><a href="https://www.hyperbola.info/?gnu-free-stros-page";>
+   <td class="icon"><a href="https://www.hyperbola.info/";>
        <img src="/graphics/distro-hyperbola.png" alt="Hyperbola" /></a></td>
-    <td class="text"><span class="advanced">[Advanced]</span>&nbsp;
-       <em>Hyperbola GNU/Linux-libre</em>&nbsp;&mdash;
-       a long-term support simplicity-focused distribution based on
-       Arch GNU/Linux.</td>
+   <td>
+   Hyperbola GNU/Linux-libre, a
+   long-term support simplicity-focused distribution based on Arch
+   GNU/Linux.
+   </td>
   </tr>
 
   <tr class="odd">
     <td class="icon"><a href="https://www.parabola.nu";>
        <img src="/graphics/distros-parabola.png"
             alt="Parabola GNU/Linux-libre" /></a></td>
-    <td class="text"><span class="interm">[Intermediate?]</span>&nbsp;
-       <em>Parabola GNU/Linux-libre</em>&nbsp;&mdash;
-       an Arch-based distro which prioritizes simple package and system
-       management.</td>
-  </tr>
+   <td>Parabola GNU/Linux-libre, a distribution based on Arch that
+       prioritizes simple package and system management.</td></tr>
 
   <tr class="even">
     <td class="icon"><a href="https://pureos.net/";>
        <img src="/graphics/pureos-logo-small.png" style="max-height: 1.8em;"
             alt="PureOS" /></a></td>
-    <td class="text"><span class="basic">[Basic]</span>&nbsp;
-       <em>PureOS</em>&nbsp;&mdash;
-       a Debian-based distro which focuses on privacy, security, and
-       convenience.</td>
-  </tr>
+   <td>PureOS, a GNU distribution based on Debian with a focus on
+       privacy, security, and convenience.</td></tr>
  
   <tr class="odd">
     <td class="icon"><a href="https://trisquel.info/";>
        <img src="/graphics/distros-trisquel.png" alt="Trisquel" /></a></td>
-    <td class="text"><span class="basic">[Basic]</span>&nbsp;
-       <em>Trisquel</em>&nbsp;&mdash;
-       an Ubuntu-based distro, oriented toward small enterprises,
-       domestic users and educational centers.</td>
-  </tr>
+   <td>Trisquel, a GNU/Linux distribution based on Ubuntu that's oriented 
+ toward small enterprises, domestic users and educational centers.</td></tr>
 
-  <tr class="even">
+<tr class="even">
     <td class="icon"><a href="http://www.ututo.org/";>
        <img src="/graphics/distros-ututo.png" alt="Ututo" /></a></td>
-    <td class="text"><span class="basic">[Basic]</span>&nbsp;
-       <em>Ututo</em>&nbsp;&mdash;
-       the first fully free GNU/Linux system recognized by the GNU
-       Project.
-       <span class="my-comment">
-       The latest release (Ututo 2017) is based on Ubuntu.
-       No installer yet.</span></td>
-  </tr>
+   <td>Ututo S, a GNU/Linux 100% free distribution.  It was the first
+       fully free GNU/Linux system recognized by the GNU Project.</td></tr>
+
 </table>
 
 <h3 id="small-distros">Small GNU/Linux distros</h3>
@@ -236,22 +193,19 @@
   <tr class="odd">
     <td class="icon"><a href="http://librecmc.org/";> <img
        src="/graphics/librecmc.png" alt="libreCMC" /></a></td>
-    <td class="text"><em>libreCMC</em>&nbsp;&mdash;
-       an embedded distro for devices with
+      <td>libreCMC is an embedded GNU/Linux distro for devices with
        very limited resources. While primarily targeting routers, it
        offers support for a wide range of devices and use cases. In
-       2015, LibreWRT merged with libreCMC.</td>
-  </tr>
+       2015, LibreWRT merged with libreCMC.</td></tr>
 
   <tr class="even">
     <td class="icon"><a href="http://proteanos.com/";> <img
        src="/graphics/proteanos.png" alt="ProteanOS" /></a></td>
-    <td class="text"><em>ProteanOS</em>&nbsp;&mdash;
-       a new, small, and fast distribution for embedded
+   <td>ProteanOS is a new, small, and fast distribution for embedded
        devices. Its platform configuration feature allows binary
        packages to be configured at build-time and run-time for
-       different hardware and use cases.</td>
-  </tr>
+       different hardware and use cases.</td></tr>
+
 </table>
 
 <h3 id="howto-get">How to get free GNU/Linux distros</h3>
@@ -308,21 +262,19 @@
   <tr class="odd">
     <td class="icon"><a href="http://www.blagblagblag.org/";>
        <img src="/graphics/distros-blag.jpg" alt="BLAG Linux and GNU" 
/></a></td>
-    <td class="text"><em>BLAG Linux and GNU</em>&nbsp;&mdash;
-       a Fedora-based distro.</td>
-    <td class="text"><em>Removed June 2018</em> at the request of the
+   <td>BLAG Linux and GNU, a GNU/Linux distribution based on Fedora.</td>
+   <td><em>Removed June 2018</em>. Removed at the request of the
        maintainers, as they had stopped maintaining it.</td>
   </tr>
 
   <tr class="even">
     <td class="icon"><a href="https://musixdistro.wordpress.com/";>
        <img src="/graphics/distros-musix.png" alt="Musix GNU+Linux" /></a></td>
-    <td class="text"><em>Musix</em>&nbsp;&mdash;
-       a Knoppix-based distribution with special
+   <td>Musix, a GNU+Linux distribution based on Knoppix, with special
        emphasis on audio production. This is a &ldquo;static&rdquo;
        distro, normally run from a live CD. Since it will not receive
        security updates, it should be used offline.</td>
-    <td class="text"><em>Removed March 2019</em> at the request of the
+   <td><em>Removed March 2019</em>. Removed at the request of the
        maintainer, as they had stopped maintaining it.</td>
   </tr>
 </table>
@@ -384,7 +336,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/05/20 15:12:48 $
+$Date: 2020/01/01 16:21:50 $
 <!-- timestamp end -->
 </p>
 </div>

Index: free-software-for-education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/free-software-for-education.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- free-software-for-education.html    8 Dec 2019 16:25:29 -0000       1.8
+++ free-software-for-education.html    1 Jan 2020 16:21:50 -0000       1.9
@@ -4,7 +4,6 @@
 <title>Free Software for Education - GNU Project - Free Software 
Foundation</title>
 
 <!--#include virtual="/software/po/free-software-for-education.translist" -->
-<link rel="stylesheet" type="text/css" href="education.css" media="screen" />
 <style type="text/css" media="print,screen">
 <!--
 table.programs {
@@ -28,7 +27,7 @@
 </style>
 
 <!--#include virtual="/server/fs-gang-definitions.html" -->
-<!--#include virtual="/server/staging/banner.html" -->
+<!--#include virtual="/server/banner.html" -->
 
 
 <h2>Free Software for Education</h2>
@@ -346,7 +345,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/12/08 16:25:29 $
+$Date: 2020/01/01 16:21:50 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy.html
===================================================================
RCS file: /webcvs/www/www/server/staging/philosophy.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy.html     10 Jun 2012 08:08:11 -0000      1.3
+++ philosophy.html     1 Jan 2020 16:21:50 -0000       1.4
@@ -1,216 +1,64 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.86 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 
-<head>
-<!-- start of server/head-include-1.html -->
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:address@hidden"; />
-<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
-<meta name="ICBM" content="42.256233,-71.006581" />
-<meta name="DC.title" content="gnu.org" />
-<!-- end of server/head-include-1.html -->
+<title>Philosophy of the GNU Project
+- GNU Project - Free Software Foundation</title>
 
-<!-- end of server/header.html -->
+<!--#include virtual="/philosophy/po/philosophy.translist" -->
+<!--#include virtual="/server/banner.html" -->
 
+<div id="education-content">
 
-<title>Philosophy of the GNU Project - GNU Project - Free Software Foundation 
(FSF)</title>
-
-<!-- start of server/banner.html -->
-<!-- start of head-include-2.html -->
-
-<link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout.css" media="screen" />
-
-<link rel="stylesheet" href="mini.css" media="handheld" />
-
-<link rel="stylesheet" href="print.css" media="print" />
-<!-- end of head-include-2.html -->
-
-</head>
-<body>
-<!-- start of server/body-include-1.html -->
-<div id="toplinks"><span class="netscape4"><a href="#content">Skip to 
content</a> | <a href="#navigation">Skip to navigation</a> | <a 
href="#searcher">Skip to search</a>| </span><a 
href="#translations">Translations of this page</a> | <a 
href="/accessibility/">Accessibility</a></div>
-
-<!-- end of server/body-include-1.html -->
-
-
-<div id="null-wrapper">
-
-<!-- start of server/body-include-2 -->
-      <div id="header">
-        <div class="inner" style="position: relative;">
-
-        <h1 id="logo"><a href="/">The GNU Operating System</a></h1>
-
-
-
-       <div id="fssbox">
-<!--     <h4>Sign up for the <a href="http://www.fsf.org/fss";>Free Software 
Supporter</a></h4> -->
-<!--     <p>A monthly email newsletter about GNU and Free Software</p> -->
-<!--     <form 
action="https://crm.fsf.org/civicrm/profile/create&amp;reset=1&amp;gid=31"; 
method="post"> -->
-<!-- <div><input name="postURL" type="hidden" value="" /> -->
-<!-- <input type="hidden" name="group[25]" value="1" /> -->
-
-<!-- <input name="cancelURL" type="hidden" 
value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; /> -->
-<!-- <input name="_qf_default" type="hidden" value="Edit:cancel" /> -->
-<a href="https://my.fsf.org/associate/support_freedom?referrer=10189";><img 
src="https://static.fsf.org/nosvn/appeal2011/gnu-1.png"; alt="Help us raise 
$300,000 for free software by January 30th" /></a>
-<!-- </div> -->
-
-<!--     <p><label>Enter your email address (e.g. 
address@hidden)</label></p><p><input type="text" id="frmEmail" 
name="email-Primary" size="15" maxlength="80" /> &nbsp; <input type="submit" 
name="_qf_Edit_next" value="Ok" /></p> -->
-<!--     </form> -->
-       </div>
-
-       </div>
-      </div>
-
-<div id="navigation">
- <div class="inner">
-
-  <div id="searcher">
-   <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
-    <div><label class="netscape4" for="phrase">Search:</label>
-    <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
-           value="Why GNU/Linux?" onfocus="this.value=''" />
-
-    <input type="submit" value="Search" /></div><!-- unnamed label -->
-   </form>
-  </div><!-- /searcher -->
-
-  <ul>
-   <li id="tabPhilosophy" class="selected"><a href=
-                           "philosophy.html">Philosophy</a></li>
-   <li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
-   <li id="tabEducation"><a href="education.html">Education</a></li>
-
-   <li id="tabSoftware"><a href="/software/software.html">Downloads</a></li>
-   <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
-   <li id="tabHelp"><a href="/help/help.html">Help&nbsp;GNU</a></li>
-   <li id="joinfsftab"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join&nbsp;the&nbsp;FSF!</a></li>
-  </ul>
-
- </div><!-- /inner -->
-
- <!-- begin edu navigation bar -->
-<ul id="sub-nav">
-
-<li class="selected"><a href="philosophy.html">Introduction</a></li>
-       <li><a href="http://audio-video.gnu.org/";>Audio and video</a></li>
-       <li><a href="/philosophy/essays-and-articles.html">Essays and 
articles</a></li>
-
-       <li><a href="/philosophy/speeches-and-interview.html">Speeches and 
interviews</a></li>
-       <li><a href="/philosophy/third-party-ideas.html">Third party 
ideas</a></li>
-       <li><a href="/server/sitemap.html#directory-philosophy">All philosophy 
articles</a></li>
-</ul>
-
-</div><!--  /navigation -->
-<!-- end of server/body-include-2 -->
-
-
-<div id="content" class="inner">
-<!-- end of server/banner.html -->
-
-<!-- begin translinks file -->
-<div id="translations">
-<ul class="translations-list">
-<!-- Arabic -->
-<li><a 
href="/philosophy/philosophy.ar.html">&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;</a>&nbsp;[ar]</li>
-<!-- Bulgarian -->
-
-<li><a 
href="/philosophy/philosophy.bg.html">&#x431;&#x44A;&#x43B;&#x433;&#x430;&#x440;&#x441;&#x43A;&#x438;</a>&nbsp;[bg]</li>
-<!-- Bosnian -->
-<li><a href="/philosophy/philosophy.bs.html">bosanski</a>&nbsp;[bs]</li>
-<!-- Catalan -->
-<li><a href="/philosophy/philosophy.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li>
-<!-- Czech -->
-<li><a href="/philosophy/philosophy.cs.html">&#x010c;esky</a>&nbsp;[cs]</li>
-<!-- Danish -->
-<li><a href="/philosophy/philosophy.da.html">dansk</a>&nbsp;[da]</li>
-
-<!-- German -->
-<li><a href="/philosophy/philosophy.de.html">Deutsch</a>&nbsp;[de]</li>
-<!-- Greek -->
-<li><a 
href="/philosophy/philosophy.el.html">&#x03b5;&#x03bb;&#x03bb;&#x03b7;&#x03bd;&#x03b9;&#x03ba;&#x03ac;</a>&nbsp;[el]</li>
-<!-- English -->
-<li><a href="/philosophy/philosophy.html">English</a>&nbsp;[en]</li>
-<!-- Spanish -->
-<li><a href="/philosophy/philosophy.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li>
-<!-- Finnish -->
-
-<li><a href="/philosophy/philosophy.fi.html">suomi</a>&nbsp;[fi]</li>
-<!-- French -->
-<li><a href="/philosophy/philosophy.fr.html">fran&ccedil;ais</a>&nbsp;[fr]</li>
-<!-- Galician -->
-<li><a href="/philosophy/philosophy.gl.html">galego</a>&nbsp;[gl]</li>
-<!-- Hebrew -->
-<li><a 
href="/philosophy/philosophy.he.html">&#x05e2;&#x05d1;&#x05e8;&#x05d9;&#x05ea;</a>&nbsp;[he]</li>
-<!-- Hungarian -->
-<li><a href="/philosophy/philosophy.hu.html">magyar</a>&nbsp;[hu]</li>
-
-<!-- Indonesian -->
-<li><a href="/philosophy/philosophy.id.html">Bahasa 
Indonesia</a>&nbsp;[id]</li>
-<!-- Italian -->
-<li><a href="/philosophy/philosophy.it.html">italiano</a>&nbsp;[it]</li>
-<!-- Japanese -->
-<li><a 
href="/philosophy/philosophy.ja.html">&#x65e5;&#x672c;&#x8a9e;</a>&nbsp;[ja]</li>
-<!-- Korean -->
-<li><a 
href="/philosophy/philosophy.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
-<!-- Macedonian -->
-<li><a 
href="/philosophy/philosophy.mk.html">&#x043c;&#x0430;&#x043a;&#x0435;&#x0434;&#x043e;&#x043d;&#x0441;&#x043a;&#x0438;</a>&nbsp;[mk]</li>
-
-<!-- Dutch -->
-<li><a href="/philosophy/philosophy.nl.html">Nederlands</a>&nbsp;[nl]</li>
-<!-- Polish -->
-<li><a href="/philosophy/philosophy.pl.html">polski</a>&nbsp;[pl]</li>
-<!-- Brazilian Portuguese -->
-<li><a href="/philosophy/philosophy.pt-br.html">portugu&ecirc;s do 
Brasil</a>&nbsp;[pt-br]</li>
-<!-- Romanian -->
-<li><a 
href="/philosophy/philosophy.ro.html">rom&#x00e2;n&#x0103;</a>&nbsp;[ro]</li>
-
-<!-- Russian -->
-<li><a 
href="/philosophy/philosophy.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
-<!-- Serbian -->
-<li><a 
href="/philosophy/philosophy.sr.html">&#x0441;&#x0440;&#x043f;&#x0441;&#x043a;&#x0438;</a>&nbsp;[sr]</li>
-<!-- Chinese (Simplified) -->
-<li><a 
href="/philosophy/philosophy.zh-cn.html">&#x7b80;&#x4f53;&#x4e2d;&#x6587;</a>&nbsp;[zh-cn]</li>
-<!-- Chinese (Traditional) -->
-<li><a 
href="/philosophy/philosophy.zh-tw.html">&#x7e41;&#x9ad4;&#x4e2d;&#x6587;</a>&nbsp;[zh-tw]</li>
-</ul>
-</div> <!-- id="translations" -->
-<!-- end translinks file -->
+<!--#include virtual="/philosophy/philosophy-menu.html" -->
 
-<div id="education-content">
-<h2>Philosophy of the GNU Project</h2>
 </div> <!-- id="education-content" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
+<h2>Philosophy of the GNU Project</h2>
 
-<p>Our development of the GNU free software operating system is motivated
-by the philosophy of the free software movement.  This page provides an
-introduction to that philosophy.</p>
-
-<p>Free software is a matter of freedom: people should be free to use
-software in all the ways that are socially useful.  Software differs
-from material objects&mdash;such as chairs, sandwiches, and
-gasoline&mdash;in that it can be copied and changed much more easily.
-These possibilities make software as useful as it is; we believe
-software users should be able to make use of them.</p>
+<blockquote><p>
+See <a href="http://audio-video.gnu.org/";>audio-video.gnu.org</a>
+for recordings of Richard Stallman's speeches.
+</p></blockquote>
+
+<p><em>Free software</em> 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
+computing.</p>
+
+<p>Specifically, free software means users have
+the <a href="/philosophy/free-sw.html">four essential freedoms</a>:
+(0) to run the program, (1) to study and change the program in source
+code form, (2) to redistribute exact copies, and (3) to distribute
+modified versions.</p>
+
+<p>Software differs from material objects&mdash;such as chairs,
+sandwiches, and gasoline&mdash;in that it can be copied and changed
+much more easily.  These facilities are why software is useful; we
+believe a program's users should be free to take advantage of them,
+not solely its developer.</p>
 
 <p>For further reading, please select a section
 from the menu above.</p>
 
-<p>We also maintain a list of <a href="/philosophy/latest-articles.html">most 
recently added articles</a>.</p>
+<p>We also maintain a list of <a
+href="/philosophy/latest-articles.html">most recently added articles</a>.</p>
 
 <h3 id="introduction">Introduction</h3>
 
-<!-- I don't think it's good idea to link specific translation -->
-<!-- (e.g. foo.fr.html) from here.  It would be better to link them -->
-<!-- from philosophy.fr.html and the original documents. -mhatta -->
-
 <ul>
   <li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
+  <li><a href="/philosophy/free-software-even-more-important.html">
+      Why we must insist on free software</a></li>
+  <li><a href="/proprietary/proprietary.html">
+      Proprietary software is often malware</a></li>
   <li><a href="/gnu/gnu.html">History of GNU/Linux</a></li>
-  <li><a href="/philosophy/why-free.html">Why
-       Software Should Not Have Owners</a></li>
-
   <li><a href="/philosophy/pragmatic.html">Copyleft: Pragmatic 
Idealism</a></li>
   <li><a href="/philosophy/free-doc.html">Why Free Software Needs
       Free Documentation</a></li>
@@ -218,109 +66,88 @@
   <li><a href="/philosophy/fs-motives.html">Motives For Writing Free 
Software</a></li>
   <li><a href="/philosophy/right-to-read.html">The Right to Read: A
   Dystopian Short Story</a> by <a href="http://www.stallman.org/";>
-
   Richard Stallman</a></li>
   <li><a href="/philosophy/open-source-misses-the-point.html">Why
-       "Open Source" misses the point of Free Software</a></li>
+       &ldquo;Open Source&rdquo; misses the point of Free Software</a></li>
+  <li><a 
href="/philosophy/when-free-software-isnt-practically-superior.html">When
+       Free Software Isn't (Practically) Superior</a></li>
+  <li><a href="/philosophy/government-free-software.html">Measures
+       governments can use to promote free software</a></li>       
+  <li><a href="/education/education.html">Free software in education</a></li>
 </ul>
 
-<p>
 <!-- please leave both these ID attributes here. ... -->
-<a id="TOCFreedomOrganizations">We</a>
-<a id="FreedomOrganizations">also</a>
 <!-- ... we removed this as an H$ section as it was duplicating the  -->
 <!-- same information on links.html, but it's possible that some users -->
 <!-- have the URLs bookmarked or on their pages. -len -->
-
-keep a list of
+<div id="TOCFreedomOrganizations">
+<p id="FreedomOrganizations">We also keep a list of
 <a href="/links/links.html#FreedomOrganizations">Organizations
 that Work for Freedom in
 Computer Development and Electronic Communications</a>.</p>
-
-<!-- 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". -->
-</div><!-- for id="content", starts in the include above -->
-
-              <!-- begin server/footer-text.html -->
-<div class="inner">
-    
-<div class="yui-g" id="fsf-links">
-       <ul>
-               <li><a href="/">GNU&nbsp;home&nbsp;page</a></li>
-
-               <li><a 
href="http://www.fsf.org/";>FSF&nbsp;home&nbsp;page</a></li>
-               <li><a href="/graphics/graphics.html">GNU&nbsp;Art</a></li>
-               <li><a href="/fun/fun.html">GNU&nbsp;Fun</a></li>
-               <li><a href="/people/people.html">GNU's&nbsp;Who?</a></li>
-
-               <li><a 
href="http://directory.fsf.org";>Free&nbsp;Software&nbsp;Directory</a></li>
-               <li><a href="/server/sitemap.html">Site&nbsp;map</a></li>
-       </ul>
 </div>
 
-<div class="yui-g" id="mission-statement">
-
-<p><small>The <a href="http://www.fsf.org";>Free Software
-Foundation</a> is the principal organizational sponsor of the <a
-href="http://www.gnu.org/";>GNU Operating System</a>. <strong>Our
-mission is to preserve, protect and promote the freedom to use, study,
-copy, modify, and redistribute computer software, and to defend the
-rights of Free Software users.</strong> Support GNU and the FSF by <a
-href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
-href="http://www.fsf.org/join";>joining the FSF as an associate
-member</a> or by making a
-donation, either <a href="http://donate.fsf.org/";>directly to the FSF</a> 
-
-or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via 
Flattr</a>.</small></p>
-
-<p id="backtotop"><a href="#header">back to top</a></p>
-
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
 
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
 
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting 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>
 </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).
 
-</div>
-<!-- end server/footer-text.html -->
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
 
-<div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
-
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p>Copyright &copy; 2013, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
 
-<p>
-Copyright &copy; 2011 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>
 
-<p>
-Updated:
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2012/06/10 08:08:11 $
+$Date: 2020/01/01 16:21:50 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>
-



reply via email to

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