Put in lots of orderedlists...more SGML, less for the user to read.

2001-07-03  Kevin Breit  <battery841@mediaone.net>

	* C/usage-mail.sgml: Put in lots of orderedlists...more SGML, less
	for the user to read.  They'll thank me in droves later.

svn path=/trunk/; revision=10764

6 files changed, 1300 insertions, 732 deletions

diff --git a/doc/C/usage-exec-summary.sgml b/doc/C/usage-exec-summary.sgml
index 77f84e8230..cccf6c409f 100644
--- a/doc/C/usage-exec-summary.sgml
+++ b/doc/C/usage-exec-summary.sgml
@@ -3,8 +3,8 @@
     <para>
        My Evolution is designed to show you a
        summary of important information: the appointments for a given
-       day, important email, and so forth. To see your My Evolution. 
-       , click on the <guibutton>My Evolution</guibutton>
+       day, important email, and so forth. To see your My Evolution, 
+       click on the <guibutton>My Evolution</guibutton>
        button in the shortcut bar, or select the
        <guilabel>My Evolution</guilabel> folder in the folder
        bar.
@@ -14,40 +14,24 @@
       <title>Introducing My Evolution</title>
       <para>
         The first thing you'll want to do with My Evolution
-        is add a service. Click the <guibutton>Add Service</guibutton>
-        button in the toolbar, then select one of the available
-        services.  Services may vary depending upon your system, but
-        most installations will have at least the following options:
+        is add a service. Go to
+      <menuchoice>
+	<guimenu>Tools</guimenu>
+	<guimenuitem>My Evolution Settings</guimenuitem>
+      </menuchoice>
+      then select one of the available
+      services.  Services may vary depending upon your system, but
+      most installations will have at least the following options:
+      <variablelist>
 
-        <variablelist>
-
-          <varlistentry>
-             <term>Calendar</term>
-             <listitem>
-               <para>
-                  Pending appointments and other events for that day.
-               </para>
-             </listitem>
-           </varlistentry>
-
-          <varlistentry>
-             <term>Inbox</term>
-             <listitem>
-               <para>
-                 Information about your mail, such as the number of
-                 new messages you have waiting.
-               </para>
-             </listitem>
-           </varlistentry>
-
-          <varlistentry>
-             <term>To Do</term>
-             <listitem>
-               <para>
-                 A short summary of your task pad.
-               </para>
-             </listitem>
-           </varlistentry>
+	<varlistentry>
+	  <term>Mail</term>
+	  <listitem>
+	    <para>
+	      Display amount of unread email in your selected folders.
+	    </para>
+	  </listitem>
+	</varlistentry>
 
           <varlistentry>
              <term>RDF Summary</term>
@@ -61,27 +45,136 @@
              </listitem>
            </varlistentry>
 
-        </variablelist>
-
-     </para>
+	<varlistentry>
+	  <term>Weather</term>
+	  <listitem>
+	    <para>
+	      Shows you the current weather for the cities of your choice.
+	    </para>
+	  </listitem>
+	</varlistentry>
 
-     <para>
-       Each service appears in a small box on the screen; you can
-       remove the service by clicking the <guibutton>x</guibutton>
-       button in the upper right, or bring up a settings dialog by
-       clicking the little wrench icon below that.
-     </para>
-   </sect1>
-<!-- 
-   <sect1 id="exec-services-detail">
-     <title>Services in Detail</title>
+	<varlistentry>
+	  <term>Schedule</term>
+	  <listitem>
+	    <para>
+	      Lets you see the events for the day.
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+    </para>
+    <para>
+      <application>Evolution</application> comes with ... enabled by
+      default.
+    </para>
+    <sect2 id="new-components">
+      <title>Adding New Components</title>
+      <para>
+	To add a new service:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Choose
+	      <menuchoice>
+		<guimenu>Tools</guimenu>
+		<guimenuitem>My Evolution Settings</guimenuitem>
+	      </menuchoice>
+	      from the menubar.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Select the service you wish to add by clicking on the respective
+	      tab.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Choose <guibutton>OK</guibutton> when finished configuring the
+	      item.
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+    </sect2>
+    <sect2 id="delete-components">
+      <title>Deleting Components</title>
+      <para>
+	Of course, there are possibly some components which you'd prefer not too
+	view in your My Evolution.
+	To remove a component:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Choose
+	      <menuchoice>
+		<guimenu>Tools</guimenu>
+		<guimenuitem>My Evolution Settings</guimenuitem>
+	      </menuchoice>
+	      from the menubar.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click the <guilabel>Enable</guilabel> button in the component you
+	      would like to disable.
+	      <!-- This is incorrect.  I am going to ask Iain if he could throw
+	      in an Enable button -->
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+    </sect2>
+    <sect2 id="modifying-components">
+      <title>Modifying Components</title>
       <para>
-          This section will show you how to use several
-          <application>Evolution</application> services, once they
-          become available.  Wait for updates.  FIXME
+	Chances are, the components that you setup aren't going to be setup for
+	your needs.  For instance, you may choose that you want to use different
+	city choices than the default settings.
+	<application>Evolution</application> lets you configure all the
+	components in My Evolution.
       </para>
-     
-    </sect1>
--->
+      <sect3 id="modifying-components-mail">
+	<title>Modifying Mail</title>
+	<para>
+	  To modify mail:
+	  <orderedlist numeration="arabic">
+	    <listitem>
+	      <para>
+		Choose
+		<menuchoice>
+		  <guimenu>Tools</guimenu>
+		  <guimenuitem>My Evolution Settings</guimenuitem>
+		</menuchoice>
+		from the menubar.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Click the <guilabel>Mail</guilabel> tab at the top of the
+		window.
+	      </para>
+	    </listitem>
+	  </orderedlist>
+	</para>
+	<para>
+	  The <guilabel>Mail</guilabel> service window is broken up into two
+	  sections.  The left section is where your mail folders are listed.
+	  The right section shows which folders are displayed.
+	</para>
+	<para>
+	  To add a folder to be displayed, click on a folder in the
+	  <guilabel>All folders</guilabel> section and click the
+	  <guibutton>Add</guibutton> button.
+	</para>
+	<para>
+	  To remove a folder from the service, click on the folder in the
+	  <guilabel>Display folders</guilabel> section and click the
+	  <guibutton>Remove</guibutton> button.
+	</para>
+      </sect3>
+    </sect2>
+  </sect1>
 </chapter>
 
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 1217109a25..3f8ced92f1 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -56,6 +56,7 @@
        start with the <interface>Inbox</interface> open and show you a
        message from Ximian welcoming you to the application.
       </para>
+
       <para>
         Your <application>Evolution</application>
         <guilabel>Inbox</guilabel> will look something like the one in
@@ -82,172 +83,296 @@
       </figure>
 <!-- ==============End of Figure============================== -->
 
-      <para>
-        <inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
-        <guilabel>Email Viewer</guilabel>
-      </para>
-
-      <para>
-        This is where your email is displayed.
-      </para>
+    <para>
+      <inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
+      <guilabel>Email Viewer</guilabel>
+    </para>
+    
+    <para>
+      This is where your email is displayed.
+    </para>
 
-      <para>
-        <inlinegraphic fileref="fig/full-2.png"></inlinegraphic>
-        <guilabel>Email List</guilabel>
-      </para>
+    <para>
+      <inlinegraphic fileref="fig/full-2.png"></inlinegraphic>
+      <guilabel>Email List</guilabel>
+    </para>
+    
+    <para>
+      The <guilabel>Email List</guilabel> lists off all the emails that you
+      have.  This includes all your read, unread, and email that is flagged 
+      to be deleted.
+    </para>
+    
+    <para>
+      Most of the mail-related actions you'll want to perform are
+      listed in the <guimenu>Message</guimenu> menu in the menu
+      bar.  The most frequently used ones, like
+      <guimenuitem>Reply</guimenuitem> and
+      <guimenuitem>Forward</guimenuitem>, also appear as buttons in
+      the toolbar. Almost all of them are also located in the
+      right-click menu and as keyboard shortcuts, which tend to be
+      faster once you get the hang of them.  You can choose
+      whichever way you like best; the idea is that the software
+      should work the way you want, rather than making you work the
+      way the it does.
+      
+      <tip id="view-headers">
+	<title>Take a look at the headers</title>
+	<para>
+	  To look at the entire source of your email message, including
+	  all the header information, select
+	  <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenuitem></menuchoice>
+	</para>
+      </tip>
 
+    </para>
+    
+    <sect2 id="usage-mail-listorder">
+      <title>Sorting the message list</title>
       <para>
-        The <guilabel>Email List</guilabel> lists off all the emails that you
-        have.  This includes all your read, unread, and email that is flagged to        be deleted.
+	One of the ways <application>Evolution</application> lets
+	you choose the way you work is the way it lets you sort your
+	message lists.  To sort by sender, subject, or date, click
+	on the bars with those labels at the top of the message
+	list. The direction of the arrow next to the label indicates
+	the direction of the sort, and if you click again, you'll
+	sort them in reverse order. For example, click once on
+	<guilabel>Date</guilabel> to sort messages by date from
+	oldest to newest.  Click again, and
+	<application>Evolution</application> sorts the list from
+	newest to oldest. You can also right-click on the message
+	header bars to get a set of sorting options, and add or
+	remove columns from the message list.  You can find detailed
+	instructions on how to customize your message display
+	columns in <xref linkend="usage-mail-organize-columns">.
       </para>
