Merge from emacs--devo--0

[gnu-emacs] / etc / refcard.tex

diff --git a/etc/refcard.tex b/etc/refcard.tex
index 5567320c98aac3b8eb4acab5588095ddcfd144f6..9ee88261ca59c842b317c6c45e2a92e1ddb0f4b8 100644 (file)
--- a/etc/refcard.tex
+++ b/etc/refcard.tex
@@ -14,14 +14,14 @@
 \letterpaper=1
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-%   2005 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 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,
@@ -63,8 +63,10 @@
 
 % If there were room, it would be nice to see a section on Dired.
 
-\def\versionnumber{2.3}
-\def\year{2005}
+\def\versionnumber{2.3}         % version of this manual
+\def\versionyear{2006}          % year manual was updated
+\def\versionemacs{22}           % version of emacs this manual is for
+\def\year{2007}                 % copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -73,7 +75,7 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version 22, \year}
+\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, \versionyear}
 \centerline{designed by Stephen Gildea}
 
 Permission is granted to make and distribute copies of
@@ -271,11 +273,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \title{GNU Emacs Reference Card}
 
-\centerline{(for version 22)}
+\centerline{(for version \versionemacs)}
 
 \section{Starting Emacs}
 
-To enter GNU Emacs 22, just type its name: \kbd{emacs}
+To enter GNU Emacs \versionemacs, just type its name: \kbd{emacs}
 
 \section{Leaving Emacs}
 
@@ -328,7 +330,7 @@ the directions.  If you are a first-time user, type \kbd{C-h t} for a
 \key{abort current search}{C-g}
 
 Use \kbd{C-s} or \kbd{C-r} again to repeat the search in either direction.
-If Emacs is still searching, \kbd{C-g} cancels only the part not done.
+If Emacs is still searching, \kbd{C-g} cancels only the part not matched.
 
 \shortcopyrightnotice
 
@@ -476,7 +478,7 @@ The following keys are defined in the minibuffer.
 \key{abort command}{C-g}
 
 Type \kbd{C-x ESC ESC} to edit and repeat the last command that used the
-minibuffer.  Type \kbd{F10} to activate the menu bar using the minibuffer.
+minibuffer.  Type \kbd{F10} to activate menu bar items on text terminals.
 
 \newcolumn
 \title{GNU Emacs Reference Card}
@@ -598,8 +600,9 @@ Moving between nodes:
 Other:
 
 \key{run Info {\bf tutorial}}{h}
+\key{look up a subject in the indices}{i}
+\key{search nodes for regexp}{s}
 \key{{\bf quit} Info}{q}
-\key{search nodes for regexp}{M-s}
 
 \endindentedkeys
 
@@ -654,7 +657,7 @@ An example:
 
 \beginexample%
 (defun this-line-to-top-of-window (line)
-  "Reposition line point is on to top of window.
+  "Reposition current line to top of window.
 With ARG, put point on line ARG."
   (interactive "P")
   (recenter (if (null line)