chef 0.10.0.beta.8 → 0.10.0.beta.9

data/distro/common/html/knife-search.1.html

@@ -61,6 +61,13 @@
   <div class='man-navigation' style='display:none'>
     <a href="#NAME">NAME</a>
     <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#SYNTAX">SYNTAX</a>
+    <a href="#EXAMPLES">EXAMPLES</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#AUTHOR">AUTHOR</a>
+    <a href="#DOCUMENTATION">DOCUMENTATION</a>
+    <a href="#CHEF">CHEF</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -85,14 +92,48 @@
 <dt><code>-r</code>, <code>--run-list</code></dt><dd>Show only the run list</dd>
 <dt><code>-o</code>, <code>--sort SORT</code></dt><dd>The order to sort the results in</dd>
 <dt><code>-b</code>, <code>--start ROW</code></dt><dd>The row to start returning results at</dd>
+<dt><code>-m</code>, <code>--medium</code></dt><dd>Display medium sized output when searching nodes using the default
+summary format</dd>
+<dt><code>-l</code>, <code>--long</code></dt><dd>Display long output when searching nodes using the default summary
+format</dd>
 </dl>
 
 
-<p>Search indexes are a feature of the Chef Server and the search sub-command allows querying any of the available indexes using SOLR query syntax. The following data types are indexed for search: <em>node</em>, <em>role</em>, <em>client</em>, <em>data bag</em>.</p>
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>Search indexes are a feature of the Chef Server and the search
+sub-command allows querying any of the available indexes using SOLR
+query syntax. The following data types are indexed for search:
+* <em>node</em>
+* <em>role</em>
+* <em>environment</em>
+* <em>data bag</em></p>
+
+<h2 id="SYNTAX">SYNTAX</h2>
+
+<h2 id="EXAMPLES">EXAMPLES</h2>
+
+<h2 id="SEE-ALSO">SEE ALSO</h2>
+
+<p>   <strong>knife-ssh</strong>(1)
+   <a href="http://wiki.opscode.com/display/chef/Attributes" data-bare-link="true">http://wiki.opscode.com/display/chef/Attributes</a></p>
+
+<h2 id="AUTHOR">AUTHOR</h2>
+
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#x61;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#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;&#58;&#x6a;&#x6f;&#x73;&#104;&#117;&#97;&#x40;&#x6f;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#x6a;&#x6f;&#115;&#x68;&#x75;&#97;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#100;&#101;&#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>
+
+<h2 id="CHEF">CHEF</h2>
+
+<p>   Knife is distributed with Chef. <a href="http://wiki.opscode.com/display/chef/Home" data-bare-link="true">http://wiki.opscode.com/display/chef/Home</a></p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 0.10.0.beta.8</li>
+    <li class='tl'>Chef 0.10.0.beta.9</li>
     <li class='tc'>April 2011</li>
     <li class='tr'>knife-search(1)</li>
   </ol>

data/distro/common/html/knife-ssh.1.html

@@ -61,6 +61,12 @@
   <div class='man-navigation' style='display:none'>
     <a href="#NAME">NAME</a>
     <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#TERMINAL-MULTIPLEXING-AND-TERMINAL-TAB-SUPPORT">TERMINAL MULTIPLEXING AND TERMINAL TAB SUPPORT</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#AUTHOR">AUTHOR</a>
+    <a href="#DOCUMENTATION">DOCUMENTATION</a>
+    <a href="#CHEF">CHEF</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -87,11 +93,60 @@
 </dl>
 
 
