aboutsummaryrefslogtreecommitdiffstats
path: root/docbook/wsdg_src
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-03-01 15:58:16 -0600
committerAnders Broman <a.broman58@gmail.com>2017-03-02 11:54:31 +0000
commit4fdc16d8e4e2bf527fe75d6143d09e3238553170 (patch)
tree118a49869f31d04de3c54ff9098edb007c14342e /docbook/wsdg_src
parent2d0e4c37304031ac51d56d62deb672df5a4e5c3a (diff)
Docbook: Replace "OS X" with "macOS".
Change-Id: Ic2ab4f9050c9c76349d8d872b8fc2bf9feb7827d Reviewed-on: https://code.wireshark.org/review/20325 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'docbook/wsdg_src')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc6
-rw-r--r--docbook/wsdg_src/WSDG_chapter_sources.asciidoc6
-rw-r--r--docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc4
3 files changed, 8 insertions, 8 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
index 14c1bf310b..74b6ee0601 100644
--- a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
@@ -43,7 +43,7 @@ others:
==== Unix
-* Apple OS X
+* Apple macOS
* FreeBSD
@@ -217,7 +217,7 @@ for the following systems:
obtains an .rpm file from which the package manager checks the dependencies
and installs the software.
-* OS X (.dmg file). The typical OS X end user is used to getting a .dmg file
+* macOS (.dmg file). The typical macOS end user is used to getting a .dmg file
which will install all the required things for him.
* Solaris. A Solaris user obtains a file from which the package manager (PKG)
@@ -307,7 +307,7 @@ The Buildbot runs on a platform collection that represents the different
* Ubuntu x86-64 (Linux, little endian, gcc, Clang)
-* OS X x86-64 (BSD, little endian, Clang)
+* macOS x86-64 (BSD, little endian, Clang)
and two buildslaves that run static code analysis to help spot coding issues:
diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
index 0fe48cfac4..c7ce80514d 100644
--- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
@@ -1056,9 +1056,9 @@ installing the _qt-devel_ package.
[[ChSrcOSX]]
-==== OS X: .dmg packages
+==== macOS: .dmg packages
-The OS X Package is built using OS X packaging tools, based on information
+The macOS Package is built using macOS packaging tools, based on information
found in the source tree under 'packaging/macosx'.
In the wireshark directory, type:
@@ -1067,7 +1067,7 @@ In the wireshark directory, type:
$ make osx-package
----
-to build the OS X Package.
+to build the macOS Package.
[[ChSrcNSIS]]
diff --git a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc b/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
index ac1d225fee..edadfafd94 100644
--- a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
@@ -270,7 +270,7 @@ intended to be a multiplatform tool, there are some drawbacks, as the
result is a somewhat "non native" look and feel.
GTK{plus} is available for many different platforms including, but not limited to:
-Unix/Linux, OS X and Win32. It's the foundation of the famous GNOME desktop,
+Unix/Linux, macOS and Win32. It's the foundation of the famous GNOME desktop,
so the future development of GTK should be certain. GTK is implemented in plain
C (as is Wireshark itself), and available under the LGPL (Lesser General Public
License), making it free to used by commercial and noncommercial applications.
@@ -377,7 +377,7 @@ http://library.gnome.org/devel/hig-book/stable/[]
* The KDE Usability/HIG project:
http://techbase.kde.org/Projects/Usability/HIG[]
-* OS X Human Interface Guidelines:
+* macOS Human Interface Guidelines:
https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html[]
* Design apps for the Windows desktop: