Cosmetic corrections - Mac OS X

9 files changed, 18 insertions, 18 deletions

diff --git a/CHANGES b/CHANGES
index eb500e5f4..691fa5544 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1726,7 +1726,7 @@ Version 2.0.6 (30 April 2012)
             [Lua] Fix uninitialised variable in SWIGTYPE **OUTPUT typemaps as reported by Jim Anderson.
 
 2012-04-28: wsfulton
-            [Python] Fix compilation errors when wrapping STL containers on Mac OSX and possibly other systems.
+            [Python] Fix compilation errors when wrapping STL containers on Mac OS X and possibly other systems.
 
 2012-04-28: wsfulton
             [Java] Patch 3521811 from Leo Davis - char **STRING_ARRAY typemaps fixed to handle
@@ -2421,7 +2421,7 @@ Version 2.0.2 (20 February 2011)
             Update chapter name to MzScheme/Racket accounting for the rename of MzScheme to Racket.
 
 2011-02-05: wsfulton
-            [C#] SF #3085906 - Possible fix running test-suite on Mac OSX.
+            [C#] SF #3085906 - Possible fix running test-suite on Mac OS X.
 
 2011-02-05: wsfulton
             SF #3173367 Better information during configure about Boost prerequisite for running
@@ -4074,7 +4074,7 @@ Version 1.3.37 (13 January 2009)
             in Allegro CL
 
 2008-07-19: wsfulton
-            Fix building of Tcl examples/test-suite on Mac OSX reported by Gideon Simpson.
+            Fix building of Tcl examples/test-suite on Mac OS X reported by Gideon Simpson.
 
 2008-07-17: wsfulton
             Fix SF #2019156 Configuring with --without-octave or --without-alllang
@@ -12895,7 +12895,7 @@ Version 1.3.20 (December 17, 2003)
             Suggested by Kerim Borchaev.
 
 11/11/2003: beazley
-            Configuration changes to make SWIG work on Mac OSX 10.3.x (Panther).
+            Configuration changes to make SWIG work on Mac OS X 10.3.x (Panther).
             Tested with Python, Tcl, Perl, and Ruby---all of which seem to work.
 
 11/08/2003: cheetah (William Fulton)
diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index 06c858b29..e8b1e3477 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -1072,7 +1072,7 @@
 </ul>
 <li><a href="Javascript.html#Javascript_embedded_webkit">Embedded Webkit</a>
 <ul>
-<li><a href="Javascript.html#Javascript_osx">OSX</a>
+<li><a href="Javascript.html#Javascript_osx">Mac OS X</a>
 <li><a href="Javascript.html#Javascript_gtk">GTK</a>
 </ul>
 <li><a href="Javascript.html#Javascript_applications_webkit">Creating Applications with node-webkit</a>
diff --git a/Doc/Manual/Javascript.html b/Doc/Manual/Javascript.html
index 7857d9770..613ca99ed 100644
--- a/Doc/Manual/Javascript.html
+++ b/Doc/Manual/Javascript.html
@@ -25,7 +25,7 @@
 </ul>
 <li><a href="#Javascript_embedded_webkit">Embedded Webkit</a>
 <ul>
-<li><a href="#Javascript_osx">OSX</a>
+<li><a href="#Javascript_osx">Mac OS X</a>
 <li><a href="#Javascript_gtk">GTK</a>
 </ul>
 <li><a href="#Javascript_applications_webkit">Creating Applications with node-webkit</a>
@@ -156,7 +156,7 @@ $ make check-javascript-examples V8_VERSION=0x032530 ENGINE=v8</pre>
     <li><p><code>instanceOf</code> does not work under JSC</p></li>
 </ul>
 
-<p>The primary development environment has been Linux (Ubuntu 12.04). Windows and OSX have been tested sporadically. Therefore, the generators might have more issues on those platforms. Please report back any problem you observe to help us improving this module quickly.</p>
+<p>The primary development environment has been Linux (Ubuntu 12.04). Windows and Mac OS X have been tested sporadically. Therefore, the generators might have more issues on those platforms. Please report back any problem you observe to help us improving this module quickly.</p>
 
 <H2><a name="Javascript_integration"></a>26.3 Integration</H2>
 
@@ -166,7 +166,7 @@ $ make check-javascript-examples V8_VERSION=0x032530 ENGINE=v8</pre>
 <H3><a name="Javascript_node_extensions"></a>26.3.1 Creating node.js Extensions</H3>
 
 
-<p>To install <code>node.js</code> you can download an installer from their <a href="https://launchpad.net/~chris-lea/+archive/node.js">web-site</a> for OSX and Windows. For Linux you can either build the source yourself and run <code>sudo checkinstall</code> or keep to the (probably stone-age) packaged version. For Ubuntu there is a <a href="https://launchpad.net/~chris-lea/+archive/node.js/">PPA</a> available.</p>
+<p>To install <code>node.js</code> you can download an installer from their <a href="https://launchpad.net/~chris-lea/+archive/node.js">web-site</a> for Mac OS X and Windows. For Linux you can either build the source yourself and run <code>sudo checkinstall</code> or keep to the (probably stone-age) packaged version. For Ubuntu there is a <a href="https://launchpad.net/~chris-lea/+archive/node.js/">PPA</a> available.</p>
 <div class="shell">
 <pre>
 $ sudo add-apt-repository ppa:chris-lea/node.js
@@ -224,9 +224,9 @@ $ sudo apt-get remove gyp</pre>
 <H3><a name="Javascript_embedded_webkit"></a>26.3.2 Embedded Webkit</H3>
 
 
-<p>Webkit is pre-installed on OSX and available as a library for GTK.</p>
+<p>Webkit is pre-installed on Mac OS X and available as a library for GTK.</p>
 
-<H4><a name="Javascript_osx"></a>26.3.2.1 OSX</H4>
+<H4><a name="Javascript_osx"></a>26.3.2.1 Mac OS X</H4>
 
 
 <p>There is general information about programming with WebKit on <a href="https://developer.apple.com/library/mac/documentation/cocoa/conceptual/DisplayWebContent/DisplayWebContent.html">Apple Developer Documentation</a>. Details about <code>Cocoa</code> programming are not covered here.</p>
diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in
index d5eac5c03..0c799c7d9 100644
--- a/Examples/test-suite/csharp/Makefile.in
+++ b/Examples/test-suite/csharp/Makefile.in
@@ -73,7 +73,7 @@ setup = \
 # Compiles C# files then runs the testcase. A testcase is only run if
 # a file is found which has _runme.cs appended after the testcase name.
 # Note C# uses LD_LIBRARY_PATH under Unix, PATH under Cygwin/Windows and SHLIB_PATH on HPUX.
-# DYLD_FALLBACK_LIBRARY_PATH is cleared for MacOSX.
+# DYLD_FALLBACK_LIBRARY_PATH is cleared for Mac OS X.
 run_testcase = \
 	if [ -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
 	  $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \
diff --git a/Examples/test-suite/errors/Makefile.in b/Examples/test-suite/errors/Makefile.in
index 4c61001e7..b5d01a0eb 100644
--- a/Examples/test-suite/errors/Makefile.in
+++ b/Examples/test-suite/errors/Makefile.in
@@ -32,7 +32,7 @@ include $(srcdir)/../common.mk
 
 # Portable dos2unix / todos for stripping CR
 TODOS        = tr -d '\r'
-#TODOS        = sed -e 's/\r$$//' # On OSX behaves as if written 's/r$$//'
+#TODOS        = sed -e 's/\r$$//' # On Mac OS X behaves as if written 's/r$$//'
 
 # strip source directory from output, so that diffs compare
 STRIP_SRCDIR = sed -e 's|\\|/|g' -e 's|^$(SRCDIR)||'
diff --git a/Examples/test-suite/guile/li_std_string_runme.scm b/Examples/test-suite/guile/li_std_string_runme.scm
index 83fc2b5e7..fcf2f58d2 100644
--- a/Examples/test-suite/guile/li_std_string_runme.scm
+++ b/Examples/test-suite/guile/li_std_string_runme.scm
@@ -25,7 +25,7 @@
 
 (if (not (try-set-locale "C.UTF-8"))     ; Linux
 (if (not (try-set-locale "en_US.utf8"))  ; Linux
-(if (not (try-set-locale "en_US.UTF-8")) ; Mac OSX
+(if (not (try-set-locale "en_US.UTF-8")) ; Mac OS X
 (error "Failed to set any UTF-8 locale")
 )))
 
diff --git a/Source/Modules/javascript.cxx b/Source/Modules/javascript.cxx
index 179ffb28c..6f0fb3afd 100644
--- a/Source/Modules/javascript.cxx
+++ b/Source/Modules/javascript.cxx
@@ -1100,7 +1100,7 @@ int JSEmitter::emitSetter(Node *n, bool is_member, bool is_static) {
  * ----------------------------------------------------------------------------- */
 
 int JSEmitter::emitConstant(Node *n) {
-  // HACK: somehow it happened under OSX that before everything started
+  // HACK: somehow it happened under Mac OS X that before everything started
   // a lot of SWIG internal constants were emitted
   // This didn't happen on other platforms yet...
   // we ignore those premature definitions
diff --git a/Tools/javascript/Makefile.in b/Tools/javascript/Makefile.in
index 1eec5bc1e..5eeec0785 100644
--- a/Tools/javascript/Makefile.in
+++ b/Tools/javascript/Makefile.in
@@ -14,7 +14,7 @@
 all: javascript
 
 CC         = @CC@
-# HACK: under OSX a g++ compiled interpreter is seg-faulting when loading module libraries
+# HACK: under Mac OS X a g++ compiled interpreter is seg-faulting when loading module libraries
 # with 'c++' it works... probably some missing flags?
 JSCXX      = @JSINTERPRETERCXX@
 CPPFLAGS   = @BOOST_CPPFLAGS@
diff --git a/configure.ac b/configure.ac
index 31bbac3bf..6d4505875 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,7 +357,7 @@ fi
 
 # On darwin 10.7,10.8,10.9 using clang++, need to ensure using
 # libc++ for tests and examples to run under mono. May affect
-# other language targets as well - problem is an OSX incompatibility
+# other language targets as well - problem is a Mac OS X incompatibility
 # between libraries depending on libstdc++ and libc++.
 CLANGXX=
 $CXX -v 2>&1 | grep -i clang >/dev/null && CLANGXX=yes
@@ -1460,7 +1460,7 @@ else
   if test -z "$JSCOREINCDIR"; then
     JSCOREINCDIR="/usr/include/ /usr/local/include/"
 
-    # Add in default directory for JavaScriptCore headers for Linux and MacOSX
+    # Add in default directory for JavaScriptCore headers for Linux and Mac OS X
     case $host in
     *-*-linux*)
       JSCOREINCDIR="/usr/include/webkit-1.0/ /usr/include/webkitgtk-1.0/ /usr/local/include/webkit-1.0/JavaScriptCore/ $JSCOREINCDIR"
@@ -1515,7 +1515,7 @@ else
 
   # if not include dir is specified we try to find
   if test -z "$JSV8INCDIR"; then
-    # Add in default directory for JavaScriptCore headers for Linux and MacOSX
+    # Add in default directory for JavaScriptCore headers for Linux and Mac OS X
     case $host in
     *-*-linux*)
       JSV8INCDIR="/usr/include /usr/local/include/ $JSV8INCDIR"