Release 0.10.10.rc.4 ever harder

17 files changed, 36 insertions, 38 deletions

diff --git a/chef/distro/common/man/man1/knife-bootstrap.1 b/chef/distro/common/man/man1/knife-bootstrap.1
index 2a13e5c75a..a11493bc72 100644
--- a/chef/distro/common/man/man1/knife-bootstrap.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-BOOTSTRAP" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-bootstrap\fR \- Install Chef Client on a remote host
@@ -58,8 +58,8 @@ Execute the bootstrap via sudo
 Bootstrap a distro using a template
 .
 .TP
-\fB\-\-no\-host\-key\-verify\fR
-Disable host key verification
+\fB\-\-[no\-]host\-key\-verify\fR
+Enable host key verification, which is the default behavior\.
 .
 .SH "DESCRIPTION"
 Performs a Chef Bootstrap on the target node\. The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server\. The main assumption is a baseline OS installation exists\. This sub\-command is used internally by some cloud computing plugins\.
@@ -96,7 +96,7 @@ ubuntu10\.04\-apt
 .IP "" 0
 .
 .P
-The gems installations will use RubyGems 1\.3\.6 and Chef installed as a gem\. The apt installation will use the Opscode APT repository\. The RubyGems installation requires installing gems with native extensions, so development related packages (ruby\-dev, build\-essential) are installed\. These are not installed with the apt installation, as native extensions are already compiled in the required packages\.
+The gems installations will use RubyGems 1\.3\.6 and Chef installed as a gem\. The apt installation will use the Opscode APT repository\.
 .
 .P
 In addition to handling the software installation, these bootstrap templates do the following:
diff --git a/chef/distro/common/man/man1/knife-client.1 b/chef/distro/common/man/man1/knife-client.1
index 8419c7003f..ca09b8ad1f 100644
--- a/chef/distro/common/man/man1/knife-client.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-CLIENT" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-client\fR \- Manage Chef API Clients
diff --git a/chef/distro/common/man/man1/knife-configure.1 b/chef/distro/common/man/man1/knife-configure.1
index 6799dd73da..6b1a7e09a3 100644
--- a/chef/distro/common/man/man1/knife-configure.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-CONFIGURE" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-configure\fR \- Generate configuration files for knife or Chef Client
diff --git a/chef/distro/common/man/man1/knife-cookbook-site.1 b/chef/distro/common/man/man1/knife-cookbook-site.1
index b5c56ae3e3..8e93f5520a 100644
--- a/chef/distro/common/man/man1/knife-cookbook-site.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-COOKBOOK\-SITE" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-cookbook\-site\fR \- Install and update open source cookbooks
@@ -16,8 +16,8 @@
 \fBcookbook site install COOKBOOK [VERSION]\fR \fI(options)\fR
 .
 .TP
-\fB\-D\fR, \fB\-\-no\-dependencies\fR
-Do not install dependencies automatically
+\fB\-D\fR, \fB\-\-skip\-dependencies\fR
+Skip automatic installation of dependencies\.
 .
 .TP
 \fB\-o\fR, \fB\-\-cookbook\-path PATH\fR
@@ -51,7 +51,7 @@ The pristine copy branch is merged into the master branch\.
 By installing cookbook with this process, you can locally modify the upstream cookbook in your master branch and let git maintain your changes as a separate patch\. When an updated upstream version becomes available, you will be able to merge the upstream changes while maintaining your local modifications\.
 .
 .P
-Unless \fI\-D\fR is specified, the process is applied recursively to all the cookbooks \fICOOKBOOK\fR depends on (via metadata \fIdependencies\fR)\.
+Unless \fI\-\-skip\-dependencies\fR is specified, the process is applied recursively to all the cookbooks \fICOOKBOOK\fR depends on (via metadata \fIdependencies\fR)\.
 .
 .SH "DOWNLOAD"
 \fBknife cookbook site download COOKBOOK [VERSION]\fR \fI(options)\fR
