www-commits
[Top][All Lists]
Advanced

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

www/education edu-faq.html edu-projects.html ed...


From: Matteo Gamba
Subject: www/education edu-faq.html edu-projects.html ed...
Date: Thu, 14 Jul 2011 22:56:34 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Matteo Gamba <argoncordell>     11/07/14 22:56:33

Modified files:
        education      : edu-faq.html edu-projects.html 
                         edu-resources.html edu-software-gcompris.html 
                         edu-software-tuxpaint.html edu-software.html 
                         edu-team.html edu-why.html 

Log message:
        Uploading the correct version of the pages, using SSI directives as 
requested by the GNU server standards.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-faq.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-projects.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-resources.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-gcompris.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-tuxpaint.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-team.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-why.html?cvsroot=www&r1=1.2&r2=1.3

Patches:
Index: edu-faq.html
===================================================================
RCS file: /web/www/www/education/edu-faq.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edu-faq.html        13 Jul 2011 17:28:18 -0000      1.3
+++ edu-faq.html        14 Jul 2011 22:56:28 -0000      1.4
@@ -1,86 +1,36 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"; lang="en">
-<head><!-- Parent-Version: $Revision: 1.3 $ -->
+<!-- Parent-Version: 1.57 -->
        
+<!--#include virtual="/server/header.html" -->
+<title>Educational Frequently Asked Questions - GNU Project - Free Software 
Foundation</title>
        
-       <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="http://www.gnu.org/graphics/gnu-head-mini.png"; />
-       <meta name="ICBM" content="42.256233,-71.006581" />
-       <meta name="DC.title" content="gnu.org" />
+<!--#include virtual="/server/banner.html" -->
        
+<div id="education-content">
+<h2>Educational Frequently Asked Questions</h2>
        
-       <title>Education Frequently Asked Questions - GNU Project - Free 
Software Foundation (FSF)</title>
-       <!-- start of 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>
-<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>
-
-<div id="null-wrapper">
-       
-       <!-- begin of 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 <em>Free Software 
Supporter</em></h4>
-                               <p>A monthly update on GNU and the FSF</p>
-                               <form 
action="http://lists.fsf.org/mailman/subscribe/info-fsf"; method="post">
-                                       <p><input type="text" id="frmEmail" 
name="email" size="15" maxlength="80" value="address@hidden" 
onfocus="this.value=''" /> &nbsp; <input type="submit" 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/philosophy.html">Philosophy</a></li>
-                               <li id="tabLicenses"><a 
href="/licenses/licenses.html">Licenses</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 -->
-       </div><!--  /navigation -->
-       <!-- end of body-include-2 -->
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">Education Contents</a></li>
        
-       <div id="content" class="inner">
+<li>
+<a href="/education/edu-cases.html">Case Studies</a></li>
        
-               <!-- end of banner.html -->
+<li>
+<a href="/education/edu-resources.html">Educational Resources</a></li>
 
-<div id="education-content">
+<li>
+<a href="/education/edu-projects.html">Education Projects</a></li>
 
-<h2>Education Frequently Asked Questions</h2>
+<li class="active">
+<a href="/education/edu-faq.html">FAQ</a></li>
 
-<ul id="edu-navigation">
-                       <li><a href="/education/edu-contents.html">Education 
Contents</a></li>
-                       <li><a href="/education/edu-cases.html">Case 
Studies</a></li>
-                       <li><a href="/education/edu-resources.html">Educational 
Resources</a></li>
-                       <li><a href="/education/edu-projects.html">Education 
Projects</a></li>
-                       <li class="active"><a 
href="/education/edu-faq.html">FAQ</a></li>
-                       <li><a href="/education/edu-team.html">The Education 
Team</a></li>
+<li>
+<a href="/education/edu-team.html">The Education Team</a></li>
 </ul>
+<!-- end edu navigation bar -->
+
+</div> <!-- id="edu-content" -->
 
 <p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
 FAQ</p>
@@ -127,7 +77,7 @@
                                millions of people around the world use Free 
Libre Software.</p>                
                        </dd>
                        
-                       <dt>I am the head of a technical instititue and I would 
like to teach 
+                       <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 
@@ -157,141 +107,67 @@
                        </dd>
 </dl>
 
-</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". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
 
-<!-- begin server/footer-text.html -->
+<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>
+
+<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>
 
-<div class="inner">
-       <div class="yui-g" id="fsf-links">
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-1">
-                               <p class="netscape4"><a href="#footer">Skip 
sitemap</a> or <a href="#sitemap-2">skip to licensing items</a></p>
-                               <ul>
-                                       <li><a href="/gnu/gnu-history.html">GNU 
History</a></li>
-                                       <li><a href="/help/">Get involved</a>
-                                               <ul>
-                                                       <li><a 
href="http://savannah.gnu.org/people/?type_id=1";>Projects that need 
help</a></li>
-                                                       <li><a 
href="/server/standards/translations/priorities.html#Languages">Help translate 
this website</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/server/takeaction.html#unmaint">Take over an unmaintained 
package</a></li>
-                                       <li><a 
href="/server/takeaction.html#gnustep">Use GNUstep</a></li>
-                                       <li><a 
href="/distros/free-distros.html">Download GNU</a></li>
-                                       <li><a 
href="http://directory.fsf.org/GNU/";>GNU packages</a></li>
-                                       <li><a href="/manual/manual.html">Free 
documentation</a></li>
-                                       <li><a href="http://lists.gnu.org/";>GNU 
mailing lists</a></li>
-                                       <li><a 
href="http://savannah.gnu.org/";>GNU savannah</a></li>
-                                       <li><a 
href="http://libreplanet.org/";>Connect with free software users</a></li>
-                                       <li><a href="/people/">GNU's 
Who?</a></li>
-                                       <li><a 
href="http://planet.gnu.org/";>Planet GNU</a></li>
-                                       <li><a 
href="/contact/gnu-advisory.html">GNU Advisory Committee</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-2">
-                               <p class="netscape4"><a href="#sitemap-3">Skip 
to general items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/licensing";>Software licensing</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/licensing/education";>Licensing education</a></li>
-                                                       <li><a 
href="/licenses">Free software licenses</a>
-                                                               <ul>
-                                                                       <li><a 
href="/licenses/gpl.html">GNU GPL</a></li>
-                                                                       <li><a 
href="/licenses/agpl.html">GNU AGPL</a></li>
-                                                                       <li><a 
href="/licenses/lgpl.html">GNU LGPL</a></li>
-                                                                       <li><a 
href="/licenses/fdl.html">GNU FDL</a></li>
-                                                               </ul>
-                                                       </li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Software licensing FAQ</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Licensing compliance</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">How to use GNU licenses for your own 
software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/resources/service/";>GNU Service Directory</a></li>
-                                       <li><a href="/fun/fun.html">GNU 
Fun</a></li>
-                                       <li><a 
href="/graphics/graphics.html">GNU Art</a></li>
-                                       <li><a href="/music/music.html">Music 
&amp; Songs</a></li>
-                               </ul>
-                       </div>
-               </div>
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-3">
-                               <p class="netscape4"><a href="#sitemap-4">Skip 
to philosophical items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/news/";>Latest News</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/events/";>Upcoming Events</a></li>
-                                                       <li><a 
href="http://www.fsf.org/blogs/";>FSF Blogs</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/volunteer";>Volunteering and internships</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/hw";>Hardware Database</a></li>
-                                       <li><a 
href="http://directory.fsf.org";>Free Software Directory</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/";>Free Software Resources</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/";>Associate Members</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/account/";>My FSF Account</a></li>
-                                       <li class="noright"><a 
href="http://www.fsf.org/about/contact.html";>Contact the FSF</a></li>
-                                       <li><a 
href="http://audio-video.gnu.org/";>GNU Audio/Video</a></li>
-                                       <li><a 
href="/accessibility/accessibility.html">Accessibility Statement</a></li>
-                                       <li><a 
href="http://ftp.gnu.org/gnu/";>GNU FTP Site</a> and <a 
href="/prep/ftp.html">mirrors</a></li>
-                                       <li><a href="/people/speakers.html">GNU 
Speakers</a></li>
-                                       <li><a 
href="http://www.fsf.org/jobs";>Free software jobs</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-4">
-                               <p class="netscape4"><a href="#footer">Skip 
list</a></p>
-                               <ul>
-                                       <li><a 
href="http://donate.fsf.org";>Donate to the FSF</a></li>
-                                       <li><a 
href="http://www.fsf.org/jfb";>Join the FSF</a></li>
-                                       <li><a href="/philosophy/">Free 
software philosophy</a>
-                                               <ul>
-                                                       <li><a 
href="/philosophy/free-sw.html">The Free Software Definition</a></li>
-                                                       <li><a 
href="/philosophy/pragmatic.html">Copyleft: Pragmatic Idealism</a></li>
-                                                       <li><a 
href="/philosophy/free-doc.html">Free Software and Free Manuals</a></li>
-                                                       <li><a 
href="/philosophy/selling.html">Selling Free Software</a></li>
-                                                       <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></li>
-                                                       <li><a 
href="/philosophy/open-source-misses-the-point.html">Why Open Source Misses the 
Point of Free Software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/software/for-windows.html">Free software for Windows</a></li>
-                                       <li><a 
href="http://defectivebydesign.org/";>Defective by Design &mdash; Fight 
DRM</a></li>
-                                       <li><a 
href="http://windows7sins.org/";>Windows 7 Sins</a></li>
-                                       <li><a 
href="http://playogg.org/";>Support free media formats</a></li>
-                               </ul>
-                       </div>
-               </div>
-       </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></small></p>
-               <p><small><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 
<a href="http://donate.fsf.org/";>making a donation</a>.</strong></small></p>
-               <p id="backtotop"><a href="#header">back to top</a></p>
-       </div>
-</div>
-<!-- end server/footer-text.html -->
-<div id="footer">
-       <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>
-       <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; 2011 Free Software Foundation, Inc.</p>
-       <p>This page is licensed under a <a rel="license"
+<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>.
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/07/14 22:56:28 $
+<!-- timestamp end -->
 </p>
-       <p>Updated:
-       <!-- timestamp start -->$Date: 2011/07/13 17:28:18 $<!-- timestamp end 
-->
-       </p>
 </div>
-<div id="translations">
-       <h4><a 
href="/server/standards/README.translations.html">Translations</a> of this 
page</h4>
        
-       <!-- Please keep this list alphabetical by language code. Comment what 
the language is for each type, i.e. de is German. Write the language name in 
its own language (Deutsch) in the text. If you add a new language here, please 
advise address@hidden and add it to - 
/home/www/html/server/standards/README.translations.html - one of the lists 
under the section "Translations Underway" - if there is a translation team, you 
also have to add an alias to mail.gnu.org:/com/mailer/aliases Please also check 
you have the language code right; see: 
http://www.loc.gov/standards/iso639-2/php/code_list.php If the 2-letter ISO 
639-1 code is not available, use the 3-letter ISO 639-2. Please use W3C 
normative character entities. See also '(web-trans)Capitalization': 
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
-       <!-- ZCZC START MARK by RMS46 031117 -->
+<div id="translations">
+<h4>Translations of this page</h4>
        
-       <ul class="translations-list">
-               <!-- English -->
-               <li><a 
href="/server/standards/boilerplate.html">English</a>&nbsp;[en]</li>
-       </ul>
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
+<ul class="translations-list">
+<!-- English -->
+<li><a href="/education/edu-faq.html">English</a>&nbsp;[en]</li>
+</ul>
 </div>
 </div>
 </body>

