Merge remote-tracking branch 'origin/3.6'

27 files changed, 44 insertions, 44 deletions

diff --git a/CHANGELOG-3.3.md b/CHANGELOG-3.3.md
index a788535a79a..cd3d0f273a2 100644
--- a/CHANGELOG-3.3.md
+++ b/CHANGELOG-3.3.md
@@ -265,7 +265,7 @@ noted.
   standard Ice installation.
 
 - Improved the way the build system locates the Python framework on
-  Mac OS X.
+  macOS.
 
 ## Ruby Changes
 
@@ -741,7 +741,7 @@ noted.
 
 - The thread stack size specified with the `IceUtil::Thread::start()`
   method parameter is now adjusted to `PTHREAD_STACK_MIN` if it's
-  inferior to it. On Mac OS X, it's also adjusted to the next closest
+  inferior to it. On macOS, it's also adjusted to the next closest
   multiple of the page size (4KB).
 
 - Added a new overloading of the Ice::createInputStream method:
diff --git a/CHANGELOG-3.5.md b/CHANGELOG-3.5.md
index 17819a76aeb..07fa7136de9 100644
--- a/CHANGELOG-3.5.md
+++ b/CHANGELOG-3.5.md
@@ -148,7 +148,7 @@ class Compact(1)
 
 - The Slice compilers now define the `ICE_VERSION` preprocessor macro so that you can use the Ice version to conditionally compile your Slice definitions.
 
-- Fixed bug where the UDP client endpoint `--interface` option would be ignored on some platforms (Windows and OS X).
+- Fixed bug where the UDP client endpoint `--interface` option would be ignored on some platforms (Windows and macOS).
 IceGrid now enables active connection management for its object adapters to allow client connections to be closed automatically when inactive.
 
 - Improved `Ice.Trace.Network` tracing for transport acceptors. The tracing now shows when the object adapter starts listening for incoming connections and when it starts accepting them.
@@ -221,7 +221,7 @@ struct MyStruct {
 
 - Fixed a bug that could cause an assertion failure when flushing batch requests.
 
-- Added support for clang compiler on OS X.
+- Added support for clang compiler on macOS.
 
 - Fixed issue where a connection to a remote address would always fail with an assertion on Windows 8.
 
diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md
index 802e4ba2d41..2eed41a7c8a 100644
--- a/CHANGELOG-3.6.md
+++ b/CHANGELOG-3.6.md
@@ -83,7 +83,7 @@ These are the changes since Ice 3.6.4.
 with a element of type Object* items where unmarshal in reverse order.
 
 - Fixed a bug where metadata was not correctly ignored and can result in bogus
-code being generated if applying invalid metadata directives. 
+code being generated if applying invalid metadata directives.
 
 # Changes in Ice 3.6.3
 
@@ -193,7 +193,7 @@ These are the changes since Ice 3.6.1.
 - Fixed potential deadlock that could occur when using collocation optimization
   and serialized server thread pools.
 
-- Fixed IceSSL bug that would only show up with WSS servers running on OS X
+- Fixed IceSSL bug that would only show up with WSS servers running on macOS
   and Linux. The WSS server could stop reading requests if the client sent
   multiple requests within the same SSL record.
 
@@ -211,7 +211,7 @@ These are the changes since Ice 3.6.1.
 - Fixed an IceGridGUI bug where metrics attributes for Glacier2 and IceStorm
   were not displayed.
 
-- Fixed an IceGridGUI bug where the GUI started minimized in OS X.
+- Fixed an IceGridGUI bug where the GUI started minimized in macOS.
 
 ## Python Changes
 
@@ -294,7 +294,7 @@ These are the changes since Ice 3.6.0.
 
 ## PHP Changes
 
-- Update PHP builds for Linux and OS X to use php-config from PATH. It is no
+- Update PHP builds for Linux and macOS to use php-config from PATH. It is no
   longer necessary to set PHP_HOME.
 
 # Changes in Ice 3.6.0
@@ -359,7 +359,7 @@ These are the changes since Ice 3.5.1.
   member should always be `true` since servers always reject invalid client
   certificates.
 
-- The Ice distribution now supports the Objective-C mapping on OS X.
+- The Ice distribution now supports the Objective-C mapping on macOS.
 
 - The Glacier2 `SessionHelper` class now creates the callback object adapter
   automatically unless the application calls
@@ -663,11 +663,11 @@ These are the changes since Ice 3.5.1.
 
 - Significant changes to the IceSSL plug-in:
 
-    - Now uses the native SecureTransport API on OS X
+    - Now uses the native SecureTransport API on macOS
     - Now uses the native SChannel API on Windows
     - OpenSSL is only used in IceSSL on Linux
 
-- Added support for the `IceSSL.FindCert` property on Windows and OS X.
+- Added support for the `IceSSL.FindCert` property on Windows and macOS.
 
 - Added the new metadata tag `cpp:view-type:Type`, where `Type` is a type that
   can safely provide a "view" into the Ice unmarshaling buffer and thereby avoid
diff --git a/README.md b/README.md
index faf5453d68d..72c5b543fa1 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Ice runs on a wide range of platforms:
 - Linux
 - Linux on embedded devices
 - Node.js
-- OS X
+- macOS
 - Web Browser
 - Windows
 - Universal Windows
diff --git a/cpp/BuildInstructionsOSX.md b/cpp/BuildInstructionsOSX.md
index ca84338b04d..ebecf058b12 100644
--- a/cpp/BuildInstructionsOSX.md
+++ b/cpp/BuildInstructionsOSX.md
@@ -1,4 +1,4 @@
-# Building Ice for C++ on OS X
+# Building Ice for C++ on macOS
 
 This file describes the Ice source distribution, including information about
 compiler requirements, third-party dependencies, and instructions for building
diff --git a/cpp/src/Ice/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp
index 53887744c01..3a363cc3709 100644
--- a/cpp/src/Ice/CountDownLatch.cpp
+++ b/cpp/src/Ice/CountDownLatch.cpp
@@ -115,7 +115,7 @@ IceUtilInternal::CountDownLatch::countDown()
     }
 #if defined(__APPLE__)
     //
-    // On OS X we do the broadcast with the mutex held. This seems to
+    // On macOS we do the broadcast with the mutex held. This seems to
     // be necessary to prevent the broadcast call to hang (spinning in
     // an infinite loop).
     //
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index 6273ebd7a98..82ca2addc02 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -183,7 +183,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
 
 #ifdef __APPLE__
     //
-    // On OS X fallback to .so and .bundle extensions, if the default
+    // On macOS fallback to .so and .bundle extensions, if the default
     // .dylib fails.
     //
     if(!load(lib + ".dylib"))
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 572df1b4cfc..599f6537896 100755
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -1107,7 +1107,7 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol
 
     // In theory, getaddrinfo should only return EAI_NONAME if
     // AI_NUMERICHOST is specified and the host name is not a IP
-    // address. However on some platforms (e.g. OS X 10.4.x)
+    // address. However on some platforms (e.g. macOS 10.4.x)
     // EAI_NODATA is also returned so we also check for it.
 #  ifdef EAI_NODATA
     if(!canBlock && (rs == EAI_NONAME || rs == EAI_NODATA))
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index bcb78ed2373..2b36f64d754 100755
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -899,7 +899,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance,
 
     //
     // NOTE: setting the multicast interface before performing the
-    // connect is important for some OS such as OS X.
+    // connect is important for some OS such as macOS.
     //
     if(isMulticast(_addr))
     {
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index 63aa2583532..4fb9f32850d 100644
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -34,7 +34,7 @@
 
 #include <iterator>
 
-// Ignore OS X OpenSSL deprecation warnings
+// Ignore macOS OpenSSL deprecation warnings
 #ifdef __APPLE__
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
index 6d83dba98df..a4fad08ca87 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
@@ -160,7 +160,7 @@ checkTrustResult(SecTrustRef trust,
     }
     default:
     // case kSecTrustResultInvalid:
-    // case kSecTrustResultConfirm: // Used in old OS X versions
+    // case kSecTrustResultConfirm: // Used in old macOS versions
     // case kSecTrustResultDeny:
     // case kSecTrustResultRecoverableTrustFailure:
     // case kSecTrustResultFatalTrustFailure:
diff --git a/cpp/test/Ice/udp/AllTests.cpp b/cpp/test/Ice/udp/AllTests.cpp
index fbb4e7ea083..450d6e6c9f5 100644
--- a/cpp/test/Ice/udp/AllTests.cpp
+++ b/cpp/test/Ice/udp/AllTests.cpp
@@ -200,7 +200,7 @@ allTests(const CommunicatorPtr& communicator)
 
     //
     // Sending the replies back on the multicast UDP connection doesn't work for most
-    // platform (it works for OS X Leopard but not Snow Leopard, doesn't work on SLES,
+    // platform (it works for macOS Leopard but not Snow Leopard, doesn't work on SLES,
     // Windows...). For Windows, see UdpTransceiver constructor for the details. So
     // we don't run this test.
     //
diff --git a/cpp/test/IceSSL/certs/makecerts.py b/cpp/test/IceSSL/certs/makecerts.py
index 424213a7307..aa60ddb3bdb 100755
--- a/cpp/test/IceSSL/certs/makecerts.py
+++ b/cpp/test/IceSSL/certs/makecerts.py
@@ -168,7 +168,7 @@ for (ca, alias, path, args) in savecerts:
         cert.save(path + ".p12", **args)
 
 #
-# Create DH parameters to use with OS X Secure Transport.
+# Create DH parameters to use with macOS Secure Transport.
 #
 if clean or not os.path.exists("dh_params512.der"):
     ca1.run("openssl", "dhparam", 512, outform="DER", out="dh_params512.der")
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index b619416eff5..0fcfcb8deca 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -2164,7 +2164,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
         // }
 #  else
         //
-        // In OS X we don't support IceSSL.Protocols as secure transport doesn't allow to set the enabled protocols
+        // In macOS we don't support IceSSL.Protocols as secure transport doesn't allow to set the enabled protocols
         // instead we use IceSSL.ProtocolVersionMax IceSSL.ProtocolVersionMin to set the maximun and minimum
         // enabled protocol versions. See the test bellow.
         //
@@ -2608,7 +2608,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
         {
 #    ifndef ICE_USE_SECURE_TRANSPORT
             //
-            // OS X 10.10 bug the handshake fails attempting client auth
+            // macOS 10.10 bug the handshake fails attempting client auth
             // with anon cipher.
             //
             cerr << ex << endl;
diff --git a/csharp/src/Ice/Network.cs b/csharp/src/Ice/Network.cs
index babefa65710..7606f6f4a98 100644
--- a/csharp/src/Ice/Network.cs
+++ b/csharp/src/Ice/Network.cs
@@ -127,7 +127,7 @@ namespace IceInternal
 
         public static bool notConnected(SocketException ex)
         {
-            // BUGFIX: SocketError.InvalidArgument because shutdown() under OS X returns EINVAL
+            // BUGFIX: SocketError.InvalidArgument because shutdown() under macOS returns EINVAL
             // if the server side is gone.
             // BUGFIX: shutdown() under Vista might return SocketError.ConnectionReset
             SocketError error = socketErrorCode(ex);
diff --git a/csharp/test/Ice/udp/AllTests.cs b/csharp/test/Ice/udp/AllTests.cs
index 522f3994f9e..12a7c8c2405 100644
--- a/csharp/test/Ice/udp/AllTests.cs
+++ b/csharp/test/Ice/udp/AllTests.cs
@@ -215,7 +215,7 @@ public class AllTests
 
         //
         // Sending the replies back on the multicast UDP connection doesn't work for most
-        // platform (it works for OS X Leopard but not Snow Leopard, doesn't work on SLES,
+        // platform (it works for macOS Leopard but not Snow Leopard, doesn't work on SLES,
         // Windows...). For Windows, see UdpTransceiver constructor for the details. So
         // we don't run this test.
         //
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/Selector.java b/java-compat/src/Ice/src/main/java/IceInternal/Selector.java
index caf607a60d3..cd0d471821a 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/Selector.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/Selector.java
@@ -262,7 +262,7 @@ public final class Selector
             }
             catch(java.nio.channels.CancelledKeyException ex)
             {
-                // This sometime occurs on OS X, ignore.
+                // This sometime occurs on macOS, ignore.
                 continue;
             }
             catch(java.io.IOException ex)
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java b/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
index 288af7da40d..15979f8aac1 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/UdpTransceiver.java
@@ -381,7 +381,7 @@ final class UdpTransceiver implements Transceiver
             Network.setBlock(_fd, false);
             //
             // NOTE: setting the multicast interface before performing the
-            // connect is important for some OS such as OS X.
+            // connect is important for some OS such as macOS.
             //
             if(_addr.getAddress().isMulticastAddress())
             {
diff --git a/java/BuildInstructions.md b/java/BuildInstructions.md
index 4d1892733d4..10c9f137637 100644
--- a/java/BuildInstructions.md
+++ b/java/BuildInstructions.md
@@ -8,7 +8,7 @@ platforms.
 
 ### Operating Systems
 
-Ice for Java is expected to build and run properly on Windows, OS X, and any
+Ice for Java is expected to build and run properly on Windows, macOS, and any
 recent Linux distribution for x86 and x86_64, and was extensively tested using
 the operating systems and compiler versions listed for our [supported
 platforms][2]. Due to the portability of Java, it is very likely that it will
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java
index 39abd6906a4..29137d04c51 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java
@@ -29,7 +29,7 @@ public class Main extends JFrame
         //
         try
         {
-            if(System.getProperty("os.name").startsWith("Mac OS")) // OS X L&F
+            if(System.getProperty("os.name").startsWith("Mac OS")) // macOS L&F
             {
                 UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
             }
diff --git a/java/test/src/main/java/test/Ice/udp/AllTests.java b/java/test/src/main/java/test/Ice/udp/AllTests.java
index a2c41512a63..e765ef5dc65 100644
--- a/java/test/src/main/java/test/Ice/udp/AllTests.java
+++ b/java/test/src/main/java/test/Ice/udp/AllTests.java
@@ -211,7 +211,7 @@ public class AllTests
 
         //
         // Sending the replies back on the multicast UDP connection doesn't work for most
-        // platform (it works for OS X Leopard but not Snow Leopard, doesn't work on SLES,
+        // platform (it works for macOS Leopard but not Snow Leopard, doesn't work on SLES,
         // Windows...). For Windows, see UdpTransceiver constructor for the details. So
         // we don't run this test.
         //
diff --git a/js/BuildInstructions.md b/js/BuildInstructions.md
index 864965ed581..ae4092988c9 100644
--- a/js/BuildInstructions.md
+++ b/js/BuildInstructions.md
@@ -46,7 +46,7 @@ This requires that you build the Java test controller from the Java subdirectory
 and test servers from C++, C# or Java. Follow the instructions from the
 corresponding language mapping to build the tests and the server controller.
 
-In OS X the first time you run the script, you will be prompted for your
+In macOS the first time you run the script, you will be prompted for your
 password. This is necessary to configure the trust setting for the HTTP
 server certificate, which will enable you to connect to the HTTP server
 with SSL via your web browser.
diff --git a/objective-c/BuildInstructions.md b/objective-c/BuildInstructions.md
index f5c17d5224b..18ab900848b 100644
--- a/objective-c/BuildInstructions.md
+++ b/objective-c/BuildInstructions.md
@@ -1,7 +1,7 @@
-# Building Ice for Objective-C on OS X
+# Building Ice for Objective-C on macOS
 
 This page describes how to build and install Ice for Objective-C from source
-code on OS X. If you prefer, you can install a [Homebrew][1] package instead.
+code on macOS. If you prefer, you can install a [Homebrew][1] package instead.
 
 ## Objective-C Build Requirements
 
diff --git a/php/BuildInstructionsLinuxOSX.md b/php/BuildInstructionsLinuxOSX.md
index f7050f8d03b..e0b6c3717c4 100644
--- a/php/BuildInstructionsLinuxOSX.md
+++ b/php/BuildInstructionsLinuxOSX.md
@@ -1,7 +1,7 @@
-# Building Ice for PHP on Linux and OS X
+# Building Ice for PHP on Linux and macOS
 
 This page describes how to build and install Ice for PHP from source code on
-Linux and OS X. If you prefer, you can also download [binary distributions][1]
+Linux and macOS. If you prefer, you can also download [binary distributions][1]
 for the supported platforms.
 
 ## PHP Build Requirements
@@ -71,7 +71,7 @@ shown below:
     $ php -m
 
 Look for `ice` among the installed modules. Note that your library search path
-(`LD_LIBRARY_PATH` on Linux or `DYLD_LIBRARY_PATH` on OS X) must include the
+(`LD_LIBRARY_PATH` on Linux or `DYLD_LIBRARY_PATH` on macOS) must include the
 directory containing the Ice shared libraries.
 
 Read the PHP Dependencies and PHP Source Files sections below for more
diff --git a/python/BuildInstructionsLinuxOSX.md b/python/BuildInstructionsLinuxOSX.md
index dad1e2ef772..bb019a45494 100644
--- a/python/BuildInstructionsLinuxOSX.md
+++ b/python/BuildInstructionsLinuxOSX.md
@@ -1,14 +1,14 @@
-# Building Ice for Python on Linux and OS X
+# Building Ice for Python on Linux and macOS
 
 This page describes how to build and install Ice for Python from source code on
-Linux and OS X. If you prefer, you can also download [binary distributions][1]
+Linux and macOS. If you prefer, you can also download [binary distributions][1]
 for the supported platforms.
 
 ## Python Build Requirements
 
 ### Operating Systems and Compilers
 
-Ice for Python is expected to build and run properly on OS X and any recent
+Ice for Python is expected to build and run properly on macOS and any recent
 Linux distribution for x86 and x86_64, and was extensively tested using the
 operating systems and compiler versions listed for our [supported platforms][2].
 
diff --git a/ruby/BuildInstructionsLinuxOSX.md b/ruby/BuildInstructionsLinuxOSX.md
index 2dda2fe0eec..b9ffcc2c747 100644
--- a/ruby/BuildInstructionsLinuxOSX.md
+++ b/ruby/BuildInstructionsLinuxOSX.md
@@ -1,21 +1,21 @@
 # Building Ice for Ruby on Linux
 
 This file describes how to build and install Ice for Ruby from source code on
-Linux and OS X. If you prefer, you can also download [binary distributions][1]
+Linux and macOS. If you prefer, you can also download [binary distributions][1]
 for the supported platforms.
 
 ## Ruby Build Requirements
 
 ### Operating Systems and Compilers
 
-Ice for Ruby is expected to build and run properly on OS X and on any recent
+Ice for Ruby is expected to build and run properly on macOS and on any recent
 Linux distribution for x86 and x86_64, and was extensively tested using the
 operating systems and Ruby versions listed for our [supported platforms][2].
 
 ### Ruby Versions
 
 Ice for Ruby supports Ruby versions 1.8.1 or later. You can use a source or
-binary installation of Ruby. 
+binary installation of Ruby.
 
 If you use an RPM installation, the following packages are required:
 
@@ -85,7 +85,7 @@ You must also modify `LD_LIBRARY_PATH` or `DYLD_LIBRARY_PATH` to include the
 directory `/opt/Ice/lib`:
 
     $ export LD_LIBRARY_PATH=/opt/Ice/lib:$LD_LIBRARY_PATH       (Linux)
-    $ export DYLD_LIBRARY_PATH=/opt/Ice/lib:$DYLD_LIBRARY_PATH   (OS X)
+    $ export DYLD_LIBRARY_PATH=/opt/Ice/lib:$DYLD_LIBRARY_PATH   (macOS)
 
 To verify that Ruby can load the Ice extension successfully, open a command
 window and start the interpreter using `irb`:
diff --git a/ruby/config/Make.rules b/ruby/config/Make.rules
index 715d24212f9..b5f23f6efb0 100644
--- a/ruby/config/Make.rules
+++ b/ruby/config/Make.rules
@@ -29,7 +29,7 @@ ifneq ($(wildcard $(ruby_config_dir)/ruby/config.h),)
     ruby_cppflags += -I$(ruby_config_dir)
 endif
 
-# OS X & macOS with LLVM-Clang > 7.3 and the system version of Ruby require '-Wno-shift-negative-value'. This issue
+# macOS & macOS with LLVM-Clang > 7.3 and the system version of Ruby require '-Wno-shift-negative-value'. This issue
 # has been patched in more recent 2.x Ruby versions.
 ifeq ($(shell uname),Darwin)
     ifeq ($(shell which $(RUBY)),/usr/bin/ruby)