summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-08-11 14:51:37 +0200
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-08-15 07:09:50 +0000
commit85197ddb8d6da0e5cf74b8d945c076d4db3986a8 (patch)
tree9249e2374ce36df84c3ecf31ea8727a651c8f6b6 /examples
parentefa8c3361bea905afef1a051900275bf33ccb9ef (diff)
Doc: Change instances of 'OS X' to 'macOS'
As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase), except within \code blocks in QDoc manual, where macros are not expanded. Change-Id: Ic742163948f3970d2acaa179eb02d4e0c1593bf8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/assistant/doc/src/simpletextviewer.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/assistant/doc/src/simpletextviewer.qdoc b/examples/assistant/doc/src/simpletextviewer.qdoc
index b23967916..ac3b38995 100644
--- 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 OS X.
+ platform, but fortunately it is only different on \macos.
The displayed documentation can be altered using the \c -collectionFile
command line argument when launching \QA. When started without any options,