Merge from gnus--devo--0

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

3 files changed, 54 insertions, 14 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ef1a9ea569e..8015e54ebc3 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,36 @@
+2008-04-13  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Oort Gnus): Add message-fill-column.
+
+2008-04-12  Adrian Aichner  <adrian@xemacs.org>
+
+        * gnus.texi (Mail Source Specifiers): Typo fix.
+
+2008-04-12  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Diary Headers Generation): Update key binding for
+        `gnus-diary-check-message'.
+
+2008-04-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Emacsen): Addition.
+
+2008-04-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Emacsen): Give recommendations for Emacs 22 and Emacs 23.
+
+2008-04-09  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Oort Gnus): Mention customizing of tool bars.
+
+2008-04-09  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-news.texi: Update tool bar item.
+
+2008-04-09  Sven Joachim  <svenjoac@gmx.de>
+
+        * gnus-news.texi: Fix typos.
+
 2008-04-11  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc.texi (Vector and Matrix Arithmetic, Calc Summary):
diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi
index f611bee067e..db22c5b4193 100644
--- a/doc/misc/gnus-news.texi
+++ b/doc/misc/gnus-news.texi
@@ -32,10 +32,10 @@ file, where this release will store flags for nntp.  See a later entry
 for more information about nntp marks.  Note that downgrading isn't
 safe in general.
 
-@item Incompatibity when switching from Emacs 23 to Emacs 22 
+@item Incompatibility when switching from Emacs 23 to Emacs 22 
 In Emacs 23, Gnus uses Emacs' new internal coding system @code{utf-8-emacs}
-for saving articles drafts and @file{~/.newsrc.eld}.  These file may not
-be read correctly in Emacs 22 and below.  If you want to Gnus across
+for saving articles drafts and @file{~/.newsrc.eld}.  These files may not
+be read correctly in Emacs 22 and below.  If you want to use Gnus across
 different Emacs versions, you may set @code{mm-auto-save-coding-system}
 to @code{emacs-mule}.
 @c FIXME: Untested.  (Or did anyone test it?)
@@ -284,9 +284,8 @@ messages are deleted again).
 @itemize @bullet
 
 @item The tool bar has been updated to use GNOME icons.
-You can also customize the tool bar.  There's no documentation in the
-manual yet, but @kbd{M-x customize-apropos RET -tool-bar$} should get
-you started.  (Only for Emacs, not in XEmacs.)
+You can also customize the tool bars: @kbd{M-x customize-apropos RET
+-tool-bar$} should get you started.  (Only for Emacs, not in XEmacs.)
 @c FIXME: Document this in the manual
 
 @item The tool bar icons are now (de)activated correctly
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index e2bb06e6f2f..91811b5d20e 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -14576,7 +14576,7 @@ corresponding keywords.
 
 @item :mailbox
 The name of the mailbox to get mail from.  The default is @samp{INBOX}
-which normally is the mailbox which receive incoming mail.
+which normally is the mailbox which receives incoming mail.
 
 @item :predicate
 The predicate used to find articles to fetch.  The default, @samp{UNSEEN
@@ -18971,9 +18971,9 @@ needed.
 
   This function is hooked into the @code{nndiary} back end, so that
 moving or copying an article to a diary group will trigger it
-automatically.  It is also bound to @kbd{C-c D c} in @code{message-mode}
-and @code{article-edit-mode} in order to ease the process of converting
-a usual mail to a diary one.
+automatically.  It is also bound to @kbd{C-c C-f d} in
+@code{message-mode} and @code{article-edit-mode} in order to ease the
+process of converting a usual mail to a diary one.
 
   This function takes a prefix argument which will force prompting of
 all diary headers, regardless of their presence or validity.  That way,
@@ -26261,7 +26261,7 @@ know.
 @cindex Mule
 @cindex Emacs
 
-Gnus should work on:
+This version of Gnus should work on:
 
 @itemize @bullet
 
@@ -26278,6 +26278,8 @@ that.  Not reliably, at least.  Older versions of Gnus may work on older
 Emacs versions.  Particularly, Gnus 5.10.8 should also work on Emacs
 20.7 and XEmacs 21.1.
 
+@c No-merge comment: The paragraph added in v5-10 here must not be
+@c synced here!
 
 @node Gnus Development
 @subsection Gnus Development
@@ -27939,7 +27941,12 @@ controls this.
 @item You can now drag and drop attachments to the Message buffer.
 See @code{mml-dnd-protocol-alist} and @code{mml-dnd-attach-options}.
 @xref{MIME, ,MIME, message, Message Manual}.
-@c New in 5.10.9 / 5.11
+@c New in 5.10.9 / 5.11 (Emacs 21.1)
+
+@item @code{auto-fill-mode} is enabled by default in Message mode.
+See @code{message-fill-column}.  @xref{Various Message Variables, ,
+Message Headers, message, Message Manual}.
+@c New in Gnus 5.10.12 / 5.11 (Emacs 22.3)
 
 @end itemize
 
@@ -27992,8 +27999,9 @@ message, Message Manual}).
 
 @item
 The tool bars have been updated to use GNOME icons in Group, Summary and
-Message mode.  You can also customize the tool bars.  This is a new
-feature in Gnus 5.10.9.  (Only for Emacs, not in XEmacs.)
+Message mode.  You can also customize the tool bars: @kbd{M-x
+customize-apropos RET -tool-bar$} should get you started.  This is a new
+feature in Gnus 5.10.10.  (Only for Emacs, not in XEmacs.)
 
 @item The tool bar icons are now (de)activated correctly
 in the group buffer, see the variable @code{gnus-group-update-tool-bar}.