- improve SYNOPSIS (mark down punctuation)

- put `-i' description in correct place
- -m takes an argument
- use `$' for command line examples
- document strfile(8), and note it is not installed by default
- improve FILES and SEE ALSO
- a few other tweaks

1 files changed, 37 insertions, 19 deletions

diff --git a/games/fortune/fortune/fortune.6 b/games/fortune/fortune/fortune.6
index 0f9edf2e2c2..0a45076ec3c 100644
--- a/games/fortune/fortune/fortune.6
+++ b/games/fortune/fortune/fortune.6
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fortune.6,v 1.8 2003/06/03 03:01:39 millert Exp $
+.\"	$OpenBSD: fortune.6,v 1.9 2004/08/20 23:15:15 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -43,8 +43,10 @@
 .Op Fl aefilosw
 .Op Fl m Ar pattern
 .Oo
-.Op Ar N%
-.Ar file/dir/all
+.Op Ar N Ns %
+.Sm off
+.Ar file No / Ar directory No / Ar all
+.Sm on
 .Oc
 .Sh DESCRIPTION
 When
@@ -66,9 +68,13 @@ on multiple files).
 .It Fl f
 Print out the list of files which would be searched, but don't
 print a fortune.
+.It Fl i
+Ignore case for
+.Fl m
+patterns.
 .It Fl l
 Long dictums only.
-.It Fl m
+.It Fl m Ar pattern
 Print out all fortunes which match the regular expression
 .Ar pattern .
 See
@@ -97,10 +103,6 @@ Needs be.
 .Ed
 .It Fl s
 Short apothegms only.
-.It Fl i
-Ignore case for
-.Fl m
-patterns.
 .It Fl w
 Wait before termination for an amount of time calculated from the
 number of characters in the message.
@@ -111,13 +113,14 @@ to guarantee that the message can be read before the screen is cleared.
 The user may specify alternate sayings.
 You can specify a specific file, a directory which contains one or
 more files, or the special word
-.Em all
+.Em all ,
 which says to use all the standard databases.
 Any of these may be preceded by a percentage, which is a number
 .Ar N
 between 0 and 100 inclusive, followed by a
-.Ar % .
-If it is, there will be a
+.Sq %
+character.
+If it is, there will be an
 .Ar N
 percent probability that an adage will be picked from that file
 or directory.
@@ -134,7 +137,7 @@ with
 .Em funny
 twice as big, saying
 .Bd -literal -offset indent
-fortune funny not-funny
+$ fortune funny not-funny
 .Ed
 .Pp
 will get you fortunes out of
@@ -142,27 +145,42 @@ will get you fortunes out of
 two-thirds of the time.
 The command
 .Bd -literal -offset indent
-fortune 90% funny 10% not-funny
+$ fortune 90% funny 10% not-funny
 .Ed
 .Pp
 will pick out 90% of its fortunes from
 .Em funny
-(the ``10% not-funny'' is unnecessary, since 10% is all that's left).
+(the
+.Dq 10%
+is unnecessary, since 10% is all that's left).
 The
 .Fl e
 option says to consider all files equal;
 thus
 .Bd -literal -offset indent
-fortune -e
+$ fortune -e
 .Ed
 .Pp
 is equivalent to
 .Bd -literal -offset indent
-fortune 50% funny 50% not-funny
+$ fortune 50% funny 50% not-funny
 .Ed
+.Pp
+Datafiles for
+.Nm
+are created by a utility called
+.Nm strfile .
+Although not installed by default,
+the source code and a manual page for this utility
+can be found in
+.Pa /usr/src/games/fortune/strfile/ ,
+if it exists.
 .Sh FILES
-.Bl -tag -width Pa -compact
-.It Pa /usr/share/games/fortune
+.Bl -tag -width "/usr/share/games/fortune/*XX" -compact
+.It Pa /usr/share/games/fortune/*
+Fortune files.
 .El
 .Sh SEE ALSO
-.Xr regex 3
+.Xr regex 3 ,
+.Xr random 6 ,
+.Xr rot13 6