sync chef-shell topics

jamescott · jamescott · commit 4705fe4c6915 · 2016-02-01T22:03:08.000-08:00
diff --git a/chef_master/source/chef_shell.rst b/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
diff --git a/includes_notes/includes_notes_chef_shell_was_shef.rst b/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.
diff --git a/release_chef_11-0/source/ctl_chef_shell.rst b/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
 =====================================================
diff --git a/release_chef_11-10/source/ctl_chef_shell.rst b/release_chef_11-10/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
 =====================================================
diff --git a/release_chef_11-12/source/ctl_chef_shell.rst b/release_chef_11-12/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
 =====================================================
diff --git a/release_chef_11-14/source/ctl_chef_shell.rst b/release_chef_11-14/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
 =====================================================
diff --git a/release_chef_11-16/source/ctl_chef_shell.rst b/release_chef_11-16/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
 =====================================================
diff --git a/release_chef_11-18/source/ctl_chef_shell.rst b/release_chef_11-18/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
 =====================================================
diff --git a/release_chef_11-2/source/ctl_chef_shell.rst b/release_chef_11-2/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
 =====================================================
diff --git a/release_chef_11-4/source/ctl_chef_shell.rst b/release_chef_11-4/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
 =====================================================
diff --git a/release_chef_11-6/source/ctl_chef_shell.rst b/release_chef_11-6/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
 =====================================================
diff --git a/release_chef_11-8/source/ctl_chef_shell.rst b/release_chef_11-8/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
 =====================================================
