add updated html files for knife and chef- man pages

28 files changed, 237 insertions, 311 deletions

diff --git a/distro/common/html/_sources/ctl_chef_client.txt b/distro/common/html/_sources/ctl_chef_client.txt
new file mode 100644
index 0000000000..99b0037154
--- /dev/null
+++ b/distro/common/html/_sources/ctl_chef_client.txt
@@ -0,0 +1,36 @@
+=====================================================
+chef-client
+=====================================================
+
+.. include:: ../../includes_chef_client/includes_chef_client.rst
+
+.. include:: ../../includes_ctl_chef_client/includes_ctl_chef_client.rst
+
+.. note:: .. include:: ../../includes_config/includes_config_rb_client.rst
+
+Options
+=====================================================
+.. include:: ../../includes_ctl_chef_client/includes_ctl_chef_client_11-8_options.rst
+
+Run with Elevated Privileges
+=====================================================
+.. include:: ../../includes_ctl_chef_client/includes_ctl_chef_client_elevated_privileges.rst
+
+Linux
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_client/includes_ctl_chef_client_elevated_privileges_linux.rst
+
+Windows
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_client/includes_ctl_chef_client_elevated_privileges_windows.rst
+
+Examples
+=====================================================
+
+**Start a Chef run when the chef-client is running as a daemon**
+
+.. include:: ../../step_ctl_chef_client/step_ctl_chef_client_start_chef_run_daemon.rst
+
+**Start a Chef run manually**
+
+.. include:: ../../step_ctl_chef_client/step_ctl_chef_client_start_chef_run_manual.rst
\ No newline at end of file
diff --git a/distro/common/html/_sources/ctl_chef_server.txt b/distro/common/html/_sources/ctl_chef_server.txt
new file mode 100644
index 0000000000..9c38c30ef6
--- /dev/null
+++ b/distro/common/html/_sources/ctl_chef_server.txt
@@ -0,0 +1,26 @@
+=====================================================
+chef-server-ctl
+=====================================================
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server.rst
+
+Options
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_options.rst
+
+
+Examples
+=====================================================
+The following examples show how to use |chef server ctl| to manage services.
+
+**View the status of a service**
+
+.. include:: ../../step_ctl_chef_server/step_ctl_chef_server_view_service_status.rst
+
+**Restart a service**
+
+.. include:: ../../step_ctl_chef_server/step_ctl_chef_server_restart_service.rst
+
+**Restart all services**
+
+.. include:: ../../step_ctl_chef_server/step_ctl_chef_server_restart_all_services.rst
diff --git a/distro/common/html/_sources/ctl_chef_shell.txt b/distro/common/html/_sources/ctl_chef_shell.txt
new file mode 100644
index 0000000000..75902f3141
--- /dev/null
+++ b/distro/common/html/_sources/ctl_chef_shell.txt
@@ -0,0 +1,15 @@
+=====================================================
+chef-shell
+=====================================================
+
+.. include:: ../../includes_chef_shell/includes_chef_shell.rst
+
+.. include:: ../../includes_ctl_chef_shell/includes_ctl_chef_shell.rst
+
+Modes
+=====================================================
+.. include:: ../../includes_chef_shell/includes_chef_shell_modes.rst
+
+Options
+=====================================================
+.. include:: ../../includes_ctl_chef_shell/includes_ctl_chef_shell_options.rst
diff --git a/distro/common/html/_sources/ctl_chef_solo.txt b/distro/common/html/_sources/ctl_chef_solo.txt
new file mode 100644
index 0000000000..a80c8bad3c
--- /dev/null
+++ b/distro/common/html/_sources/ctl_chef_solo.txt
@@ -0,0 +1,25 @@
+=====================================================
+chef-solo
+=====================================================
+
+.. include:: ../../includes_chef_solo/includes_chef_solo.rst
+
+.. include:: ../../includes_ctl_chef_solo/includes_ctl_chef_solo.rst
+
+Options
+=====================================================
+.. include:: ../../includes_ctl_chef_solo/includes_ctl_chef_solo_options.rst
+
+Examples
+=====================================================
+**Use a URL**
+
+.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_url.rst
+
+**Use a directory**
+
+.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_directory.rst
+
+**Use a URL for cookbook and JSON data**
+
+.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_url_for_cookbook_and_json.rst
diff --git a/distro/common/html/_sources/index.txt b/distro/common/html/_sources/index.txt
new file mode 100644
index 0000000000..1600827541
--- /dev/null
+++ b/distro/common/html/_sources/index.txt
@@ -0,0 +1,126 @@
+=====================================================
+|chef client| Man Pages
+=====================================================
+
+The following command line interfaces are available in the |chef client|:
+
+* :doc:`ctl_chef_client`
+* :doc:`ctl_chef_server`
+* :doc:`ctl_chef_shell`
+* :doc:`ctl_chef_solo`
+* :doc:`knife`
+
+knife
+=====================================================
+.. include:: ../../includes_knife/includes_knife.rst
+
+The following sections describe functionality common to all |knife| subcommands:
+
+* :doc:`knife_using`
+* :doc:`knife_common_options`
+
+|knife| includes the following sub-commands: 
+
+.. list-table::
+   :widths: 150 450
+   :header-rows: 1
+
+   * - Sub-command
+     - Description
+   * - :doc:`knife_bootstrap`
+     - .. include:: ../../includes_knife/includes_knife_bootstrap.rst
+   * - :doc:`knife_client`
+     - .. include:: ../../includes_knife/includes_knife_client.rst
+   * - :doc:`knife_configure`
+     - .. include:: ../../includes_knife/includes_knife_configure.rst
+   * - :doc:`knife_cookbook`
+     - .. include:: ../../includes_knife/includes_knife_cookbook.rst
+   * - :doc:`knife_cookbook_site`
+     - .. include:: ../../includes_knife/includes_knife_site_cookbook.rst
+   * - :doc:`knife_data_bag`
+     - .. include:: ../../includes_knife/includes_knife_data_bag.rst
+   * - :doc:`knife_delete`
+     - .. include:: ../../includes_knife/includes_knife_delete.rst
+   * - :doc:`knife_deps`
+     - .. include:: ../../includes_knife/includes_knife_deps.rst
+   * - :doc:`knife_diff`
+     - .. include:: ../../includes_knife/includes_knife_diff.rst
+   * - :doc:`knife_download`
+     - .. include:: ../../includes_knife/includes_knife_download.rst
+   * - :doc:`knife_edit`
+     - .. include:: ../../includes_knife/includes_knife_edit.rst
+   * - :doc:`knife_environment`
+     - .. include:: ../../includes_knife/includes_knife_environment.rst
+   * - :doc:`knife_exec`
+     - .. include:: ../../includes_knife/includes_knife_exec.rst
+   * - :doc:`knife_index_rebuild`
+     - .. include:: ../../includes_knife/includes_knife_index_rebuild.rst
+   * - :doc:`knife_list`
+     - .. include:: ../../includes_knife/includes_knife_list.rst
+   * - :doc:`knife_node`
+     - .. include:: ../../includes_knife/includes_knife_node.rst
+   * - :doc:`knife_raw`
+     - .. include:: ../../includes_knife/includes_knife_raw.rst
+   * - :doc:`knife_recipe_list`
+     - .. include:: ../../includes_knife/includes_knife_recipe_list.rst
+   * - :doc:`knife_role`
+     - .. include:: ../../includes_knife/includes_knife_role.rst
+   * - :doc:`knife_search`
+     - .. include:: ../../includes_knife/includes_knife_search.rst
+   * - :doc:`knife_show`
+     - .. include:: ../../includes_knife/includes_knife_show.rst
+   * - :doc:`knife_ssh`
+     - .. include:: ../../includes_knife/includes_knife_ssh.rst
+   * - :doc:`knife_status`
+     - .. include:: ../../includes_knife/includes_knife_status.rst
+   * - :doc:`knife_tag`
+     - .. include:: ../../includes_knife/includes_knife_tag.rst
+   * - :doc:`knife_upload`
+     - .. include:: ../../includes_knife/includes_knife_upload.rst
+   * - :doc:`knife_user`
+     - .. include:: ../../includes_knife/includes_knife_user.rst
+   * - :doc:`knife_xargs`
+     - .. include:: ../../includes_knife/includes_knife_xargs.rst
+
+
+.. Hide the TOC from this file.
+
+.. toctree::
+   :hidden:
+
+   ctl_chef_client
+   ctl_chef_server
+   ctl_chef_shell
+   ctl_chef_solo
+   knife
+   knife_common_options
+   knife_bootstrap
+   knife_client
+   knife_configure
+   knife_cookbook
+   knife_cookbook_site
+   knife_data_bag
+   knife_delete
+   knife_deps
+   knife_diff
+   knife_download
+   knife_edit
+   knife_environment
+   knife_exec
+   knife_index_rebuild
+   knife_list
+   knife_node
+   knife_raw
+   knife_recipe_list
+   knife_role
+   knife_search
+   knife_show
+   knife_ssh
+   knife_status
+   knife_tag
+   knife_upload
+   knife_user
+   knife_using
+   knife_xargs
+
+
diff --git a/distro/common/html/_sources/knife.txt b/distro/common/html/_sources/knife.txt
index 22b6c2b1dd..6320825e83 100644
--- a/distro/common/html/_sources/knife.txt
+++ b/distro/common/html/_sources/knife.txt
@@ -1,19 +1,13 @@
 =====================================================
-About Knife
+knife
 =====================================================
 
 .. include:: ../../includes_knife/includes_knife.rst
 
-.. list-table::
-   :widths: 150 450
-   :header-rows: 1
+The following sections describe functionality common to all |knife| subcommands:
 
-   * - Topic
-     - Description
-   * - :doc:`knife_using`
-     - |knife| runs from a management workstation and sits in-between a |chef server| and an organization’s infrastructure.
-   * - :doc:`knife_common_options`
-     - There are many options that are available for all |knife| sub-commands.
+* :doc:`knife_using`
+* :doc:`knife_common_options`
 
 |knife| includes the following sub-commands: 
 
@@ -78,41 +72,3 @@ About Knife
    * - :doc:`knife_xargs`
      - .. include:: ../../includes_knife/includes_knife_xargs.rst
 
-
-.. Hide the TOC from this file.
-
-.. toctree::
-   :hidden:
-
-   knife
-   knife_common_options
-   knife_bootstrap
-   knife_client
-   knife_configure
-   knife_cookbook
-   knife_cookbook_site
-   knife_data_bag
-   knife_delete
-   knife_deps
-   knife_diff
-   knife_download
-   knife_edit
-   knife_environment
-   knife_exec
-   knife_index_rebuild
-   knife_list
-   knife_node
-   knife_raw
-   knife_recipe_list
-   knife_role
-   knife_search
-   knife_show
-   knife_ssh
-   knife_status
-   knife_tag
-   knife_upload
-   knife_user
-   knife_using
-   knife_xargs
-
-
diff --git a/distro/common/html/_sources/knife_bootstrap.txt b/distro/common/html/_sources/knife_bootstrap.txt
index 04924a35a7..ee275b58f5 100644
--- a/distro/common/html/_sources/knife_bootstrap.txt
+++ b/distro/common/html/_sources/knife_bootstrap.txt
@@ -18,12 +18,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_bootstrap_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_bootstrap_settings.rst
-
 Custom Templates
 =====================================================
 The ``chef-full`` distribution uses the |omnibus installer|. For most bootstrap operations, regardless of the platform on which the target node is running, using the ``chef-full`` distribution is the best approach for installing the |chef client| on a target node. In some situations, using another supported distribution is necessary. And in some situations, a custom template may be required. For example, the default bootstrap operation relies on an Internet connection to get the distribution to the target node. If a target node cannot access the Internet, then a custom template can be used to define a specific location for the distribution so that the target node may access it during the bootstrap operation.
diff --git a/distro/common/html/_sources/knife_client.txt b/distro/common/html/_sources/knife_client.txt
index c7f24d86eb..d9d6ba62a1 100644
--- a/distro/common/html/_sources/knife_client.txt
+++ b/distro/common/html/_sources/knife_client.txt
@@ -34,12 +34,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_client_create_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_client_create_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -68,7 +62,7 @@ Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
 
-**xxxxx**
+**Delete a client**
 
 .. include:: ../../step_knife/step_knife_client_delete.rst
 
@@ -88,7 +82,7 @@ Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
 
-**xxxxx**
+**Edit a client**
 
 .. include:: ../../step_knife/step_knife_client_edit.rst
 
@@ -108,7 +102,7 @@ Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
 
-**xxxxx**
+**View a list of clients**
 
 .. include:: ../../step_knife/step_knife_client_list_all.rst
 
@@ -126,17 +120,11 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_client_reregister_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_client_reregister_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
 
-**xxxxx**
+**Reregister clients**
 
 .. include:: ../../step_knife/step_knife_client_reregister.rst
 
@@ -156,7 +144,7 @@ Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
 
-**xxxxx**
+**Show clients**
 
 .. include:: ../../step_knife/step_knife_client_show.rst
 
diff --git a/distro/common/html/_sources/knife_configure.txt b/distro/common/html/_sources/knife_configure.txt
index e21ac23af6..1e0485e7fa 100644
--- a/distro/common/html/_sources/knife_configure.txt
+++ b/distro/common/html/_sources/knife_configure.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_configure_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_configure_settings.rst
-
 Examples
 =====================================================
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_cookbook.txt b/distro/common/html/_sources/knife_cookbook.txt
index b5ef252173..462e4dd76c 100644
--- a/distro/common/html/_sources/knife_cookbook.txt
+++ b/distro/common/html/_sources/knife_cookbook.txt
@@ -20,12 +20,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_cookbook_bulk_delete_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_cookbook_bulk_delete_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -47,12 +41,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_cookbook_create_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_cookbook_create_settings.rst
-
 Examples 
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -74,12 +62,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_cookbook_delete_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_cookbook_delete_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -101,12 +83,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_cookbook_download_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_cookbook_download_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -128,12 +104,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_cookbook_list_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_cookbook_list_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -155,12 +125,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_cookbook_metadata_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_cookbook_metadata_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -203,12 +167,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_cookbook_show_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_cookbook_show_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -242,12 +200,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_cookbook_test_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_cookbook_test_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -269,12 +221,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_cookbook_upload_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_cookbook_upload_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_cookbook_site.txt b/distro/common/html/_sources/knife_cookbook_site.txt
index 90766652d0..92fadaa819 100644
--- a/distro/common/html/_sources/knife_cookbook_site.txt
+++ b/distro/common/html/_sources/knife_cookbook_site.txt
@@ -20,12 +20,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_site_cookbook_download_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_site_cookbook_download_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -46,12 +40,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_site_cookbook_install_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_site_cookbook_install_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -112,12 +100,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_site_cookbook_share_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_site_cookbook_share.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_data_bag.txt b/distro/common/html/_sources/knife_data_bag.txt
index 91309a53b7..32888e6f8b 100644
--- a/distro/common/html/_sources/knife_data_bag.txt
+++ b/distro/common/html/_sources/knife_data_bag.txt
@@ -22,12 +22,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_data_bag_create_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_data_bag_create_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -72,12 +66,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_data_bag_edit_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_data_bag_edit_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -102,12 +90,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_data_bag_from_file_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_data_bag_from_file_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -153,12 +135,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_data_bag_show_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_data_bag_show_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_delete.txt b/distro/common/html/_sources/knife_delete.txt
index d290bcbde0..55e239792a 100644
--- a/distro/common/html/_sources/knife_delete.txt
+++ b/distro/common/html/_sources/knife_delete.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_delete_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_delete_settings.rst
-
 Examples
 =====================================================
 None.
diff --git a/distro/common/html/_sources/knife_deps.txt b/distro/common/html/_sources/knife_deps.txt
index ea50d649f0..b9c7da5e9d 100644
--- a/distro/common/html/_sources/knife_deps.txt
+++ b/distro/common/html/_sources/knife_deps.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_deps_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_deps_settings.rst
-
 Examples
 =====================================================
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_diff.txt b/distro/common/html/_sources/knife_diff.txt
index 3c2fd15a1c..de467b3887 100644
--- a/distro/common/html/_sources/knife_diff.txt
+++ b/distro/common/html/_sources/knife_diff.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_diff_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_diff_settings.rst
-
 Examples
 =====================================================
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_download.txt b/distro/common/html/_sources/knife_download.txt
index 399ebe5edc..d2497b7d3a 100644
--- a/distro/common/html/_sources/knife_download.txt
+++ b/distro/common/html/_sources/knife_download.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_download_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_download_settings.rst
-
 Examples
 =====================================================
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_edit.txt b/distro/common/html/_sources/knife_edit.txt
index 30e636cb21..d9e44f44bc 100644
--- a/distro/common/html/_sources/knife_edit.txt
+++ b/distro/common/html/_sources/knife_edit.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_edit_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_edit_settings.rst
-
 Examples
 =====================================================
 None.
diff --git a/distro/common/html/_sources/knife_environment.txt b/distro/common/html/_sources/knife_environment.txt
index 8d71a41872..a16e102ea0 100644
--- a/distro/common/html/_sources/knife_environment.txt
+++ b/distro/common/html/_sources/knife_environment.txt
@@ -40,12 +40,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_environment_create_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_environment_create_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -109,12 +103,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_environment_from_file_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_environment_from_file_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_exec.txt b/distro/common/html/_sources/knife_exec.txt
index fb73f7448d..85e7d9f628 100644
--- a/distro/common/html/_sources/knife_exec.txt
+++ b/distro/common/html/_sources/knife_exec.txt
@@ -22,12 +22,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_exec_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_exec_settings.rst
-
 Examples
 =====================================================
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_list.txt b/distro/common/html/_sources/knife_list.txt
index 5e1879f2b1..bad0be1e09 100644
--- a/distro/common/html/_sources/knife_list.txt
+++ b/distro/common/html/_sources/knife_list.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_list_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_list_settings.rst
-
 Examples
 =====================================================
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_node.txt b/distro/common/html/_sources/knife_node.txt
index 0f8268632e..165db5079f 100644
--- a/distro/common/html/_sources/knife_node.txt
+++ b/distro/common/html/_sources/knife_node.txt
@@ -105,12 +105,6 @@ Options
 -----------------------------------------------------
 |no_options|
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_node_from_file_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -132,12 +126,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_node_list_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_node_list_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -163,12 +151,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_node_run_list_add_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_node_run_list_add_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -206,12 +188,6 @@ Options
 -----------------------------------------------------
 |no_options|
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_node_run_list_remove_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_raw.txt b/distro/common/html/_sources/knife_raw.txt
index 34a988c035..3a27c0456a 100644
--- a/distro/common/html/_sources/knife_raw.txt
+++ b/distro/common/html/_sources/knife_raw.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_raw_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_raw_settings.rst
-
 Examples
 =====================================================
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_role.txt b/distro/common/html/_sources/knife_role.txt
index fa78339e75..edd218ddc6 100644
--- a/distro/common/html/_sources/knife_role.txt
+++ b/distro/common/html/_sources/knife_role.txt
@@ -42,12 +42,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_role_create_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_role_create_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -108,12 +102,6 @@ Options
 -----------------------------------------------------
 |no_options|
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_role_from_file_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -154,12 +142,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_role_show_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_role_show_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_ssh.txt b/distro/common/html/_sources/knife_ssh.txt
index b2d5d84a37..bc7f4e5977 100644
--- a/distro/common/html/_sources/knife_ssh.txt
+++ b/distro/common/html/_sources/knife_ssh.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_ssh_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_ssh_settings.rst
-
 Examples
 =====================================================
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_status.txt b/distro/common/html/_sources/knife_status.txt
index 6c54946247..194b985f67 100644
--- a/distro/common/html/_sources/knife_status.txt
+++ b/distro/common/html/_sources/knife_status.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_status_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_status_settings.rst
-
 Examples
 =====================================================
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_upload.txt b/distro/common/html/_sources/knife_upload.txt
index 36c29233ba..bd37725108 100644
--- a/distro/common/html/_sources/knife_upload.txt
+++ b/distro/common/html/_sources/knife_upload.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_upload_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_upload_settings.rst
-
 Examples
 =====================================================
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_user.txt b/distro/common/html/_sources/knife_user.txt
index ea1b055056..1642d30f7b 100644
--- a/distro/common/html/_sources/knife_user.txt
+++ b/distro/common/html/_sources/knife_user.txt
@@ -20,12 +20,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_user_create_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_user_create_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
@@ -99,12 +93,6 @@ Options
 -----------------------------------------------------
 .. include:: ../../includes_knife/includes_knife_user_reregister_options.rst
 
-knife.rb Settings
-+++++++++++++++++++++++++++++++++++++++++++++++++++++
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_user_reregister_settings.rst
-
 Examples
 -----------------------------------------------------
 The following examples show how to use this |knife| subcommand:
diff --git a/distro/common/html/_sources/knife_xargs.txt b/distro/common/html/_sources/knife_xargs.txt
index 73914bf03a..852ba282aa 100644
--- a/distro/common/html/_sources/knife_xargs.txt
+++ b/distro/common/html/_sources/knife_xargs.txt
@@ -14,12 +14,6 @@ Options
 
 .. include:: ../../includes_knife/includes_knife_xargs_options.rst
 
-knife.rb Settings
------------------------------------------------------
-.. note:: See :doc:`knife.rb </config_rb_knife>` for more information about how to add optional settings to the |knife rb| file.
-
-.. include:: ../../includes_knife/includes_knife_xargs_settings.rst
-
 Examples
 =====================================================
 The following examples show how to use this |knife| subcommand: