Fix merge conflicts

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

diff --git a/rogue/rogue.6 b/rogue/rogue.6
index 79dff7861d6840416ca9bec124bd9b695ffe4d23..4598c7b44a30c5d0ae13f9283e8d9fbb600cc0c2 100644 (file)
--- a/rogue/rogue.6
+++ b/rogue/rogue.6
@@ -1,4 +1,4 @@
-.\"    $NetBSD: rogue.6,v 1.9 2003/04/26 21:30:51 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.
 .\"
@@ -85,11 +81,6 @@ 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
 .Sh FILES
 .Bl -tag -width /var/games/rogue.scores -compact
 .It Pa /var/games/rogue.scores
@@ -103,6 +94,11 @@ 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