Commit Graph

15 Commits

Author SHA1 Message Date
Doug Barton
436c93525d 1. Remove a bunch of duplicates. Usually this means removing them from
fortunes, but occasionally remove them from the other 2 files when
   they are not offensive, or not murphy'ish enough.

   Where the version in fortunes had better attribution and/or formatting,
   copy it over.

2. Fix a few typos

3. Use the full name of François De La Rochefoucauld, fix one of his
   quotes, and remove the duplicate of it.
2011-12-27 10:21:57 +00:00
Doug Barton
319a098a8f Sort these files using: sh ../tools/do_sort < $file > $file.sorted
This greatly aids in detecting duplicates, among other things.
2007-12-07 22:41:39 +00:00
Doug Barton
2c7bf96d02 This is a massive cleanup of the fortune files, including removal
of many duplicates, formatting/whitespace fixes, spelling fixes,
and a host of others. Note: No fortunes were intentionally removed
(other than duplicates) as part of this cleanup. In removing dupes
I tried to be generous in not removing similarly worded fortunes
that had even slightly different punch lines.

Duplicates were resolved as follows (in this order):
* + limerick		-> limerick
* + fortunes-o.real	-> fortunes-o.real
* + fortunes2-o		-> fortunes2-o
* + zippy		-> zippy
murphy + fortunes	-> fortunes

In correcting spelling I've tried to leave colloquial variations
(especially British'isms) intact, as well as to not "correct"
errors that are part of the joke.

In fortunes and fortunes2-o I combined a couple of fortunes that
were adjacent to each other that seemed like they should have
originally been combined, and split a couple that seemed like they
should have originally been split.

Miscellaneous:
1. Fixed underlining
2. Capitalized proper names
3. Removed quotation marks from "freestanding" quotes for consistency
4. Added quotation marks to QOTD fortunes that needed them
5. Corrected or added many attributions
6. Removed apostrophes from trailing 's' that are plural, not possessive
7. Updated the path to fortune stuff included in some of the jokes
8. Updated several fortunes to their original version, and added attribution
9. Split up compound words that ispell tripped over
2007-12-07 22:28:08 +00:00
Doug Barton
9f5203687a Add the text of a sign that I've seen on other desks, and
always wanted to put on mine.
2007-12-07 22:21:37 +00:00
Ruslan Ermilov
150ea19c8e Ignore case and all non-word characters, and remove more duplicates. 2005-02-01 16:34:38 +00:00
Ruslan Ermilov
ec28d17dba Removed full duplicates that only differ in amount of whitespace
and line breaks.
2005-02-01 15:15:33 +00:00
Doug Barton
7934cbe0d3 Remove duplicates of the "wherever you go, there you are" fortune,
quote directly from the movie, and give a better attribution (with
correct spelling) for Buckaroo Banzai.
2004-06-01 00:16:32 +00:00
Jens Schweikhardt
d910ed771d Fix all cases of unintended word doublings (the the, and and, ...) and a
few typos.
2003-12-26 21:32:47 +00:00
Eivind Eklund
b594bd6d9a Remove duplicates 2003-03-19 17:55:17 +00:00
Eivind Eklund
6ff4f27715 Fix typos 2003-03-19 17:54:22 +00:00
Eivind Eklund
68fc9ca99a Refactor two sexual jokes to murphy-o 2003-03-19 17:50:59 +00:00
Jens Schweikhardt
9d5abbddbf Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,
especially in troff files.
2003-01-01 18:49:04 +00:00
Poul-Henning Kamp
d03811a2cf Spelling fixes.
PR:		20474
Submitted by:	Christian Weisgerber <naddy@mips.inka.de>
2001-03-28 11:08:32 +00:00
Tim Vanderhoek
de79c0b6c6 A set of diffs to bring the new murphy into line with the
fortune/Notes fortmatting instructions.  Also fix a couple typos.
I did a bit of this, by Cy Schubert did most of it.  Thanks Cy!
2000-05-28 05:06:38 +00:00
Tim Vanderhoek
39758512e0 Quoting submitter:
This is a recent conversion of an old IBM Mainframe application
 to the fortune datafile format.

 The "laws" were extracted from a S/370 Assembler program on a SHARE tape.
 The comments in the program:

 *---------------------------------------------------------------------*
 *        'MURPHY'  THE OLE PHILOSOPHER              18 AUGUST 1988    *
 *                                                                     *
 *        MURPHY WAS FOUND ON A JES2 TAPE OF ALL PLACES WITH ABOUT     *
 *        500 OR SO SAYINGS. GOT ANOTHER 250 FROM AN UNKNOWN SOURCE    *
 *        AND HAVE ADDED ABOUT 100 OR SO MYSELF.                       *
 *                                                                     *
     [list of changes omitted]
 *                                                                     *
 *        JIM MARSHALL, CAPT, USAF                                     *
 *        (301) 688-6829                                               *
 *                                                                     *
 *---------------------------------------------------------------------*

Fortunes that a sufficiently twisted mind could perceive as offensive
have been moved to murphy-o.  Thanks to the submitter for reviewing
these fortunes.

The copyright issues were considered before approval.

PR:		misc/8519
Submitted by:	Cy Schubert (misc/8519)
Approved by:	The Fortune Teller
2000-05-28 04:41:02 +00:00