-<p>The <em>ssh</em> sub-command opens an ssh session to each of the nodes in the search results of the <em>QUERY</em>. 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).</p>
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>The <em>ssh</em> sub-command opens an ssh session to each of the nodes in the
+search results of the <em>QUERY</em>. 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).</p>
+
+<h2 id="TERMINAL-MULTIPLEXING-AND-TERMINAL-TAB-SUPPORT">TERMINAL MULTIPLEXING AND TERMINAL TAB SUPPORT</h2>
+
+<p><code>knife ssh</code> integrates with several terminal multiplexer programs to
+provide a more convenient means of managing multiple ssh sessions. When
+the <em>COMMAND</em> option matches one of these, <code>knife ssh</code> will create
+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>
+
+<dl>
+<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>
+<dt><code>macterm</code> (Mac OS X only)</dt><dd>Opens a Terminal.app window and creates a tab for each ssh session.
+You must install the rb-appscript gem before you can use this
+option.</dd>
+</dl>
+
+
+<h2 id="SEE-ALSO">SEE ALSO</h2>
+
+<p>   <strong>knife-search</strong>(1)</p>
+
+<h2 id="AUTHOR">AUTHOR</h2>
+
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#x61;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#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;&#58;&#x6a;&#x6f;&#x73;&#104;&#117;&#97;&#x40;&#x6f;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#x6a;&#x6f;&#115;&#x68;&#x75;&#97;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#100;&#101;&#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>
+
+<h2 id="CHEF">CHEF</h2>
+
+<p>   Knife is distributed with Chef. <a href="http://wiki.opscode.com/display/chef/Home" data-bare-link="true">http://wiki.opscode.com/display/chef/Home</a></p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 0.10.0.beta.8</li>
+    <li class='tl'>Chef 0.10.0.beta.9</li>
     <li class='tc'>April 2011</li>
     <li class='tr'>knife-ssh(1)</li>
   </ol>

data/distro/common/html/knife-status.1.html

@@ -61,6 +61,11 @@
   <div class='man-navigation' style='display:none'>
     <a href="#NAME">NAME</a>
     <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#AUTHOR">AUTHOR</a>
+    <a href="#DOCUMENTATION">DOCUMENTATION</a>
+    <a href="#CHEF">CHEF</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -83,11 +88,37 @@
 </dl>
 
 
-<p>The <em>status</em> sub-command searches the Chef Server for all nodes and displays information about the last time the node checked into the server and executed a <code>node.save</code>. The fields displayed are the relative checkin time, the node name, it's operating system platform and version, the fully-qualified domain name and the default IP address. If the <code>-r</code> option is given, the node's run list will also be displayed. Note that depending on the configuration of the nodes, the FQDN and IP displayed may not be publicly reachable.</p>
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>The <em>status</em> sub-command searches the Chef Server for all nodes and
+displays information about the last time the node checked into the
+server and executed a <code>node.save</code>. The fields displayed are the relative
+checkin time, the node name, it's operating system platform and version,
+the fully-qualified domain name and the default IP address. If the <code>-r</code>
+option is given, the node's run list will also be displayed. Note that
+depending on the configuration of the nodes, the FQDN and IP displayed
+may not be publicly reachable.</p>
+
+<h2 id="SEE-ALSO">SEE ALSO</h2>
+
+<p>   <strong>knife-search</strong>(1)</p>
+
+<h2 id="AUTHOR">AUTHOR</h2>
+
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#x61;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#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;&#58;&#x6a;&#x6f;&#x73;&#104;&#117;&#97;&#x40;&#x6f;&#x70;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#x6a;&#x6f;&#115;&#x68;&#x75;&#97;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#100;&#101;&#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>
+
+<h2 id="CHEF">CHEF</h2>
+
+<p>   Knife is distributed with Chef. <a href="http://wiki.opscode.com/display/chef/Home" data-bare-link="true">http://wiki.opscode.com/display/chef/Home</a></p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 0.10.0.beta.8</li>
+    <li class='tl'>Chef 0.10.0.beta.9</li>
     <li class='tc'>April 2011</li>
     <li class='tr'>knife-status(1)</li>
   </ol>

data/distro/common/html/knife-tag.1.html

@@ -62,6 +62,13 @@
     <a href="#NAME">NAME</a>
     <a href="#SYNOPSIS">SYNOPSIS</a>
     <a href="#TAG-SUBCOMMANDS">TAG SUBCOMMANDS</a>
+    <a href="#CREATE">CREATE</a>
+    <a href="#DELETE">DELETE</a>
+    <a href="#LIST">LIST</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#AUTHOR">AUTHOR</a>
+    <a href="#DOCUMENTATION">DOCUMENTATION</a>
+    <a href="#CHEF">CHEF</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -81,9 +88,46 @@
 
 <h2 id="TAG-SUBCOMMANDS">TAG SUBCOMMANDS</h2>
 
