17 files changed, 492 insertions, 562 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index f5973702413..bc5cbb3d271 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,25 @@
+2009-07-21  Glenn Morris  <rgm@gnu.org>
+
+	* refcards/cs-dired-ref.tex, refcards/dired-ref.tex:
+	* refcards/fr-dired-ref.tex, refcards/sk-dired-ref.tex:
+	* refcards/cs-refcard.tex, refcards/de-refcard.tex:
+	* refcards/fr-refcard.tex, refcards/pl-refcard.tex:
+	* refcards/pt-br-refcard.tex, refcards/refcard.tex:
+	* refcards/ru-refcard.tex, refcards/sk-refcard.tex:
+	* refcards/cs-survival.tex, refcards/fr-survival.tex:
+	* refcards/sk-survival.tex, refcards/survival.tex:
+	Remove version numbers that don't mean much.  Instead, just use Emacs
+	version and date.  Use FSF URL rather than postal address.
+
+	* refcards/vipcard.tex (versionnumber, version): Remove.
+	(versionemacs, versionvip): New.
+	(copyrightnotice): Use FSF URL rather than postal address.
+
+	* refcards/viperCard.tex (versionnumber): Rename to versionviper.
+	(versionemacs, versionxemacs): New.
+	(version): Remove.
+	(copyrightnotice): Use FSF URL rather than postal address.
+
 2009-07-16  Glenn Morris  <rgm@gnu.org>
 
 	* refcards/cs-dired-ref.tex, refcards/fr-dired-ref.tex:
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index dce7fb6a529..2e06c90947d 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -1,9 +1,10 @@
 % Reference Card for Dired
+
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
 %   2009  Free Software Foundation, Inc.
 
-% Czech hyphenation rules applied
-\chyph
+% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
+% Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
 
 % This file is part of GNU Emacs.
 
@@ -20,62 +21,51 @@
 % You should have received a copy of the GNU General Public License
 % 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.
+
+% See dired-ref.tex.
+
+% Process the file with `csplain' from the `CSTeX' distribution (included
+% e.g. in the TeX Live CD).
+
 %**start of header
 
-\newcount\columnsperpage
+% Czech hyphenation rules applied
+\chyph
 
+% This file can be printed with 1, 2, or 3 columns per page.
+% Specify how many you want here.
+\newcount\columnsperpage
 \columnsperpage=2
 
 % PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
 % a landscape layout.
-
 \input pdflayout.sty
 \pdflayout=(0)
 
-% Nothing else needs to be changed.
-% This file is intended to be processed by plain TeX (TeX82).
-% The reference card looks OK with 2 columns per page, portrait mode.
-% I haven't tried it with 3 columns per page.
-
-% This is a bit of a dirty hack on the GNU Emacs reference card
-% to produce a Dired reference card instead.
-
-% I (Evgeny Roubinchtein, eroubinc@u.washington.edu) put this together
-% because I wanted a Dired reference card,
-% but couldn't find anything on the 'net.
-% Based mostly off Dired's describe-mode.
-
-% Translated to Czech by Pavel Janík <Pavel@Janik.cz> in March 2001
-
-% Process the file with `csplain' from the `CSTeX' distribution (included
-% e.g. in the TeX Live CD).
-
-\def\versionnumber{0.1}
-\def\versionemacs{23}
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
-\def\version{May 2006\ v\versionnumber}
+
+% Nothing else needs to be changed.
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Permissions on back.  v\versionnumber}}
+  Permissions on back.}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{designed by Stephen Gildea, \version}
-\centerline{for GNU Emacs version \versionemacs{} on Unix systems}
-\centerline{Updated for Dired in May 2000 by Evgeny Roubinchtein}
+\centerline{For GNU Emacs version \versionemacs}
+\centerline{Originally written May 2000 by Evgeny Roubinchtein,}
+\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.
 
-For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-MA 02110-1301, USA.
+For copies of the GNU Emacs manual, see:
 
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -261,7 +251,7 @@ MA 02110-1301, USA.
 
 \title{Referenční karta pro Dired}
 
-\centerline{(určeno pro Dired v GNU Emacsu \versionemacs.x)}
+\centerline{(určeno pro Dired v GNU Emacsu \versionemacs)}
 \centerline{Příkazy označené \dx{} vyžadují dired-x}
 
 % trim this down to fit everything on one page
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index 4b758b0d063..d76d637a394 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -1,25 +1,12 @@
-% Reference Card for GNU Emacs version 21 on Unix systems
+% Reference Card for GNU Emacs
 
-% Czech hyphenation rules applied
-\chyph
-
-%**start of header
-\newcount\columnsperpage
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
-% This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.
-
-\columnsperpage=1
-
-% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
-% a landscape layout.
-
-\input pdflayout.sty
-\pdflayout=(0)
-
-% Nothing else needs to be changed.
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
+% 	Milan Zamazal <pdm@zamazal.org>, August 1999
+%	Pavel Janík <Pavel@Janik.cz>, November 2000 (Emacs 21)
 
 % This file is part of GNU Emacs.
 
@@ -36,6 +23,7 @@
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+
 % This file is intended to be processed by plain TeX (TeX82).
 %
 % The final reference card has six columns, three on each side.
@@ -50,48 +38,50 @@
 %    produces two pages which must be printed sideways to make a
 %    ready-to-use 8.5 x 11 inch reference card.
 %    For this you need a dvi device driver that can print sideways.
-% Which mode to use is controlled by setting \columnsperpage above.
-%
-% Author:
-%  Stephen Gildea
-%  Internet: gildea@stop.mail-abuse.org
-%
-% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
-% for their many good ideas.
-
-% If there were room, it would be nice to see a section on Dired.
-
-% Translated to Czech by Jan Buchal <buchal@brailcom.cz> in January 1999
-% Corrections and improvements of the translation
-% by Milan Zamazal <pdm@zamazal.org> in August 1999
-% More work on better integration with GNU Emacs 21
-% by Pavel Janík <Pavel@Janik.cz> in November 2000
+% Which mode to use is controlled by setting \columnsperpage.
 
 % Process the file with `csplain' from the `CSTeX' distribution (included
 % e.g. in the TeX Live CD).
 
-\def\versionnumber{2.2}
-\def\versionemacs{23}
-\def\versionyear{2006}          % latest update
+
+%**start of header
+
+% Czech hyphenation rules applied
+\chyph
+
+% This file can be printed with 1, 2, or 3 columns per page.
+% Specify how many you want here.
+\newcount\columnsperpage
+\columnsperpage=1
+
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+\input pdflayout.sty
+\pdflayout=(0)
+
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
 
+% Nothing else needs to be changed.
+
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Permissions on back.  v\versionnumber}}
+  Permissions on back.}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, \versionyear}
-\centerline{designed by Stephen Gildea}
+\centerline{For GNU Emacs version \versionemacs}
+\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.
 
-For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+For copies of the GNU Emacs manual, see:
 
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index 26c0bcbe046..ed303f10dd4 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -1,8 +1,31 @@
-%
 % Title:  GNU Emacs Survival Card
+
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+%   2009  Free Software Foundation, Inc.
+
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
-%
-%**start of header
+% Czech translation: Pavel Janík <Pavel@Janik.cz>, 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.
+
+% 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/>.
+
+
+% See survival.tex.
+
+% Process the file with `csplain' from the `CSTeX' distribution (included
+% e.g. in the TeX Live CD).
 
 % User interface is `plain.tex' and macros described below
 %
@@ -14,6 +37,9 @@
 %
 % \kbd{ARG} -- argument is typed literally
 
+
+%**start of header
+
 \def\plainfmtname{plain}
 \ifx\fmtname\plainfmtname
 \else
@@ -23,45 +49,19 @@
 
 % PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
 % a landscape layout.
-
 \input pdflayout.sty
 \pdflayout=(0)
 
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-%   2006, 2007, 2008, 2009  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.
-
-% 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/>.
-
 % Czech hyphenation rules applied
 \chyph
 
-% Translated to Czech by Pavel Janík <Pavel@Janik.cz> in March 2001
-
-% Process the file with `csplain' from the `CSTeX' distribution (included
-% e.g. in the TeX Live CD).
-
-\def\versionnumber{1.0}
-\def\versionemacs{23}
-\def\versiondate{duben 2000}    % latest update
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
-    Copyright \year\ Free Software Foundation, Inc.\break
-    Verze \versionnumber{} pro GNU Emacs \versionemacs, \versiondate\break
+    Copyright \copyright\ \year\ Free Software Foundation, Inc.\break
+    Pro GNU Emacs \versionemacs\break
     W{\l}odek Bzyl (matwb@univ.gda.pl)\break
     Do češtiny přeložil Pavel Janík (Pavel@Janik.cz)
 
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 9af576efb6f..6c80fae596d 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -1,30 +1,10 @@
-% Reference Card for GNU Emacs version 23 on Unix systems
-%
-% Translation into German by Sven Joachim <svenjoac@gmx.de>
-%
-%**start of header
-\newcount\columnsperpage
+% Reference Card for GNU Emacs
 
-% This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.
+% Copyright (C) 1987, 1993, 1996, 2000, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
-\columnsperpage=3
-
-% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
-% a landscape layout.
-
-\input pdflayout.sty
-\pdflayout=(0l)
-
-% If you don't have german.sty, you can either get it from CTAN or
-% change the \glqq and \grqq commands below.
-
-\input german.sty
-\mdqoff               % deactivates the "-char
-
-% Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 2000, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% German translation: Sven Joachim <svenjoac@gmx.de>
 
 % This file is part of GNU Emacs.
 
@@ -41,6 +21,7 @@
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+
 % This file is intended to be processed by plain TeX (TeX82).
 %
 % The final reference card has six columns, three on each side.
@@ -55,35 +36,44 @@
 %    produces two pages which must be printed sideways to make a
 %    ready-to-use 8.5 x 11 inch reference card.
 %    For this you need a dvi device driver that can print sideways.
-% Which mode to use is controlled by setting \columnsperpage above.
+% Which mode to use is controlled by setting \columnsperpage.
 %
 % To compile and print this document:
 % tex de-refcard.tex
 % dvips -t landscape de-refcard.dvi
-%
-% Author:
-%  Stephen Gildea
-%  Internet: gildea@stop.mail-abuse.org
-%
-% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
-% for their many good ideas.
 
-% If there were room, it would be nice to see a section on Dired.
 
-\def\versionnumber{2.3}
-\def\versionyear{2009}          % latest update
-\def\versionemacs{23}
+%**start of header
+
+% This file can be printed with 1, 2, or 3 columns per page.
+% Specify how many you want here.
+\newcount\columnsperpage
+\columnsperpage=3
+
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+\input pdflayout.sty
+\pdflayout=(0l)
+
+% If you don't have german.sty, you can either get it from CTAN or
+% change the \glqq and \grqq commands below.
+
+\input german.sty
+\mdqoff               % deactivates the "-char
+
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
 
+% Nothing else needs to be changed below this line.
+
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Bedingungen auf der R\"uckseite.  v\versionnumber}}
+  Bedingungen auf der R\"uckseite.}}
 
 \def\copyrightnotice{\vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} f\"ur GNU Emacs Version \versionemacs,
-  \versionyear}
-\centerline{entworfen von Stephen Gildea}
+\centerline{F\"ur GNU Emacs Version \versionemacs}
+\centerline{Entworfen von Stephen Gildea}
 % \centerline{deutsche \"Ubersetzung von Sven Joachim}
 
 Es ist gestattet, ver\"anderte und unver\"anderte Kopien dieser
@@ -91,10 +81,9 @@ Karte her\-zu\-stellen und zu verbreiten, vorausgesetzt dass sich
 der Copyright-Hinweis und der Hinweis auf diese Erlaubnis auf allen
 Kopien befinden.
 
-F\"ur Kopien des Handbuchs zu GNU Emacs schreiben Sie an die Free
-Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
+F\"ur Kopien des Handbuchs zu GNU Emacs:
 
+\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index 159d4469f29..5d2b3d0443f 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -1,6 +1,9 @@
 % Reference Card for Dired
-% Copyright (C) 2000, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+%   2009  Free Software Foundation, Inc.
+
+% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
 
 % This file is part of GNU Emacs.
 
@@ -17,57 +20,53 @@
 % You should have received a copy of the GNU General Public License
 % 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.  
-%**start of header
 
+% This file is intended to be processed by plain TeX (TeX82).
+
+% This is a bit of a dirty hack on the GNU Emacs reference card
+% to produce a Dired reference card instead.
+
+% I put this together because I wanted a Dired reference card, but
+% couldn't find anything on the 'net.  Based mostly off Dired's
+% describe-mode.
+
+%**start of header
 \newcount\columnsperpage
 
+% This file can be printed with 1, 2, or 3 columns per page.
+% Specify how many you want here.  
+% The reference card looks OK with 2 columns per page, portrait mode.
+% I haven't tried it with 3 columns per page.
 \columnsperpage=2
 
 % PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
 % a landscape layout.
-
 \input pdflayout.sty
 \pdflayout=(1)
 
-% Nothing else needs to be changed.
-% This file is intended to be processed by plain TeX (TeX82).
-% The reference card looks OK with 2 columns per page, portrait mode.
-% I haven't tried it with 3 columns per page.
-
-% This is a bit of a dirty hack on the GNU Emacs reference card
-% to produce a Dired reference card instead.
-
-% I (Evgeny Roubinchtein, eroubinc@u.washington.edu) put this together
-% because I wanted a Dired reference card,
-% but couldn't find anything on the 'net.
-% Based mostly off Dired's describe-mode.
-
-
-\def\versionnumber{0.1}
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
-\def\version{May 2006\ v\versionnumber}
+
+% Nothing else needs to be changed.
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Permissions on back.  v\versionnumber}}
+  Permissions on back.}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{designed by Stephen Gildea, \version}
-\centerline{for GNU Emacs version 19 on Unix systems}
-\centerline{Updated for Dired in May 2000 by Evgeny Roubinchtein}
+\centerline{For GNU Emacs version \versionemacs}
+\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.
 
-For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-MA 02110-1301, USA.
+For copies of the GNU Emacs manual, see:
 
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -255,7 +254,7 @@ MA 02110-1301, USA.
 
 \title{Dired Reference Card}
 
-\centerline{(based on Dired in GNU Emacs 23)}
+\centerline{(based on Dired in GNU Emacs \versionemacs)}
 \centerline{Commands marked with \dx{} require dired-x}
 
 % trim this down to fit everything on one page
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index c3f2ec29285..2dba387346d 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -1,7 +1,11 @@
 % Reference Card for Dired
+
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
 %   2009  Free Software Foundation, Inc.
 
+% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
+% French translation: Eric Jacoboni
+
 % This file is part of GNU Emacs.
 
 % GNU Emacs is free software: you can redistribute it and/or modify
@@ -17,47 +21,35 @@
 % You should have received a copy of the GNU General Public License
 % 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.
+
+% See dired-ref.tex.
+
 %**start of header
 
+% This file can be printed with 1, 2, or 3 columns per page.
+% Specify how many you want here.
 \newcount\columnsperpage
-
 \columnsperpage=2
 
 % PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
 % a landscape layout.
-
 \input pdflayout.sty
 \pdflayout=(0)
 
-% Nothing else needs to be changed.
-% This file is intended to be processed by plain TeX (TeX82).
-% The reference card looks OK with 2 columns per page, portrait mode.
-% I haven't tried it with 3 columns per page.
-
-% This is a bit of a dirty hack on the GNU Emacs reference card
-% to produce a Dired reference card instead.
-
-% I (Evgeny Roubinchtein, eroubinc@u.washington.edu) put this together
-% because I wanted a Dired reference card,
-% but couldn't find anything on the 'net.
-% Based mostly off Dired's describe-mode.
-
-
-\def\versionnumber{0.1}
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
-\def\version{Mai 2006\ v\versionnumber}
+
+% Nothing else needs to be changed.
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Permissions au dos.  v\versionnumber}}
+  Permissions au dos.}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{conception de Stephen Gildea, \version}
-\centerline{pour GNU Emacs version 19 sur syst\`emes Unix}
+\centerline{Pour GNU Emacs version  \versionemacs}
+\centerline{Conception de Stephen Gildea}
 \centerline{Mis \`a jour pour Dired en Mai 2000 par Evgeny Roubinchtein}
 \centerline{Traduction fran\c{c}aise d'\'Eric Jacoboni}
 
@@ -65,9 +57,9 @@ 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.
 
-Pour obtenir des copies du manuel de GNU Emacs, \'ecrivez \`a la Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+Pour obtenir des copies du manuel de GNU Emacs:
 
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -258,7 +250,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 \title{Carte de r\'ef\'erence de Dired}
 
-\centerline{(bas\'e sur Dired de GNU Emacs 23.x)}
+\centerline{(bas\'e sur Dired de GNU Emacs \versionemacs)}
 \centerline{Les commandes marqu\'ees par \dx{} n\'ecessitent dired-x}
 
 % trim this down to fit everything on one page
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index 438af230dab..39fb70375e8 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -1,21 +1,11 @@
-% Reference Card for GNU Emacs version 23 on Unix systems
-%**start of header
-\newcount\columnsperpage
-
-% This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.
-
-\columnsperpage=3
-
-% PDF output layout.  0 for A4, 1 for Letter (US), a `l' is added for
-% a landscape layout.
+% Reference Card for GNU Emacs
 
-\input pdflayout.sty
-\pdflayout=(0l)
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
-% Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% French translation: Eric Jacoboni
+%	Micha\"el Cadilhac
 
 % This file is part of GNU Emacs.
 
@@ -32,6 +22,7 @@
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+
 % This file is intended to be processed by plain TeX (TeX82).
 %
 % The final reference card has six columns, three on each side.
@@ -46,48 +37,49 @@
 %    produces two pages which must be printed sideways to make a
 %    ready-to-use 8.5 x 11 inch reference card.
 %    For this you need a dvi device driver that can print sideways.
-% Which mode to use is controlled by setting \columnsperpage above.
+% Which mode to use is controlled by setting \columnsperpage.
 %
 % To compile and print this document:
 % tex fr-refcard.tex
 % dvips -t landscape fr-refcard.dvi
-%
 
-% Author:
-%  Stephen Gildea
-%  Internet: gildea@stop.mail-abuse.org
-%
-% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
-% for their many good ideas.
 
-% If there were room, it would be nice to see a section on Dired.
+%**start of header
 
-\def\versionnumber{2.3}
-\def\versionemacs{23}
-\def\versionyear{2007}          % latest update
+% This file can be printed with 1, 2, or 3 columns per page.
+% Specify how many you want here.
+\newcount\columnsperpage
+\columnsperpage=3
+
+% PDF output layout.  0 for A4, 1 for Letter (US), a `l' is added for
+% a landscape layout.
+\input pdflayout.sty
+\pdflayout=(0l)
+
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
 
+% Nothing else needs to be changed below this line.
+
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Permissions au dos.  v\versionnumber}}
+  Permissions au dos.}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} pour GNU Emacs version \versionemacs,
-  \versionyear}
-\centerline{conception de Stephen Gildea}
-\centerline{traduction fran\c{c}aise de Micha\"el Cadilhac}
+\centerline{Pour GNU Emacs version \versionemacs}
+\centerline{Conception de Stephen Gildea}
+\centerline{Traduction fran\c{c}aise de Micha\"el Cadilhac}
 % previously: Eric Jacoboni
 
 Vous pouvez faire et distribuer des copies de cette carte, modifiée ou
 non, pourvu que la note de copyright et cette note de permission
 soient conserv\'ees sur toutes les copies.
 
-Pour des copies du manuel GNU Emacs, \'ecrivez \`a la Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
+Pour des copies du manuel GNU Emacs:
 
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index 13db13af607..87a42904532 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -1,9 +1,29 @@
 %&tex
-%
 % Title:  GNU Emacs Survival Card
+
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+%   2009  Free Software Foundation, Inc.
+
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
-%
-%**start of header
+% French translation:  \'Eric Jacoboni <jaco@teaser.fr>, 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.
+
+% 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/>.
+
+
+% See survival.tex.
 
 % User interface is `plain.tex' and macros described below
 %
@@ -15,6 +35,9 @@
 %
 % \kbd{ARG} -- argument is typed literally
 
+
+%**start of header
+
 \def\plainfmtname{plain}
 \ifx\fmtname\plainfmtname
 \else
@@ -24,39 +47,16 @@
 
 % PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
 % a landscape layout.
-
 \input pdflayout.sty
 \pdflayout=(0)
 
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-%   2006, 2007, 2008, 2009  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.
-
-% 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/>.
-
-% Translated to french by \'Eric Jacoboni <jaco@teaser.fr> in November 2001
-
-\def\versionnumber{1.0}
-\def\versionemacs{23}
-\def\versiondate{Avril 2000}    % latest update
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
-    Copyright \year\ Free Software Foundation, Inc.\break
-    Version \versionnumber{} pour GNU Emacs \versionemacs, \versiondate\break
+    Copyright \copyright\ \year\ Free Software Foundation, Inc.\break
+    Pour GNU Emacs \versionemacs\break
     Auteur W{\l}odek Bzyl (matwb@univ.gda.pl)\break
     Traduction fran\c{c}aise \'Eric Jacoboni (jaco@teaser.fr)
 
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index 71bedf494e6..36d8cb3dad8 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -1,46 +1,11 @@
 %&mex
-%=====================================================================
-% Reference Card for GNU Emacs version 20 on Unix systems was
-% translated into Polish language by W{\l}odek Bzyl (matwb@univ.gda.pl)
-% who also added new section on `Dired' and added info about Polish
-% support in Emacs to section `International Character Sets'.
+% Reference Card for GNU Emacs
 
-% This file uses macros and fonts defined in the mex format.
-% These macros and fonts are part of a current WEB2C
-% distribution of TeX, for example teTeX (unix) fpTeX (windows).
-% TeTeX comes with texconfig utility which could be used in
-% particular to generate formats. Just run it and follow instructions.
-%
-% Note that the original Emacs refcard.tex uses macros and fonts
-% defined in plain format. This file uses mex format which is
-% a Polish adaptation of plain.
+% Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+%   2009  Free Software Foundation, Inc.
 
-%**start of header
-
-\ifx\MeX\undefined
-  \errmessage{This file requires `mex' format to be typeset correctly.
-    See head of this file for the comments how to generate mex format}
- \endinput
-\else
-  \prefixing
-\fi
-
-\newcount\columnsperpage
-
-% This file can be printed with 1, or 2 columns per page (see below).
-% Specify how many you want here.
-
-\columnsperpage=2
-
-% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
-% a landscape layout.
-
-\input pdflayout.sty
-\pdflayout=(0)
-
-% Nothing else needs to be changed.
-% Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
-%   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Polish translation: W{\l}odek Bzyl <matwb@univ.gda.pl>
 
 % This file is part of GNU Emacs.
 
@@ -57,6 +22,7 @@
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+
 % This file is intended to be processed by plain TeX (TeX82).
 %
 % The final reference card has six columns, three on each side.
@@ -67,31 +33,56 @@
 % 2 columns per page
 %    produces three already-reduced pages.
 %    You will still need to cut and paste.
-% Which mode to use is controlled by setting \columnsperpage above.
-%
-% Author:
-%  Stephen Gildea
-%  Internet: gildea@stop.mail-abuse.org
+% Which mode to use is controlled by setting \columnsperpage.
+
+% Translated into Polish language by W{\l}odek Bzyl (matwb@univ.gda.pl)
+% who also added new section on `Dired' and added info about Polish
+% support in Emacs to section `International Character Sets'.
+
+% This file uses macros and fonts defined in the mex format.
+% These macros and fonts are part of a current WEB2C
+% distribution of TeX, for example teTeX (unix) fpTeX (windows).
+% TeTeX comes with texconfig utility which could be used in
+% particular to generate formats. Just run it and follow instructions.
 %
-% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
-% for their many good ideas.
+% Note that the original Emacs refcard.tex uses macros and fonts
+% defined in plain format. This file uses mex format which is
+% a Polish adaptation of plain.
+
+
+%**start of header
+
+\ifx\MeX\undefined
+  \errmessage{This file requires `mex' format to be typeset correctly.
+    See head of this file for the comments how to generate mex format}
+ \endinput
+\else
+  \prefixing
+\fi
 
-% If there were room, it would be nice to see a section on Dired.
+% This file can be printed with 1, or 2 columns per page.
+% Specify how many you want here.
+\newcount\columnsperpage
+\columnsperpage=2
+
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+\input pdflayout.sty
+\pdflayout=(0)
 
-\def\versionnumber{1.2}
-\def\versionemacs{23}
-\def\versiondate{czerwiec 2006} % latest update
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
 
+% Nothing else needs to be changed.
+
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Permissions on back.  Version \versionnumber}}
+  Permissions on back.}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{Wersja \versionnumber{} dla GNU Emacsa \versionemacs,
-  \versiondate}
+\centerline{dla GNU Emacsa \versionemacs}
 \centerline{projekt Stephen Gildea}
 \centerline{t/lumaczenie W/lodek Bzyl}
 
@@ -99,9 +90,9 @@ Permission is granted to make and distribute copies of
 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
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+For copies of the GNU Emacs manual, see:
 
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index 4baeb99c8ef..dfa3b2e7e72 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -1,27 +1,10 @@
-% Reference Card for GNU Emacs version 23 on Unix systems
-%**start of header
-\newcount\columnsperpage
-\newcount\letterpaper
-
-% This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.
+% Reference Card for GNU Emacs
 
-\columnsperpage=3
+% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004, 2006, 2007,
+%   2008, 2009  Free Software Foundation, Inc.
 
-% Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
-% only when columnsperpage is 2 or 3.
-
-\letterpaper=0
-
-% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
-% a landscape layout.
-
-\input pdflayout.sty
-\pdflayout=(0l)
-
-% Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-%   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Portuguese translation: Rodrigo Real <rreal@ucpel.tche.br>
 
 % This file is part of GNU Emacs.
 
@@ -38,6 +21,7 @@
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+
 % This file is intended to be processed by plain TeX (TeX82).
 %
 % The final reference card has six columns, three on each side.
@@ -52,48 +36,55 @@
 %    produces two pages which must be printed sideways to make a
 %    ready-to-use 8.5 x 11 inch reference card.
 %    For this you need a dvi device driver that can print sideways.
-% Which mode to use is controlled by setting \columnsperpage above.
+% Which mode to use is controlled by setting \columnsperpage.
 %
 % To compile and print this document:
 % tex refcard.tex
 % dvips -t landscape refcard.dvi
-%
-% Author:
-%  Stephen Gildea
-%  Internet: gildea@stop.mail-abuse.org
-%
-% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
-% for their many good ideas.
 
-% If there were room, it would be nice to see a section on Dired.
+% Thanks to Mario Goulart for the opinions.
+
 
-% Translated from English to Portuguese by Rodrigo Real, send comments
-% and suggestions to rreal@ucpel.tche.br. Thanks to Mario Goulart for
-% the opinions.
+%**start of header
+\newcount\columnsperpage
+\newcount\letterpaper
 
+% This file can be printed with 1, 2, or 3 columns per page.
+% Specify how many you want here.
+\columnsperpage=3
 
-\def\versionnumber{2.3}
-\def\versionyear{2006}          % latest update
-\def\versionemacs{23}
+% Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
+% only when columnsperpage is 2 or 3.
+\letterpaper=0
+
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+\input pdflayout.sty
+\pdflayout=(0l)
+
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
 
+% Nothing else needs to be changed below this line.
+
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Permissions on back.  v\versionnumber}}
+  Permissions on back.}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, \versionyear}
-\centerline{designed by Stephen Gildea}
+\centerline{For GNU Emacs version \versionemacs}
+\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.
 
-For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+For copies of the GNU Emacs manual, see:
 
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 1e9a8de22d2..bd98969678b 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -1,27 +1,9 @@
-% Reference Card for GNU Emacs version 23 on Unix systems
-%**start of header
-\newcount\columnsperpage
-\newcount\letterpaper
-
-% This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.
+% Reference Card for GNU Emacs
 
-\columnsperpage=3
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
-% Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
-% only when columnsperpage is 2 or 3.
-
-\letterpaper=1
-
-% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
-% a landscape layout.
-
-\input pdflayout.sty
-\pdflayout=(1l)
-
-% Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 
 % This file is part of GNU Emacs.
 
@@ -38,6 +20,7 @@
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+
 % This file is intended to be processed by plain TeX (TeX82).
 %
 % The final reference card has six columns, three on each side.
@@ -52,43 +35,54 @@
 %    produces two pages which must be printed sideways to make a
 %    ready-to-use 8.5 x 11 inch reference card.
 %    For this you need a dvi device driver that can print sideways.
-% Which mode to use is controlled by setting \columnsperpage above.
+% Which mode to use is controlled by setting \columnsperpage.
 %
 % To compile and print this document:
 % tex refcard.tex
 % dvips -t landscape refcard.dvi
 %
-% Author:
-%  Stephen Gildea
-%  Internet: gildea@stop.mail-abuse.org
-%
 % Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
 % for their many good ideas.
 
-% If there were room, it would be nice to see a section on Dired.
+%**start of header
+\newcount\columnsperpage
+\newcount\letterpaper
+
+% This file can be printed with 1, 2, or 3 columns per page.
+% Specify how many you want here.
+\columnsperpage=3
+
+% Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
+% only when columnsperpage is 2 or 3.
+\letterpaper=1
+
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+\input pdflayout.sty
+\pdflayout=(1l)
+
+% Nothing else needs to be changed below this line.
 
-\def\versionnumber{2.3}         % version of this manual
-\def\versionyear{2009}          % year manual was updated
-\def\versionemacs{23}           % version of emacs this manual is for
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Permissions on back.  v\versionnumber}}
+  Permissions on back.}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, \versionyear}
-\centerline{designed by Stephen Gildea}
+\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.
 
-For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+For copies of the GNU Emacs manual, see:
 
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index b9ff9f65d30..2f52535f9f3 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -1,5 +1,8 @@
-% Copyright (C) 1997, 2002, 2003, 2004, 2005,
-%   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+% Copyright (C) 1997, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+%   2009  Free Software Foundation, Inc.
+
+% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Russian translation: Alex Ott <alexott@gmail.com>
 
 \documentclass[10pt]{article}
 \usepackage{multicol,tabularx}
@@ -19,28 +22,27 @@
 \newlength{\ColThreeWidth}
 \setlength{\ColThreeWidth}{25mm}
 
-\newcommand{\versionnumber}[0]{2.3}
-\newcommand{\versionemacs}[0]{23}
-\newcommand{\nyear}[0]{2009}
+\newcommand{\versionemacs}[0]{23} % version of Emacs this is for
+\newcommand{\year}[0]{2009}       % copyright year
 
 \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
