diff options
-rw-r--r-- | lib/chef/resource/chocolatey_config.rb | 2 | ||||
-rw-r--r-- | lib/chef/resource/chocolatey_source.rb | 2 | ||||
-rw-r--r-- | lib/chef/resource/hostname.rb | 4 | ||||
-rw-r--r-- | lib/chef/resource/ohai_hint.rb | 2 | ||||
-rw-r--r-- | lib/chef/resource/powershell_package.rb | 2 | ||||
-rw-r--r-- | lib/chef/resource/script.rb | 2 | ||||
-rw-r--r-- | lib/chef/resource/sysctl.rb | 12 |
7 files changed, 13 insertions, 13 deletions
diff --git a/lib/chef/resource/chocolatey_config.rb b/lib/chef/resource/chocolatey_config.rb index bfa95ddd05..e9452e8f3c 100644 --- a/lib/chef/resource/chocolatey_config.rb +++ b/lib/chef/resource/chocolatey_config.rb @@ -24,7 +24,7 @@ class Chef introduced "14.3" property :config_key, String, name_property: true, - description: "The name of the config. We'll use the resource's name if this isn't provided." + description: "The name of the config. The resource's name will be used if this isn't provided." property :value, String, description: "The value to set." diff --git a/lib/chef/resource/chocolatey_source.rb b/lib/chef/resource/chocolatey_source.rb index 4ced5aa44d..5319f82ab4 100644 --- a/lib/chef/resource/chocolatey_source.rb +++ b/lib/chef/resource/chocolatey_source.rb @@ -24,7 +24,7 @@ class Chef introduced "14.3" property :source_name, String, name_property: true, - description: "The name of the source to add. We'll use the resource's name if this isn't provided." + description: "The name of the source to add. The resource's name will be used if this isn't provided." property :source, String, description: "The source URL." diff --git a/lib/chef/resource/hostname.rb b/lib/chef/resource/hostname.rb index d4b977bb78..82240bd6fb 100644 --- a/lib/chef/resource/hostname.rb +++ b/lib/chef/resource/hostname.rb @@ -31,7 +31,7 @@ class Chef name_property: true property :compile_time, [ TrueClass, FalseClass ], - description: "Should the resource run at compile time or not.", + description: "Whether the resource runs at compile time or not.", default: true property :ipaddress, String, @@ -43,7 +43,7 @@ class Chef default: nil property :windows_reboot, [ TrueClass, FalseClass ], - description: "Should Windows nodes be rebooted upon changing the name so it can take effect.", + description: "Whether Windows nodes will be rebooted upon changing the name so changes can take effect.", default: true action_class do diff --git a/lib/chef/resource/ohai_hint.rb b/lib/chef/resource/ohai_hint.rb index dcfffdba40..66146ff16a 100644 --- a/lib/chef/resource/ohai_hint.rb +++ b/lib/chef/resource/ohai_hint.rb @@ -34,7 +34,7 @@ class Chef description: "Values to include in the hint file." property :compile_time, [TrueClass, FalseClass], - description: "Should the resource execute during the compile time phase.", + description: "Whether the resource will execute during the compile time phase or not.", default: true, desired_state: false action :create do diff --git a/lib/chef/resource/powershell_package.rb b/lib/chef/resource/powershell_package.rb index 58c38a6d32..ba5a03ef8b 100644 --- a/lib/chef/resource/powershell_package.rb +++ b/lib/chef/resource/powershell_package.rb @@ -38,7 +38,7 @@ class Chef property :version, [String, Array], coerce: proc { |x| [x].flatten } property :source, [String] property :skip_publisher_check, [true, false], default: false, introduced: "14.3", - description: "Skip validating module author" + description: "Skip validating module author." end end end diff --git a/lib/chef/resource/script.rb b/lib/chef/resource/script.rb index d3562ee6f5..35d73a61dc 100644 --- a/lib/chef/resource/script.rb +++ b/lib/chef/resource/script.rb @@ -40,7 +40,7 @@ class Chef # FIXME: remove this and use an execute sub-resource instead of inheriting from Execute def command(arg = nil) unless arg.nil? - raise Chef::Exceptions::Script, "Do not use the command attribute on a #{resource_name} resource, use the 'code' attribute instead." + raise Chef::Exceptions::Script, "Do not use the command attribute on a #{resource_name} resource, use the 'code' property instead." end super end diff --git a/lib/chef/resource/sysctl.rb b/lib/chef/resource/sysctl.rb index 1b08ccbd0e..e03b7a362c 100644 --- a/lib/chef/resource/sysctl.rb +++ b/lib/chef/resource/sysctl.rb @@ -50,8 +50,8 @@ class Chef default: "/etc/sysctl.d" def after_created - raise "The systctl resource requires Linux as it needs sysctl and the systctl.d directory functionality." unless node["os"] == "linux" - raise "The systctl resource does not support SLES releases less than 12 as it requires a systctl.d directory" if platform_family?("suse") && node["platform_version"].to_i < 12 + raise "The sysctl resource requires Linux as it needs sysctl and the sysctl.d directory functionality." unless node["os"] == "linux" + raise "The sysctl resource does not support SLES releases less than 12 as it requires a sysctl.d directory" if platform_family?("suse") && node["platform_version"].to_i < 12 end def coerce_value(v) @@ -63,16 +63,16 @@ class Chef end end - # shellout to systctl to get the current value + # shellout to sysctl to get the current value # ignore missing keys by using '-e' - # convert tabs to spaces since systctl tab deliminates multivalue parameters + # convert tabs to spaces since sysctl tab deliminates multivalue parameters # strip the newline off the end of the output as well load_current_value do value shell_out!("sysctl -n -e #{key}").stdout.tr("\t", " ").strip end action :apply do - description "Apply a systctl value." + description "Apply a sysctl value." converge_if_changed do # set it temporarily @@ -97,7 +97,7 @@ class Chef # only converge the resource if the file actually exists to delete if ::File.exist?("#{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf") - converge_by "removing systctl config at #{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf" do + converge_by "removing sysctl config at #{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf" do file "#{new_resource.conf_dir}/99-chef-#{new_resource.key}.conf" do action :delete end |