Index: edu-projects.html
===================================================================
RCS file: /web/www/www/education/edu-projects.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edu-projects.html   13 Jul 2011 17:28:18 -0000      1.3
+++ edu-projects.html   14 Jul 2011 22:56:28 -0000      1.4
@@ -1,91 +1,36 @@
-<!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">
-
-<head>
-       <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" />
-       
-<title>Other Education Groups and Projects - GNU Project - Free Software 
Foundation (FSF)</title>
-       
-       <!-- start of 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>
-<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>
+<!-- Parent-Version: 1.57 -->
 
-<div id="null-wrapper">
+<!--#include virtual="/server/header.html" -->
+<title>Other Education Groups and Projects - GNU Project - Free Software 
Foundation</title>
        
-       <!-- begin of 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 <em>Free Software 
Supporter</em></h4>
-                               <p>A monthly update on GNU and the FSF</p>
-                               <form 
action="http://lists.fsf.org/mailman/subscribe/info-fsf"; method="post">
-                                       <p><input type="text" id="frmEmail" 
name="email" size="15" maxlength="80" value="address@hidden" 
onfocus="this.value=''" /> &nbsp; <input type="submit" 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/philosophy.html">Philosophy</a></li>
-                               <li id="tabLicenses"><a 
href="/licenses/licenses.html">Licenses</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 -->
-       </div><!--  /navigation -->
+<!--#include virtual="/server/banner.html" -->
 
-       <!-- end of body-include-2 -->
+<div id="education-content">
+<h2>Other Education Groups and Projects</h2>
        
-       <div id="content" class="inner">
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">Education Contents</a></li>
        
-               <!-- end of banner.html -->
+<li>
+<a href="/education/edu-cases.html">Case Studies</a></li>
        
-<div id="education-content">
+<li>
+<a href="/education/edu-resources.html">Educational Resources</a></li>
        
-<h2>Other Education Groups and Projects</h2>
+<li class="active">
+<a href="/education/edu-projects.html">Education Projects</a></li>
                
-<ul id="edu-navigation">
-                       <li><a href="/education/edu-contents.html">Education 
Contents</a></li>
-                       <li><a href="/education/edu-cases.html">Case 
Studies</a></li>
-                       <li><a href="/education/edu-resources.html">Educational 
Resources</a></li>
-                       <li class="active"><a 
href="/education/edu-projects.html">Education Projects</a></li>
-                       <li><a href="/education/edu-faq.html">FAQ</a></li>
-                       <li><a href="/education/edu-team.html">The Education 
Team</a></li>
+<li>
+<a href="/education/edu-faq.html">FAQ</a></li>
+
+<li>
+<a href="/education/edu-team.html">The Education Team</a></li>
 </ul>
+<!-- end edu navigation bar -->
+
+</div> <!-- id="edu-content" -->
                        
 <p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
 Education Projects</p>
@@ -187,140 +132,67 @@
     educational environments.</dd> 
 </dl>
 
-</div>
-</div>
-
-<!-- begin server/footer-text.html -->
-<div class="inner">
-       <div class="yui-g" id="fsf-links">
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-1">
-                               <p class="netscape4"><a href="#footer">Skip 
sitemap</a> or <a href="#sitemap-2">skip to licensing items</a></p>
-                               <ul>
-                                       <li><a href="/gnu/gnu-history.html">GNU 
History</a></li>
-                                       <li><a href="/help/">Get involved</a>
-                                               <ul>
-                                                       <li><a 
href="http://savannah.gnu.org/people/?type_id=1";>Projects that need 
help</a></li>
-                                                       <li><a 
href="/server/standards/translations/priorities.html#Languages">Help translate 
this website</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/server/takeaction.html#unmaint">Take over an unmaintained 
package</a></li>
-                                       <li><a 
href="/server/takeaction.html#gnustep">Use GNUstep</a></li>
-                                       <li><a 
href="/distros/free-distros.html">Download GNU</a></li>
-                                       <li><a 
href="http://directory.fsf.org/GNU/";>GNU packages</a></li>
-                                       <li><a href="/manual/manual.html">Free 
documentation</a></li>
-                                       <li><a href="http://lists.gnu.org/";>GNU 
mailing lists</a></li>
-                                       <li><a 
href="http://savannah.gnu.org/";>GNU savannah</a></li>
-                                       <li><a 
href="http://libreplanet.org/";>Connect with free software users</a></li>
-                                       <li><a href="/people/">GNU's 
Who?</a></li>
-                                       <li><a 
href="http://planet.gnu.org/";>Planet GNU</a></li>
-                                       <li><a 
href="/contact/gnu-advisory.html">GNU Advisory Committee</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-2">
-                               <p class="netscape4"><a href="#sitemap-3">Skip 
to general items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/licensing";>Software licensing</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/licensing/education";>Licensing education</a></li>
-                                                       <li><a 
href="/licenses">Free software licenses</a>
-                                                               <ul>
-                                                                       <li><a 
href="/licenses/gpl.html">GNU GPL</a></li>
-                                                                       <li><a 
href="/licenses/agpl.html">GNU AGPL</a></li>
-                                                                       <li><a 
href="/licenses/lgpl.html">GNU LGPL</a></li>
-                                                                       <li><a 
href="/licenses/fdl.html">GNU FDL</a></li>
-                                                               </ul>
-                                                       </li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Software licensing FAQ</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Licensing compliance</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">How to use GNU licenses for your own 
software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/resources/service/";>GNU Service Directory</a></li>
-                                       <li><a href="/fun/fun.html">GNU 
Fun</a></li>
-                                       <li><a 
href="/graphics/graphics.html">GNU Art</a></li>
-                                       <li><a href="/music/music.html">Music 
&amp; Songs</a></li>
-                               </ul>
-                       </div>
-               </div>
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-3">
-                               <p class="netscape4"><a href="#sitemap-4">Skip 
to philosophical items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/news/";>Latest News</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/events/";>Upcoming Events</a></li>
-                                                       <li><a 
href="http://www.fsf.org/blogs/";>FSF Blogs</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/volunteer";>Volunteering and internships</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/hw";>Hardware Database</a></li>
-                                       <li><a 
href="http://directory.fsf.org";>Free Software Directory</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/";>Free Software Resources</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/";>Associate Members</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/account/";>My FSF Account</a></li>
-                                       <li class="noright"><a 
href="http://www.fsf.org/about/contact.html";>Contact the FSF</a></li>
-                                       <li><a 
href="http://audio-video.gnu.org/";>GNU Audio/Video</a></li>
-                                       <li><a 
href="/accessibility/accessibility.html">Accessibility Statement</a></li>
-                                       <li><a 
href="http://ftp.gnu.org/gnu/";>GNU FTP Site</a> and <a 
href="/prep/ftp.html">mirrors</a></li>
-                                       <li><a href="/people/speakers.html">GNU 
Speakers</a></li>
-                                       <li><a 
href="http://www.fsf.org/jobs";>Free software jobs</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-4">
-                               <p class="netscape4"><a href="#footer">Skip 
list</a></p>
-                               <ul>
-                                       <li><a 
href="http://donate.fsf.org";>Donate to the FSF</a></li>
-                                       <li><a 
href="http://www.fsf.org/jfb";>Join the FSF</a></li>
-                                       <li><a href="/philosophy/">Free 
software philosophy</a>
-                                               <ul>
-                                                       <li><a 
href="/philosophy/free-sw.html">The Free Software Definition</a></li>
-                                                       <li><a 
href="/philosophy/pragmatic.html">Copyleft: Pragmatic Idealism</a></li>
-                                                       <li><a 
href="/philosophy/free-doc.html">Free Software and Free Manuals</a></li>
-                                                       <li><a 
href="/philosophy/selling.html">Selling Free Software</a></li>
-                                                       <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></li>
-                                                       <li><a 
href="/philosophy/open-source-misses-the-point.html">Why Open Source Misses the 
Point of Free Software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/software/for-windows.html">Free software for Windows</a></li>
-                                       <li><a 
href="http://defectivebydesign.org/";>Defective by Design &mdash; Fight 
DRM</a></li>
-                                       <li><a 
href="http://windows7sins.org/";>Windows 7 Sins</a></li>
-                                       <li><a 
href="http://playogg.org/";>Support free media formats</a></li>
-                               </ul>
-                       </div>
-               </div>
-       </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></small></p>
-               <p><small><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 
<a href="http://donate.fsf.org/";>making a donation</a>.</strong></small></p>
-               <p id="backtotop"><a href="#header">back to top</a></p>
-       </div>
-</div>
-<!-- end server/footer-text.html -->
+<!-- If needed, change the copyright block at the bottom. In general,
+     all pages on the GNU web server should have the section about
+     verbatim copying.  Please do NOT remove this without talking
+     with the webmasters first.
+     Please make sure the copyright date is consistent with the document
+     and that it is like this: "2001, 2002", not this: "2001-2002". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
-       <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>
-       <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; 2011 Free Software Foundation, Inc.</p>
-       <p>This page is licensed under a <a rel="license"
+
+<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>
+
+<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; 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>.
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/07/14 22:56:28 $
+<!-- timestamp end -->
 </p>
-       <p>Updated:
-       <!-- timestamp start -->$Date: 2011/07/13 17:28:18 $<!-- timestamp end 
-->
-       </p>
 </div>
-<div id="translations">
-       <h4><a 
href="/server/standards/README.translations.html">Translations</a> of this 
page</h4>
        
-       <!-- Please keep this list alphabetical by language code. Comment what 
the language is for each type, i.e. de is German. Write the language name in 
its own language (Deutsch) in the text. If you add a new language here, please 
advise address@hidden and add it to - 
/home/www/html/server/standards/README.translations.html - one of the lists 
under the section "Translations Underway" - if there is a translation team, you 
also have to add an alias to mail.gnu.org:/com/mailer/aliases Please also check 
you have the language code right; see: 
http://www.loc.gov/standards/iso639-2/php/code_list.php If the 2-letter ISO 
639-1 code is not available, use the 3-letter ISO 639-2. Please use W3C 
normative character entities. See also '(web-trans)Capitalization': 
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
-       <!-- ZCZC START MARK by RMS46 031117 -->
+<div id="translations">
+<h4>Translations of this page</h4>
        
-       <ul class="translations-list">
-               <!-- English -->
-               <li><a 
href="/server/standards/boilerplate.html">English</a>&nbsp;[en]</li>
-       </ul>
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
+<ul class="translations-list">
+<!-- English -->
+<li><a href="/education/edu-projects.html">English</a>&nbsp;[en]</li>
+</ul>
 </div>
 </div>
 </body>

Index: edu-resources.html
===================================================================
RCS file: /web/www/www/education/edu-resources.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-resources.html  13 Jul 2011 17:28:18 -0000      1.2
+++ edu-resources.html  14 Jul 2011 22:56:28 -0000      1.3
@@ -1,91 +1,36 @@
-<!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">
+<!-- Parent-Version: 1.57 -->
 
-<head>
-       <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" />
-       
-<title>Free Educational Resources - GNU Project - Free Software Foundation 
(FSF)</title>
-       
- <!-- start of 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>
-<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>
-
-<div id="null-wrapper">
+<!--#include virtual="/server/header.html" -->
+<title>Free Educational Resources - GNU Project - Free Software 
Foundation</title>
        
-       <!-- begin of body-include-2 -->
+<!--#include virtual="/server/banner.html" -->
 
