summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fortune/datfiles/fortunes6
-rw-r--r--fortune/datfiles/fortunes.sp.ok3
-rw-r--r--larn/scores.c12
-rw-r--r--rogue/USD.doc/rogue.me4
4 files changed, 11 insertions, 14 deletions
diff --git a/fortune/datfiles/fortunes b/fortune/datfiles/fortunes
index be6b88f8..b0b6d70d 100644
--- a/fortune/datfiles/fortunes
+++ b/fortune/datfiles/fortunes
@@ -4287,7 +4287,7 @@ A: He told me, he says, "I have to kill you because you can identify
Q: Did he kill you?
A: No.
%
-fortune: cpu time/usefulness ratio too high -- core dumped.
+fortune: CPU time/usefulness ratio too high -- core dumped.
%
Fortune: You will be attacked next Wednesday at 3:15 p.m. by six samurai
sword wielding purple fish glued to Harley-Davidson motorcycles.
@@ -10566,10 +10566,10 @@ Q: How many heterosexual males does it take to screw in a light bulb
in San Francisco?
A: Both of them.
%
-Q: How many IBM cpu's does it take to do a logical right shift?
+Q: How many IBM CPUs does it take to do a logical right shift?
A: 33. 1 to hold the bits and 32 to push the register.
%
-Q: How many IBM CPU's does it take to execute a job?
+Q: How many IBM CPUs does it take to execute a job?
A: Four; three to hold it down, and one to rip its head off.
%
Q: How many IBM types does it take to change a light bulb?
diff --git a/fortune/datfiles/fortunes.sp.ok b/fortune/datfiles/fortunes.sp.ok
index 4161ae89..0e4da00b 100644
--- a/fortune/datfiles/fortunes.sp.ok
+++ b/fortune/datfiles/fortunes.sp.ok
@@ -176,7 +176,6 @@ CONGRAM
CONtractor
CPPR
CPU
-CPU's
CPUs
CRN
CS
@@ -1387,8 +1386,6 @@ conks
copacetic
corkenpoppen
corpuscle
-cpu
-cpu's
crabgrass
crapshoot
criminology
diff --git a/larn/scores.c b/larn/scores.c
index e9082a95..71d399e1 100644
--- a/larn/scores.c
+++ b/larn/scores.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scores.c,v 1.11 2001/02/05 00:57:34 christos Exp $ */
+/* $NetBSD: scores.c,v 1.12 2004/02/13 11:36:08 wiz Exp $ */
/*
* scores.c Larn is copyrighted 1986 by Noah Morgan.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: scores.c,v 1.11 2001/02/05 00:57:34 christos Exp $");
+__RCSID("$NetBSD: scores.c,v 1.12 2004/02/13 11:36:08 wiz Exp $");
#endif /* not lint */
#include <sys/types.h>
#include <sys/times.h>
@@ -74,9 +74,9 @@ struct log_fmt { /* 102 bytes struct for the log file */
long moves; /* number of moves made by player */
short ac; /* armor class of player */
short hp, hpmax; /* players hitpoints */
- short cputime;/* cpu time needed in seconds */
+ short cputime;/* CPU time needed in seconds */
short killed, spused; /* monsters killed and spells cast */
- short usage; /* usage of the cpu in % */
+ short usage; /* usage of the CPU in % */
short lev; /* player level */
#endif
char who[12];/* player name */
@@ -674,10 +674,10 @@ invalid:
snprintf(logg.what, sizeof(logg.what),
"%s", whydead[x - 256]);
logg.cavelev = level;
- time(&zzz); /* get cpu time -- write out score info */
+ time(&zzz); /* get CPU time -- write out score info */
logg.diedtime = zzz;
#ifdef EXTRA
- times(&cputime);/* get cpu time -- write out score info */
+ times(&cputime);/* get CPU time -- write out score info */
logg.cputime = i = (cputime.tms_utime + cputime.tms_stime) / 60 + c[CPUTIME];
logg.lev = c[LEVEL];
logg.ac = c[AC];
diff --git a/rogue/USD.doc/rogue.me b/rogue/USD.doc/rogue.me
index 5bcc2caf..b1592dd2 100644
--- a/rogue/USD.doc/rogue.me
+++ b/rogue/USD.doc/rogue.me
@@ -1,4 +1,4 @@
-.\" $NetBSD: rogue.me,v 1.5 2003/08/07 09:37:41 agc Exp $
+.\" $NetBSD: rogue.me,v 1.6 2004/02/13 11:36:08 wiz Exp $
.\"
.\" Copyright (c) 1986, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -744,7 +744,7 @@ input over forty characters will be ignored.
If this option is set,
running moves will not be displayed
until you reach the end of the move.
-This saves considerable cpu and display time.
+This saves considerable CPU and display time.
This option defaults to
.i jump
if you are using a slow terminal.