Touched. Minor changes to IMAP section, to make sure links worked, etc.

2001-11-27  Aaron Weber  <aaron@ximian.com>

	* C/usage-mail.sgml: Touched. Minor changes to IMAP section, to
	make sure links worked, etc.

	* C/config-prefs.sgml: Expanded IMAP options.

	* C/usage-mainwindow.sgml: Added note about more options
	available.

2001-11-26  Aaron Weber  <aaron@ximian.com>

	* C/usage-exchange.sgml: removed FIXMES, made valid within larger
	<book> context.

2001-11-19  Aaron Weber  <aaron@ximian.com>

	* C/usage-mail-org.sgml: changed Unmatched vfolder
	description. Removed note about how it behaves when you have no
	vFolders.

2001-11-15  Aaron Weber  <aaron@ximian.com>

	* C/apx-authors.sgml: Removed authorlist, point people to "About"
	box, since there's no point in having so many lists in so many
	places.

2001-11-02  Aaron Weber  <aaron@ximian.com>

	* C/usage-mainwindow.sgml: Connector.

	* C/config-prefs.sgml: Connector.

	* C/usage-exchange.sgml: Connector.

2001-10-31  Aaron Weber  <aaron@ximian.com>

	* C/usage-exchange.sgml: More working on this file today. Nearly
	done.

	* C/topic.dat: Added Connector info.

	* C/usage-mainwindow.sgml: Added mention of Connector to
	configuration options.

	* C/config-prefs.sgml: Added mention of Connector to configuration
	options.

2001-10-30  Aaron Weber  <aaron@ximian.com>

	* C/evolution.sgml: Cleaned up comments. Added Exchange entity.
	* C/Makefile.am: added exchange.sgml file

svn path=/trunk/; revision=14851

9 files changed, 365 insertions, 85 deletions

diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index 7eadf081d3..2209d6d374 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -39,6 +39,7 @@ sgml_ents =	\
 	usage-exec-summary.sgml	\
 	usage-mail-org.sgml	\
 	usage-mail.sgml		\
+	usage-exchange.sgml	\
 	usage-mainwindow.sgml	\
 	usage-print.sgml	\
 	usage-sync.sgml
diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
index acf43b6cfc..6bd9f83f6d 100644
--- a/help/C/apx-authors.sgml
+++ b/help/C/apx-authors.sgml
@@ -1,41 +1,12 @@
   <appendix id="authors">
     <title>Authors</title>
      <para>
-      <application>Evolution</application> was written by:
-<simplelist>
-     <member>Seth Alves: <email>alves@ximian.com</email></member>
-     <member>Anders Carlsson: <email>andersca@gnu.org</email></member>
-     <member>Damon Chaplin: <email>damon@ximian.com</email></member>
-     <member>Clifford R. Conover: <email>rusty@zootweb.com</email></member>
-     <member>Anna Dirks: <email>anna@ximian.com</email></member>
-     <member>Miguel De Icaza: <email>miguel@ximian.com</email></member>
-     <member>Radek Doulik: <email>rodo@ximian.com</email></member>
-     <member>Arturo Espinoza: <email>arturo@nucleu.unam.mx</email></member>
-     <member>Larry Ewing: <email>lewing@ximian.com</email></member>
-     <member>Nat Friedman: <email>nat@ximian.com</email></member>
-     <member>Bertrand Guiheneuf: <email>bertrand@ximian.com</email></member>
-     <member>Iain Holmes: <email>iain@ximian.com</email></member>
-     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
-     <member>Christopher J. Lahey: <email>clahey@ximian.com</email></member>
-     <member>Jason Leach: <email>jleach@usa.net</email></member>
-     <member>Matthew Loper: <email>matt@loper.org</email></member>
-     <member>Federico Mena: <email>federico@ximian.com</email></member>
-     <member>Rodrigo Moya: <email>rodrigo@ximian.com</email></member>
-     <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>
-     <member>Federico Mena: <email>federico@ximian.com</email></member>
-     <member>Jesse Pavel: <email>jpavel@ximian.com</email></member>
-     <member>Ettore Perazzoli: <email>ettore@ximian.com</email></member>
-     <member>Jeffrey Stedfast: <email>jeff@ximian.com</email></member>
-     <member>Jakyb Steiner: <email>rodo@ximian.com</email></member> 
-     <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>     
-     <member>Peter Teichman: <email>peter@ximian.com</email></member>     
-     <member>Chris Toshok: <email>toshok@ximian.com</email></member>
-     <member>Peter Williams: <email>peter@newton.cx</email></member>
-     <member>Dan Winship: <email>danw@ximian.com</email></member>
-     <member>Michael Zucchi: <email>notzed@ximian.com</email></member>
-</simplelist>
-and numerous other dedicated GNOME programmers. 
-</para>
+      <application>Evolution</application> was written by the Ximian
+      Evolution team and numerous other dedicated GNOME programmers.
+      You can see their names by selecting <menuchoice>
+      <guimenu>Help</guimenu> <guimenuitem>About</guimenuitem>
+      </menuchoice> from any Evolution window.
+     </para>
     <para>
       The <application>Evolution</application> code owes a great debt
        to the <application>GNOME-pim</application> and
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 7660d400c8..61dc2c6449 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -115,8 +115,8 @@
      and denoted by <filename>/</filename>.
      The rest of the "branches" spread downwards from the root.  Don't
      confuse the root directory with the root
