From jhein@timing.com  Sat Feb  7 18:31:40 2009
Return-Path: <jhein@timing.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3ACD1065674
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Feb 2009 18:31:40 +0000 (UTC)
	(envelope-from jhein@timing.com)
Received: from Daffy.timing.com (w.timing.com [206.168.13.218])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B22B8FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Feb 2009 18:31:40 +0000 (UTC)
	(envelope-from jhein@timing.com)
Received: from brain.timing.com (brain.timing.com [206.168.13.195])
	by Daffy.timing.com (8.13.1/8.13.1) with ESMTP id n17IVdet070397;
	Sat, 7 Feb 2009 11:31:40 -0700 (MST)
	(envelope-from jhein@timing.com)
Received: from brain.timing.com (localhost [127.0.0.1])
	by brain.timing.com (8.14.2/8.13.1) with ESMTP id n17IVccj018577;
	Sat, 7 Feb 2009 11:31:38 -0700 (MST)
	(envelope-from jhein@brain.timing.com)
Received: (from jhein@localhost)
	by brain.timing.com (8.13.1/8.13.1/Submit) id n17IVcNF018576;
	Sat, 7 Feb 2009 11:31:38 -0700 (MST)
	(envelope-from jhein)
Message-Id: <200902071831.n17IVcNF018576@brain.timing.com>
Date: Sat, 7 Feb 2009 11:31:38 -0700 (MST)
From: John Hein <jhein@timing.com>
Reply-To: John Hein <jhein@timing.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: George Bernard Shaw quote fix
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         131469
>Category:       conf
>Synopsis:       [patch] fortune(6): George Bernard Shaw quote fix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 07 18:40:00 UTC 2009
>Closed-Date:    Sat Jun 06 02:27:25 UTC 2009
>Last-Modified:  Sat Jun  6 02:30:03 UTC 2009
>Originator:     John Hein
>Release:        all
>Organization:
>Environment:


>Description:

This error has been in fortunes since 1.1 (verbatim from the Rand
Lindsly collection of quotes)

>How-To-Repeat:
>Fix:

s/milestones/millstones/

and less important..

s/man/Man/

Not every source I've seen capitalizes 'Man', but it seems
right.  Uncapitalized 'man' would usually be preceded by
an 'a'.  But I haven't seen any reference cite the orignal
source yet, so I can't say for sure.

Index: fortunes
===================================================================
RCS file: /base/FreeBSD-CVS/src/games/fortune/datfiles/fortunes,v
retrieving revision 1.272
diff -u -p -r1.272 fortunes
--- fortunes	8 Oct 2008 19:39:22 -0000	1.272
+++ fortunes	7 Feb 2009 17:21:58 -0000
@@ -48262,9 +48262,9 @@ beat their head on the keyboard.  After 
 		-- Harry Skelton
 %
 The seven deadly sins ... Food, clothing, firing, rent, taxes,
-respectability and children.  Nothing can lift those seven milestones
-from man's neck but money; and the spirit cannot soar until the
-milestones are lifted.
+respectability and children.  Nothing can lift those seven millstones
+from Man's neck but money; and the spirit cannot soar until the
+millstones are lifted.
 		-- George Bernard Shaw
 %
 The seven eyes of Ningauble the Wizard floated back to his hood as he
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: edwin 
State-Changed-When: Thu Jun 4 22:01:49 UTC 2009 
State-Changed-Why:  
Commited in head, MFC this weekend. 


Responsible-Changed-From-To: freebsd-bugs->edwin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jun 4 22:01:49 UTC 2009 
Responsible-Changed-Why:  
Track pending MFC 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/131469: commit references a PR
Date: Thu,  4 Jun 2009 22:02:07 +0000 (UTC)

 Author: edwin
 Date: Thu Jun  4 22:01:50 2009
 New Revision: 193467
 URL: http://svn.freebsd.org/changeset/base/193467
 
 Log:
   [patch] fortune(6): George Bernard Shaw quote fix
   
   From the original PR:
   
       s/milestones/millstones/
       and less important..
       s/man/Man/
       Not every source I've seen capitalizes 'Man', but it seems
       right. Uncapitalized 'man' would usually be preceded by
       an 'a'. But I haven't seen any reference cite the orignal
       source yet, so I can't say for sure.
   
   http://quotationsbook.com/quote/31568/
   
   PR:		conf/131469
   Submitted by:	John Hein <jhein@timing.com>
   MFC after:	2 days
 
 Modified:
   head/games/fortune/datfiles/fortunes
 
 Modified: head/games/fortune/datfiles/fortunes
 ==============================================================================
 --- head/games/fortune/datfiles/fortunes	Thu Jun  4 22:00:48 2009	(r193466)
 +++ head/games/fortune/datfiles/fortunes	Thu Jun  4 22:01:50 2009	(r193467)
 @@ -48262,9 +48262,9 @@ beat their head on the keyboard.  After 
  		-- Harry Skelton
  %
  The seven deadly sins ... Food, clothing, firing, rent, taxes,
 -respectability and children.  Nothing can lift those seven milestones
 -from man's neck but money; and the spirit cannot soar until the
 -milestones are lifted.
 +respectability and children.  Nothing can lift those seven millstones
 +from Man's neck but money; and the spirit cannot soar until the
 +millstones are lifted.
  		-- George Bernard Shaw
  %
  The seven eyes of Ningauble the Wizard floated back to his hood as he
 _______________________________________________
 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: Sat Jun 6 02:26:43 UTC 2009 
State-Changed-Why:  
MFC into stable/7 done. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/131469: commit references a PR
Date: Sat,  6 Jun 2009 02:26:39 +0000 (UTC)

 Author: edwin
 Date: Sat Jun  6 02:26:23 2009
 New Revision: 193562
 URL: http://svn.freebsd.org/changeset/base/193562
 
 Log:
   MFC of r193464, r193467
   
   [patch] fortune(6): George Bernard Shaw quote fix
   [patch] fortune(6): file not Y2.01K compliant
   
   PR:		conf/129860, conf/131469
   Submitted by:	Alan Amesbury <amesbury@umn.edu>, John Hein <jhein@timing.com>
 
 Modified:
   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)
 
 Modified: stable/7/games/fortune/datfiles/fortunes
 ==============================================================================
 --- stable/7/games/fortune/datfiles/fortunes	Sat Jun  6 02:17:33 2009	(r193561)
 +++ stable/7/games/fortune/datfiles/fortunes	Sat Jun  6 02:26:23 2009	(r193562)
 @@ -48239,9 +48239,9 @@ beat their head on the keyboard.  After 
  		-- Harry Skelton
  %
  The seven deadly sins ... Food, clothing, firing, rent, taxes,
 -respectability and children.  Nothing can lift those seven milestones
 -from man's neck but money; and the spirit cannot soar until the
 -milestones are lifted.
 +respectability and children.  Nothing can lift those seven millstones
 +from Man's neck but money; and the spirit cannot soar until the
 +millstones are lifted.
  		-- George Bernard Shaw
  %
  The seven eyes of Ningauble the Wizard floated back to his hood as he
 
 Modified: stable/7/games/fortune/datfiles/fortunes-o.real
 ==============================================================================
 --- stable/7/games/fortune/datfiles/fortunes-o.real	Sat Jun  6 02:17:33 2009	(r193561)
 +++ stable/7/games/fortune/datfiles/fortunes-o.real	Sat Jun  6 02:26:23 2009	(r193562)
 @@ -4242,7 +4242,7 @@ Apple owners do it with mice!
  APPOINTMENT BOOK:
  	The reference of last resort when trying to duck undesired
  	invitations ("Gee, the soonest I can pencil you in is
 -	December, 2009"), or when trying to figure out what the hell
 +	December, 2039"), or when trying to figure out what the hell
  	it was you did during the past year.
  %
  Approximately 80% of our air pollution stems from hydrocarbons
 _______________________________________________
 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:
