Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Merge r268637 from head:

fortune(8): Search fortune files installed by ports/packages as well as
those supplied by the base system.

PR: 191800
Submitted by: Andy Kosela

Merge r268295 from head:
Fix equation and limerick to be correct. NetBSD fixed this 14 years ago
(src/games/fortune/datfiles/fortunes2 1.7).

PR: 188714
Submitted by: ksmakoto dd.iij4u.or.jp

MFC r259057:
Remove "Warning: file \"%s\" unreadable". It was introduced with revision
44599 and turned less than useful ever since fortunes-o.dat got removed.

MFC r259056:
Fix r203922 for "fortune -o".

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Refresh the tips for the new pkg system.

Reviewed by: bapt
Approved by: re (hrs)

Remove a reference to instant-server which has been removed from the
ports tree in r313427.

PR: 177012
Submitted by: Kevin Zheng <kevinz5000@gmail.com>
Approved by: bcr (mentor)

Remove fortunes-o from the base system. Debating what does or does not
belong in this file is not a useful exercise or conducive to producing a
high quality advanced operating system.

While here, simplify the make rules to autocompute BLDS and FILES from a
single DB variable.

Approved by: core
MFC after: 1 week

Remove political propaganda

Use Bernard Baruch's full name.

The words "old than" seem to be quoted as "older than" by some sources,
so use the more likely and grammatically correct text.

PR: docs/173868
Submitted by: Chris Petrik <c.petrik.sosa@gmail.com>
Approved by: cperciva
MFC after: 1 week

fix a couple of spelling errors...

In games/fortune/fortune/fortune.c, make 'Debug' the correct type (it is
*not* a boolean).

MFC after: 3 days

Make OK_TO_WRITE_TO_DISK an envrionment variable instead
of a compile time option.

While here, don't differ based on the existence of LOCK_EX
which doesn't seem to have ever made a difference on FreeBSD.

Approved by: cperciva (from discussion)
MFC after: 3 days

Prefer the use of stdbool to custom defines.

Approved by: cperciva (from discussion)
MFC after: 3 days

Remove extra word:

Submitted by: many
Approved by: cperciva (implicit)
MFC after: 3 days

Sysinstall has been removed from base.

Approved by: cperciva

Make do_uniq work with python3

Approved by: cperciva
MFC after: 3 days

Correct the tip about finding all the directories on the system
Add a tip about clearing the screen.
Make things more consistent by removing quotes around 'make search'

Approved by: cperciva
MFC after: 3 days

Add a couple of nice quotes from Edward Everett Hale

Partial revert of previous commit as some of the changes were not
newbie-friendly.

Requested by: jhb, gcooper
Approved by: cperciva (implicit)
MFC after: 3 days
X-MFC-With: r235209

Add a few new tips and update some old ones to more modern commands

MFC after: 1 week

Replace index() and rindex() calls with strchr() and strrchr().

The index() and rindex() functions were marked LEGACY in the 2001
revision of POSIX and were subsequently removed from the 2008 revision.
The strchr() and strrchr() functions are part of the C standard.

This makes the source code a lot more consistent, as most of these C
files also call into other str*() routines. In fact, about a dozen
already perform strchr() calls.

1. Correct capitalization of the nobility particle for
Francois de La Rochefoucauld introduced in r228909 [1],[2]

2. Change c-cedilla introduced in the same commit to ASCII c since
non-UTF-8 terminals will choke on the non-ASCII text. [2],[3]

Pointed out by: bf [1]
Reviewed by: French-speakers on #bsdcode [2]
Requested by: uqs [3]

Prefer ASCII apostrophes over Unicode ones like the rest of the file.

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.

Add static keywords to variables and functions where possible in games/.

This allows us to detect unused functions and variables and allows the
compiler to do a better job at optimisation.

Fix the text and attribution of the poem "Youth" by Samuel Ullman.

Our copy was a bastardization of the "older" (probably original?) and
shorter version of the poem; and the "newer" version that is better
known, and arguably more popular. Standardize on the latter.

Cf. http://www.bartleby.com/73/2099.html

Minor typo, fix 2 attributions

Convert a file to UTF-8. This only changes a character in the
copyright section and will not require UTF-8 for fortune(6).

fortune(6): fix typos and misspellings.

While here, drop words in the spelling files that are no longer used
anywhere.

Speling errors found via: codespell from Lucas De Marchi

Move potentially offensive fortune to fortunes-o.

PR: bin/137702
MFC after: 3 days

Add advice to new fathers from Thomas Ptacek.

Suggested by: wilko
Approved by: Thomas Ptacek
Security: New parents often feel very insecure.

fix the move so that it matches what the rest of the internet
says about this game... This move also makes more sense...

MFC after: 1 week

"whereis netscape" gives empty output for quite a long time already.
Suggest to use "whereis firefox" instead.

Fix indention of attribution line for some recent additions.

MFC after: 3 days

Correct a Cecil Beaton quote

PR: docs/148916
Submitted by: Rob Farmer <rfarmer@predatorlabs.net>

Taken from actual police videos ...

Sync fortunes with other *BSDs

- Spelling errors
- Typographical fixes
- Consistent attributions
- Use Jr. more consistently
- Capitalization of dictionary-like entries
- Sorting using tools/do_sort
- Remove duplicate fortunes
- Style according to the Notes file
- Reflect correct default fortune name in Notes
- Remove some no longer needed spelling hints
- Drop latin1 characters (sorry Mårten)

This is a partial sync against the DragonflyBSD sources, where a lot of
fixes from Free, Net and OpenBSD were merged previously. Only about 50%
of the changes originate from there, the rest was done by dougb and
yours truly.

Partial review by: wilko (earlier version), ed (dito)
In collaboration with: dougb
Approved by: ed (co-mentor)

s/all ready/already/

Submitted by: ru@, gj@

On the (non)sense of legal disclaimers in emails.

Prefer exit(0) from main over return(0).

Although not explicitly mentioned in style(9), it allows for easier
grepping of exit points. This reverts part of r203926.

Requested by: des
Approved by: philip (mentor)

fortune(6) switch to 3-clause BSDL; style(9)

This reduces the diff to other *BSD and makes it possible to actually
see the code differences.

Approved by: ed (Co-mentor)

games: make WARNS=6 the default, remove overrides

This also bumps factor, fortune, primes, and random to WARNS=6.

Approved by: ed (Co-mentor)

fortune(6) make WARNS=6 clean

Fixes taken mostly from DragonflyBSD.

Approved by: ed (Co-mentor)

Add the definition of Mistakeholder

Our standard "xterm" termcap entry supports colour, so this tip is redundant.
As it happens, "xterm-color" has just been an alias for "xterm" since
src/share/termcap/termcap.src 1.131 in September 2002.

PR: docs/132959
Approved by: ed (mentor)

For the now-infamous Rumsfeld quote:

Change "there're" to "there are" which is consistent with the vast
majority of on line references.

Remove a spurious trailing "

Update the citation text with a suggestion from des.

- Move potentially offensive quotes I committed recently to fortunes-o.
- Reference date.
- Be more clear on context.

Suggested by: dougb

Remove more duplicates

Minor reformatting on a few

- Add two particulary interesting quotes from the past decade.

Use ANSI C function declarations.

Properly sort a math fortune after the changes in r193486

Properly sort fortunes added in r174879 and r174959

Move Warner's very funny comparison of VCS to anal sex into fortunes-o

