CVSROOT: /web/www
Module name: www
Changes by: Dora Scilipoti <dora> 12/01/29 10:17:37
Modified files:
education : edu-resources.html edu-software.html
education.html
Log message:
Replaced old comment about verbatim copy with new one CC-BY-ND.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-resources.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.html?cvsroot=www&r1=1.40&r2=1.41
Patches:
Index: edu-resources.html
===================================================================
RCS file: /web/www/www/education/edu-resources.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- edu-resources.html 20 Sep 2011 08:13:25 -0000 1.5
+++ edu-resources.html 29 Jan 2012 10:17:29 -0000 1.6
@@ -36,6 +36,9 @@
<p class="edu-breadcrumb">
<a href="/education/education.html">Education</a> → Educational
Resources</p>
+<div style="text-align: center; font-size: 110%; width: 300px; float: right;
margin: 12px; background-color: #fcc76f; color: #000000; padding: 1em;">We are
looking for developers of free educational games, or information about free
games that can be used for educational purposes. Contact <a
href="mailto:educat...@gnu.org";><educat...@gnu.org></a></div>
+
+
<h3><a href="/education/edu-software.html">Educational Free Software</a></h3>
<p>In our <a href="/education/edu-software.html">Educational
@@ -109,9 +112,9 @@
</dl>
<!-- If needed, change the copyright block at the bottom. In general,
- all pages on the GNU web server should have the section about
- verbatim copying. Please do NOT remove this without talking
- with the webmasters first.
+ pages on the GNU web server should be under CC BY-ND 3.0 US.
+ Please do NOT change or remove this without talking
+ with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the document
and that it is like this: "2001, 2002", not this: "2001-2002". -->
</div><!-- for id="content", starts in the include above -->
@@ -130,7 +133,7 @@
README</a> for information on coordinating and submitting translations
of this article.</p>
-<p>Copyright © 2011 Free Software Foundation, Inc.</p>
+<p>Copyright © 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
@@ -138,7 +141,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2011/09/20 08:13:25 $
+$Date: 2012/01/29 10:17:29 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software.html
===================================================================
RCS file: /web/www/www/education/edu-software.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- edu-software.html 20 Sep 2011 08:13:25 -0000 1.5
+++ edu-software.html 29 Jan 2012 10:17:29 -0000 1.6
@@ -50,6 +50,8 @@
<h3>What you will find in this section</h3>
+<div style="text-align: center; font-size: 110%; width: 300px; float: right;
margin: 12px; background-color: #fcc76f; color: #000000; padding: 1em;">We are
looking for developers of free educational games, or information about free
games that can be used for educational purposes. Contact <a
href="mailto:educat...@gnu.org";><educat...@gnu.org></a></div>
+
<p>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
@@ -98,9 +100,9 @@
<a href="mailto:educat...@gnu.org";><educat...@gnu.org></a>.</p>
<!-- If needed, change the copyright block at the bottom. In general,
- all pages on the GNU web server should have the section about
- verbatim copying. Please do NOT remove this without talking
- with the webmasters first.
+ pages on the GNU web server should be under CC BY-ND 3.0 US.
+ Please do NOT change or remove this without talking
+ with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the document
and that it is like this: "2001, 2002", not this: "2001-2002". -->
</div><!-- for id="content", starts in the include above -->
@@ -119,7 +121,7 @@
README</a> for information on coordinating and submitting translations
of this article.</p>
-<p>Copyright © 2011 Free Software Foundation, Inc.</p>
+<p>Copyright © 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
@@ -127,7 +129,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2011/09/20 08:13:25 $
+$Date: 2012/01/29 10:17:29 $
<!-- timestamp end -->
</p>
</div>
Index: education.html
===================================================================
RCS file: /web/www/www/education/education.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- education.html 25 Sep 2011 20:21:00 -0000 1.40
+++ education.html 29 Jan 2012 10:17:29 -0000 1.41
@@ -21,8 +21,12 @@
</div> <!-- id="education-content" -->
+<div style="text-align: center; margin-top: 0.5em; margin-bottom: 0.5em;
background-color: #fcc76f; color: #000000; padding: 0.5em;">We are looking for
developers of free educational games, or information about free games that can
be used for educational purposes. Contact <a
href="mailto:educat...@gnu.org";><educat...@gnu.org></a></div>
+
<div class="center">
+
<h3>What Does Free Software Have To Do With Education?</h3>
+
</div>
<p>Software freedom has an especially important role in education.
@@ -110,9 +114,9 @@
</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.
+ pages on the GNU web server should be under CC BY-ND 3.0 US.
+ Please do NOT change or remove this without talking
+ with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the document
and that it is like this: "2001, 2002", not this: "2001-2002". -->
@@ -135,7 +139,7 @@
README</a> for information on coordinating and submitting translations
of this article.</p>
-<p>Copyright © 2011 Free Software Foundation, Inc.</p>
+<p>Copyright © 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
@@ -143,7 +147,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2011/09/25 20:21:00 $
+$Date: 2012/01/29 10:17:29 $
<!-- timestamp end -->
</p>
</div>
