Merge from origin/emacs-25

4af5981 Add a comment in generated refcards about the source
ef880a5 ; * etc/refcards/calccard.tex: Remove obsolete comment.
4887e7c js-mode: Fix indent problem after a regexp
e992ac0 Fix sluggish display of symbols in UTF-8 language environment
1fc101b Don't confuse how Texinfo outputs @var with the input
91aa5d1 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frame...
f758fcd * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --da...
5b0cddd More fixes in copyright notices in etc/refcards/
f994c20 Update copyright text in refcards
9ad2ae7 Fix Outline command names
26c3554 Send text received by bracketed paste to process
db0b58d Correct the statement about programming modes always running ...
78aece4 Improve documentation of 'occur'
eb364fd Do call debugger on failed cl-assert
3ef4ee8 Avoid infloop in python
8da810f Don't refer to obsolete FEATURE-unload-hook
4f478ca Improve documentation of dabbrevs
7272e5d * lisp/chistory.el (list-command-history): Doc fix.  (Bug#24890)
89b7482 * lisp/simple.el (set-mark-command): Doc fix.  (Bug#24890)
3b199f7 Improve documentation of some Help commands
93d3a0e Fix documentation of yes-or-no prompts
af04919 Fix documentation of partial completion style
ed80184 Fix documentation of the mode line on emacsclient frames
e6be855 Fix description of 'C-z' in User manual
16f7007 Improve and clarify documentation of Outline Mode
31d93aa Add Emacs version number to nt/README.W32
0b6b815 Fix python-mode hideshow regexp
dc152c5 Modernize usage of 'macOS' in doc and comments
84c5343 Prefer comments /* like this */ in C code
bb61e50 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845).
3ef86fd Clarify documentation of face attribute functions
de51d59 ; * nt/README.W32: Minor copyedits.
db436e9 Don't call debug on failed cl-assert

# Conflicts:
#	doc/emacs/cmdargs.texi
#	etc/NEWS
#	etc/PROBLEMS
#	lisp/auth-source.el
#	lisp/net/tramp-sh.el

21 files changed, 247 insertions, 144 deletions

diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index 5ca8207e2c8..e692ca4b7d9 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -22,14 +22,18 @@
 
 % Copyright (C) 1987, 1992, 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.
@@ -75,14 +79,10 @@
 \centerline{designed by Dave Gillespie and Stephen Gildea,}
 \centerline{for GNU Emacs Calc.}
 
-Permission is granted to make and distribute copies of
-this card provided the copyright notice and this permission notice
-are preserved on all copies.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
-%For copies of the GNU Emacs Calc manual, write to the Free Software
-%Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-%MA 02110-1301, USA.
-%
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index d980170724d..c36167d5619 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -5,14 +5,18 @@
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
 
-% 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.
@@ -57,9 +61,9 @@
 \centerline{using refcard layout designed by Stephen Gildea.}
 \centerline{Translated by Pavel Janík.}
 
-Permission is granted to make and distribute copies of
-this card provided the copyright notice and this permission notice
-are preserved on all copies.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index ecd7064f977..154831029ab 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -8,14 +8,18 @@
 % 	Milan Zamazal <pdm@zamazal.org>, August 1999
 %	Pavel Janík <Pavel@Janik.cz>, November 2000 (Emacs 21)
 
-% 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.
@@ -74,9 +78,9 @@
 \centerline{Designed by Stephen Gildea}
 \centerline{Translated by Jan Buchal, Milan Zamazal, Pavel Janík}
 
-Permission is granted to make and distribute copies of
-this card provided the copyright notice and this permission notice
-are preserved on all copies.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index bb38a916bb0..77893aec3ac 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -5,14 +5,18 @@
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
 
-% 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.
@@ -63,9 +67,11 @@
     W{\l}odek Bzyl (matwb@univ.gda.pl)\break
     Do češtiny přeložil Pavel Janík (Pavel@Janik.cz)
 
-    Kopie tohoto dokumentu můžete vytvářet a šířit
-    za předpokladu, že budou obsahovat tuto poznámku
-    o autorských právech.\par}}
+    Released under the terms of the GNU General Public License
+    version 3 or later.
+
+    \TeX{} source for this card is distributed with Emacs in
+    {\tt etc/refcards/}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 748f9f8add2..89636a84509 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -6,14 +6,18 @@
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % German translation: Sven Joachim <svenjoac@gmx.de>
 
-% 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.
@@ -75,10 +79,10 @@
 \centerline{Entworfen von Stephen Gildea}
 % \centerline{deutsche \"Ubersetzung von Sven Joachim}
 
-Es ist gestattet, ver\"anderte und unver\"anderte Kopien dieser
-Karte her\-zu\-stellen und zu verbreiten, vorausgesetzt dass sich
-der Copyright-Hinweis und der Hinweis auf diese Erlaubnis auf allen
-Kopien befinden.
+Released under the terms of the GNU General Public License
+version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 F\"ur Kopien des Handbuchs zu GNU Emacs:
 
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index cef3f46fd81..5f8d8babcc3 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -4,14 +4,18 @@
 
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 
-% 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.
@@ -58,9 +62,9 @@
 \centerline{Originally written May 2000 by Evgeny Roubinchtein,}
 \centerline{using refcard layout designed 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.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index c430a97ee0c..913372bc8cd 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -5,14 +5,18 @@
 % Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 % French translation: Eric Jacoboni
 
-% 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.
@@ -51,9 +55,10 @@
 \centerline{Mis \`a jour pour Dired en Mai 2000 par Evgeny Roubinchtein}
 \centerline{Traduction fran\c{c}aise d'\'Eric Jacoboni}
 
-Vous pouvez faire et distribuer des copies de cette carte, pourvu que
-la notice de copyright et cette note de permission soient pr\'eserv\'ees
-sur toutes les copies.
+Released under the terms of the GNU General Public License
+version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 Pour obtenir des copies du manuel de GNU Emacs:
 
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index e63d34fdb4c..ddaa85befbe 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -7,14 +7,18 @@
 % French translation: Eric Jacoboni
 %	Micha\"el Cadilhac
 
-% 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.
@@ -72,9 +76,9 @@
 \centerline{Traduction fran\c{c}aise de Micha\"el Cadilhac}
 % previously: Eric Jacoboni
 
-Vous pouvez faire et distribuer des copies de cette carte, modifi\'ee ou
-non, pourvu que la note de copyright et cette note de permission
-soient conserv\'ees sur toutes les copies.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 Pour des copies du manuel GNU Emacs:
 
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index 1256de33f08..a6279e80d40 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -6,14 +6,18 @@
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 % French translation:  \'Eric Jacoboni <jaco@teaser.fr>, November 2001
 
-% 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.
@@ -58,9 +62,11 @@
     Auteur W{\l}odek Bzyl (matwb@univ.gda.pl)\break
     Traduction fran\c{c}aise \'Eric Jacoboni (jaco@teaser.fr)
 
-    Vous pouvez faire et distribuer des copies de cette carte, pourvu
-    que la note de copyright, ainsi que cette notice soient
-    pr\'eserv\'ees sur toutes les copies.\par}}
+    Released under the terms of the GNU General Public License
+    version 3 or later.
+
+    \TeX{} source for this card is distributed with Emacs in {\tt
+      etc/refcards/}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index d51e2aca639..46d0d7df225 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -123,9 +123,11 @@
     Copyright \copyright\ 1995, 2000, 2002--2016 Free Software Foundation, Inc.\\*
   \end{center}
 
-  Permission is granted to make and distribute copies of this reference
-  \guide{} provided the copyright notice and this permission are preserved on
-  all copies.  Please send corrections, additions and suggestions to the
+  Released under the terms of the GNU General Public License version 3 or later.
+
+  \TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
+
+  Please send corrections, additions and suggestions to the
   current maintainer's email address. \Guide{} last edited on \date.
   }
 
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 20df7534d27..a5a66264557 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/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,10 @@
 \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.}
+
+\centerline{\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}}
 
 \endgroup}
 
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index e4fbb6f6e24..df370d4b504 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -6,14 +6,18 @@
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Polish translation: W{\l}odek Bzyl <matwb@univ.gda.pl>
 
-% 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.
@@ -84,9 +88,9 @@
 \centerline{projekt Stephen Gildea}
 \centerline{t/lumaczenie W/lodek Bzyl}
 
-Permission is granted to make and distribute copies of
-this card provided the copyright notice and this permission notice
-are preserved on all copies.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index c1b31f85ac9..27849a3d8d3 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -6,14 +6,18 @@
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Portuguese translation: Rodrigo Real <rreal@ucpel.tche.br>
 
-% 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.
@@ -77,9 +81,9 @@
 \centerline{Designed by Stephen Gildea}
 \centerline{Translated by Rodrigo Real}
 
-Permission is granted to make and distribute copies of
-this card provided the copyright notice and this permission notice
-are preserved on all copies.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index a5c74191dac..6eefd1560ce 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -5,14 +5,18 @@
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 
-% 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.
@@ -75,9 +79,9 @@
 \centerline{For GNU Emacs version \versionemacs}
 \centerline{Designed by Stephen Gildea}
 
-Permission is granted to make and distribute modified or unmodified
-copies of this card provided the copyright notice and this permission
-notice are preserved on all copies.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index 03af6576bfe..1d96473fa6c 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -3,6 +3,25 @@
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Russian translation: Alex Ott <alexott@gmail.com>
 
+% 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.
+
+% 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.
+
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 \documentclass[10pt]{article}
 \usepackage{multicol,tabularx}
 \usepackage[a4paper,hmargin={2cm,2cm},vmargin={2cm,2cm},nohead,twoside]{geometry}
@@ -35,9 +54,9 @@
 \centerline{Designed by Stephen Gildea}
 \centerline{Перевод Alex Ott <alexott@gmail.com>}
 
-Permission is granted to make and distribute copies of
-this card provided the copyright notice and this permission notice
-are preserved on all copies.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 7bd5ceb5e13..81f112270f0 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -6,14 +6,18 @@
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
 % Slovak translation: Miroslav Vasko <vasko@debian.cz>, March 2001
 
-% 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.
@@ -58,9 +62,9 @@
 \centerline{using refcard layout designed by Stephen Gildea.}
 \centerline{Translated by Miroslav Vaško.}
 
-Permission is granted to make and distribute copies of
-this card provided the copyright notice and this permission notice
-are preserved on all copies.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 86f1919247c..27b3a38cd9c 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -9,14 +9,18 @@
 %	Pavel Janík <Pavel@Janik.cz>, November 2000 (Emacs 21)
 % Slovak translation: Miroslav Vaško <vasko@debian.cz>, March 2001
 
-% 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.
@@ -75,9 +79,9 @@
 \centerline{Designed by Stephen Gildea}
 \centerline{Translated by Miroslav Vaško}
 
-Permission is granted to make and distribute copies of
-this card provided the copyright notice and this permission notice
-are preserved on all copies.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index f8db101c126..152009bd86f 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -6,14 +6,18 @@
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
 % Slovak translation: Miroslav Vasko <vasko@debian.cz>, March 2001
 
-% 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.
@@ -65,9 +69,11 @@
     Do češtiny preložil Pavel Janík (Pavel@Janik.cz)\break
     Do slovenčiny preložil Miroslav Vaško (vasko@debian.cz)
 
-    Kópie tohto dokumentu môžete vytvárať a šíriť
-    za predpokladu, že budú obsahovať túto poznámku
-    o autorských právach.\par}}
+    Released under the terms of the GNU General Public License
+    version 3 or later.
+
+    \TeX{} source for this card is distributed with Emacs in
+    {\tt etc/refcards/}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 02d310f5897..2d81b309906 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -5,14 +5,18 @@
 
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
 
-% 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.
@@ -52,9 +56,11 @@
     For GNU Emacs version \versionemacs\break
     Author W{\l}odek Bzyl (matwb@univ.gda.pl)
 
-    Permission is granted to make and distribute copies of
-    this card provided the copyright notice and this permission notice
-    are preserved on all copies.\par}}
+    Released under the terms of the GNU General Public License
+    version 3 or later.
+
+    \TeX{} source for this card is distributed with Emacs in
+    {\tt etc/refcards/}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index 942ec6cf300..5eca55cc582 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -4,14 +4,18 @@
 
 % Author: Masahiko Sato <ms@sail.stanford.edu>, <masahiko@sato.riec.tohoku.junet>
 
-% 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.
@@ -67,9 +71,9 @@
 \centerline{Written by Masahiko Sato,}
 \centerline{using refcard layout designed 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.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index 35528b193c7..d984ffc484f 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -6,14 +6,18 @@
 %	Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3)
 %	Masahiko Sato <ms@sail.stanford.edu> (VIP 3.5)
 
-% 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.
@@ -71,9 +75,9 @@
 \centerline{by Aamod Sane, VIP version 4.3}
 \centerline{by Masahiko Sato, VIP version 3.5}
 
-Permission is granted to make and distribute copies of
-this card provided the copyright notice and this permission notice
-are preserved on all copies.
+Released under the terms of the GNU General Public License version 3 or later.
+
+\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
 
 For copies of the GNU Emacs manual, see: