CVSROOT: /web/www
Module name: www
Changes by: Pavel Kharitonov <ineiev> 12/01/29 13:12:31
Modified files:
fun/jokes : long-options.html merry-xmas.html
nobody-owns.html
Log message:
Update templates.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/long-options.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/merry-xmas.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/nobody-owns.html?cvsroot=www&r1=1.8&r2=1.9
Patches:
Index: long-options.html
===================================================================
RCS file: /web/www/www/fun/jokes/long-options.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- long-options.html 28 Jan 2011 11:44:14 -0000 1.13
+++ long-options.html 29 Jan 2012 13:12:22 -0000 1.14
@@ -1,9 +1,9 @@
<!--#include virtual="/server/header.html" -->
-
-<title>Long options? - GNU Project - Free Software Foundation (FSF)</title>
-
+<!-- Parent-Version: 1.65 -->
+<title>Long options? - GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/banner.html" -->
-
+<!--#set var="article_name" value="/fun/jokes/long-options" -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
<h2>Long options?</h2>
<p>
From: arons...@lysator.liu.se
@@ -72,59 +72,29 @@
<p>The Free Software Foundation claims no copyright on this joke.</p>
</div>
-</div>
-
-<!--#include virtual="/server/footer-min.html" -->
-
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
<div id="footer">
-<p>
-Please send FSF & GNU inquiries to
-<a href="mailto:g...@gnu.org";><em>g...@gnu.org</em></a>. There are
-also <a href="http://www.fsf.org/about/contact.html";>other ways to
-contact</a> the FSF.
-<br />
-Please send broken links and other corrections (or suggestions) to
-<a href="mailto:webmast...@gnu.org";><em>webmast...@gnu.org</em></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>Please send general FSF & GNU inquiries to
+<a href="mailto:g...@gnu.org";><g...@gnu.org></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:webmast...@gnu.org";><webmast...@gnu.org></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>
Updated:
<!-- timestamp start -->
-$Date: 2011/01/28 11:44:14 $
+$Date: 2012/01/29 13:12:22 $
<!-- timestamp end -->
</p>
</div>
-
-<div id="translations">
-<h4>Translations of this page</h4>
-
- <!-- Please keep this list alphabetical, and in the original -->
- <!-- language if possible, otherwise default to English -->
- <!-- If you do not have it English, please comment what the -->
- <!-- English is. If you add a new language here, please -->
- <!-- advise web-translat...@gnu.org and add it to -->
- <!-- - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
- <!-- - in /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 2 letter language code right versus -->
- <!-- http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
-
-<ul class="translations-list">
-<!-- English -->
-<li><a href="/fun/jokes/long-options.html">English</a> [en]</li>
-<li><a href="/fun/jokes/long-options.ko.html">Korean</a> [ko]</li>
-</ul>
-
-</div>
</div>
</body>
</html>
Index: merry-xmas.html
===================================================================
RCS file: /web/www/www/fun/jokes/merry-xmas.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- merry-xmas.html 29 Apr 2011 11:46:00 -0000 1.6
+++ merry-xmas.html 29 Jan 2012 13:12:23 -0000 1.7
@@ -1,9 +1,10 @@
<!--#include virtual="/server/header.html" -->
-
-<title>Merry Christmas -- GNU OS -- FSF</title>
-
+<!-- Parent-Version: 1.65 -->
+<title>Merry Christmas
+- GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/banner.html" -->
-
+<!--#set var="article_name" value="/fun/jokes/merry-xmas" -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
<h2>Merry Christmas in 4 languages</h2>
<p>
@@ -39,58 +40,29 @@
<p>The Free Software Foundation claims no copyright on this joke.</p>
</div>
-</div>
-
-<!--#include virtual="/server/footer-min.html" -->
-
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
<div id="footer">
-<p>
-Please send FSF & GNU inquiries to
-<a href="mailto:g...@gnu.org";><em>g...@gnu.org</em></a>. There are
-also <a href="http://www.fsf.org/about/contact.html";>other ways to
-contact</a> the FSF.
-<br />
-Please send broken links and other corrections (or suggestions) to
-<a href="mailto:webmast...@gnu.org";><em>webmast...@gnu.org</em></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>Please send general FSF & GNU inquiries to
+<a href="mailto:g...@gnu.org";><g...@gnu.org></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:webmast...@gnu.org";><webmast...@gnu.org></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>
Updated:
<!-- timestamp start -->
-$Date: 2011/04/29 11:46:00 $
+$Date: 2012/01/29 13:12:23 $
<!-- timestamp end -->
</p>
</div>
-
-<div id="translations">
-<h4>Translations of this page</h4>
-
- <!-- Please keep this list alphabetical, and in the original -->
- <!-- language if possible, otherwise default to English -->
- <!-- If you do not have it English, please comment what the -->
- <!-- English is. If you add a new language here, please -->
- <!-- advise web-translat...@gnu.org and add it to -->
- <!-- - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
- <!-- - in /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 2 letter language code right versus -->
- <!-- http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
-
-<ul class="translations-list">
-<!-- English -->
-<li><a href="/fun/jokes/merry-xmas.html">English</a> [en]</li>
-</ul>
-
-</div>
</div>
</body>
</html>
Index: nobody-owns.html
===================================================================
RCS file: /web/www/www/fun/jokes/nobody-owns.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- nobody-owns.html 30 Dec 2011 05:12:02 -0000 1.8
+++ nobody-owns.html 29 Jan 2012 13:12:23 -0000 1.9
@@ -1,35 +1,11 @@
-<!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="fr" lang="fr">
-<head>
-<title>Nobody owns this song - GNU Project - Free Software Foundation
(FSF)</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" href="/gnu.css" type="text/css" />
-<link rev="made" href="mailto:webmast...@gnu.org"; />
-</head>
-<body>
-
-
-
-<h3>Nobody owns this song</h3>
-
-<p>
-<a href="/graphics/gleesons.html"><img src="/graphics/gleeson_head.jpg"
- alt=" [colorful rounded image of the Head of a GNU]"
- width="153" height="128" /></a>
-</p>
-
-<p>
- <a href="#translations">Translations</a> of this page
-</p>
-
-<hr />
-
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.65 -->
+<title>Nobody owns this song - GNU Project - Free Software Foundation</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#set var="article_name" value="/fun/jokes/nobody-owns" -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
+<h2>Nobody owns this song</h2>
<pre>
-<!-- When using this boilerplate, remember to replace the
- "JokeTITLE" in both places above.
- And if it's a song, not a joke, change that word in the Disclaimer.
--->
Nobody owns this song
(Title Subject To Change, Of Course)
@@ -74,87 +50,41 @@
in the GNU Humor Collection.
</p>
-<h4>Disclaimer</h4>
-
-<p>
-Nobody knows from where this song was obtained!
-<br />
-The Free Software Foundation claims no copyrights on this song.
-</p>
-
-<hr />
-
-<!-- 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." -->
-
-<p class="translations">
-<a id="translations"></a>
-<b>Translations of this page:</b><br />
-
-<!-- Please keep this list alphabetical, and in the original -->
-<!-- language if possible, otherwise default to English -->
-<!-- If you do not have it English, please comment what the -->
-<!-- English is. If you add a new language here, please -->
-<!-- advise web-translat...@gnu.org and add it to -->
-<!-- - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
-<!-- - in /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 2 letter language code right versus -->
-<!-- http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
-<!-- Please use xhtml normative character entities, instead of -->
-<!-- non-w3c entities. xhtml should be XML compliant -->
-
-[
- <a href="/fun/jokes/nobody-owns.en.html">English</a>
-| <a href="/fun/jokes/nobody-owns.fr.html">Français</a> <!-- French -->
-]
-</p>
-
-
-<div class="copyright">
-<p>
-Return to the <a href="/home.html">GNU Project home page</a>.
-</p>
+<div class="infobox">
+<h4 id="Disclamer">Disclaimer</h4>
+<p>Nobody knows from where this song was obtained!</p>
+<p>The Free Software Foundation claims no copyrights on this song.</p>
+</div>
-<p>
-Please send FSF & GNU inquiries to
-<a href="mailto:g...@gnu.org";><em>g...@gnu.org</em></a>.
-There are also <a href="/home.html#ContactInfo">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections (or suggestions) to
-<a href="mailto:webmast...@gnu.org";><em>webmast...@gnu.org</em></a>.
-</p>
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:g...@gnu.org";><g...@gnu.org></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:webmast...@gnu.org";><webmast...@gnu.org></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>
-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 © 1999 Free Software Foundation, Inc.</p>
-<p>
-Copyright © 1999 Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-<br />
-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>.
-</p>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<p>
Updated:
<!-- timestamp start -->
-$Date: 2011/12/30 05:12:02 $
+$Date: 2012/01/29 13:12:23 $
<!-- timestamp end -->
</p>
</div>
-
+</div>
</body>
</html>
