Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Nov 2009 22:40:13 +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: r199027 - stable/7/games/fortune/datfiles
Message-ID:  <200911072240.nA7MeDDU065687@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dougb
Date: Sat Nov  7 22:40:13 2009
New Revision: 199027
URL: http://svn.freebsd.org/changeset/base/199027

Log:
  Mass MFC of older commits to bring these files up to date with HEAD:
  r174581, r174597, r174897, r175017, r175129, r175213, r176638, r176639,
  r176764, r177781, r177879, r178604, r178605, r178662, r179960, r179987,
  r180286, r180341, r181207, r183691, r183707, r189448
  
  MFC r197797:
  s/Putluck Pogo/Potluck Pogo/
  
  MFC r198921:
  Grammar/formatting fix
  
  MFC 199021:
  Remove svn:executable from datfiles/gerrold.limerick
  
  MFC r199023:
  Move VCS fortune to fortunes-o
  
  MFC 199025:
  Sort fortune

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

Modified: stable/7/games/fortune/datfiles/fortunes
==============================================================================
--- stable/7/games/fortune/datfiles/fortunes	Sat Nov  7 22:27:34 2009	(r199026)
+++ stable/7/games/fortune/datfiles/fortunes	Sat Nov  7 22:40:13 2009	(r199027)
@@ -69,6 +69,17 @@ either.  If you need some help, give us 
 
 		-- CommUNIXque 1:1, ASCAR Business Systems
 %
+			   1/2
+	12 + 144 + 20 + 3*4                    2
+	----------------------  +  5 * 11  =  9  +  0
+		  7
+
+A dozen, a gross and a score,
+Plus three times the square root of four,
+	Divided by seven,
+	Plus five times eleven,
+Equals nine squared plus zero, no more!
+%
 			-- Gifts for Children --
 
 This is easy.  You never have to figure out what to get for children,
@@ -674,17 +685,6 @@ Liza Minnelli.
 %
 	... with liberty and justice for all who can afford it.
 %
-			   1/2
-	12 + 144 + 20 + 3*4                    2
-	----------------------  +  5 * 11  =  9  +  0
-		  7
-
-A dozen, a gross and a score,
-Plus three times the square root of four,
-	Divided by seven,
-	Plus five times eleven,
-Equals nine squared plus zero, no more!
-%
 	7,140	pounds on the Sun
 	   97	pounds on Mercury or Mars
 	  255	pounds on Earth
@@ -2605,7 +2605,7 @@ man.  Mud-as-man alone could speak.
 	"Certainly," said man.
 	"Then I leave it to you to think of one for all of this," said God.
 	And He went away.
-		-- Kurt Vonnegut, Between Time and Timbuktu"
+		-- Kurt Vonnegut, "Between Time and Timbuktu"
 %
 	In the beginning there was data.  The data was without form and
 null, and darkness was upon the face of the console; and the Spirit of
@@ -10544,6 +10544,10 @@ Another day, another dollar.
 		   upon Hinckley's acquittal for shooting President Ronald
 		   Reagan.
 %
+Another flaw in the human character is that everybody wants to build
+and nobody wants to do maintenance.
+		-- Kurt Vonnegut, "Hocus Pocus"
+%
 Another good night not to sleep in a eucalyptus tree.
 %
 Another megabytes the dust.
@@ -11478,6 +11482,14 @@ As you will see, I told them, in no unce
 %
 As Zeus said to Narcissus, "Watch yourself."
 %
+Ascend to the high mountain pass,
+Cross the shallow side of the wide ocean.
+Do not give up to the great distance:
+It's by going that you will reach your aim.
+Be not discouraged by human frailty:
+You will overcome it if you try to.
+		-- Chinggis (Genghis) Khan 
+%
 ASCII:
 	The control code for all beginning programmers and those who would
 	become computer literate.  Etymologically, the term has come down as
