Merge branch 'maint'

2 files changed, 12 insertions, 9 deletions

diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index 5b2a64e..0add934 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -20,14 +20,18 @@
 % Copyright (C) 1987, 1993, 1996-1997, 2001-2016 Free Software
 % Foundation, Inc.
 
-% This file is part of GNU Emacs.
-
-% GNU Emacs is free software: you can redistribute it and/or modify
+% This document is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
 % the Free Software Foundation, either version 3 of the License, or
 % (at your option) any later version.
 
-% GNU Emacs is distributed in the hope that it will be useful,
+% As a special additional permission, you may distribute reference cards
+% printed, or formatted for printing, with the notice "Released under
+% the terms of the GNU General Public License version 3 or later"
+% instead of the usual distributed-under-the-GNU-GPL notice, and without
+% a copy of the GPL itself.
+
+% This document is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
 % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 % GNU General Public License for more details.
@@ -73,9 +77,8 @@
 \centerline{Author: Philip Rooke}
 \centerline{based on refcard design and format by Stephen Gildea}
 
-Permission is granted to make and distribute copies of
-this card provided the copyright notice and this permission notice
-are preserved on all copies.
+\centerline{Released under the terms of the GNU General Public License}
+\centerline{version 3 or later.}
 
 \endgroup}
 
diff --git a/lisp/org.el b/lisp/org.el
index b4f7ad2..1a2bf7a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -2251,7 +2251,7 @@ See `org-file-apps'.")
     ("dvi"    . "xdvi %s")
     ("fig"    . "xfig %s")
     (t . "open %s"))
-  "Default file applications on a MacOS X system.
+  "Default file applications on a macOS system.
 The system \"open\" is known as a default, but we use X11 applications
 for some files for which the OS does not have a good default.
 See `org-file-apps'.")
@@ -2323,7 +2323,7 @@ Possible values for the file identifier are:
                will also open html files inside Emacs, unless you add
                (\"html\" . default) to the list as well.
  `system'      The system command to open files, like `open' on Windows
-               and Mac OS X, and mailcap under GNU/Linux.  This is the command
+               and macOS, and mailcap under GNU/Linux.  This is the command
                that will be selected if you call `org-open-at-point' with a
                double prefix argument (`\\[universal-argument] \
 \\[universal-argument] \\[org-open-at-point]').