www/fun humor.de.html humor.fr.html humor.html ...

[John Sullivan]

CVSROOT:        /web/www
Module name:    www
Changes by:     John Sullivan <johnsu01>        18/10/11 18:44:34

Modified files:
        fun            : humor.de.html humor.fr.html humor.html 
                         humor.ja.html humor.ru.html humor.sq.html 
                         humor.zh-cn.html humor.zh-tw.html 
Removed files:
        fun/jokes      : clinton.tree.html clinton.tree.txt 

Log message:
        remove partisan joke that also doesn't seem to be a joke

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.de.html?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.fr.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.html?cvsroot=www&r1=1.98&r2=1.99
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.ja.html?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.ru.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.sq.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.zh-cn.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.zh-tw.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/clinton.tree.html?cvsroot=www&r1=1.16&r2=0
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/clinton.tree.txt?cvsroot=www&r1=1.1&r2=0

Patches:
Index: humor.de.html
===================================================================
RCS file: /web/www/www/fun/humor.de.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- humor.de.html       10 Oct 2018 14:02:36 -0000      1.53
+++ humor.de.html       11 Oct 2018 22:44:33 -0000      1.54
@@ -187,8 +187,6 @@
 häufig-vorkommende Wörter</li>
   <li><a href="/fun/jokes/bug.war.html" hreflang="en">Ein Krieg gegen
 Programmfehler!</a></li>
-  <li><a href="/fun/jokes/clinton.tree.html" hreflang="en">Wenn Clinton ein 
Baum
-wäre &hellip;</a></li>
   <li><a href="/fun/jokes/courtroom.quips.html" hreflang="en">Lustige
 Gerichtsurteile</a></li>
   <li><a href="/fun/jokes/fsf-in-german.html" hreflang="en">FSF auf 
Deutsch</a></li>
@@ -320,7 +318,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Letzte Änderung:
 
-$Date: 2018/10/10 14:02:36 $
+$Date: 2018/10/11 22:44:33 $
 
 <!-- timestamp end -->
 </p>

Index: humor.fr.html
===================================================================
RCS file: /web/www/www/fun/humor.fr.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- humor.fr.html       10 Oct 2018 14:02:36 -0000      1.43
+++ humor.fr.html       11 Oct 2018 22:44:34 -0000      1.44
@@ -164,7 +164,6 @@
 <a href= "http://www.stallman.org/";>rms</a></li>
   <li><a href="/fun/jokes/anagrams.html">Anagrames</a> de quelques mots 
courants</li>
   <li>Une guerre contre les <a href="/fun/jokes/bug.war.html">bogues</a>Â 
!</li>
-  <li><a href="/fun/jokes/clinton.tree.html">Si Clinton était un 
arbre&hellip;</a></li>
   <li><a href="/fun/jokes/courtroom.quips.html">Entendu au tribunal</a></li>
   <li><a href="/fun/jokes/fsf-in-german.html">FSF en allemand</a></li>
   <li><a href="/fun/jokes/gospel.html">Évangile</a></li>
@@ -295,7 +294,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2018/10/10 14:02:36 $
+$Date: 2018/10/11 22:44:34 $
 
 <!-- timestamp end -->
 </p>

Index: humor.html
===================================================================
RCS file: /web/www/www/fun/humor.html,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- humor.html  10 Oct 2018 14:02:36 -0000      1.98
+++ humor.html  11 Oct 2018 22:44:34 -0000      1.99
@@ -166,8 +166,6 @@
   <li><a href="/fun/jokes/anagrams.html">Anagrams</a> for some common
   words</li>
   <li>A war against <a href="/fun/jokes/bug.war.html">Bugs</a>!</li>
-  <li><a href="/fun/jokes/clinton.tree.html">If Clinton was a
-  tree&hellip;</a></li>
   <li>Funny <a href="/fun/jokes/courtroom.quips.html">Court
   Statements</a></li>
   <li><a href="/fun/jokes/fsf-in-german.html">FSF in German</a></li>
@@ -279,7 +277,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/10/10 14:02:36 $
+$Date: 2018/10/11 22:44:34 $
 <!-- timestamp end -->
 </p>
 </div>

