Merge from emacs--devo--0

[gnu-emacs] / etc / dired-ref.tex

diff --git a/etc/dired-ref.tex b/etc/dired-ref.tex
index 52d3f3eaad2c0300081bdd500341d7f8e5a94448..45c1e8fc14fc85dedb5506e355083f84e9874ff8 100644 (file)
--- a/etc/dired-ref.tex
+++ b/etc/dired-ref.tex
@@ -1,11 +1,12 @@
 % Reference Card for Dired
-% Copyright (C) 2000. 2001 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,
@@ -15,8 +16,8 @@
 
 % 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., 59 Temple Place - Suite 330,
-% Boston, MA 02111-1307, USA.
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.  Nothing else needs to be changed.
@@ -40,8 +41,8 @@
 
 
 \def\versionnumber{0.1}
-\def\year{2000}
-\def\version{May \year\ v\versionnumber}
+\def\year{2007}                 % latest copyright year
+\def\version{May 2006\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -59,7 +60,8 @@ 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., 675 Massachusetts Ave, Cambridge MA 02139.
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 \endgroup}
 
@@ -93,7 +95,7 @@ Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
   \def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
 \else                           %2 or 3 columns uses prereduced size
   \hsize 3.4in
-  \vsize 7.95in
+  \vsize 9.2in
   \hoffset -.75in
   \voffset -.745in
   \font\titlefont=cmbx10 \scaledmag2
@@ -241,12 +243,14 @@ Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
 % commands fit on a page in two-column format
 \def\dx{{\bf (DX)}}
 
+\nopagenumbers
+
 %**end of header
 \f
 
 \title{Dired Reference Card}
 
-\centerline{(based on Dired in GNU Emacs 21.x)}
+\centerline{(based on Dired in GNU Emacs 22)}
 \centerline{Commands marked with \dx{} require dired-x}
 
 % trim this down to fit everything on one page
@@ -324,10 +328,17 @@ Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
 \key{change the marks to a different character}{* c}
 \key{mark files for which Elisp expression returns t}{* ( \dx}
 
-\section{Getting Help}
+\section{Modifying the Dired Buffer}
 
-\key{dired help}{h}
-\key{dired summary (short help) and error log}{?}
+\key{insert a subdirectory into this buffer}{i}
+\key{remove marked files from the listing}{k}
+\key{remove a subdir listing}{C-u k}
+\key{re-read all directories (retains all marks)}{g}
+\key{toggle sorting of current subdir by name/date}{s}
+\key{edit ls switches}{C-u s}
+\key{recover marks, hidden lines, and such}{C-_}
+\key{hide all subdirectories}{M-\$}
+\key{hide or unhide subdirectory}{\$}
 
 \section{Commands on Files Marked or Specified by the Prefix}
 
@@ -363,18 +374,6 @@ Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
 \key{execute the deletions requested (flagged files)}{x}
 \key{flag files matching a regular expression}{\% d}
 
-\section{Modifying the Dired Buffer}
-
-\key{insert a subdirectory into this buffer}{i}
-\key{remove marked files from the listing}{k}
-\key{remove a subdir listing}{C-u k}
-\key{re-read all directories (retains all marks)}{g}
-\key{toggle sorting of current subdir by name/date}{s}
-\key{edit ls switches}{C-u s}
-\key{recover marks, hidden lines, and such}{C-_}
-\key{hide all subdirectories}{M-\$}
-\key{hide or unhide subdirectory}{\$}
-
 \section{Regular Expression Commands}
 
 \key{mark filenames matching a regular expression}{\% m}
@@ -390,7 +389,12 @@ Foundation, Inc., 675 Massachusetts Ave, Cambridge MA 02139.
 \metax{dired file(s) that contain pattern}{M-x find-grep-dired}
 \metax{dired file(s) based on \kbd{find} output}{M-x find-dired}
 
-%\copyrightnotice
+\section{Getting Help}
+
+\key{dired help}{h}
+\key{dired summary (short help) and error log}{?}
+
+\copyrightnotice
 
 \bye