summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2007-07-26 04:55:08 +0000
committerGlenn Morris <rgm@gnu.org>2007-07-26 04:55:08 +0000
commitef2805c29bb03f0c8c0d4b37a65f511123dcab1c (patch)
tree0d99b0bad43e7e8d158cfa23ceac1b58e3a92293
parent706b5dc02e1b29d3151707cceaee2f3ebad63803 (diff)
downloademacs-ef2805c29bb03f0c8c0d4b37a65f511123dcab1c.tar.gz
Standardize license text as GPLv3 or later.
-rw-r--r--etc/vipcard.tex28
-rw-r--r--etc/viperCard.tex28
2 files changed, 28 insertions, 28 deletions
diff --git a/etc/vipcard.tex b/etc/vipcard.tex
index 6bd0fabdf9f..667a8e9d132 100644
--- a/etc/vipcard.tex
+++ b/etc/vipcard.tex
@@ -12,20 +12,20 @@
% This file is part of GNU Emacs.
-% This file is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY. No author or distributor
-% accepts responsibility to anyone for the consequences of using it
-% or for whether it serves any particular purpose or describes
-% any piece of software unless they say so in writing. Refer to the
-% GNU Emacs General Public License for full details.
-%
-% Permission is granted to copy, modify and redistribute this source
-% file provided the copyright notice and permission notices are
-% preserved on all copies.
-%
-% Permission is granted to process this file through TeX and print the
-% results, provided the printed document carries copyright and
-% permission notices identical to the ones below.
+% 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, or (at your option)
+% any later version.
+
+% 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; see the file COPYING. If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
% This file is intended to be processed by plain TeX (TeX82).
%
diff --git a/etc/viperCard.tex b/etc/viperCard.tex
index a4d80fcf668..71996e9d143 100644
--- a/etc/viperCard.tex
+++ b/etc/viperCard.tex
@@ -12,20 +12,20 @@
% This file is part of GNU Emacs.
-% This file is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY. No author or distributor
-% accepts responsibility to anyone for the consequences of using it
-% or for whether it serves any particular purpose or describes
-% any piece of software unless they say so in writing. Refer to the
-% GNU Emacs General Public License for full details.
-%
-% Permission is granted to copy, modify and redistribute this source
-% file provided the copyright notice and permission notices are
-% preserved on all copies.
-%
-% Permission is granted to process this file through TeX and print the
-% results, provided the printed document carries copyright and
-% permission notices identical to the ones below.
+% 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, or (at your option)
+% any later version.
+
+% 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; see the file COPYING. If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
% This file is intended to be processed by plain TeX (TeX82).
%