www-commits
[Top][All Lists]
Advanced

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

www/music writing-fs-song.html free-software-so...


From: Joerg Kohne
Subject: www/music writing-fs-song.html free-software-so...
Date: Fri, 12 Aug 2011 13:52:23 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Joerg Kohne <joeko>     11/08/12 13:52:23

Modified files:
        music          : writing-fs-song.html free-software-song.html 
                         gdb-song.html till_there_was_gnu.html 
                         emacsvsvi.html music.html blues-song.html 

Log message:
        GNUNified according boilerplate v1.59

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/music/writing-fs-song.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/music/free-software-song.html?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/music/gdb-song.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/music/till_there_was_gnu.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/music/emacsvsvi.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/music/music.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/music/blues-song.html?cvsroot=www&r1=1.5&r2=1.6

Patches:
Index: writing-fs-song.html
===================================================================
RCS file: /web/www/www/music/writing-fs-song.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- writing-fs-song.html        13 Jul 2011 17:30:24 -0000      1.11
+++ writing-fs-song.html        12 Aug 2011 13:52:12 -0000      1.12
@@ -49,7 +49,7 @@
 such a song is called a &ldquo;filk&rdquo; of the original song.
 Thus, the free software song is a filk of <cite>Sadi Moma</cite>.</p>
 
-</div>
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 
 <div id="footer">
@@ -71,14 +71,14 @@
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.
-</p>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/07/13 17:30:24 $
+$Date: 2011/08/12 13:52:12 $
 <!-- timestamp end -->
 </p>
+</div>
 
 <div id="translations">
 <h4>Translations of this page</h4>
@@ -103,6 +103,8 @@
      -->
 
 <ul class="translations-list">
+<!-- German -->
+<li><a href="/music/writing-fs-song.de.html">Deutsch</a>&nbsp;[de]</li>
 <!-- English -->
 <li><a href="/music/writing-fs-song.html">English</a>&nbsp;[en]</li>
 <!-- Spanish -->
@@ -110,6 +112,5 @@
 </ul>
 </div>
 </div>
-</div>
 </body>
 </html>

Index: free-software-song.html
===================================================================
RCS file: /web/www/www/music/free-software-song.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- free-software-song.html     23 Jul 2011 03:16:38 -0000      1.59
+++ free-software-song.html     12 Aug 2011 13:52:14 -0000      1.60
@@ -1,16 +1,18 @@
+<!-- Parent-Version: 1.59 -->
 <!--#include virtual="/server/header.html" -->
-<title>Free Software Song - GNU Project - Free Software Foundation 
(FSF)</title>
+<title>Free Software Song 
+- GNU Project - Free Software Foundation (FSF)</title>
 <!--#include virtual="/server/banner.html" -->
 <h2>The Free Software Song</h2>
 <p>by Richard Stallman</p>
 
-<p>You can read the story of <a href="/music/writing-fs-song.html">the writing 
of the song</a>, too.</p>
-<p>The lyrics of the "Free Software Song" are sung to the melody of the
-Bulgarian fold song <a href="free-software-song.html#SadiMoma"
-                      id="REFSadiMoma">"Sadi moma bela loza"</a>:]</p>
+<p>You can read the story of <a href="/music/writing-fs-song.html">the writing 
of the song</a>,
+too.</p>
 
-<div class="lyrics">
+<p>The lyrics of the &ldquo;Free Software Song&rdquo; are sung to the melody 
of the Bulgarian fold 
+song &ldquo;<a href="#SadiMoma" id="REFSadiMoma">Sadi moma bela 
loza</a>&rdquo; <!-- :] --></p>
 
+<div class="lyrics">
      <p>Join us now and share the software;<br />
      You'll be
      free, <a href="http://stallman.org/articles/on-hacking.html";>hackers</a>,
@@ -32,7 +34,6 @@
      You'll be free, hackers, you'll be free.<br />
      Join us now and share the software;<br />
      You'll be free, hackers, you'll be free.</p>
-
 </div>
 
 <p>This song is in a rhythm of 7/8; those unaccustomed to odd rhythms
@@ -40,100 +41,76 @@
 into three subgroups as slow-quick-quick or 3-2-2. Such meters in
 Bulgarian music can often be stretched, and some musicians analyze
 this song as 3-2-3 instead; however, Yves Moreau, who collected and
-taught the dance, endorses the rhythm of 7.
-</p>
+taught the dance, endorses the rhythm of 7.</p>
 
-<h3>Performances</h3>
+<h3 id="download">Downloads</h3><!-- ## added by www-de ## -->
 
-<ul>
-<li>A <a href="/music/free-software-song.au">recording (.au format)</a>
-of <a href="http://www.stallman.org/";>Richard Stallman</a> singing this
-song, also available in <a href="/music/free-software-song.ogg">Ogg
-Vorbis format</a>.</li>
-
-<li><a href="./FreeSWSong.ogg">A recording (.ogg)</a> of the piece
-  accompanied by Bulgarian instruments played in traditional style.</li>
-
-<li>A <a
-href="http://audio-video.gnu.org/video/stallman_free_software_song_320x240.ogv";>video
-of RMS performing the song (ogg)</a>, released under GFDLv1.3+ by the
-videographer, Julian Coccia.</li>
+<h4>Performances</h4>
 
+<ul>
+  <li>A <a href="/music/free-software-song.au">recording (.au format)</a> of <a
+    href="http://www.stallman.org/";>Richard Stallman</a> singing this song, 
also available in <a
+    href="/music/free-software-song.ogg">Ogg Vorbis format</a>.</li>
+  <li>A <a href="/music/FreeSWSong.ogg">recording (.ogg)</a> of the piece 
accompanied by Bulgarian
+    instruments played in traditional style.</li>
+  <li>A <a 
href="http://audio-video.gnu.org/video/stallman_free_software_song_320x240.ogv";>video
 of
+    RMS performing the song (ogg)</a>, released under GFDLv1.3+ by the 
videographer, Julian
+  Coccia.</li>
 </ul>
 
-
-<h3>Alternate versions</h3>
+<h4>Alternate versions</h4>
 
 <ul>
-<li><a
-href="http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";>Another
-song</a>, inspired by this one but mostly different, sung by the band
-Fenster (4.5M).</li>
-<li>A rhythmic version of free software song in <a
-href="/music/free-software-song-rhythmic.ogg">Ogg Vorbis</a> format by
-<!-- a href="http://thj.no/";>Thor</a --> Thor.</li>
-<li>An improvised piano version by Markus Haist
-  in <a href="/music/markushaist-free-software-song.ogg">Ogg
-  Vorbis</a> format (1.2 MB), released
-  under <a href="/licenses/gpl-3.0.html">GPLv3</a>.</li>
-<li>Another rock-like version by Pjj &amp; Hairyone in
-<a href="/music/pjj-and-hairyone-freesoftwaresong.ogg">Ogg Vorbis</a>
-format (1.6 MB).</li>
-<li>A Spanish punk variant by ALEC in
-<a
-href="http://e3.ututo.org/users/musix/ALEC/cancion_software_libre/master/ALEC_Cancion_SL_master.ogg";>Ogg
-Vorbis</a> format (1.4 MB).</li>
-
-<li>A version with a different structure in
-  <a href="/music/freesoft.ogg">Ogg Vorbis</a> format (3.7 MB) by
-  <a href="http://www.phoeniximago.com/2010/01/the-free-software-song/";>Robert
-    Kay</a>, released under 
-  <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode";>
-    CC-BY-NC-SA</a>.</li>
-<li>A version by the band Zweitgolf: <a 
href="free_software_song_sunnata.ogg">free_software_song_sunnata.ogg</a>, 
-released under the GPL</li>
+  <li><a 
href="http://audio-video.gnu.org/audio/Fenster-Free-Software-Song.ogg";>Another 
song</a>,
+    inspired by this one but mostly different, sung by the band Fenster 
(4.5M).</li>
+  <li>A rhythmic version of free software song in <a
+    href="/music/free-software-song-rhythmic.ogg">Ogg Vorbis</a> format by
+    <!-- a href="http://thj.no/";>Thor</a --> Thor.</li>
+  <li>An improvised piano version by Markus Haist in <a
+    href="/music/markushaist-free-software-song.ogg">Ogg Vorbis</a> format 
(1.2 MB), released under
+    <a href="/licenses/gpl-3.0.html">GPLv3</a>.</li>
+  <li>Another rock-like version by Pjj &amp; Hairyone in <a
+    href="/music/pjj-and-hairyone-freesoftwaresong.ogg">Ogg Vorbis</a> format 
(1.6 MB).</li>
+  <!-- ## link invalid, by www-de ## <li>A Spanish punk variant by ALEC in <a
+    
href="http://e3.ututo.org/users/musix/ALEC/cancion_software_libre/master/ALEC_Cancion_SL_master.ogg";>Ogg
+    Vorbis</a> format (1.4 MB).</li> -->
+  <li>A version with a different structure in <a 
href="/music/freesoft.ogg">Ogg Vorbis</a> format
+    (3.7 MB) by <a 
href="http://www.phoeniximago.com/2010/01/the-free-software-song/";>Robert
+    Kay</a>, released under <a
+    
href="http://creativecommons.org/licenses/by-nc-sa/3.0/legalcode";>CC-BY-NC-SA</a>.</li>
+  <li>A version by the band Zweitgolf: <a
+    href="free_software_song_sunnata.ogg">free_software_song_sunnata.ogg</a>, 
released under the
+  GPL</li>
 </ul>
 
-<p>
-You can get a <a href="free-software-song.pdf">typeset score</a> of
-the song made with <a href="http://lilypond.org";>GNU LilyPond</a>.  The
-LilyPond <a href="free-software-song.ly">source</a> for the typeset
-score is also available.
-</p>
-
-<div class="infobox">
-
-<h4>Disclaimer</h4>
-
-<p>The Free Software Foundation claims no copyrights on this song.</p>
-
-</div>
-
-<h3 id="SadiMoma">"Sadi moma bela loza"</h3>
-
-<p>
-Here is a description of the tune of "Sadi moma bela loza", a Bulgarian dance
-tune, in an ad-hoc form of notation using letters for notes.  A dash
-means the previous note continues.  There are seven beats per measure,
-thus seven characters in each group.
-</p>
-
+<p>You can get a <a href="/music/free-software-song.pdf">typeset score</a> of 
the song made with <a
+href="http://lilypond.org";>GNU LilyPond</a>. The LilyPond <a
+href="/music/free-software-song.ly">source</a> for the typeset score is also 
available.</p>
+
+<h4 id="SadiMoma">"Sadi moma bela loza"</h4>
+
+<p>Here is a description of the tune of "Sadi moma bela loza", a Bulgarian 
dance tune, in an ad-hoc
+form of notation using letters for notes. A dash means the previous note 
continues. There are seven
+beats per measure, thus seven characters in each group.</p>
 <pre>
-D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---
-D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- A------
-</pre>
+    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- D-CB---
+    D-CB-A- B-CBAG- G--A--B C--B-BD A--A--- A------</pre>
 
 <p>It is also available as an <a href="/music/sadi-moma.abc">ABC file</a>.</p>
 
-</div>
-<!--#include virtual="/server/footer.html" -->
+<h3 id="license">Disclaimer</h3>
 
+<!-- div class="infobox" -->
+<p>The Free Software Foundation claims no copyrights on this song.</p>
+<!-- /div -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries &amp; questions
+
+<p>Please send FSF &amp; GNU inquiries &amp; questions
 to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-Other <a href="/contact/">ways to contact</a> the FSF.
-</p>
+Other <a href="/contact/">ways to contact</a> the FSF.</p>
+
 <p>Please send comments on these web pages
 to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
@@ -142,30 +119,48 @@
 README</a> for information on coordinating and submitting translations
 of this article.</p>
 
-<p>
-Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010 Richard
-Stallman
-</p>
-<p>
-This page is licensed under a <a rel="license"
+<p>Copyright &copy; 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2010 Richard
+Stallman</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>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
-<p>
-Updated:
+<p>Updated:
 <!-- timestamp start -->
-$Date: 2011/07/23 03:16:38 $
+$Date: 2011/08/12 13:52:14 $
 <!-- timestamp end -->
 </p>
+</div>
 
 <div id="translations">
 <h4>Translations of this page</h4>
-<ul>
+
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
+<ul class="translations-list">
 <!-- Catalan -->
 <li><a 
href="/music/free-software-song.ca.html">catal&#x00e0;</a>&nbsp;[ca]</li> 
 <!-- German -->
 <li><a href="/music/free-software-song.de.html">Deutsch</a>&nbsp;[de]</li> 
+<!-- English -->
 <li><a href="/music/free-software-song.html">English</a>&nbsp;[en]</li>
 <!-- Spanish -->
 <li><a 
href="/music/free-software-song.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> 
@@ -180,6 +175,5 @@
 </ul>
 </div>
 </div>
-</div>
 </body>
 </html>

