Merged change 97f3e833-afc9-41af-80b1-744415b1c12c

Delivery Server · Delivery Server · commit 6a6f4b6fbb27 · 2016-02-02T05:40:11.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_system_requirements.rst b/chef_master/source/chef_system_requirements.rst
@@ -2,13 +2,7 @@
 System Requirements
 =====================================================
 
-Before installing |chef|:
-
-* Ensure that each machine that will be a node is running a :doc:`supported platform </supported_platforms>`
-* Ensure that the machine that will run the |chef server| is sufficiently powerful
-* Ensure that any network and firewall settings are configured correctly
-
-Install and configure the |chef server|, then install and configure a workstation, and then run the bootstrap command from the workstation to install the |chef client| on each node.
+.. include:: ../../includes_system_requirements/includes_system_requirements.rst
 
 |chef client|
 =====================================================
@@ -30,4 +24,4 @@ Hosted |chef server_title|
 
 |chef dk_title|
 =====================================================
-The |chef dk| has the same requirements as the |chef client|.
+.. include:: ../../includes_system_requirements/includes_system_requirements_chefdk.rst
diff --git a/chef_master/source/chef_vault.rst b/chef_master/source/chef_vault.rst
@@ -2,12 +2,10 @@
 |chef vault|
 =====================================================
 
+.. include:: ../../includes_chef_vault/includes_chef_vault.rst
 
-|chef vault| is a |rubygems| package that is included in the |chef dk|. |chef vault| allows the encryption of a data bag item by using the public keys of a list of nodes, allowing only those nodes to decrypt the encrypted values. |chef vault| adds the ``knife vault`` subcommand. 
-
-* For more information about the |knife| subcommands, its arguments, and other uses, see https://github.com/chef/chef-vault
-* For more information about using the ``chef-vault`` cookbook, its helper methods and resources, see https://github.com/chef-cookbooks/chef-vault
-
-The ``chef-vault`` cookbook is maintained by |company_name|. Use it along with |chef vault| itself. This cookbook adds the ``chef_vault_item`` helper method to the |dsl recipe| and the ``chef_vault_secret`` resource. Use them both in recipes to work with data bag secrets
+For more information ...
+=====================================================
+For more information about |chef vault|:
 
-For more detailed discussion of managing secrets using these tools, see Joshua Timberman's blog post: https://www.chef.io/blog/2013/09/19/managing-secrets-with-chef-vault/.
+* `Joshua Timberman's blog post <https://www.chef.io/blog/2013/09/19/managing-secrets-with-chef-vault/>`_
diff --git a/chef_master/source/chefspec.rst b/chef_master/source/chefspec.rst
@@ -6,7 +6,11 @@
 
 .. include:: ../../includes_chefspec/includes_chefspec_whatis.rst
 
+.. 
+.. The following topic needs to be better before it can be uncommented, along with an H1 (=====) header added.
+..
 .. .. include:: ../../includes_chefspec/includes_chefspec_compare_to_resource.rst
+..
 
 Run |chef spec|
 =====================================================
diff --git a/chef_master/source/windows.rst b/chef_master/source/windows.rst
@@ -684,7 +684,7 @@ Recipe DSL Methods
 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 .. include:: ../../includes_dsl_recipe/includes_dsl_recipe_method_windows_methods.rst
 
-.. include:: ../../includes_notes/includes_notes_dsl_recipe_order_for_windows_methods.rst
+.. note:: .. include:: ../../includes_notes/includes_notes_dsl_recipe_order_for_windows_methods.rst
 
 registry_data_exists?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/includes_chef_vault/includes_chef_vault.rst b/includes_chef_vault/includes_chef_vault.rst
@@ -0,0 +1,10 @@
+.. 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 vault| is a |rubygems| package that is included in the |chef dk|. |chef vault| allows the encryption of a data bag item by using the public keys of a list of nodes, allowing only those nodes to decrypt the encrypted values. |chef vault| adds the ``knife vault`` subcommand. 
+
+* For more information about the |knife| subcommands, its arguments, and other uses, see https://github.com/chef/chef-vault
+* For more information about using the ``chef-vault`` cookbook, its helper methods and resources, see https://github.com/chef-cookbooks/chef-vault
+
+The ``chef-vault`` cookbook is maintained by |company_name|. Use it along with |chef vault| itself. This cookbook adds the ``chef_vault_item`` helper method to the |dsl recipe| and the ``chef_vault_secret`` resource. Use them both in recipes to work with data bag secrets.
diff --git a/includes_system_requirements/includes_system_requirements.rst b/includes_system_requirements/includes_system_requirements.rst
@@ -0,0 +1,11 @@
+.. 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.
+
+
+Before installing |chef|:
+
+* Ensure that each machine that will be a node is running a :doc:`supported platform </supported_platforms>`
+* Ensure that the machine that will run the |chef server| is sufficiently powerful
+* Ensure that any network and firewall settings are configured correctly
+
+Install and configure the |chef server|, then install and configure a workstation, and then run the bootstrap command from the workstation to install the |chef client| on each node.
diff --git a/includes_system_requirements/includes_system_requirements_chefdk.rst b/includes_system_requirements/includes_system_requirements_chefdk.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 dk| has the same requirements as the |chef client|.
