Merged change e5546bf4-ff87-47cf-a758-94d878b6cce0

From review branch _reviews/master/jscott/updatedscresourcelinks/4 into master

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

Author: Delivery Server

chef_master/source/index.rst

@@ -1,5 +1,5 @@
 =====================================================
-All about |chef|
+All about |chef| 
 =====================================================
 
 .. include:: ../../includes_chef/includes_chef_index.rst

chef_master/source/install_delivery_aws.rst

@@ -333,7 +333,7 @@ To verify provisioning (from inside the ``delivery-cluster`` directory), do the
 
       $ rake info:list_core_services
 
-#. Navigate to your CHEF_SERVER_URL, and then login with ``delivery:delivery``.
+#. Navigate to your CHEF_SERVER_URL, and then login with ``delivery:delivery``. Use ``rake info:delivery_creds`` to get the password.
 #. Click on **Nodes**. You’ll see your |chef delivery| server, your build nodes, and nodes for any other optional features that you installed.
 #. Get the credentials and URL with the following command:
 
@@ -346,13 +346,13 @@ To verify provisioning (from inside the ``delivery-cluster`` directory), do the
 
    .. code-block:: bash
 
-      $ knife node status
+      $ knife node list
 
    All build nodes should report available.
 
 Configure Delivery
 =====================================================
-In |chef delivery| there are multiple levels of organization: enterprises, organizations, and projects. The provisioning step created the initial enterprise you specified in your environment file as the first ``name`` option. Enterprises are designed to provide units of multi-tenancy with separate sets of organizations and users. Next, set up |chef delivery| by adding users and organizations.
+In |chef delivery| there are multiple levels of organization: enterprises, organizations, and projects, where enterprise contain one (or more) organizations and organizations contain one (or more) projects. The provisioning step created the initial enterprise you specified in your environment file as the first ``name`` option. Enterprises are designed to provide units of multi-tenancy with separate sets of organizations and users. Next, set up |chef delivery| by adding users and organizations.
 
 .. note:: |chef delivery| by default hosts a git server that you interact with through the delivery CLI commands. Additionally, you can integrate GitHub Enterprise or GitHub.com.
 

includes_resources/includes_resource_12-3_remote_file_attributes.rst

@@ -156,4 +156,4 @@ This resource has the following properties:
 
    |verify_file|
 
-   .. include:: ../../includes_resources_common/includes_resources_common_attribute_verify.rst
+   .. include:: ../../includes_resources/includes_resource_remote_file_attributes_verify.rst

includes_resources/includes_resource_cookbook_file_attributes.rst

@@ -114,6 +114,6 @@ This resource has the following properties:
 
    |verify_file|
 
-   .. include:: ../../includes_resources_common/includes_resources_common_attribute_verify.rst
+   .. include:: ../../includes_resources/includes_resource_cookbook_file_attributes_verify.rst
 
 .. note:: .. include:: ../../includes_notes/includes_notes_resource_properties_use_owner_and_right.rst

includes_resources/includes_resource_cookbook_file_attributes_verify.rst

@@ -0,0 +1,58 @@
+.. The contents of this file are included in multiple topics.
+.. This file should not be changed in a way that hinders its ability to appear in multiple documentation sets.
+
+A block is arbitrary |ruby| defined within the resource block by using the ``verify`` property. When a block is ``true``, the |chef client| will continue to update the file as appropriate.
+
+For example, this should return ``true``:
+
+.. code-block:: ruby
+
+   cookbook_file '/tmp/baz' do
+     verify { 1 == 1 }
+   end
+
+This should return ``true``:
+
+.. code-block:: ruby
+
+   cookbook_file '/etc/nginx.conf' do
+     verify 'nginx -t -c %{path}'
+   end
+
+.. warning:: For releases of the |chef client| prior to 12.5 (|chef client| 12.4 and earlier) the correct syntax is:
+
+   .. code-block:: ruby
+
+      cookbook_file '/etc/nginx.conf' do
+        verify 'nginx -t -c %{file}'
+      end
+
+   See |github| issues https://github.com/chef/chef/issues/3232 and https://github.com/chef/chef/pull/3693 for more information about these differences.
+
+This should return ``true``:
+
+.. code-block:: ruby
+
+   cookbook_file '/tmp/bar' do
+     verify { 1 == 1}
+   end
+
+And this should return ``true``:
+
+.. code-block:: ruby
+
+   cookbook_file '/tmp/foo' do
+     verify do |path|
+       true
+     end
+   end
+
+Whereas, this should return ``false``:
+
+.. code-block:: ruby
+
+   cookbook_file '/tmp/turtle' do
+     verify '/usr/bin/false'
+   end
+
+If a string or a block return ``false``, the |chef client| run will stop and an error is returned.

