osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Gerald Combs 2017-03-01 15:58:16 -06:00 committed by Anders Broman
parent 2d0e4c3730
commit 4fdc16d8e4
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
View File

@ -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:

6
docbook/wsdg_src/WSDG_chapter_sources.asciidoc
View File

@ -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]]

4
docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
View File

@ -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:

8
docbook/wsug_src/WSUG_chapter_build_install.asciidoc
View File

@ -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.

4
docbook/wsug_src/WSUG_chapter_customize.asciidoc
View File

@ -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.

6
docbook/wsug_src/WSUG_chapter_introduction.asciidoc
View File

@ -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.

4
docbook/wsug_src/WSUG_chapter_io.asciidoc
View File

@ -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:

6
docbook/wsug_src/WSUG_chapter_use.asciidoc
View File

@ -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]