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
This commit is contained in:
Eli Zaretskii 2016-11-13 18:20:59 +02:00 committed by Kyle Meyer
parent ad5e2aed21
commit 68760e703e
1 changed files with 8 additions and 5 deletions

View File

@ -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}