From 3f9cce0a03e967d2e7bcb7cd16bbc898c1a35708 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Sun, 18 Sep 2016 19:57:19 +0100
Subject: 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.
---
 Library/Homebrew/requirements/maximum_macos_requirement.rb | 2 +-
 Library/Homebrew/requirements/minimum_macos_requirement.rb | 2 +-
 Library/Homebrew/requirements/python_requirement.rb        | 2 +-
 Library/Homebrew/requirements/unsigned_kext_requirement.rb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Library/Homebrew/requirements')

diff --git a/Library/Homebrew/requirements/maximum_macos_requirement.rb b/Library/Homebrew/requirements/maximum_macos_requirement.rb
index ad60af063..ceaa5184b 100644
--- a/Library/Homebrew/requirements/maximum_macos_requirement.rb
+++ b/Library/Homebrew/requirements/maximum_macos_requirement.rb
@@ -12,7 +12,7 @@ class MaximumMacOSRequirement < Requirement
 
   def message
     <<-EOS.undent
-      This formula either does not compile or function as expected on OS X
+      This formula either does not compile or function as expected on macOS
       versions newer than #{@version.pretty_name} due to an upstream incompatibility.
     EOS
   end
diff --git a/Library/Homebrew/requirements/minimum_macos_requirement.rb b/Library/Homebrew/requirements/minimum_macos_requirement.rb
index f128a6615..8f82001ea 100644
--- a/Library/Homebrew/requirements/minimum_macos_requirement.rb
+++ b/Library/Homebrew/requirements/minimum_macos_requirement.rb
@@ -11,6 +11,6 @@ class MinimumMacOSRequirement < Requirement
   satisfy(build_env: false) { MacOS.version >= @version }
 
   def message
-    "OS X #{@version.pretty_name} or newer is required."
+    "macOS #{@version.pretty_name} or newer is required."
   end
 end
diff --git a/Library/Homebrew/requirements/python_requirement.rb b/Library/Homebrew/requirements/python_requirement.rb
index 478f6286e..5d79f2a18 100644
--- a/Library/Homebrew/requirements/python_requirement.rb
+++ b/Library/Homebrew/requirements/python_requirement.rb
@@ -10,7 +10,7 @@ class PythonRequirement < Requirement
     next unless python
     version = python_short_version
     next unless version
-    # Always use Python 2.7 for consistency on older versions of OSX.
+    # Always use Python 2.7 for consistency on older versions of Mac OS X.
     version == Version.create("2.7")
   end
 
diff --git a/Library/Homebrew/requirements/unsigned_kext_requirement.rb b/Library/Homebrew/requirements/unsigned_kext_requirement.rb
index f57be6577..2ffc8fda3 100644
--- a/Library/Homebrew/requirements/unsigned_kext_requirement.rb
+++ b/Library/Homebrew/requirements/unsigned_kext_requirement.rb
@@ -8,7 +8,7 @@ class UnsignedKextRequirement < Requirement
   def message
     s = <<-EOS.undent
       Building this formula from source isn't possible due to OS X
-      Yosemite and above's strict unsigned kext ban.
+      Yosemite (10.10) and above's strict unsigned kext ban.
     EOS
     s += super
     s
-- 
cgit v1.2.3