www-commits
[Top][All Lists]
Advanced

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

www fun/jokes/eternal-flame.html fun/jokes/filk...


From: Therese Godefroy
Subject: www fun/jokes/eternal-flame.html fun/jokes/filk...
Date: Mon, 12 Jul 2021 12:42:29 -0400 (EDT)

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 21/07/12 12:42:29

Modified files:
        fun/jokes      : eternal-flame.html filks.html gnu-song.html 
                         hackersong.html hackforfreedom.html 
                         hap-bash.html lauper.html nobody-owns.html 
                         only-gnu.html vi.song.html vim-songs.html 
                         welcome-to-gnu-emacs.html wonderful-code.html 
        music          : blues-song.html emacsvsvi.html 
                         free-birthday-song.html free-firmware-song.html 
                         gdb-song.html till_there_was_gnu.html 
                         whole-gnu-world.html 

Log message:
        Add breadcrumb and available info, update to boilerplate 1.96, restyle
        as needed 

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/eternal-flame.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/filks.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/gnu-song.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/hackersong.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/hackforfreedom.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/hap-bash.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/lauper.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/nobody-owns.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/only-gnu.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/vi.song.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/vim-songs.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/welcome-to-gnu-emacs.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/wonderful-code.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/music/blues-song.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/music/emacsvsvi.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/music/free-birthday-song.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/music/free-firmware-song.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/music/gdb-song.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/music/till_there_was_gnu.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/music/whole-gnu-world.html?cvsroot=www&r1=1.2&r2=1.3

Patches:
Index: fun/jokes/eternal-flame.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/eternal-flame.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- fun/jokes/eternal-flame.html        18 Aug 2015 20:29:16 -0000      1.16
+++ fun/jokes/eternal-flame.html        12 Jul 2021 16:42:28 -0000      1.17
@@ -1,124 +1,152 @@
 <!--#include virtual="/server/header.html" -->
-<title>Eternal Flame</title>
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Eternal Flame - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 52em; }
+#content .right-align { margin: 1em 3% 1em 0; }
+@media (min-width: 48em) {
+  .break { display: none; }
+}
+--></style>
 <!--#include virtual="/fun/jokes/po/eternal-flame.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>Eternal Flame (song parody)</h2>
-
-<p>This is a parody of the song &ldquo;God Lives on Terra&rdquo; by
-Julia Ecklar.  For more information about this song, visit
-<a href="http://www.songworm.com/db/songworm-parody/EternalFlame.html";>
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Eternal Flame</h2>
+
+<address class="byline">by Bob Kanefsky and Julia Ecklar</address>
+
+<p>This is a parody of <cite>God Lives on Terra</cite> by Julia&nbsp;Ecklar.
+For more information, visit <a
+href="http://www.songworm.com/db/songworm-parody/EternalFlame.html";>
 Songworm</a>.</p>
 
 <div class="lyrics">
 <p>
-I was taught assembler<br />
+I was taught assembler<br class="break" />
 in my second year of school.<br />
-It's kinda like construction work &mdash;<br />
+It's kinda like construction work<br class="break" />
 with a toothpick for a tool.<br />
-So when I made my senior year,<br />
+So when I made my senior year,<br class="break" />
 I threw my code away,<br />
-And learned the way to program<br />
-that I still prefer today.<br />
+And learned the way to program<br class="break" />
+that I still prefer today.
 </p>
+
 <p>
-Now, some folks on the Internet<br />
+Now, some folks on the Internet<br class="break" />
 put their faith in C++.<br />
-They swear that it's so powerful,<br />
+They swear that it's so powerful,<br class="break" />
 it's what God used for us.<br />
-And maybe it lets mortals dredge<br />
-their objects from the C.<br />
-But I think that explains<br />
-why only God can make a tree.<br />
+And maybe it lets mortals<br class="break" />
+dredge their objects from the C.<br />
+But I think that explains<br class="break" />
+why only God can make a tree.
 </p>
 <p>
-For God wrote in Lisp code<br />
-When he filled the leaves with green.<br />
-The fractal flowers and recursive roots:<br />
-The most lovely hack I've seen.<br />
-And when I ponder snowflakes,<br />
+For God wrote in Lisp code<br class="break" />
+when he filled the leaves with green.<br />
+The fractal flowers and recursive roots:<br class="break" />
+the most lovely hack I've seen.<br />
+And when I ponder snowflakes,<br class="break" />
 never finding two the same,<br />
-I know God likes a language<br />
-with its own four-letter name.<br />
+I know God likes a language<br class="break" />
+with its own four-letter name.
 </p>
 <p>
-Now, I've used a SUN under Unix,<br />
+Now, I've used a SUN under Unix,<br class="break" />
 so I've seen what C can hold.<br />
-I've surfed for Perls, found what Fortran's for,<br />
-Got that Java stuff down cold.<br />
-Though the chance that I'd write COBOL code<br />
+I've surfed for Perls, found what Fortran's for,<br class="break" />
+got that Java stuff down cold.<br />
+Though the chance that I'd write COBOL code<br class="break" />
 is a SNOBOL's chance in Hell.<br />
-And I basically hate hieroglyphs,<br />
-so I won't use APL.<br />
+And I basically hate hieroglyphs,<br class="break" />
+so I won't use APL.
 </p>
 <p>
-Now, God must know all these languages,<br />
+Now, God must know all these languages,<br class="break" />
 and a few I haven't named.<br />
-But the Lord made sure, when each sparrow falls,<br />
+But the Lord made sure, when each sparrow falls,<br class="break" />
 that its flesh will be reclaimed.<br />
-And the Lord could not count grains of sand<br />
+And the Lord could not count grains of sand<br class="break" />
 with a 32-bit word.<br />
-Who knows where we would go to<br />
-if Lisp weren't what he preferred?<br />
+Who knows where we would go to<br class="break" />
+if Lisp weren't what he preferred?
 </p>
 <p>
-And God wrote in Lisp code<br />
-Every creature great and small.<br />
-Don't search the disk drive for man.c,<br />
-When the listing's on the wall.<br />
-And when I watch the lightning burn<br />
-Unbelievers to a crisp,<br />
-I know God had six days to work,<br />
-So he wrote it all in Lisp.<br />
+And God wrote in Lisp code<br class="break" />
+every creature great and small.<br />
+Don't search the disk drive for <code>man.c</code>,<br class="break" />
+when the listing's on the wall.<br />
+And when I watch the lightning<br class="break" />
+burn unbelievers to a crisp,<br />
+I know God had six days to work.<br class="break" />
+So he wrote it all in Lisp.
 </p>
 <p>
-Yes, God had a deadline.<br />
+Yes, God had a deadline.<br class="break" />
 So he wrote it all in Lisp.</p>
 </div>
 
-<p>An <a href="/fun/jokes/eternal-flame.ogg">audio recording of this
-song in Ogg Vorbis</a> format is available.</p>
-
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<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>
-
+<p><cite>Eternal Flame</cite> was performed by Julia Ecklar:</p>
+<p class="button right-align">
+<a href="/fun/jokes/eternal-flame.ogg">Audio recording</a>
+<small>(OGG&nbsp;Vorbis&nbsp;format,&nbsp;5.5MB)</small></p>
 </div>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+<div id="footer" role="contentinfo">
+<div class="unprintable">
 
-<div id="footer">
 <p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&gt;</a>.</p>
 
-<!-- This page is an exception; only the web page copyright year should
-     get updated.  -->
-<p>&ldquo;The Eternal Flame&rdquo; parody lyrics Copyright &copy; 1996 by
-Bob Kanefsky, parodying &ldquo;God Lives on Terra&rdquo; by JuliaEcklar.</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
 
-<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>
+        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:web-translators@gnu.org";>
+        &lt;web-translators@gnu.org&gt;</a>.</p>
+
+        <p>For information on coordinating and contributing 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 contributing translations
+of this article.</p>
+</div>
+
+<p>Copyright &copy; Julia Ecklar 1984 (original song: lyrics and music)<br />
+   Copyright &copy; Bob Kanefsky 1996 (parody)</p>
+
+<p>Non-commercial duplication and redistribution of the audio recording
+of <cite>Eternal Flame</cite>, by Julia Ecklar and Bob Kanefsky, is permitted
+provided the entire recording is preserved, including the entire notice.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/08/18 20:29:16 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/filks.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/filks.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- fun/jokes/filks.html        6 Jul 2020 13:43:09 -0000       1.15
+++ fun/jokes/filks.html        12 Jul 2021 16:42:28 -0000      1.16
@@ -1,23 +1,45 @@
 <!--#include virtual="/server/header.html" -->
-<title>Filks - GNU Project - Free Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Filks - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 40em; }
+.lyrics, dl.lyrics {
+  display: block;
+  width: 32em;
+  margin: 2em auto;
+}
+dl.lyrics { background: white; padding-top: .8em; }
+dl.lyrics dd { font-style: normal; }
+h3 { margin-top: 2em; }
+--></style>
 <!--#include virtual="/fun/jokes/po/filks.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>Filks</h2>
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2 class="c">Filks</h2>
 
 <h3>GNUbaya</h3>
 
-<dl><dt>Original</dt>
+<dl class="compact lyrics"><dt>Original</dt>
 <dd>Kumbaya</dd>
 
 <dt>Filked information</dt>
 <dd>Version: 1.0 Virre Annerg&aring;rd</dd>
 </dl>
 
-<p>I listened to some music as I was waiting for the lift up time for
+<p class="jtf">I listened to some music as I was waiting for the lift up time 
for
 Sweden's first astronaut.  First I filked a Swedish text, then this
 come and GNUbaya is just to much there.</p>
 
-<p>This text was entered using GNU Emacs. No people or animals were
+<p class="jtf">This text was entered using GNU Emacs. No people or animals were
 hurt in making this song and only GNU software was used.</p>
 
 <div class="lyrics">
@@ -49,12 +71,12 @@
 
 <h3>Walk on the Free Side</h3>
 
-<dl><dt>Original</dt>
+<dl class="compact lyrics"><dt>Original</dt>
 <dd>Walk on the Wild Side by Lou Reed</dd>
 <dt>Filk information</dt>
 <dd>Version 1.0 Virre Annerg&aring;rd</dd></dl>
 
-<p>So this one is quite easy to do actually.  Oh and we got space lift
+<p class="jtf">So this one is quite easy to do actually.  Oh and we got space 
lift
 up as I was creating this.</p>
 
 <div class="lyrics">
@@ -120,15 +142,15 @@
 <p><b>[do's]</b></p>
 </div>
 
-<h3>Hackers l&auml;r av historien &mdash; Hackers learn by
+<h3>Hackers l&auml;r av historien <br /> Hackers learn by
 History</h3>
 
-<dl><dt>Orginal</dt>
+<dl class="compact lyrics"><dt>Original</dt>
 <dd>L&auml;r av historien by Knutna N&auml;var</dd>
 <dt>Filk information</dt>
 <dd>Version 0.1 Virre Annerg&aring;rd</dd></dl>
 
-<p>First a Swedish text than followed with a bad translation to
+<p class="jtf">First a Swedish text than followed with a bad translation to
 English.  The original is a really horrible communist text that among
 other things says that Stalin was good.  I do not agree to this, quite
 the opposite.  Some other notes, I'm certanly not good enough to call
@@ -148,7 +170,7 @@
 
 <p>/Virre</p>
 
-<blockquote><p>
+<blockquote><p class="jtf">
 <!-- This is severely broken: No proper punctuation, and as a whole
      doesn't make sense.  A Swedish speaker is welcome to fix it.
      (The English translation has some problems, too.) -->
@@ -202,7 +224,7 @@
 
 <p><b>ref.</b></p>
 
-<p>splitringen var en bra sak<br />
+<p class="jtf">splitringen var en bra sak<br />
 vi rensade bort de som hindrade<br />
 r&ouml;relsens icke-komersiella utveckling<br />
 vi st&aring;r starkare idag en n&aring;gonsin f&ouml;rr<br />
@@ -211,7 +233,7 @@
 <p><b>ref.</b></p>
 </div>
 
-<blockquote><p>1996 a wave of free software propagated the net hackers
+<blockquote><p class="jtf">1996 a wave of free software propagated the net 
hackers
 and others spontaneously struggled for freer software and better
 software licenses that showed the bugs in the freesoftware moment.
 Many in leading positions wanted to tune down the propagande for a
@@ -267,45 +289,53 @@
 fails from freedom</p>
 </div>
 
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<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 class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The filks on this page were obtained from the FSF's email archives of the
+GNU Project. Neither the author nor the Free Software Foundation claim
+copyright on them.</p>
+</div>
 </div>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+<div id="footer" role="contentinfo">
+<div class="unprintable">
 
-<div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to
-<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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:web-translators@gnu.org";>
+        &lt;web-translators@gnu.org&gt;</a>.</p>
+
+        <p>For information on coordinating and contributing 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 contributing translations
+of this article.</p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/07/06 13:43:09 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/gnu-song.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/gnu-song.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- fun/jokes/gnu-song.html     28 Feb 2013 17:09:07 -0000      1.12
+++ fun/jokes/gnu-song.html     12 Jul 2021 16:42:28 -0000      1.13
@@ -1,14 +1,31 @@
 <!--#include virtual="/server/header.html" -->
-<title>The GNU Song - GNU Project - Free Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>The GNU Song - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 52em; }
+--></style>
 <!--#include virtual="/fun/jokes/po/gnu-song.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>The GNU Song</h2>
 
-<div class="lyrics">
-<p>The GNU Song</p>
-<p>(to the tune of &ldquo;At The Drop of a Hat&rdquo;,<br />
-by Michael Flanders and Donald Swann)</p>
+<address class="byline">by David Flynn</address>
+
+<p>A take-off on <a
+href="https://web.archive.org/web/20051027205940/http://www.nyanko.pwp.blueyonder.co.uk/fas/hatintro.html";>
+<cite>The Gnu song</cite></a> by Michael&nbsp;Flanders and
+Donald&nbsp;Swann</p>
 
+<div class="lyrics">
 <p>A year ago last Thursday, I was in a computer shop<br />
 When I met a man who thought he knew the lot<br />
 He was laying down the law about copyrights and licenses<br />
@@ -49,45 +66,53 @@
 G-no, g-no, g-no, I'm a GNU!</p>
 </div>
 
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<h4 id="Disclaimer">Disclaimer</h4>
-<p>The music on this page was provided courtesy of David
-Flynn <a href="mailto:dav@chess.plus.com";>&lt;dav@chess.plus.com&gt;</a>.</p>
-<p>The Free Software Foundation claims no copyrights on this
-music.</p>
-
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The lyrics on this page were submitted to the GNU Project by David
+Flynn in 2004. Neither the author nor the Free Software Foundation claim
+copyright on them.</p>
+</div>
 </div>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+<div id="footer" role="contentinfo">
+<div class="unprintable">
 
-<div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to
-<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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:web-translators@gnu.org";>
+        &lt;web-translators@gnu.org&gt;</a>.</p>
+
+        <p>For information on coordinating and contributing 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 contributing translations
+of this article.</p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 17:09:07 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/hackersong.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/hackersong.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- fun/jokes/hackersong.html   28 Feb 2013 17:09:08 -0000      1.12
+++ fun/jokes/hackersong.html   12 Jul 2021 16:42:28 -0000      1.13
@@ -1,11 +1,28 @@
 <!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>If the Beatles were hackers&hellip; - GNU Project - Free
-  Software Foundation (FSF)</title>
+  Software Foundation</title>
+<style type="text/css" media="screen, print">
+.lyrics { width: 32em; }
+<!--
+h3 small { font-size: .75em; font-weight: normal; }
+--></style>
 <!--#include virtual="/fun/jokes/po/hackersong.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>If the Beatles were hackers&hellip;</h2>
 
-<h3>Eleanor Rigby (with apologies to the Beatles)</h3>
+<h3>Eleanor Rigby <small>(with apologies to the Beatles)</small></h3>
+
 <div class="lyrics">
 <p>Eleanor Rigby<br />
 Sits at the keyboard and waits for a line on the screen<br />
@@ -30,7 +47,8 @@
 Ahhhh&hellip; look at all those lonely users&hellip;</p>
 </div>
 
-<h3>Always a hacker (with apologies to Billy Joel)</h3>
+<h3>Always a Hacker <small>(with apologies to Billy Joel)</small></h3>
+
 <div class="lyrics">
 <p>She can kill all your files<br />
 She can freeze with a frown<br />
@@ -39,51 +57,52 @@
 She lives like a bat but she's always a hacker to me.</p>
 </div>
 
-<h3>Unknown morbid source</h3>
-<div class="lyrics">
-<p>He died at the console of hunger and thirst<br />
-Next day he was buried<br />
-Face down, nine edge first.</p>
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The lyrics on this page were obtained from the FSF's email archives of the
+GNU Project. The Free Software Foundation does not claim copyright on them.</p>
 </div>
-
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<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>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+<div id="footer" role="contentinfo">
+<div class="unprintable">
 
-<div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to
-<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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:web-translators@gnu.org";>
+        &lt;web-translators@gnu.org&gt;</a>.</p>
+
+        <p>For information on coordinating and contributing 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 contributing translations
+of this article.</p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 17:09:08 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/hackforfreedom.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/hackforfreedom.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- fun/jokes/hackforfreedom.html       28 Feb 2013 17:09:09 -0000      1.12
+++ fun/jokes/hackforfreedom.html       12 Jul 2021 16:42:28 -0000      1.13
@@ -1,11 +1,27 @@
 <!--#include virtual="/server/header.html" -->
