From q@uni.de  Sun Mar 28 07:40:04 2004
Return-Path: <q@uni.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4C8C616A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2004 07:40:04 -0800 (PST)
Received: from wrzx35.rz.uni-wuerzburg.de (wrzx35.rz.uni-wuerzburg.de [132.187.3.35])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B6B7443D1F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2004 07:40:03 -0800 (PST)
	(envelope-from q@uni.de)
Received: from wrzx30.rz.uni-wuerzburg.de (wrzx30.rz.uni-wuerzburg.de [132.187.1.30])
	by wrzx35.rz.uni-wuerzburg.de (Postfix) with ESMTP id 90359D9DEE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2004 17:42:18 +0200 (CEST)
Received: from virusscan (localhost [127.0.0.1])
	by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id 6577F56013
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2004 17:40:02 +0200 (CEST)
Received: from wrzx28.rz.uni-wuerzburg.de (wrzx28.rz.uni-wuerzburg.de [132.187.3.28])
	by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id 3FE6A5600B
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2004 17:40:02 +0200 (CEST)
Received: from coyote.q.local (wwsx14.win-screen.uni-wuerzburg.de [132.187.253.14])
	by wrzx28.rz.uni-wuerzburg.de (Postfix) with ESMTP id 9316BD0F09
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2004 17:42:21 +0200 (CEST)
Received: from roadrunner.q.local (roadrunner [192.168.0.147])
	by coyote.q.local (8.12.10/8.12.10) with ESMTP id i2SFe299015988
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2004 17:40:02 +0200 (CEST)
	(envelope-from q@roadrunner.q.local)
Received: from roadrunner.q.local (localhost [127.0.0.1])
	by roadrunner.q.local (8.12.10/8.12.10) with ESMTP id i2SFe1pI013216
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2004 17:40:01 +0200 (CEST)
	(envelope-from q@roadrunner.q.local)
Received: (from q@localhost)
	by roadrunner.q.local (8.12.10/8.12.10/Submit) id i2SFe1Om013215;
	Sun, 28 Mar 2004 17:40:01 +0200 (CEST)
	(envelope-from q)
Message-Id: <200403281540.i2SFe1Om013215@roadrunner.q.local>
Date: Sun, 28 Mar 2004 17:40:01 +0200 (CEST)
From: Ulrich Spoerlein <q@uni.de>
Reply-To: Ulrich Spoerlein <q@uni.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: PATCH: calendar(1) has duplicate entries for US holidays
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         64848
>Category:       docs
>Synopsis:       PATCH: calendar(1) has duplicate entries for US holidays
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    cperciva
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 28 07:50:19 PST 2004
>Closed-Date:    Tue Mar 30 11:54:13 PST 2004
>Last-Modified:  Tue Mar 30 11:54:13 PST 2004
>Originator:     Ulrich Spoerlein
>Release:        FreeBSD 5.2.1-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
The last revision of calendar.1 introduced the calendar.usholiday twice.
Remove this and put calendar.world before the national calendar files. Thus
we have an alphabetised list of international calendars. And an alphabetised
list of national calendar files.
>How-To-Repeat:
man calendar, read carefully
>Fix:
--- patch begins here ---
Index: calendar.1
===================================================================
RCS file: /home/ncvs/src/usr.bin/calendar/calendar.1,v
retrieving revision 1.33
diff -u -r1.33 calendar.1
--- calendar.1	19 Nov 2002 00:30:38 -0000	1.33
+++ calendar.1	28 Mar 2004 15:34:43 -0000
@@ -229,10 +229,9 @@
 .It Pa calendar.music
 Musical  events,  births, and deaths.
 Strongly  oriented  toward  rock 'n' roll.
-.It Pa calendar.usholiday
-U.S. holidays.
-This calendar should be updated yearly by the local system administrator
-so that roving holidays are set correctly for the current year.
+.It Pa calendar.world
+Includes all calendar files except for national files.
+.Pp
 .It Pa calendar.french
 French calendar.
 .It Pa calendar.german
@@ -244,9 +243,9 @@
 .It Pa calendar.southafrica
 Calendar of events in South Africa.
 .It Pa calendar.usholiday
-Calendar of holidays specific to the United States of America.
-.It Pa calendar.world
-Includes all calendar files except for national files.
+U.S. holidays.
+This calendar should be updated yearly by the local system administrator
+so that roving holidays are set correctly for the current year.
 .El
 .Sh SEE ALSO
 .Xr at 1 ,
--- patch ends here ---
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: cperciva 
State-Changed-When: Tue Mar 30 10:28:57 PST 2004 
State-Changed-Why:  
Patched in -current, will MFC in 3 days. 


Responsible-Changed-From-To: freebsd-doc->cperciva 
Responsible-Changed-By: cperciva 
Responsible-Changed-When: Tue Mar 30 10:28:57 PST 2004 
Responsible-Changed-Why:  
Patched in -current, will MFC in 3 days. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=64848 
State-Changed-From-To: patched->closed 
State-Changed-By: cperciva 
State-Changed-When: Tue Mar 30 11:53:45 PST 2004 
State-Changed-Why:  
des did the MFC by accident. 

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