diff --git a/docs/dns-changes.rst b/docs/dns-changes.rst
new file mode 100644
index 000000000000..ba3e0f44a414
--- /dev/null
+++ b/docs/dns-changes.rst
@@ -0,0 +1,7 @@
+Change Sets
+~~~~~~~~~~~
+
+.. automodule:: gcloud.dns.changes
+  :members:
+  :undoc-members:
+  :show-inheritance:
diff --git a/docs/dns-client.rst b/docs/dns-client.rst
new file mode 100644
index 000000000000..d6c8ac49ad89
--- /dev/null
+++ b/docs/dns-client.rst
@@ -0,0 +1,15 @@
+DNS Client
+==========
+
+.. automodule:: gcloud.dns.client
+  :members:
+  :undoc-members:
+  :show-inheritance:
+
+Connection
+~~~~~~~~~~
+
+.. automodule:: gcloud.dns.connection
+  :members:
+  :undoc-members:
+  :show-inheritance:
diff --git a/docs/dns-resource_record_set.rst b/docs/dns-resource_record_set.rst
new file mode 100644
index 000000000000..e68df9f58f90
--- /dev/null
+++ b/docs/dns-resource_record_set.rst
@@ -0,0 +1,7 @@
+Resource Record Sets
+~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: gcloud.dns.resource_record_set
+  :members:
+  :undoc-members:
+  :show-inheritance:
diff --git a/docs/dns-zone.rst b/docs/dns-zone.rst
new file mode 100644
index 000000000000..059f535d6356
--- /dev/null
+++ b/docs/dns-zone.rst
@@ -0,0 +1,7 @@
+Managed Zones
+~~~~~~~~~~~~~
+
+.. automodule:: gcloud.dns.zone
+  :members:
+  :undoc-members:
+  :show-inheritance:
diff --git a/docs/index.rst b/docs/index.rst
index a9b024ce9ad2..1a5915cc5dd6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -64,6 +64,10 @@
   :caption: DNS
 
   dns-usage
+  Client <dns-client>
+  dns-zone
+  dns-resource_record_set
+  dns-changes
 
 .. toctree::
   :maxdepth: 0
diff --git a/gcloud/dns/changes.py b/gcloud/dns/changes.py
index 29a42f318abc..84795cba1e8e 100644
--- a/gcloud/dns/changes.py
+++ b/gcloud/dns/changes.py
@@ -129,7 +129,7 @@ def additions(self):
         """Resource record sets to be added to the zone.
 
         :rtype: sequence of
-                :class:`gcloud.dns.resource_record_set.ResourceRecordSet'.
+                :class:`gcloud.dns.resource_record_set.ResourceRecordSet`.
         :returns: record sets appended via :meth:`add_record_set`
         """
         return self._additions
@@ -139,7 +139,7 @@ def deletions(self):
         """Resource record sets to be deleted from the zone.
 
         :rtype: sequence of
-                :class:`gcloud.dns.resource_record_set.ResourceRecordSet'.
+                :class:`gcloud.dns.resource_record_set.ResourceRecordSet`.
         :returns: record sets appended via :meth:`delete_record_set`
         """
         return self._deletions
@@ -148,7 +148,7 @@ def add_record_set(self, record_set):
         """Append a record set to the 'additions' for the change set.
 
         :type record_set:
-            :class:`gcloud.dns.resource_record_set.ResourceRecordSet'
+            :class:`gcloud.dns.resource_record_set.ResourceRecordSet`
         :param record_set: the record set to append
 
         :raises: ``ValueError`` if ``record_set`` is not of the required type.
@@ -161,7 +161,7 @@ def delete_record_set(self, record_set):
         """Append a record set to the 'deletions' for the change set.
 
         :type record_set:
-            :class:`gcloud.dns.resource_record_set.ResourceRecordSet'
+            :class:`gcloud.dns.resource_record_set.ResourceRecordSet`
         :param record_set: the record set to append
 
         :raises: ``ValueError`` if ``record_set`` is not of the required type.