[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99751: Synch with Gnus trunk:

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 99751 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-04-16 03:27:09 +0000
message:
  Synch with Gnus trunk:
  (Score File Format): Fix typo.
  (Mail Group Commands): Add index entry.
  By Andreas Seltenreich <address@hidden>.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-04-15 07:34:28 +0000
+++ b/doc/misc/ChangeLog        2010-04-16 03:26:07 +0000
@@ -1,3 +1,8 @@
+2010-04-15  Andreas Seltenreich  <address@hidden>
+
+       * gnus.texi (Score File Format): Fix typo.  Reported by Štěpán Němec.
+       (Mail Group Commands): Add index entry.
+
 2010-04-15  Glenn Morris  <address@hidden>
 
        * info.texi (Search Index): Mention Emacs's Info-virtual-index.

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2010-01-21 09:05:08 +0000
+++ b/doc/misc/gnus.texi        2010-04-16 03:26:07 +0000
@@ -11315,6 +11315,7 @@
 
 @item B DEL
 @kindex B DEL (Summary)
address@hidden deleting mail
 @findex gnus-summary-delete-article
 @c @icon{gnus-summary-mail-delete}
 Delete the mail article.  This is ``delete'' as in ``delete it from your
@@ -21827,7 +21828,7 @@
 
 When you enter the group the first time, you will only see the new
 threads.  You then raise the score of the threads that you find
-interesting (with @kbd{I T} or @kbd{I S}), and ignore (@kbd{C y}) the
+interesting (with @kbd{I T} or @kbd{I S}), and ignore (@kbd{c y}) the
 rest.  Next time you enter the group, you will see new articles in the
 interesting threads, plus any new threads.