Merge from gnus--rel--5.10

[gnu-emacs] / etc / survival.tex

diff --git a/etc/survival.tex b/etc/survival.tex
index 0e164d7654fb48145d0b81c6907f70eba7459bec..45662ecc4eac3b76027dcfd44ec4ddc5cbd69273 100644 (file)
--- a/etc/survival.tex
+++ b/etc/survival.tex
@@ -25,13 +25,14 @@
   \endinput
 \fi
 
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007  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 2, or (at your option)
+% 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,
@@ -45,12 +46,13 @@
 % Boston, MA 02110-1301, USA.
 
 \def\versionnumber{1.0}
-\def\year{2005}
+\def\versionemacs{21}
+\def\year{2007}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
     Copyright \year\ Free Software Foundation, Inc.\break
-    Version \versionnumber{} for GNU Emacs 21, April 2000\break
+    Version \versionnumber{} for GNU Emacs \versionemacs, April 2000\break
     Project W{\l}odek Bzyl (matwb@univ.gda.pl)
 
     Permission is granted to make and distribute copies of
@@ -158,7 +160,7 @@
 %**end of header
 \f
 
-\title{GNU\ \ Emacs\ \ Survival\ \ Card}{for version 21}
+\title{GNU\ \ Emacs\ \ Survival\ \ Card}{for version \versionemacs}
 
 In the following, \kbd{C-z} means hit the `\kbd{z}' key while
 holding down the {\it Ctrl}\ \ key. \kbd{M-z} means hit the