Use new "macOS" naming where appropriate.

Not quite a mass replacement as I've used OS X and Mac OS X where
describing specific older versions and added compatibility methods
for things in the DSL.

2 files changed, 6 insertions, 6 deletions

diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index f8d6c9e1f..15dd3328f 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -3,7 +3,7 @@ module Homebrew
     class Checks
       def development_tools_checks
         %w[
-          check_for_unsupported_osx
+          check_for_unsupported_macos
           check_for_prerelease_xcode
           check_for_bad_install_name_tool
           check_for_installed_developer_tools
@@ -25,7 +25,7 @@ module Homebrew
         end
       end
 
-      def check_for_unsupported_osx
+      def check_for_unsupported_macos
         return if ARGV.homebrew_developer?
 
         who = "We"
@@ -39,7 +39,7 @@ module Homebrew
         end
 
         <<-EOS.undent
-          You are using OS X #{MacOS.version}.
+          You are using macOS #{MacOS.version}.
           #{who} do not provide support for this #{what}.
           You may encounter build failures or other breakages.
           Please create pull-requests instead of filing issues.
@@ -98,7 +98,7 @@ module Homebrew
 
         <<-EOS.undent
           You have Xcode 8 installed without the CLT;
-          this causes certain builds to fail on OS X 10.11.
+          this causes certain builds to fail on OS X El Capitan (10.11).
           Please install the CLT via:
             sudo xcode-select --install
         EOS
@@ -150,7 +150,7 @@ module Homebrew
           You have an outdated version of /usr/bin/install_name_tool installed.
           This will cause binary package installations to fail.
           This can happen if you install osx-gcc-installer or RailsInstaller.
-          To restore it, you must reinstall OS X or restore the binary from
+          To restore it, you must reinstall macOS or restore the binary from
           the OS packages.
         EOS
       end
diff --git a/Library/Homebrew/extend/os/mac/system_config.rb b/Library/Homebrew/extend/os/mac/system_config.rb
index c369f38e6..acee50ad0 100644
--- a/Library/Homebrew/extend/os/mac/system_config.rb
+++ b/Library/Homebrew/extend/os/mac/system_config.rb
@@ -40,7 +40,7 @@ class SystemConfig
 
     def dump_verbose_config(f = $stdout)
       dump_generic_verbose_config(f)
-      f.puts "OS X: #{MacOS.full_version}-#{kernel}"
+      f.puts "macOS: #{MacOS.full_version}-#{kernel}"
       f.puts "Xcode: #{xcode ? xcode : "N/A"}"
       f.puts "CLT: #{clt ? clt : "N/A"}"
       f.puts "X11: #{describe_xquartz}"