info/Empire4.4: Improve a few change log entries

[empserver] / man / empire.6

diff --git a/man/empire.6 b/man/empire.6
index 7148ce455bf84664bf810c98a488734e29592ba7..764811e6751c29855c357a39520fdda12cb3c9aa 100644 (file)
--- a/man/empire.6
+++ b/man/empire.6
@@ -3,18 +3,12 @@
 empire \- Empire client
 .SH SYNOPSIS
 .B empire
-[
-.B \-ku
-]
-[
-.BI \-2 " outfile"
-]
-[
-.I country
-[
-.I password
-]
-]
+[\fB\-hkruv\fP]
+[\fB\-2\fP \fIoutfile\fP]
+[\fB\-H\fP \fIhistfile\fP]
+[\fB\-s\fP \fI[host:]port\fP]
+[\fIcountry\fP
+[\fIpassword\fP]]
 .br
 .SH DESCRIPTION
 .B empire
@@ -28,15 +22,37 @@ WARNING -- This game is not only addictive but often peels back
 the thin veneer of civilization that hides the maniac within.
 .SH OPTIONS
 .TP
+.B \-h
+Help.  Print brief usage information and exit.
+.TP
+.BI \-H " histfile"
+Load command history from \fIhistfile\fP, and save it back.  Default
+is '~/.empire_history' without \fB\-r\fP, and none with \fB-r\fP.  You
+might want to protect your history file from prying eyes.
+.IP
+Only available when compiled the GNU \fBreadline\fP library.
+.TP
 .B \-k
 If someone else is connected to your country, kill their connection.
 .TP
+.B \-r
+Restricted mode: disable redirections and execute command.  This is
+useful when you want to grant somebody access to just Empire, but not
+to the host system's user account that runs the client.  Be careful
+with \fB\-H\fP and \fB\-2\fP then.
+.TP
+.BI \-s " [host:]port"
+Specify server \fIhost\fR and \fIport\fR.
+.TP
 .B \-u
 Use UTF-8 rather than ASCII character set.
 .IP
 This requires server version 4.2.21 or later, and a terminal that
 understands UTF-8.
 .TP
+.B \-v
+Print version information and exit.
+.TP
 .BI \-2 " outfile"
 Append log of session to \fIoutfile\fR.
 .SH OPERANDS
@@ -54,9 +70,11 @@ client:
 .TP
 .I EMPIREHOST
 Specifies the host to connect to, i.e. where the server runs.
+Only effective if no host specified via \-s.
 .TP
 .I EMPIREPORT
 Specifies the port number or service name to connect to.
+Only effective if no port specified via \-s.
 .TP
 .I COUNTRY
 The name of your country in the game.
@@ -67,31 +85,45 @@ representative.
 .TP
 .I LOGNAME
 Your user name.
+.TP
+.I INPUTRC
+The filename for the \fBreadline\fP startup file, overriding the
+default of \fI~/.inputrc\fP (see \fBREADLINE\fP below).
+.SH READLINE
+When compiled with the GNU \fBreadline\fP library, the client supports
+fancy line editing and persistent history.  Its application name for
+application-specific settings is \fBEmpire\fP.  See the readline
+documentation for details.
 .SH "SEE ALSO"
-\fIemp_server\fR(6).
+\fIemp_server\fR(6), \fIreadline\fR(3).
+.SH FILES
+.TP
+.I ~/.inputrc
+Individual \fBreadline\fP initialization file
 .SH AUTHORS
 .nf
-Primary Author is Dave Pare (mr-frog@scam.berkeley.edu)
+Primary Author is Dave Pare <mr-frog@scam.berkeley.edu>
 Secondary authors/contributors may include:
-James Anderson (jwa@k.cs.cmu.edu)
-Jeff Anton (anton@postgres.berkeley.edu)
-Markus Armbruster (armbru@pond.sub.org)
-Phill Everson (everson@compsci.bristol.ac.uk)
-Steven Grimm (koreth@ucscb.UCSC.EDU)
-Lewis R. Jansen (lrj@helios.tn.cornell.edu)
-Mike St. Johns (stjohns@edn-vax.arpa)
-Ron Koenderink (rkoenderink@yahoo.ca)
-Nick Lai (lai@cs.ucla.edu)
-Shelley Louie (slouie@cory.berekely.edu)
-Steve McClure (ionica@empire.cx)
-Chris Metcalf (metcalf-christopher@yale.arpa)
-Dave Muir Sharnoff (muir@cogsci.berkeley.edu)
-Keith Muller (muller@sdcc7.ucsd.edu)
-Chuck Musciano (chuck@trantor.harris-atd.com)
-Jeff Okamoto (okamoto%hpccc@hplabs.hp.com)
-Julian Onions (jpo@computer-science.nottingham.ac.uk)
-Kurt Pires (kjpires@ic.berkeley.edu)
-Jim Reuter (reuter@decwrl.dec.com)
-Peter Vukovich (peterv@monet.berkeley.edu)
-Jeff Wallace (jeffw@scam.berkeley.edu)
-John Yockey (johny@verinet.com)
+James Anderson <jwa@k.cs.cmu.edu>
+Jeff Anton <anton@postgres.berkeley.edu>
+Markus Armbruster <armbru@pond.sub.org>
+Phill Everson <everson@compsci.bristol.ac.uk>
+Steven Grimm <koreth@ucscb.UCSC.EDU>
+Martin Haukeli <martin.haukeli@gmail.com>
+Lewis R. Jansen <lrj@helios.tn.cornell.edu>
+Mike St. Johns <stjohns@edn-vax.arpa>
+Ron Koenderink <rkoenderink@yahoo.ca>
+Nick Lai <lai@cs.ucla.edu>
+Shelley Louie <slouie@cory.berekely.edu>
+Steve McClure <ionica@empire.cx>
+Chris Metcalf <metcalf-christopher@yale.arpa>
+Dave Muir Sharnoff <muir@cogsci.berkeley.edu>
+Keith Muller <muller@sdcc7.ucsd.edu>
+Chuck Musciano <chuck@trantor.harris-atd.com>
+Jeff Okamoto <okamoto%hpccc@hplabs.hp.com>
+Julian Onions <jpo@computer-science.nottingham.ac.uk>
+Kurt Pires <kjpires@ic.berkeley.edu>
+Jim Reuter <reuter@decwrl.dec.com>
+Peter Vukovich <peterv@monet.berkeley.edu>
+Jeff Wallace <jeffw@scam.berkeley.edu>
+John Yockey <johny@verinet.com>