From f4eb88dd2322db7831563ad55f8b6c45516906f9 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 12 Dec 2010 13:11:11 +0000
Subject: Add -privateserver and -servername options to chocolate-server
 manpage. Add server registration option to setup tool (thanks exp(x)).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2220
---
 man/chocolate-server.6 | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'man')

diff --git a/man/chocolate-server.6 b/man/chocolate-server.6
index 65d0a3fe..f37173f2 100644
--- a/man/chocolate-server.6
+++ b/man/chocolate-server.6
@@ -29,6 +29,12 @@ mean the netgame will simply not function at all.
 .TP
 \fB-port <n>\fR
 Use the specified UDP port for communications, instead of the default (2342). 
+.TP
+\fB-privateserver\fR
+Don't register with the global master server.
+.TP
+\fB-servername <name>\fR
+Specify a name for the server.
 .SH SEE ALSO
 \fBchocolate-doom\fR(6),
 \fBchocolate-setup\fR(6)
-- 
cgit v1.2.3


From 463bcf013ce355398974953508d232ac88a6b2d6 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 18 Dec 2010 23:55:07 +0000
Subject: Add a M_CheckParmWithArgs function, that behaves like M_CheckParm but
 also checks that extra options were provided on the command line (thanks
 Sander van Dijk).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2223
---
 man/docgen | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'man')

diff --git a/man/docgen b/man/docgen
index bfde7aef..3016dc5a 100755
--- a/man/docgen
+++ b/man/docgen
@@ -293,10 +293,10 @@ def add_parameter(param, line, config_file):
 
     # Is this documenting a command line parameter?
 
-    match = re.search('M_CheckParm\s*\(\s*"(.*?)"\s*\)', line)
+    match = re.search('M_CheckParm(WithArgs)?\s*\(\s*"(.*?)"', line)
 
     if match:
-        param.name = match.group(1)
+        param.name = match.group(2)
         categories[param.category].add_param(param)
         return
 
-- 
cgit v1.2.3