Mercurial > emacs

changeset 95010:9f4d6f3769da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch to recommended form of GPLv3 permissions notice.
author Glenn Morris <rgm@gnu.org>
date Thu, 15 May 2008 07:47:22 +0000
parents b05d11c8695d
children a1e7d73546c4
files etc/refcards/Makefile etc/refcards/calccard.tex etc/refcards/cs-dired-ref.tex etc/refcards/cs-refcard.tex etc/refcards/cs-survival.tex etc/refcards/de-refcard.tex etc/refcards/dired-ref.tex etc/refcards/fr-dired-ref.tex etc/refcards/fr-refcard.tex etc/refcards/fr-survival.tex etc/refcards/orgcard.tex etc/refcards/pdflayout.sty etc/refcards/pl-refcard.tex etc/refcards/pt-br-refcard.tex etc/refcards/refcard.tex etc/refcards/sk-dired-ref.tex etc/refcards/sk-refcard.tex etc/refcards/sk-survival.tex etc/refcards/survival.tex etc/refcards/vipcard.tex etc/refcards/viperCard.tex
diffstat 21 files changed, 91 insertions(+), 133 deletions(-) [+]
line wrap: on
line diff
--- a/etc/refcards/Makefile	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/Makefile	Thu May 15 07:47:22 2008 +0000
@@ -1,14 +1,14 @@
 ### Makefile for Emacs refcards
 
-## Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-##   2007, 2008 Free Software Foundation, Inc.
+## Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+##   2008  Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
-
-## GNU Emacs is free software; you can redistribute it and/or modify
+#
+## 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.
+## 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,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
 ## 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.
+## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
 ## Top-level targets.
--- a/etc/refcards/calccard.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/calccard.tex	Thu May 15 07:47:22 2008 +0000
@@ -25,10 +25,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -36,9 +36,7 @@
 % 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, 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/refcards/cs-dired-ref.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/cs-dired-ref.tex	Thu May 15 07:47:22 2008 +0000
@@ -7,10 +7,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.
--- a/etc/refcards/cs-refcard.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/cs-refcard.tex	Thu May 15 07:47:22 2008 +0000
@@ -23,10 +23,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,9 +34,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/refcards/cs-survival.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/cs-survival.tex	Thu May 15 07:47:22 2008 +0000
@@ -32,10 +32,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -43,9 +43,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % Czech hyphenation rules applied
 \chyph
--- a/etc/refcards/de-refcard.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/de-refcard.tex	Thu May 15 07:47:22 2008 +0000
@@ -28,10 +28,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -39,9 +39,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/refcards/dired-ref.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/dired-ref.tex	Thu May 15 07:47:22 2008 +0000
@@ -4,10 +4,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  
--- a/etc/refcards/fr-dired-ref.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/fr-dired-ref.tex	Thu May 15 07:47:22 2008 +0000
@@ -4,10 +4,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.
--- a/etc/refcards/fr-refcard.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/fr-refcard.tex	Thu May 15 07:47:22 2008 +0000
@@ -19,10 +19,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,9 +30,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/refcards/fr-survival.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/fr-survival.tex	Thu May 15 07:47:22 2008 +0000
@@ -33,10 +33,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -44,9 +44,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % Translated to french by \'Eric Jacoboni <jaco@teaser.fr> in November 2001
 
--- a/etc/refcards/orgcard.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/orgcard.tex	Thu May 15 07:47:22 2008 +0000
@@ -18,15 +18,15 @@
 \letterpaper=0
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007, 2008  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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 2, or (at your option)
-% any later version.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,9 +34,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/refcards/pdflayout.sty	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/pdflayout.sty	Thu May 15 07:47:22 2008 +0000
@@ -2,10 +2,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,9 +13,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file defines `\pdflayout':
 %  - \pdflayout=(0) is A4 portrait,
--- a/etc/refcards/pl-refcard.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/pl-refcard.tex	Thu May 15 07:47:22 2008 +0000
@@ -44,10 +44,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -55,9 +55,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/refcards/pt-br-refcard.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/pt-br-refcard.tex	Thu May 15 07:47:22 2008 +0000
@@ -25,10 +25,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -36,9 +36,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/refcards/refcard.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/refcard.tex	Thu May 15 07:47:22 2008 +0000
@@ -25,10 +25,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -36,9 +36,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/refcards/sk-dired-ref.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/sk-dired-ref.tex	Thu May 15 07:47:22 2008 +0000
@@ -7,10 +7,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.
--- a/etc/refcards/sk-refcard.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/sk-refcard.tex	Thu May 15 07:47:22 2008 +0000
@@ -23,10 +23,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,9 +34,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/refcards/sk-survival.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/sk-survival.tex	Thu May 15 07:47:22 2008 +0000
@@ -32,10 +32,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -43,9 +43,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % Slovak hyphenation rules applied
 \shyph
--- a/etc/refcards/survival.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/survival.tex	Thu May 15 07:47:22 2008 +0000
@@ -33,10 +33,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -44,9 +44,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 \def\versionnumber{1.0}
 \def\versionemacs{21}
--- a/etc/refcards/vipcard.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/vipcard.tex	Thu May 15 07:47:22 2008 +0000
@@ -19,10 +19,10 @@
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,9 +30,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %
--- a/etc/refcards/viperCard.tex	Thu May 15 07:45:48 2008 +0000
+++ b/etc/refcards/viperCard.tex	Thu May 15 07:47:22 2008 +0000
@@ -14,15 +14,15 @@
 \pdflayout=(1)
 
 % Nothing else needs to be changed.
-% Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+% Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006,
+%   2007, 2008  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
-% GNU Emacs is free software; you can redistribute it and/or modify
+% 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.
+% 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,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,9 +30,7 @@
 % 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.
+% along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 % This file is intended to be processed by plain TeX (TeX82).
 %