diff --git libcloud/common/base.py libcloud/common/base.py
index 9568124..9c8ea3f 100644
--- libcloud/common/base.py
+++ libcloud/common/base.py
@@ -785,27 +785,27 @@ class BaseDriver(object):
     def __init__(self, key, secret=None, secure=True, host=None, port=None,
                  api_version=None, **kwargs):
         """
-        @keyword    key:    API key or username to used
-        @type       key:    str
+        @param    key:    API key or username to used (required)
+        @type     key:    C{str}
 
-        @keyword    secret: Secret password to be used
-        @type       secret: str
+        @param    secret: Secret password to be used (required)
+        @type     secret: C{str}
 
-        @keyword    secure: Weither to use HTTPS or HTTP. Note: Some providers
+        @param    secure: Weither to use HTTPS or HTTP. Note: Some providers
                             only support HTTPS, and it is on by default.
-        @type       secure: bool
+        @type     secure: C{bool}
 
-        @keyword    host: Override hostname used for connections.
-        @type       host: str
+        @param    host: Override hostname used for connections.
+        @type     host: C{str}
 
-        @keyword    port: Override port used for connections.
-        @type       port: int
+        @param    port: Override port used for connections.
+        @type     port: C{int}
 
-        @keyword    api_version: Optional API version. Only used by drivers
+        @param    api_version: Optional API version. Only used by drivers
                                  which support multiple API versions.
-        @type       api_version: str
+        @type     api_version: C{str}
 
-        @requires: key, secret
+        @rtype: C{None}
         """
 
         self.key = key
diff --git libcloud/common/gandi.py libcloud/common/gandi.py
index 3f2a3a8..320c2ef 100644
--- libcloud/common/gandi.py
+++ libcloud/common/gandi.py
@@ -106,7 +106,14 @@ class BaseGandiDriver(object):
 
     def __init__(self, key, secret=None, secure=False):
         """
-        @requires: key, secret
+        @param    key:    API key or username to used (required)
+        @type     key:    C{str}
+
+        @param    secret: Secret password to be used (required)
+        @type     secret: C{str}
+
+        @param    secure: Weither to use HTTPS or HTTP.
+        @type     secure: C{bool}
         """
         self.key = key
         self.secret = secret
diff --git libcloud/compute/base.py libcloud/compute/base.py
index 6896dff..5ef6fac 100644
--- libcloud/compute/base.py
+++ libcloud/compute/base.py
@@ -446,9 +446,6 @@ class NodeDriver(BaseDriver):
 
     def __init__(self, key, secret=None, secure=True, host=None, port=None,
                  api_version=None, **kwargs):
-        """
-        @requires: key, secret
-        """
         super(NodeDriver, self).__init__(key=key, secret=secret, secure=secure,
                                          host=host, port=port,
                                          api_version=api_version, **kwargs)
diff --git libcloud/compute/drivers/brightbox.py libcloud/compute/drivers/brightbox.py
index 82d80f8..e10533f 100644
--- libcloud/compute/drivers/brightbox.py
+++ libcloud/compute/drivers/brightbox.py
@@ -56,9 +56,6 @@ class BrightboxNodeDriver(NodeDriver):
 
     def __init__(self, key, secret=None, secure=True, host=None, port=None,
                  api_version=API_VERSION, **kwargs):
-        """
-        @requires: key, secret
-        """
         super(BrightboxNodeDriver, self).__init__(key=key, secret=secret,
                                                   secure=secure,
                                                   host=host, port=port,
diff --git libcloud/compute/drivers/cloudstack.py libcloud/compute/drivers/cloudstack.py
index 690b4ce..f62a364 100644
--- libcloud/compute/drivers/cloudstack.py
+++ libcloud/compute/drivers/cloudstack.py
@@ -116,7 +116,13 @@ class CloudStackNodeDriver(CloudStackDriverMixIn, NodeDriver):
     def __init__(self, key, secret=None, secure=True, host=None,
                  path=None, port=None, *args, **kwargs):
         """
-        @requires: key, secret, host or path
+        @inherits: L{NodeDriver.__init__}
+
+        @param    host: The host where the API can be reached. (required)
+        @type     host: C{str}
+
+        @param    path: The host where the API can be reached. (required)
+        @type     path: C{str}
         """
         host = host if host else self.host
 
@@ -146,7 +152,7 @@ class CloudStackNodeDriver(CloudStackDriverMixIn, NodeDriver):
                 'hypervisor': img['hypervisor'],
                 'format': img['format'],
                 'os': img['ostypename'],
-            }))
+                }))
         return images
 
     def list_locations(self):
@@ -242,7 +248,7 @@ class CloudStackNodeDriver(CloudStackDriverMixIn, NodeDriver):
                 'zoneid': location.id,
                 'ip_addresses': [],
                 'forwarding_rules': [],
-            }
+                }
         )
 
     def destroy_node(self, node):
diff --git libcloud/compute/drivers/dummy.py libcloud/compute/drivers/dummy.py
index 185b367..77ed745 100644
--- libcloud/compute/drivers/dummy.py
+++ libcloud/compute/drivers/dummy.py
@@ -69,7 +69,10 @@ class DummyNodeDriver(NodeDriver):
 
     def __init__(self, creds):
         """
-        @requires: creds
+        @param  creds: Credentials
+        @type   creds: C{str}
+
+        @rtype: C{None}
         """
         self.creds = creds
         try:
diff --git libcloud/compute/drivers/ec2.py libcloud/compute/drivers/ec2.py
index 77831e3..27354c2 100644
--- libcloud/compute/drivers/ec2.py
+++ libcloud/compute/drivers/ec2.py
@@ -1321,7 +1321,10 @@ class EucNodeDriver(EC2NodeDriver):
     def __init__(self, key, secret=None, secure=True, host=None,
                  path=None, port=None):
         """
-        @requires: key, secret
+        @inherits: L{EC2NodeDriver.__init__}
+
+        @param    path: The host where the API can be reached.
+        @type     path: C{str}
         """
         super(EucNodeDriver, self).__init__(key, secret, secure, host, port)
         if path is None:
diff --git libcloud/compute/drivers/gandi.py libcloud/compute/drivers/gandi.py
index 3b19c3c..b396f59 100644
--- libcloud/compute/drivers/gandi.py
+++ libcloud/compute/drivers/gandi.py
@@ -53,6 +53,12 @@ class GandiNodeDriver(BaseGandiDriver, NodeDriver):
     # TODO : which features to enable ?
     features = {}
 
+    def __init__(self, *args, **kwargs):
+        """
+        @inherits: L{NodeDriver.__init__}
+        """
+        super(BaseGandiDriver, self).__init__(*args, **kwargs)
+
     def _resource_info(self, type, id):
         try:
             obj = self.connection.request('%s.info' % type, int(id))
diff --git libcloud/compute/drivers/gogrid.py libcloud/compute/drivers/gogrid.py
index 3a28c4e..9f569c2 100644
--- libcloud/compute/drivers/gogrid.py
+++ libcloud/compute/drivers/gogrid.py
@@ -103,6 +103,12 @@ class GoGridNodeDriver(BaseGoGridDriver, NodeDriver):
 
     _instance_types = GOGRID_INSTANCE_TYPES
 
+    def __init__(self, *args, **kwargs):
+        """
+        @inherits: L{NodeDriver.__init__}
+        """
+        super(GoGridNodeDriver, self).__init__(*args, **kwargs)
+
     def _get_state(self, element):
         try:
             return STATE[element['state']['name']]
diff --git libcloud/compute/drivers/joyent.py libcloud/compute/drivers/joyent.py
index a0928d5..4a48044 100644
--- libcloud/compute/drivers/joyent.py
+++ libcloud/compute/drivers/joyent.py
@@ -98,7 +98,10 @@ class JoyentNodeDriver(NodeDriver):
 
     def __init__(self, *args, **kwargs):
         """
-        @requires: key, secret
+        @inherits: L{NodeDriver.__init__}
+
+        @keyword    location: Location which should be used
+        @type       location: C{str}
         """
         if 'location' in kwargs:
             if kwargs['location'] not in LOCATIONS:
diff --git libcloud/compute/drivers/libvirt_driver.py libcloud/compute/drivers/libvirt_driver.py
index 4167937..adb4da0 100644
--- libcloud/compute/drivers/libvirt_driver.py
+++ libcloud/compute/drivers/libvirt_driver.py
@@ -49,7 +49,10 @@ class LibvirtNodeDriver(NodeDriver):
 
     def __init__(self, uri):
         """
-        @requires: uri
+        @param  uri: URI (required)
+        @type   uri: C{str}
+
+        @rtype: C{None}
         """
         if not have_libvirt:
             raise RuntimeError('Libvirt driver requires \'libvirt\' Python ' +
diff --git libcloud/compute/drivers/linode.py libcloud/compute/drivers/linode.py
index cf0ab03..786fde3 100644
--- libcloud/compute/drivers/linode.py
+++ libcloud/compute/drivers/linode.py
@@ -78,10 +78,10 @@ class LinodeNodeDriver(NodeDriver):
     def __init__(self, key):
         """Instantiate the driver with the given API key
 
-        @keyword key: the API key to use
-        @type key: C{str}
+        @param   key: the API key to use (required)
+        @type    key: C{str}
 
-        @requires: key
+        @rtype: C{None}
         """
         self.datacenter = None
         NodeDriver.__init__(self, key)
diff --git libcloud/compute/drivers/openstack.py libcloud/compute/drivers/openstack.py
index 23df12a..77716e8 100644
--- libcloud/compute/drivers/openstack.py
+++ libcloud/compute/drivers/openstack.py
@@ -175,9 +175,6 @@ class OpenStackNodeDriver(NodeDriver, OpenStackDriverMixin):
 
     def __new__(cls, key, secret=None, secure=True, host=None, port=None,
                 api_version=DEFAULT_API_VERSION, **kwargs):
-        """
-        @requires: key, secret
-        """
         if cls is OpenStackNodeDriver:
             if api_version == '1.0':
                 cls = OpenStack_1_0_NodeDriver
diff --git libcloud/compute/drivers/rimuhosting.py libcloud/compute/drivers/rimuhosting.py
index 5705267..eb81a91 100644
--- libcloud/compute/drivers/rimuhosting.py
+++ libcloud/compute/drivers/rimuhosting.py
@@ -120,7 +120,22 @@ class RimuHostingNodeDriver(NodeDriver):
     def __init__(self, key, host=API_HOST, port=443,
                  api_context=API_CONTEXT, secure=True):
         """
-        @requires: key, secret
+        @param    key: API key (required)
+        @type     key: C{str}
+
+        @param    host: hostname for connection
+        @type     host: C{str}
+
+        @param    port: Override port used for connections.
+        @type     port: C{int}
+
+        @param    api_context: Optional API context.
+        @type     api_context: C{str}
+
+        @param    secure: Weither to use HTTPS or HTTP.
+        @type     secure: C{bool}
+
+        @rtype: C{None}
         """
         # Pass in some extra vars so that
         self.key = key
diff --git libcloud/compute/drivers/softlayer.py libcloud/compute/drivers/softlayer.py
index 24e99eb..6f87a0d 100644
--- libcloud/compute/drivers/softlayer.py
+++ libcloud/compute/drivers/softlayer.py
@@ -266,7 +266,16 @@ class SoftLayerNodeDriver(NodeDriver):
 
     def __init__(self, key, secret=None, secure=False):
         """
-        @requires: key, secret
+        @param    key:    API key or username to used (required)
+        @type     key:    C{str}
+
+        @param    secret: Secret password to be used (required)
+        @type     secret: C{str}
+
+        @param    secure: Weither to use HTTPS or HTTP.
+        @type     secure: C{bool}
+
+        @rtype: C{None}
         """
         self.key = key
         self.secret = secret
diff --git libcloud/compute/drivers/vcl.py libcloud/compute/drivers/vcl.py
index b6f0a90..866d6e4 100644
--- libcloud/compute/drivers/vcl.py
+++ libcloud/compute/drivers/vcl.py
@@ -130,7 +130,22 @@ class VCLNodeDriver(NodeDriver):
     def __init__(self, key, secret, secure=True, host=None, port=None, *args,
                  **kwargs):
         """
-        @requires: key, secret, host
+        @param    key:    API key or username to used (required)
+        @type     key:    C{str}
+
+        @param    secret: Secret password to be used (required)
+        @type     secret: C{str}
+
+        @param    secure: Weither to use HTTPS or HTTP.
+        @type     secure: C{bool}
+
+        @param    host: Override hostname used for connections. (required)
+        @type     host: C{str}
+
+        @param    port: Override port used for connections.
+        @type     port: C{int}
+
+        @rtype: C{None}
         """
         if not host:
             raise Exception('When instantiating VCL driver directly ' +
diff --git libcloud/dns/base.py libcloud/dns/base.py
index 0ce57ec..d429c74 100644
--- libcloud/dns/base.py
+++ libcloud/dns/base.py
@@ -135,7 +135,23 @@ class DNSDriver(BaseDriver):
 
     def __init__(self, key, secret=None, secure=True, host=None, port=None, **kwargs):
         """
-        @requires: key, secret
+        @param    key:    API key or username to used (required)
+        @type     key:    C{str}
+
+        @param    secret: Secret password to be used (required)
+        @type     secret: C{str}
+
+        @param    secure: Weither to use HTTPS or HTTP. Note: Some providers
+                only support HTTPS, and it is on by default.
+        @type     secure: C{bool}
+
+        @param    host: Override hostname used for connections.
+        @type     host: C{str}
+
+        @param    port: Override port used for connections.
+        @type     port: C{int}
+
+        @rtype: C{None}
         """
         super(DNSDriver, self).__init__(key=key, secret=secret, secure=secure,
                                         host=host, port=port, **kwargs)
diff --git libcloud/dns/drivers/dummy.py libcloud/dns/drivers/dummy.py
index 36860e1..8d19aa8 100644
--- libcloud/dns/drivers/dummy.py
+++ libcloud/dns/drivers/dummy.py
@@ -35,7 +35,13 @@ class DummyDNSDriver(DNSDriver):
 
     def __init__(self, api_key, api_secret):
         """
-        @requires: api_key, api_secret
+        @param    api_key:    API key or username to used (required)
+        @type     api_key:    C{str}
+
+        @param    api_secret: Secret password to be used (required)
+        @type     api_secret: C{str}
+
+        @rtype: C{None}
         """
         self._zones = {}
 
diff --git libcloud/dns/drivers/rackspace.py libcloud/dns/drivers/rackspace.py
index 92473d7..beb7ea2 100644
--- libcloud/dns/drivers/rackspace.py
+++ libcloud/dns/drivers/rackspace.py
@@ -131,9 +131,6 @@ class RackspaceDNSDriver(DNSDriver, OpenStackDriverMixin):
     website = 'http://www.rackspace.com/'
 
     def __init__(self, *args, **kwargs):
-        """
-        @requires: key, secret
-        """
         OpenStackDriverMixin.__init__(self, *args, **kwargs)
         super(RackspaceDNSDriver, self).__init__(*args, **kwargs)