From d3de388ad48ce3ac1a5150232513ba173eaad0ae Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 12 Aug 2017 06:06:47 +0200 Subject: [PATCH] Drop a a few accidentally repeated words Signed-off-by: Markus Armbruster --- doc/clients-howto | 4 ++-- doc/contributing | 2 +- doc/threads | 2 +- info/Empire4.2.t | 8 ++++---- info/Empire4.3.t | 2 +- info/Guerrilla.t | 2 +- info/Guide.t | 6 +++--- info/mksubj.pl | 2 +- info/telegram.t | 2 +- info/xdump.t | 2 +- src/lib/commands/scut.c | 2 +- src/lib/common/nsc.c | 2 +- src/lib/update/nat.c | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/clients-howto b/doc/clients-howto index e70a2c8a..ad476747 100644 --- a/doc/clients-howto +++ b/doc/clients-howto @@ -264,7 +264,7 @@ The following IDs occur: rejects redirections in batch files. Certain bad failures make the server ignore the rest of the batch - file file. This feature is too hard to predict to be really useful. + file. This feature is too hard to predict to be really useful. Protocol flaw: strictly asynchronous clients cannot support C_EXECUTE correctly. By the time C_EXECUTE arrives, the client may @@ -286,7 +286,7 @@ The following IDs occur: empire-client prints the text verbatim, prepended by a line feed. This is clearly sub-optimal, because it can be inserted in the - middle of user input. Clients wishing to to display asynchronous + middle of user input. Clients wishing to display asynchronous messages together with normal I/O should insert them before the current prompt. diff --git a/doc/contributing b/doc/contributing index 2404db74..8bffd099 100644 --- a/doc/contributing +++ b/doc/contributing @@ -22,7 +22,7 @@ install the "git-core" package. You can always download from If you're new to git, try the gittutorial(7) manual page, and the Git User's Manual. Both are also available at , -along with other resources, including the the "Pro Git" book. +along with other resources, including the "Pro Git" book. Getting sources diff --git a/doc/threads b/doc/threads index be5b50b7..d65a09e9 100644 --- a/doc/threads +++ b/doc/threads @@ -50,7 +50,7 @@ The server has seven basic threads: while the update is in progress. select: This thread and its interface provides a mechanism for - other threads to deschedule until either a a file descriptor + other threads to deschedule until either a file descriptor is read/write ready, or a particular amount of time has passed. When the select thread actually runs, the whole process blocks until the select system call returns. However, diff --git a/info/Empire4.2.t b/info/Empire4.2.t index 7d562dcf..d496f4de 100644 --- a/info/Empire4.2.t +++ b/info/Empire4.2.t @@ -81,7 +81,7 @@ Changes to Empire 4.2.22 - Tue Oct 11 20:23:51 UTC 2005 player could starve out the others. * launch assumed plane maximum mobility 127 for calculating when satellites will be ready to use. - * Drop support for for DCE threads. + * Drop support for DCE threads. * Drop support for pthread implementations lacking pthread_kill(). This includes ancient versions of OS X. * Code cleanups. @@ -257,7 +257,7 @@ Changes to Empire 4.2.19 - Thu Dec 23 20:24:24 UTC 2004 * Fix a rounding error in production command column `max'. * Fix production command for overpopulated mountains and plains. * Fix tradeship ally cut to match documentation. - * Fix plague, which was was broken in 4.2.14: it got stuck in stage I. + * Fix plague, which was broken in 4.2.14: it got stuck in stage I. * Fix a bug in aerial sonar where ships could mask submarines with the same number modulo 256. * Don't allow bombing of subs that were not detected. @@ -275,8 +275,8 @@ Changes to Empire 4.2.19 - Thu Dec 23 20:24:24 UTC 2004 * New ship selectors for sail: mobquota, path, follow. * New news selector uid. * Implement command line parsing under Windows where it was missing. - * emp_server and and files print a usage message on command line - syntax errors. + * emp_server and files print a usage message on command line syntax + errors. * Fix how emp_server exits after being panicked by a signal. It can now dump core when this happens. * Fix bug in client that could crash it when a line of input starts diff --git a/info/Empire4.3.t b/info/Empire4.3.t index 2f03ce9e..cfa190e4 100644 --- a/info/Empire4.3.t +++ b/info/Empire4.3.t @@ -509,7 +509,7 @@ Changes to Empire 4.3.30 - Tue May 22 18:34:52 UTC 2012 - Fix a race condition that could cause commodity trades to be executed multiple times. Abusing this to duplicate commodities seems tricky, but possible. Broken in Empire 3. - - Don't expropriate sellers of units. POGO got the the money, the + - Don't expropriate sellers of units. POGO got the money, the telegrams and made the news, the seller got nothing. Broken in 4.3.17. * Login command quit and server shutdown could lose player output. diff --git a/info/Guerrilla.t b/info/Guerrilla.t index 05639bf0..ee3f41b8 100644 --- a/info/Guerrilla.t +++ b/info/Guerrilla.t @@ -66,7 +66,7 @@ or a sector lost to guerrilla activities! .s1 Land units present in a sector help to fight them, fighting without any multiplier, either offensive or defensive and without any -fortification bonus, except units units with the +fortification bonus, except units with the \*Qsecurity\*U ability fight with a multiplier of four. They will also kill some che before anything else is done (commando raids). diff --git a/info/Guide.t b/info/Guide.t index 8b788e72..17806fa5 100644 --- a/info/Guide.t +++ b/info/Guide.t @@ -258,7 +258,7 @@ User's Guide to Empire 8 Chapter 2 :-: How to get into a game of Empire. - The most common way of finding about about games that are about to + The most common way of finding about games that are about to happen is by monitoring the newsgroup rec.games.empire on your local news reading program. Other ways are via e-mail by getting to know several players with whom you correspond over the network. Some @@ -2436,7 +2436,7 @@ User's Guide to Empire 51 other aspect of thresholds is that if there is less than the threshold of a commodity, then the warehouse will send out enough of that commodity to equal the threshold, assuming it has such commodities in - the warehouse. The command to set the threshold for for in the sector + the warehouse. The command to set the threshold for in the sector so that food will go to the sector from the warehouse could be this: [534:30] Command: threshold food -15,1 50 @@ -2464,7 +2464,7 @@ User's Guide to Empire 51 3) Sometimes it may seem that the warehouse is not getting the commodities to the sectors requesting it. Empire updates sectors one at a time, and as such the warehouse may actually run out of a commodity, receive the - request for that commodity, be unable to fill it and move on the the + request for that commodity, be unable to fill it and move on the sectors it updates after that sector. Those sectors in turn may send commodities to the warehouse, thus giving it enough to fill the previous request. However, since it has already updated that sector, it will not diff --git a/info/mksubj.pl b/info/mksubj.pl index e2093709..c6360a07 100644 --- a/info/mksubj.pl +++ b/info/mksubj.pl @@ -43,7 +43,7 @@ my @Chapters = qw/Introduction Concept Command Server/; my @Levels = qw/Basic Expert Obsolete/; -# $Subjects{SUBJECT} is a reference to an an anonymous array +# $Subjects{SUBJECT} is a reference to an anonymous array # containing SUBJECT's topics my %Subjects; diff --git a/info/telegram.t b/info/telegram.t index 57707b11..d999136f 100644 --- a/info/telegram.t +++ b/info/telegram.t @@ -13,7 +13,7 @@ Telegrams sent to country #0 appear as prayers, (favors are best obtained in this manner.) .s1 While entering your telegram the system tells you how many characters -you have left. You end the telegram by by entering a line with a '.' +you have left. You end the telegram by entering a line with a '.' on a line by itself. A line containing only '~q' will abort the telegram. .s1 diff --git a/info/xdump.t b/info/xdump.t index 832733fa..3da26d0a 100644 --- a/info/xdump.t +++ b/info/xdump.t @@ -8,7 +8,7 @@ in machine readable format. It is intended for use by clients and tools. This info page gives an overview; see doc/xdump in the source distribution for complete documentation. .s1 -Game configuration and state consists of a a number of tables or +Game configuration and state consists of a number of tables or files. xdump shows only things that are \*(fIcertainly\*(fP visible to you: sectors you own, ship types known, etc. .s1 diff --git a/src/lib/commands/scut.c b/src/lib/commands/scut.c index 0555fc0a..cc4b008c 100644 --- a/src/lib/commands/scut.c +++ b/src/lib/commands/scut.c @@ -136,7 +136,7 @@ scuttle_tradeship(struct shpstr *sp) && relations_with(sect.sct_own, sp->shp_own) >= FRIENDLY) { dist = mapdist(sp->shp_x, sp->shp_y, sp->shp_orig_x, sp->shp_orig_y); - /* Don't disclose distance to to pirates */ + /* Don't disclose distance to pirates */ if (player->cnum == sp->shp_orig_own) pr("%s has gone %d sects\n", prship(sp), dist); if (dist < trade_1_dist) diff --git a/src/lib/common/nsc.c b/src/lib/common/nsc.c index 9bf6505e..01a2dff1 100644 --- a/src/lib/common/nsc.c +++ b/src/lib/common/nsc.c @@ -752,7 +752,7 @@ struct castr empfile_ca[] = { struct castr symbol_ca[] = { #define CURSTR struct symbol /* - * value is is const because it has to match what is compiled into + * value is const because it has to match what is compiled into * the server. name is const because clients key on it. */ {"value", fldoff(value), NSC_INT, 0, NULL, EF_BAD, 0, CA_DUMP_CONST}, diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c index 6a7f1aac..097b059a 100644 --- a/src/lib/update/nat.c +++ b/src/lib/update/nat.c @@ -60,7 +60,7 @@ static void share_incr(double[], double[]); * for values below the "easy level" values, production is * as normal. For values above "easy", production gets harder * based on an equation in "limit_level()" in update/nat.c. - * Basically, the smaller the the values for "level_log", the + * Basically, the smaller the values for "level_log", the * smaller return on investment above level_easy[] values. */ /*