diff --git a/docs/datastore-api.rst b/docs/datastore-api.rst
index 16aabfabb534..536aa039ba18 100644
--- a/docs/datastore-api.rst
+++ b/docs/datastore-api.rst
@@ -10,10 +10,9 @@ Datastore
 :mod:`gcloud.datastore`
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-.. automodule:: gcloud.datastore.__init__
-  :members:
-  :undoc-members:
-  :show-inheritance:
+.. automodule:: gcloud.datastore
+  :members: get_connection, get_default_connection, get_default_dataset_id,
+            set_default_connection, set_default_dataset_id, set_defaults
 
 Connections
 ~~~~~~~~~~~
diff --git a/docs/pubsub-api.rst b/docs/pubsub-api.rst
index 2f6e609b6526..0346bd1b09dc 100644
--- a/docs/pubsub-api.rst
+++ b/docs/pubsub-api.rst
@@ -8,10 +8,9 @@ Pub/Sub
 :mod:`gcloud.pubsub`
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-.. automodule:: gcloud.pubsub.__init__
-  :members:
-  :undoc-members:
-  :show-inheritance:
+.. automodule:: gcloud.pubsub
+  :members: get_connection, get_default_connection,
+            set_default_connection, set_defaults
 
 Connections
 ~~~~~~~~~~~
diff --git a/docs/storage-api.rst b/docs/storage-api.rst
index b3fc4cc661d5..6cbced11a7f6 100644
--- a/docs/storage-api.rst
+++ b/docs/storage-api.rst
@@ -10,10 +10,9 @@ Storage
 :mod:`gcloud.storage`
 ~~~~~~~~~~~~~~~~~~~~~
 
-.. automodule:: gcloud.storage.__init__
-  :members:
-  :undoc-members:
-  :show-inheritance:
+.. automodule:: gcloud.storage
+  :members: get_connection, get_default_connection, get_default_bucket,
+            set_default_connection, set_default_bucket, set_defaults
 
 Connections
 ~~~~~~~~~~~
diff --git a/gcloud/datastore/__init__.py b/gcloud/datastore/__init__.py
index f5bfa7de4cc4..b8b8ba9b1344 100644
--- a/gcloud/datastore/__init__.py
+++ b/gcloud/datastore/__init__.py
@@ -71,10 +71,12 @@ def set_defaults(dataset_id=None, connection=None):
     """Set defaults either explicitly or implicitly as fall-back.
 
     Uses the arguments to call the individual default methods
+
     - set_default_dataset_id
     - set_default_connection
 
     In the future we will likely enable methods like
+
     - set_default_namespace
 
     :type dataset_id: string