From 47e088962f2a6a925d8066e4a2722635deda7c97 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Fri, 1 Oct 2010 00:34:42 +0000 Subject: [PATCH] Fix previous merge from Gnus trunk. --- doc/misc/ChangeLog | 4 ++-- lisp/ChangeLog | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 96522da7343..d40d2f7c397 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -41,7 +41,7 @@ 2010-09-26 Julien Danjou - * gnus.texi (Oort Gnus): Remove mention of ssl.el + * gnus.texi (Oort Gnus): Remove mention of ssl.el. 2010-09-26 Lars Magne Ingebrigtsen @@ -71,7 +71,7 @@ 2010-09-25 Julien Danjou - * gnus.texi (Customizing Articles): Remove gnus-treat-translate + * gnus.texi (Customizing Articles): Remove gnus-treat-translate. 2010-09-24 Glenn Morris diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b93b34a4fcb..07dbc824cd5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,10 +1,10 @@ 2010-09-30 Lars Magne Ingebrigtsen - * 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. -- 2.39.5