20 files changed, 46 insertions, 47 deletions
diff --git a/CMakeOptions.txt b/CMakeOptions.txt
index f986a39364..4f2440c5ac 100644
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -87,7 +87,7 @@ set(DUMPCAP_INSTALL_OPTION   "normal" CACHE STRING "Permissions to install")
 set(DUMPCAP_INST_VALS "normal" "suid" "capabilities")
 set_property(CACHE DUMPCAP_INSTALL_OPTION PROPERTY STRINGS ${DUMPCAP_INST_VALS})
 if(APPLE)
-	option(ENABLE_APPLICATION_BUNDLE "Build a Mac OS X application bundle (Wireshark.app)" ON)
+	option(ENABLE_APPLICATION_BUNDLE "Build an OS X application bundle (Wireshark.app)" ON)
 else()
-	option(ENABLE_APPLICATION_BUNDLE "Build a Mac OS X application bundle (Wireshark.app)" OFF)
+	option(ENABLE_APPLICATION_BUNDLE "Build an OS X application bundle (Wireshark.app)" OFF)
 endif()
diff --git a/README b/README
index 927a74d2e6..6ef85151e0 100644
--- a/README
+++ b/README
@@ -32,7 +32,7 @@ Wireshark is known to compile and run on the following systems:
   - FreeBSD (2.2.5 and later)
   - NetBSD
   - OpenBSD
-  - Mac OS X (10.2 and later)
+  - OS X (10.2 and later)
   - HP-UX (10.20, 11.00, 11.11)
   - Sequent PTX v4.4.5  (Nick Williams <njw@sequent.com>)
   - Tru64 UNIX (formerly Digital UNIX) (3.2 and later)
diff --git a/README.cmake b/README.cmake
index 2d6f2d75dc..d5423dd109 100644
--- a/README.cmake
+++ b/README.cmake
@@ -57,7 +57,7 @@ Note 1:
   # http://public.kitware.com/Bug/view.php?id=13818
   -DPYTHON_EXECUTABLE=c:/Python27/python
 
-  # Disable building an application bundle (Wireshark.app) on Mac OS X
+  # Disable building an application bundle (Wireshark.app) on OS X
   -DENABLE_APPLICATION_BUNDLE=OFF
 
   # Qt Creator expects .cbp files when used with CMake.
diff --git a/README.macos b/README.macos
index 5dd149b13c..9a02faa9e0 100644
--- a/README.macos
+++ b/README.macos
@@ -34,10 +34,10 @@ environment variable's setting includes both /usr/X11/lib/pkgconfig and
 
 If you wish to build the legacy (GTK+) UI you must have X11 and the X11
 developer headers and libraries installed; otherwise, you will not be
-able to build or install GTK+.  The X11 and X11 SDK that come with Mac
-OS X releases for releases from Panther to Lion can be used to build and
-run Wireshark.  Mountain Lion does not include X11; you should install
-X11 from elsewhere, such as
+able to build or install GTK+.  The X11 and X11 SDK that come with OS X
+releases for releases from Panther to Lion can be used to build and run
+Wireshark.  Mountain Lion does not include X11; you should install X11
+from elsewhere, such as
 
 	http://xquartz.macosforge.org/
 
@@ -100,7 +100,7 @@ GTK+ with the CUPS printing backend disabled.
 libgcrypt - the libgcrypt configuration script attempts to determine
 which flavor of assembler-language routines to use based on the platform
 type determined by standard autoconf code.  That code uses uname to
-determine the processor type; however, in Mac OS X, uname always reports
+determine the processor type; however, in OS X, uname always reports
 "i386" as the processor type on Intel machines, even Intel machines with
 64-bit processors, so it will attempt to assemble the 32-bit x86
 assembler-language routines, which will fail.  The workaround for this
diff --git a/configure.ac b/configure.ac
index c0539de51b..cee651ea00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -826,7 +826,7 @@ AC_SUBST(HAVE_RPM)
 # Debian
 AC_CHECK_PROG(HAVE_DPKG_BUILDPACKAGE, dpkg-buildpackage, "yes", "no")
 
-# Mac OS X
+# OS X
 AC_CHECK_PROG(HAVE_XCODEBUILD, xcodebuild, "yes", "no")
 AC_CHECK_PROG(HAVE_HDIUTIL, hdiutil, "yes", "no")
 AC_CHECK_PROG(HAVE_BLESS, bless, "yes", "no")
@@ -3273,7 +3273,7 @@ if test "x$have_gtk" = "xyes"; then
 		gtk_lib_message=" (with GTK+ 2"
 	fi
 	if test "x$have_ige_mac" = "xyes"; then
-		gtk_lib_message="$gtk_lib_message and Mac OS X integration)"
+		gtk_lib_message="$gtk_lib_message and OS X integration)"
 	else
 		gtk_lib_message="$gtk_lib_message)"
 	fi
