From ad5e2aed21499d1e10f447119fc430d4c1869fc5 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 6 Nov 2016 00:33:43 -0700 Subject: [PATCH 1/3] Backport commit dc152c5 from Emacs 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. Modernize usage of 'macOS' in doc and comments dc152c54f4e44f5f2040883b03f71ff6aa66c893 Paul Eggert Sun Nov 6 00:42:03 2016 -0700 --- lisp/org.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index b4f7ad258..1a2bf7a14 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]'). From 68760e703e8b31b2821ed9d22890fad0697a852a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 13 Nov 2016 18:20:59 +0200 Subject: [PATCH 2/3] Backport commit f994c20 from Emacs * doc/orgcard.tex: Update the copyright blurb. (Bug#24520) Update copyright text in refcards f994c2046588b168c1a4a900879cdffaf9d02f01 Eli Zaretskii Sun Nov 13 18:20:59 2016 +0200 --- doc/orgcard.tex | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/orgcard.tex b/doc/orgcard.tex index 5b2a64e76..d55e544d6 100644 --- a/doc/orgcard.tex +++ b/doc/orgcard.tex @@ -20,13 +20,17 @@ % 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 % 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. +% 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. + % GNU Emacs 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 @@ -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} From d31c8ef17c171ec32143d01fd6e6bebf6a96cd4d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 15 Nov 2016 19:01:07 +0200 Subject: [PATCH 3/3] Backport commit 5b0cddd from Emacs * doc/orgcard.tex: Change "GNU Emacs" to "this document" in copyright notices. (Bug#24520) More fixes in copyright notices in etc/refcards/ 5b0cddd91535025bbf0c69d17e2d4e470dd350c5 Eli Zaretskii Tue Nov 15 19:01:07 2016 +0200 --- doc/orgcard.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/orgcard.tex b/doc/orgcard.tex index d55e544d6..0add93478 100644 --- a/doc/orgcard.tex +++ b/doc/orgcard.tex @@ -20,7 +20,7 @@ % Copyright (C) 1987, 1993, 1996-1997, 2001-2016 Free Software % Foundation, Inc. -% 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. @@ -31,7 +31,7 @@ % instead of the usual distributed-under-the-GNU-GPL notice, and without % a copy of the GPL itself. -% GNU Emacs is distributed in the hope that it will be useful, +% 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.