summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-27 11:02:05 -0700
committerTim Smith <tsmith@chef.io>2018-03-27 11:02:05 -0700
commit0fa1d1ec14f591c3e5b2c641a557b6896a18c311 (patch)
treecbda799f3abfb7df1bd100ca43c1cdf36d8eafa5
parent180d43c2da144d8d6cc3aeaabac15c6df5322c63 (diff)
downloadchef-0fa1d1ec14f591c3e5b2c641a557b6896a18c311.tar.gz
More release note updates from reviews
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--RELEASE_NOTES.md6
-rw-r--r--lib/chef/resource/hostname.rb3
2 files changed, 5 insertions, 4 deletions
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index db77aafb88..0374dbc98c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -32,7 +32,7 @@ Use the homebrew_tap resource to add additional formula repositories to the Home
### hostname
-Use the hostname resource to sets the system's hostname, configure hostname and hosts config file, and re-run the Ohai hostname plugin so the hostname will be available in subsequent cookbooks. This resource was ported from the `chef_hostname` community cookbook.
+Use the hostname resource to set the system's hostname, configure hostname and hosts config file, and re-run the Ohai hostname plugin so the hostname will be available in subsequent cookbooks. This resource was ported from the `chef_hostname` community cookbook.
### macos_userdefaults
@@ -68,7 +68,7 @@ Use the rhsm_register resource to register a node with the Red Hat Subscription
### rhsm_repo
-Use the rhsm_repo resource to enabling or disabling Red Hat Subscription Manager repositories that are made available via attached subscriptions. This resource was ported from the `redhat_subscription_manager` community cookbook.
+Use the rhsm_repo resource to enable or disable Red Hat Subscription Manager repositories that are made available via attached subscriptions. This resource was ported from the `redhat_subscription_manager` community cookbook.
### rhsm_subscription
@@ -86,7 +86,7 @@ Use the swap_file resource to create or delete swap files on Linux systems, and
Use the sysctl resource to set kernel parameters using the sysctl command line tool and configuration files in the system's `sysctl.d` directory. Configuration files managed by this resource are named 99-chef-KEYNAME.conf. If an existing value was already set for the value it will be backed up to the node and restored if the :remove action is used later. This resource was ported from the `sysctl` community cookbook.
-`Note`: This resource no longer backs up existing key values to the node when changing values as we done in the sysctl cookbook previously. The resource has also been renamed from `sysctl_param` to `systctl` with backwards compatibility for the previous name.
+`Note`: This resource no longer backs up existing key values to the node when changing values as we have done in the sysctl cookbook previously. The resource has also been renamed from `sysctl_param` to `systctl` with backwards compatibility for the previous name.
### windows_ad_join
diff --git a/lib/chef/resource/hostname.rb b/lib/chef/resource/hostname.rb
index a863b14f1d..f785d1b620 100644
--- a/lib/chef/resource/hostname.rb
+++ b/lib/chef/resource/hostname.rb
@@ -6,7 +6,8 @@ class Chef
resource_name :hostname
provides :hostname
- description "Sets the systems hostname, ensures that reboot will preserve the hostname, and re-runs the ohai plugin so the hostname will be available in subsequent cookbooks."
+ description "Use the hostname resource to set the system's hostname, configure hostname and hosts config"\
+ " file, and re-run the Ohai hostname plugin so the hostname will be available in subsequent cookbooks."
introduced "14.0"
property :hostname, String,