diff options
| author | Gnus developers <ding@gnus.org> | 2011-07-05 22:27:16 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-07-05 22:27:16 +0000 |
| commit | d30dd079c92097ac9eee48d574ce609da778b50f (patch) | |
| tree | cac68c7b7f6811d28ccd8257459c2ca50ea6a7a7 /lisp/gnus/mm-decode.el | |
| parent | 0e4260bf5d321e16e1a0261b10a6305ac06819ff (diff) | |
| download | emacs-d30dd079c92097ac9eee48d574ce609da778b50f.tar.gz emacs-d30dd079c92097ac9eee48d574ce609da778b50f.tar.bz2 emacs-d30dd079c92097ac9eee48d574ce609da778b50f.zip | |
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 'lisp/gnus/mm-decode.el')
| -rw-r--r-- | lisp/gnus/mm-decode.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index f543920446b..a51c6630ac5 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/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) |