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.
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.
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
- 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
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
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)
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.
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>
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.
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. ;-)
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.
power outages, spontaneously generated mini (or larger) black holes,
planetary disruptions, or personal injury or worse that may result from the
use of this material.
-- taken from Samuel M. Goldwasser's
Sam's Strobe FAQ Notes on the Troubleshooting
and Repair of Electronic Flash Units and Strobe Lights
The following repo-copies were made (by Mark Murray):
sys/i386/isa/spkr.c -> sys/dev/speaker/spkr.c
sys/i386/include/speaker.h -> sys/dev/speaker/speaker.h
share/man/man4/man4.i386/spkr.4 -> share/man/man4/spkr.4
- typos
- different spelling, punctuation, whitespace
- phonetically similar names
- words rearranged ("was once" vs "once was" etc)
If a limerick appeared as a single one and as part of a
double or triple, the singleton was removed.
With a little help from: sort limerick|uniq -d
This still turns up 20 lines being repeated, but the respective
limericks are sufficiently unique to leave them in (i.e. most differ
in at least two lines).
Nuke spaces in front of colons while I'm here.
to the offensive file.
The other Hitler quotes/references stay in the unoffensive file, as
they offer more historical perspective than this one.
Approved by: core
