chef 12.0.3 → 12.1.0.rc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e516e23b8f432618bba6ae817b113bef6f1fd7e6
-  data.tar.gz: 0130eaec499c6059291f3d395b1fb282a203d9d5
+  metadata.gz: e9c7d72a1bb22b0477282799c72de62ea5f2a81d
+  data.tar.gz: f80c1c36bac01861d0b216c1df5f17762c28849a
 SHA512:
-  metadata.gz: dad78645f06fa14308a32787553f371b741d3195df67b027afddb3f6e3e3a44b291a47bda4fddb7a623358c3677c95b145203e5657e133116cc0ee255c168b90
-  data.tar.gz: 4aa354a66a468b4100723a4027b1ff9265cfcf8c8377d3698f279c6852494c9f01bc246868c29dea3d8b49251a0c287920671bb9fbeb913bbbf0682e6a4a6ad9
+  metadata.gz: 8807e256d51b7e5738d9be8262423ee32f014fcceb0e37dc1830697ffa45934d4f6d343c54a73444cd826d433edd22aa325234eb8189f872d63f2810b6365838
+  data.tar.gz: 45f84064ef58c0b536e06ee948dda070d5636d389323dc611efd25cd7176c17c82703c0adfe310c52feb3105548bdfbe9d97041c79525fa27bf1da548ae4dc6b

data/CONTRIBUTING.md

