From 66231b2150266b7d09211ee8452f1b46c881b3ef Mon Sep 17 00:00:00 2001
From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com>
Date: Sat, 22 Apr 2023 04:21:38 -0700
Subject: [PATCH] Remove 'America' (A) from 'USA' :-)
This to make the country code consistent with mkiocccentry (and I guess
international standard country codes).
This affects many README.md files and (for one line) winners.csv.
---
1986/applin/README.md | 2 +-
1987/hines/README.md | 2 +-
1987/korn/README.md | 2 +-
1987/wall/README.md | 2 +-
1987/westley/README.md | 2 +-
1988/applin/README.md | 2 +-
1988/isaak/README.md | 2 +-
1988/robison/README.md | 2 +-
1989/fubar/README.md | 2 +-
1989/paul/README.md | 2 +-
1989/robison/README.md | 2 +-
1989/vanb/README.md | 2 +-
1989/westley/README.md | 2 +-
1990/cmills/README.md | 2 +-
1990/dg/README.md | 2 +-
1990/jaw/README.md | 6 +++---
1990/scjones/README.md | 2 +-
1990/tbr/README.md | 4 ++--
1990/theorem/README.md | 2 +-
1990/westley/README.md | 2 +-
1991/buzzard/README.md | 2 +-
1991/davidguy/README.md | 4 ++--
1991/fine/README.md | 2 +-
1991/westley/README.md | 2 +-
1992/adrian/README.md | 2 +-
1992/buzzard.1/README.md | 2 +-
1992/buzzard.2/README.md | 2 +-
1992/lush/README.md | 2 +-
1992/nathan/README.md | 2 +-
1992/vern/README.md | 2 +-
1992/westley/README.md | 6 +++---
1993/cmills/README.md | 2 +-
1993/ejb/README.md | 2 +-
1993/plummer/README.md | 2 +-
1993/schnitzi/README.md | 2 +-
1993/vanb/README.md | 2 +-
1994/README.md | 2 +-
1994/dodsond1/README.md | 2 +-
1994/dodsond2/README.md | 2 +-
1994/horton/README.md | 2 +-
1994/ldb/README.md | 2 +-
1994/schnitzi/README.md | 2 +-
1994/shapiro/README.md | 2 +-
1994/smr/README.md | 2 +-
1994/weisberg/README.md | 2 +-
1994/westley/README.md | 2 +-
1995/dodsond1/README.md | 2 +-
1995/dodsond2/README.md | 2 +-
1995/heathbar/README.md | 2 +-
1995/leo/README.md | 2 +-
1995/makarios/README.md | 2 +-
1995/savastio/README.md | 2 +-
1995/schnitzi/README.md | 2 +-
1995/vanschnitz/README.md | 2 +-
1996/README.md | 2 +-
1996/dalbec/README.md | 2 +-
1996/huffman/README.md | 2 +-
1996/rcm/README.md | 2 +-
1996/westley/README.md | 2 +-
1998/banks/README.md | 2 +-
1998/chaos/README.md | 2 +-
1998/dloweneil/README.md | 4 ++--
1998/schnitzi/README.md | 2 +-
2000/bmeyer/README.md | 2 +-
2000/dhyang/README.md | 2 +-
2000/dlowe/README.md | 2 +-
2000/robison/README.md | 2 +-
2000/schneiderwent/README.md | 2 +-
2001/bellard/Makefile | 2 +-
2001/coupard/README.md | 2 +-
2001/ctk/README.md | 2 +-
2001/dgbeards/README.md | 2 +-
2001/jason/README.md | 2 +-
2001/westley/README.md | 2 +-
2001/williams/README.md | 2 +-
2004/burley/README.md | 2 +-
2004/hoyle/README.md | 2 +-
2004/jdalbec/README.md | 2 +-
2004/omoikane/README.md | 2 +-
2004/vik1/README.md | 2 +-
2004/vik2/README.md | 2 +-
2005/klausler/README.md | 2 +-
2005/mikeash/README.md | 2 +-
2005/vik/README.md | 2 +-
2005/vince/README.md | 2 +-
tmp/winners.csv | 2 +-
86 files changed, 93 insertions(+), 93 deletions(-)
diff --git a/1986/applin/README.md b/1986/applin/README.md
index 09e8f8ee8..167629e28 100644
--- a/1986/applin/README.md
+++ b/1986/applin/README.md
@@ -1,7 +1,7 @@
# Most adaptable program
Jack Applin
-USA
+US
## To build:
diff --git a/1987/hines/README.md b/1987/hines/README.md
index ea57e0f51..f4d8126fa 100644
--- a/1987/hines/README.md
+++ b/1987/hines/README.md
@@ -5,7 +5,7 @@ OnLine Computer Systems
4200 Farragut Street
Hyattsville, MD
20781
-USA
+US
## To build:
diff --git a/1987/korn/README.md b/1987/korn/README.md
index 9817d1a30..4c67c6dec 100644
--- a/1987/korn/README.md
+++ b/1987/korn/README.md
@@ -5,7 +5,7 @@ AT&T Bell Labs
MH 3C-526B, AT&T Bell Labs
Murray Hill, NJ
07974
-USA
+US
## To build:
diff --git a/1987/wall/README.md b/1987/wall/README.md
index a9aa09eec..a3069bceb 100644
--- a/1987/wall/README.md
+++ b/1987/wall/README.md
@@ -3,7 +3,7 @@
Larry Wall
Unisys - System Development Group Santa Monica
9132 Kester Ave
-Panorama City, CA 91402 USA
+Panorama City, CA 91402 US
## To build:
diff --git a/1987/westley/README.md b/1987/westley/README.md
index 65bc1cbc7..729fc1ae2 100644
--- a/1987/westley/README.md
+++ b/1987/westley/README.md
@@ -5,7 +5,7 @@ Starfire Consulting
1121 Hamline Ave. N. #17
St. Paul, MN
55108
-USA
+US
## To build:
diff --git a/1988/applin/README.md b/1988/applin/README.md
index 0d4599a96..975486c2c 100644
--- a/1988/applin/README.md
+++ b/1988/applin/README.md
@@ -5,7 +5,7 @@ Hewlett-Packard
3404 E. Harmony Rd
Ft. Collins, CO
80525
-USA
+US
## To build:
diff --git a/1988/isaak/README.md b/1988/isaak/README.md
index e5f5c1a92..251133c20 100644
--- a/1988/isaak/README.md
+++ b/1988/isaak/README.md
@@ -5,7 +5,7 @@ Imagen Corporation
2650 San Tomas Expy.
Santa Clara, CA
95052-8101
-USA
+US
## To build:
diff --git a/1988/robison/README.md b/1988/robison/README.md
index 8b23b5f9b..488b7c8d6 100644
--- a/1988/robison/README.md
+++ b/1988/robison/README.md
@@ -5,7 +5,7 @@ University of Illinois at Urbana-Champaign
1304 W. Springfield Ave.
Urbana IL
61801
-USA
+US
## To build:
diff --git a/1989/fubar/README.md b/1989/fubar/README.md
index d9d1038a1..9c13c3d34 100644
--- a/1989/fubar/README.md
+++ b/1989/fubar/README.md
@@ -5,7 +5,7 @@ Sequent Computer Systems, Inc
15450 SW Koll Parkway
Beaverton, OR
97006
-USA
+US
## To build:
diff --git a/1989/paul/README.md b/1989/paul/README.md
index a837936f3..db9f1f1ef 100644
--- a/1989/paul/README.md
+++ b/1989/paul/README.md
@@ -5,7 +5,7 @@ CIRRUS LOGIC, Inc.
1463 Centre Pointe Dr.
Milpitas, CA
95035
-USA
+US
## To build:
diff --git a/1989/robison/README.md b/1989/robison/README.md
index 06a7411dd..0b7127c3b 100644
--- a/1989/robison/README.md
+++ b/1989/robison/README.md
@@ -5,7 +5,7 @@ University of Illinois
1304 W. Springfield Ave.
Urbana, IL
61801
-USA
+US
## To build:
diff --git a/1989/vanb/README.md b/1989/vanb/README.md
index a8111f831..9bcfb961e 100644
--- a/1989/vanb/README.md
+++ b/1989/vanb/README.md
@@ -5,7 +5,7 @@ Department of Computer Science
University of Central Florida
Orlando, Florida
32816
-USA
+US
## To build:
diff --git a/1989/westley/README.md b/1989/westley/README.md
index 096137a44..fef7065d0 100644
--- a/1989/westley/README.md
+++ b/1989/westley/README.md
@@ -5,7 +5,7 @@ Starfire Consulting
1026 Blair Ave.
St. Paul, MN
55104
-USA
+US
## To build:
diff --git a/1990/cmills/README.md b/1990/cmills/README.md
index 135ff7cca..7c9b8f5f4 100644
--- a/1990/cmills/README.md
+++ b/1990/cmills/README.md
@@ -4,7 +4,7 @@ Chris Mills
Wyse Technology
3471 N. 1st St.
San Jose CA 95134
-USA
+US
## To build:
diff --git a/1990/dg/README.md b/1990/dg/README.md
index 32dd59b67..f48d6d0c7 100644
--- a/1990/dg/README.md
+++ b/1990/dg/README.md
@@ -4,7 +4,7 @@ David Goodenough
anonymous organization
541 Commonwealth Ave
Newton, MA 02159
-USA
+US
## To build:
diff --git a/1990/jaw/README.md b/1990/jaw/README.md
index aaed01a8f..b934acb95 100644
--- a/1990/jaw/README.md
+++ b/1990/jaw/README.md
@@ -5,19 +5,19 @@ Research Institute for Advanced Computer Science
MS 230-5
NASA Ames Research Center
Moffett Field, CA 94131
-USA
+US
Karl F. Fox
Morning Star Technologies, Inc.
1760 Zollinger Road
Columbus, OH 43221
-USA
+US
Paul Eggert
Twin Sun Inc.
360 N. Sepulveda Blvd. #2055
El Segundo, CA 90245
-USA
+US
## To build:
diff --git a/1990/scjones/README.md b/1990/scjones/README.md
index c95350842..e1ffcfc23 100644
--- a/1990/scjones/README.md
+++ b/1990/scjones/README.md
@@ -4,7 +4,7 @@ Larry Jones
SDRC
2000 Eastman Dr
Milford, OH 45150
-USA
+US
## To build:
diff --git a/1990/tbr/README.md b/1990/tbr/README.md
index 6068dc980..916b1ae7f 100644
--- a/1990/tbr/README.md
+++ b/1990/tbr/README.md
@@ -4,13 +4,13 @@ Byron Rakitzis
Princeton University
5707 Old Lodge Dr.
Houston, TX 77066
-USA
+US
Sean Dorward
Princeton University
10274 Burleigh Cottage Lane
Ellicott City, MD 21043
-USA
+US
## To build:
diff --git a/1990/theorem/README.md b/1990/theorem/README.md
index 0beac04a8..4b6d753dc 100644
--- a/1990/theorem/README.md
+++ b/1990/theorem/README.md
@@ -4,7 +4,7 @@ Adrian Mariano
University of Washington
2729 72nd Ave SE
Mercer Island, WA 98040
-USA
+US
## To build:
diff --git a/1990/westley/README.md b/1990/westley/README.md
index 8c692d9db..8f8a8f5cf 100644
--- a/1990/westley/README.md
+++ b/1990/westley/README.md
@@ -4,7 +4,7 @@ Brian Westley (Merlyn LeRoy on usenet)
DigiBoard, Inc.
1026 Blair Ave.
St. Paul, MN 55104
-USA
+US
## To build:
diff --git a/1991/buzzard/README.md b/1991/buzzard/README.md
index 881b01227..9d7904288 100644
--- a/1991/buzzard/README.md
+++ b/1991/buzzard/README.md
@@ -4,7 +4,7 @@ Sean Barrett
University of Maryland
5407 20th Place
Hyattsville MD 20782
-USA
+US
## To build:
diff --git a/1991/davidguy/README.md b/1991/davidguy/README.md
index 106eab808..33bc3d909 100644
--- a/1991/davidguy/README.md
+++ b/1991/davidguy/README.md
@@ -4,14 +4,14 @@ David Applegate
School of Computer Science
Carnegie Mellon University
Pittsburgh PA 15213
-USA
+US
Guy Jacobson
AT&T Bell Laboratories
600 Mountain Avenue
Murray Hill NJ 07974
-USA
+US
## To build:
diff --git a/1991/fine/README.md b/1991/fine/README.md
index afafd7184..570cada52 100644
--- a/1991/fine/README.md
+++ b/1991/fine/README.md
@@ -5,7 +5,7 @@ Ohio State University
Department of Computer and Information Science
2036 Neil Avenue Mall
Columbus, Ohio 43210
-USA
+US
## To build:
diff --git a/1991/westley/README.md b/1991/westley/README.md
index 567ec3442..2e505d628 100644
--- a/1991/westley/README.md
+++ b/1991/westley/README.md
@@ -4,7 +4,7 @@ Brian Westley (Merlyn LeRoy on usenet)
DigiBoard, Inc.
1026 Blair Ave.
St. Paul, MN 55104
-USA
+US
## To build:
diff --git a/1992/adrian/README.md b/1992/adrian/README.md
index d2104fbbb..1c823a263 100644
--- a/1992/adrian/README.md
+++ b/1992/adrian/README.md
@@ -4,7 +4,7 @@ Adrian Mariano
University of Washington
2729 72nd Ave SE
Mercer Island, WA 98040
-USA
+US
## To build:
diff --git a/1992/buzzard.1/README.md b/1992/buzzard.1/README.md
index 36379d272..add45a284 100644
--- a/1992/buzzard.1/README.md
+++ b/1992/buzzard.1/README.md
@@ -4,7 +4,7 @@ Sean Barrett
Software Construction Company
430 Southwest Parkway, #1906
College Station, TX 77840
-USA
+US
## To build:
diff --git a/1992/buzzard.2/README.md b/1992/buzzard.2/README.md
index d9ae23b46..0245fb876 100644
--- a/1992/buzzard.2/README.md
+++ b/1992/buzzard.2/README.md
@@ -4,7 +4,7 @@ Sean Barrett
Software Construction Company
430 Southwest Parkway, #1906
College Station, TX 77840
-USA
+US
## To build:
diff --git a/1992/lush/README.md b/1992/lush/README.md
index a4d3db23d..89907b340 100644
--- a/1992/lush/README.md
+++ b/1992/lush/README.md
@@ -4,7 +4,7 @@ Ed Luke
Mississippi State University
P.O. Box 6176
Mississippi State, MS 39762
-USA
+US
## To build:
diff --git a/1992/nathan/README.md b/1992/nathan/README.md
index 85317702f..12b8e66f1 100644
--- a/1992/nathan/README.md
+++ b/1992/nathan/README.md
@@ -58,7 +58,7 @@ The US International Traffic in Arms Regulations controls certain exportations
going out of the United States. The U.S. Munitions List gives the specific
categories of restricted exports. Because this entry at one time appeared to
fall under this restricted category, the judges originally were not able to
-distribute winners outside of the USA.
+distribute winners outside of the US.
Nathan Sidwell stated that he was willing to distribute the winning source. To
read HIS instructions of how to obtain his winning program one was able to run:
diff --git a/1992/vern/README.md b/1992/vern/README.md
index 9f458b73c..abea02b7f 100644
--- a/1992/vern/README.md
+++ b/1992/vern/README.md
@@ -6,7 +6,7 @@ Computer Systems Engineering
Bldg. 46A, Room 1123
Lawrence Berkeley Laboratory
1 Cyclotron Rd.
-Berkeley, CA 94720 USA
+Berkeley, CA 94720 US
## To build:
diff --git a/1992/westley/README.md b/1992/westley/README.md
index ad4d7cf1c..2cb99a8f2 100644
--- a/1992/westley/README.md
+++ b/1992/westley/README.md
@@ -4,7 +4,7 @@ Brian Westley (aka Merlyn LeRoy)
Digi International
1026 Blair Ave.
St. Paul, MN 55104
-USA
+US
## To build:
@@ -50,7 +50,7 @@ show correctly!
### Alternative code:
-The author provided a version for the USA. To build:
+The author provided a version for the US. To build:
```sh
make alt
@@ -143,7 +143,7 @@ is reasonably accurate.
- Beijing 40 116
- Tokyo 36 140
-For a domestic (USA) version with higher resolution, try:
+For a domestic (US) version with higher resolution, try:
```c
main(l,a,n,d)char**a;{for(d=atoi(a[1])/2*80-atoi(a[2])-2043;
diff --git a/1993/cmills/README.md b/1993/cmills/README.md
index 98d178197..c9213d6de 100644
--- a/1993/cmills/README.md
+++ b/1993/cmills/README.md
@@ -4,7 +4,7 @@ Chris Mills
Pagine Corporation
1961-A Concourse Drive
San Jose, CA 95131
-USA
+US
## To build:
diff --git a/1993/ejb/README.md b/1993/ejb/README.md
index e916d9504..2bed24a5f 100644
--- a/1993/ejb/README.md
+++ b/1993/ejb/README.md
@@ -4,7 +4,7 @@ E. Jay Berkenbilt
Engineering Research Associates
1595 Springhill Road
Vienna, VA 22182-2235
-USA
+US
## To build:
diff --git a/1993/plummer/README.md b/1993/plummer/README.md
index deeb689bc..cfbab66a7 100644
--- a/1993/plummer/README.md
+++ b/1993/plummer/README.md
@@ -3,7 +3,7 @@
Mark Plummer
2901 Reckord Road
Fallston, MD, 21047
-USA
+US
## To build:
diff --git a/1993/schnitzi/README.md b/1993/schnitzi/README.md
index 3a110307c..ba0f07494 100644
--- a/1993/schnitzi/README.md
+++ b/1993/schnitzi/README.md
@@ -3,7 +3,7 @@
Mark Schnitzius
1700 Woodbury Rd. #1208
Orlando, FL 32828
-USA
+US
diff --git a/1993/vanb/README.md b/1993/vanb/README.md
index 8aa91aac5..ec7c96480 100644
--- a/1993/vanb/README.md
+++ b/1993/vanb/README.md
@@ -4,7 +4,7 @@ David Van Brackle
ISX Corporation
1165 Northchase Parkway, Suite 120
Marietta, GA 30067
-USA
+US
## To build:
diff --git a/1994/README.md b/1994/README.md
index cf836e967..5f5f74d30 100644
--- a/1994/README.md
+++ b/1994/README.md
@@ -43,7 +43,7 @@ The ideal 3rd judge would have all of the following:
* reasonable written communication skills (able to write README.md files)
* appreciation for well-written non-obfuscated code
* willing to devote ~4 weekend days in January (starting Jan 96) for judging
- * located in the San Francisco (California, USA) Bay Area, or
+ * located in the San Francisco (California, US) Bay Area, or
able to travel (paying your own way) to the SF Bay Area during judging, or
able to link to the other IOCCC judges some form of a a video link
diff --git a/1994/dodsond1/README.md b/1994/dodsond1/README.md
index 631e8d5ed..ae6db89bf 100644
--- a/1994/dodsond1/README.md
+++ b/1994/dodsond1/README.md
@@ -4,7 +4,7 @@ Don Dodson
AG Communication Systems
17239 N. 19th Ave. #1003
Phoenix, AZ 85023
-USA
+US
## To build:
diff --git a/1994/dodsond2/README.md b/1994/dodsond2/README.md
index e4334733f..215e3964d 100644
--- a/1994/dodsond2/README.md
+++ b/1994/dodsond2/README.md
@@ -4,7 +4,7 @@ Don Dodson
AG Communication Systems
17239 N. 19th Ave. #1003
Phoenix, AZ 85023
-USA
+US
## To build:
diff --git a/1994/horton/README.md b/1994/horton/README.md
index 473948963..926fd0e1b 100644
--- a/1994/horton/README.md
+++ b/1994/horton/README.md
@@ -5,7 +5,7 @@ AT&T Bell Labs
Rm 1H-117
6200 E Broad St.
Columbus OH 43213
-USA
+US
## To build:
diff --git a/1994/ldb/README.md b/1994/ldb/README.md
index 0f6a4d3f8..3b5277f86 100644
--- a/1994/ldb/README.md
+++ b/1994/ldb/README.md
@@ -4,7 +4,7 @@ Laurion Burchall
Brown University
Unit 4641
Providence RI 02912-4641
-USA
+US
## To build:
diff --git a/1994/schnitzi/README.md b/1994/schnitzi/README.md
index df07269a0..ebdb2ca82 100644
--- a/1994/schnitzi/README.md
+++ b/1994/schnitzi/README.md
@@ -4,7 +4,7 @@ Mark Schnitzius
ISX Corporation
1165 Northchase Pkwy, Suite 120
Marietta, GA 30067
-USA
+US
diff --git a/1994/shapiro/README.md b/1994/shapiro/README.md
index 3c04cb0c2..7a445f164 100644
--- a/1994/shapiro/README.md
+++ b/1994/shapiro/README.md
@@ -4,7 +4,7 @@ Andrew T. Shapiro
CSES/CIRES University of Colorado
Campus Box 216
Boulder, CO 80309-0216
-USA
+US
## To build:
diff --git a/1994/smr/README.md b/1994/smr/README.md
index 2dc03ecf6..11a898eff 100644
--- a/1994/smr/README.md
+++ b/1994/smr/README.md
@@ -4,7 +4,7 @@ Szymon Rusinkiewicz
Massachusetts Institute of Technology
305 Memorial Dr., Room 005B
Cambridge, Ma 02139
-USA
+US
## To build:
diff --git a/1994/weisberg/README.md b/1994/weisberg/README.md
index f21377b38..9ab863d38 100644
--- a/1994/weisberg/README.md
+++ b/1994/weisberg/README.md
@@ -5,7 +5,7 @@ University of Rochester
Dept of Electrical Engineering
Computer Studies Bldg
Rochester, NY 14627
-USA
+US
## To build:
diff --git a/1994/westley/README.md b/1994/westley/README.md
index d01a1de4e..e7070bce9 100644
--- a/1994/westley/README.md
+++ b/1994/westley/README.md
@@ -4,7 +4,7 @@ Brian Westley (Merlyn LeRoy on Usenet)
Digi International
1906 James Ave.
St. Paul, MN 55105
-USA
+US
## To build:
diff --git a/1995/dodsond1/README.md b/1995/dodsond1/README.md
index 476a29110..76df83e1a 100644
--- a/1995/dodsond1/README.md
+++ b/1995/dodsond1/README.md
@@ -4,7 +4,7 @@ Don Dodson
AG Communication Systems
4101 W Union Hills Dr #1104
Glendale, AZ 85308
-USA
+US
## To build:
diff --git a/1995/dodsond2/README.md b/1995/dodsond2/README.md
index 0ba254903..3cdde3163 100644
--- a/1995/dodsond2/README.md
+++ b/1995/dodsond2/README.md
@@ -4,7 +4,7 @@ Don Dodson
AG Communication Systems
4101 W Union Hills Dr #1104
Glendale, AZ 85308
-USA
+US
## To build:
diff --git a/1995/heathbar/README.md b/1995/heathbar/README.md
index fa2ee87fe..08e66d18c 100644
--- a/1995/heathbar/README.md
+++ b/1995/heathbar/README.md
@@ -4,7 +4,7 @@ Heather Downs & Selene Makarios
The Software Bungalow
900 High School Way, #2202
Mountain View, CA 94041
-USA
+US
## To build:
diff --git a/1995/leo/README.md b/1995/leo/README.md
index d910023df..a5bf24f63 100644
--- a/1995/leo/README.md
+++ b/1995/leo/README.md
@@ -3,7 +3,7 @@
Leonid A. Broukhis
46728 Crawford St., apt. 20
Fremont, CA 94539
-USA
+US
## To build:
diff --git a/1995/makarios/README.md b/1995/makarios/README.md
index 8096f3434..a428a8d7e 100644
--- a/1995/makarios/README.md
+++ b/1995/makarios/README.md
@@ -4,7 +4,7 @@ Selene Makarios & Heather Downs
The Software Bungalow
900 High School Way, #2202
Mountain View, CA 94041
-USA
+US
## To build:
diff --git a/1995/savastio/README.md b/1995/savastio/README.md
index 921fd73c8..10411d8aa 100644
--- a/1995/savastio/README.md
+++ b/1995/savastio/README.md
@@ -4,7 +4,7 @@ Michael Savastio
Securicor Telesciences
925 1/2 Anchor St, Apt 2
Philadelphia, PA 19124
-USA
+US
## To build:
diff --git a/1995/schnitzi/README.md b/1995/schnitzi/README.md
index 40c3d2303..e76377637 100644
--- a/1995/schnitzi/README.md
+++ b/1995/schnitzi/README.md
@@ -4,7 +4,7 @@ Mark Schnitzius
ISX Corporation
3215-C Post Woods Dr.
Atlanta, GA 30339
-USA
+US
diff --git a/1995/vanschnitz/README.md b/1995/vanschnitz/README.md
index 23544dd91..18b9d75b4 100644
--- a/1995/vanschnitz/README.md
+++ b/1995/vanschnitz/README.md
@@ -5,7 +5,7 @@ ISX Corporation
1165 Northchase Parkway
Suite 120
Marietta, GA 30067
-USA
+US
## To build:
diff --git a/1996/README.md b/1996/README.md
index c128016c3..370af3293 100644
--- a/1996/README.md
+++ b/1996/README.md
@@ -72,7 +72,7 @@ contest have not been formed at this time and are not expected to be
ready for distribution until late February 1998.
So what happened to 1997? Well the next USENIX Technical Conference
-will be held Jun 15-19, 1998 (in New Orleans, USA). The 18 month
+will be held Jun 15-19, 1998 (in New Orleans, US). The 18 month
span between conferences will cause the IOCCC to skip over 1997.
Be sure to wait until the 1998 rules are posted before submitting entries.
diff --git a/1996/dalbec/README.md b/1996/dalbec/README.md
index 3e84f5e86..3dbccd6cf 100644
--- a/1996/dalbec/README.md
+++ b/1996/dalbec/README.md
@@ -3,7 +3,7 @@
John Dalbec
20 Squire's Ct. (home address)
Canfield, OH 44406
-USA
+US
## To build:
diff --git a/1996/huffman/README.md b/1996/huffman/README.md
index 37d342918..e2a1c5dd0 100644
--- a/1996/huffman/README.md
+++ b/1996/huffman/README.md
@@ -4,7 +4,7 @@ Ken Huffman
Applied Innovation Inc
5800 Innovation Dr.
Dublin, OH 43016
-USA
+US
huffmancoding@gmail.com
diff --git a/1996/rcm/README.md b/1996/rcm/README.md
index ea6527367..648505a01 100644
--- a/1996/rcm/README.md
+++ b/1996/rcm/README.md
@@ -3,7 +3,7 @@
Ron McFarland
7941 Fawncreek Drive
Cincinnati, Ohio 45249
-USA
+US
## To build:
diff --git a/1996/westley/README.md b/1996/westley/README.md
index 32a3b89dc..e179b41cf 100644
--- a/1996/westley/README.md
+++ b/1996/westley/README.md
@@ -3,7 +3,7 @@
Brian Westley (Merlyn LeRoy on Usenet)
1906 James Ave.
St. Paul, MN 55105
-USA
+US
## To build:
diff --git a/1998/banks/README.md b/1998/banks/README.md
index 53c5ff04c..d891a9ebd 100644
--- a/1998/banks/README.md
+++ b/1998/banks/README.md
@@ -4,7 +4,7 @@ Carl Banks
Penn State Department of Aerospace Engineering
232 Hammond Building
University Park, PA 16802
-USA
+US
## To build:
diff --git a/1998/chaos/README.md b/1998/chaos/README.md
index 7c7685f0d..895b27456 100644
--- a/1998/chaos/README.md
+++ b/1998/chaos/README.md
@@ -3,7 +3,7 @@
Alan De Smet
8531 Greenway Blvd. #206
Middleton, WI 53562
-USA
+US
diff --git a/1998/dloweneil/README.md b/1998/dloweneil/README.md
index 959145c2f..f7858b2bc 100644
--- a/1998/dloweneil/README.md
+++ b/1998/dloweneil/README.md
@@ -4,13 +4,13 @@ David Lowe
Pootpoot
67-D Manchester Street
San Francisco, CA 94110
-USA
+US
Neil Mix
Pootpoot
1490 Sacramento Street #4G
San Francisco, CA 94110
-USA
+US
## To build:
diff --git a/1998/schnitzi/README.md b/1998/schnitzi/README.md
index 32482f070..8ecc3085e 100644
--- a/1998/schnitzi/README.md
+++ b/1998/schnitzi/README.md
@@ -4,7 +4,7 @@ Mark Schnitzius
ISX Corporation
1280 West Peachtree St. Apt. 1507
Atlanta, GA 30309
-USA
+US
## To build:
diff --git a/2000/bmeyer/README.md b/2000/bmeyer/README.md
index 5f7cb7f4e..2c93fdfa1 100644
--- a/2000/bmeyer/README.md
+++ b/2000/bmeyer/README.md
@@ -373,7 +373,7 @@ en/decoded\[4\].
- [lavabus.pgm](lavabus.pgm)
- A bus that was trapped by lava from Kilauea volcano in Hawaii, USA. Nobody
+ A bus that was trapped by lava from Kilauea volcano in Hawaii, US. Nobody
was in the bus at the time, BTW. Photo date: 1981.
- [lenna.glic](lenna.glic)
diff --git a/2000/dhyang/README.md b/2000/dhyang/README.md
index 59242724a..f76da504d 100644
--- a/2000/dhyang/README.md
+++ b/2000/dhyang/README.md
@@ -4,7 +4,7 @@ Don Yang
UCSD
259 E. Bellbrook St.
Covina, CA 91722
-USA
+US
## To build:
diff --git a/2000/dlowe/README.md b/2000/dlowe/README.md
index 163ab3557..a49e6b510 100644
--- a/2000/dlowe/README.md
+++ b/2000/dlowe/README.md
@@ -3,7 +3,7 @@
David Lowe
1224 11th Avenue
San Francisco, California, 94122
-USA
+US
## To build:
diff --git a/2000/robison/README.md b/2000/robison/README.md
index cc2637d95..21dd02f5d 100644
--- a/2000/robison/README.md
+++ b/2000/robison/README.md
@@ -3,7 +3,7 @@
Arch D. Robison
1406 Country Lake Drive
Champaign IL 61821
-USA
+US
## To build:
diff --git a/2000/schneiderwent/README.md b/2000/schneiderwent/README.md
index 938561721..53c172ea3 100644
--- a/2000/schneiderwent/README.md
+++ b/2000/schneiderwent/README.md
@@ -1,7 +1,7 @@
# Most Timely Output
Craig Schneiderwent
-WI, USA
+WI, US
## To build:
diff --git a/2001/bellard/Makefile b/2001/bellard/Makefile
index 2fb739b3d..0bda56ef2 100644
--- a/2001/bellard/Makefile
+++ b/2001/bellard/Makefile
@@ -38,7 +38,7 @@ include ../../var.mk
# Common C compiler warnings to silence
#
-CSILENCE= -Wno-bitwise-op-parentheses -Wno-error -Wno-implicit-function-declaration \
+CSILENCE= #-Wno-bitwise-op-parentheses -Wno-error -Wno-implicit-function-declaration \
-Wno-implicit-int -Wno-int-conversion -Wno-int-to-pointer-cast \
-Wno-parentheses -Wno-return-type
diff --git a/2001/coupard/README.md b/2001/coupard/README.md
index 6e8e6ad11..a113e753c 100644
--- a/2001/coupard/README.md
+++ b/2001/coupard/README.md
@@ -5,7 +5,7 @@ Lineo, Inc.
ATTN : Pierre-Philippe Coupard
390 South 400 West
Lindon, UT 84042
-USA
+US
## To build:
diff --git a/2001/ctk/README.md b/2001/ctk/README.md
index 794fbd02c..6cead0621 100644
--- a/2001/ctk/README.md
+++ b/2001/ctk/README.md
@@ -3,7 +3,7 @@
Chris King
115 Foster Center Road
Foster, RI, 02825
-USA
+US
## To build:
diff --git a/2001/dgbeards/README.md b/2001/dgbeards/README.md
index 9d839302c..68c964983 100644
--- a/2001/dgbeards/README.md
+++ b/2001/dgbeards/README.md
@@ -4,7 +4,7 @@ Doug Beardsley
Southern Adventist University
359 Davis Rd. NW
Cleveland, TN 37312
-USA
+US
## To build:
diff --git a/2001/jason/README.md b/2001/jason/README.md
index e6f5d2687..749931dc9 100644
--- a/2001/jason/README.md
+++ b/2001/jason/README.md
@@ -3,7 +3,7 @@
Jason Orendorff
5 Buchanan St.
Nashua, NH 03060
- USA
+ US
http://www.jorendorff.com/
diff --git a/2001/westley/README.md b/2001/westley/README.md
index 12217d6fa..cf03a2d54 100644
--- a/2001/westley/README.md
+++ b/2001/westley/README.md
@@ -4,7 +4,7 @@
Firesign Theatre webmaster
1906 James Ave
St. Paul, MN 55105
- USA
+ US
http://www.westley.org
diff --git a/2001/williams/README.md b/2001/williams/README.md
index fa5491ba1..9e563cbea 100644
--- a/2001/williams/README.md
+++ b/2001/williams/README.md
@@ -3,7 +3,7 @@
John Williams
941 E 25 S
Lindon UT 84042
- USA
+ US
## To build:
diff --git a/2004/burley/README.md b/2004/burley/README.md
index 2caacff8c..ffacea42e 100644
--- a/2004/burley/README.md
+++ b/2004/burley/README.md
@@ -3,7 +3,7 @@
Brent Burley
500 S. Buena Vista St.
Burbank, CA 91521
- USA
+ US
## To build:
diff --git a/2004/hoyle/README.md b/2004/hoyle/README.md
index 425b7b88c..e7a7adcf5 100644
--- a/2004/hoyle/README.md
+++ b/2004/hoyle/README.md
@@ -3,7 +3,7 @@
Jonathan Hoyle
162 Burwyck Park
Saline, MI 48176
- USA
+ US
http://www.jonhoyle.com
diff --git a/2004/jdalbec/README.md b/2004/jdalbec/README.md
index 8ec54ef44..7ecd87160 100644
--- a/2004/jdalbec/README.md
+++ b/2004/jdalbec/README.md
@@ -3,7 +3,7 @@
John Dalbec
20 Squire's Ct.
Canfield OH 44406
-USA
+US
## To build:
diff --git a/2004/omoikane/README.md b/2004/omoikane/README.md
index c0059be8e..7229fb1fc 100644
--- a/2004/omoikane/README.md
+++ b/2004/omoikane/README.md
@@ -3,7 +3,7 @@
Don Yang
259 E. Bellbrook St.
Covina, CA 91722
- USA
+ US
http://uguu.org/
diff --git a/2004/vik1/README.md b/2004/vik1/README.md
index 2c1d34f19..a3ef66ad8 100644
--- a/2004/vik1/README.md
+++ b/2004/vik1/README.md
@@ -3,7 +3,7 @@
Daniel Vik
926 Genter Street
La Jolla, Ca 92037
- USA
+ US
http://www.vik.cc/
diff --git a/2004/vik2/README.md b/2004/vik2/README.md
index 259bc83e9..21a809d7f 100644
--- a/2004/vik2/README.md
+++ b/2004/vik2/README.md
@@ -3,7 +3,7 @@
Daniel Vik
926 Genter Street
La Jolla, Ca 92037
- USA
+ US
http://www.vik.cc/
diff --git a/2005/klausler/README.md b/2005/klausler/README.md
index 0ce515d5f..df702ddcf 100644
--- a/2005/klausler/README.md
+++ b/2005/klausler/README.md
@@ -4,7 +4,7 @@
Cray Inc.
2802 W 40th St
Minneapolis MN 55410
- USA
+ US
pmk@cray.com
## To build:
diff --git a/2005/mikeash/README.md b/2005/mikeash/README.md
index 19af62162..89bbafb27 100644
--- a/2005/mikeash/README.md
+++ b/2005/mikeash/README.md
@@ -1,7 +1,7 @@
# Best use of parenthesis
Michael Ash
- USA
+ US
mike@mikeash.com
## To build:
diff --git a/2005/vik/README.md b/2005/vik/README.md
index 8f61802e8..b18b17aee 100644
--- a/2005/vik/README.md
+++ b/2005/vik/README.md
@@ -3,7 +3,7 @@
Daniel Vik
926 Genter Street
La Jolla Ca 92037
- USA
+ US
daniel@vik.cc
## To build:
diff --git a/2005/vince/README.md b/2005/vince/README.md
index 9b0200535..33f9395cb 100644
--- a/2005/vince/README.md
+++ b/2005/vince/README.md
@@ -2,7 +2,7 @@
Vincent Weaver
Ithaca, NY
- USA
+ US
vince@deater.net
diff --git a/tmp/winners.csv b/tmp/winners.csv
index 4702040f3..fd3ba23fa 100644
--- a/tmp/winners.csv
+++ b/tmp/winners.csv
@@ -125,7 +125,7 @@ Mary Ann (Mark) Horton,Mark_Horton">