Merge pull request #2484 from opscode/tball/contrib-pass

Merging community contributions

49 files changed, 104 insertions, 75 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25c7172a12..35ad446cb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,12 @@
   Added support for handling empty version strings to rubygems provider.
 * [**Yulian Kuncheff**](https://github.com/Daegalus)
   Correctly set the pre-release identifier during knife bootstrap.
+* [**Anshul Sharma**](https://github.com/justanshulsharma)
+  `knife node run_list remove` now accepts run_list options in the same form as add
+* [**Veres Lajos**](https://github.com/vlajos)
+  Typo fixes
+* [**Tim Smith**](https://github.com/tas50)
+  Typo fixes
 
 ### Chef Contributions
 * Update Chef to use RSpec 3.
@@ -313,7 +319,7 @@
 * [**Nikhil Benesch**](https://github.com/benesch):
   Implemented a threaded download queue for synchronizing cookbooks. (CHEF-4423)
 * [**Chulki Lee**](https://github.com/chulkilee):
-  Raise an error when source is accidently passed to apt_package (CHEF-5113)
+  Raise an error when source is accidentally passed to apt_package (CHEF-5113)
 * [**Cam Cope**](https://github.com/ccope):
   Add an open_timeout when opening an http connection (CHEF-5152)
 * [**Sander van Harmelen**](https://github.com/svanharmelen):
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index 7eb85eb894..22294a3e39 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -165,7 +165,7 @@ and receive
   # snip other Ubuntu nodes
 ]
 ```
-If instead you wanted all the languages data (remember, `"languages"` is only one tiny piece of information the Chef Server stores about your node), you would have `:filter_result => {"languages" => ["laguages"]}` in your search query.
+If instead you wanted all the languages data (remember, `"languages"` is only one tiny piece of information the Chef Server stores about your node), you would have `:filter_result => {"languages" => ["languages"]}` in your search query.
 
 For backwards compatibility, a `partial_search` method has been added to `Chef::Search::Query` which can be used in the same way as the `partial_search` method from the [partial_search cookbook](https://supermarket.getchef.com/cookbooks/partial_search). Note that this method has been deprecated and will be removed in future versions of Chef.
 
@@ -539,7 +539,7 @@ For the`batch` resource, the `guard_interpreter` attribute it is set to `:batch`
 that if a string is supplied to an `only_if` or `not_if` attribute of a `batch` resource, the 64-bit version of the Windows
 default command interpreter, `cmd.exe`, will be used to evaluate the guard. It also means that other features available to the guard
 when `guard_interpreter` is set to something other than `:default`, such as inheritance of attributes and the specification of
-process architectur of the guard process (i.e. 32-bit or 64-bit process) are available by default.
+process architecture of the guard process (i.e. 32-bit or 64-bit process) are available by default.
 
 In versions of Chef prior to Chef 12, the value of the attribute was `:default` by default, which means the 32-bit version of the
 `cmd.exe` (batch script language) shell would be used to evaluate strings supplied to guards.
diff --git a/README.md b/README.md
index 306baba163..a0124fe1de 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Install these via your platform's preferred method (apt, yum, ports,
 emerge, etc.):
 
 * git
-* C compiler, header files, etc. On Ubuntu/debian, use the
+* C compiler, header files, etc. On Ubuntu/Debian, use the
   `build-essential` package.
 * ruby 1.9.3 or later
 * rubygems
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c20b486f43..7faf924134 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -57,7 +57,7 @@ deprecated and config.rb will be preferred.
 Chef Client 12 introduces a set of changes to `knife bootstrap`. Here is the list of changes:
 
 * Unused / untested bootstrap templates that install Chef Client from rubygems are removed. The recommended installation path for Chef Client is to use the omnibus packages. `chef-full` template (which is the default) installs Chef Client using omnibus packages on all the supported platforms.
-* `--distro` & `--template-file` options are deprecated in Chef 12 in favor of `--boostrap-template` option. This option can take a boostrap template name (e.g. 'chef-full') or the full path to a bootstrap template.
+* `--distro` & `--template-file` options are deprecated in Chef 12 in favor of `--boostrap-template` option. This option can take a bootstrap template name (e.g. 'chef-full') or the full path to a bootstrap template.
 * Chef now configures `:ssl_verify_mode` & `:verify_api_cert` config options on the node that is being bootstrapped. This setting can be controlled by `:node_ssl_verify_mode` & `:node_verify_api_cert` CLI options. If these are not specified the configured value will be inferred from knife config.
 
 ## Solaris Mount Provider
@@ -238,7 +238,7 @@ manifest for the cookbook will be deleted from the cookbook file cache.
 
 ## When given an override run list Chef does not clean the file_cache
 
-In order to avoid redownloading the file_cache for all the cookbooks and files that are skipped when an
+In order to avoid re-downloading the file_cache for all the cookbooks and files that are skipped when an
 override run list is used, when an override run list is set the file cache is not cleaned at all.
 
 ## Dropped Support For Ruby 1.8.7/1.9.1/1.9.2
@@ -288,9 +288,9 @@ Informational messages from knife are now sent to stderr, allowing you to pipe t
 The `data_bag_item` dsl method can be used to load encrypted data bag items when an additional `secret` String parameter is included.
 If no `secret` is provided but the data bag item is encrypted, `Chef::Config[:encrypted_data_bag_secret]` will be checked.
 
-## 'group' provider on OSX properly uses 'dscl' to determine existing groups
+## 'group' provider on OS X properly uses 'dscl' to determine existing groups
 
-On OSX, the 'group' provider would use 'etc' to determine existing groups,
+On OS X, the 'group' provider would use 'etc' to determine existing groups,
 but 'dscl' to add groups, causing broken idempotency if something existed
 in /etc/group. The provider now uses 'dscl' for both idempotenty checks and
 modifications.
@@ -334,7 +334,7 @@ error when `client_fork false` is set.
 
 ## Interval sleep occurs before converge
 When running chef-client or chef-solo at intervals, the application will perform splay and interval sleep
-before converging chef. (In previous releases, splay sleep occurred first, then convergance, then interval sleep).
+before converging chef. (In previous releases, splay sleep occurred first, then convergence, then interval sleep).
 
 ## `--dry-run` option for knife cookbook site share
 "knife cookbook site share" command now accepts a new command line option `--dry-run`. When this option is specified, command
@@ -408,7 +408,7 @@ process behavior by supplying an architecture attribute to the guard as follows:
 
 ```ruby
 # The not_if will be evaluated with 64-bit cmd.exe by default,
-# so you can verride it with the :architecture guard option to
+# so you can override it with the :architecture guard option to
 # make it 32-bit as it is in Chef 11
 batch 'make_safe_backup' do
   code 'copy %USERPROFILE%\\data\\nodes.json %SYSTEMROOT%\\system32\\data\\nodes.bak'
diff --git a/distro/common/html/_static/searchtools.js b/distro/common/html/_static/searchtools.js
index 6e1f06bd1b..fec94539f9 100644
--- a/distro/common/html/_static/searchtools.js
+++ b/distro/common/html/_static/searchtools.js
@@ -594,7 +594,7 @@ var Search = {
    * helper function to return a node containing the
    * search summary for a given text. keywords is a list
    * of stemmed words, hlwords is the list of normal, unstemmed
-   * words. the first one is used to find the occurance, the
+   * words. the first one is used to find the occurrence, the
    * latter for highlighting it.
    */
   makeSearchSummary : function(text, keywords, hlwords) {
diff --git a/distro/common/markdown/man1/knife-bootstrap.mkd b/distro/common/markdown/man1/knife-bootstrap.mkd
index 5c5e456023..cb292de311 100644
--- a/distro/common/markdown/man1/knife-bootstrap.mkd
+++ b/distro/common/markdown/man1/knife-bootstrap.mkd
@@ -84,7 +84,7 @@ When this is complete, the bootstrapped node will have:
 
   - Latest Chef version installed from RubyGems or APT Packages from Opscode. This may be a later version than the local system.
   - Be validated with the configured Chef Server.
-  - Have run Chef with its default run list if one is specfied.
+  - Have run Chef with its default run list if one is specified.
 
 Additional custom bootstrap templates can be created and stored in
 `.chef/bootstrap/DISTRO.erb`, replacing __DISTRO__ with the value passed
diff --git a/distro/common/markdown/man1/knife-cookbook-site.mkd b/distro/common/markdown/man1/knife-cookbook-site.mkd
index 7c2b0fe31b..9496cf1765 100644
--- a/distro/common/markdown/man1/knife-cookbook-site.mkd
+++ b/distro/common/markdown/man1/knife-cookbook-site.mkd
@@ -26,7 +26,7 @@ repository. Running `knife cookbook site install` does the following:
    upstream;
 2. All existing cookbooks are removed from the branch;
 3. The cookbook is downloaded from the cookbook site in tarball form;
-4. The downloaded cookbook is untarred, and its contents commited via git;
+4. The downloaded cookbook is untarred, and its contents committed via git;
 5. The pristine copy branch is merged into the master branch.
 
 By installing cookbook with this process, you can locally modify the
diff --git a/distro/common/markdown/man1/knife-data-bag.mkd b/distro/common/markdown/man1/knife-data-bag.mkd
index 67ec02158c..53abf95272 100644
--- a/distro/common/markdown/man1/knife-data-bag.mkd
+++ b/distro/common/markdown/man1/knife-data-bag.mkd
@@ -90,7 +90,7 @@ formatted according to the --format option.
 
 ## ENCRYPTION SUPPORT
 Data Bag Items may be encrypted to keep their contents secret. This may
-be desireable when storing sensitive information such as database
+be desirable when storing sensitive information such as database
 passwords, API keys, etc.
 
 Data Bag Item encryption uses the AES-256 CBC symmetric key algorithm.
diff --git a/distro/common/markdown/man1/knife-environment.mkd b/distro/common/markdown/man1/knife-environment.mkd
index 2eebffbce6..98ca4997bd 100644
--- a/distro/common/markdown/man1/knife-environment.mkd
+++ b/distro/common/markdown/man1/knife-environment.mkd
@@ -73,7 +73,7 @@ represented as a single JSON object, like this:
 
     {"apache2": ">= 1.5.0"}
 
-In the Ruby format, the cookbook version contraints for an environment
+In the Ruby format, the cookbook version constraints for an environment
 are represented as a Ruby Hash, like this:
 
     {"apache2" => ">= 1.5.0"}
diff --git a/distro/common/markdown/man1/knife.mkd b/distro/common/markdown/man1/knife.mkd
index 61e0c7f8b9..c3add163f9 100644
--- a/distro/common/markdown/man1/knife.mkd
+++ b/distro/common/markdown/man1/knife.mkd
@@ -174,7 +174,7 @@ recommended though, and git fits with a lot of the workflow paradigms.
 ## ENVIRONMENT
   * `EDITOR`:
     The text editor to use for editing data. The --editor option takes
-    precedence over this value, and the --disable-editing option supresses
+    precedence over this value, and the --disable-editing option suppresses
     data editing entirely.
 
 ## SEE ALSO
diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index a2718e7556..7214afc5be 100644
--- a/lib/chef/application.rb
+++ b/lib/chef/application.rb
@@ -226,7 +226,7 @@ class Chef
     private
     def can_fork?
       # win32-process gem exposes some form of :fork for Process
-      # class. So we are seperately ensuring that the platform we're
+      # class. So we are separately ensuring that the platform we're
       # running on is not windows before forking.
       Chef::Config[:client_fork] && Process.respond_to?(:fork) && !Chef::Platform.windows?
     end
diff --git a/lib/chef/application/knife.rb b/lib/chef/application/knife.rb
index d3e2f55757..ca5a9c9900 100644
--- a/lib/chef/application/knife.rb
+++ b/lib/chef/application/knife.rb
@@ -64,7 +64,7 @@ class Chef::Application::Knife < Chef::Application
     :long         => "--disable-editing",
     :description  => "Do not open EDITOR, just accept the data as is",
     :boolean      => true,
-    :defaut       => false
+    :default       => false
 
   option :help,
     :short        => "-h",
diff --git a/lib/chef/config.rb b/lib/chef/config.rb
index 538271de0e..c3fd939628 100644
--- a/lib/chef/config.rb
+++ b/lib/chef/config.rb
@@ -271,7 +271,7 @@ class Chef
     # * :fatal
     # These work as you'd expect. There is also a special `:auto` setting.
     # When set to :auto, Chef will auto adjust the log verbosity based on
-    # context. When a tty is available (usually becase the user is running chef
+    # context. When a tty is available (usually because the user is running chef
     # in a console), the log level is set to :warn, and output formatters are
     # used as the primary mode of output. When a tty is not available, the
     # logger is the primary mode of output, and the log level is set to :info
diff --git a/lib/chef/cookbook/metadata.rb b/lib/chef/cookbook/metadata.rb
index 54e930135d..781d3b40b0 100644
--- a/lib/chef/cookbook/metadata.rb
+++ b/lib/chef/cookbook/metadata.rb
@@ -227,11 +227,11 @@ class Chef
         )
       end
 
-      # Sets the current cookbook version, or returns it.  Can be two or three digits, seperated
+      # Sets the current cookbook version, or returns it.  Can be two or three digits, separated
       # by dots.  ie: '2.1', '1.5.4' or '0.9'.
       #
       # === Parameters
-      # version<String>:: The curent version, as a string
+      # version<String>:: The current version, as a string
       #
       # === Returns
       # version<String>:: Returns the current version
@@ -246,7 +246,7 @@ class Chef
       # Sets the name of the cookbook, or returns it.
       #
       # === Parameters
-      # name<String>:: The curent cookbook name.
+      # name<String>:: The current cookbook name.
       #
       # === Returns
       # name<String>:: Returns the current cookbook name.
diff --git a/lib/chef/dsl/reboot_pending.rb b/lib/chef/dsl/reboot_pending.rb
index a81debce99..7af67e94a5 100644
--- a/lib/chef/dsl/reboot_pending.rb
+++ b/lib/chef/dsl/reboot_pending.rb
@@ -47,7 +47,7 @@ class Chef
           # Vista + Server 2008 and newer may have reboots pending from CBS
           registry_key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired') ||
 
-          # The mere existance of the UpdateExeVolatile key should indicate a pending restart for certain updates
+          # The mere existence of the UpdateExeVolatile key should indicate a pending restart for certain updates
           # http://support.microsoft.com/kb/832475
           (registry_key_exists?('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile') &&
                 !registry_get_values('HKLM\SOFTWARE\Microsoft\Updates\UpdateExeVolatile').select { |v| v[:name] == "Flags" }[0].nil? &&
diff --git a/lib/chef/event_dispatch/base.rb b/lib/chef/event_dispatch/base.rb
index bfd4503097..50d261cecd 100644
--- a/lib/chef/event_dispatch/base.rb
+++ b/lib/chef/event_dispatch/base.rb
@@ -193,7 +193,7 @@ class Chef
       def definition_file_load_failed(path, exception)
       end
 
-      # Called when resource defintions are done loading
+      # Called when resource definitions are done loading
       def definition_load_complete
       end
 
diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb
index 0c079792a4..c000ca4d0a 100644
--- a/lib/chef/knife.rb
+++ b/lib/chef/knife.rb
@@ -252,7 +252,7 @@ class Chef
     OFFICIAL_PLUGINS = %w[ec2 rackspace windows openstack terremark bluebox]
 
     # :nodoc:
-    # Error out and print usage. probably becuase the arguments given by the
+    # Error out and print usage. probably because the arguments given by the
     # user could not be resolved to a subcommand.
     def self.subcommand_not_found!(args)
       ui.fatal("Cannot find sub command for: '#{args.join(' ')}'")
diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb
index ce062bdd25..ffc36436ec 100644
--- a/lib/chef/knife/core/bootstrap_context.rb
+++ b/lib/chef/knife/core/bootstrap_context.rb
@@ -23,7 +23,7 @@ class Chef
   class Knife
     module Core
       # Instances of BootstrapContext are the context objects (i.e., +self+) for
-      # bootstrap templates. For backwards compatability, they +must+ set the
+      # bootstrap templates. For backwards compatibility, they +must+ set the
       # following instance variables:
       # * @config   - a hash of knife's config values
       # * @run_list - the run list for the node to boostrap
diff --git a/lib/chef/knife/node_run_list_remove.rb b/lib/chef/knife/node_run_list_remove.rb
index 8519fd590a..4b8953a264 100644
--- a/lib/chef/knife/node_run_list_remove.rb
+++ b/lib/chef/knife/node_run_list_remove.rb
@@ -27,11 +27,20 @@ class Chef
         require 'chef/json_compat'
       end
 
-      banner "knife node run_list remove [NODE] [ENTRIES] (options)"
+      banner "knife node run_list remove [NODE] [ENTRY[,ENTRY]] (options)"
 
       def run
         node = Chef::Node.load(@name_args[0])
-        entries = @name_args[1].split(',')
+
+        if @name_args.size > 2
+          # Check for nested lists and create a single plain one
+          entries = @name_args[1..-1].map do |entry|
+            entry.split(',').map { |e| e.strip }
+          end.flatten
+        else
+          # Convert to array and remove the extra spaces
+          entries = @name_args[1].split(',').map { |e| e.strip }
+        end
 
         entries.each { |e| node.run_list.remove(e) }
 
@@ -45,4 +54,3 @@ class Chef
     end
   end
 end
-
diff --git a/lib/chef/mixin/command.rb b/lib/chef/mixin/command.rb
index c92315e718..d9a9c4f006 100644
--- a/lib/chef/mixin/command.rb
+++ b/lib/chef/mixin/command.rb
@@ -82,7 +82,7 @@ class Chef
       end
 
       # works same as above, except that it returns stdout and stderr
-      # requirement => platforms like solaris 9,10 has wierd issues where
+      # requirement => platforms like solaris 9,10 has weird issues where
       # even in command failure the exit code is zero, so we need to lookup stderr.
       def run_command_and_return_stdout_stderr(args={})
         command_output = ""
diff --git a/lib/chef/mixin/params_validate.rb b/lib/chef/mixin/params_validate.rb
index bedc67f357..78d72dc801 100644
--- a/lib/chef/mixin/params_validate.rb
+++ b/lib/chef/mixin/params_validate.rb
@@ -42,8 +42,8 @@ class Chef
       #               method names.
       # :required:: Raise an exception if this parameter is missing. Valid values are true or false,
       #             by default, options are not required.
-      # :regex:: Match the value of the paramater against a regular expression.
-      # :equal_to:: Match the value of the paramater with ==.  An array means it can be equal to any
+      # :regex:: Match the value of the parameter against a regular expression.
+      # :equal_to:: Match the value of the parameter with ==.  An array means it can be equal to any
       #             of the values.
       def validate(opts, map)
         #--
diff --git a/lib/chef/provider/deploy.rb b/lib/chef/provider/deploy.rb
index b30f7ed17e..26c677643b 100644
--- a/lib/chef/provider/deploy.rb
+++ b/lib/chef/provider/deploy.rb
@@ -126,7 +126,7 @@ class Chef
         # * Move release_path directory before deploy and move it back when error occurs
         # * Rollback to previous commit
         # * Do nothing - because deploy is force, it will be retried in short time
-        # Because last is simpliest, keep it
+        # Because last is simplest, keep it
         deploy
       end
 
diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb
index dd731adee4..21689503f0 100644
--- a/lib/chef/provider/package/rubygems.rb
+++ b/lib/chef/provider/package/rubygems.rb
@@ -130,7 +130,7 @@ class Chef
 
           ##
           # Determines the candidate version for a gem from a .gem file on disk
-          # and checks if it matches the version contraints in +gem_dependency+
+          # and checks if it matches the version constraints in +gem_dependency+
           # === Returns
           # Gem::Version  a singular gem version object is returned if the gem
           #               is available
diff --git a/lib/chef/provider/package/yum-dump.py b/lib/chef/provider/package/yum-dump.py
index 8b09dedbf0..c9f6a1fcea 100644
--- a/lib/chef/provider/package/yum-dump.py
+++ b/lib/chef/provider/package/yum-dump.py
@@ -23,7 +23,7 @@
 # and dump the results to stdout.
 #
 # yum-dump invokes yum similarly to the command line interface which makes it
-# subject to most of the configuration paramaters in yum.conf. yum-dump will
+# subject to most of the configuration parameters in yum.conf. yum-dump will
 # also load yum plugins in the same manor as yum - these can affect the output.
 #
 # Can be run as non root, but that won't update the cache.
@@ -70,7 +70,7 @@ def setup(yb, options):
       else:
         yb.doConfigSetup(errorlevel=0, debuglevel=0)
     except yum.Errors.ConfigError, e:
-      # supresses an ignored exception at exit
+      # suppresses an ignored exception at exit
       yb.preconf = None
       print >> sys.stderr, "yum-dump Config Error: %s" % e
       return 1
diff --git a/lib/chef/provider/remote_directory.rb b/lib/chef/provider/remote_directory.rb
index 9a7416e318..eaccce46cf 100644
--- a/lib/chef/provider/remote_directory.rb
+++ b/lib/chef/provider/remote_directory.rb
@@ -44,7 +44,7 @@ class Chef
         # Transfer files
         files_to_transfer.each do |cookbook_file_relative_path|
           create_cookbook_file(cookbook_file_relative_path)
-          # parent directories and file being transfered are removed from the purge list
+          # parent directories and file being transferred are removed from the purge list
           Pathname.new(Chef::Util::PathHelper.cleanpath(::File.join(@new_resource.path, cookbook_file_relative_path))).descend do |d|
             files_to_purge.delete(d.to_s)
           end
diff --git a/lib/chef/provider/service/upstart.rb b/lib/chef/provider/service/upstart.rb
index 3a3ddb2385..8d4aa41035 100644
--- a/lib/chef/provider/service/upstart.rb
+++ b/lib/chef/provider/service/upstart.rb
@@ -41,7 +41,7 @@ class Chef
         # In chef, when we ask a service to start, we expect it to have started before performing the next step
         # since we have top down dependencies. Which is to say we may follow witha resource next that requires
         # that service to be running. According to [2] we can trust that sending a 'goal' such as start will not
-        # return until that 'goal' is reached, or some error has occured.
+        # return until that 'goal' is reached, or some error has occurred.
         #
         # [1] http://upstart.ubuntu.com/wiki/JobStates
         # [2] http://www.netsplit.com/2008/04/27/upstart-05-events/
diff --git a/lib/chef/provider/user/dscl.rb b/lib/chef/provider/user/dscl.rb
index 84f5145c52..39746f0018 100644
--- a/lib/chef/provider/user/dscl.rb
+++ b/lib/chef/provider/user/dscl.rb
@@ -39,7 +39,7 @@ class Chef
       # > 10.7  => password shadow calculation format SALTED-SHA512-PBKDF2
       #         => stored in: /var/db/dslocal/nodes/Default/users/#{name}.plist
       #         => shadow binary length 128 bytes
-      #         => Salt / Iterations are stored seperately in the same file
+      #         => Salt / Iterations are stored separately in the same file
       #
       # This provider only supports Mac OSX versions 10.7 and above
       class Dscl < Chef::Provider::User
diff --git a/lib/chef/recipe.rb b/lib/chef/recipe.rb
index de72a8d0c4..e54a1d98e3 100644
--- a/lib/chef/recipe.rb
+++ b/lib/chef/recipe.rb
@@ -82,7 +82,7 @@ class Chef
       run_context.resource_collection.find(*args)
     end
 
-    # This was moved to Chef::Node#tag, redirecting here for compatability
+    # This was moved to Chef::Node#tag, redirecting here for compatibility
     def tag(*tags)
       run_context.node.tag(*tags)
     end
diff --git a/lib/chef/resource_definition.rb b/lib/chef/resource_definition.rb
index 278114e209..9d6844129c 100644
--- a/lib/chef/resource_definition.rb
+++ b/lib/chef/resource_definition.rb
@@ -54,7 +54,7 @@ class Chef
     end
 
     # When we do the resource definition, we're really just setting new values for
-    # the paramaters we prototyped at the top.  This method missing is as simple as
+    # the parameters we prototyped at the top.  This method missing is as simple as
     # it gets.
     def method_missing(symbol, *args)
       @params[symbol] = args.length == 1 ? args[0] : args
diff --git a/lib/chef/util/file_edit.rb b/lib/chef/util/file_edit.rb
index 92cefb4bb4..4d2a9c03eb 100644
--- a/lib/chef/util/file_edit.rb
+++ b/lib/chef/util/file_edit.rb
@@ -47,7 +47,7 @@ class Chef
       end
 
       #search the file line by line and match each line with the given regex
-      #if matched, replace the match (all occurances)  with the replace parameter
+      #if matched, replace the match (all occurrences)  with the replace parameter
       def search_file_replace(regex, replace)
         @changes = (editor.replace(regex, replace) > 0) || @changes
       end
@@ -59,7 +59,7 @@ class Chef
       end
 
       #search the file line by line and match each line with the given regex
-      #if matched, delete the match (all occurances) from the line
+      #if matched, delete the match (all occurrences) from the line
       def search_file_delete(regex)
         search_file_replace(regex, '')
       end
diff --git a/spec/functional/resource/aixinit_service_spec.rb b/spec/functional/resource/aixinit_service_spec.rb
index 3d3234f0f7..19b65ca2a0 100755
--- a/spec/functional/resource/aixinit_service_spec.rb
+++ b/spec/functional/resource/aixinit_service_spec.rb
@@ -28,7 +28,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
 
   # Platform specific validation routines.
   def service_should_be_started(file_name)
-    # The existance of this file indicates that the service was started.
+    # The existence of this file indicates that the service was started.
     expect(File.exists?("/tmp/#{file_name}")).to be_truthy
   end
 
diff --git a/spec/support/pedant/pedant_config.rb b/spec/support/pedant/pedant_config.rb
index f7d14d8f17..3f8219fc59 100644
--- a/spec/support/pedant/pedant_config.rb
+++ b/spec/support/pedant/pedant_config.rb
@@ -26,7 +26,7 @@
 
 # If you are doing development testing, you can specify the address of
 # the Solr server.  The presence of this parameter will enable tests
-# to force commits to Solr, greatly decreasing the amout of time
+# to force commits to Solr, greatly decreasing the amount of time
 # needed for testing the search endpoint.  This is only an
 # optimization for development!  If you are testing a "live" Chef
 # Server, or otherwise do not have access to the Solr server from your
@@ -36,7 +36,7 @@
 #search_server "http://localhost:8983"
 
 # Related to the 'search_server' parameter, this specifies the maximum
-# amout of time (in seconds) that search endpoint requests should be
+# amount of time (in seconds) that search endpoint requests should be
 # retried before giving up.  If not explicitly set, it will default to
 # 65 seconds; only set it if you know that your Solr commit interval
 # differs significantly from this.
diff --git a/spec/support/shared/functional/file_resource.rb b/spec/support/shared/functional/file_resource.rb
index bcc2a7da25..4f8e2f5b71 100644
--- a/spec/support/shared/functional/file_resource.rb
+++ b/spec/support/shared/functional/file_resource.rb
@@ -813,7 +813,7 @@ shared_examples_for "a configured file resource" do
 
   # Regression test for http://tickets.opscode.com/browse/CHEF-4082
   context "when notification is configured" do
-    describe "when path is specified with normal seperator" do
+    describe "when path is specified with normal separator" do
       before do
         @notified_resource = Chef::Resource.new("punk", resource.run_context)
         resource.notifies(:run, @notified_resource, :immediately)
@@ -826,7 +826,7 @@ shared_examples_for "a configured file resource" do
       end
     end
 
-    describe "when path is specified with windows seperator", :windows_only do
+    describe "when path is specified with windows separator", :windows_only do
       let(:path) {
         File.join(test_file_dir, make_tmpname(file_base)).gsub(::File::SEPARATOR, ::File::ALT_SEPARATOR)
       }
diff --git a/spec/support/shared/functional/http.rb b/spec/support/shared/functional/http.rb
index 9a3389306d..963fbf1c5b 100644
--- a/spec/support/shared/functional/http.rb
+++ b/spec/support/shared/functional/http.rb
@@ -131,7 +131,7 @@ module ChefHTTPShared
     }
 
     #
-    # in the presense of a transfer-encoding header, we must ignore the content-length (this bad content-length should work)
+    # in the presence of a transfer-encoding header, we must ignore the content-length (this bad content-length should work)
     #
 
     # (expected_content should be uncompressed)
diff --git a/spec/support/shared/unit/api_error_inspector.rb b/spec/support/shared/unit/api_error_inspector.rb
index e85fa971e9..29faa07f29 100644
--- a/spec/support/shared/unit/api_error_inspector.rb
+++ b/spec/support/shared/unit/api_error_inspector.rb
@@ -23,7 +23,7 @@
 # runs without error, but don't make assertions about the output. This is
 # because aspects such as how information gets formatted, what's included, etc.
 # are still in flux. When testing an inspector, change the outputter to use
-# STDOUT and manually check the ouput.
+# STDOUT and manually check the output.
 
 shared_examples_for "an api error inspector" do
 
diff --git a/spec/unit/cookbook/metadata_spec.rb b/spec/unit/cookbook/metadata_spec.rb
index a1903a1948..760ae5dd2a 100644
--- a/spec/unit/cookbook/metadata_spec.rb
+++ b/spec/unit/cookbook/metadata_spec.rb
@@ -441,7 +441,7 @@ describe Chef::Cookbook::Metadata do
       }.not_to raise_error
     end
 
-     it "should let type be hash (backwards compatability only)" do
+     it "should let type be hash (backwards compatibility only)" do
       expect {
         metadata.attribute("db/mysql/databases", :type => "hash")
       }.not_to raise_error
diff --git a/spec/unit/cookbook_version_spec.rb b/spec/unit/cookbook_version_spec.rb
index 3d0348553b..6dd3429ffc 100644
--- a/spec/unit/cookbook_version_spec.rb
+++ b/spec/unit/cookbook_version_spec.rb
@@ -396,7 +396,7 @@ describe Chef::CookbookVersion do
       expect(@cookbook_version).to have_template_for_node(@node, ["test.erb"])
     end
 
-    it "should see a template using an array lookup with non-existant elements" do
+    it "should see a template using an array lookup with non-existent elements" do
       expect(@cookbook_version).to have_template_for_node(@node, ["missing.txt", "test.erb"])
     end
 
@@ -408,23 +408,23 @@ describe Chef::CookbookVersion do
       expect(@cookbook_version).to have_cookbook_file_for_node(@node, ["test.txt"])
     end
 
-    it "should see a file using an array lookup with non-existant elements" do
+    it "should see a file using an array lookup with non-existent elements" do
       expect(@cookbook_version).to have_cookbook_file_for_node(@node, ["missing.txt", "test.txt"])
     end
 
-    it "should not see a non-existant template" do
+    it "should not see a non-existent template" do
       expect(@cookbook_version).not_to have_template_for_node(@node, "missing.erb")
     end
 
-    it "should not see a non-existant template using an array lookup" do
+    it "should not see a non-existent template using an array lookup" do
       expect(@cookbook_version).not_to have_template_for_node(@node, ["missing.erb"])
     end
 
-    it "should not see a non-existant file" do
+    it "should not see a non-existent file" do
       expect(@cookbook_version).not_to have_cookbook_file_for_node(@node, "missing.txt")
     end
 
-    it "should not see a non-existant file using an array lookup" do
+    it "should not see a non-existent file using an array lookup" do
       expect(@cookbook_version).not_to have_cookbook_file_for_node(@node, ["missing.txt"])
     end
 
diff --git a/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb b/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb
index ee957ed450..a42d234601 100644
--- a/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb
+++ b/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb
@@ -114,20 +114,20 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
     describe "recipe_snippet" do
       before do
         # fake code to run through #recipe_snippet
-        source_file = [ "if true", "var = non_existant", "end" ]
+        source_file = [ "if true", "var = non_existent", "end" ]
         allow(IO).to receive(:readlines).and_return(source_file)
         allow(File).to receive(:exists?).and_return(true)
       end
 
       it "parses a Windows path" do
-        source_line = "C:/Users/btm/chef/chef/spec/unit/fake_file.rb:2: undefined local variable or method `non_existant' for main:Object (NameError)"
+        source_line = "C:/Users/btm/chef/chef/spec/unit/fake_file.rb:2: undefined local variable or method `non_existent' for main:Object (NameError)"
         @resource.source_line = source_line
         @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
         expect(@inspector.recipe_snippet).to match(/^# In C:\/Users\/btm/)
       end
 
       it "parses a unix path" do
-        source_line = "/home/btm/src/chef/chef/spec/unit/fake_file.rb:2: undefined local variable or method `non_existant' for main:Object (NameError)"
+        source_line = "/home/btm/src/chef/chef/spec/unit/fake_file.rb:2: undefined local variable or method `non_existent' for main:Object (NameError)"
         @resource.source_line = source_line
         @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
         expect(@inspector.recipe_snippet).to match(/^# In \/home\/btm/)
@@ -145,7 +145,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
           expect(@inspector.recipe_snippet).to be_nil
         end
 
-        it "does not raise an exception trying to load a non-existant file (CHEF-3411)" do
+        it "does not raise an exception trying to load a non-existent file (CHEF-3411)" do
           @resource.source_line = "/somewhere/in/space"
           @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
           expect { @inspector.recipe_snippet }.not_to raise_error
diff --git a/spec/unit/handler_spec.rb b/spec/unit/handler_spec.rb
index a9aa0e0b50..e7f67405fc 100644
--- a/spec/unit/handler_spec.rb
+++ b/spec/unit/handler_spec.rb
@@ -84,7 +84,7 @@ describe Chef::Handler do
     end
 
     it "has a shortcut for the success? and failed? predicates" do
-      expect(@handler.success?).to be_falsey # becuase there's an exception
+      expect(@handler.success?).to be_falsey # because there's an exception
       expect(@handler.failed?).to be_truthy
     end
 
diff --git a/spec/unit/knife/node_run_list_remove_spec.rb b/spec/unit/knife/node_run_list_remove_spec.rb
index ea951e21dd..ceceef7178 100644
--- a/spec/unit/knife/node_run_list_remove_spec.rb
+++ b/spec/unit/knife/node_run_list_remove_spec.rb
@@ -66,9 +66,24 @@ describe Chef::Knife::NodeRunListRemove do
         expect(@node.run_list).not_to include('role[monkey]')
         expect(@node.run_list).not_to include('recipe[duck::type]')
       end
+
+      it "should remove the items from the run list when name args contains whitespace" do
+        @node.run_list << 'role[monkey]'
+        @node.run_list << 'recipe[duck::type]'
+        @knife.name_args = [ 'adam', 'role[monkey], recipe[duck::type]' ]
+        @knife.run
+        expect(@node.run_list).not_to include('role[monkey]')
+        expect(@node.run_list).not_to include('recipe[duck::type]')
+      end
+
+      it "should remove the items from the run list when name args contains multiple run lists" do
+        @node.run_list << 'role[blah]'
+        @node.run_list << 'recipe[duck::type]'
+        @knife.name_args = [ 'adam', 'role[monkey], recipe[duck::type]', 'role[blah]' ]
+        @knife.run
+        expect(@node.run_list).not_to include('role[monkey]')
+        expect(@node.run_list).not_to include('recipe[duck::type]')
+      end
     end
   end
 end
-
-
-
diff --git a/spec/unit/knife_spec.rb b/spec/unit/knife_spec.rb
index d35ba4fa5f..49fa4a85ca 100644
--- a/spec/unit/knife_spec.rb
+++ b/spec/unit/knife_spec.rb
@@ -64,7 +64,7 @@ describe Chef::Knife do
       expect(KnifeSpecs::TestNameMapping.subcommand_category).to eq('test')
     end
 
-    it "has an explictly defined category if set" do
+    it "has an explicitly defined category if set" do
       expect(KnifeSpecs::TestExplicitCategory.subcommand_category).to eq('cookbook site')
     end
 
diff --git a/spec/unit/lwrp_spec.rb b/spec/unit/lwrp_spec.rb
index 0fb0ea7cab..35963dec64 100644
--- a/spec/unit/lwrp_spec.rb
+++ b/spec/unit/lwrp_spec.rb
@@ -247,7 +247,7 @@ describe "LWRP" do
           end
         end
 
-        it "ammends actions when they are already defined" do
+        it "amends actions when they are already defined" do
           raise_if_deprecated!
           expect(child.actions).to eq([:eat, :sleep, :drink])
         end
diff --git a/spec/unit/node/immutable_collections_spec.rb b/spec/unit/node/immutable_collections_spec.rb
index b1e7b9169b..d0ec81c7f7 100644
--- a/spec/unit/node/immutable_collections_spec.rb
+++ b/spec/unit/node/immutable_collections_spec.rb
@@ -33,7 +33,7 @@ describe Chef::Node::ImmutableMash do
     expect(@immutable_mash[:top][:second_level]).to eq("some value")
   end
 
-  it "elelment references like a regular Mash" do
+  it "element references like a regular Mash" do
     expect(@immutable_mash[:top_level_2]).to eq(%w[array of values])
   end
 
diff --git a/spec/unit/resource_definition_spec.rb b/spec/unit/resource_definition_spec.rb
index 01e28bf091..1371a8b9a6 100644
--- a/spec/unit/resource_definition_spec.rb
+++ b/spec/unit/resource_definition_spec.rb
@@ -85,7 +85,7 @@ describe Chef::ResourceDefinition do
     expect(defn.recipe.call).to eql("I am what I am")
   end
 
-  it "should set paramaters based on method_missing" do
+  it "should set parameters based on method_missing" do
     defn.mind "to fly"
     expect(defn.params[:mind]).to eql("to fly")
   end
diff --git a/spec/unit/resource_spec.rb b/spec/unit/resource_spec.rb
index bb02d91b23..335956009f 100644
--- a/spec/unit/resource_spec.rb
+++ b/spec/unit/resource_spec.rb
@@ -324,7 +324,7 @@ describe Chef::Resource do
       expect(zm.is("one", "two", "three")).to eq(%w|one two three|)
     end
 
-    it "should allow arguments preceeded by is to methods" do
+    it "should allow arguments preceded by is to methods" do
       @resource.noop(@resource.is(true))
       expect(@resource.noop).to eql(true)
     end
diff --git a/spec/unit/run_list/run_list_expansion_spec.rb b/spec/unit/run_list/run_list_expansion_spec.rb
index 927257875e..859219d346 100644
--- a/spec/unit/run_list/run_list_expansion_spec.rb
+++ b/spec/unit/run_list/run_list_expansion_spec.rb
@@ -97,7 +97,7 @@ describe Chef::RunList::RunListExpansion do
       expect(@expansion.recipes).to eq(['lobster', 'crabrevenge', 'fist'])
     end
 
-    it "has the merged attributes from the roles with outer roles overridding inner" do
+    it "has the merged attributes from the roles with outer roles overriding inner" do
       expect(@expansion.default_attrs).to eq({'foo' => 'bar'})
       expect(@expansion.override_attrs).to eq({'baz' => 'qux'})
     end
@@ -109,7 +109,7 @@ describe Chef::RunList::RunListExpansion do
 
   end
 
-  describe "after expanding a run list with a non existant role" do
+  describe "after expanding a run list with a non existent role" do
     before do
       allow(@expansion).to receive(:fetch_role) { @expansion.role_not_found('crabrevenge', "role[base]") }
       @expansion.expand
diff --git a/spec/unit/shell_spec.rb b/spec/unit/shell_spec.rb
index 58dea4c988..0e028f4359 100644
--- a/spec/unit/shell_spec.rb
+++ b/spec/unit/shell_spec.rb
@@ -47,7 +47,7 @@ describe Shell do
 
   describe "reporting its status" do
 
-    it "alway says it is running" do
+    it "always says it is running" do
       expect(Shell).to be_running
     end
 
diff --git a/spec/unit/util/dsc/configuration_generator_spec.rb b/spec/unit/util/dsc/configuration_generator_spec.rb
index c39c949991..e75e285d43 100644
--- a/spec/unit/util/dsc/configuration_generator_spec.rb
+++ b/spec/unit/util/dsc/configuration_generator_spec.rb
@@ -137,7 +137,7 @@ describe Chef::Util::DSC::ConfigurationGenerator do
 
   describe "#find_configuration_document" do
     it "should find the mof file" do
-      # These tests seem way too implementation specific. Unfortunatly, File and Dir
+      # These tests seem way too implementation specific. Unfortunately, File and Dir
       # need to be mocked because they are OS specific
       allow(File).to receive(:join) do |a, b|
         [a,b].join("++")
diff --git a/spec/unit/workstation_config_loader_spec.rb b/spec/unit/workstation_config_loader_spec.rb
index 0f60e3ec38..a865103188 100644
--- a/spec/unit/workstation_config_loader_spec.rb
+++ b/spec/unit/workstation_config_loader_spec.rb
@@ -219,7 +219,7 @@ describe Chef::WorkstationConfigLoader do
 
     end
 
-    context "when an explict config is given but it doesn't exist" do
+    context "when an explicit config is given but it doesn't exist" do
 
       let(:explicit_config_location) { "/nope/nope/nope/frab/jab/nab" }