Update author/maintainer info

Update email addresses and fix spellings of some author and
maintainer names.

32 files changed, 41 insertions, 46 deletions

diff --git a/etc/ChangeLog.1 b/etc/ChangeLog.1
index 24b8b39ec1c..4317cfcb038 100644
--- a/etc/ChangeLog.1
+++ b/etc/ChangeLog.1
@@ -3395,7 +3395,7 @@
 
 	* MORE.STUFF: Update some links, remove some dead ones.
 
-2007-04-04  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
+2007-04-04  Sławomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
 
 	* emacs.py (format_exception): New function.
 	(eexecfile): Use it instead of traceback.print_exception.
@@ -3770,7 +3770,7 @@
 	(section{TODO Items and Checkboxes}): Checkbox keys moved to this
 	section, added documentation for the key `C-c #'.
 
-2006-11-05  Slawomir Nowaczyk  <slawek@cs.lth.se>
+2006-11-05  Sławomir Nowaczyk  <slawek@cs.lth.se>
 
 	* emacs.py (eargs): Provide eldoc message for builtin types.
 	Make sure eargs always outputs sentinel, to avoid Emacs freeze.
@@ -3861,7 +3861,7 @@
 	(eimport): Use __main__ rather than `emacs' namespace.
 	(modpath): New fun.
 
-2006-08-20  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
+2006-08-20  Sławomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>
 
 	* emacs.py (eexecfile): Use the __main__ rather than `emacs' namespace.
 
@@ -4122,7 +4122,7 @@
 	Stefan Monnier <monnier@iro.umontreal.ca>.
 
 	* pl-refcard.tex (section{Info}): Ditto.  Translation suggested by
-	Slawomir Nowaczyk <slawomir.nowaczyk.847@student.lu.se>.
+	Sławomir Nowaczyk <slawomir.nowaczyk.847@student.lu.se>.
 
 	* cs-refcard.tex (section{Info}): Use `s' instead of `M-s'.
 	Entry for `i' is not translated yet.
@@ -4854,7 +4854,7 @@
 
 	* NEWS: Lots of clarifications and cleanups.
 
-2005-05-05  Slawomir Nowaczyk  <slawek@cs.lth.se>
+2005-05-05  Sławomir Nowaczyk  <slawek@cs.lth.se>
 
 	* TUTORIAL.pl: Updated header.
 
@@ -5777,7 +5777,7 @@
 
 	* ps-prin0.ps: Changed comment version (6.0).
 
-2000-08-24  Wlodzimierz Bzyl  <matwb@univ.gda.pl>
+2000-08-24  Włodzimierz Bzyl  <matwb@univ.gda.pl>
 
 	* survival.tex: New file.
 
@@ -5852,7 +5852,7 @@
 
 	* refcard.bit: Removed.
 
-2000-04-10  Wlodzimierz Bzyl  <matwb@monika.univ.gda.pl>
+2000-04-10  Włodzimierz Bzyl  <matwb@monika.univ.gda.pl>
 
 	* refcard-pl.ps: New file.
 	* refcard-pl.tex: New file.
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index 2b85536886c..7e28f83057a 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -58,14 +58,10 @@
 % Which mode to use is controlled by setting \columnsperpage above.
 %
 % Author (Calc reference card):
-%  Dave Gillespie
-%  UUCP: uunet!synaptx!daveg
-%  Internet: daveg@synaptics.com
+%  Dave Gillespie <daveg@synaptics.com>
 %
 % Author (refcard.tex format):
-%  Stephen Gildea
-%  UUCP: mit-erl!gildea
-%  Internet: gildea@stop.mail-abuse.org
+%  Stephen Gildea <stepheng+emacs@gildea.com>
 
 \input emacsver.tex
 
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index ca7d8333208..ec9e9a9edfd 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
 
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
 % 	Milan Zamazal <pdm@zamazal.org>, August 1999
 %	Pavel Janík <Pavel@Janik.cz>, November 2000 (Emacs 21)
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index b91c9c927ca..bdc35cd20e1 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -2,7 +2,7 @@
 
 % Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
-% Author: Wlodek Bzyl <matwb@univ.gda.pl>
+% Author: Włodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
 
 % This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 06b6efe37de..5c8127d0738 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996, 2000-2019 Free Software Foundation,
 % Inc.
 
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % German translation: Sven Joachim <svenjoac@gmx.de>
 
 % This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index 0ebf791cd8b..467c71a86fc 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
 
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % French translation: Eric Jacoboni
 %	Micha\"el Cadilhac
 
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index 20755497ff2..f0bbc11f12a 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -3,7 +3,7 @@
 
 % Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
-% Author: Wlodek Bzyl <matwb@univ.gda.pl>
+% Author: Włodek Bzyl <matwb@univ.gda.pl>
 % French translation:  \'Eric Jacoboni <jaco@teaser.fr>, November 2001
 
 % This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index ae4e26c2863..4a51fe01c58 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -60,8 +60,7 @@
 % dvips -t landscape refcard.dvi
 %
 % Author:
-%  Stephen Gildea
-%  Internet: gildea@stop.mail-abuse.org
+%  Stephen Gildea <stepheng+emacs@gildea.com>
 %
 % Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
 % for their many good ideas.
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index 578a8f6251b..54b6a10e4b4 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -3,8 +3,8 @@
 
 % Copyright (C) 1999, 2001-2019 Free Software Foundation, Inc.
 
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
-% Polish translation: W{\l}odek Bzyl <matwb@univ.gda.pl>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
+% Polish translation: Włodek Bzyl <matwb@univ.gda.pl>
 
 % This document is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@
 %    You will still need to cut and paste.
 % Which mode to use is controlled by setting \columnsperpage.
 
-% Translated into Polish language by W{\l}odek Bzyl (matwb@univ.gda.pl)
+% Translated into Polish language by Włodek Bzyl <matwb@univ.gda.pl>
 % who also added new section on `Dired' and added info about Polish
 % support in Emacs to section `International Character Sets'.
 
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index 04ce77d0325..b7840621eea 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2019 Free
 % Software Foundation, Inc.
 
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % Portuguese translation: Rodrigo Real <rreal@ucpel.tche.br>
 
 % This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 5089133e954..d03e6654f0c 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
 
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 
 % This document is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index 43c18d58e29..59741f31ebe 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -1,6 +1,6 @@
 % Copyright (C) 1997, 2002-2019 Free Software Foundation, Inc.
 
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % Russian translation: Alex Ott <alexott@gmail.com>
 
 % This document is free software: you can redistribute it and/or modify
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 823913affcd..7ec15983346 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -3,7 +3,7 @@
 % Copyright (C) 1987, 1993, 1996-1997, 2001-2019 Free Software
 % Foundation, Inc.
 
-% Author: Stephen Gildea <gildea@stop.mail-abuse.org>
+% Author: Stephen Gildea <stepheng+emacs@gildea.com>
 % Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
 % 	Milan Zamazal <pdm@zamazal.org>, August 1999
 %	Pavel Janík <Pavel@Janik.cz>, November 2000 (Emacs 21)
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index b63a618b060..80eb2aee08d 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -2,7 +2,7 @@
 
 % Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
-% Author: Wlodek Bzyl <matwb@univ.gda.pl>
+% Author: Włodek Bzyl <matwb@univ.gda.pl>
 % Czech translation: Pavel Janík <Pavel@Janik.cz>, March 2001
 % Slovak translation: Miroslav Vasko <vasko@debian.cz>, March 2001
 
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 5dbe788ee62..b25c9af76b1 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -3,7 +3,7 @@
 
 % Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
-% Author: Wlodek Bzyl <matwb@univ.gda.pl>
+% Author: Włodek Bzyl <matwb@univ.gda.pl>
 
 % This document is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index fb116d41f9f..00d9e3b7f5d 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -2,7 +2,7 @@
 
 % Copyright (C) 1995-1997, 2001-2019 Free Software Foundation, Inc.
 
-% Author: Michael Kifer <kifer@cs.sunysb.edu> (Viper)
+% Author: Michael Kifer <kifer@cs.stonybrook.edu> (Viper)
 %	Aamod Sane <sane@cs.uiuc.edu> (VIP 4.3)
 %	Masahiko Sato <ms@sail.stanford.edu> (VIP 3.5)
 
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt
index d1710c9bb84..58b931b520a 100644
--- a/etc/srecode/c.srt
+++ b/etc/srecode/c.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2007-2010, 2012-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt
index 79b62b34589..bac247c7017 100644
--- a/etc/srecode/cpp.srt
+++ b/etc/srecode/cpp.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt
index 693cc9504c2..c896326c800 100644
--- a/etc/srecode/default.srt
+++ b/etc/srecode/default.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt
index f7a0af65cfa..15c5c195360 100644
--- a/etc/srecode/doc-cpp.srt
+++ b/etc/srecode/doc-cpp.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt
index 1f1cb4e9cca..2c7403e118c 100644
--- a/etc/srecode/doc-default.srt
+++ b/etc/srecode/doc-default.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt
index 659a8e9f341..3cd4d24fa61 100644
--- a/etc/srecode/doc-java.srt
+++ b/etc/srecode/doc-java.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt
index 1f5a2711efa..c203536d77f 100644
--- a/etc/srecode/ede-autoconf.srt
+++ b/etc/srecode/ede-autoconf.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2010, 2012-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt
index edf34a087f1..5cef78eac00 100644
--- a/etc/srecode/ede-make.srt
+++ b/etc/srecode/ede-make.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index 5d5a2ecf352..baa7c59fe34 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
-;; Author: Eric Ludlam <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt
index cdb06dcc5ae..78946a75b66 100644
--- a/etc/srecode/getset-cpp.srt
+++ b/etc/srecode/getset-cpp.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt
index f9e67b78014..95935449b74 100644
--- a/etc/srecode/java.srt
+++ b/etc/srecode/java.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt
index 1288acb7d3e..4aa1c0a2830 100644
--- a/etc/srecode/make.srt
+++ b/etc/srecode/make.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt
index a651e324d3a..f0855da1b45 100644
--- a/etc/srecode/template.srt
+++ b/etc/srecode/template.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2005, 2007-2019 Free Software Foundation, Inc.
 
-;; Author: Eric Ludlam <zappo@gnu.org>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt
index 79f9dd027ba..3bbc33e72dc 100644
--- a/etc/srecode/test.srt
+++ b/etc/srecode/test.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt
index d696cc09f7a..17f4c5a1129 100644
--- a/etc/srecode/texi.srt
+++ b/etc/srecode/texi.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2008-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt
index 40fe942384b..27c65bef570 100644
--- a/etc/srecode/wisent.srt
+++ b/etc/srecode/wisent.srt
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
-;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;; Author: Eric M. Ludlam <zappo@gnu.org>
 
 ;; This file is part of GNU Emacs.