Merge from raven-branch. FEATURE_MULTIPLAYER has been disabled

temporarily until the netgame changes on raven-branch are finished.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2259

2 files changed, 19 insertions, 16 deletions

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)
diff --git a/man/docgen b/man/docgen
index 73e8c852..3016dc5a 100755
--- a/man/docgen
+++ b/man/docgen
@@ -150,11 +150,8 @@ config_files = {}
 show_vanilla_options = True
 
 class Parameter:
-    def __cmp__(self, other):
-        if self.name < other.name:
-            return -1
-        else:
-            return 1
+    def __lt__(self, other):
+        return self.name < other.name
 
     def __init__(self):
         self.text = ""
@@ -296,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
 
@@ -389,7 +386,7 @@ def print_template(template_file, content):
     try:
         for line in f:
             line = line.replace("@content", content)
-            print line.rstrip()
+            print(line.rstrip())
 
     finally:
         f.close()
@@ -407,7 +404,7 @@ def wiki_output(targets, template):
     read_wikipages()
 
     for t in targets:
-        print t.wiki_output()
+        print(t.wiki_output())
 
 def plaintext_output(targets, template_file):
 
@@ -419,13 +416,13 @@ def plaintext_output(targets, template_file):
     print_template(template_file, content)
 
 def usage():
-    print "Usage: %s [-V] [-c filename ]( -m | -w | -p ) <directory>" \
-            % sys.argv[0]
-    print "   -c :  Provide documentation for the specified configuration file"
-    print "   -m :  Manpage output"
-    print "   -w :  Wikitext output"
-    print "   -p :  Plaintext output"
-    print "   -V :  Don't show Vanilla Doom options"
+    print("Usage: %s [-V] [-c filename ]( -m | -w | -p ) <directory>" \
+            % sys.argv[0])
+    print("   -c :  Provide documentation for the specified configuration file")
+    print("   -m :  Manpage output")
+    print("   -w :  Wikitext output")
+    print("   -p :  Plaintext output")
+    print("   -V :  Don't show Vanilla Doom options")
     sys.exit(0)
 
 # Parse command line