aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Erik Martin-Dorel <erik@martin-dorel.org>2016-10-14 23:49:26 +0200
committerGravatar GitHub <noreply@github.com>2016-10-14 23:49:26 +0200
commit13e2533c8e4590227d83b4869342e6594a885e14 (patch)
tree6b0fd28fb726fbe4301de1fda3808c5add53e6c6
parentf252e201299c42f15228ee9a53e62614912a003d (diff)
parent168375b8fc9c24e89c63a599a38ae0686e6d4396 (diff)
Merge pull request #115 from tchajed/macos-rebranding
Refer to Apple's operating system as macOS
-rw-r--r--COMPATIBILITY8
-rw-r--r--README.md2
2 files changed, 5 insertions, 5 deletions
diff --git a/COMPATIBILITY b/COMPATIBILITY
index 4bf5de0b..e2345a99 100644
--- a/COMPATIBILITY
+++ b/COMPATIBILITY
@@ -15,20 +15,20 @@ See below for notes about other operating systems.
In the major 4.0 release ** XEmacs compatibility was dropped **
-Running on Mac OS X
+Running on macOS
-------------------
For tips, please see here:
http://proofgeneral.inf.ed.ac.uk/wiki/PGEmacsOnMacOSX
-We recommend the 24.5 build of GNU Emacs, which builds natively on Mac
-OS X (based on the NextStep port). Binaries are available at various
+We recommend the 24.5 build of GNU Emacs, which builds natively on macOS
+(based on the NextStep port). Binaries are available at various
websites (e.g., http://emacsformacosx.com), or you can build your own
by compiling from the FSF CVS. See the Emacs Wiki at
http://www.emacswiki.org/emacs/EmacsForMacOS for more.
-Note that Mac compatibility isn't thoroughly tested. If you discover
+Note that macOS compatibility isn't thoroughly tested. If you discover
problems, please send a report and/or fix to the PG tracker. Please
add tips to the wiki page above.
diff --git a/README.md b/README.md
index 9933c16a..77dddcf1 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Then add the following to your `.emacs`:
(load "~/.emacs.d/lisp/PG/generic/proof-site")
```
-If Proof General complains about a version mismatch, make sure that the shell's `emacs` is indeed your usual Emacs. If not, run the Makefile again with an explicit path to Emacs. On Mac in particular you'll probably need something like
+If Proof General complains about a version mismatch, make sure that the shell's `emacs` is indeed your usual Emacs. If not, run the Makefile again with an explicit path to Emacs. On macOS in particular you'll probably need something like
```sh
make clean; make EMACS=/Applications/Emacs.app/Contents/MacOS/Emacs