diff options
| author | Paul Eggert | 2016-11-06 00:33:43 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-11-06 00:42:03 -0700 |
| commit | dc152c54f4e44f5f2040883b03f71ff6aa66c893 (patch) | |
| tree | 7b4f0336a1f03e7a53d980000a42568b10907409 /lisp/org | |
| parent | 84c53436ab25b6c8f76c133e59b34e533ea33cc7 (diff) | |
| download | emacs-dc152c54f4e44f5f2040883b03f71ff6aa66c893.tar.gz emacs-dc152c54f4e44f5f2040883b03f71ff6aa66c893.zip | |
Modernize usage of 'macOS' in doc and comments
Apple changed the spelling of its operating system again, to "macOS",
effective with macOS 10.12 Sierra (2016-09-20). Change Emacs
documentation and comments to match this. Stick with older OS
spellings ("OS X", "Mac OS X") when talking about older releases where
the older names are more correct.
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el index 13e4a222131..eb01426533d 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -1937,7 +1937,7 @@ See `org-file-apps'.") | |||
| 1937 | ("eps.gz" . "gv %s") | 1937 | ("eps.gz" . "gv %s") |
| 1938 | ("dvi" . "xdvi %s") | 1938 | ("dvi" . "xdvi %s") |
| 1939 | ("fig" . "xfig %s")) | 1939 | ("fig" . "xfig %s")) |
| 1940 | "Default file applications on a MacOS X system. | 1940 | "Default file applications on a macOS system. |
| 1941 | The system \"open\" is known as a default, but we use X11 applications | 1941 | The system \"open\" is known as a default, but we use X11 applications |
| 1942 | for some files for which the OS does not have a good default. | 1942 | for some files for which the OS does not have a good default. |
| 1943 | See `org-file-apps'.") | 1943 | See `org-file-apps'.") |
| @@ -2012,7 +2012,7 @@ file identifier are | |||
| 2012 | (\"html\" . default) to the list as well. | 2012 | (\"html\" . default) to the list as well. |
| 2013 | t Default for files not matched by any of the other options. | 2013 | t Default for files not matched by any of the other options. |
| 2014 | `system' The system command to open files, like `open' on Windows | 2014 | `system' The system command to open files, like `open' on Windows |
| 2015 | and Mac OS X, and mailcap under GNU/Linux. This is the command | 2015 | and macOS, and mailcap under GNU/Linux. This is the command |
| 2016 | that will be selected if you call `C-c C-o' with a double | 2016 | that will be selected if you call `C-c C-o' with a double |
| 2017 | \\[universal-argument] \\[universal-argument] prefix. | 2017 | \\[universal-argument] \\[universal-argument] prefix. |
| 2018 | 2018 | ||