[Emacs-diffs] /srv/bzr/emacs/trunk r101695: Fix previous merge from Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101695
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-01 00:34:42 +0000
message:
  Fix previous merge from Gnus trunk.
modified:
  doc/misc/ChangeLog
  lisp/ChangeLog

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-10-01 00:25:50 +0000
+++ b/doc/misc/ChangeLog        2010-10-01 00:34:42 +0000
@@ -41,7 +41,7 @@
 
 2010-09-26  Julien Danjou  <address@hidden>
 
-       * gnus.texi (Oort Gnus): Remove mention of ssl.el
+       * gnus.texi (Oort Gnus): Remove mention of ssl.el.
 
 2010-09-26  Lars Magne Ingebrigtsen  <address@hidden>
 
@@ -71,7 +71,7 @@
 
 2010-09-25  Julien Danjou  <address@hidden>
 
-       * gnus.texi (Customizing Articles): Remove gnus-treat-translate
+       * gnus.texi (Customizing Articles): Remove gnus-treat-translate.
 
 2010-09-24  Glenn Morris  <address@hidden>
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-01 00:25:50 +0000
+++ b/lisp/ChangeLog    2010-10-01 00:34:42 +0000
@@ -1,10 +1,10 @@
 2010-09-30  Lars Magne Ingebrigtsen  <address@hidden>
 
-       * 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.