Merged change 4d28096e-95ff-425f-a57f-0bda608d1697

Delivery Server · Delivery Server · commit bd09817d2fbe · 2016-02-02T06:36:23.000Z
From review branch _reviews/master/jscott/edits01346g/1 into master

Signed-off-by: jscott &lt;jamescott@getchef.com&gt;
diff --git a/chef_master/source/chef_vault.rst b/chef_master/source/chef_vault.rst
@@ -4,6 +4,10 @@
 
 .. include:: ../../includes_chef_vault/includes_chef_vault.rst
 
+Options for knife bootstrap
+=====================================================
+.. include:: ../../includes_chef_vault/includes_chef_vault_knife_bootstrap_options.rst
+
 For more information ...
 =====================================================
 For more information about |chef vault|:
diff --git a/chef_master/source/knife_bootstrap.rst b/chef_master/source/knife_bootstrap.rst
@@ -6,9 +6,9 @@ knife bootstrap
 
 .. include:: ../../includes_knife/includes_knife_bootstrap.rst
 
-.. note:: Starting with |chef client| 12.0, use the `knife ssl_fetch <http://docs.chef.io/knife_ssl_fetch.html>`_ command to pull down the SSL certificates from the on-premises |chef server| and add them to the ``/trusted_certs_dir`` on the workstation. This certificates is used during a |knife| bootstrap operation.
+.. note:: .. include:: ../../includes_knife/includes_notes_knife_bootstrap_use_knife_ssl_fetch.rst
 
-.. note:: To bootstrap the |chef client| on |windows| machines, the `knife-windows <http://docs.chef.io/plugin_knife_windows.html>`_ plugins is required, which includes the necessary bootstrap scripts that are used to do the actual installation.
+.. note:: .. include:: ../../includes_knife/includes_notes_knife_bootstrap_on_windows.rst
 
 Syntax
 =====================================================
@@ -28,16 +28,7 @@ Validatorless Bootstrap
 
 ``knife bootstrap`` Options
 +++++++++++++++++++++++++++++++++++++++++++++++++++++
-Use the following options with a validatorless bootstrap to specify items that are stored in |chef vault|:
-
-``--bootstrap-vault-file VAULT_FILE``
-   |bootstrap valut_file|
-
-``--bootstrap-vault-item VAULT_ITEM``
-   |bootstrap valut_item|
-
-``--bootstrap-vault-json VAULT_JSON``
-   |bootstrap valut_json|
+.. include:: ../../includes_chef_vault/includes_chef_vault_knife_bootstrap_options.rst
 
 Custom Templates
 =====================================================
@@ -90,4 +81,3 @@ The following examples show how to use this |knife| subcommand:
 **Specify a custom installation command sequence**
 
 .. include:: ../../step_knife/step_knife_bootstrap_custom_install_command_sequence.rst
-
diff --git a/chef_master/source/knife_common_options.rst b/chef_master/source/knife_common_options.rst
@@ -3,4 +3,3 @@ Common Options
 =====================================================
 
 .. include:: ../../includes_knife/includes_knife_common_options.rst
-
diff --git a/chef_master/source/knife_configure.rst b/chef_master/source/knife_configure.rst
@@ -27,5 +27,3 @@ The following examples show how to use this |knife| subcommand:
 **Configure client.rb**
 
 .. include:: ../../step_knife/step_knife_configure_client_rb.rst
-
-
diff --git a/chef_master/source/knife_cookbook_site.rst b/chef_master/source/knife_cookbook_site.rst
@@ -6,7 +6,7 @@ knife cookbook site
 
 .. include:: ../../includes_knife/includes_knife_site_cookbook.rst
 
-.. warning:: Please consider managing community cookbooks using the version of |berkshelf| that ships with the |chef dk|. For more information about the |chef dk|, see http://docs.chef.io/devkit/.
+.. warning:: .. include:: ../../includes_notes/includes_notes_knife_cookbook_site_use_devkit_berkshelf.rst
 
 .. note:: Review the list of :doc:`common options </knife_common_options>` available to this (and all) |knife| subcommands and plugins.
 
@@ -164,4 +164,4 @@ The following examples show how to use this |knife| subcommand:
 
 **Unshare a cookbook version**
 
-.. include:: ../../step_knife/step_knife_site_cookbook_unshare_version.rst
+.. include:: ../../step_knife/step_knife_site_cookbook_unshare_version.rst
diff --git a/chef_master/source/knife_delete.rst b/chef_master/source/knife_delete.rst
@@ -19,10 +19,3 @@ Options
 Examples
 =====================================================
 None.
-
-
-
-
-
-
-
diff --git a/chef_master/source/knife_deps.rst b/chef_master/source/knife_deps.rst
@@ -55,9 +55,3 @@ The following examples show how to use this |knife| subcommand:
 **Pass knife deps output to knife xargs**
 
 .. include:: ../../step_knife/step_knife_deps_pass_output_to_knife_xargs.rst
-
-
-
-
-
-
diff --git a/chef_master/source/knife_diff.rst b/chef_master/source/knife_diff.rst
@@ -31,6 +31,3 @@ The following examples show how to use this |knife| subcommand:
 **Compare, then return results**
 
 .. include:: ../../step_knife/step_knife_diff_compare_then_return_results.rst
-
-
-
diff --git a/chef_master/source/knife_download.rst b/chef_master/source/knife_download.rst
@@ -43,4 +43,3 @@ The following examples show how to use this |knife| subcommand:
 **Download cookbooks and roles**
 
 .. include:: ../../step_knife/step_knife_download_directory_cookbooks_and_role.rst
-
diff --git a/chef_master/source/knife_raw.rst b/chef_master/source/knife_raw.rst
@@ -34,4 +34,4 @@ The following examples show how to use this |knife| subcommand:
 
 **Delete a role**
 
-.. include:: ../../step_knife/step_knife_raw_delete_role.rst
+.. include:: ../../step_knife/step_knife_raw_delete_role.rst
diff --git a/chef_master/source/knife_show.rst b/chef_master/source/knife_show.rst
@@ -24,4 +24,4 @@ The following examples show how to use this |knife| subcommand:
 
 **Show roles and environments**
 
-.. include:: ../../step_knife/step_knife_show_roles_and_environments.rst
+.. include:: ../../step_knife/step_knife_show_roles_and_environments.rst
diff --git a/chef_master/source/knife_ssl_check.rst b/chef_master/source/knife_ssl_check.rst
@@ -31,5 +31,3 @@ The following examples show how to use this |knife| subcommand:
 **Verify an external server's SSL certificate**
 
 .. include:: ../../step_knife/step_knife_ssl_check_verify_external_server.rst
-
-
diff --git a/chef_master/source/knife_ssl_fetch.rst b/chef_master/source/knife_ssl_fetch.rst
@@ -26,4 +26,4 @@ The following examples show how to use this |knife| subcommand:
 
 **Verify Checksums**
 
-.. include:: ../../step_knife/step_knife_ssl_fetch_verify_certificate.rst
+.. include:: ../../step_knife/step_knife_ssl_fetch_verify_certificate.rst
diff --git a/chef_master/source/knife_status.rst b/chef_master/source/knife_status.rst
@@ -35,4 +35,3 @@ The following examples show how to use this |knife| subcommand:
 **View status for all nodes**
 
 .. include:: ../../step_knife/step_knife_status_view_for_all_nodes.rst
-
diff --git a/chef_master/source/knife_upload.rst b/chef_master/source/knife_upload.rst
@@ -47,5 +47,3 @@ The following examples show how to use this |knife| subcommand:
 **Use output of knife deps to pass command to knife upload**
 
 .. include:: ../../step_knife/step_knife_upload_pass_to_knife_deps.rst
