From nobody@FreeBSD.org  Mon Apr 23 09:43:26 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5A4F716A401
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 23 Apr 2007 09:43:26 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 3357813C45B
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 23 Apr 2007 09:43:26 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l3N9hPOC080046
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 23 Apr 2007 09:43:26 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l3N9cOh2078084;
	Mon, 23 Apr 2007 09:38:24 GMT
	(envelope-from nobody)
Message-Id: <200704230938.l3N9cOh2078084@www.freebsd.org>
Date: Mon, 23 Apr 2007 09:38:24 GMT
From: Niclas Zeising<niclas.zeising@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] misc fixes to fortunes
X-Send-Pr-Version: www-3.0

>Number:         112024
>Category:       conf
>Synopsis:       [patch] misc fixes to fortunes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 23 09:50:04 GMT 2007
>Closed-Date:    Sun Jun 07 04:35:21 UTC 2009
>Last-Modified:  Sun Jun  7 04:50:00 UTC 2009
>Originator:     Niclas Zeising
>Release:        7.0-CURRENT
>Organization:
N/A
>Environment:
>Description:
Here is a patch with som misc fixes to src/games/fortune/datfiles/fortunes . It's mostly whitespace, spelling and removal of some duplicate fortunes.
>How-To-Repeat:
N/A
>Fix:
The attached patch removes the duplicate fortunes and changes the whitespace and spelling.
>Release-Note:
>Audit-Trail:

From: "Niclas Zeising" <niclas.zeising@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org, freebsd-bugs@freebsd.org
Cc:  
Subject: Re: misc/112024: [patch] misc fixes to fortunes
Date: Mon, 23 Apr 2007 12:52:18 +0200

 ------=_Part_148800_25722856.1177325538069
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 On 4/23/07, FreeBSD-gnats-submit@freebsd.org
 <FreeBSD-gnats-submit@freebsd.org> wrote:
 > Thank you very much for your problem report.
 > It has the internal identification `misc/112024'.
 > The individual assigned to look at your
 > report is: freebsd-bugs.
 >
 > You can access the state of your problem report at any time
 > via this link:
 >
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=112024
 >
 > >Category:       misc
 > >Responsible:    freebsd-bugs
 > >Synopsis:       [patch] misc fixes to fortunes
 > >Arrival-Date:   Mon Apr 23 09:50:04 GMT 2007
 >
 
 And here is the patch as promised, it got lost somewhere...
 //Niclas
 --
 
 ------=_Part_148800_25722856.1177325538069
 Content-Type: text/plain; name="fortunes.diff"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="fortunes.diff"
 X-Attachment-Id: f_f0ut82ox
 
 SW5kZXg6IGZvcnR1bmVzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL25jdnMvc3JjL2dhbWVz
 L2ZvcnR1bmUvZGF0ZmlsZXMvZm9ydHVuZXMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjM4CmRp
 ZmYgLXUgLXIxLjIzOCBmb3J0dW5lcwotLS0gZm9ydHVuZXMJMzAgTWFyIDIwMDcgMDQ6MzE6NTMg
 LTAwMDAJMS4yMzgKKysrIGZvcnR1bmVzCTIzIEFwciAyMDA3IDA5OjMyOjQ4IC0wMDAwCkBAIC00
 NTcsNyArNDU3LDcgQEAKIDMuCUlmIHlvdSdyZSBvbiBmaXJlLCBhdm9pZCBnYXNvbGluZSBhbmQg
 b3RoZXIgZmxhbW1hYmxlIG1hdGVyaWFscy4KIDQuCURvbid0IGF0dGVtcHQgY29tbXVuaWNhdGlv
 biB3aXRoIGRlYWQgcGVvcGxlOyBpdCB3aWxsIG9ubHkgbGVhZAogCQl0byBwc3ljaG9sb2dpY2Fs
 IHByb2JsZW1zLgotNS4JRm9vZCB3aWxsIGJlIHNjYXJjZSwgeW91IHdpbGwgaGF2ZSB0byBzY2F2
 ZW5nZS4gICBMZWFybiB0byByZWNvZ25pemUKKzUuCUZvb2Qgd2lsbCBiZSBzY2FyY2UsIHlvdSB3
 aWxsIGhhdmUgdG8gc2NhdmVuZ2UuICBMZWFybiB0byByZWNvZ25pemUKIAkJZm9vZHMgdGhhdCB3
 aWxsIGJlIGF2YWlsYWJsZSBhZnRlciB0aGUgYm9tYjogbWFzaGVkIHBvdGF0b2VzLAogCQlzaHJl
 ZGRlZCB3aGVhdCwgdG9zc2VkIHNhbGFkLCBncm91bmQgYmVlZiwgZXRjLgogNi4JUHV0IHlvdXIg
 aGFuZCBvdmVyIHlvdXIgbW91dGggd2hlbiB5b3Ugc25lZXplLCBpbnRlcm5hbCBvcmdhbnMKQEAg
 LTcyMiw4ICs3MjIsOSBAQAogJQogCS4uLiB3aXRoIGxpYmVydHkgYW5kIGp1c3RpY2UgZm9yIGFs
 bCB3aG8gY2FuIGFmZm9yZCBpdC4KICUKLQkxMiArIDE0NCArIDIwICsgMyg0KSAgICAgICAgICAg
 ICAgICAgIDIKLQktLS0tLS0tLS0tLS0tLS0tLS0tLS0tICArICA1KDExKSAgPSAgOSAgKyAgMAor
 CQkJICAgMS8yCisJMTIgKyAxNDQgKyAyMCArIDMqNCAgICAgICAgICAgICAgICAgIDIKKwktLS0t
 LS0tLS0tLS0tLS0tLS0tLS0tICArICA1KjExICA9ICA5ICArICAwCiAJCSAgNwogCiBBIGRvemVu
 LCBhIGdyb3NzIGFuZCBhIHNjb3JlLApAQCAtODIxLDcgKzgyMiw3IEBACiAJIk5vcGUuIiByZXBs
 aWVzIGhpcyB3aWZlLiAgIlR3byBvZiB0aGVtIGFyZSBqdW1waW5nIHVwIGFuZCBkb3duIGluCiB0
 aGUgYmFjayBvZiB5b3VyIHRydWNrLCBhbmQgdGhlIG90aGVyIG9uZSBpcyBob25raW5nIHRoZSBo
 b3JuISIKICUKLQlBIGZhdGhlciBnYXZlIGhpcyB0ZWVuLWFnZSBkYXVnaHRlciBhbiB1bnRyYWlu
 ZWQgcGVkaWdyZWVkIHB1cCBmb3IKKwlBIGZhdGhlciBnYXZlIGhpcyB0ZWVuYWdlIGRhdWdodGVy
 IGFuIHVudHJhaW5lZCBwZWRpZ3JlZWQgcHVwIGZvcgogaGVyIGJpcnRoZGF5LiAgQW4gaG91ciBs
 YXRlciwgd2hlbiB3YW5kZXJlZCB0aHJvdWdoIHRoZSBob3VzZSwgaGUgZm91bmQgaGVyCiBsb29r
 aW5nIGF0IGEgcHVkZGxlIGluIHRoZSBjZW50ZXIgb2YgdGhlIGtpdGNoZW4uICAiTXkgcHVwLCIg
 c2hlIG11cm11cmVkCiBzYWRseSwgInJ1bm5ldGggb3Zlci4iCkBAIC0yMDk5LDcgKzIxMDAsNyBA
 QAogbGluZSBwcmludGVycywgeW91IGNhbiBzdGlsbCBoYXZlIGEgYmVhdXRpZnVsIHNlY3JldGFy
 eS4gIEJlIGxpbmVhci4gIFN0cml2ZQogdG8gc3RheSBlbXBsb3llZC4KIAkJLS0gVGVjaG5vbG9y
 YXRhLCAiQW5hbG9nIgotJQorJSAKIAkiSGFpZywgaW4gY29uZ3Jlc3Npb25hbCBoZWFyaW5ncyBi
 ZWZvcmUgaGlzIGNvbmZpcm1hdG9yeSwgcGFyYWRveGVkCiBoaXMgYXVkaWVuY2VycyBieSBhYm5v
 cm1hbGluZyBoaXMgcmVzcG9uZHMgc28gdGhhdCB2ZXJicyB3ZXJlIG5vdW5lZCwgbm91bnMKIHZl
 cmJlZCwgYW5kIGFkamVjdGl2ZXMgYWR2ZXJiaXNlZC4gIEhlIHRlY2huaXF1ZWQgYSBuZXcgd2F5
 IHRvIHZvY2FidWxhcnkgaGlzCkBAIC0yNTQyLDcgKzI1NDMsNyBAQAogc2hvdWxkIGZpbmQgd2hh
 dCBJJ20gbG9va2luZyBmb3IgYnkgbWlkIE1heS4gIEkgaG9wZSBJIGNhbiByZW1lbWJlciB3aGF0
 IGl0CiB3YXMgYnkgdGhlIHRpbWUgSSBmaW5kIGl0LgogCUkgaGFkIHRoaXMgaWRlYSBmb3IgYSBu
 ZXcgaG9ycm9yIGZpbG0sICJWTVMgTWFudWFscyBmcm9tIEhlbGwiIG9yIG1heWJlCi0iVGhlIFBh
 cGVyIENoYXNlIDogSUJNIHZzLiBERUMiLiAgSXQncyBiYXNlZCBvbiBIaXRjaGNvY2sncyAiVGhl
 IEJpcmRzIiwgZXhjZXB0CisiVGhlIFBhcGVyIENoYXNlOiBJQk0gdnMuIERFQyIuICBJdCdzIGJh
 c2VkIG9uIEhpdGNoY29jaydzICJUaGUgQmlyZHMiLCBleGNlcHQKIHRoYXQgaXQncyBjZW50ZXJl
 ZCBhcm91bmQgYSBwcm9ncmFtbWVyIHdobyBpcyBhdHRhY2tlZCBieSBhIHN3YXJtIG9mIGJpbmRl
 cgogcGFnZXMgd2l0aCBhbiBpbmRleCBudW1iZXIgYW5kIHRoZSBzaW5nbGUgbGluZSAiVGhpcyBw
 YWdlIGludGVudGlvbmFsbHkgbGVmdAogYmxhbmsuIgpAQCAtMjY1MCw3ICsyNjUxLDcgQEAKIAlJ
 biB0aGUgZWFzdCB0aGVyZSBpcyBhIHNoYXJrIHdoaWNoIGlzIGxhcmdlciB0aGFuIGFsbCBvdGhl
 ciBmaXNoLiAgSXQKIGNoYW5nZXMgaW50byBhIGJpcmQgd2hvc2Ugd2luZ3MgYXJlIGxpa2UgY2xv
 dWRzIGZpbGxpbmcgdGhlIHNreS4gIFdoZW4gdGhpcwogYmlyZCBtb3ZlcyBhY3Jvc3MgdGhlIGxh
 bmQsIGl0IGJyaW5ncyBhIG1lc3NhZ2UgZnJvbSBDb3Jwb3JhdGUgSGVhZHF1YXJ0ZXJzLgotVGhp
 cyBtZXNzYWdlIGl0IGRyb3BzIGludG8gdGhlIG1pZHN0IG9mIHRoZSBwcm9ncmFtIG1lcnMsIGxp
 a2UgYSBzZWFndWxsCitUaGlzIG1lc3NhZ2UgaXQgZHJvcHMgaW50byB0aGUgbWlkc3Qgb2YgdGhl
 IHByb2dyYW1tZXJzLCBsaWtlIGEgc2VhZ3VsbAogbWFraW5nIGl0cyBtYXJrIHVwb24gdGhlIGJl
 YWNoLiAgVGhlbiB0aGUgYmlyZCBtb3VudHMgb24gdGhlIHdpbmQgYW5kLCB3aXRoCiB0aGUgYmx1
 ZSBza3kgYXQgaXRzIGJhY2ssIHJldHVybnMgaG9tZS4KIAlUaGUgbm92aWNlIHByb2dyYW1tZXIg
 c3RhcmVzIGluIHdvbmRlciBhdCB0aGUgYmlyZCwgZm9yIGhlIHVuZGVyc3RhbmRzCkBAIC0yODgz
 LDI4ICsyODg0LDYgQEAKIGZvcmV2ZXIsIGluIGEgY2xlYW4sIGhvbmVzdCwgcHVyaWZpZWQsIEVs
 ZWN0cm93b3JsZC4KIAkJLS0gVGhvbWFzIFB5bmNob24sICJHcmF2aXR5J3MgUmFpbmJvdyIKICUK
 LQlMb25nIGFnbywgaW4gYSBmaW5pdGUgc3RhdGUgZmFyIGF3YXksIHRoZXJlIGxpdmVkIGEgSk9W
 SUFMCi1jaGFyYWN0ZXIgbmFtZWQgSmFjay4gIEphY2sgYW5kIGhpcyByZWxhdGlvbnMgd2VyZSBw
 b29yLiAgT2Z0ZW4gdGhlaXIKLWhhc2ggdGFibGUgd2FzIGJhcmUuICBPbmUgZGF5IEphY2sncyBw
 YXJlbnQgc2FpZCB0byBoaW0sICJPdXIgbWF0cmljZXMKLWFyZSBzcGFyc2UuICBZb3UgbXVzdCBn
 byB0byB0aGUgbWFya2V0IHRvIGV4Y2hhbmdlIG91ciBSQU0gZm9yIHNvbWUKLUJBU0lDcy4iICBT
 aGUgY29tcGlsZWQgYSBsaW5rZWQgbGlzdCBvZiBpdGVtcyB0byByZXRyaWV2ZSBhbmQgcGFzc2Vk
 IGl0Ci10byBoaW0uCi0JU28gSmFjayBzZXQgb3V0LiAgQnV0IGFzIGhlIHdhcyB3YWxraW5nIGFs
 b25nIGEgSGFtaWx0b24gcGF0aCwKLWhlIG1ldCB0aGUgdHJhdmVsaW5nIHNhbGVzbWFuLgotCSJX
 aGl0aGVyIGRvc3QgdGh5IGZsb3cgY2hhcnQgdGFrZSB0aG91PyIgcHJvbXB0ZWQgdGhlIHNhbGVz
 bWFuCi1pbiBoaWdoLWxldmVsIGxhbmd1YWdlLgotCSJJJ20gZ29pbmcgdG8gdGhlIG1hcmtldCB0
 byBleGNoYW5nZSB0aGlzIFJBTSBmb3Igc29tZSBjaGlwcwotYW5kIEFwcGxlcywiIGNvbW1lbnRl
 ZCBKYWNrLgotCSJJIGhhdmUgYSBtdWNoIGJldHRlciBhbGdvcml0aG0uICBZb3UgbmVlZG4ndCBq
 b2luIGEgcXVldWUKLXRoZXJlOyBJIHdpbGwgc3dhcCB5b3VyIFJBTSBmb3IgdGhlc2UgbWFnaWMg
 a2VybmVscyBub3cuIgotCUphY2sgbWFkZSB0aGUgdHJhZGUsIHRoZW4gYmFja3RyYWNrZWQgdG8g
 aGlzIGhvdXNlLiAgQnV0IHdoZW4KLWhlIHRvbGQgaGlzIGJ1c3ktd2FpdGluZyBwYXJlbnQgb2Yg
 dGhlIGRlYWwsIHNoZSBiZWNhbWUgc28gYW5ncnkgc2hlCi1zdGFydGVkIHRocmFzaGluZy4KLQki
 RG9uJ3QgeW91IGV2ZW4gaGF2ZSBhbnkgYXJ0aWZpY2lhbCBpbnRlbGxpZ2VuY2U/ICBBbGwgdGhl
 c2UKLWtlcm5lbHMgdG9nZXRoZXIgaGFyZGx5IG1ha2UgdXAgb25lIGJ5dGUsIiBhbmQgc2hlIHBv
 cHBlZCB0aGVtIG91dCB0aGUKLXdpbmRvdy4uLgotCQktLSBNYXJrIElzYWFrLCAiSmFjayBhbmQg
 dGhlIEJlYW5zdGFjayIKLSUKIAlMb29raW5nIGZvciBhIGNvb2wgb25lIGFmdGVyIGEgbG9uZywg
 ZHVzdHkgcmlkZSwgdGhlIGRyaWZ0ZXIgc3Ryb2RlCiBpbnRvIHRoZSBzYWxvb24uICBBcyBoZSBt
 YWRlIGhpcyB3YXkgdGhyb3VnaCB0aGUgY3Jvd2QgdG8gdGhlIGJhciwgYSBtYW4KIGdhbGxvcGVk
 IHRocm91Z2ggdG93biBzY3JlYW1pbmcsICJCaWcgTWlrZSdzIGNvbWluJyEgIFJ1biBmZXIgeWVy
 IGxpdmVzISIKQEAgLTI5NjIsNyArMjk0MSw3IEBACiAJVGhleSBjYW4ndCBwcm92ZSB3aG8gdGhl
 eSBhcmUgYmVjYXVzZSB0aGV5J3ZlIGxlZnQgdGhlaXIKIHBhc3Nwb3J0cyBpbiB0aGVpciBob3Rl
 bCByb29tLiAgRm9yIHRocmVlIHdlZWtzIHRoZXkncmUgdG9ydHVyZWQgZGF5CiBhbmQgbmlnaHQg
 dG8gZ2V0IHRoZW0gdG8gbmFtZSB0aGVpciBjb250YWN0cyBpbiB0aGUgbGliZXJhdGlvbgotbW92
 ZW1lbnQuLiAgRmluYWxseSB0aGV5J3JlIGhhdWxlZCBpbiBmcm9udCBvZiBhIG1pbGl0YXJ5IGNv
 dXJ0LAorbW92ZW1lbnQuICBGaW5hbGx5IHRoZXkncmUgaGF1bGVkIGluIGZyb250IG9mIGEgbWls
 aXRhcnkgY291cnQsCiBjaGFyZ2VkIHdpdGggZXNwaW9uYWdlLCBhbmQgc2VudGVuY2VkIHRvIGRl
 YXRoLgogCVRoZSBuZXh0IG1vcm5pbmcgdGhleSdyZSBsaW5lZCB1cCBpbiBmcm9udCBvZiB0aGUg
 d2FsbCB3aGVyZQogdGhleSdsbCBiZSBzaG90LiAgVGhlIHNlcmdlYW50IGluIGNoYXJnZSBvZiB0
 aGUgZmlyaW5nIHNxdWFkIGFza3MgdGhlbQpAQCAtMzAzMyw3ICszMDEyLDcgQEAKIEFzc3VtZSB0
 aGF0IHNoZSBib3VnaHQgdGhlbSBhdCBhIGZsZWEgbWFya2V0LgogCQktLSBKYW1lcyBQZXRlcnNv
 biBhbmQgS2F0ZSBOb2xhbgogJQotCU5FVyBZT1JLLS0gS3JhZnQgRm9vZHMsIEluYy4gYW5ub3Vu
 Y2VkIHRvZGF5IHRoYXQgaXRzIGJvYXJkIG9mCisJTkVXIFlPUksgLS0gS3JhZnQgRm9vZHMsIElu
 Yy4gYW5ub3VuY2VkIHRvZGF5IHRoYXQgaXRzIGJvYXJkIG9mCiBkaXJlY3RvcnMgdW5hbmltb3Vz
 bHkgcmVqZWN0ZWQgdGhlICQxMSBiaWxsaW9uIHRha2VvdmVyIGJpZCBieSBQaGlsaXAKIE1vcnJp
 cyBhbmQgQ28uIEEgS3JhZnQgc3Bva2VzbWFuIHN0YXRlZCBpbiBhIHByZXNzIGNvbmZlcmVuY2Ug
 dGhhdCB0aGUKIG9mZmVyIHdhcyByZWplY3RlZCBiZWNhdXNlIHRoZSAkOTAtcGVyLXNoYXJlIGJp
 ZCBkaWQgbm90IHJlZmxlY3QgdGhlCkBAIC0zNjI5LDcgKzM2MDgsNyBAQAogR28gdG8gQWZyaWNh
 LCBvcmdhbml6ZSBhIHNhZmFyaSwgZmluZCBhbiBlbGVwaGFudCBpbiB0aGUganVuZ2xlIGFuZCBz
 aG9vdCBpdC4KIFRoYXQgd2F5IHlvdSdsbCBnZXQgaXQgb3V0IG9mIHlvdXIgc3lzdGVtLiIKIAlT
 YW0gaW1tZWRpYXRlbHkgbWFkZSBhcnJhbmdlbWVudHMgZm9yIGEgc2FmYXJpIGh1bnQgaW4gQWZy
 aWNhLAotaW52aXRpbmcgaGlzIGJlc3QgZnJpZW5kIHRvIGpvaW4gaGltLiAgIFRoZXkgYXJyaXZl
 ZCBpbiBOYWlyb2JpIGFuZCBsb3N0IG5vCitpbnZpdGluZyBoaXMgYmVzdCBmcmllbmQgdG8gam9p
 biBoaW0uICBUaGV5IGFycml2ZWQgaW4gTmFpcm9iaSBhbmQgbG9zdCBubwogdGltZSBnZXR0aW5n
 IG91dCBvbiB0aGUganVuZ2xlIHRyYWlscy4gIEFmdGVyIHRoZXkgaGFkIGJlZW4gaHVudGluZyBm
 b3IKIHNldmVyYWwgZGF5cywgU2FtJ3MgYmVzdCBmcmllbmQgZ3JhYmJlZCBoaW0gYnkgdGhlIGFy
 bSBvbmUgbW9ybmluZyBhbmQKIHllbGxlZCBhdCBoaW06CkBAIC0zODg3LDE0ICszODY2LDE0IEBA
 CiAlCiAJVGhlIGJvc3MgcmV0dXJuZWQgZnJvbSBsdW5jaCBpbiBhIGdvb2QgbW9vZCBhbmQgY2Fs
 bGVkIHRoZSB3aG9sZSBzdGFmZgogaW4gdG8gbGlzdGVuIHRvIGEgY291cGxlIG9mIGpva2VzIGhl
 IGhhZCBwaWNrZWQgdXAuICBFdmVyeWJvZHkgYnV0IG9uZSBnaXJsCi1sYXVnaGVkIHVwcm9hcmlv
 dXNseS4gICJXaGF0J3MgdGhlIG1hdHRlcj8iIGdydW1ibGVkIHRoZSBib3NzLiAiSGF2ZW4ndCB5
 b3UKK2xhdWdoZWQgdXByb2FyaW91c2x5LiAgIldoYXQncyB0aGUgbWF0dGVyPyIgZ3J1bWJsZWQg
 dGhlIGJvc3MuICAiSGF2ZW4ndCB5b3UKIGdvdCBhIHNlbnNlIG9mIGh1bW9yPyIKIAkiSSBkb24n
 dCBoYXZlIHRvIGxhdWdoLCIgc2hlIHNhaWQuICAiSSdtIGxlYXZpbmcgRnJpZGF5IGFueXdheS4K
 ICUKIAlUaGUgZGVmZW5zZSBhdHRvcm5leSB3YXMgaGFtbWVyaW5nIGF3YXkgYXQgdGhlIHBsYWlu
 dGlmZjoKICJZb3UgY2xhaW0sIiBoZSBqZWVyZWQsICJ0aGF0IG15IGNsaWVudCBjYW1lIGF0IHlv
 dSB3aXRoIGEgYnJva2VuIGJvdHRsZQogaW4gaGlzIGhhbmQuICBCdXQgaXMgaXQgbm90IHRydWUs
 IHRoYXQgeW91IGhhZCBzb21ldGhpbmcgaW4gWU9VUiBoYW5kPyIKLQkiWWVzLCIgdGhlIG1hbiBh
 ZG1pdHRlZCwgImhpcyB3aWZlLiBWZXJ5IGNoYXJtaW5nLCBvZiBjb3Vyc2UsCisJIlllcywiIHRo
 ZSBtYW4gYWRtaXR0ZWQsICJoaXMgd2lmZS4gIFZlcnkgY2hhcm1pbmcsIG9mIGNvdXJzZSwKIGJ1
 dCBub3QgbXVjaCBnb29kIGluIGEgZmlnaHQuIgogJQogCVRoZSBkZXZvdXQgSmV3IHdhcyBiZXNp
 ZGUgaGltc2VsZiBiZWNhdXNlIGhpcyBzb24gaGFkIGJlZW4gZGF0aW5nCkBAIC00MTU4LDcgKzQx
 MzcsNyBAQAogJQogCVRoZSBtYXN0ZXIgcHJvZ3JhbW1lciBtb3ZlcyBmcm9tIHByb2dyYW0gdG8g
 cHJvZ3JhbSB3aXRob3V0IGZlYXIuICBObwogY2hhbmdlIGluIG1hbmFnZW1lbnQgY2FuIGhhcm0g
 aGltLiAgSGUgd2lsbCBub3QgYmUgZmlyZWQsIGV2ZW4gaWYgdGhlIHByb2plY3QKLWlzIGNhbmNl
 bGVkLiBXaHkgaXMgdGhpcz8gIEhlIGlzIGZpbGxlZCB3aXRoIHRoZSBUYW8uCitpcyBjYW5jZWxl
 ZC4gIFdoeSBpcyB0aGlzPyAgSGUgaXMgZmlsbGVkIHdpdGggdGhlIFRhby4KIAkJLS0gR2VvZmZy
 ZXkgSmFtZXMsICJUaGUgVGFvIG9mIFByb2dyYW1taW5nIgogJQogCVRoZSBNaW5uZXNvdGEgQm9h
 cmQgb2YgRWR1Y2F0aW9uIHZvdGVkIHRvIGNvbnNpZGVyIHJlcXVpcmluZyBhbGwKQEAgLTQzMDks
 NyArNDI4OCw3IEBACiB0byB0aGUgdGlja2V0IGJvb3RoIGFuZCBnb3QgaW4gYSBsb25nIGxpbmUg
 Zm9yIGFub3RoZXIgc2VhdC4gIEFmdGVyIGFuIGhvdXIncwogd2FpdCBoZSB3YXMganVzdCBhIGZl
 dyBmZWV0IGZyb20gdGhlIGJvb3RoIHdoZW4gYSB2b2ljZSBjYWxsZWQgb3V0LCAiSGV5LAogRGF2
 ZSEiICBUaGUgQWdnaWUgbG9va2VkIHVwLCBzdGVwcGVkIG91dCBvZiBsaW5lIGFuZCB0cmllZCB0
 byBmaW5kIHRoZSBvd25lcgotb2YgdGhlIHZvaWNlIC0tIHdpdGggbm8gc3VjY2Vzcy4gICBUaGVu
 IGhlIHJlYWxpemVkIGhlIGhhZCBsb3N0IGhpcyBwbGFjZSBpbgorb2YgdGhlIHZvaWNlIC0tIHdp
 dGggbm8gc3VjY2Vzcy4gIFRoZW4gaGUgcmVhbGl6ZWQgaGUgaGFkIGxvc3QgaGlzIHBsYWNlIGlu
 CiBsaW5lIGFuZCBoYWQgdG8gd2FpdCBhbGwgb3ZlciBhZ2Fpbi4gIFdoZW4gdGhlIGZhbiBmaW5h
 bGx5IGJvdWdodCBoaXMgdGlja2V0LAogaGUgd2FzIHRoaXJzdHksIHNvIGhlIHdlbnQgdG8gYnV5
 IGEgZHJpbmsuICBUaGUgbGluZSBhdCB0aGUgY29uY2Vzc2lvbiBzdGFuZAogd2FzIGxvbmcsIHRv
 bywgYnV0IHNpbmNlIHRoZSBnYW1lIGhhZG4ndCBzdGFydGVkIGhlIGRlY2lkZWQgdG8gd2FpdC4g
 IEp1c3QgYXMKQEAgLTQzNDUsNyArNDMyNCw3IEBACiBtYWtlIHN1cmUgdGhhdCB0aGV5IGFyZSBF
 YXJ0aGxpbmdzLiAgVGhlbiB0aGVyZSdzIHRoZSBwb2xpY2UuICBJbiBQb3J0bGFuZCwKIHdoZW4g
 c29tZSBndXkgZ29lcyBiYW5hbmFzLCB0aGUgY29wcyByb3BlIG9mZiBhIHNpeHRlZW4gYmxvY2sg
 YXJlYSBhcm91bmQKIGhpbSBhbmQgY2FsbCBhIHNocmluayBmcm9tIHRoZSBtZWRpY2FsIHNjaG9v
 bCB3aG8gc3RhbmRzIGF0b3AgYSBwYXRyb2wgY2FyCi13aXRoIGEgbWVnYXBob25lIGFuZCBzaG91
 dHMsICJPSyEgVEhJUyEgIEFMTCEgIFNUQVJURUQhICBXSEVOISAgWU9VISAgV0VSRSEKK3dpdGgg
 YSBtZWdhcGhvbmUgYW5kIHNob3V0cywgIk9LISAgVEhJUyEgIEFMTCEgIFNUQVJURUQhICBXSEVO
 ISAgWU9VISAgV0VSRSEKIFRIUkVFISBZRUFSUyEgIE9MRCEgIE9OISAgQUNDT1VOVCEgT0YhICBZ
 T1VSIE1PVEhFUiEgIFJJR0hUPyAgU08hICBMRVQnUyEKIFRBTEshIEFCT1VUISAgSVQhIiAgRG93
 biBoZXJlIHRoZXkgZG9uJ3Qgd2FzdGUgdGhhdCBraW5kIG9mIHRpbWUuICBUaGUgTEFQRAogaGFz
 IFNXQVQgdGVhbXMgY29tcG9zZWQgb2YgZ3V5cyB3aG8gbWFrZSBEYXJ0aCBWYWRlciBsb29rIGxp
 a2UgTXIuIFBlZXBlcnMuCkBAIC00NDc1LDcgKzQ0NTQsNyBAQAogd2FybG9yZCBXdS4gIFRoZSB3
 YXJsb3JkIGFza2VkIHRoZSBwcm9ncmFtbWVyOiAiV2hpY2ggaXMgZWFzaWVyIHRvIGRlc2lnbjoK
 IGFuIGFjY291bnRpbmcgcGFja2FnZSBvciBhbiBvcGVyYXRpbmcgc3lzdGVtPyIKIAkiQW4gb3Bl
 cmF0aW5nIHN5c3RlbSwiIHJlcGxpZWQgdGhlIHByb2dyYW1tZXIuCi0JVGhlIHdhcmxvcmQgdXR0
 ZXJlZCBhbiBleGNsYW1hdGlvbiBvZiBkaXNiZWxpZWYuICJTdXJlbHkgYW4KKwlUaGUgd2FybG9y
 ZCB1dHRlcmVkIGFuIGV4Y2xhbWF0aW9uIG9mIGRpc2JlbGllZi4gICJTdXJlbHkgYW4KIGFjY291
 bnRpbmcgcGFja2FnZSBpcyB0cml2aWFsIG5leHQgdG8gdGhlIGNvbXBsZXhpdHkgb2YgYW4gb3Bl
 cmF0aW5nCiBzeXN0ZW0sIiBoZSBzYWlkLgogCSJOb3Qgc28sIiBzYWlkIHRoZSBwcm9ncmFtbWVy
 LCAid2hlbiBkZXNpZ25pbmcgYW4gYWNjb3VudGluZyBwYWNrYWdlLApAQCAtNDQ4NSw3ICs0NDY0
 LDcgQEAKIGFwcGVhcmFuY2VzLiAgV2hlbiBkZXNpZ25pbmcgYW4gb3BlcmF0aW5nIHN5c3RlbSwg
 dGhlIHByb2dyYW1tZXIgc2Vla3MgdGhlCiBzaW1wbGVzdCBoYXJtb255IGJldHdlZW4gbWFjaGlu
 ZSBhbmQgaWRlYXMuICBUaGlzIGlzIHdoeSBhbiBvcGVyYXRpbmcgc3lzdGVtCiBpcyBlYXNpZXIg
 dG8gZGVzaWduLiIKLQlUaGUgd2FybG9yZCBvZiBXdSBub2RkZWQgYW5kIHNtaWxlZC4gIlRoYXQg
 aXMgYWxsIGdvb2QgYW5kIHdlbGwsIgorCVRoZSB3YXJsb3JkIG9mIFd1IG5vZGRlZCBhbmQgc21p
 bGVkLiAgIlRoYXQgaXMgYWxsIGdvb2QgYW5kIHdlbGwsIgogaGUgc2FpZCwgImJ1dCB3aGljaCBp
 cyBlYXNpZXIgdG8gZGVidWc/IgogCVRoZSBwcm9ncmFtbWVyIG1hZGUgbm8gcmVwbHkuCiAJCS0t
 IEdlb2ZmcmV5IEphbWVzLCAiVGhlIFRhbyBvZiBQcm9ncmFtbWluZyIKQEAgLTQ5MjUsNyArNDkw
 NCw3IEBACiBzdXJlLCBsaXR0bGUgbGFkeSwgaXQncyBlbGV2ZW4tdGhpcnR5LiAgV2FubmEgZ2V0
 IGhpZ2g/CiAJRG9uJ3QgYm90aGVyIHRoaW5raW5nIHRoYXQgaW5zdGFudCBsdXN0IHdpbGwgdHVy
 biBpbnRvIHRoZSByZWFsIHRoaW5nLgogSXQgbWF5LCBidXQgdGhlbiB5b3UgbWF5IGFsc28gd2Fr
 ZSB1cCBvbmUgbW9ybmluZyB0byBmaW5kIHlvdSdyZSB0aGUgUXVlZW4gb2YKLVJ1bWFuaWEuCitS
 b21hbmlhLgogCQktLSBDeW50aGlhIEhlbWllbCwgIlNleCBUaXBzIGZvciBHaXJscyIKICUKIAki
 V2hlbiB5b3Ugd2FrZSB1cCBpbiB0aGUgbW9ybmluZywgUG9vaCwiIHNhaWQgUGlnbGV0IGF0IGxh
 c3QsCkBAIC01MzY1LDkgKzUzNDQsOSBAQAogRm9yIHRob3NlIHdobyBoYXZlIGhhZCB0b28gbXVj
 aCBvZiBFc2FsZW4sIFRvcGFuZ2EsIGFuZCBLYWlyb3MuCiBUaXJlZCBvZiBiZWluZyBnZW51aW5l
 IGFsbCB0aGUgdGltZT8gIFdvdWxkIHlvdSBsaWtlIHRvIGxlYXJuIGhvdwogdG8gYmUgYSBsaXR0
 bGUgcGhvbnkgYWdhaW4/ICBIYXZlIHlvdSBkaXNjbG9zZWQgc28gbXVjaCB0aGF0IHlvdSdyZQot
 YmVnaW5uaW5nIHRvIGF2b2lkIHBlb3BsZT8gSGF2ZSB5b3UgdG91Y2hlZCBzbyBtYW55IHBlb3Bs
 ZSB0aGF0Ci10aGV5J3JlIGFsbCBiZWdpbm5pbmcgdG8gZmVlbCB0aGUgc2FtZT8gTGlrZSB0byBi
 ZSBhIGxpdHRsZSBkZXBlbmRlbnQ/Ci1BcmUgcGVyZmVjdCBvcmdhc21zIGJlZ2lubmluZyB0byBi
 b3JlIHlvdT8gV291bGQgeW91IGxpa2UsIGZvciBvbmNlLAorYmVnaW5uaW5nIHRvIGF2b2lkIHBl
 b3BsZT8gIEhhdmUgeW91IHRvdWNoZWQgc28gbWFueSBwZW9wbGUgdGhhdAordGhleSdyZSBhbGwg
 YmVnaW5uaW5nIHRvIGZlZWwgdGhlIHNhbWU/ICBMaWtlIHRvIGJlIGEgbGl0dGxlIGRlcGVuZGVu
 dD8KK0FyZSBwZXJmZWN0IG9yZ2FzbXMgYmVnaW5uaW5nIHRvIGJvcmUgeW91PyAgV291bGQgeW91
 IGxpa2UsIGZvciBvbmNlLAogbm90IHRvIGV4cHJlc3MgYSBmZWVsaW5nPyAgT3IgYmV0dGVyIHll
 dCwgbm90IGJlIGluIHRvdWNoIHdpdGggaXQgYXQKIGFsbD8gIENvbWUgdG8gdXMuICBXZSBwcm9t
 aXNlIHRvIHJlbGlldmUgeW91IG9mIHRoZSBidXJkZW4gb2YgeW91cgogZ3JlYXQgcG90ZW50aWFs
 LgpAQCAtNjcyNCw3ICs2NzAzLDcgQEAKIAkJLS0gV2hpdG5leSBCYWxsaWV0dAogJQogQSAiY3Jp
 dGljIiBpcyBhIG1hbiB3aG8gY3JlYXRlcyBub3RoaW5nIGFuZCB0aGVyZWJ5IGZlZWxzCi1xdWFs
 aWZpZWQgdG8ganVkZ2UgdGhlIHdvcmsgb2YgY3JlYXRpdmUgbWVuLiBUaGVyZSBpcyBsb2dpYwor
 cXVhbGlmaWVkIHRvIGp1ZGdlIHRoZSB3b3JrIG9mIGNyZWF0aXZlIG1lbi4gIFRoZXJlIGlzIGxv
 Z2ljCiBpbiB0aGlzOyBoZSBpcyB1bmJpYXNlZCAtLSBoZSBoYXRlcyBhbGwgY3JlYXRpdmUgcGVv
 cGxlIGVxdWFsbHkuCiAlCiBBIGNydXNhZGVyJ3Mgd2lmZSBzbGlwcGVkIGZyb20gdGhlIGdhcnJp
 c29uCkBAIC02Nzc4LDkgKzY3NTcsNiBAQAogQSBkaXBsb21hdCBpcyBtYW4gd2hvIGFsd2F5cyBy
 ZW1lbWJlcnMgYSB3b21hbidzIGJpcnRoZGF5IGJ1dCBuZXZlciBoZXIgYWdlLgogCQktLSBSb2Jl
 cnQgRnJvc3QKICUKLUEgZGlwbG9tYXQgaXMgc29tZW9uZSB3aG8gY2FuIHRlbGwgeW91IHRvIGdv
 IHRvIGhlbGwgaW4gc3VjaCBhIHdheSB0aGF0Ci15b3Ugd2lsbCBsb29rIGZvcndhcmQgdG8gdGhl
 IHRyaXAuCi0lCiBBIGRpcGxvbWF0aWMgaHVzYmFuZCBzYWlkIHRvIGhpcyB3aWZlLCAiSG93IGRv
 IHlvdSBleHBlY3QgbWUgdG8gcmVtZW1iZXIKIHlvdXIgYmlydGhkYXkgd2hlbiB5b3UgbmV2ZXIg
 bG9vayBhbnkgb2xkZXI/IgogJQpAQCAtNzQzMiw3ICs3NDA4LDcgQEAKICUKIEEgbGl0dGxlIGtp
 ZCB3ZW50IHVwIHRvIFNhbnRhIGFuZCBhc2tlZCBoaW0sICJTYW50YSwgeW91IGtub3cgd2hlbiBJ
 J20gYmFkCiByaWdodD8iICBBbmQgU2FudGEgc2F5cywgIlllcywgSSBkby4iICBUaGUgbGl0dGxl
 IGtpZCB0aGVuIGFza3MsICJBbmQgeW91Ci1rbm93IHdoZW4gSSdtIHNsZWVwaW5nPyIgVG8gd2hp
 Y2ggU2FudGEgcmVwbGllcywgIkV2ZXJ5IG1pbnV0ZS4iIFNvIHRoZQora25vdyB3aGVuIEknbSBz
 bGVlcGluZz8iICBUbyB3aGljaCBTYW50YSByZXBsaWVzLCAiRXZlcnkgbWludXRlLiJpICBTbyB0
 aGUKIGxpdHRsZSBraWQgdGhlbiBzYXlzLCAiV2VsbCwgaWYgeW91IGtub3cgd2hlbiBJJ20gYmFk
 IGFuZCB3aGVuIEknbSBnb29kLAogdGhlbiBob3cgY29tZSB5b3UgZG9uJ3Qga25vdyB3aGF0IEkg
 d2FudCBmb3IgQ2hyaXN0bWFzPyIKICUK
 ------=_Part_148800_25722856.1177325538069--
Responsible-Changed-From-To: freebsd-bugs->edwin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Nov 4 10:53:33 UTC 2007 
Responsible-Changed-Why:  
I will track this one once I got rid of my mentor. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112024 
Responsible-Changed-From-To: edwin->freebsd-bugs 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Feb 14 10:34:20 UTC 2008 
Responsible-Changed-Why:  

Give back into the pool until later. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112024 
State-Changed-From-To: open->patched 
State-Changed-By: edwin 
State-Changed-When: Fri Jun 5 07:56:27 UTC 2009 
State-Changed-Why:  
MFC this weekend 


Responsible-Changed-From-To: freebsd-bugs->edwin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jun 5 07:56:27 UTC 2009 
Responsible-Changed-Why:  
MFC this weekend. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112024 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/112024: commit references a PR
Date: Fri,  5 Jun 2009 07:57:28 +0000 (UTC)

 Author: edwin
 Date: Fri Jun  5 07:57:10 2009
 New Revision: 193486
 URL: http://svn.freebsd.org/changeset/base/193486
 
 Log:
   Misc fixed to fortunes
   
   PR:		conf/112024
   Submitted by:	Niclas Zeising <niclas.zeising@gmail.com>
   MFC after:	2 days
 
 Modified:
   head/games/fortune/datfiles/fortunes
   head/games/fortune/datfiles/fortunes-o.real
 
 Modified: head/games/fortune/datfiles/fortunes
 ==============================================================================
 --- head/games/fortune/datfiles/fortunes	Fri Jun  5 06:09:55 2009	(r193485)
 +++ head/games/fortune/datfiles/fortunes	Fri Jun  5 07:57:10 2009	(r193486)
 @@ -674,8 +674,9 @@ Liza Minnelli.
  %
  	... with liberty and justice for all who can afford it.
  %
 -	12 + 144 + 20 + 3(4)                  2
 -	----------------------  +  5(11)  =  9  +  0
 +			   1/2
 +	12 + 144 + 20 + 3*4                    2
 +	----------------------  +  5 * 11  =  9  +  0
  		  7
  
  A dozen, a gross and a score,
 @@ -758,7 +759,7 @@ his honeymoon a chastened man.  He'd bec
  	A farm in the country side had several turkeys, it was known as the
  house of seven gobbles.
  %
 -	A father gave his teen-age daughter an untrained pedigreed pup for
 +	A father gave his teenage daughter an untrained pedigreed pup for
  her birthday.  An hour later, when wandered through the house, he found her
  looking at a puddle in the center of the kitchen.  "My pup," she murmured
  sadly, "runneth over."
 @@ -2547,7 +2548,7 @@ library and I'm half way through the sec
  should find what I'm looking for by mid May.  I hope I can remember what it
  was by the time I find it.
  	I had this idea for a new horror film, "VMS Manuals from Hell" or maybe
 -"The Paper Chase : IBM vs. DEC".  It's based on Hitchcock's "The Birds", except
 +"The Paper Chase: IBM vs. DEC".  It's based on Hitchcock's "The Birds", except
  that it's centered around a programmer who is attacked by a swarm of binder
  pages with an index number and the single line "This page intentionally left
  blank."
 @@ -2941,7 +2942,7 @@ Esther and hustle them off to prison.
  	They can't prove who they are because they've left their
  passports in their hotel room.  For three weeks they're tortured day
  and night to get them to name their contacts in the liberation
 -movement..  Finally they're hauled in front of a military court,
 +movement.  Finally they're hauled in front of a military court,
  charged with espionage, and sentenced to death.
  	The next morning they're lined up in front of the wall where
  they'll be shot.  The sergeant in charge of the firing squad asks them
 @@ -2998,7 +2999,7 @@ a girl should not do before twenty."
  	"Your mother is right," said the executive, "I don't like a large
  audience, either."
  %
 -	NEW YORK-- Kraft Foods, Inc. announced today that its board of
 +	NEW YORK -- Kraft Foods, Inc. announced today that its board of
  directors unanimously rejected the $11 billion takeover bid by Philip
  Morris and Co. A Kraft spokesman stated in a press conference that the
  offer was rejected because the $90-per-share bid did not reflect the
 @@ -4083,7 +4084,7 @@ right!  Can I have a dollar?"
  %
  	The master programmer moves from program to program without fear.  No
  change in management can harm him.  He will not be fired, even if the project
 -is canceled. Why is this?  He is filled with the Tao.
 +is canceled.  Why is this?  He is filled with the Tao.
  		-- Geoffrey James, "The Tao of Programming"
  %
  	The Minnesota Board of Education voted to consider requiring all
 @@ -4248,7 +4249,7 @@ With a lot of these folks you'd have to 
  make sure that they are Earthlings.  Then there's the police.  In Portland,
  when some guy goes bananas, the cops rope off a sixteen block area around
  him and call a shrink from the medical school who stands atop a patrol car
 -with a megaphone and shouts, "OK! THIS!  ALL!  STARTED!  WHEN!  YOU!  WERE!
 +with a megaphone and shouts, "OK!  THIS!  ALL!  STARTED!  WHEN!  YOU!  WERE!
  THREE! YEARS!  OLD!  ON!  ACCOUNT! OF!  YOUR MOTHER!  RIGHT?  SO!  LET'S!
  TALK! ABOUT!  IT!"  Down here they don't waste that kind of time.  The LAPD
  has SWAT teams composed of guys who make Darth Vader look like Mr. Peepers.
 @@ -4383,7 +4384,7 @@ against a wall, and this was inscribed o
  warlord Wu.  The warlord asked the programmer: "Which is easier to design:
  an accounting package or an operating system?"
  	"An operating system," replied the programmer.
 -	The warlord uttered an exclamation of disbelief. "Surely an
 +	The warlord uttered an exclamation of disbelief.  "Surely an
  accounting package is trivial next to the complexity of an operating
  system," he said.
  	"Not so," said the programmer, "when designing an accounting package,
 @@ -4393,7 +4394,7 @@ tax laws.  By contrast, an operating sys
  appearances.  When designing an operating system, the programmer seeks the
  simplest harmony between machine and ideas.  This is why an operating system
  is easier to design."
 -	The warlord of Wu nodded and smiled. "That is all good and well,"
 +	The warlord of Wu nodded and smiled.  "That is all good and well,"
  he said, "but which is easier to debug?"
  	The programmer made no reply.
  		-- Geoffrey James, "The Tao of Programming"
 @@ -4834,7 +4835,7 @@ invariably he can't speak English, and i
  sure, little lady, it's eleven-thirty.  Wanna get high?
  	Don't bother thinking that instant lust will turn into the real thing.
  It may, but then you may also wake up one morning to find you're the Queen of
 -Rumania.
 +Romania.
  		-- Cynthia Hemiel, "Sex Tips for Girls"
  %
  	"When you wake up in the morning, Pooh," said Piglet at last,
 @@ -5276,9 +5277,9 @@ marked "450 volts", react as you would n
  For those who have had too much of Esalen, Topanga, and Kairos.
  Tired of being genuine all the time?  Would you like to learn how
  to be a little phony again?  Have you disclosed so much that you're
 -beginning to avoid people? Have you touched so many people that
 -they're all beginning to feel the same? Like to be a little dependent?
 -Are perfect orgasms beginning to bore you? Would you like, for once,
 +beginning to avoid people?  Have you touched so many people that
 +they're all beginning to feel the same?  Like to be a little dependent?
 +Are perfect orgasms beginning to bore you?  Would you like, for once,
  not to express a feeling?  Or better yet, not be in touch with it at
  all?  Come to us.  We promise to relieve you of the burden of your
  great potential.
 @@ -6578,7 +6579,7 @@ A critic is a bundle of biases held loos
  		-- Whitney Balliett
  %
  A "critic" is a man who creates nothing and thereby feels
 -qualified to judge the work of creative men. There is logic
 +qualified to judge the work of creative men.  There is logic
  in this; he is unbiased -- he hates all creative people equally.
  %
  A cynic is a person searching for an honest man, with a stolen lantern.
 @@ -7270,7 +7271,7 @@ A little inaccuracy sometimes saves tons
  %
  A little kid went up to Santa and asked him, "Santa, you know when I'm bad
  right?"  And Santa says, "Yes, I do."  The little kid then asks, "And you
 -know when I'm sleeping?" To which Santa replies, "Every minute." So the
 +know when I'm sleeping?"  To which Santa replies, "Every minute."  So the
  little kid then says, "Well, if you know when I'm bad and when I'm good,
  then how come you don't know what I want for Christmas?"
  %
 
 Modified: head/games/fortune/datfiles/fortunes-o.real
 ==============================================================================
 --- head/games/fortune/datfiles/fortunes-o.real	Fri Jun  5 06:09:55 2009	(r193485)
 +++ head/games/fortune/datfiles/fortunes-o.real	Fri Jun  5 07:57:10 2009	(r193486)
 @@ -1636,7 +1636,7 @@ Jerry Falwell, would get upset about see
  claim," he jeered, "that my client came at you with a broken bottle in
  his hand.  But is it not true, that you had something in YOUR hand?"
  
 -	"Yes," he admitted, "his wife. Very charming, of course, but
 +	"Yes," he admitted, "his wife.  Very charming, of course, but
  not much good in a fight."
  %
  	The devout Jew was beside himself because his son had been dating
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: edwin 
State-Changed-When: Sun Jun 7 04:35:05 UTC 2009 
State-Changed-Why:  
MFC to stable-7 done. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112024 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/112024: commit references a PR
Date: Sun,  7 Jun 2009 04:49:46 +0000 (UTC)

 Author: edwin
 Date: Sun Jun  7 04:49:23 2009
 New Revision: 193610
 URL: http://svn.freebsd.org/changeset/base/193610
 
 Log:
   MFC of r193486
   
   Misc fixed to fortunes
   
   PR:		conf/112024
   Submitted by:	Niclas Zeising <niclas.zeising@gmail.com>
 
 Modified:
   stable/7/games/fortune/   (props changed)
   stable/7/games/fortune/datfiles/   (props changed)
   stable/7/games/fortune/datfiles/fortunes
   stable/7/games/fortune/datfiles/fortunes-o.real
   stable/7/games/fortune/datfiles/freebsd-tips   (props changed)
   stable/7/games/fortune/fortune/   (props changed)
 
 Modified: stable/7/games/fortune/datfiles/fortunes
 ==============================================================================
 --- stable/7/games/fortune/datfiles/fortunes	Sun Jun  7 04:45:50 2009	(r193609)
 +++ stable/7/games/fortune/datfiles/fortunes	Sun Jun  7 04:49:23 2009	(r193610)
 @@ -674,8 +674,9 @@ Liza Minnelli.
  %
  	... with liberty and justice for all who can afford it.
  %
 -	12 + 144 + 20 + 3(4)                  2
 -	----------------------  +  5(11)  =  9  +  0
 +			   1/2
 +	12 + 144 + 20 + 3*4                    2
 +	----------------------  +  5 * 11  =  9  +  0
  		  7
  
  A dozen, a gross and a score,
 @@ -758,7 +759,7 @@ his honeymoon a chastened man.  He'd bec
  	A farm in the country side had several turkeys, it was known as the
  house of seven gobbles.
  %
 -	A father gave his teen-age daughter an untrained pedigreed pup for
 +	A father gave his teenage daughter an untrained pedigreed pup for
  her birthday.  An hour later, when wandered through the house, he found her
  looking at a puddle in the center of the kitchen.  "My pup," she murmured
  sadly, "runneth over."
 @@ -2541,7 +2542,7 @@ library and I'm half way through the sec
  should find what I'm looking for by mid May.  I hope I can remember what it
  was by the time I find it.
  	I had this idea for a new horror film, "VMS Manuals from Hell" or maybe
 -"The Paper Chase : IBM vs. DEC".  It's based on Hitchcock's "The Birds", except
 +"The Paper Chase: IBM vs. DEC".  It's based on Hitchcock's "The Birds", except
  that it's centered around a programmer who is attacked by a swarm of binder
  pages with an index number and the single line "This page intentionally left
  blank."
 @@ -2935,7 +2936,7 @@ Esther and hustle them off to prison.
  	They can't prove who they are because they've left their
  passports in their hotel room.  For three weeks they're tortured day
  and night to get them to name their contacts in the liberation
 -movement..  Finally they're hauled in front of a military court,
 +movement.  Finally they're hauled in front of a military court,
  charged with espionage, and sentenced to death.
  	The next morning they're lined up in front of the wall where
  they'll be shot.  The sergeant in charge of the firing squad asks them
 @@ -2992,7 +2993,7 @@ a girl should not do before twenty."
  	"Your mother is right," said the executive, "I don't like a large
  audience, either."
  %
 -	NEW YORK-- Kraft Foods, Inc. announced today that its board of
 +	NEW YORK -- Kraft Foods, Inc. announced today that its board of
  directors unanimously rejected the $11 billion takeover bid by Philip
  Morris and Co. A Kraft spokesman stated in a press conference that the
  offer was rejected because the $90-per-share bid did not reflect the
 @@ -4077,7 +4078,7 @@ right!  Can I have a dollar?"
  %
  	The master programmer moves from program to program without fear.  No
  change in management can harm him.  He will not be fired, even if the project
 -is canceled. Why is this?  He is filled with the Tao.
 +is canceled.  Why is this?  He is filled with the Tao.
  		-- Geoffrey James, "The Tao of Programming"
  %
  	The Minnesota Board of Education voted to consider requiring all
 @@ -4242,7 +4243,7 @@ With a lot of these folks you'd have to 
  make sure that they are Earthlings.  Then there's the police.  In Portland,
  when some guy goes bananas, the cops rope off a sixteen block area around
  him and call a shrink from the medical school who stands atop a patrol car
 -with a megaphone and shouts, "OK! THIS!  ALL!  STARTED!  WHEN!  YOU!  WERE!
 +with a megaphone and shouts, "OK!  THIS!  ALL!  STARTED!  WHEN!  YOU!  WERE!
  THREE! YEARS!  OLD!  ON!  ACCOUNT! OF!  YOUR MOTHER!  RIGHT?  SO!  LET'S!
  TALK! ABOUT!  IT!"  Down here they don't waste that kind of time.  The LAPD
  has SWAT teams composed of guys who make Darth Vader look like Mr. Peepers.
 @@ -4377,7 +4378,7 @@ against a wall, and this was inscribed o
  warlord Wu.  The warlord asked the programmer: "Which is easier to design:
  an accounting package or an operating system?"
  	"An operating system," replied the programmer.
 -	The warlord uttered an exclamation of disbelief. "Surely an
 +	The warlord uttered an exclamation of disbelief.  "Surely an
  accounting package is trivial next to the complexity of an operating
  system," he said.
  	"Not so," said the programmer, "when designing an accounting package,
 @@ -4387,7 +4388,7 @@ tax laws.  By contrast, an operating sys
  appearances.  When designing an operating system, the programmer seeks the
  simplest harmony between machine and ideas.  This is why an operating system
  is easier to design."
 -	The warlord of Wu nodded and smiled. "That is all good and well,"
 +	The warlord of Wu nodded and smiled.  "That is all good and well,"
  he said, "but which is easier to debug?"
  	The programmer made no reply.
  		-- Geoffrey James, "The Tao of Programming"
 @@ -4828,7 +4829,7 @@ invariably he can't speak English, and i
  sure, little lady, it's eleven-thirty.  Wanna get high?
  	Don't bother thinking that instant lust will turn into the real thing.
  It may, but then you may also wake up one morning to find you're the Queen of
 -Rumania.
 +Romania.
  		-- Cynthia Hemiel, "Sex Tips for Girls"
  %
  	"When you wake up in the morning, Pooh," said Piglet at last,
 @@ -5270,9 +5271,9 @@ marked "450 volts", react as you would n
  For those who have had too much of Esalen, Topanga, and Kairos.
  Tired of being genuine all the time?  Would you like to learn how
  to be a little phony again?  Have you disclosed so much that you're
 -beginning to avoid people? Have you touched so many people that
 -they're all beginning to feel the same? Like to be a little dependent?
 -Are perfect orgasms beginning to bore you? Would you like, for once,
 +beginning to avoid people?  Have you touched so many people that
 +they're all beginning to feel the same?  Like to be a little dependent?
 +Are perfect orgasms beginning to bore you?  Would you like, for once,
  not to express a feeling?  Or better yet, not be in touch with it at
  all?  Come to us.  We promise to relieve you of the burden of your
  great potential.
 @@ -6572,7 +6573,7 @@ A critic is a bundle of biases held loos
  		-- Whitney Balliett
  %
  A "critic" is a man who creates nothing and thereby feels
 -qualified to judge the work of creative men. There is logic
 +qualified to judge the work of creative men.  There is logic
  in this; he is unbiased -- he hates all creative people equally.
  %
  A cynic is a person searching for an honest man, with a stolen lantern.
 @@ -7264,7 +7265,7 @@ A little inaccuracy sometimes saves tons
  %
  A little kid went up to Santa and asked him, "Santa, you know when I'm bad
  right?"  And Santa says, "Yes, I do."  The little kid then asks, "And you
 -know when I'm sleeping?" To which Santa replies, "Every minute." So the
 +know when I'm sleeping?"  To which Santa replies, "Every minute."  So the
  little kid then says, "Well, if you know when I'm bad and when I'm good,
  then how come you don't know what I want for Christmas?"
  %
 
 Modified: stable/7/games/fortune/datfiles/fortunes-o.real
 ==============================================================================
 --- stable/7/games/fortune/datfiles/fortunes-o.real	Sun Jun  7 04:45:50 2009	(r193609)
 +++ stable/7/games/fortune/datfiles/fortunes-o.real	Sun Jun  7 04:49:23 2009	(r193610)
 @@ -1636,7 +1636,7 @@ Jerry Falwell, would get upset about see
  claim," he jeered, "that my client came at you with a broken bottle in
  his hand.  But is it not true, that you had something in YOUR hand?"
  
 -	"Yes," he admitted, "his wife. Very charming, of course, but
 +	"Yes," he admitted, "his wife.  Very charming, of course, but
  not much good in a fight."
  %
  	The devout Jew was beside himself because his son had been dating
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
