diff --git a/docs/index.rst b/docs/index.rst
index 4e35d2c..43af1f6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -349,6 +349,9 @@ first add ``MW1`` and then ``MW2``.
     def foo(sid):
         # ...
 
+Note: if an event has a handler in a class-based namespace, and also a
+decorator-based function handler, the standalone function handler is invoked.
+
 Using a Message Queue
 ---------------------
 
diff --git a/socketio/server.py b/socketio/server.py
index f1ceb61..d87f714 100644
--- a/socketio/server.py
+++ b/socketio/server.py
@@ -161,9 +161,9 @@ class Server(object):
     def register_namespace(self, namespace_handler):
         """Register a namespace handler object.
 
-        :param namespace_handler: A namespace subclass that handles all the
-                                  event traffic for a namespace. This method
-                                  accepts the class itself, or an instance.
+        :param namespace_handler: An instance of a :class:`Namespace`
+                                  subclass that handles all the event traffic
+                                  for a namespace.
         """
         if not isinstance(namespace_handler, namespace.Namespace):
             raise ValueError('Not a namespace instance')