Merged change 569a7212-272e-451a-95b3-8da68a7656cf

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

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

Author: Delivery Server

chef_master/source/kitchen.rst

@@ -6,8 +6,6 @@
 
 .. include:: ../../includes_test_kitchen/includes_test_kitchen_key_concepts.rst
 
-.. warning:: This topic is about a |chef| community-authored tool that is packaged as part of the |chef dk|. See http://kitchen.ci/docs/getting-started/ for more information about |kitchen|.
-
 Bento
 =====================================================
 .. include:: ../../includes_bento/includes_bento.rst
@@ -28,13 +26,13 @@ kitchen (executable)
 =====================================================
 .. include:: ../../includes_ctl_kitchen/includes_ctl_kitchen.rst
 
-For more information about the ``kitchen`` command line tool, see :doc:`kitchen </ctl_kitchen>`. 
+.. note:: For more information about the ``kitchen`` command line tool, see :doc:`kitchen </ctl_kitchen>`. 
 
 |kitchen yml|
 =====================================================
 .. include:: ../../includes_test_kitchen/includes_test_kitchen_yml.rst
 
-For more information about the |kitchen yml| file, see :doc:`kitchen.yml </config_yml_kitchen>`. 
+.. note:: For more information about the |kitchen yml| file, see :doc:`kitchen.yml </config_yml_kitchen>`. 
 
 Syntax
 -----------------------------------------------------
@@ -48,9 +46,7 @@ For more information ...
 =====================================================
 For more information about test-driven development and |kitchen|:
 
+* `Getting Started with Kitchen <http://kitchen.ci/docs/getting-started/>`_
 * `Test-Driven Infrastructure with Chef, 2nd Edition <http://shop.oreilly.com/product/0636920030973.do>`_, by Stephen Nelson-Smith (O'Reilly Media)
 * `kitchen.ci <http://kitchen.ci>`_
-
-
-
-
+        

chef_master/source/plugin_knife_supermarket.rst

@@ -6,7 +6,7 @@ knife supermarket
 
 .. include:: ../../includes_plugin_knife/includes_plugin_knife_supermarket.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.
 

includes_dsl_recipe/includes_dsl_recipe_method_windows_helpers.rst

@@ -0,0 +1,46 @@
+.. 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 following |windows| platform-specific helpers can be used in recipes:
+
+.. list-table::
+   :widths: 200 300
+   :header-rows: 1
+
+   * - Helper
+     - Description
+   * - ``cluster?``
+     - Use to test for a |microsoft cluster| |microsoft sku| (|windows server| 2003 and later).
+   * - ``core?``
+     - Use to test for a |microsoft core| |microsoft sku| (|windows server| 2003 and later).
+   * - ``datacenter?``
+     - Use to test for a |microsoft datacenter| |microsoft sku|.
+   * - ``marketing_name``
+     - Use to display the marketing name for a |windows| platform.
+   * - ``windows_7?``
+     - Use to test for |windows 7|.
+   * - ``windows_8?``
+     - Use to test for |windows 8|.
+   * - ``windows_8_1?``
+     - Use to test for |windows 8_1|.
+   * - ``windows_2000?``
+     - Use to test for |windows 2000|.
+   * - ``windows_home_server?``
+     - Use to test for |windows home server|.
+   * - ``windows_server_2003?``
+     - Use to test for |windows server| 2003.
+   * - ``windows_server_2003_r2?``
+     - Use to test for |windows server| 2003 R2.
+   * - ``windows_server_2008?``
+     - Use to test for |windows server| 2008.
+   * - ``windows_server_2008_r2?``
+     - Use to test for |windows server| 2008 R2.
+   * - ``windows_server_2012?``
+     - Use to test for |windows server| 2012.
+   * - ``windows_server_2012_r2?``
+     - Use to test for |windows server| 2012 R2.
+   * - ``windows_vista?``
+     - Use to test for |windows vista|.
+   * - ``windows_xp?``
+     - Use to test for |windows xp|.