Added descriptions, options

3 files changed, 27 insertions, 6 deletions

diff --git a/paste/servers/cgi_server.py b/paste/servers/cgi_server.py
index 7bf8ce3..02bd308 100644
--- a/paste/servers/cgi_server.py
+++ b/paste/servers/cgi_server.py
@@ -28,3 +28,15 @@ def serve(conf, app):
     print "if __name__ == '__main__':"
     print "    from paste.cgiserver import run_with_cgi"
     print "    run_with_cgi(app)"
+
+description = """\
+A 'server' that creates a CGI script that you can use to invoke your
+application.
+"""
+
+help = """\
+Typically you would use this like:
+
+  %prog --server=cgi > .../cgi-bin/myapp.cgi
+  chmod +x .../cgi-bin/myapp.cgi
+"""
diff --git a/paste/servers/scgi_server/__init__.py b/paste/servers/scgi_server/__init__.py
index 0ef4e56..a2a2f0d 100644
--- a/paste/servers/scgi_server/__init__.py
+++ b/paste/servers/scgi_server/__init__.py
@@ -5,3 +5,12 @@ from scgiserver import serve_application
 def serve(conf, app):
     prefix = conf.get('scgi_prefix', '/')
     serve_application(app, prefix, port=int(conf.get('port', 4000)))
+
+options = [
+    ('port', 'Port to serve on (default 4000).'),
+    ]
+
+description = """\
+A pre-forking SCGI server.  SCGI is a FastCGI alternative
+(see <http://www.mems-exchange.org/software/scgi/> for more).
+"""
diff --git a/paste/servers/wsgiutils_server.py b/paste/servers/wsgiutils_server.py
index 00ff182..137e41b 100644
--- a/paste/servers/wsgiutils_server.py
+++ b/paste/servers/wsgiutils_server.py
@@ -9,11 +9,11 @@ def serve(conf, app):
     server.serve_forever()
 
 description = """\
-WSGIUtils is a small threaded server using Python's standard
-SimpleHTTPServer.
+WSGIUtils <http://www.owlfish.com/software/wsgiutils/> is a small
+threaded server using Python's standard SimpleHTTPServer.
 """
 
-options = {
-    'port': 'Port to serve on (default: 8080)',
-    'host': 'Host to serve from (default: localhost, which is only accessible from the local computer; use 0.0.0.0 to make your application public)',
-    }
+options = [
+    ('port', 'Port to serve on (default: 8080)'),
+    ('host', 'Host to serve from (default: localhost, which is only accessible from the local computer; use 0.0.0.0 to make your application public)'),
+    ]