Update years in copyright notice; nfc.

54 files changed, 175 insertions, 155 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 805b17e763a..07c05935fed 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -2179,7 +2179,7 @@
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
-        Free Software Foundation, Inc.
+        2002, 2003, 2004, 2005 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/etc/DEBUG b/etc/DEBUG
index a29e5fd3e6c..27f563a7405 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -1,5 +1,6 @@
 Debugging GNU Emacs
-Copyright (c) 1985, 2000, 2001, 2005 Free Software Foundation, Inc.
+Copyright (C) 1985, 2000, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/DISTRIB b/etc/DISTRIB
index bc0ea8cc60d..f5c380bfe37 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -3,8 +3,9 @@ For an order form for all Emacs and FSF distributions deliverable from
 the USA, see http://www.gnu.org/order/order.html.
 
            GNU Emacs availability information, October 2000
-Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998, 2000
-           Free Software Foundation, Inc.
+
+Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998,
+   2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
         Permission is granted to anyone to make or distribute
         verbatim copies of this document provided that the
diff --git a/etc/GNU b/etc/GNU
index 0a0e962fda0..6d54265d849 100644
--- a/etc/GNU
+++ b/etc/GNU
@@ -1,4 +1,5 @@
-Copyright (C) 1985, 1993, 2003, 2005 Free Software Foundation, Inc.
+Copyright (C) 1985, 1993, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
 of this document, in any medium, provided that the copyright notice and
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index 6e36a985973..0c9e0f4ef1f 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -1,5 +1,6 @@
 GNUS NEWS -- history of user-visible changes.
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send Gnus bug reports to bugs@gnus.org.
@@ -62,7 +63,7 @@ picons, install the picons database from
 
 and point `gnus-picon-databases' to that location.
 
-** If the new option `gnus-treat-body-boundary' is `head', a boundary 
+** If the new option `gnus-treat-body-boundary' is `head', a boundary
 line is drawn at the end of the headers.
 
 ** Retrieval of charters and control messages
@@ -77,7 +78,7 @@ for sending yourself reminders.  Setup with (gnus-delay-initialize).
 ** If `auto-compression-mode' is enabled, attachments are automatically
 decompressed when activated.
 
-** If the new option `nnml-use-compressed-files' is non-nil, 
+** If the new option `nnml-use-compressed-files' is non-nil,
 the nnml back end allows compressed message files.
 
 ** Signed article headers (X-PGP-Sig) can be verified with `W p'.
@@ -91,24 +92,24 @@ Do you often find yourself replying to news by email by mistake?  Then
 the new option `gnus-confirm-mail-reply-to-news' is just the thing for
 you.
 
-** If the new option `gnus-summary-display-while-building' is non-nil, 
+** If the new option `gnus-summary-display-while-building' is non-nil,
 the summary buffer is shown and updated as it's being built.
 
 ** The new `recent' mark "." indicates newly arrived messages (as
 opposed to old but unread messages).
 
-** The new option `gnus-gcc-mark-as-read' automatically marks 
+** The new option `gnus-gcc-mark-as-read' automatically marks
 Gcc articles as read.
 
 ** The nndoc back end now supports mailman digests and exim bounces.
 
-** Gnus supports RFC 2369 mailing list headers, and adds a number of 
+** Gnus supports RFC 2369 mailing list headers, and adds a number of
 related commands in mailing list groups.
 
 ** The Date header can be displayed in a format that can be read aloud
 in English, see `gnus-treat-date-english'.
 
-** The envelope sender address can be customized when using Sendmail, see 
+** The envelope sender address can be customized when using Sendmail, see
 `message-sendmail-envelope-from'.
 
 ** diffs are automatically highlighted in groups matching
@@ -488,7 +489,7 @@ If you used procmail like in
 (setq nnmail-procmail-directory "~/mail/incoming/")
 (setq nnmail-procmail-suffix "\\.in")
 
-this now has changed to 
+this now has changed to
 
 (setq mail-sources
       '((directory :path "~/mail/incoming/"
@@ -527,7 +528,8 @@ ever-changing layouts.
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/NEWS b/etc/NEWS
index 6cd040e4fac..08479a5579e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -14510,7 +14510,8 @@ select one of those items.
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index d6977ee4f72..999fb88fffe 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3561,8 +3561,8 @@ This problem will not happen if the m-...h file for your type
 of machine defines NO_UNION_TYPE.
 
 
-Copyright 1987,88,89,93,94,95,96,97,98,1999,2001,2002,2004
-  Free Software Foundation, Inc.
+Copyright 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 Copying and redistribution of this file with or without modification
 are permitted without royalty provided this notice is preserved.
diff --git a/etc/TUTORIAL b/etc/TUTORIAL
index 48fa02f93d9..0df9a6f2711 100644
--- a/etc/TUTORIAL
+++ b/etc/TUTORIAL
@@ -1,5 +1,4 @@
 Emacs tutorial.  See end for copying conditions.
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
 
 Emacs commands generally involve the CONTROL key (sometimes labeled
 CTRL or CTL) or the META key (sometimes labeled EDIT or ALT).  Rather than
@@ -1104,7 +1103,8 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.bg b/etc/TUTORIAL.bg
index 239d3d58c19..8f51458381f 100644
--- a/etc/TUTORIAL.bg
+++ b/etc/TUTORIAL.bg
@@ -1,5 +1,4 @@
 Âúâåäåíèå â Emacs. Óñëîâèÿòà çà êîïèðàíå ñà â êðàÿ íà òåêñòà.
-Copyright (c) 1985,1996,1998,2001,2002,2003,2005 Free Software Foundation.
 
 Êîìàíäèòå íà Emacs íàé-÷åñòî âêëþ÷âàò êëàâèøèòå CONTROL (ïîíÿêîãà
 îòáåëÿçâàí ñ CTRL èëè CTL) è META (ïîíÿêîãà îòáåëÿçâàí ñ EDIT èëè
@@ -1170,7 +1169,8 @@ Dired âè ïîçâîëÿâà äà ãëåäàòå ñïèñúêà îò ôàéëîâå â äèðåêòîðèÿ (è êàòî
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.cn b/etc/TUTORIAL.cn
index 1b30b6e909a..f35c53be663 100644
--- a/etc/TUTORIAL.cn
+++ b/etc/TUTORIAL.cn
@@ -1,5 +1,4 @@
 Emacs ¿ìËÙÖ¸ÄÏ.
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
 
 Emacs Ö¸Áîͨ³£°üº¬ÓÐ CONTROL ¼ü£¨ÓÐʱºòÒÔ CTRL »ò CTL À´±êʾ£©»òÊÇ 
 META ¼ü£¨ÓÐʱºòÒÔ EDIT »ò ALT À´±êʾ£©¡£ÎªÁ˱ÜÃâÿһ´Î¶¼ÒªÐ´³öÆäÈ«Ãû£¬
@@ -1050,7 +1049,8 @@ issue here>¡¹¡£
 Õâ¸ö°æ±¾µÄ¿ìËÙÖ¸ÄÏºÍ GNU Emacs Ò»Ñù¶¼ÊÇ°æȨ»¯µÄ£¬²¢ÇÒÔÊÐíÔÚijЩÌõ¼þÏÂ
 É¢²¼Æ俽±´£º
 
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 Chinese Translation by Chao-Hong Liu (2002, 2003)
 
    Permission is granted to anyone to make or distribute verbatim copies
diff --git a/etc/TUTORIAL.cs b/etc/TUTORIAL.cs
index 9a244a5e750..57e77de9a4b 100644
--- a/etc/TUTORIAL.cs
+++ b/etc/TUTORIAL.cs
@@ -1,5 +1,4 @@
 Tutoriál k Emacsu.  Podmínky viz na konci.
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
 Do èe¹tiny pøelo¾il Milan Zamazal <pdm@zamazal.org>.
 
 Máte pøed sebou tutoriál k Emacsu.
@@ -1023,7 +1022,8 @@ tutoriálem napsaným Stuartem Cracraftem pro pùvodní Emacs.
 Tato verze tutoriálu je, podobnì jako GNU Emacs, chránìna copyrightem a
 je ¹íøena se svolením distribuovat kopie za jistých podmínek:
 
-Copyright (c) 1985, 1996 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Ka¾dému je zaruèeno právo vytváøet a distribuovat pøesné kopie tohoto
    dokumentu tak, jak jej obdr¾el, na jakémkoliv médiu, s tím, ¾e bude
diff --git a/etc/TUTORIAL.de b/etc/TUTORIAL.de
index 9c556c83b90..17019ad66dc 100644
--- a/etc/TUTORIAL.de
+++ b/etc/TUTORIAL.de
@@ -1,5 +1,4 @@
 Einführung in Emacs.  Siehe Dateiende für Vervielfältigungsbedingungen.
-(c) 2002, 2003, 2005 Free Software Foundation, Inc.
 
 Emacs-Befehle beinhalten im allgemeinen die CONTROL-Taste (manchmal
 auch als CTRL, CTL oder STRG beschriftet) sowie die META-Taste (auch
@@ -1461,7 +1460,8 @@ geschrieben.  Übersetzer ins Deutsche ist Werner Lemberg (wl@gnu.org).
 Beachten Sie bitte, daß im Zweifelsfalle das englische Original dieser
 Urheberrechtsnotiz gültig ist (zu finden in der Datei TUTORIAL).
 
-Copyright (c) 1985, 1996, 1997 Free Software Foundation
+Copyright (C) 1985, 1996, 1997, 2002, 2003, 2004,
+   2005 Free Software Foundation
 
    Hiermit wird für jedermann die Erlaubnis erteilt, wörtliche,
    unveränderte Kopien dieses Dokumentes für jegliches Medium zu
diff --git a/etc/TUTORIAL.es b/etc/TUTORIAL.es
index ed55cc5ca41..cb5e92a2df3 100644
--- a/etc/TUTORIAL.es
+++ b/etc/TUTORIAL.es
@@ -1,5 +1,4 @@
 Tutorial de Emacs. Vea al final las condiciones de copiado.
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
 
 Generalmente los comandos de Emacs involucran la tecla CONTROL
 (algunas veces llamada CTRL O CTL) o la tecla meta (algunas veces
@@ -1188,7 +1187,8 @@ Por favor, en caso de duda, sólo es válido el original en inglés de la
 siguiente nota de derechos de reproducción (que puede encontrar en el
 archivo TUTORIAL).
 
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Se permite a cualquiera hacer o distribuir copias literales de este
    documento como se recibe, en cualquier medio, siempre que la nota
diff --git a/etc/TUTORIAL.fr b/etc/TUTORIAL.fr
index e3e940abd4e..30a6f05fe23 100644
--- a/etc/TUTORIAL.fr
+++ b/etc/TUTORIAL.fr
@@ -1,5 +1,4 @@
 Didacticiel d'Emacs.  Voir la fin de ce document pour les conditions.
-Copyright (c) 1985, 2001, 2002 Free Software Foundation, Inc.
 
 Les commandes Emacs utilisent généralement la touche CONTROLE (souvent
 désignée par CTRL ou CTL) ou la touche META (souvent désignée par EDIT
@@ -1171,7 +1170,8 @@ Cette version du didacticiel, comme GNU Emacs, est placée sous
 copyright, et vous pouvez en distribuer des copies sous certaines
 conditions :
 
-Copyright (c) 1985, 1996, 2001, 2002 Free Software Foundation
+Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Chacun peut créer ou distribuer des copies de ce document tel qu'il
    l'a reçu, sur n'importe quel support, pourvu que la note de
diff --git a/etc/TUTORIAL.it b/etc/TUTORIAL.it
index 55608250c2b..d310a16eae4 100644
--- a/etc/TUTORIAL.it
+++ b/etc/TUTORIAL.it
@@ -1,5 +1,4 @@
 Esercitazione di Emacs.  Condizioni d'uso alla fine del file.
-Copyright (c) 2003 Free Software Foundation, Inc.
 
 I comandi di Emacs comportano generalmente l'uso del tasto CONTROL (a
 volte indicato con CTRL o CTL) o del tasto META (a volte indicato con EDIT
@@ -1094,7 +1093,7 @@ distribuito con il permesso di farne copie a determinate condizioni:
    indicativo, restando comunque inteso il fatto che è quella originale a
    fare fede.
 
-   Copyright (c) 2003 Free Software Foundation
+Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
    È permesso a chiunque copiare e distribuire attraverso ogni mezzo copie
    fedeli di questo documento così come viene ricevuto, a condizione che
diff --git a/etc/TUTORIAL.ja b/etc/TUTORIAL.ja
index ccb454bf3f6..dec03f35d20 100644
--- a/etc/TUTORIAL.ja
+++ b/etc/TUTORIAL.ja
@@ -1,5 +1,4 @@
 Emacs $BF~Lg%,%$%I(B.  $BK\%U%!%$%k$NCx:n8"$K$D$$$F$O:G8e$r8fMw2<$5$$!#(B
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
 
 Emacs $B$N%3%^%s%I$rF~NO$9$k$K$O!"0lHL$K%3%s%H%m!<%k%-!<!J%-!<%H%C%W$K(B
 CONTROL $B$H$+(B CTRL $B$H$+(B CTL $B$H=q$$$F$"$k!K$d%a%?%-!<!J%-!<%H%C%W$K(B META
@@ -1048,7 +1047,8 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.ko b/etc/TUTORIAL.ko
index 8e94db3c658..c8875dc31be 100644
--- a/etc/TUTORIAL.ko
+++ b/etc/TUTORIAL.ko
@@ -1,5 +1,5 @@
 $(C@L8F=:(B(Emacs) $(CAvD'<-@T4O4Y(B.
-$(C@z@[1G(B (c) 1985, 2001 Free Software Foundation, Inc;  $(C3!?!4B(B $(C:9;g(B $(CA60G@L(B
+$(C3!?!4B(B $(C:9;g(B $(CA60G@L(B
 $(C@V=@4O4Y(B.  $(CAv1](B $(C@P0m(B $(C@V4B(B $(C@L(B $(C1[@:(B $(C@L8F=:(B(Emacs) $(CAvD'<-@T4O4Y(B.
 
 $(C@L8F=:(B $(C8m7I5i@:(B $(C4k03(B $(CA&>n<h(B (CTRL$(C@L3*(B CTL$(C@L6s0m55(B $(CG%=C(B) $(CH$@:(B
@@ -989,7 +989,8 @@ C-x C-s$(C?M(B (META$(C<h3*(B EDIT$(C<h(B $(CH$@:(B $(C13C<<h0!(B $(C
 GNU $(C@L8F=:?M(B $(C00@L(B $(C@L(B $(CAvD'<-(B $(CFG@:(B $(C@z@[1G@L(B $(C@V@88g(B $(CF/A$GQ(B $(CA60G@;(B $(C88A7GR(B
 $(C6'?!(B $(C:9;g:;@;(B $(C9hFwGR(B $(C<v(B $(C@V4B(B $(CGc0!8&(B $(C0.0m(B $(C3*?B(B $(C0M@L4Y(B:
 
-$(C@z@[1G(B (c) 1985, 1996 Free Software Foundation
+Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    $(C@L(B $(C9.<-4B(B $(C@L(B $(C@z@[1G(B $(C0x0m?M(B $(CGc?k(B $(C0x0m0!(B $(C1W4k7N(B $(C@/Av5G0m(B, $(C9hFw@Z0!(B
    $(C<vCk@Z?!0T(B $(C@L(B $(C0x0m?!(B $(C5{6s(B $(CGc?k5G4B(B $(C0MC373(B $(C6G(B $(C@g:P9hGO4B(B $(C0M@;(B
diff --git a/etc/TUTORIAL.nl b/etc/TUTORIAL.nl
index 6b6a20a1bba..6438869369f 100644
--- a/etc/TUTORIAL.nl
+++ b/etc/TUTORIAL.nl
@@ -1,5 +1,4 @@
 Emacs-inleiding.  De kopieervoorwaarden staan onderaan.
-Copyright (c) 1985, 1996, 1997, 2003, 2004, 2005 Free Software Foundation
 
 De meeste Emacs-commando's gebruiken de CONTROL-toets (soms CTRL of CTL
 genaamd) en/of de META-toets (soms genaamd EDIT of ALT).  In plaats van
@@ -1205,7 +1204,8 @@ het Engelse origineel.)
 Deze versie van de inleiding valt onder copyright, net als GNU Emacs.
 Je mag deze inleiding verspreiden onder bepaalde voorwaarden:
 
-Copyright (c) 1985, 1996, 1997, 2003, 2004, 2005 Free Software Foundation
+Copyright (C) 1985, 1996, 1997, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Iedereen mag letterlijke kopieën van dit document, zowel ontvangen
    als verspreiden, op elk medium, vooropgesteld dat de
@@ -1229,7 +1229,8 @@ software te gebruiken, te schrijven en te delen!
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (c) 1985, 1996, 1997, 2003, 2004, 2005 Free Software Foundation
+Copyright (C) 1985, 1996, 1997, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
diff --git a/etc/TUTORIAL.pl b/etc/TUTORIAL.pl
index 076a33bbd84..cff0b9dd40c 100644
--- a/etc/TUTORIAL.pl
+++ b/etc/TUTORIAL.pl
@@ -1,5 +1,4 @@
 Krótki samouczek Emacsa.  Warunki kopiowania znajduj± sie na koñcu pliku.
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
 
 Polecenia Emacsa wymagaj± na ogó³ wci¶niêcia klawisza CONTROL (oznaczanego
 czasami Ctrl lub CTL) lub klawisza META (oznaczanego czasami EDIT
@@ -1218,7 +1217,8 @@ z pomoc± Ryszarda Kubiaka i Janusza S. Bienia <jsbien@mail.uw.edu.pl>.
 Ta wersja samouczka, podobnie jak GNU Emacs, jest chroniona prawem
 autorskim, ale wolno j± kopiowaæ pod nastêpuj±cymi warunkami:
 
-Copyright (c) 1985, 1994, 2001 Free Software Foundation
+Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
 Zezwala siê na wykonywanie lub rozpowszechnianie
 wiernych kopii tego dokumentu w otrzymanej formie, na dowolnym
diff --git a/etc/TUTORIAL.pt_BR b/etc/TUTORIAL.pt_BR
index 56f431ecdd7..bd7cf84d6c1 100644
--- a/etc/TUTORIAL.pt_BR
+++ b/etc/TUTORIAL.pt_BR
@@ -1,5 +1,4 @@
 Tutorial do Emacs. Veja no fim as condições para cópia.
-Copyright (c) 2004, 2005 Free Software Foundation.
 
 Os comandos do Emacs geralmente envolvem a tecla CONTROL (algumas vezes
 nomeada CTRL ou CTL) ou a tecla META (algumas vezes nomeada EDIT ou
@@ -1064,7 +1063,7 @@ Essa versão do tutorial foi originalmente traduzida por Marcelo Toledo
 <marcelo@gnu.org> e como o GNU Emacs, tem um copyright, e vem
 com uma permissão de distribuição de cópias nas seguintes condições:
 
-Copyright (c) 1985, 1996 Free Software Foundation
+Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
    Permissão é garantida a qualquer um para fazer ou distribuir copias
    integrais deste documento como recebido, em qualquer meio, deixando
diff --git a/etc/TUTORIAL.ro b/etc/TUTORIAL.ro
index 71b2466eca9..85e8e30892f 100644
--- a/etc/TUTORIAL.ro
+++ b/etc/TUTORIAL.ro
@@ -1,5 +1,4 @@
 Tutorialului de Emacs.  A se citi sfârºitul pentru condiþii.
-Copyright (c) 1998 Free Software Foundation
 Traducere din englezã de Tudor Hulubei <tudor@gnu.org>.
 Mulþumiri Aidei Hulubei <aida@chang.pub.ro> pentru corecturi ºi sugestii.
 
@@ -1092,7 +1091,7 @@ continuare noþita de copyright originalã în limba englezã.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (c) 1985, 1996 Free Software Foundation
+Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.ru b/etc/TUTORIAL.ru
index 1be3a1e28a8..cd84911db2d 100644
--- a/etc/TUTORIAL.ru
+++ b/etc/TUTORIAL.ru
@@ -1,5 +1,4 @@
 õÞÅÂÎÉË Emacs. õÓÌÏ×ÉÑ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÐÒÉ×ÅÄÅÎÙ × ËÏÎÃÅ ÆÁÊÌÁ
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation, Inc.
 
 äÌÑ ÕÐÒÁ×ÌÅÎÉÑ Emacs ÏÂÙÞÎÏ ÉÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ (key -- ÓÏÞÅÔÁÎÉÅ ËÌÁ×ÉÛ
 ËÌÁ×ÉÁÔÕÒÙ É/ÉÌÉ ËÎÏÐÏË ÍÙÛÉ), ×ËÌÀÞÁÀÝÉÊ × ÓÅÂÑ ËÌÁ×ÉÛÕ CONTROL (ÉÎÏÇÄÁ
@@ -669,7 +668,7 @@ meta- ÓÉÍ×ÏÌÙ. Emacs ÏÂÈÏÄÉÔ ÜÔÏ, ÉÓÐÏÌØÚÕÑ X-ËÏÍÁÎÄÕ (eXtend). åÓÔØ Ä×Å
 
         C-x     òÁÓÛÉÒÅÎÉÅ Ó ÐÏÍÏÝØÀ ××ÏÄÁ ÐÒÅÆÉËÓÁ. úÁ ÎÉÍ ÓÌÅÄÕÅÍ ÏÄÉÎ ÓÉÍ×ÏÌ.
         M-x     òÁÓÛÉÒÅÎÉÅ ÎÁÂÏÒÁ ËÏÍÁÎÄ Ó ÐÏÍÏÝØÀ ÉÈ ÎÁÉÍÅÎÏ×ÁÎÉÑ. úÁ ÎÉÍ ÓÌÅÄÕÅÔ ÉÍÑ
-        ËÏÍÁÎÄÙ. 
+        ËÏÍÁÎÄÙ.
 
 üÔÏ ÐÏÌÅÚÎÙÅ ËÏÍÁÎÄÙ, ÎÏ ÏÎÉ ÉÓÐÏÌØÚÕÀÔÓÑ ÍÅÎÅÅ ÞÁÓÔÏ, ÞÅÍ ÔÅ ËÏÍÁÎÄÙ,
 ËÏÔÏÒÙÅ ÍÙ ÉÚÕÞÉÌÉ. ÷Ù ÕÖÅ ×ÉÄÅÌÉ ÎÅËÏÔÏÒÙÅ ÉÚ ÎÉÈ: ËÏÍÁÎÄÙ ÒÁÂÏÔÙ Ó ÆÁÊÌÁÍÉ
@@ -1132,7 +1131,8 @@ Dired ÐÏÚ×ÏÌÑÅÔ ×ÁÍ ÏÔÏÂÒÁÖÁÔØ ÓÐÉÓÏË ÆÁÊÌÏ× × ËÁÔÁÌÏÇÅ (Á ÔÁËÖÅ
 (copyrighted), É ÐÒÉÈÏÄÉÔ Ó ÏÇÒÁÎÉÞÅÎÉÑÍÉ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ËÏÐÉÊ ÓÏ
 ÓÌÅÄÕÀÝÉÍÉ ÓÏÇÌÁÛÅÎÉÑÍÉ:
 
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
@@ -1151,7 +1151,7 @@ Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
 ÏÂÅÓÐÅÞÅÎÉÑ ("×ÌÁÄÅÎÉÅ"), ÉÓÐÏÌØÚÕÑ, ÓÏÚÄÁ×ÁÑ É ÒÁÓÐÒÏÓÔÒÁÎÑÑ Ó×ÏÂÏÄÎÏÅ
 ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ!
 
-// ÚÁÍÅÞÁÎÉÑ, ÉÓÐÒÁ×ÌÅÎÉÑ ÏÛÉÂÏË Ó ÖÄÕ ÐÏ ÁÄÒÅÓÕ alexott@gmail.com. 
+// ÚÁÍÅÞÁÎÉÑ, ÉÓÐÒÁ×ÌÅÎÉÑ ÏÛÉÂÏË Ó ÖÄÕ ÐÏ ÁÄÒÅÓÕ alexott@gmail.com.
 // Alex Ott.
 
 ;;; Local Variables:
diff --git a/etc/TUTORIAL.sk b/etc/TUTORIAL.sk
index 67e20f1497c..26e3f834748 100644
--- a/etc/TUTORIAL.sk
+++ b/etc/TUTORIAL.sk
@@ -1,5 +1,4 @@
 Tútorial k Emacsu. Podmienky pozri na konci.
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
 Do èe¹tiny prelo¾il Milan Zamazal <pdm@zamazal.org>, do slovenèiny Miroslav
 Va¹ko <zemiak@zoznam.sk>.
 
@@ -1082,7 +1081,8 @@ tútorialom napísaným Stuartom Cracraftom pre pôvodný Emacs.
 Táto verzia tútorialu je, podobne ako GNU Emacs, chránená copyrightom
 a je ¹írená s povolením distribuova» kópie za istých podmienok:
 
-Copyright (c) 1985, 1996 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Ka¾dému je zaruèené právo vytvára» a distribuova» presné kópie tohto
    dokumentu tak, ako ho dostal, na akomkoµvek médiu, s tým, ¾e bude
diff --git a/etc/TUTORIAL.sl b/etc/TUTORIAL.sl
index 263019643db..37ebb2fbf11 100644
--- a/etc/TUTORIAL.sl
+++ b/etc/TUTORIAL.sl
@@ -1,5 +1,4 @@
 Prvo berilo za Emacs. Pogoji uporabe in raz¹irjanja so navedeni na koncu.
-Copyright (c) 1985, 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
 
 Ukazi v Emacsu v splo¹nem vkljuèujejo tipki CONTROL (vèasih oznaèeni
 CTRL ali CTL) in META (vèasih oznaèena EDIT ali ALT). Namesto, da bi ju
@@ -1115,7 +1114,8 @@ Emacs. V sloven¹èino ga je prevedel Primo¾ Peterlin.
 To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo
 razmno¾evanje in raz¹irjanje je dovoljeno pod naslednjimi pogoji:
 
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Dovoljeno je izdelovati in raz¹irjati neokrnjene kopije tega spisa
    v kakr¹nikoli obliki pod pogojem, da je ohranjena navedba o
diff --git a/etc/TUTORIAL.sv b/etc/TUTORIAL.sv
index e4a86cabada..65dff742ec2 100644
--- a/etc/TUTORIAL.sv
+++ b/etc/TUTORIAL.sv
@@ -1,6 +1,4 @@
-Emacs användarhandledning. I slutet finns kopieringsvillkoren. 
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software
-Foundation, Inc.
+Emacs användarhandledning. I slutet finns kopieringsvillkoren.
 
 Emacs-kommandon innebär ofta användning av kontrolltangenten (vanligen
 märkt CTRL eller CTL) eller META-tangenten (på vissa tangentbord märkt
@@ -310,9 +308,9 @@ texten. Tecken som du kan se, så som A, 7, *, etc. tolkas som text och
 sätts in direkt. Skriv <Return> (retur-tangenten) för att sätta in en
 radbrytning.
 
-Du kan radera det sista tecknet du skrev genom att trycka <Delback>. 
+Du kan radera det sista tecknet du skrev genom att trycka <Delback>.
 <Delback> är en tangent på tangentbordet -- samma som du normalt
-använder utanför Emacs för att ta bort det senaste tecknet du skrivit. 
+använder utanför Emacs för att ta bort det senaste tecknet du skrivit.
 Det är vanligen en stor tangent några rader ovanför retur-tangenten,
 och den är vanligtvis märkt "Delete, "Del" eller "Backspace".
 
@@ -325,7 +323,7 @@ markörspositionen.
 
 >>  Gör detta nu: Skriv in några tecken och ta bort dem genom att
     använda <Delback>. Var inte rädd för att skriva i den här filen,
-    du kommer inte att kunna förändra originalet till vägledningen. 
+    du kommer inte att kunna förändra originalet till vägledningen.
     Detta är bara en lokal kopia.
 
 När en rad blir för lång för att rymmas på en skärmbredd så fortsätter
@@ -408,7 +406,7 @@ raderar så många rader OCH innehållet i dem. Detta är alltså inte bara
 en repetition av kommandot. C-u 2 C-k raderar två rader samt de tomma
 raderna, medan C-k två gånger inte kommer att göra det.
 
-Att sätta in borttagen text kallas att "återhämta" den (yanking). 
+Att sätta in borttagen text kallas att "återhämta" den (yanking).
 (Tänk på det som att du rycker, eller drar, tillbaka någon text som
 tagits bort.) Du kan antingen hämta tillbaka borttagen text till samma
 plats som där den blev borttagen, eller så kan du sätta in den på en
@@ -593,7 +591,7 @@ Emacs-fönster så tillhör den alltid en buffert.
 
 >> Skriv C-x 1 för att bli kvitt buffertlistan.
 
-När du har flera buffertar så är bara en av dem "gällande" åt gången. 
+När du har flera buffertar så är bara en av dem "gällande" åt gången.
 Det är den buffert du redigerar. Om du vill redigera en annan buffert
 så måste du byta till den. Om du vill byta till en buffert som
 motsvarar en fil kan du göra det genom att besöka den igen med C-x
@@ -615,7 +613,7 @@ skapades med C-x C-b. Bufferten "*Messages*" motsvarar inte heller
 någon fil. Den innehåller de meddelanden som visas på den nedersta
 raden i Emacs sessionen.
 
->> Skriv C-x b *Messages* <Return> för att se meddelandebufferten. 
+>> Skriv C-x b *Messages* <Return> för att se meddelandebufferten.
    Skriv sedan C-x b TUTORIAL.sv <Return> för att återgå till den här
    handledningen.
 
@@ -979,7 +977,7 @@ Ibland kan du hamna i något som kallas "rekursiv redigering"
 huvudläget i lägesraden. Till exempel kan det stå [(Fundamental)]
 istället för (Fundamental).
 
-För att komma ur rekursiv redigering trycker du <ESC> <ESC> <ESC>. 
+För att komma ur rekursiv redigering trycker du <ESC> <ESC> <ESC>.
 Detta är ett generellt brytkommando. Du kan också använda det för att
 bli kvitt extra fönster och för att komma ut ur minibufferten.
 
@@ -1099,7 +1097,7 @@ ett mail och klaga!
 ----------------
 
 Du kan lära dig mer om Emacs genom att läsa dess manual, antingen i
-bokform eller on-line i Info (använd Hjälp-menyn eller skriv F10 h r). 
+bokform eller on-line i Info (använd Hjälp-menyn eller skriv F10 h r).
 Två finesser som du kan komma att gilla speciellt är komplettering
 (completion), som spar tangenttryckningar, och dired, som förenklar
 filhantering.
@@ -1128,7 +1126,8 @@ Lidell översatte den till Svenska.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.th b/etc/TUTORIAL.th
index 86c03d31f3b..5db33b3d470 100644
--- a/etc/TUTORIAL.th
+++ b/etc/TUTORIAL.th
@@ -970,7 +970,8 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (c) 1985, 1996 Free Software Foundation
+Copyright (C) 1985, 1996, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.zh b/etc/TUTORIAL.zh
index 8411bf878f5..1a1020a425b 100644
--- a/etc/TUTORIAL.zh
+++ b/etc/TUTORIAL.zh
@@ -1,7 +1,6 @@
 Emacs §Ö³t«ü«n¡].
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
 
-Emacs «ü¥O³q±`¥]§t¦³ CONTROL Áä¡]¦³®É­Ô¥H CTRL ©Î CTL ¨Ó¼Ð¥Ü¡^©Î¬O 
+Emacs «ü¥O³q±`¥]§t¦³ CONTROL Áä¡]¦³®É­Ô¥H CTRL ©Î CTL ¨Ó¼Ð¥Ü¡^©Î¬O
 META Áä¡]¦³®É­Ô¥H EDIT ©Î ALT ¨Ó¼Ð¥Ü¡^¡C¬°¤FÁקK¨C¤@¦¸³£­n¼g¥X¨ä¥þ¦W¡A
 §Ú­Ì±N·|¨Ï¥Î¤U­zªºÁY¼g¡G
 
@@ -15,7 +14,7 @@ META Áä¡]¦³®É­Ô¥H EDIT ©Î ALT ¨Ó¼Ð¥Ü¡^¡C¬°¤FÁקK¨C¤@¦¸³£­n¼g¥X¨ä¥þ¦W¡A
 ­«­n³Æ§Ñ¿ý¡G­nÂ÷¶} Emacs §@·~¶¥¬q¡] session ¡^¡AÁä¤J C-x C-c ¡]¨â­Ó¦r
 ¤¸¡^¡C¦ì¦b¥ª°¼Ãä¬Éªº¡u>>¡v¦r¤¸¬OÅý±z¥i¥H¸ÕµÛ¨Ï¥Îªº«ü¥Oªº´£¥Ü¡CÁ|¨Ò¨Ó»¡¡G
 <<Blank lines inserted around following line by help-with-tutorial>>
-[Middle of page left blank for didactic purposes.  Text continues below] 
+[Middle of page left blank for didactic purposes.  Text continues below]
 >> ²{¦bÁä¤J C-v ¡] View next screen ¡^¥H²¾¨ì¤U­Ó¿Ã¹õ¡C
     ¡]¸Õ¸Õ¬Ý¡AÁä¤J¦r¤¸ v ®É¡A«ö¦í CONTROL Áä¡^
     ±q²{¦b¶}©l¡A±zÀ³¸Ó¦b¨C¦¸¾\Ū§¹¥Ø«eªº¿Ã¹õ®É°µ¤@¦¸³o­Ó°Ê§@¡C
@@ -24,7 +23,7 @@ META Áä¡]¦³®É­Ô¥H EDIT ©Î ALT ¨Ó¼Ð¥Ü¡^¡C¬°¤FÁקK¨C¤@¦¸³£­n¼g¥X¨ä¥þ¦W¡A
 ´£¨Ñ¤@¨Ç³sÄò©Ê¡AÅý±z¥i¥H±µÄò¦a¾\Ū¤å¦r¡C
 
 ±z»Ý­nª¾¹Dªº²Ä¤@¥ó¨Æ¬O¦p¦ó¦b¤å¦r¤¤²¾°Ê¡C±z¤w¸gª¾¹D¤F¥i¥H C-v ¨Ó¦V«e²¾
-°Ê¤@­Ó¿Ã¹õ¡C­n¦V«á²¾°Ê¤@­Ó¿Ã¹õ¡A«hÁä¤J M-v ¡]«ö¦í META Áä¡AµM«áÁä¤J v 
+°Ê¤@­Ó¿Ã¹õ¡C­n¦V«á²¾°Ê¤@­Ó¿Ã¹õ¡A«hÁä¤J M-v ¡]«ö¦í META Áä¡AµM«áÁä¤J v
 ¡A©Î¬O¦pªG±z¨S¦³ META ¡B EDIT ©Î ALT Áä®ÉÁä¤J <ESC>v ¡^¡C
 
 >>  ¸ÕµÛÁä¤J M-v µM«á C-v ¡A³sÄò­Ó´X¦¸¡C
@@ -74,7 +73,7 @@ META Áä¡]¦³®É­Ô¥H EDIT ©Î ALT ¨Ó¼Ð¥Ü¡^¡C¬°¤FÁקK¨C¤@¦¸³£­n¼g¥X¨ä¥þ¦W¡A
 >> ¥H C-n ©Î C-p ±N´å¼Ð²¾¨ì¹Ï§Îªº¤¤¥¡¡C
    Áä¤J C-l ·|¬Ý¨ì¾ã­Ó¹Ï§ÎÅã¥Ü¦b¿Ã¹õªº¤¤¥¡¡C
 
-±z·|µo²{¥Î¦r¥À©Ò¥Nªíªº·N¸q¨Ó°O¾Ð¥¦­Ì«Ü®e©ö¡GP ªí¥Ü previous ¡B N ªí¥Ü 
+±z·|µo²{¥Î¦r¥À©Ò¥Nªíªº·N¸q¨Ó°O¾Ð¥¦­Ì«Ü®e©ö¡GP ªí¥Ü previous ¡B N ªí¥Ü
 next ¡B B ªí¥Ü backward ¡B¦Ó F «hªí¥Ü forward ¡C±z±N¡uÁ`¬O¡v¥Î¨ì³o¨Ç´å
 ¼Ð²¾°Ê«ü¥O¡C
 
@@ -172,9 +171,9 @@ META ¦r¤¸¬O¥Î¨Ó§@¬°»P¡u¥H»y¨¥©w¸q¥Xªº³æ¦ì¡]¦r¡B¥y¤l¡B¬q¸¨¡^¡v¦³Ãöªº¾Þ
    µM«á¦A­«½Æ¦a¨Ï¥Î M-v ¦^¨ì³o¸Ì¡C
 
 ¦pªG±zªº²×ºÝ¾÷¦³¤è¦VÁ䪺¸Ü¡A±z¤]¥i¥H¥Î¤è¦VÁä²¾°Ê´å¼Ð¡C§Ú­Ì¦³¤T­Ó²z¥Ñ«Ø
-ij±z¾Ç²ß C-b ¡B C-f ¡B C-n ¡B ©M C-p ¡G(1) ¥ô¦óªº²×ºÝ¾÷³£¯à¨Ï¥Î¡C(2) 
+ij±z¾Ç²ß C-b ¡B C-f ¡B C-n ¡B ©M C-p ¡G(1) ¥ô¦óªº²×ºÝ¾÷³£¯à¨Ï¥Î¡C(2)
 ¤@¥¹±z¨Ï¥Î Emacs ¬Û·í¼ô½m¤F¡A±z·|µo²{Áä¤J³o¨Ç CONTROL ¦r¤¸¡A¤ñ°_¨Ï¥Î¤è
-¦VÁä§Ö¦h¤F¡]¦]¬°±z¤£»Ý­n±N¤â²¾¶}¥´¦r°Ï¡^¡C(3) ¤@¥¹±z¨Ï¥Î³o¨Ç CONTROL 
+¦VÁä§Ö¦h¤F¡]¦]¬°±z¤£»Ý­n±N¤â²¾¶}¥´¦r°Ï¡^¡C(3) ¤@¥¹±z¨Ï¥Î³o¨Ç CONTROL
 ¦r¤¸«ü¥O¦¨¬°²ßºD¡A±z¤]¥i¥H«Ü®e©ö¦a¾Ç·|¨ä¥L¶i¶¥ªº´å¼Ð°Ê§@«ü¥O¡C
 
 ¤j³¡¥÷ªº Emacs «ü¥O±µ¨ü¼Æ¦r°Ñ¼Æ¡F¹ï¤j³¡¥÷ªº«ü¥O¦Ó¨¥¡A¥¦ªº§@¥Î¬O«ü©w­«
@@ -194,7 +193,7 @@ META ¦r¤¸¬O¥Î¨Ó§@¬°»P¡u¥H»y¨¥©w¸q¥Xªº³æ¦ì¡]¦r¡B¥y¤l¡B¬q¸¨¡^¡v¦³Ãöªº¾Þ
 ¥X²{¡A¦Ó¤£ºÞ¨ä­È¬°¦ó¡A¥¦­ÌÅý³o«ü¥O°µ¨Ç¤£¤@¼Ëªº¨Æ¡C
 
 C-v ©M M-v «h¬O¥t¤@Ãþªº¨Ò¥~¡C·íµ¹©w¤@­Ó°Ñ¼Æ®É¡A¥¦­Ì±²°Ê¡u©Ò«ü©wªº¼Æ¶q
-ªº¦æ¡]¥H¦æ¬°³æ¦ì¡^¡v¡A¦Ó¤£¬O¥H¡u¿Ã¹õ¡v¬°³æ¦ì±²°Ê¡CÁ|¨Ò¨Ó»¡¡AC-u 8 C-v 
+ªº¦æ¡]¥H¦æ¬°³æ¦ì¡^¡v¡A¦Ó¤£¬O¥H¡u¿Ã¹õ¡v¬°³æ¦ì±²°Ê¡CÁ|¨Ò¨Ó»¡¡AC-u 8 C-v
 ±NÅã¥Ü¿Ã¹õ±²°Ê 8 ¦æ¡C
 
 >> ²{¦b¸ÕµÛÁä¤J C-u 8 C-v¡C
@@ -261,25 +260,25 @@ Emacs ¥i¥H¦³¼Æ­Óµ¡®æ¡A¨C¤@­ÓÅã¥Ü¥¦¦Û¤vªº¤å¦r¡C§Ú­Ì¦bµy«á·|¸ÑÄÀ¦p¦ó¨Ï¥Î
 
 >> Áä¤J C-x 1 ¥H¨Ï¤å¥ó¦Cªíµ¡®æ®ø¥¢¡C
 
-³o­Ó«ü¥O¨Ã¤£¹³±z¥ý«e©Ò¾Ç¹Lªº«ü¥O¨º¯ë¡A¥¦¥]¬A¤F¨â­Ó¦r¤¸¡C¥¦¬O¥H¦r¤¸ 
+³o­Ó«ü¥O¨Ã¤£¹³±z¥ý«e©Ò¾Ç¹Lªº«ü¥O¨º¯ë¡A¥¦¥]¬A¤F¨â­Ó¦r¤¸¡C¥¦¬O¥H¦r¤¸
 CONTROL-x §@¬°¶}©l¡C¦³¤@¾ã­Ó¨t¦Cªº«ü¥O¬O¥H CONTROL-x §@¬°¶}©l¡F¥¦­Ì¤§
-¤¤¦³³\¦h¬O»P¡uµ¡®æ¡BÀɮסB¼È¦s°Ï¥H¤Î¬ÛÃö¨Æª«¡v¦³Ãöªº¡C³o¨Ç«ü¥O¦³ 2 ¡B 
+¤¤¦³³\¦h¬O»P¡uµ¡®æ¡BÀɮסB¼È¦s°Ï¥H¤Î¬ÛÃö¨Æª«¡v¦³Ãöªº¡C³o¨Ç«ü¥O¦³ 2 ¡B
 3 ©Î 4 ­Ó¦r¤¸ªø¡C
 
 
 * ´¡¤J»P§R°£¡] INSERTING AND DELETING ¡^
 ----------------------------------------
 
-¦pªG±z·Q­n´¡¤J¤å¦r¡A§â¥¦Áä¤J´N¬O¤F¡C±z¥i¥H¬Ý¨ìªº¦r¤¸¡A¹³¬O A ¡B 7 ¡B * 
-µ¥¡A³Q Emacs µø¬°¤å¦r¨Ã¥B¥i¥Hª½±µ´¡¤J¡CÁä¤J <Return> 
+¦pªG±z·Q­n´¡¤J¤å¦r¡A§â¥¦Áä¤J´N¬O¤F¡C±z¥i¥H¬Ý¨ìªº¦r¤¸¡A¹³¬O A ¡B 7 ¡B *
+µ¥¡A³Q Emacs µø¬°¤å¦r¨Ã¥B¥i¥Hª½±µ´¡¤J¡CÁä¤J <Return>
 ¡] carriage-return Áä¡^¥H´¡¤J¤@­Ó Newline ¦r¤¸¡C
 
-±z¥i¥HÁä¤J <Delback> ¥H§R°£±z³Ì«áÁä¤Jªº¦r¤¸¡C<Delback> ¬O¤@­ÓªºÁä½LÁä 
+±z¥i¥HÁä¤J <Delback> ¥H§R°£±z³Ì«áÁä¤Jªº¦r¤¸¡C<Delback> ¬O¤@­ÓªºÁä½LÁä
 -- ´N¬O±z³q±`¦b Emacs ¥~¡A¨Ï¥Î¨Ó¡u§R°£±z³Ì«áÁä¤J¦r¤¸¡vªº¦P¤@­Ó¡C¤@¯ë¨Ó
 »¡¬O­Ó¦b <Return> ¤W¤è¼Æ¦æªº¤jÁä¡A³q±`¼Ð¥Ü¬°¡yDelete¡z¡B¡yDel¡z©Î
 ¡yBackspace¡z¡C
 
-¦pªG¦b¨º¸Ì¦³­Ó¼Ð¥Ü¬°¡yBackspace¡zªº¤jÁä¡A¨º»ò¨º¤@­Ó´N¬O±z¨Ï¥Î¨Ó§@¬° 
+¦pªG¦b¨º¸Ì¦³­Ó¼Ð¥Ü¬°¡yBackspace¡zªº¤jÁä¡A¨º»ò¨º¤@­Ó´N¬O±z¨Ï¥Î¨Ó§@¬°
 <Delback> ªºÁä¤F¡C¬Y­Ó¦a¤è¥i¯à¤]·|¦³¥t¤@­Ó¼Ð¥Ü¬°¡yDelete¡zªºÁä¡A¦ý¨º­Ó
 ¨Ã¤£¬O <Delback> ¡C
 
@@ -325,13 +324,13 @@ CONTROL-x §@¬°¶}©l¡C¦³¤@¾ã­Ó¨t¦Cªº«ü¥O¬O¥H CONTROL-x §@¬°¶}©l¡F¥¦­Ì¤§
         C-k          §R°£±q´å¼Ð©Ò¦b¨ì¡u¦æ§À¡v¶¡ªº¦r¤¸
         M-k          §R°£±q´å¼Ð©Ò¦b¨ì¡u¥y§À¡v¶¡ªº¦r¤¸
 
-ª`·N¡u<Delback> ©M C-d¡vÁÙ¦³¡uM-<Delback> ©M M-d¡v¬O¥­¦æ¦a¦Û C-f ©M 
+ª`·N¡u<Delback> ©M C-d¡vÁÙ¦³¡uM-<Delback> ©M M-d¡v¬O¥­¦æ¦a¦Û C-f ©M
 M-f ÂX¥R¥X¨Óªº¡]¶â¡A<Delback> ¨Ã¤£¬O±±¨î¦r¤¸¡A¦ý¬O¨S¤°»ò¦n¾á¤ßªº¡^¡C
 C-k ©M M-k ¦b¬YºØµ{«×¤W»P C-e ©M M-e ¤@¼Ë¡A¦pªG§â¡u¤@¦æ¡v©M¡u¤@¥y¡v§@
 ¬°Ãþ¤ñªº¸Ü¡C
 
 ±z¤]¥i¥H¥u¥H¤@ºØ¤èªk¨Ó§R°£½w½Ä°Ï¤ºªº¥ô¦ó³¡¥÷¡A¥ý²¾°Ê¨ì±z·Q­n§R°£ªº³¡¥÷
-ªº¤@ºÝ¡AµM«áÁä¤J C-@ ©Î C-SPC ¡]¥ô¤@­Ó§Y¥i¡^¡C¡] SPC «üªº¬O Space Bar 
+ªº¤@ºÝ¡AµM«áÁä¤J C-@ ©Î C-SPC ¡]¥ô¤@­Ó§Y¥i¡^¡C¡] SPC «üªº¬O Space Bar
 ¡^¦A²¾¨ì¨º³¡¥÷ªº¥t¤@ºÝ¡A±µµÛÁä¤J C-w ¡C³o¼Ë´N·|§â¤¶©ó³o¨â­Ó¦ì¸m¶¡ªº©Ò
 ¦³¤å¦r§R°£¡C
 
@@ -368,7 +367,7 @@ C-k ©M M-k ¦b¬YºØµ{«×¤W»P C-e ©M M-e ¤@¼Ë¡A¦pªG§â¡u¤@¦æ¡v©M¡u¤@¥y¡v§@
 
 >> ¸Õ¸Õ¬Ý¡FÁä¤J C-y ±N¤å¦r©Ô¦^¡C
 
-¦pªG±z³sÄò¦a°µ¤F¼Æ¦¸ C-k¡A©Ò¦³³Q±þ±¼ªº¤å¦r³£·|³QÀx¦s¦b¤@°_¡A¦]¦¹°µ¤@¦¸ 
+¦pªG±z³sÄò¦a°µ¤F¼Æ¦¸ C-k¡A©Ò¦³³Q±þ±¼ªº¤å¦r³£·|³QÀx¦s¦b¤@°_¡A¦]¦¹°µ¤@¦¸
 C-y ´N·|§â©Ò¦³³o¨Ç¦æ³£©Ô¦^¨Ó¡C
 
 >> ²{¦b°µ¤@¤U¡AÁä¤J C-k ¼Æ¦¸¡C
@@ -401,7 +400,7 @@ C-y ·|§â³Ìªñ±þ±¼ªº©Ô¦^¨Ó¡A¦ý¬O¥ý«eªº¤å¦r¨Ã¨S¦³®ø¥¢¡A±z¥i¥H¥Î M-y ¨Ó¦^
 ¦pªG±z¹ï¤å¦r°µ¤F¤@¨Ç§ïÅÜ¡A«á¨Óı±o¥¦¬O­Ó¿ù»~¡A±z¥i¥H Undo «ü¥O¨ú®ø³o¤@
 ­Ó§ïÅÜ¡AC-x u¡C
 
-³q±` C-x u ·|§â¤@­Ó«ü¥O©Ò³y¦¨ªº§ïÅܨú®ø±¼¡F¦pªG±z¦b¤@¦æ¤¤­«½Æ¤F³\¦h¦¸ 
+³q±` C-x u ·|§â¤@­Ó«ü¥O©Ò³y¦¨ªº§ïÅܨú®ø±¼¡F¦pªG±z¦b¤@¦æ¤¤­«½Æ¤F³\¦h¦¸
 C-x u¡A¨C¤@­Ó­«½Æ³£·|¨ú®øÃB¥~ªº«ü¥O¡C
 
 ¦ý¬O¦³¨â­Ó¨Ò¥~¡G
@@ -422,12 +421,12 @@ C-_ ¬O¥t¤@­Ó¨ú®ø«ü¥O¡F¥¦ªº§@¥Î´N©M C-x u ¤@¼Ë¡A¦ý¬O¦b¤@¦æ¤¤¥¦¤ñ¸û®e©ö
 * Àɮס] FILE ¡^
 ----------------
 
-¬°¤F¨Ï±z½s¿èªº¤å¦r¥Ã¤[«O¦s¡A±z¥²¶·§â¥¦©ñ¨ì¤@­ÓÀɮפ¤¡C¤£µM¡A·í±zÂ÷¶} 
+¬°¤F¨Ï±z½s¿èªº¤å¦r¥Ã¤[«O¦s¡A±z¥²¶·§â¥¦©ñ¨ì¤@­ÓÀɮפ¤¡C¤£µM¡A·í±zÂ÷¶}
 Emacs «á¡A¥¦´N·|ÀH¤§®ø¥¢¡C¬°¤F§â±zªº¤å¦r©ñ¦bÀɮפ¤¡A±z¥²¶·¦b±zÁä¤J³o¨Ç
 ¤å¦r«e¡u§ä¡] find ¡^¡vÀɮסC¡]³o¤]ºÙ¤§¬°¡u«ô³X¡] visiting ¡^¡vÀɮס^
 
 §ä¤@­ÓÀɮתí¥Ü±z¥i¥H¦b Emacs ¤¤¬Ý¨ìÀɮתº¤º®e¡C±q³\¦h¤è­±¨Ó¬Ý¡A¥¦´N¹³
-¬O±zª½±µ½s¿è¨º­ÓÀɮפ@¼Ë¡CµM¦Ó¡Aª½¨ì±z¡uÀx¦s¡v³o­ÓÀɮפ§«e¡A±z¨Ï¥Î 
+¬O±zª½±µ½s¿è¨º­ÓÀɮפ@¼Ë¡CµM¦Ó¡Aª½¨ì±z¡uÀx¦s¡v³o­ÓÀɮפ§«e¡A±z¨Ï¥Î
 Emacs ½s¿è©Ò°µ¥Xªº§ïÅܨ䣷|«O¦s¤U¨Ó¡C³o´N¬O¬°¤°»ò·í±z¤£·Q­n®É¡A±z¥i¥H
 ÁקK¯d¤U­×§ï¨ì¤@¥bªºÀɮצb¨t²Î¤¤¡C§Y¨Ï·í±zÀx¦s¤F¡AEmacs ¤]·|§â­ì¥»ªºÀÉ
 ®×¥H¤@­Ó¤£¦Pªº¦WºÙ«O¯d¤U¨Ó¡A­Y±zµy«áı±o±zªº§ïÅܬO¤@­Ó¿ù»~ªº¸Ü¡A´N¥i¥H
@@ -446,7 +445,7 @@ TUTORIAL.zh¡v©Î¨ä¥LÃþ¦üªºªF¦è§@¬°¶}©l¡C³o¬O¿Ã¹õªº¤@³¡¤À¡A³q±`¥Î¨Óªí¥Ü
         C-x C-f   §ä¤@­ÓÀÉ®×
 
 Emacs ·|­n±zÁä¤JÀɦW¡C±z©ÒÁä¤JªºÀɦW·|¥X²{¦b¿Ã¹õªº©³¦æ¡C¦b³Q¥Î¨Ó§@¬°³o
-ºØ§Î¦¡ªº¿é¤J®É¡A©³¦æ³QºÙ¬°¤p½w½Ä°Ï¡] minibuffer ¡^¡C±z¥i¥H¨Ï¥Î¥¿±`ªº 
+ºØ§Î¦¡ªº¿é¤J®É¡A©³¦æ³QºÙ¬°¤p½w½Ä°Ï¡] minibuffer ¡^¡C±z¥i¥H¨Ï¥Î¥¿±`ªº
 Emacs ½s¿è«ü¥O¨Ó½s¿è³o­ÓÀɦW¡C
 
 ·í±z¥¿¦bÁä¤JÀɦW®É¡]©Î¬O¥ô¦óªº¤p½w½Ä°Ï¿é¤J®É¡^¡A±z¥i¥H¥Î C-g ³o­Ó«ü¥O
@@ -477,7 +476,7 @@ Emacs ½s¿è«ü¥O¨Ó½s¿è³o­ÓÀɦW¡C
 
 ª`·N¡G¦b¬Y¨Ç¨t²Î¤¤¡AÁä¤J C-x C-s ±N·|§â¿Ã¹õ­áµ²¡A±z±N¬Ý¤£¨ì±q Emacs ¨Ó
 ªº¥ô¦ó¿é¥X¡C³oªí¥Ü§@·~¨t²Î¤@­ÓºÙ¬°¡u¬yµ{±±¨î¡vªº¡u¥\¯à¡v±N C-s «ü¥OÄd
-ºI¦í¡A¨Ã¥B¤£Åý¥¦¶Ç¨ì Emacs¡C­n¨ú®ø¿Ã¹õªº­áµ²¡A½ÐÁä¤J C-q¡CµM«á¨ì Emacs 
+ºI¦í¡A¨Ã¥B¤£Åý¥¦¶Ç¨ì Emacs¡C­n¨ú®ø¿Ã¹õªº­áµ²¡A½ÐÁä¤J C-q¡CµM«á¨ì Emacs
 ¨Ï¥Î¤â¥U¤¤¬Ý¬Ý¹ï©ó¡uº¥¶i¦¡·j´Mªº¦P®É¶i¤J¡] Spontaneous Entry to
 Incremental Search ¡^¡v³o­Ó¥DÃD¡A¥H¨ú±o³B²z³o­Ó¡u¥\¯à¡vªº«Øij¡C
 
@@ -528,7 +527,7 @@ Emacs Àx¦s¨C­ÓÀɮתº¤å¦r¦b¤@­ÓºÙ¬°¡u½w½Ä°Ï¡] buffer ¡^¡vªºª«¥ó¤¤¡C§ä¤@
 ±z¦b¤@­Ó Emacs µ¡®æ¤¤©Ò¨£¨ìªº¡u¥ô¦ó¡v¤å¦rÁ`¬O¬Y­Ó½w½Ä°Ïªº¤@³¡¥÷¡C¦³¤@
 ¨Ç½w½Ä°Ï¨Ã¨S¦³³s±µ¨ìÀɮסCÁ|¨Ò¨Ó»¡¡A©R¦W¬°¡u*Buffer List*¡vªº½w½Ä°Ï¨Ã
 ¨S¦³¥ô¦óÀɮסC¥¦¬O¥]§t¦³±z¥H C-x C-b «ü¥O©Ò»s§@¥X¨Óªº½w½Ä°Ï¦Cªíªº½w½Ä
-°Ï¡C©R¦W¬°¡u*Messages*¡vªº½w½Ä°Ï¤]¨S¦³³s±µ¨ì¥ô¦óÀɮסF¥¦¦b±zªº Emacs 
+°Ï¡C©R¦W¬°¡u*Messages*¡vªº½w½Ä°Ï¤]¨S¦³³s±µ¨ì¥ô¦óÀɮסF¥¦¦b±zªº Emacs
 §@·~¶¥¬q¤¤¥]§t¥X²{¦b©³¦æªº°T®§¡C
 
 >> Áä¤J C-x b *Messages* <Return> ¨Ó¬Ý¬Ý°T®§ªº½w½Ä°Ï¡C
@@ -593,10 +592,10 @@ C-z ¬O *¼È®É* Â÷¶} Emacs ªº«ü¥O -- ¦]¦¹±zµy«á¥i¥H¦^¨ì¦P¼Ëªº Emacs ¶¥¬q¡C
 ¥HÂX¥R¨Ó©R¦Wªº«ü¥O³q±`¬O¤£¤Ó±`¨Ï¥Îªº«ü¥O¡A©Î¬O¥u¦b¯S©wªº¼Ò¦¡¤U¤~·|¨Ï¥Î
 ªº«ü¥O¡C¤@­Ó¨Ò¤l¬O¨ú¥N¦r¦ê«ü¥O¡A¥¦·|¥þ°ì¦a±N¤@­Ó¦r¦ê¥H¥t¤@­Ó¨Ó¨ú¥N¡C·í
 ±zÁä¤J M-x ®É¡AEmacs ·|¦b¿Ã¹õªº©³ºÝ¸ß°Ý±z¡AµM«á±z¤]À³¸ÓÁä¤J³o­Ó«ü¥Oªº
-¦WºÙ¡C¦b³o­Ó¨Ò¤l¤¤¬O¡yreplace-string¡z¥u­nÁä¤J¡yrepl s<TAB>¡z¡AµM«á 
+¦WºÙ¡C¦b³o­Ó¨Ò¤l¤¤¬O¡yreplace-string¡z¥u­nÁä¤J¡yrepl s<TAB>¡z¡AµM«á
 Emacs ±N·|¸É»ô³o­Ó¦WºÙ¡C¥H <Return> ¨Óµ²§ô³o­Ó«ü¥O¦WºÙ¡C
 
-¨ú¥N¦r¦ê«ü¥O»Ý­n¨â­Ó°Ñ¼Æ -- ³Q¨ú¥Nªº¦r¦ê¥H¤Î¥Î¨Ó¨ú¥N¥¦ªº¦r¦ê¡C±z¥²¶·¥H 
+¨ú¥N¦r¦ê«ü¥O»Ý­n¨â­Ó°Ñ¼Æ -- ³Q¨ú¥Nªº¦r¦ê¥H¤Î¥Î¨Ó¨ú¥N¥¦ªº¦r¦ê¡C±z¥²¶·¥H
 Newline ¦r¤¸¨Óµ²§ô¨C¤@­Ó°Ñ¼Æ¡C
 
 >> ±N´å¼Ð²¾¨ì¥»¦æªº¤U¨â¦æªÅ¥Õ¡AµM«áÁä¤J
@@ -605,7 +604,7 @@ Newline ¦r¤¸¨Óµ²§ô¨C¤@­Ó°Ñ¼Æ¡C
    ¡i¬°¤F»¡©úªº¥Øªº¡A©ó¤U«O¯d¤@¦æ­ì¤å¡C
    Notice how this line has changed: you've replaced... ¡j
 
-½Ðª`·N³o¤@¦æ¬O«ç»ò§ïÅܪº¡G¦b´å¼Ðªº°_©l¦ì¸m¤§«á¡A±z¤w¸g±N c-h-a-n-g-e-d 
+½Ðª`·N³o¤@¦æ¬O«ç»ò§ïÅܪº¡G¦b´å¼Ðªº°_©l¦ì¸m¤§«á¡A±z¤w¸g±N c-h-a-n-g-e-d
 ³o­Ó¦r -- ¤£ºÞ¥¦¦b­þ¸Ì¥X²{ -- ¥H¡ualtered¡v³o­Ó¦r¨Ó¨ú¥N¤F¡C
 
 
@@ -665,7 +664,7 @@ Emacs ¦³³\¦h¤£¦Pªº¥D¼Ò¦¡¡C¥¦­Ì¤§¤¤¦³¤@¨Ç¬O¥Î¨Ó½s¿è¤£¦Pªº»y¨¥¥H¤Î¡þ©Î¤£
 ¤@­Ó¥D¼Ò¦¡¬O¤@­Ó©µ¦ù«ü¥Oªº¦WºÙ¡A¨Ï±o±z¥i¥H¥Î¨Ó¤Á´«¦Ü¨º­Ó¼Ò¦¡¡CÁ|¨Ò¨Ó»¡¡A
 M-x fundamental-mode ´N¬O¤Á´«¨ì Fundamental ¼Ò¦¡ªº¤@­Ó«ü¥O¡C
 
-¦pªG±z·Q­n½s¿è¤HÃþ»y¨¥ªº¤å¦rÀÉ®× -- ¹³¬O²{¦bªº³o¤@­Ó¡A±zÀ³¸Ó¨Ï¥Î Text 
+¦pªG±z·Q­n½s¿è¤HÃþ»y¨¥ªº¤å¦rÀÉ®× -- ¹³¬O²{¦bªº³o¤@­Ó¡A±zÀ³¸Ó¨Ï¥Î Text
 ¼Ò¦¡¡C
 
 >> Áä¤J M-x text mode<Return>¡C
@@ -679,7 +678,7 @@ M-x fundamental-mode ´N¬O¤Á´«¨ì Fundamental ¼Ò¦¡ªº¤@­Ó«ü¥O¡C
 ¤l¡A±µÄò¤W­±©Ò¶}ªºÀY¡A¥Hµ{¦¡»y¨¥ªºµù¸Ñ¨Ó»¡¡C¦P¼Ë¤@­Ó´¡¤Jµù¸Ñªº°Ê§@¡A¦]
 ¬°±z¨Ï¥Îªºµ{¦¡»y¨¥¡þ¥D¼Ò¦¡ªº¤£¦P¦Ó¤£¦P¡C­Y±z¨Ï¥Î C »y¨¥¡AEmacs ´¡¤J
 ¡y/* ¤¶©ó¤¤¶¡ªº¬°µù¸Ñ°Ï¶ô */¡z¡F­Y±z¨Ï¥Îªº¬O Fortran »y¨¥¡AEmacs ´¡¤J
-¡yc ¥H¦r¤¸ c ¬°­ºªº¬°µù¸Ñ¦æ¡z¡F­Y±z¨Ï¥Îªº¬O Basic »y¨¥¡AEmacs «h´¡¤J¡y' 
+¡yc ¥H¦r¤¸ c ¬°­ºªº¬°µù¸Ñ¦æ¡z¡F­Y±z¨Ï¥Îªº¬O Basic »y¨¥¡AEmacs «h´¡¤J¡y'
 ºJ¸¹¥H«áªº¬°µù¸Ñ¤å¦r¡z¡C½s¿è¾¹ªº¼u©Ê¦p¦¹¡A¹ê¦b¨S¦³¥²­n¬°¤F¤£¦Pªº»y¨¥¡B
 ¥Øªº©Î¥~Æ[¡A³]­p¯S®í¤Æªº½s¿è¾¹¡C¡u¨D¤j¦P¡A¦s¤p²§¡v¦b³o¸Ì¤]¬O¦¨¥ßªº¡C¡j
 
@@ -714,7 +713,7 @@ mode ¡^¡C¦¸­nªº¼Ò¦¡¨Ã¤£¬O¥D¼Ò¦¡ªº¨ä¥L¿ï¾Ü¡A¦Ó¥u¬O¦¸­nªº§ó§ï¡C¨C¤@­Ó¦¸
    µM«áÁä¤J¤@¨Ç¤å¦r¡A¬Ý¬Ý Emacs ¥H 20 ­Ó¦r¤¸¡A
    ¦b¦æ»P¦æ¤§¶¡¶i¦æ fill °Ê§@¡CµM«á¦A¥Î¤@¦¸ C-x f ±NÃä¬É³]¦^ 70¡C
 
-¦pªG±z¦b¤@­Ó¬q¸¨ªº¤¤¶¡°µ¥X§ïÅÜ¡AAuto Fill ¼Ò¦¡¨Ã¤£·|¬°±z­«·s¶i¦æ fill 
+¦pªG±z¦b¤@­Ó¬q¸¨ªº¤¤¶¡°µ¥X§ïÅÜ¡AAuto Fill ¼Ò¦¡¨Ã¤£·|¬°±z­«·s¶i¦æ fill
 ªº°Ê§@¡] re-fill ¡^¡C­n re-fill ³o­Ó¬q¸¨¡AÁä¤J M-q (META-q)¡A¦Ó´å¼Ð¥²
 ¶·³B¦b¨ä¤¤¡C
 
@@ -747,7 +746,7 @@ Emacs ·j´M«ü¥O»P¤j³¡¤À½s¿è¾¹ªº·j´M«ü¥O¤£¦Pªº¦a¤è¦b©ó¡A¥¦¬O¡uº¥¶iªº
 >> Áä¤J <Return> µ²§ô·j´M¡C
 
 ±z¦³¨S¦³¬Ý¨ìµo¥Í¤F¤°»ò¡H¦b¤@­Óº¥¶i¦¡·j´M¤¤¡AEmacs ¸ÕµÛ­n¨«¨ì±zÁä¤Jªº¦r
-¦êªº¤U¤@­Ó¥X²{¦ì¸m¡C­n²¾°Ê¨ì´å¼Ð©Ò¦bªº¤U¤@­Ó¥X²{¦ì¸m¡A¥u­n¦AÁä¤J C-s 
+¦êªº¤U¤@­Ó¥X²{¦ì¸m¡C­n²¾°Ê¨ì´å¼Ð©Ò¦bªº¤U¤@­Ó¥X²{¦ì¸m¡A¥u­n¦AÁä¤J C-s
 ¤@¦¸¡C¦pªG¨Ã¨S¦³³o¼Ëªº¥X²{¦ì¸m¦s¦b¡AEmacs ·|¹Í¤@Án¡A¨Ã§i¶D±z¥Ø«eªº·j´M
 ¡u¥¢±Ñ¡v¡C¥t¥~ C-g ¤]¥i¥H¥Î¨Óµ²§ô·j´M¡C
 
@@ -799,7 +798,7 @@ Emacs ³\¦h¦n¥\¯àªº¨ä¤¤¤§¤@¬O¡A±z¥i¥H¦b¿Ã¹õ¤¤¦P®É®i¥Ü¶W¹L¤@­Óµ¡®æ¡C
 
 «ü¥O C-M-v ¦b·í±z©ó¤@­Óµ¡®æ¤¤½s¿è¤å¦r¡A¨Ã¨Ï¥Î¨ä¥Lªºµ¡®æ§@¬°°Ñ¦Ò¤§¥Î®É¡A
 ¬O«D±`¦³¥Îªº¡C±z¥i¥H±N´å¼Ð¤@ª½«O«ù¦b±z¥¿¦b½s¿èªºµ¡®æ¤¤¡A¨Ã¥H C-M-v «ü
-¥O¦b¨ä¥Lªºµ¡®æ´`§Ç¦a«e¶i¡C¡iÅçÃÒ¤u§@¯S§O¾A¦X¥H³oºØ¤è¦¡¨Ó¶i¦æ¡A¦p GNU 
+¥O¦b¨ä¥Lªºµ¡®æ´`§Ç¦a«e¶i¡C¡iÅçÃÒ¤u§@¯S§O¾A¦X¥H³oºØ¤è¦¡¨Ó¶i¦æ¡A¦p GNU
 ¤¤Ä¶¤p²Õ¡G§ä¤@­Ó­ì©l­^¤åÀɮסF¦A§ä¥¦Â½Ä¶¦nªº¤¤¤åÀɮסA½s¿è³o­Ó¡u³Q¿ï¾Ü
 ªºµ¡®æ¡v¡A¥H C-M-v «ü¥O¸ò¤WÅçÃÒ¤¤ªº¬q¸¨¡K¡K¡C¡j
 
@@ -833,7 +832,7 @@ C-M-v ¬O CONTROL-META ¦r¤¸ªº¤@­Ó¨Ò¤l¡C¦pªG±z¦³¤@­Ó¯uªº META Áä¡A±z¥i¥H
 --------------------------------------------
 
 ¦³®É­Ô±z·|¶i¤J©Ò¿×ªº¡u»¼°j½s¿è¶¥¼h¡v¡C¥¦¬O¥Ñ¦ì¦bª¬ºA¦æªº¤è¬A©·©Ò«ü©ú¡A
-¨Ã¥B¥]§t¦í¥H¤p¬A©·¨Ó«ü©úªº¼Ò¦¡¦WºÙ¡CÁ|¨Ò¨Ó»¡¡A±z¥i¯à·|¬Ý¨ì 
+¨Ã¥B¥]§t¦í¥H¤p¬A©·¨Ó«ü©úªº¼Ò¦¡¦WºÙ¡CÁ|¨Ò¨Ó»¡¡A±z¥i¯à·|¬Ý¨ì
 [(Fundamental)]¡A¦Ó¤£¬O (Fundamental)¡C
 
 ­nÂ÷¶}»¼°j½s¿è¶¥¼h¡A½ÐÁä¤J ESC ESC ESC¡C³o¬O­Ó¥þ¥\¯àªº¡uÂ÷¶}¡v«ü¥O¡C±z
@@ -848,7 +847,7 @@ C-M-v ¬O CONTROL-META ¦r¤¸ªº¤@­Ó¨Ò¤l¡C¦pªG±z¦³¤@­Ó¯uªº META Áä¡A±z¥i¥H
 * ¨ú±o§ó¦hªºÀ°§U¡] GETTING MORE HELP ¡^
 ---------------------------------------
 
-¦b¥»§Ö³t«ü«n¤¤¡A§Ú­Ì¸ÕµÛ¶È´£¨Ñ­è­è¦nªº¸ê°TÅý±z¥i¥H¶}©l¨Ï¥Î Emacs¡C¦b 
+¦b¥»§Ö³t«ü«n¤¤¡A§Ú­Ì¸ÕµÛ¶È´£¨Ñ­è­è¦nªº¸ê°TÅý±z¥i¥H¶}©l¨Ï¥Î Emacs¡C¦b
 Emacs ¤¤¦³¤Ó¦h¥i¨ú±oªº¸ê°T¡A·Q­n¦b³o¸Ì¥þ³¡¸ÑÄÀ¬O¤£¥i¯àªº¡CµM¦Ó¡A±z¤]³\
 ·|·Q­n¾Ç²ß§ó¦h Emacs ¬ÛÃöªº¸ê°T¡A¦]¬°¥¦¦³³\¦h¨ä¥L¦³¥Îªº¥\¯à¡CEmacs ´£
 ¨Ñ¤F¡u¾\Ū¦³Ãö Emacs «ü¥O¡vªº«ü¥O¡C³o¨Ç¡uhelp¡v«ü¥O³£¥H CONTROL-h ³o­Ó
@@ -856,7 +855,7 @@ Emacs ¤¤¦³¤Ó¦h¥i¨ú±oªº¸ê°T¡A·Q­n¦b³o¸Ì¥þ³¡¸ÑÄÀ¬O¤£¥i¯àªº¡CµM¦Ó¡A±z¤]³\
 
 ­n¨Ï¥Î Help ¥\¯à¡AÁä¤J C-h ¦r¤¸¡AµM«á¦AÁä¤J¤@­Ó»¡©ú±z©Ò»Ý­nªºÀ°§Uªº¦r
 ¤¸¡C¦pªG±z¯uªº¤£ª¾¹D­n°Ý¤°»ò¡A¨º»ò½ÐÁä¤J¡yC-h ?¡z¡A¦¹®É Emacs ±N·|§i¶D
-±z¥¦¯à°÷´£¨ÑªºÀ°§U¡C¦pªG±z¤w¸gÁä¤J C-h¡A¦ýµo²{±z¨Ã¤£»Ý­n¥ô¦óÀ°§U¡AÁä¤J 
+±z¥¦¯à°÷´£¨ÑªºÀ°§U¡C¦pªG±z¤w¸gÁä¤J C-h¡A¦ýµo²{±z¨Ã¤£»Ý­n¥ô¦óÀ°§U¡AÁä¤J
 C-g ¨Ó¨ú®ø±¼¥¦´N¬O¤F¡C
 
 ¡]¦³¨Çºô¯¸±N C-h ³o­Ó¦r¤¸ªº·N¸q§ïÅܤF¡C¥L­Ì¯uªº¤£À³¸Ó§â¥¦³]¬°¹ï©Ò¦³¨Ï
@@ -864,7 +863,7 @@ C-g ¨Ó¨ú®ø±¼¥¦´N¬O¤F¡C
 ®É¡A¦pªG C-h ¨Ã¨S¦³¦bµ¡®æªº©³³¡Åã¥Ü¥ô¦ó¦³ÃöÀ°§Uªº°T®§¡A¸ÕµÛÁä¤J F1 Áä¡A
 ©Î¬O M-x help <Return>¡C¡^
 
-³Ì°ò¥»ªº HELP ¥\¯à¬O C-h c¡CÁä¤J C-h¡A¦r¤¸ c¡A¥H¤Î¤@­Ó©Î¤@¦ê¦r¤¸¡FµM«á 
+³Ì°ò¥»ªº HELP ¥\¯à¬O C-h c¡CÁä¤J C-h¡A¦r¤¸ c¡A¥H¤Î¤@­Ó©Î¤@¦ê¦r¤¸¡FµM«á
 Emacs ·|Åã¥Ü¤@­Ó«D±`²µuªº¦³Ãö³o­Ó«ü¥Oªº¸ÑÄÀ¡C
 
 >> Áä¤J C-h c C-p¡C
@@ -877,7 +876,7 @@ Emacs ·|Åã¥Ü¤@­Ó«D±`²µuªº¦³Ãö³o­Ó«ü¥Oªº¸ÑÄÀ¡C
 ©ó¨ç¼Æ¦WºÙ¬O¥Ñ¡u¥Î¨Ó«ü¥X³o«ü¥O¦b°µ¨Ç¤°»ò¡v¦Ó³Q¿ï©w¡A¥¦­Ì¦]¦¹¤]¥i¥H§@¬°
 «D±`²µuªº¤å¥ó -- ¨¬°÷´£¿ô±z¤w¸g¾Ç¹Lªº«ü¥O¡C
 
-¦h¦r¤¸«ü¥O¹³¬O C-x C-s ©M ¡]¦pªG±z¨S¦³ META ©Î EDIT ©Î ALT Áä¡^<ESC>v 
+¦h¦r¤¸«ü¥O¹³¬O C-x C-s ©M ¡]¦pªG±z¨S¦³ META ©Î EDIT ©Î ALT Áä¡^<ESC>v
 ¤]¥i¥H¦b C-h c «á­±¥X²{¡C
 
 ­n¨ú±o§ó¦h¦³Ãö¤@­Ó«ü¥Oªº¸ê°T¡A¥Î C-h k ¨Ó¨ú¥N¨Ï¥Î C-h c ¡C
@@ -933,13 +932,13 @@ find-file ¡^ªº®ÇÃä¡C
 ¥i¯à·|¯S§O³ßÅwªº¥\¯à¯S¦â¬O¥i¥H¸`¬Ù¥´¦r¶qªº completion ÁÙ¦³Â²¤ÆÀɮ׳B²z
 ªº dired ¡C
 
-Completion ¬O¤@ºØÁקK¤£¥²­nªº¥´¦rªº¤è¦¡¡CÁ|¨Ò¨Ó»¡¡A¦pªG±z·Q­n¤Á´« 
+Completion ¬O¤@ºØÁקK¤£¥²­nªº¥´¦rªº¤è¦¡¡CÁ|¨Ò¨Ó»¡¡A¦pªG±z·Q­n¤Á´«
 *Messages* ½w½Ä°Ï¡A±z¥i¥HÁä¤J C-x b *M<Tab> ¡A¥u­n¥i¥H±q±z¤w¸gÁä¤Jªº¤å
 ¦r¤¤½T©w¡A Emacs ´N·|±N³Ñ¤Uªº½w½Ä°Ï¦WºÙ¸É»ô¡C Completion ¬O¦b Emacs ¨Ï
 ¥Î¤â¥Uªº Info ¤¤¡AºÙ¬°¡uCompletion¡vªº¸`ÂI¤¤©Ò¸ÑÄÀªº¡C
 
 Dired ¨Ï±z¥i¥H¦b¤@­Ó¥Ø¿ý¤¤¦C¥XÀɮס]¦¸¥Ø¿ý«h¬O¥i¿ïªº¡^¡B¦b¦Cªí¤¤¨ì³B²¾
-°Ê¡B«ô³X¡B­«·s©R¦W¡B§R°£¥H¤Î¹ïÀɮק@¾Þ§@¡C Dired ¬O¦b Emacs ¨Ï¥Î¤â¥Uªº 
+°Ê¡B«ô³X¡B­«·s©R¦W¡B§R°£¥H¤Î¹ïÀɮק@¾Þ§@¡C Dired ¬O¦b Emacs ¨Ï¥Î¤â¥Uªº
 Info ¤¤¡AºÙ¬°¡uDired¡vªº¸`ÂI¤¤©Ò¸ÑÄÀªº¡C
 
 ¨Ï¥Î¤â¥U¤]¸ÑÄÀ¤F³\¦h¨ä¥¦ Emacs ªº¥\¯à¯S¦â¡C
@@ -948,7 +947,7 @@ Info ¤¤¡AºÙ¬°¡uDired¡vªº¸`ÂI¤¤©Ò¸ÑÄÀªº¡C
 * µ²½×¡] CONCLUSION ¡^
 ----------------------
 
-°O¦í¡A­n§¹¥þÂ÷¶} Emacs ½Ð¨Ï¥Î C-x C-c ¡C­n¼È®ÉÂ÷¶}¨ì shell¡Aµy«á¦A¦^¨ì 
+°O¦í¡A­n§¹¥þÂ÷¶} Emacs ½Ð¨Ï¥Î C-x C-c ¡C­n¼È®ÉÂ÷¶}¨ì shell¡Aµy«á¦A¦^¨ì
 Emacs¡A½Ð¨Ï¥Î C-z ¡C
 
 ¥»§Ö³t«ü«n¹ï©ó©Ò¦³ªº·s¤âÀ³¸Ó³£¬O©ö©ó²z¸Ñªº¡A©Ò¥H¦pªG±zµo²{¤F¤°»ò¦a¤è¤£
@@ -958,9 +957,9 @@ Emacs¡A½Ð¨Ï¥Î C-z ¡C
 * ½Ķ¡] TRANSLATION ¡^
 -----------------------
 
-¥»§Ö³t«ü«nªºÂ½Ä¶¤H­û¦Cªí¦p¤U¡A¦pªG±z¦b¾\Ū¥»¤å¤§«e¡A¡u§¹¥þ¡v¹ï Emacs 
+¥»§Ö³t«ü«nªºÂ½Ä¶¤H­û¦Cªí¦p¤U¡A¦pªG±z¦b¾\Ū¥»¤å¤§«e¡A¡u§¹¥þ¡v¹ï Emacs
 ¨S¦³·§©À¡A½Ð§i¶D§Ú­Ì±zªº·N¨£¥H§@¬°¥»¤å«áÄòªº§ï¶i¨Ì¾Ú¡C½Ķ¤]´£¨Ñ¤F¤@¥÷
-¡mGNU Emacs ¤¤¤å³B²z»¡©ú¡n¦b 
+¡mGNU Emacs ¤¤¤å³B²z»¡©ú¡n¦b
 http://www.gnu.org/software/chinese/guide/emacs-chinese.zh.html ¡q³¡¥÷
 ¤º®e¤w¸g¾ã²z¨ì¥»§Ö³t«ü«n¡r¡A¤]½Ð±z¦Û¦æ°Ñ¾\¡C
 
@@ -1050,7 +1049,8 @@ issue here>¡v¡C
 ³o­Óª©¥»ªº§Ö³t«ü«n©M GNU Emacs ¤@¼Ë³£¬Oª©Åv¤Æªº¡A¨Ã¥B¤¹³\¦b¬Y¨Ç±ø¥ó¤U
 ´²§G¨ä«þ¨©¡G
 
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 Chinese Translation by Chao-Hong Liu (2002, 2003)
 
    Permission is granted to anyone to make or distribute verbatim copies
diff --git a/etc/calccard.tex b/etc/calccard.tex
index 7dec45450f3..41c3b3bad43 100644
--- a/etc/calccard.tex
+++ b/etc/calccard.tex
@@ -13,7 +13,8 @@
 % Typical command to format:  tex calccard.tex
 % Typical command to print (3 cols):  dvips -t landscape calccard.dvi
 
-% Copyright (c) 1987, 1992, 2001 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1992, 2001, 2002, 2003, 2004,
+%   2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -60,7 +61,7 @@
 
 \def\versionnumber{2.03}
 \def\versiondate{November 2001}
-\def\year{2001}
+\def\year{2005}
 \def\version{v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/cs-dired-ref.tex b/etc/cs-dired-ref.tex
index b19ff2bdfc2..12e3c01c871 100644
--- a/etc/cs-dired-ref.tex
+++ b/etc/cs-dired-ref.tex
@@ -1,5 +1,5 @@
 % Reference Card for Dired
-% Copyright (C) 2000 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 % Czech hyphenation rules applied
 \chyph
@@ -47,7 +47,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{0.1}
-\def\year{2000}
+\def\year{2005}
 \def\version{May \year\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/cs-refcard.tex b/etc/cs-refcard.tex
index 43e4e38612b..1164817a14d 100644
--- a/etc/cs-refcard.tex
+++ b/etc/cs-refcard.tex
@@ -11,7 +11,8 @@
 
 \columnsperpage=1
 
-% Copyright (c) 1987, 1993, 1996, 1997, 2001 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
+%   2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -65,7 +66,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{2.2}
-\def\year{1997}
+\def\year{2005}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/cs-survival.tex b/etc/cs-survival.tex
index 768224eb829..4140f2a858e 100644
--- a/etc/cs-survival.tex
+++ b/etc/cs-survival.tex
@@ -21,7 +21,7 @@
   \endinput
 \fi
 
-% Copyright (c) 2000, 2004 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -49,7 +49,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{1.0}
-\def\year{2000}
+\def\year{2005}
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/de-refcard.tex b/etc/de-refcard.tex
index 7ac0e2a862b..bb0ce3c978d 100644
--- a/etc/de-refcard.tex
+++ b/etc/de-refcard.tex
@@ -7,7 +7,8 @@
 
 \columnsperpage=2
 
-% Copyright (c) 1987, 1993, 1996, 2000 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 2000, 2002, 2003, 2004,
+%   2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -52,7 +53,7 @@
 % If there were room, it would be nice to see a section on Dired.
 
 \def\versionnumber{2.1}
-\def\year{1996}
+\def\year{2005}
 \def\version{March \year\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/dired-ref.tex b/etc/dired-ref.tex
index df7745d4bce..62038525a21 100644
--- a/etc/dired-ref.tex
+++ b/etc/dired-ref.tex
@@ -1,5 +1,6 @@
 % Reference Card for Dired
-% Copyright (C) 2000. 2001 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004,
+%   2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -40,7 +41,7 @@
 
 
 \def\versionnumber{0.1}
-\def\year{2000}
+\def\year{2005}
 \def\version{May \year\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/edt-user.doc b/etc/edt-user.doc
index 683c1ae2ba2..9910317de0a 100644
--- a/etc/edt-user.doc
+++ b/etc/edt-user.doc
@@ -2,7 +2,8 @@ File:  edt-user.doc  ---  EDT Emulation User Instructions
 
                                 For GNU Emacs 19
 
-Copyright (C) 1986, 1992, 1994, 1995, 1999, 2000 Free Software Foundation, Inc.
+Copyright (C) 1986, 1992, 1994, 1995, 1999, 2000, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
 Author: Kevin Gallagher <kevingal@onramp.net>
 Maintainer: Kevin Gallagher <kevingal@onramp.net>
diff --git a/etc/emacs.1 b/etc/emacs.1
index 95617414e7e..97529ddee28 100644
--- a/etc/emacs.1
+++ b/etc/emacs.1
@@ -1,4 +1,5 @@
-.\" Copyright (C) 1995, 1999, 2000, 2001  Free Software Foundation, Inc.
+.\" Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004,
+.\"   2005 Free Software Foundation, Inc.
 .\"
 .\" This file is part of GNU Emacs.
 .\"
@@ -535,7 +536,7 @@ Joachim Martillo and Robert Krawitz added the X features.
 Copyright
 .if t \(co
 .if n (c)
-1995, 1999, 2000, 2001 Free Software Foundation, Inc.
+1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff --git a/etc/emacs.py b/etc/emacs.py
index f644db2d8b4..1eba14f67a4 100644
--- a/etc/emacs.py
+++ b/etc/emacs.py
@@ -1,6 +1,6 @@
 """Definitions used by commands sent to inferior Python in python.el."""
 
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 # Author: Dave Love <d.love@dl.ac.uk>
 
 # This file is part of GNU Emacs.
diff --git a/etc/emacstool.1 b/etc/emacstool.1
index 664e1c10286..7f3200a0700 100644
--- a/etc/emacstool.1
+++ b/etc/emacstool.1
@@ -136,7 +136,7 @@ emacs(1)
 Copyright 
 .if t \(co
 .if n (c)
-2001 Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff --git a/etc/etags.1 b/etc/etags.1
index 2a84c622e0e..0c0e12bb6cf 100644
--- a/etc/etags.1
+++ b/etc/etags.1
@@ -1,4 +1,5 @@
-.\" Copyright (c) 1992, 2001 Free Software Foundation
+.\" Copyright (C) 1992, 2001, 2002, 2003, 2004,
+.\"   2005 Free Software Foundation, Inc.
 .\" See section COPYING for conditions for redistribution
 .TH etags 1 "23nov2001" "GNU Tools" "GNU Tools"
 .de BP
@@ -288,7 +289,7 @@ Stallman.
 Copyright
 .if t \(co
 .if n (c)
-1999, 2001 Free Software Foundation, Inc.
+1999, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff --git a/etc/fr-drdref.tex b/etc/fr-drdref.tex
index d4b21e9c132..e64fe9574a5 100644
--- a/etc/fr-drdref.tex
+++ b/etc/fr-drdref.tex
@@ -1,6 +1,6 @@
 
 % Reference Card for Dired
-% Copyright (C) 2000 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -41,7 +41,7 @@
 
 
 \def\versionnumber{0.1}
-\def\year{2000}
+\def\year{2005}
 \def\version{Mai \year\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/fr-refcard.tex b/etc/fr-refcard.tex
index 49f2a201650..bff17c6d625 100644
--- a/etc/fr-refcard.tex
+++ b/etc/fr-refcard.tex
@@ -8,7 +8,8 @@
 
 \columnsperpage=1
 
-% Copyright (c) 1987, 1993, 1996, 1997 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
+%   2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -53,7 +54,7 @@
 % If there were room, it would be nice to see a section on Dired.
 
 \def\versionnumber{2.2}
-\def\year{1997}
+\def\year{2005}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/fr-survival.tex b/etc/fr-survival.tex
index 912a0977093..e73db5352a5 100644
--- a/etc/fr-survival.tex
+++ b/etc/fr-survival.tex
@@ -22,7 +22,7 @@
   \endinput
 \fi
 
-% Copyright (c) 2000, 2004 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -44,7 +44,7 @@
 % Translated to french by \'Eric Jacoboni <jaco@teaser.fr> in November 2001
 
 \def\versionnumber{1.0}
-\def\year{2000}
+\def\year{2005}
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/gfdl.1 b/etc/gfdl.1
index 0974486ed63..b8e627971aa 100644
--- a/etc/gfdl.1
+++ b/etc/gfdl.1
@@ -11,7 +11,7 @@ Version 1.1, March 2000
 Copyright
 .if t \(co
 .if n (c)
-2000  Free Software Foundation, Inc.
+2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Everyone is permitted to copy and distribute verbatim copies
diff --git a/etc/gnus-refcard.tex b/etc/gnus-refcard.tex
index 343de2d6f6f..87c02032424 100644
--- a/etc/gnus-refcard.tex
+++ b/etc/gnus-refcard.tex
@@ -112,7 +112,8 @@
 
 \newcommand{\Copyright}{%
   \begin{center}
-    Copyright \copyright\ 1995 Free Software Foundation, Inc.\\*
+    Copyright \copyright\ 1995, 2002, 2003, 2004,
+       2005 Free Software Foundation, Inc.\\*
     Copyright \copyright\ 1995 Vladimir Alexiev
     $<$vladimir@cs.ualberta.ca$>$.\\*
     Copyright \copyright\ 2000 Felix Natter $<$fnatter@gmx.net$>$.\\*
diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt
index 16800048c31..29b5356e9e9 100644
--- a/etc/gnus-tut.txt
+++ b/etc/gnus-tut.txt
@@ -24,7 +24,7 @@ was done by moi, yours truly, your humble servant, Lars Magne
 Ingebrigtsen.  If you have a WWW browser, you can investigate to your
 heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
 
-;; Copyright (C) 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Keywords: news
diff --git a/etc/orgcard.tex b/etc/orgcard.tex
index f653ff78e01..22a85c7f8d4 100644
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -18,7 +18,8 @@
 
 \columnsperpage=3
 
-% Copyright (c) 2004 Philip Rooke, 2005 Free Software Foundation
+% Copyright (C) 2004 Philip Rooke
+% Coypright (C) 2005 Free Software Foundation, Inc.
 
 % 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
@@ -62,7 +63,7 @@
 \def\year{2005}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
-  \centerline{\small \copyright\ 2004, 2005\ Free Software Foundation, Inc.
+  \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
   Permissions on back.  v\orgversionnumber}}
 
 \def\copyrightnotice{
diff --git a/etc/pl-refcard.tex b/etc/pl-refcard.tex
index df8c83566b3..dfbb5a2783a 100644
--- a/etc/pl-refcard.tex
+++ b/etc/pl-refcard.tex
@@ -32,7 +32,7 @@
 
 \columnsperpage=2
 
-% Copyright (c) 1999, 2004 Free Software Foundation, Inc.
+% Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -73,7 +73,7 @@
 % If there were room, it would be nice to see a section on Dired.
 
 \def\versionnumber{1.1}
-\def\year{1999}
+\def\year{2005}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/refcard.tex b/etc/refcard.tex
index 208a48c7832..5567320c98a 100644
--- a/etc/refcard.tex
+++ b/etc/refcard.tex
@@ -14,7 +14,8 @@
 \letterpaper=1
 
 % Nothing else needs to be changed below this line.
-% Copyright (c) 1987, 1993, 1996, 1997, 2005 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
+%   2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff --git a/etc/ru-refcard.tex b/etc/ru-refcard.tex
index d62eedd17bb..1083055bd9f 100644
--- a/etc/ru-refcard.tex
+++ b/etc/ru-refcard.tex
@@ -1,3 +1,5 @@
+% Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
 \documentclass[10pt]{article}
 \usepackage{multicol,tabularx}
 \usepackage[a4paper,hmargin={2cm,2cm},vmargin={2cm,2cm},nohead,twoside]{geometry}
@@ -17,7 +19,7 @@
 \setlength{\ColThreeWidth}{25mm}
 
 \newcommand{\versionnumber}[0]{2.2}
-\newcommand{\nyear}[0]{1997}
+\newcommand{\nyear}[0]{2005}
 
 \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
   \centerline{\footnotesize \copyright\ \nyear\ Free Software Foundation, Inc.
diff --git a/etc/sk-dired-ref.tex b/etc/sk-dired-ref.tex
index 19983aeeb32..26846834b36 100644
--- a/etc/sk-dired-ref.tex
+++ b/etc/sk-dired-ref.tex
@@ -1,5 +1,5 @@
 % Reference Card for Dired
-% Copyright (C) 2000 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 % Slovak hyphenation rules applied
 \shyph
@@ -48,7 +48,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{0.1}
-\def\year{2000}
+\def\year{2005}
 \def\version{May \year\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/sk-refcard.tex b/etc/sk-refcard.tex
index ca40c194c99..40f36f2109f 100644
--- a/etc/sk-refcard.tex
+++ b/etc/sk-refcard.tex
@@ -11,7 +11,8 @@
 
 \columnsperpage=1
 
-% Copyright (c) 1987, 1993, 1996, 1997 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
+%   2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -67,7 +68,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{2.2}
-\def\year{1997}
+\def\year{2005}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/sk-survival.tex b/etc/sk-survival.tex
index ff94cc43706..346516cf48e 100644
--- a/etc/sk-survival.tex
+++ b/etc/sk-survival.tex
@@ -21,7 +21,7 @@
   \endinput
 \fi
 
-% Copyright (c) 2000, 2004 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -50,7 +50,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{1.0}
-\def\year{2000}
+\def\year{2005}
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/survival.tex b/etc/survival.tex
index 2c5ada3c160..0e164d7654f 100644
--- a/etc/survival.tex
+++ b/etc/survival.tex
@@ -25,7 +25,7 @@
   \endinput
 \fi
 
-% Copyright (c) 2000 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -45,7 +45,7 @@
 % Boston, MA 02110-1301, USA.
 
 \def\versionnumber{1.0}
-\def\year{2000}
+\def\year{2005}
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/vipcard.tex b/etc/vipcard.tex
index 5591f151f95..cca644b6bfd 100644
--- a/etc/vipcard.tex
+++ b/etc/vipcard.tex
@@ -7,7 +7,7 @@
 
 \columnsperpage=1
 
-% Copyright (c) 1987 Free Software Foundation, Inc.
+% Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -54,7 +54,7 @@
 
 
 \def\versionnumber{1.2}
-\def\year{1987}
+\def\year{2005}
 \def\version{September \year\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/viperCard.tex b/etc/viperCard.tex
index e5e0bded891..50f65b2c0d5 100644
--- a/etc/viperCard.tex
+++ b/etc/viperCard.tex
@@ -7,7 +7,8 @@
 
 \columnsperpage=2
 
-% Copyright (c) 1995, 1996, 1997 Free Software Foundation, Inc.
+% Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004,
+%   2005 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -61,7 +62,7 @@
 
 
 \def\versionnumber{3.0}
-\def\year{1997}
+\def\year{2005}
 \def\version{August \year\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill