diff --git a/doc/modules/wsgi.rst b/doc/modules/wsgi.rst
index 798bb95..9c69db4 100644
--- a/doc/modules/wsgi.rst
+++ b/doc/modules/wsgi.rst
@@ -1,5 +1,29 @@
 :mod:`wsgi` -- WSGI server
 ===========================
 
+The wsgi module provides a simple an easy way to start an event-driven 
+`WSGI <http://wsgi.org/wsgi/>`_ server.  This can serve as an embedded
+web server in an application, or as the basis for a more full-featured web
+server package.  One such package is `Spawning <http://pypi.python.org/pypi/Spawning/>`_.
+
+To launch a wsgi server, simply create a socket and call :func:`eventlet.wsgi.server` with it::
+
+    from eventlet import wsgi
+    from eventlet.green import socket
+    
+    def hello_world(env, start_response):
+        start_response('200 OK', [('Content-Type', 'text/plain')])
+        return ['Hello, World!\r\n']
+    
+    sock = socket.socket()
+    sock.bind(('', 8090))
+    sock.listen(500)
+    
+    wsgi.server(sock, hello_world)
+
+
+You can find a slightly more elaborate version of this code in the file
+``examples/wsgi.py``.
+
 .. automodule:: eventlet.wsgi
 	:members:
diff --git a/eventlet/wsgi.py b/eventlet/wsgi.py
index cbca82b..9da7b63 100644
--- a/eventlet/wsgi.py
+++ b/eventlet/wsgi.py
@@ -442,7 +442,7 @@ def server(sock, site,
            log_x_forwarded_for=True,
            custom_pool=None,
            log_format=DEFAULT_LOG_FORMAT):
-    """  Start up a `WSGI <http://wsgi.org/wsgi/>`_ server handling requests from the supplied server 
+    """  Start up a wsgi server handling requests from the supplied server 
     socket.  This function loops forever.
     
     :param sock: Server socket, must be already bound to a port and listening.
@@ -450,12 +450,13 @@ def server(sock, site,
     :param log: File-like object that logs should be written to.  If not specified, sys.stderr is used.
     :param environ: Additional parameters that go into the environ dictionary of every request.
     :param max_size: Maximum number of client connections opened at any time by this server.
+    :param max_http_version: Set to "HTTP/1.0" to make the server pretend it only supports HTTP 1.0.  The primary reason to do this is to prevent clients from keeping connections open with keepalives.
     :param protocol: Protocol class.  Deprecated.
     :param server_event: Used to collect the Server object.  Deprecated.
     :param minimum_chunk_size: Minimum size in bytes for http chunks.  This  can be used to improve performance of applications which yield many small strings, though using it technically violates the WSGI spec.
     :param log_x_forwarded_for: If True (the default), logs the contents of the x-forwarded-for header in addition to the actual client ip address in the 'client_ip' field of the log line.
     :param custom_pool: A custom Pool instance which is used to spawn client green threads.  If this is supplied, max_size is ignored.
-    :param log_formar: A python format string that is used as the template to generate log lines.  The following values can be formatted into it: client_ip, date_time, request_line, status_code, body_length, wall_seconds.  Look at DEFAULT_LOG_FORMAT for an example of how to use this.
+    :param log_formar: A python format string that is used as the template to generate log lines.  The following values can be formatted into it: client_ip, date_time, request_line, status_code, body_length, wall_seconds.  Look the default for an example of how to use this.
     """
     serv = Server(sock, sock.getsockname(), 
                   site, log, 
diff --git a/examples/wsgi.py b/examples/wsgi.py
index 150fead..93469fd 100644
--- a/examples/wsgi.py
+++ b/examples/wsgi.py
@@ -5,8 +5,8 @@ multiple threads, and graceful code reloading, see:
 http://pypi.python.org/pypi/Spawning/
 """
 
-from eventlet import api, wsgi
-
+from eventlet import wsgi
+from eventlet.green import socket
 
 def hello_world(env, start_response):
     if env['PATH_INFO'] != '/':
@@ -14,7 +14,9 @@ def hello_world(env, start_response):
         return ['Not Found\r\n']
     start_response('200 OK', [('Content-Type', 'text/plain')])
     return ['Hello, World!\r\n']
+        
+sock = socket.socket()
+sock.bind(('', 8090))
+sock.listen(500)
 
-
-wsgi.server(api.tcp_listener(('', 8080)), hello_world)
-
+wsgi.server(sock, hello_world)