Refill some long/short copyright headers.

22 files changed, 30 insertions, 40 deletions

diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE
index b2fcfb76c2b..df5dd7daefc 100644
--- a/etc/CONTRIBUTE
+++ b/etc/CONTRIBUTE
@@ -1,5 +1,4 @@
-Copyright (C) 2006-2011
-  Free Software Foundation, Inc.
+Copyright (C) 2006-2011  Free Software Foundation, Inc.
 See end for license conditions.
 
 
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 955709e9aac..75670ff0218 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -5194,8 +5194,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2011
-    Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/etc/MACHINES b/etc/MACHINES
index b5a1eadc060..126ae40cb57 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -1,6 +1,7 @@
 Emacs machines list
 
-Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1989-1990, 1992-1993, 1998, 2001-2011
+  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 This is a list of the status of GNU Emacs on various machines and systems.
@@ -401,4 +402,3 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 5409bc98fd6..90d96c12fb8 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -1,7 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  1992.
 
-Copyright (C) 1993-1995, 2001, 2006-2011
-  Free Software Foundation, Inc.
+Copyright (C) 1993-1995, 2001, 2006-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -6541,4 +6540,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
-
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 7dedb5a96e8..47f61a13e3b 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -1,7 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
 
-Copyright (C) 2000-2011
-  Free Software Foundation, Inc.
+Copyright (C) 2000-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index a4d687258c7..3920f59fefa 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -1,7 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.
 
-Copyright (C) 2001-2011
-          Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
@@ -5606,4 +5605,3 @@ Local variables:
 mode: outline
 paragraph-separate: "[  ]*$"
 end:
-
diff --git a/etc/README b/etc/README
index a4210ebcf02..d1cad4a3a0f 100644
--- a/etc/README
+++ b/etc/README
@@ -9,6 +9,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 File: emacs.icon
   Author: Sun Microsystems, Inc
-  Copyright (C) 1999, 2001-2011
-    Free Software Foundation, Inc.
+  Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/TERMS b/etc/TERMS
index 2edeab11fae..e361188247b 100644
--- a/etc/TERMS
+++ b/etc/TERMS
@@ -1,5 +1,4 @@
-Copyright (C) 1999, 2001-2011
-Free Software Foundation, Inc.
+Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 
 This file describes what you must or might want to do to termcap entries
diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg
index 7d5a7d78583..aad6560a004 100644
--- a/etc/images/gnus/gnus.svg
+++ b/etc/images/gnus/gnus.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Gnu Emacs Logo
 
-   Copyright (C) 2008-2011
-   Free Software Foundation, Inc.
+   Copyright (C) 2008-2011  Free Software Foundation, Inc.
 
    Author: Francesc Rocher <f.rocher@member.fsf.org>
 
diff --git a/etc/images/tree-widget/default/README b/etc/images/tree-widget/default/README
index 71db7e8d678..ccc6cdbf21e 100644
--- a/etc/images/tree-widget/default/README
+++ b/etc/images/tree-widget/default/README
@@ -5,6 +5,5 @@ Files: close.png close.xpm empty.png empty.xpm end-guide.png end-guide.xpm
        no-guide.png no-guide.xpm no-handle.png no-handle.xpm open.png
        open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
-Copyright (C) 2004-2011
-  Free Software Foundation, Inc.
+Copyright (C) 2004-2011  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/images/tree-widget/folder/README b/etc/images/tree-widget/folder/README
index 1b839349e18..58716db456d 100644
--- a/etc/images/tree-widget/folder/README
+++ b/etc/images/tree-widget/folder/README
@@ -5,6 +5,5 @@ Files:  close.png close.xpm empty.png empty.xpm end-guide.png
         leaf.png leaf.xpm no-guide.png no-guide.xpm no-handle.png
         no-handle.xpm open.png open.xpm
 Author: David Ponce <david.ponce@wanadoo.fr>
-Copyright (C) 2004-2011
-  Free Software Foundation, Inc.
+Copyright (C) 2004-2011  Free Software Foundation, Inc.
 License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps
index bff6f5b53ab..ed48807b068 100644
--- a/etc/ps-prin0.ps
+++ b/etc/ps-prin0.ps
@@ -1,8 +1,7 @@
 % === BEGIN ps-print prologue 0
 % version: 6.0
 
-% Copyright (C) 2000-2011
-%   Free Software Foundation, Inc.
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index 71f744f1705..dbb0db846bf 100644
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -1,8 +1,7 @@
 % === BEGIN ps-print prologue 1
 % version: 6.1
 
-% Copyright (C) 2000-2011
-%   Free Software Foundation, Inc.
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff --git a/etc/refcards/README b/etc/refcards/README
index 2f9b5714c12..fa5ae9258eb 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -12,6 +12,5 @@ it is reproduced here for convenience.
 
 File: gnus-logo.eps, gnus-logo.pdf
   Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2001-2011
-    Free Software Foundation, Inc.
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later (see COPYING)
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index 372102d8bce..8b9456b4a63 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -1,6 +1,7 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+%   Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index 8553d98ee6f..61caccbea8e 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -1,6 +1,7 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+%   Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % French translation: Eric Jacoboni
diff --git a/etc/refcards/gnus-logo.eps b/etc/refcards/gnus-logo.eps
index c47e446a538..36659ebfb4b 100644
--- a/etc/refcards/gnus-logo.eps
+++ b/etc/refcards/gnus-logo.eps
@@ -1,6 +1,5 @@
 %!PS-Adobe-2.0 EPSF-2.0
-% Copyright (C) 2000-2011
-%   Free Software Foundation, Inc.
+% Copyright (C) 2000-2011  Free Software Foundation, Inc.
 %
 % Author: Luis Fernandes <elf@ee.ryerson.ca>
 %
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 894cc6ad219..f35ed209149 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -17,7 +17,8 @@
 \pdflayout=(0l)
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+%   Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index edf702a2976..4091f59d1f6 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -1,6 +1,7 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2002-2004, 2006-2011
+%   Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Portuguese translation: Rodrigo Real <rreal@ucpel.tche.br>
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index f0038b9708d..52b9348db26 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -1,6 +1,7 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+%   Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 08b21d4eddb..789bbaea92f 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -1,6 +1,7 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011  Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
+%   Free Software Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 % Czech translation: Jan Buchal <buchal@brailcom.cz>, January 1999
diff --git a/etc/tutorials/TUTORIAL.eo b/etc/tutorials/TUTORIAL.eo
index bd7849018db..f95f3317abf 100644
--- a/etc/tutorials/TUTORIAL.eo
+++ b/etc/tutorials/TUTORIAL.eo
@@ -1081,7 +1081,8 @@ la dosiero verkita de Stuart Cracraft por la originala Emakso.
 kopirajton, kaj venas kun permeso por disdoni kopiojn se certaj
 kondiĉoj estas observataj:
 
-   Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1999, 2001-2002, 2005, 2007-2011
+     Free Software Foundation, Inc.
 
    Ĉi tiu dosiero estas parto de "GNU Emacs".
  
@@ -1113,4 +1114,3 @@ kaj kompletigis Sergio B. Pokrovskij.
 ;;; Local Variables:
 ;;;   coding: latin-3
 ;;; End:
-