diff --git a/docs/docs_channel.rst b/docs/docs_channel.rst
index 063fb0790..5020d5c8a 100644
--- a/docs/docs_channel.rst
+++ b/docs/docs_channel.rst
@@ -69,6 +69,13 @@ Gets a Message_ from the channel that matches the specified criteria. E.g:
 - **key** - a `String` that is the key
 - **value** - a `String` that is the value
 
+permissionsOf(user)
+~~~~~~~~~~~~~~~~~~~
+
+Gets the EvaluatedPermissions_ of a User in the channel.
+
+- **user** - A User_ or Member_ you want to get the permissions of.
+
 equals(object)
 ~~~~~~~~~~~~~~
 
diff --git a/docs/docs_message.rst b/docs/docs_message.rst
index 7dbbbfc3d..812216c62 100644
--- a/docs/docs_message.rst
+++ b/docs/docs_message.rst
@@ -21,7 +21,7 @@ A `unix timestamp` as a `Number` representing when the message was sent.
 mentions
 ~~~~~~~~
 
-An `Array` of User_ objects that represent the users mentioned in the message.
+An `Array` of Member_ and User_ objects that represent the users mentioned in the message. The only way that the User_ objects would exist in the Array is if the message is from a log, where the mentioned users may have left the server afterwards.
 
 everyoneMentioned
 ~~~~~~~~~~~~~~~~~
@@ -60,7 +60,7 @@ author
 
 **Aliases** : `sender`
 
-The User_ that sent the message.
+The Member or User_ that sent the message. May be a User_ if from a log, it depends on whether the sender left the server after sending the message. If received in realtime, always a Member.
 
 attachments
 ~~~~~~~~~~~
diff --git a/docs/docs_server.rst b/docs/docs_server.rst
index 0baa9d331..198a235c8 100644
--- a/docs/docs_server.rst
+++ b/docs/docs_server.rst
@@ -92,11 +92,11 @@ Gets a Channel_ that matches the specified criteria. E.g:
 getMember(key, value)
 ~~~~~~~~~~~~~~~~~~~~~
 
-Gets a User_ that matches the specified criteria. E.g:
+Gets a Member_ that matches the specified criteria. E.g:
 
 .. code-block:: js
 
-    bot.getUser("id", 1243987349) // returns a user where user.id === 1243987349
+    server.getMember("id", 1243987349) // returns a Member where member.id === 1243987349
     
 - **key** - a `String` that is the key
 - **value** - a `String` that is the value