X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=man%2Femp_server.6;h=3a23823cb51bb5e820a4a873adaae80403fd7ba6;hp=15ef79e41add1dfbe239e7c90da0f473ce3c929b;hb=HEAD;hpb=ec484e17a74de4d2c50b532a05ef97cdd8faddb1

diff --git a/man/emp_server.6 b/man/emp_server.6
index 15ef79e41..3a23823cb 100644
--- a/man/emp_server.6
+++ b/man/emp_server.6
@@ -6,33 +6,20 @@
 emp_server \- Empire server
 .SH SYNOPSIS
 .B emp_server
-[
-.B \-dhpsv
-]
-[
-.BI \-e " configfile"
-]
+[\fB\-dFhpsv\fP]
+[\fB\-e\fP \fIconfigfile\fP]
+[\fB\-E\fP \fIaction\fP]
+[\fB\-R\fP \fIseed\fP]
 .if \nw \{\
 .br
 .B emp_server
-[
-.B \-i
-|
-.BI \-I " service-name"
-]
-[
-.BI \-e " configfile"
-]
+[\fB\-i\fP
+|\fB\-I\fP \fIservice-name\fP]
+[\fB\-e\fP \fIconfigfile\fP]
 .br
 .B emp_server
-[
-.B \-u
-|
-.BI \-U " service-name"
-]\}
-[
-.BI \-R " random-seed"
-]
+[\fB\-u\fP
+|\fB\-U\fP \fIservice-name\fP]\}
 .SH DESCRIPTION
 .B emp_server
 is a daemon which listens to the Empire port for players connecting to
@@ -40,17 +27,30 @@ the game.  For more information on the game of Empire, see the info
 pages within the game.
 .SH OPTIONS
 .TP
-.B \-d 
+.B \-d
 Debug mode.  This will prevent the server from forking itself into the
-background.  It will also make it abort when it detects an internal
-error.  You normally want to use this flag if you are running
+background.  Implies -E abort.  You normally want to use this flag if
+you are running
 .B emp_server
 from within a debugger.
 .TP
 .BI \-e " configfile"
 Use game configuration in \fIconfigfile\fR.
 .TP
-.B \-h 
+.BI \-E " action"
+What to do on recoverable internal error ("oops"): \fBabort\fP,
+\fBcrash\-dump\fP (but continue), \fBnothing\fP (default).
+.ie \nw \fBcrash-dump\fP is not implemented for Windows.
+.el \fBcrash-dump\fP works by aborting a fork of the server process.
+.TP
+.B \-F
+Force
+.B emp_server
+to start even when game state looks bad.  Risks crashes and further
+corruption; use this only for attempting to fix up problems.  Better
+make a backup first, and lock out players.
+.TP
+.B \-h
 Help.  Print brief usage information and exit.
 .if \nw \{\
 .TP
@@ -73,7 +73,7 @@ Uninstall the Windows Service with the specified name.\}
 .B \-s
 Enable thread stack checking.
 .TP
-.B \-R " random-seed"
+.B \-R " seed"
 Set the seed for random function.
 .TP
 .B \-v
@@ -107,6 +107,6 @@ Please report all bugs to the Wolfpack <wolfpack@wolfpackempire.com>
 \fIempire\fR(6), \fIempsched\fR(6), \fIfairland\fR(6), \fIfiles\fR(6),
 \fIpconfig\fR(6).
 .SH AUTHORS
-Dave Pare, Jeff Bailey, Thomas Ruschak, Ken Stevens and Steve McClure
-are principal authors.  The full list of authors is too long to
-include here.
+Dave Pare, Jeff Bailey, Thomas Ruschak, Ken Stevens, Steve McClure and
+Markus Armbruster are principal authors.  The full list of authors is
+too long to include here.