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..ce4150e1df7008a26e0a6ef075bc61e409829ffa 100644 (file)
--- a/etc/dired-ref.tex
+++ b/etc/dired-ref.tex
@@ -1,5 +1,6 @@
 % Reference Card for Dired
 % Reference Card for Dired

-% Copyright (C) 2000. 2001 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004,
+%   2005, 2006 Free Software Foundation, Inc.

 
 % This file is part of GNU Emacs.
 
 
 % This file is part of GNU Emacs.
 


@@ -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
 
 % 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.
 
 % 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,7 +41,7 @@
 
 
 \def\versionnumber{0.1}
 
 
 \def\versionnumber{0.1}

-\def\year{2000}
+\def\year{2006}

 \def\version{May \year\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
 \def\version{May \year\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill


@@ -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
 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}
 
 
 \endgroup}