Merge branch 'upstream'

3 files changed, 4 insertions, 4 deletions

diff --git a/src/builder/edit_guild.rs b/src/builder/edit_guild.rs
index ba87f0c..c9083a2 100644
--- a/src/builder/edit_guild.rs
+++ b/src/builder/edit_guild.rs
@@ -93,7 +93,7 @@ impl EditGuild {
 
     /// Set the name of the guild.
     ///
-    /// **Note**: Must be between (and including) 2-100 chracters.
+    /// **Note**: Must be between (and including) 2-100 characters.
     pub fn name(mut self, name: &str) -> Self {
         self.0.insert("name", Value::String(name.to_string()));
 
diff --git a/src/builder/edit_role.rs b/src/builder/edit_role.rs
index 1deb57d..bf0b489 100644
--- a/src/builder/edit_role.rs
+++ b/src/builder/edit_role.rs
@@ -5,7 +5,7 @@ use model::{
 };
 use utils::VecMap;
 
-/// A builer to create or edit a [`Role`] for use via a number of model methods.
+/// A builder to create or edit a [`Role`] for use via a number of model methods.
 ///
 /// These are:
 ///
diff --git a/src/builder/execute_webhook.rs b/src/builder/execute_webhook.rs
index 65823bb..780d102 100644
--- a/src/builder/execute_webhook.rs
+++ b/src/builder/execute_webhook.rs
@@ -143,7 +143,7 @@ impl ExecuteWebhook {
     ///
     /// # Examples
     ///
-    /// Overriuding the username to `"hakase"`:
+    /// Overriding the username to `"hakase"`:
     ///
     /// ```rust,no_run
     /// # use serenity::client::rest;
@@ -173,7 +173,7 @@ impl Default for ExecuteWebhook {
     /// ```rust
     /// use serenity::builder::ExecuteWebhook;
     ///
-    /// let executer = ExecuteWebhook::default();
+    /// let executor = ExecuteWebhook::default();
     /// ```
     ///
     /// [`Webhook`]: ../model/webhook/struct.Webhook.html