@@ -13301,6 +13313,10 @@ were not hard, and money not scarce?
 Can anything be sadder than work left unfinished?
 Yes, work never begun.
 %
+"Can you be more stupid than aggravating the judge AND your lawyer?
+No? Oh yes you can: You can aggravate the whole kernel community."
+		-- Alexander Lyamin (about Hans Reisers murder trial)
+%
 Can you buy friendship?  You not only can, you must.  It's the
 only way to obtain friends.  Everything worthwhile has a price.
 		-- Robert J. Ringer
@@ -14234,6 +14250,12 @@ Computers are useless.  They can only gi
 Computers can figure out all kinds of problems, except the things in
 the world that just don't add up.
 %
+Computers can't cruise.  Meandering is a foreign concept to them.
+The computer assumes that all behavior is in pursuit of an ultimate
+goal.  Whenever a motorist changes his or her mind and veers off
+course, the GPS lady issues that snippy announcement: "Recalculating!"
+		-- Joel Achenbach (www.slate.com, 20 Jun 2008)
+%
 Computers don't actually think.
 	You just think they think.
 		(We think.)
@@ -15974,6 +15996,9 @@ Don't marry for money; you can borrow it
 %
 Don't mind him; politicians always sound like that.
 %
+Don't patch bad code -- rewrite it.
+		-- "The Elements of Programming Style", Kernighan and Plauger
+%
 Don't plan any hasty moves.
 You'll be evicted soon anyway.
 %
@@ -18095,7 +18120,7 @@ tail on me, go ahead.  They'd be very bo
 		   commenting on rumors of womanizing.
 %
 Food for thought is no substitute for the real thing.
-		-- Walt Kelly, "Putluck Pogo"
+		-- Walt Kelly, "Potluck Pogo"
 %
 Foolproof Operation:
 	No provision for adjustment.
@@ -19475,20 +19500,6 @@ engaging a suitable stereotype protagoni
 president, political party, etc.) to consummate the act of social
 schizophrenia in mass genocide.
 %
-From dusk till dawn
-I gathered people and their crown
-Conquered the hearts of
-Not too few
-United the heads of
-Now too humble.
-When weaken your mind
-Don?t get weakened
-When tired of thinking
-Don?t get tired
-My sons and descendants
-Don?t get exhausted in mind and thought and but get experienced.
-		-- Chinggis (Genghis) Khan
-%
 From Italian tourist guide:
 
 	"Non stop trains to Roma Termini Station leave from 7.38
@@ -22722,6 +22733,10 @@ steer clear of me at parties.  Often, as
 they don't even invite me.
 		-- Dave Barry
 %
+I asked a teacher what the opposite of a miracle was and she, without
+thinking, I assume, said it was an act of God.
+			-- Terry Prachett (Daily Mail 21 june 2008)
+%
 I asked the engineer who designed the communication terminal's keyboards
 why these were not manufactured in a central facility, in view of the
 small number needed [1 per month] in his factory.  He explained that this
@@ -23934,6 +23949,9 @@ I like myself, but I won't say I'm as ha
 that kidnaped Europa.
 		-- Marcus Tullius Cicero
 %
+I like paying taxes.  With them I buy civilization.
+		-- Oliver Wendell Holmes
+%
 I like to believe that people in the long run are going to do more to
 promote peace than our governments.  Indeed, I think that people want
 peace so much that one of these days governments had better get out of
@@ -25207,7 +25225,8 @@ them scream.
 		-- Sylvestre Matuschka, "the Hungarian Train Wreck Freak",
 		   escaped prison 1937, not heard from since
 %
-Iam
+I
+am
 not
 very
 happy
@@ -26017,16 +26036,6 @@ If Karl, instead of writing a lot about 
 had made a lot of Capital, it would have been much better.
 		-- Karl Marx's Mother
 %
-If Khaan behaves as serfs
-Lose entire states and all estates.
-If serfs behave as Khaan
-He will regret for his head.
-In time of friendship and harmony
-Befriend as closely
-In time of conflict with enemies
-Be falcon of advance and attacks
-		-- Chinggis (Genghis) Khan
-%
 If life gives you lemons, make lemonade.
 %
 If life is a stage, I want some better lighting.
@@ -26576,6 +26585,9 @@ theirs, then you clearly don't understan
 %
 If you can lead it to water and force it to drink, it isn't a horse.
 %
+If you can not say it, you can not whistle it, either.
+		-- Wittgenstein
+%
 If you can read this, you're too close.
 %
 If you can survive death, you can probably survive anything.
@@ -27145,6 +27157,15 @@ I guess you do have a problem.
 %
 If your life was a horse, you'd have to shoot it.
 %
+If your mind grows weak,
+Don't yield to the weakness.
+Even if tired of thought,
+Never stop thinking.
+My sons and descendants,
+Don't get exhausted in reason--
+But become experienced.
+		-- Chinggis (Genghis) Khan
+%
 If your mother knew what you're doing,
 she'd probably hang her head and cry.
 %
@@ -28096,6 +28117,10 @@ _s_e_e the high-water mark -- the pla
 rolled back.
 		-- Hunter S. Thompson, "Fear and Loathing in Las Vegas"
 %
+"In the age of the internet attaching a famous name to your personal
+opinion to give more weight to it is a very valid strategy."
+		-- Benjamin Franklin
+%
 In the beginning there was nothing.  And the Lord said "Let There Be Light!"
 And still there was nothing, but at least now you could see it.
 %
@@ -28245,6 +28270,12 @@ different kinds of weather inside of 24 
 %
 In the stairway of life, you'd best take the elevator.
 %
+In the time of peace and harmony
+Be a kind-hearted friend.
+In the time of conflict with enemies
+Be a falcon of advance and attack.
+		-- Chinggis (Genghis) Khan
+%
 In the Top 40, half the songs are secret messages to the teen world to drop
 out, turn on, and groove with the chemicals and light shows at discotheques.
 		-- Art Linkletter
@@ -29420,15 +29451,6 @@ they'll come out for it.
 		-- Red Skelton, surveying the funeral of Hollywood
 		   mogul Harry Cohn
 %
-
-It ruins mind
-It exhausts wealth
-When it reaches to the tongue
-It is like a mosquito
-When it relives from tongue
-It is like an elephant.
-		-- Boorchi (first of 9 knights of Chinggis (Genghis) Khan)
-%
 It runs like _x, where _x is something unsavory.
 		-- Prof. Romas Aleliunas, CS 435
 %
@@ -31219,11 +31241,10 @@ for Loeb, George came back to the fold, 
 around his neck.
 		-- Dave Barry
 %
-
-Let my petty body exhausted,
-But not my state nature.
-Let my whole body exhausted
-But not my entire state
+Let my own body be exhausted,
+But not the wealth of my state.
+Let my mortal body vanish,
+But not the power of my state.
 		-- Chinggis (Genghis) Khan
 %
 Let no guilty man escape.
@@ -31238,7 +31259,7 @@ Let sleeping dogs lie.
 		-- Charles Dickens
 %
 Let the machine do the dirty work.
-		-- "Elements of Programming Style", Kernighan and Ritchie
+		-- "The Elements of Programming Style", Kernighan and Plauger
 %
 Let the meek inherit the earth -- they have it coming to them.
 		-- James Thurber
@@ -33047,6 +33068,10 @@ versions of songs from The Wizard of Oz.
 %
 May a Misguided Platypus lay its Eggs in your Jockey Shorts
 %
+May all your Emus lay soft boiled eggs, and may all your
+Kangaroos be born with iPods already fitted.
+		-- Aussie New Years wish, found on hasselbladinfo.com
+%
 May all your PUSHes be POPped.
 %
 May Euell Gibbons eat your only copy of the manual!
@@ -34277,6 +34302,11 @@ My own dear love, he is all my world --
 	And I wish I'd never met him.
 		-- Dorothy Parker, part 1
 %
+My own feelings are perhaps best described by saying that I am
+perfectly aware that there is no Royal Road to Mathematics, in other
+words, that I have only a very small head and must live with it.
+		-- Edsger W. Dijkstra
+%
 My own life has been spent chronicling the rise and fall of human systems,
 and I am convinced that we are terribly vulnerable.  ...  We should be
 reluctant to turn back upon the frontier of this epoch. Space is indifferent
@@ -43297,14 +43327,6 @@ the "Gaslight" treatment, the "Are you t
 implication.  Advance to manipulation and humiliation.  Above all, relax
 and have a nice day.
 %
-Strive to the pass of high mountain
-Cross in the shallow side of the wide ocean
-Do not give up because of distance
-Will certainly reach if walks
-Do not discourage of human
-Shall overcome if you try
-		-- Chinggis (Genghis) Khan
-%
 Stuckness shouldn't be avoided.  It's the psychic predecessor of all
 real understanding.  An egoless acceptance of stuckness is a key to an
 understanding of all Quality, in mechanical work as in other endeavors.
@@ -43827,10 +43849,10 @@ Technological progress has merely provid
 with more efficient means for going backwards.
 		-- Aldous Huxley
 %
-Teeth for meat is in mouth
-Teeth for human is in soul.
-Win one with your body strength
-Win many with your mind strength
+Teeth for meat are in the mouth --
+Teeth for humans are in the soul.
+A strong body defeats one,
+A strong soul conquers many.
 		-- Chinggis (Genghis) Khan
 %
 Tehee quod she, and clapte the wyndow to.
@@ -45337,6 +45359,9 @@ endow them with any special qualities of
 compassion.
 		-- Saul Alinsky
 %
+The fall of the USSR proves you wrong.
+		-- Aryeh M. Friedman
+%
 The famous politician was trying to save both his faces.
 %
 The farther you go, the less you know.
@@ -49231,7 +49256,7 @@ round in the worst cars available," he s
 admit it, I tell him, `Forget it'.  If they bring a car back late we
 overlook it.  If they've had a crash and it doesn't involve another vehicle
 we might overlook that too."
-	"Where's the ashtray?" asked on Los Angeles wife, as she settled
+	"Where's the ashtray?" asked one Los Angeles wife, as she settled
 into the ripped interior.  "Honey," said her husband, "the whole car's the
 ash tray."
 		-- Stephen Pile, "The Book of Heroic Failures"
@@ -50777,6 +50802,14 @@ Things are more like they used to be tha
 Things are not always what they seem.
 		-- Phaedrus
 %
+Things Charles Darwin did not say:
+
+Finches, eh ? Seen one, seem 'em all.
+%
+Things Charles Darwin did not say:
+
+Nah, it's only a theory - I don't think it should be taught in schools.
+%
 Things equal to nothing else are equal to each other.
 %
 Things fall apart; the centre cannot hold.
@@ -52167,6 +52200,9 @@ the Thanksgiving festivities of that cit
 the affair," and of course be sadly disappointed thereby.
 		-- Sacramento Daily Union, November 29, 1861
 %
+Too many of his [Mozart's] works sound like interoffice memos.
+		-- Glenn Gould
+%
 Too many people are thinking of security instead of opportunity.
 They seem more afraid of life than death.
 		-- James F. Byrnes
@@ -53841,7 +53877,7 @@ but we always respect their good judgmen
 ...we must be wary of granting too much power to natural selection
 by viewing all basic capacities of our brain as direct adaptations.
 I do not doubt that natural selection acted in building our oversized
-brains -- and I am equally confidant that our brains became large as
+brains -- and I am equally confident that our brains became large as
 an adaptation for definite roles (probably a complex set of interacting
 functions).  But these assumptions do not lead to the notion, often
 uncritically embraced by strict Darwinians, that all major capacities
@@ -53858,7 +53894,7 @@ We must die because we have known them.
 We must finish once and for all with the neutrality of chess.  We must
 condemn once and for all the formula 'chess for the sake of chess,' like
 the formula 'art for art's sake.'  We must organize shock-brigades of
-chess-play ers, and begin the immediate realization of a Five-Year Plan
+chess-players, and begin the immediate realization of a Five-Year Plan
 for chess.
 		-- Nikolai V. Krylenko, People's Commissar for Justice
 		   (of RFSFR, later of USSR), speaking at a 1932 Congress
@@ -55469,6 +55505,12 @@ winter with slightly over half that quan
 %
 When I kill, the only thing I feel is recoil.
 %
+When I look at the horse heads and men's faces, the immense
+live torrent once raised by my will and now whirling to
+nowhere through the red sunset desert, I often wonder where
+I am in this torrent.
+		-- Chinggis (Genghis) Khan
+%
 When I said "we", officer, I was referring to
 myself, the four young ladies, and, of course, the goat.
 %
@@ -56260,6 +56302,9 @@ and perhaps weigh 1 1/2 tons.
 %
 Where am I?  Who am I?  Am I?  I
 %
+Where am I, and what am I doing in this handbasket?
+		-- Mark A. Matthews, to Wes Peters, circa 1996
+%
 Where are the calculations that go with a calculated risk?
 %
 WHERE CAN THE MATTER BE
@@ -59726,6 +59771,17 @@ You've been telling me to relax all the 
 and now you're telling me just to be myself?
 		-- The Return of the Secaucus Seven
 %
+You've decked the halls with a dozen miles' length of electric lights. 
+Your front lawn is a gleaming testament of incandescent wonder. The neighbors 
+wear sunglasses 24/7,  and orbiting satellites have officially picked up 
+and pinpointed your house as the brightest spot on earth.
+        
+You've finally put together the Christmas wonderland of your dreams... now 
+if only you could get a good picture of it.
+        
+Photographing holiday lights is no easy task. 
+		-- from an email sent by photojojo.com
+%
 You've got to have a gimmick if your band sucks.
 		-- Gary Giddens
 %

Modified: stable/7/games/fortune/datfiles/fortunes-o.real
==============================================================================
--- stable/7/games/fortune/datfiles/fortunes-o.real	Sat Nov  7 22:27:34 2009	(r199026)
+++ stable/7/games/fortune/datfiles/fortunes-o.real	Sat Nov  7 22:40:13 2009	(r199027)
@@ -755,7 +755,7 @@ see Sir Lancelot riding hard to catch up
 	"What is amiss, my friend?" asked the king.
 	"My lord," gasped Lancelot, "you have given me the wrong key!"
 %
-	"Before we get married," said the young woman to her fiancee,
+	"Before we get married," said the young woman to her fiance,
 "I want to confess some affairs that I've had in the past."
 	"But you told me all about those a few weeks ago," her young man
 replied.
@@ -1153,6 +1153,12 @@ and stuck it in my back."
 	"Gabriel's trumpet will produce you from the ass of a pig."
 		-- Al Swearingen, E. B. Farnum, _Deadwood_
 %
+	I'd say that VCS is more like the anal sex of the software
+world: Everybody talks about it, some people do it, some people enjoy
+it, but typically only vague implications about the best techniques
+are ever voiced in public.
+              -- Warner Losh, on Version Control Systems
+%
 	"I'll tell ya, Jeb," Wilbur said to his friend, "the tractor
 business ain't doin' too well.  I ain't sold one all month.
 	"You think you've got problems?" Jeb replied.  "The other day, I went

Modified: stable/7/games/fortune/datfiles/fortunes.sp.ok
==============================================================================
--- stable/7/games/fortune/datfiles/fortunes.sp.ok	Sat Nov  7 22:27:34 2009	(r199026)
+++ stable/7/games/fortune/datfiles/fortunes.sp.ok	Sat Nov  7 22:40:13 2009	(r199027)
@@ -3300,6 +3300,7 @@ postjudice
 Postnews
 Postpetroleum
 potholes
+Potluck
 potty
 Poul
 Pournelle
@@ -3376,7 +3377,6 @@ Purshottam
 PUSHes
 pushy
 pussycats
-Putluck
 Putt's
 PVLC
 PxP

Modified: stable/7/games/fortune/datfiles/gerrold.limerick
==============================================================================
--- stable/7/games/fortune/datfiles/gerrold.limerick	Sat Nov  7 22:27:34 2009	(r199026)
+++ stable/7/games/fortune/datfiles/gerrold.limerick	Sat Nov  7 22:40:13 2009	(r199027)
@@ -39,7 +39,7 @@ rights reserved, used with permission of
 I have written some limericks quite fateful,
 malicious and vicious and hateful;
 	but I've torn up the jokes
-	that will sicken most folks,
+	that would sicken most folks,
 and humanity ought to be grateful.
 
 From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all
@@ -215,7 +215,7 @@ rights reserved, used with permission of
 %
 There was a young lady quite tearful.
 Of sucking a cock, she was fearful.
-	In a moment of dreard,
+	In a moment of dread,
 	she just turned her head.
 And, boy! Did she get an earful!
 
@@ -499,7 +499,7 @@ Rick promised to gently deflower
 a maiden who lived on South Gower,
 	(The truth is, he spread
 	her legs wide on the bed,
-and finsihed her off in an hour.)
+and finished her off in an hour.)
 
 From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all
 rights reserved, used with permission of the author.
@@ -531,15 +531,6 @@ and left her all dried up and squinty.
 From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all
 rights reserved, used with permission of the author.
 %
-I have written some limericks quite fateful,
-malicious and vicious and hateful;
-	but I've torn up the jokes
-	that would sicken most folks,
-and humanity ought ot be grateful;
-
-From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all
-rights reserved, used with permission of the author.
-%
 Here's the tale of Benjamin Sneed:
 Where others were two'd he was three'd
 	and when they unmasked it,
@@ -552,7 +543,7 @@ rights reserved, used with permission of
 A maiden who had a third breast
 always kept her hand close to her chest,
 	and I promised her well
-	that I never woudl tell.
+	that I never would tell.
 (Write me privately. Name on request.)
 
 From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all
@@ -741,7 +732,7 @@ tie me up in some chains that are clinky
 Just get the straps and the slings and a shipment
 	of high-grade Vaseline,
 	and a strong trampoline,
-and allof the other equipment!"
+and all of the other equipment!"
 
 "Now, when we get all the bedsprings a-drummin',
 that's when I'll start in a-hummin',
@@ -769,7 +760,7 @@ rights reserved, used with permission of
 %
 The speed of Ed's seed is unclocked
 whenever a lady's unfrocked.
-	Tho' his spirit is willin,
+	Tho' his spirit is willin',
 	when a pussy needs fillin',
 he's a man who goes off half-cocked.
 
@@ -815,7 +806,7 @@ rights reserved, used with permission of
 A king who was mad at the time,
 decreed limerick writing a crime.
 	but late in the night
-	all the poets woudl write
+	all the poets would write
 verses without any rhyme or meter.
 
 From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all

Modified: stable/7/games/fortune/datfiles/limerick
==============================================================================
--- stable/7/games/fortune/datfiles/limerick	Sat Nov  7 22:27:34 2009	(r199026)
+++ stable/7/games/fortune/datfiles/limerick	Sat Nov  7 22:40:13 2009	(r199027)
@@ -4421,7 +4421,7 @@ And secretly finger his dong.
 There was an old man of St. Bees,
 Who was stung in the arm by a wasp.
 	When asked, "Does it hurt?"
-	He relied, "No, it doesn't.
+	He replied, "No, it doesn't.
 I'm so glad that it wasn't a hornet."
 		-- W.S. Gilbert
 %



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