diff --git a/chef/distro/common/man/man1/knife-cookbook.1 b/chef/distro/common/man/man1/knife-cookbook.1
index 185e6e85a8..e105509834 100644
--- a/chef/distro/common/man/man1/knife-cookbook.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-COOKBOOK" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-cookbook\fR \- upload and manage chef cookbooks
diff --git a/chef/distro/common/man/man1/knife-data-bag.1 b/chef/distro/common/man/man1/knife-data-bag.1
index 97657c0c28..dc395adbcd 100644
--- a/chef/distro/common/man/man1/knife-data-bag.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-DATA\-BAG" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-data\-bag\fR \- Store arbitrary data on a Chef Server
@@ -57,6 +57,12 @@ Edit an item in a data bag\.
 .SH "FROM FILE"
 \fBknife data bag from file\fR \fIbag name\fR \fIfile\fR \fI(options)\fR
 .
+.P
+\fBknife data bag from file\fR \fIbag name\fR \fIfile1\fR \fIfile2\fR \fIfile3\fR \fI(options)\fR
+.
+.P
+\fBknife data bag from file\fR \fIbag name\fR \fIfolder\fR \fI(options)\fR
+.
 .TP
 \fB\-s\fR, \fB\-\-secret SECRET\fR
 A secret key used to encrypt the data bag item\. See \fBencryption support\fR below\.
diff --git a/chef/distro/common/man/man1/knife-environment.1 b/chef/distro/common/man/man1/knife-environment.1
index 7c05e7eb6e..057de8c58b 100644
--- a/chef/distro/common/man/man1/knife-environment.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-ENVIRONMENT" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-environment\fR \- Define cookbook policies for the environments in your infrastructure
diff --git a/chef/distro/common/man/man1/knife-exec.1 b/chef/distro/common/man/man1/knife-exec.1
index 2b65d7881d..9cd8bca4ac 100644
--- a/chef/distro/common/man/man1/knife-exec.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-EXEC" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-exec\fR \- Run user scripts using the Chef API DSL
diff --git a/chef/distro/common/man/man1/knife-index.1 b/chef/distro/common/man/man1/knife-index.1
index 94559340eb..0adf81029c 100644
--- a/chef/distro/common/man/man1/knife-index.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-INDEX" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-index\fR \- Rebuild the search index on a Chef Server
diff --git a/chef/distro/common/man/man1/knife-node.1 b/chef/distro/common/man/man1/knife-node.1
index daeadc41ef..44c5859c83 100644
--- a/chef/distro/common/man/man1/knife-node.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-NODE" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-node\fR \- Manage the hosts in your infrastructure
@@ -31,7 +31,7 @@ Deletes nodes for which the name matches the regular expression \fIregex\fR on t
 \fBknife node create\fR \fIname\fR \fI(options)\fR
 .
 .P
-Create a new node\. Unless the \-\-no\-editor option is given, an empty node object will be created and displayed in your text editor\. If the editor exits with a successful exit status, the node data will be posted to the Chef Server to create the node\.
+Create a new node\. Unless the \-\-disable\-editing option is given, an empty node object will be created and displayed in your text editor\. If the editor exits with a successful exit status, the node data will be posted to the Chef Server to create the node\.
 .
 .SH "DELETE"
 \fBknife node delete\fR \fIname\fR \fI(options)\fR
diff --git a/chef/distro/common/man/man1/knife-role.1 b/chef/distro/common/man/man1/knife-role.1
index d42fe09f18..4e91dcc2d1 100644
--- a/chef/distro/common/man/man1/knife-role.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-ROLE" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-role\fR \- Group common configuration settings
diff --git a/chef/distro/common/man/man1/knife-search.1 b/chef/distro/common/man/man1/knife-search.1
index d0810edd82..a9e84ca2f6 100644
--- a/chef/distro/common/man/man1/knife-search.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-SEARCH" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-search\fR \- Find objects on a Chef Server by query
diff --git a/chef/distro/common/man/man1/knife-ssh.1 b/chef/distro/common/man/man1/knife-ssh.1
index 024a77b95e..d826d1bb9a 100644
--- a/chef/distro/common/man/man1/knife-ssh.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-SSH" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-ssh\fR \- Run a command or interactive session on multiple remote hosts
@@ -38,12 +38,8 @@ The SSH identity file used for authentication
 The ssh port
 .
 .TP
