summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-11-15 09:44:38 -0800
committerTim Smith <tsmith@chef.io>2018-11-15 09:44:38 -0800
commit52b46e76aff36a77befb5f28dc187952a75347d9 (patch)
tree6df31435d262df463eb1e90267ea584ad2976031
parent72f051cd4b29e7207f2ea9d8b56070fd9d534bca (diff)
downloadchef-52b46e76aff36a77befb5f28dc187952a75347d9.tar.gz
Updates from the review of #7929
Thanks @tyler-ball Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/resource/cron.rb2
-rw-r--r--lib/chef/resource/cron_d.rb4
-rw-r--r--lib/chef/resource/dmg_package.rb2
-rw-r--r--lib/chef/resource/execute.rb2
-rw-r--r--lib/chef/resource/hostname.rb2
-rw-r--r--lib/chef/resource/scm.rb2
-rw-r--r--lib/chef/resource/swap_file.rb2
-rw-r--r--lib/chef/resource/sysctl.rb2
-rw-r--r--lib/chef/resource/systemd_unit.rb2
-rw-r--r--lib/chef/resource/windows_auto_run.rb2
-rw-r--r--lib/chef/resource/windows_feature.rb2
-rw-r--r--lib/chef/resource/windows_feature_powershell.rb2
12 files changed, 13 insertions, 13 deletions
diff --git a/lib/chef/resource/cron.rb b/lib/chef/resource/cron.rb
index 647853bd9f..7e9f3022a7 100644
--- a/lib/chef/resource/cron.rb
+++ b/lib/chef/resource/cron.rb
@@ -159,7 +159,7 @@ class Chef
default: "root"
property :environment, Hash,
- description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}). (These variables must exist for a command to be run successfully.)",
+ description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}).",
default: lazy { Hash.new }
private
diff --git a/lib/chef/resource/cron_d.rb b/lib/chef/resource/cron_d.rb
index 92bfe34d40..f42318b574 100644
--- a/lib/chef/resource/cron_d.rb
+++ b/lib/chef/resource/cron_d.rb
@@ -103,7 +103,7 @@ class Chef
}
property :hour, [Integer, String],
- description: "The hour at which the cron entry is to run (0 - 23).",
+ description: "The hour at which the cron entry should run (0 - 23).",
default: "*", callbacks: {
"should be a valid hour spec" => ->(spec) { validate_numeric(spec, 0, 23) },
}
@@ -150,7 +150,7 @@ class Chef
description: "A comment to place in the cron.d file."
property :environment, Hash,
- description: "A Hash containing additional arbitrary environment variables under which the cron job will be run in the form of ``({'ENV_VARIABLE' => 'VALUE'})``. (These variables must exist for a command to be run successfully.)",
+ description: "A Hash containing additional arbitrary environment variables under which the cron job will be run in the form of ``({'ENV_VARIABLE' => 'VALUE'})``.",
default: lazy { Hash.new }
property :mode, [String, Integer],
diff --git a/lib/chef/resource/dmg_package.rb b/lib/chef/resource/dmg_package.rb
index 93dfd524b8..e6695ac5e3 100644
--- a/lib/chef/resource/dmg_package.rb
+++ b/lib/chef/resource/dmg_package.rb
@@ -27,7 +27,7 @@ class Chef
introduced "14.0"
property :app, String,
- description: "The name of the application as it appears in the /Volumes directory, if it differs from the resource block name.",
+ description: "The name of the application as it appears in the /Volumes directory, if it differs from the resource block's name.",
name_property: true
property :source, String,
diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb
index e2f389325e..05a76ab5e3 100644
--- a/lib/chef/resource/execute.rb
+++ b/lib/chef/resource/execute.rb
@@ -65,7 +65,7 @@ class Chef
description: "The current working directory from which the command will be run."
property :environment, Hash,
- description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}). (These variables must exist for a command to be run successfully.)"
+ description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'})."
alias :env :environment
diff --git a/lib/chef/resource/hostname.rb b/lib/chef/resource/hostname.rb
index 89c4c0c6d0..6b5a5617cf 100644
--- a/lib/chef/resource/hostname.rb
+++ b/lib/chef/resource/hostname.rb
@@ -27,7 +27,7 @@ class Chef
introduced "14.0"
property :hostname, String,
- description: "An optional property to set the hostnam if it differs from the resource block's name.",
+ description: "An optional property to set the hostname if it differs from the resource block's name.",
name_property: true
property :compile_time, [ TrueClass, FalseClass ],
diff --git a/lib/chef/resource/scm.rb b/lib/chef/resource/scm.rb
index 9346405e53..fb0e70ad44 100644
--- a/lib/chef/resource/scm.rb
+++ b/lib/chef/resource/scm.rb
@@ -66,7 +66,7 @@ class Chef
default: "deploy"
property :environment, [Hash, nil],
- description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}). (These variables must exist for a command to be run successfully.)",
+ description: "A Hash of environment variables in the form of ({'ENV_VARIABLE' => 'VALUE'}).",
default: nil
alias :env :environment
diff --git a/lib/chef/resource/swap_file.rb b/lib/chef/resource/swap_file.rb
index 87920e3d9b..f4f95cb28c 100644
--- a/lib/chef/resource/swap_file.rb
+++ b/lib/chef/resource/swap_file.rb
@@ -27,7 +27,7 @@ class Chef
introduced "14.0"
property :path, String,
- description: "The path where the swap file will be created on the system, if it differs from the resource block name.",
+ description: "The path where the swap file will be created on the system, if it differs from the resource block's name.",
name_property: true
property :size, Integer,
diff --git a/lib/chef/resource/sysctl.rb b/lib/chef/resource/sysctl.rb
index 91b9371a0a..a5568904ba 100644
--- a/lib/chef/resource/sysctl.rb
+++ b/lib/chef/resource/sysctl.rb
@@ -33,7 +33,7 @@ class Chef
introduced "14.0"
property :key, String,
- description: "The kernel parameter key in dotted format, if it differs from the resource block name.",
+ description: "The kernel parameter key in dotted format, if it differs from the resource block's name.",
name_property: true
property :ignore_error, [TrueClass, FalseClass],
diff --git a/lib/chef/resource/systemd_unit.rb b/lib/chef/resource/systemd_unit.rb
index 8197d760ab..89bc30b9d1 100644
--- a/lib/chef/resource/systemd_unit.rb
+++ b/lib/chef/resource/systemd_unit.rb
@@ -60,7 +60,7 @@ class Chef
property :unit_name, String, desired_state: false,
identity: true, name_property: true,
- description: "The name of the unit file if it differs from the resource block name.",
+ description: "The name of the unit file if it differs from the resource block's name.",
introduced: "13.7"
def to_ini
diff --git a/lib/chef/resource/windows_auto_run.rb b/lib/chef/resource/windows_auto_run.rb
index 5fb93e1b9e..74c3d85520 100644
--- a/lib/chef/resource/windows_auto_run.rb
+++ b/lib/chef/resource/windows_auto_run.rb
@@ -28,7 +28,7 @@ class Chef
introduced "14.0"
property :program_name, String,
- description: "The name of the program to run at login, if it differs from the resource block name.",
+ description: "The name of the program to run at login, if it differs from the resource block's name.",
name_property: true
property :path, String,
diff --git a/lib/chef/resource/windows_feature.rb b/lib/chef/resource/windows_feature.rb
index d705de857f..24f555a86c 100644
--- a/lib/chef/resource/windows_feature.rb
+++ b/lib/chef/resource/windows_feature.rb
@@ -28,7 +28,7 @@ class Chef
introduced "14.0"
property :feature_name, [Array, String],
- description: "The name of the feature(s) or role(s) to install, if it differs from the resource block name. The same feature may have different names depending on the underlying installation method being used (ie DHCPServer vs DHCP; DNS-Server-Full-Role vs DNS).",
+ description: "The name of the feature(s) or role(s) to install, if it differs from the resource block's name. The same feature may have different names depending on the underlying installation method being used (ie DHCPServer vs DHCP; DNS-Server-Full-Role vs DNS).",
name_property: true
property :source, String,
diff --git a/lib/chef/resource/windows_feature_powershell.rb b/lib/chef/resource/windows_feature_powershell.rb
index 9f1a3b151d..9a7b725575 100644
--- a/lib/chef/resource/windows_feature_powershell.rb
+++ b/lib/chef/resource/windows_feature_powershell.rb
@@ -31,7 +31,7 @@ class Chef
introduced "14.0"
property :feature_name, [Array, String],
- description: "The name of the feature(s) or role(s) to install, if it differs from the resource block name.",
+ description: "The name of the feature(s) or role(s) to install, if it differs from the resource block's name.",
coerce: proc { |x| to_formatted_array(x) },
name_property: true