various fixes from netbsd -r1.35 and -r1.36 (snj@netbsd)

4 files changed, 29 insertions, 33 deletions

diff --git a/games/fortune/datfiles/fortunes-o.real b/games/fortune/datfiles/fortunes-o.real
index 32945da4c22..f015ba0dfac 100644
--- a/games/fortune/datfiles/fortunes-o.real
+++ b/games/fortune/datfiles/fortunes-o.real
@@ -1486,7 +1486,7 @@ Suckin' them hop toads, suckin' them chunkers,
 Suckin' them a leapy type, suckin' them flunkers.
 
 Look at them toad suckers, ain't they snappy?
-Suckin' them bog frogs sure make's 'em happy!
+Suckin' them bog frogs sure makes 'em happy!
 
 Them hugger mugger toad suckers, way down south,
 Stickin' them sucky toads in they mouth!
diff --git a/games/fortune/datfiles/fortunes2 b/games/fortune/datfiles/fortunes2
index 8e8e43c3875..04815176ae8 100644
--- a/games/fortune/datfiles/fortunes2
+++ b/games/fortune/datfiles/fortunes2
@@ -1518,7 +1518,7 @@ after their wedding, he presented the lady to a friend who said politely,
 "Congratulations, Herr d'Albert; you have rarely introduced me to so
 charming a wife."
 %
-	Everthing is farther away than it used to be.  It is even twice as
+	Everything is farther away than it used to be.  It is even twice as
 far to the corner and they have added a hill.  I have given up running for
 the bus; it leaves earlier than it used to.
 	It seems to me they are making the stairs steeper than in the old
@@ -3692,7 +3692,7 @@ Suckin' them hop toads, suckin' them chunkers,
 Suckin' them a leapy type, suckin' them flunkers.
 
 Look at them toad suckers, ain't they snappy?
-Suckin' them bog frogs sure make's 'em happy!
+Suckin' them bog frogs sure makes 'em happy!
 
 Them hugger mugger toad suckers, way down south,
 Stickin' them sucky toads in they mouth!
@@ -5257,7 +5257,7 @@ increase to more than $100,000,000 -- by which time it will be worth nothing.
 1/2 oz. gin
 1/2 oz. vodka
 1/2 oz. rum (preferably dark)
-3/4 oz. tequilla
+3/4 oz. tequila
 1/2 oz. triple sec
 1/2 oz. orange juice
 3/4 oz. sour mix
@@ -5673,7 +5673,7 @@ A compliment is something like a kiss through a veil.
 		-- Joseph Campbell
 %
 A computer lets you make more mistakes faster than any other invention,
-with the possible exceptions of handguns and Tequilla.
+with the possible exceptions of handguns and tequila.
 	-- Mitch Ratcliffe
 %
 A computer salesman visits a company president for the purpose of selling
@@ -6736,7 +6736,7 @@ to his death.
 	"DUMB YANKEE."
 %
 A New Yorker was driving through Berkeley when he saw a big crowd gathered
-by the side of the street.  Curiousity got the better of him and he leaned
+by the side of the street.  Curiosity got the better of him and he leaned
 out of his window to ask an onlooker what was going on.  The fellow explained
 that a protestor against the U.S. position in South America had doused
 himself with gasoline and set himself on fire.  "That's terrible," gasped
@@ -14842,7 +14842,7 @@ CARTABLANCA:
 	trouble with the local French authorities who would really prefer
 	wine and the occupying Germans who believe that only their beer is
 	fit to be sold.  Wacky events ensue until the gripping climax in
-	which the much-hated German beer distributer is drowned in a vat.
+	which the much-hated German beer distributor is drowned in a vat.
 %
 FORTUNE DISCUSSES THE OBSCURE FILMS: #11
 
@@ -15227,7 +15227,7 @@ FORTUNE'S FUN FACTS TO KNOW AND TELL:		#1
 	A black panther is really a leopard that has a solid black coat
 	    rather than a spotted one.
 	Peanuts are not really nuts.  The majority of nuts grow on trees
-		while peauts grow underground.  They are classified as a
+		while peanuts grow underground.  They are classified as a
 		legume-part of the pea family.
 	A cucumber is not a vegetable but a fruit.
 %
@@ -16056,7 +16056,7 @@ Good teaching is one-fourth preparation and three-fourths good theatre.
 Goodbye, cool world.
 %
 Goose pimples rose all over me, my hair stood on end, my eyes filled with
-tears of love and gratitude for this greatest of all conquerers of human
+tears of love and gratitude for this greatest of all conquerors of human
 misery and shame, and my breath came in little gasps.  If I had not known
 that the Leader would have scorned such adulation, I might have fallen to
 my knees in unashamed worship, but instead I drew myself to attention, raised
@@ -18818,8 +18818,8 @@ take one along that worked.
 		-- Raymond Chandler
 %
 I know if you been talkin' you done said
-just how suprised you wuz by the living dead.
-You wuz suprised that they could understand you words
+just how surprised you wuz by the living dead.
+You wuz surprised that they could understand you words
 and never respond once to all the truth they heard.
 But don't you get square!
 There ain't no rule that says they got to care.
@@ -19045,7 +19045,7 @@ I've never seen a purple cow
 I never hope to see one
 But from the milk we're getting now
 There certainly must be one
-		-- Odgen Nash
+		-- Ogden Nash
 
 Ah, yes, I wrote "The Purple Cow"
 I'm sorry now I wrote it
@@ -20809,7 +20809,7 @@ Their romance might have flourished.
 But he built tetrahedral in his shape,
 His ions ferric,
 Love could not help but die,
-Uncatylised, inert, and undernourished.
+Uncatalised, inert, and undernourished.
 %
 If society fits you comfortably enough, you call it freedom.
 		-- Robert Frost
@@ -22124,7 +22124,7 @@ In Hollywood, if you don't have happiness, you send out for it.
 		-- Rex Reed
 %
 In Italy, for thirty years under the Borgias, they had warfare, terror,
-murder, and bloodshed, but they produced Michaelangelo, Leonardo da Vinci
+murder, and bloodshed, but they produced Michelangelo, Leonardo da Vinci
 and the Renaissance.  In Switzerland, they had brotherly love, they had
 five hundred years of democracy and peace -- and what did they produce?
 The cuckoo-clock.
@@ -26900,7 +26900,7 @@ Yea, tho I walk through the valley of surprise quizzes,
 	I will fear no prof, for my calculator is there to hearten me.
 It prepareth a log table to comfort me, it prepareth an
 	arc sin for me in the presence of my teachers.
-It annoints my homework with correct solutions, my interpolations are
+It anoints my homework with correct solutions, my interpolations are
 	over.
 Surely, both precision and accuracy shall follow me all the days of my
 	life, and I shall dwell in the house of Texas instruments forever.
@@ -28982,7 +28982,7 @@ While you pondered sentient and crystalline,
 Over many a broken and subordinate
 Volume of gnarly lore,
 While I pestered, nearly singing,
-Sudddenly there came a hewing,
+Suddenly there came a hewing,
 As of someone profusely skulking,
 Skulking at my chamber door.
 %
@@ -31365,7 +31365,7 @@ QOTD:
 	horse with one of the horns broken off."
 %
 QOTD:
-	"I treat her like a throughbred, and she's STILL a nag!"
+	"I treat her like a thoroughbred, and she's STILL a nag!"
 %
 QOTD:
 	"I tried buying a goat instead of a lawn tractor; had to return
@@ -31934,7 +31934,7 @@ the first one.
 %
 "Remember, if it's being done correctly, here or abroad, it's
 *not* the U.S. Army doing it!"
-		-- Good Morning VietNam
+		-- Good Morning Vietnam
 %
 Remember kids, if there's a loaded gun in the room, be sure
 that you're the one holding it.
@@ -33404,7 +33404,7 @@ COMMUNISM:
 	Give both to the government.  The government gives you milk.
 CAPITALISM:
 	You sell one cow and buy a bull.
-FACISM:
+FASCISM:
 	You have two cows.  Give milk to the government.
 	The government sells it.
 NAZISM:
@@ -36224,7 +36224,7 @@ SEE Man-Fish Battle Shark-Man-Killer!
 See Jane Russell in 3-D; She'll Knock Both Your Eyes Out!
 		-- The French Line (1954)
 
-See Jane Russell Shake Her Tamborines... and Drive Cornel WILDE!
+See Jane Russell Shake Her Tambourines... and Drive Cornel WILDE!
 		-- Hot Blood (1956)
 %
 The Great Movie Posters:
@@ -41037,7 +41037,7 @@ boarder.
 %
 Today you'll start getting heavy metal radio on your dentures.
 %
