Fix merge conflicts

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

diff --git a/atc/atc.6 b/atc/atc.6
index 60aebd07d7fec9692d3c5565091109b8d1968ed1..dff91db734414ad22360c82db79191a79bbe741e 100644 (file)
--- a/atc/atc.6
+++ b/atc/atc.6
@@ -1,4 +1,4 @@
-.\"    $NetBSD: atc.6,v 1.17 2003/04/26 21:27:47 wiz Exp $
+.\"    $NetBSD: atc.6,v 1.24 2015/07/26 22:22:24 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -14,11 +14,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 @@
 .\"
 .\" Copyright (c) 1986 Ed James. All rights reserved.
 .\"
-.Dd May 31, 1993
+.Dd January 1, 2004
 .Dt ATC 6
 .Os
 .Sh NAME
@@ -116,7 +112,6 @@ Suspending a game is not permitted.
 If you get a talk message, tough.
 When was the last time an Air Traffic Controller got called away to the phone?
 .Sh THE DISPLAY
-.Pp
 Depending on the terminal you run
 .Nm
 on, the screen will be divided into 4 areas.
@@ -179,7 +174,7 @@ Changing altitude is not considered
 to be a command and is therefore not displayed.
 The following are some possible information lines:
 .Pp
-.Bd -literal -unfilled -offset indent
+.Bd -literal -offset indent
 B4*A0: Circle @ b1
 g7 E4: 225
 .Ed
@@ -384,6 +379,11 @@ Planes enter at 7000 feet and leave at 9000 feet.
 Planes flying at an altitude of 0 crash if they are not over an airport.
 .It
 Planes waiting at airports can only be told to take off (climb in altitude).
+.It
+Pressing return (that is, entering an empty command) will perform the
+next update immediately.
+This allows you to ``fast forward''
+the game clock if nothing interesting is happening.
 .El
 .Sh NEW GAMES
 The
@@ -452,11 +452,11 @@ the lines are horizontal, vertical or
 .Em exactly
 diagonal.
 .Ss FIELD FILE EXAMPLE
-.Bd -literal -unfilled
+.Bd -literal
 # This is the default game.
 
 update = 5;
-newplane = 5;
+newplane = 10;
 width = 30;
 height = 21;
 
@@ -492,8 +492,11 @@ which holds the list of playable games, as well as the games themselves.
 .Pp
 The scores are kept in
 .Pa /var/games/atc_score .
-.Sh AUTHOR
-Ed James, UC Berkeley: edjames@ucbvax.berkeley.edu, ucbvax!edjames
+.Sh AUTHORS
+.An Ed James ,
+UC Berkeley:
+.Aq Mt edjames@ucbvax.berkeley.edu ,
+ucbvax!edjames
 .Pp
 This game is based on someone's description of the overall flavor
 of a game written for some unknown PC many years ago, maybe.