Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Jun 2011 22:36:41 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r223548 - stable/7/games/fortune/datfiles
Message-ID:  <201106252236.p5PMaf6p025291@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dougb
Date: Sat Jun 25 22:36:41 2011
New Revision: 223548
URL: http://svn.freebsd.org/changeset/base/223548

Log:
  MFC r211094:
    "whereis netscape" gives empty output for quite a long time already.
    Suggest to use "whereis firefox" instead.
  
  MFC r212168:
    fix the move so that it matches what the rest of the internet
    says about this game...  This move also makes more sense...
  
  MFC r213287
    Add advice to new fathers from Thomas Ptacek.
  
  MFC r221908
    fortune(6): fix typos and misspellings.
  
    While here, drop words in the spelling files that are no longer used
    anywhere.
  
    Speling errors found via:	codespell from Lucas De Marchi
  
  MFC r221909
    Convert a file to UTF-8. This only changes a character in the
    copyright section and will not require UTF-8 for fortune(6).
  
  MFC r222890
    Minor typo, fix 2 attributions

Modified:
  stable/7/games/fortune/datfiles/fortunes
  stable/7/games/fortune/datfiles/fortunes-o.real
  stable/7/games/fortune/datfiles/fortunes-o.sp.ok
  stable/7/games/fortune/datfiles/fortunes.sp.ok
  stable/7/games/fortune/datfiles/freebsd-tips
  stable/7/games/fortune/datfiles/freebsd-tips.sp.ok
  stable/7/games/fortune/datfiles/gerrold.limerick
  stable/7/games/fortune/datfiles/limerick
  stable/7/games/fortune/datfiles/limerick.sp.ok
  stable/7/games/fortune/datfiles/startrek.sp.ok
  stable/7/games/fortune/datfiles/zippy.sp.ok
Directory Properties:
  stable/7/games/fortune/   (props changed)

Modified: stable/7/games/fortune/datfiles/fortunes
==============================================================================
--- stable/7/games/fortune/datfiles/fortunes	Sat Jun 25 22:22:25 2011	(r223547)
+++ stable/7/games/fortune/datfiles/fortunes	Sat Jun 25 22:36:41 2011	(r223548)
@@ -2057,7 +2057,7 @@ promised me faithfully that you'd be bac
 nine.  It just can't take that long to play 18 holes of golf."
 	"Honey, wait," said Harry.  "Let me explain.  I know what I promised
 you, but I have a very good reason for being late.  Fred and I tee'd off
-right on time and everything was find for the first three holes.  Then, on
+right on time and everything was fine for the first three holes.  Then, on
 the fourth tee Fred had a stroke.  I ran back to the clubhouse but couldn't
 find a doctor.  And, by the time I got back to Fred, he was dead.  So, for
 the next 15 holes, it was hit the ball, drag Fred, hit the ball, drag Fred...
@@ -10494,13 +10494,13 @@ Anti-trust laws should be approached wit
 Antonio Antonio
 Was tired of living alonio
 He thought he would woo			Antonio Antonio
-Miss Lucamy Lu,				Rode of on his polo ponio
+Miss Lucamy Lu,				Rode off on his polo ponio
 Miss Lucamy Lucy Molonio.		And found the maid
 					In a bowery shade,
 					Sitting and knitting alonio.
 Antonio Antonio
 Said if you will be my ownio
-I'll love tou true			Oh nonio Antonio
+I'll love you true			Oh nonio Antonio
 And buy for you				You're far too bleak and bonio
 An icery creamry conio.			And all that I wish
 					You singular fish
@@ -10509,7 +10509,7 @@ Antonio Antonio
 Uttered a dismal moanio
 And went off and hid
 Or I'm told that he did
-In the Antartical Zonio.
+In the Antarctical Zonio.
 %
 Antonym, n.:
 	The opposite of the word you're trying to think of.
@@ -20232,7 +20232,7 @@ Good-bye.  I am leaving because I am bor
 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
@@ -25099,7 +25099,7 @@ intellectual
 enlightenment
 %
 IBM:
-	[Internation Business Machines Corp.]  Also known as Itty Bitty
+	[International Business Machines Corp.]  Also known as Itty Bitty
 	Machines or The Lawyer's Friend.  The dominant force in computer
 	marketing, having supplied worldwide some 75% of all known hardware
 	and 10% of all software.  To protect itself from the litigious envy
@@ -25523,7 +25523,9 @@ him, prussic acid could solve our popula
 %
 If everybody minded their own business, the world would go
 around a deal faster.
-		-- The Duchess, "Through the Looking Glass"
+		-- The Duchess; Lewis Carroll,
+		   "Through the Looking-Glass,
+		   and What Alice Found There" (1871)
 %
 If everything is coming your way then you're in the wrong lane.
 %
@@ -42420,7 +42422,7 @@ in peoples' memories never really happen
 Some of them want to use you,
 Some of them want to be used by you,
 ...Everybody's looking for something.
-		-- Eurythmics
+		-- Eurythmics, "Sweet Dreams (Are Made Of This)"
 %
 Some of us are becoming the men we wanted to marry.
 		-- Gloria Steinem
@@ -45217,7 +45219,7 @@ of their own homes.
 	1: P-Q4, Kt-KB3
 	2: Kt-Q2, P-K4
 	3: PxP, Kt-Kt5
-	4: P-K6, Kt-K6/
+	4: P-KR3, Kt-K6/
 	White then resigns on realizing that a fifth move would involve
 either a Q-KR5 check or the loss of his queen.
 		-- Stephen Pile, "The Book of Heroic Failures"
@@ -50598,6 +50600,12 @@ of its twelfth story apartment, and crus
 for freedom.
 		-- Stig's Inferno
 %
+They're basically very smelly houseplants until they get to the crawling
+age.  You're constantly terrified that they're going to randomly die on
+you, but the rules for preventing that outcome are straightforward and
+hard to forget.
+		-- Thomas Ptacek, giving advice to a new father
+%
 They're giving bank robbing a bad name.
 		-- John Dillinger, on Bonnie and Clyde
 %

Modified: stable/7/games/fortune/datfiles/fortunes-o.real
==============================================================================
--- stable/7/games/fortune/datfiles/fortunes-o.real	Sat Jun 25 22:22:25 2011	(r223547)
+++ stable/7/games/fortune/datfiles/fortunes-o.real	Sat Jun 25 22:36:41 2011	(r223548)
@@ -7722,7 +7722,7 @@ I wooed a stewed nude in Bermuda,
 I was lewd, but my God! she was lewder.
 	She said it was crude
 	To be wooed in the nude--
-I persued her, subdued her, and screwed her!
+I pursued her, subdued her, and screwed her!
 %
 I would like to say, Mister Bunce,
 I'm a great connoisseur of hot cunts.
@@ -9044,7 +9044,7 @@ raped, his house burned, and all his cat
 distant neighbors about the tragedy, a few of them reported that the only
 stranger they had seen in the area for weeks was a tall desperado wearing a
 black hat and a red neckerchief.
-	The cowboy saddled his fastest horse and set out to find the villian.
+	The cowboy saddled his fastest horse and set out to find the villain.
 He searched for months but couldn't catch up with the culprit; in town after
 dusty town he was told that a man fitting the description had been there but
 had just departed; usually after some heinous crime.

Modified: stable/7/games/fortune/datfiles/fortunes-o.sp.ok
==============================================================================
--- stable/7/games/fortune/datfiles/fortunes-o.sp.ok	Sat Jun 25 22:22:25 2011	(r223547)
+++ stable/7/games/fortune/datfiles/fortunes-o.sp.ok	Sat Jun 25 22:36:41 2011	(r223548)
@@ -1121,7 +1121,6 @@ pees
 penis
 pere
 Perelman
-persued
 pestes
 Peteer
 Pettigrew
@@ -1600,7 +1599,6 @@ vibrators
 vici
 Vida
 vidi
-villian
 virginem
 Visme
 viziti

Modified: stable/7/games/fortune/datfiles/fortunes.sp.ok
==============================================================================
--- stable/7/games/fortune/datfiles/fortunes.sp.ok	Sat Jun 25 22:22:25 2011	(r223547)
+++ stable/7/games/fortune/datfiles/fortunes.sp.ok	Sat Jun 25 22:36:41 2011	(r223548)
@@ -139,7 +139,6 @@ Anouilh
 ANRS
 Ansley
 answerback
-Antartic
 Anthony's
 Antonym
 Antrim
@@ -375,7 +374,6 @@ Bertolt
 Besicovitch
 Beslove
 Betazoid
-bethumped
 Bette
 Bevan
 BEW
@@ -468,7 +466,6 @@ booing
 bookaholic
 Booker's
 boola
-Boorchi
 Boorstin
 bootable
 Boothe
@@ -576,7 +573,6 @@ Bulwer
 bumperless
 Bumstead
 Bungei
-BURBULATION
 Buren
 Burggoven
 burgled
@@ -623,7 +619,6 @@ Callahan
 Callahan's
 Callimachus
 Camden
-Camelia
 Cameron
 Camillo
 Campbell
@@ -771,7 +766,6 @@ Churchill's
 Churchy
 Chuzzlewit
 CI
-Cianci
 Ciardi
 cinched
 cinema's
@@ -806,7 +800,6 @@ Cochran
 cockamamie
 Cocteau
 Cody
-Cody's
 Coevolution
 cogito
 Cohen's
@@ -826,7 +819,6 @@ Comebacks
 Commedia
 Commie
 CommUNIXque
-compuberty
 computatis
 Computerdom
 computerites
@@ -1077,8 +1069,6 @@ DJ
 DMPK
 Dobb's
 Dobbs
-doberman
-doberperson
 Dobie
 Doc
 Docquier
@@ -1203,7 +1193,6 @@ EINS
 Einstein's
 Eisley
 Elbert
-ELBONICS
 Eldridge
 electrocommunications
 Electrocution
@@ -1264,7 +1253,6 @@ Eschenbach
 Escher
 esperantisto
 Esplandian
-Esser
 est
 estas
 Estes
@@ -1293,7 +1281,6 @@ exhalation
 exhibitionists
 EXP
 expatriated
-extemporanea
 extracurricular
 Exupery
 Exxon's
@@ -1301,7 +1288,6 @@ eyestalks
 Eyquem
 Ezrin
 FAA
-FACISM
 Factorials
 Fadiman
 Fafhrd
@@ -1340,7 +1326,6 @@ Fellgett's
 Felton
 feminism's
 Femme
-FENDERBERG
 Fenelon
 Fenster
 Ferber
@@ -1369,7 +1354,6 @@ fikcio
 fiks
 filees
 filename
-Filgoer's
 filigrees
 Filkharmonics
 Fillmore
@@ -1398,7 +1382,6 @@ flamewars
 Flandry
 Flannagan's
 Flannery
-FLANNISTER
 Flappity
 flatfoot
 flatteries
@@ -1410,7 +1393,6 @@ Flon's
 floppity
 Florio
 floss
-flouride
 Flugg's
 Flummery
 flutterby
@@ -1557,7 +1539,6 @@ Geminis
 Genderplex
 Genesereth
 Genghis
-genlock
 genocide
 Genter
 Geritol
@@ -1605,7 +1586,6 @@ Giuseppe
 Glanvill
 Glaser
 gleekzorp
-GLEEMITES
 Glegg
 gleknow
 Glib's
@@ -2013,7 +1993,6 @@ if's
 ifthen
 Igmmlptk
 Ignatowski
-ignisecond
 ihuxw
 IIc
 III's
@@ -2498,7 +2477,6 @@ Lovin
 Lowells
 Lowery's
 Lowes
-Lownes
 LP
 LPA
 LSD
@@ -2534,7 +2512,6 @@ Ma's
 Mabbitt
 Mabley
 Macaroons
-MacBeth
 Maccius
 MacDowell
 MacDuff
@@ -2621,7 +2598,6 @@ Matz's
 Maud
 Maud'Dib
 Maugham
-Maughm
 Maupin
 Maureens
 Maurois
@@ -2630,7 +2606,6 @@ Maxey
 Maxson
 May's
 Mayorga
-Mårten
 MBAs
 MBH
 MC
@@ -2687,7 +2662,6 @@ Mendelson
 mendicants
 Mengot
 Menninger
-Mensa
 Menschen
 Meow
 meowing
@@ -2715,7 +2689,6 @@ Mickos
 microchips
 Microcomputing
 micrometric
-Microsystem's
 Microsystems
 MicroVAXes
 midgets
@@ -2730,7 +2703,6 @@ milk's
 Milkbone
 Millay
 Milligan
-millihelen
 Millikan
 Millikan's
 millions
@@ -2763,7 +2735,6 @@ Mitford
 Mitgong
 mittengrabben
 mitts
-mittsquinter
 MITZIE
 Mix's
 Miyamoto
@@ -2779,7 +2750,6 @@ modifaiing
 Modula
 Moebius
 Mohandas
-Mohandis
 mohmen
 Moishe
 Molander
@@ -2803,7 +2773,6 @@ Moolah
 moonshiner's
 Moore's
 mopeds
-mophobia
 Moping
 moralists
 Mordecai
@@ -2832,7 +2801,6 @@ Mt
 MTA
 Muad'dib
 muckest
-mucklucks
 Mudgeeraba
 Mudhead
 mudslide
@@ -2888,7 +2856,6 @@ nanohenry
 nanometers
 Nansen
 Napoleon's
-narcolepulacyi
 Narnia
 Nasium's
 Naso
@@ -2909,7 +2876,6 @@ Neantical
 Nebuchadnezzar
 Nebuchadnezzar's
 necesas
-necessitious
 NecroSoft
 Nehru
 Neil's
@@ -2940,7 +2906,6 @@ NF
 NFL
 Ngdanga
 Niagra
-Niccoli
 Nicklaus
 Nicol
 Nicolaides
@@ -3165,7 +3130,6 @@ Pearsall
 PECCATOPHOBIA
 Pecor's
 Pedaeration
-pediddel
 Peers's
 Pegler
 pelted
@@ -3192,7 +3156,6 @@ Personifiers
 Petaluma
 Petersons
 Petr
-petribar
 Petronius
 Pfeiffer
 Pfffttt
@@ -3204,7 +3167,6 @@ Philips
 philogyny
 phoney
 Phooey
-phosflink
 Picadilly
 Pickard
 Pickle's
@@ -3246,7 +3208,6 @@ Pocataligo
 Pocatello
 Podunk
 Pohl's
-Poincair
 Poincare's
 pointy
 Polanski
@@ -3347,7 +3308,6 @@ Pumpernickel
 punchline
 punning
 PUPs
-PURPITATION
 Purshottam
 PUSHes
 pushy
@@ -3551,7 +3511,6 @@ Saberhagen
 Sacher's
 Sadat
 Saddam
-sadoequinecrophilia
 Saens
 Safford
 Safire's
@@ -3605,7 +3564,6 @@ Schickele
 Schieffer
 schisms
 schizophrenics
-schlattwhapper
 schlichte
 schluerfen
 Schmendrick
@@ -3631,7 +3589,6 @@ Scintillae
 Scott's
 Scoville
 SCRBL
-SCRIBLINE
 Scrubb
 scullery
 scurries
@@ -3784,7 +3741,6 @@ somebody'd
 something's
 Sondheim
 Sooooo
-Soren
 Sorhed
 sort've
 sorta
@@ -3799,7 +3755,6 @@ SP
 Spacemen
 Spaceport
 spacewar
-SPAGMUMPS
 spake
 Spam
 spank
@@ -3824,7 +3779,6 @@ springenwerk
 Springsteen
 sprites
 SPSW
-SQUATCHO
 squaws
 squealers
 squrooneg
@@ -3980,7 +3934,6 @@ teepers
 telematic
 telepath
 teleportation
-TELEPRESSION
 telepsychology
 tempfile
 tendrils
@@ -4028,7 +3981,6 @@ tinpot
 Tirith
 tis
 Tiselius
-Titas
 tites
 TLC
 TM
@@ -4060,7 +4012,6 @@ toun
 Tourbillon
 Toven
 trans
-transcendant
 transmogrifiers
 trapezes
 Traub
@@ -4121,7 +4072,6 @@ TYDFS
 tyg
 typefaces
 Tyroon
-tzu
 Ubi
 UDA
 Udall's
@@ -4152,7 +4102,6 @@ Unseld
 untechnician
 unvoist
 Updike
-upharsen
 uponst
 Urey
 Urho

Modified: stable/7/games/fortune/datfiles/freebsd-tips
==============================================================================
--- stable/7/games/fortune/datfiles/freebsd-tips	Sat Jun 25 22:22:25 2011	(r223547)
+++ stable/7/games/fortune/datfiles/freebsd-tips	Sat Jun 25 22:36:41 2011	(r223548)
@@ -476,6 +476,6 @@ You can use "whereis" to search standard
 directories for the specified programs. This can be particularly handy
 when you are trying to find where in the ports tree an application is.
 
