6 files changed, 19 insertions, 14 deletions

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index fa1e04b4891..9c1775b25cb 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -4,7 +4,9 @@
 ;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 ;;   Free Software Foundation, Inc.
 
-;; Author: Jamie Zawinski, Richard Stallman, Stefan Monnier
+;; Author: Jamie Zawinski
+;;      Richard Stallman
+;;      Stefan Monnier
 ;; Maintainer: FSF
 ;; Keywords: languages, faces
 
diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el
index 1a87435bb0a..58e4360506e 100644
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -1,10 +1,11 @@
 ;;; ogonek.el --- change the encoding of Polish diacritics
 
-;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009  Free Software Foundation, Inc.
 
-;; Author: W{\l}odek Bzyl, Ryszard Kubiak
-;; Maintainer: rysiek@ipipan.gda.pl (Ryszard Kubiak)
+;; Author: W{\l}odek Bzyl
+;;         Ryszard Kubiak
+;; Maintainer: Ryszard Kubiak <rysiek@ipipan.gda.pl>
 ;; Keywords: i18n
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 3d8987995c2..df7927f84ea 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -1,7 +1,7 @@
 ;;; tibetan.el --- support for Tibetan language -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009  Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -10,6 +10,8 @@
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 
+;; Author: Toru TOMABECHI <Toru.Tomabechi@orient.unil.ch>
+;; Created: Feb. 17. 1997
 ;; Keywords: multilingual, Tibetan, i18n
 
 ;; This file is part of GNU Emacs.
@@ -27,11 +29,8 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Toru TOMABECHI, <Toru.Tomabechi@orient.unil.ch>
-
-;; Created: Feb. 17. 1997
+;;; History:
 
-;; History:
 ;; 1997.03.13 Modification for special signs and punctuations.
 
 ;;; Commentary:
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index 456a5b453b2..064066cd787 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -1,6 +1,7 @@
 ;;; mh-junk.el --- MH-E interface to anti-spam measures
 
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>,
 ;;         Bill Wohler <wohler@newt.com>
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index ebb5676230f..18ca2b448b9 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -1,6 +1,7 @@
 ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 30ec1802220..f04eb3da591 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 
-;; Author: Dave Love <fx@gnu.org>, Riccardo Murri <riccardo.murri@gmail.com>
+;; Author: Dave Love <fx@gnu.org>
+;;         Riccardo Murri <riccardo.murri@gmail.com>
 ;; Keywords: tools
 ;; Created: Sept 2006
 ;; Version: 2008-01-04 (Bzr revno 25)