Fixed wrong entries in etc/ChangeLog and replaced my email.

4 files changed, 26 insertions, 21 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index e81c661290f..95f847ac9ee 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -59,7 +59,7 @@
 
         * TUTORIAL.de: Updated header.
 
-2005-04-05  Marcelo Toledo  <marcelo@marcelotoledo.org>
+2005-04-05  Marcelo Toledo  <marcelo@gnu.org>
 
         * TUTORIAL.translators: Added the field Maintainer.
 
@@ -80,20 +80,24 @@
 
         * TUTORIAL.es: Clean up line breaks.
 
-2005-04-01  Marcelo Toledo  <marcelo@marcelotoledo.org>
+2005-04-01  Marcelo Toledo  <marcelo@gnu.org>
 
         * TUTORIAL.pt_BR, TUTORIAL.cn, TUTORIAL.cs, TUTORIAL.de,
         * TUTORIAL.es, TUTORIAL.fr, TUTORIAL.it, TUTORIAL.ja, TUTORIAL.ko,
         * TUTORIAL.pl, TUTORIAL.pt_BR, TUTORIAL.ro, TUTORIAL.ru,
         * TUTORIAL.sk, TUTORIAL.sl, TUTORIAL.th, TUTORIAL.zh: Fix title
         line.
-
+        
+2005-04-01  Ognyan Kulev  <ogi@fmi.uni-sofia.bg>
+        
         * TUTORIAL.bg: Fix title line; Applied TUTORIAL changes in
         2005-02-08T14:20:54Z!lute@gnu.org, "Emacs" is not transliterated to cyrillic anymore;
-        Minor fixes; patch by Ognyan Kulev <ogi@fmi.uni-sofia.bg>.
+        Minor fixes.
+
+2005-04-01  Mats Lidell  <matsl@contactor.se>
 
         * TUTORIAL.sv: Sync some other changes with the TUTORIAL version
-        2005-04-01T00:31:25Z!rms@gnu.org patch by Mats Lidell <matsl@contactor.se>.
+        2005-04-01T00:31:25Z!rms@gnu.org.
 
 2005-04-01  Lute Kamstra  <lute@gnu.org>
 
@@ -358,7 +362,7 @@
         * tree-widget: New directory containing tree-widget themes and
         images.
 
-2004-04-13  Marcelo Toledo  <marcelo@marcelotoledo.org>
+2004-04-13  Marcelo Toledo  <marcelo@gnu.org>
 
         * TUTORIAL.pt_BR: initial check-in.
 
@@ -377,9 +381,9 @@
 
         * TUTORIAL.it, TUTORIAL.nl, TUTORIAL.sv: Add coding: latin-1.
 
-2004-04-16  David Kastrup  <dak@gnu.org>
+2004-04-16  Alex Ott  <ottalex@narod.ru>
 
-        * TUTORIAL.ru: Changes by Alex Ott checked in.
+        * TUTORIAL.ru: Various corrections.
 
 2004-04-14  Jan Nieuwenhuizen  <janneke@gnu.org>
 
@@ -574,10 +578,9 @@
 
         * MH-E-NEWS: Upgraded to MH-E version 7.0.
 
-2002-11-22  Juanma Barranquero  <lektu@terra.es>
+2002-11-22  Rafael Sep,Az(Blveda  <drs@gnulinux.org.mx>
 
-        * TUTORIAL.es: Extensively changed and updated by Rafael Sep,Az(Blveda
-        <drs@gnulinux.org.mx>.
+        * TUTORIAL.es: Extensively changed and updated.
 
 2002-10-01  Bill Wohler  <wohler@newt.com>
 
@@ -1833,11 +1836,13 @@
         * emacstool.c: setenv IN_EMACSTOOL=t, TERM=sun, TERMCAP=.
 
         * emacsstool.1: update to document environment variables.
+        
+1989-02-21  Mosur Mohan (email@notavailable)
+        
+        * etags.c (PAS_funcs): New function.
 
 1989-02-21  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
 
-        * etags.c (PAS_funcs): New function by Mosur Mohan.
-
         * movemail.c: On sysv, include unistd.h.
 
 1989-02-18  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
@@ -1856,10 +1861,10 @@
 
         * fakemail.c (put_line): Break header lines at 79 cols.
 
-1989-01-19  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
+1989-01-19  Sam Kendall  (email@notavailable)
 
-        * etags.c: Greatly rewritten by Sam Kendall for C++ support and for
-        multiple tags per line.
+        * etags.c: Greatly rewritten for C++ support and for multiple tags        
+        per line.
 
 1989-01-03  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
 
diff --git a/etc/TUTORIAL.pt_BR b/etc/TUTORIAL.pt_BR
index a7a50804ca0..56f431ecdd7 100644
--- a/etc/TUTORIAL.pt_BR
+++ b/etc/TUTORIAL.pt_BR
@@ -1061,7 +1061,7 @@ Esse tutorial descende de uma longa linha de tutoriais do Emacs
 iniciando com um escrito por Stuart Cracraft para o Emacs original.
 
 Essa versão do tutorial foi originalmente traduzida por Marcelo Toledo
-<marcelo@marcelotoledo.org> e como o GNU Emacs, tem um copyright, e vem
+<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
diff --git a/etc/TUTORIAL.translators b/etc/TUTORIAL.translators
index 5583430c750..d0c09e5bc7b 100644
--- a/etc/TUTORIAL.translators
+++ b/etc/TUTORIAL.translators
@@ -52,8 +52,8 @@ Maintainer: Beatę Wierzchołowską <beataw@orient.uw.edu.pl>
             Janusz S. Bien <jsbien@mail.uw.edu.pl>
 
 * TUTORIAL.pt_BR: 
-Author:     Marcelo Toledo <marcelo@marcelotoledo.org>
-Maintainer: Marcelo Toledo <marcelo@marcelotoledo.org>
+Author:     Marcelo Toledo <marcelo@gnu.org>
+Maintainer: Marcelo Toledo <marcelo@gnu.org>
 
 * TUTORIAL.ro: 
 Author:     Tudor Hulubei <tudor@gnu.org>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4efd990f145..95b6f0d3605 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1737,7 +1737,7 @@
         * xt-mouse.el (xterm-mouse-mode): Add explicit Custom group, mouse.
         Doc fix.
 
-2005-04-03  Marcelo Toledo  <marcelo@marcelotoledo.org>
+2005-04-03  Marcelo Toledo  <marcelo@gnu.org>
 
         * add-log.el (change-log-font-lock-keywords): The manual
         describing a Change Log entry, says: (...) "Aside from these
@@ -12097,7 +12097,7 @@
 
         * tree-widget.el: New file.
 
-2004-05-13  Marcelo Toledo  <marcelo@marcelotoledo.org>
+2004-05-13  Marcelo Toledo  <marcelo@gnu.org>
 
         * language/european.el ("Brazilian Portuguese"): Add support for
         Brazilian Portuguese.