Remove the svn:executable property from this file

Fix not only the grammar, but also the formatting that makes the gag

"Potluck Pogo" was a collection of Walt Kelly's "Pogo" cartoons
first published in 1955. "Putluck Pogo" seems to be a typo.

Fix several instances of spaces before commas, and one of a space
before a ).

PR: docs/136723
Submitted by: Ulrich Sporlein <uqs@spoerlein.net>
Approved by: re (kib)

Misc fixed to fortunes

PR: conf/112024
Submitted by: Niclas Zeising <niclas.zeising@gmail.com>
MFC after: 2 days

[patch] fortune(6): George Bernard Shaw quote fix

From the original PR:

s/milestones/millstones/
and less important..
s/man/Man/
Not every source I've seen capitalizes 'Man', but it seems
right. Uncapitalized 'man' would usually be preceded by
an 'a'. But I haven't seen any reference cite the orignal
source yet, so I can't say for sure.

http://quotationsbook.com/quote/31568/

PR: conf/131469
Submitted by: John Hein <jhein@timing.com>
MFC after: 2 days

[patch] fortune(6): file not Y2.01K compliant

Update the time in the fortune to make the joke a little bit more
realistic again: Bump year from 2009 to 2039.

PR: conf/129860
Submitted by: Alan Amesbury <amesbury@umn.edu>
MFC after: 2 days

Too good to pass.

netcat is "now" in base, so point people at nc(1) instead of the port.

MFC after: 1 week

Another good day for historical quotes, Oliver Wendell Holmes brought to
you by Thomas L. Friedman.

(http://www.nytimes.com/2008/10/08/opinion/08friedman.html?ref=opinion)

A Wittgenstein quote according to David Ignatius
http://voices.washingtonpost.com/postpartisan/2008/10/the_town_hall_debate_in_praise.html

Use __FreeBSD_version check since it is bootstrap tool

Add reference to arc4random_uniform(3)

Use arc4random_uniform(3)

Use arc4random_uniform(3)

Obtained from: OpenBSD

Add a quote too good to miss from:

http://www.schneier.com/blog/archives/2008/08/schneier_misquo.html

(and reorder one I appearantly didn't get in the right place last time.)

o Alan Shepard was first American in the space; fix attribution.
o Correct Alan's surname.

PR: bin/125812
Submitted by: Derek Taylor [1], gavin [2]
MFC after: 1 week

Unmangle an E.W.Dijkstra quote.

Apply learning from RAIEC (Redundant Array of Independeng English Courses)
kindly provided by four different correspondents since my last commit.

Two quotes too good to miss.

Months in English are capitalized (even when abbreviated).

+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)

Remove a quote about the instant-workstation, this port
has been removed ages ago.

PR: docs/124166
Submitted by: keramida
Prodded by: novel,keramida

This bloke has his priorities straight:

+"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)

Found at: http://www.news.com/8301-10784_3-9925607-7.html?tag=nefd.top

Add a missing quote symbol.

Just met Kurt Vonnegut's quote remarkably relevant
to open software development (as well as to the other
kinds of human activity.)

Put back the quote from Chinggis Khan removed in rev. 1.259.
The quote predated rev. 1.232, which rev. 1.259 was to correct;
therefore it was protected by the "Don't remove fortunes" rule.

Noticed by: ceri
Pointy hat to: yar

Improve some quotes of Chinggis Khan.
Remove militant and moralized quotes of Chinggis Khan.
Add one more quote of Chinggis Khan.

Reviewed by: yar
Approved by: keramida(mentor)

Fix typo.

Add another very relevant quote from "The Elements of Programming Style"
by Kernighan and Plauger.

It was Plauger, not Ritchie, who co-authored both editions
of "The Elements of Programming Style". Also spell the name
of the book properly.

getopt(3) returns -1, not EOF.

A real gem from freebsd-current@

Typo; s/relied/replied

Fix a few small typos, and remove one duplicate.

I'm intentionally not sorting this file since it won't be added to.
(Although, if it were sorted the duplicate would have been easier to see.)

:)

Aussie New Years wish

Typos corrected.

On Christmas lights.

Warner lets a good one out..

Typo

Add my all-time favorite quote, from one of my all-time favorite people.

A few more cleanups.

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.

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.

Sort these files using: sh ../tools/do_sort < $file > $file.sorted

This greatly aids in detecting duplicates, among other things.

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

Add speller files for fortune files that did not have them,
and update the ones that already existed.

Add some quotes from the television show "Buffy the Vampire Slayer"

Add the text of a sign that I've seen on other desks, and
always wanted to put on mine.

Revise the markup.

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

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

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)

[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

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

Fix a couple of small typos, and remove a duplicate

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.

Remove duplicate. Was that a bug? :-)

Correct typo.

Correct two small typos

Line wrap previous entry

Submitted by: des

Add some more random offensive quotes.

A note from Peter Wemm about how to tell the difference between amd64 and
ia64.

Dialogue gem from Deadwood

- Fix typo

PR: bin/110648
Submitted by: Seth Hieronymus <shieronymus@speakeasy.net>
Approved by: keramida (mentor)
MFC after: 3 days

Add Wise Words from Colin on irregular verbs and code quality. :-)

Submitted by: cperciva

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.

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>

Wisdom of Chinggis (Genghis) Khan.

Submitted by: Ganbold <ganbold@micom.mng.net>

o Fix typo: manger -> manager.

PR: misc/106253
Submitted by: Niclas Zeising
MFC after: 1 week

o /stand/sysinstall -> /usr/sbin/sysinstall.

PR: conf/106254
Submitted by: Simon Olofsson
MFC after: 1 week

Squash a typo.

Submitted by: Miltiadis Margaronis <mmargaron@gmail.com>

It so happens that everything that is stupid is not unconstitutional.
-- Supreme Court Justice Antonio Scalia

Voltaire again.

Add a tip on "how to strip UTF-8 BOM"

Approved by: delphij (mentor)

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.

Correct typo.

Too many good quotes flying by these days.

visionary thoughts..

MFC after: 1 week

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

And now without typo.

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

More stale maintainer.

+To create quality software, the ability to say no is usually far
+more important than the ability to say yes.
+ -- Michi Henning
+%

Burying UNIX--a quote by Rob Pike,

Seen on The UNIX Heritage Society mailing list.

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. ;-)

Who am I to correct the native speakers... anyway, s/council/counsel/

Noted by: des

Any sufficiently simple directive can be obfuscated beyond reason
given proper legal council.

- Alfred Perlstein

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).

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)

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.

Go figure this error...

Submitted by: Thomas Beha

Add attribution: the quote comes from Perlis's Paradigms of AI Programming
p. 348. See http://www.norvig.com/Lisp-retro.html