-
-
diff --git a/chef_master/source/knife_user.rst b/chef_master/source/knife_user.rst
@@ -66,7 +66,6 @@ Examples
 -----------------------------------------------------
 None.
 
-
 key create
 =====================================================
 .. include:: ../../includes_knife/includes_knife_user_key_create.rst
@@ -201,4 +200,3 @@ The following examples show how to use this |knife| subcommand:
 **Show user data as JSON**
 
 .. include:: ../../step_knife/step_knife_user_show_json.rst
-
diff --git a/chef_master/source/knife_xargs.rst b/chef_master/source/knife_xargs.rst
@@ -31,7 +31,3 @@ The following examples show how to use this |knife| subcommand:
 **View security groups data**
 
 .. include:: ../../step_knife/step_knife_xargs_view_json.rst
-
-
-
-
diff --git a/includes_chef_vault/includes_chef_vault_knife_bootstrap_options.rst b/includes_chef_vault/includes_chef_vault_knife_bootstrap_options.rst
@@ -0,0 +1,14 @@
+.. The contents of this file may be included in multiple topics (using the includes directive).
+.. The contents of this file should be modified in a way that preserves its ability to appear in multiple topics.
+
+
+Use the following options with a validatorless bootstrap to specify items that are stored in |chef vault|:
+
+``--bootstrap-vault-file VAULT_FILE``
+   |bootstrap valut_file|
+
+``--bootstrap-vault-item VAULT_ITEM``
+   |bootstrap valut_item|
+
+``--bootstrap-vault-json VAULT_JSON``
+   |bootstrap valut_json|
diff --git a/includes_notes/includes_notes_knife_bootstrap_on_windows.rst b/includes_notes/includes_notes_knife_bootstrap_on_windows.rst
@@ -0,0 +1,5 @@
+.. The contents of this file may be included in multiple topics (using the includes directive).
+.. The contents of this file should be modified in a way that preserves its ability to appear in multiple topics.
+
+
+To bootstrap the |chef client| on |windows| machines, the `knife-windows <http://docs.chef.io/plugin_knife_windows.html>`_ plugins is required, which includes the necessary bootstrap scripts that are used to do the actual installation.
diff --git a/includes_notes/includes_notes_knife_bootstrap_use_knife_ssl_fetch.rst b/includes_notes/includes_notes_knife_bootstrap_use_knife_ssl_fetch.rst
@@ -0,0 +1,5 @@
+.. The contents of this file may be included in multiple topics (using the includes directive).
+.. The contents of this file should be modified in a way that preserves its ability to appear in multiple topics.
+
+
+Starting with |chef client| 12.0, use the `knife ssl_fetch <http://docs.chef.io/knife_ssl_fetch.html>`_ command to pull down the SSL certificates from the on-premises |chef server| and add them to the ``/trusted_certs_dir`` on the workstation. This certificates is used during a |knife| bootstrap operation.
diff --git a/includes_notes/includes_notes_knife_cookbook_site_use_devkit_berkshelf.rst b/includes_notes/includes_notes_knife_cookbook_site_use_devkit_berkshelf.rst
@@ -0,0 +1,5 @@
+.. The contents of this file may be included in multiple topics (using the includes directive).
+.. The contents of this file should be modified in a way that preserves its ability to appear in multiple topics.
+
+
+Please consider managing community cookbooks using the version of |berkshelf| that ships with the |chef dk|. For more information about the |chef dk|, see http://docs.chef.io/devkit/.
diff --git a/release_chef_11-0/source/knife_bootstrap.rst b/release_chef_11-0/source/knife_bootstrap.rst
@@ -8,7 +8,7 @@ knife bootstrap
 
 .. include:: ../../includes_knife/includes_knife_bootstrap.rst
 
-.. note:: To bootstrap the |chef client| on |windows| machines, the `knife-windows <http://docs.chef.io/plugin_knife_windows.html>`_ plugins is required, which includes the necessary bootstrap scripts that are used to do the actual installation.
+.. note:: .. include:: ../../includes_knife/includes_notes_knife_bootstrap_on_windows.rst
 
 Syntax
 =====================================================
@@ -57,4 +57,3 @@ The following examples show how to use this |knife| subcommand:
 **Use a file that contains a private key**
 
 .. include:: ../../step_knife/step_knife_bootstrap_use_file_with_private_key.rst
-
diff --git a/release_chef_11-0/source/knife_cookbook_site.rst b/release_chef_11-0/source/knife_cookbook_site.rst
@@ -8,7 +8,7 @@ knife cookbook site
 
 .. include:: ../../includes_knife/includes_knife_site_cookbook.rst
 
-.. warning:: Please consider managing community cookbooks using the version of |berkshelf| that ships with the |chef dk|. For more information about the |chef dk|, see http://docs.opscode.com/devkit/.
+.. warning:: .. include:: ../../includes_notes/includes_notes_knife_cookbook_site_use_devkit_berkshelf.rst
 
 .. note:: Review the list of :doc:`common options </knife_common_options>` available to this (and all) |knife| subcommands and plugins.
 
diff --git a/release_chef_11-10/source/knife_bootstrap.rst b/release_chef_11-10/source/knife_bootstrap.rst
@@ -8,7 +8,7 @@ knife bootstrap
 
 .. include:: ../../includes_knife/includes_knife_bootstrap.rst
 
-.. note:: To bootstrap the |chef client| on |windows| machines, the `knife-windows <http://docs.chef.io/plugin_knife_windows.html>`_ plugins is required, which includes the necessary bootstrap scripts that are used to do the actual installation.
+.. note:: .. include:: ../../includes_knife/includes_notes_knife_bootstrap_on_windows.rst
 
 Syntax
 =====================================================
@@ -57,4 +57,3 @@ The following examples show how to use this |knife| subcommand:
 **Use a file that contains a private key**
 
 .. include:: ../../step_knife/step_knife_bootstrap_use_file_with_private_key.rst
-
diff --git a/release_chef_11-10/source/knife_cookbook_site.rst b/release_chef_11-10/source/knife_cookbook_site.rst
@@ -8,7 +8,7 @@ knife cookbook site
 
 .. include:: ../../includes_knife/includes_knife_site_cookbook.rst
 
-.. warning:: Please consider managing community cookbooks using the version of |berkshelf| that ships with the |chef dk|. For more information about the |chef dk|, see http://docs.opscode.com/devkit/.
+.. warning:: .. include:: ../../includes_notes/includes_notes_knife_cookbook_site_use_devkit_berkshelf.rst
 
 .. note:: Review the list of :doc:`common options </knife_common_options>` available to this (and all) |knife| subcommands and plugins.
 
diff --git a/release_chef_11-12/source/knife_bootstrap.rst b/release_chef_11-12/source/knife_bootstrap.rst
@@ -8,7 +8,7 @@ knife bootstrap
 
 .. include:: ../../includes_knife/includes_knife_bootstrap.rst
 
-.. note:: To bootstrap the |chef client| on |windows| machines, the `knife-windows <http://docs.chef.io/plugin_knife_windows.html>`_ plugins is required, which includes the necessary bootstrap scripts that are used to do the actual installation.
+.. note:: .. include:: ../../includes_knife/includes_notes_knife_bootstrap_on_windows.rst
 
 Syntax
 =====================================================
@@ -57,4 +57,3 @@ The following examples show how to use this |knife| subcommand:
 **Use a file that contains a private key**
 
 .. include:: ../../step_knife/step_knife_bootstrap_use_file_with_private_key.rst
-
diff --git a/release_chef_11-12/source/knife_cookbook_site.rst b/release_chef_11-12/source/knife_cookbook_site.rst
@@ -8,7 +8,7 @@ knife cookbook site
 
 .. include:: ../../includes_knife/includes_knife_site_cookbook.rst
 
-.. warning:: Please consider managing community cookbooks using the version of |berkshelf| that ships with the |chef dk|. For more information about the |chef dk|, see http://docs.opscode.com/devkit/.
+.. warning:: .. include:: ../../includes_notes/includes_notes_knife_cookbook_site_use_devkit_berkshelf.rst
 
 .. note:: Review the list of :doc:`common options </knife_common_options>` available to this (and all) |knife| subcommands and plugins.
 
diff --git a/release_chef_11-14/source/knife_bootstrap.rst b/release_chef_11-14/source/knife_bootstrap.rst
@@ -8,7 +8,7 @@ knife bootstrap
 
 .. include:: ../../includes_knife/includes_knife_bootstrap.rst
 
-.. note:: To bootstrap the |chef client| on |windows| machines, the `knife-windows <http://docs.opscode.com/plugin_knife_windows.html>`_ plugins is required, which includes the necessary bootstrap scripts that are used to do the actual installation.
+.. note:: .. include:: ../../includes_knife/includes_notes_knife_bootstrap_on_windows.rst
 
 Syntax
 =====================================================
@@ -73,4 +73,3 @@ The following examples show how to use this |knife| subcommand:
 **Specify a custom installation command sequence**
 
 .. include:: ../../step_knife/step_knife_bootstrap_custom_install_command_sequence.rst
-
diff --git a/release_chef_11-14/source/knife_cookbook_site.rst b/release_chef_11-14/source/knife_cookbook_site.rst
@@ -8,7 +8,7 @@ knife cookbook site
 
 .. include:: ../../includes_knife/includes_knife_site_cookbook.rst
 
-.. warning:: Please consider managing community cookbooks using the version of |berkshelf| that ships with the |chef dk|. For more information about the |chef dk|, see http://docs.opscode.com/devkit/.
+.. warning:: .. include:: ../../includes_notes/includes_notes_knife_cookbook_site_use_devkit_berkshelf.rst
 
 .. note:: Review the list of :doc:`common options </knife_common_options>` available to this (and all) |knife| subcommands and plugins.
 
diff --git a/release_chef_11-16/source/knife_bootstrap.rst b/release_chef_11-16/source/knife_bootstrap.rst
@@ -8,7 +8,7 @@ knife bootstrap
 
 .. include:: ../../includes_knife/includes_knife_bootstrap.rst
 
-.. note:: To bootstrap the |chef client| on |windows| machines, the `knife-windows <http://docs.opscode.com/plugin_knife_windows.html>`_ plugins is required, which includes the necessary bootstrap scripts that are used to do the actual installation.
+.. note:: .. include:: ../../includes_knife/includes_notes_knife_bootstrap_on_windows.rst
 
 Syntax
 =====================================================
@@ -73,4 +73,3 @@ The following examples show how to use this |knife| subcommand:
 **Specify a custom installation command sequence**
 
 .. include:: ../../step_knife/step_knife_bootstrap_custom_install_command_sequence.rst
-
diff --git a/release_chef_11-16/source/knife_cookbook_site.rst b/release_chef_11-16/source/knife_cookbook_site.rst
@@ -8,7 +8,7 @@ knife cookbook site
 
 .. include:: ../../includes_knife/includes_knife_site_cookbook.rst
 
-.. warning:: Please consider managing community cookbooks using the version of |berkshelf| that ships with the |chef dk|. For more information about the |chef dk|, see http://docs.opscode.com/devkit/.
+.. warning:: .. include:: ../../includes_notes/includes_notes_knife_cookbook_site_use_devkit_berkshelf.rst
 
 .. note:: Review the list of :doc:`common options </knife_common_options>` available to this (and all) |knife| subcommands and plugins.
 
