Synch to No Gnus 200408171427.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81f0aa6..79f92a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-17  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * nnimap.el (nnimap-open-connection): add 'imaps' synonym to
+       'imap' for netrc parsing
+
 2004-08-16  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * mailcap.el (mailcap-mime-data): Mark as risky.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 4477604..eecdc9a 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -762,7 +762,12 @@ If EXAMINE is non-nil the group is selected read-only."
                      (netrc-machine list
                                     (or nnimap-server-address
                                         nnimap-address)
-                                    port "imap")))
+                                    port "imap")
+                     (netrc-machine list server port "imaps")
+                     (netrc-machine list
+                                    (or nnimap-server-address
+                                        nnimap-address)
+                                    port "imaps")))
           (user (netrc-get alist "login"))
           (passwd (netrc-get alist "password")))
       (if (imap-authenticate user passwd nnimap-server-buffer)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 2755387..dc720a4 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-17  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * gnus.texi (IMAP): add comments about imaps synonym to imap in
+       netrc syntax
+
 2004-08-15  Simon Josefsson  <jas@extundo.com>
 
        * gnus.texi (IMAP): Add example.  Suggested and partially written

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index d120243..43577c6 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -15547,10 +15547,11 @@ nnimap \e$B$K5-;v$NFbItE*$JF|IU$NBe$o$j$K\e(B Date: \e$B$r;H$&$h$&$K$5$;$^$9!#$5$i$
 machine students.uio.no login larsi password geheimnis port imap
 @end example
 
-\e$B0BA4$J\e(B imap \e$B$G;H$o$l$k<B:]$N%]!<%HHV9f$O\e(B port 993 \e$B$G$9$,!"\e(B
+\e$B0BA4$J\e(B IMAP \e$B$G;H$o$l$k<B:]$N%]!<%HHV9f$O\e(B port 993 \e$B$G$9$,!"\e(B
 @code{nnimap-stream} \e$B$H$7$F\e(B @code{tls} \e$B$^$?$O\e(B @code{ssl} \e$B$r;H$&>l9g!"$=\e(B
 \e$B$l$O\e(B @code{port imap} \e$B$^$?$O\e(B @code{port 143} \e$B$G$J$1$l$P$J$i$J$$$3$H$KCm\e(B
-\e$B0U$7$F2<$5$$!#\e(B
+\e$B0U$7$F2<$5$$!#JX59>e\e(B Gnus \e$B$O\e(B @code{port imap} \e$B$NF15A8l$H$7\e(B
+\e$B$F\e(B @code{port imaps} \e$B$r<u$1F~$l$^$9!#\e(B
 
 @item nnimap-need-unselect-to-notice-new-mail
 @vindex nnimap-need-unselect-to-notice-new-mail

diff --git a/texi/gnus.texi b/texi/gnus.texi
index cf8edb9..2f1a30a 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -16376,7 +16376,9 @@ machine students.uio.no login larsi password geheimnis port imap
 
 Note that it should be @code{port imap}, or @code{port 143}, if you
 use a @code{nnimap-stream} of @code{tls} or @code{ssl}, even if the
-actual port number used is port 993 for secured imap.
+actual port number used is port 993 for secured IMAP.  For
+convenience, Gnus will accept @code{port imaps} as a synonym of
+@code{port imap}.
 
 @item nnimap-need-unselect-to-notice-new-mail
 @vindex nnimap-need-unselect-to-notice-new-mail