www-commits
[Top][All Lists]
Advanced

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

www/fun/jokes merry-xmas.xhtml


From: Joakim Olsson
Subject: www/fun/jokes merry-xmas.xhtml
Date: Sat, 05 Jan 2008 00:51:14 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Joakim Olsson <jocke>   08/01/05 00:51:14

Modified files:
        fun/jokes      : merry-xmas.xhtml 

Log message:
        Templated.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/merry-xmas.xhtml?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: merry-xmas.xhtml
===================================================================
RCS file: /web/www/www/fun/jokes/merry-xmas.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- merry-xmas.xhtml    23 Dec 2007 22:57:02 -0000      1.6
+++ merry-xmas.xhtml    5 Jan 2008 00:51:09 -0000       1.7
@@ -1,38 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!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">
+<!--#include virtual="/server/header.html" -->
 
-<head>
 <title>Merry Christmas -- GNU OS -- FSF</title>
-<meta http-equiv="content-type" content='text/html; charset=utf-8' />
-<link rel="stylesheet" type="text/css" href="/gnu.css" />
-<link rev="made" href="address@hidden" />
-</head>
-
-<body>
-
-<h3>Merry Christmas in 4 languages</h3>
-
-<a href="/graphics/gleesons.html">
-<img src="/graphics/gleeson_head.jpg" 
-alt=" [colorful rounded image of the Head of a GNU] " width="129" height="122" 
/>
-</a>
 
-<p>
-<a href="#translations">Translations</a> of this page
-</p>
-
-<p>
-<hr/>
-</p>
+<!--#include virtual="/server/banner.html" -->
 
-<p>
-The following is in C, Pascal, FORTRAN,
-and PHP.  You might also be interested in <a
-href="/fun/jokes/happy-new-year.cfbC.html">Happy New Year in
-4 languages</a>
-</p>
+<h2>Merry Christmas in 4 languages</h2>
 
 <pre>
 const a = '\''; void b()/*'; var b:string;{
@@ -50,57 +22,26 @@
 </pre>
 
 <p>
-<hr/>
-</p>
-
-<p>
-<a href="/fun/humor.html">Other humor</a> in the GNU Humor Collection.
-</p>
-
-<h4>Disclaimer</h4>
-
-<p>
-The joke on this page was obtained from the FSF's email archives
-of the GNU Project.  The Free Software Foundation claims no
-copyrights on this joke.
-</p>
+<a href="/fun/humor.html">Other humor</a>
+in the GNU Humor Collection.</p>
 
-<p>
-<hr/>
-</p>
+<div class="infobox">
+<h4 id="Disclaimer">Disclaimer</h4><p>The joke on this page was
+obtained from the FSF's <a href="http://lists.gnu.org/";>email
+archives</a> of the GNU Project.</p>
+<p>The Free Software Foundation claims no copyright on this joke.</p>
+</div>
 
-<p style="font-size: 10pt;">
-<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 address@hidden 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 -->
-
-[
-  <a href="/boilerplate.html">English</a>
-]
-</p>
+</div>
 
-<div class="copyright">
-<p>
-Return to the <a href="/home.html">GNU Project home page</a>.
-</p>
+<!--#include virtual="/server/footer-min.html" -->
 
+<div id="footer">
 <p>
 Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-There are also <a href="/home.html#ContactInfo">other ways to contact</a> 
-the FSF.
+<a href="mailto:address@hidden";><em>address@hidden</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:address@hidden";><em>address@hidden</em></a>.
@@ -108,27 +49,41 @@
 
 <p>
 Please see the 
-<a href="/server/standards/README.translations.html">Translations
+<a href="/server/standards/README.translations">Translations
 README</a> for information on coordinating and submitting
 translations of this article.
 </p>
 
 <p>
-Copyright &copy; 2004 Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-<br />
-Verbatim copying and distribution of this entire article is
-permitted worldwide without royalty in any medium provided
-this notice is preserved.
-</p>
-
-<p>
 Updated:
 <!-- timestamp start -->
-$Date: 2007/12/23 22:57:02 $ $Author: karl $
+$Date: 2008/01/05 00:51:09 $
 <!-- 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 address@hidden 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.xhtml">English</a>&nbsp;[en]</li>
+</ul>
+
+</div>
+</div>
 </body>
 </html>




reply via email to

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