-       <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 <em>Free Software 
Supporter</em></h4>
-                               <p>A monthly update on GNU and the FSF</p>
-                               <form 
action="http://lists.fsf.org/mailman/subscribe/info-fsf"; method="post">
-                                       <p><input type="text" id="frmEmail" 
name="email" size="15" maxlength="80" value="address@hidden" 
onfocus="this.value=''" /> &nbsp; <input type="submit" 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/philosophy.html">Philosophy</a></li>
-                               <li id="tabLicenses"><a 
href="/licenses/licenses.html">Licenses</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 -->
-       </div><!--  /navigation -->
+<div id="education-content">
+<h2>Free Learning Resources</h2>
        
-       <!-- end of body-include-2 -->
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">Education Contents</a></li>
        
-       <div id="content" class="inner">
+<li>
+<a href="/education/edu-cases.html">Case Studies</a></li>
        
-               <!-- end of banner.html -->
+<li class="active">
+<a href="/education/edu-resources.html">Educational Resources</a></li>
                
-<div id="education-content">
+<li>
+<a href="/education/edu-projects.html">Education Projects</a></li>
                
-<h2>Free Learning Resources</h2>
+<li>
+<a href="/education/edu-faq.html">FAQ</a></li>
                
-<ul id="edu-navigation">
-                       <li><a href="/education/edu-contents.html">Education 
Contents</a></li>
-                       <li><a href="/education/edu-cases.html">Case 
Studies</a></li>
-                       <li class="active"><a 
href="/education/edu-resources.html">Educational Resources</a></li>
-                       <li><a href="/education/edu-projects.html">Education 
Projects</a></li>
-                       <li><a href="/education/edu-faq.html">FAQ</a></li>
-                       <li><a href="/education/edu-team.html">The Education 
Team</a></li>
+<li>
+<a href="/education/edu-team.html">The Education Team</a></li>
 </ul>
+<!-- end edu navigation bar -->
+
+</div> <!-- id="edu-content" -->
 
 <p class="edu-breadcrumb">
 <a href="/education/education.html">Education</a> &rarr; Educational 
Resources</p>
@@ -104,7 +49,7 @@
 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 
favour the ownership of knowledge, tailored to prevent people from accessing, 
using or 
+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 
@@ -137,7 +82,7 @@
 
 <dt>GNU Project</dt>
 
-<dd>We mantain a list of <a href= "/doc/other-free-books.html">free books</a> 
mainly related to Free Software documentation, and we make
+<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>
@@ -158,150 +103,73 @@
 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 organisations to contribute to the 
+encourages both individuals and organizations to contribute to the 
 community."</p></dd>
 
 </dl>
 
-</div>
-</div>
-
-<!-- begin server/footer-text.html -->
+<!-- If needed, change the copyright block at the bottom. In general,
+     all pages on the GNU web server should have the section about
+     verbatim copying.  Please do NOT remove this without talking
+     with the webmasters first.
+     Please make sure the copyright date is consistent with the document
+     and that it is like this: "2001, 2002", not this: "2001-2002". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
 
-<div class="inner">
-       <div class="yui-g" id="fsf-links">
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-1">
-                               <p class="netscape4"><a href="#footer">Skip 
sitemap</a> or <a href="#sitemap-2">skip to licensing items</a></p>
-                               <ul>
-                                       <li><a href="/gnu/gnu-history.html">GNU 
History</a></li>
-                                       <li><a href="/help/">Get involved</a>
-                                               <ul>
-                                                       <li><a 
href="http://savannah.gnu.org/people/?type_id=1";>Projects that need 
help</a></li>
-                                                       <li><a 
href="/server/standards/translations/priorities.html#Languages">Help translate 
this website</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/server/takeaction.html#unmaint">Take over an unmaintained 
package</a></li>
-                                       <li><a 
href="/server/takeaction.html#gnustep">Use GNUstep</a></li>
-                                       <li><a 
href="/distros/free-distros.html">Download GNU</a></li>
-                                       <li><a 
href="http://directory.fsf.org/GNU/";>GNU packages</a></li>
-                                       <li><a href="/manual/manual.html">Free 
documentation</a></li>
-                                       <li><a href="http://lists.gnu.org/";>GNU 
mailing lists</a></li>
-                                       <li><a 
href="http://savannah.gnu.org/";>GNU savannah</a></li>
-                                       <li><a 
href="http://libreplanet.org/";>Connect with free software users</a></li>
-                                       <li><a href="/people/">GNU's 
Who?</a></li>
-                                       <li><a 
href="http://planet.gnu.org/";>Planet GNU</a></li>
-                                       <li><a 
href="/contact/gnu-advisory.html">GNU Advisory Committee</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-2">
-                               <p class="netscape4"><a href="#sitemap-3">Skip 
to general items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/licensing";>Software licensing</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/licensing/education";>Licensing education</a></li>
-                                                       <li><a 
href="/licenses">Free software licenses</a>
-                                                               <ul>
-                                                                       <li><a 
href="/licenses/gpl.html">GNU GPL</a></li>
-                                                                       <li><a 
href="/licenses/agpl.html">GNU AGPL</a></li>
-                                                                       <li><a 
href="/licenses/lgpl.html">GNU LGPL</a></li>
-                                                                       <li><a 
href="/licenses/fdl.html">GNU FDL</a></li>
-                                                               </ul>
-                                                       </li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Software licensing FAQ</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Licensing compliance</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">How to use GNU licenses for your own 
software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/resources/service/";>GNU Service Directory</a></li>
-                                       <li><a href="/fun/fun.html">GNU 
Fun</a></li>
-                                       <li><a 
href="/graphics/graphics.html">GNU Art</a></li>
-                                       <li><a href="/music/music.html">Music 
&amp; Songs</a></li>
-                               </ul>
-                       </div>
-               </div>
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-3">
-                               <p class="netscape4"><a href="#sitemap-4">Skip 
to philosophical items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/news/";>Latest News</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/events/";>Upcoming Events</a></li>
-                                                       <li><a 
href="http://www.fsf.org/blogs/";>FSF Blogs</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/volunteer";>Volunteering and internships</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/hw";>Hardware Database</a></li>
-                                       <li><a 
href="http://directory.fsf.org";>Free Software Directory</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/";>Free Software Resources</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/";>Associate Members</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/account/";>My FSF Account</a></li>
-                                       <li class="noright"><a 
href="http://www.fsf.org/about/contact.html";>Contact the FSF</a></li>
-                                       <li><a 
href="http://audio-video.gnu.org/";>GNU Audio/Video</a></li>
-                                       <li><a 
href="/accessibility/accessibility.html">Accessibility Statement</a></li>
-                                       <li><a 
href="http://ftp.gnu.org/gnu/";>GNU FTP Site</a> and <a 
href="/prep/ftp.html">mirrors</a></li>
-                                       <li><a href="/people/speakers.html">GNU 
Speakers</a></li>
-                                       <li><a 
href="http://www.fsf.org/jobs";>Free software jobs</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-4">
-                               <p class="netscape4"><a href="#footer">Skip 
list</a></p>
-                               <ul>
-                                       <li><a 
href="http://donate.fsf.org";>Donate to the FSF</a></li>
-                                       <li><a 
href="http://www.fsf.org/jfb";>Join the FSF</a></li>
-                                       <li><a href="/philosophy/">Free 
software philosophy</a>
-                                               <ul>
-                                                       <li><a 
href="/philosophy/free-sw.html">The Free Software Definition</a></li>
-                                                       <li><a 
href="/philosophy/pragmatic.html">Copyleft: Pragmatic Idealism</a></li>
-                                                       <li><a 
href="/philosophy/free-doc.html">Free Software and Free Manuals</a></li>
-                                                       <li><a 
href="/philosophy/selling.html">Selling Free Software</a></li>
-                                                       <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></li>
-                                                       <li><a 
href="/philosophy/open-source-misses-the-point.html">Why Open Source Misses the 
Point of Free Software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/software/for-windows.html">Free software for Windows</a></li>
-                                       <li><a 
href="http://defectivebydesign.org/";>Defective by Design &mdash; Fight 
DRM</a></li>
-                                       <li><a 
href="http://windows7sins.org/";>Windows 7 Sins</a></li>
-                                       <li><a 
href="http://playogg.org/";>Support free media formats</a></li>
-                               </ul>
-                       </div>
-               </div>
-       </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></small></p>
-               <p><small><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 
<a href="http://donate.fsf.org/";>making a donation</a>.</strong></small></p>
-               <p id="backtotop"><a href="#header">back to top</a></p>
-       </div>
-</div>
+<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>
+
+<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>
 
-<!-- end server/footer-text.html -->
+<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
 
-<div id="footer">
-       <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>
-       <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; 2011 Free Software Foundation, Inc.</p>
-       <p>This page is licensed under a <a rel="license"
+<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>.
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/07/14 22:56:28 $
+<!-- timestamp end -->
 </p>
-       <p>Updated:
-       <!-- timestamp start -->$Date: 2011/07/13 17:28:18 $<!-- timestamp end 
-->
-       </p>
 </div>
-<div id="translations">
-       <h4><a 
href="/server/standards/README.translations.html">Translations</a> of this 
page</h4>
        
-       <!-- Please keep this list alphabetical by language code. Comment what 
the language is for each type, i.e. de is German. Write the language name in 
its own language (Deutsch) in the text. If you add a new language here, please 
advise address@hidden and add it to - 
/home/www/html/server/standards/README.translations.html - one of the lists 
under the section "Translations Underway" - if there is a translation team, you 
also have to add an alias to mail.gnu.org:/com/mailer/aliases Please also check 
you have the language code right; see: 
http://www.loc.gov/standards/iso639-2/php/code_list.php If the 2-letter ISO 
639-1 code is not available, use the 3-letter ISO 639-2. Please use W3C 
normative character entities. See also '(web-trans)Capitalization': 
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
-       <!-- ZCZC START MARK by RMS46 031117 -->
+<div id="translations">
+<h4>Translations of this page</h4>
        
-       <ul class="translations-list">
-               <!-- English -->
-               <li><a 
href="/server/standards/boilerplate.html">English</a>&nbsp;[en]</li>
-       </ul>
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
+<ul class="translations-list">
+<!-- English -->
+<li><a href="/education/edu-resources.html">English</a>&nbsp;[en]</li>
+</ul>
 </div>
 </div>
 </body>
 </html>
-               

Index: edu-software-gcompris.html
===================================================================
RCS file: /web/www/www/education/edu-software-gcompris.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edu-software-gcompris.html  13 Jul 2011 17:28:18 -0000      1.4
+++ edu-software-gcompris.html  14 Jul 2011 22:56:28 -0000      1.5
@@ -1,90 +1,36 @@
-<!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">
+<!-- Parent-Version: 1.57 -->
 
-<head>
-       <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" />
-       
-       <title>GCompris - GNU Project - 
-       Free Software Foundation (FSF)</title>
-       <!-- start of 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>
-<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>
-<div id="null-wrapper">
+<!--#include virtual="/server/header.html" -->
+<title>GCompris - GNU Project - Free Software Foundation</title>
 
-<!-- begin of body-include-2 -->
+<!--#include virtual="/server/banner.html" -->
 
-<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 <em>Free Software 
Supporter</em></h4>
-                               <p>A monthly update on GNU and the FSF</p>
-                               <form 
action="http://lists.fsf.org/mailman/subscribe/info-fsf"; method="post">
-                                       <p><input type="text" id="frmEmail" 
name="email" size="15" maxlength="80" value="address@hidden" 
onfocus="this.value=''" /> &nbsp; <input type="submit" 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/philosophy.html">Philosophy</a></li>
-                               <li id="tabLicenses"><a 
href="/licenses/licenses.html">Licenses</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 -->
-       </div><!--  /navigation -->
+<div id="education-content">
+<h2>GCompris</h2>
        
