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 /doc | |
| parent | 1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff) | |
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 'doc')
| -rw-r--r-- | doc/README.plugins | 4 | ||||
| -rw-r--r-- | doc/README.vagrant | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/README.plugins b/doc/README.plugins index faed57d155..1882c2bc61 100644 --- a/doc/README.plugins +++ b/doc/README.plugins @@ -331,8 +331,8 @@ The menu entries themselves are generated with the following code structure: ext_menubar_add_entry(os_menu, "Test Entry B", NULL, menu_cb, <user_data>); -This will not work with the GTK version on OS X; the GTK interface is -currently not supported on this platform. The Qt interface on OS X +This will not work with the GTK version on macOS; the GTK interface is +currently not supported on this platform. The Qt interface on macOS provides the menu. For a more detailed information, please refer to plugin_if.h diff --git a/doc/README.vagrant b/doc/README.vagrant index 790d969ebc..1d2f0438a5 100644 --- a/doc/README.vagrant +++ b/doc/README.vagrant @@ -68,8 +68,8 @@ The various Wireshark applications can be run from the ~/build folder of the Ubuntu VM with commands such as `./run/wireshark`, `./run/tshark`, etc. To run the Wireshark GUI you will typically need an X server. If you are using -macOS (OS X) as the host system then you would likely use XQuartz as your X -server. XQuartz can be downloaded from https://www.xquartz.org/. +macOS ({Mac} OS X) as the host system then you would likely use XQuartz as +your X server. XQuartz can be downloaded from https://www.xquartz.org/. The Ubuntu VM can be shutdown or suspended from the host system with the commands `vagrant halt` and `vagrant suspend` repectively. In either case the |