includes_resources/includes_resource_dsc_resource_features.rst

@@ -10,30 +10,30 @@ For built-in |windows powershell_dsc_short| resources, use the following values:
    * - Value
      - Description
    * - ``:archive``
-     - Use to to `unpack archive (.zip) files <http://technet.microsoft.com/en-us/library/dn249917.aspx>`_.
+     - Use to to `unpack archive (.zip) files <https://msdn.microsoft.com/en-us/powershell/dsc/archiveresource>`_.
    * - ``:environment``
-     - Use to to `manage system environment variables <http://technet.microsoft.com/en-us/library/dn282121.aspx>`_.
+     - Use to to `manage system environment variables <https://msdn.microsoft.com/en-us/powershell/dsc/environmentresource>`_.
    * - ``:file``
-     - Use to to `manage files and directories <http://technet.microsoft.com/en-us/library/dn282129.aspx>`_.
+     - Use to to `manage files and directories <https://msdn.microsoft.com/en-us/powershell/dsc/fileresource>`_.
    * - ``:group``
-     - Use to to `manage local groups <http://technet.microsoft.com/en-us/library/dn282124.aspx>`_.
+     - Use to to `manage local groups <https://msdn.microsoft.com/en-us/powershell/dsc/groupresource>`_.
    * - ``:log``
-     - Use to to `log configuration messages <http://technet.microsoft.com/en-us/library/dn282117.aspx>`_.
+     - Use to to `log configuration messages <https://msdn.microsoft.com/en-us/powershell/dsc/logresource>`_.
    * - ``:package``
-     - Use to to `install and manage packages <http://technet.microsoft.com/en-us/library/dn282132.aspx>`_.
+     - Use to to `install and manage packages <https://msdn.microsoft.com/en-us/powershell/dsc/packageresource>`_.
    * - ``:registry``
-     - Use to to `manage registry keys and registry key values <http://technet.microsoft.com/en-us/library/dn282133.aspx>`_.
+     - Use to to `manage registry keys and registry key values <https://msdn.microsoft.com/en-us/powershell/dsc/registryresource>`_.
    * - ``:script``
-     - Use to to `run Powershell script blocks <http://technet.microsoft.com/en-us/library/dn282130.aspx>`_.
+     - Use to to `run Powershell script blocks <https://msdn.microsoft.com/en-us/powershell/dsc/registryresource>`_.
    * - ``:service``
-     - Use to to `manage services <http://technet.microsoft.com/en-us/library/dn282120.aspx>`_.
+     - Use to to `manage services <https://msdn.microsoft.com/en-us/powershell/dsc/registryresource>`_.
    * - ``:user``
-     - Use to to `manage local user accounts <http://technet.microsoft.com/en-us/library/dn282118.aspx>`_.
+     - Use to to `manage local user accounts <https://msdn.microsoft.com/en-us/powershell/dsc/userresource>`_.
    * - ``:windowsfeature``
-     - Use to to `add or remove Windows features and roles <http://technet.microsoft.com/en-us/library/dn282127.aspx>`_.
+     - Use to to `add or remove Windows features and roles <https://msdn.microsoft.com/en-us/powershell/dsc/windowsfeatureresource>`_.
    * - ``:windowsoptionalfeature``
      - Use to configure |windows| optional features.
    * - ``:windowsprocess``
-     - Use to to `configure Windows processes <http://technet.microsoft.com/en-us/library/dn282123.aspx>`_.
+     - Use to to `configure Windows processes <https://msdn.microsoft.com/en-us/powershell/dsc/windowsprocessresource>`_.
 
-Any |windows powershell_dsc_short| resource may be used in a |chef| recipe. For example, the |windows powershell_dsc_resource_kit| contains resources for `configuring Active Directory components <http://gallery.technet.microsoft.com/scriptcenter/xActiveDirectory-f2d573f3>`_, such as ``xADDomain``, ``xADDomainController``, and ``xADUser``. Assuming that these resources are available to the |chef client|, the corresponding values for the ``resource_name`` attribute would be: ``:xADDomain``, ``:xADDomainController``, and ``xADUser``.
+Any |windows powershell_dsc_short| resource may be used in a |chef| recipe. For example, the |windows powershell_dsc_resource_kit| contains resources for `configuring Active Directory components <http://www.powershellgallery.com/packages/xActiveDirectory/2.8.0.0>`_, such as ``xADDomain``, ``xADDomainController``, and ``xADUser``. Assuming that these resources are available to the |chef client|, the corresponding values for the ``resource_name`` attribute would be: ``:xADDomain``, ``:xADDomainController``, and ``xADUser``.

includes_resources/includes_resource_file_attributes.rst

@@ -119,5 +119,5 @@ This resource has the following properties:
 
    |verify_file|
 
-   .. include:: ../../includes_resources_common/includes_resources_common_attribute_verify.rst
+   .. include:: ../../includes_resources/includes_resource_file_attributes_attribute_verify.rst
 

includes_resources/includes_resource_file_attributes_attribute_verify.rst

@@ -0,0 +1,58 @@
+.. The contents of this file are included in multiple topics.
+.. This file should not be changed in a way that hinders its ability to appear in multiple documentation sets.
+
+A block is arbitrary |ruby| defined within the resource block by using the ``verify`` property. When a block is ``true``, the |chef client| will continue to update the file as appropriate.
+
+For example, this should return ``true``:
+
+.. code-block:: ruby
+
+   file '/tmp/baz' do
+     verify { 1 == 1 }
+   end
+
+This should return ``true``:
+
+.. code-block:: ruby
+
+   file '/etc/nginx.conf' do
+     verify 'nginx -t -c %{path}'
+   end
+
+.. warning:: For releases of the |chef client| prior to 12.5 (|chef client| 12.4 and earlier) the correct syntax is:
+
+   .. code-block:: ruby
+
+      file '/etc/nginx.conf' do
+        verify 'nginx -t -c %{file}'
+      end
+
+   See |github| issues https://github.com/chef/chef/issues/3232 and https://github.com/chef/chef/pull/3693 for more information about these differences.
+
+This should return ``true``:
+
+.. code-block:: ruby
+
+   file '/tmp/bar' do
+     verify { 1 == 1}
+   end
+
+And this should return ``true``:
+
+.. code-block:: ruby
+
+   file '/tmp/foo' do
+     verify do |path|
+       true
+     end
+   end
+
+Whereas, this should return ``false``:
+
+.. code-block:: ruby
+
+   file '/tmp/turtle' do
+     verify '/usr/bin/false'
+   end
+
+If a string or a block return ``false``, the |chef client| run will stop and an error is returned.

includes_resources/includes_resource_remote_file_attributes.rst

@@ -155,4 +155,4 @@ This resource has the following properties:
 
    |verify_file|
 
-   .. include:: ../../includes_resources_common/includes_resources_common_attribute_verify.rst
+   .. include:: ../../includes_resources/includes_resource_remote_file_attributes_verify.rst

includes_resources/includes_resource_remote_file_attributes_verify.rst

@@ -0,0 +1,58 @@
+.. The contents of this file are included in multiple topics.
+.. This file should not be changed in a way that hinders its ability to appear in multiple documentation sets.
+
+A block is arbitrary |ruby| defined within the resource block by using the ``verify`` property. When a block is ``true``, the |chef client| will continue to update the file as appropriate.
+
+For example, this should return ``true``:
+
+.. code-block:: ruby
+
+   remote_file '/tmp/baz' do
+     verify { 1 == 1 }
+   end
+
+This should return ``true``:
+
+.. code-block:: ruby
+
+   remote_file '/etc/nginx.conf' do
+     verify 'nginx -t -c %{path}'
+   end
+
+.. warning:: For releases of the |chef client| prior to 12.5 (|chef client| 12.4 and earlier) the correct syntax is:
+
+   .. code-block:: ruby
+
+      remote_file '/etc/nginx.conf' do
+        verify 'nginx -t -c %{file}'
+      end
+
+   See |github| issues https://github.com/chef/chef/issues/3232 and https://github.com/chef/chef/pull/3693 for more information about these differences.
+
+This should return ``true``:
+
+.. code-block:: ruby
+
+   remote_file '/tmp/bar' do
+     verify { 1 == 1}
+   end
+
+And this should return ``true``:
+
+.. code-block:: ruby
+
+   remote_file '/tmp/foo' do
+     verify do |path|
+       true
+     end
+   end
+
+Whereas, this should return ``false``:
+
+.. code-block:: ruby
+
+   remote_file '/tmp/turtle' do
+     verify '/usr/bin/false'
+   end
+
+If a string or a block return ``false``, the |chef client| run will stop and an error is returned.