diff options
| author | Tim Smith <tsmith@chef.io> | 2020-06-17 11:26:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 11:26:22 -0700 |
| commit | c2b6e8f6df6a75502f9c956a98d0fcbbf1b4ac63 (patch) | |
| tree | 9d0fc17757f82992b202bf3303a27dd7ffe284d5 | |
| parent | 936597dbc9304eedb7bb9dcd1b2013b67b8e33f5 (diff) | |
| parent | 9597b52a41e74b613beb24dc425de6303f95d807 (diff) | |
| download | chef-c2b6e8f6df6a75502f9c956a98d0fcbbf1b4ac63.tar.gz | |
Merge pull request #10010 from chef/docs
Minor docs updates and MacOS -> macOS
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | lib/chef/provider/user/dscl.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/homebrew_update.rb | 5 | ||||
| -rw-r--r-- | lib/chef/util/diff.rb | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a40fba3f9f..f808fa6ff9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,4 +1,4 @@ -# End-to-End Test of Chef in MacOS +# End-to-End Test of Chef in macOS variables: FORCE_FFI_YAJL: 'ext' diff --git a/lib/chef/provider/user/dscl.rb b/lib/chef/provider/user/dscl.rb index fade7097b5..4c056b00fd 100644 --- a/lib/chef/provider/user/dscl.rb +++ b/lib/chef/provider/user/dscl.rb @@ -536,7 +536,7 @@ in 'password', with the associated 'salt' and 'iterations'.") # We flush the cache here in order to make sure that we read fresh information # for the user. - shell_out("dscacheutil", "-flushcache") # FIXME: this is MacOS version dependent + shell_out("dscacheutil", "-flushcache") # FIXME: this is macOS version dependent begin user_plist_file = "#{USER_PLIST_DIRECTORY}/#{new_resource.username}.plist" diff --git a/lib/chef/resource/homebrew_update.rb b/lib/chef/resource/homebrew_update.rb index 36dcda810d..a13d22c223 100644 --- a/lib/chef/resource/homebrew_update.rb +++ b/lib/chef/resource/homebrew_update.rb @@ -19,6 +19,7 @@ # require_relative "../resource" +require_relative "../dist" class Chef class Resource @@ -27,7 +28,7 @@ class Chef provides(:homebrew_update) { true } - description "Use the **homebrew_update** resource to manage Homebrew repository updates on MacOS." + description "Use the **homebrew_update** resource to manage Homebrew repository updates on macOS." introduced "16.2" examples <<~DOC **Update the homebrew repository data at a specified interval**: @@ -37,7 +38,7 @@ class Chef action :periodic end ``` - **Update the Homebrew repository at the start of a Chef Infra Client run**: + **Update the Homebrew repository at the start of a #{Chef::Dist::PRODUCT} run**: ```ruby homebrew_update 'update' ``` diff --git a/lib/chef/util/diff.rb b/lib/chef/util/diff.rb index 6f10cbde35..5cc8bf5e82 100644 --- a/lib/chef/util/diff.rb +++ b/lib/chef/util/diff.rb @@ -136,7 +136,7 @@ class Chef return "(file sizes exceed #{diff_filesize_threshold} bytes, diff output suppressed)" end - # MacOSX(BSD?) diff will *sometimes* happily spit out nasty binary diffs + # macOS(BSD?) diff will *sometimes* happily spit out nasty binary diffs return "(current file is binary, diff output suppressed)" if is_binary?(old_file) return "(new content is binary, diff output suppressed)" if is_binary?(new_file) |