-Todays weirdness is tomorrows reason why.
+Today's weirdness is tomorrow's reason why.
 		-- H. S. Thompson
 %
 Toddlers are the stormtroopers of the Lord of Entropy.
@@ -41650,7 +41650,7 @@ of more feet, just to be sure.
 		-- Eric Allman
 
 ... We make rope.
-		-- Rob Gingell on Sun Microsystem's new virtual memory.
+		-- Rob Gingell on Sun Microsystems' new virtual memory.
 %
 Unix is a lot more complicated (than CP/M) of course -- the typical Unix
 hacker can never remember what the PRINT command is called this week --
@@ -42782,7 +42782,7 @@ Sitting at a table, dealing stud,
 Sat that dirty (bleep) that named me Sue.
 ...
 Now, I knew that snake was my own sweet Dad,
-From a wornout picture that my Mother had,
+From a worn out picture that my Mother had,
 And I knew that scar on his cheek and his evil eye...
 		-- Johnny Cash, "A Boy Named Sue"
 %
@@ -43479,10 +43479,6 @@ Whatever you do will be insignificant, but it is very important that
 you do it.
 		-- Ghandi
 %
-Whatever you do will be insignificant,
-but it is very important that you do it.
-		-- Gandhi
-%
 Whatever you may be sure of, be sure of this: that you are dreadfully like
 other people.
 		-- James Russell Lowell, "My Study Windows"
diff --git a/games/fortune/datfiles/fortunes2-o b/games/fortune/datfiles/fortunes2-o
index 1e241781c31..e2693fa29f6 100644
--- a/games/fortune/datfiles/fortunes2-o
+++ b/games/fortune/datfiles/fortunes2-o
@@ -894,7 +894,7 @@ you one wish.  Do you want a quick fuck or a little head?"
 %
 	Everyone in the smart nightclub was amazed by the old gentleman,
 obviously pushing 70, tossing off manhattans and cavorting around the dance
-floor like a 20-year old.  Finally curiousity got the best of the cigarette
+floor like a 20-year old.  Finally curiosity got the best of the cigarette
 girl.  "I beg your pardon, sir," she said, "but I'm amazed to see a gentleman
 of your age living it up like a youngster.  Tell me, are all of your faculties
 unimpaired?"
@@ -3356,7 +3356,7 @@ to his death.
 	"DUMB YANKEE."
 %
 A New Yorker was driving through Berkeley when he saw a big crowd gathered
-by the side of the street.  Curiousity got the better of him and he leaned
+by the side of the street.  Curiosity got the better of him and he leaned
 out of his window to ask an onlooker what was going on.  The fellow explained
 that a protestor against the U.S. position in South America had doused
 himself with gasoline and set himself on fire.  "That's terrible," gasped
@@ -5275,7 +5275,7 @@ Sed virginem pine necebat.
 %
 Cunnilingus is next to cleanliness.
 %
-Curiousity killed the cat, but satisfaction brought her back.
+Curiosity killed the cat, but satisfaction brought her back.
 %
 Dad," the 13-year-old boy asked, looking up from his social-studies text,
 "what did you do during the sexual revolution?"
@@ -13876,7 +13876,7 @@ to leave her, you've got to annoy her.
 %
 Today is gonna be one helluva week!
 %
-Todays title:
+Today's title:
 	Creative Violence in Sexual Relationships
 %
 Tonight's piss is tommorrow's Tang.
diff --git a/games/fortune/datfiles/limerick b/games/fortune/datfiles/limerick
index ce64d68dbdd..8f19cb4fbe2 100644
--- a/games/fortune/datfiles/limerick
+++ b/games/fortune/datfiles/limerick
@@ -443,7 +443,7 @@ He couldn't get out with ESC.
 A hacker-turned-pervert named Fisk
 Made love to the drive of his disk.
 	The thing circumsized him,
-	Which rather suprised him.
+	Which rather surprised him.
 He wasn't aware of *that* risk.
 %
 A handsome young rodent named Gratian
@@ -2063,7 +2063,7 @@ Fell in love with a virile young Tartar.
 And cried: "For that I'll be a martyr!"
 %
 There once was a lady named Clair,
-Who posessed a magnificent pair.
+Who possessed a magnificent pair.
 	Or that's what I thought,
 	Till I saw one get caught,
 On a thorn and begin losing air.