move notes to includes, update paths

coolhead · Jul 29, 2015 · 28968ee · 28968ee
1 parent 6f41594
commit 28968ee
Show file tree

Hide file tree

Showing 90 changed files with 285 additions and 166 deletions.
diff --git a/chef_master/source/api_chef_server.rst b/chef_master/source/api_chef_server.rst
@@ -210,7 +210,7 @@ PUT
 -----------------------------------------------------
 |api chef server clients|
 
-.. note:: |note api chef server manage clients with knife|
+.. note:: .. include:: ../../includes_notes/includes_notes_api_chef_server_manage_clients_with_knife.rst
 
 .. include:: ../../includes_api_chef_server/includes_api_chef_server_endpoint_clients.rst
 

diff --git a/chef_master/source/api_cookbooks_site.rst b/chef_master/source/api_cookbooks_site.rst
@@ -4,7 +4,7 @@
 
 .. include:: ../../includes_api_cookbooks_site/includes_api_cookbooks_site.rst
 
-.. note:: |note api cookbooks site using knife|
+.. note:: .. include:: ../../includes_notes/includes_notes_api_cookbooks_site_using_knife.rst
 
 Endpoints
 =====================================================

diff --git a/chef_master/source/attributes.rst b/chef_master/source/attributes.rst
@@ -67,7 +67,7 @@ Use Attribute Files
 
 .. include:: ../../includes_node/includes_node_attribute_when_to_use_unless_variants.rst
 
-.. note:: |note see_attributes_overview|
+.. note:: .. include:: ../../includes_notes/includes_notes_see_attributes_overview.rst
 
 File Methods
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/chef_master/source/ohai.rst b/chef_master/source/ohai.rst
@@ -14,7 +14,7 @@ Automatic Attributes
 
 .. include:: ../../includes_ohai/includes_ohai_attribute_list.rst
 
-.. note:: |note see_attributes_overview|
+.. note:: .. include:: ../../includes_notes/includes_notes_see_attributes_overview.rst
 
 Attribute Persistence
 -----------------------------------------------------

diff --git a/chef_master/source/recipes.rst b/chef_master/source/recipes.rst
@@ -8,7 +8,7 @@ Recipe Attributes
 =====================================================
 .. include:: ../../includes_cookbooks/includes_cookbooks_attribute.rst
 
-.. note:: |note see_attributes_overview|
+.. note:: .. include:: ../../includes_notes/includes_notes_see_attributes_overview.rst
 
 Attribute Types
 -----------------------------------------------------

diff --git a/chef_master/source/resource.rst b/chef_master/source/resource.rst
@@ -2,7 +2,7 @@
 About Resources and Providers
 =====================================================
 
-.. note:: |note all_resources|
+.. note:: .. include:: ../../includes_notes/includes_notes_all_resources.rst
 
 .. include:: ../../includes_resources_common/includes_resources_common.rst
 

diff --git a/chef_master/source/resource_apt_package.rst b/chef_master/source/resource_apt_package.rst
@@ -6,7 +6,7 @@ apt_package
 
 .. include:: ../../includes_resources/includes_resource_package_apt.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_bff_package.rst b/chef_master/source/resource_bff_package.rst
@@ -6,6 +6,8 @@ bff_package
 
 .. include:: ../../includes_resources/includes_resource_package_bff.rst
 
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
+
 Syntax
 =====================================================
 .. include:: ../../includes_resources/includes_resource_package_bff_syntax.rst

diff --git a/chef_master/source/resource_chef_acl.rst b/chef_master/source/resource_chef_acl.rst
@@ -2,7 +2,7 @@
 chef_acl
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_chef_client/includes_chef_client.rst
 

diff --git a/chef_master/source/resource_chef_client.rst b/chef_master/source/resource_chef_client.rst
@@ -2,7 +2,7 @@
 chef_client
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_chef_client/includes_chef_client.rst
 

diff --git a/chef_master/source/resource_chef_container.rst b/chef_master/source/resource_chef_container.rst
@@ -2,7 +2,7 @@
 chef_container
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_chef_client/includes_chef_client.rst
 

diff --git a/chef_master/source/resource_chef_data_bag.rst b/chef_master/source/resource_chef_data_bag.rst
@@ -2,7 +2,7 @@
 chef_data_bag
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_data_bag/includes_data_bag.rst
 

diff --git a/chef_master/source/resource_chef_environment.rst b/chef_master/source/resource_chef_environment.rst
@@ -2,7 +2,7 @@
 chef_environment
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_environment/includes_environment.rst
 

diff --git a/chef_master/source/resource_chef_gem.rst b/chef_master/source/resource_chef_gem.rst
@@ -4,11 +4,11 @@ chef_gem
 
 .. include:: ../../includes_resources_common/includes_resources_common_generic.rst
 
-.. warning:: |note chef_gem vs gem_package|
+.. warning:: .. include:: ../../includes_notes/includes_notes_chef_gem_vs_gem_package.rst
 
 .. include:: ../../includes_resources/includes_resource_package_chef_gem.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_chef_group.rst b/chef_master/source/resource_chef_group.rst
@@ -2,7 +2,7 @@
 chef_group
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_chef_client/includes_chef_client.rst
 

diff --git a/chef_master/source/resource_chef_mirror.rst b/chef_master/source/resource_chef_mirror.rst
@@ -2,7 +2,7 @@
 chef_mirror
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_chef_client/includes_chef_client.rst
 

diff --git a/chef_master/source/resource_chef_node.rst b/chef_master/source/resource_chef_node.rst
@@ -2,7 +2,7 @@
 chef_node
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_node/includes_node.rst
 

diff --git a/chef_master/source/resource_chef_organization.rst b/chef_master/source/resource_chef_organization.rst
@@ -2,7 +2,7 @@
 chef_organization
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_chef_client/includes_chef_client.rst
 

diff --git a/chef_master/source/resource_chef_role.rst b/chef_master/source/resource_chef_role.rst
@@ -2,7 +2,7 @@
 chef_role
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_role/includes_role.rst
 

diff --git a/chef_master/source/resource_chef_user.rst b/chef_master/source/resource_chef_user.rst
@@ -2,7 +2,7 @@
 chef_user
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_resources_common/includes_resources_common_generic.rst
 

diff --git a/chef_master/source/resource_dpkg_package.rst b/chef_master/source/resource_dpkg_package.rst
@@ -6,7 +6,7 @@ dpkg_package
 
 .. include:: ../../includes_resources/includes_resource_package_dpkg.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_easy_install_package.rst b/chef_master/source/resource_easy_install_package.rst
@@ -6,7 +6,7 @@ easy_install_package
 
 .. include:: ../../includes_resources/includes_resource_package_easy_install.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_env.rst b/chef_master/source/resource_env.rst
@@ -6,7 +6,7 @@ env
 
 .. include:: ../../includes_resources/includes_resource_env.rst
 
-.. note:: |note env resource variable on unix|
+.. note:: .. include:: ../../includes_notes/includes_notes_env_resource_variable_on_unix.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_erlang_call.rst b/chef_master/source/resource_erlang_call.rst
@@ -6,7 +6,7 @@ erl_call
 
 .. include:: ../../includes_resources/includes_resource_erlang_call.rst
 
-.. note:: |note erlang_call resource must be on path|
+.. note:: .. include:: ../../includes_notes/includes_notes_erlang_call_resource_must_be_on_path.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_execute.rst b/chef_master/source/resource_execute.rst
@@ -6,8 +6,7 @@ execute
 
 .. include:: ../../includes_resources/includes_resource_execute.rst
 
-|note execute resource intepreter|
-
+.. note:: .. include:: ../../includes_notes/includes_notes_execute_resource_intepreter.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_file.rst b/chef_master/source/resource_file.rst
@@ -6,7 +6,7 @@ file
 
 .. include:: ../../includes_resources/includes_resource_file.rst
 
-.. note:: |note file resource use other resources|
+.. note:: .. include:: ../../includes_notes/includes_notes_file_resource_use_other_resources.rst
 
 Syntax
 =====================================================
@@ -16,12 +16,12 @@ Actions
 =====================================================
 .. include:: ../../includes_resources/includes_resource_file_actions.rst
 
+.. warning:: .. include:: ../../includes_notes/includes_notes_selinux_file_based_resources.rst
+
 Attributes
 =====================================================
 .. include:: ../../includes_resources/includes_resource_file_attributes.rst
 
-.. warning:: |warning selinux_file_based_resources|
-
 Atomic File Updates
 -----------------------------------------------------
 .. include:: ../../includes_resources_common/includes_resources_common_atomic_update.rst

