Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 43-57)

   - Update from CVS
   - Merge from erc--emacs--0
   - Make constrain-to-field notice overlays
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 18-21)

   - Update from CVS
   - Merge from emacs--devo--0

54 files changed, 145 insertions, 89 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5411a0cf626..3d64ba12cc3 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-05  Jay Belanger  <belanger@truman.edu>
+
+        * calccard.tex: Update copyright year.
+
+2006-02-04  Michael Olson  <mwolson@gnu.org>
+
+        * NEWS: Update for ERC 5.1.1.  Use the same wording for headings
+        that Emacs does in its NEWS file.
+
 2006-02-03  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 7.91.
@@ -2542,7 +2551,7 @@
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
-        2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+        2002, 2003, 2004, 2005, 2006 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 0c2739cafc8..1695c6e7f07 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -1,6 +1,6 @@
 Debugging GNU Emacs
 Copyright (C) 1985, 2000, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 f5c380bfe37..8b52ee51418 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -5,7 +5,7 @@ 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, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   2000, 2002, 2003, 2004, 2005, 2006 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/ERC-NEWS b/etc/ERC-NEWS
index fea5497a4a5..eee5589ad8d 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1,6 +1,39 @@
 ERC NEWS                                                       -*- outline -*-
 
-* Changes since ERC 5.0.4
+* Changes in ERC 5.1.1
+
+** Fix a requirement on cl.el.
+
+** Use tls.el for SSL connections, rather than ssl.el.
+
+** Changes and additions to modules
+
+*** ibuffer integration (erc-ibuffer.el)
+
+**** Update this to work with the version of ibuffer.el that comes with
+recent Emacs variants.
+
+*** Old completion (erc-complete.el)
+
+**** Fix a few errors.
+
+*** Speedbar (erc-speedbar.el)
+
+**** Make this work with the version of speedbar.el that comes with
+recent Emacs variants.
+
+*** Timestamps (erc-stamp.el)
+
+**** By default, use a more failsafe method of displaying right timestamps.
+To get right timestamps to align perfectly in Emacs22 using X, set the
+new `erc-timestamp-right-align-by-pixel' option to non-nil.
+
+*** Viper compatibility (erc-viper.el)
+
+**** Since most of these changes are now merged into Emacs22, detect
+whether we need these changes and install them only if necessary.
+
+* Changes in ERC 5.1
 
 ** Improve XEmacs compatibility.
 
@@ -206,11 +239,11 @@ the right margin.
 
 **** Helps ERC work correctly in viper-mode.
 
-* Fixes since ERC 5.0.3
+* Changes in ERC 5.0.4
 
 ** Fix a problem with undo in channels.
 
-* Fixes since ERC 5.0.2
+* Changes in ERC 5.0.3
 
 ** Fix typo in the `ctcp-request-to' entry of the English catalog.
 
@@ -251,7 +284,7 @@ indicator.  Previously, there was an additional unnecessary space.
 **** Fix an error that occurred when unchecked buffers existed when
 invoking /QUIT.
 
-* Fixes since ERC 5.0.1
+* Changes in ERC 5.0.2
 
 ** If a channel key is required for a certain channel, ERC will prompt
 for one if `erc-prompt-for-channel-key' is non-nil.
@@ -284,7 +317,7 @@ choice anymore.
 
 **** You can now save logs and truncate buffers from the menu-bar.
 
-* Fixes since ERC 5.0
+* Changes in ERC 5.0.1
 
 ** Narrowing in ERC buffers no longer causes formatting errors.
 
@@ -298,7 +331,7 @@ choice anymore.
 This means that `erc-track-priority-faces-only', `erc-track-exclude',
 and `erc-track-exclude-types' now work with server buffers.
 
-* Changes since ERC 4.0
+* Changes in ERC 5.0
 
 ** Channel members are now stored as a hash-table.
 `erc-server-users' and `erc-channel-users' are now hash-tables, rather
@@ -542,7 +575,7 @@ in XEmacs.
     mode-line where modified channels are shown (only works in GNU
     Emacs versions above 21.3).
 
-* Changes since ERC 3.0.cvs.20030119
+* Changes in ERC 4.0
 
 ** The module system has again changed a lot.  You can now customize
   the variable `erc-modules' and define once and for all which
@@ -565,7 +598,7 @@ in XEmacs.
   openprojects to freenode.  You may need to update your configuration
   for a successful automatic nickserv identification.
 
-* Changes since ERC 2.93.cvs.20020819
+* Changes in ERC 3.0.cvs.20030119
 
 ** New module erc-dcc:
 
diff --git a/etc/GNU b/etc/GNU
index 6d54265d849..53d7f576129 100644
--- a/etc/GNU
+++ b/etc/GNU
@@ -1,5 +1,5 @@
 Copyright (C) 1985, 1993, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 59e0b5dbd2e..d5fbfe78106 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -1,6 +1,6 @@
 GNUS NEWS -- history of user-visible changes.
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send Gnus bug reports to bugs@gnus.org.
@@ -529,7 +529,7 @@ ever-changing layouts.
 Copyright information:
 
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 2ea7ddb9b25..e63c2d3bc76 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -14868,7 +14868,7 @@ select one of those items.
 Copyright information:
 
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 8db27aab035..93561daa534 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3599,7 +3599,7 @@ of machine defines NO_UNION_TYPE.
 
 
 Copyright 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   2001, 2002, 2003, 2004, 2005, 2006 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 0df9a6f2711..5748d0d4e5e 100644
--- a/etc/TUTORIAL
+++ b/etc/TUTORIAL
@@ -1104,7 +1104,7 @@ 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, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 8f51458381f..9cb97696772 100644
--- a/etc/TUTORIAL.bg
+++ b/etc/TUTORIAL.bg
@@ -1170,7 +1170,7 @@ 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, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 f35c53be663..ce22ac0b349 100644
--- a/etc/TUTORIAL.cn
+++ b/etc/TUTORIAL.cn
@@ -1050,7 +1050,7 @@ issue here>¡¹¡£
 É¢²¼Æ俽±´£º
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 57e77de9a4b..5b0e20ce218 100644
--- a/etc/TUTORIAL.cs
+++ b/etc/TUTORIAL.cs
@@ -1023,7 +1023,7 @@ 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, 1998, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 17019ad66dc..a571b15c545 100644
--- a/etc/TUTORIAL.de
+++ b/etc/TUTORIAL.de
@@ -1461,7 +1461,7 @@ 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, 2002, 2003, 2004,
-   2005 Free Software Foundation
+   2005, 2006 Free Software Foundation, Inc.
 
    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 cb5e92a2df3..0860cb7972c 100644
--- a/etc/TUTORIAL.es
+++ b/etc/TUTORIAL.es
@@ -1188,7 +1188,7 @@ siguiente nota de derechos de reproducción (que puede encontrar en el
 archivo TUTORIAL).
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 30a6f05fe23..0c8b3d3ee9b 100644
--- a/etc/TUTORIAL.fr
+++ b/etc/TUTORIAL.fr
@@ -1171,7 +1171,7 @@ copyright, et vous pouvez en distribuer des copies sous certaines
 conditions :
 
 Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 d310a16eae4..46388e78cc3 100644
--- a/etc/TUTORIAL.it
+++ b/etc/TUTORIAL.it
@@ -1093,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, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2003, 2004, 2005, 2006 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 dec03f35d20..826a175e8c6 100644
--- a/etc/TUTORIAL.ja
+++ b/etc/TUTORIAL.ja
@@ -1048,7 +1048,7 @@ 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, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 c8875dc31be..9a9f28612c5 100644
--- a/etc/TUTORIAL.ko
+++ b/etc/TUTORIAL.ko
@@ -990,7 +990,7 @@ GNU $(C@L8F=:?M(B $(C00@L(B $(C@L(B $(CAvD'<-(B $(CFG@:(B $(C@z@[1G@L
 $(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:
 
 Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 6438869369f..1efe9748803 100644
--- a/etc/TUTORIAL.nl
+++ b/etc/TUTORIAL.nl
@@ -1205,7 +1205,7 @@ 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, Inc.
+   2005, 2006 Free Software Foundation, Inc.
 
    Iedereen mag letterlijke kopieën van dit document, zowel ontvangen
    als verspreiden, op elk medium, vooropgesteld dat de
@@ -1230,7 +1230,7 @@ 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, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 cff0b9dd40c..e1cfeec9dab 100644
--- a/etc/TUTORIAL.pl
+++ b/etc/TUTORIAL.pl
@@ -1218,7 +1218,7 @@ 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, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 bd7cf84d6c1..b9309d31d5d 100644
--- a/etc/TUTORIAL.pt_BR
+++ b/etc/TUTORIAL.pt_BR
@@ -1063,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) 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006 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 85e8e30892f..3a4c7fb77af 100644
--- a/etc/TUTORIAL.ro
+++ b/etc/TUTORIAL.ro
@@ -1091,7 +1091,8 @@ 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) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 1998, 2002, 2003, 2004, 2005,
+   2006 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 cd84911db2d..4a097635a59 100644
--- a/etc/TUTORIAL.ru
+++ b/etc/TUTORIAL.ru
@@ -1132,7 +1132,7 @@ Dired ÐÏÚ×ÏÌÑÅÔ ×ÁÍ ÏÔÏÂÒÁÖÁÔØ ÓÐÉÓÏË ÆÁÊÌÏ× × ËÁÔÁÌÏÇÅ (Á ÔÁËÖÅ
 ÓÌÅÄÕÀÝÉÍÉ ÓÏÇÌÁÛÅÎÉÑÍÉ:
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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.sk b/etc/TUTORIAL.sk
index 26e3f834748..6b2cd86bf91 100644
--- a/etc/TUTORIAL.sk
+++ b/etc/TUTORIAL.sk
@@ -1082,7 +1082,7 @@ 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, 1998, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 37ebb2fbf11..52d2d18766c 100644
--- a/etc/TUTORIAL.sl
+++ b/etc/TUTORIAL.sl
@@ -1115,7 +1115,7 @@ 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, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 65dff742ec2..a2e0cd9abea 100644
--- a/etc/TUTORIAL.sv
+++ b/etc/TUTORIAL.sv
@@ -1127,7 +1127,7 @@ 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, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 5db33b3d470..1156925e2a5 100644
--- a/etc/TUTORIAL.th
+++ b/etc/TUTORIAL.th
@@ -971,7 +971,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
 Copyright (C) 1985, 1996, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 1a1020a425b..0a04da4d9e1 100644
--- a/etc/TUTORIAL.zh
+++ b/etc/TUTORIAL.zh
@@ -1050,7 +1050,7 @@ issue here>¡v¡C
 ´²§G¨ä«þ¨©¡G
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 1502a3c73c2..befdea965ae 100644
--- a/etc/calccard.tex
+++ b/etc/calccard.tex
@@ -14,7 +14,7 @@
 % Typical command to print (3 cols):  dvips -t landscape calccard.dvi
 
 % Copyright (C) 1987, 1992, 2001, 2002, 2003, 2004,
-%   2005 Free Software Foundation, Inc.
+%   2005, 2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -60,7 +60,7 @@
 %  Internet: gildea@stop.mail-abuse.org
 
 \def\versionnumber{2.1}
-\def\year{2005}
+\def\year{2006}
 \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 12e3c01c871..46f7d7c6985 100644
--- a/etc/cs-dired-ref.tex
+++ b/etc/cs-dired-ref.tex
@@ -1,5 +1,6 @@
 % Reference Card for Dired
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+%   2006 Free Software Foundation, Inc.
 
 % Czech hyphenation rules applied
 \chyph
@@ -47,7 +48,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{0.1}
-\def\year{2005}
+\def\year{2006}
 \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 1164817a14d..be54da104ad 100644
--- a/etc/cs-refcard.tex
+++ b/etc/cs-refcard.tex
@@ -12,7 +12,7 @@
 \columnsperpage=1
 
 % Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-%   2005 Free Software Foundation, Inc.
+%   2005, 2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -66,7 +66,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{2.2}
-\def\year{2005}
+\def\year{2006}
 
 \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 4140f2a858e..cf8297e7f39 100644
--- a/etc/cs-survival.tex
+++ b/etc/cs-survival.tex
@@ -21,7 +21,8 @@
   \endinput
 \fi
 
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+%   2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -49,7 +50,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{1.0}
-\def\year{2005}
+\def\year{2006}
 
 \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 bb0ce3c978d..743e699fd76 100644
--- a/etc/de-refcard.tex
+++ b/etc/de-refcard.tex
@@ -8,7 +8,7 @@
 \columnsperpage=2
 
 % Copyright (C) 1987, 1993, 1996, 2000, 2002, 2003, 2004,
-%   2005 Free Software Foundation, Inc.
+%   2005, 2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -53,7 +53,7 @@
 % If there were room, it would be nice to see a section on Dired.
 
 \def\versionnumber{2.1}
-\def\year{2005}
+\def\year{2006}
 \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 62038525a21..ce4150e1df7 100644
--- a/etc/dired-ref.tex
+++ b/etc/dired-ref.tex
@@ -1,6 +1,6 @@
 % Reference Card for Dired
 % Copyright (C) 2000, 2001, 2002, 2003, 2004,
-%   2005 Free Software Foundation, Inc.
+%   2005, 2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -41,7 +41,7 @@
 
 
 \def\versionnumber{0.1}
-\def\year{2005}
+\def\year{2006}
 \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 9910317de0a..1195c21841f 100644
--- a/etc/edt-user.doc
+++ b/etc/edt-user.doc
@@ -3,7 +3,7 @@ File:  edt-user.doc  ---  EDT Emulation User Instructions
                                 For GNU Emacs 19
 
 Copyright (C) 1986, 1992, 1994, 1995, 1999, 2000, 2002, 2003, 2004,
-   2005 Free Software Foundation, Inc.
+   2005, 2006 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 1c9707243d9..ed9de22bf33 100644
--- a/etc/emacs.1
+++ b/etc/emacs.1
@@ -1,5 +1,5 @@
 .\" Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004,
-.\"   2005 Free Software Foundation, Inc.
+.\"   2005, 2006 Free Software Foundation, Inc.
 .\"
 .\" This file is part of GNU Emacs.
 .\"
@@ -536,7 +536,8 @@ Joachim Martillo and Robert Krawitz added the X features.
 Copyright
 .if t \(co
 .if n (c)
-1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+      2006 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 fcb55a0a205..9538b0b7127 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, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006 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 7f3200a0700..22eb311789a 100644
--- a/etc/emacstool.1
+++ b/etc/emacstool.1
@@ -136,7 +136,7 @@ emacs(1)
 Copyright 
 .if t \(co
 .if n (c)
-2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006 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 ad049066577..39228685d08 100644
--- a/etc/etags.1
+++ b/etc/etags.1
@@ -1,5 +1,5 @@
 .\" Copyright (C) 1992, 2001, 2002, 2003, 2004,
-.\"   2005 Free Software Foundation, Inc.
+.\"   2005, 2006 Free Software Foundation, Inc.
 .\" See section COPYING for conditions for redistribution
 .TH etags 1 "23nov2001" "GNU Tools" "GNU Tools"
 .de BP
@@ -292,7 +292,7 @@ Stallman.
 Copyright
 .if t \(co
 .if n (c)
-1999, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+1999, 2001, 2002, 2003, 2004, 2005, 2006 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 e64fe9574a5..40a238d529f 100644
--- a/etc/fr-drdref.tex
+++ b/etc/fr-drdref.tex
@@ -1,6 +1,7 @@
 
 % Reference Card for Dired
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+%   2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -41,7 +42,7 @@
 
 
 \def\versionnumber{0.1}
-\def\year{2005}
+\def\year{2006}
 \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 bff17c6d625..54d73ca6312 100644
--- a/etc/fr-refcard.tex
+++ b/etc/fr-refcard.tex
@@ -9,7 +9,7 @@
 \columnsperpage=1
 
 % Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-%   2005 Free Software Foundation, Inc.
+%   2005, 2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -54,7 +54,7 @@
 % If there were room, it would be nice to see a section on Dired.
 
 \def\versionnumber{2.2}
-\def\year{2005}
+\def\year{2006}
 
 \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 e73db5352a5..5c99fb27c49 100644
--- a/etc/fr-survival.tex
+++ b/etc/fr-survival.tex
@@ -22,7 +22,8 @@
   \endinput
 \fi
 
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+%   2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -44,7 +45,7 @@
 % Translated to french by \'Eric Jacoboni <jaco@teaser.fr> in November 2001
 
 \def\versionnumber{1.0}
-\def\year{2005}
+\def\year{2006}
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/gnus-refcard.tex b/etc/gnus-refcard.tex
index 87c02032424..3bfca03d93d 100644
--- a/etc/gnus-refcard.tex
+++ b/etc/gnus-refcard.tex
@@ -113,7 +113,7 @@
 \newcommand{\Copyright}{%
   \begin{center}
     Copyright \copyright\ 1995, 2002, 2003, 2004,
-       2005 Free Software Foundation, Inc.\\*
+       2005, 2006 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 29b5356e9e9..5dd26f1dfc5 100644
--- a/etc/gnus-tut.txt
+++ b/etc/gnus-tut.txt
@@ -24,7 +24,8 @@ 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, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;;   2006 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 494ef6b3ae7..064d9decc95 100644
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -5,7 +5,7 @@
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % At the moment this card works quite nicely in 3 column format and
-% currently takes 2 full pages.  It is thus suited to producing one 
+% currently takes 2 full pages.  It is thus suited to producing one
 % double-side page when printed.
 
 % There are a couple of tweaks in the format of this card which make it work
@@ -18,7 +18,8 @@
 
 \columnsperpage=3
 
-% Copyright (c) 2004 Philip Rooke, 2005, 2006 Free Software Foundation
+% Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+% Copyright (c) 2004 Philip Rooke
 
 % 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
@@ -88,7 +89,7 @@ are preserved on all copies.
 
 \def\ncolumns{\the\columnsperpage}
 
-\message{[\ncolumns\space 
+\message{[\ncolumns\space
   column\if 1\ncolumns\else s\fi\space per page]}
 
 \def\scaledmag#1{ scaled \magstep #1}
@@ -173,7 +174,7 @@ are preserved on all copies.
   \def\bye{\par\vfill\supereject
     \if a\abc \else\null\vfill\eject\fi
     \if a\abc \else\null\vfill\eject\fi
-    \end}  
+    \end}
 \fi
 
 % we won't be using math mode much, so redefine some of the characters
@@ -710,7 +711,7 @@ an org file. In the file, find a location with:
 \key{next heading}{DOWN}
 \key{previous heading}{UP}
 
-Insert the note with one of the following: 
+Insert the note with one of the following:
 
 \key{as sublevel of heading at cursor}{RET}
 \key{right here (cursor not on heading)}{RET}
@@ -752,7 +753,7 @@ $^4$ Keybinding affected by {\tt org-CUA-compatibility}.
 
 % arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290
 
-%%% Local Variables: 
+%%% Local Variables:
 %%% mode: latex
 %%% TeX-master: t
-%%% End: 
+%%% End:
diff --git a/etc/pl-refcard.tex b/etc/pl-refcard.tex
index dfbb5a2783a..0d5f008378e 100644
--- a/etc/pl-refcard.tex
+++ b/etc/pl-refcard.tex
@@ -32,7 +32,8 @@
 
 \columnsperpage=2
 
-% Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 1999, 2002, 2003, 2004, 2005,
+%   2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -73,7 +74,7 @@
 % If there were room, it would be nice to see a section on Dired.
 
 \def\versionnumber{1.1}
-\def\year{2005}
+\def\year{2006}
 
 \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 5567320c98a..218a6cc8e36 100644
--- a/etc/refcard.tex
+++ b/etc/refcard.tex
@@ -15,7 +15,7 @@
 
 % Nothing else needs to be changed below this line.
 % Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-%   2005 Free Software Foundation, Inc.
+%   2005, 2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -64,7 +64,7 @@
 % If there were room, it would be nice to see a section on Dired.
 
 \def\versionnumber{2.3}
-\def\year{2005}
+\def\year{2006}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/ru-refcard.tex b/etc/ru-refcard.tex
index 1083055bd9f..72fbe28e86f 100644
--- a/etc/ru-refcard.tex
+++ b/etc/ru-refcard.tex
@@ -1,4 +1,5 @@
-% Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 1997, 2002, 2003, 2004, 2005,
+%   2006 Free Software Foundation, Inc.
 
 \documentclass[10pt]{article}
 \usepackage{multicol,tabularx}
@@ -19,7 +20,7 @@
 \setlength{\ColThreeWidth}{25mm}
 
 \newcommand{\versionnumber}[0]{2.2}
-\newcommand{\nyear}[0]{2005}
+\newcommand{\nyear}[0]{2006}
 
 \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 26846834b36..82a3d2a5be0 100644
--- a/etc/sk-dired-ref.tex
+++ b/etc/sk-dired-ref.tex
@@ -1,5 +1,6 @@
 % Reference Card for Dired
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+%   2006 Free Software Foundation, Inc.
 
 % Slovak hyphenation rules applied
 \shyph
@@ -48,7 +49,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{0.1}
-\def\year{2005}
+\def\year{2006}
 \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 40f36f2109f..97911a66db8 100644
--- a/etc/sk-refcard.tex
+++ b/etc/sk-refcard.tex
@@ -12,7 +12,7 @@
 \columnsperpage=1
 
 % Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-%   2005 Free Software Foundation, Inc.
+%   2005, 2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -68,7 +68,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{2.2}
-\def\year{2005}
+\def\year{2006}
 
 \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 346516cf48e..4cd12672ada 100644
--- a/etc/sk-survival.tex
+++ b/etc/sk-survival.tex
@@ -21,7 +21,8 @@
   \endinput
 \fi
 
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+%   2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -50,7 +51,7 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{1.0}
-\def\year{2005}
+\def\year{2006}
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/survival.tex b/etc/survival.tex
index 0e164d7654f..8c56232d7ad 100644
--- a/etc/survival.tex
+++ b/etc/survival.tex
@@ -25,7 +25,8 @@
   \endinput
 \fi
 
-% Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2002, 2003, 2004, 2005,
+%   2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -45,7 +46,7 @@
 % Boston, MA 02110-1301, USA.
 
 \def\versionnumber{1.0}
-\def\year{2005}
+\def\year{2006}
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
diff --git a/etc/vipcard.tex b/etc/vipcard.tex
index cca644b6bfd..693667bd076 100644
--- a/etc/vipcard.tex
+++ b/etc/vipcard.tex
@@ -7,7 +7,8 @@
 
 \columnsperpage=1
 
-% Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+% Copyright (C) 1987, 2002, 2003, 2004, 2005,
+%   2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -54,7 +55,7 @@
 
 
 \def\versionnumber{1.2}
-\def\year{2005}
+\def\year{2006}
 \def\version{September \year\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/viperCard.tex b/etc/viperCard.tex
index 50f65b2c0d5..b2761126837 100644
--- a/etc/viperCard.tex
+++ b/etc/viperCard.tex
@@ -8,7 +8,7 @@
 \columnsperpage=2
 
 % Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004,
-%   2005 Free Software Foundation, Inc.
+%   2005, 2006 Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -62,7 +62,7 @@
 
 
 \def\versionnumber{3.0}
-\def\year{2005}
+\def\year{2006}
 \def\version{August \year\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill