diff --git a/tox.ini b/tox.ini
index 23dd7c6e..c179eaac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,7 @@ commands = {posargs}
 
 [testenv:docs]
 deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -b html doc/source doc/build/html
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
 deps = -r{toxinidir}/doc/requirements.txt
diff --git a/zaqarclient/queues/v1/client.py b/zaqarclient/queues/v1/client.py
index 22b33c21..7478ef08 100644
--- a/zaqarclient/queues/v1/client.py
+++ b/zaqarclient/queues/v1/client.py
@@ -32,15 +32,10 @@ class Client(object):
     :type url: `six.text_type`
     :param version: API Version pointing to.
     :type version: `int`
-    :param options: Extra options:
-        - client_uuid: Custom client uuid. A new one
-        will be generated, if not passed.
-        - auth_opts: Authentication options:
-            - backend
-            - options
+    :param conf: CONF object.
+    :type conf: `oslo_config.cfg.CONF`
     :param session: keystone session. But it's just place holder, we wont'
         support it in v1.
-    :type options: `dict`
     """
 
     queues_module = queues
@@ -148,7 +143,7 @@ class Client(object):
         """Gets a list of pools from the server
 
         :param params: Filters to use for getting pools
-        :type params: **kwargs dict.
+        :type params: dict.
 
         :returns: A list of pools
         :rtype: `list`
@@ -179,7 +174,7 @@ class Client(object):
         """Gets a list of flavors from the server
 
         :param params: Filters to use for getting flavors
-        :type params: **kwargs dict.
+        :type params: dict.
 
         :returns: A list of flavors
         :rtype: `list`
diff --git a/zaqarclient/queues/v2/client.py b/zaqarclient/queues/v2/client.py
index e158fc74..cc7c7d2b 100644
--- a/zaqarclient/queues/v2/client.py
+++ b/zaqarclient/queues/v2/client.py
@@ -29,13 +29,8 @@ class Client(client.Client):
     :type url: `six.text_type`
     :param version: API Version pointing to.
     :type version: `int`
-    :param options: Extra options:
-        - client_uuid: Custom client uuid. A new one
-        will be generated, if not passed.
-        - auth_opts: Authentication options:
-            - backend
-            - options
-    :type options: `dict`
+    :param conf: CONF object.
+    :type conf: `oslo_config.cfg.CONF`
     """
 
     queues_module = queues
@@ -78,7 +73,7 @@ class Client(client.Client):
         """Gets a list of subscriptions from the server
 
         :param params: Filters to use for getting subscriptions
-        :type params: **kwargs dict.
+        :type params: dict.
 
         :returns: A list of subscriptions
         :rtype: `list`