-<title>Hack For Freedom Song
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Hack For Freedom - Song
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 40em; }
+.lyrics span, .chorus { color: #6b3699; }
+.lyrics .chorus { font-style: normal; }
+--></style>
 <!--#include virtual="/fun/jokes/po/hackforfreedom.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>Hack For Freedom Song</h2>
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Hack For Freedom</h2>
 
-<h3>Hack For Freedom based on Manowar &mdash; Fight for Freedom</h3>
+<p>Sung to the tune of Manowar's <cite>Fight for&nbsp;Freedom</cite>.</p>
 
 <div class="lyrics">
 <p>There's a sound heard across the AI lab<br />
@@ -18,67 +34,75 @@
 Those memories will always live in silence<br />
 And now it's our time to free Unix</p>
 
-<p>[Chorus:]</p>
-<p>Where the hackers play &mdash; I will soon be there<br />
+<p class="chorus">[Chorus:]</p>
+<p><span>Where the hackers play &mdash; I will soon be there<br />
 If you want to &mdash; come along with me my friend<br />
 Share the software and you'll be free<br />
 From the Hurd to Emacs<br />
-We'll hack for freedom again</p>
+We'll hack for freedom again</span></p>
 
 <p>Scream out loud for all the world to hear<br />
 From MIT to the Savannah<br />
 Let freedom ring and every hacker be king<br />
 To live on GNU through the years</p>
 
-<p>[Repeat chorus]</p>
+<p class="chorus">[Repeat chorus]</p>
 
 <p>Now's the time we all must stand together<br />
 So raise your keyboard show them we are strong<br />
 Side by side the hacking goes on forever<br />
 Marching to the battle with our code</p>
 
-<p>[Repeat chorus to fade]</p>
+<p class="chorus">[Repeat chorus to fade]</p>
 </div>
 
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<h4>Disclaimer</h4>
-<p>The song on this page was submitted by <b>Giuseppe
-Scrivano</b>.</p>
-<p>The Free Software Foundation does not claim copyright for this
-song.</p>
-
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The lyrics on this page were submitted to the GNU Project by Giuseppe
+Scrivano in 2006. Neither the author nor the Free Software Foundation claim
+copyright on them.</p>
+</div>
 </div>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+<div id="footer" role="contentinfo">
+<div class="unprintable">
 
-<div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to
-<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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:web-translators@gnu.org";>
+        &lt;web-translators@gnu.org&gt;</a>.</p>
+
+        <p>For information on coordinating and contributing 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 contributing translations
+of this article.</p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 17:09:09 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/hap-bash.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/hap-bash.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- fun/jokes/hap-bash.html     28 Feb 2013 17:09:10 -0000      1.12
+++ fun/jokes/hap-bash.html     12 Jul 2021 16:42:28 -0000      1.13
@@ -1,9 +1,25 @@
 <!--#include virtual="/server/header.html" -->
-<title>Happiness is a bash prompt - GNU Project - Free Software
-Foundation (FSF)</title>
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Happiness is a Bash Prompt - GNU Project - Free Software
+Foundation</title>
 <!--#include virtual="/fun/jokes/po/hap-bash.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>Happiness is a bash prompt</h2>
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Happiness is a Bash Prompt</h2>
+
+<address class="byline">by Janos Barbero</address>
+
+<p>Based on the Beatles' song <cite>Happiness is
+a&nbsp;Warm&nbsp;Gun</cite></p>
 
 <!-- The first verse may be interpreted as some reasons why to use
 Vim. "Walk this way", in the first line, could be "use Vim", for
@@ -17,9 +33,6 @@
 mean something like "look for useful and beautiful tools" and "Just
 beware of the thorns" "It may not be so easy in the begining".  -->
 
-<h3>Happiness is a bash prompt &mdash; Based on the Beatles' song
-&ldquo;Happiness is a Warm Gun&rdquo;</h3>
-
 <div class="lyrics">
 <p>It's not a prompt that misses much<br />
 Do do do do do do- oh yea!<br />
@@ -54,44 +67,53 @@
 Well don't ya know that happiness is a bash prompt, mama?</p>
 </div>
 
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<h4 id="Disclaimer">Disclaimer</h4>
-<p>The song on this page were submitted by Janos Barbero.</p>
-<p>The Free Software Foundation claims no copyrights on this joke.</p>
-
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The lyrics on this page were submitted to the GNU Project by Janos
+Barbero in 2005. Neither the author nor the Free Software Foundation claim
+copyright on them.</p>
+</div>
 </div>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+<div id="footer" role="contentinfo">
+<div class="unprintable">
 
-<div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to
-<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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:web-translators@gnu.org";>
+        &lt;web-translators@gnu.org&gt;</a>.</p>
+
+        <p>For information on coordinating and contributing 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 contributing translations
+of this article.</p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 17:09:10 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>
-

Index: fun/jokes/lauper.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/lauper.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- fun/jokes/lauper.html       9 Nov 2020 19:13:53 -0000       1.1
+++ fun/jokes/lauper.html       12 Jul 2021 16:42:28 -0000      1.2
@@ -1,26 +1,43 @@
 <!--#include virtual="/server/header.html" -->
-<title>GNUS JUST WANNA HAVE FUN - GNU Project - Free Software Foundation 
(FSF)</title>
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>GNUs Just Wanna Have Fun - GNU Project - Free Software 
Foundation</title>
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 40em; }
+.chorus { color: #6b3699; }
+--></style>
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>GNUS JUST WANNA HAVE FUN</h2>
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>GNUs Just Wanna Have Fun</h2>
 
-<blockquote>
-<p>This is to the tune of Cyndi Lauper's
-"<cite>Girls Just Wanna Have Fun</cite>":</p>
+<address class="byline">by Paul Hardy</address>
 
-<div class="lyrics" style="max-width: max-content;">
+<p>Sung to the tune of Cyndi&nbsp;Lauper's
+<cite>Girls Just Wanna Have&nbsp;Fun</cite></p>
+
+<div class="lyrics">
   <p>
   Updates done past the morning light<br/>
-  My mother says, "When you gonna live your life right?"<br/>
+  My mother says, &ldquo;When you gonna live your life right?&rdquo;<br/>
   Oh mother dear, we had a late test run<br/>
   And GNUs, they wanna have fun<br/>
   Oh GNUs just wanna have fun!
   </p>
   <p>
   Co-maintainers call in the dead of night<br/>
-  My father yells, "What you gonna do with your life?"<br/>
+  My father yells, &ldquo;What you gonna do with your life?&rdquo;<br/>
   Oh dad, this bug fix is a critical one<br/>
   And GNUs, they wanna have fun<br/>
-  Oh GNUs just wanna have…
+  Oh GNUs just wanna have&hellip;
   </p>
   <p>
   That's all they really want<br/>
@@ -29,15 +46,15 @@
   Oh GNUs, they wanna have fun<br/>
   Oh GNUs just wanna have fun!
   </p>
-  <p style="color:#7a49a5;">
-  (GNUs, they want, wanna have fun, GNUs wanna have…)
+  <p class="chorus">
+  (GNUs, they want, wanna have fun, GNUs wanna have&hellip;)
   </p>
   <p>
   Some GNUs take code that's a beautiful hack<br/>
   And make it even better, then give it right back<br/>
   'Cause sharing our code is how we've all won<br/>
   And GNUs, they wanna have fun<br/>
-  Oh GNUs just wanna have…
+  Oh GNUs just wanna have&hellip;
   </p>
   <p>
   That’s all they really want<br/>
@@ -46,8 +63,8 @@
   Oh GNUs, they wanna have fun<br/>
   Oh GNUs just wanna have fun!
   </p>
-  <p style="color:#7a49a5;">
-  (GNUs they want, wanna have fun, GNUs wanna have…)
+  <p class="chorus">
+  (GNUs they want, wanna have fun, GNUs wanna have&hellip;)
   </p>
   <p>
   They just wanna<br/>
@@ -60,56 +77,63 @@
   <p>
   When the ho-hum<br/>
   When the ho-hum day is done, oh<br/>
-  GNUs…
+  GNUs&hellip;
   </p>
   <p>
   GNUs just wanna have fun!
   </p>
 </div>
 
-<p>&mdash;<br />
-Submitted by <i>Paul Hardy</i>.</p>
-</blockquote>
-
-<p>This joke is also available in <a href="/fun/jokes/lauper.txt">plain
-text</a>.</p>
-
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<h4 id="Disclaimer">Disclaimer</h4>
-<p>The Free Software Foundation claims no copyright on this joke.</p>
+<p class="button right-align"><a href="/fun/jokes/lauper.txt">Plain
+text version</a></p>
 
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The lyrics on this page were submitted to the GNU Project by Paul
+Hardy in 2020. Neither the author nor the Free Software Foundation claim
+copyright on them.</p>
+</div>
 </div>
 
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+<div id="footer" role="contentinfo">
+<div class="unprintable">
 
-<div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to
-<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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:web-translators@gnu.org";>
+        &lt;web-translators@gnu.org&gt;</a>.</p>
+
+        <p>For information on coordinating and contributing 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 contributing translations
+of this article.</p>
+</div>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
-<p>Updated:
+<p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/11/09 19:13:53 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/nobody-owns.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/nobody-owns.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- fun/jokes/nobody-owns.html  21 Aug 2015 01:34:54 -0000      1.17
+++ fun/jokes/nobody-owns.html  12 Jul 2021 16:42:28 -0000      1.18
@@ -1,63 +1,87 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Nobody owns this song - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen"><!--
+.lyrics { display: inline-block; }
+.chorus { color: #6b3699; }
+-->
+.reduced-width { width: 40em; }
+@media (min-width: 25em) {
+  .lyrics { display: block; box-sizing: border-box;
+            width: 28em; max-width: 100%; }
+  .s1  { padding-left:  3%; }
+  .s2  { padding-left:  6%; }
+  .s3  { padding-left:  9%; }
+  .s4  { padding-left: 12%; }
+  .s5  { padding-left: 15%; }
+  .s6  { padding-left: 18%; }
+  .s7  { padding-left: 21%; }
+  .s8  { padding-left: 24%; }
+  .s9  { padding-left: 27%; }
+  .s10 { padding-left: 30%; }
+  .s11 { padding-left: 33%; }
+}
+</style>
 <!--#include virtual="/fun/jokes/po/nobody-owns.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>Nobody owns this song</h2>
-<pre>
-Nobody owns this song
-
-(Title Subject To Change, Of Course)
-------------------------------------
-
-
-This song, it has no author
-No place of origin;
-This song, it has no ending,
-And it never did begin;
-This song can travel anywhere;
-There's no place it don't belong . . .
-'Cause nobody owns this song.
-
-Melodies can be added
-In major or minor keys.
-All parts can be rearranged
-In any ways you please.
-Many things can be done to this,
-And none of them are wrong,
-'Cause nobody owns this song.
-
-You can play it on the lute,
-You can play it on the flute,
-You can play it on the slide trombone.
-You can play it on the harp,
-You can play it flat or sharp,
-You can play it on the saxophone.
-You can play it real high or
-You can play it real low,
-You can play it real fast or
-You can play it real slow,
-You can play it real short or
-You can play it real long,
-'Cause nobody owns this song.
-</pre>
-
-<hr />
 
+<div class="lyrics">
+<p class="chorus">
+(Title Subject To Change, Of Course)</p>
 <p>
-<a href="/fun/humor.html">Other humor</a>
-in the GNU Humor Collection.
-</p>
+This song, it has no author<br />
+<span class="s1">No place of origin;</span><br />
+<span class="s2">This song, it has no ending,</span><br />
+<span class="s3">And it never did begin;</span><br />
+<span class="s4">This song can travel anywhere;</span><br />
+<span class="s5">There's no place it don't 
belong&nbsp;.&nbsp;.&nbsp;.</span><br />
+<span class="chorus">'Cause nobody owns this song.</span></p>
+<p>
+Melodies can be added<br />
+<span class="s1">In major or minor keys.</span><br />
+<span class="s2">All parts can be rearranged</span><br />
+<span class="s3">In any ways you please.</span><br />
+<span class="s4">Many things can be done to this,</span><br />
+<span class="s5">And none of them are wrong,</span><br />
+<span class="chorus">'Cause nobody owns this song.</span></p>
+<p>
+You can play it on the lute,<br />
+<span class="s1">You can play it on the flute,</span><br />
+<span class="s2">You can play it on the slide trombone.</span><br />
+<span class="s3">You can play it on the harp,</span><br />
+<span class="s4">You can play it flat or sharp,</span><br />
+<span class="s5">You can play it on the saxophone.</span><br />
+<span class="s6">You can play it real high or</span><br />
+<span class="s7">You can play it real low,</span><br />
+<span class="s8">You can play it real fast or</span><br />
+<span class="s9">You can play it real slow,</span><br />
+<span class="s10">You can play it real short or</span><br />
+<span class="s11">You can play it real long,</span><br />
+<span class="chorus">'Cause nobody owns this song.</span></p>
+</div>
 
-<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 class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The lyrics on this page were obtained from the FSF's email archives of the
+GNU Project. The Free Software Foundation does not claim copyright on them.</p>
+</div>
 </div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -75,13 +99,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -89,10 +113,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/08/21 01:34:54 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/only-gnu.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/only-gnu.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fun/jokes/only-gnu.html     12 Aug 2014 05:04:09 -0000      1.5
+++ fun/jokes/only-gnu.html     12 Jul 2021 16:42:28 -0000      1.6
@@ -1,49 +1,60 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
-<title>Only G.N.U. - GNU Project - Free Software Foundation</title>
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Only GNU - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 37em; }
+--></style>
 <!--#include virtual="/server/gnun/initial-translations-list.html" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>Only G.N.U. (And G.N.U. Alone)</h2>
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Only GNU (And GNU Alone)</h2>
 
-<div class="lyrics">
-<p>(With apologies to The Platters, Buck Ram and Andre Rand)</p>
+<address class="byline">by Marco Chieppa</address>
+
+<p>With apologies to Buck&nbsp;Ram (a.k.a Ande&nbsp;Rand) and
+The&nbsp;Platters</p>
 
+<div class="lyrics">
 <p>
-Only G.N.U. can make this world seem free<br />
-Only G.N.U. can make the BASH a referee<br />
-Only G.N.U. and G.N.U. alone<br />
+Only GNU can make this world seem free<br />
+Only GNU can make the BASH a referee<br />
+Only GNU and GNU alone<br />
 Can thrill me like you do<br />
 And fill my ram with scripts for only you<br />
 </p>
 
 <p>
-Only G.N.U. can make this change in me<br />
+Only GNU can make this change in me<br />
 For it's true, you are my OS<br />
 When you hold off MS<br />
 I understand the source code that you do<br />
 You're my dream come true<br />
-My one and only G.N.U.
+My one and only GNU.
 </p>
 
 <p>
-Only G.N.U. can make this change in me<br />
+Only GNU can make this change in me<br />
 For it's true, you are my destiny<br />
 When you flip on my brain<br />
 I understand the computing that you do<br />
 You're my system come free<br />
-My one and only G.N.U.
+My one and only GNU.
 </p>
 </div>
 
-<div class="infobox">
-<h4 id="License">License</h4><p>This poem was sent to us by Marco
-Chieppa.  It is available under the <a href="/licenses/fdl.html">GNU
-FDL 1.2 or later</a>.</p>
-</div>
-
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -61,24 +72,30 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
+<p>Copyright &copy; 2008 Marco Chieppa (the lyrics)</p>
+
+<p>The lyrics on this page are licensed under the <a
+rel="license" href="/licenses/fdl.html">GNU Free Documentation License</a>,
+version&nbsp;1.2 or later.</p>
+
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/08/12 05:04:09 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/vi.song.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/vi.song.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- fun/jokes/vi.song.html      4 Jun 2020 09:22:29 -0000       1.11
+++ fun/jokes/vi.song.html      12 Jul 2021 16:42:28 -0000      1.12
@@ -1,130 +1,132 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML>
-<HEAD>
-<TITLE>Addicted to vi - GNU Project - Free Software Foundation (FSF)</TITLE>
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<LINK REV="made" HREF="mailto:webmasters@gnu.org";>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#1F00FF" ALINK="#FF0000" 
VLINK="#9900DD">
-
-<H3>Addicted to <CODE>vi</CODE></H3>
-
-<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>
-
-<HR>
-       
-<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.
--->
-As you sing this, it may help the effect to imagine a dozen women, all of
-whom resemble Bill Joy, dressed in black and dancing sinuously.
-
-Addicted To vi
-(with apologies to Robert Palmer)
-
-You press the keys with no effect,
-Your mode is not correct.
-The screen blurs, your fingers shake;
-You forgot to press escape.
-Can't insert, can't delete,
-Cursor keys won't repeat.
-You try to quit, but can't leave,
-An extra "bang" is all you need.
-
-You think it's neat to type an "a" or an "i"--
-Oh yeah?
-You won't look at emacs, no you'd just rather die
-You know you're gonna have to face it;
-You're addicted to vi!
-
-You edit files one at a time;
-That doesn't seem too out of line?
-You don't think of keys to bind--
-A meta key would blow your mind.
-H, J, K, L?  You're not annoyed?
-Expressions must be a Joy!
-Just press "f", or is it "t"?
-Maybe "n", or just "g"?
-
-Oh--You think it's neat to type an "a" or an "i"--
-Oh yeah?
-You won't look at emacs, no you'd just rather die
-You know you're gonna have to face it;
-You're addicted to vi!
-
-Might as well face it,
-You're addicted to vi!
-
-You press the keys without effect,
-Your life is now a wreck.
-What a waste!  Such a shame!
-And all you have is vi to blame.
-
-Oh--You think it's neat to type an "a" or an "i"--
-Oh yeah?
-You won't look at emacs, no you'd just rather die
-You know you're gonna have to face it;
-You're addicted to vi!
-
-Might as well face it,
-You're addicted to vi!
-
-Copyright 1989, by Chuck Musciano.  All Rights Reserved
-
-</PRE>
-
-<HR>
-
-<P>
-<A HREF="/fun/humor.html">Other humor</A>
-in the GNU Humor Collection.
-
-
-<H4>Disclaimer</H4>
-
-The song on this page was obtained from the FSF's email archives
-of the GNU Project.
-<BR>
-The Free Software Foundation claims no copyrights on this song.
-
-<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.
--->
-<HR>
-
-<P>
-Return to <A HREF="/home.html">GNU's home page</A>.
-<P>
-
-Please send FSF &amp; GNU inquiries &amp; questions to 
-
-<A HREF="mailto:gnu@gnu.org";><EM>gnu@gnu.org</EM></A>.
-There are also <A HREF="/home.html#ContactInfo">other ways to
-contact</A> the FSF.
-<P>
-
-Please send comments on these web pages to
-
-<A HREF="mailto:webmasters@gnu.org";><EM>webmasters@gnu.org</EM></A>,
-send other questions to
-<A HREF="mailto:gnu@gnu.org";><EM>gnu@gnu.org</EM></A>.
-
-
-<P>
-<A href="http://www.fsf.org/about/dmca-notice";>Copyright Infringement 
Notification</A>
-
-<P>
-Updated:
-<!-- hhmts start -->
-$Date: 2020/06/04 09:22:29 $
-<!-- hhmts end -->
-<HR>
-</BODY>
-</HTML>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Addicted to vi - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 40em; }
+.chorus { color: #6b3699; }
+--></style>
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
+<!--#include virtual="/server/banner.html" -->
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Addicted to <code>vi</code></h2>
+
+<address class="byline">by Chuck Musciano</address>
+
+<p>Sung to the tune of <cite>Addicted To Love</cite> by Robert&nbsp;Palmer</p>
+
+<p>As you sing this, it may help the effect to imagine a dozen women, all of
+whom resemble Bill Joy, dressed in black and dancing sinuously.</p>
+
+<div class="lyrics c">
+<p>
+You press the keys with no effect,<br />
+Your mode is not correct.<br />
+The screen blurs, your fingers shake;<br />
+You forgot to press escape.<br />
+Can't insert, can't delete,<br />
+Cursor keys won't repeat.<br />
+You try to quit, but can't leave,<br />
+An extra &ldquo;bang&rdquo; is all you need.</p>
+<p class="chorus">
+You think it's neat to type an &ldquo;a&rdquo; or an &ldquo;i&rdquo;&mdash;<br 
/>
+Oh yeah?<br />
+You won't look at emacs, no you'd just rather die<br />
+You know you're gonna have to face it;<br />
+You're addicted to <code>vi</code>!</p>
+<p>
+You edit files one at a time;<br />
+That doesn't seem too out of line?<br />
+You don't think of keys to bind&mdash;<br />
+A meta key would blow your mind.<br />
+H, J, K, L?  You're not annoyed?<br />
+Expressions must be a Joy!<br />
+Just press &ldquo;f&rdquo;, or is it &ldquo;t&rdquo;?<br />
+Maybe &ldquo;n&rdquo;, or just &ldquo;g&rdquo;?</p>
+<p class="chorus">
+Oh&mdash;You think it's neat to type an &ldquo;a&rdquo; or an 
&ldquo;i&rdquo;&mdash;<br />
+Oh yeah?<br />
+You won't look at emacs, no you'd just rather die<br />
+You know you're gonna have to face it;<br />
+You're addicted to <code>vi</code>!</p>
+<p class="chorus">
+Might as well face it,<br />
+You're addicted to <code>vi</code>!</p>
+<p>
+You press the keys without effect,<br />
+Your life is now a wreck.<br />
+What a waste!  Such a shame!<br />
+And all you have is <code>vi</code> to blame.</p>
+<p class="chorus">
+Oh&mdash;You think it's neat to type an &ldquo;a&rdquo; or an 
&ldquo;i&rdquo;&mdash;<br />
+Oh yeah?<br />
+You won't look at emacs, no you'd just rather die<br />
+You know you're gonna have to face it;<br />
+You're addicted to <code>vi</code>!</p>
+<p class="chorus">
+Might as well face it,<br />
+You're addicted to <code>vi</code>!</p>
+</div>
+
+<p class="button right-align"><a href="/fun/jokes/vi.song.txt">Plain
+text version</a></p>
+
+<div class="infobox">
+<hr />
+<p>Source:&nbsp; <a 
+href="https://www.netfunny.com/rhf/jokes/89q2/dictvi.441.html";>
+rec.humor.funny</a> (1989)</p>
+</div>
+</div>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer" role="contentinfo">
+<div class="unprintable">
+
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&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:web-translators@gnu.org";>
+        &lt;web-translators@gnu.org&gt;</a>.</p>
+
+        <p>For information on coordinating and contributing 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 contributing translations
+of this article.</p>
+</div>
+
+<p>Copyright &copy; 1989 Chuck Musciano (used with permission)</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2021/07/12 16:42:28 $
+<!-- timestamp end -->
+</p>
+</div>
+</div><!-- for class="inner", starts in the banner include -->
+</body>
+</html>

Index: fun/jokes/vim-songs.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/vim-songs.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- fun/jokes/vim-songs.html    13 Sep 2015 16:32:36 -0000      1.13
+++ fun/jokes/vim-songs.html    12 Jul 2021 16:42:28 -0000      1.14
@@ -1,80 +1,99 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
-<title>VIM Songs . . .
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Vim, Send Me an Angel!
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 40em; }
+.chorus { color: #6b3699; }
+--></style>
 <!--#include virtual="/server/gnun/initial-translations-list.html" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>VIM Songs . . .</h2>
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Vim, Send Me an Angel!</h2>
+
+<address class="byline">by Pablo Mayckon</address>
 
-<h3>Vim, send me an angel!</h3>
+<p>Sung to the tune of <cite>Send Me an Angel</cite> by
+The&nbsp;Scorpions</p>
 
-<pre>
-The wise man said just walk this way
-To the dawn of the light
-The wind will blow into your face
-As the years pass you by
-Hear this voice from deep inside
-It's the call of your heart
-Close your eyes and your will find
+<div class="lyrics c">
+<p>
+The wise man said just walk this way<br />
+To the dawn of the light<br />
+The wind will blow into your face<br />
+As the years pass you by<br />
+Hear this voice from deep inside<br />
+It's the call of your heart<br />
+Close your eyes and your will find<br />
 The passage out of the dark
-</pre>
+</p>
 
-<pre>
-V-I-M
-Will you send me an angel
-V-I-M
+<p class="chorus">
+V-I-M<br />
+Will you send me an angel<br />
+V-I-M<br />
 In the land of the morning star
-</pre>
+</p>
 
-<pre>
-The wise man said just find your place
-In the eye of the storm
-Seek the roses along the way
+<p>
+The wise man said just find your place<br />
+In the eye of the storm<br />
+Seek the roses along the way<br />
 Just beware of the thorns
-</pre>
+</p>
 
-<pre>
-V-I-M
-Will you send me an angel
-V-I-M
+<p class="chorus">
+V-I-M<br />
+Will you send me an angel<br />
+V-I-M<br />
 In the land of the morning star
-</pre>
+</p>
 
-<pre>
-The wise man said just raise your hand
-And reach out for the spell
-Find the door to the promised land
-Just believe in yourself
-Hear this voice from deep inside
-It's the call of your heart
-Close your eyes and your will find
+<p class="c">
+The wise man said just raise your hand<br />
+And reach out for the spell<br />
+Find the door to the promised land<br />
+Just believe in yourself<br />
+Hear this voice from deep inside<br />
+It's the call of your heart<br />
+Close your eyes and your will find<br />
 The way out of the dark
-</pre>
+</p>
 
-<pre>
-V-I-M
-Will you send me an angel
-V-I-M
+<p class="chorus">
+V-I-M<br />
+Will you send me an angel<br />
+V-I-M<br />
+In the land of the morning star<br />
+V-I-M<br />
+Will you send me an angel<br />
+V-I-M<br />
 In the land of the morning star
-V-I-M
-Will you send me an angel
-V-I-M
-In the land of the morning star
-</pre>
-
-<h3>Disclaimer</h3>
-
-<p>
-The song on this page were submitted by Pablo Mayckon
-&lt;pmsf(at)lia.ufc.br&gt; 
-</p>
-<p>
-The Free Software Foundation claims no copyrights on this song.
 </p>
+</div>
+
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The lyrics on this page were submitted to the GNU Project by Pablo
+Mayckon in 2004. Neither the author nor the Free Software Foundation claim
+copyright on them.</p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -92,41 +111,24 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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
+README</a> for information on coordinating and contributing 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. -->
-
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/13 16:32:36 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/welcome-to-gnu-emacs.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/welcome-to-gnu-emacs.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- fun/jokes/welcome-to-gnu-emacs.html 4 Jun 2020 09:22:29 -0000       1.17
+++ fun/jokes/welcome-to-gnu-emacs.html 12 Jul 2021 16:42:28 -0000      1.18
@@ -1,112 +1,128 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>GNU Emacs Song
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen"><!--
+.intro { font-style:normal; color: #6b3699; }
+--></style>
 <!--#include virtual="/server/gnun/initial-translations-list.html" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>GNU Emacs Song</h2>
-
-<h3>Welcome to GNU Emacs</h3>
-
-<blockquote><p>(Hacked up by Jamie Mason to the tune 
-&ldquo;Welcome to the Jungle&rdquo; by Guns 'n'
-Roses)</p></blockquote>
-
-<p>
-&lt;Heavy guitar intro, &ldquo;Oh my GOD!&rdquo; spoken in the
-background...&gt;
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Welcome to GNU Emacs</h2>
+
+<address class="byline">by Jamie Mason</address>
+
+<p>Sung to the tune of <cite>Welcome to the Jungle</cite>
+by Guns&nbsp;'n'&nbsp;Roses</p>
+
+<div class="lyrics c">
+<p class="intro">
+[Heavy guitar intro,<br />
+&ldquo;Oh my GOD!&rdquo; spoken in the background&hellip;]
 </p>
 
-<pre>
-Welcome to GNU Emacs
-We've got fun'n'games
-We got everything you want
-If you just know the names
-We are people that define
-Whatever you may need.
-If you've got the mem'ry, honey
+<p>
+Welcome to GNU Emacs<br />
+We've got fun'n'games<br />
+We got everything you want<br />
+If you just know the names<br />
+We are people that define<br />
+Whatever you may need.<br />
+If you've got the mem'ry, honey<br />
 We got your disease
-</pre>
+</p>
 
-<pre>
-In GNU Emacs
-Welcome to GNU Emacs
-Watch it bring your system to its knees.
+<p>
+In GNU Emacs<br />
+Welcome to GNU Emacs<br />
+Watch it bring your system to its knees.<br />
 I, I wanna fill yer disk
-</pre>
+</p>
 
-<pre>
-Welcome to GNU Emacs
-We malloc() K by K
-If you want it you're gonna thrash
-But it's the price you pay
-And it's a very fast machine
-With sixty megs of core
-It used to handle lotsa users
-But can't do it anymore
-In GNU Emacs
-Welcome to GNU Emacs
-Won't you feed my... my... my... my... mem'ry need?
+<p>
+Welcome to GNU Emacs<br />
+We malloc() K by K<br />
+If you want it you're gonna thrash<br />
+But it's the price you pay<br />
+And it's a very fast machine<br />
+With sixty megs of core<br />
+It used to handle lotsa users<br />
+But can't do it anymore<br />
+In GNU Emacs<br />
+Welcome to GNU Emacs<br />
+Won't you feed my&hellip; my&hellip; my&hellip; my&hellip; mem'ry need?<br />
 I wanna hear you thrash!
-</pre>
+</p>
 
-<pre>
-Welcome to GNU Emacs
-It gets bigger ev'ry day
-You learn to fill all the disk packs
-On the system where we play
-And if you've got some swap that we can see
-We'll brk() it eventually
-You can allocate anything you want
+<p>
+Welcome to GNU Emacs<br />
+It gets bigger ev'ry day<br />
+You learn to fill all the disk packs<br />
+On the system where we play<br />
+And if you've got some swap that we can see<br />
+We'll brk() it eventually<br />
+You can allocate anything you want<br />
 But you'd better not take it from me
-</pre>
+</p>
 
-<pre>
-In GNU Emacs
-Welcome to GNU Emacs
-Watch it bring your system to its knees
+<p>
+In GNU Emacs<br />
+Welcome to GNU Emacs<br />
+Watch it bring your system to its knees<br />
 I'm gonna fill yer disk
-</pre>
+</p>
 
-<pre>
-When you're up
-You never ever wanna shut down, shutdown, shutdown, SHUTDOWN!
+<p>
+When you're up<br />
+You never ever wanna shut down, shutdown, shutdown, SHUTDOWN!<br />
 YEAH!
-</pre>
+</p>
 
-<pre>
-You know where you are?
-You in GNU Emacs, baby.
-Yer system's gonna DIE!
-In GNU Emacs
-Welcome to GNU Emacs
-Watch it bring your system to its knees
-In GNU Emacs
-Welcome to GNU Emacs
-Won't you feed my... my... my... my... mem'ry need?
-In GNU Emacs
-Welcome to GNU Emacs
-Watch it bring your system to its knees
-In GNU Emacs
-Welcome to GNU Emacs
-Watch it bring your system...
-It's gonna bring it down!
+<p>
+You know where you are?<br />
+You in GNU Emacs, baby.<br />
+Yer system's gonna DIE!<br />
+In GNU Emacs<br />
+Welcome to GNU Emacs<br />
+Watch it bring your system to its knees<br />
+In GNU Emacs<br />
+Welcome to GNU Emacs<br />
+Won't you feed my&hellip; my&hellip; my&hellip; my&hellip; mem'ry need?<br />
+In GNU Emacs<br />
+Welcome to GNU Emacs<br />
+Watch it bring your system to its knees<br />
+In GNU Emacs<br />
+Welcome to GNU Emacs<br />
+Watch it bring your system&hellip;<br />
+It's gonna bring it down!<br />
 HA!
-</pre>
+</p>
+</div>
 
-<h3>Disclaimer</h3>
+<p class="button right-align"><a 
href="/fun/jokes/welcome-to-gnu-emacs.txt">Plain
+text version</a></p>
 
-<p>
-The song on this page was obtained from the FSF's email archives
-of the GNU Project.
-</p>
-<p>
-The Free Software Foundation claims no copyrights on this song.
-</p>
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The lyrics on this page were obtained from the FSF's email archives of the
+GNU Project (1992). Neither the author nor the Free Software Foundation claim
+copyright on them.</p>
+</div>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -124,41 +140,24 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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
+README</a> for information on coordinating and contributing 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. -->
-
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/06/04 09:22:29 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: fun/jokes/wonderful-code.html
===================================================================
RCS file: /webcvs/www/www/fun/jokes/wonderful-code.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- fun/jokes/wonderful-code.html       12 Aug 2014 05:04:13 -0000      1.9
+++ fun/jokes/wonderful-code.html       12 Jul 2021 16:42:28 -0000      1.10
@@ -1,55 +1,63 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
-
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>What a Wonderful Code - GNU Project - Free Software Foundation</title>
-
+<style type="text/css" media="print,screen"><!--
+.reduced-width { width: 35em; }
+--></style>
 <!--#include virtual="/server/gnun/initial-translations-list.html" -->
 <!--#include virtual="/server/banner.html" -->
-
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>What a Wonderful Code</h2>
 
-<pre>
-WHAT A WONDERFUL CODE
+<address class="byline">by Peter Sundling</address>
 
-(With apologies to George Weiss and Bob Thiele)
+<p>With apologies to George Weiss and Bob Thiele</p>
 
-
-I can see the code, and change it too
-I can make it do things I want it to do
+<div class="lyrics c">
+<p>
+I can see the code, and change it too<br />
+I can make it do things I want it to do<br />
 And I think to myself, what a wonderful code
-
-I see people around hacking the code
-most of them only wears a bathrobe
+</p><p>
+I see people around hacking the code<br />
+most of them only wears a bathrobe<br />
 And I think to myself, what a wonderful code
-
-The functions is so pretty, the logic so clean
-The source is free, GPL is not mean
-Anyone who wants, can contribute
+</p><p>
+The functions is so pretty, the logic so clean<br />
+The source is free, GPL is not mean<br />
+Anyone who wants, can contribute<br />
 And if they want to, they can also distribute
-
-The code is evolving, I watch it grow
-I learn much more when I read the code
-And I think to myself, what a wonderful code
+</p><p>
+The code is evolving, I watch it grow<br />
+I learn much more when I read the code<br />
+And I think to myself, what a wonderful code<br />
 Yes, I think to myself, what a wonderful code
+</p><p>
+Oh yeah
+</p>
+</div>
 
-oh yeah
-
-
-by Peter Sundling.
-</pre>
-
-<p>
-<a href="/fun/humor.html">Other humor</a>
-in the GNU Humor Collection.</p>
-
-<div class="infobox">
-<h4 id="Disclaimer">Disclaimer</h4>
-<p>The Free Software Foundation claims no copyright on this joke.</p>
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The lyrics on this page were submitted to the GNU Project by Peter
+Sundling in 2003. Neither the author nor the Free Software Foundation
+claim copyright on them.</p>
+</div>
 </div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -67,13 +75,13 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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
+README</a> for information on coordinating and contributing translations
 of this article.</p>
 </div>
 
@@ -81,10 +89,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/08/12 05:04:13 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: music/blues-song.html
===================================================================
RCS file: /webcvs/www/www/music/blues-song.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- music/blues-song.html       12 Apr 2014 12:39:54 -0000      1.17
+++ music/blues-song.html       12 Jul 2021 16:42:28 -0000      1.18
@@ -1,12 +1,29 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>The Programmer's Blues
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="screen, print">
+.chorus { color: #6b3699; }
+</style>
 <!--#include virtual="/music/po/blues-song.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU&nbsp;humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>The Programmer's Blues</h2>
 
-<p><em>(with apologies to Glenn Frye)</em></p>
+<address class="byline">by Robert J. Woodhead</address>
+
+<p>Sung to the tune of <cite>Smuggler's Blues</cite> by Glenn&nbsp;Frye and
+Jack&nbsp;Tempchin</p>
 
 <div class="lyrics">
 <p>There's trouble in the data now, I can feel it in my bones,<br />
@@ -19,9 +36,9 @@
 You debug for 20 days and I'll pay you 20 grand!</p>
 
 <p>I'm sorry it went down like this, but some chip had to fuse.<br />
-It's the typing of the language, it's the programmer's blues&#8230;</p>
+It's the typing of the language, it's the programmer's blues&hellip;</p>
 
-<p>Programmer's blues&#8230;</p>
+<p class="chorus">Programmer's blues&hellip;</p>
 
 <p>Coder's and analyst's, hacker's and sysop's,<br />
 The comments and strange bomboffs, and the bugs nobody copped,<br />
@@ -33,9 +50,9 @@
 It's the lure of relaxed typing, it's so easy to be crude!</p>
 
 <p>Perhaps you'll understand it better, when you see my tools,<br />
-It's the ultimate enhancement, it's the programmer's blues&#8230;</p>
+It's the ultimate enhancement, it's the programmer's blues&hellip;</p>
 
-<p>Programmer's blues&#8230;</p>
+<p class="chorus">Programmer's blues&hellip;</p>
 
 <p>You see it in the memos, you read them every day,<br />
 They say you have to fix those bugs, but they don't go away.<br />
@@ -44,34 +61,37 @@
 
 <p>You hope that none'll notice them, but they always seem to do,<br />
 You beg for Beta-testing, maybe one will give a clue,<br />
-Down from the office of your manager, you learn the heat's on you&#8230;</p>
+Down from the office of your manager, you learn the heat's on you&hellip;</p>
 
-<p>Heat's on you&#8230;</p>
+<p>Heat's on you&hellip;</p>
 
 <p>It's a losing proposition, but one you can't refuse,<br />
-It's policies of debugging, it's the programmer's blues&#8230;</p>
+It's policies of debugging, it's the programmer's blues&hellip;</p>
 
-<p>Programmer's blues&#8230;</p>
+<p class="chorus">Programmer's blues&hellip;</p>
 </div>
 
-<h3 id="license">Licensing</h3>
+<div class="infobox" role="contentinfo">
+<hr />
+<p>The lyrics on this page were obtained from the FSF's email archives of the
+GNU Project (before 1999). Neither the author nor the Free Software Foundation
+claim copyright on them.</p>
 
-<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>
+<p>Other source:&nbsp; <a
+href="http://www.poppyfields.net/filks/00189.html";>poppyfields.net</a></p>
+</div>
+</div>
 
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor Collection.</p>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
-<p>Please send general FSF &amp; GNU inquiries to <a
-href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&gt;</a>.</p>
+<p>Please send general FSF &amp; GNU inquiries to
+<a href="mailto:gnu@gnu.org";>&lt;gnu@gnu.org&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:webmasters@gnu.org";>&lt;webmasters@gnu.org&gt;</a>.</p>
 
 <p><!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -82,29 +102,24 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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>
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and contributing translations
+of this article.</p>
 </div>
 
-<p>Copyright &copy; 2014 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: 2014/04/12 12:39:54 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: music/emacsvsvi.html
===================================================================
RCS file: /webcvs/www/www/music/emacsvsvi.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- music/emacsvsvi.html        28 Jul 2015 00:59:47 -0000      1.19
+++ music/emacsvsvi.html        12 Jul 2021 16:42:28 -0000      1.20
@@ -1,66 +1,72 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
-<title>Emacs vs VI
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<title>Emacs vs Vi
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="screen, print">
+.chorus { color: #6b3699; }
+#download a { margin: 0 .5em; }
+}
+</style>
 <!--#include virtual="/music/po/emacsvsvi.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<h2>Emacs vs VI</h2>
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU&nbsp;humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
+<h2>Emacs vs Vi</h2>
 
-<p><em>(To the tune of &ldquo;Ghost Riders in the Sky&rdquo;, by the 
Outlaws)</em></p>
+<p>Sung to the tune of <cite>Ghost Riders in the Sky</cite> by the Outlaws</p>
 
 <div class="lyrics">
 <p>A hacker went a-coding armed with coffee and his brain<br />
-Debating in himself whether to put it all in &#8217;main&#8217;<br />
+Debating in himself whether to put it all in &ldquo;main&rdquo;<br />
 When all at once his IRC was filled with hateful spite<br />
 A plethora of angry words about syntax highlight </p>
 
-<p>Their hands were writing fire and they called each other n00b&#8230;<br />
-He&#8217;d never seen such sparking since the days of vacuum tubes<br />
+<p>Their hands were writing fire and they called each other n00b&hellip;<br />
+He'd never seen such sparking since the days of vacuum tubes<br />
 A bolt of fear went through him as he closed parentheses<br />
-Torn between the &#8217;write and quit&#8217; and ol&#8217; C-x C-c </p>
+Torn between the &ldquo;write and quit&rdquo; and ol' C-x C-c </p>
 
-<p>Yippy kai yay&#8230;<br />
-File I/O&#8230;<br />
-Emacs versus vi&#8230; </p>
+<p class="chorus">Yippy kai yay&hellip;<br />
+File I/O&hellip;<br />
+Emacs versus vi&hellip; </p>
 
-<p>He&#8217;d long endured the arguments, he knew the story well&#8230;<br />
+<p>He'd long endured the arguments, he knew the story well&hellip;<br />
 So why condemn an editor and all its bytes to Hell?<br />
-From concepts of simplicity to a buffer-based OS&#8230;<br />
-You&#8217;d think they&#8217;d find a better way to work out daily stress!<br 
/>
+From concepts of simplicity to a buffer-based OS&hellip;<br />
+You'd think they'd find a better way to work out daily stress!<br />
 </p>
 
-<p>So learn your lesson, hacker, and you&#8217;ll not regret one day&#8230; 
<br />
-The time you spent recovering, and throwing chars away&#8230; <br />
-What&#8217;s popular is never what you&#8217;ll get into your head&#8230; <br 
/>
-So take a pointer from the pros&#8230; and choose the mighty ED! </p>
-
-<p>Yippy kai yay&#8230; <br />
-File I/O&#8230; <br />
-Emacs versus vi&#8230; </p>
-
-<p>Yippy kai yay&#8230; <br />
-File I/O&#8230; <br />
-Emacs versus vi&#8230; </p>
+<p>So learn your lesson, hacker, and you'll not regret one day&hellip; <br />
+The time you spent recovering, and throwing chars away&hellip; <br />
+What's popular is never what you'll get into your head&hellip; <br />
+So take a pointer from the pros&hellip; and choose the mighty ED! </p>
+
+<p class="chorus">Yippy kai yay&hellip; <br />
+File I/O&hellip; <br />
+Emacs versus vi&hellip; </p>
+
+<p class="chorus">Yippy kai yay&hellip; <br />
+File I/O&hellip; <br />
+Emacs versus vi&hellip; </p>
 </div>
 
-<h3 id="download">Other formats</h3>
-
-<p><a href="/music/emacsvsvi.tex">Latex</a><br />
+<p id="download" class="button right-align">Other formats:
+<a href="/music/emacsvsvi.tex">Latex</a>
 <a href="/music/emacsvsvi.pdf">PDF</a></p>
+</div>
 
-<h3 id="license">Licensing</h3>
-
-<p>Copyright (C) 2010 by James Taylor</p>
-
-<p>Permission is granted to copy, distribute and/or modify this document under
-the terms of the GNU Free Documentation License, Version 1.3</p>
-
-<p>The Free Software Foundation claims no copyright on this song.</p>
-
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor Collection.</p>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to <a
@@ -78,28 +84,29 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2010 by James Taylor</p>
+<p>Copyright &copy; 2010 James Taylor (the lyrics)</p>
+
+<p>Permission is granted to copy, distribute and/or modify this document under
+the terms of the <a rel="license" href="/licenses/fdl.html">GNU Free
+Documentation License, version 1.3</a>.</p>
 
-<p>'Emacs vs VI' by James Taylor is licensed under
-the <a href="https://gnu.org/licenses/fdl-1.3-standalone.html";>GNU
-Free Documentation License, Version 1.3</a>.</p>
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/07/28 00:59:47 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: music/free-birthday-song.html
===================================================================
RCS file: /webcvs/www/www/music/free-birthday-song.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- music/free-birthday-song.html       12 Apr 2014 12:39:55 -0000      1.5
+++ music/free-birthday-song.html       12 Jul 2021 16:42:28 -0000      1.6
@@ -1,17 +1,30 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
-
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>The Free Birthday Song - GNU Project - Free Software Foundation</title>
-
+<style type="text/css" media="screen, print">
+.reduced-width { width: 40em; }
+</style>
  <!--#include virtual="/music/po/free-birthday-song.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU&nbsp;humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>The Free Birthday Song</h2>
 
-<p>This song was written by Steven Sheffey in celebration of Richard
+<address class="byline">by Steven Sheffey</address>
+
+<p>This song was written in celebration of Richard
 Stallman's birthday.  It follows the same tune as the
-<a href="/music/free-software-song.html">Free Software Song</a>: the Bulgarian
-folk song &ldquo;Sadi moma bela loza.&rdquo;</p>
+<a href="/music/free-software-song.html"><cite>Free Software Song</cite></a>:
+the Bulgarian folk song <cite>Sadi moma bela loza</cite>.</p>
 
 <div class="lyrics">
 
@@ -36,20 +49,15 @@
     Set us free, Stallman, set us free.</p>
 </div>
 
-<p>Download Steven Sheffey's performance of the 
-<a href="/music/free-birthday-song.ogg">Free Birthday Song</a> (ogg 
format).</p>
-
-<h3 id="license">Licensing</h3>
-
-<p>The Free Birthday Song by Steven Sheffey is licensed under a 
-<a href="https://creativecommons.org/licenses/by-sa/4.0/";>Creative
-Commons Attribution-ShareAlike 4.0 International</a> license.</p>
+<p>The <cite>Free Birthday Song</cite> was performed by Steven Sheffey:</p>
+<p class="button right-align" style="margin-right: 3%">
+<a href="/music/free-birthday-song.ogg">Audio recording</a>
+<small>(OGG&nbsp;Vorbis&nbsp;format,&nbsp;1.4MB)</small></p>
+</div>
 
 </div><!-- for id="content", starts in the include above -->
-
 <!--#include virtual="/server/footer.html" -->
-
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -58,7 +66,6 @@
 the FSF.  Broken links and other corrections or suggestions can be sent
 to <a href="mailto:webmasters@gnu.org";>&lt;webmasters@gnu.org&gt;</a>.</p>
 
-
 <p><!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
 
@@ -68,49 +75,30 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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>
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and contributing 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; 2014 Steven Sheffey (the lyrics).</p>
-
-<p>Copyright &copy; 2014 Free Software Foundation (text other than lyrics.)</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>
+<p>Copyright &copy; 2014 Steven Sheffey (the lyrics)</p>
+
+<p>The lyrics on this page are licensed under the
+<a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/";>
+Creative Commons Attribution-ShareAlike 4.0 International</a> license.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 12:39:55 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: music/free-firmware-song.html
===================================================================
RCS file: /webcvs/www/www/music/free-firmware-song.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- music/free-firmware-song.html       11 Dec 2020 07:00:33 -0000      1.3
+++ music/free-firmware-song.html       12 Jul 2021 16:42:28 -0000      1.4
@@ -1,25 +1,37 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.94 -->
+<!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>The Free Firmware Song
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="screen, print">
+.chorus { font-style: normal; color: #572385; }
+</style>
  <!--#include virtual="/music/po/free-firmware-song.translist" -->
 <!--#include virtual="/server/banner.html" -->
-<div style="max-width: 40em">
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU&nbsp;humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>The Free Firmware Song</h2>
 
 <address class="byline">by <a
 href="https://blog.vimuser.org";>Leah Rowe</a></address>
 
-<p style="margin-top: 2em">This is a take-off on Richard
-Stallman's <cite>&ldquo;Free Software Song&rdquo;</cite>.
+<p>This is a take-off on Richard
+Stallman's <cite>&ldquo;Free Software Song.&rdquo;</cite>
 It is also published on the author's blog, with the <a
 href="https://blog.vimuser.org/free-firmware-song.html";>story of its
 writing</a>, and a <a
 href="https://av.vimuser.org/firmware.webm";>video</a> of the author
 singing it.</p>
 
-<div class="lyrics article" style="max-width: max-content">
+<div class="lyrics">
 <p>Join us now and flash free firmware!<br />
 You’ll be free! Hackers, you’ll be free!<br />
 Join us now and flash free firmware!<br />
@@ -41,14 +53,18 @@
 You’ll be free! Hackers, you’ll be free!</p>
 </div>
 
-<h3 id="Disclaimer" class="footnote">Disclaimer</h3>
-
-<p>Leah Rowe claims no copyright on this song.</p>
+<div class="infobox" role="contentinfo">
+<hr />
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>The lyrics on this page were submitted to the GNU Project in 2020.
+Neither the author nor the Free Software Foundation claim copyright
+on them.</p>
+</div>
 </div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -80,7 +96,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/12/11 07:00:33 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>

Index: music/gdb-song.html
===================================================================
RCS file: /webcvs/www/www/music/gdb-song.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- music/gdb-song.html 18 Apr 2021 10:31:23 -0000      1.27
+++ music/gdb-song.html 12 Jul 2021 16:42:28 -0000      1.28
@@ -1,40 +1,47 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.96 -->
 <!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>The GDB Song
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="screen, print">
+.chorus { font-style: normal; color: #6b3699; }
+.imgright { margin-top: -5em; }
+@media (max-width: 35em) { .imgright { display: none; }}
+</style>
 <!--#include virtual="/music/po/gdb-song.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU&nbsp;humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
 <div class="reduced-width">
 <h2>The GDB Song</h2>
-<!-- when you replace this graphics, make sure you change the link
-to also point to the correct html page.
-If you make a new graphics for this page, make sure it has
-a corresponding entry in /graphics/graphics.html -->
 
-<div class="imgright" style="margin-top: -1em">
+<div class="imgright">
 <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></div>
 
-<address class="byline" style="margin-bottom: 0">
-with thanks to Joel Bion, Mark Baushke, and Lynn Slater</address>
-<p>published earlier in <a href="/bulletins/bull4.html#SEC11">GNU's Bulletin
-No. 4</a>.</p>
-
-<div class="article" style="clear: both; margin-top: 2em">
-<p>Somebody asked us what was GDB. With apologies to Oscar Hammerstein&nbsp;II,
-Richard Rodgers, and Julie Andrews, we offered the following
+<address class="byline">
+by Joel&nbsp;Bion, Mark&nbsp;Baushke, and Lynn&nbsp;Slater</address>
+
+<p class="clear">Somebody asked us what was GDB. With apologies to 
Oscar&nbsp;Hammerstein&nbsp;II,
+Richard&nbsp;Rodgers, and Julie&nbsp;Andrews, we offered the following
 reply:</p>
 
 <div class="lyrics">
       <p>Let's start at the very beginning, a very good place to start,</p>
       <p>When you're learning to sing, its Do, Re, Mi; <br />
          When you're learning to code, its G, D, B.</p>
-      <p>(background) G, D, B. </p>
+      <p><span class="chorus">(background)</span> G, D, B. </p>
       <p>The first three letters just happen to be, G, D, B. </p>
-      <p>(background) G, D, B. </p>
-      <p>(Chorus) </p>
+      <p><span class="chorus">(background)</span> G, D, B. </p>
+      <p class="chorus">(Chorus) </p>
       <dl>
         <dt>G!, </dt>
           <dd>GNU!, it's Stallman's hope, </dd>
@@ -56,21 +63,15 @@
                               D,
                                  B,
                                     &lt;link&gt;</pre>
-      <p>(Resume from the Chorus) </p>
+      <p class="chorus">(Resume from the Chorus) </p>
 </div>
-</div>
-
-<p class="button right-align">Other songs, poems and jokes in the
-<a href="/fun/humor.html">GNU Humor Collection</a></p>
 
-<div class="infobox">
+<div class="infobox" role="contentinfo">
 <hr />
-<h3 id="license">Disclaimer</h3>
-
-<p>The song on this page was originally obtained from the FSF's email archives
-of the GNU Project.</p>
-
-<p>The Free Software Foundation claims no copyright on this work.</p>
+<h3 id="Disclaimer">Disclaimer</h3>
+<p>These lyrics were first published in <a href="/bulletins/bull4.html#SEC11">
+GNU's Bulletin No. 4</a> (1988). Neither the authors nor the Free Software
+Foundation claim copyright on them.</p>
 </div>
 </div>
 
@@ -94,7 +95,7 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing translations of
         our web pages, see <a
         href="/server/standards/README.translations.html">Translations
         README</a>. -->
@@ -108,10 +109,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/04/18 10:31:23 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: music/till_there_was_gnu.html
===================================================================
RCS file: /webcvs/www/www/music/till_there_was_gnu.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- music/till_there_was_gnu.html       19 Jul 2015 23:02:24 -0000      1.22
+++ music/till_there_was_gnu.html       12 Jul 2021 16:42:28 -0000      1.23
@@ -1,69 +1,80 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>'Till There Was GNU
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="screen, print">
+.chorus { font-style: normal; color: #572385; }
+</style>
 <!--#include virtual="/music/po/till_there_was_gnu.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU&nbsp;humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--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.de.html" -->
+<!--#endif -->
+<!--#endif -->
+<div class="reduced-width">
 <h2>'Till There Was GNU</h2>
 
-<p><strong>A Song Performed By Steven R. Champagne</strong></p>
+<address class="byline">by Steven R. Champagne</address>
+
+<p>Sung to the tune of <cite>'Til There Was You</cite> by Meredith Wilson</p>
 
 <div class="lyrics">
-<p>there were applications<br />
-but I never saw their source code<br />
-no I never saw it at all<br />
-'till there was gnu</p>
+<p>There were applications,<br />
+but I never saw their source code.<br />
+No I never saw it at all<br />
+'till there was GNU.</p>
 
-<p>there were profits so high<br />
-it was all proprietary<br />
+<p>There were profits so high;<br />
+it was all proprietary,<br />
 all behind a corporate wall<br />
-'till there was gnu</p>
+'till there was GNU.</p>
 
-<p>then there were downloads<br />
+<p>Then there were downloads,<br />
 and wonderful mail lists<br />
 that informed me<br />
 with sweet contributions<br />
-from all, it's true</p>
+from all, it's true.</p>
 
-<p>there was code all around<br />
-but I never heard of sharing<br />
-no I never heard it at all<br />
-'till there was gnu</p>
+<p>There was code all around,<br />
+but I never heard of sharing.<br />
+No I never heard it at all<br />
+'till there was GNU.</p>
 
-<p>&lt;instruments&gt;</p>
+<p class="chorus">&lt;instruments&gt;</p>
 
-<p>then there were downloads<br />
+<p>Then there were downloads,<br />
 and wonderful mail lists<br />
 that informed me<br />
 with sweet contributions<br />
-from all, it's true</p>
+from all, it's true.</p>
 
-<p>there was code all around<br />
-but I never heard of sharing<br />
-no I never heard it at all<br />
-'till there was gnu</p>
+<p>There was code all around,<br />
+but I never heard of sharing.<br />
+No I never heard it at all<br />
+'till there was GNU&hellip;</p>
 
-<p>'till there was gnu</p>
+<p>'till there was GNU.</p>
+</div>
 </div>
-
-<h3 id="license">Licensing</h3>
-
-<p>Copyright &copy; 2011 Steven R. Champagne</p>
-
-<p>'Till There Was GNU by Steven R. Champagne is licensed under a
-<a href="http://creativecommons.org/licenses/by-nc-nd/3.0/";>Creative Commons 
-Attribution-NonCommercial-NoDerivs 3.0 Unported License.</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.
-     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 id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to <a
@@ -81,32 +92,29 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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>
+information on coordinating and contributing translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2011 Steven R. Champagne</p>
+<p>Copyright &copy; 2011 Steven R. Champagne (the lyrics)</p>
 
-<p>'Till There Was GNU by Steven R. Champagne is licensed under a
-<a rel="license"
-href="http://creativecommons.org/licenses/by-nc-nd/3.0/";>Creative
-Commons Attribution-NonCommercial-NoDerivs 3.0 Unported
-License.</a></p>
+<p>The lyrics on this page are licensed under the
+<a href="http://creativecommons.org/licenses/by-nc-nd/3.0/";>Creative Commons 
+Attribution-NonCommercial-NoDerivs 3.0 Unported License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/07/19 23:02:24 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: music/whole-gnu-world.html
===================================================================
RCS file: /webcvs/www/www/music/whole-gnu-world.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- music/whole-gnu-world.html  10 Aug 2015 05:57:23 -0000      1.2
+++ music/whole-gnu-world.html  12 Jul 2021 16:42:28 -0000      1.3
@@ -1,15 +1,29 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.78 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>A Whole GNU World
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="screen, print">
+.reduced-width { width: 40em; }
+</style>
  <!--#include virtual="/music/po/whole-gnu-world.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<div class="breadcrumb" role="navigation">
+ <a href="/"><img src="/graphics/icons/home.png" height="26" width="26"
+    alt="GNU Home" title="GNU Home" /></a>&nbsp;/
+ <a href="/fun/humor.html#content">GNU&nbsp;humor</a>&nbsp;/
+ <a href="/music/music.html#content">Music</a>&nbsp;/
+</div>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="reduced-width">
 <h2>A Whole GNU World</h2>
 
-<p>by Daniel Vukelich</p>
+<address class="byline">by Daniel Vukelich</address>
 
-<p>Sung to the tune of Disney's &ldquo;A Whole New World&rdquo; from
-the movie &ldquo;Aladdin.&rdquo;</p>
+<p>Sung to the tune of <cite>A Whole New World</cite> from
+Disney's movie <cite>Aladdin</cite></p>
 
 <div class="lyrics">
 
@@ -71,12 +85,12 @@
 <b>RMS</b>: A hacker's dream<br />
 <b>User</b>: Where freedoms gleam<br />
 <b>Both</b>: For you and me!</p>
-
+</div>
 </div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -94,36 +108,19 @@
         to <a href="mailto:web-translators@gnu.org";>
         &lt;web-translators@gnu.org&gt;</a>.</p>
 
-        <p>For information on coordinating and submitting translations of
+        <p>For information on coordinating and contributing 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
+README</a> for information on coordinating and contributing 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 4.0.  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).
+<p>Copyright &copy; 2015 Daniel Vukelich (the lyrics)</p>
      
-     There is more detail about copyright years in the GNU Maintainers
-     Information document, www.gnu.org/prep/maintain. -->
-
-<p>Copyright &copy; 2015 Daniel Vukelich</p>
-
-<p>This page is licensed under a <a rel="license"
+<p>The lyrics on this page are licensed under the <a rel="license"
 href="http://creativecommons.org/licenses/by-sa/4.0/";>Creative
 Commons Attribution-ShareAlike 4.0 International License</a>.</p>
 
@@ -131,10 +128,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/08/10 05:57:23 $
+$Date: 2021/07/12 16:42:28 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>



reply via email to

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