PERFORCE change 40235 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=40235

Change 40235 by rwatson at rwatson_paprika on 2003/10/22 19:19:20

	Integrate trustedbsd_sebsd games tree forward to 39070, the last
	major integration of the trustedbsd_mac branch, which brings in
	many of the major changes in the last four months to the main
	FreeBSD tree.  This includes substantial lock pushdown, threading
	bug fixes, compiler upgrades, et al.  Minor quote changes :-).

Affected files ...

.. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/fortunes-o.real#4 integrate
.. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/fortunes2#4 integrate
.. //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/startrek#4 integrate

Differences ...

==== //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/fortunes-o.real#4 (text+ko) ====

@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.16 2003/03/19 18:14:47 eivind Exp $
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.17 2003/09/13 15:46:35 eivind Exp $
 		My Favorite Drugs [Sung to My Favorite Things]
 Reefers and roach clips and papers and rollers
 Cocaine and procaine for twenty year molars
@@ -770,8 +770,8 @@
 	Haggis is a kind of stuff black pudding eaten by the Scots and
 considered by them to be not only a delicacy but fit for human
 consumption.  The minced heart, liver and lungs of a sheep, calf or
-other animal's inner organs are mixed with oatmeal, sealed and boiled
-in maw in the sheep's intestinal stomach-bag and ... Excuse me a minute....
+other animal are mixed with oatmeal, sealed and boiled in maw in the sheep's
+intestinal stomach-bag and ... Excuse me a minute....
 %
 Hardly a pure science, history is closer to animal husbandry than it is
 to mathematics, in that it involves selective breeding.  The principal
@@ -1350,9 +1350,6 @@
 do with the other.
 		-- Jules Feiffer
 %
-Republicans consume three-fourths of the rutabaga produced in this
-country.  The remainder is thrown out.
-%
 Republicans raise dahlias, Dalmatians and eyebrows.
 Democrats raise Airedales, kids and taxes.
 
@@ -1663,7 +1660,7 @@
 		   the Catholic Church, and the National Rifle
 		   Association
 %
-Sure eating yogurt will improve your sex life.  People know that if
+Sure eating yoghurt will improve your sex life.  People know that if
 you'll eat that stuff, you'll eat anything.
 %
 Sure, Reagan has promised to take senility tests.  But what if he

==== //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/fortunes2#4 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.57 2003/03/10 19:58:37 fanf Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.58 2003/08/31 23:05:39 dougb Exp $
 %
 =======================================================================
 ||								     ||
@@ -52105,7 +52105,7 @@
 	"But what kind of chauffeur was it?"  Having been told by his aides
 	not that he had been shot but that he had been struck by a taxi, the
 	President spent the last conscious moments of his life wondering how
-	how an automobile got into the charity book sale at the Maison
+	an automobile got into the charity book sale at the Maison
 	Rothschild, where his assassination occurred.
 %
 When properly administered, vacations do not diminish productivity: for
@@ -52113,7 +52113,7 @@
 is away and you get twice as much done.
 		-- Daniel B. Luten
 %
-When smashing monuments, save the pedstals -- they always come in handy.
+When smashing monuments, save the pedestals -- they always come in handy.
 		-- Stanislaw J. Lem, "Unkempt Thoughts"
 %
 When some people decide it's time for everyone to make

==== //depot/projects/trustedbsd/sebsd/games/fortune/datfiles/startrek#4 (text+ko) ====

@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.4 2003/07/13 03:49:43 kris Exp $
+%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.5 2003/08/25 20:08:16 ceri Exp $
 A father doesn't destroy his children.
 		-- Lt. Carolyn Palamas, "Who Mourns for Adonais?",
 		   stardate 3468.1.
@@ -490,7 +490,7 @@
 deeply -- life in every form from fetus to developed being.
 		-- Hodin of Gideon, "The Mark of Gideon", stardate 5423.4
 %
-... The prejudices people feel about each other disappear when then get
+... The prejudices people feel about each other disappear when they get
 to know each other.
 		-- Kirk, "Elaan of Troyius", stardate 4372.5
 %
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message