-
       <para>
-        Most of the mail-related actions you'll want to perform are
-        listed in the <guimenu>Message</guimenu> menu in the menu
-        bar.  The most frequently used ones, like
-        <guimenuitem>Reply</guimenuitem> and
-        <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-         the toolbar, and almost all of them are duplicated in the
-        right-click menu and as keyboard shortcuts, which tend to be
-        faster once you get the hang of them.  You can choose
-        whichever way you like best; the idea is that the software
-        should work the way you want, rather than making you work the
-        way the it does.
-         <tip id="view-headers">
-          <title>Take a look at the headers</title>
-          <para>
-            To look at the entire source of your email message, including
-            all the header information, select
-            <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenuitem></menuchoice>
-          </para>
-        </tip>
+	You can also choose a threaded message view. Select
+	<menuchoice> 
+	  <guimenu>View</guimenu>
+          <guimenuitem>Threaded</guimenuitem> 
+	</menuchoice> 
+	to turn the threaded view on or off.  When you select this option,
+	<application>Evolution</application> groups the replies to a
+	message with the original, so you can follow the thread of a
+	conversation from one message to the next.
       </para>
-
-      <sect2 id="usage-mail-listorder">
-        <title>Sorting the message list</title>
-        <para>
-          One of the ways <application>Evolution</application> lets
-          you choose the way you work is the way it lets you sort your
-          message lists.  To sort by sender, subject, or date, click
-          on the bars with those labels at the top of the message
-          list. The direction of the arrow next to the label indicates
-          the direction of the sort, and if you click again, you'll
-          sort them in reverse order. For example, click once on
-          <guilabel>Date</guilabel> to sort messages by date from
-          oldest to newest.  Click again, and
-          <application>Evolution</application> sorts the list from
-          newest to oldest. You can also right-click on the message
-          header bars to get a set of sorting options, and add or
-          remove columns from the message list.  You can find detailed
-          instructions on how to customize your message display
-          columns in <xref linkend="usage-mail-organize-columns">.
-        </para>
-        <para>
-          You can also choose a threaded message view. Select
-          <menuchoice> <guimenu>View</guimenu>
-          <guimenuitem>Threaded</guimenuitem> </menuchoice> to turn
-          the threaded view on or off.  When you select this option,
-          <application>Evolution</application> groups the replies to a
-          message with the original, so you can follow the thread of a
-          conversation from one message to the next.
-        </para>
-      </sect2>
-      <sect2 id="usage-mail-getnsend-delete">
+    </sect2>
+    
+    <sect2 id="usage-mail-getnsend-delete">
         <title>Deleting Mail</title>
         <para>
           Once you've read your mail, you may want to get rid of
-          it. To mark a message for deletion, select it in the the
-          <interface>message list</interface> by clicking on it once.
-          Then click on the <guibutton>Delete</guibutton> button in
-          the tool bar. Or, right-click on a message and choose
-          <guimenuitem>Delete</guimenuitem> from the right-click
-          menu. The message will appear with a line through it, to
-          show that you've marked it for deletion.
-        </para>
-        <para>
-          If you change your mind and decide you want to keep it,
-          select <menuchoice> <guimenu>Message</guimenu>
-          <guimenuitem>Undelete</guimenuitem></menuchoice>.  If you
-          really want to get rid of it, choose
-          <guimenuitem>Expunge</guimenuitem> from the
-          <guimenu>Folder</guimenu> menu.  That will delete it
-          permanently.
-        </para>
-      </sect2>
-    </sect1>
-
-    <sect1 id="usage-mail-getnsend-get">
-      <title>Checking Mail</title>
-      <para>
-        Now that you've had a look around the
-        <interface>Inbox</interface>, it's time to check for new mail.
-        Click <guibutton>Get mail</guibutton> in the toolbar to check
-        your mail.  If it's the first time you've done so, the
-        <interface>mail setup assistant</interface> will ask you for
-        the information it needs to check your mail (see <xref
-        linkend="config-setupassist"> for more information).
-     </para>
-     <para>
-        Then, you need to enter your email
-        password. <application>Evolution</application> will remember
-        your password until until you select <menuchoice>
-        <guimenu>Settings</guimenu> <guimenuitem>Forget
-        Passwords</guimenuitem> </menuchoice>.
+          it. 
+	To delete a message:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Click the message to select it
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Press delete button or right click and click on 
+	      <guilabel>Delete</guilabel>.
+	    </para>
+	    <note>
+	      <title>Deleted but still here?</title>
+	      <para>
+		When you do this, your message is marked to be deleted.  It is
+		not until you expunge the message that the message is gone.
+	      </para>
+	    </note>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click
+	      <menuchoice>
+		<guimenu>Actions</guimenu>
+		<guimenuitem>Expunge</guimenuitem>
+	      </menuchoice>
+	      or press
+	      <keycombo action="simul">
+		<keycap>Ctrl</keycap>
+		<keycap>E</keycap>
+	      </keycombo>
+	    </para>
+	  </listitem>
+	</orderedlist>
       </para>
+    </sect2>
+    <sect2 id="usage-mail-getnsend-undelete">
+      <title>Undeleting Messages</title>
       <para>
-        Once it's validated the password,
-        <application>Evolution</application> will check your mail.
-        New mail will appear in the local <interface>Inbox</interface>
-        if you're using a <glossterm>POP</glossterm> account, and in
-        your <glossterm>IMAP</glossterm> folders if you use IMAP.  If
-        you have chosen to use IMAP, and you have multiple folders on
-        your IMAP server, you may need to subscribe to them.  To learn
-        how to use the subscription manager, read <xref
-        linkend="usage-mail-subscriptions">.
-      </para>
-
-     <note id="badmailsettings">
-     <title>Can't Check Mail?</title>
-     <para>
-        If you get an error message instead of mail, you probably need
-        to change your network settings.  To learn how to do that,
-        have a look at <xref linkend="config-prefs-mail-network">, or
-        ask your system administrator.
+	To undelete a message:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Click a message marked for deletion to select it
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click
+	      <menuchoice>
+		<guimenu>Actions</guimenu>
+		<guimenuitem>Undelete</guimenuitem>
+	      </menuchoice>
+	    </para>
+	    <note>
+	      <title>What does Undelete actually do?</title>
+	      <para>
+		Undelete doesn't bring back messages that have been expunged.
+		Undelete simply unmarks messages for expunging.
+	      </para>
+	    </note>
+	  </listitem>
+	</orderedlist>
       </para>
-    </note>
+    </sect2>
+  </sect1>
 
-      <sect2 id="usage-mail-getnsend-get-news">
-         <title>Using Evolution for News </title>
-       <para>
-         Newsgroups are so similar to email that there's no reason not
-         to read them side by side.  If you want to do that, add a
-         news source to your configuration (see <xref
-         linkend="config-prefs-network-news">). The news server will
-         appear as a remote server, and will look quite similar to an
-         IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
-         <application>Evolution</application> will also check for news
-         messages.
+  <sect1 id="usage-mail-getnsend-get">
+    <title>Checking Mail</title>
+    <para>
+      Now that you've had a look around the <interface>Inbox</interface>, it's
+      time to check for new mail.  Click <guibutton>Get Mail</guibutton> in the
+      toolbar to check your mail.  If it's the first time you've done so, the
+      <interface>mail setup assistance</interface> will ask you for the
+      information it needs to check your email.
+    </para>
+    <para>
+      The druid will give you several dialogue boxes where you setup:
+      <itemizedlist>
+	<listitem>
+	  <para>
+	    Setup your personal information
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Setup your outgoing email server information
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Identity Name
+	  </para>
+	</listitem>
+      </itemizedlist>
+    </para>
+    <para>
+      To check your email, press the <guibutton>Check Mail</guibutton> button.
+      If this is your first time checking mail, or you don't have
+      <application>Evolution</application> setup to store your password, you'll
+      be prompted for the password.  Enter your password and your email will be
+      downloaded.
+    </para>
+    <note id="badmailsettings">
+      <title>Can't Check Mail?</title>
+      <para>
+	If you get an error message instead of mail, you probably need to check
+	your network settings.  If you.  To learn how to do that,
+	 have a look at <xref linkend="config-prefs-mail-network">, or
+	 ask your system administrator.
        </para>
-       </sect2>
+     </note>
 
-      <sect2 id="usage-mail-getnsend-get-attach">
-        <title>Attachments and HTML Mail</title>
-        <para>
-          If someone sends you an <glossterm>attachment</glossterm>, a
-          file attached to an email,
-          <application>Evolution</application> will display the file
-          at the bottom of the message to which it's attached.  Text,
-          HTML, and most images will be displayed within the message
-          itself.  For other files,
-          <application>Evolution</application> will show an icon at
-          the end of the message.  Right-click on the icon to get a
-          list of options which will vary depending on the type of
-          attachment. You will have the option to display most files
-          as part of the message, export them to a different
-          application (images to Eye of GNOME, spreadsheets to
-          Gnumeric, and so forth), or save them to disk.
-        </para>
+       <sect2 id="usage-mail-getnsend-get-news">
+	  <title>Using Evolution for News </title>
+	<para>
+	  Newsgroups are so similar to email that there's no reason not
+	  to read them side by side.  If you want to do that, add a
+	  news source to your configuration (see <xref
+	  linkend="config-prefs-network-news">). The news server will
+	  appear as a remote server, and will look quite similar to an
+	  IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
+	  <application>Evolution</application> will also check for news
+	  messages.
+	</para>
+	</sect2>
 
+       <sect2 id="usage-mail-getnsend-get-attach">
+	 <title>Attachments and HTML Mail</title>
+	 <para>
+	   If someone sends you an <glossterm>attachment</glossterm>, a
+	   file attached to an email,
+	   <application>Evolution</application> will display the file
+	   at the bottom of the message to which it's attached.  Text,
+	   HTML, and most images will be displayed within the message
+	   itself.  For other files,
+	   <application>Evolution</application> will show an icon at
+	   the end of the message. 
+     </para>
+     <para>
+       To Save an Attachment to Disk:
+       <orderedlist numeration="arabic">
+	 <listitem>
+	   <para>
+	     Open up the desired email
+	   </para>
+	 </listitem>
+	 <listitem>
+	   <para>
+	     Click on the down arrow at the bottom of the email for the desired
+	     attachment.
+	   </para>
+	 </listitem>
+	 <listitem>
+	   <para>
+	     Select <guibutton>Save to Disk</guibutton>.
+	   </para>
+	 </listitem>
+	 <listitem>
+	   <para>
+	     Choose the directory and filename you wish.
+	   </para>
+	 </listitem>
+	 <listitem>
+	   <para>
+	     Click <guibutton>OK</guibutton>
+	   </para>
+	 </listitem>
+       </orderedlist>
+      </para>
+      <tip>
+	<para>
+	  To automatically view an attachment inline, press the arrow button next
+	  to the attachment.
+	</para>
+      </tip>
+      <para>
+	To Open an Attachment in a Program:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Open up the desired email
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click the down arrow at the bottom of the email for the desired
+	      attachment.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>Open in Program</guibutton> where program is the
+	      program that is assigned to open that file type.
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+    
+      
+      <!-- Right-click on the icon to get a
+      list of options which will vary depending on the type of
+      attachment. You will have the option to display most files
+      as part of the message, export them to a different
+      application (images to Eye of GNOME, spreadsheets to
+      Gnumeric, and so forth), or save them to disk.
+    </para>
+      -->
         <para>
            <application>Evolution</application> can also display
            HTML-formatted mail, complete with graphics.  HTML
@@ -283,14 +408,14 @@
 
  <!-- Check the alignment of the following paragraph in the PS and
  HTML output: it's indented for no good reason 
-      Kevin Breit: I dont see a problem with it.
--->
+      Kevin Breit: I dont see a problem with the HTML.
+    -->
       <para>
-         Enter an address in the <guilabel>To:</guilabel> field, a
-         subject in the <guilabel>Subject:</guilabel> and a message in
-         the big empty box at the bottom of the window, and press
-         <guibutton>Send</guibutton>.
-       </para>
+      Enter an address in the <guilabel>To:</guilabel> field.  If you wish
+      enter a  subject in the <guilabel>Subject:</guilabel> and a message in
+      the big empty box at the bottom of the window.  Once you have revised
+      your message, press <guibutton>Send</guibutton>.
+    </para>
 
       <sect2 id="usage-mail-getnsend-send-delay">
         <title>Saving Messages for Later</title>
@@ -312,44 +437,57 @@
            filter behavior, see <xref linkend="config-prefs-mail">.
         </para>
 
-        <para>
-           You can also choose to save messages as drafts or as text
-           files.  Choose
-           <menuchoice>
-             <guimenu>File</guimenu>
-             <guimenuitem>Save</guimenuitem>
+      <para>
+	You can also choose to save messages as drafts or as text
+	files.  Choose
+	<menuchoice>
+	  <guimenu>File</guimenu>
+	  <guimenuitem>Save</guimenuitem>
           </menuchoice>
-          or <guimenuitem>Save As</guimenuitem> to save your message
-          as a text file. If you prefer to keep your message in a
-          folder (the <guilabel>Drafts</guilabel> folder would be the
-          obvious place), you can select <menuchoice>
+	or <guimenuitem>Save As</guimenuitem> to save your message
+	as a text file. If you prefer to keep your message in a
+	folder (the <guilabel>Drafts</guilabel> folder would be the
+	obvious place), you can select <menuchoice>
           <guimenu>File</guimenu> <guimenuitem>Save In
-          Folder</guimenuitem> </menuchoice>.
-        </para>
-      </sect2>
-      <sect2 id="usage-mail-getnsend-send-compose">
-        <title>Advanced Mail Composition</title>
-        <para>
-          You can probably guess the purpose of the buttons labelled
-          <guibutton>Cut</guibutton>, <guibutton>Copy</guibutton>,
-          <guibutton>Paste</guibutton>, <guibutton>Undo</guibutton>
-          and <guibutton>Redo</guibutton>, but there's a bit more to
-          sending mail that's less obvious.  In the next few sections,
-          you'll see how <application>Evolution</application> handles
-          additional features, including large recipient lists,
-          attachments, and forwarding.
-        </para>
+	    Folder</guimenuitem> </menuchoice>.
+      </para>
+    </sect2>
+
+    <sect2 id="usage-mail-getnsend-send-compose">
+      <title>Advanced Mail Composition</title>
+      <para>
+	<application>Evolution</application> is meant to not only handle large
+	amounts of incoming mail, but helps you manage all the tasks of having
+	an email account.
+	In the next few sections, you'll see how 
+	<application>Evolution</application> handles additional features, 
+	including large recipient lists, attachments, and forwarding.
+      </para>
       <sect3 id="usage-mail-getnsend-send-attach">
         <title>Attachments</title>
         <para>
-            If you want to attach a file to your email message, you
-            can drag it from your desktop into the message window, or
-            click the button in the toolbar with a paper clip on it,
-            labelled <guibutton>Attach</guibutton>.  If you click the
-            <guibutton>Attach</guibutton> button,
-            <application>Evolution</application> will open a file
-            selection dialog box to ask you which file you want to
-            send.  Select the file and click <guilabel>OK</guilabel>.
+	  To attach a file to your email:
+	  <orderedlist numeration="arabic">
+	    <listitem>
+	      <para>
+		Push the attach button in the composer toolbar
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Select the file you want to attach
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Press <guibutton>OK</guibutton>
+	      </para>
+	    </listitem>
+	  </orderedlist>
+	</para>
+	<para>
+	  You can drag a file from your desktop into the composer window to
+	  attach it as well.
         </para>
         <para>
             To hide the display of files you've attached to the
@@ -371,11 +509,12 @@
             addressbook, or never load images.
         </para>
       </sect3>
+
       <sect3 id="usage-mail-getnsend-send-to-types">
-         <title>Types of Recipients</title>
+	<title>Types of Recipients</title>
         <para>
-            <application>Evolution</application>, like most email
-            programs recognizes three types of addressee: primary
+	  <application>Evolution</application>, like most email
+	  programs recognizes three types of addressee: primary
             recipients, secondary recipients, and hidden ("blind")
             recipients.
          </para>
@@ -429,7 +568,7 @@
         <sect3 id="usage-mail-getnsend-send-to">
         <title>Choosing Recipients Quickly</title>
         <para>
-f you have created address cards in the contact manager,
+	  If you have created address cards in the contact manager,
           you can also enter nicknames or other portions of address
           data, and <application>Evolution</application> will transparently
           complete
@@ -446,7 +585,7 @@ f you have created address cards in the contact manager,
             Alternately, you can click on the
             <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
             <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
-            potentially a very long one &mdash; of the email addresses
+            a potentially a very long one &mdash; of the email addresses
             in your contact manager.  Select addresses and click on
             the arrows to move them into the appropriate address
             columns.
@@ -543,7 +682,7 @@ with quoted materials and the relevant replies interspersed-->
       <sect2 id="usage-mail-getnsend-send-find">
         <title>Searching and Replacing with the Composer</title>
         <para>
-           You're probably familiar with search and replace features,
+           You maybe familiar with search and replace features,
            and if you come from a Linux or Unix background, you
            probably know what <guimenuitem>Find Regex</guimenuitem>
            does.  If you aren't among the lucky who already know,
@@ -588,6 +727,7 @@ with quoted materials and the relevant replies interspersed-->
 
           </variablelist>
         </para>
+
         <para>
             For all of these menu items, you can choose whether or not
             to <guilabel>Search Backwards</guilabel> in the document
@@ -598,6 +738,7 @@ with quoted materials and the relevant replies interspersed-->
             a match.
         </para>
       </sect2>
+
       <sect2 id="usage-mail-getnsend-send-html">
         <title>Embellish your email with HTML</title>
         <para>
@@ -650,44 +791,44 @@ with quoted materials and the relevant replies interspersed-->
                   or <guilabel>Header 1</guilabel> through
                   <guilabel>Header 6</guilabel> for varying sizes of
                   header from large (1) to tiny (6). Other styles
-                  include <guilabel>pre</guilabel>, to use the HTML
+                  include <guilabel>preformat</guilabel>, to use the HTML
                   tag for preformatted blocks of text, and three types
                   of <guilabel>List Item</guilabel> for the highly
                   organized.
                 </para>
               </listitem>
            </varlistentry>
-           <varlistentry>
-             <term>Text style</term>
-              <listitem>
-                <para>
-                  Use these buttons to determine the way your letters
-                  look.  If you have text selected, the style will
-                  apply to the selected text.  If you do not have text
-                  selected, the style will apply to whatever you type
-                  next.  The buttons are:
-                  <itemizedlist mark="none">
-                    <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>
-                    <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
-                    <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
-                    <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
-                  </itemizedlist>
-                </para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
+	  <varlistentry>
+	    <term>Text style</term>
+	    <listitem>
+	      <para>
+		Use these buttons to determine the way your letters
+		look.  If you have text selected, the style will
+		apply to the selected text.  If you do not have text
+		selected, the style will apply to whatever you type
+		next.  The buttons are:
+		<itemizedlist mark="none">
+		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>
+		  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
+		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
+		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
+		</itemizedlist>
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
               <term>Alignment</term>
-              <listitem>
-                <para>
-                   Located next to the text style buttons, these three
-                   paragraph icons should be familiar to users of most
-                   word processing software.  The leftmost button will
-                   make your text aligned to the left, the center
-                   button, centered, and the right hand button,
-                   aligned on the right side.
-                </para>
-              </listitem>
-              </varlistentry>
+	    <listitem>
+	      <para>
+		Located next to the text style buttons, these three
+		paragraph icons should be familiar to users of most
+		word processing software.  The leftmost button will
+		make your text aligned to the left, the center
+		button, centered, and the right hand button,
+		aligned on the right side.
+	      </para>
+	    </listitem>
+	  </varlistentry>
 
             <varlistentry>
               <term>Indentation rules</term>
@@ -719,79 +860,114 @@ with quoted materials and the relevant replies interspersed-->
           </variablelist>
         </para>
         <para>
-           There are three tools that you can find only in the
-           <guimenu>Insert</guimenu> menu.
-           <variablelist>
-             <varlistentry>
-               <term><guimenuitem>Insert Link</guimenuitem>:</term>
-               <listitem>
-                <para>
-                  Use this tool to put hyperlinks in your HTML
-                  messages.  When you select it,
-                  <application>Evolution</application> will prompt you
-                  for the <guilabel>Text</guilabel> that will appear,
-                  and the <guilabel>Link</guilabel>, where you should
-                  enter the actual web address (URL). If you don't
-                  want special link text, you can just enter the address
+	The <guimenu>Insert</guimenu> gives you three opinions which let you
+           spruce up your email to make it more interesting:
+	<variablelist>
+	  <varlistentry>
+	    <term><guimenuitem>Insert Link</guimenuitem></term>
+	    <listitem>
+	      <para>
+		Lets you link some text to a website.  Use this tool to put hyperlinks in your HTML
+                  messages.  If you don't want special link text, you can just enter the address
                   directly, and <application>Evolution</application>
                   will recognize it as a link.
-               </para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term> <guimenuitem>Insert Image</guimenuitem>:</term>
-            <listitem>
-              <para>
-               Select this item to embed an image into your email, as
-               was done in the welcome message.  Images will appear at
-               the location of the cursor. This is different from
-               attaching them to a message, but not very different.
-              </para>
-            </listitem>
-           </varlistentry>
-          <varlistentry>
-             <term><guimenuitem>Insert Rule</guimenuitem>:</term>
-             <listitem><para>
-               This will insert a horizontal line, or rule, into your document.
-               You'll be presented with a dialog box which gives you
-               the choice of size, percentage of screen, shading, and
-               alignment; if you leave everything at the default
-               values you'll get a thin black rule all the way across
-               the screen.</para></listitem>
-        </varlistentry>
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guimenuitem>Insert Image</guimenuitem></term>
+	    <listitem>
+	      <para>
+		Lets you put an image alongside text.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guimenuitem>Insert Rule</guimenuitem></term>
+	    <listitem>
+	      <para>
+		Inserts a horizontal line into the text to help divide two
+		sections.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  </variablelist>
+	To add a hyperlink to your HTML message:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Select the text you want to link from
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Right click on text and select
+	      <guimenuitem>Link</guimenuitem>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Enter the address you wish to link to in the
+	      <guilabel>URL</guilabel> field.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Press <guibutton>OK</guibutton>.
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+      <para>
+	To add an image to your HTML message:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Click
+	      <menuchoice>
+		<guimenu>Insert</guimenu>
+		<guimenuitem>Image</guimenuitem>
+	      </menuchoice>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>Browse</guibutton>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Select the image you want
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Press <guibutton>OK</guibutton>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Press <guibutton>Insert</guibutton>
+	    </para>
+	  </listitem>
+	</orderedlist>
 
-          </variablelist>
-          </para>
-          <note>
-            <title>A Technical note on HTML Tags</title>
-            <para>
-              The composer is a <acronym>WYSIWYG</acronym>
-              (What You See Is What You Get)
-              editor for HTML. That means that if you enter HTML
-              directly into the composer&mdash; say, <markup
-              role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
-              the composer will assume you meant exactly that string
-              of characters, and not "make this text bold," as an HTML
-              composition tool or text editor would.
-            </para>
+      </para>
+      <note>
+	<title>A Technical note on HTML Tags</title>
+	<para>
+	  The composer is a <acronym>WYSIWYG</acronym>
+	  (What You See Is What You Get)
+	  editor for HTML. That means that if you enter HTML
+	  directly into the composer&mdash; say, 
+	  <markup role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
+	  the composer will assume you meant exactly that string
+	  of characters, and not "make this text bold," as an HTML
+	  composition tool or text editor would.
+	</para>
         </note>
       </sect2>
 
-
-<!-- Function not implemented, possibly never will be due to security evil. -->
-<!--
-        <sect3 id="usage-mail-getnsend-send-live">
-          <title>Live Documents</title>
-          <para>
-            Later versions of <application>Evolution</application>
-            will allow you to enliven your email with almost any
-            sort of document, and even with entire
-            applications. At this point, however, this feature has not 
-            yet been implemented.
-          </para>
-        </sect3>
--->
-
       <sect2 id="usage-mail-getnsend-fwd">
         <title>Forwarding Mail</title>
         <para>
@@ -828,6 +1004,7 @@ with quoted materials and the relevant replies interspersed-->
           <guibutton>Send</guibutton>.
         </para>
       </sect2>
+
       <sect2 id="usage-mail-getnsend-ettiquette">
         <title>Seven Tips for Email Courtesy</title>
         <para>
@@ -892,24 +1069,31 @@ with quoted materials and the relevant replies interspersed-->
       <para>
          <application>Evolution</application> lets you handle your
          IMAP and newsgroup subscriptions with the same tool: the
-         subscriptions manager.  To start using it, choose
-         <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
-         Subscriptions</guimenuitem> </menuchoice>.
-      </para>
-      <para>
-         If you have configured any IMAP (mail) or NNTP (news)
-         servers, you will see them listed in the left half of the
-         subscription management window.  Click on a server to select
-         it, and you will see the folders or newsgroups available to
-         you.  You can then select individual folders and subscribe to
-         them, or remove yourself from the subscription list.
-      </para>
-      <para>
-        Once you have subscribed to a folder or newsgroup, your system
-        will check for new messages whenever you press the
-        <guibutton>Get Mail</guibutton> button.
-      </para>
-</sect1>
+         subscriptions manager.
+
+      <orderedlist numeration="arabic">
+	<listitem>
+	  <para>
+	    Click on the folder you wish to subscribe to in the
+	    <guilabel>Store</guilabel> section.
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Click the <guibutton>Subscribe</guibutton> to add it to the
+	    subscribed list.
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Close the window.
+	  </para>
+	</listitem>
+
+      </orderedlist>
+    </para>
+
+  </sect1>
 
   
 <sect1 id="encryption">
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7caf5ae499..ac79ab4be3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-03  Kevin Breit  <battery841@mediaone.net>
+
+	* C/usage-mail.sgml: Put in lots of orderedlists...more SGML, less
+	for the user to read.  They'll thank me in droves later.
+
+	* C/usage-exec-summary.sgml: Fixed build error
+
 2001-06-29  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* white-papers/mail/camel.sgml: Updated slightly.
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
index 77f84e8230..cccf6c409f 100644
--- a/help/C/usage-exec-summary.sgml
+++ b/help/C/usage-exec-summary.sgml
@@ -3,8 +3,8 @@
     <para>
        My Evolution is designed to show you a
        summary of important information: the appointments for a given
-       day, important email, and so forth. To see your My Evolution. 
-       , click on the <guibutton>My Evolution</guibutton>
+       day, important email, and so forth. To see your My Evolution, 
+       click on the <guibutton>My Evolution</guibutton>
        button in the shortcut bar, or select the
        <guilabel>My Evolution</guilabel> folder in the folder
        bar.
@@ -14,40 +14,24 @@
       <title>Introducing My Evolution</title>
       <para>
         The first thing you'll want to do with My Evolution
-        is add a service. Click the <guibutton>Add Service</guibutton>
-        button in the toolbar, then select one of the available
-        services.  Services may vary depending upon your system, but
-        most installations will have at least the following options:
+        is add a service. Go to
+      <menuchoice>
+	<guimenu>Tools</guimenu>
+	<guimenuitem>My Evolution Settings</guimenuitem>
+      </menuchoice>
+      then select one of the available
+      services.  Services may vary depending upon your system, but
+      most installations will have at least the following options:
+      <variablelist>
 
-        <variablelist>
-
-          <varlistentry>
-             <term>Calendar</term>
-             <listitem>
-               <para>
-                  Pending appointments and other events for that day.
-               </para>
-             </listitem>
-           </varlistentry>
-
-          <varlistentry>
-             <term>Inbox</term>
-             <listitem>
-               <para>
-                 Information about your mail, such as the number of
-                 new messages you have waiting.
-               </para>
-             </listitem>
-           </varlistentry>
-
-          <varlistentry>
-             <term>To Do</term>
-             <listitem>
-               <para>
-                 A short summary of your task pad.
-               </para>
-             </listitem>
-           </varlistentry>
+	<varlistentry>
+	  <term>Mail</term>
+	  <listitem>
+	    <para>
+	      Display amount of unread email in your selected folders.
+	    </para>
+	  </listitem>
+	</varlistentry>
 
           <varlistentry>
              <term>RDF Summary</term>
@@ -61,27 +45,136 @@
              </listitem>
            </varlistentry>
 
-        </variablelist>
-
-     </para>
+	<varlistentry>
+	  <term>Weather</term>
+	  <listitem>
+	    <para>
+	      Shows you the current weather for the cities of your choice.
+	    </para>
+	  </listitem>
+	</varlistentry>
 
-     <para>
-       Each service appears in a small box on the screen; you can
-       remove the service by clicking the <guibutton>x</guibutton>
-       button in the upper right, or bring up a settings dialog by
-       clicking the little wrench icon below that.
-     </para>
-   </sect1>
-<!-- 
-   <sect1 id="exec-services-detail">
-     <title>Services in Detail</title>
+	<varlistentry>
+	  <term>Schedule</term>
+	  <listitem>
+	    <para>
+	      Lets you see the events for the day.
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+    </para>
+    <para>
+      <application>Evolution</application> comes with ... enabled by
+      default.
+    </para>
+    <sect2 id="new-components">
+      <title>Adding New Components</title>
+      <para>
+	To add a new service:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Choose
+	      <menuchoice>
+		<guimenu>Tools</guimenu>
+		<guimenuitem>My Evolution Settings</guimenuitem>
+	      </menuchoice>
+	      from the menubar.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Select the service you wish to add by clicking on the respective
+	      tab.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Choose <guibutton>OK</guibutton> when finished configuring the
+	      item.
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+    </sect2>
+    <sect2 id="delete-components">
+      <title>Deleting Components</title>
+      <para>
+	Of course, there are possibly some components which you'd prefer not too
+	view in your My Evolution.
+	To remove a component:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Choose
+	      <menuchoice>
+		<guimenu>Tools</guimenu>
+		<guimenuitem>My Evolution Settings</guimenuitem>
+	      </menuchoice>
+	      from the menubar.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click the <guilabel>Enable</guilabel> button in the component you
+	      would like to disable.
+	      <!-- This is incorrect.  I am going to ask Iain if he could throw
+	      in an Enable button -->
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+    </sect2>
+    <sect2 id="modifying-components">
+      <title>Modifying Components</title>
       <para>
-          This section will show you how to use several
-          <application>Evolution</application> services, once they
-          become available.  Wait for updates.  FIXME
+	Chances are, the components that you setup aren't going to be setup for
+	your needs.  For instance, you may choose that you want to use different
+	city choices than the default settings.
+	<application>Evolution</application> lets you configure all the
+	components in My Evolution.
       </para>
-     
-    </sect1>
--->
+      <sect3 id="modifying-components-mail">
+	<title>Modifying Mail</title>
+	<para>
+	  To modify mail:
+	  <orderedlist numeration="arabic">
+	    <listitem>
+	      <para>
+		Choose
+		<menuchoice>
+		  <guimenu>Tools</guimenu>
+		  <guimenuitem>My Evolution Settings</guimenuitem>
+		</menuchoice>
+		from the menubar.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Click the <guilabel>Mail</guilabel> tab at the top of the
+		window.
+	      </para>
+	    </listitem>
+	  </orderedlist>
+	</para>
+	<para>
+	  The <guilabel>Mail</guilabel> service window is broken up into two
+	  sections.  The left section is where your mail folders are listed.
+	  The right section shows which folders are displayed.
+	</para>
+	<para>
+	  To add a folder to be displayed, click on a folder in the
+	  <guilabel>All folders</guilabel> section and click the
+	  <guibutton>Add</guibutton> button.
+	</para>
+	<para>
+	  To remove a folder from the service, click on the folder in the
+	  <guilabel>Display folders</guilabel> section and click the
+	  <guibutton>Remove</guibutton> button.
+	</para>
+      </sect3>
+    </sect2>
+  </sect1>
 </chapter>
 
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 1217109a25..3f8ced92f1 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -56,6 +56,7 @@
        start with the <interface>Inbox</interface> open and show you a
        message from Ximian welcoming you to the application.
       </para>
+
       <para>
         Your <application>Evolution</application>
         <guilabel>Inbox</guilabel> will look something like the one in
@@ -82,172 +83,296 @@
       </figure>
 <!-- ==============End of Figure============================== -->
 
-      <para>
-        <inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
-        <guilabel>Email Viewer</guilabel>
-      </para>
-
-      <para>
-        This is where your email is displayed.
-      </para>
+    <para>
+      <inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
+      <guilabel>Email Viewer</guilabel>
+    </para>
+    
+    <para>
+      This is where your email is displayed.
+    </para>
 
-      <para>
-        <inlinegraphic fileref="fig/full-2.png"></inlinegraphic>
-        <guilabel>Email List</guilabel>
-      </para>
+    <para>
+      <inlinegraphic fileref="fig/full-2.png"></inlinegraphic>
+      <guilabel>Email List</guilabel>
+    </para>
+    
+    <para>
+      The <guilabel>Email List</guilabel> lists off all the emails that you
+      have.  This includes all your read, unread, and email that is flagged 
+      to be deleted.
+    </para>
+    
+    <para>
+      Most of the mail-related actions you'll want to perform are
+      listed in the <guimenu>Message</guimenu> menu in the menu
+      bar.  The most frequently used ones, like
+      <guimenuitem>Reply</guimenuitem> and
+      <guimenuitem>Forward</guimenuitem>, also appear as buttons in
+      the toolbar. Almost all of them are also located in the
+      right-click menu and as keyboard shortcuts, which tend to be
+      faster once you get the hang of them.  You can choose
+      whichever way you like best; the idea is that the software
+      should work the way you want, rather than making you work the
+      way the it does.
+      
+      <tip id="view-headers">
+	<title>Take a look at the headers</title>
+	<para>
+	  To look at the entire source of your email message, including
+	  all the header information, select
+	  <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenuitem></menuchoice>
+	</para>
+      </tip>
 
+    </para>
+    
+    <sect2 id="usage-mail-listorder">
+      <title>Sorting the message list</title>
       <para>
-        The <guilabel>Email List</guilabel> lists off all the emails that you
-        have.  This includes all your read, unread, and email that is flagged to        be deleted.
+	One of the ways <application>Evolution</application> lets
+	you choose the way you work is the way it lets you sort your
+	message lists.  To sort by sender, subject, or date, click
+	on the bars with those labels at the top of the message
+	list. The direction of the arrow next to the label indicates
+	the direction of the sort, and if you click again, you'll
+	sort them in reverse order. For example, click once on
+	<guilabel>Date</guilabel> to sort messages by date from
+	oldest to newest.  Click again, and
+	<application>Evolution</application> sorts the list from
+	newest to oldest. You can also right-click on the message
+	header bars to get a set of sorting options, and add or
+	remove columns from the message list.  You can find detailed
+	instructions on how to customize your message display
+	columns in <xref linkend="usage-mail-organize-columns">.
       </para>
-
       <para>
-        Most of the mail-related actions you'll want to perform are
-        listed in the <guimenu>Message</guimenu> menu in the menu
-        bar.  The most frequently used ones, like
-        <guimenuitem>Reply</guimenuitem> and
-        <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-         the toolbar, and almost all of them are duplicated in the
-        right-click menu and as keyboard shortcuts, which tend to be
-        faster once you get the hang of them.  You can choose
-        whichever way you like best; the idea is that the software
-        should work the way you want, rather than making you work the
-        way the it does.
-         <tip id="view-headers">
-          <title>Take a look at the headers</title>
-          <para>
-            To look at the entire source of your email message, including
-            all the header information, select
-            <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenuitem></menuchoice>
-          </para>
-        </tip>
+	You can also choose a threaded message view. Select
+	<menuchoice> 
+	  <guimenu>View</guimenu>
+          <guimenuitem>Threaded</guimenuitem> 
+	</menuchoice> 
+	to turn the threaded view on or off.  When you select this option,
+	<application>Evolution</application> groups the replies to a
+	message with the original, so you can follow the thread of a
+	conversation from one message to the next.
       </para>
-
-      <sect2 id="usage-mail-listorder">
-        <title>Sorting the message list</title>
-        <para>
-          One of the ways <application>Evolution</application> lets
-          you choose the way you work is the way it lets you sort your
-          message lists.  To sort by sender, subject, or date, click
-          on the bars with those labels at the top of the message
-          list. The direction of the arrow next to the label indicates
-          the direction of the sort, and if you click again, you'll
-          sort them in reverse order. For example, click once on
-          <guilabel>Date</guilabel> to sort messages by date from
-          oldest to newest.  Click again, and
-          <application>Evolution</application> sorts the list from
-          newest to oldest. You can also right-click on the message
-          header bars to get a set of sorting options, and add or
-          remove columns from the message list.  You can find detailed
-          instructions on how to customize your message display
-          columns in <xref linkend="usage-mail-organize-columns">.
-        </para>
-        <para>
-          You can also choose a threaded message view. Select
-          <menuchoice> <guimenu>View</guimenu>
-          <guimenuitem>Threaded</guimenuitem> </menuchoice> to turn
-          the threaded view on or off.  When you select this option,
-          <application>Evolution</application> groups the replies to a
-          message with the original, so you can follow the thread of a
-          conversation from one message to the next.
-        </para>
-      </sect2>
-      <sect2 id="usage-mail-getnsend-delete">
+    </sect2>
+    
+    <sect2 id="usage-mail-getnsend-delete">
         <title>Deleting Mail</title>
         <para>
           Once you've read your mail, you may want to get rid of
-          it. To mark a message for deletion, select it in the the
-          <interface>message list</interface> by clicking on it once.
-          Then click on the <guibutton>Delete</guibutton> button in
-          the tool bar. Or, right-click on a message and choose
-          <guimenuitem>Delete</guimenuitem> from the right-click
-          menu. The message will appear with a line through it, to
-          show that you've marked it for deletion.
-        </para>
-        <para>
-          If you change your mind and decide you want to keep it,
-          select <menuchoice> <guimenu>Message</guimenu>
-          <guimenuitem>Undelete</guimenuitem></menuchoice>.  If you
-          really want to get rid of it, choose
-          <guimenuitem>Expunge</guimenuitem> from the
-          <guimenu>Folder</guimenu> menu.  That will delete it
-          permanently.
-        </para>
-      </sect2>
-    </sect1>
-
-    <sect1 id="usage-mail-getnsend-get">
-      <title>Checking Mail</title>
-      <para>
-        Now that you've had a look around the
-        <interface>Inbox</interface>, it's time to check for new mail.
-        Click <guibutton>Get mail</guibutton> in the toolbar to check
-        your mail.  If it's the first time you've done so, the
-        <interface>mail setup assistant</interface> will ask you for
-        the information it needs to check your mail (see <xref
-        linkend="config-setupassist"> for more information).
-     </para>
-     <para>
-        Then, you need to enter your email
-        password. <application>Evolution</application> will remember
-        your password until until you select <menuchoice>
-        <guimenu>Settings</guimenu> <guimenuitem>Forget
-        Passwords</guimenuitem> </menuchoice>.
+          it. 
+	To delete a message:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Click the message to select it
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Press delete button or right click and click on 
+	      <guilabel>Delete</guilabel>.
+	    </para>
+	    <note>
+	      <title>Deleted but still here?</title>
+	      <para>
+		When you do this, your message is marked to be deleted.  It is
+		not until you expunge the message that the message is gone.
+	      </para>
+	    </note>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click
+	      <menuchoice>
+		<guimenu>Actions</guimenu>
+		<guimenuitem>Expunge</guimenuitem>
+	      </menuchoice>
+	      or press
+	      <keycombo action="simul">
+		<keycap>Ctrl</keycap>
+		<keycap>E</keycap>
+	      </keycombo>
+	    </para>
+	  </listitem>
+	</orderedlist>
       </para>
+    </sect2>
+    <sect2 id="usage-mail-getnsend-undelete">
+      <title>Undeleting Messages</title>
       <para>
-        Once it's validated the password,
-        <application>Evolution</application> will check your mail.
-        New mail will appear in the local <interface>Inbox</interface>
-        if you're using a <glossterm>POP</glossterm> account, and in
-        your <glossterm>IMAP</glossterm> folders if you use IMAP.  If
-        you have chosen to use IMAP, and you have multiple folders on
-        your IMAP server, you may need to subscribe to them.  To learn
-        how to use the subscription manager, read <xref
-        linkend="usage-mail-subscriptions">.
-      </para>
-
-     <note id="badmailsettings">
-     <title>Can't Check Mail?</title>
-     <para>
-        If you get an error message instead of mail, you probably need
-        to change your network settings.  To learn how to do that,
-        have a look at <xref linkend="config-prefs-mail-network">, or
-        ask your system administrator.
+	To undelete a message:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Click a message marked for deletion to select it
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click
+	      <menuchoice>
+		<guimenu>Actions</guimenu>
+		<guimenuitem>Undelete</guimenuitem>
+	      </menuchoice>
+	    </para>
+	    <note>
+	      <title>What does Undelete actually do?</title>
+	      <para>
+		Undelete doesn't bring back messages that have been expunged.
+		Undelete simply unmarks messages for expunging.
+	      </para>
+	    </note>
+	  </listitem>
+	</orderedlist>
       </para>
-    </note>
+    </sect2>
+  </sect1>
 
-      <sect2 id="usage-mail-getnsend-get-news">
-         <title>Using Evolution for News </title>
-       <para>
-         Newsgroups are so similar to email that there's no reason not
-         to read them side by side.  If you want to do that, add a
-         news source to your configuration (see <xref
-         linkend="config-prefs-network-news">). The news server will
-         appear as a remote server, and will look quite similar to an
-         IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
-         <application>Evolution</application> will also check for news
-         messages.
+  <sect1 id="usage-mail-getnsend-get">
+    <title>Checking Mail</title>
+    <para>
+      Now that you've had a look around the <interface>Inbox</interface>, it's
+      time to check for new mail.  Click <guibutton>Get Mail</guibutton> in the
+      toolbar to check your mail.  If it's the first time you've done so, the
+      <interface>mail setup assistance</interface> will ask you for the
+      information it needs to check your email.
+    </para>
+    <para>
+      The druid will give you several dialogue boxes where you setup:
+      <itemizedlist>
+	<listitem>
+	  <para>
+	    Setup your personal information
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Setup your outgoing email server information
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Identity Name
+	  </para>
+	</listitem>
+      </itemizedlist>
+    </para>
+    <para>
+      To check your email, press the <guibutton>Check Mail</guibutton> button.
+      If this is your first time checking mail, or you don't have
+      <application>Evolution</application> setup to store your password, you'll
+      be prompted for the password.  Enter your password and your email will be
+      downloaded.
+    </para>
+    <note id="badmailsettings">
+      <title>Can't Check Mail?</title>
+      <para>
+	If you get an error message instead of mail, you probably need to check
+	your network settings.  If you.  To learn how to do that,
+	 have a look at <xref linkend="config-prefs-mail-network">, or
+	 ask your system administrator.
        </para>
-       </sect2>
+     </note>
 
-      <sect2 id="usage-mail-getnsend-get-attach">
-        <title>Attachments and HTML Mail</title>
-        <para>
-          If someone sends you an <glossterm>attachment</glossterm>, a
-          file attached to an email,
-          <application>Evolution</application> will display the file
-          at the bottom of the message to which it's attached.  Text,
-          HTML, and most images will be displayed within the message
-          itself.  For other files,
-          <application>Evolution</application> will show an icon at
-          the end of the message.  Right-click on the icon to get a
-          list of options which will vary depending on the type of
-          attachment. You will have the option to display most files
-          as part of the message, export them to a different
-          application (images to Eye of GNOME, spreadsheets to
-          Gnumeric, and so forth), or save them to disk.
-        </para>
+       <sect2 id="usage-mail-getnsend-get-news">
+	  <title>Using Evolution for News </title>
+	<para>
+	  Newsgroups are so similar to email that there's no reason not
+	  to read them side by side.  If you want to do that, add a
+	  news source to your configuration (see <xref
+	  linkend="config-prefs-network-news">). The news server will
+	  appear as a remote server, and will look quite similar to an
+	  IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
+	  <application>Evolution</application> will also check for news
+	  messages.
+	</para>
+	</sect2>
 
+       <sect2 id="usage-mail-getnsend-get-attach">
+	 <title>Attachments and HTML Mail</title>
+	 <para>
+	   If someone sends you an <glossterm>attachment</glossterm>, a
+	   file attached to an email,
+	   <application>Evolution</application> will display the file
+	   at the bottom of the message to which it's attached.  Text,
+	   HTML, and most images will be displayed within the message
+	   itself.  For other files,
+	   <application>Evolution</application> will show an icon at
+	   the end of the message. 
+     </para>
+     <para>
+       To Save an Attachment to Disk:
+       <orderedlist numeration="arabic">
+	 <listitem>
+	   <para>
+	     Open up the desired email
+	   </para>
+	 </listitem>
+	 <listitem>
+	   <para>
+	     Click on the down arrow at the bottom of the email for the desired
+	     attachment.
+	   </para>
+	 </listitem>
+	 <listitem>
+	   <para>
+	     Select <guibutton>Save to Disk</guibutton>.
+	   </para>
+	 </listitem>
+	 <listitem>
+	   <para>
+	     Choose the directory and filename you wish.
+	   </para>
+	 </listitem>
+	 <listitem>
+	   <para>
+	     Click <guibutton>OK</guibutton>
+	   </para>
+	 </listitem>
+       </orderedlist>
+      </para>
+      <tip>
+	<para>
+	  To automatically view an attachment inline, press the arrow button next
+	  to the attachment.
+	</para>
+      </tip>
+      <para>
+	To Open an Attachment in a Program:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Open up the desired email
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click the down arrow at the bottom of the email for the desired
+	      attachment.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>Open in Program</guibutton> where program is the
+	      program that is assigned to open that file type.
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+    
+      
+      <!-- Right-click on the icon to get a
+      list of options which will vary depending on the type of
+      attachment. You will have the option to display most files
+      as part of the message, export them to a different
+      application (images to Eye of GNOME, spreadsheets to
+      Gnumeric, and so forth), or save them to disk.
+    </para>
+      -->
         <para>
            <application>Evolution</application> can also display
            HTML-formatted mail, complete with graphics.  HTML
@@ -283,14 +408,14 @@
 
  <!-- Check the alignment of the following paragraph in the PS and
  HTML output: it's indented for no good reason 
-      Kevin Breit: I dont see a problem with it.
--->
+      Kevin Breit: I dont see a problem with the HTML.
+    -->
       <para>
-         Enter an address in the <guilabel>To:</guilabel> field, a
-         subject in the <guilabel>Subject:</guilabel> and a message in
-         the big empty box at the bottom of the window, and press
-         <guibutton>Send</guibutton>.
-       </para>
+      Enter an address in the <guilabel>To:</guilabel> field.  If you wish
+      enter a  subject in the <guilabel>Subject:</guilabel> and a message in
+      the big empty box at the bottom of the window.  Once you have revised
+      your message, press <guibutton>Send</guibutton>.
+    </para>
 
       <sect2 id="usage-mail-getnsend-send-delay">
         <title>Saving Messages for Later</title>
@@ -312,44 +437,57 @@
            filter behavior, see <xref linkend="config-prefs-mail">.
         </para>
 
-        <para>
-           You can also choose to save messages as drafts or as text
-           files.  Choose
-           <menuchoice>
-             <guimenu>File</guimenu>
-             <guimenuitem>Save</guimenuitem>
+      <para>
+	You can also choose to save messages as drafts or as text
+	files.  Choose
+	<menuchoice>
+	  <guimenu>File</guimenu>
+	  <guimenuitem>Save</guimenuitem>
           </menuchoice>
-          or <guimenuitem>Save As</guimenuitem> to save your message
-          as a text file. If you prefer to keep your message in a
-          folder (the <guilabel>Drafts</guilabel> folder would be the
-          obvious place), you can select <menuchoice>
+	or <guimenuitem>Save As</guimenuitem> to save your message
+	as a text file. If you prefer to keep your message in a
+	folder (the <guilabel>Drafts</guilabel> folder would be the
+	obvious place), you can select <menuchoice>
           <guimenu>File</guimenu> <guimenuitem>Save In
-          Folder</guimenuitem> </menuchoice>.
-        </para>
-      </sect2>
-      <sect2 id="usage-mail-getnsend-send-compose">
-        <title>Advanced Mail Composition</title>
-        <para>
-          You can probably guess the purpose of the buttons labelled
-          <guibutton>Cut</guibutton>, <guibutton>Copy</guibutton>,
-          <guibutton>Paste</guibutton>, <guibutton>Undo</guibutton>
-          and <guibutton>Redo</guibutton>, but there's a bit more to
-          sending mail that's less obvious.  In the next few sections,
-          you'll see how <application>Evolution</application> handles
-          additional features, including large recipient lists,
-          attachments, and forwarding.
-        </para>
+	    Folder</guimenuitem> </menuchoice>.
+      </para>
+    </sect2>
+
+    <sect2 id="usage-mail-getnsend-send-compose">
+      <title>Advanced Mail Composition</title>
+      <para>
+	<application>Evolution</application> is meant to not only handle large
+	amounts of incoming mail, but helps you manage all the tasks of having
+	an email account.
+	In the next few sections, you'll see how 
+	<application>Evolution</application> handles additional features, 
+	including large recipient lists, attachments, and forwarding.
+      </para>
       <sect3 id="usage-mail-getnsend-send-attach">
         <title>Attachments</title>
         <para>
-            If you want to attach a file to your email message, you
-            can drag it from your desktop into the message window, or
-            click the button in the toolbar with a paper clip on it,
-            labelled <guibutton>Attach</guibutton>.  If you click the
-            <guibutton>Attach</guibutton> button,
-            <application>Evolution</application> will open a file
-            selection dialog box to ask you which file you want to
-            send.  Select the file and click <guilabel>OK</guilabel>.
+	  To attach a file to your email:
+	  <orderedlist numeration="arabic">
+	    <listitem>
+	      <para>
+		Push the attach button in the composer toolbar
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Select the file you want to attach
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Press <guibutton>OK</guibutton>
+	      </para>
+	    </listitem>
+	  </orderedlist>
+	</para>
+	<para>
+	  You can drag a file from your desktop into the composer window to
+	  attach it as well.
         </para>
         <para>
             To hide the display of files you've attached to the
@@ -371,11 +509,12 @@
             addressbook, or never load images.
         </para>
       </sect3>
+
       <sect3 id="usage-mail-getnsend-send-to-types">
-         <title>Types of Recipients</title>
+	<title>Types of Recipients</title>
         <para>
-            <application>Evolution</application>, like most email
-            programs recognizes three types of addressee: primary
+	  <application>Evolution</application>, like most email
+	  programs recognizes three types of addressee: primary
             recipients, secondary recipients, and hidden ("blind")
             recipients.
          </para>
@@ -429,7 +568,7 @@
         <sect3 id="usage-mail-getnsend-send-to">
         <title>Choosing Recipients Quickly</title>
         <para>
-f you have created address cards in the contact manager,
+	  If you have created address cards in the contact manager,
           you can also enter nicknames or other portions of address
           data, and <application>Evolution</application> will transparently
           complete
@@ -446,7 +585,7 @@ f you have created address cards in the contact manager,
             Alternately, you can click on the
             <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
             <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
-            potentially a very long one &mdash; of the email addresses
+            a potentially a very long one &mdash; of the email addresses
             in your contact manager.  Select addresses and click on
             the arrows to move them into the appropriate address
             columns.
@@ -543,7 +682,7 @@ with quoted materials and the relevant replies interspersed-->
       <sect2 id="usage-mail-getnsend-send-find">
         <title>Searching and Replacing with the Composer</title>
         <para>
-           You're probably familiar with search and replace features,
+           You maybe familiar with search and replace features,
            and if you come from a Linux or Unix background, you
            probably know what <guimenuitem>Find Regex</guimenuitem>
            does.  If you aren't among the lucky who already know,
@@ -588,6 +727,7 @@ with quoted materials and the relevant replies interspersed-->
 
           </variablelist>
         </para>
+
         <para>
             For all of these menu items, you can choose whether or not
             to <guilabel>Search Backwards</guilabel> in the document
@@ -598,6 +738,7 @@ with quoted materials and the relevant replies interspersed-->
             a match.
         </para>
       </sect2>
+
       <sect2 id="usage-mail-getnsend-send-html">
         <title>Embellish your email with HTML</title>
         <para>
