Changes committed gnus/texi (8 files)
"Miles Bader" <[email protected]> Tue, 17 Jun 2008 23:37:01 +0200
| Newsgroups | gmane.emacs.gnus.commits |
|---|---|
| Message-ID | <[email protected]> |
Modified: ChangeLog emacs-mime.texi gnus-coding.texi gnus.texi
message.texi pgg.texi sasl.texi sieve.texi
Merge from emacs--devo--0, emacs--rel--22
Patches applied:
* emacs--devo--0 (patch 1231, 1236, 1242, 1244-1245, 1253)
- Merge from gnus--devo--0
- Update from CVS
- Remove unneeded Gnus ChangeLog entries
* emacs--rel--22 (patch 276)
- Merge from gnus--rel--5.10
2008-06-16 Glenn Morris <[email protected]>
* texi/pgg.texi, texi/sasl.texi: Add Cover-Texts.
2008-06-15 Glenn Morris <[email protected]>
* texi/sasl.texi: Refer to license in Emacs manual.
* texi/gnus-coding.texi: Refer to license in Gnus manual.
* texi/emacs-mime.texi, texi/gnus.texi, texi/message.texi, texi/sieve.texi:
Remove references to external license, since doclicense is included.
2008-06-13 Glenn Morris <[email protected]>
* texi/emacs-mime.texi, texi/gnus-coding.texi, texi/gnus.texi, texi/message.texi
* texi/sieve.texi: Update Back-Cover Text as per maintain.info.
Revision: [email protected]/gnus--devo--0--patch-514
Index: ChangeLog
diff -u gnus/texi/ChangeLog:7.413 gnus/texi/ChangeLog:7.414
--- ChangeLog:7.413 Tue Jun 17 04:36:37 2008
+++ ChangeLog Tue Jun 17 23:37:01 2008
@@ -1,3 +1,21 @@
+2008-06-16 Glenn Morris <[email protected]>
+
+ * pgg.texi, sasl.texi: Add Cover-Texts.
+
+2008-06-15 Glenn Morris <[email protected]>
+
+ * sasl.texi: Refer to license in Emacs manual.
+
+ * gnus-coding.texi: Refer to license in Gnus manual.
+
+ * emacs-mime.texi, gnus.texi, message.texi, sieve.texi:
+ Remove references to external license, since doclicense is included.
+
+2008-06-13 Glenn Morris <[email protected]>
+
+ * emacs-mime.texi, gnus-coding.texi, gnus.texi, message.texi
+ * sieve.texi: Update Back-Cover Text as per maintain.info.
+
2008-06-15 Reiner Steib <[email protected]>
* gnus-faq.texi: Generate. Change node names to "FAQ N-M".
Index: emacs-mime.texi
diff -u gnus/texi/emacs-mime.texi:7.38 gnus/texi/emacs-mime.texi:7.39
--- emacs-mime.texi:7.38 Thu Jan 24 07:19:33 2008
+++ emacs-mime.texi Tue Jun 17 23:37:01 2008
@@ -16,19 +16,13 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below. A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below. A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software. Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License. If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual. Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
@end quotation
@end copying
Index: gnus-coding.texi
diff -u gnus/texi/gnus-coding.texi:1.14 gnus/texi/gnus-coding.texi:1.15
--- gnus-coding.texi:1.14 Sun Mar 2 16:07:22 2008
+++ gnus-coding.texi Tue Jun 17 23:37:01 2008
@@ -11,16 +11,16 @@
@quotation
Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with the Front-Cover texts being ``A GNU
Manual'', and with the Back-Cover Texts as in (a) below. A copy of the
license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
+License'' in the Gnus manual.
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software. Copies published by the Free
-Software Foundation raise funds for GNU development.''
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual. Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
This document is part of a collection distributed under the GNU Free
Documentation License. If you want to distribute this document
Index: gnus.texi
diff -u gnus/texi/gnus.texi:7.295 gnus/texi/gnus.texi:7.296
--- gnus.texi:7.295 Tue Jun 17 04:36:37 2008
+++ gnus.texi Tue Jun 17 23:37:01 2008
@@ -16,19 +16,13 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below. A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below. A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software. Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License. If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual. Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
@end quotation
@end copying
Index: message.texi
diff -u gnus/texi/message.texi:7.56 gnus/texi/message.texi:7.57
--- message.texi:7.56 Thu May 1 23:57:24 2008
+++ message.texi Tue Jun 17 23:37:01 2008
@@ -15,19 +15,13 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below. A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below. A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software. Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License. If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual. Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
@end quotation
@end copying
Index: pgg.texi
diff -u gnus/texi/pgg.texi:7.22 gnus/texi/pgg.texi:7.23
--- pgg.texi:7.22 Thu Jan 24 07:19:33 2008
+++ pgg.texi Tue Jun 17 23:37:01 2008
@@ -15,9 +15,13 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts. A copy of the license is included in the section entitled ``GNU
-Free Documentation License.''
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+and with the Back-Cover Texts as in (a) below. A copy of the license
+is included in the section entitled ``GNU Free Documentation License.''
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual. Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
@end quotation
@end copying
Index: sasl.texi
diff -u gnus/texi/sasl.texi:7.7 gnus/texi/sasl.texi:7.8
--- sasl.texi:7.7 Sun Jan 20 06:23:58 2008
+++ sasl.texi Tue Jun 17 23:37:01 2008
@@ -11,19 +11,31 @@
@settitle Emacs SASL Library @value{VERSION}
-@ifinfo
+@copying
This file describes the Emacs SASL library.
Copyright @copyright{} 2000, 2004, 2005, 2006, 2007, 2008
Free Software Foundation, Inc.
+@quotation
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts. A copy of the license is included in the section entitled "GNU
-Free Documentation License".
-@end ifinfo
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+and with the Back-Cover Texts as in (a) below. A copy of the license
+is included in the section entitled ``GNU Free Documentation License''
+in the Emacs manual.
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual. Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
+
+This document is part of a collection distributed under the GNU Free
+Documentation License. If you want to distribute this document
+separately from the collection, you can do so by adding a copy of the
+license to the document, as described in section 6 of the license.
+@end quotation
+@end copying
@tex
@@ -34,14 +46,7 @@
@page
@vskip 0pt plus 1filll
-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
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts. A copy of the license is included in the section entitled "GNU
-Free Documentation License".
+@insertcopying
@end titlepage
@page
Index: sieve.texi
diff -u gnus/texi/sieve.texi:7.13 gnus/texi/sieve.texi:7.14
--- sieve.texi:7.13 Thu Jan 24 07:19:33 2008
+++ sieve.texi Tue Jun 17 23:37:01 2008
@@ -16,19 +16,13 @@
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below. A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below. A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software. Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License. If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual. Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
@end quotation
@end copying