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

8 files changed, 17 insertions, 15 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);