www-commits
[Top][All Lists]
Advanced

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

www/server/staging/ghm2016 education.html layou...


From: Therese Godefroy
Subject: www/server/staging/ghm2016 education.html layou...
Date: Fri, 22 Jul 2016 19:50:45 +0000 (UTC)

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 16/07/22 19:50:45

Modified files:
        server/staging/ghm2016: education.html layout-rsd.css 
                                footer-text.html home-ghm-rsd.html 
Added files:
        server/staging/ghm2016: edu-resources.html edu-software.html 
                                education-menu.html 

Log message:
        Education pages: turn the menu into an include; restyle note about 
games, #backtotop, etc.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/education.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/layout-rsd.css?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/footer-text.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/home-ghm-rsd.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/edu-resources.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/edu-software.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/education-menu.html?cvsroot=www&rev=1.1

Patches:
Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/education.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- education.html      19 Jul 2016 16:56:06 -0000      1.2
+++ education.html      22 Jul 2016 19:50:44 -0000      1.3
@@ -9,13 +9,30 @@
 <!--#include virtual="/education/po/education.translist" -->
 <style type="text/css" media="screen">
 <!--
-#content #video-container {
-   max-width: 40em;
+#video-container, .note-wrapper {
+   width: 40em; max-width: 100%;
    margin: 2em auto;
 }
-#content #video-container p { text-align: justify; }
-#rms-movie { width: 100%; margin-bottom: .3em; }
--->
+#video-container p { text-align: justify; }
+#rms-movie { width: 100%; }
+.note-wrapper p.highlight { border: .1em solid #fc7; }
+
address@hidden (min-width: 48em) {
+  .note-wrapper {
+      float: right;
+      width: 28em; max-width: 45%;
+      margin: 2.3em 0 2em 1.5em;
+   }
+}-->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
+<!--
address@hidden (min-width: 48em) {
+  .note-wrapper {
+      float: left;
+      margin: 2.3em 1.5em 2em 0;
+   }
+}-->
+<!--#endif -->
 </style>
 
 <!--#include virtual="/po/home.translist" -->
@@ -31,20 +48,7 @@
 <!--#include virtual="/server/staging/ghm2016/body-include-2-rsd.html" -->
 <div id="content">
 
-<div id="education-content">           
-
-<!-- begin edu navigation bar -->
-<ul id="edu-navigation">
-  <li><a href="/education/edu-contents.html">CONTENTS</a></li>
-  <li><a href="/education/edu-cases.html">CASE&nbsp;STUDIES</a></li>
-  <li><a href="/education/edu-resources.html">RESOURCES</a></li>
-  <li><a href="/education/edu-projects.html">PROJECTS</a></li>
-  <li><a href="/education/edu-faq.html">FAQ</a></li>
-  <li><a href="/education/edu-team.html">OUR&nbsp;TEAM</a></li>
-</ul>
-<!-- end edu navigation bar -->
-
-</div> <!-- id="education-content" -->
+<!--#include virtual="/server/staging/ghm2016/education-menu.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#if expr="$OUTDATED_SINCE" --><!--#else -->
 <!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -53,15 +57,9 @@
 <!--#endif -->
 <!--#endif -->
 
-<h2>Free Software and Education</h2>
+<h2 class="c">Free Software and Education</h2>
 
-<div class="point italic"><p>
-We are looking for free educational games, or information about free games 
-that can be used for educational purposes. Contact 
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p></div>
-
-<h3 style="clear: both">How Does Free Software Relate to Education?</h3>
+<h3>How Does Free Software Relate to Education?</h3>
 
 <p>Software freedom plays a fundamental role in education. 
 Educational institutions of all levels should use and teach Free 
@@ -135,7 +133,13 @@
 <a href="/education/misc/edu-misc.html#subtitles-rms-education">other 
    languages</a>. 
 </p></div> <!-- /.emph-box -->
-</div> <!-- /#video-container -->
+</div>
+
+<div class="note-wrapper c"><p class="highlight italic">
+We are looking for free educational games, or information about free games 
+that can be used for educational purposes. Contact 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p></div>
 
 <h3>In Depth</h3>
 <ul>
@@ -190,7 +194,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/07/19 16:56:06 $
+$Date: 2016/07/22 19:50:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: layout-rsd.css
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/layout-rsd.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- layout-rsd.css      19 Jul 2016 16:33:15 -0000      1.9
+++ layout-rsd.css      22 Jul 2016 19:50:44 -0000      1.10
@@ -52,7 +52,7 @@
    #d4d4d4  #fsf-links, #searcher
    #e4e4e4  html
    #eee     #edu-navigation, submit
-   #f3f3f3  #translations, #footer, #outdated, .emph-box, .toc,
+   #f5f5f5  #translations, #footer, #outdated, .emph-box, .toc,
             .lyrics, .listing
    white    body, .note
 
@@ -178,7 +178,7 @@
 #searcher, #fsf-links {
    background-color: #d4d4d4;
 }
-#translations, #footer { background-color: #f3f3f3; }
+#translations, #footer { background-color: #f5f5f5; }
 #edu-navigation { background-color: #eee; }
 #navigation { background-color: #a42e2b; }
 
@@ -421,7 +421,6 @@
    padding: .6em 1.2em;
 }
 div.highlight-para, div.emph-box { padding: 1.2em; }
-p.highlight { text-align: justify; }
 
 /* Strip the top and bottom margins to avoid uneven spacing between text and
    border (NetSurf, for instance, leaves the bottom margin of the last element
@@ -437,7 +436,7 @@
    border-bottom: .1em solid #f49943;
 }
 .emph-box, .lyrics {
-   background-color: #f3f3f3;
+   background-color: #f5f5f5;
    border: .1em solid #ddd;
 }
 .lyrics {
@@ -507,7 +506,7 @@
 }
 
 /* For translators notes */
-.translators-notes { font-size: .9em; margin-top: 2em; }
+.translators-notes { clear: left; font-size: .9em; margin-top: 2em; }
 .translators-notes hr { margin-bottom: 1em; }
 .translators-notes ol li { margin: .5em 1.1em 0; }
 
@@ -519,7 +518,7 @@
 .note {
    text-align: center;
    padding: 1em;
-   margin: 1.5em 0;
+   margin: 1.5em auto;
    border: .15em dotted #6092d0;
 }
 .note > *,
@@ -530,11 +529,8 @@
 /** Tables of contents **/
 
 .summary, .toc {
-   display: inline-block;
-   max-width: 94%;
    padding: 1.5em;
-   margin: 0 0 1em;
-   background: #f3f3f3; 
+   background: #f5f5f5; 
 }
 .summary h3, .toc h3 {
    font-size: 1.3em;
@@ -543,7 +539,6 @@
 .summary h4, .toc h4 {
    font-size: 1.1em;
 }
-
 /* Spacing between items is given by the top margin of li. */
 .summary > ul > li, .summary > ol > li
  .toc > ul > li, .toc > ol > li {
@@ -557,14 +552,17 @@
    margin-top: 0;
 }
 
+.toc {
+   width: 45em; max-width: 85%;
+   margin: 2em auto 1.5em;
+}
+.summary {
+   display: inline-block;
+   max-width: 94%;
+   margin: 0 0 1em;
+}
+
 @media (min-width: 48em) {
-   .toc {
-      display: block;
-      max-width: 45em;
-      margin: 2.5em auto 2em;
-   }
-   .toc h3, .toc h4 {
-   }
    .note, .summary {
       clear: right;
       float: right;
@@ -583,29 +581,6 @@
 
 /** Single short paragraph followed by 'clear:both' **/
 
-.point {
-   clear: right; float: right;
-   max-width: 85%;
-   font-size: 1.1em;
-   font-style: italic;
-   padding: .4em .5em .4em 2.3em;
-   margin: 0 0 1.5em;
-}
-.point p { margin: 0; }
-
address@hidden (min-width: 0) {
-   .point p { text-indent: -2.1em; }
-   .point p:before {
-      content: '\25b6\00a0\00a0';
-      font-size: 1.4em;
-      font-style: normal;
-      color: #e74c3c;
-   }
-}
address@hidden (max-width: 30em) {
-   .point { float: none; }
-}
-
 
 /*** IMAGES ***/
 
@@ -687,7 +662,7 @@
    background-color: transparent;
 }
 .listing .even {
-   background-color: #f3f3f3;
+   background-color: #f5f5f5;
 }
 .listing .listingCheckbox {
    text-align: center;
@@ -896,6 +871,8 @@
 
 /*** NAVIGATION BARS ***/
 
+#navigation, #fsf-links { clear: both; }
+
 /* line-height is defined here for NetSurf 1.2.
    No effect in NetSurf 2.9 or Firefox. */
 #navigation ul, #fsf-links ul, ul#edu-navigation {
@@ -951,12 +928,7 @@
 
 /*** CONTENT ***/
 
-/* This gives a 2.5em spacing between the last element
-   and the following div. */
-#content:after {
-   display: block; height: .1em;
-   content: ""; margin-top: 2.4em;
-}
+#content { margin-bottom: 2.5em; }
 
 
 /*** MISSION STATEMENT ***/
@@ -975,11 +947,19 @@
    margin: .3em .5em;
 }
 
-#backtotop { margin: 0 5% 2em; }
+#backtotop {
+   text-align: right;
+   font-weight: bold;
+   margin: 0 5% 2em;
+}
 #backtotop a {
+   text-decoration: none;
    padding: .3em .5em;
-   background-color: #fff5d4;
+   color: white;
+   background-color: #4080d0;
 }
+#backtotop a:hover { color: #ddd; }
+
 
 /*** FOOTER ***/
 

Index: footer-text.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/footer-text.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- footer-text.html    19 Jul 2016 16:43:53 -0000      1.1
+++ footer-text.html    22 Jul 2016 19:50:44 -0000      1.2
@@ -33,6 +33,6 @@
 
 </div>
 
-<p id="backtotop" class="back"><a href="#header">Back to top</a></p>
+<p id="backtotop"><a href="#header">Back to top</a></p>
 
 <!-- end server/footer-text.html -->

Index: home-ghm-rsd.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/home-ghm-rsd.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- home-ghm-rsd.html   19 Jul 2016 17:19:16 -0000      1.6
+++ home-ghm-rsd.html   22 Jul 2016 19:50:44 -0000      1.7
@@ -93,6 +93,7 @@
    -webkit-border-radius: .4em;
    -opera-border-radius: .4em;
 }
+#content #backtotop { margin: 0 5%; }
 .translators-notes { display: none; }
 
 @media (min-width: 62em) {
@@ -342,8 +343,8 @@
 </div>
 
 </div><!-- /second-column -->
+<p id="backtotop"><a href="#header">Back to top</a></p>
 </div><!-- /home -->
-<p id="backtotop" class="back"><a href="#header">Back to top</a></p>
 
 </div><!-- for id="content", starts in the include above -->
 <div id="fs-gang">
@@ -426,7 +427,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/07/19 17:19:16 $
+$Date: 2016/07/22 19:50:44 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-resources.html
===================================================================
RCS file: edu-resources.html
diff -N edu-resources.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ edu-resources.html  22 Jul 2016 19:50:44 -0000      1.1
@@ -0,0 +1,217 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Free Educational Resources
+- GNU Project - Free Software Foundation</title>
+<style type="text/css" media="screen">
+<!--
+.note-wrapper {
+   width: 40em; max-width: 100%;
+   margin: 1.5em auto;
+}
+.note-wrapper p.highlight {
+   padding: .5em 3%;
+   background: #e4ffcc;
+   border: .1em solid #ad9;
+}
address@hidden (min-width: 48em) {
+   #text-left {
+      float: left; width: 55%;
+      margin: 0 3% 0 0;
+   }
+   .note-wrapper { width: auto; margin-top: 1.4em; margin-left: 58%; }
+   }
+}-->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
+<!--
address@hidden (min-width: 48em) {
+   #text-left {
+      float: right;
+      margin: 0 0 0 3%;
+   }
+   .note-wrapper { margin-right: 58%; }
+   }
+}-->
+<!--#endif -->
+</style>
+<!--#include virtual="/education/po/edu-resources.translist" -->
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="stylesheet" href="/combo.css" media="screen" />
+<link rel="stylesheet" href="/mini.css" media="handheld" />
+<link rel="stylesheet" href="layout-rsd.css" media="screen" />
+<link rel="stylesheet" href="/print.min.css" media="print" />
+</head>
+<body>
+<div class="inner">
+<!--#include virtual="/server/staging/ghm2016/body-include-1-rsd.html" -->
+<!--#include virtual="/server/staging/ghm2016/body-include-2-rsd.html" -->
+<div id="content">
+<!--#include virtual="/server/staging/ghm2016/education-menu.html" -->
+<p class="edu-breadcrumb">
+<a href="/education/education.html">Education</a> &rarr; Educational 
Resources</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
+<h2>Free Learning Resources</h2>
+
+<h3>Educational Free Software</h3>
+
+<p id="text-left">In our <a href="/education/edu-software.html">Educational 
+Free Software</a> section we present some examples of how free programs 
+are being used by educational institutions around the world and how they
+are putting into practice the four freedoms that Free Software grants to 
+all users.</p>
+
+<div class="note-wrapper c"><p class="highlight italic">
+We are looking for free educational games, or information about free games 
+that can be used for educational purposes. Contact 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p></div>
+
+<h3>Other Learning Resources</h3>
+
+<p>Free learning resources, like Free Software, is a matter of freedom, 
+not price. It's about bringing the principles of Free Software to 
+general knowledge and educational materials. Knowledge should be usable 
+and accessible to all without restrictions and should not be treated as 
+property. It is not an article of consumer goods that decays over time or 
+wears out with use like a pair of shoes. Knowledge is a naturally abundant 
+resource that improves with usage: the more it is used and passed around, 
+the more it grows for the benefit of all. The introduction of measures 
+designed to favor the ownership of knowledge, tailored to prevent people 
+from accessing, using or sharing knowledge, is a conspiracy to inhibit 
+human progress.</p>
+
+<p>These principles on the freedom of knowledge have always been in the 
+spirit of the GNU Project. In 1999 it formally introduced the concept of a 
+<a href="/encyclopedia/free-encyclopedia.html">Free Universal Encyclopedia 
+and Learning Resource</a>, which was fulfilled by the Wikipedia project.</p>
+
+<p>In these pages we want to list learning resources and projects that
+follow the principles of the GNU Project. Some of them are educational
+institutions who offer courses on the philosophical and technical
+aspects of Free Software.</p>  
+
+<dl>
+
+<dt><a href="http://www.wikipedia.org";>Wikipedia</a></dt>
+
+<dd>Written in collaboration by thousands of volunteers from all over 
+the world, Wikipedia is nowadays the best example of knowledge made 
+available to and usable by anyone without restrictions. Wikipedia readers 
+are allowed to copy, use, and adapt the articles, provided that the source 
+is mentioned and that eventual derivative works are released under the same 
+terms (see <a href="/licenses/copyleft.html">Copyleft</a>).</dd> 
+
+<dt><a href="http://www.gutenberg.org/wiki/Main_Page";>Project
+Gutenberg</a></dt>
+
+<dd>This project offers general knowledge books that are free as in freedom. 
+It publishes plain text digital versions of public-domain works. If you are 
+looking for a copy of a classic book, your search should start here.
+
+<p>They have a very clear explanation about the
+<a href="http://www.gutenberg.org/wiki/Gutenberg:No_Cost_or_Freedom%3f";>
+difference between free as in price and free as in freedom</a> related to 
+printed material.</p>
+</dd>
+
+<dt>GNU Project</dt>
+
+<dd>We maintain a list of <a href="/doc/other-free-books.html">free books</a> 
+mainly related to Free Software documentation, and we make
+<a href="/manual/manual.html">GNU manuals</a> available online. All books 
+published by the
+<a href="http://shop.fsf.org/category/books/";>Free Software Foundation</a> 
+are free as in freedom.</dd>
+
+<dt><a href="http://ftacademy.org/";>Free Technology Academy</a></dt>
+
+<dd>The Free Technology Academy (FTA) is a joint initiative from 
+several educational institutions in various countries. It aims to 
+contribute to a society that permits all users to study, participate and 
+build upon existing knowledge without restrictions. The FTA offers an 
+online master level programme with course modules about Free 
+Technologies. These courses are taught completely online in a virtual 
+campus based on the Campus Project interoperability framework.
+
+<p>The FTA is a collaboration between the Free Knowledge Institute, the 
+Open University of Catalonia (Spain) and the Open University of the 
+Netherlands. A larger group of Associate Partners adds to the founding 
+base with a network of organisations that share a common interest in 
+offering courses in the area of Free Technology. The FTA is extending 
+the current network of partners and collaborations continuously and 
+encourages both individuals and organizations to contribute to the 
+community.</p></dd>
+
+</dl>
+
+</div><!-- for id="content", starts in the include above -->
+
+<!--#include virtual="/server/staging/ghm2016/footer-text.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 2011, 2012 Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2016/07/22 19:50:44 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: edu-software.html
===================================================================
RCS file: edu-software.html
diff -N edu-software.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ edu-software.html   22 Jul 2016 19:50:44 -0000      1.1
@@ -0,0 +1,176 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+
+<title>Educational Free Software
+- GNU Project - Free Software Foundation</title>
+<style type="text/css" media="screen">
+<!--
+.note-wrapper {
+   width: 40em; max-width: 100%;
+   margin: 1.5em auto;
+}
+.note-wrapper p.highlight {
+   margin: 0;
+   background-color: white;
+   border: .2em dotted #e74c3c;
+}
address@hidden (min-width: 48em) {
+  .note-wrapper {
+      float: right;
+      width: 28em; max-width: 45%;
+      margin: .2em 0 2.5em 1.5em;
+   }
+}-->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
+<!--
address@hidden (min-width: 48em) {
+  .note-wrapper {
+      float: left;
+      margin: .3em 1.5em 2em 0;
+   }
+}-->
+<!--#endif -->
+</style>
+<!--#include virtual="/education/po/edu-software.translist" -->
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="stylesheet" href="/combo.css" media="screen" />
+<link rel="stylesheet" href="/mini.css" media="handheld" />
+<link rel="stylesheet" href="layout-rsd.css" media="screen" />
+<link rel="stylesheet" href="/print.min.css" media="print" />
+</head>
+<body>
+<div class="inner">
+<!--#include virtual="/server/staging/ghm2016/body-include-1-rsd.html" -->
+<!--#include virtual="/server/staging/ghm2016/body-include-2-rsd.html" -->
+<div id="content">
+<!--#include virtual="/server/staging/ghm2016/education-menu.html" -->
+<p class="edu-breadcrumb">
+<a href="/education/education.html">Education</a> &rarr; 
+<a href="/education/edu-resources.html">Educational Resources</a> &rarr; 
+Educational Free Software</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
+<h2>Educational Free Software</h2>
+
+<div class="emph-box">
+<p>Before addressing the subject in this section, we would like to 
+remind our readers that the word "Free" in "Free Software" <strong>does 
+not refer to price</strong> but to <strong>liberty</strong>. Free 
+Software is software that grants you <strong>freedom</strong>, namely
+the freedom to run, copy, distribute, study, change and improve the 
+software. To learn more, see the <a href="/philosophy/free-sw.html">
+Free Software definition</a>.</p>
+</div>
+
+<h3>What you will find in this section</h3>
+
+<p style="clear:both">
+These pages do not constitute an exhaustive listing of available 
+educational free programs. Our aim is to present some examples so as to
+illustrate how educational institutions can put into practice and 
+effectively apply the freedoms that Free Software grants them. For each 
+program described, we will show how those freedoms were actually 
+applied. </p> 
+
+<p>The following are the examples that we present:</p>
+
+<!-- begin adding programs in alphabetical order -->
+
+<p>
+<a href="/education/edu-software-gcompris.html">GCompris</a> | 
+<a href="/education/edu-software-gimp.html">GIMP</a> |
+<a href="/education/edu-software-tuxpaint.html">Tux Paint</a> 
+</p>
+
+<!-- end adding programs -->
+
+<p>Some of the programs presented here, like GCompris, are part of the 
+GNU Project. This means that developers of these programs agree to pay 
+attention to making the program work well with the rest of the 
+GNU System. A GNU program uses the latest version of the license that 
+the GNU Project recommends in order to protect the users' fundamental 
+freedoms. A GNU program does not recommend the use of any nonfree 
+program, and it does not refer the user to any nonfree documentation 
+for Free Software, as defined in our campaign for 
+<a href="/philosophy/free-doc.html">free documentation</a>.</p>
+
+<p>You can also check the <a href="/software/free-software-for-education.html">
+list of educational software</a> that we recommend.</p>
+
+<p>People who wish to migrate to Free Software or are looking for a free 
+libre program to accomplish a particular task, should refer to the 
+<a href="http://directory.fsf.org";>Free Software Directory</a>, which 
+consists of a catalog of more than 6,000 free programs that run on 
+<a href="http://gnu.org/distros/free-distros.html";>free operating 
+systems</a>. In particular, the 
+<a href="http://directory.fsf.org/category/educ/";>Education</a> section 
+of the Directory lists programs inherent to different levels of 
+education, from pre-elementary school to highly specialized levels, 
+including university and research.</p>
+
+<div class="note-wrapper c"><p class="highlight italic">
+We are looking for free educational games, or information about free games 
+that can be used for educational purposes. Contact 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p></div>
+
+<p>If you know of a Free Software program that is being used by an 
+educational institution for specific purposes, or has been modified or 
+otherwise adapted by its users to meet their own educational needs, 
+please let us know by sending an email to 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+</div><!-- for id="content", starts in the include above -->
+
+<!--#include virtual="/server/staging/ghm2016/footer-text.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<p>Copyright &copy; 2011, 2012, 2016 Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2016/07/22 19:50:44 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: education-menu.html
===================================================================
RCS file: education-menu.html
diff -N education-menu.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ education-menu.html 22 Jul 2016 19:50:44 -0000      1.1
@@ -0,0 +1,63 @@
+<ul id="edu-navigation">
+<!--#if expr="$REQUEST_URI = /\/edu-contents/" -->
+  <li class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/education/edu-contents.html">CONTENTS</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li><a href="/education/edu-contents.html">CONTENTS</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /\/edu-cases/" -->
+  <li class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/education/edu-cases.html">CASE&nbsp;STUDIES</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li><a href="/education/edu-cases.html">CASE&nbsp;STUDIES</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /\/edu-(resources|software)/" -->
+  <li class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/education/edu-resources.html">RESOURCES</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li><a href="/education/edu-resources.html">RESOURCES</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /\/edu-projects/" -->
+  <li class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/education/edu-projects.html">PROJECTS</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li><a href="/education/edu-projects.html">PROJECTS</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /\/edu-faq/" -->
+  <li class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/education/edu-faq.html">FAQ</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li><a href="/education/edu-faq.html">FAQ</a></li>
+<!--#endif -->
+<!--#if expr="$REQUEST_URI = /\/edu-team/" -->
+  <li class="active">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/education/edu-team.html">OUR&nbsp;TEAM</a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  </li>
+<!--#else -->
+   <li><a href="/education/edu-team.html">OUR&nbsp;TEAM</a></li>
+<!--#endif -->
+</ul>
+



reply via email to

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