summaryrefslogtreecommitdiff
path: root/chef/distro
diff options
context:
space:
mode:
Diffstat (limited to 'chef/distro')
-rw-r--r--chef/distro/common/html/chef-client.8.html13
-rw-r--r--chef/distro/common/html/chef-expander.8.html8
-rw-r--r--chef/distro/common/html/chef-expanderctl.8.html8
-rw-r--r--chef/distro/common/html/chef-server-webui.8.html8
-rw-r--r--chef/distro/common/html/chef-server.8.html8
-rw-r--r--chef/distro/common/html/chef-solo.8.html8
-rw-r--r--chef/distro/common/html/chef-solr.8.html10
-rw-r--r--chef/distro/common/html/knife-bootstrap.1.html24
-rw-r--r--chef/distro/common/html/knife-client.1.html8
-rw-r--r--chef/distro/common/html/knife-configure.1.html8
-rw-r--r--chef/distro/common/html/knife-cookbook-site.1.html12
-rw-r--r--chef/distro/common/html/knife-cookbook.1.html17
-rw-r--r--chef/distro/common/html/knife-data-bag.1.html8
-rw-r--r--chef/distro/common/html/knife-environment.1.html8
-rw-r--r--chef/distro/common/html/knife-exec.1.html8
-rw-r--r--chef/distro/common/html/knife-index.1.html8
-rw-r--r--chef/distro/common/html/knife-node.1.html31
-rw-r--r--chef/distro/common/html/knife-role.1.html8
-rw-r--r--chef/distro/common/html/knife-search.1.html17
-rw-r--r--chef/distro/common/html/knife-ssh.1.html20
-rw-r--r--chef/distro/common/html/knife-status.1.html8
-rw-r--r--chef/distro/common/html/knife-tag.1.html8
-rw-r--r--chef/distro/common/html/knife.1.html40
-rw-r--r--chef/distro/common/html/shef.1.html8
-rw-r--r--chef/distro/common/man/man1/knife-bootstrap.128
-rw-r--r--chef/distro/common/man/man1/knife-client.12
-rw-r--r--chef/distro/common/man/man1/knife-configure.12
-rw-r--r--chef/distro/common/man/man1/knife-cookbook-site.112
-rw-r--r--chef/distro/common/man/man1/knife-cookbook.110
-rw-r--r--chef/distro/common/man/man1/knife-data-bag.12
-rw-r--r--chef/distro/common/man/man1/knife-environment.12
-rw-r--r--chef/distro/common/man/man1/knife-exec.12
-rw-r--r--chef/distro/common/man/man1/knife-index.12
-rw-r--r--chef/distro/common/man/man1/knife-node.124
-rw-r--r--chef/distro/common/man/man1/knife-role.12
-rw-r--r--chef/distro/common/man/man1/knife-search.113
-rw-r--r--chef/distro/common/man/man1/knife-ssh.129
-rw-r--r--chef/distro/common/man/man1/knife-status.12
-rw-r--r--chef/distro/common/man/man1/knife-tag.12
-rw-r--r--chef/distro/common/man/man1/knife.159
-rw-r--r--chef/distro/common/man/man1/shef.12
-rw-r--r--chef/distro/common/man/man8/chef-client.822
-rw-r--r--chef/distro/common/man/man8/chef-expander.82
-rw-r--r--chef/distro/common/man/man8/chef-expanderctl.82
-rw-r--r--chef/distro/common/man/man8/chef-server-webui.82
-rw-r--r--chef/distro/common/man/man8/chef-server.82
-rw-r--r--chef/distro/common/man/man8/chef-solo.82
-rw-r--r--chef/distro/common/man/man8/chef-solr.810
48 files changed, 317 insertions, 224 deletions
diff --git a/chef/distro/common/html/chef-client.8.html b/chef/distro/common/html/chef-client.8.html
index fb1307d455..74b5a43e17 100644
--- a/chef/distro/common/html/chef-client.8.html
+++ b/chef/distro/common/html/chef-client.8.html
@@ -88,14 +88,19 @@
<dt><code>-g</code>, <code>--group GROUP</code></dt><dd>Group to set privilege to</dd>
<dt><code>-i</code>, <code>--interval SECONDS</code></dt><dd>Run chef-client periodically, in seconds</dd>
<dt><code>-j</code>, <code>--json-attributes JSON_ATTRIBS</code></dt><dd>Load attributes from a JSON file or URL</dd>
+<dt><code>-E</code>, <code>--environment ENVIRONMENT</code></dt><dd>Set the Chef Environment on the node</dd>
<dt><code>-l</code>, <code>--log_level LEVEL</code></dt><dd>Set the log level (debug, info, warn, error, fatal)</dd>
<dt><code>-L</code>, <code>--logfile LOGLOCATION</code></dt><dd>Set the log file location, defaults to STDOUT - recommended for
daemonizing</dd>
<dt><code>-V</code>, <code>--verbose</code></dt><dd>Ensures logging goes to STDOUT as well as to other configured
log location(s).</dd>
<dt><code>-N</code>, <code>--node-name NODE_NAME</code></dt><dd>The node name for this client</dd>
+<dt><code>-K</code>, <code>--validation_key KEY_FILE</code></dt><dd>Set the validation key file location, used for registering new clients</dd>
+<dt><code>-k</code>, <code>--client_key KEY_FILE</code></dt><dd>Set the client key file location</dd>
<dt><code>-s</code>, <code>--splay SECONDS</code></dt><dd>The splay time for running at intervals, in seconds</dd>
<dt><code>-u</code>, <code>--user USER</code></dt><dd>User to set privilege to</dd>
+<dt><code>-P</code>, <code>--pid PIDFILE</code></dt><dd>Set the PID file location, defaults to /tmp/chef-client.pid</dd>
+<dt class="flush"><code>--once</code></dt><dd>Cancel any interval or splay options, run chef once and exit</dd>
<dt><code>-v</code>, <code>--version</code></dt><dd>Show chef version</dd>
<dt><code>-h</code>, <code>--help</code></dt><dd>Show this message</dd>
</dl>
@@ -120,9 +125,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#116;&#111;&#x3a;&#x61;&#x64;&#x61;&#109;&#64;&#x6f;&#115;&#x70;&#x63;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#x40;&#111;&#x73;&#x70;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#109;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#x61;&#x64;&#x61;&#x6d;&#64;&#x6f;&#x73;&#x70;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#100;&#97;&#109;&#64;&#x6f;&#x73;&#112;&#99;&#111;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;</a> of Opscode
(http://www.opscode.com), with contributions from the community. This
-manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#x6a;&#x6f;&#115;&#x68;&#117;&#x61;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#x65;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#x61;&#64;&#111;&#112;&#115;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#111;&#109;</a> with
+manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#58;&#106;&#111;&#x73;&#x68;&#x75;&#x61;&#x40;&#x6f;&#x70;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6a;&#111;&#115;&#x68;&#117;&#x61;&#64;&#111;&#112;&#x73;&#99;&#x6f;&#x64;&#x65;&#x2e;&#99;&#111;&#109;</a> with
help2man. Permission is granted to copy, distribute and / or modify
this document under the terms of the Apache 2.0 License.</p>
@@ -131,8 +136,8 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>chef-client(8)</li>
</ol>
diff --git a/chef/distro/common/html/chef-expander.8.html b/chef/distro/common/html/chef-expander.8.html
index 91f0d2ce14..41a1bf939b 100644
--- a/chef/distro/common/html/chef-expander.8.html
+++ b/chef/distro/common/html/chef-expander.8.html
@@ -143,9 +143,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#116;&#111;&#x3a;&#x61;&#x64;&#x61;&#109;&#64;&#x6f;&#115;&#x70;&#x63;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#x40;&#111;&#x73;&#x70;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#109;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#x61;&#x64;&#x61;&#x6d;&#64;&#x6f;&#x73;&#x70;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#100;&#97;&#109;&#64;&#x6f;&#x73;&#112;&#99;&#111;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;</a> of Opscode
(http://www.opscode.com), with contributions from the community. This
-manual page was created by Nuo Yan <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#x6e;&#x75;&#111;&#x40;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#110;&#117;&#111;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#99;&#x6f;&#109;</a>. Permission is
+manual page was created by Nuo Yan <a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#58;&#110;&#117;&#x6f;&#x40;&#x6f;&#x70;&#x73;&#x63;&#x6f;&#x64;&#101;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x6e;&#117;&#x6f;&#x40;&#111;&#112;&#x73;&#99;&#x6f;&#100;&#101;&#46;&#x63;&#111;&#x6d;</a>. Permission is
granted to copy, distribute and / or modify this document under the
terms of the Apache 2.0 License.</p>
@@ -154,8 +154,8 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>chef-expander(8)</li>
</ol>
diff --git a/chef/distro/common/html/chef-expanderctl.8.html b/chef/distro/common/html/chef-expanderctl.8.html
index 3f4d429559..70ab9477e5 100644
--- a/chef/distro/common/html/chef-expanderctl.8.html
+++ b/chef/distro/common/html/chef-expanderctl.8.html
@@ -125,9 +125,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#116;&#111;&#x3a;&#x61;&#x64;&#x61;&#109;&#64;&#x6f;&#115;&#x70;&#x63;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#x40;&#111;&#x73;&#x70;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#109;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#111;&#58;&#97;&#x64;&#x61;&#109;&#x40;&#x6f;&#x73;&#112;&#99;&#x6f;&#100;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#97;&#109;&#x40;&#x6f;&#x73;&#x70;&#x63;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#109;</a> of Opscode
(http://www.opscode.com), with contributions from the community. This
-manual page was created by Nuo Yan <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#x6e;&#x75;&#111;&#x40;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#110;&#117;&#111;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#99;&#x6f;&#109;</a>. Permission is
+manual page was created by Nuo Yan <a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#58;&#x6e;&#117;&#111;&#64;&#111;&#112;&#x73;&#x63;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#110;&#x75;&#111;&#x40;&#111;&#112;&#x73;&#x63;&#111;&#x64;&#x65;&#46;&#x63;&#111;&#109;</a>. Permission is
granted to copy, distribute and / or modify this document under the
terms of the Apache 2.0 License.</p>
@@ -136,8 +136,8 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>chef-expanderctl(8)</li>
</ol>
diff --git a/chef/distro/common/html/chef-server-webui.8.html b/chef/distro/common/html/chef-server-webui.8.html
index 376d3535d6..d6e29842f1 100644
--- a/chef/distro/common/html/chef-server-webui.8.html
+++ b/chef/distro/common/html/chef-server-webui.8.html
@@ -163,9 +163,9 @@ is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p>Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#97;&#x64;&#x61;&#x6d;&#x40;&#x6f;&#x73;&#x70;&#x63;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#97;&#109;&#64;&#111;&#x73;&#x70;&#x63;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#111;&#58;&#97;&#x64;&#x61;&#109;&#x40;&#x6f;&#x73;&#112;&#99;&#x6f;&#100;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#97;&#109;&#x40;&#x6f;&#x73;&#x70;&#x63;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#109;</a> of Opscode
(http://www.opscode.com), with contributions from the community. This
-manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x6a;&#x6f;&#x73;&#x68;&#117;&#97;&#x40;&#111;&#112;&#x73;&#99;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#x6a;&#111;&#115;&#x68;&#117;&#97;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#x65;&#46;&#x63;&#111;&#109;</a> with
+manual page was written by Joshua Timberman <a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#58;&#x6a;&#111;&#115;&#104;&#117;&#97;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#x6a;&#111;&#115;&#x68;&#x75;&#97;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#x65;&#46;&#99;&#x6f;&#109;</a> with
help2man for the Debian project (but may be used by others). Permission
is granted to copy, distribute and / or modify this document under the
terms of the Apache 2.0 License.</p>
@@ -175,8 +175,8 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>chef-server-webui(8)</li>
</ol>
diff --git a/chef/distro/common/html/chef-server.8.html b/chef/distro/common/html/chef-server.8.html
index 40be8b6ce2..d72d9340d7 100644
--- a/chef/distro/common/html/chef-server.8.html
+++ b/chef/distro/common/html/chef-server.8.html
@@ -161,9 +161,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#x69;&#x6c;&#116;&#111;&#x3a;&#x61;&#x64;&#x61;&#109;&#64;&#x6f;&#115;&#x70;&#x63;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#x40;&#111;&#x73;&#x70;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#109;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#x61;&#x64;&#97;&#x6d;&#x40;&#x6f;&#115;&#x70;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#x61;&#109;&#x40;&#x6f;&#x73;&#x70;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;</a> of Opscode
(http://www.opscode.com), with contributions from the community. This
-manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#x6a;&#x6f;&#115;&#x68;&#117;&#x61;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#x65;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#x61;&#64;&#111;&#112;&#115;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#111;&#109;</a> with
+manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#106;&#x6f;&#115;&#x68;&#117;&#97;&#64;&#x6f;&#x70;&#115;&#99;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x6a;&#111;&#115;&#x68;&#117;&#x61;&#64;&#111;&#x70;&#115;&#x63;&#x6f;&#x64;&#x65;&#46;&#x63;&#x6f;&#109;</a> with
help2man. Permission is granted to copy, distribute and / or modify
this document under the terms of the Apache 2.0 License.</p>
@@ -172,8 +172,8 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>chef-server(8)</li>
</ol>
diff --git a/chef/distro/common/html/chef-solo.8.html b/chef/distro/common/html/chef-solo.8.html
index 0aa51ada95..78ee1879ad 100644
--- a/chef/distro/common/html/chef-solo.8.html
+++ b/chef/distro/common/html/chef-solo.8.html
@@ -170,9 +170,9 @@ http://wiki.opscode.com/display/chef/Home.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p>Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#97;&#x64;&#x61;&#x6d;&#x40;&#x6f;&#x73;&#x70;&#x63;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#97;&#109;&#64;&#111;&#x73;&#x70;&#x63;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#x61;&#x64;&#97;&#x6d;&#x40;&#x6f;&#115;&#x70;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#x61;&#109;&#x40;&#x6f;&#x73;&#x70;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;</a> of Opscode
(http://www.opscode.com), with contributions from the community. This
-manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x6a;&#x6f;&#x73;&#x68;&#117;&#97;&#x40;&#111;&#112;&#x73;&#99;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#x6a;&#111;&#115;&#x68;&#117;&#97;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#x65;&#46;&#x63;&#111;&#109;</a> with
+manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#106;&#x6f;&#115;&#x68;&#117;&#97;&#64;&#x6f;&#x70;&#115;&#99;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x6a;&#111;&#115;&#x68;&#117;&#x61;&#64;&#111;&#x70;&#115;&#x63;&#x6f;&#x64;&#x65;&#46;&#x63;&#x6f;&#109;</a> with
help2man. Permission is granted to copy, distribute and / or modify
this document under the terms of the Apache 2.0 License.</p>
@@ -181,8 +181,8 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>chef-solo(8)</li>
</ol>
diff --git a/chef/distro/common/html/chef-solr.8.html b/chef/distro/common/html/chef-solr.8.html
index 5744ecd918..28e2b49a10 100644
--- a/chef/distro/common/html/chef-solr.8.html
+++ b/chef/distro/common/html/chef-solr.8.html
@@ -87,10 +87,12 @@
<dt><code>-g</code>, <code>--group GROUP</code></dt><dd>Group to set privilege to</dd>
<dt><code>-l</code>, <code>--log_level LEVEL</code></dt><dd>Set the log level (debug, info, warn, error, fatal)</dd>
<dt><code>-L</code>, <code>--logfile LOGLOCATION</code></dt><dd>Set the log file location, defaults to STDOUT - recommended for daemonizing</dd>
+<dt><code>-P</code>, <code>--pid PIDFILE</code></dt><dd>Set the PID file location, defaults to /tmp/chef-solr.pid</dd>
<dt><code>-D</code>, <code>--solr-data-dir PATH</code></dt><dd>Where the Solr data lives</dd>
<dt><code>-x</code>, <code>--solor-heap-size SIZE</code></dt><dd>Set the size of the Java Heap</dd>
<dt><code>-H</code>, <code>--solr-home-dir PATH</code></dt><dd>Solr home directory</dd>
<dt><code>-j</code>, <code>--java-opts OPTS</code></dt><dd>Raw options passed to Java</dd>
+<dt><code>-x</code>, <code>--solor-heap-size</code></dt><dd>Set the size of the Java Heap</dd>
<dt><code>-W</code>, <code>--solr-jetty-dir PATH</code></dt><dd>Where to place the Solr Jetty instance</dd>
<dt><code>-u</code>, <code>--user USER</code></dt><dd>User to set privilege to</dd>
<dt><code>-v</code>, <code>--version</code></dt><dd>Show chef-solr version</dd>
@@ -142,9 +144,9 @@ wiki, http://wiki.opscode.com/display/chef/Home.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p>Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#97;&#x64;&#x61;&#x6d;&#x40;&#x6f;&#x73;&#x70;&#x63;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#97;&#109;&#64;&#111;&#x73;&#x70;&#x63;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;</a> of Opscode
+<p>Chef was written by Adam Jacob <a href="&#x6d;&#97;&#x69;&#108;&#116;&#x6f;&#58;&#x61;&#100;&#x61;&#x6d;&#x40;&#x6f;&#x73;&#112;&#99;&#111;&#x64;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#x6d;&#64;&#x6f;&#115;&#x70;&#99;&#111;&#100;&#101;&#46;&#x63;&#111;&#x6d;</a> of Opscode
(http://www.opscode.com), with contributions from the community. This
-manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x6a;&#x6f;&#x73;&#x68;&#117;&#97;&#x40;&#111;&#112;&#x73;&#99;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#x6a;&#111;&#115;&#x68;&#117;&#97;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#x65;&#46;&#x63;&#111;&#109;</a> with
+manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#x3a;&#x6a;&#x6f;&#115;&#x68;&#117;&#x61;&#64;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6a;&#x6f;&#115;&#x68;&#x75;&#x61;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#99;&#x6f;&#109;</a> with
help2man. Permission is granted to copy, distribute and / or modify
this document under the terms of the Apache 2.0 License.</p>
@@ -153,8 +155,8 @@ found in /usr/share/common-licenses/Apache-2.0.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>chef-solr(8)</li>
</ol>
diff --git a/chef/distro/common/html/knife-bootstrap.1.html b/chef/distro/common/html/knife-bootstrap.1.html
index e02ad23ad8..a5fa62c2f7 100644
--- a/chef/distro/common/html/knife-bootstrap.1.html
+++ b/chef/distro/common/html/knife-bootstrap.1.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv='content-type' value='text/html;charset=utf8'>
<meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
- <title>knife-bootrap(1) - Install Chef Client on a remote host</title>
+ <title>knife-bootstrap(1) - Install Chef Client on a remote host</title>
<style type='text/css' media='all'>
/* style: man */
body#manpage {margin:0}
@@ -71,14 +71,14 @@
</div>
<ol class='man-decor man-head man head'>
- <li class='tl'>knife-bootrap(1)</li>
+ <li class='tl'>knife-bootstrap(1)</li>
<li class='tc'>Chef Manual</li>
- <li class='tr'>knife-bootrap(1)</li>
+ <li class='tr'>knife-bootstrap(1)</li>
</ol>
<h2 id="NAME">NAME</h2>
<p class="man-name">
- <code>knife-bootrap</code> - <span class="man-whatis">Install Chef Client on a remote host</span>
+ <code>knife-bootstrap</code> - <span class="man-whatis">Install Chef Client on a remote host</span>
</p>
<h2 id="SYNOPSIS">SYNOPSIS</h2>
@@ -90,13 +90,15 @@
<dt><code>-N</code>, <code>--node-name NAME</code></dt><dd>The Chef node name for your new node</dd>
<dt><code>-P</code>, <code>--ssh-password PASSWORD</code></dt><dd>The ssh password</dd>
<dt><code>-x</code>, <code>--ssh-user USERNAME</code></dt><dd>The ssh username</dd>
+<dt><code>-p</code>, <code>--ssh-port PORT</code></dt><dd>The ssh port</dd>
+<dt><code>--bootstrap-version VERSION</code></dt><dd>The version of Chef to install</dd>
+<dt><code>--bootstrap-proxy PROXY_URL</code></dt><dd><code>The proxy server for the node being bootstrapped</code></dd>
<dt><code>--prerelease</code></dt><dd>Install pre-release Chef gems</dd>
<dt><code>-r</code>, <code>--run-list RUN_LIST</code></dt><dd>Comma separated list of roles/recipes to apply</dd>
-<dt><code>-P</code>, <code>--ssh-password PASSWORD</code></dt><dd>The ssh password</dd>
-<dt><code>-x</code>, <code>--ssh-user USERNAME</code></dt><dd>The ssh username</dd>
<dt><code>--template-file TEMPLATE</code></dt><dd>Full path to location of template to use</dd>
<dt class="flush"><code>--sudo</code></dt><dd>Execute the bootstrap via sudo</dd>
<dt><code>-d</code>, <code>--distro DISTRO</code></dt><dd>Bootstrap a distro using a template</dd>
+<dt><code>--no-host-key-verify</code></dt><dd>Disable host key verification</dd>
</dl>
@@ -218,11 +220,11 @@ to other users via the process list using tools such as <span class="man-ref">ps
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x61;&#100;&#97;&#109;&#x40;&#111;&#112;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#x61;&#x6d;&#64;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#x65;&#x2e;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#97;&#x64;&#x61;&#109;&#x40;&#111;&#112;&#115;&#x63;&#111;&#x64;&#x65;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#x63;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#109;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#108;&#116;&#x6f;&#x3a;&#x6a;&#x6f;&#x73;&#x68;&#117;&#97;&#x40;&#111;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#x73;&#x68;&#x75;&#97;&#x40;&#x6f;&#x70;&#x73;&#99;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#109;&#97;&#x69;&#x6c;&#116;&#x6f;&#58;&#106;&#111;&#x73;&#x68;&#117;&#97;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#100;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x6a;&#111;&#x73;&#x68;&#x75;&#97;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#99;&#111;&#109;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -231,9 +233,9 @@ to other users via the process list using tools such as <span class="man-ref">ps
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
- <li class='tr'>knife-bootrap(1)</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
+ <li class='tr'>knife-bootstrap(1)</li>
</ol>
</div>
diff --git a/chef/distro/common/html/knife-client.1.html b/chef/distro/common/html/knife-client.1.html
index b9a76fdb66..6cd4590156 100644
--- a/chef/distro/common/html/knife-client.1.html
+++ b/chef/distro/common/html/knife-client.1.html
@@ -196,11 +196,11 @@ setting up a host for management with Chef.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x61;&#100;&#97;&#109;&#x40;&#111;&#112;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#x61;&#x6d;&#64;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#x65;&#x2e;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#97;&#x64;&#x61;&#109;&#x40;&#111;&#112;&#115;&#x63;&#111;&#x64;&#x65;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#x63;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#109;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#108;&#116;&#x6f;&#x3a;&#x6a;&#x6f;&#x73;&#x68;&#117;&#97;&#x40;&#111;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#x73;&#x68;&#x75;&#97;&#x40;&#x6f;&#x70;&#x73;&#99;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#109;&#97;&#x69;&#x6c;&#116;&#x6f;&#58;&#106;&#111;&#x73;&#x68;&#117;&#97;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#100;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x6a;&#111;&#x73;&#x68;&#x75;&#97;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#99;&#111;&#109;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -209,8 +209,8 @@ setting up a host for management with Chef.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-client(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-configure.1.html b/chef/distro/common/html/knife-configure.1.html
index 3a7098e765..3e1e4aec9e 100644
--- a/chef/distro/common/html/knife-configure.1.html
+++ b/chef/distro/common/html/knife-configure.1.html
@@ -147,11 +147,11 @@ may need to modify that setting after copying to a remote host.</p></li>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#97;&#100;&#97;&#x6d;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#x40;&#111;&#112;&#115;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#111;&#x3a;&#x61;&#x64;&#97;&#x6d;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#97;&#x6d;&#x40;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#111;&#x6d;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#x6a;&#x6f;&#115;&#104;&#x75;&#x61;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#97;&#64;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#x6a;&#111;&#x73;&#x68;&#x75;&#x61;&#64;&#x6f;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#111;&#x73;&#x68;&#117;&#97;&#64;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#x65;&#x2e;&#x63;&#111;&#109;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -160,8 +160,8 @@ may need to modify that setting after copying to a remote host.</p></li>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-configure(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-cookbook-site.1.html b/chef/distro/common/html/knife-cookbook-site.1.html
index bd4b502676..e1486a1d79 100644
--- a/chef/distro/common/html/knife-cookbook-site.1.html
+++ b/chef/distro/common/html/knife-cookbook-site.1.html
@@ -102,6 +102,8 @@
<dl>
<dt><code>-D</code>, <code>--no-dependencies</code></dt><dd>Do not install dependencies automatically</dd>
+<dt><code>-o</code>, <code>--cookbook-path PATH</code></dt><dd>Install cookbooks to PATH</dd>
+<dt><code>-B</code>, <code>--branch BRANCH</code></dt><dd>Default branch to work with [defaults to master]</dd>
</dl>
@@ -120,7 +122,7 @@ upstream;</li>
<p>By installing cookbook with this process, you can locally modify the
-upstream cookbook in your master branch ant let git maintain your
+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>
@@ -216,11 +218,11 @@ configuration file.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x61;&#100;&#97;&#109;&#x40;&#111;&#112;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#x61;&#x6d;&#64;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#x65;&#x2e;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#111;&#x3a;&#x61;&#x64;&#97;&#x6d;&#x40;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#97;&#x6d;&#x40;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#111;&#x6d;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#108;&#116;&#x6f;&#x3a;&#x6a;&#x6f;&#x73;&#x68;&#117;&#97;&#x40;&#111;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#x73;&#x68;&#x75;&#97;&#x40;&#x6f;&#x70;&#x73;&#99;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#x6a;&#111;&#x73;&#x68;&#x75;&#x61;&#64;&#x6f;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#111;&#x73;&#x68;&#117;&#97;&#64;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#x65;&#x2e;&#x63;&#111;&#109;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -229,8 +231,8 @@ configuration file.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-cookbook-site(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-cookbook.1.html b/chef/distro/common/html/knife-cookbook.1.html
index 8e5c86230d..0a31341f24 100644
--- a/chef/distro/common/html/knife-cookbook.1.html
+++ b/chef/distro/common/html/knife-cookbook.1.html
@@ -119,6 +119,7 @@
<dt><code>-f</code>, <code>--fqdn fqdn </code></dt><dd>the fqdn of the host to see the file for</dd>
<dt><code>-p</code>, <code>--platform platform </code></dt><dd>the platform to see the file for</dd>
<dt><code>-v</code>, <code>--platform-version version</code></dt><dd>the platform version to see the file for</dd>
+<dt><code>-w</code>, <code>--with-uri</code></dt><dd>Show corresponding URIs</dd>
</dl>
@@ -218,7 +219,7 @@ regular expression (<em>regex</em>) should be in quotes, not in //'s.</p>
<dl>
<dt><code>-o</code>, <code>--cookbook-path path</code></dt><dd>the directory where the cookbook will be created</dd>
-<dt><code>-r</code>, <code>--readme-format format</code></dt><dd>format of the readme file</dd>
+<dt><code>-r</code>, <code>--readme-format format</code></dt><dd>format of the readme file md, mkd, txt, rdoc</dd>
<dt><code>-c</code>, <code>--copyright copyright</code></dt><dd>name of copyright holder</dd>
<dt><code>-i</code>, <code>--license license</code></dt><dd>license for cookbook, apachev2 or none</dd>
<dt><code>-e</code>, <code>--email email</code></dt><dd>email address of cookbook maintainer</dd>
@@ -236,14 +237,14 @@ named cookbook.</p>
<li>cookbook/libraries</li>
<li>cookbook/metadata.rb</li>
<li>cookbook/providers</li>
-<li>cookbook/readme.rdoc</li>
+<li>cookbook/readme.md</li>
<li>cookbook/recipes/default.rb</li>
<li>cookbook/resources</li>
<li>cookbook/templates/default</li>
</ul>
-<p>supported readme formats are 'rdoc' (default), 'md', 'mkd', 'txt'. the
+<p>supported readme formats are 'md' (default), 'mkd', 'txt', 'rdoc'. the
readme file will be written with the specified extension and a set of
helpful starting headers.</p>
@@ -264,7 +265,7 @@ non-redistributable.</p>
maintainer. if this value is not specified, an all-caps string
<code>your_email</code> is used which can easily be changed with find/replace.</p>
-<p>the cookbook copyright, license, email and readme format settings can be filled in the
+<p>the cookbook copyright, license, email and readme_format settings can be filled in the
<code>knife.rb</code>, for example with default values:</p>
<pre><code>cookbook_copyright "your_company_name"
@@ -360,11 +361,11 @@ cookbook.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#x61;&#x64;&#97;&#x6d;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#109;&#64;&#x6f;&#112;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#109;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#x6c;&#x74;&#111;&#58;&#x61;&#x64;&#97;&#x6d;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#64;&#111;&#x70;&#115;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#108;&#x74;&#x6f;&#58;&#106;&#111;&#x73;&#x68;&#117;&#97;&#64;&#111;&#112;&#115;&#99;&#111;&#100;&#x65;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#x6a;&#111;&#x73;&#x68;&#x75;&#97;&#x40;&#111;&#112;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#x63;&#x6f;&#109;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#x6a;&#x6f;&#115;&#x68;&#x75;&#x61;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#x73;&#x68;&#x75;&#97;&#64;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#101;&#46;&#99;&#x6f;&#x6d;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -373,8 +374,8 @@ cookbook.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-cookbook(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-data-bag.1.html b/chef/distro/common/html/knife-data-bag.1.html
index 148cd4f83b..8ea9c486b4 100644
--- a/chef/distro/common/html/knife-data-bag.1.html
+++ b/chef/distro/common/html/knife-data-bag.1.html
@@ -211,11 +211,11 @@ encryption keys.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#97;&#100;&#97;&#x6d;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#x40;&#111;&#112;&#115;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#x6c;&#x74;&#111;&#58;&#x61;&#x64;&#97;&#x6d;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#64;&#111;&#x70;&#115;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#x6a;&#x6f;&#115;&#104;&#x75;&#x61;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#97;&#64;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#x6a;&#x6f;&#115;&#x68;&#x75;&#x61;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#x73;&#x68;&#x75;&#97;&#64;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#101;&#46;&#99;&#x6f;&#x6d;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -224,8 +224,8 @@ encryption keys.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-data-bag(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-environment.1.html b/chef/distro/common/html/knife-environment.1.html
index 0de591a776..de2546200f 100644
--- a/chef/distro/common/html/knife-environment.1.html
+++ b/chef/distro/common/html/knife-environment.1.html
@@ -244,11 +244,11 @@ override_attributes "aws_s3_bucket" =&gt; "production"
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#97;&#x64;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#x3a;&#97;&#x64;&#97;&#x6d;&#x40;&#x6f;&#x70;&#x73;&#x63;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#99;&#111;&#x6d;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Daniel DeLeo <a href="&#109;&#97;&#105;&#x6c;&#x74;&#111;&#x3a;&#x64;&#x61;&#x6e;&#64;&#x6f;&#x70;&#115;&#99;&#111;&#100;&#x65;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#100;&#x61;&#110;&#x40;&#111;&#x70;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#99;&#x6f;&#x6d;</a>.
+<p> This manual page was written by Daniel DeLeo <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#58;&#x64;&#x61;&#x6e;&#x40;&#111;&#112;&#x73;&#99;&#x6f;&#x64;&#101;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#100;&#97;&#x6e;&#64;&#x6f;&#x70;&#115;&#99;&#111;&#x64;&#101;&#x2e;&#99;&#111;&#x6d;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -257,8 +257,8 @@ override_attributes "aws_s3_bucket" =&gt; "production"
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-environment(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-exec.1.html b/chef/distro/common/html/knife-exec.1.html
index 2e25afa9d5..3460eba460 100644
--- a/chef/distro/common/html/knife-exec.1.html
+++ b/chef/distro/common/html/knife-exec.1.html
@@ -111,11 +111,11 @@ commands available.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#97;&#x64;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#97;&#x64;&#97;&#109;&#x40;&#x6f;&#x70;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#64;&#111;&#112;&#115;&#99;&#111;&#100;&#101;&#46;&#99;&#111;&#109;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#109;&#97;&#105;&#x6c;&#x74;&#111;&#x3a;&#x6a;&#x6f;&#x73;&#104;&#x75;&#x61;&#64;&#111;&#112;&#115;&#x63;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#x6a;&#111;&#x73;&#104;&#x75;&#x61;&#64;&#x6f;&#x70;&#115;&#x63;&#x6f;&#x64;&#101;&#46;&#99;&#111;&#x6d;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#58;&#106;&#x6f;&#115;&#104;&#117;&#x61;&#x40;&#111;&#112;&#115;&#99;&#x6f;&#100;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#115;&#x68;&#x75;&#97;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#x6d;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -124,8 +124,8 @@ commands available.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-exec(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-index.1.html b/chef/distro/common/html/knife-index.1.html
index cd4a5dcac5..6b95a969af 100644
--- a/chef/distro/common/html/knife-index.1.html
+++ b/chef/distro/common/html/knife-index.1.html
@@ -102,11 +102,11 @@ time for all objects to be indexed and available for search.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#97;&#x64;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#97;&#x64;&#97;&#109;&#x40;&#x6f;&#x70;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#64;&#111;&#112;&#115;&#99;&#111;&#100;&#101;&#46;&#99;&#111;&#109;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#109;&#97;&#105;&#x6c;&#x74;&#111;&#x3a;&#x6a;&#x6f;&#x73;&#104;&#x75;&#x61;&#64;&#111;&#112;&#115;&#x63;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#x6a;&#111;&#x73;&#104;&#x75;&#x61;&#64;&#x6f;&#x70;&#115;&#x63;&#x6f;&#x64;&#101;&#46;&#99;&#111;&#x6d;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#58;&#106;&#x6f;&#115;&#104;&#117;&#x61;&#x40;&#111;&#112;&#115;&#99;&#x6f;&#100;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#115;&#x68;&#x75;&#97;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#x6d;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -115,8 +115,8 @@ time for all objects to be indexed and available for search.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-index(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-node.1.html b/chef/distro/common/html/knife-node.1.html
index 4672ab6a34..59f15a2407 100644
--- a/chef/distro/common/html/knife-node.1.html
+++ b/chef/distro/common/html/knife-node.1.html
@@ -205,28 +205,7 @@ will be displayed in your text editor unless the -n option is present.</p>
</dl>
-<p>Displays the node identified by <em>node name</em> on stdout. The amount of
-content displayed and the output format are modified by the --format
-option. If no alternate format is selected, the default is summary.
-Valid formats are:</p>
-
-<ul>
-<li>summary:
-displays the node in a custom, summarized format (default)</li>
-<li>text
-displays the node data in its entirety using the colorized tree
-display</li>
-<li>json:
-displays the node in JSON format</li>
-<li>yaml:
-displays the node in YAML format</li>
-<li>pp
-displays the node using Ruby's pretty printer.</li>
-</ul>
-
-
-<p>For brevity, only the first character of the format is required, for
-example, -Fj will produce JSON format output.</p>
+<p>Displays the node identified by <em>node name</em> on stdout.</p>
<h2 id="RUN-LIST-ITEM-FORMAT">RUN LIST ITEM FORMAT</h2>
@@ -248,11 +227,11 @@ run list, the correct syntax is "role[ROLE_NAME]"</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#x61;&#x64;&#97;&#x6d;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#109;&#64;&#x6f;&#112;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#109;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#108;&#116;&#111;&#x3a;&#x61;&#100;&#97;&#x6d;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#x65;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#x61;&#100;&#x61;&#x6d;&#64;&#111;&#x70;&#115;&#x63;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#108;&#x74;&#x6f;&#58;&#106;&#111;&#x73;&#x68;&#117;&#97;&#64;&#111;&#112;&#115;&#99;&#111;&#100;&#x65;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#x6a;&#111;&#x73;&#x68;&#x75;&#97;&#x40;&#111;&#112;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#x63;&#x6f;&#109;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#58;&#x6a;&#x6f;&#115;&#x68;&#117;&#97;&#64;&#111;&#112;&#115;&#x63;&#x6f;&#x64;&#101;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#x75;&#97;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#101;&#46;&#99;&#x6f;&#109;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -261,8 +240,8 @@ run list, the correct syntax is "role[ROLE_NAME]"</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-node(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-role.1.html b/chef/distro/common/html/knife-role.1.html
index eccd20c739..6a1d6f98e3 100644
--- a/chef/distro/common/html/knife-role.1.html
+++ b/chef/distro/common/html/knife-role.1.html
@@ -177,11 +177,11 @@ run_list.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#x61;&#x64;&#97;&#x6d;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#109;&#64;&#x6f;&#112;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#109;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#108;&#116;&#111;&#x3a;&#x61;&#100;&#97;&#x6d;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#x65;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#x61;&#100;&#x61;&#x6d;&#64;&#111;&#x70;&#115;&#x63;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#108;&#x74;&#x6f;&#58;&#106;&#111;&#x73;&#x68;&#117;&#97;&#64;&#111;&#112;&#115;&#99;&#111;&#100;&#x65;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#x6a;&#111;&#x73;&#x68;&#x75;&#97;&#x40;&#111;&#112;&#x73;&#x63;&#x6f;&#100;&#101;&#46;&#x63;&#x6f;&#109;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#58;&#x6a;&#x6f;&#115;&#x68;&#117;&#97;&#64;&#111;&#112;&#115;&#x63;&#x6f;&#x64;&#101;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#x75;&#97;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#101;&#46;&#99;&#x6f;&#109;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -190,8 +190,8 @@ run_list.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-role(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-search.1.html b/chef/distro/common/html/knife-search.1.html
index 6ee66e35de..cf40b07e97 100644
--- a/chef/distro/common/html/knife-search.1.html
+++ b/chef/distro/common/html/knife-search.1.html
@@ -120,6 +120,7 @@ query syntax. The following data types are indexed for search:</p>
<li><em>node</em></li>
<li><em>role</em></li>
<li><em>environment</em></li>
+<li><em>clients</em></li>
<li><em>data bag</em></li>
</ul>
@@ -191,7 +192,7 @@ match values between X and Y, inclusively, use square brackets:</p>
Distance algorithm. To perform a fuzzy match, append a tilda (~) to
the search term:</p>
-<pre><code>knife search nodes 'field:term~'
+<pre><code>knife search INDEX 'field:term~'
</code></pre>
<p>This search would return nodes whose <code>field</code> was 'perm' or 'germ'.</p>
@@ -235,17 +236,17 @@ enclose them in single quotes.</p>
<p>Find the nodes with the fully-qualified domain name (FQDN)
www.example.com:</p>
-<pre><code>knife search nodes 'fqdn:www.example.com'
+<pre><code>knife search node 'fqdn:www.example.com'
</code></pre>
<p>Find the nodes running a version of Ubuntu:</p>
-<pre><code>knife search nodes 'platform:ubuntu*'
+<pre><code>knife search node 'platform:ubuntu*'
</code></pre>
<p>Find all nodes running CentOS in the production environment:</p>
-<pre><code>knife search nodes 'chef_environment:production AND platform:centos'
+<pre><code>knife search node 'chef_environment:production AND platform:centos'
</code></pre>
<h2 id="KNOWN-BUGS">KNOWN BUGS</h2>
@@ -264,11 +265,11 @@ www.example.com:</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#97;&#100;&#97;&#x6d;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#x40;&#111;&#112;&#115;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#x61;&#x64;&#x61;&#109;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#x6d;&#x40;&#111;&#112;&#115;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#x6a;&#x6f;&#115;&#104;&#x75;&#x61;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#97;&#64;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#58;&#x6a;&#111;&#x73;&#104;&#x75;&#x61;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#100;&#101;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#x75;&#97;&#x40;&#111;&#x70;&#115;&#99;&#111;&#100;&#101;&#46;&#x63;&#111;&#x6d;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -277,8 +278,8 @@ www.example.com:</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-search(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-ssh.1.html b/chef/distro/common/html/knife-ssh.1.html
index dd2c3f6add..58adc268c2 100644
--- a/chef/distro/common/html/knife-ssh.1.html
+++ b/chef/distro/common/html/knife-ssh.1.html
@@ -91,6 +91,9 @@
<dt><code>-P</code>, <code>--ssh-password PASSWORD</code></dt><dd>The ssh password</dd>
<dt><code>-x</code>, <code>--ssh-user USERNAME </code></dt><dd>The ssh username</dd>
<dt><code>-i</code>, <code>--identity-file IDENTITY_FILE</code></dt><dd>The SSH identity file used for authentication</dd>
+<dt><code>-p</code>, <code>--ssh-port PORT</code></dt><dd>The ssh port</dd>
+<dt><code>-i</code>, <code>--identity-file IDENTITY_FILE</code></dt><dd>The SSH identity file used for authentication</dd>
+<dt><code>--no-host-key-verify</code></dt><dd>Disable host key verification</dd>
</dl>
@@ -111,14 +114,11 @@ the <em>COMMAND</em> option matches one of these, <code>knife ssh</code> will cr
multiple interactive ssh sessions running locally in the terminal
multiplexer instead of invoking the command on the remote host.</p>
-<p>The available multiplexers are:
- * <code>interactive</code>:</p>
-
-<pre><code>A built-in multiplexer. `interactive` supports running commands on a
-subset of the connected hosts in parallel
-</code></pre>
+<p>The available multiplexers are:</p>
<dl>
+<dt><code>interactive</code></dt><dd>A built-in multiplexer. <code>interactive</code> supports running commands on a
+subset of the connected hosts in parallel</dd>
<dt><strong>screen</strong>(1)</dt><dd>Runs ssh interactively inside <code>screen</code>. ~/.screenrc will be sourced
if it exists.</dd>
<dt class="flush"><strong>tmux</strong>(1)</dt><dd>Runs ssh interactively inside tmux.</dd>
@@ -134,11 +134,11 @@ option.</dd>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#108;&#x74;&#111;&#58;&#97;&#x64;&#97;&#109;&#64;&#111;&#112;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#100;&#97;&#x6d;&#x40;&#111;&#112;&#115;&#99;&#111;&#x64;&#101;&#46;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#x61;&#x64;&#x61;&#109;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#x6d;&#x40;&#111;&#112;&#115;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#109;&#97;&#x69;&#108;&#116;&#x6f;&#x3a;&#x6a;&#x6f;&#115;&#104;&#117;&#x61;&#x40;&#x6f;&#x70;&#x73;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#115;&#x68;&#117;&#97;&#x40;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#101;&#x2e;&#x63;&#x6f;&#x6d;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#58;&#x6a;&#111;&#x73;&#104;&#x75;&#x61;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#100;&#101;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#x75;&#97;&#x40;&#111;&#x70;&#115;&#99;&#111;&#100;&#101;&#46;&#x63;&#111;&#x6d;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -147,8 +147,8 @@ option.</dd>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-ssh(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-status.1.html b/chef/distro/common/html/knife-status.1.html
index 3f26abc8b6..5819e8f46f 100644
--- a/chef/distro/common/html/knife-status.1.html
+++ b/chef/distro/common/html/knife-status.1.html
@@ -105,11 +105,11 @@ may not be publicly reachable.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#97;&#100;&#97;&#x6d;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#x40;&#111;&#112;&#115;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#x61;&#100;&#97;&#x6d;&#x40;&#111;&#112;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#97;&#109;&#64;&#111;&#x70;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#x6a;&#x6f;&#115;&#104;&#x75;&#x61;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#97;&#64;&#111;&#x70;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;</a>.
+<p> This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#x6a;&#x6f;&#115;&#x68;&#x75;&#97;&#x40;&#111;&#112;&#115;&#99;&#111;&#100;&#101;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#117;&#97;&#64;&#x6f;&#x70;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#109;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -118,8 +118,8 @@ may not be publicly reachable.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-status(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife-tag.1.html b/chef/distro/common/html/knife-tag.1.html
index 2d18f2539c..d6808da4d3 100644
--- a/chef/distro/common/html/knife-tag.1.html
+++ b/chef/distro/common/html/knife-tag.1.html
@@ -114,11 +114,11 @@
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#97;&#x64;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#99;&#x6f;&#x64;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#100;&#x61;&#109;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a> with many contributions from the community.</p>
+<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#x61;&#100;&#97;&#x6d;&#x40;&#111;&#112;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#97;&#109;&#64;&#111;&#x70;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#x63;&#111;&#109;</a> with many contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Daniel DeLeo <a href="&#109;&#97;&#105;&#x6c;&#x74;&#111;&#x3a;&#x64;&#x61;&#x6e;&#64;&#x6f;&#x70;&#115;&#99;&#111;&#100;&#x65;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#100;&#x61;&#110;&#x40;&#111;&#x70;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#99;&#x6f;&#x6d;</a>.
+<p> This manual page was written by Daniel DeLeo <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#x64;&#x61;&#110;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#100;&#x61;&#x6e;&#64;&#x6f;&#112;&#115;&#99;&#111;&#100;&#x65;&#x2e;&#x63;&#111;&#109;</a>.
Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
<h2 id="CHEF">CHEF</h2>
@@ -127,8 +127,8 @@
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife-tag(1)</li>
</ol>
diff --git a/chef/distro/common/html/knife.1.html b/chef/distro/common/html/knife.1.html
index 2299d04a13..5e930c2e38 100644
--- a/chef/distro/common/html/knife.1.html
+++ b/chef/distro/common/html/knife.1.html
@@ -66,6 +66,7 @@
<a href="#SUB-COMMANDS">SUB-COMMANDS</a>
<a href="#CONFIGURATION">CONFIGURATION</a>
<a href="#FILES">FILES</a>
+ <a href="#FORMATS">FORMATS</a>
<a href="#CHEF-WORKFLOW">CHEF WORKFLOW</a>
<a href="#EXAMPLES">EXAMPLES</a>
<a href="#ENVIRONMENT">ENVIRONMENT</a>
@@ -128,15 +129,18 @@ documentation using <code>knife help TOPIC</code>.</p>
<dt><code>-s</code>, <code>--server-url</code> URL</dt><dd>Chef Server URL, corresponds to <code>Chef::Config</code> <code>chef_server_url</code>.</dd>
<dt><code>-k</code>, <code>--key</code> KEY</dt><dd>API Client Key, corresponds to <code>Chef::Config</code> <code>client_key</code>.</dd>
<dt><code>-c</code>, <code>--config</code> CONFIG</dt><dd>The configuration file to use</dd>
+<dt><code>-E</code>, <code>--environment ENVIRONMENT</code></dt><dd>Set the Chef environment</dd>
<dt><code>-e</code>, <code>--editor</code> EDITOR</dt><dd>Set the editor to use for interactive commands</dd>
-<dt><code>-F</code>, <code>--format</code> FORMAT</dt><dd>Which format to use for output</dd>
-<dt><code>-l</code>, <code>--log_level</code> LEVEL</dt><dd>Set the log level (debug, info, warn, error, fatal), corresponds to <code>Chef::Config</code> <code>log_level</code>.</dd>
-<dt><code>-L</code>, <code>--logfile</code> LOGLOCATION</dt><dd>Set the log file location, defaults to STDOUT, corresponds to <code>Chef::Config</code> <code>log_location</code>.</dd>
+<dt><code>-F</code>, <code>--format</code> FORMAT</dt><dd>Which format to use for output. See FORMATS for details.</dd>
+<dt><code>-V</code>, <code>--verbose</code></dt><dd>More verbose output. Use twice for max verbosity</dd>
<dt><code>-n</code>, <code>--no-editor</code></dt><dd>Do not open EDITOR, just accept the data as is</dd>
<dt><code>-u</code>, <code>--user</code> USER</dt><dd>API Client Username, corresponds to <code>Chef::Config</code> <code>node_name</code>.</dd>
<dt><code>-p</code>, <code>--print-after</code></dt><dd>Show the data after a destructive operation</dd>
<dt><code>-v</code>, <code>--version</code></dt><dd>Show chef version</dd>
<dt><code>-y</code>, <code>--yes</code></dt><dd>Say yes to all prompts for confirmation</dd>
+<dt><code>--defaults</code></dt><dd>Accept default values for all questions</dd>
+<dt class="flush"><code>--color</code></dt><dd>Use colored output</dd>
+<dt><code>--no-color</code></dt><dd>Don't use colors in the output</dd>
<dt><code>-h</code>, <code>--help</code></dt><dd>Show the available options for a command.</dd>
</dl>
@@ -202,7 +206,7 @@ determines what preamble to put in the comment of the default recipe,
and is listed as the license in the cookbook metadata. Currently
supported licenses are "apachev2" and "none". Any other values will
result in an empty license in the metadata (needs to be filled in by the
-author), and no comment preamble in the default recipe. Currently supported
+author), and no comment preamble in the default recipe. Currently supported
readme formats are "md", "mkd", "txt", and "rdoc". Any other value will
result in an unformatted README.</li>
</ul>
@@ -214,6 +218,26 @@ result in an unformatted README.</li>
<p>Ruby DSL configuration file for knife. See <strong>CONFIGURATION</strong>.</p>
+<h2 id="FORMATS">FORMATS</h2>
+
+<p>The amount of content displayed and the output format are
+modified by the <code>--format</code> option. If no alternate format is selected,
+the default is summary.</p>
+
+<p>Valid formats are:</p>
+
+<dl>
+<dt class="flush"><code>summary</code></dt><dd>displays the node in a custom, summarized format (default)</dd>
+<dt class="flush"><code>text</code></dt><dd>displays the node data in its entirety using the colorized tree display</dd>
+<dt class="flush"><code>json</code></dt><dd>displays the node in JSON format</dd>
+<dt class="flush"><code>yaml</code></dt><dd>displays the node in YAML format</dd>
+<dt class="flush"><code>pp</code></dt><dd>displays the node using Ruby's pretty printer.</dd>
+</dl>
+
+
+<p>For brevity, only the first character of the format is required, for
+example, -Fj will produce JSON format output.</p>
+
<h2 id="CHEF-WORKFLOW">CHEF WORKFLOW</h2>
<p>When working with Chef and Knife in the local repository, the recommended workflow outline looks like:</p>
@@ -268,12 +292,12 @@ data editing entirely.</dd>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x61;&#100;&#97;&#109;&#x40;&#111;&#112;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#97;&#x64;&#x61;&#x6d;&#64;&#x6f;&#112;&#115;&#99;&#x6f;&#100;&#x65;&#x2e;&#x63;&#111;&#x6d;</a> of Opscode
+<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#97;&#x64;&#97;&#109;&#64;&#x6f;&#112;&#x73;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#x40;&#x6f;&#x70;&#115;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a> of Opscode
(<a href="http://www.opscode.com" data-bare-link="true">http://www.opscode.com</a>), with contributions from the community.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#108;&#116;&#x6f;&#x3a;&#x6a;&#x6f;&#x73;&#x68;&#117;&#97;&#x40;&#111;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#x73;&#x68;&#x75;&#97;&#x40;&#x6f;&#x70;&#x73;&#99;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;</a>.</p>
+<p> This manual page was written by Joshua Timberman <a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#58;&#106;&#x6f;&#115;&#104;&#117;&#97;&#x40;&#111;&#112;&#x73;&#x63;&#x6f;&#x64;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6a;&#x6f;&#115;&#104;&#x75;&#x61;&#64;&#x6f;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#111;&#109;</a>.</p>
<h2 id="LICENSE">LICENSE</h2>
@@ -287,8 +311,8 @@ data editing entirely.</dd>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>knife(1)</li>
</ol>
diff --git a/chef/distro/common/html/shef.1.html b/chef/distro/common/html/shef.1.html
index 1c11adccf1..deebc9e6fe 100644
--- a/chef/distro/common/html/shef.1.html
+++ b/chef/distro/common/html/shef.1.html
@@ -258,12 +258,12 @@ and may become out of sync with the behavior of those libraries.</p>
<h2 id="AUTHOR">AUTHOR</h2>
-<p> Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#x61;&#x64;&#97;&#x6d;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#x64;&#x65;&#46;&#99;&#111;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#109;&#64;&#x6f;&#112;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#109;</a> with many
+<p> Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#97;&#x64;&#97;&#109;&#64;&#x6f;&#112;&#x73;&#x63;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#x40;&#x6f;&#x70;&#115;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a> with many
contributions from the community. Shef was written by Daniel DeLeo.</p>
<h2 id="DOCUMENTATION">DOCUMENTATION</h2>
-<p> This manual page was written by Daniel DeLeo <a href="&#x6d;&#x61;&#105;&#108;&#x74;&#x6f;&#58;&#100;&#97;&#x6e;&#x40;&#111;&#112;&#115;&#99;&#111;&#100;&#101;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#x64;&#97;&#110;&#x40;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#x6d;</a>.
+<p> This manual page was written by Daniel DeLeo <a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#58;&#100;&#x61;&#110;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x64;&#97;&#x6e;&#x40;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#x63;&#111;&#109;</a>.
Permission is granted to copy, distribute and / or modify this
document under the terms of the Apache 2.0 License.</p>
@@ -273,8 +273,8 @@ and may become out of sync with the behavior of those libraries.</p>
<ol class='man-decor man-foot man foot'>
- <li class='tl'>Chef 0.10.4</li>
- <li class='tc'>August 2011</li>
+ <li class='tl'>Chef 0.10.6.beta.1</li>
+ <li class='tc'>October 2011</li>
<li class='tr'>shef(1)</li>
</ol>
diff --git a/chef/distro/common/man/man1/knife-bootstrap.1 b/chef/distro/common/man/man1/knife-bootstrap.1
index 1f22da51ab..2ea735b43c 100644
--- a/chef/distro/common/man/man1/knife-bootstrap.1
+++ b/chef/distro/common/man/man1/knife-bootstrap.1
@@ -1,10 +1,10 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
-.TH "KNIFE\-BOOTRAP" "1" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-BOOTSTRAP" "1" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
-\fBknife\-bootrap\fR \- Install Chef Client on a remote host
+\fBknife\-bootstrap\fR \- Install Chef Client on a remote host
.
.SH "SYNOPSIS"
\fBknife\fR \fBbootstrap\fR \fI(options)\fR
@@ -26,20 +26,24 @@ The ssh password
The ssh username
.
.TP
-\fB\-\-prerelease\fR
-Install pre\-release Chef gems
+\fB\-p\fR, \fB\-\-ssh\-port PORT\fR
+The ssh port
.
.TP
-\fB\-r\fR, \fB\-\-run\-list RUN_LIST\fR
-Comma separated list of roles/recipes to apply
+\fB\-\-bootstrap\-version VERSION\fR
+The version of Chef to install
.
.TP
-\fB\-P\fR, \fB\-\-ssh\-password PASSWORD\fR
-The ssh password
+\fB\-\-bootstrap\-proxy PROXY_URL\fR
+\fBThe proxy server for the node being bootstrapped\fR
.
.TP
-\fB\-x\fR, \fB\-\-ssh\-user USERNAME\fR
-The ssh username
+\fB\-\-prerelease\fR
+Install pre\-release Chef gems
+.
+.TP
+\fB\-r\fR, \fB\-\-run\-list RUN_LIST\fR
+Comma separated list of roles/recipes to apply
.
.TP
\fB\-\-template\-file TEMPLATE\fR
@@ -53,6 +57,10 @@ Execute the bootstrap via sudo
\fB\-d\fR, \fB\-\-distro DISTRO\fR
Bootstrap a distro using a template
.
+.TP
+\fB\-\-no\-host\-key\-verify\fR
+Disable host key verification
+.
.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\.
.
diff --git a/chef/distro/common/man/man1/knife-client.1 b/chef/distro/common/man/man1/knife-client.1
index b614ccce8b..2e47f2510c 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-CLIENT" "1" "October 2011" "Chef 0.10.6.beta.1" "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 61f5ff878c..8721456bbd 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-CONFIGURE" "1" "October 2011" "Chef 0.10.6.beta.1" "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 925edef8f7..1c22158880 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-COOKBOOK\-SITE" "1" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBknife\-cookbook\-site\fR \- Install and update open source cookbooks
@@ -19,6 +19,14 @@
\fB\-D\fR, \fB\-\-no\-dependencies\fR
Do not install dependencies automatically
.
+.TP
+\fB\-o\fR, \fB\-\-cookbook\-path PATH\fR
+Install cookbooks to PATH
+.
+.TP
+\fB\-B\fR, \fB\-\-branch BRANCH\fR
+Default branch to work with [defaults to master]
+.
.P
Uses git(1) version control in conjunction with the cookbook site to install community contributed cookbooks to your local cookbook repository\. Running \fBknife cookbook site install\fR does the following:
.
@@ -40,7 +48,7 @@ The pristine copy branch is merged into the master branch\.
.IP "" 0
.
.P
-By installing cookbook with this process, you can locally modify the upstream cookbook in your master branch ant 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\.
+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)\.
diff --git a/chef/distro/common/man/man1/knife-cookbook.1 b/chef/distro/common/man/man1/knife-cookbook.1
index 00cf1b17a4..6e216f9f42 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-COOKBOOK" "1" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBknife\-cookbook\fR \- upload and manage chef cookbooks
@@ -41,6 +41,10 @@ the platform to see the file for
\fB\-v\fR, \fB\-\-platform\-version version\fR
the platform version to see the file for
.
+.TP
+\fB\-w\fR, \fB\-\-with\-uri\fR
+Show corresponding URIs
+.
.P
show a particular part of a \fIcookbook\fR for the specified \fIversion\fR\. \fIpart\fR can be one of:
.
@@ -167,7 +171,7 @@ the directory where the cookbook will be created
.
.TP
\fB\-r\fR, \fB\-\-readme\-format format\fR
-format of the readme file md, mkd, txt, or rdoc
+format of the readme file md, mkd, txt, rdoc
.
.TP
\fB\-c\fR, \fB\-\-copyright copyright\fR
@@ -229,7 +233,7 @@ specify \fB\-i\fR or \fB\-\-license\fR with the license that the cookbook is dis
specify \fB\-e\fR or \fB\-\-email\fR with the email address of the cookbook\'s maintainer\. if this value is not specified, an all\-caps string \fByour_email\fR is used which can easily be changed with find/replace\.
.
.P
-the cookbook copyright, license, email, and readme format settings can be filled in the \fBknife\.rb\fR, for example with default values:
+the cookbook copyright, license, email and readme_format settings can be filled in the \fBknife\.rb\fR, for example with default values:
.
.IP "" 4
.
diff --git a/chef/distro/common/man/man1/knife-data-bag.1 b/chef/distro/common/man/man1/knife-data-bag.1
index 3955da8d5e..4ffd6a82f9 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-DATA\-BAG" "1" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBknife\-data\-bag\fR \- Store arbitrary data on a Chef Server
diff --git a/chef/distro/common/man/man1/knife-environment.1 b/chef/distro/common/man/man1/knife-environment.1
index 1541a59703..1d47f48505 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-ENVIRONMENT" "1" "October 2011" "Chef 0.10.6.beta.1" "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 0b6cec66b4..85b1d5deb4 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-EXEC" "1" "October 2011" "Chef 0.10.6.beta.1" "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 aca3208fcb..19e8de1aad 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-INDEX" "1" "October 2011" "Chef 0.10.6.beta.1" "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 32adee94d4..fb7fab2489 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-NODE" "1" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBknife\-node\fR \- Manage the hosts in your infrastructure
@@ -101,27 +101,7 @@ Display the node in a different format\.
Display more, but not all, of the node\'s data when using the default \fIsummary\fR format
.
.P
-Displays the node identified by \fInode name\fR on stdout\. The amount of content displayed and the output format are modified by the \-\-format option\. If no alternate format is selected, the default is summary\. Valid formats are:
-.
-.IP "\(bu" 4
-summary: displays the node in a custom, summarized format (default)
-.
-.IP "\(bu" 4
-text displays the node data in its entirety using the colorized tree display
-.
-.IP "\(bu" 4
-json: displays the node in JSON format
-.
-.IP "\(bu" 4
-yaml: displays the node in YAML format
-.
-.IP "\(bu" 4
-pp displays the node using Ruby\'s pretty printer\.
-.
-.IP "" 0
-.
-.P
-For brevity, only the first character of the format is required, for example, \-Fj will produce JSON format output\.
+Displays the node identified by \fInode name\fR on stdout\.
.
.SH "RUN LIST ITEM FORMAT"
Run list items may be either roles or recipes\. When adding a role to a run list, the correct syntax is "role[ROLE_NAME]"
diff --git a/chef/distro/common/man/man1/knife-role.1 b/chef/distro/common/man/man1/knife-role.1
index 179e071d04..952c56de3f 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-ROLE" "1" "October 2011" "Chef 0.10.6.beta.1" "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 4e7c9c1082..689efe310e 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-SEARCH" "1" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBknife\-search\fR \- Find objects on a Chef Server by query
@@ -61,6 +61,9 @@ Search indexes are a feature of the Chef Server and the search sub\-command allo
\fIenvironment\fR
.
.IP "\(bu" 4
+\fIclients\fR
+.
+.IP "\(bu" 4
\fIdata bag\fR
.
.IP "" 0
@@ -138,7 +141,7 @@ Fuzzy searches allows one to match values based on the Levenshtein Distance algo
.
.nf
-knife search nodes \'field:term~\'
+knife search INDEX \'field:term~\'
.
.fi
.
@@ -222,7 +225,7 @@ Find the nodes with the fully\-qualified domain name (FQDN) www\.example\.com:
.
.nf
-knife search nodes \'fqdn:www\.example\.com\'
+knife search node \'fqdn:www\.example\.com\'
.
.fi
.
@@ -235,7 +238,7 @@ Find the nodes running a version of Ubuntu:
.
.nf
-knife search nodes \'platform:ubuntu*\'
+knife search node \'platform:ubuntu*\'
.
.fi
.
@@ -248,7 +251,7 @@ Find all nodes running CentOS in the production environment:
.
.nf
-knife search nodes \'chef_environment:production AND platform:centos\'
+knife search node \'chef_environment:production AND platform:centos\'
.
.fi
.
diff --git a/chef/distro/common/man/man1/knife-ssh.1 b/chef/distro/common/man/man1/knife-ssh.1
index c51cfa2f4b..3cc927ae5a 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-SSH" "1" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBknife\-ssh\fR \- Run a command or interactive session on multiple remote hosts
@@ -33,6 +33,18 @@ The ssh username
\fB\-i\fR, \fB\-\-identity\-file IDENTITY_FILE\fR
The SSH identity file used for authentication
.
+.TP
+\fB\-p\fR, \fB\-\-ssh\-port PORT\fR
+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
+.
.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)\.
.
@@ -40,18 +52,11 @@ The \fIssh\fR sub\-command opens an ssh session to each of the nodes in the sear
\fBknife ssh\fR integrates with several terminal multiplexer programs to provide a more convenient means of managing multiple ssh sessions\. When the \fICOMMAND\fR option matches one of these, \fBknife ssh\fR will create multiple interactive ssh sessions running locally in the terminal multiplexer instead of invoking the command on the remote host\.
.
.P
-The available multiplexers are: * \fBinteractive\fR:
-.
-.IP "" 4
+The available multiplexers are:
.
-.nf
-
-A built\-in multiplexer\. `interactive` supports running commands on a
-subset of the connected hosts in parallel
-.
-.fi
-.
-.IP "" 0
+.TP
+\fBinteractive\fR
+A built\-in multiplexer\. \fBinteractive\fR supports running commands on a subset of the connected hosts in parallel
.
.TP
\fBscreen\fR(1)
diff --git a/chef/distro/common/man/man1/knife-status.1 b/chef/distro/common/man/man1/knife-status.1
index 58dc079f70..e440350e69 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-STATUS" "1" "October 2011" "Chef 0.10.6.beta.1" "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 0e9a4883f2..6723c52729 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE\-TAG" "1" "October 2011" "Chef 0.10.6.beta.1" "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 acc6c6172b..c4ec2bd378 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "KNIFE" "1" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBknife\fR \- Chef Server API client utility
@@ -80,20 +80,20 @@ API Client Key, corresponds to \fBChef::Config\fR \fBclient_key\fR\.
The configuration file to use
.
.TP
+\fB\-E\fR, \fB\-\-environment ENVIRONMENT\fR
+Set the Chef environment
+.
+.TP
\fB\-e\fR, \fB\-\-editor\fR EDITOR
Set the editor to use for interactive commands
.
.TP
\fB\-F\fR, \fB\-\-format\fR FORMAT
-Which format to use for output
-.
-.TP
-\fB\-l\fR, \fB\-\-log_level\fR LEVEL
-Set the log level (debug, info, warn, error, fatal), corresponds to \fBChef::Config\fR \fBlog_level\fR\.
+Which format to use for output\. See FORMATS for details\.
.
.TP
-\fB\-L\fR, \fB\-\-logfile\fR LOGLOCATION
-Set the log file location, defaults to STDOUT, corresponds to \fBChef::Config\fR \fBlog_location\fR\.
+\fB\-V\fR, \fB\-\-verbose\fR
+More verbose output\. Use twice for max verbosity
.
.TP
\fB\-n\fR, \fB\-\-no\-editor\fR
@@ -116,6 +116,18 @@ Show chef version
Say yes to all prompts for confirmation
.
.TP
+\fB\-\-defaults\fR
+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
+.
+.TP
\fB\-h\fR, \fB\-\-help\fR
Show the available options for a command\.
.
@@ -167,7 +179,7 @@ If the config file exists, knife uses these settings for \fBGENERAL OPTIONS\fR d
\fBvalidation_key\fR: Specifies the private key file to use when bootstrapping new hosts\. See knife\-client(1) for more information about the validation client\.
.
.IP "\(bu" 4
-\fBcookbook_copyright\fR, \fBcookbook_email\fR, \fBcookbook_license\fR, \fBreadme_format\fR Used by \fBknife cookbook create\fR sub\-command to specify the copyright holder, maintainer email, license and readme format (respectively) for new cookbooks\. The copyright holder is listed as the maintainer in the cookbook\'s metadata and as the Copyright in the comments of the default recipe\. The maintainer email is used in the cookbook metadata\. The license determines what preamble to put in the comment of the default recipe, and is listed as the license in the cookbook metadata\. Currently supported licenses are "apachev2" and "none"\. Any other values will result in an empty license in the metadata (needs to be filled in by the author), and no comment preamble in the default recipe\. Currently supported readme formats are "md", "mkd", "txt", and "rdoc"\. Any other value will result in an unformatted README\.
+\fBcookbook_copyright\fR, \fBcookbook_email\fR, \fBcookbook_license\fR, \fBreadme_format\fR Used by \fBknife cookbook create\fR sub\-command to specify the copyright holder, maintainer email, license and readme format (respectively) for new cookbooks\. The copyright holder is listed as the maintainer in the cookbook\'s metadata and as the Copyright in the comments of the default recipe\. The maintainer email is used in the cookbook metadata\. The license determines what preamble to put in the comment of the default recipe, and is listed as the license in the cookbook metadata\. Currently supported licenses are "apachev2" and "none"\. Any other values will result in an empty license in the metadata (needs to be filled in by the author), and no comment preamble in the default recipe\. Currently supported readme formats are "md", "mkd", "txt", and "rdoc"\. Any other value will result in an unformatted README\.
.
.IP "" 0
.
@@ -177,6 +189,35 @@ If the config file exists, knife uses these settings for \fBGENERAL OPTIONS\fR d
.P
Ruby DSL configuration file for knife\. See \fBCONFIGURATION\fR\.
.
+.SH "FORMATS"
+The amount of content displayed and the output format are modified by the \fB\-\-format\fR option\. If no alternate format is selected, the default is summary\.
+.
+.P
+Valid formats are:
+.
+.TP
+\fBsummary\fR
+displays the node in a custom, summarized format (default)
+.
+.TP
+\fBtext\fR
+displays the node data in its entirety using the colorized tree display
+.
+.TP
+\fBjson\fR
+displays the node in JSON format
+.
+.TP
+\fByaml\fR
+displays the node in YAML format
+.
+.TP
+\fBpp\fR
+displays the node using Ruby\'s pretty printer\.
+.
+.P
+For brevity, only the first character of the format is required, for example, \-Fj will produce JSON format output\.
+.
.SH "CHEF WORKFLOW"
When working with Chef and Knife in the local repository, the recommended workflow outline looks like:
.
diff --git a/chef/distro/common/man/man1/shef.1 b/chef/distro/common/man/man1/shef.1
index 1b86b55b5b..a6935f1028 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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "SHEF" "1" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBshef\fR \- Interactive Chef Console
diff --git a/chef/distro/common/man/man8/chef-client.8 b/chef/distro/common/man/man8/chef-client.8
index 1527685d92..5b8bc994aa 100644
--- a/chef/distro/common/man/man8/chef-client.8
+++ b/chef/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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "CHEF\-CLIENT" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBchef\-client\fR \- Runs a client node connecting to a chef\-server\.
@@ -34,6 +34,10 @@ Run chef\-client periodically, in seconds
Load attributes from a JSON file or URL
.
.TP
+\fB\-E\fR, \fB\-\-environment ENVIRONMENT\fR
+Set the Chef Environment on the node
+.
+.TP
\fB\-l\fR, \fB\-\-log_level LEVEL\fR
Set the log level (debug, info, warn, error, fatal)
.
@@ -50,6 +54,14 @@ Ensures logging goes to STDOUT as well as to other configured log location(s)\.
The node name for this client
.
.TP
+\fB\-K\fR, \fB\-\-validation_key KEY_FILE\fR
+Set the validation key file location, used for registering new clients
+.
+.TP
+\fB\-k\fR, \fB\-\-client_key KEY_FILE\fR
+Set the client key file location
+.
+.TP
\fB\-s\fR, \fB\-\-splay SECONDS\fR
The splay time for running at intervals, in seconds
.
@@ -58,6 +70,14 @@ The splay time for running at intervals, in seconds
User to set privilege to
.
.TP
+\fB\-P\fR, \fB\-\-pid PIDFILE\fR
+Set the PID file location, defaults to /tmp/chef\-client\.pid
+.
+.TP
+\fB\-\-once\fR
+Cancel any interval or splay options, run chef once and exit
+.
+.TP
\fB\-v\fR, \fB\-\-version\fR
Show chef version
.
diff --git a/chef/distro/common/man/man8/chef-expander.8 b/chef/distro/common/man/man8/chef-expander.8
index f2d9fcd468..c518492871 100644
--- a/chef/distro/common/man/man8/chef-expander.8
+++ b/chef/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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "CHEF\-EXPANDER" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr
diff --git a/chef/distro/common/man/man8/chef-expanderctl.8 b/chef/distro/common/man/man8/chef-expanderctl.8
index 4ff7ea4e51..02c53ecaec 100644
--- a/chef/distro/common/man/man8/chef-expanderctl.8
+++ b/chef/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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "CHEF\-EXPANDERCTL" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBchef\-expanderctl\fR \- management program for chef\-expander
diff --git a/chef/distro/common/man/man8/chef-server-webui.8 b/chef/distro/common/man/man8/chef-server-webui.8
index f5be2067a9..e2f15d4748 100644
--- a/chef/distro/common/man/man8/chef-server-webui.8
+++ b/chef/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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "CHEF\-SERVER\-WEBUI" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBchef\-server\-webui\fR \- Start the Chef Server merb application slice providing Web User Interface (Management Console)\.
diff --git a/chef/distro/common/man/man8/chef-server.8 b/chef/distro/common/man/man8/chef-server.8
index 56ae671d0e..eb29476c2a 100644
--- a/chef/distro/common/man/man8/chef-server.8
+++ b/chef/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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "CHEF\-SERVER" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBchef\-server\fR \- Start the Chef Server merb application slice\.
diff --git a/chef/distro/common/man/man8/chef-solo.8 b/chef/distro/common/man/man8/chef-solo.8
index 9e07024c92..5e81b4aef6 100644
--- a/chef/distro/common/man/man8/chef-solo.8
+++ b/chef/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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "CHEF\-SOLO" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBchef\-solo\fR \- Runs chef in solo mode against a specified cookbook location\.
diff --git a/chef/distro/common/man/man8/chef-solr.8 b/chef/distro/common/man/man8/chef-solr.8
index 968d6d5b85..c76ff7672b 100644
--- a/chef/distro/common/man/man8/chef-solr.8
+++ b/chef/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" "August 2011" "Chef 0.10.4" "Chef Manual"
+.TH "CHEF\-SOLR" "8" "October 2011" "Chef 0.10.6.beta.1" "Chef Manual"
.
.SH "NAME"
\fBchef\-solr\fR \- Runs as Chef\'s search server
@@ -30,6 +30,10 @@ Set the log level (debug, info, warn, error, fatal)
Set the log file location, defaults to STDOUT \- recommended for daemonizing
.
.TP
+\fB\-P\fR, \fB\-\-pid PIDFILE\fR
+Set the PID file location, defaults to /tmp/chef\-solr\.pid
+.
+.TP
\fB\-D\fR, \fB\-\-solr\-data\-dir PATH\fR
Where the Solr data lives
.
@@ -46,6 +50,10 @@ Solr home directory
Raw options passed to Java
.
.TP
+\fB\-x\fR, \fB\-\-solor\-heap\-size\fR
+Set the size of the Java Heap
+.
+.TP
\fB\-W\fR, \fB\-\-solr\-jetty\-dir PATH\fR
Where to place the Solr Jetty instance
.