Merge branch 'master' of https://github.com/tas50/chef-1 into tball/contrib-pass

3 files changed, 8 insertions, 8 deletions

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 3c4e14aec6..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.
@@ -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'