Index: humor.ja.html
===================================================================
RCS file: /web/www/www/fun/humor.ja.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- humor.ja.html       10 Oct 2018 14:02:36 -0000      1.47
+++ humor.ja.html       11 Oct 2018 22:44:34 -0000      1.48
@@ -143,7 +143,6 @@
 href="/fun/jokes/luser-vs-rms.html">対話</a></li>
   <li>いくつかの一般的な言葉の<a 
href="/fun/jokes/anagrams.html">アナグラム</a></li>
   <li><a href="/fun/jokes/bug.war.html">バグども</a>と戦争だ!</li>
-  <li><a href="/fun/jokes/clinton.tree.html">もしもクリントンが木だ
ったら&hellip;</a></li>
   <li>おかしな<a 
href="/fun/jokes/courtroom.quips.html">裁判所判決</a></li>
   <li><a href="/fun/jokes/fsf-in-german.html">FSFをドイツ語で</a></li>
   <li><a href="/fun/jokes/gospel.html">ゴスペル</a></li>
@@ -256,7 +255,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2018/10/10 14:02:36 $
+$Date: 2018/10/11 22:44:34 $
 
 <!-- timestamp end -->
 </p>

Index: humor.ru.html
===================================================================
RCS file: /web/www/www/fun/humor.ru.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- humor.ru.html       10 Oct 2018 14:02:36 -0000      1.6
+++ humor.ru.html       11 Oct 2018 22:44:34 -0000      1.7
@@ -161,7 +161,6 @@
 пользователя</a> с <a href="http://www.stallman.org/";>rms</a></li>
   <li><a href="/fun/jokes/anagrams.html">Анаграммы</a> 
некоторых общих слов</li>
   <li><a href="/fun/jokes/bug.war.html">Ошибкам&nbsp;&mdash; 
бой</a>!</li>
-  <li><a href="/fun/jokes/clinton.tree.html">Если бы Клинтон 
был деревом...</a></li>
   <li>Забавные <a 
href="/fun/jokes/courtroom.quips.html">заявления на суде</a></li>
   <li><a href="/fun/jokes/fsf-in-german.html">ФСПО 
по-немецки</a></li>
   <li><a href="/fun/jokes/gospel.html">Евангелие</a></li>
@@ -290,7 +289,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2018/10/10 14:02:36 $
+$Date: 2018/10/11 22:44:34 $
 
 <!-- timestamp end -->
 </p>

Index: humor.sq.html
===================================================================
RCS file: /web/www/www/fun/humor.sq.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- humor.sq.html       10 Oct 2018 14:02:36 -0000      1.8
+++ humor.sq.html       11 Oct 2018 22:44:34 -0000      1.9
@@ -274,7 +274,6 @@
        <a href="http://www.stallman.org/";>rms</a>.
   </li><li><a href="/fun/jokes/anagrams.html">Anagrama</a> p&euml;r disa 
fjal&euml; t&euml; zakonshme.
   </li><li>Luft&euml; kund&euml;r <a 
href="/fun/jokes/bug.war.html">"Bug"-esh</a>!.
-  </li><li><a href="/fun/jokes/clinton.tree.html">Po t&euml; qe Clinton-i 
nj&euml; pem&euml; ...</a>
   </li><li><a href="/fun/jokes/courtroom.quips.html">Deklarata Zbavit&euml;se 
Gjyukatash</a>.
   </li><li><a href="/fun/jokes/foreign-signs.html">Shenja t&euml; Huaja</a>.
   </li><li><a href="/fun/jokes/fsf-in-german.html">FSF n&euml; Gjermanisht</a>.
@@ -360,7 +359,7 @@
 
 <p>P&euml;rdit&euml;suar:
 <!-- timestamp start -->
-$Date: 2018/10/10 14:02:36 $ $Author: johnsu01 $
+$Date: 2018/10/11 22:44:34 $ $Author: johnsu01 $
 <!-- timestamp end -->
 </p>
 </div>

Index: humor.zh-cn.html
===================================================================
RCS file: /web/www/www/fun/humor.zh-cn.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- humor.zh-cn.html    10 Oct 2018 14:02:36 -0000      1.8
+++ humor.zh-cn.html    11 Oct 2018 22:44:34 -0000      1.9
@@ -144,7 +144,6 @@
 "http://www.stallman.org/";>rms</a></li>
   <li>关于某些常见字的<a 
href="/fun/jokes/anagrams.html">谜语</a></li>
   <li>针对<a href="/fun/jokes/bug.war.html">虫子/故
障</a>的战争！</li>
-  <li><a href="/fun/jokes/clinton.tree.html">如果克林顿是棵æ 
‘&hellip;</a></li>
   <li>可笑的<a href="/fun/jokes/courtroom.quips.html">法庭陈述</a></li>
   <li><a href="/fun/jokes/fsf-in-german.html">FSF的德语意思</a></li>
   <li><a href="/fun/jokes/gospel.html">福音</a></li>
@@ -258,7 +257,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/10/10 14:02:36 $
+$Date: 2018/10/11 22:44:34 $
 
 <!-- timestamp end -->
 </p>

Index: humor.zh-tw.html
===================================================================
RCS file: /web/www/www/fun/humor.zh-tw.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- humor.zh-tw.html    10 Oct 2018 14:02:36 -0000      1.5
+++ humor.zh-tw.html    11 Oct 2018 22:44:34 -0000      1.6
@@ -210,7 +210,6 @@
   <A HREF="/fun/jokes/luser-vs-rms.html">¤¬°Ê</a> ¡C
   <LI>address@hidden <A HREF="/fun/jokes/anagrams.html">ÄA­Ë´åÀ¸</a> ¡C
   <LI>¦P <A HREF="/fun/jokes/bug.war.html">¯äÂÎ</A> ªº¾Ôª§!
-  <LI><a href="/fun/jokes/clinton.tree.html">address@hidden</a>
   <LI>¦³½ìªº <a href="/fun/jokes/courtroom.quips.html">ªk®x«Å§P</a> ¡C
   <LI><a href="/fun/jokes/foreign-signs.html">¥~°êªº­·«U</a> ¡C
   <LI><a href="/fun/jokes/fsf-in-german.html">¼w»y¤¤ªº FSF</a> ¡C
@@ -292,7 +291,7 @@
 <P>
 Updated:
 <!-- timestamp start -->
-$Date: 2018/10/10 14:02:36 $ $Author: johnsu01 $
+$Date: 2018/10/11 22:44:34 $ $Author: johnsu01 $
 <!-- timestamp end -->
 <HR>
 </BODY>

Index: jokes/clinton.tree.html
===================================================================
RCS file: jokes/clinton.tree.html
diff -N jokes/clinton.tree.html
--- jokes/clinton.tree.html     13 Sep 2015 16:51:10 -0000      1.16
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,87 +0,0 @@
-<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.78 -->
-<title>If Clinton was a tree!
-- GNU Project - Free Software Foundation</title>
-<!--#include virtual="/fun/jokes/po/clinton.tree.translist" -->
-<!--#include virtual="/server/banner.html" -->
-<h2>If Clinton was a tree!</h2>
-
-<p class="lyrics">
-I'M GLAD I AM AMERICAN<br />
-I'M GLAD THAT I AM &ldquo;FREE&rdquo;<br />
-BUT, I WISH I WAS A GREAT BIG DOG<br />
-AND BILL CLINTON WAS A TREE!
-</p>
-
-<p>This joke is also available in <a href="/fun/jokes/clinton.tree">
-plain text</a>.</p>
-
-<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
-Collection.</p>
-
-<h3 id="Disclaimer">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><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
-<div id="footer">
-<div class="unprintable">
-
-<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.  Broken links and other corrections or suggestions can be sent
-to <a href="mailto:address@hidden";>&lt;address@hidden&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:address@hidden";>
-        &lt;address@hidden&gt;</a>.</p>
-
-        <p>For information on coordinating and submitting 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>
-</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).
-     
-     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:51:10 $
-<!-- timestamp end -->
-</p>
-</div>
-</div>
-</body>
-</html>

Index: jokes/clinton.tree.txt
===================================================================
RCS file: jokes/clinton.tree.txt
diff -N jokes/clinton.tree.txt
--- jokes/clinton.tree.txt      23 Dec 2011 05:23:56 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-I'M GLAD I AM AMERICAN
-I'M GLAD THAT I AM "FREE"
-BUT, I WISH I WAS A GREAT BIG DOG
-AND BILL CLINTON WAS A TREE!