2 files changed, 16 insertions, 3 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 89e16eaa308..9761e599d8f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Customizing the IMAP Connection): Remove nnir mention,
+        since that works by default.
+
+2010-11-03  Kan-Ru Chen  <kanru@kanru.info>  (tiny change)
+
+        * gnus.texi (Customizing the IMAP Connection): Document
+        `nnimap-expunge' and remove `nnimap-expunge-inbox' from example.
+
 2010-11-04  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Remote shell setup): New item "Interactive shell
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index eccef851980..8709635a58b 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -14845,9 +14845,7 @@ Here's an example method that's more complex:
         (nnimap-inbox "INBOX")
         (nnimap-split-methods default)
         (nnimap-expunge t)
-        (nnimap-stream ssl)
-        (nnir-search-engine imap)
-        (nnimap-expunge-inbox t))
+        (nnimap-stream ssl))
 @end example
 
 @table @code
@@ -14883,6 +14881,11 @@ what you need.
 Some @acronym{IMAP} servers allow anonymous logins.  In that case,
 this should be set to @code{anonymous}.
 
+@item nnimap-expunge
+If non-@code{nil}, expunge articles after deleting them.  This is always done
+if the server supports UID EXPUNGE, but it's not done by default on
+servers that doesn't support that command.
+
 @item nnimap-streaming
 Virtually all @code{IMAP} server support fast streaming of data.  If
 you have problems connecting to the server, try setting this to @code{nil}.