diff --git a/info/list.t b/info/list.t index cc7179a2..cc3447d9 100644 --- a/info/list.t +++ b/info/list.t @@ -15,8 +15,8 @@ which generates a brief summary of each command. Initial number is cost in B.T.U. units. Next 2 chars (if present) are: $ - must be non-broke c -- must have capital -Args in [brackets] are optional. -All-caps args in have the following meanings: +Arguments in [brackets] are optional. +All-caps arguments in have the following meanings: :: a number in unspecified units :: a commodity such as `food', `guns', etc :: an item type such as `ship', `plane', etc diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c index 07d4bc11..98a76d0b 100644 --- a/src/lib/commands/vers.c +++ b/src/lib/commands/vers.c @@ -101,9 +101,9 @@ vers(void) if (rollover_avail_max) pr("Up to %d avail can roll over an update.\n", rollover_avail_max); - pr("Happiness p.e. requires 1 happy stroller per %d civ.\n", + pr("Happiness p.e. requires 1 happy stroller per %d civilians.\n", (int)hap_cons / etu_per_update); - pr("Education p.e. requires 1 class of graduates per %d civ.\n", + pr("Education p.e. requires 1 class of graduates per %d civilians.\n", (int)edu_cons / etu_per_update); pr("Happiness is averaged over %d time units.\n", (int)hap_avg); pr("Education is averaged over %d time units.\n", (int)edu_avg); diff --git a/src/lib/lwp/sel.c b/src/lib/lwp/sel.c index a42ac035..c41cc065 100644 --- a/src/lib/lwp/sel.c +++ b/src/lib/lwp/sel.c @@ -99,7 +99,7 @@ lwpSleepFd(int fd, int mask, struct timeval *timeout) if (LwpMaxfd == 0 && !LwpDelayq.head) { /* select process is sleeping until first waiter arrives */ - lwpStatus(LwpCurrent, "going to resched fd %d", fd); + lwpStatus(LwpCurrent, "going to reschedule fd %d", fd); lwpReady(LwpSelProc); } lwpStatus(LwpCurrent, "going to wait on fd %d", fd); diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c index 84f990d6..3827920d 100644 --- a/src/lib/player/empdis.c +++ b/src/lib/player/empdis.c @@ -116,8 +116,8 @@ explain(void) "Initial number is cost in BTUs.\n" "Next 2 chars (if present) are:\n" "$ - must be non-broke\tc -- must have capital\n" - "Args in [brackets] are optional.\n" - "All-caps args in " + "Arguments in [brackets] are optional.\n" + "All-caps arguments in " " have the following meanings:\n" /* FIXME incomplete */ " :: a number in unspecified units\n" diff --git a/tests/version/journal.log b/tests/version/journal.log index 61e90497..fbbe0544 100644 --- a/tests/version/journal.log +++ b/tests/version/journal.log @@ -47,8 +47,8 @@ Play#0 output Play#0 1 1000 civilians generate $8.33, uncompensated workers $1.78 each time unit. Play#0 output Play#0 1 1000 active military cost $83.33, reserves cost $8.33. Play#0 output Play#0 1 Up to 50 avail can roll over an update. - Play#0 output Play#0 1 Happiness p.e. requires 1 happy stroller per 10000 civ. - Play#0 output Play#0 1 Education p.e. requires 1 class of graduates per 10000 civ. + Play#0 output Play#0 1 Happiness p.e. requires 1 happy stroller per 10000 civilians. + Play#0 output Play#0 1 Education p.e. requires 1 class of graduates per 10000 civilians. Play#0 output Play#0 1 Happiness is averaged over 48 time units. Play#0 output Play#0 1 Education is averaged over 192 time units. Play#0 output Play#0 1 The technology/research boost you get from the world is 50.00%. @@ -2843,8 +2843,8 @@ Play#2 output Play#2 1 1000 civilians generate $8.33, uncompensated workers $1.78 each time unit. Play#2 output Play#2 1 1000 active military cost $83.33, reserves cost $8.33. Play#2 output Play#2 1 Up to 50 avail can roll over an update. - Play#2 output Play#2 1 Happiness p.e. requires 1 happy stroller per 10000 civ. - Play#2 output Play#2 1 Education p.e. requires 1 class of graduates per 10000 civ. + Play#2 output Play#2 1 Happiness p.e. requires 1 happy stroller per 10000 civilians. + Play#2 output Play#2 1 Education p.e. requires 1 class of graduates per 10000 civilians. Play#2 output Play#2 1 Happiness is averaged over 48 time units. Play#2 output Play#2 1 Education is averaged over 192 time units. Play#2 output Play#2 1 The technology/research boost you get from the world is 50.00%. @@ -2958,8 +2958,8 @@ Play#1 output Play#1 1 1000 civilians generate $8.33, uncompensated workers $1.78 each time unit. Play#1 output Play#1 1 1000 active military cost $83.33, reserves cost $8.33. Play#1 output Play#1 1 Up to 50 avail can roll over an update. - Play#1 output Play#1 1 Happiness p.e. requires 1 happy stroller per 10000 civ. - Play#1 output Play#1 1 Education p.e. requires 1 class of graduates per 10000 civ. + Play#1 output Play#1 1 Happiness p.e. requires 1 happy stroller per 10000 civilians. + Play#1 output Play#1 1 Education p.e. requires 1 class of graduates per 10000 civilians. Play#1 output Play#1 1 Happiness is averaged over 48 time units. Play#1 output Play#1 1 Education is averaged over 192 time units. Play#1 output Play#1 1 The technology/research boost you get from your allies is 50.00%.