diff --git a/discord/channel.py b/discord/channel.py
index 3d330a439..30e2369cd 100644
--- a/discord/channel.py
+++ b/discord/channel.py
@@ -45,11 +45,6 @@ async def _single_delete_strategy(messages):
 class TextChannel(discord.abc.Messageable, discord.abc.GuildChannel, Hashable):
     """Represents a Discord guild text channel.
 
-    **Inherited Classes**
-
-    - :class:`discord.abc.Messageable`
-    - :class:`discord.abc.GuildChannel`
-
     .. container:: operations
 
         .. describe:: x == y
@@ -393,11 +388,6 @@ class TextChannel(discord.abc.Messageable, discord.abc.GuildChannel, Hashable):
 class VoiceChannel(discord.abc.Connectable, discord.abc.GuildChannel, Hashable):
     """Represents a Discord guild voice channel.
 
-    **Inherited Classes**
-
-    - :class:`discord.abc.Connectable`
-    - :class:`discord.abc.GuildChannel`
-
     .. container:: operations
 
         .. describe:: x == y
@@ -625,10 +615,6 @@ class CategoryChannel(discord.abc.GuildChannel, Hashable):
 class DMChannel(discord.abc.Messageable, Hashable):
     """Represents a Discord direct message channel.
 
-    **Inherited Classes**
-
-    - :class:`discord.abc.Messageable`
-
     .. container:: operations
 
         .. describe:: x == y
@@ -711,10 +697,6 @@ class DMChannel(discord.abc.Messageable, Hashable):
 class GroupChannel(discord.abc.Messageable, Hashable):
     """Represents a Discord group channel.
 
-    **Inherited Classes**
-
-    - :class:`discord.abc.Messageable`
-
     .. container:: operations
 
         .. describe:: x == y
diff --git a/discord/ext/commands/context.py b/discord/ext/commands/context.py
index 3130d56fb..73679e52f 100644
--- a/discord/ext/commands/context.py
+++ b/discord/ext/commands/context.py
@@ -34,9 +34,7 @@ class Context(discord.abc.Messageable):
     the invocation context. This class is not created manually and is instead
     passed around to commands as the first parameter.
 
-    **Inherited Classes**
-
-    - :class:`discord.abc.Messageable`
+    This class implements the :class:`abc.Messageable` ABC.
 
     Attributes
     -----------
diff --git a/discord/member.py b/discord/member.py
index f18fe1681..f265a1be7 100644
--- a/discord/member.py
+++ b/discord/member.py
@@ -112,9 +112,7 @@ _BaseUser = discord.abc.User
 class Member(discord.abc.Messageable, _BaseUser):
     """Represents a Discord member to a :class:`Guild`.
 
-    **Inherited Classes**
-
-    - :class:`discord.abc.Messageable`
+    This implements a lot of the functionality of :class:`User`.
 
     .. container:: operations
 
diff --git a/discord/user.py b/discord/user.py
index 0b7b9859a..07a173699 100644
--- a/discord/user.py
+++ b/discord/user.py
@@ -479,10 +479,6 @@ class ClientUser(BaseUser):
 class User(BaseUser, discord.abc.Messageable):
     """Represents a Discord user.
 
-    **Inherited Classes**
-
-    - :class:`discord.abc.Messageable`
-
     .. container:: operations
 
         .. describe:: x == y
diff --git a/docs/api.rst b/docs/api.rst
index aca4fe494..7fe668d55 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -1846,6 +1846,7 @@ ClientUser
 
 .. autoclass:: ClientUser()
     :members:
+    :inherited-members:
 
 Relationship
 ~~~~~~~~~~~~~~
@@ -1858,6 +1859,14 @@ User
 
 .. autoclass:: User()
     :members:
+    :inherited-members:
+    :exclude-members: history, typing
+
+    .. autocomethod:: history
+        :async-for:
+
+    .. autocomethod:: typing
+        :async-with:
 
 Attachment
 ~~~~~~~~~~~
@@ -1908,6 +1917,14 @@ Member
 
 .. autoclass:: Member()
     :members:
+    :inherited-members:
+    :exclude-members: history, typing
+
+    .. autocomethod:: history
+        :async-for:
+
+    .. autocomethod:: typing
+        :async-with:
 
 Spotify
 ~~~~~~~~
@@ -1944,31 +1961,56 @@ TextChannel
 
 .. autoclass:: TextChannel()
     :members:
+    :inherited-members:
+    :exclude-members: history, typing
+
+    .. autocomethod:: history
+        :async-for:
+
+    .. autocomethod:: typing
+        :async-with:
 
 VoiceChannel
 ~~~~~~~~~~~~~
 
 .. autoclass:: VoiceChannel()
     :members:
+    :inherited-members:
 
 CategoryChannel
 ~~~~~~~~~~~~~~~~~
 
 .. autoclass:: CategoryChannel()
     :members:
+    :inherited-members:
 
 DMChannel
 ~~~~~~~~~
 
 .. autoclass:: DMChannel()
     :members:
+    :inherited-members:
+    :exclude-members: history, typing
+
+    .. autocomethod:: history
+        :async-for:
 
+    .. autocomethod:: typing
+        :async-with:
 
 GroupChannel
 ~~~~~~~~~~~~
 
 .. autoclass:: GroupChannel()
     :members:
+    :inherited-members:
+    :exclude-members: history, typing
+
+    .. autocomethod:: history
+        :async-for:
+
+    .. autocomethod:: typing
+        :async-with:
 
 
 Invite