-  \centerline{\footnotesize \copyright\ \nyear\ Free Software Foundation, Inc.
-  Permissions on back.  v\versionnumber}}
+  \centerline{\footnotesize \copyright\ \year\ Free Software Foundation, Inc.
+  Permissions on back.}}
 
 \newcommand\copyrightnotice[0]{
 \vskip 1ex plus 2 fill\begingroup\footnotesize
-\centerline{Copyright \copyright\ \nyear\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, June 2006}
-\centerline{designed by Stephen Gildea}
+\centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
+\centerline{For GNU Emacs version \versionemacs}
+\centerline{Designed by Stephen Gildea}
 \centerline{đĹŇĹ×ĎÄ Alex Ott <alexott@gmail.com>}
 
 Permission is granted to make and distribute copies of
 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
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+For copies of the GNU Emacs manual, see:
 
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 \hyphenation{mini-buf-fer}
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 22a9729b5fe..b5e54284215 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -1,9 +1,11 @@
 % Reference Card for Dired
+
 % Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
 %   2009  Free Software Foundation, Inc.
 
-% Slovak hyphenation rules applied
-\shyph
+% Author: Evgeny Roubinchtein <eroubinc@u.washington.edu>
+% Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
+% Slovak translation: Miroslav Vasko <vasko@debian.cz>, March 2001
 
 % This file is part of GNU Emacs.
 
@@ -20,63 +22,51 @@
 % You should have received a copy of the GNU General Public License
 % 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.
+
+% See dired-ref.tex.
+
+% Process the file with `csplain' from the `CSTeX' distribution (included
+% e.g. in the TeX Live CD).
+
 %**start of header
 
-\newcount\columnsperpage
+% Slovak hyphenation rules applied
+\shyph
 
+% This file can be printed with 1, 2, or 3 columns per page.
+% Specify how many you want here.
+\newcount\columnsperpage
 \columnsperpage=2
 
 % PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
 % a landscape layout.
-
 \input pdflayout.sty
 \pdflayout=(0)
 
-% Nothing else needs to be changed.
-% This file is intended to be processed by plain TeX (TeX82).
-% The reference card looks OK with 2 columns per page, portrait mode.
-% I haven't tried it with 3 columns per page.
-
-% This is a bit of a dirty hack on the GNU Emacs reference card
-% to produce a Dired reference card instead.
-
-% I (Evgeny Roubinchtein, eroubinc@u.washington.edu) put this together
-% because I wanted a Dired reference card,
-% but couldn't find anything on the 'net.
-% Based mostly off Dired's describe-mode.
-
-% Translated to Czech by Pavel Janík <Pavel@Janik.cz> in March 2001
-% Translated to Slovak by Miroslav Vasko <vasko@debian.cz> in March 2001
-
-% Process the file with `csplain' from the `CSTeX' distribution (included
-% e.g. in the TeX Live CD).
-
-\def\versionnumber{0.1}
-\def\versionemacs{23}
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
-\def\version{May 2006\ v\versionnumber}
+
+% Nothing else needs to be changed.
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Permissions on back.  v\versionnumber}}
+  Permissions on back.}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{designed by Stephen Gildea, \version}
-\centerline{for GNU Emacs version \versionemacs{} on Unix systems}
-\centerline{Updated for Dired in May 2000 by Evgeny Roubinchtein}
+\centerline{For GNU Emacs version \versionemacs}
+\centerline{Originally written May 2000 by Evgeny Roubinchtein,}
+\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.
 
-For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-MA 02110-1301, USA.
+For copies of the GNU Emacs manual, see:
 
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
@@ -264,7 +254,7 @@ MA 02110-1301, USA.
 
 \title{Referenčná karta pre Dired}
 
-\centerline{(určené pre Dired v GNU Emacse \versionemacs.x)}
+\centerline{(určené pre Dired v GNU Emacse \versionemacs)}
 \centerline{Príkazy označené \dx{} vyžadujú dired-x}
 
 % trim this down to fit everything on one page
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index ae936061ea0..eaabbdb1b8a 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -1,25 +1,13 @@
-% Reference Card for GNU Emacs version 23 on Unix systems
+% Reference Card for GNU Emacs
 
-% Slovak hyphenation rules applied
-\shyph
-
-%**start of header
-\newcount\columnsperpage
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
-% This file can be printed with 1, 2, or 3 columns per page (see below).
-% Specify how many you want here.
-
-\columnsperpage=1
-
-% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
-% a landscape layout.
-
-\input pdflayout.sty
-\pdflayout=(0)
-
-% Nothing else needs to be changed.
-% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-%   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
+% 	Milan Zamazal <pdm@zamazal.org>, August 1999
+%	Pavel Janík <Pavel@Janik.cz>, November 2000 (Emacs 21)
+% Slozak translation: Miroslav Vaško <vasko@debian.cz>, March 2001
 
 % This file is part of GNU Emacs.
 
@@ -36,6 +24,7 @@
 % You should have received a copy of the GNU General Public License
 % along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+
 % This file is intended to be processed by plain TeX (TeX82).
 %
 % The final reference card has six columns, three on each side.
@@ -50,50 +39,50 @@
 %    produces two pages which must be printed sideways to make a
 %    ready-to-use 8.5 x 11 inch reference card.
 %    For this you need a dvi device driver that can print sideways.
-% Which mode to use is controlled by setting \columnsperpage above.
-%
-% Author:
-%  Stephen Gildea
-%  Internet: gildea@stop.mail-abuse.org
-%
-% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
-% for their many good ideas.
+% Which mode to use is controlled by setting \columnsperpage.
 
-% If there were room, it would be nice to see a section on Dired.
+% Process the file with `csplain' from the `CSTeX' distribution (included
+% e.g. in the TeX Live CD).
 
-% Translated to Czech by Jan Buchal <buchal@brailcom.cz> in January 1999
-% Corrections and improvements of the translation
-% by Milan Zamazal <pdm@zamazal.org> in August 1999
-% More work on better integration with GNU Emacs 21
-% by Pavel Janík <Pavel@Janik.cz> in November 2000
 
-% Translated to Slovak by Miroslav Vaško <vasko@debian.cz> in March 2001
+%**start of header
 
-% Process the file with `csplain' from the `CSTeX' distribution (included
-% e.g. in the TeX Live CD).
+% Slovak hyphenation rules applied
+\shyph
+
+% This file can be printed with 1, 2, or 3 columns per page.
+% Specify how many you want here.
+\newcount\columnsperpage
+\columnsperpage=1
 
-\def\versionnumber{2.2}
-\def\versionemacs{23}
-\def\versionyear{2006}          % last update
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+\input pdflayout.sty
+\pdflayout=(0)
+
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
 
+% Nothing else needs to be changed.
+
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
-  Permissions on back.  v\versionnumber}}
+  Permissions on back.}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, \versionyear}
-\centerline{designed by Stephen Gildea}
+\centerline{For GNU Emacs version \versionemacs}
+\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.
 
-For copies of the GNU Emacs manual, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+For copies of the GNU Emacs manual, see:
 
+{\tt http://www.gnu.org/software/emacs/\#Manuals}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index 588999fb34e..31ff1d2c592 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -1,8 +1,32 @@
-%
 % Title:  GNU Emacs Survival Card
+
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+%   2009  Free Software Foundation, Inc.
+
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
-%
-%**start of header
+% Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
+% Slovak translation: Miroslav Vasko <vasko@debian.cz>, 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.
+
+% 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/>.
+
+
+% See survival.tex.
+
+% Process the file with `csplain' from the `CSTeX' distribution (included
+% e.g. in the TeX Live CD).
 
 % User interface is `plain.tex' and macros described below
 %
@@ -14,6 +38,9 @@
 %
 % \kbd{ARG} -- argument is typed literally
 
+%**start of header
+
+
 \def\plainfmtname{plain}
 \ifx\fmtname\plainfmtname
 \else
@@ -23,47 +50,21 @@
 
 % PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
 % a landscape layout.
-
 \input pdflayout.sty
 \pdflayout=(0)
 
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-%   2006, 2007, 2008, 2009  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.
-
-% 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/>.
-
 % Slovak hyphenation rules applied
 \shyph
 
-% Translated to Czech by Pavel Janík <Pavel@Janik.cz> in March 2001
-% Translated to Slovak by Miroslav Vasko <vasko@debian.cz> in March 2001
-
-% Process the file with `csplain' from the `CSTeX' distribution (included
-% e.g. in the TeX Live CD).
-
-\def\versionnumber{1.0}
-\def\versionemacs{23}
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
-    Copyright \year\ Free Software Foundation, Inc.\break
-    Verzia \versionnumber{} pre GNU Emacs \versionemacs, apríl 2000\break
+    Copyright \copyright\ \year\ Free Software Foundation, Inc.\break
+    Pre GNU Emacs \versionemacs\break
     W{\l}odek Bzyl (matwb@univ.gda.pl)\break
-    Do češtiny preložil Pavel Janík (Pavel@Janik.cz)
+    Do češtiny preložil Pavel Janík (Pavel@Janik.cz)\break
     Do slovenčiny preložil Miroslav Vaško (vasko@debian.cz)
 
     Kópie tohto dokumentu môžete vytvárať a šíriť
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index e0818f3e996..e3f6aeff091 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -1,8 +1,26 @@
 %&tex
-%
 % Title:  GNU Emacs Survival Card
+
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+%   2009  Free Software Foundation, Inc.
+
 % Author: Wlodek Bzyl <matwb@univ.gda.pl>
-%
+
+% 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.
+
+% 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/>.
+
 %**start of header
 
 % User interface is `plain.tex' and macros described below
@@ -24,37 +42,17 @@
 
 % PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
 % a landscape layout.
-
 \input pdflayout.sty
 \pdflayout=(1)
 
-% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-%   2006, 2007, 2008, 2009  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.
-
-% 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/>.
-
-\def\versionnumber{1.0}
-\def\versionemacs{23}
+\def\versionemacs{23}           % version of Emacs this is for
 \def\year{2009}                 % 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 \versionemacs, April 2000\break
-    Project W{\l}odek Bzyl (matwb@univ.gda.pl)
+    Copyright \copyright\ \year\ Free Software Foundation, Inc.\break
+    For GNU Emacs version \versionemacs\break
+    Author W{\l}odek Bzyl (matwb@univ.gda.pl)
 
     Permission is granted to make and distribute copies of
     this card provided the copyright notice and this permission notice