Merge branch 'integrate-chef-10-18-0'

24 files changed, 25 insertions, 28 deletions

diff --git a/distro/common/man/man1/chef-shell.1 b/distro/common/man/man1/chef-shell.1
index 05cb735470..3978c0c9b5 100644
--- a/distro/common/man/man1/chef-shell.1
+++ b/distro/common/man/man1/chef-shell.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SHELL" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "CHEF\-SHELL" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-shell\fR \- Interactive Chef Console
diff --git a/distro/common/man/man1/knife-bootstrap.1 b/distro/common/man/man1/knife-bootstrap.1
index da5283c63d..d371906534 100644
--- a/distro/common/man/man1/knife-bootstrap.1
+++ b/distro/common/man/man1/knife-bootstrap.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-BOOTSTRAP" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-BOOTSTRAP" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-bootstrap\fR \- Install Chef Client on a remote host
diff --git a/distro/common/man/man1/knife-client.1 b/distro/common/man/man1/knife-client.1
index 977688871b..d36e5d0c68 100644
--- a/distro/common/man/man1/knife-client.1
+++ b/distro/common/man/man1/knife-client.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-CLIENT" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-CLIENT" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-client\fR \- Manage Chef API Clients
diff --git a/distro/common/man/man1/knife-configure.1 b/distro/common/man/man1/knife-configure.1
index fd828ca966..fb25fc5114 100644
--- a/distro/common/man/man1/knife-configure.1
+++ b/distro/common/man/man1/knife-configure.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-CONFIGURE" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-CONFIGURE" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-configure\fR \- Generate configuration files for knife or Chef Client
diff --git a/distro/common/man/man1/knife-cookbook-site.1 b/distro/common/man/man1/knife-cookbook-site.1
index 7f17119787..d834b10ec8 100644
--- a/distro/common/man/man1/knife-cookbook-site.1
+++ b/distro/common/man/man1/knife-cookbook-site.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-COOKBOOK\-SITE" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-COOKBOOK\-SITE" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-cookbook\-site\fR \- Install and update open source cookbooks
diff --git a/distro/common/man/man1/knife-cookbook.1 b/distro/common/man/man1/knife-cookbook.1
index 270e23db77..e0c9536cc6 100644
--- a/distro/common/man/man1/knife-cookbook.1
+++ b/distro/common/man/man1/knife-cookbook.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-COOKBOOK" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-COOKBOOK" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-cookbook\fR \- upload and manage chef cookbooks
diff --git a/distro/common/man/man1/knife-data-bag.1 b/distro/common/man/man1/knife-data-bag.1
index 1a7bc0c398..4878f5d2b9 100644
--- a/distro/common/man/man1/knife-data-bag.1
+++ b/distro/common/man/man1/knife-data-bag.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-DATA\-BAG" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-DATA\-BAG" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-data\-bag\fR \- Store arbitrary data on a Chef Server
diff --git a/distro/common/man/man1/knife-environment.1 b/distro/common/man/man1/knife-environment.1
index 07050a87fe..90b73443f2 100644
--- a/distro/common/man/man1/knife-environment.1
+++ b/distro/common/man/man1/knife-environment.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-ENVIRONMENT" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-ENVIRONMENT" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-environment\fR \- Define cookbook policies for the environments in your infrastructure
diff --git a/distro/common/man/man1/knife-exec.1 b/distro/common/man/man1/knife-exec.1
index 829d58ff09..365fd252cf 100644
--- a/distro/common/man/man1/knife-exec.1
+++ b/distro/common/man/man1/knife-exec.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-EXEC" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-EXEC" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-exec\fR \- Run user scripts using the Chef API DSL
diff --git a/distro/common/man/man1/knife-index.1 b/distro/common/man/man1/knife-index.1
index 268d4acf95..e5e3574e37 100644
--- a/distro/common/man/man1/knife-index.1
+++ b/distro/common/man/man1/knife-index.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-INDEX" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-INDEX" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-index\fR \- Rebuild the search index on a Chef Server
diff --git a/distro/common/man/man1/knife-node.1 b/distro/common/man/man1/knife-node.1
index 4796822f6d..03fae4bc8d 100644
--- a/distro/common/man/man1/knife-node.1
+++ b/distro/common/man/man1/knife-node.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-NODE" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-NODE" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-node\fR \- Manage the hosts in your infrastructure
diff --git a/distro/common/man/man1/knife-role.1 b/distro/common/man/man1/knife-role.1
index c9fee15c19..9bed938917 100644
--- a/distro/common/man/man1/knife-role.1
+++ b/distro/common/man/man1/knife-role.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-ROLE" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-ROLE" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-role\fR \- Group common configuration settings
diff --git a/distro/common/man/man1/knife-search.1 b/distro/common/man/man1/knife-search.1
index 6e16e3b7d1..5dedce0961 100644
--- a/distro/common/man/man1/knife-search.1
+++ b/distro/common/man/man1/knife-search.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-SEARCH" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-SEARCH" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-search\fR \- Find objects on a Chef Server by query
diff --git a/distro/common/man/man1/knife-ssh.1 b/distro/common/man/man1/knife-ssh.1
index bb2abeb8c2..be228624dc 100644
--- a/distro/common/man/man1/knife-ssh.1
+++ b/distro/common/man/man1/knife-ssh.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-SSH" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-SSH" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-ssh\fR \- Run a command or interactive session on multiple remote hosts
diff --git a/distro/common/man/man1/knife-status.1 b/distro/common/man/man1/knife-status.1
index 69bf949259..347adaaf96 100644
--- a/distro/common/man/man1/knife-status.1
+++ b/distro/common/man/man1/knife-status.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-STATUS" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-STATUS" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-status\fR \- Display status information for the nodes in your infrastructure
diff --git a/distro/common/man/man1/knife-tag.1 b/distro/common/man/man1/knife-tag.1
index 1846ee0794..1c38a14e35 100644
--- a/distro/common/man/man1/knife-tag.1
+++ b/distro/common/man/man1/knife-tag.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-TAG" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE\-TAG" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-tag\fR \- Apply tags to nodes on a Chef Server
diff --git a/distro/common/man/man1/knife.1 b/distro/common/man/man1/knife.1
index 2c33bd6c2d..e33113f1c6 100644
--- a/distro/common/man/man1/knife.1
+++ b/distro/common/man/man1/knife.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE" "1" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "KNIFE" "1" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\fR \- Chef Server API client utility
@@ -163,10 +163,7 @@ If the config file exists, knife uses these settings for \fBGENERAL OPTIONS\fR d
 \fBchef_server_url\fR: URL of the Chef server\. Corresponds to the \fB\-s\fR or \fB\-\-server\-url\fR option\. This is requested from the user when running this sub\-command\.
 .
 .IP "\(bu" 4
-\fBcache_type\fR: The type of cache to use\. Default is BasicFile\. This can be any type of Cache that moneta supports: BasicFile, Berkeley, Couch, DataMapper, File, LMC, Memcache, Memory, MongoDB, Redis, Rufus, S3, SDBM, Tyrant, Xattr, YAML\.
-.
-.IP "\(bu" 4
-\fBcache_options\fR: Specifies various options to use for caching\. These options are dependent on the \fBcache_type\fR\.
+\fBsyntax_check_cache_path\fR: Specifies the path to a directory where knife caches information about files that it has syntax checked\.
 .
 .IP "\(bu" 4
 \fBvalidation_client_name\fR: Specifies the name of the client used to validate new clients\.
diff --git a/distro/common/man/man8/chef-client.8 b/distro/common/man/man8/chef-client.8
index c8ecd58284..1ed91de287 100644
--- a/distro/common/man/man8/chef-client.8
+++ b/distro/common/man/man8/chef-client.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-CLIENT" "8" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "CHEF\-CLIENT" "8" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-client\fR \- Runs a client node connecting to a chef\-server\.
diff --git a/distro/common/man/man8/chef-expander.8 b/distro/common/man/man8/chef-expander.8
index 31d8f36b51..8a8ea072ec 100644
--- a/distro/common/man/man8/chef-expander.8
+++ b/distro/common/man/man8/chef-expander.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-EXPANDER" "8" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "CHEF\-EXPANDER" "8" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr
diff --git a/distro/common/man/man8/chef-expanderctl.8 b/distro/common/man/man8/chef-expanderctl.8
index d210ddaa9f..732d849306 100644
--- a/distro/common/man/man8/chef-expanderctl.8
+++ b/distro/common/man/man8/chef-expanderctl.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-EXPANDERCTL" "8" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "CHEF\-EXPANDERCTL" "8" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-expanderctl\fR \- management program for chef\-expander
diff --git a/distro/common/man/man8/chef-server-webui.8 b/distro/common/man/man8/chef-server-webui.8
index c5c22c3110..77615e0ab6 100644
--- a/distro/common/man/man8/chef-server-webui.8
+++ b/distro/common/man/man8/chef-server-webui.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SERVER\-WEBUI" "8" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "CHEF\-SERVER\-WEBUI" "8" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-server\-webui\fR \- Start the Chef Server merb application slice providing Web User Interface (Management Console)\.
diff --git a/distro/common/man/man8/chef-server.8 b/distro/common/man/man8/chef-server.8
index 5928f7b7a1..548116c542 100644
--- a/distro/common/man/man8/chef-server.8
+++ b/distro/common/man/man8/chef-server.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SERVER" "8" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "CHEF\-SERVER" "8" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-server\fR \- Start the Chef Server merb application slice\.
diff --git a/distro/common/man/man8/chef-solo.8 b/distro/common/man/man8/chef-solo.8
index 332fb1a4f0..457989e052 100644
--- a/distro/common/man/man8/chef-solo.8
+++ b/distro/common/man/man8/chef-solo.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SOLO" "8" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "CHEF\-SOLO" "8" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solo\fR \- Runs chef in solo mode against a specified cookbook location\.
diff --git a/distro/common/man/man8/chef-solr.8 b/distro/common/man/man8/chef-solr.8
index 7f3a68f138..8552945f31 100644
--- a/distro/common/man/man8/chef-solr.8
+++ b/distro/common/man/man8/chef-solr.8
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SOLR" "8" "September 2012" "Chef 11.0.0.alpha" "Chef Manual"
+.TH "CHEF\-SOLR" "8" "January 2013" "Chef 11.0.0.alpha" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solr\fR \- Runs as Chef\'s search server