summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2011-07-05 22:27:16 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-07-05 22:27:16 +0000
commitd30dd079c92097ac9eee48d574ce609da778b50f (patch)
treecac68c7b7f6811d28ccd8257459c2ca50ea6a7a7 /doc
parent0e4260bf5d321e16e1a0261b10a6305ac06819ff (diff)
downloademacs-d30dd079c92097ac9eee48d574ce609da778b50f.tar.gz
Merge changes made in Gnus trunk.
gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks. nnir.el (nnir-notmuch-program, nnir-notmuch-additional-switches, nnir-notmuch-remove-prefix, nnir-engines, nnir-run-notmuch): New nnir `notmuch' backend. mm-decode.el (mm-text-html-renderer): Doc fix. gnus-msg.el (gnus-bug): Fix the MML tag. pop3.el (pop3-open-server): -ERR is a valid response to CAPA. gnus-start.el (gnus-get-unread-articles): Don't connect to the secondary methods if started with `gnus-no-server'. gnus-group.el (gnus-read-ephemeral-bug-group): Allow fetching several bug reports at once.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/gnus.texi6
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e388b54b7c2..f6a6c396ef4 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-05 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks.
+
2011-07-04 Michael Albinus <michael.albinus@gmx.de>
* tramp.texi (Cleanup remote connections): Add
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 3bce492d831..c9206363a9b 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -15648,14 +15648,16 @@ will remain on your system until hell freezes over. This bears
repeating one more time, with some spurious capitalizations: IF you do
NOT mark articles as EXPIRABLE, Gnus will NEVER delete those ARTICLES.
+@vindex gnus-auto-expirable-marks
You do not have to mark articles as expirable by hand. Gnus provides
two features, called ``auto-expire'' and ``total-expire'', that can help you
with this. In a nutshell, ``auto-expire'' means that Gnus hits @kbd{E}
for you when you select an article. And ``total-expire'' means that Gnus
considers all articles as expirable that are read. So, in addition to
the articles marked @samp{E}, also the articles marked @samp{r},
-@samp{R}, @samp{O}, @samp{K}, @samp{Y} and so on are considered
-expirable.
+@samp{R}, @samp{O}, @samp{K}, @samp{Y} (and so on) are considered
+expirable. @code{gnus-auto-expirable-marks} has the full list of
+these marks.
When should either auto-expire or total-expire be used? Most people
who are subscribed to mailing lists split each list into its own group