-\fB\-i\fR, \fB\-\-identity\-file IDENTITY_FILE\fR
-The SSH identity file used for authentication
-.
-.TP
-\fB\-\-no\-host\-key\-verify\fR
-Disable host key verification
+\fB\-\-[no\-]host\-key\-verify\fR
+Verify host key, enabled by default\.
 .
 .SH "DESCRIPTION"
 The \fIssh\fR sub\-command opens an ssh session to each of the nodes in the search results of the \fIQUERY\fR\. This sub\-command requires that the net\-ssh\-multi and highline Ruby libraries are installed\. On Debian systems, these are the libnet\-ssh\-multi\-ruby and libhighline\-ruby packages\. They can also be installed as RubyGems (net\-ssh\-multi and highline, respectively)\.
diff --git a/chef/distro/common/man/man1/knife-status.1 b/chef/distro/common/man/man1/knife-status.1
index 7813252367..6376dd85ba 100644
--- a/chef/distro/common/man/man1/knife-status.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-STATUS" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-status\fR \- Display status information for the nodes in your infrastructure
diff --git a/chef/distro/common/man/man1/knife-tag.1 b/chef/distro/common/man/man1/knife-tag.1
index a28e208315..26b2c364f6 100644
--- a/chef/distro/common/man/man1/knife-tag.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE\-TAG" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-tag\fR \- Apply tags to nodes on a Chef Server
diff --git a/chef/distro/common/man/man1/knife.1 b/chef/distro/common/man/man1/knife.1
index ac18c6fdd9..a292b5ce7b 100644
--- a/chef/distro/common/man/man1/knife.1
+++ b/chef/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" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "KNIFE" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\fR \- Chef Server API client utility
@@ -96,7 +96,7 @@ Which format to use for output\. See FORMATS for details\.
 More verbose output\. Use twice for max verbosity
 .
 .TP
-\fB\-n\fR, \fB\-\-no\-editor\fR
+\fB\-d\fR, \fB\-\-disable\-editing\fR
 Do not open EDITOR, just accept the data as is
 .
 .TP
@@ -120,12 +120,8 @@ Say yes to all prompts for confirmation
 Accept default values for all questions
 .
 .TP
-\fB\-\-color\fR
-Use colored output
-.
-.TP
-\fB\-\-no\-color\fR
-Don\'t use colors in the output
+\fB\-\-[no\-]color\fR
+Use colored output\. Color enabled by default\.
 .
 .TP
 \fB\-h\fR, \fB\-\-help\fR
@@ -256,7 +252,7 @@ A note about git: Opscode and many folks in the Chef community use git, but it i
 .
 .TP
 \fBEDITOR\fR
-The text editor to use for editing data\. The \-\-editor option takes precedence over this value, and the \-\-no\-editor option supresses data editing entirely\.
+The text editor to use for editing data\. The \-\-editor option takes precedence over this value, and the \-\-disable\-editing option supresses data editing entirely\.
 .
 .SH "SEE ALSO"
 \fBchef\-client(8)\fR \fBchef\-server(8)\fR \fBshef(1)\fR
diff --git a/chef/distro/common/man/man1/shef.1 b/chef/distro/common/man/man1/shef.1
index 752ee4bc6b..22d6501502 100644
--- a/chef/distro/common/man/man1/shef.1
+++ b/chef/distro/common/man/man1/shef.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "SHEF" "1" "November 2011" "Chef 0.10.6.beta.2" "Chef Manual"
+.TH "SHEF" "1" "May 2012" "Chef 0.10.10.rc.4" "Chef Manual"
 .
 .SH "NAME"
 \fBshef\fR \- Interactive Chef Console