+<p>The following <code>tag</code> subcommands are available:</p>
+
+<h2 id="CREATE">CREATE</h2>
+
+<p><strong>knife tag create</strong> <em>node</em> <em>tag</em> [<em>...</em>]</p>
+
+<p>Adds one or more tags to <em>node</em></p>
+
+<h2 id="DELETE">DELETE</h2>
+
+<p><strong>knife tag delete</strong> <em>node</em> <em>tag</em> [<em>...</em>]</p>
+
+<p>Removes one or more tags from <em>node</em></p>
+
+<h2 id="LIST">LIST</h2>
+
+<p><strong>knife tag list</strong> <em>node</em></p>
+
+<p>Lists the tags applied to <em>node</em></p>
+
+<h2 id="SEE-ALSO">SEE ALSO</h2>
+
+<p>   <strong><span class="man-ref">knife-node<span class="s">(1)</span></span></strong></p>
+
+<h2 id="AUTHOR">AUTHOR</h2>
+
+<p>   Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#x3a;&#97;&#100;&#x61;&#109;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#97;&#109;&#x40;&#111;&#x70;&#115;&#x63;&#x6f;&#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 Daniel DeLeo <a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#111;&#x3a;&#100;&#x61;&#110;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#100;&#x61;&#x6e;&#x40;&#111;&#112;&#115;&#99;&#111;&#100;&#x65;&#46;&#x63;&#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>
+
+<p>   Knife is distributed with Chef. <a href="http://wiki.opscode.com/display/chef/Home" data-bare-link="true">http://wiki.opscode.com/display/chef/Home</a></p>
+
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 0.10.0.beta.8</li>
+    <li class='tl'>Chef 0.10.0.beta.9</li>
     <li class='tc'>April 2011</li>
     <li class='tr'>knife-tag(1)</li>
   </ol>

data/distro/common/html/knife.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(1) - Chef Server REST API utility</title>
+  <title>knife(1) - Chef Server API client utility</title>
   <style type='text/css' media='all'>
   /* style: man */
   body#manpage {margin:0}
@@ -62,9 +62,8 @@
     <a href="#NAME">NAME</a>
     <a href="#SYNOPSIS">SYNOPSIS</a>
     <a href="#DESCRIPTION">DESCRIPTION</a>
-    <a href="#GENERAL-OPTIONS">GENERAL OPTIONS</a>
+    <a href="#OPTIONS">OPTIONS</a>
     <a href="#SUB-COMMANDS">SUB-COMMANDS</a>
-    <a href="#GENERAL-SUB-COMMANDS">GENERAL SUB-COMMANDS</a>
     <a href="#CONFIGURATION">CONFIGURATION</a>
     <a href="#FILES">FILES</a>
     <a href="#CHEF-WORKFLOW">CHEF WORKFLOW</a>
@@ -72,6 +71,9 @@
     <a href="#ENVIRONMENT">ENVIRONMENT</a>
     <a href="#SEE-ALSO">SEE ALSO</a>
     <a href="#AUTHOR">AUTHOR</a>
+    <a href="#DOCUMENTATION">DOCUMENTATION</a>
+    <a href="#LICENSE">LICENSE</a>
+    <a href="#CHEF">CHEF</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -82,30 +84,45 @@
 
   <h2 id="NAME">NAME</h2>
 <p class="man-name">
-  <code>knife</code> - <span class="man-whatis">Chef Server REST API utility</span>
+  <code>knife</code> - <span class="man-whatis">Chef Server API client utility</span>
 </p>
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><strong>knife</strong> <em>sub-command</em> <em>(options)</em></p>
+<p><strong>knife</strong> <em>sub-command</em> [<em>argument</em>...] <em>(options)</em></p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>This manual page documents knife, a command-line utility used to
-interact with a Chef server directly through the RESTful API. Knife uses
-sub-commands to take various actions on different types of Chef objects.
-Some sub-commands take additional options. General options follow
-sub-commands and their options. A configuration file can be created for
-common defaults.</p>
+<p>Knife is a command-line utility used to manage data on a Chef server
+through the HTTP(S) API. Knife is organized into groups of subcommands
+centered around the various object types in Chef. Each category of
+subcommand is documented in its own manual page. Available topics are:</p>
 
