Some docstring fixes, and a link fix; exception fix in paste.lint0.9.8.1

4 files changed, 15 insertions, 7 deletions

diff --git a/docs/index.txt b/docs/index.txt
index 6186b29..ae6f824 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -66,7 +66,7 @@ Paste for Web Developers
 Documentation
 =============
 
-* `Contributing developer guidelines <DeveloperGuidelines>`_
+* `Contributing developer guidelines <DeveloperGuidelines.html>`_
 * `Style guide <StyleGuide.html>`_
 * `Testing applications with Paste <testing-applications.html>`_
 * `URL parsing with WSGI <url-parsing-with-wsgi.html>`_
diff --git a/paste/lint.py b/paste/lint.py
index 6b3aefb..908befb 100644
--- a/paste/lint.py
+++ b/paste/lint.py
@@ -311,7 +311,7 @@ def check_environ(environ):
             continue
         assert type(environ[key]) is StringType, (
             "Environmental variable %s is not a string: %r (value: %r)"
-            % (type(environ[key]), environ[key]))
+            % (key, type(environ[key]), environ[key]))
         
     assert type(environ['wsgi.version']) is TupleType, (
         "wsgi.version should be a tuple (%r)" % environ['wsgi.version'])
diff --git a/paste/proxy.py b/paste/proxy.py
index 40b886e..97a6d04 100644
--- a/paste/proxy.py
+++ b/paste/proxy.py
@@ -118,11 +118,18 @@ class Proxy(object):
 def make_proxy(global_conf, address, allowed_request_methods="",
                suppress_http_headers=""):
     """
-    Make a WSGI application that proxies to another address --
-    'address' should be the full URL ending with a trailing /
-    'allowed_request_methods' is a space seperated list of request methods
-    'suppress_http_headers' is a space seperated list of http headers (lower case, without the leading http_)
-        that should not be passed on to target host
+    Make a WSGI application that proxies to another address:
+    
+    ``address``
+        the full URL ending with a trailing ``/``
+        
+    ``allowed_request_methods``:
+        a space seperated list of request methods (e.g., ``GET POST``)
+        
+    ``suppress_http_headers``
+        a space seperated list of http headers (lower case, without
+        the leading ``http_``) that should not be passed on to target
+        host
     """
     from paste.deploy.converters import aslist
     allowed_request_methods = aslist(allowed_request_methods)
diff --git a/paste/wsgilib.py b/paste/wsgilib.py
index eb3b157..1653bf2 100644
--- a/paste/wsgilib.py
+++ b/paste/wsgilib.py
@@ -454,6 +454,7 @@ def capture_output(environ, start_response, application):
                 body = re.sub(r'<.*?>', '', body)
                 return [body]
             return replacement_app
+
     """
     warnings.warn(
         'wsgilib.capture_output has been deprecated in favor '