[SCM] Quake 3 engine branch, master, updated. 407b8079a76b978d094fc2972572969bc273f905

Fri Oct 15 20:17:55 UTC 2010

The following commit has been merged in the master branch:
commit cc1cb4a9ad481a207a6d4dcd911cd72c2963862f
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Oct 15 20:59:12 2010 +0100

    Rename the ioquake3-server man page to ioq3ded to match the binary, and update the man pages

diff --git a/debian/changelog b/debian/changelog
index 6534dd7..48769a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ioquake3 (1.36+svn1788j-2) UNRELEASED; urgency=low
     compiler flags except -O0, if DEB_BUILD_OPTIONS contains "noopt"
   * Use build/ rather than build/flavour-arch-os/ for both flavours of build
     (debug and release)
+  * Rename the ioquake3-server man page to ioq3ded to match the binary, and
+    update the man pages
 
  -- Simon McVittie <smcv at debian.org>  Thu, 14 Oct 2010 23:36:27 +0100
 
diff --git a/debian/ioq3ded.6 b/debian/ioq3ded.6
new file mode 100644
index 0000000..bdca40e
--- /dev/null
+++ b/debian/ioq3ded.6
@@ -0,0 +1,104 @@
+.TH IOQ3DED 6 "2010-10-15"
+
+.SH NAME
+ioq3ded \- ioQuake3 game engine (dedicated server)
+
+.SH SYNOPSIS
+.BR /usr/lib/ioquake3/ioq3ded " [" +set " "
+.IR option " " value ]...
+
+.SH DESCRIPTION
+\fBioquake3-server\fP is the dedicated server for the ioQuake3 game engine.
+.PP
+The version provided in Debian is not usually useful to run directly, and
+is not included in the \fBPATH\fR. The \fBopenarena\fR and
+\fBquake3\fR Debian packages provide wrapper scripts to launch servers
+for particular games.
+
+.SH OPTIONS
+.PP
+Any console command can be prefixed with \fB+\fR and used as a
+command-line option (run the server in a terminal to use the console).
+The \fB+set\fR command is generally the most useful to use on the command line,
+but things like \fB+map\fR also work.
+.PP
+Options that can be set with \fB+set\fR
+(note that this is not a full list!) include:
+.PP
+\fBcapturelimit\fR <value>
+.PP
+\fBdedicated\fR <bool>
+.PP
+\fBfraglimit\fR <value>
+.PP
+\fBfs_basepath\fR <string>
+.PP
+\fBfs_game\fR <value>
+.PP
+\fBg_allowVote\fR <bool>
+.PP
+\fBg_banIPs\fR <IP address>
+.PP
+\fBg_doWarmup\fR <bool>
+.PP
+\fBg_friendlyFire\fR <bool>
+.PP
+\fBg_gametype\fR <bool>
+.PP
+\fBg_gravity\fR <value>
+.PP
+\fBg_inactivity\fR <value>
+.PP
+\fBg_maxGameClients\fR <value>
+.PP
+\fBg_motd\fR <string>
+.PP
+\fBg_needpass\fR <bool>
+.PP
+\fBg_password\fR <string>
+.PP
+\fBg_quadfactor\fR <value>
+.PP
+\fBg_weaponrespawn\fR <value>
+.PP
+\fBnet_ip\fR <IP adress>
+.PP
+\fBnet_port\fR <value>
+.PP
+\fBnet_qport\fR <value>
+.PP
+\fBnextmap\fR <string>
+.PP
+\fBsv_allowDownload\fR <bool>
+.PP
+\fBsv_floodProtect\fR <bool>
+.PP
+\fBsv_fps\fR <value>
+.PP
+\fBsv_hostname\fR <string>
+.PP
+\fBsv_maxclients\fR <value>
+.PP
+\fBsv_maxPing\fR <value>
+(Measurd in milliseconds)
+.PP
+\fBsv_minPing\fR <value>
+(Measurd in milliseconds)
+.PP
+\fBsv_pure\fR <bool>
+.PP
+\fBtimelimit\fR <value>
+(Measured in minutes)
+
+.SH SEE ALSO
+.BR ioquake3 (6),
+.BR openarena-server (6),
+.BR quake3-server (6),
+/usr/share/doc/ioquake3-server
+
+.SH AUTHOR
+ioQuake3 was written by id Software Inc. and the ioQuake3 Team.
+.PP
+This manual page was written by Bruno "Fuddl" Kleinert <fuddl at debian.org>
+and Simon McVittie <smcv at debian.org>, for the Debian project
+(but may be used by others).
diff --git a/debian/ioquake3-server.6 b/debian/ioquake3-server.6
deleted file mode 100644
index dd70842..0000000
--- a/debian/ioquake3-server.6
+++ /dev/null
@@ -1,26 +0,0 @@
-.TH IOQUAKE3 6 "July  17, 2010"
-.SH NAME
-ioquake3-server \- ioQuake3 engine dedicated server
-.SH SYNOPSIS
-.PP
-\fBioquake3-server\fR [\fB+set \fIoption\fR \fIvalue\fR\fP] ...
-.SH DESCRIPTION
-This manual page documents briefly the
-.B ioquake3-server
-command.
-.PP
-\fBioquake3-server\fP is the dedicated server of the ioQuake3 game engine.
-.SH OPTIONS
-.PP
-Possible options which are passed by +set option value are the same, as the server commands which the interactive command line interface of the server accepts.
-.PP
-.SH SEE ALSO
-.BR ioquake3 (6)
-.br
-/usr/share/doc/ioquake3-server
-.br
-.SH AUTHOR
-ioquake3-server was written by id Software Inc. and the ioQuake3 Team.
-.PP
-This manual page was written by Bruno "Fuddl" Kleinert <fuddl at debian.org>,
-for the Debian project (but may be used by others).
diff --git a/debian/ioquake3-server.manpages b/debian/ioquake3-server.manpages
index 7e60268..1758586 100644
--- a/debian/ioquake3-server.manpages
+++ b/debian/ioquake3-server.manpages
@@ -1 +1 @@
-debian/ioquake3-server.6
+debian/ioq3ded.6
diff --git a/debian/ioquake3.6 b/debian/ioquake3.6
index 873ea48..0e01762 100644
--- a/debian/ioquake3.6
+++ b/debian/ioquake3.6
@@ -1,20 +1,36 @@
-.TH IOQUAK3 6 "July  17, 2010"
+.TH IOQUAKE3 6 "2010-10-15"
+
 .SH NAME
