Merge branch 'master' into merging-mastermerging-master

Conflicts:
	lib/chef/version.rb

6 files changed, 6 insertions, 6 deletions

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