Index: gdb-song.html
===================================================================
RCS file: /web/www/www/music/gdb-song.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gdb-song.html       13 Jul 2011 17:30:23 -0000      1.8
+++ gdb-song.html       12 Aug 2011 13:52:15 -0000      1.9
@@ -1,166 +1,131 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>The GDB Song - GNU Project - Free Software Foundation (FSF)</TITLE>
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<LINK REV="made" HREF="mailto:address@hidden";>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#1F00FF" ALINK="#FF0000" 
VLINK="#9900DD">
-<H3>The GDB Song</H3>
-
+<!-- Parent-Version: 1.59 -->
+<!--#include virtual="/server/header.html" -->
+<title>The GDB Song 
+- GNU Project - Free Software Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<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                     -->
-<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>
-
-[
-  <A HREF="/music/gdb-song.html">English</A>
-| <A HREF="/music/gdb-song.ko.html">Korean</A>
-]
-
-<P><BR>
-<DL COMPACT>
-
-<DT>
-<DD><EM>with thanks to Joel Bion, Mark Baushke, and Lynn Slater.
-     <BR>
-     published earlier in
-     </EM>
-     <CITE>
-     <A HREF="/bulletins/bull4.html#SEC11">GNU's Bulletin No. 4</A>.
-     </CITE>
-</DL>
-
-<P>
-<STRONG>
-Somebody asked us what was GDB.  With apologies to Oscar Hammerstein
-II, Richard Rodgers, and Julie Andrews, we offered the following reply:
-</STRONG>
-
-</P>
-
-<DL COMPACT>
-
-<DT>
-<DD>Let's start at the very beginning, a very good place to start, 
-
-     <P>
-     When you're learning to sing, its Do, Re, Mi;        <BR>
-     When you're learning to code, its G,  D,   B.        <BR>
-     
-     </P>
-     <P>
-     (background) 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>
-     <DL COMPACT>
-<DT>G!,
-<DD>
-   GNU!, it's Stallman's hope,
-   
-<DT>D,
-<DD>
-     a break I set myself.
-   
-<DT>B,
-<DD>
-     debug that rotten code,
-   
-<DT>Run,
-<DD>
-   a far, far way to go.
-   
-<DT>Print,
-<DD>
- to see what you have done,
-   
-<DT>Set,
-<DD>
-   a patch that follows print.
-
-<DT>Quit,
-<DD>
- and recompile your code  - - -
-
-</DL>
-<P>
-
-
-<PRE>
-That will bring it back to G,
+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 -->
+
+<p><a href="/graphics/gleesons.html"><img src="/graphics/gleeson_head.jpg"
+alt=" [colorful rounded image of the Head of a GNU]" width="153" height="128"
+ style="float: right;" /></a></p>
+
+<p><em>with thanks to Joel Bion, Mark Baushke, and Lynn Slater. <br />
+published earlier in</em> <a href="/bulletins/bull4.html#SEC11">GNU's Bulletin
+No. 4</a>.</p>
+
+<p><strong>Somebody asked us what was GDB. With apologies to Oscar Hammerstein
+II, Richard Rodgers, and Julie Andrews, we offered the following
+reply:</strong></p>
+
+<div class="lyrics">
+<dl>
+  <dt></dt>
+    <dd>Let's start at the very beginning, a very good place to start, 
+      <p>When you're learning to sing, its Do, Re, Mi; <br />
+      When you're learning to code, its G, D, B. <br />
+      </p>
+      <p>(background) 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>
+      <dl>
+        <dt>G!, </dt>
+          <dd>GNU!, it's Stallman's hope, </dd>
+        <dt>D, </dt>
+          <dd>a break I set myself. </dd>
+        <dt>B, </dt>
+          <dd>debug that rotten code, </dd>
+        <dt>Run, </dt>
+          <dd>a far, far way to go. </dd>
+        <dt>Print, </dt>
+          <dd>to see what you have done, </dd>
+        <dt>Set, </dt>
+          <dd>a patch that follows print. </dd>
+        <dt>Quit, </dt>
+          <dd>and recompile your code - - - </dd>
+      </dl>
+      <p></p>
+      <pre>That will bring it back to G,
                                         D,
                                              B,
-                                                   &#60;link&#62;
-</PRE>
-
-
-<P>
-(Resume from the Chorus)
-
-</P>
-</DL>
-
-<P>
-<A HREF="/fun/humor.html">Other humor</A>
-in the GNU Humor Collection.
-
-
-<H4>Disclaimer</H4>
+                                    &lt;link&gt;</pre>
+      <p>(Resume from the Chorus) </p>
+    </dd>
+</dl>
+</div>
+
+<h4 id="license">Disclaimer</h4>
+
+<p>The song on this page was obtained from the FSF's <a
+href="ftp://ftp-mailing-list-archives.gnu.org/";>email archives</a> of the GNU
+Project. </p>
+
+<p>The Free Software Foundation claims no copyrights 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">
+
+<p>Please send general FSF &amp; GNU inquiries to 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also
+<a href="/contact/">other ways to contact</a> the FSF.<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";>&lt;address@hidden&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>
 
-The song on this page was obtained
-from the FSF's
-<A HREF="ftp://ftp-mailing-list-archives.gnu.org/";>email archives</A>
-of the GNU Project.
-<BR>
-The Free Software Foundation claims no copyrights on this song.
+<p>Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA  02110,  USA</p>
 
-<P>
-
-
-<HR>
-
-Return to <A HREF="/home.html">GNU's home page</A>.
-<P>
-
-Please send FSF &amp; GNU inquiries &amp; questions to 
-
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-There are also <A HREF="/home.html#ContactInfo">other ways to
-contact</A> the FSF.
-<P>
-
-Please send comments on these web pages to
-
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>,
-send other questions to
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-<P>
-Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA  02110,  USA
-<P>
-This page is licensed under a <a rel="license"
+<p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.
-<P>
-Updated:
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<p>Updated:
 <!-- timestamp start -->
-$Date: 2011/07/13 17:30:23 $ $Author: jturner $
+$Date: 2011/08/12 13:52:15 $ $Author: joeko $
 <!-- timestamp end -->
-<HR>
-</BODY>
-</HTML>
+</p>
+</div>
+
+<div id="translations">
+<h4>Translations of this page</h4>
+
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
+<ul class="translations-list">
+<!-- German -->
+<li><a href="/music/gdb-song.de.html">Deutsch</a>&nbsp;[de]</li>
+<!-- English -->
+<li><a href="/music/gdb-song.html">English</a>&nbsp;[en]</li>
+<!-- Korean -->
+<li><a 
href="/music/gdb-song.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
+</ul>
+</div>
+</div>
+</body>
+</html>

Index: till_there_was_gnu.html
===================================================================
RCS file: /web/www/www/music/till_there_was_gnu.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- till_there_was_gnu.html     26 Jan 2011 05:18:02 -0000      1.4
+++ till_there_was_gnu.html     12 Aug 2011 13:52:15 -0000      1.5
@@ -1,37 +1,7 @@
-<!-- Parent-Version: 1.54 $ -->
-
-<!-- This is the template document for GNU web pages.  We use
-     server side includes (#include) for common elements, for
-     instance, the very first line of the file.  If you're reading
-     this in its expanded form, you can retrieve the original source,
-     with the SSI statements intact, from
-     
http://web.cvs.savannah.gnu.org/viewvc/*checkout*/www/server/standards/boilerplate.html?root=www&content-type=text%2Fplain
--->
-
-<!-- Instructions for adapting this boilerplate to a new project: -->
-
-<!-- 1. In the line above starting "Parent-Version:", remove the
-        "$Revision...$" from around the revision number,
-        leaving just Parent-Version: and the number. -->
-
-<!-- 2. Replace "baz" with the name of your project.
-        You should be able to do this with search and replace;
-        making sure that the search is case insensitive and
-        that the case of the replacement matches the case
-        of the string found. In Emacs, query-replace will do this
-        when case-fold-search and case-replace are both non-nil
-        and both search and replacement string are given in lower case. -->
-
-<!-- 3. Of course update the actual information according to your project,
-        such as mailing lists, project locations, and maintainer name.  -->
-
-<!-- 4. You can use the patch-from-parent script to semi-automate
-        merging future changes to the boilerplate with your file:
-        
http://web.cvs.savannah.gnu.org/viewvc/*checkout*/www/server/standards/patch-from-parent?root=www&content-type=text%2Fplain
--->
-
+<!-- Parent-Version: 1.59 -->
 <!--#include virtual="/server/header.html" -->
-<title>'Til There Was GNU</title>
+<title>'Til There Was GNU 
+- GNU Project - Free Software Foundation (FSF)</title>
 <!--#include virtual="/server/banner.html" -->
 <h2>'Til There Was GNU</h2>
 
@@ -39,6 +9,7 @@
 <a href="http://m3m3m3.com/gdbeatles/till_there_was_gnu.html";>          
 Steven R. Champagne</a></strong></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 />
@@ -49,7 +20,7 @@
 all behind a corporate wall<br />
 '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 />
@@ -68,12 +39,13 @@
 with sweet contributions<br />
 from all, it's true</p>
 
-</p>there was code all around<br />
+<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>'till there was gnu</p>
+</div>
 
 <!-- If needed, change the copyright block at the bottom. In general,
      all pages on the GNU web server should have the section about
@@ -81,33 +53,84 @@
      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". -->
+
+<!-- ## Moved here by www-de; add Licensing to be reviewed by Webmaster ## 
+<h3 id="license">Licensing</h3>
+
+<p>Copyright &copy; 2011 Steven R. Champagne</p>
+
+<p><a href="http://m3m3m3.com/gdbeatles/till_there_was_gnu.html";>
+'Till There Was GNU by Steven R.Champagne</a> 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>
+      ## Moved Licensing ends here by www-de to be reviewed by Webmaster ## -->
+
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
 
 <p>Please send general FSF &amp; GNU inquiries to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-There are also <a href="/contact/">other ways to contact</a>
-the FSF.<br />
+<a href="mailto:address@hidden";>&lt;address@hidden&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:address@hidden";>&lt;address@hidden&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>
+
+<!-- ## Added by www-de to be reviewed by Webmasters ##
+<p>Copyright &copy; 2011 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> -->
+
+<!-- ## Moved * start * by www-de to Licensing, to be reviewed by Webmasters; 
-->
 <p>Copyright &copy; 2011 Steven R. Champagne</p>
 
-<a href="http://m3m3m3.com/gdbeatles/till_there_was_gnu.html";>
+<p><a href="http://m3m3m3.com/gdbeatles/till_there_was_gnu.html";>
 'Till There Was GNU by Steven R.Champagne</a> 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>
-
+Attribution-NonCommercial-NoDerivs 3.0 Unported License.</a></p>
+<!-- ## Moved * end * -->
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/01/26 05:18:02 $
+$Date: 2011/08/12 13:52:15 $
 <!-- timestamp end -->
 </p>
 </div>
 
+<div id="translations">
+<h4>Translations of this page</h4>
+
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
+<ul class="translations-list">
+<!-- German -->
+<li><a href="/music/till_there_was_gnu.de.html">Deutsch</a>&nbsp;[de]</li>
+<!-- English -->
+<li><a href="/music/till_there_was_gnu.html">English</a>&nbsp;[en]</li>
+</ul>
+</div>
 </div>
 </body>
 </html>
-

Index: emacsvsvi.html
===================================================================
RCS file: /web/www/www/music/emacsvsvi.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- emacsvsvi.html      13 Jul 2011 17:30:23 -0000      1.6
+++ emacsvsvi.html      12 Aug 2011 13:52:15 -0000      1.7
@@ -1,288 +1,76 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"; lang="en"><head><!-- 
Parent-Version: $Revision: 1.6 $ -->
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<link rev="made" href="mailto:address@hidden";>
-<link rel="icon" type="image/png" 
href="http://www.gnu.org/graphics/gnu-head-mini.png";>
-<meta name="ICBM" content="42.256233,-71.006581">
-<meta name="DC.title" content="gnu.org">
-
-
-<title>Emacs vs VI - GNU Project - Free Software Foundation (FSF)</title>
-<!-- start of banner.html -->
-<!-- start of head-include-2.html -->
-
-<style type="text/css" media="screen">
address@hidden url('/style.css');
-</style>
-
-<style type="text/css" media="handheld">
address@hidden url('/mini.css');
-</style>
-
-<!--[if IE]>
-<link rel="stylesheet" href="/style.css" media="screen" type="text/css" />
-<![endif]-->
-
-<style type="text/css" media="print">
address@hidden url('/print.css');
-</style>
-<meta name="viewport" content="width=320; initial-scale=1.0; 
maximum-scale=1.0; user-scalable=0;">
-<!-- end of head-include-2.html -->
-
-</head><body>
-<div id="toplinks"><span class="netscape4"><a href="#content">Skip to 
content</a> | <a href="#navigation">Skip to navigation</a> | <a 
href="#searcher">Skip to search</a>| </span><a 
href="#translations">Translations of this page</a> | <a 
href="http://www.gnu.org/accessibility/";>Accessibility</a></div>
-
-
-<div id="null-wrapper">
-
-      <div id="header">
-        <div class="inner" style="position: relative;">
-
-        <h1 id="logo"><a href="http://www.gnu.org/";>The GNU Operating 
System</a></h1>
-
-               <div id="fssbox">
-         <h4>Sign up for the <em>Free Software Supporter</em></h4>
-         <p>A monthly update on GNU and the FSF</p>
-         <form action="http://lists.fsf.org/mailman/subscribe/info-fsf"; 
method="post">
-         <p><input id="frmEmail" name="email" size="15" maxlength="80" 
value="address@hidden" onfocus="this.value=''" type="text"> &nbsp; <input 
value="Ok" type="submit"></p>
-         </form>
-       </div>
-
-
-       
-       </div>
-
-      </div>
-
-      <div id="navigation">
-        <div class="inner">
-        <ul>
-          <li id="tabPhilosophy"><a 
href="http://www.gnu.org/philosophy/philosophy.html";>Philosophy</a></li>
-          <li id="tabLicenses"><a 
href="http://www.gnu.org/licenses/licenses.html";>Licenses</a></li>     
-          <li id="tabSoftware"><a 
href="http://www.gnu.org/software/software.html";>Downloads</a></li>
-          <li id="tabDoc"><a 
href="http://www.gnu.org/doc/doc.html";>Documentation</a></li>
-          <li><a 
href="http://www.gnu.org/help/help.html";>Help&nbsp;GNU</a></li>
-          <li id="joinfsftab"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join the 
FSF!</a></li>
-        </ul>
-
-                         <div id="searcher">
+<!-- Parent-Version: 1.59 -->
+<!--#include virtual="/server/header.html" -->
+<title>Emacs vs VI 
+- GNU Project - Free Software Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<h2>Emacs vs VI</h2>
 
-  <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
-   <div><label class="netscape4" for="phrase">Search:</label>
-   <input name="phrase" id="phrase" size="18" accesskey="s" value="Why 
GNU/Linux?" type="text">
-   <input value="Search" type="submit"></div>
-                                </form>
-                        </div>
+<p><em>(To the tune of &ldquo;Ghost Riders in the Sky&rdquo;, by the 
Outlaws)</em></p>
 
-        </div>
-      </div>
+<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 />
+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 />
+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>
 
-<div id="content" class="inner">
-<!-- end of banner.html -->
+<p>Yippy kai yay&#8230;<br />
+File I/O&#8230;<br />
+Emacs versus vi&#8230; </p>
 
-<h2>Emacs vs VI</h2>
-<h5>(To the tune of "Ghost Riders in the Sky", by the Outlaws)</h5>
-<p>A hacker went a-coding armed with coffee and his brain<br>
-Debating in himself whether to put it all in ’main’<br>
-When all at once his IRC was filled with hateful spite<br>
-A plethora of angry words about syntax highlight<br>
-</p>
-<p>
-Their hands were writing fire and they called each other n00b...<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 ’write and quit’ and ol’ C-x C-c<br>
-</p>
-<p>
-Yippy kai yay...<br>
-File I/O...<br>
-Emacs versus vi...<br>
-</p>
-<p>
-He’d long endured the arguments, he knew the story well...<br>
-So why condemn an editor and all its bytes to Hell?<br>
-From concepts of simplicity to a buffer-based OS...<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’ll not regret one day... <br>
-The time you spent recovering, and throwing chars away... <br>
-What’s popular is never what you’ll get into your head... <br>
-So take a pointer from the pros... and choose the mighty ED! <br>
-</P>
-<p>
-Yippy kai yay... <br>
-File I/O... <br>
-Emacs versus vi... <br>
-</p>
-<p>
-Yippy kai yay... <br>
-File I/O... <br>
-Emacs versus vi.. <br>
+<p>He&#8217;d long endured the arguments, he knew the story well&#8230;<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 
/>
 </p>
-<h4>Other formats</h4>
-<a href="/music/emacsvsvi.tex">Latex</a><br>
-<a href="/music/emacsvsvi.pdf">PDF</a><br>
-<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 class="inner">
-    
-<div class="yui-g" id="fsf-links">
-    <div class="yui-g first">
-
-        <div class="yui-u first" id="sitemap-1">
-
-          <p class="netscape4"><a href="#footer">Skip sitemap</a> or <a 
href="#sitemap-2">skip to licensing items</a></p>
-
-      <ul>
-       <li><a href="http://www.gnu.org/gnu/gnu-history.html";>GNU 
History</a></li>
-        <li><a href="http://www.gnu.org/help/";>Get involved</a>
-
-        <ul>
-
-          <li><a href="http://savannah.gnu.org/people/?type_id=1";>Projects 
that need help</a></li>
-          <li><a 
href="http://www.gnu.org/server/standards/translations/priorities.html#Languages";>Help
 translate this website</a></li>
-        </ul></li>
-        <li><a href="http://www.gnu.org/server/takeaction.html#unmaint";>Take 
over an unmaintained package</a></li>
-        <li><a href="http://www.gnu.org/server/takeaction.html#gnustep";>Use 
GNUstep</a></li>
-         <li><a href="http://www.gnu.org/distros/free-distros.html";>Download 
GNU</a></li>
-         <li><a href="http://directory.fsf.org/GNU/";>GNU packages</a></li>
-         <li><a href="http://www.gnu.org/manual/manual.html";>Free 
documentation</a></li>
-         <li><a href="http://lists.gnu.org/";>GNU mailing lists</a></li>
-         <li><a href="http://savannah.gnu.org/";>GNU savannah</a></li>
-        <li><a href="http://libreplanet.org/";>Connect with free software 
users</a></li>
-       <li><a href="http://www.gnu.org/people/";>GNU's Who?</a></li>
-       <li><a href="http://planet.gnu.org/";>Planet GNU</a></li>
-       <li><a href="http://www.gnu.org/contact/gnu-advisory.html";>GNU Advisory 
Committee</a></li>
-      </ul>
-
-    </div>
-
-    <div class="yui-u" id="sitemap-2">
-
-          <p class="netscape4"><a href="#sitemap-3">Skip to general 
items</a></p>
-
-       <ul>
-        <li><a href="http://www.fsf.org/licensing";>Software licensing</a>
-        <ul>
-        <li><a href="http://www.fsf.org/licensing/education";>Licensing 
education</a></li>
-        <li><a href="http://www.gnu.org/licenses";>Free software licenses</a>
-        <ul>
-        <li><a href="http://www.gnu.org/licenses/gpl.html";>GNU GPL</a></li>
-
-        <li><a href="http://www.gnu.org/licenses/agpl.html";>GNU AGPL</a></li>
-        <li><a href="http://www.gnu.org/licenses/lgpl.html";>GNU LGPL</a></li>
-        <li><a href="http://www.gnu.org/licenses/fdl.html";>GNU 
FDL</a></li></ul></li>
-        <li><a href="http://www.gnu.org/licenses/gpl-faq.html";>Software 
licensing FAQ</a></li>
-        <li><a href="http://www.gnu.org/licenses/gpl-faq.html";>Licensing 
compliance</a></li>
-        <li><a href="http://www.gnu.org/licenses/gpl-faq.html";>How to use GNU 
licenses for your own software</a></li></ul></li>
-       <li><a href="http://www.fsf.org/resources/service/";>GNU Service 
Directory</a></li>
-       <li><a href="http://www.gnu.org/fun/fun.html";>GNU Fun</a></li>
-       <li><a href="http://www.gnu.org/graphics/graphics.html";>GNU Art</a></li>
-       <li><a href="http://www.gnu.org/music/music.html";>Music &amp; 
Songs</a></li>
-
-      </ul>
-
-    
-    </div>
-    </div>
-    <div class="yui-g first">
-        <div class="yui-u first" id="sitemap-3">
-
-          <p class="netscape4"><a href="#sitemap-4">Skip to philosophical 
items</a></p>
-    
-      <ul>
-
-      <li><a href="http://www.fsf.org/news/";>Latest News</a><ul>
-        <li><a href="http://www.fsf.org/events/";>Upcoming Events</a></li>
-      <li><a href="http://www.fsf.org/blogs/";>FSF Blogs</a></li></ul></li>
-      <li><a href="http://www.fsf.org/volunteer";>Volunteering and 
internships</a></li>
-      <li><a href="http://www.fsf.org/resources/hw";>Hardware Database</a></li>
-      <li><a href="http://directory.fsf.org/";>Free Software Directory</a></li>
-
-        <li><a href="http://www.fsf.org/resources/";>Free Software 
Resources</a></li>
-      <li><a href="http://www.fsf.org/associate/";>Associate Members</a></li>
-      <li><a href="http://www.fsf.org/associate/account/";>My FSF 
Account</a></li>
-      <li class="noright"><a 
href="http://www.fsf.org/about/contact.html";>Contact the FSF</a></li>
-      <li><a href="http://audio-video.gnu.org/";>GNU Audio/Video</a></li>
-<li><a 
href="http://www.gnu.org/accessibility/accessibility.html";>Accessibility 
Statement</a></li>
-<li><a href="http://ftp.gnu.org/gnu/";>GNU FTP Site</a>
-    and <a href="http://www.gnu.org/prep/ftp.html";>mirrors</a></li>
-<li><a href="http://www.gnu.org/people/speakers.html";>GNU Speakers</a></li>
-<li><a href="http://www.fsf.org/jobs";>Free software jobs</a></li>
-      </ul>
-
-      
-    </div>
-        <div class="yui-u" id="sitemap-4">
-
-          <p class="netscape4"><a href="#ft">Skip list</a></p>
-
-      <ul>
-            <li><a href="http://donate.fsf.org/";>Donate to the FSF</a></li>
-        <li><a href="http://www.fsf.org/jfb";>Join the FSF</a></li>
-
-        <li><a href="http://www.gnu.org/philosophy/";>Free software 
philosophy</a><ul>
-        <li><a href="http://www.gnu.org/philosophy/free-sw.html";>The Free 
Software Definition</a></li>
-        <li><a href="http://www.gnu.org/philosophy/pragmatic.html";>Copyleft: 
Pragmatic Idealism</a></li>
-        <li><a href="http://www.gnu.org/philosophy/free-doc.html";>Free 
Software and Free Manuals</a></li>
-        <li><a href="http://www.gnu.org/philosophy/selling.html";>Selling Free 
Software</a></li>
-        <li><a href="http://www.gnu.org/philosophy/fs-motives.html";>Motives 
for Writing Free Software</a></li>
-
-        <li><a href="http://www.gnu.org/philosophy/right-to-read.html";>The 
Right To Read</a></li>
-        <li><a 
href="http://www.gnu.org/philosophy/open-source-misses-the-point.html";>Why Open 
Source Misses the Point of Free Software</a></li></ul></li>
-      <li><a href="http://www.gnu.org/software/for-windows.html";>Free software 
for Windows</a></li>
-        <li><a href="http://defectivebydesign.org/";>Defective by Design — 
Fight DRM</a></li>
-  <li><a href="http://windows7sins.org/";>Windows 7 Sins</a></li>
-  <li><a href="http://playogg.org/";>Support free media formats</a></li>
-        </ul>
-    </div>
-    </div>
-</div>
-
-<div class="yui-g" id="mission-statement">
-
-<p><small>The <a href="http://www.fsf.org/";>Free Software
-Foundation</a> is the principal organizational sponsor of the <a 
href="http://www.gnu.org/";>GNU Operating System</a>. <strong>Our
-mission is to preserve, protect and promote the freedom to use, study,
-copy, modify, and redistribute computer software, and to defend the
-rights of Free Software users.</strong></small></p>
-
-<p><small><strong>Support GNU and the FSF by <a 
href="http://shop.fsf.org/";>buying manuals and gear</a>, <a 
href="http://www.fsf.org/join";>joining the FSF as an associate
-member</a> or by <a href="http://donate.fsf.org/";>making a
-donation</a>.</strong></small></p>
 
-<p id="backtotop"><a href="#header">back to top</a></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>
+</div>
 
+<h3 id="download">Other formats</h3>
 
-</div>
+<p><a href="/music/emacsvsvi.tex">Latex</a><br />
+<a href="/music/emacsvsvi.pdf">PDF</a></p>
 
+<h3 id="license">Licensing</h3>
 
-</div>
+<p>Copyright (C) 2010 by James Taylor<br />
+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">
 
 <p>Please send general FSF &amp; GNU inquiries to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-There are also <a href="http://www.gnu.org/contact/";>other ways to contact</a>
-the FSF.<br>
+<a href="mailto:address@hidden";>&lt;address@hidden&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:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>Please see the <a 
href="http://www.gnu.org/server/standards/README.translations.html";>Translations
-README</a> for information on coordinating and submitting translations
-of this article.</p>
+<p>Please see the 
+<a href="/server/standards/README.translations.html">Translations README</a> 
for
+information on coordinating and submitting translations of this article.</p>
 
-<p>Copyright © 2010 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2010 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
@@ -291,7 +79,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/07/13 17:30:23 $
+$Date: 2011/08/12 13:52:15 $
 <!-- timestamp end -->
 </p>
 </div>
@@ -319,9 +107,12 @@
      -->
 
 <ul class="translations-list">
+<!-- German -->
+<li><a 
href="http://www.gnu.org/music/emacsvsvi.de.html";>Deutsch</a>&nbsp;[de]</li>
 <!-- English -->
-<li><a 
href="http://www.gnu.org/server/standards/boilerplate.html";>English</a>&nbsp;[en]</li>
+<li><a 
href="http://www.gnu.org/music/emacsvsvi.html";>English</a>&nbsp;[en]</li>
 </ul>
 </div>
 </div>
-</body></html>
\ No newline at end of file
+</body>
+</html>

Index: music.html
===================================================================
RCS file: /web/www/www/music/music.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- music.html  13 Jul 2011 17:30:23 -0000      1.31
+++ music.html  12 Aug 2011 13:52:15 -0000      1.32
@@ -1,115 +1,119 @@
-
+<!-- Parent-Version: 1.59 -->
 <!--#include virtual="/server/header.html" -->
-<title>GNU Music and songs - GNU Project - Free Software Foundation 
(FSF)</title>
-
+<title>GNU Music and Songs 
+- GNU Project - Free Software Foundation (FSF)</title>
 <!--#include virtual="/server/banner.html" -->
+<h2>GNU Music and Songs</h2>
 
-<h2>GNU Music and songs</h2>
+<p><a href="/graphics/listen.html"><img src="/graphics/listen-tiny.jpg"
+alt="A Listening GNU" width="213" height="130" style="float: right;" /></a></p>
 
 <p>This is a collection of music and songs for the amusement of all 
hackers.</p>
 
-<div style="background-image: url('/graphics/listen-musicpage.jpg'); width: 
300px; height:184px; float: right;">&nbsp;</div>
-
-  <ul>
-    <li>Read the <a href="/music/free-software-song.html">lyrics,
-    score, and source code</a> of the Free Software Song.</li>
-
-    <li>Hear the Song <a href="/music/free-software-song.au">sung</a>
-    by <a href="http://www.stallman.org/";>Richard Stallman</a>
-    himself. (If you are not used to a meter of 7/8, you may
-    perceive it as inability to keep time.)</li>
-
-    <li>Hear the Song <a href="/music/FreeSWSong.ogg">performed</a> 
-    in a good Bulgarian style.</li>
-
-    <li><a href="till_there_was_gnu.html">'Till There Was GNU</a>
-    </li>
-
-    <li>The <a href="/music/blues-song.html">Programmer's Blues</a>
-    song!</li>
-
+<ul>
+  <li>Read the <a href="/music/free-software-song.html">lyrics, score, and
+    source code</a> of the Free Software Song.</li>
+  <li>Hear the Song <a href="/music/free-software-song.au">sung</a> by <a
+    href="http://www.stallman.org/";>Richard Stallman</a> himself. (If you are
+    not used to a meter of 7/8, you may perceive it as inability to keep
+  time.)</li>
+  <li>Hear the Song <a href="/music/FreeSWSong.ogg">performed</a> in a good
+    Bulgarian style.</li>
+  <li><a href="till_there_was_gnu.html">'Til There Was GNU</a> </li>
+  <li>The <a href="/music/blues-song.html">Programmer's Blues</a> song!</li>
     <li><a href="/music/gdb-song.html">The GDB Song</a>!</li>
-
-    <li><a href="/fun/jokes/vi.song.html">Addicted to
-    vi</a>.</li>
-
-    <li><a href="/fun/jokes/welcome-to-gnu-emacs.html">GNU Emacs
-    Song</a>.</li>
-
+  <li><a href="/fun/jokes/vi.song.html">Addicted to vi</a>.</li>
+  <li><a href="/fun/jokes/welcome-to-gnu-emacs.html">GNU Emacs Song</a>.</li>
     <li><a href="/fun/jokes/gnu-song.html">The GNU Song</a></li>
-
-    <li><a href="/fun/jokes/musical-pickup.html">Musical
-    pick-up!</a></li>
-
-    <li><a href="/fun/jokes/eternal-flame.ogg">"God wrote in Lisp
-    code"</a> (See also the <a href=
-    "/fun/jokes/eternal-flame.html">lyrics</a>.)</li>
-
-    <li><a href="/fun/jokes/hackersong.html">If the Beatles were
-    hackers . . .</a></li>
-
-    <li><a href="/fun/jokes/nobody-owns.html">Nobody owns this
-    song</a></li>
-
-    <li><a href="/fun/jokes/wonderful-code.html">What a Wonderful
-    Code</a></li>
-
+  <li><a href="/fun/jokes/musical-pickup.html">Musical pick-up!</a></li>
+  <li><a href="/fun/jokes/eternal-flame.ogg">"God wrote in Lisp code"</a> (See
+    also the <a href="/fun/jokes/eternal-flame.html">lyrics</a>.)</li>
+  <li><a href="/fun/jokes/hackersong.html">If the Beatles were 
Hackers&#8230;</a></li>
+  <li><a href="/fun/jokes/nobody-owns.html">Nobody owns this song</a></li>
+  <li><a href="/fun/jokes/wonderful-code.html">What a Wonderful Code</a></li>
     <li><a href="/fun/jokes/vim-songs.html">VIM Songs</a></li>
-
-    <li><a href="/fun/jokes/hap-bash.html">Happiness is a bash
-    prompt</a></li>
-
-    <li><a href="/fun/jokes/hackforfreedom.html">Hack for Freedom
-    Song</a></li>
-
-    <li><a href="http://infinite-hands.draketo.de";>Infinite
-    Hands</a></li>
+  <li><a href="/fun/jokes/hap-bash.html">Happiness is a bash prompt</a></li>
+  <li><a href="/fun/jokes/hackforfreedom.html">Hack for Freedom Song</a></li>
+  <li><a href="http://infinite-hands.draketo.de";>Infinite Hands</a></li>
     <li><a href="/music/emacsvsvi.html">Emacs vs VI</a></li>
-  </ul>
+</ul>
  
-<img src="/graphics/rms-dinnertime-radio.jpg" width="340" height="255" 
border="0" alt="Dinner Time Radio"/>
-   <p><small>"happiness is a bash prompt"</small></p>
+<div class="image">
+  <p><a href="/fun/jokes/hap-bash.html">
+  <img class="scaled" src="/graphics/rms-dinnertime-radio.jpg"
+    width="340" height="255"
+    alt="Happiness is a bash prompt" /></a></p>
+  <p class="caption">Happiness is a bash prompt</p>
+</div>
 
-<p>You can also listen to Richard Stallman's appearances on the <a 
href="http://web.mit.edu/echemi/www/";>Dinnertime Sampler</a> show on <a 
href="http://wmbr.mit.edu/";>WMBR</a>, the MIT Campus Radio Station. In these 
shows, Richard shares some examples of his eclectic musical tastes with you, 
the listener.</p>
+<p>You can also listen to Richard Stallman's appearances on the <a
+href="http://web.mit.edu/echemi/www/";>Dinnertime Sampler</a> show on <a
+href="http://wmbr.mit.edu/";>WMBR</a>, the MIT Campus Radio Station. In these
+shows, Richard shares some examples of his electric musical tastes with you,
+the listener.</p>
 <ul>
-<li><a href="http://web.mit.edu/echemi/www/stallman.html";>March 
23<sup>rd</sup> 2005</a></li>
-<li><a href="http://web.mit.edu/echemi/www/040324.html";>March 24<sup>th</sup> 
2004</a></li>
+  <li><a href="http://web.mit.edu/echemi/www/stallman.html";>March
+    23<sup>rd</sup> 2005</a></li>
+  <li><a href="http://web.mit.edu/echemi/www/040324.html";>March 24<sup>th</sup>
+    2004</a></li>
 </ul>
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-</div>
 <div id="footer">
 
-<p>Please send FSF &amp; GNU inquiries &amp; questions to 
-
-<a href="mailto:address@hidden";>address@hidden</a>.</p>
-
-<p>There are also <a href="http://www.fsf.org/about/contact.html";>other ways to
-contact</a> the <acronym title="Free Software Foundation">FSF</acronym>.</p>
+<p>Please send general FSF &amp; GNU inquiries to 
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also
+<a href="/contact/">other ways to contact</a> the FSF.<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";>&lt;address@hidden&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 comments on these web pages to <a 
href="mailto:address@hidden";>address@hidden</a>. Send other questions to <a 
href="mailto:address@hidden";>address@hidden</a></p>
-
-<p>Copyright &copy; 1999, 2001, 2005, 2006, 2007 Free Software Foundation, 
Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301,  USA</p>
+<p>Copyright &copy; 1999, 2001, 2005, 2006, 2007 Free Software Foundation, Inc.
+<!-- , 51 Franklin St, Fifth Floor, Boston, MA  02110-1301,  USA --></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>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
-<p>
-Updated:
+<p>Updated:
 <!-- timestamp start -->
-$Date: 2011/07/13 17:30:23 $ $Author: jturner $
+$Date: 2011/08/12 13:52:15 $ $Author: joeko $
 <!-- timestamp end -->
 </p>
 </div>
 
 <div id="translations">
 <h4>Translations of this page</h4>
+
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
+
 <ul class="translations-list">
-<li><a href="/music/music.html">English</a></li>
-<li><a href="/music/music.ko.html">Korean</a></li>
+<!-- German -->
+<li><a href="/music/music.de.html">Deutsch</a>&nbsp;[de]</li>
+<!-- English -->
+<li><a href="/music/music.html">English</a>&nbsp;[en]</li>
+<!-- Korean -->
+<li><a href="/music/music.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
 </ul>
 </div> 
 </div>

Index: blues-song.html
===================================================================
RCS file: /web/www/www/music/blues-song.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- blues-song.html     19 Jan 2011 14:40:43 -0000      1.5
+++ blues-song.html     12 Aug 2011 13:52:15 -0000      1.6
@@ -1,94 +1,95 @@
+<!-- Parent-Version: 1.59 -->
 <!--#include virtual="/server/header.html" -->
-
-<title>The Programmer's Blues - GNU Project - Free Software Foundation 
(FSF)</title>
-
+<title>The Programmer's Blues 
+- GNU Project - Free Software Foundation (FSF)</title>
 <!--#include virtual="/server/banner.html" -->
-
 <h2>The Programmer's Blues</h2>
 
-<em>[ with apologies to Glenn Frye ]</em>
-<p>    
-There's trouble in the data now, I can feel it in my bones,<br />
+<p><em>(with apologies to Glenn Frye)</em></p>
+
+<div class="lyrics">
+<p>There's trouble in the data now, I can feel it in my bones,<br />
 Had a premonition that I shouldn't program alone,<br />
 Had the new Rev loaded but I didn't think it'd fry,<br />
 Then everything exploded and 2 weeks work blew sky-high!</p>
-<p>
-So baby here's a printout and a keyboard in your hand,<br />
+
+<p>So baby here's a printout and a keyboard in your hand,<br />
 And here's a little floppy. Now, do it just the way he planned,<br />
 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...</p>
-<p>
-Programmer's blues...</p>
-<p>
-Coder's and analyst's, hacker's and sysop's,<br />
+
+<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>
+
+<p>Programmer's blues&#8230;</p>
+
+<p>Coder's and analyst's, hacker's and sysop's,<br />
 The comments and strange bomboffs, and the bugs nobody copped,<br />
 No matter if it's Pascal, Basic, or Cobol,<br />
 You've got to carry manuals, there's no online help at all!</p>
-<p>
-It's lots of rotten coffee, and lots of dirty food,<br />
+
+<p>It's lots of rotten coffee, and lots of dirty food,<br />
 Every variable name is dangerous, it might have been pre-used,<br />
 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...</p>
-<p>
-Programmer's blues...</p>
-<p>
-You see it in the memos, you read them every day,<br />
+
+<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>
+
+<p>Programmer's blues&#8230;</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 />
 No matter how hard you work, it just won't run ok,<br />
 You bury them in subroutines, but you know they are here to stay!</p>
-<p>
-You hope that none'll notice them, but they always seem to do,<br />
+
+<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...</p>
-<p>
-Heat's on you...</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...</p>
-<p>
-Programmer's blues...</p>
-
-<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 joke on this page was
-obtained from the FSF's <a href="http://lists.gnu.org/";>email
+Down from the office of your manager, you learn the heat's on you&#8230;</p>
+
+<p>Heat's on you&#8230;</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>
+
+<p>Programmer's blues&#8230;</p>
+</div>
+
+<!-- div class="infobox" -->
+<!-- h3 id="Disclaimer">Disclaimer</h3 -->
+<h3 id="license">Disclaimer</h3>
+
+<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 class="infobox" -->
 
-</div>
+<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor Collection.</p>
 
-<!--#include virtual="/server/footer-min.html" -->
 
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
 <div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.  There are
-also <a href="http://www.fsf.org/about/contact.html";>other ways to
-contact</a> the FSF.  
-<br />
-Please send broken links and other corrections (or suggestions) to
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
-</p>
 
-<p>
-Please see the 
-<a href="/server/standards/README.translations">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:address@hidden";>&lt;address@hidden&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:address@hidden";>&lt;address@hidden&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>
+
+<!-- ## Added by www-de, to be reviewed by Webmasters ##
+<p>Copyright &copy; 2011 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>-->
 
-<p>
-Updated:
+<p>Updated:
 <!-- timestamp start -->
-$Date: 2011/01/19 14:40:43 $
+$Date: 2011/08/12 13:52:15 $
 <!-- timestamp end -->
 </p>
 </div>
@@ -96,24 +97,31 @@
 <div id="translations">
 <h4>Translations of this page</h4>
 
-  <!-- Please keep this list alphabetical, and in the original -->
-  <!-- language if possible, otherwise default to English -->
-  <!-- If you do not have it English, please comment what the -->
-  <!-- English is.  If you add a new language here, please -->
-  <!-- advise address@hidden and add it to -->
-  <!--    - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
-  <!--    - in /home/www/html/server/standards/README.translations.html -->
-  <!--      one of the lists under the section "Translations Underway" -->
-  <!--    - if there is a translation team, you also have to add an alias -->
-  <!--      to mail.gnu.org:/com/mailer/aliases -->
-  <!-- Please also check you have the 2 letter language code right versus -->
-  <!--     http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
+<!-- Please keep this list alphabetical by language code.
+     Comment what the language is for each type, i.e. de is German.
+     Write the language name in its own language (Deutsch) in the text.
+     If you add a new language here, please
+     advise address@hidden and add it to
+      - /home/www/html/server/standards/README.translations.html
+      - one of the lists under the section "Translations Underway"
+      - if there is a translation team, you also have to add an alias
+      to mail.gnu.org:/com/mailer/aliases
+     Please also check you have the language code right; see:
+     http://www.loc.gov/standards/iso639-2/php/code_list.php
+     If the 2-letter ISO 639-1 code is not available,
+     use the 3-letter ISO 639-2.
+     Please use W3C normative character entities.
+
+     See also '(web-trans)Capitalization':
+     
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
+     -->
 
 <ul class="translations-list">
+<!-- German -->
+<li><a href="/music/blues-song.de.html">Deutsch</a>&nbsp;[de]</li>
 <!-- English -->
 <li><a href="/music/blues-song.html">English</a>&nbsp;[en]</li>
 </ul>
-
 </div>
 </div>
 </body>



reply via email to

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