-Try "whereis netscape" and "whereis whereis".
+Try "whereis firefox" and "whereis whereis".
 		-- Konstantinos Konstantinidis <kkonstan@duth.gr>
 %

Modified: stable/7/games/fortune/datfiles/freebsd-tips.sp.ok
==============================================================================
--- stable/7/games/fortune/datfiles/freebsd-tips.sp.ok	Sat Jun 25 22:22:25 2011	(r223547)
+++ stable/7/games/fortune/datfiles/freebsd-tips.sp.ok	Sat Jun 25 22:36:41 2011	(r223548)
@@ -45,7 +45,6 @@ misc
 natserv
 ncal
 netcat
-netscape
 netstat
 newfile
 NICs

Modified: stable/7/games/fortune/datfiles/gerrold.limerick
==============================================================================
--- stable/7/games/fortune/datfiles/gerrold.limerick	Sat Jun 25 22:22:25 2011	(r223547)
+++ stable/7/games/fortune/datfiles/gerrold.limerick	Sat Jun 25 22:36:41 2011	(r223548)
@@ -3,7 +3,7 @@
 %% Copyright David Gerrold, 1984-2000, all rights reserved,
 %% used with permission of the author.
 %%
-%%© This is the copyright line.
+%%© This is the copyright line.
 %%Eighty-nine is the year we assign.
 %%	These verses are caroled
 %%	by one David Gerrold.

Modified: stable/7/games/fortune/datfiles/limerick
==============================================================================
--- stable/7/games/fortune/datfiles/limerick	Sat Jun 25 22:22:25 2011	(r223547)
+++ stable/7/games/fortune/datfiles/limerick	Sat Jun 25 22:36:41 2011	(r223548)
@@ -260,7 +260,7 @@ And white footgear intended for tennis.
 %
 A dulcet-voiced callgirl named Shedd,
 Who's cultured, well-spoken, well-bred,
-	Had achieved some reknown
+	Had achieved some renown
 	For her tone going down--
 There's a nice civil tongue in her head.
 %
@@ -307,7 +307,7 @@ Had sex with a virgin named Grace.
 By bleeding all over his face.
 %
 A gay young prince from Morocco
-Made love in a manner rococco.
+Made love in a manner rococo.
 	He painted his penis
 	To resemble a Venus
 And flavored his semen with cocoa.

Modified: stable/7/games/fortune/datfiles/limerick.sp.ok
==============================================================================
--- stable/7/games/fortune/datfiles/limerick.sp.ok	Sat Jun 25 22:22:25 2011	(r223547)
+++ stable/7/games/fortune/datfiles/limerick.sp.ok	Sat Jun 25 22:36:41 2011	(r223548)
@@ -283,6 +283,7 @@ McTavish
 meanie
 meanies
 meany
+Mensa
 mentis
 midgets
 minimis
@@ -353,11 +354,9 @@ quimmy
 quints
 ravished
 Reims
-reknown
 Resounded
 retriebrve
 Rhyll
-rococco
 rogered
 Salinas
 Sandem

Modified: stable/7/games/fortune/datfiles/startrek.sp.ok
==============================================================================
--- stable/7/games/fortune/datfiles/startrek.sp.ok	Sat Jun 25 22:22:25 2011	(r223547)
+++ stable/7/games/fortune/datfiles/startrek.sp.ok	Sat Jun 25 22:36:41 2011	(r223548)
@@ -14,7 +14,6 @@ Corbomite
 Corby
 Daystrom
 Deela
-Dehaver
 Elaan
 Eleen
 Eneg

Modified: stable/7/games/fortune/datfiles/zippy.sp.ok
==============================================================================
--- stable/7/games/fortune/datfiles/zippy.sp.ok	Sat Jun 25 22:22:25 2011	(r223547)
+++ stable/7/games/fortune/datfiles/zippy.sp.ok	Sat Jun 25 22:36:41 2011	(r223548)
@@ -180,7 +180,7 @@ manicurist
 matic
 meatball
 meltdown
-naugahide
+naugahyde
 obstetrician
 poindexter
 pre



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106252236.p5PMaf6p025291>