From nobody@FreeBSD.org  Sun Sep 12 16:38:42 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 74AC11065672
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 12 Sep 2010 16:38:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 641518FC29
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 12 Sep 2010 16:38:42 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o8CGccvR071507
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 12 Sep 2010 16:38:38 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o8CGccxw071506;
	Sun, 12 Sep 2010 16:38:38 GMT
	(envelope-from nobody)
Message-Id: <201009121638.o8CGccxw071506@www.freebsd.org>
Date: Sun, 12 Sep 2010 16:38:38 GMT
From: Douglas Berry <bitnix@bitnix.ca>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Inaccurate description of Canadian historical event
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         150504
>Category:       misc
>Synopsis:       [patch] calendar(1): Inaccurate description of Canadian historical event
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 12 16:40:02 UTC 2010
>Closed-Date:    Mon Oct 18 02:36:45 UTC 2010
>Last-Modified:  Mon Oct 18 02:36:45 UTC 2010
>Originator:     Douglas Berry
>Release:        8.1-STABLE i386
>Organization:
>Environment:
FreeBSD cnd.dundas.on.ca 8.1-STABLE FreeBSD 8.1-STABLE #64 r212424: Fri Sep 10 13:29:20 EDT 2010     root@cnd.dundas.on.ca:/usr/obj/usr/src/sys/CND-GENERIC  i386
>Description:
The battle occurred on the Plains of Abraham, just outside
the walls of Quebec City. Not Abraham

see http://en.wikipedia.org/wiki/Battle_of_the_Plains_of_Abraham
>How-To-Repeat:
view stable/8/usr.bin/calendar/calendars/calendar.history
>Fix:
apply patch

Patch attached with submission follows:

--- calendar.history.orig	2010-09-12 12:06:04.000000000 -0400
+++ calendar.history	2010-09-12 12:07:54.000000000 -0400
@@ -303,7 +303,7 @@
 09/12	German paratroopers rescue Mussolini from captivity in Rome, 1943
 09/12	Germany annexes Sudetenland, 1938
 09/13	58 C (136.4 F) measured at el Azizia, Libya, 1922
-09/13	British defeat the French at Abraham near Quebec City, 1788
+09/13	British defeat the French at the Plains of Abraham near Quebec City, 1788
 09/13	Building of Hadrian's Wall begun, 122
 09/13	Chiang Kai-Shek becomes president of China, 1943
 09/14	Benjamin Franklin is sent to France as an American minister, 1778


>Release-Note:
>Audit-Trail:

From: "Douglas Berry" <bitnix@bitnix.ca>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/150504: Inaccurate description of Canadian historical event
Date: Sun, 12 Sep 2010 18:29:15 -0400

 This is a multipart MIME message.
 
 --==_Exmh_1284330541_229060
 Content-Type: text/plain; charset=iso-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 My updated patch did not make it into the web gui, the=20
 attached patch is corrected.
 
 
 --==_Exmh_1284330541_229060
 Content-Type: text/plain ; name="calendar.history.diff"; charset=iso-8859-1
 Content-Description: calendar.history.diff
 Content-Disposition: attachment; filename="calendar.history.diff"
 Content-Transfer-Encoding: quoted-printable
 
 --- calendar.history.orig	2010-09-12 12:06:04.000000000 -0400
 +++ calendar.history	2010-09-12 18:25:06.000000000 -0400
 =40=40 -303,7 +303,8 =40=40
  09/12	German paratroopers rescue Mussolini from captivity in Rome, 1943
  09/12	Germany annexes Sudetenland, 1938
  09/13	58=B0 C (136.4=B0 F) measured at el Azizia, Libya, 1922
 -09/13	British defeat the French at Abraham near Quebec City, 1788
 +09/13	British defeat the French at the Plains of Abraham, just outside
 +	the walls of Quebec City, 1759
  09/13	Building of Hadrian's Wall begun, 122
  09/13	Chiang Kai-Shek becomes president of China, 1943
  09/14	Benjamin Franklin is sent to France as an American minister, 1778
 
 --==_Exmh_1284330541_229060--
 
 
