Documentation fixes.

svn path=/trunk/; revision=3421

3 files changed, 22 insertions, 21 deletions

diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index fb66cac3..f2e3b44e 100644
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -10,7 +10,7 @@
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2001/07/25 07:18:36 $
+<td width="30%" align=right>$Date: 2001/07/25 09:06:23 $
 </table>
 <HR>
 <H1>Frequently Asked Questions About Fetchmail</H1>
@@ -508,7 +508,7 @@ for AUTH=KERBEROS_V4 in the CAPABILITY response.
 <p>If you are fetching mail from a CompuServe POP3 account, you can use
 their RPA authentication (which works much like APOP).  See <a
 href="#S3">S3</a> for details.  If you are fetching mail from
-Microsoft Exchange, you will be able to use NTLM.
+Microsoft Exchange using IMAP, you will be able to use NTLM.
 
 <p>Your POP3 server may have the RFC1938 OTP capability to use one-time
 passwords (if it doesn't, you can get OTP patches for the 2.2 version
@@ -1376,10 +1376,11 @@ RFC-compliant server.  IMAP is alleged to work OK, though.
 
 <p>Older versions of Exchange are semi-usable.
 
-<p>Fetchmail supports the proprietary NTLM mode used with M$ Exchange
-servers. To enable this, configure fetchmail with the --enable-NTLM
-option and recompile it.  Note: if you specify a user option value
-that looks like `user@domain', the part to the left of the @ will
+
+<p>Fetchmail using IMAP supports the proprietary NTLM mode used with
+M$ Exchange servers. To enable this, configure fetchmail with the
+--enable-NTLM option and recompile it.  Specify a user option value
+that looks like `user@domain': the part to the left of the @ will
 be passed as the username and the part to the right as the NTLM domain.
 
 <p>M$ Exchange violates the POP3 RFCs.  Its LIST command does not reveal
@@ -1465,8 +1466,6 @@ our friends in Redmond.
 
 <ul>
 <li>
-Try giving fetchmail a username of "/NTDomain/NTUsername/MailboxName".
-<li>
 Get your administrator to configure the server so that
 usernames and mailbox names are the same.
 <li>
@@ -2880,7 +2879,7 @@ date from the last Received header.<p>
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2001/07/25 07:18:36 $
+<td width="30%" align=right>$Date: 2001/07/25 09:06:23 $
 </table>
 
 <ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@thyrsus.com&gt;</A></ADDRESS>
diff --git a/fetchmail-features.html b/fetchmail-features.html
index 75c07875..be38896f 100644
--- a/fetchmail-features.html
+++ b/fetchmail-features.html
@@ -10,7 +10,7 @@
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2001/06/05 06:57:54 $
+<td width="30%" align=right>$Date: 2001/07/25 09:06:23 $
 </table>
 <HR>
 
@@ -85,7 +85,7 @@ regulatory policy, hooks for Secure Sockets Layer (SSL) are now part
 of the main fetchmail distribution.  The distribution still contains
 no actual cryptographic code.
 
-<LI>NTLM support, so fetchmail can query Microsoft Exchange servers.
+<LI>NTLM support under IMAP, so fetchmail can query Microsoft Exchange servers.
 
 <LI>Expunge option can now be used to break POP3 retrieval into subsessions. 
 
@@ -248,7 +248,7 @@ get-mail, gwpop, pimp-1.0, pop-perl5-1.2, popc, popmail-1.6 and upop.
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2001/06/05 06:57:54 $
+<td width="30%" align=right>$Date: 2001/07/25 09:06:23 $
 </table>
 
 <P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>
diff --git a/fetchmail.man b/fetchmail.man
index 56729900..00f2072d 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -776,13 +776,13 @@ compile in the support, \fIfetchmail\fR will try to perform an RPA pass-phrase
 authentication instead of sending over the password en clair if it
 detects "@compuserve.com" in the hostname.
 .PP
-Microsoft's NTLM authentication (used by Microsoft Exchange) is
-supported. If you compile in the support, \fIfetchmail\fR will try to
-perform an NTLM authentication (instead of sending over the
+If you are using IMAP, Microsoft's NTLM authentication (used by Microsoft
+Exchange) is supported. If you compile in the support, \fIfetchmail\fR
+will try to perform an NTLM authentication (instead of sending over the
 password en clair) whenever the server returns AUTH=NTLM in its
-capability response.  Note: if you specify a user option value
-that looks like `user@domain', the part to the left of the @ will
-be passed as the username and the part to the right as the NTLM domain.
+capability response. Specify a user option value that looks like
+`user@domain': the part to the left of the @ will be passed as the
+username and the part to the right as the NTLM domain.
 .PP
 If you are using IPsec, the -T (--netsec) option can be used to pass
 an IP security request to be used when outgoing IP connections are
@@ -1242,7 +1242,7 @@ T}
 port    	-P	T{
 Specify TCP/IP service port
 T}
-auth[enticate]	-A	T{
+auth[enticate]	\&	T{
 Set authentication type (default `password')
 T}
 timeout  	-t	T{
@@ -1671,13 +1671,15 @@ Legal protocol identifiers for use with the `protocol' keyword are:
     kpop (or KPOP)
 
 .PP
-Legal authentication types are `password', `kerberos', and `gssapi'.
+Legal authentication types are `any', `password', `kerberos', 'kereberos_v5' 
+and `gssapi', `cram-md5', `otp', `ntlm', `ssh`.
 The `password' type specifies authentication by normal transmission of a
 password (the password may be plaintext or subject to
 protocol-specific encryption as in APOP); `kerberos' tells
 \fIfetchmail\fR to try to get a Kerberos ticket at the start of each
 query instead, and send an arbitrary string as the password; and
-`gssapi' tells fetchmail to use GSSAPI authentication.
+`gssapi' tells fetchmail to use GSSAPI authentication.  See the description
+of the `auth' keyword for more.
 .PP
 Specifying `kpop' sets POP3 protocol over port 1109 with Kerberos V4
 authentication.  These defaults may be overridden by later options.