Fixed ICE-4998 - Remove Mac OS references from documentation files

20 files changed, 35 insertions, 33 deletions

diff --git a/cpp/INSTALL.MACOSX b/cpp/INSTALL.MACOSX
index 4036435856a..20b3ac7c731 100644
--- a/cpp/INSTALL.MACOSX
+++ b/cpp/INSTALL.MACOSX
@@ -6,8 +6,8 @@ Requirements
 Operating System
 ----------------
 
-Ice is expected to build and run properly on any recent Mac OS X
-version. However, Ice is officially supported only on Mac OS X 10.8.
+Ice is expected to build and run properly on any recent OS X
+version. However, Ice is officially supported only on OS X 10.8.
 
 
 C++ compiler
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 89591f36d5f..e2397656dbf 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -34,15 +34,15 @@ create_runpath_symlink	?= no
 
 #
 # Define LP64 as yes or no if you want force a 32 or 64 bit. The
-# default is platform-dependent. This property has no effect on Mac
-# OS X. On Mac OS X use CXXARCHFLAGS bellow to establish the build 
+# default is platform-dependent. This property has no effect on 
+# OS X. On OS X, use CXXARCHFLAGS bellow to establish the build
 # architectures.
 #
 #LP64			?= yes
 
 #
 # The build architectures for gcc/llvm based builds. The format of
-# these build flags are OS dependent. For example, under Mac OS X to
+# these build flags are OS dependent. For example, under OS X to
 # build binaries which support both i386 and x86_64 you would use
 # "-arch i386 -arch x86_64".  The default is OS version dependent. Be
 # aware that this value may conflict with the setting of LP64 above.
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index b0b5809adcd..17f8b0f1da9 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -41,7 +41,7 @@ endif
 CXXLIBS		=
 
 ifneq ($(embedded_runpath_prefix),)
-    # Only use -rpath if Mac OS X >= 10.5
+    # Only use -rpath if OS X >= 10.5
     release = $(shell uname -r)
     ifeq ($(shell test $(firstword $(subst ., ,$(release))) -ge 9 && echo 0),0)
 	LDPLATFORMFLAGS     = -Wl,-rpath,$(runpath_libdir)
diff --git a/cpp/demo/Freeze/customEvictor/CurrentDatabase.cpp b/cpp/demo/Freeze/customEvictor/CurrentDatabase.cpp
index a042a6fcda4..43d8222daa3 100644
--- a/cpp/demo/Freeze/customEvictor/CurrentDatabase.cpp
+++ b/cpp/demo/Freeze/customEvictor/CurrentDatabase.cpp
@@ -23,7 +23,7 @@ using namespace IceUtil;
 #endif
 
 //
-// GCC on MacOS doesn't support __thread; and on HP-UX with aC++, there
+// GCC on OS X doesn't support __thread; and on HP-UX with aC++, there
 // is strange compiler or linker bug when using __thread.
 //
 #if defined(__HP_aCC) || defined(__APPLE__)
diff --git a/cpp/demo/Freeze/customEvictor/expect.py b/cpp/demo/Freeze/customEvictor/expect.py
index 4faef2caf7b..a7f6eb1e665 100755
--- a/cpp/demo/Freeze/customEvictor/expect.py
+++ b/cpp/demo/Freeze/customEvictor/expect.py
@@ -22,7 +22,7 @@ sys.path.append(path[0])
 from demoscript import Util
 
 if Util.isDarwin():
-    print("This demo is not supported under MacOS.")
+    print("This demo is not supported under OS X.")
     sys.exit(0)
 
 sys.stdout.write("cleaning databases... ")
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index a054705c4fe..3536799ba41 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -700,9 +700,10 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol
     }
     while(info == 0 && rs == EAI_AGAIN && --retry >= 0);
 
-    // 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. Mac OS X 10.4.x) EAI_NODATA is also returned so 
-    // we also check for it.
+    // 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)
+    // EAI_NODATA is also returned so we also check for it.
 #ifdef EAI_NODATA
     if(!blocking && (rs == EAI_NONAME || rs == EAI_NODATA))
 #else
diff --git a/cpp/src/IceUtil/CountDownLatch.cpp b/cpp/src/IceUtil/CountDownLatch.cpp
index 05e6be3d5df..66c0a39c1e6 100644
--- a/cpp/src/IceUtil/CountDownLatch.cpp
+++ b/cpp/src/IceUtil/CountDownLatch.cpp
@@ -111,8 +111,9 @@ IceUtilInternal::CountDownLatch::countDown()
     }
 #if defined(__APPLE__)
     //
-    // On MacOS X 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).
+    // On OS X 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).
     //
     if(broadcast)
     {
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index bb6bbb9f2a3..a6f2c6e9329 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -158,7 +158,7 @@ sigwaitThread(void*)
         int rc = sigwait(&ctrlCLikeSignals, &signal);
 #if defined(__APPLE__)
         //
-        // WORKAROUND: sigwait is not a cancelation point on MacOS X. To cancel this thread, the 
+        // WORKAROUND: sigwait is not a cancelation point on OS X. To cancel this thread, the 
         // destructor cancels the thread and send a signal to the thread to unblock sigwait, then
         // we explicitly test for cancellation.
         //
@@ -239,7 +239,7 @@ CtrlCHandler::~CtrlCHandler()
     assert(rc == 0);
 #if defined(__APPLE__)
     //
-    // WORKAROUND: sigwait isn't a cancellation point on MacOS X, see
+    // WORKAROUND: sigwait isn't a cancellation point on OS X, see
     // comment in sigwaitThread
     //
     pthread_kill(_tid, SIGTERM);
diff --git a/cs/src/Ice/BasicStream.cs b/cs/src/Ice/BasicStream.cs
index 1011262bc52..a091dd2b90b 100644
--- a/cs/src/Ice/BasicStream.cs
+++ b/cs/src/Ice/BasicStream.cs
@@ -679,7 +679,7 @@ namespace IceInternal
             try
             {
                 //
-                // COMPILERFIX: for some reasons _buf.get() doesn't work here on MacOS X with Mono;
+                // COMPILERFIX: for some reasons _buf.get() doesn't work here on OS X with Mono;
                 //
                 //byte b = _buf.b.get();
                 byte b = readByte();
diff --git a/cs/src/Ice/Network.cs b/cs/src/Ice/Network.cs
index c698bc34744..64118e439d3 100644
--- a/cs/src/Ice/Network.cs
+++ b/cs/src/Ice/Network.cs
@@ -309,7 +309,7 @@ namespace IceInternal
         
         public static bool notConnected(SocketException ex)
         {
-            // BUGFIX: SocketError.InvalidArgument because shutdown() under MacOS returns EINVAL
+            // BUGFIX: SocketError.InvalidArgument because shutdown() under OS X returns EINVAL
             // if the server side is gone.
             // BUGFIX: shutdown() under Vista might return SocketError.ConnectionReset
             SocketError error = socketErrorCode(ex);
diff --git a/distribution/src/common/Make.rules b/distribution/src/common/Make.rules
index 3f4d7d3083a..3d8bd79b1e3 100644
--- a/distribution/src/common/Make.rules
+++ b/distribution/src/common/Make.rules
@@ -27,7 +27,7 @@ embedded_runpath_prefix  ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
 
 #
 # The build architectures for gcc based builds. The format of these
-# build flags are OS dependent. For example, under Mac OS X to build
+# build flags are OS dependent. For example, under OS X to build
 # binaries which support both i386 and x86_64 you would use "-arch
 # i386 -arch x86_64". The default is OS version dependent. Be aware
 # that this value may conflict with the setting of LP64 above.
diff --git a/distribution/src/thirdparty/README b/distribution/src/thirdparty/README
index 79be6397203..365b6257912 100644
--- a/distribution/src/thirdparty/README
+++ b/distribution/src/thirdparty/README
@@ -32,7 +32,7 @@ Table of Contents
   2. Instructions for Linux
      - Berkeley DB
      - mcpp
-  3. Instructions for Mac OS X
+  3. Instructions for OS X
      - Berkeley DB
      - mcpp
   4. Instructions for Solaris
@@ -90,7 +90,7 @@ library installation directory from $(prefix)/lib to $(prefix>/lib64.
 
 
 ======================================================================
-3. Instructions for Mac OS X
+3. Instructions for OS X
 ======================================================================
 
 Berkeley DB
diff --git a/distribution/src/unix/README.Darwin b/distribution/src/unix/README.Darwin
index eb4ff31513b..58e024f40a4 100644
--- a/distribution/src/unix/README.Darwin
+++ b/distribution/src/unix/README.Darwin
@@ -22,10 +22,10 @@ available for customers who wish to use Ice in proprietary products.
 Please contact sales@zeroc.com for more information on licensing Ice.
 
 
-Getting Started with Ice on Mac OS X
+Getting Started with Ice on OS X
 ------------------------------------
 
-Please visit the 'Using the Mac OS X Binary Distribution' section in
+Please visit the 'Using the OS X Binary Distribution' section in
 the Ice @ver@ release notes:
 
 http://doc.zeroc.com/display/Rel/Ice+@ver@+Release+Notes
diff --git a/java/src/IceInternal/Selector.java b/java/src/IceInternal/Selector.java
index 8ca48de9a6e..9ade52350c7 100644
--- a/java/src/IceInternal/Selector.java
+++ b/java/src/IceInternal/Selector.java
@@ -269,7 +269,7 @@ public final class Selector
             }
             catch(java.nio.channels.CancelledKeyException ex)
             {
-                // This sometime occurs on Mac OS X, ignore.
+                // This sometime occurs on OS X, ignore.
                 continue;
             }
             catch(java.io.IOException ex)
diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/Freeze/evictor/RemoteEvictorI.java
index cfb6c7fe620..ce112930a5f 100644
--- a/java/test/Freeze/evictor/RemoteEvictorI.java
+++ b/java/test/Freeze/evictor/RemoteEvictorI.java
@@ -59,7 +59,7 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
         _category = category;
 
         //
-        // NOTE: COMPILERBUG: The timeout here is required for MacOS X. It shouldn't be too low since
+        // NOTE: COMPILERBUG: The timeout here is required for OS X. It shouldn't be too low since
         // some operations can take some time to complete on slow machines.
         //
         _evictorAdapter = communicator.
diff --git a/php/INSTALL b/php/INSTALL
index bfdccd33fd9..34bf87390ea 100644
--- a/php/INSTALL
+++ b/php/INSTALL
@@ -16,7 +16,7 @@ Requirements
 
 
 ======================================================================
-Building the Ice for PHP extension (Linux/Mac OS X)
+Building the Ice for PHP extension (Linux/OS X)
 ======================================================================
 
 This source distribution only supports building Ice for PHP as a
@@ -115,7 +115,7 @@ To build the Ice extension, follow these instructions:
 
 
 ======================================================================
-Installing the Extension (Linux/Mac OS X)
+Installing the Extension (Linux/OS X)
 ======================================================================
 
 To install the Ice extension, you must move the extension's shared
@@ -142,7 +142,7 @@ following line on Linux:
 
   extension = IcePHP.so
 
-Or on Mac OS X:
+Or on OS X:
 
   extension = IcePHP.dy
 
@@ -155,7 +155,7 @@ Open the configuration file and append the following line on Linux:
 
   extension = IcePHP.so
 
-Or on Mac OS X:
+Or on OS X:
 
   extension = IcePHP.dy
 
@@ -165,7 +165,7 @@ command 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 Mac OS
+search path (LD_LIBRARY_PATH on Linux or DYLD_LIBRARY_PATH on OS
 X) must include the directory containing the Ice shared libraries.
 
 Read the "Dependencies" and "Source Files" sections below for more
diff --git a/py/INSTALL b/py/INSTALL
index 61357af2d80..c5cac9afd90 100644
--- a/py/INSTALL
+++ b/py/INSTALL
@@ -15,7 +15,7 @@ build the Ice extension for Python.
 
 
 ======================================================================
-Building the Ice extension for Python (Linux/Solaris/Mac OS X)
+Building the Ice extension for Python (Linux/Solaris/OS X)
 ======================================================================
 
 Follow these steps to build the Ice extension for Python:
diff --git a/py/config/Make.rules b/py/config/Make.rules
index e43668c92d2..2df6c144a54 100644
--- a/py/config/Make.rules
+++ b/py/config/Make.rules
@@ -61,7 +61,7 @@ PYTHON_LIBS	    ?= -L$(PYTHON_LIB_DIR) -l$(PYTHON_LIB_NAME)
 
 #
 # The build architectures for gcc based builds. The format of these
-# build flags are OS dependent. For example, under Mac OS X to build
+# build flags are OS dependent. For example, under OS X to build
 # binaries which support both i386 and x86_64 you would use "-arch
 # i386 -arch x86_64".  The default is OS version dependent. Be aware
 # that this value may conflict with the setting of LP64 above.
diff --git a/rb/config/Make.rules b/rb/config/Make.rules
index fdb5a2ec070..95bc0fc80b3 100644
--- a/rb/config/Make.rules
+++ b/rb/config/Make.rules
@@ -98,7 +98,7 @@ RUBY_LIBS		= -L$(RUBY_LIB_DIR) $(RUBY_LIB)
 
 #
 # The build architectures for gcc based builds. The format of these
-# build flags are OS dependent. For example, under Mac OS X to build
+# build flags are OS dependent. For example, under OS X to build
 # binaries which support both i386 and x86_64 you would use "-arch
 # i386 -arch x86_64".  The default is OS version dependent. Be aware
 # that this value may conflict with the setting of LP64 above.
diff --git a/rb/config/Make.rules.Darwin b/rb/config/Make.rules.Darwin
index f4e89a32caf..94a2d3598d8 100644
--- a/rb/config/Make.rules.Darwin
+++ b/rb/config/Make.rules.Darwin
@@ -8,7 +8,7 @@
 # **********************************************************************
 
 $(warning ===================================================================) 
-$(warning Mac OS X is currently an unsupported platform for Ice for Ruby.)
+$(warning OS X is currently an unsupported platform for Ice for Ruby.)
 $(warning Contact sales@zeroc.com if you wish to sponsor official support.)
 $(warning ===================================================================)