Spelling corrections

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/empio.h b/include/empio.h
index 3877f3d6bd73874341080357d31c34a3becc56ed..34d69f12be68f64c6d01ae503df7c99cd5868cdb 100644 (file)
--- a/include/empio.h
+++ b/include/empio.h
@@ -24,7 +24,7 @@
  *
  *  ---
  *
- *  empio.h: Describes io pointers used in Empire
+ *  empio.h: Describes I/O pointers used in Empire
  *
  *  Known contributors to this file:
  *     Markus Armbruster, 2004-2012

diff --git a/include/nsc.h b/include/nsc.h
index 5e897622d237fa85793a9c0ac9787adcb57c9788..fb5c3ae7b7ef4a75fcdb4b038ebaf8b2036205b3 100644 (file)
--- a/include/nsc.h
+++ b/include/nsc.h
@@ -152,7 +152,7 @@ enum ns_seltype {
 /* Sector iterator */
 struct nstr_sect {
     coord x, y;                        /* current x-y */
-    coord dx, dy;              /* accumlated x,y travel */
+    coord dx, dy;              /* accumulated x,y travel */
     int id;                    /* return value of sctoff */
     enum ns_seltype type;      /* selection type: NS_AREA or NS_DIST */
     int curdist;               /* NS_DIST: current range */

diff --git a/info/shark.t b/info/shark.t
index ac53ae7d02a635bdaf351378de2680f05f580d22..573d13408c80297e7e1aa39ccb16936215be9756 100644 (file)
--- a/info/shark.t
+++ b/info/shark.t
@@ -8,7 +8,7 @@ owner.  The <LOAN #> is the number of the loan you wish to buy.
      The loan must be in arrears.  The holder of the note will recieve
 the value of the loan plus one periods worth of interest from your
 treasury.  The player who owes the money on the loan will be notified
-of the switch.  After the loan is transfered you may collect on it as
+of the switch.  After the loan is transferred you may collect on it as
 normal.
 .sp
 .SA "offer, consider, collect, financial, Loans"

diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c
index c389cf73493a126dc462961a7b1eacd34005eaf7..038553ef7c22710fac0c06fb935325b7814944da 100644 (file)
--- a/src/lib/commands/anti.c
+++ b/src/lib/commands/anti.c
@@ -109,7 +109,7 @@ anti(void)
                    sect.sct_che_target = 0;
                sect.sct_che = ache;
                putsect(&sect);
-               pr("          Body count:  Military %d - Guerillas %d.\n",
+               pr("          Body count:  Military %d - Guerrillas %d.\n",
                   milkilled, chekilled);
                if (ache == 0) {
                    pr("          Partisans cleared out of this sector for now.\n");
@@ -147,7 +147,7 @@ anti(void)
                   xyas(nstr.x, nstr.y, sect.sct_oldown));
            }
        } else {
-           pr("          Body count:  Military 0 - Guerillas 0.\n");
+           pr("          Body count:  Military 0 - Guerrillas 0.\n");
            pr("          Partisans cleared out of this sector for now.\n");
        }
     }

diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index d1694d865bfc2f958bf7d05bca851c31f5c2e14b..368475647c3b88413d170a22a2f1d62b3b684e08 100644 (file)
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -132,7 +132,7 @@ budg(void)
     pr("Estimated new treasury%s\n",
        dotsprintf(buf, "%50d", np->nat_money + income - expenses));
     if (np->nat_money + income - expenses < 0 && !player->god) {
-       pr("After processsing sectors, you will be broke!\n");
+       pr("After processing sectors, you will be broke!\n");
        pr("Sectors will not produce, distribute, or deliver!\n\n");
     }
 

diff --git a/src/lib/commands/cons.c b/src/lib/commands/cons.c
index 6b44cd7ed91dc2ac06fd1e53a9de07cb5e87be04..ca8b919d8a41479a2e2924c6527fdc0c71f7964c 100644 (file)
--- a/src/lib/commands/cons.c
+++ b/src/lib/commands/cons.c
@@ -254,7 +254,7 @@ loan_accept(struct ltcomstr *ltcp)
 }
 
 /*
- * Declne a loan.  Return RET_OK on success, anything else on error.
+ * Decline a loan.  Return RET_OK on success, anything else on error.
  */
 static int
 loan_decline(struct ltcomstr *ltcp)

diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index 9ba0410f5e5f3253cf1f3d1fb29b782ed13959ae..691e3b4b01239213c0f439376a67b0c77f79c59d 100644 (file)
--- a/src/lib/commands/edit.c
+++ b/src/lib/commands/edit.c
@@ -455,7 +455,7 @@ edit_sect_i(struct sctstr *sect, char *key, int arg)
        break;
     case 'x':
        new = LIMIT_TO(arg, 0, CHE_MAX);
