[gnus git] branch master updated: n0-17-166-g1df0dc4 =2= * gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks. ; * mm-decode.el (mm-text-html-renderer): Doc fix.

       via  1df0dc47f4fb731afe03347f65cd0358fca24ef7 (commit)
       via  409ace46cb71159f112cb72dc02b04f7644e2c52 (commit)
      from  d9f9d3c495cba8584a3e60dcd81675957ce23ac1 (commit)


- Log -----------------------------------------------------------------
commit 1df0dc47f4fb731afe03347f65cd0358fca24ef7
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Tue Jul 5 18:17:11 2011 +0200

    * gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index de0f9dc..478c793 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-05  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks.
+
 2011-07-03  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* gnus.texi (Subscription Methods): Link to "Group Levels" to explain
diff --git a/texi/gnus.texi b/texi/gnus.texi
index f500a2e..e6f5d6b 100644
--- a/texi/gnus.texi
+++ b/texi/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

commit 409ace46cb71159f112cb72dc02b04f7644e2c52
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Tue Jul 5 18:13:46 2011 +0200

    * mm-decode.el (mm-text-html-renderer): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea48965..5a093c0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-07-05  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* 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.
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index f543920..a51c663 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -114,14 +114,14 @@
   "Render of HTML contents.
 It is one of defined renderer types, or a rendering function.
 The defined renderer types are:
-`shr': use Gnus simple HTML renderer;
-`gnus-w3m' : use Gnus renderer based on w3m;
-`w3m'  : use emacs-w3m;
-`w3m-standalone': use w3m;
+`shr': use the built-in Gnus HTML renderer;
+`gnus-w3m': use Gnus renderer based on w3m;
+`w3m': use emacs-w3m;
+`w3m-standalone': use plain w3m;
 `links': use links;
-`lynx' : use lynx;
-`w3'   : use Emacs/W3;
-`html2text' : use html2text;
+`lynx': use lynx;
+`w3': use Emacs/W3;
+`html2text': use html2text;
 nil    : use external viewer (default web browser)."
   :version "24.1"
   :type '(choice (const shr)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog    |    2 ++
 lisp/mm-decode.el |   14 +++++++-------
 texi/ChangeLog    |    4 ++++
 texi/gnus.texi    |    6 ++++--
 4 files changed, 17 insertions(+), 9 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project