Fix merge conflicts

[bsdgames-darwin.git] / dm / dm.8

diff --git a/dm/dm.8 b/dm/dm.8
index dec52b100d7591556c051bf266801cc9cf37a00b..a30ec11de8af2e805323b32f77b4d4fbb6df16a2 100644 (file)
--- a/dm/dm.8
+++ b/dm/dm.8
@@ -1,4 +1,4 @@
-.\"    $NetBSD: dm.8,v 1.6 1998/06/08 12:41:41 lukem Exp $
+.\"    $NetBSD: dm.8,v 1.9 2003/08/07 09:37:11 agc Exp $
 .\"
 .\" Copyright (c) 1987, 1991, 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.
 .\"
@@ -48,7 +44,7 @@ is a program used to regulate game playing.
 .Nm
 expects to be invoked with the name of a game that a user wishes to play.
 This is done by creating symbolic links to
-.Nm "" ,
+.Nm ,
 in the directory
 .Pa /usr/games
 for all of the regulated games.
@@ -63,8 +59,7 @@ program.
 determines if the requested game is available and, if so, runs it.
 The file
 .Pa /etc/dm.conf
-controls the conditions under which games may
-be run.
+controls the conditions under which games may be run.
 .Pp
 The file
 .Pa /etc/nogames
@@ -99,7 +94,7 @@ running the games setgid
 First, all games that allow users to run
 .Ux
 commands should carefully
-set both the real and effective group id's immediately before executing
+set both the real and effective group ids immediately before executing
 those commands.
 Probably more important is that
 .Nm