-       divine_sct_change_quiet(sect, "Guerillas", new != sect->sct_che,
+       divine_sct_change_quiet(sect, "Guerrillas", new != sect->sct_che,
                                "from %d to %d", sect->sct_che, new);
        sect->sct_che = new;
        break;

diff --git a/src/lib/commands/head.c b/src/lib/commands/head.c
index 74ca7bb9e0462d4ef0285fe26f3fa9e91b66478f..bc38c9155170dd996d67285d97b2cd2e4d235d6d 100644 (file)
--- a/src/lib/commands/head.c
+++ b/src/lib/commands/head.c
@@ -156,7 +156,7 @@ head_describe(struct histstr *hp, int what, char *aname, char *vname)
        break;
     case 1:
        if (hp->h_recent < -16)
-           pr("%s agression against %s has lessened slightly",
+           pr("%s aggression against %s has lessened slightly",
               aname, vname);
        else
            pr("Peace talks may occur between %s & %s", aname, vname);

diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c
index 7d5cca59449b855141aa7a85b81761d522a9301f..c805489a803ec9fd0bf2851a72d3c149314a8117 100644 (file)
--- a/src/lib/commands/laun.c
+++ b/src/lib/commands/laun.c
@@ -88,7 +88,7 @@ laun(void)
        }
        if (opt_MARKET) {
            if (ontradingblock(EF_PLANE, &plane)) {
-               pr("plane #%d inelligible - it's for sale.\n",
+               pr("plane #%d ineligible - it's for sale.\n",
                   plane.pln_uid);
                continue;
            }

diff --git a/src/lib/gen/ioqueue.c b/src/lib/gen/ioqueue.c
index 942fa8c64eb3714add698fdd07deda7ef6ef0a65..1ba0b326125de918d0cffbab0aa966856f8d30bb 100644 (file)
--- a/src/lib/gen/ioqueue.c
+++ b/src/lib/gen/ioqueue.c
@@ -31,8 +31,8 @@
  */
 
 /*
- * Read and write onto io queues.  Note that
- * the io queues don't actually do any writing;
+ * Read and write onto I/O queues.  Note that
+ * the I/O queues don't actually do any writing;
  * that is left for a higher level.
  */
 
@@ -321,7 +321,7 @@ appendcc(struct ioqueue *ioq, char *buf, int cc)
 
 /*
  * remove cc bytes from ioqueue ioq
- * free memory, dequeue io elements
+ * free memory, dequeue I/O elements
  * which are no longer used.
  */
 static int

diff --git a/src/lib/global/news.c b/src/lib/global/news.c
index e8670d7fb4b821d1e727c24738ec195cd1f4da2e..a0d17fab537a984396222b52305e443976e8ea2a 100644 (file)
--- a/src/lib/global/news.c
+++ b/src/lib/global/news.c
@@ -185,7 +185,7 @@ struct rptstr rpt[] = {
                                  "ground troops hit by missile" } },
     { N_AWON_SECT, -4, N_FRONT, { "navy secures a beachhead on %s territory",
                                  "sailors take a coastal sector from %s" } },
-    { N_PWON_SECT, -4, N_FRONT, { "paratroopers comandeer a sector from %s",
+    { N_PWON_SECT, -4, N_FRONT, { "paratroopers commandeer a sector from %s",
                                  "air force parachutists overwhelm a %s sector" } },
     { N_PARA_UNOCC, 0,  N_COLONY,{ "parachutists grab unoccupied land",
                                   "paratroopers break new ground" } },

diff --git a/src/lib/subs/caploss.c b/src/lib/subs/caploss.c
index 0bff5352618d35e5ee36414738add01f21336ad7..1aeff8103105c9e8019751171f2242672f57404a 100644 (file)
--- a/src/lib/subs/caploss.c
+++ b/src/lib/subs/caploss.c
@@ -89,7 +89,7 @@ caploss(struct sctstr *sp, natid coun, char *msg)
            if (loan.l_status == LS_SIGNED && loan.l_loner == coun) {
                loan.l_loner = player->cnum;
                putloan(loan_num, &loan);
-               pr("Loan %d has been transfered over to you\n", loan_num);
+               pr("Loan %d has been transferred over to you\n", loan_num);
            }
        }
     }

diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index 671a4bac2233c5a5794e7ffdb7ec81d8fe20b765..b2e255e33e5968999ca79fcbaf2162851c1538c3 100644 (file)
--- a/src/lib/subs/plnsub.c
+++ b/src/lib/subs/plnsub.c
@@ -581,7 +581,7 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap,
            continue;
        if (opt_MARKET) {
            if (ontradingblock(EF_PLANE, &plane)) {
-               pr("plane #%d inelligible - it's for sale.\n",
+               pr("plane #%d ineligible - it's for sale.\n",
                   plane.pln_uid);
                continue;
            }

diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index 08edeff1c35b4f1039f925231179377f32f8b707..22468c30fcb2c862ebf4e95db894d1d6c79f57ae 100644 (file)
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -273,7 +273,7 @@ show_ship_capab(int tlev)
     int i;
     struct mchrstr *mp;
 
-    pr("%25s cargos & capabilities\n", "");
+    pr("%25s cargoes & capabilities\n", "");
     for (i = 0; i < n; i++) {
        mp = &mchr[chridx[i].type];
        pr("%-25.25s ", mp->m_name);
@@ -546,7 +546,7 @@ show_news(int tlev)
     int i, j;
 
     pr("id category           good will\n");
-    pr("    messsages\n");
+    pr("    messages\n");
 
     for (i = 1; i < N_MAX_VERB + 1; i++) {
        if (rpt[i].r_newspage == N_NOTUSED)

diff --git a/src/lib/w32/w32sockets.c b/src/lib/w32/w32sockets.c
index bc2ad53b68259564d05cffcbb37f2808dd12873b..1554d903a9ed56bc84f1479181be7bc6a76a8c14 100644 (file)
--- a/src/lib/w32/w32sockets.c
+++ b/src/lib/w32/w32sockets.c
@@ -221,8 +221,8 @@ w32_socket(int domain, int type, int protocol)
     SOCKET sock;
 
     /*
-     * We have to use WSASocket() to create non-overlapped IO sockets.
-     * Overlapped IO sockets cannot be used with read/write.
+     * We have to use WSASocket() to create non-overlapped I/O sockets.
+     * Overlapped I/O sockets cannot be used with read/write.
      */
     sock = WSASocket(domain, type, protocol, NULL, 0, 0);
     if (sock == INVALID_SOCKET) {

diff --git a/src/util/fairland.c b/src/util/fairland.c
index eba88b20452b1a270cecc997ac300ba0e4d0a99e..36e7792cab7d3c663c0825166d5a913bc69c13bf 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -237,7 +237,7 @@ main(int argc, char *argv[])
            qprint("\ntry #%d (out of %d)...\n", i + 1, NUMTRIES);
        qprint("placing capitals...\n");
        if (!drift())
-           qprint("fairland: unstable drift -- try increasisg DRIFT_MAX\n");
+           qprint("fairland: unstable drift -- try increasing DRIFT_MAX\n");
        qprint("growing continents...\n");
        grow_continents();
     } while (fl_status && ++i < NUMTRIES);

diff --git a/tests/actofgod/journal.log b/tests/actofgod/journal.log
index 536c5c86383c755910169d6bacbc32b02e778372..71afc3c5a05aad1aea4ea308e3744c6411e0b440 100644 (file)
--- a/tests/actofgod/journal.log
+++ b/tests/actofgod/journal.log
@@ -507,19 +507,19 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 x 0
     Play#0 command edit
-    Play#0 output Play#0 1 Guerillas of 1,1 unchanged
+    Play#0 output Play#0 1 Guerrillas of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 x -1
     Play#0 command edit
-    Play#0 output Play#0 1 Guerillas of 3,1 unchanged
+    Play#0 output Play#0 1 Guerrillas of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 x 255
     Play#0 command edit
-    Play#0 output Play#0 1 Guerillas of 5,1 changed from 0 to 255
+    Play#0 output Play#0 1 Guerrillas of 5,1 changed from 0 to 255
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 7,1 x 256
     Play#0 command edit
-    Play#0 output Play#0 1 Guerillas of 7,1 changed from 0 to 255
+    Play#0 output Play#0 1 Guerrillas of 7,1 changed from 0 to 255
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 p 0
     Play#0 command edit

diff --git a/tests/smoke/journal.log b/tests/smoke/journal.log
index 835cb696c135378ec1f31c6e83d2cb4c94ce64da..f5585bef32352b56bb98823c2da2f0ec7df02b0c 100644 (file)
--- a/tests/smoke/journal.log
+++ b/tests/smoke/journal.log
@@ -3329,7 +3329,7 @@
     Play#1 output Play#1 1   sect    subversion activity report
     Play#1 output Play#1 1   ----    --------------------------
     Play#1 output Play#1 1   11,-1   Sector mobility/troop strength will allow 23 troops to engage.
-    Play#1 output Play#1 1           Body count:  Military 0 - Guerillas 0.
+    Play#1 output Play#1 1           Body count:  Military 0 - Guerrillas 0.
     Play#1 output Play#1 1           Partisans cleared out of this sector for now.
     Play#1 output Play#1 1 1 sector
     Play#1 output Play#1 6 0 543

diff --git a/tests/update/journal.log b/tests/update/journal.log
index c1aba0902d560925480434159fececfaee86833c..850ff1814fd4f07850c0d9cbb8847491dafbe38e 100644 (file)
--- a/tests/update/journal.log
+++ b/tests/update/journal.log
@@ -237,7 +237,7 @@
     Play#2 output Play#2 1 Balance forward                                                          100
     Play#2 output Play#2 1 Estimated delta                                                        -6684
     Play#2 output Play#2 1 Estimated new treasury.............................................-6584
-    Play#2 output Play#2 1 After processsing sectors, you will be broke!
+    Play#2 output Play#2 1 After processing sectors, you will be broke!
     Play#2 output Play#2 1 Sectors will not produce, distribute, or deliver!
     Play#2 output Play#2 1
     Play#2 output Play#2 6 0 99

diff --git a/tests/version/journal.log b/tests/version/journal.log
index f41c6d774605dc81abf53be22c131044a4cd5ffe..1acf6393663559b82350274d6940758d079dba08 100644 (file)
--- a/tests/version/journal.log
+++ b/tests/version/journal.log
@@ -232,7 +232,7 @@
     Play#0 input show ship c
     Play#0 command show
     Play#0 output Play#0 1 Printing for tech level '1000'
-    Play#0 output Play#0 1                           cargos & capabilities
+    Play#0 output Play#0 1                           cargoes & capabilities
     Play#0 output Play#0 1 fb   fishing boat          300c 10m 900f 15u fish canal
     Play#0 output Play#0 1 ss   slave ship            20c 80m 200f 1200u
     Play#0 output Play#0 1 frg  frigate               60m 10s 2g 60f semi-land
@@ -1822,7 +1822,7 @@
     Play#0 output Play#0 1 71 "missile\\040fired\\040at\\040%s\\040ground\\040troops" "missile\\040hits\\040%s\\040troops" 2 5
     Play#0 output Play#0 1 72 "regiment\\040struck\\040by\\040sub-launched\\040missile" "ground\\040troops\\040hit\\040by\\040missile" 0 5
     Play#0 output Play#0 1 73 "navy\\040secures\\040a\\040beachhead\\040on\\040%s\\040territory" "sailors\\040take\\040a\\040coastal\\040sector\\040from\\040%s" -4 2
-    Play#0 output Play#0 1 74 "paratroopers\\040comandeer\\040a\\040sector\\040from\\040%s" "air\\040force\\040parachutists\\040overwhelm\\040a\\040%s\\040sector" -4 2
+    Play#0 output Play#0 1 74 "paratroopers\\040commandeer\\040a\\040sector\\040from\\040%s" "air\\040force\\040parachutists\\040overwhelm\\040a\\040%s\\040sector" -4 2
     Play#0 output Play#0 1 75 "parachutists\\040grab\\040unoccupied\\040land" "paratroopers\\040break\\040new\\040ground" 0 8
     Play#0 output Play#0 1 76 "sailors\\040repelled\\040by\\040%s\\040coast-guard" "naval\\040forces\\040massacred\\040in\\040failed\\040assault\\040of\\040%s" 4 2
     Play#0 output Play#0 1 77 "paratroopers\\040destroyed\\040in\\040failed\\040air-assault\\040on\\040%s" "loses\\040parachutists\\040in\\040failed\\040air-assault\\040of\\040%s" 4 2
@@ -2473,7 +2473,7 @@
     Play#1 output Play#1 1 71 "missile\\040fired\\040at\\040%s\\040ground\\040troops" "missile\\040hits\\040%s\\040troops" 2 5
     Play#1 output Play#1 1 72 "regiment\\040struck\\040by\\040sub-launched\\040missile" "ground\\040troops\\040hit\\040by\\040missile" 0 5
     Play#1 output Play#1 1 73 "navy\\040secures\\040a\\040beachhead\\040on\\040%s\\040territory" "sailors\\040take\\040a\\040coastal\\040sector\\040from\\040%s" -4 2
-    Play#1 output Play#1 1 74 "paratroopers\\040comandeer\\040a\\040sector\\040from\\040%s" "air\\040force\\040parachutists\\040overwhelm\\040a\\040%s\\040sector" -4 2
+    Play#1 output Play#1 1 74 "paratroopers\\040commandeer\\040a\\040sector\\040from\\040%s" "air\\040force\\040parachutists\\040overwhelm\\040a\\040%s\\040sector" -4 2
     Play#1 output Play#1 1 75 "parachutists\\040grab\\040unoccupied\\040land" "paratroopers\\040break\\040new\\040ground" 0 8
     Play#1 output Play#1 1 76 "sailors\\040repelled\\040by\\040%s\\040coast-guard" "naval\\040forces\\040massacred\\040in\\040failed\\040assault\\040of\\040%s" 4 2
     Play#1 output Play#1 1 77 "paratroopers\\040destroyed\\040in\\040failed\\040air-assault\\040on\\040%s" "loses\\040parachutists\\040in\\040failed\\040air-assault\\040of\\040%s" 4 2