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>

diff --git a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
index 14c1bf310b2a0598dea9cd33c15ebf9dfbe49032..74b6ee060174dcab8bb7c6769b274e32870a96c4 100644 (file)
--- 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 0fe48cfac468b13e44951b86235dea95d266d14a..c7ce80514d358db06da06b80855263734c98389e 100644 (file)
--- 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 ac1d225fee1a67970b4df01bcd526b1e39c59447..edadfafd94f01b4a3ed711a0a83df36448e63dfe 100644 (file)
--- 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:

diff --git a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
index c4721f5761af5b4db85c3f5cda00387bc539f202..ae34211c160dab90a0b333a270b075193c208e1c 100644 (file)
--- a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
@@ -11,7 +11,7 @@
 === Introduction
 
 As with all things there must be a beginning and so it is with Wireshark. To
-use Wireshark you must first install it. If you are running Windows or OS X
+use Wireshark you must first install it. If you are running Windows or macOS
 you can download an official release at {wireshark-download-url}, install it,
 and skip the rest of this chapter.
 
@@ -240,14 +240,14 @@ in the _Programs and Features_ control panel. Remember that if you uninstall
 WinPcap you won't be able to capture anything with Wireshark.
 
 //
-// OS X
+// macOS
 //
 
 [[ChBuildInstallOSXInstall]]
 
-=== Installing Wireshark under OS X
+=== Installing Wireshark under macOS
 
-The official OS X packages are distributed as disk images (.dmg) containing
+The official macOS packages are distributed as disk images (.dmg) containing
 the application installer. To install Wireshark simply open the disk image and
 run the enclosed installer.
 

diff --git a/docbook/wsug_src/WSUG_chapter_customize.asciidoc b/docbook/wsug_src/WSUG_chapter_customize.asciidoc
index 97d35f1cc0a3ccf5541c0cd1b340a0cde0caf36e..6a47a997c9a6696801881b0bb5797b3179ac20bc 100644 (file)
--- a/docbook/wsug_src/WSUG_chapter_customize.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_customize.asciidoc
@@ -510,7 +510,7 @@ background colors respectively.
 .A color chooser
 image::wsug_graphics/ws-choose-color-rule.png[{small-screenshot-attrs}]
 
-The color chooser appearance depends on your operating system. The OS X color
+The color chooser appearance depends on your operating system. The macOS color
 picker is shown. Select the color you desire for the selected packets and click
 button:[OK].
 
@@ -652,7 +652,7 @@ image::wsug_graphics/ws-decode-as-show.png[{screenshot-attrs}]
 === Preferences
 
 There are a number of preferences you can set. Simply select the
-menu:Edit[Preferences...] (menu:Wireshark[Preferences...] on OS X) and
+menu:Edit[Preferences...] (menu:Wireshark[Preferences...] on macOS) and
 Wireshark will pop up the Preferences dialog box as shown in
 <<ChCustGUIPrefPage>>, with the ``User Interface'' page as default. On the left
 side is a tree where you can select the page to be shown.

diff --git a/docbook/wsug_src/WSUG_chapter_introduction.asciidoc b/docbook/wsug_src/WSUG_chapter_introduction.asciidoc
index 409ccd7925e62e04daa720ad6a4235d08f93b8e5..e7f13a8a407ab04b4db32fca50fa18e2af958707 100644 (file)
--- a/docbook/wsug_src/WSUG_chapter_introduction.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_introduction.asciidoc
@@ -195,14 +195,14 @@ release lifecycle] page for more details.
 
 ==== UNIX / Linux
 
-Wireshark runs on most UNIX and UNIX-like platforms including OS X and
+Wireshark runs on most UNIX and UNIX-like platforms including macOS and
 Linux. The system requirements should be comparable to the Windows
 values listed above.
 
 Binary packages are available for most Unices and Linux distributions
 including the following platforms:
 
-* Apple OS X
+* Apple macOS
 
 * Debian GNU/Linux
 
@@ -237,7 +237,7 @@ mailto:{wireshark-dev-list-email}[].
 You can get the latest copy of the program from the Wireshark website at
 {wireshark-download-url}. The download page should automatically
 highlight the appropriate download for your platform and direct you to
-the nearest mirror. Official Windows and OS X installers are signed by
+the nearest mirror. Official Windows and macOS installers are signed by
 the *Wireshark Foundation*.
 
 A new Wireshark version typically becomes available each month or two.

diff --git a/docbook/wsug_src/WSUG_chapter_io.asciidoc b/docbook/wsug_src/WSUG_chapter_io.asciidoc
index 7524a9bb5013b35a38993a8c2635616f4be972ca..9e49b437d4f24261e421d96fca421f75cb6a6c18 100644 (file)
--- a/docbook/wsug_src/WSUG_chapter_io.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_io.asciidoc
@@ -121,7 +121,7 @@ Specific for this dialog:
 * If Wireshark doesn't recognize the selected file as a capture file it will
   grey out the button:[Open] button.
 
-// XXX Add OS X
+// XXX Add macOS
 
 
 [[ChIOInputFormatsSection]]
@@ -259,7 +259,7 @@ Specific for this dialog:
 
 * Clicking on the + at "Browse for other folders" will allow you to browse files and folders in your file system.
 
-// XXX Add OS X
+// XXX Add macOS
 
 With this dialog box, you can perform the following actions:
 

diff --git a/docbook/wsug_src/WSUG_chapter_use.asciidoc b/docbook/wsug_src/WSUG_chapter_use.asciidoc
index 157a353e67fb327c7428e9159f55bf8d05284155..a2f335237d7644e68424ee03a7a5854771d5abf2 100644 (file)
--- a/docbook/wsug_src/WSUG_chapter_use.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_use.asciidoc
@@ -115,7 +115,7 @@ filling in a display filter.
 === The Menu
 
 Wireshark's main menu is located either at the top of the main window (Windows,
-Linux) or at the top of your main screen (OS X). An example is shown in
+Linux) or at the top of your main screen (macOS). An example is shown in
 <<ChUseWiresharkMenu>>.
 
 [NOTE]
@@ -376,7 +376,7 @@ comments, pcap does not.
 This menu item brings up a dialog box for handling configuration profiles.  More
 detail is provided in <<ChCustConfigProfilesSection>>.
 
-|menu:Preferences...[]                        |kbd:[Shift+Ctrl+P] or kbd:[Cmd+,] (OS X)|
+|menu:Preferences...[]                        |kbd:[Shift+Ctrl+P] or kbd:[Cmd+,] (macOS)|
 This menu item brings up a dialog box that allows you to set preferences for
 many parameters that control Wireshark.  You can also save your preferences so
 Wireshark will use them the next time you start it. More detail is provided in
@@ -826,7 +826,7 @@ are more DNS packets further down that use the same port numbers. Wireshark
 treats them as belonging to the same conversation and draws a line connecting
 them.
 
-// Images were created on OS X 10.11 using a retina display. Lines were
+// Images were created on macOS 10.11 using a retina display. Lines were
 // 36 physical pixels high.
 
 [horizontal]