-<!-- end of body-include-2 -->
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">Education Contents</a></li>
 
-<div id="content" class="inner">
+<li>
+<a href="/education/edu-cases.html">Case Studies</a></li>
        
-               <!-- end of banner.html -->
+<li  class="active">
+<a href="/education/edu-resources.html">Educational Resources</a></li>
                
-<div id="education-content">
+<li>
+<a href="/education/edu-projects.html">Education Projects</a></li>
 
-<h2>GCompris</h2>
+<li>
+<a href="/education/edu-faq.html">FAQ</a></li>
 
-<ul id="edu-navigation">
-  <li><a href="/education/edu-contents.html">Education Contents</a></li>
-  <li><a href="/education/edu-cases.html">Case Studies</a></li>
-  <li class="active"><a href="/education/edu-resources.html">Educational 
Resources</a></li>
-  <li><a href="/education/edu-projects.html">Education Projects</a></li>
-  <li><a href="/education/edu-faq.html">FAQ</a></li>
-  <li><a href="/education/edu-team.html">The Team</a></li>
+<li>
+<a href="/education/edu-team.html">The Education Team</a></li>
 </ul>
+<!-- end edu navigation bar -->
+
+</div> <!-- id="edu-content" -->
 
 <p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
 <a href="/education/edu-resources.html">Educational Resources</a> &rarr; 
@@ -181,146 +127,68 @@
 improving the academic and functional flair of intellectually 
 challenged children.</p>
 
-</div>
-</div>
-
-<!-- begin server/footer-text.html -->
+<!-- If needed, change the copyright block at the bottom. In general,
+     all pages on the GNU web server should have the section about
+     verbatim copying.  Please do NOT remove this without talking
+     with the webmasters first.
+     Please make sure the copyright date is consistent with the document
+     and that it is like this: "2001, 2002", not this: "2001-2002". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
 
-<div class="inner">
-       <div class="yui-g" id="fsf-links">
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-1">
-                               <p class="netscape4"><a href="#footer">Skip 
sitemap</a> or <a href="#sitemap-2">skip to licensing items</a></p>
-                               <ul>
-                                       <li><a href="/gnu/gnu-history.html">GNU 
History</a></li>
-                                       <li><a href="/help/">Get involved</a>
-                                               <ul>
-                                                       <li><a 
href="http://savannah.gnu.org/people/?type_id=1";>Projects that need 
help</a></li>
-                                                       <li><a 
href="/server/standards/translations/priorities.html#Languages">Help translate 
this website</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/server/takeaction.html#unmaint">Take over an unmaintained 
package</a></li>
-                                       <li><a 
href="/server/takeaction.html#gnustep">Use GNUstep</a></li>
-                                       <li><a 
href="/distros/free-distros.html">Download GNU</a></li>
-                                       <li><a 
href="http://directory.fsf.org/GNU/";>GNU packages</a></li>
-                                       <li><a href="/manual/manual.html">Free 
documentation</a></li>
-                                       <li><a href="http://lists.gnu.org/";>GNU 
mailing lists</a></li>
-                                       <li><a 
href="http://savannah.gnu.org/";>GNU savannah</a></li>
-                                       <li><a 
href="http://libreplanet.org/";>Connect with free software users</a></li>
-                                       <li><a href="/people/">GNU's 
Who?</a></li>
-                                       <li><a 
href="http://planet.gnu.org/";>Planet GNU</a></li>
-                                       <li><a 
href="/contact/gnu-advisory.html">GNU Advisory Committee</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-2">
-                               <p class="netscape4"><a href="#sitemap-3">Skip 
to general items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/licensing";>Software licensing</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/licensing/education";>Licensing education</a></li>
-                                                       <li><a 
href="/licenses">Free software licenses</a>
-                                                               <ul>
-                                                                       <li><a 
href="/licenses/gpl.html">GNU GPL</a></li>
-                                                                       <li><a 
href="/licenses/agpl.html">GNU AGPL</a></li>
-                                                                       <li><a 
href="/licenses/lgpl.html">GNU LGPL</a></li>
-                                                                       <li><a 
href="/licenses/fdl.html">GNU FDL</a></li>
-                                                               </ul>
-                                                       </li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Software licensing FAQ</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Licensing compliance</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">How to use GNU licenses for your own 
software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/resources/service/";>GNU Service Directory</a></li>
-                                       <li><a href="/fun/fun.html">GNU 
Fun</a></li>
-                                       <li><a 
href="/graphics/graphics.html">GNU Art</a></li>
-                                       <li><a href="/music/music.html">Music 
&amp; Songs</a></li>
-                               </ul>
-                       </div>
-               </div>
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-3">
-                               <p class="netscape4"><a href="#sitemap-4">Skip 
to philosophical items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/news/";>Latest News</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/events/";>Upcoming Events</a></li>
-                                                       <li><a 
href="http://www.fsf.org/blogs/";>FSF Blogs</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/volunteer";>Volunteering and internships</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/hw";>Hardware Database</a></li>
-                                       <li><a 
href="http://directory.fsf.org";>Free Software Directory</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/";>Free Software Resources</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/";>Associate Members</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/account/";>My FSF Account</a></li>
-                                       <li class="noright"><a 
href="http://www.fsf.org/about/contact.html";>Contact the FSF</a></li>
-                                       <li><a 
href="http://audio-video.gnu.org/";>GNU Audio/Video</a></li>
-                                       <li><a 
href="/accessibility/accessibility.html">Accessibility Statement</a></li>
-                                       <li><a 
href="http://ftp.gnu.org/gnu/";>GNU FTP Site</a> and <a 
href="/prep/ftp.html">mirrors</a></li>
-                                       <li><a href="/people/speakers.html">GNU 
Speakers</a></li>
-                                       <li><a 
href="http://www.fsf.org/jobs";>Free software jobs</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-4">
-                               <p class="netscape4"><a href="#footer">Skip 
list</a></p>
-                               <ul>
-                                       <li><a 
href="http://donate.fsf.org";>Donate to the FSF</a></li>
-                                       <li><a 
href="http://www.fsf.org/jfb";>Join the FSF</a></li>
-                                       <li><a href="/philosophy/">Free 
software philosophy</a>
-                                               <ul>
-                                                       <li><a 
href="/philosophy/free-sw.html">The Free Software Definition</a></li>
-                                                       <li><a 
href="/philosophy/pragmatic.html">Copyleft: Pragmatic Idealism</a></li>
-                                                       <li><a 
href="/philosophy/free-doc.html">Free Software and Free Manuals</a></li>
-                                                       <li><a 
href="/philosophy/selling.html">Selling Free Software</a></li>
-                                                       <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></li>
-                                                       <li><a 
href="/philosophy/open-source-misses-the-point.html">Why Open Source Misses the 
Point of Free Software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/software/for-windows.html">Free software for Windows</a></li>
-                                       <li><a 
href="http://defectivebydesign.org/";>Defective by Design &mdash; Fight 
DRM</a></li>
-                                       <li><a 
href="http://windows7sins.org/";>Windows 7 Sins</a></li>
-                                       <li><a 
href="http://playogg.org/";>Support free media formats</a></li>
-                               </ul>
-                       </div>
-               </div>
-       </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></small></p>
-               <p><small><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 
<a href="http://donate.fsf.org/";>making a donation</a>.</strong></small></p>
-               <p id="backtotop"><a href="#header">back to top</a></p>
-       </div>
-</div>
+<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>
+
+<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>
 
-<!-- end server/footer-text.html -->
+<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
 
-<div id="footer">
-       <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>
-       <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; 2011 Free Software Foundation, Inc.</p>
-       <p>This page is licensed under a <a rel="license"
+<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>.
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/07/14 22:56:28 $
+<!-- timestamp end -->
 </p>
-       <p>Updated:
-       <!-- timestamp start -->$Date: 2011/07/13 17:28:18 $<!-- timestamp end 
-->
-       </p>
 </div>
-<div id="translations">
-       <h4><a 
href="/server/standards/README.translations.html">Translations</a> of this 
page</h4>
        
-       <!-- Please keep this list alphabetical by language code. Comment what 
the language is for each type, i.e. de is German. Write the language name in 
its own language (Deutsch) in the text. If you add a new language here, please 
advise address@hidden and add it to - 
/home/www/html/server/standards/README.translations.html - one of the lists 
under the section "Translations Underway" - if there is a translation team, you 
also have to add an alias to mail.gnu.org:/com/mailer/aliases Please also check 
you have the language code right; see: 
http://www.loc.gov/standards/iso639-2/php/code_list.php If the 2-letter ISO 
639-1 code is not available, use the 3-letter ISO 639-2. Please use W3C 
normative character entities. See also '(web-trans)Capitalization': 
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
-       <!-- ZCZC START MARK by RMS46 031117 -->
+<div id="translations">
+<h4>Translations of this page</h4>
        
-       <ul class="translations-list">
-               <!-- English -->
-               <li><a 
href="/server/standards/boilerplate.html">English</a>&nbsp;[en]</li>
-       </ul>
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
+<ul class="translations-list">
+<!-- English -->
+<li><a href="/education/edu-software-gcompris.html">English</a>&nbsp;[en]</li>
+</ul>
 </div>
 </div>
 </body>
 </html>
-
-

Index: edu-software-tuxpaint.html
===================================================================
RCS file: /web/www/www/education/edu-software-tuxpaint.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edu-software-tuxpaint.html  13 Jul 2011 17:28:18 -0000      1.4
+++ edu-software-tuxpaint.html  14 Jul 2011 22:56:28 -0000      1.5
@@ -1,103 +1,49 @@
-<!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">
+<!-- Parent-Version: 1.57 -->
 
-<head>
-       <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" />
-       
-       <title>TuxPaint - GNU Project - 
-       Free Software Foundation (FSF)</title>
-       <!-- start of 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>
-<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>
-<div id="null-wrapper">
+<!--#include virtual="/server/header.html" -->
+<title>Tux Paint - GNU Project - Free Software Foundation</title>
 
-<!-- begin of body-include-2 -->
+<!--#include virtual="/server/banner.html" -->
 
-<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 <em>Free Software 
Supporter</em></h4>
-                               <p>A monthly update on GNU and the FSF</p>
-                               <form 
action="http://lists.fsf.org/mailman/subscribe/info-fsf"; method="post">
-                                       <p><input type="text" id="frmEmail" 
name="email" size="15" maxlength="80" value="address@hidden" 
onfocus="this.value=''" /> &nbsp; <input type="submit" 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/philosophy.html">Philosophy</a></li>
-                               <li id="tabLicenses"><a 
href="/licenses/licenses.html">Licenses</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 -->
-       </div><!--  /navigation -->
+<div id="education-content">
+<h2>Tux Paint</h2>
        
-<!-- end of body-include-2 -->
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">Education Contents</a></li>
 
-<div id="content" class="inner">
+<li>
+<a href="/education/edu-cases.html">Case Studies</a></li>
        
-               <!-- end of banner.html -->
+<li class="active">
+<a href="/education/edu-resources.html">Educational Resources</a></li>
                
-<div id="education-content">
+<li>
+<a href="/education/edu-projects.html">Education Projects</a></li>
 
-<h2>TuxPaint</h2>
+<li>
+<a href="/education/edu-faq.html">FAQ</a></li>
 
-<ul id="edu-navigation">
-  <li><a href="/education/edu-contents.html">Education Contents</a></li>
-  <li><a href="/education/edu-cases.html">Case Studies</a></li>
-  <li class="active"><a href="/education/edu-resources.html">Educational 
Resources</a></li>
-  <li><a href="/education/edu-projects.html">Education Projects</a></li>
-  <li><a href="/education/edu-faq.html">FAQ</a></li>
-  <li><a href="/education/edu-team.html">The Team</a></li>
+<li>
+<a href="/education/edu-team.html">The Education Team</a></li>
 </ul>
+<!-- end edu navigation bar -->
+
+</div> <!-- id="edu-content" -->
 
 <p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
 <a href="/education/edu-resources.html">Educational Resources</a> &rarr; 
 <a href="/education/edu-software.html">Educational Free Software</a>&rarr;
-TuxPaint</p>
+Tux Paint</p>
                
 <h3>Description</h3>
 
 <a href=" /education/misc/tuxpaint-start.jpg">
 <img src=" /education/misc/tuxpaint-start-sm.jpg" style="float: right" 
-width="300" height="233" alt="Screenshot of the TuxPaint interface."/></a>
+width="300" height="233" alt="Screenshot of the Tux Paint interface."/></a>
 
-<p>TuxPaint is a cross-platform drawing program created specifically 
+<p>Tux Paint is a cross-platform drawing program created specifically 
 for children. Little kids as young as 3 years old have no difficulty in 
 finding their way around its clear and intuitive interface which 
 features large buttons identified by a label as well as an icon so that
@@ -122,13 +68,13 @@
 how this was done by a group of children from a school in India, thus
 putting into practice the software freedom that the program guarantees.</p> 
 
-<p>TuxPaint is available in more than 80 languages, including minority
+<p>Tux Paint is available in more than 80 languages, including minority
 and right-to-left languages. Such a large number of languages is the
 result of contributions made by users from all over the world.</p>
 
 <p>To learn more: <a href="http://directory.fsf.org/project/TuxPaint/";>
 FSF Directory</a>, <a href="http://tuxpaint.org";>
-TuxPaint Official Website</a></p>                                              
              
+Tux Paint Official Website</a></p>                                             
               
 
 <h3>Who's Using It and How</h3>
 
@@ -136,16 +82,16 @@
 
 <a href="/education/misc/tuxpaint-stamps.jpg">
 <img src="/education/misc/tuxpaint-stamps-sm.jpg" alt="Screenshot of 
-the TuxPaint interface in Malayalam with native flowers."/></a>
+the Tux Paint interface in Malayalam with native flowers."/></a>
 </div>
 
 <p>Comments by <a href="http://tuxpaint.org/comments/";>home users</a>
 and stories from <a href="http://tuxpaint.org/schools/";>schools</a>
-using TuxPaint are presented in the official website. There are reports 
+using Tux Paint are presented in the official website. There are reports 
 that the program is one of the most helpful tools for children to get
 acquainted with basic computer graphic skills while providing a highly
 attractive environment for them. However, the distinctive feature that 
-makes TuxPaint preferable to similar drawing software for kids is
+makes Tux Paint preferable to similar drawing software for kids is
 the fact that it is Free Software, meaning it comes with no restrictions 
 of any sort and the user is granted a series of freedoms. For example, 
 one of the freedoms is that the user is allowed to install the program 
@@ -155,7 +101,7 @@
 <p>Another significant freedom that Free Software guarantees is the 
 freedom to modify the program so as to adapt it to the user's needs and 
 to redistribute copies of the modified version. It is thanks to this
-freedom that TuxPaint is available in so many languages, including
+freedom that Tux Paint is available in so many languages, including
 those spoken by minority groups. In fact, translations into less widely
 spoken languages have been provided by the users themselves. This is so
 because most of the time, companies whose business consists of
@@ -185,7 +131,7 @@
 
 </div> <!-- style -->
 
-<p>A good example of how software freedom can be applied in TuxPaint is
+<p>A good example of how software freedom can be applied in Tux Paint is
 the work done by 11 and 12 years old students from the
 <a href="/education/edu-cases-india-irimpanam.html">VHSS Irimpanam</a>
 school in the State of Kerala, in India. The work consisted in adding a
@@ -194,13 +140,13 @@
 the digital images with the free libre GNU Image Manipulation Program
 <a href= "http://directory.fsf.org/project/gimp/";>GIMP</a>, adding also
 the name of each flower in English and in Malayalam, the local language.
-As TuxPaint has a sound function, students also recorded with their own
+As Tux Paint has a sound function, students also recorded with their own
 voices the name of the flowers in Malayalam, so when one of these 
 flowers is chosen to be stamped onto the canvas, the user will see and 
 hear the name of the flower in Malayalam.</p>
 
 <p>An additional useful activity done by this school by applying the
-freedom to modify the program, was the translation of the TuxPaint
+freedom to modify the program, was the translation of the Tux Paint
 interface into Malayalam, the language spoken in the state of Kerala.</p>
 
 <h3>Why</h3>
@@ -220,7 +166,7 @@
 
 <h3>Results</h3>
 
-<p>Adding stamps to TuxPaint was an exciting and enriching experience
+<p>Adding stamps to Tux Paint was an exciting and enriching experience
 for the students. First, they analyzed how the program works and 
 discovered the mechanism that the program uses for the implementation 
 of stamps. Then they learned how this particular characteristic of the 
@@ -236,152 +182,75 @@
 
 <h4>Credits</h4>
 
-<p>Immages of the TuxPaint interface in Malayalam with native flowers, 
+<p>Images of the Tux Paint interface in Malayalam with native flowers, 
 of the Appooppan Thaady and Anthoorium flowers, as well as both sound
 files are courtesy of the Vocational Higher Secondary School Irimpanam
 and are licensed under CC-BY-SA, 
 <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/";>
 Creative Commons Attribution-ShareAlike 3.0 Unported</a>.</p> 
 
-</div>
-</div>
-
-<!-- begin server/footer-text.html -->
+<!-- If needed, change the copyright block at the bottom. In general,
+     all pages on the GNU web server should have the section about
+     verbatim copying.  Please do NOT remove this without talking
+     with the webmasters first.
+     Please make sure the copyright date is consistent with the document
+     and that it is like this: "2001, 2002", not this: "2001-2002". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
 
-<div class="inner">
-       <div class="yui-g" id="fsf-links">
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-1">
-                               <p class="netscape4"><a href="#footer">Skip 
sitemap</a> or <a href="#sitemap-2">skip to licensing items</a></p>
-                               <ul>
-                                       <li><a href="/gnu/gnu-history.html">GNU 
History</a></li>
-                                       <li><a href="/help/">Get involved</a>
-                                               <ul>
-                                                       <li><a 
href="http://savannah.gnu.org/people/?type_id=1";>Projects that need 
help</a></li>
-                                                       <li><a 
href="/server/standards/translations/priorities.html#Languages">Help translate 
this website</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/server/takeaction.html#unmaint">Take over an unmaintained 
package</a></li>
-                                       <li><a 
href="/server/takeaction.html#gnustep">Use GNUstep</a></li>
-                                       <li><a 
href="/distros/free-distros.html">Download GNU</a></li>
-                                       <li><a 
href="http://directory.fsf.org/GNU/";>GNU packages</a></li>
-                                       <li><a href="/manual/manual.html">Free 
documentation</a></li>
-                                       <li><a href="http://lists.gnu.org/";>GNU 
mailing lists</a></li>
-                                       <li><a 
href="http://savannah.gnu.org/";>GNU savannah</a></li>
-                                       <li><a 
href="http://libreplanet.org/";>Connect with free software users</a></li>
-                                       <li><a href="/people/">GNU's 
Who?</a></li>
-                                       <li><a 
href="http://planet.gnu.org/";>Planet GNU</a></li>
-                                       <li><a 
href="/contact/gnu-advisory.html">GNU Advisory Committee</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-2">
-                               <p class="netscape4"><a href="#sitemap-3">Skip 
to general items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/licensing";>Software licensing</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/licensing/education";>Licensing education</a></li>
-                                                       <li><a 
href="/licenses">Free software licenses</a>
-                                                               <ul>
-                                                                       <li><a 
href="/licenses/gpl.html">GNU GPL</a></li>
-                                                                       <li><a 
href="/licenses/agpl.html">GNU AGPL</a></li>
-                                                                       <li><a 
href="/licenses/lgpl.html">GNU LGPL</a></li>
-                                                                       <li><a 
href="/licenses/fdl.html">GNU FDL</a></li>
-                                                               </ul>
-                                                       </li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Software licensing FAQ</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Licensing compliance</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">How to use GNU licenses for your own 
software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/resources/service/";>GNU Service Directory</a></li>
-                                       <li><a href="/fun/fun.html">GNU 
Fun</a></li>
-                                       <li><a 
href="/graphics/graphics.html">GNU Art</a></li>
-                                       <li><a href="/music/music.html">Music 
&amp; Songs</a></li>
-                               </ul>
-                       </div>
-               </div>
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-3">
-                               <p class="netscape4"><a href="#sitemap-4">Skip 
to philosophical items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/news/";>Latest News</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/events/";>Upcoming Events</a></li>
-                                                       <li><a 
href="http://www.fsf.org/blogs/";>FSF Blogs</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/volunteer";>Volunteering and internships</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/hw";>Hardware Database</a></li>
-                                       <li><a 
href="http://directory.fsf.org";>Free Software Directory</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/";>Free Software Resources</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/";>Associate Members</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/account/";>My FSF Account</a></li>
-                                       <li class="noright"><a 
href="http://www.fsf.org/about/contact.html";>Contact the FSF</a></li>
-                                       <li><a 
href="http://audio-video.gnu.org/";>GNU Audio/Video</a></li>
-                                       <li><a 
href="/accessibility/accessibility.html">Accessibility Statement</a></li>
-                                       <li><a 
href="http://ftp.gnu.org/gnu/";>GNU FTP Site</a> and <a 
href="/prep/ftp.html">mirrors</a></li>
-                                       <li><a href="/people/speakers.html">GNU 
Speakers</a></li>
-                                       <li><a 
href="http://www.fsf.org/jobs";>Free software jobs</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-4">
-                               <p class="netscape4"><a href="#footer">Skip 
list</a></p>
-                               <ul>
-                                       <li><a 
href="http://donate.fsf.org";>Donate to the FSF</a></li>
-                                       <li><a 
href="http://www.fsf.org/jfb";>Join the FSF</a></li>
-                                       <li><a href="/philosophy/">Free 
software philosophy</a>
-                                               <ul>
-                                                       <li><a 
href="/philosophy/free-sw.html">The Free Software Definition</a></li>
-                                                       <li><a 
href="/philosophy/pragmatic.html">Copyleft: Pragmatic Idealism</a></li>
-                                                       <li><a 
href="/philosophy/free-doc.html">Free Software and Free Manuals</a></li>
-                                                       <li><a 
href="/philosophy/selling.html">Selling Free Software</a></li>
-                                                       <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></li>
-                                                       <li><a 
href="/philosophy/open-source-misses-the-point.html">Why Open Source Misses the 
Point of Free Software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/software/for-windows.html">Free software for Windows</a></li>
-                                       <li><a 
href="http://defectivebydesign.org/";>Defective by Design &mdash; Fight 
DRM</a></li>
-                                       <li><a 
href="http://windows7sins.org/";>Windows 7 Sins</a></li>
-                                       <li><a 
href="http://playogg.org/";>Support free media formats</a></li>
-                               </ul>
-                       </div>
-               </div>
-       </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></small></p>
-               <p><small><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 
<a href="http://donate.fsf.org/";>making a donation</a>.</strong></small></p>
-               <p id="backtotop"><a href="#header">back to top</a></p>
-       </div>
-</div>
+<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>
+
+<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>
 
-<!-- end server/footer-text.html -->
+<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
 
-<div id="footer">
-       <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>
-       <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; 2011 Free Software Foundation, Inc.</p>
-       <p>This page is licensed under a <a rel="license"
+<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>.
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/07/14 22:56:28 $
+<!-- timestamp end -->
 </p>
-       <p>Updated:
-       <!-- timestamp start -->$Date: 2011/07/13 17:28:18 $<!-- timestamp end 
-->
-       </p>
 </div>
-<div id="translations">
-       <h4><a 
href="/server/standards/README.translations.html">Translations</a> of this 
page</h4>
        
-       <!-- Please keep this list alphabetical by language code. Comment what 
the language is for each type, i.e. de is German. Write the language name in 
its own language (Deutsch) in the text. If you add a new language here, please 
advise address@hidden and add it to - 
/home/www/html/server/standards/README.translations.html - one of the lists 
under the section "Translations Underway" - if there is a translation team, you 
also have to add an alias to mail.gnu.org:/com/mailer/aliases Please also check 
you have the language code right; see: 
http://www.loc.gov/standards/iso639-2/php/code_list.php If the 2-letter ISO 
639-1 code is not available, use the 3-letter ISO 639-2. Please use W3C 
normative character entities. See also '(web-trans)Capitalization': 
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
-       <!-- ZCZC START MARK by RMS46 031117 -->
+<div id="translations">
+<h4>Translations of this page</h4>
        
-       <ul class="translations-list">
-               <!-- English -->
-               <li><a 
href="/server/standards/boilerplate.html">English</a>&nbsp;[en]</li>
-       </ul>
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
+<ul class="translations-list">
+<!-- English -->
+<li><a href="/education/edu-software-tuxpaint.html">English</a>&nbsp;[en]</li>
+</ul>
 </div>
 </div>
 </body>
 </html>
-

Index: edu-software.html
===================================================================
RCS file: /web/www/www/education/edu-software.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-software.html   13 Jul 2011 17:28:18 -0000      1.2
+++ edu-software.html   14 Jul 2011 22:56:28 -0000      1.3
@@ -1,93 +1,36 @@
-<!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">
-
-<head>
-       <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" />
+<!-- Parent-Version: 1.57 -->
        
+<!--#include virtual="/server/header.html" -->
 <title>Educational Free Software - GNU Project - Free Software 
Foundation</title>
        
- <!-- start of 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>
-<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>
-
-<div id="null-wrapper">
+<!--#include virtual="/server/banner.html" -->
        
-       <!-- begin of 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 <em>Free Software 
Supporter</em></h4>
-                               <p>A monthly update on GNU and the FSF</p>
-                               <form 
action="http://lists.fsf.org/mailman/subscribe/info-fsf"; method="post">
-                                       <p><input type="text" id="frmEmail" 
name="email" size="15" maxlength="80" value="address@hidden" 
onfocus="this.value=''" /> &nbsp; <input type="submit" 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/philosophy.html">Philosophy</a></li>
-                               <li id="tabLicenses"><a 
href="/licenses/licenses.html">Licenses</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 -->
-       </div><!--  /navigation -->
+<div id="education-content">
+<h2>Educational Free Software</h2>
        
-       <!-- end of body-include-2 -->
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">Education Contents</a></li>
        
-<div id="content" class="inner">
+<li>
+<a href="/education/edu-cases.html">Case Studies</a></li>
        
-               <!-- end of banner.html -->
+<li  class="active">
+<a href="/education/edu-resources.html">Educational Resources</a></li>
                
-<div id="education-content">
+<li>
+<a href="/education/edu-projects.html">Education Projects</a></li>
 
-<h2>Educational Free Software</h2>
+<li>
+<a href="/education/edu-faq.html">FAQ</a></li>
 
-<ul id="edu-navigation">
-  <li><a href="/education/edu-contents.html">Education Contents</a></li>
-  <li><a href="/education/edu-cases.html">Case Studies</a></li>
-  <li class="active"><a href="/education/edu-resources.html">Educational 
Resources</a></li>
-  <li><a href="/education/edu-projects.html">Education Projects</a></li>
-  <li><a href="/education/edu-faq.html">FAQ</a></li>
-  <li><a href="/education/edu-team.html">The Team</a></li>
+<li>
+<a href="/education/edu-team.html">The Education Team</a></li>
 </ul>
+<!-- end edu navigation bar -->
 
-</div> <!-- id="edu-navigation" -->
+</div> <!-- id="edu-content" -->
                
 <p class="edu-breadcrumb">
 <a href="/education/education.html">Education</a> &rarr; 
@@ -142,7 +85,7 @@
 <p>
 <a href="/education/edu-software-gcompris.html">GCompris</a> | 
 <a href="/education/edu-software-gimp.html"></a> 
-<a href="/education/edu-software-tuxpaint.html">TuxPaint</a> |
+<a href="/education/edu-software-tuxpaint.html">Tux Paint</a> |
 </p>
 
 <!-- end adding programs -->
@@ -153,147 +96,68 @@
 please let us know by sending an email to 
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</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". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
 
-<!-- begin server/footer-text.html -->
+<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>
 
-<div class="inner">
-       <div class="yui-g" id="fsf-links">
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-1">
-                               <p class="netscape4"><a href="#footer">Skip 
sitemap</a> or <a href="#sitemap-2">skip to licensing items</a></p>
-                               <ul>
-                                       <li><a href="/gnu/gnu-history.html">GNU 
History</a></li>
-                                       <li><a href="/help/">Get involved</a>
-                                               <ul>
-                                                       <li><a 
href="http://savannah.gnu.org/people/?type_id=1";>Projects that need 
help</a></li>
-                                                       <li><a 
href="/server/standards/translations/priorities.html#Languages">Help translate 
this website</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/server/takeaction.html#unmaint">Take over an unmaintained 
package</a></li>
-                                       <li><a 
href="/server/takeaction.html#gnustep">Use GNUstep</a></li>
-                                       <li><a 
href="/distros/free-distros.html">Download GNU</a></li>
-                                       <li><a 
href="http://directory.fsf.org/GNU/";>GNU packages</a></li>
-                                       <li><a href="/manual/manual.html">Free 
documentation</a></li>
-                                       <li><a href="http://lists.gnu.org/";>GNU 
mailing lists</a></li>
-                                       <li><a 
href="http://savannah.gnu.org/";>GNU savannah</a></li>
-                                       <li><a 
href="http://libreplanet.org/";>Connect with free software users</a></li>
-                                       <li><a href="/people/">GNU's 
Who?</a></li>
-                                       <li><a 
href="http://planet.gnu.org/";>Planet GNU</a></li>
-                                       <li><a 
href="/contact/gnu-advisory.html">GNU Advisory Committee</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-2">
-                               <p class="netscape4"><a href="#sitemap-3">Skip 
to general items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/licensing";>Software licensing</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/licensing/education";>Licensing education</a></li>
-                                                       <li><a 
href="/licenses">Free software licenses</a>
-                                                               <ul>
-                                                                       <li><a 
href="/licenses/gpl.html">GNU GPL</a></li>
-                                                                       <li><a 
href="/licenses/agpl.html">GNU AGPL</a></li>
-                                                                       <li><a 
href="/licenses/lgpl.html">GNU LGPL</a></li>
-                                                                       <li><a 
href="/licenses/fdl.html">GNU FDL</a></li>
-                                                               </ul>
-                                                       </li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Software licensing FAQ</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Licensing compliance</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">How to use GNU licenses for your own 
software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/resources/service/";>GNU Service Directory</a></li>
-                                       <li><a href="/fun/fun.html">GNU 
Fun</a></li>
-                                       <li><a 
href="/graphics/graphics.html">GNU Art</a></li>
-                                       <li><a href="/music/music.html">Music 
&amp; Songs</a></li>
-                               </ul>
-                       </div>
-               </div>
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-3">
-                               <p class="netscape4"><a href="#sitemap-4">Skip 
to philosophical items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/news/";>Latest News</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/events/";>Upcoming Events</a></li>
-                                                       <li><a 
href="http://www.fsf.org/blogs/";>FSF Blogs</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/volunteer";>Volunteering and internships</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/hw";>Hardware Database</a></li>
-                                       <li><a 
href="http://directory.fsf.org";>Free Software Directory</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/";>Free Software Resources</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/";>Associate Members</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/account/";>My FSF Account</a></li>
-                                       <li class="noright"><a 
href="http://www.fsf.org/about/contact.html";>Contact the FSF</a></li>
-                                       <li><a 
href="http://audio-video.gnu.org/";>GNU Audio/Video</a></li>
-                                       <li><a 
href="/accessibility/accessibility.html">Accessibility Statement</a></li>
-                                       <li><a 
href="http://ftp.gnu.org/gnu/";>GNU FTP Site</a> and <a 
href="/prep/ftp.html">mirrors</a></li>
-                                       <li><a href="/people/speakers.html">GNU 
Speakers</a></li>
-                                       <li><a 
href="http://www.fsf.org/jobs";>Free software jobs</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-4">
-                               <p class="netscape4"><a href="#footer">Skip 
list</a></p>
-                               <ul>
-                                       <li><a 
href="http://donate.fsf.org";>Donate to the FSF</a></li>
-                                       <li><a 
href="http://www.fsf.org/jfb";>Join the FSF</a></li>
-                                       <li><a href="/philosophy/">Free 
software philosophy</a>
-                                               <ul>
-                                                       <li><a 
href="/philosophy/free-sw.html">The Free Software Definition</a></li>
-                                                       <li><a 
href="/philosophy/pragmatic.html">Copyleft: Pragmatic Idealism</a></li>
-                                                       <li><a 
href="/philosophy/free-doc.html">Free Software and Free Manuals</a></li>
-                                                       <li><a 
href="/philosophy/selling.html">Selling Free Software</a></li>
-                                                       <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></li>
-                                                       <li><a 
href="/philosophy/open-source-misses-the-point.html">Why Open Source Misses the 
Point of Free Software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/software/for-windows.html">Free software for Windows</a></li>
-                                       <li><a 
href="http://defectivebydesign.org/";>Defective by Design &mdash; Fight 
DRM</a></li>
-                                       <li><a 
href="http://windows7sins.org/";>Windows 7 Sins</a></li>
-                                       <li><a 
href="http://playogg.org/";>Support free media formats</a></li>
-                               </ul>
-                       </div>
-               </div>
-       </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></small></p>
-               <p><small><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 
<a href="http://donate.fsf.org/";>making a donation</a>.</strong></small></p>
-               <p id="backtotop"><a href="#header">back to top</a></p>
-       </div>
-</div>
+<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>
 
-<!-- end server/footer-text.html -->
+<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
 
-<div id="footer">
-       <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>
-       <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; 2011 Free Software Foundation, Inc.</p>
-       <p>This page is licensed under a <a rel="license"
+<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>.
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/07/14 22:56:28 $
+<!-- timestamp end -->
 </p>
-       <p>Updated:
-       <!-- timestamp start -->$Date: 2011/07/13 17:28:18 $<!-- timestamp end 
-->
-       </p>
 </div>
-<div id="translations">
-       <h4><a 
href="/server/standards/README.translations.html">Translations</a> of this 
page</h4>
        
-       <!-- Please keep this list alphabetical by language code. Comment what 
the language is for each type, i.e. de is German. Write the language name in 
its own language (Deutsch) in the text. If you add a new language here, please 
advise address@hidden and add it to - 
/home/www/html/server/standards/README.translations.html - one of the lists 
under the section "Translations Underway" - if there is a translation team, you 
also have to add an alias to mail.gnu.org:/com/mailer/aliases Please also check 
you have the language code right; see: 
http://www.loc.gov/standards/iso639-2/php/code_list.php If the 2-letter ISO 
639-1 code is not available, use the 3-letter ISO 639-2. Please use W3C 
normative character entities. See also '(web-trans)Capitalization': 
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
-       <!-- ZCZC START MARK by RMS46 031117 -->
+<div id="translations">
+<h4>Translations of this page</h4>
        
-       <ul class="translations-list">
-               <!-- English -->
-               <li><a 
href="/server/standards/boilerplate.html">English</a>&nbsp;[en]</li>
-       </ul>
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
+<ul class="translations-list">
+<!-- English -->
+<li><a href="/education/edu-software.html">English</a>&nbsp;[en]</li>
+</ul>
+</div>
 </div>
 </body>
 </html>
-
-
-
-

Index: edu-team.html
===================================================================
RCS file: /web/www/www/education/edu-team.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-team.html       13 Jul 2011 17:28:18 -0000      1.2
+++ edu-team.html       14 Jul 2011 22:56:28 -0000      1.3
@@ -1,91 +1,36 @@
-<!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">
-
-<head>
-       <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" />
+<!-- Parent-Version: 1.57 -->
        
+<!--#include virtual="/server/header.html" -->
 <title>The Education Team - GNU Project - Free Software Foundation</title>
        
- <!-- start of 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>
-<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>
-
-<div id="null-wrapper">
-       
-       <!-- begin of body-include-2 -->
+<!--#include virtual="/server/banner.html" -->
 
-       <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 <em>Free Software 
Supporter</em></h4>
-                               <p>A monthly update on GNU and the FSF</p>
-                               <form 
action="http://lists.fsf.org/mailman/subscribe/info-fsf"; method="post">
-                                       <p><input type="text" id="frmEmail" 
name="email" size="15" maxlength="80" value="address@hidden" 
onfocus="this.value=''" /> &nbsp; <input type="submit" 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/philosophy.html">Philosophy</a></li>
-                               <li id="tabLicenses"><a 
href="/licenses/licenses.html">Licenses</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 -->
-       </div><!--  /navigation -->
+<div id="education-content">
+<h2>The Education Team</h2>
        
-       <!-- end of body-include-2 -->
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">Education Contents</a></li>
        
-       <div id="content" class="inner">
+<li>
+<a href="/education/edu-cases.html">Case Studies</a></li>
        
-               <!-- end of banner.html -->
+<li>
+<a href="/education/edu-resources.html">Educational Resources</a></li>
                
-<div id="education-content">
+<li>
+<a href="/education/edu-projects.html">Education Projects</a></li>
                
-<h2>The Education Team</h2>
+<li>
+<a href="/education/edu-faq.html">FAQ</a></li>
                
-<ul id="edu-navigation">
-                       <li><a href="/education/edu-contents.html">Education 
Contents</a></li>
-                       <li><a href="/education/edu-cases.html">Case 
Studies</a></li>
-                       <li><a href="/education/edu-resources.html">Educational 
Resources</a></li>
-                       <li><a href="/education/edu-projects.html">Education 
Projects</a></li>
-                       <li><a href="/education/edu-faq.html">FAQ</a></li>
-                       <li class="active"><a 
href="/education/edu-team.html">The Education Team</a></li>
+<li class="active">
+<a href="/education/edu-team.html">The Education Team</a></li>
 </ul>
+<!-- end edu navigation bar -->
+
+</div> <!-- id="edu-content" -->
 
 <p class="edu-breadcrumb">
 <a href="/education/education.html">Education</a> &rarr; The Education Team</p>
@@ -150,143 +95,67 @@
 implemented Free Software, please drop us a note at 
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</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". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
 
-<!-- begin server/footer-text.html -->
+<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>
 
-<div class="inner">
-       <div class="yui-g" id="fsf-links">
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-1">
-                               <p class="netscape4"><a href="#footer">Skip 
sitemap</a> or <a href="#sitemap-2">skip to licensing items</a></p>
-                               <ul>
-                                       <li><a href="/gnu/gnu-history.html">GNU 
History</a></li>
-                                       <li><a href="/help/">Get involved</a>
-                                               <ul>
-                                                       <li><a 
href="http://savannah.gnu.org/people/?type_id=1";>Projects that need 
help</a></li>
-                                                       <li><a 
href="/server/standards/translations/priorities.html#Languages">Help translate 
this website</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/server/takeaction.html#unmaint">Take over an unmaintained 
package</a></li>
-                                       <li><a 
href="/server/takeaction.html#gnustep">Use GNUstep</a></li>
-                                       <li><a 
href="/distros/free-distros.html">Download GNU</a></li>
-                                       <li><a 
href="http://directory.fsf.org/GNU/";>GNU packages</a></li>
-                                       <li><a href="/manual/manual.html">Free 
documentation</a></li>
-                                       <li><a href="http://lists.gnu.org/";>GNU 
mailing lists</a></li>
-                                       <li><a 
href="http://savannah.gnu.org/";>GNU savannah</a></li>
-                                       <li><a 
href="http://libreplanet.org/";>Connect with free software users</a></li>
-                                       <li><a href="/people/">GNU's 
Who?</a></li>
-                                       <li><a 
href="http://planet.gnu.org/";>Planet GNU</a></li>
-                                       <li><a 
href="/contact/gnu-advisory.html">GNU Advisory Committee</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-2">
-                               <p class="netscape4"><a href="#sitemap-3">Skip 
to general items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/licensing";>Software licensing</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/licensing/education";>Licensing education</a></li>
-                                                       <li><a 
href="/licenses">Free software licenses</a>
-                                                               <ul>
-                                                                       <li><a 
href="/licenses/gpl.html">GNU GPL</a></li>
-                                                                       <li><a 
href="/licenses/agpl.html">GNU AGPL</a></li>
-                                                                       <li><a 
href="/licenses/lgpl.html">GNU LGPL</a></li>
-                                                                       <li><a 
href="/licenses/fdl.html">GNU FDL</a></li>
-                                                               </ul>
-                                                       </li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Software licensing FAQ</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Licensing compliance</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">How to use GNU licenses for your own 
software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/resources/service/";>GNU Service Directory</a></li>
-                                       <li><a href="/fun/fun.html">GNU 
Fun</a></li>
-                                       <li><a 
href="/graphics/graphics.html">GNU Art</a></li>
-                                       <li><a href="/music/music.html">Music 
&amp; Songs</a></li>
-                               </ul>
-                       </div>
-               </div>
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-3">
-                               <p class="netscape4"><a href="#sitemap-4">Skip 
to philosophical items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/news/";>Latest News</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/events/";>Upcoming Events</a></li>
-                                                       <li><a 
href="http://www.fsf.org/blogs/";>FSF Blogs</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/volunteer";>Volunteering and internships</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/hw";>Hardware Database</a></li>
-                                       <li><a 
href="http://directory.fsf.org";>Free Software Directory</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/";>Free Software Resources</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/";>Associate Members</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/account/";>My FSF Account</a></li>
-                                       <li class="noright"><a 
href="http://www.fsf.org/about/contact.html";>Contact the FSF</a></li>
-                                       <li><a 
href="http://audio-video.gnu.org/";>GNU Audio/Video</a></li>
-                                       <li><a 
href="/accessibility/accessibility.html">Accessibility Statement</a></li>
-                                       <li><a 
href="http://ftp.gnu.org/gnu/";>GNU FTP Site</a> and <a 
href="/prep/ftp.html">mirrors</a></li>
-                                       <li><a href="/people/speakers.html">GNU 
Speakers</a></li>
-                                       <li><a 
href="http://www.fsf.org/jobs";>Free software jobs</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-4">
-                               <p class="netscape4"><a href="#footer">Skip 
list</a></p>
-                               <ul>
-                                       <li><a 
href="http://donate.fsf.org";>Donate to the FSF</a></li>
-                                       <li><a 
href="http://www.fsf.org/jfb";>Join the FSF</a></li>
-                                       <li><a href="/philosophy/">Free 
software philosophy</a>
-                                               <ul>
-                                                       <li><a 
href="/philosophy/free-sw.html">The Free Software Definition</a></li>
-                                                       <li><a 
href="/philosophy/pragmatic.html">Copyleft: Pragmatic Idealism</a></li>
-                                                       <li><a 
href="/philosophy/free-doc.html">Free Software and Free Manuals</a></li>
-                                                       <li><a 
href="/philosophy/selling.html">Selling Free Software</a></li>
-                                                       <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></li>
-                                                       <li><a 
href="/philosophy/open-source-misses-the-point.html">Why Open Source Misses the 
Point of Free Software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/software/for-windows.html">Free software for Windows</a></li>
-                                       <li><a 
href="http://defectivebydesign.org/";>Defective by Design &mdash; Fight 
DRM</a></li>
-                                       <li><a 
href="http://windows7sins.org/";>Windows 7 Sins</a></li>
-                                       <li><a 
href="http://playogg.org/";>Support free media formats</a></li>
-                               </ul>
-                       </div>
-               </div>
-       </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></small></p>
-               <p><small><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 
<a href="http://donate.fsf.org/";>making a donation</a>.</strong></small></p>
-               <p id="backtotop"><a href="#header">back to top</a></p>
-       </div>
-</div>
+<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>
 
-<!-- end server/footer-text.html -->
+<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
 
-<div id="footer">
-       <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>
-       <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; 2011 Free Software Foundation, Inc.</p>
-       <p>This page is licensed under a <a rel="license"
+<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>.
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/07/14 22:56:28 $
+<!-- timestamp end -->
 </p>
-       <p>Updated:
-       <!-- timestamp start -->$Date: 2011/07/13 17:28:18 $<!-- timestamp end 
-->
-       </p>
 </div>
-<div id="translations">
-       <h4><a 
href="/server/standards/README.translations.html">Translations</a> of this 
page</h4>
        
-       <!-- Please keep this list alphabetical by language code. Comment what 
the language is for each type, i.e. de is German. Write the language name in 
its own language (Deutsch) in the text. If you add a new language here, please 
advise address@hidden and add it to - 
/home/www/html/server/standards/README.translations.html - one of the lists 
under the section "Translations Underway" - if there is a translation team, you 
also have to add an alias to mail.gnu.org:/com/mailer/aliases Please also check 
you have the language code right; see: 
http://www.loc.gov/standards/iso639-2/php/code_list.php If the 2-letter ISO 
639-1 code is not available, use the 3-letter ISO 639-2. Please use W3C 
normative character entities. See also '(web-trans)Capitalization': 
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
-       <!-- ZCZC START MARK by RMS46 031117 -->
+<div id="translations">
+<h4>Translations of this page</h4>
        
-       <ul class="translations-list">
-               <!-- English -->
-               <li><a 
href="/server/standards/boilerplate.html">English</a>&nbsp;[en]</li>
-       </ul>
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
+<ul class="translations-list">
+<!-- English -->
+<li><a href="/education/edu-team.html">English</a>&nbsp;[en]</li>
+</ul>
 </div>
 </div>
 </body>

