* tramp.texi (History): Remove IMAP support.

(External methods, Frequently Asked Questions): Remove `imap' and
`imaps' methods.
(Password handling): Remove IMAP entries for ~/.authinfo.gpg.

* trampver.texi: Remove default value of `emacsimap'.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 40fa427c4e065dc85528647798aee693798f3fbd..684fe9c468f24c5c49cb47b0ce3b48a14efc2f7d 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-13  Michael Albinus  <michael.albinus@gmx.de>
+
+       * tramp.texi (History): Remove IMAP support.
+       (External methods, Frequently Asked Questions): Remove `imap' and
+       `imaps' methods.
+       (Password handling): Remove IMAP entries for ~/.authinfo.gpg.
+
+       * trampver.texi: Remove default value of `emacsimap'.
+
 2011-02-13  Glenn Morris  <rgm@gnu.org>
 
        * ada-mode.texi, dired-x.texi, ebrowse.texi, ediff.texi, eudc.texi:

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 6095d83d48427e103ee8692e1fce9d96fdb25224..994a8f9967666d63b2a45c833ae8da893406fcb2 100644 (file)
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -443,9 +443,6 @@ Support of gateways exists since April 2007.
 @ifset emacsgvfs
 GVFS integration started in February 2009.
 @end ifset
-@ifset emacsimap
-Storing files into IMAP mailboxes has been added in September 2009.
-@end ifset
 
 In December 2001, @value{tramp} has been added to the XEmacs package
 repository.  Being part of the GNU Emacs repository happened in June
@@ -1012,29 +1009,6 @@ Windows, this method isn't available.  Instead, you can use UNC
 file names like @file{//melancholia/daniel$$/.emacs}.  The only
 disadvantage is that there's no possibility to specify another user
 name.
-
-
-@ifset emacsimap
-@item @option{imap}
-@cindex method imap
-@cindex method imaps
-@cindex imap method
-@cindex imaps method
-
-Accessing an IMAP mailbox is intended to save files there as encrypted
-messages.  It could be used in case there are no other remote file
-storages available.
-
-@value{tramp} supports both @option{imap} and @option{imaps} methods.
-The latter one accesses the IMAP server over ssl.
-
-Both methods support the port number specification.
-
-Note that special handling is needed for declaring a passphrase for
-encryption / decryption of the messages (@pxref{Using an
-authentication file}).
-
-@end ifset
 @end table
 
 
@@ -1625,18 +1599,6 @@ The port can be any @value{tramp} method (@pxref{Inline methods},
 @pxref{External methods}), to match only this method.  When you omit
 the port, you match all @value{tramp} methods.
 
-@ifset emacsimap
-A special case are @option{imap}-like methods.  Authentication with
-the IMAP server is performed via @file{imap.el}, there is no special
-need from @value{tramp} point of view.  An additional passphrase, used
-for symmetric encryption and decryption of the stored messages, should
-be given with the special port indication @option{tramp-imap}:
-
-@example
-machine melancholia port tramp-imap login daniel password ultrageheim
-@end example
-@end ifset
-
 @anchor{Caching passwords}
 @subsection Caching passwords
 
@@ -2782,9 +2744,9 @@ The package has been used successfully on GNU Emacs 22, GNU Emacs 23,
 XEmacs 21 (starting with 21.4), and SXEmacs 22.
 
 The package was intended to work on Unix, and it really expects a
-Unix-like system on the remote end (except the @option{smb} and
-@option{imap} methods), but some people seemed to have some success
-getting it to work on MS Windows XP/Vista/7 @value{emacsname}.
+Unix-like system on the remote end (except the @option{smb} method),
+but some people seemed to have some success getting it to work on MS
+Windows XP/Vista/7 @value{emacsname}.
 
 
 @item

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index c3e767bd2288bc12277263cfc1ff72a8dee25705..2968642bcc2462691fc471108bd492fcd71e9223 100644 (file)
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -28,11 +28,6 @@
 @set emacsgw
 @end ifclear
 
-@c Whether or not describe IMAP support.
-@ifclear noemacsimap
-@set emacsimap
-@end ifclear
-
 @c Some flags which make the text independent on the (X)Emacs flavor.
 @c "emacs" resp "xemacs" are set in the Makefile.  Default is "emacs".
 @ifclear emacs