Fix merge conflicts

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

diff --git a/rogue/rogue.6 b/rogue/rogue.6
index 53980ad08a36a83a996f64eb407bba221f7d26f6..4598c7b44a30c5d0ae13f9283e8d9fbb600cc0c2 100644 (file)
--- a/rogue/rogue.6
+++ b/rogue/rogue.6
@@ -1,4 +1,4 @@
-.\"    $NetBSD: rogue.6,v 1.7 2002/09/26 16:12:42 wiz Exp $
+.\"    $NetBSD: rogue.6,v 1.11 2005/09/15 02:09:41 wiz Exp $
 .\"
 .\" Copyright (c) 1988, 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.
 .\"
@@ -38,7 +34,7 @@
 .Os
 .Sh NAME
 .Nm rogue
-.Nd Exploring The Dungeons of Doom
+.Nd exploring The Dungeons of Doom
 .Sh SYNOPSIS
 .Nm
 .Op Fl s
@@ -48,10 +44,9 @@
 .Sh DESCRIPTION
 .Nm
 is a computer fantasy game with a new twist.
-It is crt oriented and the
-object of the game is to survive the attacks of various monsters and get
-a lot of gold, rather than the puzzle solving orientation of most computer
-fantasy games.
+It is CRT oriented and the object of the game is to survive the attacks of
+various monsters and get a lot of gold, rather than the puzzle solving
+orientation of most computer fantasy games.
 .Pp
 To get started you really only need to know two commands.
 The command
@@ -63,9 +58,8 @@ will identify the things you see on the screen.
 To win the game (as opposed to merely playing to beat other people's high
 scores) you must locate the Amulet of Yendor which is somewhere below
 the 20th level of the dungeon and get it out.
-Nobody has achieved this
-yet and if somebody does, they will probably go down in history as a hero
-among heroes.
+Nobody has achieved this yet and if somebody does, they will probably go
+down in history as a hero among heroes.
 .Pp
 When the game ends, either by your death, when you quit, or if you (by
 some miracle) manage to win,
@@ -86,12 +80,7 @@ option will print out the list of scores.
 For more detailed directions, read the document
 .Rs
 .%T A Guide to the Dungeons of Doom
-.Re  .
-.Sh AUTHORS
-Timothy Stoehr,
-Michael C. Toy,
-Kenneth C. R. C. Arnold,
-Glenn Wichman
+.Re
 .Sh FILES
 .Bl -tag -width /var/games/rogue.scores -compact
 .It Pa /var/games/rogue.scores
@@ -105,10 +94,14 @@ Default save file
 .%A Kenneth C. R. C. Arnold
 .%T A guide to the Dungeons of Doom
 .Re
+.Sh AUTHORS
+.An Timothy Stoehr
+.An Michael C. Toy
+.An Kenneth C. R. C. Arnold
+.An Glenn Wichman
 .Sh BUGS
 Probably infinite, although none are known.
-However,
-that Ice Monsters sometimes transfix you permanently is
+However, that Ice Monsters sometimes transfix you permanently is
 .Em not
 a bug.
 It's a feature.