From owner-freebsd-bugs Mon Jan 27 17:30:09 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id RAA04988 for bugs-outgoing; Mon, 27 Jan 1997 17:30:09 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id RAA04976; Mon, 27 Jan 1997 17:30:05 -0800 (PST) Date: Mon, 27 Jan 1997 17:30:05 -0800 (PST) Message-Id: <199701280130.RAA04976@freefall.freebsd.org> To: freebsd-bugs Cc: From: j@uriah.heep.sax.de (J Wunsch) Subject: Re: bin/2600: fortunes : fortunes2 Lite2 merge Reply-To: j@uriah.heep.sax.de (J Wunsch) Sender: owner-bugs@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk The following reply was made to PR bin/2600; it has been noted by GNATS. 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. ;-)