Responsible-Changed-From-To: freebsd-bugs->edwin 
Responsible-Changed-By: arundel 
Responsible-Changed-When: Wed Sep 15 10:33:55 UTC 2010 
Responsible-Changed-Why:  
I believe edwin is in charge of calendar. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150504 
State-Changed-From-To: open->patched 
State-Changed-By: edwin 
State-Changed-When: Wed Sep 22 21:11:17 UTC 2010 
State-Changed-Why:  
Commited, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/150504: commit references a PR
Date: Wed, 22 Sep 2010 21:10:51 +0000 (UTC)

 Author: edwin
 Date: Wed Sep 22 21:10:45 2010
 New Revision: 213032
 URL: http://svn.freebsd.org/changeset/base/213032
 
 Log:
   Fix location of the Battle of the Plains of Abraham
   
   PR:		150504
   Submitted by:	Douglas Berry <bitnix@bitnix.ca>
   MFC after:	1 week
 
 Modified:
   head/usr.bin/calendar/calendars/calendar.history
 
 Modified: head/usr.bin/calendar/calendars/calendar.history
 ==============================================================================
 --- head/usr.bin/calendar/calendars/calendar.history	Wed Sep 22 21:06:43 2010	(r213031)
 +++ head/usr.bin/calendar/calendars/calendar.history	Wed Sep 22 21:10:45 2010	(r213032)
 @@ -303,7 +303,7 @@
  09/12	German paratroopers rescue Mussolini from captivity in Rome, 1943
  09/12	Germany annexes Sudetenland, 1938
  09/13	58 C (136.4 F) measured at el Azizia, Libya, 1922
 -09/13	British defeat the French at Abraham near Quebec City, 1788
 +09/13	British defeat the French at the Plains of Abraham near Quebec City, 1788
  09/13	Building of Hadrian's Wall begun, 122
  09/13	Chiang Kai-Shek becomes president of China, 1943
  09/14	Benjamin Franklin is sent to France as an American minister, 1778
 _______________________________________________
 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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/150504: commit references a PR
Date: Wed, 22 Sep 2010 21:14:24 +0000 (UTC)

 Author: edwin
 Date: Wed Sep 22 21:14:18 2010
 New Revision: 213033
 URL: http://svn.freebsd.org/changeset/base/213033
 
 Log:
   And now the 2nd part of the patch: Also fix the year.
   
   PR:		150504
   Submitted by:	Douglas Berry <bitnix@bitnix.ca>
 
 Modified:
   head/usr.bin/calendar/calendars/calendar.history
 
 Modified: head/usr.bin/calendar/calendars/calendar.history
 ==============================================================================
 --- head/usr.bin/calendar/calendars/calendar.history	Wed Sep 22 21:10:45 2010	(r213032)
 +++ head/usr.bin/calendar/calendars/calendar.history	Wed Sep 22 21:14:18 2010	(r213033)
 @@ -303,7 +303,7 @@
  09/12	German paratroopers rescue Mussolini from captivity in Rome, 1943
  09/12	Germany annexes Sudetenland, 1938
  09/13	58 C (136.4 F) measured at el Azizia, Libya, 1922
 -09/13	British defeat the French at the Plains of Abraham near Quebec City, 1788
 +09/13	British defeat the French at the Plains of Abraham, just outside the walls of Quebec City, 1759
  09/13	Building of Hadrian's Wall begun, 122
  09/13	Chiang Kai-Shek becomes president of China, 1943
  09/14	Benjamin Franklin is sent to France as an American minister, 1778
 _______________________________________________
 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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/150504: commit references a PR
Date: Thu, 14 Oct 2010 21:15:18 +0000 (UTC)

 Author: edwin
 Date: Thu Oct 14 21:14:58 2010
 New Revision: 213858
 URL: http://svn.freebsd.org/changeset/base/213858
 
 Log:
   MFC of r213032 r213033
   
   Fix location and year of the Battle of the Plains of Abraham
   
   PR:             150504
   Submitted by:   Douglas Berry <bitnix@bitnix.ca>
 
 Modified:
   stable/6/usr.bin/calendar/calendars/calendar.history
 Directory Properties:
   stable/6/usr.bin/calendar/   (props changed)
 
 Modified: stable/6/usr.bin/calendar/calendars/calendar.history
 ==============================================================================
 --- stable/6/usr.bin/calendar/calendars/calendar.history	Thu Oct 14 21:14:33 2010	(r213857)
 +++ stable/6/usr.bin/calendar/calendars/calendar.history	Thu Oct 14 21:14:58 2010	(r213858)
 @@ -303,7 +303,7 @@
  09/12	German paratroopers rescue Mussolini from captivity in Rome, 1943
  09/12	Germany annexes Sudetenland, 1938
  09/13	58 C (136.4 F) measured at el Azizia, Libya, 1922
 -09/13	British defeat the French at Abraham near Quebec City, 1788
 +09/13	British defeat the French at the Plains of Abraham, just outside the walls of Quebec City, 1759
  09/13	Building of Hadrian's Wall begun, 122
  09/13	Chiang Kai-Shek becomes president of China, 1943
  09/14	Benjamin Franklin is sent to France as an American minister, 1778
 _______________________________________________
 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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/150504: commit references a PR