diff --git a/release_chef_11-18/source/knife_bootstrap.rst b/release_chef_11-18/source/knife_bootstrap.rst
@@ -8,7 +8,7 @@ knife bootstrap
 
 .. include:: ../../includes_knife/includes_knife_bootstrap.rst
 
-.. note:: To bootstrap the |chef client| on |windows| machines, the `knife-windows <http://docs.opscode.com/plugin_knife_windows.html>`_ plugins is required, which includes the necessary bootstrap scripts that are used to do the actual installation.
+.. note:: .. include:: ../../includes_knife/includes_notes_knife_bootstrap_on_windows.rst
 
 Syntax
 =====================================================
@@ -73,4 +73,3 @@ The following examples show how to use this |knife| subcommand:
 **Specify a custom installation command sequence**
 
 .. include:: ../../step_knife/step_knife_bootstrap_custom_install_command_sequence.rst
-
diff --git a/release_chef_11-18/source/knife_cookbook_site.rst b/release_chef_11-18/source/knife_cookbook_site.rst
@@ -8,7 +8,7 @@ knife cookbook site
 
 .. include:: ../../includes_knife/includes_knife_site_cookbook.rst
 
-.. warning:: Please consider managing community cookbooks using the version of |berkshelf| that ships with the |chef dk|. For more information about the |chef dk|, see http://docs.opscode.com/devkit/.
+.. warning:: .. include:: ../../includes_notes/includes_notes_knife_cookbook_site_use_devkit_berkshelf.rst
 
 .. note:: Review the list of :doc:`common options </knife_common_options>` available to this (and all) |knife| subcommands and plugins.
 
diff --git a/release_chef_11-2/source/knife_bootstrap.rst b/release_chef_11-2/source/knife_bootstrap.rst
@@ -8,7 +8,7 @@ knife bootstrap
 
 .. include:: ../../includes_knife/includes_knife_bootstrap.rst
 
-.. note:: To bootstrap the |chef client| on |windows| machines, the `knife-windows <http://docs.chef.io/plugin_knife_windows.html>`_ plugins is required, which includes the necessary bootstrap scripts that are used to do the actual installation.
+.. note:: .. include:: ../../includes_knife/includes_notes_knife_bootstrap_on_windows.rst
 
 Syntax
 =====================================================
@@ -57,4 +57,3 @@ The following examples show how to use this |knife| subcommand:
 **Use a file that contains a private key**
 
 .. include:: ../../step_knife/step_knife_bootstrap_use_file_with_private_key.rst
-
diff --git a/release_chef_11-2/source/knife_cookbook_site.rst b/release_chef_11-2/source/knife_cookbook_site.rst
@@ -8,7 +8,7 @@ knife cookbook site
 
 .. include:: ../../includes_knife/includes_knife_site_cookbook.rst
 
-.. warning:: Please consider managing community cookbooks using the version of |berkshelf| that ships with the |chef dk|. For more information about the |chef dk|, see http://docs.opscode.com/devkit/.
+.. warning:: .. include:: ../../includes_notes/includes_notes_knife_cookbook_site_use_devkit_berkshelf.rst
 
 .. note:: Review the list of :doc:`common options </knife_common_options>` available to this (and all) |knife| subcommands and plugins.
 
diff --git a/release_chef_11-4/source/knife_bootstrap.rst b/release_chef_11-4/source/knife_bootstrap.rst
@@ -8,7 +8,7 @@ knife bootstrap
 
 .. include:: ../../includes_knife/includes_knife_bootstrap.rst
 
-.. note:: To bootstrap the |chef client| on |windows| machines, the `knife-windows <http://docs.chef.io/plugin_knife_windows.html>`_ plugins is required, which includes the necessary bootstrap scripts that are used to do the actual installation.
+.. note:: .. include:: ../../includes_knife/includes_notes_knife_bootstrap_on_windows.rst
 
 Syntax
 =====================================================