diff --git a/doc/README.plugins b/doc/README.plugins
index e8cac10246..0fbcd5da66 100644
--- a/doc/README.plugins
+++ b/doc/README.plugins
@@ -363,9 +363,9 @@ The second parameter to ext_menubar_register_menu and ext_menubar_add_entry is
 an internal definition for the menu, utilized by the GTK interface. It must not
 contain any characters besides A-Z, a-z and 0-9.
 
-Using the Gtk Version and a Mac OSX operating system, this will not work, and
-the Gtk interface is currently not supported on this plattform. The Qt interface
-on Mac provides the menu.
+This will not work with the GTK version on OS X; the GTK interface is
+currently not supported on this plattform.  The Qt interface on OS X
+provides the menu.
 
 For a more detailed information, please refer to plugin_if.h
 
diff --git a/doc/README.qt b/doc/README.qt
index d14157539b..b47ca6d96a 100644
--- a/doc/README.qt
+++ b/doc/README.qt
@@ -41,7 +41,7 @@ There are several ways of building the Qt UI:
     cmake
     make
 
-   Note that CMake builds an application bundle (Wireshark.app) on Mac OS X
+   Note that CMake builds an application bundle (Wireshark.app) on OS X
    by default. Use the option "-DENABLE_APPLICATION_BUNDLE=OFF" to create a
    traditional UNIX/POSIX build.
 
diff --git a/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc b/docbook/wsdg_src/WSDG_chapter_env_intro.asciidoc
index 8ff5d706c0..177985a6f3 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 Mac OS X
+* Apple OS X
 
 * FreeBSD
 
@@ -210,8 +210,8 @@ Binary distributions are usually easy to install (as simply starting
 the appropriate file is usually the only thing to do). They are available
 for the following systems:
 
-* Windows (.exe file). The typical Windows end user is used to get a setup.exe
-  file which will install all the required things for him.
+* Windows (.exe file). The typical Windows end user is used to getting
+  a setup.exe file which will install all the required things for him.
 
 * Win32 PAF (.paf.exe file). Another Windows end user method is to get a
   portable application file which will install all the required things for him.
@@ -224,9 +224,8 @@ for the following systems:
   obtains an .rpm file from which the package manager checks the dependencies
   and installs the software.
 
-* Mac OS X (.dmg file). The typical Mac OS X end user is used to get a .dmg file
-  which will install all the required things for him. The other requirement is
-  to have the X11.app installed.
+* OS X (.dmg file). The typical OS X 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)
   checks the dependencies and installs the software.
@@ -317,9 +316,9 @@ The Buildbot runs on a platform collection that represents the different
 
 * Solaris SPARC (Solaris, big endian, gcc)
 
-* Mac OS-X x86 (BSD, little endian, Clang)
+* OS X x86 (BSD, little endian, Clang)
 
-* Mac OS-X x86-64 (BSD, little endian, Clang)
+* OS X 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 dbcc129cf1..5f92e0e03b 100644
--- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
@@ -1094,9 +1094,9 @@ installing the _qt-devel_ package.
 
 [[ChSrcOSX]]
 
-==== Mac OS X: .dmg packages
+==== OS X: .dmg packages
 
-The Mac OS X Package is built using OS X packaging tools, based on information
+The OS X Package is built using OS X packaging tools, based on information
 found in the source tree under 'packaging/macosx'.
 
 In the wireshark directory, type:
@@ -1105,7 +1105,7 @@ In the wireshark directory, type:
 $ make osx-package
 ----
 
-to build the Mac OS X Package.
+to build the OS X Package.
 
 [[ChSrcNSIS]]
 
diff --git a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc b/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
index 5ed852f350..33a5a0f555 100644
--- a/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_userinterface.asciidoc
@@ -182,7 +182,7 @@ independent way. As GTK is intended to be a multiplatform tool, there are some
 drawbacks, as the result is a somewhat "non native" look and feel.
 
 GTK is available for many different platforms including, but not limited to:
-Unix/Linux, Mac OS X and Win32. It's the foundation of the famous GNOME desktop,
+Unix/Linux, OS X 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.
diff --git a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
index df07431efe..a799d420a7 100644
--- 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 Mac OS X
+use Wireshark you must first install it. If you are running Windows or OS X
 you can download an official release at wireshark-download-page:[], install it,
 and skip the rest of this chapter.
 
@@ -242,9 +242,9 @@ WinPcap you won't be able to capture anything with Wireshark.
 
 [[ChBuildInstallOSXInstall]]
 
-=== Installing Wireshark under Mac OS X
+=== Installing Wireshark under OS X
 
-The official Mac OS X packages are distributed as disk images (.dmg) containing
+The official OS X 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 219547770d..5f3d44caef 100644
--- a/docbook/wsug_src/WSUG_chapter_customize.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_customize.asciidoc
@@ -651,7 +651,7 @@ image::wsug_graphics/ws-decode-as-show.png[]
 === Preferences
 
 There are a number of preferences you can set. Simply select the
-menu:Edit[Preferences...] (menu:Wireshark[Preferences...] on Mac OS X) and
+menu:Edit[Preferences...] (menu:Wireshark[Preferences...] on OS X) 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.
@@ -1141,4 +1141,4 @@ The name of the trailer protocol to be used (uses ``data'' as default).
 
 ++++++++++++++++++++++++++++++++++++++
 <!-- End of WSUG Chapter Customizing -->
-++++++++++++++++++++++++++++++++++++++
-\ No newline at end of file
+++++++++++++++++++++++++++++++++++++++
diff --git a/docbook/wsug_src/WSUG_chapter_introduction.asciidoc b/docbook/wsug_src/WSUG_chapter_introduction.asciidoc
index a710f207c7..9f8be111bd 100644
--- a/docbook/wsug_src/WSUG_chapter_introduction.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_introduction.asciidoc
@@ -195,14 +195,14 @@ for more details.
 
 ==== UNIX / Linux
 
-Wireshark runs on most UNIX and UNIX-like platforms including Mac OS X and
+Wireshark runs on most UNIX and UNIX-like platforms including OS X 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 Mac OS X
+* Apple OS X
 
 * Debian GNU/Linux
 
@@ -237,7 +237,7 @@ mailto:wireshark-dev-list-email:[][wireshark-dev-list-email:[]].
 You can get the latest copy of the program from the Wireshark website at
 wireshark-download-page:[][wireshark-download-page:[]]. The download page should
 automatically highlight the appropriate download for your platform and direct you
-to the nearest mirror. Official Windows and Mac OS X installers are signed by
+to the nearest mirror. Official Windows and OS X installers are signed by
 the *Wireshark Foundation*.
 
 A new Wireshark version typically becomes available each month or two.
diff --git a/epan/prefs.c b/epan/prefs.c
index fa8c88642f..ad8bf5760f 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -2281,8 +2281,8 @@ prefs_register_modules(void)
                                    &prefs.gui_geometry_save_maximized);
 
     prefs_register_bool_preference(gui_module, "macosx_style",
-                                   "Use Mac OS X style",
-                                   "Use Mac OS X style (Mac OS X with native GTK only)?",
+                                   "Use OS X style",
+                                   "Use OS X style (OS X with native GTK only)?",
                                    &prefs.gui_macosx_style);
 
     prefs_register_obsolete_preference(gui_module, "geometry.main.x");
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).
 
diff --git a/packaging/macosx/ScriptExec/main.c b/packaging/macosx/ScriptExec/main.c
index 3c0612b05e..0dff2dcd16 100644
--- a/packaging/macosx/ScriptExec/main.c
+++ b/packaging/macosx/ScriptExec/main.c
@@ -1,5 +1,5 @@
 /*
-    Platypus - create MacOS X application bundles that execute scripts
+    Platypus - create OS X application bundles that execute scripts
         This is the executable that goes into Platypus apps
     Copyright (C) 2003 Sveinbjorn Thordarson <sveinbt@hi.is>
 
@@ -332,7 +332,7 @@ static void ShowFirstStartWarningDialog(void)
     params.cancelButton = kAlertStdAlertCancelButton;
     params.position = kWindowDefaultPosition;
 
-    StandardAlert(kAlertNoteAlert, "\pWireshark on Mac OS X",
+    StandardAlert(kAlertNoteAlert, "\pWireshark on OS X",
             "\pWhile Wireshark is open, its windows can be displayed or hidden by displaying or hiding the X11 application.\n\nThe first time this version of Wireshark is run it may take several minutes before the main window is displayed while font caches are built.",
             &params, &itemHit);
 }
diff --git a/packaging/macosx/Wireshark_package.pmdoc/index.xml.in b/packaging/macosx/Wireshark_package.pmdoc/index.xml.in
index 9c2960c910..9b6faced5a 100644
--- a/packaging/macosx/Wireshark_package.pmdoc/index.xml.in
+++ b/packaging/macosx/Wireshark_package.pmdoc/index.xml.in
@@ -1 +1 @@
-<pkmkdoc spec="1.12"><properties><title>Wireshark</title><build>Wireshark.pkg</build><organization>org.wireshark</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Wireshark (requires X11) and associated command line utilities.</description><contents><choice title="Wireshark" id="wireshark" tooltip="The Wireshark network protocol analyzer" description="The main Wireshark application" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.Wireshark.pkg"/></choice><choice title="Set capture permissions at startup" id="chmodbpf" tooltip="Install the ChmodBPF launch daemon and add an access_bpf group" description="This installs a launch daemon (org.wireshark.ChmodBPF.plist) that changes the group permissions of each BPF device to allow access for the &quot;access_bpf&quot; group. It creates the &quot;access_bpf&quot; group if it doesn't exist and adds the current user to the group." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.ChmodBPF.pkg"/></choice><choice title="Command line utilities" id="cli" tooltip="Command line utilities associated with Wireshark" description="Various utilities associated with Wireshark including TShark, dumpcap, mergecap, capinfos, and editcap." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">COPYING.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'@OSX_MIN_VERSION@'"><message-title>Failure</message-title><message>This package requires Mac OS X @OSX_MIN_VERSION@ or later. If you cannot upgrade you might try installing using MacPorts or Fink.</message></requirement></requirements><flags/><extra-files/><item type="file">01wireshark.xml</item><item type="file">02chmodbpf.xml</item><item type="file">03utility.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod><mod>properties.customizeOption</mod><mod>extraFiles</mod><mod>postinstallActions.actions</mod><mod>properties.systemDomain</mod></pkmkdoc>
+<pkmkdoc spec="1.12"><properties><title>Wireshark</title><build>Wireshark.pkg</build><organization>org.wireshark</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Wireshark (requires X11) and associated command line utilities.</description><contents><choice title="Wireshark" id="wireshark" tooltip="The Wireshark network protocol analyzer" description="The main Wireshark application" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.Wireshark.pkg"/></choice><choice title="Set capture permissions at startup" id="chmodbpf" tooltip="Install the ChmodBPF launch daemon and add an access_bpf group" description="This installs a launch daemon (org.wireshark.ChmodBPF.plist) that changes the group permissions of each BPF device to allow access for the &quot;access_bpf&quot; group. It creates the &quot;access_bpf&quot; group if it doesn't exist and adds the current user to the group." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.ChmodBPF.pkg"/></choice><choice title="Command line utilities" id="cli" tooltip="Command line utilities associated with Wireshark" description="Various utilities associated with Wireshark including TShark, dumpcap, mergecap, capinfos, and editcap." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">COPYING.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'@OSX_MIN_VERSION@'"><message-title>Failure</message-title><message>This package requires OS X @OSX_MIN_VERSION@ or later. If you cannot upgrade you might try installing using MacPorts or Fink.</message></requirement></requirements><flags/><extra-files/><item type="file">01wireshark.xml</item><item type="file">02chmodbpf.xml</item><item type="file">03utility.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod><mod>properties.customizeOption</mod><mod>extraFiles</mod><mod>postinstallActions.actions</mod><mod>properties.systemDomain</mod></pkmkdoc>
diff --git a/packaging/macosx/native-gtk/build-gtk.sh b/packaging/macosx/native-gtk/build-gtk.sh
index 5b9d6909f2..487b8937cd 100755
--- a/packaging/macosx/native-gtk/build-gtk.sh
+++ b/packaging/macosx/native-gtk/build-gtk.sh
@@ -208,7 +208,7 @@ MORE_MODULES="libIDL ORBit2 gconf"
 function print_usage
 {
     echo
-    echo "GTK+ on Mac OS X build script version $version."
+    echo "GTK+ on OS X build script version $version."
     echo
     echo "Usage:"
     echo "`basename $0` [bootstrap|[shell]|run <cmd>|build [<modules>]], modules are:"
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index a92c0050df..8e638eb3d0 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -604,11 +604,11 @@ rpathify_file () {
 		fi
 
 		#
-		# Show the minimum supported version of Mac OS X
+		# Show the minimum supported version of OS X
 		# for each executable or library
 		#
 		if [[ "$filetype" = "EXECUTE" || "$filetype" = "DYLIB" ]] && [[ "$VERSION" -ge "7" ]] ; then
-			echo "Minimum Mac OS X version for $1:"
+			echo "Minimum OS X version for $1:"
 			otool -l $1 | grep -A3 LC_VERSION_MIN_MACOSX
 		fi
 
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index bc6f01d903..4438444835 100644
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -205,8 +205,8 @@ gui_prefs_show(void)
 
 #if defined(HAVE_IGE_MAC_INTEGRATION) || defined(HAVE_GTKOSXAPPLICATION)
 	macosx_style_cb = create_preference_check_button(main_grid, pos++,
-	    "Mac OS X style",
-	    "Create a Mac OS X look and feel. Checking this box will move the "
+	    "OS X style",
+	    "Create an OS X look and feel. Checking this box will move the "
 	    "menu bar to the top of the screen instead of the top of the Wireshark window. "
 	    "Requires a restart of Wireshark to take effect.",
 	    prefs.gui_macosx_style);