From proff@profane.iq.org  Mon Jan 27 02:30:30 1997
Received: from profane.iq.org (profane.iq.org [203.4.184.217])
          by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id CAA29829
          for <FreeBSD-gnats-submit@freebsd.org>; Mon, 27 Jan 1997 02:30:15 -0800 (PST)
Received: (from proff@localhost)
          by profane.iq.org (8.8.4/8.8.2) id VAA24164;
          Mon, 27 Jan 1997 21:30:55 +1100 (EST)
Message-Id: <199701271030.VAA24164@profane.iq.org>
Date: Mon, 27 Jan 1997 21:30:55 +1100 (EST)
From: Julian Assange <proff@iq.org>
Reply-To: proff@iq.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: <Synopsis of the problem (one line)> fortunes :  fortunes2 Lite2 merge
X-Send-Pr-Version: 3.2

>Number:         2600
>Category:       bin
>Synopsis:       fortunes & fortunes2 Lite2 merge
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:
>Keywords:
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 27 02:40:02 PST 1997
>Closed-Date:    Mon Jan 27 21:37:10 PST 1997
>Last-Modified:  Mon Jan 27 22:20:02 PST 1997
>Originator:     Julian Assange
>Release:        FreeBSD 3.0-CURRENT i386
>Organization:
>Environment:

	

>Description:

	

>How-To-Repeat:

	

>Fix:
	
	


--- /usr/src/games/fortune/datfiles/fortunes2	Wed Jan  8 21:39:07 1997
+++ src/games/fortune/datfiles/fortunes2	Mon Jan  3 09:58:38 1994
@@ -12663,6 +12663,8 @@
 %
 Caution: Keep out of reach of children.
 %
+CChheecckk yyoouurr dduupplleexx sswwiittcchh..
+%
 CCI Power 6/40: one board, a megabyte of cache, and an attitude...
 %
 Celebrate Hannibal Day this year.  Take an elephant to lunch.
@@ -20431,10 +20433,10 @@
 
 Call (511) 338-0959 for an immediate appointment.
 %
-Hier liegt ein Mann ganz ohnegleich;
-Im Leibe dick, an Suenden reich.
+Hier liegt ein Mann ganz obnegleich;
+Im Leibe dick, an Suden reich.
 Wir haben ihn in das Grab gesteckt,	Here lies a man with sundry flaws
-Weil es uns duenkt er sei verreckt.	And numerous Sins upon his head;
+Weil es uns dunkt er sei verreckt.	And numerous Sins upon his head;
 					We buried him today because
 					As far as we can tell, he's dead.
 
@@ -36422,6 +36424,26 @@
 trivially equivalent, so the only important n are n less than n.  We can
 take n = n (from above), so it's true for n+1 becuase it's just about n.
 	QED.	(QED translates from the Latin as "So what?")
+%
+Proof techniques #2: Proof by Oddity.
+	SAMPLE: To prove that horses have an infinite number of legs.
+[1] Horses have an even number of legs.
+[2] They have two legs in back and fore legs in front.
+[3] This makes a total of six legs,
+	which certainly is an odd number of legs for a horse.
+[4] But the only number that is both odd and even is infinity. 
+[5] Therefore, horses must have an infinite number of legs.
+
+Topics is be covered in future issues include proof by:
+	intimidation,
+	gesticulation (handwaving),
+	"try it; it works",
+	constipation (I was just sitting there and...),
+	blatant assertion,
+	changing all the 2's to n's,
+	mutual consent,
+	lack of a counterexample, and,
+	"it stands to reason".
 %
 Proper treatment will cure a cold in seven days,
 but left to itself, a cold will hang on for a week.
--- /usr/src/games/fortune/datfiles/fortunes	Sun Jan 26 21:25:54 1997
+++ src/games/fortune/datfiles/fortunes	Mon Jan  3 10:14:51 1994
@@ -2518,7 +2518,7 @@
 %
 Caution: breathing may be hazardous to your health.
 %
-CChheecckk  yyoouurr  dduupplleexx  sswwiittcchh..
+CChheecckk yyoouurr dduupplleexx sswwiittcchh..
 %
 Cecil, you're my final hope
 Of finding out the true Straight Dope
