Update years in copyright notice; nfc.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 805b17e763a0507b614b0c9c3f9eb42cb18fb8ad..07c05935fed2f25d262f06a77aff5fdf728effbe 100644 (file)
--- 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 a29e5fd3e6c1fd23b26e8967c24bfa6d743b4737..27f563a740515ab7e2ee5458ccc8d16a470bf5a5 100644 (file)
--- 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 bc0ea8cc60d7f2d9947ea89cc0b9484f15ab99cc..f5c380bfe371dd0cf6f412e25c348e704911fd0b 100644 (file)
--- 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.
 \f
           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 0a0e962fda034b97ee026edf5dd83172ff07712f..6d54265d8490455f932c637c91a0e44202241292 100644 (file)
--- 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 6e36a9859731df2ddcc317d68418bf0efef4b276..0c9e0f4ef1f27977d8beb566225a63cf9354a201 100644 (file)
--- 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 6cd040e4fac1abc334e816cdfd0ea5dba7d76bb7..08479a5579e31e5ea5397534db83d190be357258 100644 (file)
--- 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 d6977ee4f72e1dc586da67d3992c222004331806..999fb88fffeedc2a25b02ccc2cc9a1a58601aed3 100644 (file)
--- 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.
 
 \f
-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 48fa02f93d954a0dd2fa5d6e22e2e00a3d63491f..0df9a6f2711fa6f4a924cdb6fdf8395346fbab51 100644 (file)
--- 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 239d3d58c1917613ad6ef1fb66f272ef06761cba..8f51458381fe2087355e707db422bc0de5285c24 100644 (file)
--- 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 1b30b6e909a6afa05aca003aa000a8518e66ec41..f35c53be6639f865121d2b3cbd97d82dc8d0befd 100644 (file)
--- 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 9a244a5e750c7e7e9b1d5590c63cfaea11d74728..57e77de9a4bdd8267610e79940840057cb872351 100644 (file)
--- 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
 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 9c556c83b9072bac2582a232097a988ce789ed31..17019ad66dc348b18d6efd5ccb93da4e1ab1b272 100644 (file)
--- 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.  
 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 ed55cc5ca4152d4c7ec7b86ef2e6343e5842de40..cb5e92a2df3e2f0ed7cda810d3e53e7250204aba 100644 (file)
--- 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
 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 e3e940abd4ef1343cbe590bd6a918d7eb14d7687..30a6f05fe233584b142bd856ca14cd3a075d9403 100644 (file)
--- 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
 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 55608250c2bc4f922f4e9d5950319460ddcc9353..d310a16eae46a0c34e83ef7bd8010e88b5461559 100644 (file)
--- 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 ccb454bf3f6c61fe51899f5e311518306d43b93d..dec03f35d2099d424caaa6c0db727dc5d3c003ab 100644 (file)
--- a/etc/TUTORIAL.ja
+++ b/etc/TUTORIAL.ja
@@ -1,5 +1,4 @@
 Emacs \e$BF~Lg%,%$%I\e(B.  \e$BK\%U%!%$%k$NCx:n8"$K$D$$$F$O:G8e$r8fMw2<$5$$!#\e(B
-Copyright (c) 1985, 1996, 1998, 2001, 2002, 2005 Free Software Foundation.
 
 Emacs \e$B$N%3%^%s%I$rF~NO$9$k$K$O!"0lHL$K%3%s%H%m!<%k%-!<!J%-!<%H%C%W$K\e(B
 CONTROL \e$B$H$+\e(B CTRL \e$B$H$+\e(B CTL \e$B$H=q$$$F$"$k!K$d%a%?%-!<!J%-!<%H%C%W$K\e(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 8e94db3c6583d0ee23fba84e488470e465c13ccc..c8875dc31be3b018e775688035bb3d703f8f2937 100644 (file)
--- a/etc/TUTORIAL.ko
+++ b/etc/TUTORIAL.ko
@@ -1,5 +1,5 @@
 \e$(C@L8F=:\e(B(Emacs) \e$(CAvD'<-@T4O4Y\e(B.
-\e$(C@z@[1G\e(B (c) 1985, 2001 Free Software Foundation, Inc;  \e$(C3!?!4B\e(B \e$(C:9;g\e(B \e$(CA60G@L\e(B
+\e$(C3!?!4B\e(B \e$(C:9;g\e(B \e$(CA60G@L\e(B
 \e$(C@V=@4O4Y\e(B.  \e$(CAv1]\e(B \e$(C@P0m\e(B \e$(C@V4B\e(B \e$(C@L\e(B \e$(C1[@:\e(B \e$(C@L8F=:\e(B(Emacs) \e$(CAvD'<-@T4O4Y\e(B.
 
 \e$(C@L8F=:\e(B \e$(C8m7I5i@:\e(B \e$(C4k03\e(B \e$(CA&>n<h\e(B (CTRL\e$(C@L3*\e(B CTL\e$(C@L6s0m55\e(B \e$(CG%=C\e(B) \e$(CH$@:\e(B
@@ -989,7 +989,8 @@ C-x C-s\e$(C?M\e(B (META\e$(C<h3*\e(B EDIT\e$(C<h\e(B \e$(CH$@:\e(B \e$(C13C<<h0!\e(B \e$(C
 GNU \e$(C@L8F=:?M\e(B \e$(C00@L\e(B \e$(C@L\e(B \e$(CAvD'<-\e(B \e$(CFG@:\e(B \e$(C@z@[1G@L\e(B \e$(C@V@88g\e(B \e$(CF/A$GQ\e(B \e$(CA60G@;\e(B \e$(C88A7GR\e(B
 \e$(C6'?!\e(B \e$(C:9;g:;@;\e(B \e$(C9hFwGR\e(B \e$(C<v\e(B \e$(C@V4B\e(B \e$(CGc0!8&\e(B \e$(C0.0m\e(B \e$(C3*?B\e(B \e$(C0M@L4Y\e(B:
 
-\e$(C@z@[1G\e(B (c) 1985, 1996 Free Software Foundation
+Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
+   2005 Free Software Foundation, Inc.
 
    \e$(C@L\e(B \e$(C9.<-4B\e(B \e$(C@L\e(B \e$(C@z@[1G\e(B \e$(C0x0m?M\e(B \e$(CGc?k\e(B \e$(C0x0m0!\e(B \e$(C1W4k7N\e(B \e$(C@/Av5G0m\e(B, \e$(C9hFw@Z0!\e(B
    \e$(C<vCk@Z?!0T\e(B \e$(C@L\e(B \e$(C0x0m?!\e(B \e$(C5{6s\e(B \e$(CGc?k5G4B\e(B \e$(C0MC373\e(B \e$(C6G\e(B \e$(C@g:P9hGO4B\e(B \e$(C0M@;\e(B

diff --git a/etc/TUTORIAL.nl b/etc/TUTORIAL.nl
index 6b6a20a1bba3212e558856dc6b0d350423976b84..6438869369f54d85f612721277619196beff833e 100644 (file)
--- 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 076a33bbd8461a24b960bf0df4e9fd5f21df75e9..cff0b9dd40c5a394d596219978f359f30a540ee6 100644 (file)
--- 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
 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 56f431ecdd7835463d6119e66c3dcc43f38a2225..bd7cf84d6c13652a82880efebb3cdee6f5e8101a 100644 (file)
--- 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
 <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 71b2466eca9ce5de439fcfa44680d7a4f3bd9c5f..85e8e30892f2f85a216481e5fcd20be8261b0020 100644 (file)
--- 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
 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 1be3a1e28a8be8f0711b9c1cb5311e7c1e61c96c..cd84911db2df970560870e0a44054f6922817e14 100644 (file)
--- 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- 
 
        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 67e20f1497c183929f717aa7524a13c7f38a424c..26e3f834748c6acfae16ccdc2f28a3015f064581 100644 (file)
--- 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
 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 263019643db419de49c24e7b5231ce29d46e545e..37ebb2fbf11513f3fb3eed72bb4a843cf6180e0c 100644 (file)
--- 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
 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 e4a86cabada0d9a5c43f636f680cb8dee1e6dcf9..65dff742ec277cc9ce092cc6858e2f9d1aafc71e 100644 (file)
--- 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
 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
 
 >>  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
 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
 
 >> 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
 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 
 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 86c03d31f3be41b8894ce856e09dc3e9624629ca..5db33b3d4709390c5dad59d7bdd0280f00c39ab9 100644 (file)
--- 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 8411bf878f5c1a1ff9b9afa60147c232a9906737..1a1020a425ba7edf48e82e7bd9d45ab3d93c381e 100644 (file)
--- 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 
 ­«­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 
 ´£¨Ñ¤@¨Ç³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 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 
    µ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 
 ¥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 
 
 >> Áä¤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 
         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 
 
 >> ¸Õ¸Õ¬Ý¡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 
 ¦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-_ 
 * Àɮס] 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
         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 
 
 ª`·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 
 ±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 
 ¥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 
    ¡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 
 ¤@­Ó¥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 
 ¤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 
    µ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 <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 
 
 «ü¥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 
 --------------------------------------------
 
 ¦³®É­Ô±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§ó¦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 
 
 ­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 
 ®É¡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 
 ©ó¨ç¼Æ¦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 
 ¥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 
 * µ²½×¡] 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
 * ½Ķ¡] 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>
 ³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 7dec45450f3edf33d71f8ff80a32423548b1907f..41c3b3bad43235b606f565ea1731061e454f761b 100644 (file)
--- 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 b19ff2bdfc22ef3bb5d29d27668a403eb8a5ddb2..12e3c01c8710c2eaf8bdf910cbbf183aba470a92 100644 (file)
--- 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 43e4e38612b6fdb749e9d7e5dd41c4bc829f82b7..1164817a14db074d508c0445ae54d78bd700d992 100644 (file)
--- 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 768224eb82936fb7cd721cbd1d62511ec068d624..4140f2a858e9fce49bdffeccff8b8a654b7dbb8c 100644 (file)
--- 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 7ac0e2a862b59776cd85f0ed9401811a17c0256e..bb0ce3c978d24e17dee6824b7246bb68d3a05319 100644 (file)
--- 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 df7745d4bce08ff2c072d492f1cbf2af833342d6..62038525a2151cb42e69509b5da13872f404ede2 100644 (file)
--- 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 683c1ae2ba2af00a0a65f76c226894feeed04132..9910317de0aa1c103757efb4e20c1237449633cf 100644 (file)
--- 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 95617414e7e7faa7c937ed6e4322ec4f0d7d7b0b..97529ddee28f4880fbf8cab65b69671b74a7154d 100644 (file)
--- 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 f644db2d8b44c9a8c4b48b7b4aab80c2ee12f9d6..1eba14f67a40a15125410f99cfc2e8cd5e49309f 100644 (file)
--- 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 664e1c102862e56a568913e18d98f63da49db12e..7f3200a0700a172d0c789002f08e182812a40ebc 100644 (file)
--- 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 2a84c622e0ef0e153e0db4e542cbd82cf9ac731c..0c0e12bb6cf37953bcff197d366d9bb133be79df 100644 (file)
--- 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 d4b21e9c132a4e2ed7c4250b169661b78345eb26..e64fe9574a5f226d2b4ecf4c1fbaca18b99638e6 100644 (file)
--- 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 49f2a2016509491a2228588169ecca3a299ced43..bff17c6d625f5e678943929ce81459c025abb1c3 100644 (file)
--- 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 912a097709385d5ba9a7ffee675aeb5ea538027d..e73db5352a5589316971c8f31e7305fff9ad741c 100644 (file)
--- 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 0974486ed639296964fd7da2c6cf827678e75b56..b8e627971aa00c2992c1d68c704cb9a89ef520b3 100644 (file)
--- 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 343de2d6f6f19b308009bdaf8f844148c92eca29..87c020324244df0fc46bb44b4db0e9263e7ddb1d 100644 (file)
--- 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 16800048c3134c43080b060fdc282f1a0d1fbe96..29b5356e9e9e3593e001401786e32a947e880acd 100644 (file)
--- 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 f653ff78e01c769d9d5424e7e97670dd310cc2ef..22a85c7f8d4c2a849b0c8368e1111ac0f6f6fe60 100644 (file)
--- 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 df8c83566b338cdd4b58e96b07f1d22b1cbeedad..dfbb5a2783a1de622b8350bcaed89c43961c83e3 100644 (file)
--- 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 208a48c783225ecc19f68bf411f99de40ecd6548..5567320c98aac3b8eb4acab5588095ddcfd144f6 100644 (file)
--- 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 d62eedd17bbdc4b3cd5b77713fd674669a2930bb..1083055bd9fa2990d1b055cff6993409e46c947a 100644 (file)
--- 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 19983aeeb32f1de4018c405a74f238b6ff34d586..26846834b3629e99c7015f2a4820d3c56e7e4acd 100644 (file)
--- 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 ca40c194c99e672e0b03dacff9e0b45baca152ac..40f36f2109fdc60e70568947020980483c701541 100644 (file)
--- 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 ff94cc437064f1693007b3e19942d4d8f92660cd..346516cf48ee3446ea987d5a1ff689d7f7b6a5c3 100644 (file)
--- 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 2c5ada3c160f7ff3f6629260e155c53fbdb73305..0e164d7654fb48145d0b81c6907f70eba7459bec 100644 (file)
--- 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 5591f151f95379aabcd6521b7f33a50d531f7878..cca644b6bfdae0bf3f55bf1b4fe0a75dd1dd9baa 100644 (file)
--- 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 e5e0bded89142fbe16644de8d67c76cde6e8aa91..50f65b2c0d5d7db20a5915b541ec07d18e514dec 100644 (file)
--- 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