Skip to content

Commit 5caa504

Browse files
committed
final fixes
Signed-off-by: Ian Maddaus <[email protected]>
1 parent e41892d commit 5caa504

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

content/attribute_arrays.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ override_attributes(
4444
)
4545
```
4646

47-
But that'sn't efficient, especially because most of them are identical. The deep merge capabilities of Chef Infra Client allows attributes to be layered across cookbooks, recipes, roles, and environments. This allows an attribute to be reused across nodes, making use of default attributes set at the cookbook level, but also providing a way for certain attributes (with a higher attribute precedence) to be applied only when they're supposed to be.
47+
But that isn't efficient, especially because most of them are identical. The deep merge capabilities of Chef Infra Client allows attributes to be layered across cookbooks, recipes, roles, and environments. This allows an attribute to be reused across nodes, making use of default attributes set at the cookbook level, but also providing a way for certain attributes (with a higher attribute precedence) to be applied only when they're supposed to be.
4848

4949
For example, a role named `baseline.rb`:
5050

content/custom_resources_notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ end
198198

199199
When the `converge_by` block is run in why-run mode, it will only log `touch "/tmp/foo"` and won't run the code inside the block.
200200

201-
A `converge_by` block that'sn't wrapped in an idempotency check will always cause the resource to be updated, and will always cause notifications to fire. To prevent this, a properly written resource should wrap all `converge_by` checks with an idempotency check. The [`converge_if_changed`]({{< relref "custom_resources.md#converge_if_changed" >}}) block may be used instead which will wrap a `converge_by` block with an idempotency check for you.
201+
A `converge_by` block that isn't wrapped in an idempotency check will always cause the resource to be updated, and will always cause notifications to fire. To prevent this, a properly written resource should wrap all `converge_by` checks with an idempotency check. The [`converge_if_changed`]({{< relref "custom_resources.md#converge_if_changed" >}}) block may be used instead which will wrap a `converge_by` block with an idempotency check for you.
202202

203203
```ruby
204204
action :run do

content/debug.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Use the verbose logging that's built into Chef Infra Client:
6565
Use the **log** resource to create log entries. The **log** resource
6666
behaves like any other resource: built into the resource collection
6767
during the compile phase, and then run during the execution phase. (To
68-
create a log entry that'sn't built into the resource collection, use
68+
create a log entry that isn't built into the resource collection, use
6969
`Chef::Log` instead of the **log** resource.)
7070

7171
{{< note >}}

content/feedback.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ product = []
1414
+++
1515

1616
chef-docs hopes that the documentation is always just what you are
17-
looking for, but when that'sn't the case we do appreciate
17+
looking for, but when that isn't the case we do appreciate
1818
feedback. There are several ways to get feedback to chef-docs. For
1919
members of the Chef community, customers, or people who just want to
2020
send feedback, choose any of the following options:

content/reusable/md/node_attribute_allowlist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To allowlist the `network` attributes and prevent the other attributes from bein
5151
allowed_automatic_attributes ['network/interfaces/']
5252
```
5353

54-
When a allowlist is defined, any attribute of that type that'sn't specified in that attribute allowlist **won't** be saved. So based on the previous allowlist for automatic attributes, the `filesystem` and `map - autohome` attributes won't be saved, but the `network` attributes will.
54+
When a allowlist is defined, any attribute of that type that isn't specified in that attribute allowlist **won't** be saved. So based on the previous allowlist for automatic attributes, the `filesystem` and `map - autohome` attributes won't be saved, but the `network` attributes will.
5555

5656
Leave the value empty to prevent all attributes of that attribute type from being saved:
5757

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
When attribute allowlist settings are used, only the attributes defined in a allowlist will be saved and any attribute that'sn't defined in a allowlist won't be saved. Each attribute type is allowlisted independently of the other attribute types. For example, if `automatic_attribute_allowlist` defines attributes to be saved, but `normal_attribute_allowlist`, `default_attribute_allowlist`, and
1+
When attribute allowlist settings are used, only the attributes defined in a allowlist will be saved and any attribute that isn't defined in a allowlist won't be saved. Each attribute type is allowlisted independently of the other attribute types. For example, if `automatic_attribute_allowlist` defines attributes to be saved, but `normal_attribute_allowlist`, `default_attribute_allowlist`, and
22
`override_attribute_allowlist` aren't defined, then all normal attributes, default attributes, and override attributes are saved, as well as the automatic attributes that were specifically included through allowlisting.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
When attribute blocklist settings are used, any attribute defined in a blocklist won't be saved to the Chef Infra Server and any attribute that'sn't defined in a blocklist will be saved. Each attribute type must be blocklisted independently of the other attribute types. For example, if `blocked_automatic_attributes` defines attributes that won't be saved, but `blocked_normal_attributes`, `blocked_default_attributes`, and `blocked_override_attributes` aren't defined, then all normal attributes, default attributes, and override attributes will be saved, as well as the automatic attributes that weren't specifically excluded through blocklisting.
1+
When attribute blocklist settings are used, any attribute defined in a blocklist won't be saved to the Chef Infra Server and any attribute that isn't defined in a blocklist will be saved. Each attribute type must be blocklisted independently of the other attribute types. For example, if `blocked_automatic_attributes` defines attributes that won't be saved, but `blocked_normal_attributes`, `blocked_default_attributes`, and `blocked_override_attributes` aren't defined, then all normal attributes, default attributes, and override attributes will be saved, as well as the automatic attributes that weren't specifically excluded through blocklisting.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
A knife plugin is a set of one (or more) subcommands that can be added
2-
to knife to support additional functionality that'sn't built-in to the
2+
to knife to support additional functionality that isn't built-in to the
33
base set of knife subcommands. Many of the knife plugins are built by
44
members of the Chef community and several of them are built and
55
maintained by Chef.

0 commit comments

Comments
 (0)