* lisp/emacs-lisp/authors.el (authors-aliases): Remove unnecessary entries.

* lisp/jka-cmpr-hook.el, lisp/jka-compr.el, lisp/progmodes/antlr-mode.el:
* doc/misc/autotype.texi: Fix author header comments.

* lisp/org/ChangeLog: ChangeLog fix.

7 files changed, 17 insertions, 36 deletions

diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index 7ca860486c2..ae3fa0e5870 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -1,6 +1,6 @@
 \input texinfo
 @c This is an annex of the Emacs manual.
-@c Author: Daniel.Pfeiffer@Informatik.START.dbp.de, fax (+49 69) 7588-2389
+@c Author: Daniel Pfeiffer <Daniel.Pfeiffer@Informatik.START.dbp.de>
 @setfilename ../../info/autotype
 @c @node Autotypist, Picture, Abbrevs, Top
 @c @chapter Features for Automatic Typing
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2cc9293b14d..b98f68c99ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-01-17  Glenn Morris  <rgm@gnu.org>
 
+        * emacs-lisp/authors.el (authors-aliases): Remove unnecessary entries.
+
         Make M-x authors return zero *Authors Errors* from current logs.
         * emacs-lisp/authors.el (authors-obsolete-files-regexps):
         (authors-ignored-files): Add some entries, remove others.
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 841d4fad9fb..ee9dc870441 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -53,15 +53,11 @@ files.")
     ("Brian Fox" "Brian J. Fox")
     ("Brian P Templeton" "BT Templeton")
     ("Brian Sniffen" "Brian T. Sniffen")
-    ("Christoph Wedler" "Christoph.Wedler@sap.com")
-    ("Daniel Pfeiffer" "<Daniel.Pfeiffer@Informatik.START.db.de>"
-     "<Daniel.Pfeiffer@Informatik.START.dbp.de>")
     ("David Abrahams" "Dave Abrahams")
     ("David De La Harpe Golden" "David Golden")
     ("David Gillespie" "Dave Gillespie")
     ("David Kågedal" "David K..edal")
-    ("David M. Koppelman" "David M. Koppelman, Koppel@Ec?e.Lsu.Edu"
-     "David Koppelman")
+    ("David M. Koppelman" "David Koppelman")
     ("David M. Smith" "David Smith" "David M Smith")
     ("David O'Toole" "David T. O'Toole")
     ("Deepak Goel" "D. Goel")
@@ -70,10 +66,8 @@ files.")
      "Reingold Edward M")
     ("Eli Zaretskii" "eliz")
     ("Emilio C. Lopes" "Emilio Lopes")
-    ("Era Eriksson" "Era@Iki.Fi")
     ("Eric M. Ludlam" "Eric Ludlam")
     ("Eric S. Raymond" "Eric Raymond")
-    ("Eric Youngdale" "(Eric Youngdale at youngdale@v6550c.nrl.navy.mil)")
     ("Francis J. Wright" "Dr Francis J. Wright" "Francis Wright")
     ("François Pinard" "Francois Pinard")
     ("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`")
@@ -84,18 +78,10 @@ files.")
     ("Hrvoje Nikšić" "Hrvoje Niksic")
     ;; lisp/org/ChangeLog 2010-11-11.
     (nil "aaa bbb")
-    ;; src/ChangeLog.4, 1994-01-11, since fixed.
-;;;    (nil "(afs@hplb.hpl.hp.com)")
-    ;; lisp/gnus/ChangeLog.1, 1998-01-15.
-    ;; http://quimby.gnus.org/cgi-bin/cvsweb.cgi/gnus/lisp/gnus-art.el?rev=4.13
-    (nil "<Use-Author-Address-Header@\\[127.1\\]>")
     (nil "Code Extracted") ; lisp/newcomment.el's "Author:" header
-    (nil "\\`FSF")  ; FIXME what is this for - no effect?
-    ;; lisp/gnus/ChangeLog.1, 1997-10-12, since fixed.
-;;;    (nil "ISO-2022-JP")
     ("Jaeyoun Chung" "Jae-youn Chung" "Jae-you Chung" "Chung Jae-youn")
     ("Jan Djärv" "Jan D." "Jan Djarv")
-    ("Jay K. Adams" "jka@ece.cmu.edu" "Jay Adams")
+    ("Jay K. Adams" "Jay Adams")
     ("Jérôme Marant" "Jérôme Marant" "Jerome Marant")
     ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen")
     ("Jeremy Bertram Maitin-Shepard" "Jeremy Maitin-Shepard")
@@ -108,9 +94,7 @@ files.")
     ("Joseph M. Kelsey" "Joe Kelsey")   ; FIXME ?
     ("Juan León Lahoz García" "Juan-Leon Lahoz Garcia")
     ("K. Shane Hartman" "Shane Hartman")
-    ("Kai Großjohann" "Kai Grossjohann" "Kai Großjohann"
-     "Kai.Grossjohann@Cs.Uni-Dortmund.De"
-     "Kai.Grossjohann@Gmx.Net")
+    ("Kai Großjohann" "Kai Grossjohann")
     ("Karl Berry" "K. Berry")
     ("Károly Lőrentey" "Károly Lőrentey" "Lőrentey Károly")
     ("Kazushi Marukawa" "Kazushi")
@@ -137,32 +121,28 @@ files.")
     ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
     ("Noorul Islam" "Noorul Islam K M")
     ("Paul Eggert" "eggert")
-    ("Paul Reilly" "(pmr@legacy.pajato.com)")
-    ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik" "Pavel Janík" "Pavel@Janik.Cz")
+    ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik")
     ("Pavel Kobiakov" "Pavel Kobyakov")
     ("Per Abrahamsen" "Per Abhiddenware")
     ("Per Starbäck" "Per Starback")
     ("Peter J. Weisberg" "PJ Weisberg")
-    ("Peter S. Galbraith" "Peter Galbraith")
+    ("Peter S. Galbraith" "Peter S Galbraith" "Peter Galbraith")
     ("Peter Runestig" "Peter 'luna' Runestig")
-    ("Peter S. Galbraith" "Peter S Galbraith")
     ("Piotr Zieliński" "Piotr Zielinski")
     ("Rainer Schöpf" "Rainer Schoepf")
     ("Raja R. Harinath" "Raja R Harinath")
     ("Richard G. Bielawski" "Richard G Bielawski" "Richard Bielawski")
     ("Richard King" "Dick King")
-    ("Richard M. Stallman" "Richard M. Stallman,,," "Richard Stallman"
-     "rms" "rms@gnu.org")
+    ("Richard M. Stallman" "Richard Stallman" "rms" "rms@gnu.org")
     ("Robert J. Chassell" "Bob Chassell")
     ("Roland B. Roberts" "Roland B Roberts" "Roland Roberts")
-    ("Rui-Tao Dong" "Rui-Tao Dong ~{6-Hpln~}")
+    ("Rui-Tao Dong" "Rui-Tao Dong ~{6-HpLN~}")
     ("Sacha Chua" "Sandra Jean Chua")
     ("Sam Steingold" "Sam Shteingold")
     ("Satyaki Das" "Indexed search by Satyaki Das")
     ("Sébastien Vauban" "Sebastien Vauban")
     ;; There are other Stefans.
 ;;;    ("Stefan Monnier" "Stefan")
-    ("Stephen A. Wood" "(saw@cebaf.gov)")
     ("Steven L. Baur" "SL Baur" "Steven L Baur")
     ("Stewart M. Clamen" "Stewart Clamen")
     ("Stuart D. Herring" "Stuart Herring" "Davis Herring")
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index ae8f1fb20d0..a1691461913 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -1,9 +1,9 @@
 ;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el
 
-;; Copyright (C) 1993-1995, 1997, 1999-2000, 2002-2014 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1993-1995, 1997, 1999-2000, 2002-2014
+;;   Free Software Foundation, Inc.
 
-;; Author: jka@ece.cmu.edu (Jay K. Adams)
+;; Author: Jay K. Adams <jka@ece.cmu.edu>
 ;; Maintainer: FSF
 ;; Keywords: data
 ;; Package: emacs
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 3c66c64e23a..f32eb6e084a 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -1,9 +1,8 @@
 ;;; jka-compr.el --- reading/writing/loading compressed files
 
-;; Copyright (C) 1993-1995, 1997, 1999-2014 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1993-1995, 1997, 1999-2014 Free Software Foundation, Inc.
 
-;; Author: jka@ece.cmu.edu (Jay K. Adams)
+;; Author: Jay K. Adams <jka@ece.cmu.edu>
 ;; Maintainer: FSF
 ;; Keywords: data
 
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index c476c005402..1ca4418241c 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -21092,7 +21092,7 @@
 2010-11-11  aaa bbb  <dominik@powerbook-g4-12-van-aaa-bbb.local>
 
         * org-archive.el (org-get-local-archive-location):
-        Use `org-carchive-location' as default.
+        Use `org-archive-location' as default.
 
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
 
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index f715d2404c9..9557fc80eb2 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
-;; Author: Christoph.Wedler@sap.com
+;; Author: Christoph Wedler <Christoph.Wedler@sap.com>
 ;; Keywords: languages, ANTLR, code generator
 ;; Version: 2.2c
 ;; X-URL: http://antlr-mode.sourceforge.net/