Skip to content

Commit ad13fcb

Browse files
author
Delivery Server
committed
Merged change a0fcf0a3-f1b9-410c-99ce-077707c94cf4
From review branch _reviews/master/jscott/edits17gasody261/2 into master Signed-off-by: jscott <[email protected]>
2 parents 80fc612 + 2b00804 commit ad13fcb

6 files changed

+33
-7
lines changed

‎includes_resources/includes_resource_12-4_service_reboot_attributes.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ This resource has the following properties:
2121

2222
|notifies|
2323

24-
.. include:: ../../includes_resources_common/includes_resources_common_notifications_syntax_notifies.rst
24+
.. include:: ../../includes_resources/includes_resource_service_reboot_attributes_notifies_syntax.rst
2525

26-
.. include:: ../../includes_resources_common/includes_resources_common_notifications_timers.rst
26+
.. include:: ../../includes_resources/includes_resource_service_reboot_attributes_timers.rst
2727

2828
``reason``
2929
**Ruby Type:** String
@@ -45,6 +45,6 @@ This resource has the following properties:
4545

4646
|subscribes|
4747

48-
.. include:: ../../includes_resources_common/includes_resources_common_notifications_syntax_subscribes.rst
48+
.. include:: ../../includes_resources/includes_resource_service_reboot_attributes_subscribes_syntax.rst
4949

5050
|subscribes timers|

‎includes_resources/includes_resource_service_reboot.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
44
Use the |resource reboot| resource to reboot a node, a necessary step with some installations on certain platforms. This resource is supported for use on the |windows|, |mac os x|, and |linux| platforms.
55

6-
.. warning:: The |resource reboot| must use the ``:immediately`` notification timer with any notification.
6+
.. note:: The |resource reboot| resource must use the ``:immediately`` notification timer with any notification.

‎includes_resources/includes_resource_service_reboot_attributes.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ This resource has the following properties:
1818

1919
|notifies|
2020

21-
.. include:: ../../includes_resources_common/includes_resources_common_notifications_syntax_notifies.rst
21+
.. include:: ../../includes_resources/includes_resource_service_reboot_attributes_notifies_syntax.rst
2222

23-
.. include:: ../../includes_resources_common/includes_resources_common_notifications_timers.rst
23+
.. include:: ../../includes_resources/includes_resource_service_reboot_attributes_timers.rst
2424

2525
``reason``
2626
**Ruby Type:** String
@@ -42,6 +42,6 @@ This resource has the following properties:
4242

4343
|subscribes|
4444

45-
.. include:: ../../includes_resources_common/includes_resources_common_notifications_syntax_subscribes.rst
45+
.. include:: ../../includes_resources/includes_resource_service_reboot_attributes_subscribes_syntax.rst
4646

4747
|subscribes timers|

‎includes_resources/includes_resource_service_reboot_attributes_notifies_syntax.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.. The contents of this file may be included in multiple topics (using the includes directive).
2+
.. The contents of this file should be modified in a way that preserves its ability to appear in multiple topics.
3+
4+
Specify the ``:action``, ``'resource[name]'``, and timer (``:immediately``). Use multiple ``notifies`` statements to notify more than one resource.
5+
6+
.. code-block:: ruby
7+
8+
resource 'name' do
9+
...
10+
notifies :action, 'resource[name]', :immediately
11+
end

‎includes_resources/includes_resource_service_reboot_attributes_subscribes_syntax.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.. The contents of this file may be included in multiple topics (using the includes directive).
2+
.. The contents of this file should be modified in a way that preserves its ability to appear in multiple topics.
3+
4+
Specify the ``:action``, ``'resource[name]'``, and timer (``:immediately``). Use multiple ``subscribes`` statements to listen to more than one resource.
5+
6+
.. code-block:: ruby
7+
8+
resource 'name' do
9+
...
10+
subscribes :action, 'resource[name]', :immediately
11+
end

‎includes_resources/includes_resource_service_reboot_attributes_timers.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.. The contents of this file may be included in multiple topics (using the includes directive).
2+
.. The contents of this file should be modified in a way that preserves its ability to appear in multiple topics.
3+
4+
Use the ``:immediately`` timer to specify that a notification should be run immediately, per resource notified.

0 commit comments

Comments
 (0)