Merge from emacs-23 branch

[gnu-emacs] / etc / refcards / refcard.tex

diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 048880841fea698212e227b509c0edd4b6ce0003..52b9348db2612a17115886b211508f0385fa5b3d 100644 (file)
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -1,27 +1,9 @@
-% Reference Card for GNU Emacs version 22 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-2011
+%   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  Free Software Foundation, Inc.
+% Author: Stephen Gildea <gildea@stop.mail-abuse.org>

 
 % This file is part of GNU Emacs.
 
 
 % 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/>.
 
 % 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.
 % 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.
 %    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
 %
 %
 % 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.
 
 % 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{2007}          % year manual was updated
-\def\versionemacs{22}           % version of emacs this manual is for
-\def\year{2008}                 % copyright year
+\def\versionemacs{23}           % version of Emacs this is for
+\def\year{2011}                 % copyright year

 
 \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.

-  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.}
 
 \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.
 
 
 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
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below


@@ -680,4 +674,3 @@ Type \kbd{C-h f interactive} for more details.
 % compile-command: "pdftex refcard"
 % End:
 
 % compile-command: "pdftex refcard"
 % End:
 

-% arch-tag: d67bdf5d-b77c-44eb-a22e-f4f7d25174d2