-     account, or root's home directory,
-     <filename>/home/root</filename>.b
+     account, or root's home directory, normally
+     <filename>/root</filename>.
    </para>
   </glossdef>
  </glossentry>
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 77ebe4e807..a67b3aede9 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -26,8 +26,8 @@
 	    <term><guilabel>Accounts</guilabel></term>
 	    <listitem>
 	      <para>
-		This allows you to create and alter one or more identities for your
-		email.
+		This allows you to create and alter one or more
+		identities for your email.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -125,13 +125,14 @@
 	    <para>
              Here, select the way you will be getting mail: you may
              download mail from a server (<glossterm
-             linkend="pop">POP</glossterm> or <glossterm
-             linkend="imap">IMAP</glossterm>) or access it from files
-             on your local system.  If you use a server, it may permit
-             or require you to use a Secure Socket Layer (SSL)
-             connection.  To turn SSL connections on, just click the
-             <guibutton>Use Secure Connection (SSL)</guibutton>
-             button.
+             linkend="pop">POP</glossterm>), read and keep it on the
+             server (Microsoft Exchange or <glossterm
+             linkend="imap">IMAP</glossterm>), or read it from files
+             that already exist on your desktop computer.  If you use
+             a server, it may permit or require you to use a Secure
+             Socket Layer (SSL) connection.  To turn SSL connections
+             on, just click the <guibutton>Use Secure Connection
+             (SSL)</guibutton> button.
 
 <note id="config-arbitrary-port">
 <title>Specifying Port Numbers</title>
@@ -155,10 +156,71 @@ smtp.omniport.com:143
            <listitem>
 	    <para>
               Here, decide whether you'd like to check for mail
-              automatically, and set other options related to the
-              behavior of your server.  If you use POP mail, you can
-              decide whether to leave mail on the server, and if you
-              use IMAP, you can set folder subscription options here.
+              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:
+              <variablelist>
+                <varlistentry>
+                   <term>Check for new messages in all folders</term>
+                   <listitem>
+                     <para>
+                       If you turn this feature on, then at startup
+                       and when you click Send/Recieve,
+                       <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>
+                  </varlistentry> 
+
+                <varlistentry>
+                   <term>Show only subscribed folders</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.
+                     </para>
+                   </listitem>
+                  </varlistentry> 
+
+                <varlistentry>
+                   <term>Apply filters to new messages in INBOX on
+                   this server</term>
+                   <listitem>
+                     <para>
+                        If you want to use filters on the mail you
+                        store in your IMAP folders, check this box.
+                     </para>
+                   </listitem>
+                  </varlistentry> 
+                  </variablelist>  
             </para>
 	  </listitem>
 	  </varlistentry>
@@ -168,7 +230,9 @@ smtp.omniport.com:143
 	    <para>
               In this section, you will choose and configure a method
               for sending mail.  You may choose <glossterm
-              linkend="smtp">SMTP</glossterm> or <glossterm
+              linkend="smtp">SMTP</glossterm>, Microsoft Exchange (if
+              you have purchased the Ximian Connector for Microsoft
+              Exchange) or <glossterm
               linkend="sendmail">sendmail</glossterm>.
              </para>
 	  </listitem>
diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index aff75abe03..1146b671b1 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -7,6 +7,7 @@
 <!ENTITY USAGE-MAIL-ORG SYSTEM "usage-mail-org.sgml">
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
 <!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
