diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-05 12:15:27 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-05 19:16:22 +0000 |
| commit | 357cfd3b035d1ba6438e82cc1cbec105874206b6 (patch) | |
| tree | 58a77b4dc8e1192db6278716b320bf42a18ded8f /help | |
| parent | 1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff) | |
| download | wireshark-357cfd3b035d1ba6438e82cc1cbec105874206b6.tar.gz | |
A bunch of "{Mac} OS X" -> "macOS" changes.
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was
sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
X" from 10.8 to 10.11.
Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
Reviewed-on: https://code.wireshark.org/review/20933
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'help')
| -rwxr-xr-x | help/faq.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/help/faq.py b/help/faq.py index 429b4198ba..d2df8c2f9b 100755 --- a/help/faq.py +++ b/help/faq.py @@ -261,7 +261,7 @@ answer(""" Wireshark® is a network protocol analyzer. It lets you capture and interactively browse the traffic running on a computer network. It has a rich and powerful feature set and is world's most popular tool of its -kind. It runs on most computing platforms including Windows, OS X, +kind. It runs on most computing platforms including Windows, macOS, Linux, and UNIX. Network professionals, security experts, developers, and educators around the world use it regularly. It is freely available as open source, and is released under the GNU General Public License @@ -729,12 +729,12 @@ with version 4.2.2 or a later version. """) question(""" -I've installed Wireshark from Fink on OS X; why is it very slow to +I've installed Wireshark from Fink on macOS; why is it very slow to start up? """) answer(""" -When an application is installed on OS X, prior to 10.4, it is usually +When an application is installed on macOS, prior to 10.4, it is usually "prebound" to speed up launching the application. (That's what the "Optimizing" phase of installation is.) @@ -1204,7 +1204,7 @@ Most OSes do <strong>not</strong> support capturing the FCS of a frame on Ethernet, and probably do not support it on most other link-layer types. Some drivres on some OSes do support it, such as some (all?) Ethernet drivers on NetBSD and possibly the driver for Apple's gigabit -Ethernet interface in OS X; in those OSes, you might always get the +Ethernet interface in macOS; in those OSes, you might always get the FCS, or you might only get the FCS if you capture in promiscuous mode (you'd have to determine which is the case). |