diff --git a/chef_master/source/resource_freebsd_package.rst b/chef_master/source/resource_freebsd_package.rst
@@ -6,7 +6,7 @@ freebsd_package
 
 .. include:: ../../includes_resources/includes_resource_package_freebsd.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_gem_package.rst b/chef_master/source/resource_gem_package.rst
@@ -4,11 +4,11 @@ gem_package
 
 .. include:: ../../includes_resources_common/includes_resources_common_generic.rst
 
-.. warning:: |note chef_gem vs gem_package|
+.. warning:: .. include:: ../../includes_notes/includes_notes_chef_gem_vs_gem_package.rst
 
 .. include:: ../../includes_resources/includes_resource_package_gem.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_git.rst b/chef_master/source/resource_git.rst
@@ -6,7 +6,7 @@ git
 
 .. include:: ../../includes_resources/includes_resource_scm_git.rst
 
-.. note:: |note scm resource use with resource deploy|
+.. note:: .. include:: ../../includes_notes/includes_notes_scm_resource_use_with_resource_deploy.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_homebrew_package.rst b/chef_master/source/resource_homebrew_package.rst
@@ -6,7 +6,7 @@ homebrew_package
 
 .. include:: ../../includes_resources/includes_resource_package_homebrew.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_ips_package.rst b/chef_master/source/resource_ips_package.rst
@@ -6,7 +6,7 @@ ips_package
 
 .. include:: ../../includes_resources/includes_resource_package_ips.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_load_balancer.rst b/chef_master/source/resource_load_balancer.rst
@@ -2,7 +2,7 @@
 load_balancer
 =====================================================
 
-|warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 .. include:: ../../includes_resources_common/includes_resources_common_generic.rst
 

diff --git a/chef_master/source/resource_machine.rst b/chef_master/source/resource_machine.rst
@@ -7,7 +7,7 @@ machine
 
 .. include:: ../../includes_resources/includes_resource_machine.rst
 
-.. warning:: |warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 
 Syntax

diff --git a/chef_master/source/resource_machine_batch.rst b/chef_master/source/resource_machine_batch.rst
@@ -7,7 +7,7 @@ machine_batch
 
 .. include:: ../../includes_resources/includes_resource_machine_batch.rst
 
-.. warning:: |warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 
 Syntax

diff --git a/chef_master/source/resource_machine_execute.rst b/chef_master/source/resource_machine_execute.rst
@@ -7,7 +7,7 @@ machine_execute
 
 .. include:: ../../includes_resources/includes_resource_machine_execute.rst
 
-.. warning:: |warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 
 Syntax

diff --git a/chef_master/source/resource_machine_file.rst b/chef_master/source/resource_machine_file.rst
@@ -7,7 +7,7 @@ machine_file
 
 .. include:: ../../includes_resources/includes_resource_machine_file.rst
 
-.. warning:: |warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_machine_image.rst b/chef_master/source/resource_machine_image.rst
@@ -7,7 +7,7 @@ machine_image
 
 .. include:: ../../includes_resources/includes_resource_machine_image.rst
 
-.. warning:: |warning provisioning|
+.. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_macports_package.rst b/chef_master/source/resource_macports_package.rst
@@ -6,7 +6,7 @@ macports_package
 
 .. include:: ../../includes_resources/includes_resource_package_macports.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_openbsd_package.rst b/chef_master/source/resource_openbsd_package.rst
@@ -6,7 +6,7 @@ openbsd_package
 
 .. include:: ../../includes_resources/includes_resource_package_openbsd.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_pacman_package.rst b/chef_master/source/resource_pacman_package.rst
@@ -6,7 +6,7 @@ pacman_package
 
 .. include:: ../../includes_resources/includes_resource_package_pacman.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================

diff --git a/chef_master/source/resource_paludis_package.rst b/chef_master/source/resource_paludis_package.rst
@@ -6,7 +6,7 @@ paludis_package
 
 .. include:: ../../includes_resources/includes_resource_package_paludis.rst
 
-.. note:: |note resource_based_on_package|
+.. note:: .. include:: ../../includes_notes/includes_notes_resource_based_on_package.rst
 
 Syntax
 =====================================================
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ machine @@
     .. include:: ../../includes_resources/includes_resource_machine.rst
-    .. warning:: |warning provisioning|
+    .. warning:: .. include:: ../../includes_notes/includes_notes_provisioning.rst
     Syntax
@@ Expand Down @@