Fix multiple uses of commas to separate countries. This construct is

commonly used in the United States of America to represent a
hierarchical relationship between city and state or country
("Evacuation Day in Suffolk County, Massachusetts"), but it was also
being abused to enumerate unrelated places ("Independence Day in
Albania, Mauritania").

Remove the list of countries observing All Souls' Day.  This is a
widely observed holiday, and the list only included South American
contries.

There's more to do here; the list is rather patchy.

1 files changed, 28 insertions, 28 deletions

diff --git a/usr.bin/calendar/calendars/calendar.holiday b/usr.bin/calendar/calendars/calendar.holiday
index c05b5a9..308672d 100644
--- a/usr.bin/calendar/calendars/calendar.holiday
+++ b/usr.bin/calendar/calendars/calendar.holiday
@@ -7,7 +7,7 @@
 #ifndef _calendar_holiday_
 #define _calendar_holiday_
 
-01/01	Independence Day in Haiti, Sudan
+01/01	Independence Day in Haiti and Sudan
 01/01	Universal Fraternity Day in Mozambique
 01/01	Beginning of the Year in Japan
 01/02	Ancestry Day in Haiti
@@ -72,7 +72,7 @@
 03/08	First Annual International Women's Day, 1909
 03/08	International Women's Day in U.S.S.R.
 03/08	Syrian National Day in Libyan Arab Republic
-03/08	Women's Day in Guinea-Bissau, Taiwan, Yemen Democratic Republic
+03/08	Women's Day in Guinea-Bissau, Taiwan and Yemen Democratic Republic
 03/08	Youth Day in Zambia
 03/09	Decoration Day in Liberia
 03/09	Falgun Purnima Day in Nepal
@@ -86,8 +86,8 @@
 03/16	Black Press Day; first Black newspaper founded in 1827
 03/17	Evacuation Day in Suffolk County, Massachusetts
 03/17	St. Patrick's Day
-03/19	St. Joseph's Day in Colombia, Costa Rica, Holy See, Liechtenstein,
-	San Marino, Spain, Venezuela
+03/19	St. Joseph's Day, obeserved in Colombia, Costa Rica, Holy See,
+	Liechtenstein,	San Marino, Spain, Venezuela
 03/19	Tree Planting Day in Lestho
 03/20	Independence Day in Tunisia
 03/20	Youth Day in Oklahoma
@@ -130,7 +130,7 @@
 04/16	Holy Week (5 days) in Venezuela
 04/16	Tourist Week (5 days) in Uruguay
 04/17	Burmese New Year in Burma
-04/18	Independence Day in Chile, Zimbabwe
+04/18	Independence Day in Chile and Zimbabwe
 04/19	Declaration of Independence in Venezuela
 04/19	Republic Day in Sierra Leone
 04/21	San Jacinto Day in Texas
@@ -138,7 +138,7 @@
 04/22	Oklahoma Day in Oklahoma
 04/24	Victory Day in Togo
 04/24*	Pesach - First Day of Passover - Festival of Freedom
-04/25	Anzac Day in Australia, New Zealand, Tonga, Western Samoa
+04/25	Anzac Day, observed in Australia, New Zealand, Tonga and Western Samoa
 04/25	Liberation Day in Italy 
 04/25	National Flag Day in Swaziland
 04/26	Confederate Memorial Day in Florida & Georgia
@@ -154,7 +154,7 @@
 05/03	Constitution Memorial Day in Japan
 05/04	Rhode Island Independence Day
 05/04	National Holiday in Japan
-05/05	Children's Day in Japan, South Korea
+05/05	Children's Day in Japan and South Korea
 05/05	Coronation Day in Thailand
 05/05	Liberation Day in the Netherlands
 05/06	Bataan Day in Philippines
@@ -162,7 +162,7 @@
 05/07	May Day in United Kingdom
 05/08	Truman Day in Missouri
 05/09	Liberation Day in Czechoslovakia
-05/09	Victory Day in Poland, U.S.S.R.
+05/09	Victory Day in Poland and U.S.S.R.
 05/10	Confederate Memorial Day in South Carolina
 05/10	Mothers Day in Guatemala
 05/11	Minnesota Day in Minnesota
@@ -170,10 +170,10 @@
 05/14	Independence Day (2 days) in Paraguay
 05/14	Unification Day in Liberia
 05/15	Kamuzu Day in Malawi
-05/15	Vesak Day in Singapore, Malaysia
+05/15	Vesak Day, observed in Singapore and Malaysia
 05/15	Visakha Bucha Day in Thailand
 05/16	Discovery Day in Cayman Islands
-05/17	Constitution Day in Nauru, Norway
+05/17	Constitution Day in Nauru and Norway
 05/18	Flag Day in Haiti
 05/18	Prayer Day in Denmark
 05/19	Youth and Sports Day in Turkey
@@ -182,12 +182,12 @@
 05/20	National Day in Cameroon
 05/20	Victoria Day in Canada
 05/22	National Heroes Day in Sri Lanka
-05/23	Commonwealth Day in Jamaica, Belize
+05/23	Commonwealth Day in Jamaica and Belize
 05/23	National Labor Day in Jamaica
 05/24	Bermuda Day in Bermuda
 05/24	Day of Slav Letters in Bulgaria
 05/25	African Freedom Day in Zimbabwe
-05/25	African Liberation Day in Chad, Mauritania, Zambia
+05/25	African Liberation Day in Chad, Mauritania and Zambia
 05/25	Independence Day in Jordan
 05/25	Memorial Day in New Mexico & Puerto Rico
 05/26*	First Day of Shavuot 
@@ -215,13 +215,13 @@
 06/17	National Day in Federal Republic of Germany
 06/18	Evacuation Day in Egypt
 06/19	Emancipation Day in Texas
-06/19	Labor Day in Trinidad, Tobago
+06/19	Labor Day in Trinidad and Tobago
 06/19	Revolution Day in Algeria
 06/20	Flag Day in Argentina
 06/20	West Virginia Day in West Virginia
 06/22	National Sovereignty Day in Haiti
 06/23	National Holiday in Luxembourg
-06/24	Fisherman's Day in Madagascar, Mozambique, Somalia
+06/24	Fisherman's Day in Madagascar, Mozambique and Somalia
 06/24	Kings Day in Spain
 06/24	Peasants Day in Peru
 06/24	St. Jean-Baptiste Day in Quebec
@@ -243,7 +243,7 @@
 07/04	Philippine-American Friendship Day in the Philippines
 07/04	Warriors Day (2 days) in Yugoslavia
 07/05	Day of Peace and Unity in Rwanda
-07/05	Independence Day in Algeria, Venezuela
+07/05	Independence Day in Algeria and Venezuela
 07/07	National Day in Malawi
 07/07	Saba Saba Day in Tanzania
 07/09	Independence Day in Argentina
@@ -265,7 +265,7 @@
 07/23	Egyptian National Day in Syrian Arab Republic
 07/23	Remembrance Day in Papua New Guinea
 07/24	Pioneer Day in Utah
-07/24	Simon Bolivar's Day in Ecuador, Venezuela
+07/24	Simon Bolivar's Day in Ecuador and Venezuela
 07/25	Constitution Day in Puerto Rico
 07/25	National Rebellion Day (3 days) in Cuba
 07/25	Republic Day in Tunisia
@@ -274,13 +274,13 @@
 07/28	Independence Days (2 days) in Peru
 07/29	Rain Day in Waynesburg, PA
 07/31	Revolution Day in Congo
-08/01	Discovery Day in Trinidad, Tobogo
+08/01	Discovery Day in Trinidad and Tobago
 08/01	Emancipation Day in Granada
 08/01	Freedom Day in Guyana
 08/01	National Day in Switzerland
 08/01	National Holidays (5 days) in El Salvador
 08/01	Parent's Day in Zaire
-08/03	Independence Day in Jamaica, Niger
+08/03	Independence Day in Jamaica and Niger
 08/03	Memorial Day of Archbishop Makarios in Cyprus
 08/04	Freedom Day in Guyana
 08/05*	Bank Holiday in Scotland and Northern Ireland
@@ -315,7 +315,7 @@
 08/28	Heroes Day in Philippines
 08/30	Huey P. Long Day in Louisiana
 08/30	Victory Day in Turkey
-08/31	Independence Day in Trinidad, Tobago
+08/31	Independence Day in Trinidad and Tobago
 08/31	National Day in Malaysia
 08/31	Pashtoonian Day in Afghanistan
 09/01	Army Day in Chile
@@ -336,7 +336,7 @@
 09/16	Cherokee Strip Day in Oklahoma
 09/16	Independence Days in Mexico and Papua New Guinea
 09/17	National Heroes Day in Angola
-09/18	Independence Day in Chile, Zimbabwe
+09/18	Independence Day in Chile and Zimbabwe
 09/19	Army Day in Chile
 09/21	Independence Day in Belize
 09/22	Independence Day in Mali
@@ -345,10 +345,10 @@
 09/23*	Autumnal Equinox in Japan
 09/24	Independence Day in Guinea-Bissau
 09/24	National Day in Saudi Arabia
-09/24	Republic Day in Trinidad, Tobago
+09/24	Republic Day in Trinidad and Tobago
 09/25	Army Day in Mozambique
 09/25	Referendum Day in Rwanda
-09/26	National Day in Maldives, Yemen Democratic Republic
+09/26	National Day in Maldives and Yemen Democratic Republic
 09/26	Revolution Anniversary Day in Yemen Arab
 09/28	Confucius' Day in Taiwan
 09/30	Botswana Day in Botswana
@@ -379,7 +379,7 @@
 10/11	Druger Day in South Africa
 10/12	Day of the Race in Argentina
 10/12	Discovery Day in Gahamas
-10/12	National Day in Equatorial Guinea, Spain
+10/12	National Day in Equatorial Guinea and Spain
 10/12	Our Lady Aparecida Day in Brazil
 10/12	Pan American Day in Belize
 10/13	St. Edward's Day - Patron saint of England
@@ -399,7 +399,7 @@
 10/25	Labor Day in New Zealand
 10/25	Taiwan Restoration Day in Taiwan
 10/26	Agam Day in Nauru
-10/26	Armed Forces Day in Benin, Rwanda
+10/26	Armed Forces Day in Benin and Rwanda
 10/26	National Day in Austria
 10/28	National Holiday in Greece
 10/28	OHI Day in Cyprus
@@ -407,7 +407,7 @@
 10/29	Republic Day in Turkey
 10/31	Nevada Day in Nevada
 11/01	All Saints Day
-11/02	All Souls Day in Bolivia, Brazil, El Salvador, Uruguay
+11/02	All Souls Day
 11/02	Memorial Day in Ecuador
 11/03	Culture Day in Japan
 11/03	Thanksgiving Day in Liberia
@@ -430,12 +430,12 @@
 11/22	Independence Day in Lebanon
 11/23	Labor Thanksgiving Day in Japan
 11/25	Independence Day in Suriname
-11/28	Independence Day in Albania, Mauritania
+11/28	Independence Day in Albania and Mauritania
 11/29	Day of the Republic (2 days) in Yugoslavia
 11/29	Goodwill Day in Liberia
 11/29	Liberation Day in Albania
 11/29	National Day in Burma
-11/30	Independence Day in Barbados, Yemen Democratic Republic
+11/30	Independence Day in Barbados and Yemen Democratic Republic
 11/30	National Day in Benin
 11/30	National Heroes Day in Philippines
 11/30	St. Andrew's Day
@@ -445,7 +445,7 @@
 12/03	National Holiday in Laos
 12/06	Independence Day in Finland
 12/07	Delaware Day in Delaware
-12/07	Independence Day in Ivory Coast, Panama
+12/07	Independence Day in Ivory Coast and Panama
 12/08	Mother's Day in Panama
 12/09	Independence Day in Tanzania
 12/10	Human Rights Day