Skip to content

Commit 2b7267e

Browse files
author
jamescott
committed
sync up chef-solo topics
1 parent 60493ac commit 2b7267e

File tree

33 files changed

+60
-118
lines changed

33 files changed

+60
-118
lines changed

‎chef_master/source/chef_solo.rst‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
.. include:: ../../includes_chef_solo/includes_chef_solo.rst
88

9-
.. note:: |chef solo| is configured using the :doc:`chef-solo (executable) </ctl_chef_solo>`.
10-
119
Cookbooks
1210
-----------------------------------------------------
1311
.. include:: ../../includes_chef_solo/includes_chef_solo_cookbooks.rst
@@ -41,9 +39,7 @@ Examples
4139

4240
**Run chef-solo using solo.rb settings**
4341

44-
.. code-block:: bash
45-
46-
$ chef-solo -c ~/chef/solo.rb
42+
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_solo_rb.rst
4743

4844
**Use a URL**
4945

@@ -56,4 +52,3 @@ Examples
5652
**Use a URL for cookbook and JSON data**
5753

5854
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_url_for_cookbook_and_json.rst
59-

‎chef_master/source/config_rb_solo.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@ Settings
1313
Example
1414
=====================================================
1515
.. include:: ../../includes_config/includes_config_rb_solo_example.rst
16-

‎chef_master/source/ctl_chef_solo.rst‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ Examples
2121

2222
**Run chef-solo using solo.rb settings**
2323

24-
.. code-block:: bash
25-
26-
$ chef-solo -c ~/chef/solo.rb
24+
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_solo_rb.rst
2725

2826
**Use a URL**
2927

@@ -36,4 +34,3 @@ Examples
3634
**Use a URL for cookbook and JSON data**
3735

3836
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_url_for_cookbook_and_json.rst
39-

‎release_chef_11-0/source/chef_solo.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ chef-solo
88

99
.. include:: ../../includes_chef_solo/includes_chef_solo_11-4.rst
1010

11-
.. note:: |chef solo| is configured using the :doc:`chef-solo (executable) </ctl_chef_solo>`.
12-
1311
Cookbooks
1412
-----------------------------------------------------
1513
.. include:: ../../includes_chef_solo/includes_chef_solo_cookbooks.rst
@@ -29,4 +27,3 @@ Roles
2927
Environments
3028
-----------------------------------------------------
3129
.. include:: ../../includes_chef_solo/includes_chef_solo_11-4_environments.rst
32-

‎release_chef_11-0/source/ctl_chef_solo.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Options
1616

1717
Examples
1818
=====================================================
19+
1920
**Use a URL**
2021

2122
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_url.rst

‎release_chef_11-10/source/chef_solo.rst‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
.. include:: ../../includes_chef_solo/includes_chef_solo.rst
1010

11-
.. note:: |chef solo| is configured using the :doc:`chef-solo (executable) </ctl_chef_solo>`.
12-
1311
Cookbooks
1412
-----------------------------------------------------
1513
.. include:: ../../includes_chef_solo/includes_chef_solo_cookbooks.rst
@@ -40,11 +38,10 @@ Options
4038

4139
Examples
4240
+++++++++++++++++++++++++++++++++++++++++++++++++++++
43-
**Run chef-solo using solo.rb settings**
4441

45-
.. code-block:: bash
42+
**Run chef-solo using solo.rb settings**
4643

47-
$ chef-solo -c ~/chef/solo.rb
44+
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_solo_rb.rst
4845

4946
**Use a URL**
5047

@@ -57,4 +54,3 @@ Examples
5754
**Use a URL for cookbook and JSON data**
5855

5956
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_url_for_cookbook_and_json.rst
60-

‎release_chef_11-10/source/ctl_chef_solo.rst‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ Options
1616

1717
Examples
1818
=====================================================
19+
20+
**Run chef-solo using solo.rb settings**
21+
22+
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_solo_rb.rst
23+
1924
**Use a URL**
2025

2126
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_url.rst
@@ -26,4 +31,4 @@ Examples
2631

2732
**Use a URL for cookbook and JSON data**
2833

29-
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_url_for_cookbook_and_json.rst
34+
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_url_for_cookbook_and_json.rst

‎release_chef_11-12/source/chef_solo.rst‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
.. include:: ../../includes_chef_solo/includes_chef_solo.rst
1010

11-
.. note:: |chef solo| is configured using the :doc:`chef-solo (executable) </ctl_chef_solo>`.
12-
1311
Cookbooks
1412
-----------------------------------------------------
1513
.. include:: ../../includes_chef_solo/includes_chef_solo_cookbooks.rst
@@ -40,11 +38,10 @@ Options
4038

4139
Examples
4240
+++++++++++++++++++++++++++++++++++++++++++++++++++++
43-
**Run chef-solo using solo.rb settings**
4441

45-
.. code-block:: bash
42+
**Run chef-solo using solo.rb settings**
4643

47-
$ chef-solo -c ~/chef/solo.rb
44+
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_solo_rb.rst
4845

4946
**Use a URL**
5047

@@ -57,4 +54,3 @@ Examples
5754
**Use a URL for cookbook and JSON data**
5855

5956
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_url_for_cookbook_and_json.rst
60-

‎release_chef_11-12/source/ctl_chef_solo.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ Options
1616

1717
Examples
1818
=====================================================
19+
20+
**Run chef-solo using solo.rb settings**
21+
22+
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_solo_rb.rst
23+
1924
**Use a URL**
2025

2126
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_url.rst

‎release_chef_11-14/source/chef_solo.rst‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
.. include:: ../../includes_chef_solo/includes_chef_solo.rst
1010

11-
.. note:: |chef solo| is configured using the :doc:`chef-solo (executable) </ctl_chef_solo>`.
12-
1311
Cookbooks
1412
-----------------------------------------------------
1513
.. include:: ../../includes_chef_solo/includes_chef_solo_cookbooks.rst
@@ -40,11 +38,10 @@ Options
4038

4139
Examples
4240
+++++++++++++++++++++++++++++++++++++++++++++++++++++
43-
**Run chef-solo using solo.rb settings**
4441

45-
.. code-block:: bash
42+
**Run chef-solo using solo.rb settings**
4643

47-
$ chef-solo -c ~/chef/solo.rb
44+
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_use_solo_rb.rst
4845

4946
**Use a URL**
5047

@@ -57,4 +54,3 @@ Examples
5754
**Use a URL for cookbook and JSON data**
5855

5956
.. include:: ../../step_ctl_chef_solo/step_ctl_chef_solo_url_for_cookbook_and_json.rst
60-

0 commit comments

Comments
 (0)