@@ -128,6 +128,9 @@ If you are familiar with Chef and know the component that is causing you a probl
   Github project. All of our Open Source Software can be found in our
   [Github organization](https://github.com/opscode/).
 
+There is also a listing of the various Chef products and where to file issues that can be
+  found in the Chef docs in the [community contributions section](https://docs.chef.io/community_contributions.html#issues-and-bug-reports).
+
 Otherwise you can file your issue in the [Chef project](https://github.com/opscode/chef/issues)
   and we will make sure it gets filed against the appropriate project.
 
@@ -173,7 +176,7 @@ Contributions go through a review process to improve code quality and avoid regr
 Our primary shipping vehicle is operating system specific packages that includes
   all the requirements of Chef. We call these [Omnibus packages](https://github.com/opscode/omnibus-ruby)
 
-We also release our software as gems to [Rubygems](http://rubygems.org/) but we strongly
+We also release our software as gems to [Rubygems](https://rubygems.org/) but we strongly
   recommend using Chef packages since they are the only combination of native libraries &
   gems required by Chef that we test throughly.
 

data/README.md

@@ -1,10 +1,13 @@
-# Chef [![Code Climate](https://codeclimate.com/github/opscode/chef.png)](https://codeclimate.com/github/opscode/chef)
+# Chef 
+[![Code Climate](https://codeclimate.com/github/opscode/chef.png)](https://codeclimate.com/github/opscode/chef)
+[![Build Status Master](https://travis-ci.org/chef/chef.svg?branch=master)](https://travis-ci.org/chef/chef)
+[![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/chef?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/chef/branch/master)
 
-Want to try Chef? Get started with [learnchef](https://learnchef.opscode.com)
+Want to try Chef? Get started with [learnchef](https://learn.chef.io)
 
-* Documentation: [http://docs.opscode.com](http://docs.opscode.com)
-* Source: [http://github.com/opscode/chef/tree/master](http://github.com/opscode/chef/tree/master)
-* Tickets/Issues: [https://github.com/opscode/chef/issues](https://github.com/opscode/chef/issues)
+* Documentation: [http://docs.chef.io](http://docs.chef.io)
+* Source: [http://github.com/chef/chef/tree/master](http://github.com/chef/chef/tree/master)
+* Tickets/Issues: [https://github.com/chef/chef/issues](https://github.com/chef/chef/issues)
 * IRC: `#chef` and `#chef-hacking` on Freenode
 * Mailing list: [http://lists.opscode.com](http://lists.opscode.com)
 
@@ -14,15 +17,15 @@ entire infrastructure.
 This README focuses on developers who want to modify Chef source code.
 If you just want to use Chef, check out these resources:
 
-* [learnchef](https://learnchef.opscode.com): Getting started guide
-* [http://docs.opscode.com](http://docs.opscode.com): Comprehensive User Docs
-* [Installer Downloads](http://www.getchef.com/chef/install/): Install Chef as a complete package
+* [learnchef](https://learn.chef.io): Getting started guide
+* [http://docs.chef.io](http://docs.chef.io): Comprehensive User Docs
+* [Installer Downloads](https://www.chef.io/download-chef-client/): Install Chef as a complete package
 
 ## Installing From Git
 
 **NOTE:** Unless you have a specific reason to install from source (to
 try a new feature, contribute a patch, or run chef on an OS for which no
-package is available), you should head to the [installer page](http://www.getchef.com/chef/install/)
+package is available), you should head to the [installer page](https://www.chef.io/download-chef-client/)
 to get a prebuilt package.
 
 ### Prerequisites
@@ -31,7 +34,7 @@ Install these via your platform's preferred method (apt, yum, ports,
 emerge, etc.):
 
 * git
-* C compiler, header files, etc. On Ubuntu/debian, use the
+* C compiler, header files, etc. On Ubuntu/Debian, use the
   `build-essential` package.
 * ruby 2.0.0 or later
 * rubygems
@@ -42,7 +45,7 @@ emerge, etc.):
 Then get the source and install it:
 
     # Clone this repo
-    git clone https://github.com/opscode/chef.git
+    git clone https://github.com/chef/chef.git
     
     # cd into the source tree
     cd chef
@@ -61,18 +64,34 @@ Then get the source and install it:
 
 Before working on the code, if you plan to contribute your changes, you need to
 read the
-[Chef Contributions document](http://docs.opscode.com/community_contributions.html).
+[Chef Contributions document](http://docs.chef.io/community_contributions.html).
 
-You will also need to set up the repository with the appropriate branches. We
-document the process on the
-[Working with Git](http://wiki.opscode.com/display/chef/Working+with+git) page
-of the Chef wiki.
+The general development process is:
+
+1. Fork this repo and clone it to your workstation
+2. Create a feature branch for your change
+3. Write code and tests
+4. Push your feature branch to github and open a pull request against
+   master
 
 Once your repository is set up, you can start working on the code. We do use
 TDD with RSpec, so you'll need to get a development environment running.
 Follow the above procedure ("Installing from Git") to get your local
 copy of the source running.
 
+## Reporting Issues
+
+Issues can be reported by using [GitHub issues](https://github.com/chef/chef/issues).
+
+Full details on how to report issues can be found in the [CONTRIBUTING](https://github.com/chef/chef/blob/master/CONTRIBUTING.md#-chef-issue-tracking) doc.
+
+Note that this repository is primarily for reporting chef-client issues.
+For reporting issues against other Chef projects, please look up the appropriate repository
+to report issues against in the Chef docs in the
+[community contributions section](https://docs.chef.io/community_contributions.html#issues-and-bug-reports).
+If you can't detemine the appropriate place to report an issue, then please open it
+against the repository you think best fits and it will be directed to the appropriate project.
+
 ## Testing
 
 We use RSpec for unit/spec tests. It is not necessary to start the development
@@ -87,14 +106,19 @@ environment to run the specs--they are completely standalone.
     # Run a Subset of Tests
     bundle exec rspec spec/PATH/TO/DIR
 
+When you submit a pull request, we will automatically run the functional and unit
+tests in spec/functional/ and spec/unit/ respectively. These will be run on Ubuntu
+through Travis CI, and on Windows through AppVeyor. The status of these runs will
+be displayed with your pull request.
+
 # License
 
 Chef - A configuration management system
 
 |                      |                                          |
 |:---------------------|:-----------------------------------------|
-| **Author:**          | Adam Jacob (<adam@opscode.com>)
-| **Copyright:**       | Copyright (c) 2008-2014 Chef Software, Inc.
+| **Author:**          | Adam Jacob (<adam@chef.io>)
+| **Copyright:**       | Copyright (c) 2008-2015 Chef Software, Inc.
 | **License:**         | Apache License, Version 2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");

data/distro/common/html/_sources/ctl_chef_client.txt

@@ -10,7 +10,7 @@ chef-client
 
 Options
 =====================================================
-.. include:: ../../includes_ctl_chef_client/includes_ctl_chef_client_11-8_options.rst
+.. include:: ../../release_chef_12-0/includes_ctl_chef_client_options.rst
 
 Run with Elevated Privileges
 =====================================================

data/distro/common/html/_sources/ctl_chef_server.txt

@@ -1,5 +1,5 @@
 =====================================================
-chef-server-ctl
+|chef server ctl| (executable)
 =====================================================
 
 .. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server.rst
@@ -28,31 +28,25 @@ install
 =====================================================
 .. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_install.rst
 
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_install_table.rst
-
-master-recover
-=====================================================
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_master_recover.rst
-
-org-associate
-=====================================================
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_associate.rst
-
 **Syntax**
 
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_associate_syntax.rst
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_install_syntax.rst
 
-**Examples**
-
-.. code-block:: bash
-
-   $ chef-server-ctl org-associate prod john_smith
+**Options**
 
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_install_options.rst
 
-.. code-block:: bash
+Use Downloads
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_install_features_download.rst
 
-   $ chef-server-ctl org-associate preprod testmaster
+Use Local Packages
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_install_features_manual.rst
 
+master-recover
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_master_recover.rst
 
 org-create
 =====================================================
@@ -82,7 +76,6 @@ org-create
 
    $ chef-server-ctl org-create dev Development -f /tmp/id-dev.key
 
-
 org-delete
 =====================================================
 .. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_delete.rst
@@ -102,46 +95,71 @@ org-delete
       
    $ chef-server-ctl org-delete pedant-testing-org
 
+org-list
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_list.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_list_syntax.rst
 
-org-disassociate
+**Options**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_list_options.rst
+
+org-show
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_show.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_show_syntax.rst
+
+org-user-add
 =====================================================
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_disassociate.rst
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_user_add.rst
 
 **Syntax**
 
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_disassociate_syntax.rst
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_user_add_syntax.rst
+
+**Options**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_user_add_options.rst
 
 **Examples**
 
 .. code-block:: bash
 
-   $ chef-server-ctl org-disassociate prod john_smith
+   $ chef-server-ctl org-user-add prod john_smith
+
+.. code-block:: bash
 
+   $ chef-server-ctl org-user-add preprod testmaster
 
 .. code-block:: bash
 
-      $ chef-server-ctl org-disassociate prod testmaster
+   $ chef-server-ctl org-user-add dev grantmc --admin
 
 
-org-list
+org-user-remove
 =====================================================
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_list.rst
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_user_remove.rst
 
 **Syntax**
 
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_list_syntax.rst
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_user_remove_syntax.rst
 
-**Options**
+**Examples**
 
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_list_options.rst
+.. code-block:: bash
 
-org-show
-=====================================================
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_show.rst
+   $ chef-server-ctl org-user-remove prod john_smith
 
-**Syntax**
+.. code-block:: bash
+
+   $ chef-server-ctl org-user-remove prod testmaster
 
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_show_syntax.rst
 
 password
 =====================================================

data/distro/common/html/_sources/ctl_chef_solo.txt

@@ -8,7 +8,7 @@ chef-solo
 
 Options
 =====================================================
-.. include:: ../../includes_ctl_chef_solo/includes_ctl_chef_solo_options.rst
+.. include:: ../../release_chef_12-0/includes_ctl_chef_solo_options.rst
 
 Examples
 =====================================================

data/distro/common/html/_sources/knife_bootstrap.txt

@@ -16,7 +16,7 @@ Options
 =====================================================
 .. note:: Review the list of :doc:`common options </knife_common_options>` available to this (and all) |knife| subcommands and plugins.
 
-.. include:: ../../includes_knife/includes_knife_bootstrap_options.rst
+.. include:: ../../release_chef_12-0/includes_knife_bootstrap_options.rst
 
 Custom Templates
 =====================================================

data/distro/common/html/_sources/knife_cookbook_site.txt

@@ -98,7 +98,7 @@ Syntax
 
 Options
 -----------------------------------------------------
-.. include:: ../../includes_knife/includes_knife_site_cookbook_share_options.rst
+.. include:: ../../release_chef_12-0/includes_knife_site_cookbook_share_options.rst
 
 Examples
 -----------------------------------------------------

data/distro/common/html/_sources/knife_data_bag.txt

@@ -20,7 +20,7 @@ Syntax
 
 Options
 -----------------------------------------------------
-.. include:: ../../includes_knife/includes_knife_data_bag_create_options.rst
+.. include:: ../../release_chef_12-0/includes_knife_data_bag_create_options.rst
 
 Examples
 -----------------------------------------------------
@@ -64,7 +64,7 @@ Syntax
 
 Options
 -----------------------------------------------------
-.. include:: ../../includes_knife/includes_knife_data_bag_edit_options.rst
+.. include:: ../../release_chef_12-0/includes_knife_data_bag_edit_options.rst
 
 Examples
 -----------------------------------------------------
@@ -88,7 +88,7 @@ Syntax
 
 Options
 -----------------------------------------------------
-.. include:: ../../includes_knife/includes_knife_data_bag_from_file_options.rst
+.. include:: ../../release_chef_12-0/includes_knife_data_bag_from_file_options.rst
 
 Examples
 -----------------------------------------------------
@@ -133,7 +133,7 @@ Syntax
 
 Options
 -----------------------------------------------------
-.. include:: ../../includes_knife/includes_knife_data_bag_show_options.rst
+.. include:: ../../release_chef_12-0/includes_knife_data_bag_show_options.rst
 
 Examples
 -----------------------------------------------------

data/distro/common/html/_sources/knife_status.txt

@@ -12,7 +12,7 @@ Options
 =====================================================
 .. note:: Review the list of :doc:`common options </knife_common_options>` available to this (and all) |knife| subcommands and plugins.
 
-.. include:: ../../includes_knife/includes_knife_status_options.rst
+.. include:: ../../release_chef_12-0/includes_knife_status_options.rst
 
 Examples
 =====================================================

data/distro/common/html/_static/searchtools.js

@@ -594,7 +594,7 @@ var Search = {
    * helper function to return a node containing the
    * search summary for a given text. keywords is a list
    * of stemmed words, hlwords is the list of normal, unstemmed
-   * words. the first one is used to find the occurance, the
+   * words. the first one is used to find the occurrence, the
    * latter for highlighting it.
    */
   makeSearchSummary : function(text, keywords, hlwords) {

data/distro/common/html/ctl_chef_client.html

@@ -71,10 +71,8 @@
 <dl class="docutils">
 <dt><tt class="docutils literal"><span class="pre">-A</span></tt>, <tt class="docutils literal"><span class="pre">--fatal-windows-admin-check</span></tt></dt>
 <dd>Use to cause a chef-client run to fail when the chef-client does not have administrator privileges in Microsoft Windows.</dd>
-<dt><tt class="docutils literal"><span class="pre">-c</span> <span class="pre">CONFIG</span></tt>, <tt class="docutils literal"><span class="pre">--config</span> <span class="pre">CONFIG</span></tt></dt>
-<dd>The configuration file to use.</dd>
 <dt><tt class="docutils literal"><span class="pre">--chef-zero-port</span> <span class="pre">PORT</span></tt></dt>
-<dd>The port on which chef-zero will listen.</dd>
+<dd>The port on which chef-zero will listen. If a port is not specified&#8212;individually, as range of ports, or from the <tt class="docutils literal"><span class="pre">chef_zero.port</span></tt> setting in the client.rb file&#8212;the chef-client will scan for ports between 8889-9999 and will pick the first port that is available.</dd>
 <dt><tt class="docutils literal"><span class="pre">-F</span> <span class="pre">FORMAT</span></tt>, <tt class="docutils literal"><span class="pre">--format</span> <span class="pre">FORMAT</span></tt></dt>
 <dd><p class="first">The output format: <tt class="docutils literal"><span class="pre">doc</span></tt> (default) or <tt class="docutils literal"><span class="pre">min</span></tt>.</p>
 <p>Use <tt class="docutils literal"><span class="pre">doc</span></tt> to print the progress of the chef-client run using full strings that display a summary of updates as they occur.</p>
@@ -90,9 +88,53 @@
 <dt><tt class="docutils literal"><span class="pre">-h</span></tt>, <tt class="docutils literal"><span class="pre">--help</span></tt></dt>
 <dd>Shows help for the command.</dd>
 <dt><tt class="docutils literal"><span class="pre">-i</span> <span class="pre">SECONDS</span></tt>, <tt class="docutils literal"><span class="pre">--interval</span> <span class="pre">SECONDS</span></tt></dt>
-<dd>The frequency (in seconds) at which the chef-client runs. Default value: <tt class="docutils literal"><span class="pre">1800</span></tt>.</dd>
+<dd>The frequency (in seconds) at which the chef-client runs. When the chef-client is run at intervals, <tt class="docutils literal"><span class="pre">--splay</span></tt> and <tt class="docutils literal"><span class="pre">--interval</span></tt> values are applied before the chef-client run. Default value: <tt class="docutils literal"><span class="pre">1800</span></tt>.</dd>
 <dt><tt class="docutils literal"><span class="pre">-j</span> <span class="pre">PATH</span></tt>, <tt class="docutils literal"><span class="pre">--json-attributes</span> <span class="pre">PATH</span></tt></dt>
-<dd>The path to a file that contains JSON data.</dd>
+<dd><p class="first">The path to a file that contains JSON data.</p>
+<p>Use this option to define a <tt class="docutils literal"><span class="pre">run_list</span></tt> object. For example, a JSON file similar to:</p>
+<div class="highlight-javascript"><div class="highlight"><pre><span class="s2">&quot;run_list&quot;</span><span class="o">:</span> <span class="p">[</span>
+  <span class="s2">&quot;recipe[base]&quot;</span><span class="p">,</span>
+  <span class="s2">&quot;recipe[foo]&quot;</span><span class="p">,</span>
+  <span class="s2">&quot;recipe[bar]&quot;</span><span class="p">,</span>
+  <span class="s2">&quot;role[webserver]&quot;</span>
+<span class="p">],</span>
+</pre></div>
+</div>
+<p>may be used by running <tt class="docutils literal"><span class="pre">chef-client</span> <span class="pre">-j</span> <span class="pre">path/to/file.json</span></tt>.</p>
+<p>In certain situations this option may be used to update <tt class="docutils literal"><span class="pre">normal</span></tt> attributes.</p>
+<div class="last admonition warning">
+<p class="first admonition-title">Warning</p>
+<p>Any other attribute type that is contained in this JSON file will be treated as a <tt class="docutils literal"><span class="pre">normal</span></tt> attribute. For example, attempting to update <tt class="docutils literal"><span class="pre">override</span></tt> attributes using the <tt class="docutils literal"><span class="pre">-j</span></tt> option:</p>
+<div class="highlight-javascript"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s2">&quot;name&quot;</span><span class="o">:</span> <span class="s2">&quot;dev-99&quot;</span><span class="p">,</span>
+  <span class="s2">&quot;description&quot;</span><span class="o">:</span> <span class="s2">&quot;Install some stuff&quot;</span><span class="p">,</span>
+  <span class="s2">&quot;override_attributes&quot;</span><span class="o">:</span> <span class="p">{</span>
+    <span class="s2">&quot;apptastic&quot;</span><span class="o">:</span> <span class="p">{</span>
+      <span class="s2">&quot;enable_apptastic&quot;</span><span class="o">:</span> <span class="s2">&quot;false&quot;</span><span class="p">,</span>
+      <span class="s2">&quot;apptastic_tier_name&quot;</span><span class="o">:</span> <span class="s2">&quot;dev-99.bomb.com&quot;</span>
+    <span class="p">}</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+<p>will result in a node object similar to:</p>
+<div class="last highlight-javascript"><div class="highlight"><pre><span class="p">{</span>
+  <span class="s2">&quot;name&quot;</span><span class="o">:</span> <span class="s2">&quot;maybe-dev-99&quot;</span><span class="p">,</span>
+  <span class="s2">&quot;normal&quot;</span><span class="o">:</span> <span class="p">{</span>
+  <span class="s2">&quot;name&quot;</span><span class="o">:</span> <span class="s2">&quot;dev-99&quot;</span><span class="p">,</span>
+    <span class="s2">&quot;description&quot;</span><span class="o">:</span> <span class="s2">&quot;Install some stuff&quot;</span><span class="p">,</span>
+    <span class="s2">&quot;override_attributes&quot;</span><span class="o">:</span> <span class="p">{</span>
+      <span class="s2">&quot;apptastic&quot;</span><span class="o">:</span> <span class="p">{</span>
+        <span class="s2">&quot;enable_apptastic&quot;</span><span class="o">:</span> <span class="s2">&quot;false&quot;</span><span class="p">,</span>
+        <span class="s2">&quot;apptastic_tier_name&quot;</span><span class="o">:</span> <span class="s2">&quot;dev-99.bomb.com&quot;</span>
+      <span class="p">}</span>
+    <span class="p">}</span>
+  <span class="p">}</span>
+<span class="p">}</span>
+</pre></div>
+</div>
+</div>
+</dd>
 <dt><tt class="docutils literal"><span class="pre">-k</span> <span class="pre">KEY_FILE</span></tt>, <tt class="docutils literal"><span class="pre">--client_key</span> <span class="pre">KEY_FILE</span></tt></dt>
 <dd>The location of the file which contains the client key. Default value: <tt class="docutils literal"><span class="pre">/etc/chef/client.pem</span></tt>.</dd>
 <dt><tt class="docutils literal"><span class="pre">-K</span> <span class="pre">KEY_FILE</span></tt>, <tt class="docutils literal"><span class="pre">--validation_key</span> <span class="pre">KEY_FILE</span></tt></dt>
@@ -106,15 +148,21 @@
 <dt><tt class="docutils literal"><span class="pre">-N</span> <span class="pre">NODE_NAME</span></tt>, <tt class="docutils literal"><span class="pre">--node-name</span> <span class="pre">NODE_NAME</span></tt></dt>
 <dd>The name of the node.</dd>
 <dt><tt class="docutils literal"><span class="pre">-o</span> <span class="pre">RUN_LIST_ITEM</span></tt>, <tt class="docutils literal"><span class="pre">--override-runlist</span> <span class="pre">RUN_LIST_ITEM</span></tt></dt>
-<dd>Replace the current run list with the specified items.</dd>
+<dd>Replace the current run list with the specified items. This option will not clear the list of cookbooks (and related files) that is cached on the node.</dd>
 <dt><tt class="docutils literal"><span class="pre">--once</span></tt></dt>
 <dd>Use to run the chef-client only once and to cancel <tt class="docutils literal"><span class="pre">interval</span></tt> and <tt class="docutils literal"><span class="pre">splay</span></tt> options.</dd>
 <dt><tt class="docutils literal"><span class="pre">-P</span> <span class="pre">PID_FILE</span></tt>, <tt class="docutils literal"><span class="pre">--pid</span> <span class="pre">PID_FILE</span></tt></dt>
 <dd>The location in which a process identification number (pid) is saved. An executable, when started as a daemon, will write the pid to the specified file. Default value: <tt class="docutils literal"><span class="pre">/tmp/name-of-executable.pid</span></tt>.</dd>
+<dt><tt class="docutils literal"><span class="pre">-r</span> <span class="pre">RUN_LIST_ITEM</span></tt>, <tt class="docutils literal"><span class="pre">--runlist</span> <span class="pre">RUN_LIST_ITEM</span></tt></dt>
+<dd>Use to permanently replace the current run-list with the specified run-list items.</dd>
 <dt><tt class="docutils literal"><span class="pre">-R</span></tt>, <tt class="docutils literal"><span class="pre">--enable-reporting</span></tt></dt>
 <dd>Use to enable Chef reporting, which performs data collection during a chef-client run.</dd>
+<dt><tt class="docutils literal"><span class="pre">RECIPE_FILE</span></tt></dt>
+<dd>The path to a recipe. For example, if a recipe file is in the current directory, use <tt class="docutils literal"><span class="pre">recipe_file.rb</span></tt>. This is typically used with the <tt class="docutils literal"><span class="pre">--local-mode</span></tt> option.</dd>
+<dt><tt class="docutils literal"><span class="pre">--run-lock-timeout</span> <span class="pre">SECONDS</span></tt></dt>
+<dd>The amount of time (in seconds) to wait for a chef-client run to finish. Default value: not set (indefinite). Set to <tt class="docutils literal"><span class="pre">0</span></tt> to cause a second chef-client to exit immediately.</dd>
 <dt><tt class="docutils literal"><span class="pre">-s</span> <span class="pre">SECONDS</span></tt>, <tt class="docutils literal"><span class="pre">--splay</span> <span class="pre">SECONDS</span></tt></dt>
-<dd>A number (in seconds) to add to the <tt class="docutils literal"><span class="pre">interval</span></tt> that is used to determine the frequency of chef-client runs. This number can help prevent server load when there are many clients running at the same time.</dd>
+<dd>A number (in seconds) to add to the <tt class="docutils literal"><span class="pre">interval</span></tt> that is used to determine the frequency of chef-client runs. This number can help prevent server load when there are many clients running at the same time. When the chef-client is run at intervals, <tt class="docutils literal"><span class="pre">--splay</span></tt> and <tt class="docutils literal"><span class="pre">--interval</span></tt> values are applied before the chef-client run.</dd>
 <dt><tt class="docutils literal"><span class="pre">-S</span> <span class="pre">CHEF_SERVER_URL</span></tt>, <tt class="docutils literal"><span class="pre">--server</span> <span class="pre">CHEF_SERVER_URL</span></tt></dt>
 <dd>The URL for the Chef server.</dd>
 <dt><tt class="docutils literal"><span class="pre">-u</span> <span class="pre">USER</span></tt>, <tt class="docutils literal"><span class="pre">--user</span> <span class="pre">USER</span></tt></dt>