Merge from gnus--rel--5.10

[gnu-emacs] / etc / vipcard.tex

diff --git a/etc/vipcard.tex b/etc/vipcard.tex
index 7ec8165887e8f9250f727b45d954a9583f377748..667a8e9d1320865bbf3bc07a6af88e16b063ad20 100644 (file)
--- a/etc/vipcard.tex
+++ b/etc/vipcard.tex
@@ -7,24 +7,25 @@
 
 \columnsperpage=1
 
 
 \columnsperpage=1
 

-% Copyright (c) 1987 Free Software Foundation, Inc.
+% Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007  Free Software Foundation, Inc.

 
 % This file is part of GNU Emacs.
 
 
 % 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).
 %
 
 % This file is intended to be processed by plain TeX (TeX82).
 %


@@ -54,8 +55,8 @@
 
 
 \def\versionnumber{1.2}
 
 
 \def\versionnumber{1.2}

-\def\year{1987}
-\def\version{September \year\ v\versionnumber}
+\def\year{2007}
+\def\version{September 2006\ v\versionnumber}

 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.


@@ -73,7 +74,7 @@ this card provided the copyright notice and this permission notice
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
 are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 
 \endgroup}
 
 
 \endgroup}