diff --git a/discord/guild.py b/discord/guild.py
index 0ffd8168d..d1f1c8373 100644
--- a/discord/guild.py
+++ b/discord/guild.py
@@ -47,17 +47,17 @@ class Guild(Hashable):
 
     Supported Operations:
 
-    +-----------+--------------------------------------+
-    | Operation |             Description              |
-    +===========+======================================+
+    +-----------+-------------------------------------+
+    | Operation |             Description             |
+    +===========+=====================================+
     | x == y    | Checks if two guilds are equal.     |
-    +-----------+--------------------------------------+
+    +-----------+-------------------------------------+
     | x != y    | Checks if two guilds are not equal. |
-    +-----------+--------------------------------------+
+    +-----------+-------------------------------------+
     | hash(x)   | Returns the guild's hash.           |
-    +-----------+--------------------------------------+
+    +-----------+-------------------------------------+
     | str(x)    | Returns the guild's name.           |
-    +-----------+--------------------------------------+
+    +-----------+-------------------------------------+
 
     Attributes
     ----------
diff --git a/docs/api.rst b/docs/api.rst
index 0907e30bb..bcbf1f471 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -724,17 +724,35 @@ PermissionOverwrite
 .. autoclass:: PermissionOverwrite
     :members:
 
-Channel
-~~~~~~~~
 
-.. autoclass:: Channel
+TextChannel
+~~~~~~~~~~~~
+
+.. autoclass:: TextChannel
+    :members:
+    :inherited-members:
+
+VoiceChannel
+~~~~~~~~~~~~~
+
+.. autoclass:: VoiceChannel
     :members:
+    :inherited-members:
 
-PrivateChannel
-~~~~~~~~~~~~~~~
+DMChannel
+~~~~~~~~~
+
+.. autoclass:: DMChannel
+    :members:
+    :inherited-members:
 
-.. autoclass:: PrivateChannel
+GroupChannel
+~~~~~~~~~~~~
+
+.. autoclass:: GroupChannel
     :members:
+    :inherited-members:
+
 
 Invite
 ~~~~~~~