Redo the whole options/account-creation thing.

2002-01-15  Aaron Weber  <aaron@ximian.com>

	* C/config-prefs.sgml: Redo the whole options/account-creation
	thing.

	* C/usage-mainwindow.sgml: Redo the whole options/account-creation
	thing.

svn path=/trunk/; revision=15331

3 files changed, 325 insertions, 114 deletions

diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index ef2df3bc6f..dd4f940037 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -156,72 +156,130 @@ smtp.omniport.com:143
            <listitem>
 	    <para>
               Here, decide whether you'd like to check for mail
-              automatically and how often.  You can also set other
-              options related to the behavior of your server.  If you
-              use POP mail, you can choose to leave mail on the server
-              if you wish. For IMAP, there are more extensife options:
+              automatically and how often. 
+
               <variablelist>
                 <varlistentry>
-                   <term>Check for new messages in all folders</term>
+                   <term>If you chose POP:</term>
                    <listitem>
                      <para>
-                       If you turn this feature on, then at startup
-                       and when you click Send/Receive,
-                       <application>Ximian Evolution</application>
-                       will check all folders on your IMAP server to
-                       see if they have new messages in them. If you
-                       leave it turned off, it will only check the
-                       INBOX folder.  Checking only one folder is
-                       faster than checking them all at once.
-                     </para>
-                   </listitem>
+                   <itemizedlist>
+			  <listitem>
+			    <para>Checking for new mail: If you would
+	                     like <application>Evolution</application>
+	                     to check for new mail automatically,
+	                     check the box and select a frequency in
+	                     minutes.
+                           </para>
+			  </listitem>
+
+			  <listitem>
+			    <para>
+                             Message Storage: If you'd like to store
+	                      copies of your mail on the server, check
+	                      this option.
+                           </para>
+			  </listitem>
+			</itemizedlist>
+                      </para>
+		    </listitem>
                   </varlistentry> 
 
                 <varlistentry>
-                   <term>Show only subscribed folders</term>
+                   <term>If you chose Microsoft Exchange:</term>
                    <listitem>
                      <para>
-                       Some IMAP servers provide you with a very large
-                       number of folders above and beyond your mail
-                       folders, and expect you to indicate which ones
-                       you want to work with.  If you turn this off,
-                       Evolution will show all of your folders. To
-                       subscribe to folders, select
-                       <menuchoice><guimenu>Tools</guimenu>
-                       <guimenuitem>Subscribe to
-                       Folders</guimenuitem></menuchoice>.  You can
-                       learn about subscriptions in <xref
-                       linkend="usage-mail-subscriptions">.
-                     </para>
-                   </listitem>
-                  </varlistentry> 
 
-                <varlistentry>
-                   <term>Override server-supplied namespace</term>
-                   <listitem>
-                     <para>
-                       This is not needed for most IMAP servers. If
-                       you see system files or other non-email files
-                       appearing in the folder tree after configuring
-                       your IMAP server, check this box and specify
-                       the name of the directory that contains your
-                       mail folders.
+	    <itemizedlist> <listitem>
+		<para>Checking for new mail: If you would like
+		<application>Evolution</application> to check for new mail
+		automatically, check the box and select a frequency in
+		minutes.
+		</para>
+	      </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>
+	      </listitem>
+
+	      <listitem>
+		<para>Create a Global Address List folder: If you would
+		like to have a seperate folder for the Active Directory's
+		Global Address List, leave this box checked. </para>
+	      </listitem>
+
+	      <listitem>
+		<para>
+		  Active Directory Server Name: In most organizations,
+    		  the Active Directory server will be different from
+    		  the Exchange mail server.  If so, check the box and
+    		  enter the Active Directory server name here.
+		</para>
+	      </listitem>
+
+	      <listitem>
+		<para>Limit number of Responses: Select a maximum number
+		of results for an address search. A maximum number of
+		results limits the load on your system and on your network.
+		  </para>
+	      </listitem>
+	    </itemizedlist>                       
                      </para>
                    </listitem>
                   </varlistentry> 
 
                 <varlistentry>
-                   <term>Apply filters to new messages in INBOX on
-                   this server</term>
+                   <term>If you chose IMAP:</term>
                    <listitem>
                      <para>
-                        If you want to use filters on the mail you
-                        store in your IMAP folders, check this box.
+                      
+         <itemizedlist>
+	  <listitem>
+	    <para>Checking for new mail: If you would like
+	    <application>Evolution</application> to check for new mail
+	    automatically, check the box and select a frequency in
+	    minutes.  
+            </para>
+	  </listitem>
+
+	  <listitem>
+	    <para>If you want <application>Evolution</application>
+	    to check for new messages in <emphasis>all</emphasis> your
+	    IMAP folders, make sure the <guilabel>Check for new
+	    messages in all folders</guilabel> box is selected.</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>Show only subscribed folders: Check this box if you
+	    have more folders in your IMAP view than you want to
+	    read.</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>
+              Override server-supplied namespace: If you like, enter a
+              specific directory where your server stores mail for
+              you.  Typical values are "mail" and "Mail."  For more
+              information about how to use IMAP mail, see <xref
+              linkend="usage-mail-subscriptions">.</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>Apply filters to new messages in INBOX on this
+	    server: If you'd like your filters to work on this account
+	    as well as on locally downloaded mail, check this box.</para>
+	  </listitem>
+	</itemizedlist>
                      </para>
                    </listitem>
                   </varlistentry> 
+
+             
                   </variablelist>  
-            </para>
+     </para>
 	  </listitem>
 	  </varlistentry>
 	  <varlistentry> 
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index bf47f13660..55b6aaa4b3 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -95,11 +95,11 @@
     <sect2 id="first-step">
       <title>Defining Your Identity</title>
       <para>
-	The Identity window is the first of four steps in the
-	assistant.  The identity step will ask you to enter your basic
-	personal information.  You can define multiple identities
-	later on with the <menuchoice><guimenu>Tools</guimenu>
-	<guimenuitem>Mail Settings</guimenuitem></menuchoice> tool.
+	The Identity window is the first step in the assistant. Here,
+	you will enter some basic personal information.  You can
+	define multiple identities later on with the
+	<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Mail
+	Settings</guimenuitem></menuchoice> tool.
 	<itemizedlist>
 	  <listitem>
 	    <para>
@@ -144,6 +144,7 @@
 	      you're not sure which of the following are available to
 	      you:
 	      <itemizedlist>
+
 		<listitem>
 		  <para>
 		    POP: Downloads your email to your hard disk for
@@ -158,37 +159,50 @@
 		    Exchange, this will allow you to connect to a
 		    Microsoft Exchange 2000 server, which stores
 		    email, calendar, and contact information on the
-		    server.
+		    server. 
 		  </para>
 		</listitem>
 
 		<listitem>
 		  <para>
-		    IMAP: Keeps the email on your server so you
-		    can access your email from multiple systems.
+		    IMAP: Keeps the email on your server so you can
+		    access your email from multiple systems.
 		  </para>
 		</listitem>
+
 		<listitem>
 		  <para>
-		    Unix mail spool file: If you run a mail
-		    server on your desktop computer, choose this
-		    option.
+		    Standard Unix mbox spools: If you want to read and
+		    store mail in the mail spool on your local system,
+		    choose this option. You'll need
+		    to provide the path to the mail spool you want to
+		    use.
 		  </para>
 		</listitem>
+
 		<listitem>
 		  <para>
-		    Standard Unix .mbox file: If you want
-		    <application>Ximian Evolution</application> to
-		    read mail from a specific file, or if you download
-		    mail with another application, choose this option.
+		    Maildir format mail directories: If you download
+		    your mail using qmail or another maildir-style
+		    program, you'll want to use this option.  You'll need
+		    to provide the path to the mail directory you want to
+		    use.
 		  </para>
 		</listitem>
+
 		<listitem>
 		  <para>
