--- fortune/fortune-man.part1.remove-offensive-doc 2017-03-25 06:00:59.000000000 -0700
+++ fortune/fortune-man.part1 2017-11-18 16:26:30.737160889 -0800
@@ -50,7 +50,7 @@
.SH NAME
fortune \- print a random, hopefully interesting, adage
.SH SYNOPSIS
-.BR fortune " [" -acefilosw "] [" -n
+.BR fortune " [" -acefilsw "] [" -n
.IR length "] ["
.B -m
.IR pattern "] [[" n% "] " file/dir/all ]
@@ -58,15 +58,12 @@
When
.B fortune
is run with no arguments it prints out a random epigram. Epigrams are
-divided into several categories, where each category is sub-divided
-into those which are potentially offensive and those which are not.
+divided into several categories.
.SS Options
The options are as follows:
.TP
.B -a
-Choose from all lists of maxims, both offensive and not. (See the
-.B -o
-option for more information on offensive fortunes.)
+Choose from all lists of maxims.
.TP
.B -c
Show the cookie file from which the fortune came.
@@ -114,29 +111,6 @@
ask for short fortunes, or too long and ask for long ones, fortune goes
into a never-ending thrash loop.
.TP
-.B -o
-Choose only from potentially offensive aphorisms. The -o option is
-ignored if a fortune directory is specified.
-.sp
-.B Please, please, please request a potentially
-.B offensive fortune if and only if
-.B you believe, deep in your heart,
-.B that you are willing to be
-.B offended. (And that you'll just quit
-.BR using " -o " rather
-.B than give us grief about it,
-.B okay?)
-.sp
-.RS
-\&... let us keep in mind the basic governing philosophy of The
-Brotherhood, as handsomely summarized in these words: we believe in
-healthy, hearty laughter -- at the expense of the whole human race, if
-needs be. Needs be.
-.RS
---H. Allen Smith, "Rude Jokes"
-.RE
-.RE
-.TP
.B -s
Short apothegms only. See
.B -n
@@ -207,30 +181,6 @@
.RI "50% " funny " 50% " not-funny
.sp
.RE
-This fortune also supports the BSD method of appending ``-o'' to
-database names to specify offensive fortunes. However this is
-.B not
-how fortune stores them: offensive fortunes are stored in a separate
-directory without the ``-o'' infix. A plain name (i.e., not a path to a
-file or directory) that ends in ``-o'' will be assumed to be an
-offensive database, and will have its suffix stripped off and be
-searched in the offensive directory (even if the neither of the
-.IR -a " or " -o
-options were specified). This feature is not only for
-backwards-compatibility, but also to allow users to distinguish between
-inoffensive and offensive databases of the same name.
-.PP
-For example, assuming there is a database named
-.I definitions
-in both the inoffensive and potentially offensive collections, then the
-following command will select an inoffensive definition 90% of the time,
-and a potentially offensive definition for the remaining 10%:
-.RS
-.sp
-.B fortune
-90%
-.I definitions definitions-o
-.RE
.SH FILES
Note: these are the defaults as defined at compile time.
.PP
--- fortune/fortune-man.part2.remove-offensive-doc 2017-03-25 06:00:59.000000000 -0700
+++ fortune/fortune-man.part2 2017-11-18 16:27:30.880173797 -0800
@@ -8,16 +8,6 @@
.B fortune
no longer finds the pointers file, it ignores the text file.
.SH BUGS
-The division of fortunes into offensive and non-offensive by directory,
-rather than via the `-o' file infix, is not 100% compatible with
-original BSD fortune. Although the `-o' infix is recognised as referring
-to an offensive database, the offensive database files still need to be
-in a separate directory. The workaround, of course, is to move the `-o'
-files into the offensive directory (with or without renaming), and to
-use the
-.B -a
-option.
-.PP
The supplied fortune databases have been attacked, in order to correct
orthographical and grammatical errors, and particularly to reduce
redundancy and repetition and redundancy. But especially to avoid
@@ -26,13 +16,7 @@
.PP
The fortune databases are now divided into a larger number of smaller
files, some organized by format (poetry, definitions), and some by
-content (religion, politics). There are parallel files in the main
-directory and in the offensive files directory (e.g., fortunes/definitions and
-fortunes/off/definitions). Not all the potentially offensive fortunes are in
-the offensive fortunes files, nor are all the fortunes in the offensive
-files potentially offensive, probably, though a strong attempt has been
-made to achieve greater consistency. Also, a better division might be
-made.
+content (religion, politics).
.SH HISTORY
This version of fortune is based on the NetBSD fortune 1.4, but with a
number of bug fixes and enhancements.