@@ -650,44 +791,44 @@ with quoted materials and the relevant replies interspersed-->
                   or <guilabel>Header 1</guilabel> through
                   <guilabel>Header 6</guilabel> for varying sizes of
                   header from large (1) to tiny (6). Other styles
-                  include <guilabel>pre</guilabel>, to use the HTML
+                  include <guilabel>preformat</guilabel>, to use the HTML
                   tag for preformatted blocks of text, and three types
                   of <guilabel>List Item</guilabel> for the highly
                   organized.
                 </para>
               </listitem>
            </varlistentry>
-           <varlistentry>
-             <term>Text style</term>
-              <listitem>
-                <para>
-                  Use these buttons to determine the way your letters
-                  look.  If you have text selected, the style will
-                  apply to the selected text.  If you do not have text
-                  selected, the style will apply to whatever you type
-                  next.  The buttons are:
-                  <itemizedlist mark="none">
-                    <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>
-                    <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
-                    <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
-                    <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
-                  </itemizedlist>
-                </para>
-              </listitem>
-            </varlistentry>
-            <varlistentry>
+	  <varlistentry>
+	    <term>Text style</term>
+	    <listitem>
+	      <para>
+		Use these buttons to determine the way your letters
+		look.  If you have text selected, the style will
+		apply to the selected text.  If you do not have text
+		selected, the style will apply to whatever you type
+		next.  The buttons are:
+		<itemizedlist mark="none">
+		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>
+		  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
+		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
+		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
+		</itemizedlist>
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
               <term>Alignment</term>
-              <listitem>
-                <para>
-                   Located next to the text style buttons, these three
-                   paragraph icons should be familiar to users of most
-                   word processing software.  The leftmost button will
-                   make your text aligned to the left, the center
-                   button, centered, and the right hand button,
-                   aligned on the right side.
-                </para>
-              </listitem>
-              </varlistentry>
+	    <listitem>
+	      <para>
+		Located next to the text style buttons, these three
+		paragraph icons should be familiar to users of most
+		word processing software.  The leftmost button will
+		make your text aligned to the left, the center
+		button, centered, and the right hand button,
+		aligned on the right side.
+	      </para>
+	    </listitem>
+	  </varlistentry>
 
             <varlistentry>
               <term>Indentation rules</term>
@@ -719,79 +860,114 @@ with quoted materials and the relevant replies interspersed-->
           </variablelist>
         </para>
         <para>
-           There are three tools that you can find only in the
-           <guimenu>Insert</guimenu> menu.
-           <variablelist>
-             <varlistentry>
-               <term><guimenuitem>Insert Link</guimenuitem>:</term>
-               <listitem>
-                <para>
-                  Use this tool to put hyperlinks in your HTML
-                  messages.  When you select it,
-                  <application>Evolution</application> will prompt you
-                  for the <guilabel>Text</guilabel> that will appear,
-                  and the <guilabel>Link</guilabel>, where you should
-                  enter the actual web address (URL). If you don't
-                  want special link text, you can just enter the address
+	The <guimenu>Insert</guimenu> gives you three opinions which let you
+           spruce up your email to make it more interesting:
+	<variablelist>
+	  <varlistentry>
+	    <term><guimenuitem>Insert Link</guimenuitem></term>
+	    <listitem>
+	      <para>
+		Lets you link some text to a website.  Use this tool to put hyperlinks in your HTML
+                  messages.  If you don't want special link text, you can just enter the address
                   directly, and <application>Evolution</application>
                   will recognize it as a link.
-               </para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term> <guimenuitem>Insert Image</guimenuitem>:</term>
-            <listitem>
-              <para>
-               Select this item to embed an image into your email, as
-               was done in the welcome message.  Images will appear at
-               the location of the cursor. This is different from
-               attaching them to a message, but not very different.
-              </para>
-            </listitem>
-           </varlistentry>
-          <varlistentry>
-             <term><guimenuitem>Insert Rule</guimenuitem>:</term>
-             <listitem><para>
-               This will insert a horizontal line, or rule, into your document.
-               You'll be presented with a dialog box which gives you
-               the choice of size, percentage of screen, shading, and
-               alignment; if you leave everything at the default
-               values you'll get a thin black rule all the way across
-               the screen.</para></listitem>
-        </varlistentry>
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guimenuitem>Insert Image</guimenuitem></term>
+	    <listitem>
+	      <para>
+		Lets you put an image alongside text.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guimenuitem>Insert Rule</guimenuitem></term>
+	    <listitem>
+	      <para>
+		Inserts a horizontal line into the text to help divide two
+		sections.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  </variablelist>
+	To add a hyperlink to your HTML message:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Select the text you want to link from
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Right click on text and select
+	      <guimenuitem>Link</guimenuitem>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Enter the address you wish to link to in the
+	      <guilabel>URL</guilabel> field.
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Press <guibutton>OK</guibutton>.
+	    </para>
+	  </listitem>
+	</orderedlist>
+      </para>
+      <para>
+	To add an image to your HTML message:
+	<orderedlist numeration="arabic">
+	  <listitem>
+	    <para>
+	      Click
+	      <menuchoice>
+		<guimenu>Insert</guimenu>
+		<guimenuitem>Image</guimenuitem>
+	      </menuchoice>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Click <guibutton>Browse</guibutton>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Select the image you want
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Press <guibutton>OK</guibutton>
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para>
+	      Press <guibutton>Insert</guibutton>
+	    </para>
+	  </listitem>
+	</orderedlist>
 
-          </variablelist>
-          </para>
-          <note>
-            <title>A Technical note on HTML Tags</title>
-            <para>
-              The composer is a <acronym>WYSIWYG</acronym>
-              (What You See Is What You Get)
-              editor for HTML. That means that if you enter HTML
-              directly into the composer&mdash; say, <markup
-              role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
-              the composer will assume you meant exactly that string
-              of characters, and not "make this text bold," as an HTML
-              composition tool or text editor would.
-            </para>
+      </para>
+      <note>
+	<title>A Technical note on HTML Tags</title>
+	<para>
+	  The composer is a <acronym>WYSIWYG</acronym>
+	  (What You See Is What You Get)
+	  editor for HTML. That means that if you enter HTML
+	  directly into the composer&mdash; say, 
+	  <markup role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the
+	  the composer will assume you meant exactly that string
+	  of characters, and not "make this text bold," as an HTML
+	  composition tool or text editor would.
+	</para>
         </note>
       </sect2>
 
-
-<!-- Function not implemented, possibly never will be due to security evil. -->
-<!--
-        <sect3 id="usage-mail-getnsend-send-live">
-          <title>Live Documents</title>
-          <para>
-            Later versions of <application>Evolution</application>
-            will allow you to enliven your email with almost any
-            sort of document, and even with entire
-            applications. At this point, however, this feature has not 
-            yet been implemented.
-          </para>
-        </sect3>
--->
-
       <sect2 id="usage-mail-getnsend-fwd">
         <title>Forwarding Mail</title>
         <para>
@@ -828,6 +1004,7 @@ with quoted materials and the relevant replies interspersed-->
           <guibutton>Send</guibutton>.
         </para>
       </sect2>
+
       <sect2 id="usage-mail-getnsend-ettiquette">
         <title>Seven Tips for Email Courtesy</title>
         <para>
@@ -892,24 +1069,31 @@ with quoted materials and the relevant replies interspersed-->
       <para>
          <application>Evolution</application> lets you handle your
          IMAP and newsgroup subscriptions with the same tool: the
-         subscriptions manager.  To start using it, choose
-         <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
-         Subscriptions</guimenuitem> </menuchoice>.
-      </para>
-      <para>
-         If you have configured any IMAP (mail) or NNTP (news)
-         servers, you will see them listed in the left half of the
-         subscription management window.  Click on a server to select
-         it, and you will see the folders or newsgroups available to
-         you.  You can then select individual folders and subscribe to
-         them, or remove yourself from the subscription list.
-      </para>
-      <para>
-        Once you have subscribed to a folder or newsgroup, your system
-        will check for new messages whenever you press the
-        <guibutton>Get Mail</guibutton> button.
-      </para>
-</sect1>
+         subscriptions manager.
+
+      <orderedlist numeration="arabic">
+	<listitem>
+	  <para>
+	    Click on the folder you wish to subscribe to in the
+	    <guilabel>Store</guilabel> section.
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Click the <guibutton>Subscribe</guibutton> to add it to the
+	    subscribed list.
+	  </para>
+	</listitem>
+	<listitem>
+	  <para>
+	    Close the window.
+	  </para>
+	</listitem>
+
+      </orderedlist>
+    </para>
+
+  </sect1>
 
   
 <sect1 id="encryption">
diff --git a/help/ChangeLog b/help/ChangeLog
index 7caf5ae499..ac79ab4be3 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-03  Kevin Breit  <battery841@mediaone.net>
+
+	* C/usage-mail.sgml: Put in lots of orderedlists...more SGML, less
+	for the user to read.  They'll thank me in droves later.
+
+	* C/usage-exec-summary.sgml: Fixed build error
+
 2001-06-29  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* white-papers/mail/camel.sgml: Updated slightly.