Merge from gnus--devo--0

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

3 files changed, 23 insertions, 7 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 0da88c2d8ad..0e83e083383 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * message.texi (Sending Variables): Added `message-confirm-send' doc.
+
+2008-09-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (The Gnus Registry): Don't give argument to @item used in
+        @enumerate section so as to be able to be formatted with MAKEINFO=no.
+
 2008-09-22  Bill Wohler  <wohler@newt.com>
 
         Release MH-E manual version 8.1.
@@ -9,7 +18,7 @@
         However, bump GPL to Version 3.
         Use @include for license text.
 
-2008-09-19  Katsumi Yamaoka <yamaoka@jpl.org>
+2008-09-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus.texi (Top, Setup, Fancy splitting to parent)
         (Store custom flags and keywords, Store arbitrary data): Clean up
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index cf6d65282a8..672fda1fb5d 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -26506,7 +26506,6 @@ Save table: (spam-stat-save)
 
 @node The Gnus Registry
 @section The Gnus Registry
-
 @cindex registry
 @cindex split
 @cindex track
@@ -26521,26 +26520,29 @@ Although they will be explained in detail shortly, here's a quick list
 of said features in case your attention span is...  never mind.
 
 @enumerate
+@item
+Split messages to their parent
 
-@item Split messages to their parent
 This keeps discussions in the same group.  You can use the subject and
 the sender in addition to the Message-ID.  Several strategies are
 available.
 
-@item Store custom flags and keywords
+@item
+Store custom flags and keywords
+
 The registry can store custom flags and keywords for a message.  For
 instance, you can mark a message ``To-Do'' this way and the flag will
 persist whether the message is in the nnimap, nnml, nnmaildir,
 etc. backends.
 
-@item Store arbitrary data
+@item
+Store arbitrary data
+
 Through a simple ELisp API, the registry can remember any data for a
 message.  A built-in inverse map, when activated, allows quick lookups
 of all messages matching a particular set of criteria.
-
 @end enumerate
 
-
 @menu
 * Setup::                       
 * Fancy splitting to parent::   
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 02bf0f49856..353089da264 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -2223,6 +2223,11 @@ non-@code{nil}, attach local files as external parts.
 If non-@code{nil} wait for and display errors when sending a message;
 if @code{nil} let the mailer mail back a message to report errors.
 
+@item message-confirm-send
+@vindex message-confirm-send
+If non-@code{nil} display a y/n prompt before actually sending the
+message.
+
 @end table