-<p>Unless otherwise specified, output is in JSON format, and input files
-are also JSON format.</p>
+<ul>
+<li>bootstrap</li>
+<li>client</li>
+<li>configure</li>
+<li>cookbook-site</li>
+<li>cookbook</li>
+<li>data-bag</li>
+<li>environment</li>
+<li>exec</li>
+<li>index</li>
+<li>node</li>
+<li>recipe</li>
+<li>role</li>
+<li>search</li>
+<li>ssh</li>
+<li>status</li>
+<li>tag</li>
+</ul>
 
-<p>The Chef class <code>Chef::Config</code> that configures the behavior of how knife
-runs has options that correspond to command-line options. These are
-noted as <code>Chef::Config</code> values.</p>
 
-<h2 id="GENERAL-OPTIONS">GENERAL OPTIONS</h2>
+<p>If the knife manuals are in your <code>MANPATH</code>, you can access help for the
+above topics using <code>man knife-TOPIC</code>; otherwise, you can view the
+documentation using <code>knife help TOPIC</code>.</p>
+
+<h2 id="OPTIONS">OPTIONS</h2>
 
 <dl>
 <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>
@@ -120,17 +137,15 @@ noted as <code>Chef::Config</code> values.</p>
 <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>-h</code>, <code>--help</code></dt><dd>Show this message</dd>
+<dt><code>-h</code>, <code>--help</code></dt><dd>Show the available options for a command.</dd>
 </dl>
 
 
-<p>Usage information for sub-commands can be displayed with <code>knife SUB-COMMAND --help</code>.</p>
-
 <h2 id="SUB-COMMANDS">SUB-COMMANDS</h2>
 
-<p>Knife sub-commands are structured as <em>NOUN verb NOUN (options)</em>. The
-sub-commands are meant to be intuitively named. Because the Chef Server
-API is RESTful, sub-commands generally utilize CRUD operations.</p>
+<p>Sub-commands that operate on the basic Chef data types are structured as
+<em>NOUN verb NOUN (options)</em>. For all data types, the following commands
+are available:</p>
 
 <ul>
 <li>create (create)</li>
@@ -140,13 +155,8 @@ API is RESTful, sub-commands generally utilize CRUD operations.</p>
 </ul>
 
 
-<p>Objects stored on the server support these, as described below.</p>
-
-<h2 id="GENERAL-SUB-COMMANDS">GENERAL SUB-COMMANDS</h2>
-
-<p><strong>recipe list [PATTERN]</strong></p>
-
-<p>List available recipes from the server. Specify <em>PATTERN</em> as a regular expression to limit the results.</p>
+<p>Knife also includes commands that take actions other than displaying or
+modifying data on the Chef Server, such as <strong><span class="man-ref">knife-ssh<span class="s">(1)</span></span></strong>.</p>
 
 <h2 id="CONFIGURATION">CONFIGURATION</h2>
 
@@ -158,68 +168,32 @@ be <code>.chef/knife.rb</code> in the current directory of the repository.</p>
 
 <p>If the config file exists, knife uses these settings for <strong>GENERAL OPTIONS</strong> defaults.</p>
 
-<p><code>log_level</code></p>
-
-<p>A Ruby symbol specifying the log level. Corresponds to <code>-l</code> or <code>--log_level</code> option. Default is <em>:info</em>. Valid values are:</p>
-
 <ul>