Index: edu-why.html
===================================================================
RCS file: /web/www/www/education/edu-why.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- edu-why.html        13 Jul 2011 17:28:18 -0000      1.2
+++ edu-why.html        14 Jul 2011 22:56:28 -0000      1.3
@@ -1,93 +1,36 @@
-<!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">
+<!-- Parent-Version: 1.57 -->
 
-<head>
-       <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" />
-
-<title>Why Educational Institutions Should Use and Teach Free Software - GNU 
Project - Free Software Foundation (FSF)</title>
-
-<meta name="Keywords" content="GNU, GNU Project, FSF, Free Software, Free 
Software Foundation, History" />
-
-<!-- start of 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>
-<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>
-
-<div id="null-wrapper">
+<!--#include virtual="/server/header.html" -->
+<title>Why Educational Institutions Should Use and Teach Free Software - GNU 
Project - Free Software Foundation</title>
        
-<!-- begin of body-include-2 -->
+<!--#include virtual="/server/banner.html" -->
 
-       <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 <em>Free Software 
Supporter</em></h4>
-                               <p>A monthly update on GNU and the FSF</p>
-                               <form 
action="http://lists.fsf.org/mailman/subscribe/info-fsf"; method="post">
-                                       <p><input type="text" id="frmEmail" 
name="email" size="15" maxlength="80" value="address@hidden" 
onfocus="this.value=''" /> &nbsp; <input type="submit" 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/philosophy.html">Philosophy</a></li>
-                               <li id="tabLicenses"><a 
href="/licenses/licenses.html">Licenses</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 -->
-       </div><!--  /navigation -->
+<div id="education-content">
+<h2>Why Educational Institutions Should Use and Teach Free Software</h2>
        
-       <!-- end of body-include-2 -->
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">Education Contents</a></li>
 
-<div id="content" class="inner">
+<li>
+<a href="/education/edu-cases.html">Case Studies</a></li>
   
-<!-- end of banner.html -->
+<li>
+<a href="/education/edu-resources.html">Educational Resources</a></li>
 
-<div id="education-content">
+<li>
+<a href="/education/edu-projects.html">Education Projects</a></li>
 
-<h2>Why Educational Institutions Should Use and Teach Free Software</h2>
+<li>
+<a href="/education/edu-faq.html">FAQ</a></li>
 
-<ul id="edu-navigation">
-                       <li><a href="/education/edu-contents.html">Education 
Contents</a></li>
-                       <li><a href="/education/edu-cases.html">Case 
Studies</a></li>
-                       <li><a href="/education/edu-resources.html">Educational 
Resources</a></li>
-                       <li><a href="/education/edu-projects.html">Education 
Projects</a></li>
-                       <li><a href="/education/edu-faq.html">FAQ</a></li>
-                       <li><a href="/education/edu-team.html">The Education 
Team</a></li>
+<li>
+<a href="/education/edu-team.html">The Education Team</a></li>
 </ul>
+<!-- end edu navigation bar -->
+
+</div> <!-- id="edu-content" -->
 
 <p class="edu-breadcrumb">
 <a href="/education/education.html">Education</a> &rarr; In Depth</p>
@@ -186,143 +129,67 @@
 available for education already. In any case, excellence of performance 
 is a secondary benefit; the ultimate goal is freedom for computer users.
 
-</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". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
 
-<!-- begin server/footer-text.html -->
+<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>
+
+<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>
 
-<div class="inner">
-       <div class="yui-g" id="fsf-links">
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-1">
-                               <p class="netscape4"><a href="#footer">Skip 
sitemap</a> or <a href="#sitemap-2">skip to licensing items</a></p>
-                               <ul>
-                                       <li><a href="/gnu/gnu-history.html">GNU 
History</a></li>
-                                       <li><a href="/help/">Get involved</a>
-                                               <ul>
-                                                       <li><a 
href="http://savannah.gnu.org/people/?type_id=1";>Projects that need 
help</a></li>
-                                                       <li><a 
href="/server/standards/translations/priorities.html#Languages">Help translate 
this website</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/server/takeaction.html#unmaint">Take over an unmaintained 
package</a></li>
-                                       <li><a 
href="/server/takeaction.html#gnustep">Use GNUstep</a></li>
-                                       <li><a 
href="/distros/free-distros.html">Download GNU</a></li>
-                                       <li><a 
href="http://directory.fsf.org/GNU/";>GNU packages</a></li>
-                                       <li><a href="/manual/manual.html">Free 
documentation</a></li>
-                                       <li><a href="http://lists.gnu.org/";>GNU 
mailing lists</a></li>
-                                       <li><a 
href="http://savannah.gnu.org/";>GNU savannah</a></li>
-                                       <li><a 
href="http://libreplanet.org/";>Connect with free software users</a></li>
-                                       <li><a href="/people/">GNU's 
Who?</a></li>
-                                       <li><a 
href="http://planet.gnu.org/";>Planet GNU</a></li>
-                                       <li><a 
href="/contact/gnu-advisory.html">GNU Advisory Committee</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-2">
-                               <p class="netscape4"><a href="#sitemap-3">Skip 
to general items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/licensing";>Software licensing</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/licensing/education";>Licensing education</a></li>
-                                                       <li><a 
href="/licenses">Free software licenses</a>
-                                                               <ul>
-                                                                       <li><a 
href="/licenses/gpl.html">GNU GPL</a></li>
-                                                                       <li><a 
href="/licenses/agpl.html">GNU AGPL</a></li>
-                                                                       <li><a 
href="/licenses/lgpl.html">GNU LGPL</a></li>
-                                                                       <li><a 
href="/licenses/fdl.html">GNU FDL</a></li>
-                                                               </ul>
-                                                       </li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Software licensing FAQ</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">Licensing compliance</a></li>
-                                                       <li><a 
href="/licenses/gpl-faq.html">How to use GNU licenses for your own 
software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/resources/service/";>GNU Service Directory</a></li>
-                                       <li><a href="/fun/fun.html">GNU 
Fun</a></li>
-                                       <li><a 
href="/graphics/graphics.html">GNU Art</a></li>
-                                       <li><a href="/music/music.html">Music 
&amp; Songs</a></li>
-                               </ul>
-                       </div>
-               </div>
-               <div class="yui-g first">
-                       <div class="yui-u first" id="sitemap-3">
-                               <p class="netscape4"><a href="#sitemap-4">Skip 
to philosophical items</a></p>
-                               <ul>
-                                       <li><a 
href="http://www.fsf.org/news/";>Latest News</a>
-                                               <ul>
-                                                       <li><a 
href="http://www.fsf.org/events/";>Upcoming Events</a></li>
-                                                       <li><a 
href="http://www.fsf.org/blogs/";>FSF Blogs</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="http://www.fsf.org/volunteer";>Volunteering and internships</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/hw";>Hardware Database</a></li>
-                                       <li><a 
href="http://directory.fsf.org";>Free Software Directory</a></li>
-                                       <li><a 
href="http://www.fsf.org/resources/";>Free Software Resources</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/";>Associate Members</a></li>
-                                       <li><a 
href="http://www.fsf.org/associate/account/";>My FSF Account</a></li>
-                                       <li class="noright"><a 
href="http://www.fsf.org/about/contact.html";>Contact the FSF</a></li>
-                                       <li><a 
href="http://audio-video.gnu.org/";>GNU Audio/Video</a></li>
-                                       <li><a 
href="/accessibility/accessibility.html">Accessibility Statement</a></li>
-                                       <li><a 
href="http://ftp.gnu.org/gnu/";>GNU FTP Site</a> and <a 
href="/prep/ftp.html">mirrors</a></li>
-                                       <li><a href="/people/speakers.html">GNU 
Speakers</a></li>
-                                       <li><a 
href="http://www.fsf.org/jobs";>Free software jobs</a></li>
-                               </ul>
-                       </div>
-                       <div class="yui-u" id="sitemap-4">
-                               <p class="netscape4"><a href="#footer">Skip 
list</a></p>
-                               <ul>
-                                       <li><a 
href="http://donate.fsf.org";>Donate to the FSF</a></li>
-                                       <li><a 
href="http://www.fsf.org/jfb";>Join the FSF</a></li>
-                                       <li><a href="/philosophy/">Free 
software philosophy</a>
-                                               <ul>
-                                                       <li><a 
href="/philosophy/free-sw.html">The Free Software Definition</a></li>
-                                                       <li><a 
href="/philosophy/pragmatic.html">Copyleft: Pragmatic Idealism</a></li>
-                                                       <li><a 
href="/philosophy/free-doc.html">Free Software and Free Manuals</a></li>
-                                                       <li><a 
href="/philosophy/selling.html">Selling Free Software</a></li>
-                                                       <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></li>
-                                                       <li><a 
href="/philosophy/open-source-misses-the-point.html">Why Open Source Misses the 
Point of Free Software</a></li>
-                                               </ul>
-                                       </li>
-                                       <li><a 
href="/software/for-windows.html">Free software for Windows</a></li>
-                                       <li><a 
href="http://defectivebydesign.org/";>Defective by Design &mdash; Fight 
DRM</a></li>
-                                       <li><a 
href="http://windows7sins.org/";>Windows 7 Sins</a></li>
-                                       <li><a 
href="http://playogg.org/";>Support free media formats</a></li>
-                               </ul>
-                       </div>
-               </div>
-       </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></small></p>
-               <p><small><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 
<a href="http://donate.fsf.org/";>making a donation</a>.</strong></small></p>
-               <p id="backtotop"><a href="#header">back to top</a></p>
-       </div>
-</div>
+<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
 
-<!-- end server/footer-text.html -->
-
-<div id="footer">
-       <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>
-       <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; 2011 Free Software Foundation, Inc.</p>
-       <p>This page is licensed under a <a rel="license"
+<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>.
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2011/07/14 22:56:28 $
+<!-- timestamp end -->
 </p>
-       <p>Updated:
-       <!-- timestamp start -->$Date: 2011/07/13 17:28:18 $<!-- timestamp end 
-->
-       </p>
 </div>
-<div id="translations">
-       <h4><a 
href="/server/standards/README.translations.html">Translations</a> of this 
page</h4>
        
-       <!-- Please keep this list alphabetical by language code. Comment what 
the language is for each type, i.e. de is German. Write the language name in 
its own language (Deutsch) in the text. If you add a new language here, please 
advise address@hidden and add it to - 
/home/www/html/server/standards/README.translations.html - one of the lists 
under the section "Translations Underway" - if there is a translation team, you 
also have to add an alias to mail.gnu.org:/com/mailer/aliases Please also check 
you have the language code right; see: 
http://www.loc.gov/standards/iso639-2/php/code_list.php If the 2-letter ISO 
639-1 code is not available, use the 3-letter ISO 639-2. Please use W3C 
normative character entities. See also '(web-trans)Capitalization': 
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
-       <!-- ZCZC START MARK by RMS46 031117 -->
+<div id="translations">
+<h4>Translations of this page</h4>
        
-       <ul class="translations-list">
-               <!-- English -->
-               <li><a 
href="/server/standards/boilerplate.html">English</a>&nbsp;[en]</li>
-       </ul>
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
+<ul class="translations-list">
+<!-- English -->
+<li><a href="/education/edu-why.html">English</a>&nbsp;[en]</li>
+</ul>
 </div>
 </div>
 </body>



reply via email to

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