Remove a corrupted fortune ending in line noise. Even googling did not
turn up a non-corrupted version, else I would have restored it.
(No, it's not the one that uses line noise intentionally.)

o s/you health/your health/.

PR: conf/95810
Submitted by: Gavin Atkinson

Her name was Anne Frank, not Ann Frank.

MFC after: 1 month

Wisdom about the Open Source ecosystem.

Submitted by: Mårten Mickos

Clarify time frame of jkh quote.

Add wisdom from jkh.

Never do programs contain so few bugs as when no debugging tools
are available.
-- Niklaus Wirth

Pointed by: Panagiotis Louridas

Add some wisdom from Garrett Wollman concerning error codes returned by
system calls.

Remove some duplicated entries

PR: conf/81924
Submitted by: Gavin Atkinson <gavin.atkinson@ury.york.ac.uk>
Approved by: philip (mentor)
MFC after: 3 days

Correct some typos.

We will not be responsible for damage to equipment, your ego, county wide
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

"A life lived in fear is a life half lived"

Add missing John Gilmore quote.

Canonify, correct, and add citations related to Douglas Adams' work.
Correct a quotation from Hitchhiker's.

Add another 'best quote about XML evar!' courtesy Pav Lucistnik (pav@)

correct typo

add witty remark about serious thought.

MFC after: 2 days

Fix typo

Bruce Schneier is underrepresented in the fortune file.

Add a valuable piece of Usenet advice about storing passwords. :-)

Obtained from: jpd on comp.unix.bsd.freebsd.misc

Nuke duplicates found via fuzzy logic:
- 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.

Whitespaces cleanup.

PR: conf/81926
Submitted by: Gavin Atkinson <gavin.atkinson at ury dot york dot ac dot uk>

Remove a fortune that is duplicated verbatim in fortunes2-o

Remove a duplicate and fix a typo.

Notable quote by Theodore Roosevelt.

MFC after: 3 days

Punctuation corrections.

About life

Add relationship between offence and beer.

Submitted by: philip

-- storage engineer on the virtues of FC-AL

Move the "yiddish cooking has killed more jews than Hitler" quote back
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

wisdom about 'beachhead'

Add the best quote evar! about XML.

Be a nice community member and honor the request for backout after
stirring the hornet's nest. This issue will be resolved by core.

Move the Hitler quotes and some references to him to the "offensive" file.
I did not bother to sort them all. If you have a script, feel free.

While I find the Hitler quotes extremely questionable, I'm enough
of a pedant to properly spell the monster's first name.

Fix locations of some links.
Word smithing.

PR: conf/81923
Submitted by: Gavin Atkinson <gavin dot atkinson at ury.york.ac.uk>

My change, namely srandomdev() addition, was backed out even without
discussing with me, and I obviously disagree seeing that afterwards
(srandomdev() back out not fix any thing, it can only mask the problem).

So, back out the back out and return srandomdev().

People who have problems with repeated quotes should use -D fortune
option for debugging to see is the problem in (1) /dev/random initialization
or in (2) fortune code itself.

I will be glad to help, but I can't reproduce repeated quote situation
on my machine.

In either case found, (1) or (2) should be fixed instead of removing
srandomdev().

Use a random number to seed the random number generator. Goodby, Rush
Limbaugh.

This should have already worked properly if random(4) has been
initialized correctly, but it seems that this is frequently not the
case. Instead, use the microsecond part of the current time as the
seed.

Snoopy in quality of life.

When operating the diopter adjustment knob with your eye to the view-
finder, be careful not to put your fingers or fingernails in your eye.
-- found in the users manual of the Nikon D2x camera,
a camera for professional photographers
%

Hand it to spaff, he knows how to say it:

Using encryption on the Internet is the equivalent of arranging
an armoured car to deliver credit card information from someone
living in a cardboard box to someone living on a park bench.
-- Gene Spafford, Purdue University.

Remove duplicate and attribute Weinbergs second law to the right weinberg.

Nuke a corrupted duplicate.
Some white space and punctuation fixes.

s/which/witch

Data is not information;
Information is not knowledge;
Knowledge is not wisdom
-- Gary Flake

s/self-distruction/self-destruction

He who receives ideas from me, receives instruction himself without
lessening mine; as he who lights his taper at mine receives light
without darkening me.
-- Thomas Jefferson on patents on ideas.

Typo.

PR: conf/77178
Submitted by: Andras Jako <jako.andras@eik.bme.hu>
MFC after: 1 week

These words, while not spoken about anything even slightly related, are very,
very applicable when waiting for world to compile *grin*

Impatience award to: philip

Remove dublicate entries and correct apostrophe abuse.

Submitted by: Christoph Mallon <christoph.mallon@gmx.de>

Add a story about confusing information theory with thermodynamics.

Another good Dijkstra quote.

Add missing quote.

Wisdom from 1972.

