Repository: kbknapp/clap-rs
Pull request #1221 (2018-03-20 11:38:34)

chore: Fix typos.


<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/kbknapp/clap-rs/1221)
<!-- Reviewable:end -->



Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a81f7844..187dc3a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 #### Bug Fixes
 
 * **Fish Completions:**  fixes a bug that only allowed a single completion in in Fish Shell ([e8774a8](https://github.com/kbknapp/clap-rs/pull/1214/commits/e8774a84ee4a319c888036e7c595ab46451d8e48), closes [#1212](https://github.com/kbknapp/clap-rs/issues/1212))
-* **AllowExternalSubcommands**: fixes a bug where external subcommands would be blocked by a similarly named subcomand (suggestions were getting in the way). ([a410e85](https://github.com/kbknapp/clap-rs/pull/1215/commits/a410e855bcd82b05f9efa73fa8b9774dc8842c6b))
+* **AllowExternalSubcommands**: fixes a bug where external subcommands would be blocked by a similarly named subcommand (suggestions were getting in the way). ([a410e85](https://github.com/kbknapp/clap-rs/pull/1215/commits/a410e855bcd82b05f9efa73fa8b9774dc8842c6b))
 
 #### Documentation
 
@@ -890,7 +890,7 @@ Minimum version of Rust is now v1.13.0 (Stable)
 
 #### Documentation
 
-* **Help Wrapping:**  removes the verbage about using `'{n}'` to insert newlines in help text ([c5a2b352](https://github.com/kbknapp/clap-rs/commit/c5a2b352ca600f5b802290ad945731066cd53611))
+* **Help Wrapping:**  removes the verbiage about using `'{n}'` to insert newlines in help text ([c5a2b352](https://github.com/kbknapp/clap-rs/commit/c5a2b352ca600f5b802290ad945731066cd53611))
 * **Value Delimiters:**  updates the docs for the Arg::multiple method WRT value delimiters and default settings ([f9d17a06](https://github.com/kbknapp/clap-rs/commit/f9d17a060aa53f10d0a6e1a7eed5d989d1a59533))
 * **appsettings:**  Document AppSetting::DisableVersion ([94501965](https://github.com/kbknapp/clap-rs/commit/945019654d2ca67eb2b1d6014fdf80b84d528d30), closes [#589](https://github.com/kbknapp/clap-rs/issues/589))
 
@@ -918,7 +918,7 @@ Minimum version of Rust is now v1.13.0 (Stable)
 
 #### Documentation
 
-* **Help Wrapping:**  removes the verbage about using `'{n}'` to insert newlines in help text ([c5a2b352](https://github.com/kbknapp/clap-rs/commit/c5a2b352ca600f5b802290ad945731066cd53611))
+* **Help Wrapping:**  removes the verbiage about using `'{n}'` to insert newlines in help text ([c5a2b352](https://github.com/kbknapp/clap-rs/commit/c5a2b352ca600f5b802290ad945731066cd53611))
 
 #### Improvements
 
@@ -2550,7 +2550,7 @@ Minimum version of Rust is now v1.13.0 (Stable)
 #### Features
 
 * **macros**
-  *  add ability to get mutliple typed values or exit ([0b87251f](https://github.com/kbknapp/clap-rs/commit/0b87251fc088234bee51c323c2b652d7254f7a59))
+  *  add ability to get multiple typed values or exit ([0b87251f](https://github.com/kbknapp/clap-rs/commit/0b87251fc088234bee51c323c2b652d7254f7a59))
   *  add ability to get a typed multiple values ([e243fe38](https://github.com/kbknapp/clap-rs/commit/e243fe38ddbbf845a46c0b9baebaac3778c80927))
   *  add convenience macro to get a typed value or exit ([4b7cd3ea](https://github.com/kbknapp/clap-rs/commit/4b7cd3ea4947780d9daa39f3e1ddab53ad4c7fef))
   *  add convenience macro to get a typed value ([8752700f](https://github.com/kbknapp/clap-rs/commit/8752700fbb30e89ee68adbce24489ae9a24d33a9))
diff --git a/README.md b/README.md
index fe05cc24..070979b0 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc)
 Here's whats new in 2.31.2:
 
 * **Fish Completions:**  fixes a bug that only allowed a single completion in in Fish Shell
-* **AllowExternalSubcommands**: fixes a bug where external subcommands would be blocked by a similarly named subcomand
+* **AllowExternalSubcommands**: fixes a bug where external subcommands would be blocked by a similarly named subcommand
 * Fixes some typos in the `README.md`
 
 Here's whats new in 2.31.1:
diff --git a/benches/03_complex.rs b/benches/03_complex.rs
index 4048af25..b00fc4ea 100644
--- a/benches/03_complex.rs
+++ b/benches/03_complex.rs
@@ -28,8 +28,8 @@ macro_rules! create_app {
                           Arg::from_usage("[positional2] 'tests positionals with exclusions'"),
                           Arg::from_usage("-O --Option [option3] 'tests options with specific value sets'").possible_values(&OPT3_VALS),
                           Arg::from_usage("[positional3]... 'tests positionals with specific values'").possible_values(&POS3_VALS),
-                          Arg::from_usage("--multvals [one] [two] 'Tests mutliple values, not mult occs'"),
-                          Arg::from_usage("--multvalsmo... [one] [two] 'Tests mutliple values, not mult occs'"),
+                          Arg::from_usage("--multvals [one] [two] 'Tests multiple values, not mult occs'"),
+                          Arg::from_usage("--multvalsmo... [one] [two] 'Tests multiple values, not mult occs'"),
                           Arg::from_usage("--minvals2 [minvals]... 'Tests 2 min vals'").min_values(2),
                           Arg::from_usage("--maxvals3 [maxvals]... 'Tests 3 max vals'").max_values(3)
                     ])
@@ -98,13 +98,13 @@ fn create_app_builder(b: &mut Bencher) {
                 .arg(Arg::with_name("multvals")
                     .long("multvals")
                     .takes_value(true)
-                    .help("Tests mutliple values, not mult occs")
+                    .help("Tests multiple values, not mult occs")
                     .value_names(&["one", "two"]))
                 .arg(Arg::with_name("multvalsmo")
                     .long("multvalsmo")
                     .takes_value(true)
                     .multiple(true)
-                    .help("Tests mutliple values, not mult occs")
+                    .help("Tests multiple values, not mult occs")
                     .value_names(&["one", "two"]))
                 .arg(Arg::with_name("minvals")
                     .long("minvals2")
@@ -154,9 +154,9 @@ fn create_app_macros(b: &mut Bencher) {
                 (@arg positional3: index(3) ... possible_value[vi emacs]
                     "tests positionals with specific values")
                 (@arg multvals: --multvals +takes_value value_name[one two]
-                    "Tests mutliple values, not mult occs")
+                    "Tests multiple values, not mult occs")
                 (@arg multvalsmo: --multvalsmo ... +takes_value value_name[one two]
-                    "Tests mutliple values, not mult occs")
+                    "Tests multiple values, not mult occs")
                 (@arg minvals: --minvals2 min_values(1) ... +takes_value "Tests 2 min vals")
                 (@arg maxvals: --maxvals3 ... +takes_value max_values(3) "Tests 3 max vals")
                 (@subcommand subcmd =>
diff --git a/examples/05_flag_args.rs b/examples/05_flag_args.rs
index 1ab10a27..4c703beb 100644
--- a/examples/05_flag_args.rs
+++ b/examples/05_flag_args.rs
@@ -25,13 +25,13 @@ fn main() {
                                                                   // occurrences such as "-aaa" or "-a -a"
                                     .requires("config")           // Says, "If the user uses -a, they MUST
                                                                   // also use this other 'config' arg too"
-                                                                  // Can also specifiy a list using
+                                                                  // Can also specify a list using
                                                                   // requires_all(Vec<&str>)
                                     .conflicts_with("output")     // Opposite of requires(), says "if the
                                                                   // user uses -a, they CANNOT use 'output'"
                                                                   // also has a mutually_excludes_all(Vec<&str>)
                         )
-                        // NOTE: In order to compile this example, comment out requres() and
+                        // NOTE: In order to compile this example, comment out requires() and
                         // mutually_excludes() because we have not defined an "output" or "config"
                         // argument.
                         .get_matches();
@@ -41,7 +41,7 @@ fn main() {
         println!("Awesomeness is turned on");
     }
 
-    // If we set the mutliple() option of a flag we can check how many times the user specified
+    // If we set the multiple() option of a flag we can check how many times the user specified
     //
     // Note: if we did not specify the multiple() option, and the user used "awesome" we would get
     // a 1 (no matter how many times they actually used it), or a 0 if they didn't use it at all
diff --git a/examples/06_positional_args.rs b/examples/06_positional_args.rs
index 70b73f4c..35849058 100644
--- a/examples/06_positional_args.rs
+++ b/examples/06_positional_args.rs
@@ -21,7 +21,7 @@ fn main() {
                                                                    // specify this argument (Starts at 1)
                                     .requires("config")            // Says, "If the user uses "input", they MUST
                                                                    // also use this other 'config' arg too"
-                                                                   // Can also specifiy a list using
+                                                                   // Can also specify a list using
                                                                    // requires_all(Vec<&str>)
                                     .conflicts_with("output")      // Opposite of requires(), says "if the
                                                                    // user uses -a, they CANNOT use 'output'"
diff --git a/examples/07_option_args.rs b/examples/07_option_args.rs
index 1af55fd7..cb497ecd 100644
--- a/examples/07_option_args.rs
+++ b/examples/07_option_args.rs
@@ -29,7 +29,7 @@ fn main() {
                                                                    // required arguments
                                     .requires("config")            // Says, "If the user uses "input", they MUST
                                                                    // also use this other 'config' arg too"
-                                                                   // Can also specifiy a list using
+                                                                   // Can also specify a list using
                                                                    // requires_all(Vec<&str>)
                                     .conflicts_with("output")      // Opposite of requires(), says "if the
                                                                    // user uses -a, they CANNOT use 'output'"
diff --git a/examples/10_default_values.rs b/examples/10_default_values.rs
index 577d90b4..ca509817 100644
--- a/examples/10_default_values.rs
+++ b/examples/10_default_values.rs
@@ -21,7 +21,7 @@ fn main() {
 
                         // Next we'll use the Option::unwrap_or method on this "CONFIG" option
                         .arg(Arg::with_name("CONFIG")
-                                // Note that we have to manaully include some verbage to the user
+                                // Note that we have to manually include some verbiage to the user
                                 // telling them what the default will be.
                                 .help("The config file to use (default is \"config.json\")")
                                 .short("c")
diff --git a/examples/12_typed_values.rs b/examples/12_typed_values.rs
index 647f0970..3d03e4fd 100644
--- a/examples/12_typed_values.rs
+++ b/examples/12_typed_values.rs
@@ -34,7 +34,7 @@ fn main() {
                         .get_matches();
 
     // Here we get a value of type u32 from our optional -l argument.
-    // If the value provided to len failes to parse, we default to 10
+    // If the value provided to len fails to parse, we default to 10
     //
     // Using other methods such as unwrap_or_else(|e| println!("{}",e))
     // are possible too.
diff --git a/examples/17_yaml.rs b/examples/17_yaml.rs
index 3eedd4fa..3353d73a 100644
--- a/examples/17_yaml.rs
+++ b/examples/17_yaml.rs
@@ -1,4 +1,4 @@
-// In order to use YAML to define your CLI you must compile clap with the "yaml" feature becasue
+// In order to use YAML to define your CLI you must compile clap with the "yaml" feature because
 // it's **not** included by default.
 //
 // In order to do this, ensure your Cargo.toml looks like one of the following:
@@ -23,7 +23,7 @@ fn main() {
 
     // To load a yaml file containing our CLI definition such as the example '17_yaml.yml' we can
     // use the convenience macro which loads the file at compile relative to the current file
-    // similiar to how modules are found.
+    // similar to how modules are found.
     //
     // Then we pass that yaml object to App to build the CLI.
     //
diff --git a/examples/20_subcommands.rs b/examples/20_subcommands.rs
index ef7623ee..f80f46d7 100644
--- a/examples/20_subcommands.rs
+++ b/examples/20_subcommands.rs
@@ -1,7 +1,7 @@
 // Working with subcommands is simple. There are a few key points to remember when working with
 // subcommands in clap. First, SubCommands are really just Apps. This means they can have their own
 // settings, version, authors, args, and even their own subcommands. The next thing to remember is
-// that subcommands are set up in a tree like heirachy.
+// that subcommands are set up in a tree like hierarchy.
 //
 // An ASCII art depiction may help explain this better. Using a fictional version of git as the demo
 // subject. Imagine the following are all subcommands of git (note, the author is aware these aren't
@@ -30,7 +30,7 @@
 // $ git clone url push origin path
 //
 // It's also important to know that subcommands each have their own set of matches and may have args
-// with the same name as other subcommands in a different part of the tree heirachy (i.e. the arg
+// with the same name as other subcommands in a different part of the tree hierarchy (i.e. the arg
 // names aren't in a flat namespace).
 //
 // In order to use subcommands in clap, you only need to know which subcommand you're at in your
@@ -57,7 +57,7 @@ fn main() {
         .subcommand(SubCommand::with_name("push")
             .about("pushes things")
             .setting(AppSettings::SubcommandRequiredElseHelp)
-            .subcommand(SubCommand::with_name("remote")  // Subcommands can have thier own subcommands,
+            .subcommand(SubCommand::with_name("remote")  // Subcommands can have their own subcommands,
                                                          // which in turn have their own subcommands
                 .about("pushes remote things")
                 .arg(Arg::with_name("repo")
@@ -92,7 +92,7 @@ fn main() {
         // grandchildren, great grandchildren, etc.
         //
         // i.e. if the command `git push remove --stuff foo` was run, the above will only print out,
-        // `git push` was used. We'd need to get push's matches to see futher into the tree
+        // `git push` was used. We'd need to get push's matches to see further into the tree
     }
 
     // An alternative to checking the name is matching on known names. Again notice that only the
@@ -135,8 +135,8 @@ fn main() {
             // Now we have a reference to add's matches
             println!("Adding {}", add_matches.values_of("stuff").unwrap().collect::<Vec<_>>().join(", "));
         },
-        ("", None)   => println!("No subcommand was used"), // If no subcommand was usd it'll match the tuple ("", None)
-        _            => unreachable!(), // If all subcommands are defined above, anything else is unreachabe!()
+        ("", None)   => println!("No subcommand was used"), // If no subcommand was used it'll match the tuple ("", None)
+        _            => unreachable!(), // If all subcommands are defined above, anything else is unreachable!()
     }
 
     // Continued program logic goes here...
diff --git a/src/app/help.rs b/src/app/help.rs
index 54cb85c8..3ec2165a 100644
--- a/src/app/help.rs
+++ b/src/app/help.rs
@@ -877,7 +877,7 @@ impl<'a> Help<'a> {
     ///     * `{after-help}`  - Info to be displayed after the help message.
     ///     * `{before-help}` - Info to be displayed before the help message.
     ///
-    /// The template system is, on purpose, very simple. Therefore the tags have to writen
+    /// The template system is, on purpose, very simple. Therefore the tags have to written
     /// in the lowercase and without spacing.
     fn write_templated_help(&mut self, parser: &Parser, template: &str) -> ClapResult<()> {
         debugln!("Help::write_templated_help;");
diff --git a/src/app/mod.rs b/src/app/mod.rs
index c4fd69db..25debaf4 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -419,10 +419,10 @@ impl<'a, 'b> App<'a, 'b> {
     ///            Does awesome things\n\
     ///            (C) me@mail.com\n\n\
     ///
-    ///            USAGE: myapp <opts> <comamnd>\n\n\
+    ///            USAGE: myapp <opts> <command>\n\n\
     ///
     ///            Options:\n\
-    ///            -h, --helpe      Dispay this message\n\
+    ///            -h, --help       Display this message\n\
     ///            -V, --version    Display version info\n\
     ///            -s <stuff>       Do something with stuff\n\
     ///            -v               Be verbose\n\n\
@@ -560,7 +560,7 @@ impl<'a, 'b> App<'a, 'b> {
     ///     .template("{bin} ({version}) - {usage}")
     /// # ;
     /// ```
-    /// **NOTE:**The template system is, on purpose, very simple. Therefore the tags have to writen
+    /// **NOTE:**The template system is, on purpose, very simple. Therefore the tags have to written
     /// in the lowercase and without spacing.
     /// [`App::about`]: ./struct.App.html#method.about
     /// [`App::after_help`]: ./struct.App.html#method.after_help
diff --git a/src/app/parser.rs b/src/app/parser.rs
index 60baad04..55758611 100644
--- a/src/app/parser.rs
+++ b/src/app/parser.rs
@@ -311,7 +311,7 @@ where
             self.flags.push(fb);
         }
     }
-    // actually adds the arguments but from a borrow (which means we have to do some clonine)
+    // actually adds the arguments but from a borrow (which means we have to do some cloning)
     pub fn add_arg_ref(&mut self, a: &Arg<'a, 'b>) {
         debug_assert!(self.debug_asserts(a));
         self.add_conditional_reqs(a);
@@ -1543,7 +1543,7 @@ where
         // maybe here lifetime should be 'a
         debugln!("Parser::parse_long_arg;");
 
-        // Update the curent index
+        // Update the current index
         self.cur_idx.set(self.cur_idx.get() + 1);
 
         let mut val = None;
@@ -1677,7 +1677,7 @@ where
                 ret = self.parse_flag(flag, matcher)?;
 
                 // Handle conflicts, requirements, overrides, etc.
-                // Must be called here due to mutablilty
+                // Must be called here due to mutabililty
                 if self.cache.map_or(true, |name| name != flag.b.name) {
                     self.cache = Some(flag.b.name);
                 }
diff --git a/src/app/settings.rs b/src/app/settings.rs
index e676b7b8..7b8ad750 100644
--- a/src/app/settings.rs
+++ b/src/app/settings.rs
@@ -244,7 +244,7 @@ pub enum AppSettings {
     /// For example, imagine a CLI which has three positional arguments `[foo] [bar] [baz]...` where
     /// `baz` accepts multiple values (similar to man `ARGS...` style training arguments).
     ///
-    /// With this setting the following invocations are posisble:
+    /// With this setting the following invocations are possible:
     ///
     /// * `$ prog foo bar baz1 baz2 baz3`
     /// * `$ prog foo -- baz1 baz2 baz3`
@@ -307,7 +307,7 @@ pub enum AppSettings {
     /// assert_eq!(m.values_of("baz").unwrap().collect::<Vec<_>>(), &["baz1", "baz2", "baz3"]);
     /// ```
     ///
-    /// Now nofice if we don't specifiy `foo` or `baz` but use the `--` operator.
+    /// Now notice if we don't specify `foo` or `baz` but use the `--` operator.
     ///
     /// ```rust
     /// # use clap::{App, Arg, AppSettings};
@@ -364,7 +364,7 @@ pub enum AppSettings {
     /// [`ArgMatches`]: ./struct.ArgMatches.html
     AllowExternalSubcommands,
 
-    /// Specifies that use of a valid [argument] negates [subcomands] being used after. By default
+    /// Specifies that use of a valid [argument] negates [subcommands] being used after. By default
     /// `clap` allows arguments between subcommands such as
     /// `<cmd> [cmd_args] <cmd2> [cmd2_args] <cmd3> [cmd3_args]`. This setting disables that
     /// functionality and says that arguments can only follow the *final* subcommand. For instance
@@ -520,7 +520,7 @@ pub enum AppSettings {
     /// let res = App::new("myprog")
     ///     .version("v1.1")
     ///     .setting(AppSettings::DisableHelpSubcommand)
-    ///     // Normally, creating a subcommand causes a `help` subcommand to automaticaly
+    ///     // Normally, creating a subcommand causes a `help` subcommand to automatically
     ///     // be generated as well
     ///     .subcommand(SubCommand::with_name("test"))
     ///     .get_matches_from_safe(vec![
diff --git a/src/completions/mod.rs b/src/completions/mod.rs
index 742c6161..e8775989 100644
--- a/src/completions/mod.rs
+++ b/src/completions/mod.rs
@@ -72,8 +72,8 @@ pub fn all_subcommands(p: &Parser) -> Vec<(String, String)> {
     subcmds
 }
 
-// Gets all subcommands exlcuding child subcommands in the form of (name, bin_name) where the name
-// is a single word (i.e. "install") and the bin_name is a space deliniated list of the path to said
+// Gets all subcommands excluding child subcommands in the form of (name, bin_name) where the name
+// is a single word (i.e. "install") and the bin_name is a space delineated list of the path to said
 // subcommand (i.e. "rustup toolchain install")
 //
 // Also note, aliases are treated as their own subcommands but duplicates of whatever they're
diff --git a/src/completions/zsh.rs b/src/completions/zsh.rs
index 11dd868e..4c66ce44 100644
--- a/src/completions/zsh.rs
+++ b/src/completions/zsh.rs
@@ -70,11 +70,11 @@ _{name} \"$@\"",
 // 	_describe -t commands '[bin_name] commands' commands "$@"
 //
 // Where the following variables are present:
-//    [bin_name_underscore]: The full space deliniated bin_name, where spaces have been replaced by
+//    [bin_name_underscore]: The full space delineated bin_name, where spaces have been replaced by
 //                           underscore characters
 //    [arg_name]: The name of the subcommand
 //    [arg_help]: The help message of the subcommand
-//    [bin_name]: The full space deliniated bin_name
+//    [bin_name]: The full space delineated bin_name
 //
 // Here's a snippet from rustup:
 //
@@ -204,8 +204,8 @@ fn subcommands_of(p: &Parser) -> String {
 //
 // Where the following variables are present:
 //    [name] = The subcommand name in the form of "install" for "rustup toolchain install"
-//    [bin_name] = The full space deliniated bin_name such as "rustup toolchain install"
-//    [name_hyphen] = The full space deliniated bin_name, but replace spaces with hyphens
+//    [bin_name] = The full space delineated bin_name such as "rustup toolchain install"
+//    [name_hyphen] = The full space delineated bin_name, but replace spaces with hyphens
 //    [repeat] = From the same recursive calls, but for all subcommands
 //    [subcommand_args] = The same as zsh::get_args_of
 fn get_subcommands_of(p: &Parser) -> String {
diff --git a/src/lib.rs b/src/lib.rs
index 0b51f9d7..5671af8e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -330,7 +330,7 @@
 //! * `suggestions`: Turns on the `Did you mean '--myoption'?` feature for when users make typos. (builds dependency `strsim`)
 //! * `color`: Turns on colored error messages. This feature only works on non-Windows OSs. (builds dependency `ansi-term` and `atty`)
 //! * `wrap_help`: Wraps the help at the actual terminal width when
-//!  available, instead of 120 chracters. (builds dependency `textwrap`
+//!  available, instead of 120 characters. (builds dependency `textwrap`
 //! with feature `term_size`)
 //!
 //! To disable these, add this to your `Cargo.toml`:
@@ -404,7 +404,7 @@
 //! ```
 //!
 //! Alternatively, if you have [`just`](https://github.com/casey/just) installed you can run the
-//! prebuilt recipies. *Not* using `just` is perfectly fine as well, it simply bundles commands
+//! prebuilt recipes. *Not* using `just` is perfectly fine as well, it simply bundles commands
 //! automatically.
 //!
 //! For example, to test the code, as above simply run:
@@ -413,7 +413,7 @@
 //! $ just run-tests
 //! ```
 //!
-//! From here on, I will lis the appropriate `cargo` command as well as the `just` command.
+//! From here on, I will list the appropriate `cargo` command as well as the `just` command.
 //!
 //! Sometimes it's helpful to only run a subset of the tests, which can be done via:
 //!
@@ -487,7 +487,7 @@
 //! version of Rust is considered a minor breaking change, meaning *at a minimum* the minor version
 //! of `clap` will be bumped.
 //!
-//! In order to keep from being suprised of breaking changes, it is **highly** recommended to use
+//! In order to keep from being surprised by breaking changes, it is **highly** recommended to use
 //! the `~major.minor.patch` style in your `Cargo.toml`:
 //!
 //! ```toml
diff --git a/src/macros.rs b/src/macros.rs
index 98a39e8e..97aedb94 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -942,7 +942,7 @@ macro_rules! find_by_name {
     }
 }
 
-// Finds an option including if it's aliasesed
+// Finds an option including if it's aliased
 macro_rules! find_opt_by_long {
     (@os $_self:ident, $long:expr) => {{
         _find_by_long!($_self, $long, opts)


Test patch:
diff --git a/clap-test.rs b/clap-test.rs
index 3e01edee..964f9060 100644
--- a/clap-test.rs
+++ b/clap-test.rs
@@ -50,7 +50,7 @@ mod test {
         compare(&*left, right1) || compare(&*left, right2)
     }
 
-    // Legacy tests from the pyhton script days
+    // Legacy tests from the Python script days
 
     pub fn complex_app() -> App<'static, 'static> {
         let args = "-o --option=[opt]... 'tests options'
@@ -70,8 +70,8 @@ mod test {
                 Arg::from_usage("[positional2] 'tests positionals with exclusions'"),
                 Arg::from_usage("-O --Option [option3] 'specific vals'").possible_values(&opt3_vals),
                 Arg::from_usage("[positional3]... 'tests specific values'").possible_values(&pos3_vals),
-                Arg::from_usage("--multvals [one] [two] 'Tests mutliple values, not mult occs'"),
-                Arg::from_usage("--multvalsmo... [one] [two] 'Tests mutliple values, and mult occs'"),
+                Arg::from_usage("--multvals [one] [two] 'Tests multiple values, not mult occs'"),
+                Arg::from_usage("--multvalsmo... [one] [two] 'Tests multiple values, and mult occs'"),
                 Arg::from_usage("--minvals2 [minvals]... 'Tests 2 min vals'").min_values(2),
                 Arg::from_usage("--maxvals3 [maxvals]... 'Tests 3 max vals'").max_values(3)
             ])
diff --git a/tests/app.yml b/tests/app.yml
index c34ca1bf..97d36232 100644
--- a/tests/app.yml
+++ b/tests/app.yml
@@ -56,18 +56,18 @@ args:
         possible_values: [ vi, emacs ]
     - multvals:
         long: multvals
-        help: Tests mutliple values, not mult occs
+        help: Tests multiple values, not mult occs
         value_names:
             - one
             - two
     - multvalsmo:
         long: multvalsmo
         multiple: true
-        help: Tests mutliple values, not mult occs
+        help: Tests multiple values, not mult occs
         value_names: [one, two]
     - multvalsdelim:
         long: multvalsdelim
-        help: Tests mutliple values with required delimiter
+        help: Tests multiple values with required delimiter
         multiple: true
         require_delimiter: true
     - singlealias:
@@ -78,7 +78,7 @@ args:
             - [multvalsmo, two]
     - multaliases:
         long: multaliases
-        help: Tests mutliple aliases
+        help: Tests multiple aliases
         aliases: [als1, als2, als3]
     - minvals2:
         long: minvals2
diff --git a/tests/help.rs b/tests/help.rs
index 07dfc382..97f26ac0 100644
--- a/tests/help.rs
+++ b/tests/help.rs
@@ -38,8 +38,8 @@ OPTIONS:
         --long-option-2 <option2>    tests long options with exclusions
         --maxvals3 <maxvals>...      Tests 3 max vals
         --minvals2 <minvals>...      Tests 2 min vals
-        --multvals <one> <two>       Tests mutliple values, not mult occs
-        --multvalsmo <one> <two>     Tests mutliple values, and mult occs
+        --multvals <one> <two>       Tests multiple values, not mult occs
+        --multvalsmo <one> <two>     Tests multiple values, and mult occs
     -o, --option <opt>...            tests options
 
 ARGS:
@@ -1157,4 +1157,4 @@ fn show_env_vals() {
             .help("A coffeehouse, coffee shop, or café.")
             .takes_value(true));
     assert!(test::compare_output(app, "ctest --help", SHOW_ENV_VALS, false));
-}
\ No newline at end of file
+}
diff --git a/tests/macros.rs b/tests/macros.rs
index fec61132..97c421d6 100644
--- a/tests/macros.rs
+++ b/tests/macros.rs
@@ -20,9 +20,9 @@ fn basic() {
         (@arg positional3: index(3) ... possible_value[vi emacs]
             "tests positionals with specific values")
         (@arg multvals: --multvals +takes_value value_name[one two]
-            "Tests mutliple values, not mult occs")
+            "Tests multiple values, not mult occs")
         (@arg multvalsmo: --multvalsmo ... +takes_value value_name[one two]
-            "Tests mutliple values, not mult occs")
+            "Tests multiple values, not mult occs")
         (@arg minvals: --minvals2 min_values(1) ... +takes_value "Tests 2 min vals")
         (@arg maxvals: --maxvals3 ... +takes_value max_values(3) "Tests 3 max vals")
         (@subcommand subcmd =>
@@ -53,9 +53,9 @@ fn quoted_app_name() {
         (@arg positional3: index(3) ... possible_value[vi emacs]
             "tests positionals with specific values")
         (@arg multvals: --multvals +takes_value value_name[one two]
-            "Tests mutliple values, not mult occs")
+            "Tests multiple values, not mult occs")
         (@arg multvalsmo: --multvalsmo ... +takes_value value_name[one two]
-            "Tests mutliple values, not mult occs")
+            "Tests multiple values, not mult occs")
         (@arg minvals: --minvals2 min_values(1) ... +takes_value "Tests 2 min vals")
         (@arg maxvals: --maxvals3 ... +takes_value max_values(3) "Tests 3 max vals")
         (@subcommand subcmd =>
@@ -93,9 +93,9 @@ fn quoted_arg_long_name() {
         (@arg positional3: index(3) ... possible_value[vi emacs]
             "tests positionals with specific values")
         (@arg multvals: --multvals +takes_value value_name[one two]
-            "Tests mutliple values, not mult occs")
+            "Tests multiple values, not mult occs")
         (@arg multvalsmo: --multvalsmo ... +takes_value value_name[one two]
-            "Tests mutliple values, not mult occs")
+            "Tests multiple values, not mult occs")
         (@arg minvals: --minvals2 min_values(1) ... +takes_value "Tests 2 min vals")
         (@arg maxvals: --maxvals3 ... +takes_value max_values(3) "Tests 3 max vals")
         (@subcommand subcmd =>
@@ -130,9 +130,9 @@ fn quoted_arg_name() {
         (@arg ("positional-3"): index(3) ... possible_value[vi emacs]
             "tests positionals with specific values")
         (@arg multvals: --multvals +takes_value value_name[one two]
-            "Tests mutliple values, not mult occs")
+            "Tests multiple values, not mult occs")
         (@arg multvalsmo: --multvalsmo ... +takes_value value_name[one two]
-            "Tests mutliple values, not mult occs")
+            "Tests multiple values, not mult occs")
         (@arg minvals: --minvals2 min_values(1) ... +takes_value "Tests 2 min vals")
         (@arg maxvals: --maxvals3 ... +takes_value max_values(3) "Tests 3 max vals")
         (@subcommand subcmd =>