@@ -57,4 +57,3 @@ The following examples show how to use this |knife| subcommand:
 **Use a file that contains a private key**
 
 .. include:: ../../step_knife/step_knife_bootstrap_use_file_with_private_key.rst
-
diff --git a/release_chef_11-4/source/knife_cookbook_site.rst b/release_chef_11-4/source/knife_cookbook_site.rst
@@ -8,7 +8,7 @@ knife cookbook site
 
 .. include:: ../../includes_knife/includes_knife_site_cookbook.rst
 
-.. warning:: Please consider managing community cookbooks using the version of |berkshelf| that ships with the |chef dk|. For more information about the |chef dk|, see http://docs.opscode.com/devkit/.
+.. warning:: .. include:: ../../includes_notes/includes_notes_knife_cookbook_site_use_devkit_berkshelf.rst
 
 .. note:: Review the list of :doc:`common options </knife_common_options>` available to this (and all) |knife| subcommands and plugins.
 
diff --git a/release_chef_11-6/source/knife_bootstrap.rst b/release_chef_11-6/source/knife_bootstrap.rst
@@ -8,7 +8,7 @@ knife bootstrap
 
 .. include:: ../../includes_knife/includes_knife_bootstrap.rst
 
-.. note:: To bootstrap the |chef client| on |windows| machines, the `knife-windows <http://docs.chef.io/plugin_knife_windows.html>`_ plugins is required, which includes the necessary bootstrap scripts that are used to do the actual installation.
+.. note:: .. include:: ../../includes_knife/includes_notes_knife_bootstrap_on_windows.rst
 
 Syntax
 =====================================================
@@ -57,4 +57,3 @@ The following examples show how to use this |knife| subcommand:
 **Use a file that contains a private key**
 
 .. include:: ../../step_knife/step_knife_bootstrap_use_file_with_private_key.rst
-
diff --git a/release_chef_11-6/source/knife_cookbook_site.rst b/release_chef_11-6/source/knife_cookbook_site.rst
diff --git a/release_chef_11-8/source/knife_bootstrap.rst b/release_chef_11-8/source/knife_bootstrap.rst
diff --git a/release_chef_11-8/source/knife_cookbook_site.rst b/release_chef_11-8/source/knife_cookbook_site.rst
diff --git a/release_chef_12-0/source/knife_bootstrap.rst b/release_chef_12-0/source/knife_bootstrap.rst
diff --git a/release_chef_12-1/source/knife_bootstrap.rst b/release_chef_12-1/source/knife_bootstrap.rst
diff --git a/release_chef_12-2/source/knife_bootstrap.rst b/release_chef_12-2/source/knife_bootstrap.rst
diff --git a/release_chef_12-3/source/knife_bootstrap.rst b/release_chef_12-3/source/knife_bootstrap.rst
diff --git a/release_chef_12-4/source/knife_bootstrap.rst b/release_chef_12-4/source/knife_bootstrap.rst
diff --git a/release_chef_12-5/source/knife_bootstrap.rst b/release_chef_12-5/source/knife_bootstrap.rst

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,3 @@ Common Options`
`3`	`3`	`=====================================================`
`4`	`4`
`5`	`5`	`.. include:: ../../includes_knife/includes_knife_common_options.rst`
`6`		`-`
Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,3 @@ The following examples show how to use this \|knife\| subcommand:`
`43`	`43`	`Download cookbooks and roles`
`44`	`44`
`45`	`45`	`.. include:: ../../step_knife/step_knife_download_directory_cookbooks_and_role.rst`
`46`		`-`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,4 @@ The following examples show how to use this \|knife\| subcommand:`
`34`	`34`
`35`	`35`	`Delete a role`
`36`	`36`
`37`		`-.. include:: ../../step_knife/step_knife_raw_delete_role.rst`
	`37`	`+.. include:: ../../step_knife/step_knife_raw_delete_role.rst`