Commit Graph

965 Commits

Author SHA1 Message Date
dougb
d030746b0b A few more cleanups. 2007-12-09 01:00:11 +00:00
dougb
a9c785f085 The ../tools/do_sort script could not differentiate between
a few very slightly diffrent versions of tcsh prompts, so
restore the 2 that were lost, and consolidate them all in
a way that will prevent them from being lost again.
2007-12-08 00:20:33 +00:00
dougb
6bd01c70a2 Combine the fortunes-o.real and the fortunes2-o file, as was done
with fortunes and fortunes2 2 years and 2 days ago. The fortunes2-o
file was brought in with the original import of the 4.4 Lite games
directory, but has always consisted in large part of fortunes
duplicated from other files.

The combined size of the two files is still only 631K, or less
than 1/3rd of the size of the fortunes file.

Combining them has the added benefit of making the fortunes from
fortunes2-o visibile to fortune(6)'s -m option.

This change should probably not be MFC'ed beyond RELENG_7.
2007-12-07 22:56:10 +00:00
dougb
8248da9b7f 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
dougb
a738f66c05 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
dougb
f58287ad3e Add speller files for fortune files that did not have them,
and update the ones that already existed.
2007-12-07 22:27:04 +00:00
dougb
9dd0e8826f Add some quotes from the television show "Buffy the Vampire Slayer" 2007-12-07 22:22:35 +00:00
dougb
ceaefbbb9b 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
ru
efa644585c Revise the markup. 2007-11-07 12:08:03 +00:00
edwin
6700ec8520 After discussions with grog@ (mentor):
- When none of the directories in FORTUNE_PATH exist, abort instead
  of using the default FORTDIR.
- Little stylify changes.
- Add documentation about the FORTUNE_PATH variable.

MFC after:	1 week
2007-11-07 01:14:28 +00:00
edwin
b67c0e7d8f Another typo in the previous commited fix. That makes four typos
in one fortune of only 32 words. Based on that single ratio, there
are 50453 more typos in the rest of the fortunes file....

Noticed by:	Nate Lawson <nate@root.org>
MFC after:	1 week
2007-11-06 22:40:16 +00:00
edwin
6aff7d5aab games/fortune: add FORTUNE_PATH env var, so ports of fortunes can work sanely
This patch adds an environment variable FORTUNE_PATH, which
	works like PATH for fortune files.

PR:		bin/36867
Submitted by:	Alan Eldridge <ports@geeksrus.net>

[patch] fortune -e implementation bug

	Fix the behaviour of "-e file1 file2" to equally pick them
	instead of only picking the first one.

PR:		bin/70182
Submitted by:	Martin Kulas <coolaz@web.de>

MFC after:	1 week
Approved by:	grog (mentor)
2007-11-06 22:03:24 +00:00
edwin
9f312690bc [patch] Fortune typos, around line 57346 of fortunes datfile
Small typos -- saw in a fortune today that 'equipped' is
	spelled 'equpped'. Also, 'vacuum' is spelled 'vaccuum'.
	Corrected diff provided below.

PR:		misc/112049
Submitted by:	Seth Hieronymus <shieronymus@speakeasy.net>
MFC after:	1 week
2007-11-06 21:55:56 +00:00
dougb
3a538b738e Correct, add or improve attributions for, and add to quotations from
"The Wizard of Oz"

One duplicate was also removed that wasn't the right quote anyway
2007-10-28 07:02:10 +00:00
dougb
533fe0fffb Fix a couple of small typos, and remove a duplicate 2007-10-21 05:16:52 +00:00
dougb
0141a749e7 Change to the original version of the poem titled "The Guy in the Glass,"
and add the proper attribution. Also add an explanation for the Middle
English word used in the first line.
2007-10-21 05:15:02 +00:00
philip
986e6a6dc5 Remove duplicate. Was that a bug? :-) 2007-06-12 09:20:31 +00:00
ceri
845e66c79e Correct typo. 2007-06-06 11:12:56 +00:00
dougb
663d795614 Correct two small typos 2007-05-31 20:16:46 +00:00
kris
c72e32f85b Line wrap previous entry
Submitted by:	des
2007-03-30 04:31:53 +00:00
kris
84d0794e0a Add some more random offensive quotes. 2007-03-29 08:08:34 +00:00
kris
b031f4246d A note from Peter Wemm about how to tell the difference between amd64 and
ia64.
2007-03-29 07:49:59 +00:00
kris
10e3f8f9e0 Dialogue gem from Deadwood 2007-03-29 07:40:49 +00:00
gabor
d101cd655d - Fix typo
PR:		bin/110648
Submitted by:	Seth Hieronymus <shieronymus@speakeasy.net>
Approved by:	keramida (mentor)
MFC after:	3 days
2007-03-26 11:44:46 +00:00
philip
3b33e7a4f8 Add Wise Words from Colin on irregular verbs and code quality. :-)
Submitted by:	cperciva
2007-01-11 15:19:53 +00:00
dougb
e8188b5da1 More minor cleanups:
1. Fix small typo "retorted ." -> "retorted."
2. Remove from fortunes a story that is duplicated in fortunes2-o
3. Remove from fortunes and fortunes2-o Zippy the Pinhead quotes
that are already in the zippy file.
4. ... therefore remove zippy from fortunes.sp.ok
5. Remove a duplicate in the zippy file.
2007-01-06 22:04:46 +00:00
dougb
04d777c063 Add the fortunes from the PR that were not already present.
Delete some duplicates found while double checking the new ones,
and fix a typo.

These haven't been sorted yet, but will be in a future commit.

PR:		ports/40273
Submitted by:	Achim Patzner <ap@proxon.bnc.net>
2006-12-30 21:54:41 +00:00
grog
a88b552dfd Wisdom of Chinggis (Genghis) Khan.
Submitted by: Ganbold <ganbold@micom.mng.net>
2006-12-13 00:33:39 +00:00
maxim
86ce72fe0a o Fix typo: manger -> manager.
PR:		misc/106253
Submitted by:	Niclas Zeising
MFC after:	1 week
2006-12-03 15:25:55 +00:00
maxim
b12b6ca022 o /stand/sysinstall -> /usr/sbin/sysinstall.
PR:		conf/106254
Submitted by:	Simon Olofsson
MFC after:	1 week
2006-12-03 15:22:45 +00:00
keramida
5d8789ffbe Squash a typo.
Submitted by:	Miltiadis Margaronis <mmargaron@gmail.com>
2006-10-30 12:01:57 +00:00
phk
b635902443 It so happens that everything that is stupid is not unconstitutional.
-- Supreme Court Justice Antonio Scalia
2006-10-23 13:25:17 +00:00
phk
6efba551ce Voltaire again. 2006-10-20 18:12:25 +00:00
chinsan
f0c87a1aba Add a tip on "how to strip UTF-8 BOM"
Approved by:	delphij (mentor)
2006-10-09 04:11:34 +00:00
phk
c7ea6e67a1 Add a delightful typographic gem I discovered on page 143 in Edward
Tuftes book "The Visual Display of Quantitative Information"

The constant width font does not quite do the typeset original justice,
but it is is good enough for a fortune.
2006-10-07 08:29:20 +00:00
schweikh
28bd6c8699 Correct typo. 2006-09-27 19:20:43 +00:00
phk
13a720a4b7 Too many good quotes flying by these days. 2006-09-17 21:36:16 +00:00
wilko
28c96423b2 visionary thoughts..
MFC after: 1 week
2006-08-27 14:29:10 +00:00
yar
209e4786e7 Commit the results of the typo hunt by Darren Pilgrim.
This change affects documentation and comments only,
no real code involved.

PR:		misc/101245
Submitted by:	Darren Pilgrim <darren pilgrim bitfreak org>
Tested by:	md5(1)
MFC after:	1 week
2006-08-04 07:56:35 +00:00
phk
6139cbea69 And now without typo. 2006-07-10 16:53:32 +00:00
phk
dceeb25886 Add a good quote that gets used a lot in the debate about global
warming right now:

It is difficult to get a man to understand something when his salary
depends upon his not understanding it.
                -- Upton Sinclir
2006-07-10 16:30:46 +00:00
markm
8edb3edf3a More stale maintainer. 2006-07-09 20:26:36 +00:00
phk
664c65a659 +To create quality software, the ability to say no is usually far
+more important than the ability to say yes.
+               -- Michi Henning
+%
2006-06-20 08:34:36 +00:00
grog
bc433053d0 Burying UNIX--a quote by Rob Pike,
Seen on The UNIX Heritage Society mailing list.
2006-06-12 23:28:52 +00:00
philip
716b0c76f3 Add two little nuggets of wisdom I picked up at work today:
The three most dangerous things in the world are a programmer with a
  soldering iron, a hardware type with a program patch and a user with
  an idea. -- The Wizardry Compiled by Rick Cook

  and

  Debugging is anticipated with distaste, performed with reluctance, and
  bragged about forever. -- Button at the Boston Computer Museum

I wonder why people call me a cynic. ;-)
2006-06-12 21:02:19 +00:00
wilko
f0d8cb5d0d Who am I to correct the native speakers... anyway, s/council/counsel/
Noted by: des
2006-06-12 13:44:17 +00:00
wilko
6ede61a908 Any sufficiently simple directive can be obfuscated beyond reason
given proper legal council.

- Alfred Perlstein
2006-06-12 07:56:33 +00:00
dds
99d1c6dae6 Layers are for cakes, not for software.
-- Bart Smaalders

From Performance Anti-patterns. ACM Queue 4(1):44-50. February 2006.
(Author confirmed via email that the quote is his own).
2006-05-28 06:16:15 +00:00
phk
deb189a7f1 In our system there's no intermediate step between a definitive Supreme
Court decision and violent revolution.
                -- Al Gore (New York Magazine, May 29 2006)
2006-05-25 11:21:40 +00:00
phk
66026e8c8b To save you all the trouble with CVSWEB:
Peter Fellgett's wildcard recipe:
       Into a clean dish, place the dry ingredients and add the
       liquids until the right consistency is obtained. Turn out
       into suitable containers and cook until done.
2006-05-17 11:00:49 +00:00