+<!ENTITY USAGE-EXCHANGE SYSTEM "usage-exchange.sgml">
 <!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
 <!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
@@ -21,10 +22,7 @@
 
 
 <!-- Almost every chapter is an entity.  Files, Chapter id's, and
-entity names correspond.  APX is for appendix. Note that there is no
-entity for apx-notes.sgml, which is still included in the file
-set. Reinstate the entity if and when the Notes feature is
-implemented. -->
+entity names correspond.  APX is for appendix.  -->
 
 <book id="index">
   <bookinfo>
@@ -66,7 +64,8 @@ implemented. -->
     </legalnotice>
 
    <releaseinfo>
-      This is version 1.0 of the Ximian Evolution manual.
+      This is version 1.0 of the Ximian Evolution manual. It describes
+      version 1.0 of the Ximian Evolution groupware suite.
    </releaseinfo>
 
   </bookinfo>
@@ -92,7 +91,7 @@ implemented. -->
     &USAGE-MAIL-ORG;
     &USAGE-CONTACT;
     &USAGE-CALENDAR;
-<!--   &USAGE-NOTES; -->
+    &USAGE-EXCHANGE;
     &USAGE-SYNC; 
     &USAGE-PRINT;
   </part>
@@ -119,20 +118,9 @@ implemented. -->
     &CONFIG-SYNC;
   </part>
 
-<!--  &FAQ; Just link to the webpage -->
   &MENUREF;
   &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS; 
 
-</book>
-
-
-
-
-
-
-
-
-
-
+</book>
\ No newline at end of file
diff --git a/help/C/topic.dat b/help/C/topic.dat
index cd82ca1eab..ce84eabf8b 100644
--- a/help/C/topic.dat
+++ b/help/C/topic.dat
@@ -5,6 +5,7 @@ usage-summary.html The Evolution Summary
 usage-mail.html Getting and Sending Email
 usage-contact.html Using the Contact Manager
 usage-calendar.html Managing Your Schedule
+usage-exchange.html The Exchange Plugin
 config-prefs.html Configuring Evolution
 menuref.html Quick Reference
 apx-gloss.html Glossary
\ No newline at end of file
diff --git a/help/C/usage-exchange.sgml b/help/C/usage-exchange.sgml
new file mode 100644
index 0000000000..c6aae64ee3
--- /dev/null
+++ b/help/C/usage-exchange.sgml
@@ -0,0 +1,206 @@
+<chapter id="usage-exchange">
+  <title>The Ximian Connector for Microsoft Exchange</title>
+  <para>
+    The Ximian Connector for Microsoft Exchange allows Ximian
+    Evolution clients to access accounts on Microsoft Exchange 2000
+    servers. It is available for a fee from the Ximian online store at
+    <ulink
+    url="http://store.ximian.com">store.ximian.com</ulink>. Unlike the
+    regular Ximian Evolution client, it is proprietary software and
+    source code is not available.
+  </para>
+  <para>
+    The Ximian Connector offers a significant price advantage over
+    other Exchange access methods for Linux and UNIX systems:
+    <variablelist>
+
+      <varlistentry>
+	<term>Dual Computer Installation:</term>
+	<listitem>
+	  <para>
+             The purchase of a second computer for each client imposes
+             a very heavy expense burden and is exceptionally
+             inconvenient.
+          </para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>Dual Boot or Virtual Machine:</term>
+	<listitem>
+	  <para>
+             Installation of multiple operating systems in a dual boot
+             or virtual machine configuration (such as VMWare) can
+             place a very heavy burden on the hardware and increases
+             licensing costs.  Users often complain that such a system
+             is inconvenient, slow, and not integrated with the rest
+             of their operating system.
+          </para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>Outlook Web Access:</term>
+	<listitem>
+	  <para>
+            Outlook Web Access is a web interface for Exchange
+            servers, but works best in Microsoft Internet Explorer, is
+            not integrated with the rest of the host operating system,
+            and offers only limited groupware functionality.
+          </para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+  </para>
+  <para>
+   The Ximian Connector offers a low cost, fully integrated, option
+   for Exchange 2000 server access in heterogeneous client
+   networks. This chapter will explain how to install, configure, and
+   use it.
+  </para>
+  <warning id="licensing">
+    <title>Exchange Client Licenses</title>
+    <para>
+      An Exchange client access license is still required to use the
+      Ximian Connector with Microsoft Exchange.
+  </para>
+  </warning>
+
+  <sect1 id="install">
+    <title>Installing the Connector</title>
+    <para>
+       To install the Ximian Connector, first visit the Ximian online
+       store at <ulink
+       url="http://store.ximian.com">store.ximian.com</ulink>.  You
+       will need a browser with strong (128-bit or greater) encryption
+       to access the store. After purchase you will be given an
+       activation key which you can enter into Ximian Red Carpet,
+       which will download and install the software for you.
+    </para>
+ </sect1>
+
+  <sect1 id="configure">
+    <title>Configuration</title>
+    <para>
+      Once you have installed the Connector, you need to set up access
+      for your Exchange account.  Start Ximian Evolution and select
+       <menuchoice>
+	<guimenu>Tools</guimenu>
+	<guimenuitem>Mail Settings</guimenuitem>
+      </menuchoice>
+      from any mail view.  If you have an existing account, and want
+      to convert it to use for Exchange, do the following:
+      <orderedlist>
+	<listitem>
+	  <para>
+             Select the account you want to convert and click the
+             <guibutton>Edit</guibutton> button.
+          </para>
+	</listitem>
+
+	<listitem>
+	  <para>
+            Under the <guilabel>Receiving Mail</guilabel> tab, select
+            <guilabel>Microsoft Exchange</guilabel> as your server
+            type. Enter your name of your server next to
+            <guilabel>Host</guilabel>, and the user name for your
+            account next to <guilabel>Username</guilabel>.  If your
+            server uses a Secure Socket Layer connection, click the
+            <guilabel>Use Secure Connection (SSL)</guilabel> checkbox.
+          </para>
+	</listitem>
+
+	<listitem>
+	  <para>
+            Under the <guilabel>Sending Mail</guilabel> tab, select
+            <guilabel>Microsoft Exchange</guilabel> as your server
+            type, and enter the server name as the
+            <guilabel>Host</guilabel>. You do not need to use the
+            Exchange server to send mail if you prefer to use another
+            server or server type.
+          </para>
+	</listitem>
+
+	<listitem>
+	  <para>
+            Click the <guibutton>OK</guibutton> button.
+          </para>
+	</listitem>
+
+	<listitem>
+	  <para>
+            Make sure the account is active. It should have a check
+            mark in the <guilabel>Enabled</guilabel> column of your
+            accounts list. If it doesn't, select the account and
+            click the <guibutton>Enable</guibutton> button.
+          </para>
+	</listitem>
+      </orderedlist>
+    </para>
+
+    <para>
+       If you would like to create a new account for your Exchange
+       server, click the <guibutton>Add</guibutton> button in the
+       accounts list. The account creation assistant will guide you
+       through the process, which is described in <xref
+       linkend="usage-mainwindow-starting">. </para>
+  </sect1>
+
+  <sect1 id="access">
+    <title>Accessing the Exchange Server</title>
+    <para>
+       Like IMAP and LDAP data, information for Exchange accounts is
+       stored on the server, not on your desktop computer.  This means
+       that you can access it from multiple locations. It also means
+       that your Microsoft Exchange account information is in a
+       seperate folder tree from the <guilabel>Local</guilabel> tree
+       in your folder bar. You'll see it below the local tree, with
+       the name you gave the account. If you have multiple accounts,
+       you will have multiple folder trees.
+    </para>
+    <para>
+       Click on any of the folder tree items to visit them; you may
+       have to enter your server password.  You can now create contact
+       cards, send and receive email as you would normally. If there
+       are items in your local calendar or addressbook that you'd like
+       to add to your Exchange stores, you can copy and paste them
+       over, or just drag items from one folder to another as you
+       would with two local stores.
+    </para>
+    <para>
+       In addition, when you schedule a meeting with your calendar on
+       the Exchange server, you can check when other local Exchange
+       users are busy according to their Exchange calendars. To do so: 
+       <orderedlist numeration="arabic">
+	<listitem>
+	  <para>
+            Open a new appointment in the calendar.
+          </para>
+	</listitem>
+
+	<listitem>
+	  <para> Choose <menuchoice>
+	      <guimenu>Actions</guimenu>
+	      <guimenuitem>Schedule Meeting</guimenuitem>
+	    </menuchoice> in the meeting editor window.
+          </para>
+	</listitem>
+
+	<listitem>
+	  <para> Add attendees, either by entering their email address
+            into the list, or by clicking the <guibutton>Invite
+            Others</guibutton> button. 
+         </para>
+	</listitem>
+	<listitem>
+	  <para>
+          Choose <guilabel>Options</guilabel> and then
+          <guilabel>Update Free/Busy</guilabel> to check participant
+          schedules and, if possible, update the meeting in all
+          participants' calendars.
+         </para>
+ 	</listitem>
+      </orderedlist>
+    </para>
+  </sect1>
+</chapter>
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index ce6f75e69c..0f665da24f 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -814,8 +814,15 @@
 	Folders.  That's why <application>Ximian
 	Evolution</application> includes an Unmatched vFolder.  The
 	Unmatched vFolder displays messages that are not matched by
-	other rules. If you have no vFolders, the Unmatched folder
-	will contain all of your mail.
+	other rules.
+      </para>
+      <para>
+        If you use remote email storage like IMAP or Microsoft
+        Exchange, and have created vFolders to search through them,
+        the Unmatched vFolder will follow your lead, and search the
+        remote folders as well. If you do not create any vFolders that
+        search in remote mail stores, the Unmatched vFolder will not
+        search in them either.
       </para>
     </note>
 
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index b7ff02ecf7..df57027edd 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -150,10 +150,22 @@
 		    permanent storage.
 		  </para>
 		</listitem>
+
+		<listitem>
+		  <para>
+		    Microsoft Exchange: Available only if you have
+		    purchased the Ximian Connector for Microsoft
+		    Exchange, this will allow you to connect to a
+		    Microsoft Exchange 2000 server, which stores
+		    email, calendar, and contact information on the
+		    server.
+		  </para>
+		</listitem>
+
 		<listitem>
 		  <para>
 		    IMAP: Keeps the email on your server so you
-		    can access your email from multiple systems. 
+		    can access your email from multiple systems.
 		  </para>
 		</listitem>
 		<listitem>
@@ -189,8 +201,8 @@
             <title>What's an IMAP Namespace?</title>
                 <para>
                     For IMAP mail servers, your sysadmin may provide
-		    you with a specific namespace, the path on the
-		    IMAP server where you check for mail.  If you
+		    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
@@ -230,15 +242,29 @@
 	</itemizedlist>
       </para>
       <tip id="exchange-info">
-	<title>Can Ximian Evolution Talk to Exchange?</title>
+	<title>Can Ximian Evolution Talk to Microsoft Exchange?</title>
 	<para>
-	  <application>Ximian Evolution</application> can work with the
-	   <application>Microsoft Exchange</application> server over
-	   standard protocols such as POP or IMAP. Check with your
-	   system administrator to see if you can get POP or IMAP
-	   access to your email server.
+           If you have purchased the Ximian Connector for Microsoft
+	   Exchange, you can access Microsoft Exchange 2000 servers
+	   natively.  If you do not have the Connector, or if you use
+	   an older version of Microsoft Exchange, talk to your system
+	   administrator about access to standard protocol services
+	   like POP and IMAP.
 	</para>
       </tip> 
+
+<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>
@@ -254,13 +280,28 @@
 	      <itemizedlist>
 		<listitem>
 		  <para>
-		    SMTP: Downloads mail into your mailbox file.
+		    SMTP: Sends mail directly from your system.
 		  </para>
 		</listitem>
+
+		<listitem>
+		  <para>
+		    Microsoft Exchange: Sends mail through a Microsoft
+		    Exchange server using the Microsoft Exchange 2000
+		    protocol. Available only if you have purchased the
+		    Ximian Connector for Microsoft Exchange from
+		    <ulink
+		    url="http://store.ximian.com">store.ximian.com</ulink>.
+		  </para>
+		</listitem>
+
 		<listitem>
 		  <para>
-		    Sendmail: Uses another program to download your mail
-		    to your mailbox files.
+		    Sendmail: Uses the Sendmail program to send mail
+		    from your system. Sendmail is more flexible, but
+		    is not as easy to configure, so you should only
+		    select this option if you know how to set up a
+		    sendmail service.
 		  </para>
 		</listitem>
 	      </itemizedlist>
@@ -268,8 +309,9 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Host: If you chose SMTP, enter the server's name
-	      or IP address here.
+	      Host: If you chose <guilabel>SMTP</guilabel> or
+	      <guilabel>Microsoft Exchange</guilabel>, enter the
+	      server's name or IP address here.
 	    </para>
 	  </listitem>
 	  <listitem>