Fix merge conflicts

[bsdgames-darwin.git] / trek / trek.6

diff --git a/trek/trek.6 b/trek/trek.6
index a4c11372932bd57bc5be22d1258edc6eb61b803e..b893cd2d6c1b22c7b2410e7d2d6c710a3e25c5a9 100644 (file)
--- a/trek/trek.6
+++ b/trek/trek.6
@@ -1,4 +1,4 @@
-.\"    $NetBSD: trek.6,v 1.9 2002/09/26 16:12:43 wiz Exp $
+.\"    $NetBSD: trek.6,v 1.13 2009/05/25 00:53:46 dholland Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -11,11 +11,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"    This product includes software developed by the University of
-.\"    California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
@@ -33,17 +29,16 @@
 .\"
 .\"    @(#)trek.6      8.2 (Berkeley) 12/30/93
 .\"
-.Dd December 30, 1993
+.Dd May 24, 2009
 .Dt TREK 6
 .Os
 .Sh NAME
 .Nm trek
 .Nd trekkie game
 .Sh SYNOPSIS
-.Nm /usr/games/trek
+.Nm
 .Oo
-.Op Fl a
-.Ar file
+.Fl sf
 .Oc
 .Sh DESCRIPTION
 .Nm
@@ -53,10 +48,13 @@ For complete documentation, see
 .Em Trek
 by Eric Allman.
 .Pp
-If a filename is given, a log of the game is written onto that file.
-If the
-.Fl a
-flag is given before the filename, that file is appended to, not truncated.
+The
+.Fl s
+flag makes the game somewhat more efficient if you have a (very) slow
+terminal.
+The
+.Fl f
+flag (the default) is for faster terminals.
 .Pp
 The game will ask you what length game you would like.
 Valid responses are
@@ -79,10 +77,10 @@ You should normally start out with a novice and work up.
 .Pp
 In general, throughout the game, if you forget what is appropriate
 the game will tell you what it expects if you just type in a question mark.
-.Sh AUTHOR
-Eric Allman
 .Sh SEE ALSO
 .Pa /usr/share/doc/usd/31.trek
+.Sh AUTHORS
+.An Eric Allman
 .Sh COMMAND SUMMARY
 .Bl -item -compact
 .It