Give a better advice on how to convert DOS text to UNIX text.
The former tip used `col -bx', which would not only discard
CR's, but also expand TAB's and remove BS'en. This effect is
not always wanted.

MFC after: 1 week

Add a neat remark on the popular belief that the universe is a safe
the man ought to break open and rob.

Fixed warnings and bump WARNS to 6.

Bump WARNS to 6.

Make the on-disk format of .dat files produced by strfile(8)
architecture independent. Besides the fixed-width types in
the header, the offsets are now stored as 64-bit off_t (also
in big endian format).

Tested on: i386, amd64, sparc64, ia64

Expand contractions.

Expand *n't contractions.

Sync program's usage() with manpage's SYNOPSIS.

Keep only one style of Pittsburgh driver's tests.

Noticed by: Pawel Worach

An aggressive little script I used to trim out duplicate fortunes.

Trim more cookies, by playing with different hash functions,
e.g., by trimming all non-alphabet characters and whitespace,
converting to lowercase, and considering only first (or last)
N letters (maybe only consonants). The fortune editor then
displays all fortunes that have the same hash, and allows to
remove one of them. The rest is written to stdout.

s/worman/woman/

Ignore consonants, and remove more duplicates.

Removed more duplicates (forgot to ignore underscore).

Keep the fortune above this.

Reviewed by: sheldonh

Remove more duplicates.

Ignore vowels, and remove more duplicates, mostly due to typos.

Trim some obnoxious warlording.

Removed more duplicates, by ignoring "i", "you", "we",
"an", "is", "are", "will", "'ll", "is", "'s" to find
them. More to follow...

Merged fortunes with fortunes2.
Sort fortunes (except for the first entry).

Fix bugs.

Due to one of the bugs (^C was the first character of each line
when sorting), the -b option of sort(1) didn't take any effect,
so stay bug-compatible, and remove the -b option.

Removed 1695 fortunes also found in fortunes2.

Ignore case and all non-word characters, and remove more duplicates.

- Add few lines from my personal signature file

Suggested by: Florent Thoumie
Approved by: mux

Remove another duplicate fortune.

Removed full duplicates that only differ in amount of whitespace
and line breaks.

Remove a duplicate.

s/principals/principles/

Fortune was duplicated, remove one copy.

Add comment on current state of hardware documentation.

Submitted by: philip

Remove committer-specific entry.

Sort sections.

Minor bit of advice.

1. s/women/woman/ when the singular is intended
2. Remove some duplicates
3. Slightly improve a punch line, "and then cut off her head"
instead of "and cut her head off."

Correct two typos in almost identical fortunes.

There is a better way to find out whether a port is installed or not.

Correct two typos; remove a duplicate.

"3 hands"

Start the dreaded NOFOO -> NO_FOO conversion.

OK'ed by: core

From Richard W. Hamming ``You and Your Research''
Transcription of the Bell Communications Research Colloquium Seminar
7 March 1986 by J. F. Kaiser:

There are wavelengths that people cannot see, there are
sounds that people cannot hear, and maybe computers have thoughts
that people cannot think.

The Ken Thompson school of thought on expert systems:
there's table lookup, fraud, and grand fraud.
-- Andrew Hume

USENIX'04 Technical Conference, reported by Adam S. Moskowitz
;Login: 29(5):49, October 2004.

s/Here about/Hear about/ and sort accordingly.

Never be afraid to try something new. Remember, amateurs built the ark.
Professionals built the Titanic.

For variables that are only checked with defined(), don't provide
any fake value.

Improve accuracy of last addition, as best Google advices me.

I'm surprised this one was not here yet.

To save you all a trip to CVSWEB:

Experts have correctly predicted nine out of the last five recessions.
-- Paul Samuelson, Nobel laureate in economics.

The state that separates its scholars from its warriors will have its
thinking done by cowards, and its fighting by fools. - Thucydides

Fix make search entries.

PR: docs/70899
Submitted by: Marc Silver <marcs@draenor.org>

s/the on/on the/

PR: misc/70842
Submitted by: Sean C. Farley <sean-freebsd@farley.org>

Immortalize the words of a -current reader.

Add a useful snippet on limitations of inductive reasoning by Bertrand
Russell.

Correct grammo.

The name of the landlord in Shaw's _The Man of Destiny_ is Giuseppe (not
Guiseppe) Gandi.

Submitted by: Massimiliano Stucchi <stucchi@willystudios.com>
MFC after: 3 days

Make this WARNS=3 clean.

PR: bin/38931
Submitted by: Giorgos Keramidas <keramida@freebsd.org>

Fix typos.

PR: misc/67586
Submitted by: Paul A. Hoadley <paulh@logicsquad.net>

Fix whitespace and punctuation.

PR: misc/49967
Submitted by: Sean C. Farley <sean-freebsd@farley.org>

Remove duplicate fortunes and fix some typos.

PR: misc/45839
Submitted by: Philipp Mergenthaler
<philipp.mergenthaler@stud.uni-karlsruhe.de>

Mechanically kill hard sentence breaks.

mdoc(7): Correct the type of the display.

Add a Nicollism.

Discontinue use of old libcompat regexp routines.

Correct assorted typos and grammos.

Consistently credit President Truman as Harry S. Truman.

Update the "All I really need to know I learned in kindergarten" entry
by using the text from the Villard Books edition (1989, pages 6 through
8) and formatting to fit in 72 columns.

* Reformat several attributions according to ../Notes (mostly whitespace)
* Spell out some names that were pointlessly abbreviated
* Remove a couple of incidental duplicates
* Harry Truman had no actual middle name. The initial "S" was added to his
name to make him appear more statesmanlike. Therefore it's not usually punctuated.
* Format a couple of actual fortunes to fit into 72 columns

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.

Definition of recursion.

Added forgotten quotes for citations.

I *knew* it would be a bad idea to touch the fortunes. *sigh*

Submitted by: Kevin Oberman <oberman@es.net>
Pointy hat to: me, again

Pedantry.

Submitted by: njl@

On the signs of network congestion.

Submitted by: Simon Tatham <anakin@pobox.com>

Re-sort

Moore's law vs. Nethack

Submitted by: Simon Tatham <anakin@pobox.com>

Fix grammar to make it correctly wrong.

Add a new fortune from petef.

Obtained from: petef

Add jerk city commentary on C++.

Add a Dijkstra comment on programming languages.

Don peril-sensitive sunglasses and correct the spelling of ukulele.

"Ukulele" is the canonical term, with "ukelele" being a derivation.
Also there is some evidence that the original appearance of the quote
had the spelling "ukulele", although anyone who has a copy of Esquire
from March 1967 is welcome to prove me wrong.

PR: bin/65626
Submitted by: Gavin Atkinson <gavin@ury.york.ac.uk>

Add an observation by Dijkstra software engineering.

Fix misspellings in the freebsd-tips fortunes. The same PR has
a patch to mention portupgrade in freebsd-tips as well; I'm not
sure if that belongs here, so I'll leave it for someone else.

PR: misc/37073
Submitted by: Sean Chittenden <sean@chittenden.org>
Approved by: rwatson (mentor)

Too good to miss.

Wisdumb by: Danno Coppock <danno@ipinc.com>

"The Aged Aged Man" was not a word doubling.

Spotted by: grog

typo, duh!

This is simply too true to not become a fortune.

Wisdom by: wes

Add a tip on how to print a manual page.

PR: docs/61033
Submitted by: mi@

Stop "fortune -l" from looping forever.

PR: bin/58730
Submitted by: pak <pak@cns.utoronto.ca>

Fix all cases of unintended word doublings (the the, and and, ...) and a
few typos.

Use WARNS level 2 instead of setting CFLAGS explicitly to -Wall.

A too good Feynman quote to pass up.

Add a card carryring member of the Pointless Comparison Collection.

reformat HP eng. mgr quote

Requested by: nate

Fix a typo: 'in cloud' -> 'in a cloud'.

PR: 58909
Submitted by: Chris Pepper <pepper@rockefeller.edu>
MFC after: 1 week

Addition.

A comment about spam and cockroaches.

Suggested by: dwmalone

Fix typo.

Correct a typo (s/And/An/)

Removed "Gerat" which is a typo of "Great".
Added FreeBSD ID.

Retrocomputing alternate history....

Polish last fortune.

Suggested by: nate

'Upon the release of the second version'

Suggested that this is fortune material: rene@tunix.nl
MFC after: 2 weeks

Fix spelling/grammar errors and remove a duplicate

* Fix a duplicate "how how"
* Fix pedstals -> pedestals

Correct a grammatical error.

PR: misc/54967
Submitted by: Paul A. Scott <pscott@the-frontier.org>
MFC After: 4 weeks

LANG->LC_ALL

Pointed by: ru

Use LANG=C before tr to be shure that ranges are correct

Rename collate_range_cmp() to stable_collate_range_cmp() to indicate
that it is not the common variant.
Remove doubtful microoptimization there.

Fix a tip about how to create an empty file[1].
Remove tip about retired kget(8).
Fix a typo.

PR: conf/54334
Submitted by: Mark Huizer <xaa+sendpr@timewasters.nl>
MFC after: 3 days

Remove a duplicate entry.

Eliminate a duplicate.

Add a quote of wpaul@ explaining the importance of including requested
content when replying to an e-mail.

Correct some typos.

Submitted by: pscott@the-frontier.org
PR: misc/51909
MFC After: The average lifetime of a Star Trek redshirt

Remove near-duplicate entry, keeping the better attributed one.

In the build process, fortune files have been randomized since at
least the 4.4-lite days. This is pointless, since fortune(6) performs
its own randomization. It was also problematic for binary update
systems such as ports/security/freebsd-update. This commit simply
removes the -r option to strfile so that the datfiles are constant.

Submitted by: Colin Percival <cperciva@sfu.ca>

Preserve an involunteerily joke SunCheckup has been providing.
(NB: the space before the colon in the second line is authentic, please
don't remove.)

Fixup three rather minor typos that have irked me over time.

Make the __FBSDID usage consistent
and protect copyright[] from Gcc 3.3's whining.

Add a new chance at getting offended, having removed so many.

Remove duplicates

Fix two more typos

Fix typos

Fix typo

Remove duplicates

Fix typos

Refactor two sexual jokes to murphy-o

Improved version of Unix sex.

Submitted by: Chris Wasser <cwasser@shaw.ca>

Add long-term view of astronomy.

Submitted by: newton

The attribution appears to be correct according to
http://emporium.turnpike.net/C/cs/sagan.htm. Others have apparently
attributed it to Carl Sagan.

At the risk of serious physical abuse from markm, add another regex joke,
but s/regex/regular expression/g for terminological consistency.

We were low on regex jokes. Now we are *really* low on them.

Fix style of recent additions and sort.

Add a great quote from Linus Torvalds about BDE.

EMACS joke (no, not EMACS itself).

Fix a grammar bogon.

Submitted by: Seth Hieronymus <sethh@principia.edu>
X-MFC after: 4.8 is out the door.

Add a quote from Bob Schieffer's recent book about freedom of the press.

"Happiness" is a noun.

PR: misc/47345
Submitted by: Ben Rosengart <ben@narcissus.net>

Add Greenspun's Tenth Rule of Programming.

Correct typos.

Submitted by: Seth Hieronymus <sethh@principia.edu>
X-MFC after: 4.8 is out the door

Remove the suggestion to try `hangman', because it does not exist
in the base system anymore.

Add Warner Losh quote.
Submitted by: Alexandr Kovalenko <never@nevermind.kiev.ua>

Immortalize a Robert Watson quote.

Add an explanation of why indirection is good. Remove an indirection
filk that also appears in fortunes2.

s/Kank/Kang/ (the klingon)

PR: misc/45012
Submitted by: Steve Coltrin <spcoltri@omcl.org>

Correct typos, mostly s/ a / an / where appropriate. Some whitespace cleanup,
especially in troff files.

Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/
Add FreeBSD Id tag where missing.

Fix a typo. Add FreeBSD ID in a %% comment.

MFC after: 3 days

set watch in tcsh requires an equal sign after the variable name.

MFC after: 1 day

Add gerrold.limerick to the building process.

Finished at last.

Filling this file at last (now check when I first committed it and see how
long certain people take to return books...).

Still more to go.

The future's bright: the future's Ballard...

Add a fortune for people who have read their classics.

Minor grammatical correction

Fix the path to the make.conf example file.

PR: docs/44278
Submitted by: Chris Pepper <pepper@rockefeller.edu>

So a positive time zone offset is west, right? or is it east? Um.
What is the standard for this, anyway? Ah, we get to choose. I see.

This commit is brought to you by the numbers 2001 and 2822 and the
letters P, O, S, I, X and R, F, C.

Correct the description of what fortunes get installed (by default, also the
offensive ones). Make it clear that datfiles/Makefile needs to be edited in
case someone wants it otherwise.

PR: misc/36153
Submitted by: Nick Jennings <nick@namodn.com>
X-MFC after: 4.7 is out the door.

s/seems to thing/seems to think

X-MFC after: 4.7 is out the door

Fix spelling of Bismarck's name and remove duplicate
Bertrand Russell quotations.

Add a tip about using sed(1)'s FreeBSD-specific -i option.

MFC after: 42 days

Spell Ken Olsen's name the same way everywhere.

PR: 7434

Remove some Dijkstra quotes from fortunes that are duplicated in fortunes2.
Move the single remaining one across to fortunes2 to join its friends.
Spell his name consistently. Remove a couple of other duplicate fortunes.

Re-sort.

Remove spurious quotes.

Correctly sort previous addition.

Some more advice from Dijkstra.

Fix a couple of typos in a Dijkstra quote.

Fix a typo.

PR: 40539
Submitted by: Munish Chopra <mchopra@engmail.uwaterloo.ca>

Fix a typo.

PR: 40523
Submitted by: Andrew Stevenson <andrew@ugh.net.au>

Fix whitespace botch in previous commit.

Add C code that counts the bits in a 32 bit word, right next to the C code
that reverses the bits in a 32 bit word. Who thinks up this stuff?

Paraphrase a quote to remove year specific references.

PR: 40291
Submitted by: Pierre-Paul Lavoie <ppl@nbnet.nb.ca>

Add used include of <stdlib.h>, copying style bugs from adjacent lines.

Correctly attribute a Douglas Adams quote, and remove a duplicate of
the same quote.

s/-300K/~300K/

This is an absolute (kelvin) temperature. I expect that in the original
source it was typeset as $\sim 300~{\rm K}$ or similar, meaning
"approximately 300 K". Changing it to a minus sign in the fortunes file
was clearly an error, as absolute temperatures are by definition positive.

More ispell fun

Fix a few more of my typos, a few others I noticed, and some ispell help.

Correct typo (is -> us).

Add something absurd I used one night as an example of CS overcomplication
of things most hackers take for granted.

Add one more here.

Submitted by: Glen "Going to be a Daddy" Neff

Remove a Kurt Vonnegut quote that appears in fortunes.

Spell out the name of Hunter S. Thompson.

Sort one, remove some dupes.

Add something I found amusing when overheard, and a paraphrasal of it.

Move the Rush Limbaugh fortunes to the offensive file, right after the
Anti-Reagan section. :) Apparently, people find opinions contrary to
their own to be offensive.

Sort according to ../tools/do_sort

* Add a quote about the differences between human and machine
understanding from Ellen Ullman.
* Add Rush Limbaugh's 35 Undeniable Truths of Life. The ordering
of the entries is due to the ../tools/do_sort script.

* Add $FreeBSD$ to limerick and zippy
* Delete trailing white space in all its forms. In addition to being
bad style in general, it also causes formatting, and other problems
for various third party items (like xscreensaver) which use fortunes
for their own purposes.

Kill one version of a limerick here.

Approved by: The usual suspects on that IRC channel.

Kill some duplicates.

Kill an incorrectly duplicated Einstein limerick (thanks phk!)

Kill one exact duplicate of a Hunter S. Thompson quote. Put on peril-sensitive
sunglasses for great evil, too.

Death to duplicate fortunes.

There is no host called new.bbc.co.uk - fix url.

Reviewed by: jkh
Approved by: jkh, murray
MFC after: 3 days

Sort.

Spell Fred Brooks's name right.

Resort and suppress dupes.

Add a few more aphorisms.

Add some of uncontroversial fortunes from my files.

Add some fortunes and re-order the Feynman problem solving algorithm.
Thanks to gsutter for the quotes.

Reviewed by: jkh

Add a few more tips, and tweak a couple.

PR: misc/34039

Augment the BLOCKSIZE tip. (Based on the PR with slight changes by myself).

PR: misc/34039

Add a new fortune seen in the sig of an e-mail.

Submitted by: ue (indirectly)
Approved by: eivind

o remove __P

Remove a duplicate with a typo.

MFC after: 3 days

Assorted mechanical fixes.

PR: 34790
Submitted by: Mike Makonnen <mike_makonnen@yahoo.com>

Add one.

Submitted by: jedgar
Reviewed by: The usual gang of idiots in that IRC channel.

o Move NTOHL() and associated macros into <sys/param.h>. These are
deprecated in favor of the POSIX-defined lowercase variants.
o Change all occurrences of NTOHL() and associated marcros in the
source tree to use the lowercase function variants.
o Add missing license bits to sparc64's <machine/endian.h>.
Approved by: jake
o Clean up <machine/endian.h> files.
o Remove unused __uint16_swap_uint32() from i386's <machine/endian.h>.
o Remove prototypes for non-existent bswapXX() functions.
o Include <machine/endian.h> in <arpa/inet.h> to define the
POSIX-required ntohl() family of functions.
o Do similar things to expose the ntohl() family in libstand, <netinet/in.h>,
and <sys/param.h>.
o Prepend underscores to the ntohl() family to help deal with
complexities associated with having MD (asm and inline) versions, and
having to prevent exposure of these functions in other headers that
happen to make use of endian-specific defines.
o Create weak aliases to the canonical function name to help deal with
third-party software forgetting to include an appropriate header.
o Remove some now unneeded pollution from <sys/types.h>.
o Add missing <arpa/inet.h> includes in userland.

Tested on: alpha, i386
Reviewed by: bde, jake, tmm

Add a tip about pkg_info and checking for multiple installed versions
of a package/port.

Clean up G. B. Shaw quotes:
- fix missing punctuation,
- remove duplicates in fortunes2,
- don't abbreviate first names.

Remove duplication of Shaw's principle in fortunes2.

Correct typo.

A case of ninfo (non-info)

Submitted by: Hans.VanSluis@compaq.com
MFC after: 1 month

FILES support for bsd.prog.mk. See bsd.README for details.

Stolen from: NetBSD

Modify tip that no longer applies for ftp(1).

Unix: Just Say No..

Obtained from: Jan.Hendriks@Compaq.com
MFC after: 3 days

Be more specific in an example of fortune's -e option.

PR: 32085
Submitted by: setantae@submonkey.net <setantae@submonkey.net>

Trim yet another duplicate fortune.

Properly sort the last two fortunes alphabetically.

Add a short commentary on libdialog by jkh.

Remove an incorrect duplicate Douglas Adam quote and properly format and
the correct duplicate. Both versions also attributed the quote to the
wrong book.

Fix a typo and add a missing period.

Remove some duplicate fortunes.

s/Kenned y/Kennedy/

Pointed out by: $a_lot_of_people

This string of coincidences was too good to let pass.

Obtained from: BBC World Service on 9410kHz

Fix some duplicate quotes and tidy up some Dr. Who quotes.

Other committers do not mention their personal names and/or email
addresses when adding stuff, so it seems fair to stop ``getting all
the fame'' by having my name displayed on login sessions.

Approved by: nik

Fix a typo:
Flinstone -> Flintstone.

Submitted by: grog (during the kernel debugging session at BSDConEurope)

Add terminating % so the last fortune can be found.
Add a fortune.

Separate concatenated fortunes.

Remove unattributed duplicate of Frederick Brooks eternal words
about the danger of second systems.

Correct attribution and fix translation from Danish.

Correct attribution.

PR: 30500
Submitted by: Drew Derbyshire <ahd@kew.org>

Add some important advice for young optical physicists.

Add a brief comparative analysis of 3 popular religions.

Approved by: maintainer

Borrow Peter's peril-sensitive sunglasses and add a short parody quoted in
the unnamed IRC channel.

Tip Correction : s/seconds/minutes/

PR: docs/30844
Submitted by: Andrew <andrew@ugh.net.au>

Update a duplicate quotation.

PR: 30228
MFC after: 2 weeks

Move /etc/defaults/make.conf to /usr/share/examples/etc/make.conf as
discussed on the arch@ mailinglist (after repo-copy).

sys.mk will .error if it finds /etc/defaults/make.conf but include
it anyways (this is the same behaviour as with the make.conf.local
removal).

/usr/share/examples/etc/make.conf has BDEFLAGS commented out now,
since it's only an example file.

Adjust all textes that talk about make.conf or defaults/make.conf to
match the new situation.

mdoc(7) police: s/BSD/.Bx/ where appropriate.

Removed duplicate VCS ID tags, as per style(9).

Remove whitespace after %. The whitespace was causing strfile to not see
the % string section break and thus fortune was producing a rather large
multi-fortune fortune message.

A good sysadmin always carries around a few feet of fiber. If he ever
gets lost, he simply drops the fiber on the ground, waits ten minutes,
then asks the backhoe operator for directions.
-- Bill Bradford <mrbill@mrbill.net>

Submitted by: Kris Kirby <kris@catonic.net>

Remove whitespace at EOL.

mdoc(7) police: removed HISTORY info from the .Os call.

Fix a couple of typos.

Remove two duplicate tips and correct formatting of an attribution.

Correct usage.

What to do when :w tells you you haven't got permission.

Mention that sh supports command line editing

Mention that vi supports split-screen mode.

Suggest using .login/.profile to set environment variables, not
.cshrc/.bashrc/.zshrc/.shrc

Document the mysterious Peter Wemm Murphy Field (PWMF).

Reviewed by: phk, eivind, nra

Remove some more duplicate fortunes.

"Unmount" is spelled "umount", not "unmount".

Resort the last entry to its proper location. D definitely comes before Z.

Remove a duplicate entry.

Fix a couple of tips, and add a new one.

Submitted by: Alexey V. Neyman <avn@any.ru>

Correct some typos.

PR: 28251
Submitted by: Alex Kapranoff <alex@kapran.bitmcnit.bryansk.su>

More tips. I'd never heard of look(1) before.

Submitted by: Dru <genisis@istar.ca>

More tips, this time from the Russian Fidonet FreeBSD Echo.

And I never knew about ports(7) before.

Submitted by: Alexey V. Neyman <avn@any.ru>

De-credit myself in order to be consistent.
Also add a few more tips while I am here.

More tips.

Submitted by: David Scheidt <dscheidt@tumbolia.com>

Add a new category of fortunes, 'freebsd-tips'. Useful hints, advice, and
pointers to areas of the system that might not be apparent on first
inspection.

Games ownership cleanup.

Urged by: bde

s/Cthulu/Cthulhu/

Alas, the first one is a repeat in a slightly different format and
ought to be removed (or the other copy). I'll leave that to more
enterprising souls, though (Cthulhu loves enterprising souls).

MFC after: 3 days

%DCL-I-FORMATRIGHT, Format VMS error messages pedantically correct.

Axe out duplicate.

Not to submitter: (I don't let Jordan use my axe)

PR: 24782
Submitted by: Szilveszter Adam <sziszi@petra.hos.u-szeged.hu>

Spelling fixes.

PR: 20474
Submitted by: Christian Weisgerber <naddy@mips.inka.de>

Remove duplicate.

PR: 19670
Submitted by: Anton Berezin <tobez@tobez.org>

Remove a duplicate piece of chalk.

PR: 23132
Submitted by: Alex Kapranoff <alex@kapran.bitmcnit.bryansk.su>

- Backout botched attempt to intoduce MANSECT feature.
- MAN[1-9] -> MAN.

Lets spell the guys name correctly: s/Avogardo/Avogadro/

Set the default manual section for games/ to 6.

Don't include "${.CURDIR}/../../Makefile.inc" explicitly. Doing so was
a bogus no-op in the usual case where fortune/ is a subdir of games/
(since <bsd.prog.mk> does an equivalent include automatically if
possible), but breaks building fortune when fortune/ is outside of the
games/ tree (since the include was unconditional here). This fix
depends on a previous fix for non-recursiveness of ../Makefile.inc
(it didn't exist).

PR: 25232

Remove spurious '"'.

PR: 24979
Submitted by: Joseph Scott <joseph@randomnetworks.com>

mdoc(7) police: Change -filled displays (which just happen
to be the same as -ragged in the current implementation) to
-ragged. With mdocNG, -filled displays produce the correct
output, formatted and justified to both margins.

Fix typo: seperate -> separate.

Seperate does not exist in the english language.

Submitted to look at by: kris

Unfortunately low-altitude overflights is not enough to make penguins crash.

Correct spelling of foresight.

PR: 24637
Submitted by: Christopher Rued <christor@ug.cs.sunysb.edu>

Remove a duplicate fortune.

PR: 21629
Submitted by: Sean C. Farley <sean-freebsd@farley.org>

mdoc(7) police: use the new features of the Nm macro.

Correct a bignum.

Detected-by: lang/clisp
Approved-by: jkh

Remove one other dup.

Remove some duplicated Dijkstra quotes and add a new one.

Approved by: jkh

Add an amusing spoonerism.

Submitted by: Benno Rice <benno@hiro.netizen.com.au>
Approved by: jkh

Remove a duplicate Feyman quote. Add his problem-solving algorithm.

Add definitions of hardware and software.

Add another Bill Paul quote.

Approved by: jkh

Xref strfile(8).

PR: misc/20304
Submitted by: Kim Scarborough <sluggo@unknown.nu>

put the entires back in order.... I forgot to do that after we dicussed
this at the BSDi get together...

minor brucification.

"Fix" warnings.

Remove garbage.

Some David Gerrold limericks, which he gratiously allowed us to
reproduce. I'll add the file to the makefile once I have finished adding
the limericks.

Remove a couple of dups and fix a typo. This doesn't touch dups that
are dupped between here (fortunes2) and fortunes.

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!

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

By overwhelming demand, revert the one=two joke to its previous form.
Also, fix a couple whitespace formatting errors and typos.

Note that the Klingon joke has a 12-point version in the
-chat list, mesg-id: <19990717120618.C269@marder-1> (thanks to
DES and to submitter doug@gorean). Also, note that the following
people need to learn to double-space after a period: <DougB@gorean.org>,
<des@flood.ping.uio.no>, <mellon@pobox.com>, <jeroen@vangelderen.org>,
and <rsidd@physics.iisc.ernet.in>.

Fix some newlines which have snuck in here in contradiction with
fortune's formatting rules.

Add a missing negative to a clause.

Add some fortunes, typically gleaned from FreeBSD mailing lists, remove
some dups, fix some typos and formatting.

Submitted-by (in no particular order):
Cy Schubert <cschuber@uumail.gov.bc.ca> (bin/12477)
David Kelly <dkelly@hiwaay.net> (misc/16647)
Zachary K Drew <drew0054@tc.umn.edu> (misc/16848)
Mark Ovens <mark@ukug.uk.freebsd.org> (misc/15809)
Bruce A. Mah <bmah@nimitz.ca.sandia.gov> (bin/17085)
And myself.

Approved by: The Fortune Teller

Remove a period inserted by a previous commit. Corporate mottos and
the like usually don't have periods.

Approved by: The Fortune Master

Add a new fortune and remove an email address.

Reviewed by: jkh

Get rid of some deltas lying around. This is a collection of lots of
small typo fixes. Most have to do with periods and ellipses, but there
are some spelling, capitalization, and miscellaneous fixes. No meanings
have been changed.

Put the '%' before the new appended fortune, not after.

This, we believe, is the first commit
from Disneyland, committed via ssh
on a Palm + wireless.

Inspired by: ps
Thanks to: Glenn (Damn, now I want one of these :-)

Fix typo.

Use tr(1) instead of caesar(6) to perform the rotation. This removes
the dependency on caesar which therefore doesn't need to be built by
bootstrap-tools.

Suggested by: des
Previously mentioned by: Peter Jeremy <peter.jeremy@alcatel.com.au>

Add the "3 syncs" fortune Jordan has been posting in Usenet years ago.

Found by: Thomas Gellekum <tg@melaten.rwth-aachen.de>

Change ``.Dq Fl o'' to ``.Dq -o''

- Fix a typo and add a missing file.

PR: docs/15286
Submitted by: Mark Ovens <mark@ukug.uk.freebsd.org>

- Use .Dq where it should be. (This was done by me.)

Add Matt Fuller's comment about long-standing x86 bug that allows you
to install Windows.

copyright/sccsid/rcsid cleanup.

Brucify last commit:

- Use consistent capitalization.
- Subjects and verbs now agree.

Pointed-out-by: sheldonh

Added definition of 'brucify'.

Submitted by: Eivind Eklund
Suggested by: Brian Somers

Minor typo nit. Also, remove the redundant entry from fortunes2.

PR: bin/14239
Submitted by: Doug Barton <Doug@gorean.org>

Sync our register usage with NetBSD's (non-)usage.

Add $FreeBSD$

Curchill --> Churchill

The submitter also posted a change to 'fortunes.sp.ok', but it
looks like this file is no longer needed in our version so I've
left the typo in the file. (It also doesn't have a $FreeBSD$ tag,
and I couldn't easily find in the code whether it will allow comments
within it or not.)

PR: 14832
Submitted by: mfisher@parsons.rh.rit.edu

*blush* Instead of undoing my own change, i clobbered dcs's rev 1.21
change.

I'll never touch this again...

Back out rev 1.21. bde and dcs convinced me that all this is messed up
anyway, and there can't be any solution that will universally work in any
case (make world, cross-compilation, simple `make' without `make world'
after incompatible options have been added to strfile, ...)

Revert to 1.19. ${.OBJDIR}/../strfile must be taken out, since it
breaks the cross-compilation case, but I'm not the one doing it.
$$PATH *will* have a new strfile in /usr/bin built at build-tools
time, unless you defined NOTOOLS.

If you defined NOTOOLS and it breaks for you, don't do that.

If you did not define NOTOOLS but things are not working, the error is
elsewhere. See logs for src/Makefine.inc1, particularly rev 1.36, and
revision 1.14 of this file.

Reverse the way $PATH is extended, so if the person building that area
has /usr/games in its $PATH, where /usr/games/strfile doesn't grok an
option that the newly built one inside /usr/obj would grok, the build
process would be able to complete.

Add $FreeBSD$
'if gets laid once' -> 'it gets laid once'

Remove my completely un-funny IRC fortune.

Reviewed by: jkh

Self-contradicting commit.

Notice the -C flag got dropped when I reverted to version 1.15, and put it
back.

Lewis Carroll's name was spelled Lewis Carrol in some fortunes

PR: 14569
Submitted by: Janet Davis <janet@one-eyed-alien.net>

I'll take the MAINTAINER line. I have been accused of knowing humor
when I at least see it. :)

Realize the changes to usage() and the man page were missing from
the previous commit, and document the -C (comments) flag.

IRC wisdom.

Add Kirk's comment about "copycenter"; it's just too good to pass up.

Don't say a fscking word, any one of you.

Moderate the "public" fortunes file somewhat; add the original to
the -offensive database. Also provide some whimsy in the $FBSD$
headers.

Suggested by: The Kibbutz squad.

Add a location to grog's assesment for historical reasons.

Submitted by: grog

Some more old quotations I had sitting around that I shared and were
laughed at.

Reviewed by: the FreeBSDcon terminal room

FreeBSDcon Wisdom.

Reviewed by: the anonymous members of the FreeBSDcon terminal room.

Revert to 1.15, since, as pointed out by bde, 1.16 is wrong and evil.
Add $FreeBSD$.

Add -C flag to indicate the presence of comments. Files thus processed
will be marked as having comments, which are indicated by two delimiter
characters at the beginning of a line.

Ignore comment lines in files marked as having them.

Change path order in makefile so newer fortune files will be built with
the latest fortune (strfile/caesar) sources.

Correct a separator type in fortunes2.

Add Unix geeks dating instructions (reference card style).

Fix warning: return type of `main' is not `int'

$Id$ -> $FreeBSD$

Fix core dump with `fortune -f'.

Document the usefulness of Michelle Pfeiffer in OS marketing.

Fix a bunch of typos and spelling errors.

PR: misc/12965
Partially Submitted by: Patrick Seal <patseal@hyperhost.net>

strfile(8) incorrectly states that the output files generated
will have the suffix ".out" appended to them. They are acutally
created as outputfile.dat.

PR: docs/12968
Submitted by: Patrick Seal <patseal@hyperhost.net>

A stupid nit, change freebsd to FreeBSD.

By popular request: Bill Paul's undying words.

Add recognition that Microsoft NT does not exist.

Requested-by: John Baldwin <jobaldwi@vt.edu>

Fix typo.

PR: 12784
Submitted by: Doug <Doug@gorean.org>

(1) Avoid ambigous if/else

PR: bin/12768
Submitted By: Stephen J. Roznowski <sjr@home.net>

(2) Follow KNF

Add $Id$, to make it simpler for members of the translation teams to
track.

The $Id$ line is normally at the bottom of the main comment block in the
man page, separated from the rest of the manpage by an empty comment,
like so;

.\" $Id$
.\"

If the immediately preceding comment is a @(#) format ID marker than the
the $Id$ will line up underneath it with no intervening blank lines.
Otherwise, an additional blank line is inserted.

Approved by: bde

Compile when NO_REGEX is defined.

Submitted by: Geordy Kitchen <gkitchen@cs.ubc.ca> (gnu/12117)

You'll see them eventually :-)

Getopt(3) returns -1, not EOF.

This gem deserve to live forever:

"Non stop trains to Roma Termini Station leave from 7.38
a.m. to 10.08 p.m., hourly."

(from: http://www.italyhotel.com/roma/guida/collegamenti.html)

Call me bored, but I actually fed the equation into 'calc' just now
and got a slightly different answer than is in the quotation.

Too good to be missed

Document -D option. Give a more helpful error message for some cases.

PR: bin/10152
Obtained from: Matthew D. Fuller <fullermd@futuresouth.com>

Fix typo (if it's not a typo, then it doesn't make sense IMHO)

Allow building games w/o an existing /usr/games.

Allow ``make BINDIR=/foo/games'' to work.

Fixed building without /usr/games in $PATH. Just add /usr/games
to the _end_ of $PATH before using tools that are normally in
/usr/games. I broke this in rev.1.9 by assuming that these tools
are in $PATH (as they are for `make world' unless NOTOOLS is set).
Revs.1.10-1.13 of this file had various wrong fixes. Rev.1.18
of src/Makefile.inc1 has an incomplete fix.

PR: 7936

Fixed comments about what to comment out to [not] install the
potentially offensive fortunes. This should be configured using
an ifdef.

Fixed missing dependencies of fortunes.dat on fortunes, etc.

Removed bogus dependency of `all' on source files.

Fixed some style bugs.

Back out the last two hacks. I've added games to the (correct) build
path in src/Makefile.inc. The code that I'm backing out didn't work
anyway since exists() checks for a file in .PATH (and /usr/games/strfile
doesn't exist there), so the test was always defaulting to ../strfile/strfile
which breaks cross-compiled builds.

Remove bogus dependencies.

Submitted by: bde

Reverse the sense of the test looking for caesar & strfile.

Don't expect /usr/games in the path.
Avoid using /usr/games versions if we can find what we need (caesar & strfile)
in the buildtree.

PR: 7936
Submitted by: Achim Patzner <ap@noses.com>

Use the installed versions of caesar and strfile. They are now
bootstrapped by `make world', and the installed versions are just
as likely to work as the installed version of cc if `make' is run
directly.

Teruillian --> Tertullian

PR: 5928
Submitted by: Doug <Studded@dal.net>

Be sure to set the value of Tbl.str_numstr before any call to
do_order or randomize so that they actually work.

PR: 5791

spelling error.

Use srandomdev

minor fortune fixes:
o convert a ' to "
o remove a stray "
o format some attributations properly

Typo fix.
PR: 3662
Submitted by: Matthew Hunt <mph@pobox.com>

Remove srandomdev fallback code

Remove some duplicated and incomplete entries

a bunch of formatting (\t -> \t\t) changes... so I was board one night.. :)

Use srandomdev() to initialize generator

Typo police.

Fix srandom arg type according to Lite2

Make /dev/urandom fd static, or it pick up random descriptor
(stack garbadge) and read from it

Should go into 2.2

Allow fortune to use /dev/urandom if available to obtain its random
numbers. If /dev/urandom is unavailable, it will fall back to
using the random() function.

I did this because I'm sick of seeing the same handful of fortunes
over and over, and I've seen the exact same fortune one too many times
when starting up two login shells at the same time.

2.2 safe.

Revert $FreeBSD$ to $Id$

444 -> ${NOBINMODE}
/usr/share -> ${SHAREDIR}
/usr/games -> ${BINDIR}

The fact that people can't put the proper source on Kierkegaards
most famous insult to humanity can be forgiven, afterall, it
almost underlines the quote with irony, if one knows the context.

But to misspell the name of Alfred E. Neuman ...

Correct some grammar. Closes PR# 2520.

Submitted by: John-Mark Gurney <gurney_j@efn.org>

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Fix some typos and remove a couple of duplicate
fortunes. Closes PR#s 2358 and 2402.

Submitted by: John-Mark Gurney <gurney_j@efn.org>

comma police for section SEE ALSO

Sponsored by: Vin de Pays de l'Aude

Fix minor typo/grammatical error

Submitted by: John-Mark Gurney <jmg@nike.efn.org> in PR 2085

Uncomment static from collate_range_cmp, no more in locale.h

Replace collate_range_cmp call with its code

Eliminated includes of the "temporary" backwards compatibility header
<sys/dir.h> in applications. Maintained existing (inadequate) ifdefs
for dir.h vs dirent.h in libdialog, amd and rarpd, but didn't add any
new ones.

Fixed annoying non-null output for `make depend'. SRCS should only
be used for C, C++ and assembler sources if <bsd.prog.mk> is
included. It was used for general files. This caused the __depend_*
lists in <bsd.dep.mk> to be empty, so mkdep was never run, so
.depend never existed, so it was always out of date, so `rm -f
.depend' was always executed to update it.

Fixed DPADD.

Convert to newly aded collate compare function

Pick collate info too

Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src. This is the final version of the
patches, incorporating the feedback I've received from -current.

Handle sorting in better way

Activate collate

Fix -f mode
Fix freeing of wrong pointer

Localize it.
off_t -> long.
Install strfile & unstr
-Wall cleanup
Fix matching bug with offensive database

Find caesar and strfile properly.
Generate .dat files on build state

Correct some man page cross references and file location references.

Spell a German fortune correctly.

Change `install' to `${INSTALL}' as usual.

Install the `built' files with flag ${COPY}.

Use correct spelling of ``knew''.

Obtained from: netbsd-bugs@NetBSD.ORG, Peter Seebach <seebs@solon.com>

Remove trailing whitespace.

If possible, pick up the caesar program inside in the compilation tree.

"distribute" games into their own distribution.
Reviewed by:
Submitted by:
Obtained from:

Add datfiles to SUBDIR for obj target too. "make install" wrote to the
source directory and failed when the source directory was nfs mounted.
This was fixed in 1.1.5. Sigh.

This commit was generated by cvs2svn to compensate for changes in r2490,
which included commits to RCS files with non-trunk default branches.