summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGnus developers <ding@gnus.org>2011-02-15 11:24:37 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-02-15 11:24:37 +0000
commit5415d0766d91aa8ab4dcedc6f7dd0b85edc915a3 (patch)
tree603a3a33dbbff9e2fb8d2145e94957f1a08a7bd4 /doc
parentc5ca3aa00840c5dfa0aa7eeb8483ea077e5577bc (diff)
downloademacs-5415d0766d91aa8ab4dcedc6f7dd0b85edc915a3.tar.gz
Merge changes made in Gnus trunk.
auth.texi (Help for users): Login collection is "Login" and not "login". gnus-sum.el (gnus-propagate-marks): Default to nil. (gnus-summary-exit): Kill the correct article buffer on exit from a `C-d' group. gnus-start.el (gnus-use-backend-marks): Removed, since it duplicates gnus-propagate-marks. gnus-sum.el (gnus-summary-exit-no-update): Restore the group conf before killing the buffers so that a non-full window conf gets handled correctly. (gnus-summary-exit): Ditto. (gnus-summary-read-group-1): Ditto. nntp.el (nntp-retrieve-group-data-early): Reinstate the two-part async code again so that we can debug it properly. message.el (message-reply): Take an optional switch-buffer parameter so that Gnus window confs are respected better. auth-source.el (auth-source-secrets-search): Use `delete-dups', `append mapcar', and `butlast' instead of `remove-duplicates', `mapcan', and `subseq'. (auth-sources, auth-source-backend-parse, auth-source-secrets-search): Login collection is "Login" and not "login". gnus-art.el (article-update-date-lapsed): Don't bug out when updating multiple headers.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog6
-rw-r--r--doc/misc/auth.texi4
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 20463724c79..34096144066 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -3,6 +3,10 @@
Merge from gnulib.
* texinfo.tex: Update to version 2011-02-14.11.
+2011-02-14 Teodor Zlatanov <tzz@lifelogs.com>
+
+ * auth.texi (Help for users): Login collection is "Login" and not "login".
+
2011-02-13 Michael Albinus <michael.albinus@gmx.de>
* tramp.texi (History): Remove IMAP support.
@@ -21,7 +25,7 @@
* sc.texi (Getting Connected): Remove old index entries.
-2011-02-12 Ulrich Mueller <ulm@gentoo.org>
+2011-02-12 Ulrich Mueller <ulm@gentoo.org>
* url.texi: Remove duplicate @dircategory (Bug#7942).
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 2541dba9873..020c582305c 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -161,8 +161,8 @@ and simplest configuration is:
(setq auth-sources '((:source "~/.authinfo.gpg")))
;;; even shorter and the @emph{default}:
(setq auth-sources '("~/.authinfo.gpg" "~/.authinfo"))
-;;; use the Secrets API @var{login} collection (@pxref{Secret Service API})
-(setq auth-sources '("secrets:login"))
+;;; use the Secrets API @var{Login} collection (@pxref{Secret Service API})
+(setq auth-sources '("secrets:Login"))
@end lisp
By adding multiple entries to @code{auth-sources} with a particular