-		    Qmail maildir format files: If you download your
-		    mail using qmail, you'll want to use this.
+		    Local Delivery: Choose this option if you want to
+		    move mail from the spool and store it in your home
+		    directory. If you would rather leave mail in your
+		    system's spool files, choose the
+		    <guimenuitem>Standard Unix mbox
+		    spools</guimenuitem> option instead. You'll need
+		    to provide the path to the mail spool you want to
+		    use.
 		  </para>
 		</listitem>
+
 		<listitem>
 		  <para>
 		    None: Select this if you do not plan to
@@ -197,49 +211,48 @@
 		</listitem>
 	      </itemizedlist>
 
-         <note id="imap-note-one">
-            <title>What's an IMAP Namespace?</title>
-                <para>
-                    For IMAP mail servers, your sysadmin may provide
-		    you with a specific namespace, the directory on
-		    where your server stores mail for you. If you
-		    check your IMAP mail and your folder list includes
-		    files that don't look like mail folders, you
-		    probably need to change your mail
-		    namespace. Typical values are "mail" and "Mail."
-		    If you prefer, you can choose to subscribe to
-		    individual mail folders one at a time. For more
-		    information about how to use IMAP mail, see <xref
-		    linkend="usage-mail-subscriptions">.
-               </para>
-             </note>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Email Server: This is the address of the server you're
-	      downloading from.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Username: The username that you login to your email.  That
-	      is often the part before the @ in your email.
-	    </para>
-	    <para>
-	      Authentication Type: Chances are you are using
-	      <guilabel>Password</guilabel>.  Ask your administrator
-	      for more details.  You can have <application>Ximian
-	      Evolution</application> make sure you've chosen
-	      correctly by clicking <guibutton>Check for supported
-	      types</guibutton>.
-	    </para>
-	    <para>
-	      Remember Password: If you prefer to not enter your
-	      password every time you check email, press this button.
 	    </para>
 	  </listitem>
 	</itemizedlist>
+</para>
+    <para>
+      If you selected POP, Microsoft Exchange, or IMAP as your mail
+      server, you'll need to enter some more information:
+
+                     <itemizedlist>
+		      <listitem>
+			<para>The host name of your mail server. Ask
+			your system administrator if you're not
+			sure.</para>
+		      </listitem>
+
+		      <listitem>
+			<para>The username for the account on that
+			system. </para>
+		      </listitem>
+
+		      <listitem>
+			<para>Whether you want to use a secure (SSL)
+			connection. If your server supports it, it's
+			best to enable this security option.
+			</para>
+		      </listitem>
+
+		      <listitem>
+			<para>The authentication options supported by
+			your server. If you're not sure, click the
+			<guilabel>Check for supported types</guilabel>
+			button or ask your system administrator.
+			</para>
+		      </listitem>
+
+		      <listitem>
+			<para>Whether you'd like Evolution to remember
+			your password.
+			</para>
+		      </listitem>
+		    </itemizedlist>
+
       </para>
       <tip id="exchange-info">
 	<title>Can Ximian Evolution Talk to Microsoft Exchange?</title>
@@ -252,20 +265,152 @@
 	   like POP and IMAP.
 	</para>
       </tip> 
