docs/64848: PATCH: calendar(1) has duplicate entries for US holidays

[Ulrich Spoerlein]

>Number:         64848
>Category:       docs
>Synopsis:       PATCH: calendar(1) has duplicate entries for US holidays
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 28 07:50:19 PST 2004
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: