Doc: replaced Mac OS X with OS X

Task-number: QTBUG-40759
Change-Id: I3dd691ec1f17ae3217cb85e6f3e6330114ab7aa3
Reviewed-by: Martin Smith <martin.smith@digia.com>

diff --git a/examples/assistant/doc/src/simpletextviewer.qdoc b/examples/assistant/doc/src/simpletextviewer.qdoc
index dda039e..b239679 100644 (file)
--- a/examples/assistant/doc/src/simpletextviewer.qdoc
+++ b/examples/assistant/doc/src/simpletextviewer.qdoc
@@ -330,7 +330,7 @@
     To start the process we need the executable name of \QA as well as the
     command line arguments for running \QA in a customized mode. The
     executable name is a little bit tricky since it depends on the
-    platform, but fortunately it is only different on Mac OS X.
+    platform, but fortunately it is only different on OS X.
 
     The displayed documentation can be altered using the \c -collectionFile
     command line argument when launching \QA. When started without any options,

diff --git a/src/designer/src/designer/doc/src/designer-manual.qdoc b/src/designer/src/designer/doc/src/designer-manual.qdoc
index 6654564..7dd4d52 100644 (file)
--- a/src/designer/src/designer/doc/src/designer-manual.qdoc
+++ b/src/designer/src/designer/doc/src/designer-manual.qdoc
@@ -800,7 +800,7 @@
     \table
         \header
             \li  Windows XP
-            \li  Mac OS X
+            \li  OS X
             \li  Cleanlooks
         \row
             \li  \inlineimage designer-form-layout-windowsXP.png

diff --git a/src/macdeployqt/macdeployqt/main.cpp b/src/macdeployqt/macdeployqt/main.cpp
index 3cc8f5a..81639f2 100644 (file)
--- a/src/macdeployqt/macdeployqt/main.cpp
+++ b/src/macdeployqt/macdeployqt/main.cpp
@@ -72,8 +72,8 @@ int main(int argc, char **argv)
         qDebug() << "to skip these plugins. Currently two SQL plugins are known to";
         qDebug() << "be incompatible: qsqlodbc and qsqlpsql.";
         qDebug() << "";
-        qDebug() << "See the \"Deploying an Application on Qt/Mac\" topic in the";
-        qDebug() << "documentation for more information about deployment on Mac OS X.";
+        qDebug() << "See the \"Deploying Applications on OS X\" topic in the";
+        qDebug() << "documentation for more information about deployment on OS X.";
 
         return 1;
     }