fix what danw said was wrong.

2002-02-12  Aaron Weber  <aaron@ximian.com>

	* usage-mainwindow.sgml: fix what danw said was wrong.

	* usage-exchange.sgml: fix what danw said was wrong.

svn path=/trunk/; revision=15690

3 files changed, 40 insertions, 69 deletions

diff --git a/help/C/.cvsignore b/help/C/.cvsignore
index d124a07e3e..282522db03 100644
--- a/help/C/.cvsignore
+++ b/help/C/.cvsignore
@@ -1,9 +1,2 @@
 Makefile
 Makefile.in
-*.log
-*.ps
-*.dvi
-*.tex
-evolution
-index.html
-omf_timestamp
diff --git a/help/C/usage-exchange.sgml b/help/C/usage-exchange.sgml
index 2a46d6adc5..b87aee9cdc 100644
--- a/help/C/usage-exchange.sgml
+++ b/help/C/usage-exchange.sgml
@@ -353,10 +353,9 @@ There are, however, some features which are not available:
 		  </listitem>
 		  <listitem>
 		    <para>
-                     Enter the name of your Exchange email
-                     server, and the username with which you log in
-                     (normally, this is the part of your email address
-                     before the @).
+                     Enter the name of your Exchange email server, and
+                     the user name you would use to log in to a
+                     Windows workstation in your organization.
                    </para>
 		  </listitem>
 		    <listitem>
@@ -364,22 +363,13 @@ There are, however, some features which are not available:
                       If you wish, select the box labelled
                       <guilabel>Use secure connection
                       (SSL)</guilabel>, to take advantage of a more
-                      secure connection method. If your server
-                      supports it, it is generally recommended to use
-                      SSL.
+                      secure connection method. This may allow you to
+                      connect to the server from outside your
+                      firewall.
                    </para>
 		  </listitem>
 		  <listitem>
 		    <para>
-                      Some servers support multiple authentication
-                      methods.  If your system administrator has asked
-                      that you use one in particular, select it now.
-                      Otherwise, just use
-                      <guilabel>Password</guilabel>.
-                    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
                        If you would like
                        <application>Evolution</application> to
                        remember your password, check the box labelled
@@ -405,33 +395,22 @@ There are, however, some features which are not available:
 		  </listitem>
 		  <listitem>
 		    <para>
-                      Exchange Server: If your exchange server stores
-                      your folders under a different name from your
-                      login username, select the checkbox and enter
-                      the name your server uses for your mail storage.
+                      Exchange Server: If your Exchange mailbox name
+                      is different from your Windows name, enter your
+                      mailbox name here.
                      </para>
 		  </listitem>
 		  <listitem>
 		    <para>
                      Active Directory: If you would like to use the
-    			   Global Address List (GAL) maintained on
-    			   your Exchange server, check the box
+    			   Global Address List (GAL), check the box
     			   labelled <guilabel>Create a Global Address
-    			   List folder</guilabel>.  The GAL is
-    			   maintained by your system administrator and
-    			   you cannot add, change, or remove items
-    			   from it using Ximian Evolution. However,
-    			   you can use it to invite people to meetings
-    			   and to look up addresses and other
-    			   information. In many organizations, the GAL
-    			   is stored on a different server from email.
-    			   If this is the case, you should also
-    			   specify the directory server name here.  To
-			   avoid strain on the server, the maximum
-			   number of responses to any Active Directory
-			   query has been set to 500. If you would
-			   like to change that, you may do so here as
-			   well.
+    			   List folder</guilabel> and enter the name
+    			   of the directory server.  To avoid strain
+    			   on the server, the maximum number of
+    			   responses to any Active Directory query has
+    			   been set to 500. If you would like to
+    			   change that, you may do so here as well.
                      </para>
 		  </listitem>
 		</orderedlist>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 55b6aaa4b3..9be52d8115 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -233,8 +233,8 @@
 
 		      <listitem>
 			<para>Whether you want to use a secure (SSL)
-			connection. If your server supports it, it's
-			best to enable this security option.
+			connection. This may allow you to access the
+			server from outside a firewall.
 			</para>
 		      </listitem>
 
@@ -313,9 +313,9 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>Exchange Server: If your active directory user name
-	    is different from your Exchange mail user name, check this
-	    box and enter your mail username here.
+	    <para>Exchange Server: If your Echange mailbox name is is
+	    different from your Windows user name, check this box and
+	    enter your mailbox name here.
 	    </para>
 	  </listitem>
 
@@ -327,10 +327,8 @@
 
 	  <listitem>
 	    <para>
-              Active Directory Server Name: In most organizations, the
-	      Active Directory server will be different from the
-	      Exchange mail server.  Enter the Active Directory server
-	      name here.
+              Active Directory Server Name: Enter the Active Directory
+	      server name here.
             </para>
 	  </listitem>
 
@@ -471,16 +469,18 @@
 	      Authentication Type: Chances are you are using
 	      <guilabel>Password</guilabel>.  If you're not sure, ask
 	      your system administrator or ISP, or have
-	      <application>Ximian Evolution</application> check for you by
-	      clicking <guibutton>Check for supported
-	      types</guibutton>.
+	      <application>Ximian Evolution</application> check for
+	      you by clicking <guibutton>Check for supported
+	      types</guibutton>. For exchange servers, Password is the
+	      only type supported.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Username: The account name you use when you login
-	      to check your email.  Normally, this is the part of your
-	      email address before the '@' character.
+	      Username: The account name you use when you login to
+	      check mail.  For Exchange servers, enter the user name
+	      you use to login to a Windows workstation in your
+	      network.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -619,12 +619,12 @@ the workaround described in the note below.
     <sect2 id="mutt">
       <title>Importing Mail from mutt</title>
       <para>
-	<application>mutt</application> is a full-featured mail client
-	which is shipped with most Linux and Unix distributions.
-	<application>mutt</application> uses the standard mbox,
-	maildir, and MH file formats, which makes importing your mail into
-	<application>Evolution</application> easy.  By default,
-	<application>mutt</application> uses the mbox file format.
+	<application>mutt</application> is a text-based mail client
+	 shipped with most Linux and Unix distributions.
+	 <application>mutt</application> can use several different
+	 formats, including mbox, maildir, and MH file formats, all of
+	 which import cleanly into
+	 <application>Evolution</application>. Here's how:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
@@ -678,10 +678,9 @@ the workaround described in the note below.
     <sect2 id="kmail">
       <title>Importing Mail from KMail</title>
       <para>
-	KMail is a full-featured mail client which is shipped with the
-	KDE desktop environment.  KMail uses the standard mbox file
-	format, which means that importing your mail into
-	<application>Evolution</application> is easy.
+	KMail is the mail client is shipped with the KDE desktop
+	environment.  KMail uses the standard UNIX mbox file format to
+	store its messages. Here's how to import nessages from KMail:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>