Signed CONTRIBUTORS.txt and changes for review

5 files changed, 9 insertions, 7 deletions

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 40b7960..32ea0ba 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -142,3 +142,5 @@ Contributors
 - David D Lowe, 2017-06-02
 
 - Jack Wearden, 2018-05-18
+
+- Frank Krick, 2018-10-29
diff --git a/docs/arguments.rst b/docs/arguments.rst
index 9ca5644..b176c00 100644
--- a/docs/arguments.rst
+++ b/docs/arguments.rst
@@ -53,12 +53,12 @@ unix_socket_perms
 
 sockets
     .. versionadded:: 1.1.1
-        A list of sockets. The sockets can be internet or unix sockets and have to be bound.
+        A list of sockets. The sockets can be Internet or UNIX sockets and have to be bound.
         If the socket list is not empty, waitress creates one server for each socket.
         Default is ``[]``.
 
         .. warning::
-            May not be used with ``listen``, ``host`` and/or ``port`` or ``unix_socket``
+            May not be used with ``listen``, ``host``, ``port`` or ``unix_socket``
 
 threads
     number of threads used to process application logic (integer), default
diff --git a/docs/socket-activation.rst b/docs/socket-activation.rst
index 008bb9f..27f856b 100644
--- a/docs/socket-activation.rst
+++ b/docs/socket-activation.rst
@@ -2,10 +2,10 @@ Socket Activation
 -----------------
 
 While waitress does not support the various implementations of socket activation,
-e.g. using systemd or launchd, it is prepared to receive pre-bound applications
+for example using systemd or launchd, it is prepared to receive pre-bound applications
 from an init system.
 
-The following shows a code example starting waitress with three different,
+The following shows a code example starting waitress with three different
 pre-bound sockets.
 
 .. code-block:: python
@@ -41,7 +41,7 @@ pre-bound sockets.
 
 Generally, to implement socket activation for a given init system, a wrapper
 script uses the init system specific libraries to retrieve the sockets from
-the init system. Afterwards it starts waitress passing the sockets with the parameter
+the init system. Afterwards it starts waitress, passing the sockets with the parameter
 ``sockets``. Note that the sockets have to be bound, which all init systems
 supporting socket activation do.
 
diff --git a/waitress/adjustments.py b/waitress/adjustments.py
index 8474236..91b67a6 100644
--- a/waitress/adjustments.py
+++ b/waitress/adjustments.py
@@ -235,7 +235,7 @@ class Adjustments(object):
             raise ValueError('socket may not be set if listen is set.')
 
         if 'sockets' in kw and ('host' in kw or 'port' in kw):
-            raise ValueError('host and or port may not be set if sockets is set.')
+            raise ValueError('host or port may not be set if sockets is set.')
 
         if 'sockets' in kw and 'unix_socket' in kw:
             raise ValueError('unix_socket may not be set if sockets is set')
diff --git a/waitress/tests/test_adjustments.py b/waitress/tests/test_adjustments.py
index dd597df..0304c94 100644
--- a/waitress/tests/test_adjustments.py
+++ b/waitress/tests/test_adjustments.py
@@ -56,7 +56,7 @@ class Test_as_socket_list(unittest.TestCase):
         sockets = [
             socket.socket(socket.AF_INET, socket.SOCK_STREAM),
             socket.socket(socket.AF_INET6, socket.SOCK_STREAM)]
-        if hasattr(sockets, 'AF_UNIX'):
+        if hasattr(socket, 'AF_UNIX'):
             sockets.append(socket.socket(socket.AF_UNIX, socket.SOCK_STREAM))
         new_sockets = as_socket_list(sockets)
         self.assertEqual(sockets, new_sockets)