Mercurial > emacs
changeset 110667:a554263b06d4
Fix previous merge from Gnus trunk.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 01 Oct 2010 00:34:42 +0000 |
| parents | 3b9bd3888ee9 |
| children | 838ae151fca7 |
| files | doc/misc/ChangeLog lisp/ChangeLog |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Fri Oct 01 00:25:50 2010 +0000 +++ b/doc/misc/ChangeLog Fri Oct 01 00:34:42 2010 +0000 @@ -41,7 +41,7 @@ 2010-09-26 Julien Danjou <julien@danjou.info> - * gnus.texi (Oort Gnus): Remove mention of ssl.el + * gnus.texi (Oort Gnus): Remove mention of ssl.el. 2010-09-26 Lars Magne Ingebrigtsen <larsi@gnus.org> @@ -71,7 +71,7 @@ 2010-09-25 Julien Danjou <julien@danjou.info> - * gnus.texi (Customizing Articles): Remove gnus-treat-translate + * gnus.texi (Customizing Articles): Remove gnus-treat-translate. 2010-09-24 Glenn Morris <rgm@gnu.org>
--- a/lisp/ChangeLog Fri Oct 01 00:25:50 2010 +0000 +++ b/lisp/ChangeLog Fri Oct 01 00:34:42 2010 +0000 @@ -1,10 +1,10 @@ 2010-09-30 Lars Magne Ingebrigtsen <larsi@gnus.org> - * tls.el (tls-starttls-switches): New variable. + * net/tls.el (tls-starttls-switches): New variable. (tls-find-starttls-argument): Use it. (open-tls-stream): Ditto. -1 * netrc.el (netrc-credentials): Return the value of the "default" + * net/netrc.el (netrc-credentials): Return the value of the "default" entry. (netrc-machine): Ditto.