Synch with Emacs trunk.

2010-05-20  Kevin Ryde  <user42@zip.com.au>
 * gnus-start.el (gnus-level-unsubscribed): Doc fix.  (Bug#6206)

2010-05-19  Michael Albinus  <michael.albinus@gmx.de>
 * password-cache.el (password-cache-remove): Fix docstring.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b04871..a8fee12 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-20  Kevin Ryde  <user42@zip.com.au>
+
+       * gnus-start.el (gnus-level-unsubscribed): Doc fix.  (Bug#6206)
+
+2010-05-19  Michael Albinus  <michael.albinus@gmx.de>
+
+       * password-cache.el (password-cache-remove): Fix docstring.
+
 2010-05-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-sum.el (gnus-summary-save-article): Don't bother to re-fetch

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index ff51530..9ef251f 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -181,7 +181,7 @@ Groups with levels less than `gnus-level-subscribed', which
 should be less than this variable, are subscribed.  Groups with
 levels from `gnus-level-subscribed' (exclusive) upto this
 variable (inclusive) are unsubscribed.  See also
-`gnus-level-zombie', `gnus-level-killed' and the Info node `Group
+`gnus-level-zombie', `gnus-level-killed' and the Info node `(gnus)Group
 Levels' for details.")
 
 (defconst gnus-level-zombie 8

diff --git a/lisp/password-cache.el b/lisp/password-cache.el
index 126205a..7c07642 100644 (file)
--- a/lisp/password-cache.el
+++ b/lisp/password-cache.el
@@ -105,7 +105,7 @@ remove incorrect ones from the cache."
 
 (defun password-cache-remove (key)
   "Remove password indexed by KEY from password cache.
-This is typically run be a timer setup from `password-cache-add',
+This is typically run by a timer setup from `password-cache-add',
 but can be invoked at any time to forcefully remove passwords
 from the cache.  This may be useful when it has been detected
 that a password is invalid, so that `password-read' query the