Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 1006, 1009)

   - Merge from emacs--rel--22
   - Merge from gnus--devo--0

 * emacs--rel--22  (patch 181, 189, 193)

   - Update from CVS
   - Merge from gnus--rel--5.10

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-447

diff --git a/etc/images/mail/README b/etc/images/mail/README
index 8318334..962206e 100644 (file)
--- a/etc/images/mail/README
+++ b/etc/images/mail/README
@@ -1,7 +1,7 @@
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
 The following icons are from GNOME 2.x. They are not part of Emacs,
-but distributed and used by Emacs.  They are licensed under the
+but are distributed and used by Emacs.  They are licensed under the
 GNU General Public License version 2 or later.  See the source of the
 gnome-icons-theme package for more information.
 

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index bd432e3..77c51da 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -10,7 +10,7 @@
 This file documents the Emacs MIME interface functionality.
 
 Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi
index 8f0280c..a626c20 100644 (file)
--- a/texi/gnus-faq.texi
+++ b/texi/gnus-faq.texi
@@ -1,7 +1,8 @@
 @c \input texinfo @c -*-texinfo-*-
 @c Uncomment 1st line before texing this file alone.
 @c %**start of header
-@c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+@c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+@c   2008 Free Software Foundation, Inc.
 @c
 @c Do not modify this file, it was generated from gnus-faq.xml, available from
 @c <URL:http://my.gnus.org/FAQ/>.

diff --git a/texi/pgg.texi b/texi/pgg.texi
index f49e279..ba0fae8 100644 (file)
--- a/texi/pgg.texi
+++ b/texi/pgg.texi
@@ -8,8 +8,8 @@
 @copying
 This file describes PGG, an Emacs interface to various PGP implementations.
 
-Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007  Free Software
-Foundation, Inc.
+Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007, 2008
+Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/texi/sieve.texi b/texi/sieve.texi
index 0f8b76a..532c964 100644 (file)
--- a/texi/sieve.texi
+++ b/texi/sieve.texi
@@ -9,7 +9,7 @@
 @copying
 This file documents the Emacs Sieve package, for server-side mail filtering.
 
-Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 Free Software Foundation, Inc.
 
 @quotation