-ioquake3 \- ioQuake3 game engine client
+ioquake3 \- ioQuake3 game engine (client)
+
 .SH SYNOPSIS
-.PP
-\fBioquake3\fR [\fB+set \fIoption\fR \fIvalue\fR\fP] ...
+.BR /usr/lib/ioquake3/ioquake3 " [" +set " "
+.IR option " " value ]...
+
 .SH DESCRIPTION
 This manual page documents briefly the
 .B ioquake3
 command.
 .PP
 \fBioquake3\fP is the game engine client for ioQuake3 based games.
+.PP
+The version provided in Debian is not usually useful to run directly, and
+is not included in the \fBPATH\fR. The \fBopenarena\fR and
+\fBquake3\fR Debian packages provide wrapper scripts to launch particular
+games.
+
 .SH OPTIONS
 .PP
-Options passed by "+set <option> <value>" are the same as the in-game console accepts. For the in-game console press <Shift>+<Esc> to open/close it.
-.br
-(Note that this is not a full list!)
+Any console command can be prefixed with \fB+\fR and used as a
+command-line option (press Shift+Esc to access the in-game console), including:
+.TP
+\fB+set\fR \fIoption\fR \fIvalue\fR
+Set an option (see below for some options)
+.TP
+\fB+connect\fR \fIserver\fR[\fB:\fIport\fR]
+Connect to a server
+.PP
+Options which can be set using \fB+set\fR include:
 .TP
 \fBr_fullscreen\fR <bool>
 1: Play in fullscreen mode; 0: Play in window mode
@@ -28,12 +44,16 @@ Use \fUpixels\fR as width if r_mode is set to \-1.
 \fBr_customheight\fR <pixels>
 Use \fUpixels\fR as height if r_mode is set to \-1.
 .PP
+
 .SH SEE ALSO
-.BR ioquake3-server (6)
-.br
+.BR ioquake3-server (6),
+.BR openarena (6),
+.BR quake3 (6),
 /usr/share/doc/ioquake3
+
 .SH AUTHOR
 ioquake3 was written by id Software Inc. and the ioQuake3 Team.
 .PP
-This manual page was written by Bruno "Fuddl" Kleinert <fuddl at debian.org>,
-for the Debian project (but may be used by others).
+This manual page was written by Bruno "Fuddl" Kleinert <fuddl at debian.org>
+and Simon McVittie <smcv at debian.org>, for the Debian project
+(but may be used by others).

-- 
Quake 3 engine

