2006-03-27 Reiner Steib <Reiner.Steib@gmx.de>

	* sasl.texi: Use @copyright{} instead of (C).  Update copyright.

[ Merge from Emacs: ]

2006-03-27  Karl Berry  <karl@gnu.org>

	* gnus.texi, message.texi, emacs-mime.texi, sieve.texi, pgg.texi:
	Do not indent copyright year list.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index c032a8f..95d3800 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * sasl.texi: Use @copyright{} instead of (C).  Update copyright.
+
+2006-03-27  Karl Berry  <karl@gnu.org>
+
+       * gnus.texi, message.texi, emacs-mime.texi, sieve.texi, pgg.texi:
+       Do not indent copyright year list.
+
 2006-03-27  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-faq.texi: Use .invalid.

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

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 63a0b92..96f8752 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -9,8 +9,8 @@
 @documentencoding ISO-8859-1
 
 @copying
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/texi/pgg.texi b/texi/pgg.texi
index 0c21c99..f4fe0a0 100644 (file)
--- a/texi/pgg.texi
+++ b/texi/pgg.texi
@@ -6,10 +6,10 @@
 
 
 @copying
-This file describes the PGG.
+This file describes PGG, an Emacs interface to various PGP implementations.
 
-Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-Copyright (C) 2001 Daiki Ueno.
+Copyright @copyright{} 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2001 Daiki Ueno.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/texi/sasl.texi b/texi/sasl.texi
index 111d731..9cd465a 100644 (file)
--- a/texi/sasl.texi
+++ b/texi/sasl.texi
@@ -14,7 +14,8 @@
 @ifinfo
 This file describes the Emacs SASL library.
 
-Copyright (C) 2000 Daiki Ueno.
+Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2000 Daiki Ueno.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or

diff --git a/texi/sieve.texi b/texi/sieve.texi
index 2a4040d..34c554d 100644 (file)
--- a/texi/sieve.texi
+++ b/texi/sieve.texi
@@ -7,9 +7,10 @@
 @synindex pg cp
 
 @copying
-This file documents the Emacs Sieve package.
+This file documents the Emacs Sieve package, for server-side mail filtering.
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006 Free
+Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document