aboutsummaryrefslogtreecommitdiffstats
path: root/help
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-11-10 13:07:54 -0800
committerGuy Harris <guy@alum.mit.edu>2015-11-10 21:09:08 +0000
commit2b4881fe77102b7b62ca249d0af9899a57d73741 (patch)
tree61253198e94949043c5ec12bc975b52f7bd42d5c /help
parente9d1d003eaea57f2a94fd24b920a7c462b7ff4e0 (diff)
downloadwireshark-2b4881fe77102b7b62ca249d0af9899a57d73741.tar.gz
wireshark-2b4881fe77102b7b62ca249d0af9899a57d73741.tar.bz2
wireshark-2b4881fe77102b7b62ca249d0af9899a57d73741.zip
Apple calls it just "OS X" these days.
Change-Id: I98905988ceb394d27307d1cbe883d8fe95ac23e4 Reviewed-on: https://code.wireshark.org/review/11703 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 0b05086754ad977d639ed7715a34b57b5e0ee28e) Reviewed-on: https://code.wireshark.org/review/11704
Diffstat (limited to 'help')
-rwxr-xr-xhelp/faq.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/help/faq.py b/help/faq.py
index 692ee4b8d3..3575204fbf 100755
--- a/help/faq.py
+++ b/help/faq.py
@@ -729,7 +729,7 @@ with version 4.2.2 or a later version.
""")
question("""
-I've installed Wireshark from Fink on Mac OS X; why is it very slow to
+I've installed Wireshark from Fink on OS X; why is it very slow to
start up?
""")
@@ -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 Mac OS X; in those OSes, you might always get the
+Ethernet interface in OS X; 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).