Doc tweaks and a missing 'rb'.

2 files changed, 7 insertions, 3 deletions

diff --git a/cherrypy/_cplogging.py b/cherrypy/_cplogging.py
index 15f26086..d6035bb8 100644
--- a/cherrypy/_cplogging.py
+++ b/cherrypy/_cplogging.py
@@ -61,7 +61,7 @@ class LogManager(object):
         return self.error(*args, **kwargs)
     
     def access(self):
-        """Write to the access log."""
+        """Write to the access log (in Apache/NCSA Combined Log format)."""
         request = cherrypy.request
         inheaders = request.headers
         remote = request.remote
diff --git a/cherrypy/wsgiserver/__init__.py b/cherrypy/wsgiserver/__init__.py
index 9c0e0336..3bfded43 100644
--- a/cherrypy/wsgiserver/__init__.py
+++ b/cherrypy/wsgiserver/__init__.py
@@ -1057,7 +1057,11 @@ class WorkerThread(threading.Thread):
 
 
 class ThreadPool(object):
-    """A Request Queue for the CherryPyWSGIServer which pools threads."""
+    """A Request Queue for the CherryPyWSGIServer which pools threads.
+    
+    ThreadPool objects must provide min, get(), put(obj), start()
+    and stop(timeout) attributes.
+    """
     
     def __init__(self, server, min=10, max=-1):
         self.server = server
@@ -1487,7 +1491,7 @@ class CherryPyWSGIServer(object):
     
     def populate_ssl_environ(self):
         """Create WSGI environ entries to be merged into each request."""
-        cert = open(self.ssl_certificate).read()
+        cert = open(self.ssl_certificate, 'rb').read()
         cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert)
         ssl_environ = {
             "wsgi.url_scheme": "https",