+    </sect2>
+    <sect2 id="more-mail-options">
+      <title>More Mail Configuration Options</title>
+      <para>
+        There are more extensive options for mail preferences,
+        especially if you've chosen POP, Microsoft Exchange, or IMAP
+        as incoming mail server type.  If you want to set these
+        options after you've created the account, you can select
+        <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Mail
+        Settings</guimenuitem></menuchoice>, click on the account you
+        want to change, and then click the <guibutton>Edit</guibutton>
+        button. See <xref linkend="config-prefs-mail"> for details.
+      </para>
+        <variablelist>
+	 <varlistentry>
+	  <term>If you chose POP mail:</term>
+	  <listitem><para>
+         <itemizedlist>
+	  <listitem>
+	    <para>Checking for new mail: If you would like
+	    <application>Evolution</application> to check for new mail
+	    automatically, check the box and select a frequency in
+	    minutes.
+            </para>
+	  </listitem>
+
+	  <listitem>
+	    <para>
+              Message Storage: If you'd like to store copies of your
+	    mail on the server, check this option.
+            </para>
+	  </listitem>
+	</itemizedlist>
+           </para>
+ 	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term>If you chose Microsoft Exchange:</term>
+	  <listitem><para>
+        <itemizedlist> <listitem>
+	    <para>Checking for new mail: If you would like
+	    <application>Evolution</application> to check for new mail
+	    automatically, check the box and select a frequency in
+	    minutes.
+            </para>
+	  </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>
+	  </listitem>
+
+	  <listitem>
+	    <para>Create a Global Address List folder: If you would
+	    like to have a seperate folder for the Active Directory's
+	    Global Address List, leave this box checked. </para>
+	  </listitem>
+
+	  <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.
+            </para>
+	  </listitem>
+
+	  <listitem>
+	    <para>Limit number of Responses: Select a maximum number
+	    of results for an address search. A maximum number of
+	    results limits the load on your system and on your network.
+              </para>
+	  </listitem>
+	</itemizedlist>
+            </para>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term>If you chose IMAP:</term>
+	  <listitem>
+	    <para>
+         <itemizedlist>
+	  <listitem>
+	    <para>Checking for new mail: If you would like
+	    <application>Evolution</application> to check for new mail
+	    automatically, check the box and select a frequency in
+	    minutes.  
+            </para>
+	  </listitem>
+
+	  <listitem>
+	    <para>If you want <application>Evolution</application>
+	    to check for new messages in <emphasis>all</emphasis> your
+	    IMAP folders, make sure the <guilabel>Check for new
+	    messages in all folders</guilabel> box is selected.</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>Show only subscribed folders: Check this box if you
+	    have more folders in your IMAP view than you want to
+	    read.</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>
+              Override server-supplied namespace: If you like, enter a
+              specific directory where your server stores mail for
+              you.  Typical values are "mail" and "Mail."  For more
+              information about how to use IMAP mail, see <xref
+              linkend="usage-mail-subscriptions">.</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>Apply filters to new messages in INBOX on this
+	    server: If you'd like your filters to work on this account
+	    as well as on locally downloaded mail, check this box.</para>
+	  </listitem>
+
+
+	</itemizedlist>
+     </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+
+         <note id="imap-namespace">
+            <title>What's an IMAP Namespace?</title>
+                <para>
+                    For IMAP mail servers, your sysadmin may provide
+		    you with a specific namespace, the directory on
+		    where your server stores mail for you. If you
+		    check your IMAP mail and your folder list includes
+		    files that don't look like mail folders, you
+		    probably need to change your mail
+		    namespace. Typical values are "mail" and "Mail."
+		    If you prefer, you can choose to subscribe to
+		    individual mail folders one at a time. For more
+		    information about how to use IMAP mail, see <xref
+		    linkend="usage-mail-subscriptions">.
+               </para>
+             </note>
 
-<note id="recieving-options">
-<title>More Options</title>
-<para>
-There are more extensive options for mail preferences, especially if
-you've chosen IMAP as your incoming mail server type.  Once you've
-created an account, you can fine-tune it by selecting
-<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Mail
-Settings</guimenuitem></menuchoice>, selecting the account you want to
-change, and clicking the <guibutton>Edit</guibutton> button. See <xref
-linkend="config-prefs-mail"> for details.
-</para>
-</note>
     </sect2>
+
     <sect2 id="third-step">
       <title>Sending Email</title>
       <para>
diff --git a/help/ChangeLog b/help/ChangeLog
index cae97f991d..2d956c279c 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-15  Aaron Weber  <aaron@ximian.com>
+
+	* C/config-prefs.sgml: Redo the whole options/account-creation
+	thing.
+
+	* C/usage-mainwindow.sgml: Redo the whole options/account-creation
+	thing.
+
 2002-01-07  Aaron Weber  <aaron@ximian.com>
 
 	* C/evolution.sgml: Touched this file but don't think I changed