-<li>:info</li>
-<li>:debug</li>
-<li>:warn</li>
-<li>:fatal</li>
-</ul>
-
-
-<p><code>log_location</code></p>
-
-<p>Corresponds to the <code>-L</code> or <code>--log-file</code> option. Defaults is <strong>STDOUT</strong>.
-Valid values are <strong>STDOUT</strong> or a filename.</p>
-
-<p><code>node_name</code></p>
-
-<p>User to authenticate to the Chef server. Corresponds to the <code>-u</code> or
-<code>--user</code> option. This is requested from the user when running this
-sub-command.</p>
-
-<p><code>client_key</code></p>
-
-<p>Private key file to authenticate to the Chef server. Corresponds to the
-<code>-k</code> or <code>--key</code> option. This is requested from the user when running
-this sub-command.</p>
-
-<p><code>chef_server_url</code></p>
-
-<p>URL of the Chef server. Corresponds to the <code>-s</code> or <code>--server-url</code>
-option. This is requested from the user when running this sub-command.</p>
-
-<p><code>cache_type</code></p>
-
-<p>The type of cache to use. Default is BasicFile. This can be any type of
+<li><code>node_name</code>:
+User or client identity (i.e., <em>name</em>) to use for authenticating
+requests to the Chef Server.</li>
+<li><code>client_key</code>:
+Private key file to authenticate to the Chef server. Corresponds to the
+<code>-k</code> or <code>--key</code> option.</li>
+<li><code>chef_server_url</code>:
+URL of the Chef server. Corresponds to the <code>-s</code> or <code>--server-url</code>
+option. This is requested from the user when running this sub-command.</li>
+<li><code>cache_type</code>:
+The type of cache to use. Default is BasicFile. This can be any type of
 Cache that moneta supports: BasicFile, Berkeley, Couch, DataMapper,
 File, LMC, Memcache, Memory, MongoDB, Redis, Rufus, S3, SDBM, Tyrant,
-Xattr, YAML.</p>
-
-<p><code>cache_options</code></p>
-
-<p>Specifies various options to use for caching. Default reads the Chef
-client configuration (/etc/chef/checksums).</p>
-
-<p><code>validation_client_name</code></p>
-
-<p>Specifies the name of the client used to validate new clients. This is
-requested from the user when running the configuration sub-command.</p>
-
-<p><code>validation_key</code></p>
-
-<p>Specifies the private key file to use for generating ec2 instance data
-for validating new clients. This is implied from the
-<code>validation_client_name</code>.</p>
-
-<p><code>cookbook_copyright</code>
-<code>cookbook_email</code>
-<code>cookbook_license</code></p>
-
-<p>Used by <code>knife cookbook create</code> sub-command to specify the copyright
+Xattr, YAML.</li>
+<li><code>cache_options</code>:
+Specifies various options to use for caching. These options are
+dependent on the <code>cache_type</code>.</li>
+<li><code>validation_client_name</code>:
+Specifies the name of the client used to validate new clients.</li>
+<li><code>validation_key</code>:
+Specifies the private key file to use when bootstrapping new hosts.
+See <span class="man-ref">knife-client<span class="s">(1)</span></span> for more information about the validation
+client.</li>
+<li><code>cookbook_copyright</code>, <code>cookbook_email</code>, <code>cookbook_license</code>
+Used by <code>knife cookbook create</code> sub-command to specify the copyright
 holder, maintainer email and license (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
@@ -228,27 +202,9 @@ 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.</p>
-
-<p><code>knife[:aws_access_key_id]</code>
-<code>knife[:aws_secret_access_key]</code></p>
-
-<p>Specifies the Amazon AWS EC2 credentials to use when running the ec2 sub-commands.</p>
-
-<p><code>knife[:rackspace_api_username]</code>
-<code>knife[:rackspace_api_key]</code></p>
-
-<p>Specifies the Rackspace Cloud credentials to use when running the rackspace sub-commands.</p>
-
-<p><code>knife[:terremark_username]</code>
-<code>knife[:terremark_password]</code>
-<code>knife[:terremark_service]</code></p>
-
-<p>Specifies the Terremark vCloud credentials to use when running the terremark sub-commands.</p>
-
-<p><code>knife[:slicehost_password]</code></p>
+author), and no comment preamble in the default recipe.</li>
+</ul>
 
-<p>Specifies the Slicehost password to use when running the slicdehost sub-commands.</p>
 
 <h2 id="FILES">FILES</h2>
 
@@ -279,50 +235,6 @@ recommended though, and git fits with a lot of the workflow paradigms.</p>
 
 <h2 id="EXAMPLES">EXAMPLES</h2>
 
-<p>Example client config (<code>/etc/chef/client.rb</code>) from <code>knife configure
-client</code>. The same configuration is used when using the <code>knife bootstrap</code>
-command with the default <code>gem</code> templates that come with Chef.</p>
-
-<pre><code>log_level        :info
-log_location     STDOUT
-chef_server_url  'https://api.opscode.com/organizations/ORGNAME'
-validation_client_name 'ORGNAME-validator'
-</code></pre>
-
-<p>Setting up a custom bootstrap is fairly straightforward. Create
-<code>.chef/bootstrap</code> in your Chef Repository directory or in
-<code>$HOME/.chef/bootstrap</code>. Then create the ERB template file.</p>
-
-<pre><code>mkdir ~/.chef/bootstrap
-vi ~/.chef/bootstrap/debian5.0-apt.erb
-</code></pre>
-
-<p>For example, to create a new bootstrap template that should be used when
-setting up a new Debian node. Edit the template to run the commands, set
-up the validation certificate and the client configuration file, and
-finally to run chef-client on completion. The bootstrap template can be
-called with:</p>
-
-<pre><code>knife bootstrap mynode.example.com --template-file ~/.chef/bootstrap/debian5.0-apt.erb
-</code></pre>
-
-<p>Or,</p>
-
-<pre><code>knife bootstrap mynode.example.com --distro debian5.0-apt
-</code></pre>
-
-<p>The <code>--distro</code> parameter will automatically look in the
-<code>~/.chef/bootstrap</code> directory for a file named <code>debian5.0-apt.erb</code>.</p>
-
-<p>Templates provided by the Chef installation are located in
-<code>BASEDIR/lib/chef/knife/bootstrap/*.erb</code>, where <em>BASEDIR</em> is the
-location where the package or Gem installed the Chef client libraries.</p>
-
-<p>Uploading cookbooks to the Opscode cookbooks site using the user/certificate specifically:</p>
-
-<pre><code>knife cookbook site share example Other -k ~/.chef/USERNAME.pem -u USERNAME
-</code></pre>
-
 <h2 id="ENVIRONMENT">ENVIRONMENT</h2>
 
 <dl>
@@ -334,25 +246,46 @@ data editing entirely.</dd>
 
 <h2 id="SEE-ALSO">SEE ALSO</h2>
 
-<p>Full documentation for Chef is located on the Chef wiki, http://wiki.opscode.com/display/chef/Home/.</p>
+<p>  <strong><span class="man-ref">chef-client<span class="s">(8)</span></span></strong> <strong><span class="man-ref">chef-server<span class="s">(8)</span></span></strong> <strong><span class="man-ref">shef<span class="s">(1)</span></span></strong></p>
 
-<p>JSON is JavaScript Object Notation and more information can be found at http://json.org/.</p>
+<p>  <strong><span class="man-ref">knife-bootstrap<span class="s">(1)</span></span></strong> <strong><span class="man-ref">knife-client<span class="s">(1)</span></span></strong> <strong><span class="man-ref">knife-configure<span class="s">(1)</span></span></strong>
+  <strong><span class="man-ref">knife-cookbook-site<span class="s">(1)</span></span></strong> <strong><span class="man-ref">knife-cookbook<span class="s">(1)</span></span></strong> <strong><span class="man-ref">knife-data-bag<span class="s">(1)</span></span></strong>
+  <strong><span class="man-ref">knife-environment<span class="s">(1)</span></span></strong> <strong><span class="man-ref">knife-exec<span class="s">(1)</span></span></strong> <strong><span class="man-ref">knife-index<span class="s">(1)</span></span></strong>
+  <strong><span class="man-ref">knife-node<span class="s">(1)</span></span></strong> <strong><span class="man-ref">knife-recipe<span class="s">(1)</span></span></strong> <strong><span class="man-ref">knife-role<span class="s">(1)</span></span></strong>
+  <strong><span class="man-ref">knife-search<span class="s">(1)</span></span></strong> <strong><span class="man-ref">knife-ssh<span class="s">(1)</span></span></strong> <strong><span class="man-ref">knife-tag<span class="s">(1)</span></span></strong></p>
 
-<p>SOLR is an open source search engine. The Chef Server includes a SOLR installation. More information about SOLR, including the search query syntax, can be found at http://lucene.apache.org/solr/.</p>
+<p>  Complete Chef documentation is available online: <a href="http://wiki.opscode.com/display/chef/Home/" data-bare-link="true">http://wiki.opscode.com/display/chef/Home/</a></p>
 
-<p>Git is a version control system and documented at http://git-scm.com/.</p>
+<p>  JSON is JavaScript Object Notation <a href="http://json.org/" data-bare-link="true">http://json.org/</a></p>
 
-<p>This manual page was generated in nroff from Markdown with ronn. Ryan Tomayko wrote ronn and more information can be found at http://rtomayko.github.com/ronn/ronn.5.html.</p>
+<p>  SOLR is an open source search engine. <a href="http://lucene.apache.org/solr/" data-bare-link="true">http://lucene.apache.org/solr/</a></p>
+
+<p>  <strong><span class="man-ref">git<span class="s">(1)</span></span></strong> is a version control system <a href="http://git-scm.com/" data-bare-link="true">http://git-scm.com/</a></p>
+
+<p>  This manual page was generated from Markdown with <strong><span class="man-ref">ronn<span class="s">(1)</span></span></strong> <a href="http://rtomayko.github.com/ronn/ronn.1.html" data-bare-link="true">http://rtomayko.github.com/ronn/ronn.1.html</a></p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Chef was written by Adam Jacob <a href="&#109;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#x61;&#100;&#97;&#109;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#x64;&#97;&#x6d;&#x40;&#x6f;&#x70;&#115;&#x63;&#x6f;&#100;&#x65;&#46;&#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. This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#106;&#111;&#115;&#104;&#117;&#x61;&#64;&#x6f;&#112;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x6a;&#111;&#x73;&#104;&#x75;&#x61;&#x40;&#111;&#112;&#x73;&#x63;&#x6f;&#x64;&#x65;&#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>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#108;&#x74;&#x6f;&#x3a;&#97;&#100;&#x61;&#x6d;&#x40;&#x6f;&#112;&#x73;&#x63;&#111;&#100;&#x65;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#100;&#97;&#x6d;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#x2e;&#x63;&#111;&#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;&#x61;&#105;&#108;&#x74;&#x6f;&#x3a;&#106;&#x6f;&#x73;&#x68;&#x75;&#x61;&#64;&#111;&#112;&#x73;&#x63;&#x6f;&#100;&#x65;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#106;&#111;&#115;&#x68;&#117;&#x61;&#x40;&#111;&#x70;&#x73;&#x63;&#111;&#x64;&#x65;&#x2e;&#99;&#111;&#x6d;</a>.</p>
+
+<h2 id="LICENSE">LICENSE</h2>
+
+<p>   Both Chef and this documentation are released under the terms of the
+   Apache 2.0 License. You may view the license online: <a href="http://www.apache.org/licenses/LICENSE-2.0.html" data-bare-link="true">http://www.apache.org/licenses/LICENSE-2.0.html</a>
+   On some systems, the complete text of the Apache 2.0 License may be found in <code>/usr/share/common-licenses/Apache-2.0</code>.</p>
+
+<h2 id="CHEF">CHEF</h2>
 
-<p>On Debian systems, the complete text of the Apache 2.0 License can be found in <code>/usr/share/common-licenses/Apache-2.0</code>.</p>
+<p>   Knife is distributed with Chef. <a href="http://wiki.opscode.com/display/chef/Home" data-bare-link="true">http://wiki.opscode.com/display/chef/Home</a></p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 0.10.0.beta.8</li>
+    <li class='tl'>Chef 0.10.0.beta.9</li>
     <li class='tc'>April 2011</li>
     <li class='tr'>knife(1)</li>
   </ol>