Merged change b09c05b9-8709-4fa8-bf12-14dddfec5fb7

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

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

Author: Delivery Server

chef_master/source/chef_solo.rst

@@ -2,7 +2,7 @@
 |chef solo|
 =====================================================
 
-.. warning:: The |chef client| now `includes an option called local mode <http://docs.chef.io/ctl_chef_client.html#run-in-local-mode>`_ (``--local-mode`` or ``-z``), which runs the |chef client| against the |chef repo| on the local machine as if it were running against a |chef server|. Local mode was added to the |chef client| in the 11.8 release. If you are running that version of the |chef client| (or later), you should consider using local mode instead of using |chef solo|.
+.. warning:: .. include:: ../../includes_notes/includes_notes_chef_solo_use_local_mode.rst
 
 .. include:: ../../includes_chef_solo/includes_chef_solo.rst
 

chef_master/source/config_rb_solo.rst

@@ -2,13 +2,12 @@
 |solo rb|
 =====================================================
 
-.. warning:: The |chef client| now `includes an option called local mode <http://docs.chef.io/ctl_chef_client.html#run-in-local-mode>`_ (``--local-mode`` or ``-z``), which runs the |chef client| against the |chef repo| on the local machine as if it were running against a |chef server|. Local mode was added to the |chef client| in the 11.8 release. If you are running that version of the |chef client| (or later), you should consider using local mode instead of using |chef solo|.
+.. warning:: .. include:: ../../includes_notes/includes_notes_chef_solo_use_local_mode.rst
 
 .. include:: ../../includes_config/includes_config_rb_solo.rst
 
 Settings
 ==========================================================================
-
 .. include:: ../../includes_config/includes_config_rb_solo_settings.rst
 
 Example

chef_master/source/ctl_analytics.rst

@@ -18,6 +18,10 @@ preflight-check
 =====================================================
 .. include:: ../../includes_ctl_analytics/includes_ctl_analytics_preflight_check.rst
 
+purge-node
+=====================================================
+.. include:: ../../includes_ctl_analytics/includes_ctl_analytics_purge_nodes.rst
+
 reconfigure
 =====================================================
 .. include:: ../../includes_ctl_analytics/includes_ctl_analytics_reconfigure.rst
@@ -32,9 +36,7 @@ uninstall
 
 Service Subcommands
 =====================================================
-|chef analytics| has a built in process supervisor, which ensures that all of the
-required services are in the appropriate state at any given time. The supervisor
-starts two processes per service.
+.. include:: ../../includes_ctl_common/includes_ctl_common_service_subcommands.rst
 
 hup
 -----------------------------------------------------
@@ -52,10 +54,6 @@ once
 -----------------------------------------------------
 .. include:: ../../includes_ctl_analytics/includes_ctl_analytics_once.rst
 
-purge-node
------------------------------------------------------
-.. include:: ../../includes_ctl_analytics/includes_ctl_analytics_purge_nodes.rst
-
 restart
 -----------------------------------------------------
 .. include:: ../../includes_ctl_analytics/includes_ctl_analytics_restart.rst

chef_master/source/ctl_chef_server.rst

@@ -459,7 +459,7 @@ user-show
 
 Service Subcommands
 =====================================================
-The |chef server| has a built in process supervisor, which ensures that all of the required services are in the appropriate state at any given time. The supervisor starts two processes per service.
+.. include:: ../../includes_ctl_common/includes_ctl_common_service_subcommands.rst
 
 .. warning:: The following commands are disabled when an external |postgresql| database is configured for the |chef server|: ``hup``, ``int``, ``kill``, ``once``, ``restart``, ``start``, ``stop``, ``tail``, and ``term``.
 

chef_master/source/ctl_chef_solo.rst

@@ -2,7 +2,7 @@
 |chef solo| (executable)
 =====================================================
 
-.. warning:: The |chef client| now `includes an option called local mode <http://docs.chef.io/ctl_chef_client.html#run-in-local-mode>`_ (``--local-mode`` or ``-z``), which runs the |chef client| against the |chef repo| on the local machine as if it were running against a |chef server|. Local mode was added to the |chef client| in the 11.8 release. If you are running that version of the |chef client| (or later), you should consider using local mode instead of using |chef solo|.
+.. warning:: .. include:: ../../includes_notes/includes_notes_chef_solo_use_local_mode.rst
 
 .. include:: ../../includes_chef_solo/includes_chef_solo.rst
 

chef_master/source/ctl_delivery_server.rst

@@ -158,8 +158,7 @@ update-project-hooks
 
 Service Subcommands
 =====================================================
-The |chef delivery| server has a built in process supervisor, which ensures that all of the required services are in the appropriate state at any given time. The supervisor starts two processes per service.
-
+.. include:: ../../includes_ctl_common/includes_ctl_common_service_subcommands.rst
 
 graceful-kill
 -----------------------------------------------------

chef_master/source/ctl_supermarket.rst

@@ -26,9 +26,7 @@ uninstall
 
 Service Subcommands
 =====================================================
-|supermarket| has a built in process supervisor, which ensures that all of the
-required services are in the appropriate state at any given time. The supervisor
-starts two processes per service.
+.. include:: ../../includes_ctl_common/includes_ctl_common_service_subcommands.rst
 
 hup
 -----------------------------------------------------

includes_config/includes_config_rb_metadata.rst

@@ -5,6 +5,6 @@
 A |metadata rb| file is:
 
 * Located at the top level of a cookbook's directory structure
-* Compiled whenever a cookbook is uploaded to the |chef server| or when the ``knife cookbook metadata`` subcommand is run, and then stored as |json data|
+* Compiled whenever a cookbook is uploaded to the |chef server| or when the ``knife cookbook metadata`` subcommand is run, and then stored as |json| data
 * Created automatically by |knife| whenever the ``knife cookbook create`` subcommand is run
 * Edited using a text editor, and then re-uploaded to the |chef server| as part of a cookbook upload

includes_ctl_common/includes_ctl_common_service_subcommands.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. 
+
+
+This command has a built in process supervisor that ensures all of the required services are in the appropriate state at any given time. The supervisor starts two processes per service and provides the following subcommands for managing services: ``hup``, ``int``, ``kill``, ``once``, ``restart``, ``service-list``, ``start``, ``status``, ``stop``, ``tail``, and ``term``.

includes_notes/includes_notes_chef_solo_use_local_mode.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.
+
+
+The |chef client| `includes an option called local mode <https://docs.chef.io/ctl_chef_client.html#run-in-local-mode>`_ (``--local-mode`` or ``-z``), which runs the |chef client| against the |chef repo| on the local machine as if it were running against a |chef server|. Local mode was added to the |chef client| in the 11.8 release. If you are running that version of the |chef client| (or later), you should consider using local mode instead of using |chef solo|.