@@ -5320,10 +5320,10 @@
 motto is:  'It is very difficult to disprove certain kinds of pain.'"
 		-- Dave Barry, "Pain and Suffering"
 %
-Hier liegt ein Mann ganz ohnegleich;
-Im Leibe dick, an Suenden reich.
+Hier liegt ein Mann ganz obnegleich;
+Im Leibe dick, an Suden reich.
 Wir haben ihn in das Grab gesteckt,	Here lies a man with sundry flaws
-Weil es uns duenkt er sei verreckt.	And numerous Sins upon his head;
+Weil es uns dunkt er sei verreckt.	And numerous Sins upon his head;
 					We buried him today because
 					As far as we can tell, he's dead.
 		-- PDQ Bach's epitaph, as requested by his cousin Betty
@@ -8579,8 +8579,8 @@
 Malek's Law:
 	Any simple idea will be worded in the most complicated way.
 %
-Man 1:	Ask me.  "What is the most important thing about telling a good
-	joke?"
+Man 1:	Ask me the what the most important thing about telling a good
+	joke is.
 
 Man 2:	OK, what is the most impo --
 
@@ -10547,7 +10547,7 @@
 (4) But the only number that is both odd and even is infinity. 
 (5) Therefore, horses must have an infinite number of legs.
 
-Topics to be covered in future issues include proof by:
+Topics is be covered in future issues include proof by:
 	Intimidation
 	Gesticulation (handwaving)
 	"Try it; it works"
@@ -16278,7 +16278,7 @@
 "Yow!  Am I having fun yet?"
 		-- Zippy the Pinhead
 %
-YOW!!  Everybody out of the GENETIC POOL!
+YOW!!  Everybody out of the GENETIC POOL!"
 %
 Zero Defects, n.:
 	The result of shutting down a production line.
>Release-Note:
>Audit-Trail:

From: j@uriah.heep.sax.de (J Wunsch)
To: proff@iq.org
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: bin/2600: fortunes :  fortunes2 Lite2 merge
Date: Mon, 27 Jan 1997 21:09:27 +0100

 As Julian Assange wrote:
 
 > >Synopsis:       fortunes & fortunes2 Lite2 merge
 
 Ick.  You've broken the FreeBSD corrections with this. :-(
 
 Merges like these should be handled on a vendor-branch, so the local
 edits can be retained.
 
 For example:
 
 > @@ -20431,10 +20433,10 @@
 >  
 >  Call (511) 338-0959 for an immediate appointment.
 >  %
 > -Hier liegt ein Mann ganz ohnegleich;
 > -Im Leibe dick, an Suenden reich.
 > +Hier liegt ein Mann ganz obnegleich;
 > +Im Leibe dick, an Suden reich.
 >  Wir haben ihn in das Grab gesteckt,	Here lies a man with sundry flaws
 > -Weil es uns duenkt er sei verreckt.	And numerous Sins upon his head;
 > +Weil es uns dunkt er sei verreckt.	And numerous Sins upon his head;
 
 You're trying to un-germanize this again.  Whoever wrote it in the
 first place didn't have much clues about german.
 
 
 Looking into everything, this one is the only real addition that
 remains:
 
 --- /usr/src/games/fortune/datfiles/fortunes2	Wed Jan  8 21:39:07 1997
 +++ src/games/fortune/datfiles/fortunes2	Mon Jan  3 09:58:38 1994
 @@ -36422,6 +36424,26 @@
  trivially equivalent, so the only important n are n less than n.  We can
  take n = n (from above), so it's true for n+1 becuase it's just about n.
  	QED.	(QED translates from the Latin as "So what?")
 +%
 +Proof techniques #2: Proof by Oddity.
 +	SAMPLE: To prove that horses have an infinite number of legs.
 +[1] Horses have an even number of legs.
 +[2] They have two legs in back and fore legs in front.
 +[3] This makes a total of six legs,
 +	which certainly is an odd number of legs for a horse.
 +[4] But the only number that is both odd and even is infinity. 
 +[5] Therefore, horses must have an infinite number of legs.
 +
 +Topics is be covered in future issues include proof by:
 +	intimidation,
 +	gesticulation (handwaving),
 +	"try it; it works",
 +	constipation (I was just sitting there and...),
 +	blatant assertion,
 +	changing all the 2's to n's,
 +	mutual consent,
 +	lack of a counterexample, and,
 +	"it stands to reason".
  %
  Proper treatment will cure a cold in seven days,
  but left to itself, a cold will hang on for a week.
 
 -- 
 cheers, J"org
 
 joerg_wunsch@uriah.heep.sax.de -- http://www.sax.de/~joerg/ -- NIC: JW11-RIPE
 Never trust an operating system you don't have sources for. ;-)
State-Changed-From-To: open->closed 
State-Changed-By: mpp 
State-Changed-When: Mon Jan 27 21:37:10 PST 1997 
State-Changed-Why:  
The provided diffs remove local FreeBSD fixes or re-add duplicate 
entries that were removed. 

From: Mike Pritchard <mpp>
To: proff@iq.org
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: bin/2600: <Synopsis of the problem (one line)> fortunes :  fortunes2 Lite2 merge
Date: Mon, 27 Jan 1997 21:32:15 -0800 (PST)

 Julian Assange wrote:
 > 
 > 
 > >Number:         2600
 > >Category:       bin
 > 
 > --- /usr/src/games/fortune/datfiles/fortunes2	Wed Jan  8 21:39:07 1997
 > +++ src/games/fortune/datfiles/fortunes2	Mon Jan  3 09:58:38 1994
 > @@ -12663,6 +12663,8 @@
 > [patches deleted]
 
 These patches actually undo some fixes I have applied over the past month
 or so.
 --
 Mike Pritchard
 mpp@FreeBSD.org
 "Go that way.  Really fast.  If something gets in your way, turn"

From: John-Mark Gurney <jmg@nike.efn.org>
To: J Wunsch <joerg_wunsch@uriah.heep.sax.de>
Cc: freebsd-bugs@freefall.freebsd.org,
        freebsd-gnats-submit@freefall.freebsd.org
Subject: Re: bin/2600: fortunes :  fortunes2 Lite2 merge
Date: Mon, 27 Jan 1997 22:12:37 -0800 (PST)

 On Mon, 27 Jan 1997, J Wunsch wrote:
 
 >  Looking into everything, this one is the only real addition that
 >  remains:
 >  
 >  --- /usr/src/games/fortune/datfiles/fortunes2	Wed Jan  8 21:39:07 1997
 >  +++ src/games/fortune/datfiles/fortunes2	Mon Jan  3 09:58:38 1994
 >  @@ -36422,6 +36424,26 @@
 >   trivially equivalent, so the only important n are n less than n.  We can
 >   take n = n (from above), so it's true for n+1 becuase it's just about n.
 >   	QED.	(QED translates from the Latin as "So what?")
 >  +%
 >  +Proof techniques #2: Proof by Oddity.
 >  +	SAMPLE: To prove that horses have an infinite number of legs.
 >  +[1] Horses have an even number of legs.
 >  +[2] They have two legs in back and fore legs in front.
 >  +[3] This makes a total of six legs,
 >  +	which certainly is an odd number of legs for a horse.
 >  +[4] But the only number that is both odd and even is infinity. 
 >  +[5] Therefore, horses must have an infinite number of legs.
 >  +
 >  +Topics is be covered in future issues include proof by:
 >  +	intimidation,
 >  +	gesticulation (handwaving),
 >  +	"try it; it works",
 >  +	constipation (I was just sitting there and...),
 >  +	blatant assertion,
 >  +	changing all the 2's to n's,
 >  +	mutual consent,
 >  +	lack of a counterexample, and,
 >  +	"it stands to reason".
 >   %
 >   Proper treatment will cure a cold in seven days,
 >   but left to itself, a cold will hang on for a week.
 
 but this fortune was removed in r1.3 for fortune2 because it was a
 duplicate from fortune...  plus it has that same mistake that fortune
 has...
 
 it should be "Topics to be covered in ..." instead of "Topic is be
 converted in ..."
 
 John-Mark
 
 gurney_j@efn.org
 http://resnet.uoregon.edu/~gurney_j/
 Modem/FAX: (541) 683-6954   (FreeBSD Box)
 
 Live in Peace, destroy Micro$oft, support free software, run FreeBSD (unix)
 
 
>Unformatted:
