Merged change f3c3ed91-2e02-4552-856c-493d92b539a4

From review branch _reviews/master/jscott/edits01346g/1 into master

Signed-off-by: jscott <[email protected]>

Author: Delivery Server

chef_master/source/chef_shell.rst

@@ -4,8 +4,6 @@
 
 .. include:: ../../includes_chef_shell/includes_chef_shell.rst
 
-.. note:: |chef shell| is configured using the :doc:`chef-shell (executable) </ctl_chef_shell>`.
-
 Modes
 =====================================================
 .. include:: ../../includes_chef_shell/includes_chef_shell_modes.rst

chef_master/source/chef_solo.rst

@@ -6,8 +6,6 @@
 
 .. include:: ../../includes_chef_solo/includes_chef_solo.rst
 
-.. note:: |chef solo| is configured using the :doc:`chef-solo (executable) </ctl_chef_solo>`.
-
 Cookbooks
 -----------------------------------------------------
 .. include:: ../../includes_chef_solo/includes_chef_solo_cookbooks.rst
@@ -41,9 +39,7 @@ Examples
 
 **Run chef-solo using solo.rb settings**
 
-.. code-block:: bash
-
-   $ chef-solo -c ~/chef/solo.rb
+.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_solo_rb.rst
 
 **Use a URL**
 
@@ -56,4 +52,3 @@ Examples
 **Use a URL for cookbook and JSON data**
 
 .. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_url_for_cookbook_and_json.rst
-

chef_master/source/compliance.rst

@@ -32,7 +32,7 @@ The following examples show how to use the |dsl compliance| to build tests.
 
 **Only accept requests on secure ports**
 
-This code uses the ``port`` resource to ensure that the web server is only listening on well-secured ports.
+This code uses the ``port`` resource to ensure that a web server is only listening on well-secured ports.
 
 .. include:: ../../step_inspec/step_inspec_port_listen_on_secure_ports.rst
 

chef_master/source/config_rb_solo.rst

@@ -13,4 +13,3 @@ Settings
 Example
 =====================================================
 .. include:: ../../includes_config/includes_config_rb_solo_example.rst
-

chef_master/source/ctl_chef_solo.rst

@@ -21,9 +21,7 @@ Examples
 
 **Run chef-solo using solo.rb settings**
 
-.. code-block:: bash
-
-   $ chef-solo -c ~/chef/solo.rb
+.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_solo_rb.rst
 
 **Use a URL**
 
@@ -36,4 +34,3 @@ Examples
 **Use a URL for cookbook and JSON data**
 
 .. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_url_for_cookbook_and_json.rst
-

includes_notes/includes_notes_chef_shell_was_shef.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.
+
+
+|chef shell| is the new name for |shef| as of |chef client| version 11.0. |chef shell| is backwards compatible and aside from the name change, has the same set of functionality as with previous releases.

release_chef_11-0/source/chef_solo.rst

@@ -8,8 +8,6 @@ chef-solo
 
 .. include:: ../../includes_chef_solo/includes_chef_solo_11-4.rst
 
-.. note:: |chef solo| is configured using the :doc:`chef-solo (executable) </ctl_chef_solo>`.
-
 Cookbooks
 -----------------------------------------------------
 .. include:: ../../includes_chef_solo/includes_chef_solo_cookbooks.rst
@@ -29,4 +27,3 @@ Roles
 Environments
 -----------------------------------------------------
 .. include:: ../../includes_chef_solo/includes_chef_solo_11-4_environments.rst
-

release_chef_11-0/source/ctl_chef_shell.rst

@@ -8,7 +8,7 @@
 
 .. include:: ../../includes_ctl_chef_shell/includes_ctl_chef_shell.rst
 
-.. note:: |chef shell| is the new name for |shef| as of |chef client| 11. |chef shell| is backwards compatible and aside from the name change, has the same set of functionality as with previous releases.
+.. note:: .. include:: ../../includes_notes/includes_notes_chef_shell_was_shef.rst
 
 Modes
 =====================================================

release_chef_11-0/source/ctl_chef_solo.rst

@@ -16,6 +16,7 @@ Options
 
 Examples
 =====================================================
+
 **Use a URL**
 
 .. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_url.rst

release_chef_11-10/source/chef_solo.rst

@@ -8,8 +8,6 @@
 
 .. include:: ../../includes_chef_solo/includes_chef_solo.rst
 
-.. note:: |chef solo| is configured using the :doc:`chef-solo (executable) </ctl_chef_solo>`.
-
 Cookbooks
 -----------------------------------------------------
 .. include:: ../../includes_chef_solo/includes_chef_solo_cookbooks.rst
@@ -40,11 +38,10 @@ Options
 
 Examples
 +++++++++++++++++++++++++++++++++++++++++++++++++++++
-**Run chef-solo using solo.rb settings**
 
-.. code-block:: bash
+**Run chef-solo using solo.rb settings**
 
-   $ chef-solo -c ~/chef/solo.rb
+.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_solo_rb.rst
 
 **Use a URL**
 
@@ -57,4 +54,3 @@ Examples
 **Use a URL for cookbook and JSON data**
 
 .. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_url_for_cookbook_and_json.rst
-