diff options
| author | Gnus developers <[email protected]> | 2010-10-10 00:15:21 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <[email protected]> | 2010-10-10 00:15:21 +0000 |
| commit | f7aa248a5b1ce15ac2a3b70b4a55833d9d1eb44b (patch) | |
| tree | b99adc70fa490b39906ab483b5478066d81d149a /doc | |
| parent | e836e5cd0462864de01c9873a327169f7706bd3a (diff) | |
Merge changes made in Gnus trunk.
nnimap.el (nnimap-open-connection): If we have gnutls loaded, then try to use that for the tls stream.
nnimap.el (nnimap-retrieve-group-data-early): Rework the marks code to heed UIDVALIDITY and find out which groups are read-only and not.
nnimap.el (nnimap-get-flags): Use the same marks parsing code as the rest of nnimap.
nnimap.el (nnmail-expiry-target-group): Say that every expiry target group is the "last".
nnir.el (nnir-engines): Fix too many arguments.
nnimap.el: Start implementing QRESYNC support.
gnus.el (gnus-group-set-parameter): Fix typo.
shr.el: Rework the way things are indented by <li> slightly.
spam.el (gnus-summary-mode-map): Bind to "$".
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/gnus.texi | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index b3c52d5c36..d54b3875ed 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-09 Lars Magne Ingebrigtsen <[email protected]> + + * gnus.texi (Spam Package Introduction): Mention `$'. + 2010-10-09 Eli Zaretskii <[email protected]> * makefile.w32-in (emacsdir): New variable. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 4b3defaa4a..1a1f0d48eb 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -23750,12 +23750,14 @@ yourself, so that the message is processed as spam when you exit the group: @table @kbd -@item M-d +@item $ +@itemx M-d @itemx M s x @itemx S x -@kindex M-d -@kindex S x -@kindex M s x +@kindex $ (Summary) +@kindex M-d (Summary) +@kindex S x (Summary) +@kindex M s x (Summary) @findex gnus-summary-mark-as-spam @findex gnus-summary-mark-as-spam Mark current article as spam, showing it with the @samp{$} mark |