Date: Thu, 14 Oct 2010 21:16:22 +0000 (UTC)

 Author: edwin
 Date: Thu Oct 14 21:16:14 2010
 New Revision: 213859
 URL: http://svn.freebsd.org/changeset/base/213859
 
 Log:
   MFC of r213032 r213033
   
   Fix location and year of the Battle of the Plains of Abraham
   
   PR:             150504
   Submitted by:   Douglas Berry <bitnix@bitnix.ca>
 
 Modified:
   stable/8/usr.bin/calendar/calendars/calendar.history
 Directory Properties:
   stable/8/usr.bin/calendar/   (props changed)
 
 Modified: stable/8/usr.bin/calendar/calendars/calendar.history
 ==============================================================================
 --- stable/8/usr.bin/calendar/calendars/calendar.history	Thu Oct 14 21:14:58 2010	(r213858)
 +++ stable/8/usr.bin/calendar/calendars/calendar.history	Thu Oct 14 21:16:14 2010	(r213859)
 @@ -303,7 +303,7 @@
  09/12	German paratroopers rescue Mussolini from captivity in Rome, 1943
  09/12	Germany annexes Sudetenland, 1938
  09/13	58 C (136.4 F) measured at el Azizia, Libya, 1922
 -09/13	British defeat the French at Abraham near Quebec City, 1788
 +09/13	British defeat the French at the Plains of Abraham, just outside the walls of Quebec City, 1759
  09/13	Building of Hadrian's Wall begun, 122
  09/13	Chiang Kai-Shek becomes president of China, 1943
  09/14	Benjamin Franklin is sent to France as an American minister, 1778
 _______________________________________________
 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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/150504: commit references a PR
Date: Thu, 14 Oct 2010 21:17:39 +0000 (UTC)

 Author: edwin
 Date: Thu Oct 14 21:17:32 2010
 New Revision: 213860
 URL: http://svn.freebsd.org/changeset/base/213860
 
 Log:
   MFC of r213032 r213033
   
   Fix location and year of the Battle of the Plains of Abraham
   
   PR:             150504
   Submitted by:   Douglas Berry <bitnix@bitnix.ca>
 
 Modified:
   stable/7/usr.bin/calendar/calendars/calendar.history
 Directory Properties:
   stable/7/usr.bin/calendar/   (props changed)
 
 Modified: stable/7/usr.bin/calendar/calendars/calendar.history
 ==============================================================================
 --- stable/7/usr.bin/calendar/calendars/calendar.history	Thu Oct 14 21:16:14 2010	(r213859)
 +++ stable/7/usr.bin/calendar/calendars/calendar.history	Thu Oct 14 21:17:32 2010	(r213860)
 @@ -303,7 +303,7 @@
  09/12	German paratroopers rescue Mussolini from captivity in Rome, 1943
  09/12	Germany annexes Sudetenland, 1938
  09/13	58 C (136.4 F) measured at el Azizia, Libya, 1922
 -09/13	British defeat the French at Abraham near Quebec City, 1788
 +09/13	British defeat the French at the Plains of Abraham, just outside the walls of Quebec City, 1759
  09/13	Building of Hadrian's Wall begun, 122
  09/13	Chiang Kai-Shek becomes president of China, 1943
  09/14	Benjamin Franklin is sent to France as an American minister, 1778
 _______________________________________________
 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: Mon Oct 18 02:36:19 UTC 2010 
State-Changed-Why:  
All done! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150504 
>Unformatted:
