emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-25 f994c20: Update copyright text in refcards


From: Eli Zaretskii
Subject: [Emacs-diffs] emacs-25 f994c20: Update copyright text in refcards
Date: Sun, 13 Nov 2016 16:22:24 +0000 (UTC)

branch: emacs-25
commit f994c2046588b168c1a4a900879cdffaf9d02f01
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Update copyright text in refcards
    
    * etc/refcards/viperCard.tex:
    * etc/refcards/vipcard.tex:
    * etc/refcards/survival.tex:
    * etc/refcards/sk-survival.tex:
    * etc/refcards/sk-dired-ref.tex:
    * etc/refcards/sk-refcard.tex:
    * etc/refcards/ru-refcard.tex:
    * etc/refcards/refcard.tex:
    * etc/refcards/pt-br-refcard.tex:
    * etc/refcards/pl-refcard.tex:
    * etc/refcards/orgcard.tex:
    * etc/refcards/gnus-refcard.tex:
    * etc/refcards/fr-survival.tex):
    * etc/refcards/fr-refcard.tex:
    * etc/refcards/fr-dired-ref.tex:
    * etc/refcards/dired-ref.tex:
    * etc/refcards/de-refcard.tex:
    * etc/refcards/cs-survival.tex:
    * etc/refcards/cs-refcard.tex:
    * etc/refcards/cs-dired-ref.tex:
    * etc/refcards/calccard.tex: Update the copyright blurb.  (Bug#24520)
---
 etc/refcards/calccard.tex      |   12 +++++++-----
 etc/refcards/cs-dired-ref.tex  |   12 +++++++-----
 etc/refcards/cs-refcard.tex    |   12 +++++++-----
 etc/refcards/cs-survival.tex   |   13 ++++++++-----
 etc/refcards/de-refcard.tex    |   14 ++++++++------
 etc/refcards/dired-ref.tex     |   12 +++++++-----
 etc/refcards/fr-dired-ref.tex  |   13 ++++++++-----
 etc/refcards/fr-refcard.tex    |   12 +++++++-----
 etc/refcards/fr-survival.tex   |   13 ++++++++-----
 etc/refcards/gnus-refcard.tex  |    6 +++---
 etc/refcards/orgcard.tex       |   13 ++++++++-----
 etc/refcards/pl-refcard.tex    |   12 +++++++-----
 etc/refcards/pt-br-refcard.tex |   12 +++++++-----
 etc/refcards/refcard.tex       |   12 +++++++-----
 etc/refcards/ru-refcard.tex    |   23 ++++++++++++++++++++---
 etc/refcards/sk-dired-ref.tex  |   12 +++++++-----
 etc/refcards/sk-refcard.tex    |   12 +++++++-----
 etc/refcards/sk-survival.tex   |   13 ++++++++-----
 etc/refcards/survival.tex      |   13 ++++++++-----
 etc/refcards/vipcard.tex       |   12 +++++++-----
 etc/refcards/viperCard.tex     |   12 +++++++-----
 21 files changed, 163 insertions(+), 102 deletions(-)

diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index 5ca8207..55933c7 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -22,13 +22,17 @@
 
 % 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
 % 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
@@ -75,9 +79,7 @@
 \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.
 
 %For copies of the GNU Emacs Calc manual, write to the Free Software
 %Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index d980170..b2a46ca 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -5,13 +5,17 @@
 % Author: Evgeny Roubinchtein <address@hidden>
 % Czech translation: Pavel Janík <address@hidden>, March 2001
 
-% 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
@@ -57,9 +61,7 @@
 \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.
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index ecd7064..a63592a 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -8,13 +8,17 @@
 %      Milan Zamazal <address@hidden>, August 1999
 %      Pavel Janík <address@hidden>, November 2000 (Emacs 21)
 
-% 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
@@ -74,9 +78,7 @@
 \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.
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index bb38a91..15bd900 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -5,13 +5,17 @@
 % Author: Wlodek Bzyl <address@hidden>
 % Czech translation: Pavel Janík <address@hidden>, March 2001
 
-% 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
@@ -63,9 +67,8 @@
     W{\l}odek Bzyl (address@hidden)\break
     Do češtiny přeložil Pavel Janík (address@hidden)
 
-    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.\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 748f9f8..75f7491 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -6,13 +6,17 @@
 % Author: Stephen Gildea <address@hidden>
 % German translation: Sven Joachim <address@hidden>
 
-% 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
@@ -75,10 +79,8 @@
 \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.
 
 F\"ur Kopien des Handbuchs zu GNU Emacs:
 
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index cef3f46..6936d2b 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -4,13 +4,17 @@
 
 % Author: Evgeny Roubinchtein <address@hidden>
 
-% 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
@@ -58,9 +62,7 @@
 \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.
 
 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 c430a97..b74346c 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -5,13 +5,17 @@
 % Author: Evgeny Roubinchtein <address@hidden>
 % French translation: Eric Jacoboni
 
-% 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
@@ -51,9 +55,8 @@
 \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.
 
 Pour obtenir des copies du manuel de GNU Emacs:
 
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index e63d34f..c6d853d 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -7,13 +7,17 @@
 % 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
 % 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
@@ -72,9 +76,7 @@
 \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.
 
 Pour des copies du manuel GNU Emacs:
 
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index 1256de3..7a06bfb 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -6,13 +6,17 @@
 % Author: Wlodek Bzyl <address@hidden>
 % French translation:  \'Eric Jacoboni <address@hidden>, November 2001
 
-% 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
@@ -58,9 +62,8 @@
     Auteur W{\l}odek Bzyl (address@hidden)\break
     Traduction fran\c{c}aise \'Eric Jacoboni (address@hidden)
 
-    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.\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index d51e2ac..674c399 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -123,9 +123,9 @@
     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.
+
+  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 20df753..6d68da9 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/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}
 
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index e4fbb6f..ebb6d09 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -6,13 +6,17 @@
 % Author: Stephen Gildea <address@hidden>
 % Polish translation: W{\l}odek Bzyl <address@hidden>
 
-% 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
@@ -84,9 +88,7 @@
 \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.
 
 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 c1b31f8..2126b78 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -6,13 +6,17 @@
 % Author: Stephen Gildea <address@hidden>
 % Portuguese translation: Rodrigo Real <address@hidden>
 
-% 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
@@ -77,9 +81,7 @@
 \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.
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index a5c7419..1677d25 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -5,13 +5,17 @@
 
 % Author: Stephen Gildea <address@hidden>
 
-% 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
@@ -75,9 +79,7 @@
 \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.
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index 273a79c..052d843 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -3,6 +3,25 @@
 % Author: Stephen Gildea <address@hidden>
 % Russian translation: Alex Ott <address@hidden>
 
+% 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
+% 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,7 @@
 \centerline{Designed by Stephen Gildea}
 \centerline{Перевод Alex Ott <address@hidden>}
 
-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.
 
 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 7bd5ceb..deda693 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -6,13 +6,17 @@
 % Czech translation: Pavel Janík <address@hidden>, March 2001
 % Slovak translation: Miroslav Vasko <address@hidden>, March 2001
 
-% 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
@@ -58,9 +62,7 @@
 \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.
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 86f1919..4037d9f 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -9,13 +9,17 @@
 %      Pavel Janík <address@hidden>, November 2000 (Emacs 21)
 % Slovak translation: Miroslav Vaško <address@hidden>, March 2001
 
-% 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
@@ -75,9 +79,7 @@
 \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.
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index f8db101..f0f61eb 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -6,13 +6,17 @@
 % Czech translation: Pavel Janík <address@hidden>, March 2001
 % Slovak translation: Miroslav Vasko <address@hidden>, March 2001
 
-% 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
@@ -65,9 +69,8 @@
     Do češtiny preložil Pavel Janík (address@hidden)\break
     Do slovenčiny preložil Miroslav Vaško (address@hidden)
 
-    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.\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 02d310f..50146fd 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -5,13 +5,17 @@
 
 % Author: Wlodek Bzyl <address@hidden>
 
-% 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
@@ -52,9 +56,8 @@
     For GNU Emacs version \versionemacs\break
     Author W{\l}odek Bzyl (address@hidden)
 
-    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.\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index 942ec6c..c68133e 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -4,13 +4,17 @@
 
 % Author: Masahiko Sato <address@hidden>, <address@hidden>
 
-% 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
@@ -67,9 +71,7 @@
 \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.
 
 For copies of the GNU Emacs manual, see:
 
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index 35528b1..2e57d7f 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -6,13 +6,17 @@
 %      Aamod Sane <address@hidden> (VIP 4.3)
 %      Masahiko Sato <address@hidden> (VIP 3.5)
 
-% 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
@@ -71,9 +75,7 @@
 \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.
 
 For copies of the GNU Emacs manual, see:
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]