added some <glossterms>, added linkends to existing glossterms.

2000-11-29  Aaron Weber  <aaron@helixcode.com>

	* C/config-setupassist.sgml: added some <glossterms>, added linkends to existing glossterms.

2000-11-28  Aaron Weber  <aaron@helixcode.com>

	* C/evolution-guide.sgml: Changed intro to Config section. Now
	defines what, exactly, "configurable" means.

	* C/usage-print.sgml: Stylistic revisions.

	* C/usage-calendar.sgml: Stylistic revisions.

	* C/usage-contact.sgml: Stylistic revisions.

svn path=/trunk/; revision=6716

20 files changed, 684 insertions, 214 deletions

diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
index f04b381d19..365e64b60d 100644
--- a/doc/C/apx-gloss.sgml
+++ b/doc/C/apx-gloss.sgml
@@ -298,7 +298,7 @@
    <para>
       A regular expression, or "regex", is a way of describing a
       string of text using metacharacters or wild-card symbols.  For
-      example, the statement <userinput>fly*so[a|u]p</userinput> means
+      example, the statement <userinput>fly.*so[a|u]p</userinput> means
       "any phrase beginning with 'fly' and ending in 'soup' or
       'soap'".  If you searched for that expression, you'd find both
       "fly in my soup" and "fly in my soap."  There's not room here to
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index 27c1ac57db..157b61e1cc 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -1,5 +1,4 @@
 <!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
-
 <chapter id="config-prefs">
 
       <title>Advanced Configuration</title>
@@ -62,8 +61,6 @@
 	  </listitem>
 	</varlistentry>
 
-
-
 	<varlistentry>
 	  <term><guilabel>Other</guilabel></term>
 	  <listitem>
@@ -71,7 +68,7 @@
               Miscellaneous mail and news settings, such as HTML
               handling preferences, and how long
               <application>Evolution</application> should wait before
-              marking message read.
+              marking a message read.
            </para>
 	  </listitem>
 	</varlistentry>
@@ -175,7 +172,9 @@
 	      <term><guilabel>Mail source type:</guilabel></term>
 	      <listitem>
 		<para>
-                  Select from IMAP or POP servers, or Unix-style
+                  Select from <glossterm
+                  linkend="imap">IMAP</glossterm> or <glossterm
+                  linkend="pop">POP</glossterm> servers, or Unix-style
                   <systemitem><filename>mbox</filename></systemitem>
                   or <systemitem><filename>mh</filename></systemitem>
                   files.
@@ -188,7 +187,7 @@
 		<para>
                   Enter the name of the mail source server in this
                   field. If you use an  may or may not be the same as your
-                  <glossterm>SMTP</glossterm> server.
+                  <glossterm linkend="smtp">SMTP</glossterm> server.
                 </para>
 	      </listitem>
 	    </varlistentry>
@@ -249,13 +248,13 @@
 	<para>
            The <interface>Mail Transports</interface> tab lets you set
            how you will send mail.  Evolution currently supports two
-           mail transport options: <guilabel>SMTP</guilabel>, which
+           mail transport options: <glossterm linkend="smtp">SMTP</glossterm>, which
            uses a remote mail server, and
-           <guilabel>sendmail</guilabel>, which uses the
+           <glossterm linkend="sendmail">sendmail</glossterm>, which uses the
            <application>sendmail</application> program on your local
            system.  <application>Sendmail</application> is more
            difficult to configure, but offers more flexibility than
-           <systemitem>SMTP</systemitem>.
+           <glossterm>SMTP</glossterm>.
         </para>
 	<para>
             To use <guilabel>SMTP</guilabel>, you'll need to enter the
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
index d9649f1adc..b9b72b568a 100644
--- a/doc/C/config-setupassist.sgml
+++ b/doc/C/config-setupassist.sgml
@@ -22,9 +22,7 @@
 
 <!--  
 
-
-
-Before you get it, though, you should decide where you want to
+        Before you get it, though, you should decide where you want to
 	keep it.  Your options will vary a little depending on your
 	network setup, but they come down to storing the mail on your
 	hard disk (using <glossterm linkend="pop">POP</glossterm>), or
@@ -116,8 +114,8 @@ Before you get it, though, you should decide where you want to
 	  <listitem>
 	    <para>
               <application>Evolution</application> supports several
-              mail sources: <glossterm>POP</glossterm> and
-              <glossterm>IMAP</glossterm> servers, and UNIX-style
+              mail sources: <glossterm linkend="pop">POP</glossterm> and
+              <glossterm linkend="imap">IMAP</glossterm> servers, and UNIX-style
               <systemitem><filename>mbox</filename></systemitem> and
               <systemitem><filename>mh</filename></systemitem> files.
               POP servers retrieve your mail and store it on your
@@ -149,10 +147,9 @@ Before you get it, though, you should decide where you want to
           <term> <guilabel>Server:</guilabel></term>
 	  <listitem>
 	    <para>
-              This should be the name of the server where you check
-              your mail, if you use one.  It may be the same as the
-              server where you send your outgoing mail, if you use
-              one.
+              This should be the name of the server where you get
+              incoming mail.  It may (or may not) be the same as the
+              server where you send your outgoing mail.
             </para>
 	  </listitem>
 	</varlistentry>
@@ -162,7 +159,7 @@ Before you get it, though, you should decide where you want to
 	<listitem>
              <para>
               Enter the username for your mail server account, if you
-              have one. Normally, this is the part of your email
+              have one. In almost all cases, this is the part of your email
               address before the @ character, and
               <application>Evolution</application> has selected that
               value as the default.  If you have a different username,
@@ -188,8 +185,10 @@ Before you get it, though, you should decide where you want to
 	  <listitem>
 	    <para>
               This is the mail sending protocol you will want to use.
-              <application>Evolution</application> supports both SMTP
-              and <application>sendmail</application>.
+              <application>Evolution</application> supports both
+              <glossterm linkend="smtp">SMTP</glossterm> and
+              <application>sendmail</application>; SMTP is by far the
+              more common.
             </para>
 	  </listitem>
       </varlistentry>
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 064bb0d305..5adc131eeb 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -99,13 +99,14 @@ implemented. -->
         <application>Evolution</application> is highly configurable.
         Usually, when developers say that, they mean that they didn't
         test it out thoroughly and have left it to other programmers
-        to "configure" themselves a working system.  But in the case
-        of <application>Evolution</application>, you can expect that
-        it will work perfectly well with minimal setup hassle, and
-        that you can alter its behavior to fit your needs with just a
-        little more work.  This part of the book will describe that
-        process, from the quickest glimpse of the Setup Assistant to
-        an in-depth tour of the preferences dialogs.
+        to "configure" themselves a working system. In the case of
+        <application>Evolution</application>, "configurable" means
+        what it ought to.  It means that, while you can expect the
+        program to work perfectly well in its default settings, it's
+        also easy to alter its behavior in a wide variety of ways, so
+        that it fits your needs exactly.  This part of the book will
+        describe that process, from the quickest glimpse of the Setup
+        Assistant to an in-depth tour of the preferences dialogs.
       </para>
     </partintro>
 
diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml
index 036b663b23..c1f6e31c1c 100644
--- a/doc/C/menuref.sgml
+++ b/doc/C/menuref.sgml
@@ -464,6 +464,152 @@
 	</variablelist>
        </para>
     </sect2>
+
+   <sect2 id="menuref-mail-messagelistheader">
+      <title>The Message Heading Right-Click Menu</title>
+      <para>
+         At the top of the message list is the message list heading
+         bar; you can click on an individual heading &mdash;
+         <guilabel>Subject</guilabel>, for example, to have the
+         message list sorted by that attribute.  However, if you right
+         click on a heading, you'll get the following menu:
+      </para>
+
+      <para>
+          <variablelist>
+
+	  <varlistentry>
+	      <term><guimenuitem>Sort Ascending</guimenuitem></term>
+	      <listitem><para>
+		 Sort the list, in ascending order, by the attribute you clicked.
+	      </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Sort Descending</guimenuitem></term>
+	      <listitem><para>
+		 Sort the list in descending order.
+	      </para></listitem>
+	    </varlistentry>
+  
+	  <varlistentry>
+	      <term><guimenuitem>Unsort</guimenuitem></term>
+	      <listitem><para>
+		 Undo any sorting by this attribute, and leave the message list sorted 
+                 by the previous one.
+	      </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Group by this Field</guimenuitem></term>
+	      <listitem><para>
+		 Instead of sorting the messages, group them in boxes. 
+	      </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Group by Box</guimenuitem></term>
+	      <listitem><para> If you have your messages grouped in
+	      boxes, you can arrange the boxes as well, by choosing
+	      this item.  </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Remove this column</guimenuitem></term>
+	      <listitem><para>
+		 Choose this to remove the column from the message list display.
+	      </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Field Chooser</guimenuitem></term>
+	      <listitem><para>
+		 Opens a palette of columns. You can drag the columns
+		 you want from the palette into position in the
+		 message list heading bar; red arrows appear
+		 when you get close enough to a possibile position.</para>
+                 
+              <para>
+                 Your options are: 
+                 <itemizedlist>
+                     <listitem><para>
+                         <guiicon>An Envelope</guiicon> which indicates whether a message has been read (closed for unread, open for read).
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guiicon>An Exclamation Point</guiicon> for priority
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guiicon>A Penguin</guiicon> which indicates something, although I'm not sure what.
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guiicon>A Paper Clip</guiicon> which indicates that there is an attachment to the message.
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guilabel>From</guilabel>, for the <guilabel>From</guilabel> field of a message.
+                     </para></listitem>
+                     <listitem><para>
+                         <guilabel>Subject</guilabel>, for the <guilabel>Subject</guilabel> field of a message.
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guilabel>Date</guilabel>, for the date and time a message was sent.
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guilabel>Received</guilabel>, for the date and time you got the message. 
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guilabel>To</guilabel>, for the <guilabel>To</guilabel> field.
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guilabel>Size</guilabel>, for a message's size.
+                     </para></listitem>
+		  </itemizedlist>
+             </para>   
+
+	      </listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Alignment</guimenuitem></term>
+	      <listitem><para> Use this item to decide upon the
+	      alignment of the message attributes within their
+	      columns.  </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Best Fit</guimenuitem></term>
+	      <listitem><para>
+		 Alters the width of the message list columns to maximize the amount of information displayed.
+	      </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Format Columns...</guimenuitem></term>
+	      <listitem><para>
+		 This item is not yet available.
+	      </para></listitem>
+	    </varlistentry>
+
+
+	  <varlistentry>
+	      <term><guimenuitem>Customize
+	      Views...</guimenuitem></term> <listitem><para> Opens a
+	      dialog box that lets you choose a complex set of
+	      arrangements for your message list, so you can combine
+	      sorting and grouping in as many ways as you like.
+	      </para></listitem>
+	    </varlistentry>
+
+          </variablelist>
+      </para>
+   </sect2>
   </sect1>
 
   <sect1 id="menuref-mail-editor">
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index 72f278a424..0c6165f80e 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -8,12 +8,11 @@
     To begin using the calendar, select
     <guibutton>Calendar</guibutton> from the <interface>shortcut
     bar</interface>.  By default, the calendar starts showing today's
-    schedule on a grey and white ruled background.  At the upper
-    right, there's a monthly calendar you can use to switch days.
-    Below that, there's a <guilabel>TaskPad</guilabel>, where you can
-    keep a sort of glorified to-do list that's not linked to your
-    calendar.  The calendar's daily view is shown in <xref
-    linkend="usage-calendar-fig">.
+    schedule on a ruled background.  At the upper right, there's a
+    monthly calendar you can use to switch days.  Below that, there's
+    a <guilabel>TaskPad</guilabel>, where you can keep a list of tasks
+    seperate from your calendar appointments.  The calendar's daily
+    view is shown in <xref linkend="usage-calendar-fig">.
 
    <!-- ============== Figure ============================= -->
     <figure id="usage-calendar-fig">
@@ -31,9 +30,11 @@
     <title>Ways of Looking at your Calendar</title>
 
     <para>
-       You can view your calendar by the day, by the week, by the
-       month, or by the year; press the calendar-shaped buttons on the
-       right side of the toolbar to switch between views.
+       The toolbar offers you four different views of your calendar:
+       one day, five days, a week, or a month at once. Press the
+       calendar-shaped buttons on the right side of the toolbar to
+       switch between views. You can also select a range of days in
+       the small calendar at the upper right.
     </para>
     <para>
        To view yesterday's appointments, &mdash;last week's, if you're in
@@ -65,15 +66,9 @@ lack of time, resources, and interest.
   <sect1 id="usage-calendar-apts">
     <title>Scheduling With the Evolution Calendar</title>
     <para>
-       The <application>Evolution</application> calendar allows you to
-       schedule events for yourself or a group of people.  It can
-       handle events that repeat, event lengths from ten minutes to
-       multiple days, and events that have a date but no specific
-       time.  Of course, you can also set event reminders and alarms
-       so that you don't forget about everything you've just put into
-       your calendar. From office or family to office
-       <emphasis>and</emphasis> family,
-       <application>Evolution</application> can handle the schedule.
+      Of course, you'll want to use the calendar to do more than find
+      out what day it is. This section will tell you how to schedule
+      events, set alarms, and determine event recurrence.
     </para>
     <sect2 id="usage-calendar-apts-basic">
       <title>Creating events</title>
@@ -193,8 +188,8 @@ lack of time, resources, and interest.
 	icon in the toolbar.  That will save the event and close the
 	event editor window. If you want, you can alter an event
 	summary in the calendar view by clicking on it and typing. You
-	can change other settings by right-clicking on the event in
-	the and then choosing <guimenuitem>Edit this Appointment</guimenuitem>.
+	can change other settings by right-clicking on the event then
+	choosing <guimenuitem>Edit this Appointment</guimenuitem>.
       </para>
     </sect2>
 
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index 21630cacb3..e1fa058fd8 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -11,27 +11,27 @@
       Rolodex.  Of course, it's a lot easier to update
       <application>Evolution</application> than it is to change an
       actual paper book. <application>Evolution</application> also
-      allows easy synchronization with hand-held and remote devices.
-      Since <application>Evolution</application> supports most major
-      network protocols, including <glossterm linkend="ldap">LDAP</glossterm>, it can
-      fit into almost any existing network.
+      allows easy synchronization with hand-held devices.  Since
+      <application>Evolution</application> supports the <glossterm
+      linkend="ldap">LDAP</glossterm> directory protocol, you can use
+      it with almost any type of existing directory server on your
+      network.
     </para>
     <para>
       Another advantage of the <application>Evolution</application>
-      address book is its integration with the rest of the
-      application.  That means that when you look for someone's
+      contact manager is its integration with the rest of the
+      application.  When you look for someone's
       address, you can also see a history of appointments with that
       person.  Or, you can get an e-mail with contact information in
       it and create a new address card on the spot.  In addition,
-      searches and folders and all work in the same way they do in the
-      other components, so you don't have to learn another system for
-      similar tasks.
+      searches and folders work in the same way they do in the
+      other components.
     </para>
     <para>
       This chapter will cover using the
       <application>Evolution</application> contact manager to organize
       any amount of contact information, share addresses over a
-      network, and several ways to save time with everyday tasks.  To
+      network, and several ways to save time with everyday tasks. To
       learn about configuring the contact manager, see <xref
       linkend="config-prefs-contact">.
     </para>
@@ -94,14 +94,14 @@
     </para>
 
     <para>
-       The rest of the contact manager is taken up by the display of
-       your contact information.  You can view that display as a table
-       or as a list of cards&mdash; switch views in the
-       <guimenu>View</guimenu> menu &mdash; and move through them
-       alphabetically with the buttons and the scrollbar at the right
-       of the window. Of course, if you have more than a few people
-       listed, you'll want some way of finding them more quickly,
-       which is why there's a search feature.
+       Your contact information fills the rest of the display. By
+       default, <application>Evolution</application> shows it as a set
+       of small address cards, but you can set it to appear as a table
+       with the options in the <guimenu>View</guimenu> menu. Move
+       through the cards alphabetically with the buttons and the
+       scrollbar at the right of the window. Of course, if you have
+       more than a few people listed, you'll want some way of finding
+       them more quickly, which is why there's a search feature.
     </para>
 
     <sect2 id="contact-search">
@@ -113,22 +113,27 @@
     	   hit <keycap>Enter</keycap>.
     	   <application>Evolution</application> will search through
     	   the contents of every displayed card to find one that
-    	   matches. That means that you can refine searches by doing several in
-    	   succession.
+    	   matches. In other words, you can refine searches by doing
+    	   several in succession.
 	</para>
       <para>
-	   If there are no matches, the card display will be blank. When
-	   you'd like to see all the cards again, press <guilabel>Show
-	   All</guilabel>.
+	   If there are no matches, the card display will be
+	   blank. When you'd like to see all the cards again, press
+	   <guilabel>Show All</guilabel>.
+ <!--  **************************************************
+           If you're sneaky, you can
+	   enter a blank search &mdash; every contact has at least one
+	   space in it, so you'll display them all. NOTE: This may not actually work.
+ ******  -->
       </para>
       <example id="contact-quicksearch-ex">
 	<title>Refining a Quick Search</title>
 	<para>
-	    Tom comes back from lunch and finds a note on his keyboard:
-	    "Curtis in sales called for you, but he didn't leave a number,
-	    and I forgot to write down the name of the company he works
-	    for. He said it was important, though." Tom is not at all
-	    annoyed.
+	    Tom comes back from lunch and finds a note on his
+	    keyboard: "Curtis in sales called for you, but he didn't
+	    leave a number, and I forgot to write down the name of the
+	    company he works for. He said it was important, though."
+	    Tom is not at all annoyed.
          </para>
 	 <para>
 	    He opens his contacts folder, and runs a quick search for
@@ -152,11 +157,11 @@
         Click <guibutton>Add Criterion</guibutton> to increase the
         number of criteria you'd like to use in the search, and
         <guibutton>Remove Criterion</guibutton> to remove one from the
-        bottom of the list.  Your criteria may be a searchs within the
+        bottom of the list.  Your criteria may be a search within the
         <guilabel>Name</guilabel> or <guilabel>Email</guilabel>
         fields; alternately you can choose to search through all the
-        fields with a regular expression.  Then, you can select all
-        the familiar requirements like <guilabel>Begins
+        fields with a regular expression.  Then, you can select from
+        all the familiar requirements like <guilabel>Begins
         With</guilabel> and <guilabel>Does Not Contain</guilabel>,
         decide whether to match <guilabel>All</guilabel> or
         <guilabel>Any</guilabel> of your criteria, and press
@@ -475,15 +480,15 @@
   <sect1 id="usage-contact-sharing">
     <title>Sharing your Cards</title>
     <para>
-       If you keep your cards on a network using an
-       <glossterm linkend="ldap">LDAP</glossterm> server, you can share access to
-       them.  Actually, the server software takes care of that, and
-       also determines who is allowed to see and change them.  This is
-       the sort of feature you'll want to use if your company has a
+       If you keep your cards on a network using an <glossterm
+       linkend="ldap">LDAP</glossterm> server, you can share access to
+       them, browse other address books, or maintain a shared set of
+       contact information for your company or your department.  This
+       is the sort of feature you'll want to use if your company has a
        list of vendors and clients that needs constant updating.  If
        you also share your calendars, people can avoid duplicating
-       work and keep up to date on developments within their work-group
-       or across the entire company.
+       work and keep up to date on developments within their
+       work-group or across the entire company.
     </para>
 
      <example id="usage-contact-sharing-ex">
@@ -496,7 +501,7 @@
 	    already scheduled a meeting with Company X next Thursday.
 	    He can either go to the meeting himself or ask Deanna to
 	    discuss his concerns for him.  Either way, he avoids
-	    scheduling an extra meeting with Company X.
+	    scheduling an extra meeting with Company X. 
 	 </para>
       </example>
     <para>
@@ -576,14 +581,16 @@
 	 <application>Evolution</application> will fill in addresses
 	 from your contact manager's address cards if you let it.  In
 	 addition to that, you can send email to everyone in a
-	 particular group.
+	 particular group if you choose.
       </para>
  <!-- FIXME this feature not yet implemented  -->
       <para>
-         Future versions of <application>Evolution</application> will
-	 allow you to you export a group of cards to a spreadsheet,
-	 database, or word processor so you can print address labels
-	 or prepare large postal mailings.
+         You can also use the contact manager to handle lists of
+	 postal addresses to print for labels.  Future versions of
+	 <application>Evolution</application> will allow you to you
+	 export a group of cards to a spreadsheet, database, or word
+	 processor so you can print address labels or prepare large
+	 mailings.
       </para>
     </sect2>
 <!--
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 6aafdaa492..7dee8e0234 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -112,7 +112,11 @@
           message lists.  To sort by sender, subject, or date, click
           on the bars with those labels at the top of the message
           list.  If you click twice, you'll sort them in reverse
-          order.
+          order. 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
@@ -852,6 +856,48 @@ possibly never will be due to security evil. -->
       Fortunately, <application>Evolution</application> has the tools
       to help you do it.
     </para>
+    <sect2 id="usage-mail-organize-columns">
+      <title>Sorting Mail with Column Headers</title>
+      <para>
+         By default, the columns in a mail message list are an
+         envelope icon indicating whether a message has been read
+         (closed for unread, open for read), an exclamation point
+         indicating priority, and the <guilabel>From</guilabel>,
+         <guilabel>Subject</guilabel>, and <guilabel>Date</guilabel>
+         fields.  However, you can change that if you want.
+      </para>
+      <para>
+         Right-click on one of the column headers to get a list of
+         options:
+             <variablelist>
+
+               <varlistentry>
+                  <term><guimenuitem> </guimenuitem></term>
+                  <listitem><para>
+                  </para></listitem>
+               </varlistentry>
+
+              <varlistentry>
+                  <term><guimenuitem> </guimenuitem></term>
+                  <listitem><para>
+                  </para></listitem>
+               </varlistentry>
+
+              <varlistentry>
+                  <term><guimenuitem> </guimenuitem></term>
+                  <listitem><para>
+                  </para></listitem>
+               </varlistentry>
+
+              <varlistentry>
+                  <term><guimenuitem> </guimenuitem></term>
+                  <listitem><para>
+                  </para></listitem>
+               </varlistentry>
+
+            </variablelist>
+      </para>
+    </sect2>
 
     <sect2 id="usage-mail-organize-folders">
       <title>Getting Organized with Folders</title>
@@ -872,12 +918,15 @@ possibly never will be due to security evil. -->
         When you click <guibutton>OK</guibutton>, your new folder will
 	appear in the <interface>folder view</interface>.  You can
 	then put messages in it by dragging and dropping them, or by
-	using the <guibutton>Move</guibutton> button in the toolbar.
-	If you create a filter with the <interface>filter
-	assistant</interface>, you can have mail moved to your folder
-	automatically.
+	using the <guibutton>Move</guibutton> button in the
+	toolbar. If you want to move several messages at once, click
+	on the ones you want to move while holding down the
+	<keycap>CTRL</keycap> key, or use <keycap>Shift</keycap> to
+	select a range of messages.  If you create a filter with the
+	<interface>filter assistant</interface>, you can have mail
+	moved to your folder automatically.
       </para>
-    </sect2>    
+        </sect2>    
 
     <sect2 id="usage-mail-organize-search">
       <title>Searching for Messages</title>
diff --git a/doc/C/usage-print.sgml b/doc/C/usage-print.sgml
index 1af298eb42..cc1ac16357 100644
--- a/doc/C/usage-print.sgml
+++ b/doc/C/usage-print.sgml
@@ -18,19 +18,25 @@
   <sect1 id="printpreview">
     <title>Print Preview</title>
     <para>
-      <guibutton>Print Preview</guibutton>, appears both as a button
-      in the printing dialog and as an item in the
+      <guibutton>Print Preview</guibutton> appears both as a button in
+      the printing dialog and as an item in the
       <guimenu>File</guimenu> menu.  In both places, it does the same
-      thing: it opens a new window that displays an image of the current
-      message, calendar, appointment, or address card.
+      thing: it opens a new window that shows you what would happen if
+      you were to print the current message, calendar, appointment, or
+      address card.
     </para>
     <para>
       That window allows you to select which pages you want to see,
       and how close you'd like to look at them.  Zoom in or out, fit
-      the page to the window (<guibutton>Fit</guibutton>) or match the
-      width of the page and the window (<guibutton>Fit
-      Width</guibutton>).  If you're satisfied with the way it looks,
-      click <guibutton>Print</guibutton> to send your document on its way.
+      the page to the window (the <guibutton>Fit</guibutton> button)
+      or match the width of the page and the window (the
+      <guibutton>Fit Width</guibutton> button).  None of these buttons
+      changes the way the page will be printed, but they do let you
+      get a better look.  If you're satisfied with the way the things
+      look, click <guibutton>Print</guibutton> to send your document
+      on its way.  If you'd like to change it, just close the
+      <guilabel>Print Preview</guilabel> window and make the changes
+      you want from the Mail, Calendar, or Contact Manager.
     </para>
 
 
@@ -90,3 +96,10 @@
     </para>
   </sect1>
 </chapter>
+
+
+
+
+
+
+
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3b2a5968d3..e72971a13d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,29 @@
+2000-11-29  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-setupassist.sgml: added some <glossterms>, added linkends to existing glossterms.
+
+2000-11-28  Aaron Weber  <aaron@helixcode.com>
+
+	* C/evolution-guide.sgml: Changed intro to Config section. Now
+	defines what, exactly, "configurable" means.
+
+	* C/usage-print.sgml: Stylistic revisions.
+
+	* C/usage-calendar.sgml: Stylistic revisions.
+
+	* C/usage-contact.sgml: Stylistic revisions.
+
+2000-11-09  Aaron Weber  <aaron@helixcode.com>
+
+	* C/menuref.sgml: Message heading Right-Click Menu.
+
+2000-11-03  Aaron Weber  <aaron@helixcode.com>
+
+	* C/apx-gloss.sgml: The regexp example was quite wrong. Props to Sasha.
+
+2000-11-02  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-contact.sgml: Style and spelling.
 
 2000-11-01  Aaron Weber  <aaron@helixcode.com>
 
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index f04b381d19..365e64b60d 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -298,7 +298,7 @@
    <para>
       A regular expression, or "regex", is a way of describing a
       string of text using metacharacters or wild-card symbols.  For
-      example, the statement <userinput>fly*so[a|u]p</userinput> means
+      example, the statement <userinput>fly.*so[a|u]p</userinput> means
       "any phrase beginning with 'fly' and ending in 'soup' or
       'soap'".  If you searched for that expression, you'd find both
       "fly in my soup" and "fly in my soap."  There's not room here to
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 27c1ac57db..157b61e1cc 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -1,5 +1,4 @@
 <!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
-
 <chapter id="config-prefs">
 
       <title>Advanced Configuration</title>
@@ -62,8 +61,6 @@
 	  </listitem>
 	</varlistentry>
 
-
-
 	<varlistentry>
 	  <term><guilabel>Other</guilabel></term>
 	  <listitem>
@@ -71,7 +68,7 @@
               Miscellaneous mail and news settings, such as HTML
               handling preferences, and how long
               <application>Evolution</application> should wait before
-              marking message read.
+              marking a message read.
            </para>
 	  </listitem>
 	</varlistentry>
@@ -175,7 +172,9 @@
 	      <term><guilabel>Mail source type:</guilabel></term>
 	      <listitem>
 		<para>
-                  Select from IMAP or POP servers, or Unix-style
+                  Select from <glossterm
+                  linkend="imap">IMAP</glossterm> or <glossterm
+                  linkend="pop">POP</glossterm> servers, or Unix-style
                   <systemitem><filename>mbox</filename></systemitem>
                   or <systemitem><filename>mh</filename></systemitem>
                   files.
@@ -188,7 +187,7 @@
 		<para>
                   Enter the name of the mail source server in this
                   field. If you use an  may or may not be the same as your
-                  <glossterm>SMTP</glossterm> server.
+                  <glossterm linkend="smtp">SMTP</glossterm> server.
                 </para>
 	      </listitem>
 	    </varlistentry>
@@ -249,13 +248,13 @@
 	<para>
            The <interface>Mail Transports</interface> tab lets you set
            how you will send mail.  Evolution currently supports two
-           mail transport options: <guilabel>SMTP</guilabel>, which
+           mail transport options: <glossterm linkend="smtp">SMTP</glossterm>, which
            uses a remote mail server, and
-           <guilabel>sendmail</guilabel>, which uses the
+           <glossterm linkend="sendmail">sendmail</glossterm>, which uses the
            <application>sendmail</application> program on your local
            system.  <application>Sendmail</application> is more
            difficult to configure, but offers more flexibility than
-           <systemitem>SMTP</systemitem>.
+           <glossterm>SMTP</glossterm>.
         </para>
 	<para>
             To use <guilabel>SMTP</guilabel>, you'll need to enter the
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index d9649f1adc..b9b72b568a 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -22,9 +22,7 @@
 
 <!--  
 
-
-
-Before you get it, though, you should decide where you want to
+        Before you get it, though, you should decide where you want to
 	keep it.  Your options will vary a little depending on your
 	network setup, but they come down to storing the mail on your
 	hard disk (using <glossterm linkend="pop">POP</glossterm>), or
@@ -116,8 +114,8 @@ Before you get it, though, you should decide where you want to
 	  <listitem>
 	    <para>
               <application>Evolution</application> supports several
-              mail sources: <glossterm>POP</glossterm> and
-              <glossterm>IMAP</glossterm> servers, and UNIX-style
+              mail sources: <glossterm linkend="pop">POP</glossterm> and
+              <glossterm linkend="imap">IMAP</glossterm> servers, and UNIX-style
               <systemitem><filename>mbox</filename></systemitem> and
               <systemitem><filename>mh</filename></systemitem> files.
               POP servers retrieve your mail and store it on your
@@ -149,10 +147,9 @@ Before you get it, though, you should decide where you want to
           <term> <guilabel>Server:</guilabel></term>
 	  <listitem>
 	    <para>
-              This should be the name of the server where you check
-              your mail, if you use one.  It may be the same as the
-              server where you send your outgoing mail, if you use
-              one.
+              This should be the name of the server where you get
+              incoming mail.  It may (or may not) be the same as the
+              server where you send your outgoing mail.
             </para>
 	  </listitem>
 	</varlistentry>
@@ -162,7 +159,7 @@ Before you get it, though, you should decide where you want to
 	<listitem>
              <para>
               Enter the username for your mail server account, if you
-              have one. Normally, this is the part of your email
+              have one. In almost all cases, this is the part of your email
               address before the @ character, and
               <application>Evolution</application> has selected that
               value as the default.  If you have a different username,
@@ -188,8 +185,10 @@ Before you get it, though, you should decide where you want to
 	  <listitem>
 	    <para>
               This is the mail sending protocol you will want to use.
-              <application>Evolution</application> supports both SMTP
-              and <application>sendmail</application>.
+              <application>Evolution</application> supports both
+              <glossterm linkend="smtp">SMTP</glossterm> and
+              <application>sendmail</application>; SMTP is by far the
+              more common.
             </para>
 	  </listitem>
       </varlistentry>
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index 064bb0d305..5adc131eeb 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -99,13 +99,14 @@ implemented. -->
         <application>Evolution</application> is highly configurable.
         Usually, when developers say that, they mean that they didn't
         test it out thoroughly and have left it to other programmers
-        to "configure" themselves a working system.  But in the case
-        of <application>Evolution</application>, you can expect that
-        it will work perfectly well with minimal setup hassle, and
-        that you can alter its behavior to fit your needs with just a
-        little more work.  This part of the book will describe that
-        process, from the quickest glimpse of the Setup Assistant to
-        an in-depth tour of the preferences dialogs.
+        to "configure" themselves a working system. In the case of
+        <application>Evolution</application>, "configurable" means
+        what it ought to.  It means that, while you can expect the
+        program to work perfectly well in its default settings, it's
+        also easy to alter its behavior in a wide variety of ways, so
+        that it fits your needs exactly.  This part of the book will
+        describe that process, from the quickest glimpse of the Setup
+        Assistant to an in-depth tour of the preferences dialogs.
       </para>
     </partintro>
 
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index 036b663b23..c1f6e31c1c 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -464,6 +464,152 @@
 	</variablelist>
        </para>
     </sect2>
+
+   <sect2 id="menuref-mail-messagelistheader">
+      <title>The Message Heading Right-Click Menu</title>
+      <para>
+         At the top of the message list is the message list heading
+         bar; you can click on an individual heading &mdash;
+         <guilabel>Subject</guilabel>, for example, to have the
+         message list sorted by that attribute.  However, if you right
+         click on a heading, you'll get the following menu:
+      </para>
+
+      <para>
+          <variablelist>
+
+	  <varlistentry>
+	      <term><guimenuitem>Sort Ascending</guimenuitem></term>
+	      <listitem><para>
+		 Sort the list, in ascending order, by the attribute you clicked.
+	      </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Sort Descending</guimenuitem></term>
+	      <listitem><para>
+		 Sort the list in descending order.
+	      </para></listitem>
+	    </varlistentry>
+  
+	  <varlistentry>
+	      <term><guimenuitem>Unsort</guimenuitem></term>
+	      <listitem><para>
+		 Undo any sorting by this attribute, and leave the message list sorted 
+                 by the previous one.
+	      </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Group by this Field</guimenuitem></term>
+	      <listitem><para>
+		 Instead of sorting the messages, group them in boxes. 
+	      </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Group by Box</guimenuitem></term>
+	      <listitem><para> If you have your messages grouped in
+	      boxes, you can arrange the boxes as well, by choosing
+	      this item.  </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Remove this column</guimenuitem></term>
+	      <listitem><para>
+		 Choose this to remove the column from the message list display.
+	      </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Field Chooser</guimenuitem></term>
+	      <listitem><para>
+		 Opens a palette of columns. You can drag the columns
+		 you want from the palette into position in the
+		 message list heading bar; red arrows appear
+		 when you get close enough to a possibile position.</para>
+                 
+              <para>
+                 Your options are: 
+                 <itemizedlist>
+                     <listitem><para>
+                         <guiicon>An Envelope</guiicon> which indicates whether a message has been read (closed for unread, open for read).
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guiicon>An Exclamation Point</guiicon> for priority
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guiicon>A Penguin</guiicon> which indicates something, although I'm not sure what.
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guiicon>A Paper Clip</guiicon> which indicates that there is an attachment to the message.
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guilabel>From</guilabel>, for the <guilabel>From</guilabel> field of a message.
+                     </para></listitem>
+                     <listitem><para>
+                         <guilabel>Subject</guilabel>, for the <guilabel>Subject</guilabel> field of a message.
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guilabel>Date</guilabel>, for the date and time a message was sent.
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guilabel>Received</guilabel>, for the date and time you got the message. 
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guilabel>To</guilabel>, for the <guilabel>To</guilabel> field.
+                     </para></listitem>
+
+                     <listitem><para>
+                         <guilabel>Size</guilabel>, for a message's size.
+                     </para></listitem>
+		  </itemizedlist>
+             </para>   
+
+	      </listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Alignment</guimenuitem></term>
+	      <listitem><para> Use this item to decide upon the
+	      alignment of the message attributes within their
+	      columns.  </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Best Fit</guimenuitem></term>
+	      <listitem><para>
+		 Alters the width of the message list columns to maximize the amount of information displayed.
+	      </para></listitem>
+	    </varlistentry>
+
+	  <varlistentry>
+	      <term><guimenuitem>Format Columns...</guimenuitem></term>
+	      <listitem><para>
+		 This item is not yet available.
+	      </para></listitem>
+	    </varlistentry>
+
+
+	  <varlistentry>
+	      <term><guimenuitem>Customize
+	      Views...</guimenuitem></term> <listitem><para> Opens a
+	      dialog box that lets you choose a complex set of
+	      arrangements for your message list, so you can combine
+	      sorting and grouping in as many ways as you like.
+	      </para></listitem>
+	    </varlistentry>
+
+          </variablelist>
+      </para>
+   </sect2>
   </sect1>
 
   <sect1 id="menuref-mail-editor">
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 72f278a424..0c6165f80e 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -8,12 +8,11 @@
     To begin using the calendar, select
     <guibutton>Calendar</guibutton> from the <interface>shortcut
     bar</interface>.  By default, the calendar starts showing today's
-    schedule on a grey and white ruled background.  At the upper
-    right, there's a monthly calendar you can use to switch days.
-    Below that, there's a <guilabel>TaskPad</guilabel>, where you can
-    keep a sort of glorified to-do list that's not linked to your
-    calendar.  The calendar's daily view is shown in <xref
-    linkend="usage-calendar-fig">.
+    schedule on a ruled background.  At the upper right, there's a
+    monthly calendar you can use to switch days.  Below that, there's
+    a <guilabel>TaskPad</guilabel>, where you can keep a list of tasks
+    seperate from your calendar appointments.  The calendar's daily
+    view is shown in <xref linkend="usage-calendar-fig">.
 
    <!-- ============== Figure ============================= -->
     <figure id="usage-calendar-fig">
@@ -31,9 +30,11 @@
     <title>Ways of Looking at your Calendar</title>
 
     <para>
-       You can view your calendar by the day, by the week, by the
-       month, or by the year; press the calendar-shaped buttons on the
-       right side of the toolbar to switch between views.
+       The toolbar offers you four different views of your calendar:
+       one day, five days, a week, or a month at once. Press the
+       calendar-shaped buttons on the right side of the toolbar to
+       switch between views. You can also select a range of days in
+       the small calendar at the upper right.
     </para>
     <para>
        To view yesterday's appointments, &mdash;last week's, if you're in
@@ -65,15 +66,9 @@ lack of time, resources, and interest.
   <sect1 id="usage-calendar-apts">
     <title>Scheduling With the Evolution Calendar</title>
     <para>
-       The <application>Evolution</application> calendar allows you to
-       schedule events for yourself or a group of people.  It can
-       handle events that repeat, event lengths from ten minutes to
-       multiple days, and events that have a date but no specific
-       time.  Of course, you can also set event reminders and alarms
-       so that you don't forget about everything you've just put into
-       your calendar. From office or family to office
-       <emphasis>and</emphasis> family,
-       <application>Evolution</application> can handle the schedule.
+      Of course, you'll want to use the calendar to do more than find
+      out what day it is. This section will tell you how to schedule
+      events, set alarms, and determine event recurrence.
     </para>
     <sect2 id="usage-calendar-apts-basic">
       <title>Creating events</title>
@@ -193,8 +188,8 @@ lack of time, resources, and interest.
 	icon in the toolbar.  That will save the event and close the
 	event editor window. If you want, you can alter an event
 	summary in the calendar view by clicking on it and typing. You
-	can change other settings by right-clicking on the event in
-	the and then choosing <guimenuitem>Edit this Appointment</guimenuitem>.
+	can change other settings by right-clicking on the event then
+	choosing <guimenuitem>Edit this Appointment</guimenuitem>.
       </para>
     </sect2>
 
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 21630cacb3..e1fa058fd8 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -11,27 +11,27 @@
       Rolodex.  Of course, it's a lot easier to update
       <application>Evolution</application> than it is to change an
       actual paper book. <application>Evolution</application> also
-      allows easy synchronization with hand-held and remote devices.
-      Since <application>Evolution</application> supports most major
-      network protocols, including <glossterm linkend="ldap">LDAP</glossterm>, it can
-      fit into almost any existing network.
+      allows easy synchronization with hand-held devices.  Since
+      <application>Evolution</application> supports the <glossterm
+      linkend="ldap">LDAP</glossterm> directory protocol, you can use
+      it with almost any type of existing directory server on your
+      network.
     </para>
     <para>
       Another advantage of the <application>Evolution</application>
-      address book is its integration with the rest of the
-      application.  That means that when you look for someone's
+      contact manager is its integration with the rest of the
+      application.  When you look for someone's
       address, you can also see a history of appointments with that
       person.  Or, you can get an e-mail with contact information in
       it and create a new address card on the spot.  In addition,
-      searches and folders and all work in the same way they do in the
-      other components, so you don't have to learn another system for
-      similar tasks.
+      searches and folders work in the same way they do in the
+      other components.
     </para>
     <para>
       This chapter will cover using the
       <application>Evolution</application> contact manager to organize
       any amount of contact information, share addresses over a
-      network, and several ways to save time with everyday tasks.  To
+      network, and several ways to save time with everyday tasks. To
       learn about configuring the contact manager, see <xref
       linkend="config-prefs-contact">.
     </para>
@@ -94,14 +94,14 @@
     </para>
 
     <para>
-       The rest of the contact manager is taken up by the display of
-       your contact information.  You can view that display as a table
-       or as a list of cards&mdash; switch views in the
-       <guimenu>View</guimenu> menu &mdash; and move through them
-       alphabetically with the buttons and the scrollbar at the right
-       of the window. Of course, if you have more than a few people
-       listed, you'll want some way of finding them more quickly,
-       which is why there's a search feature.
+       Your contact information fills the rest of the display. By
+       default, <application>Evolution</application> shows it as a set
+       of small address cards, but you can set it to appear as a table
+       with the options in the <guimenu>View</guimenu> menu. Move
+       through the cards alphabetically with the buttons and the
+       scrollbar at the right of the window. Of course, if you have
+       more than a few people listed, you'll want some way of finding
+       them more quickly, which is why there's a search feature.
     </para>
 
     <sect2 id="contact-search">
@@ -113,22 +113,27 @@
     	   hit <keycap>Enter</keycap>.
     	   <application>Evolution</application> will search through
     	   the contents of every displayed card to find one that
-    	   matches. That means that you can refine searches by doing several in
-    	   succession.
+    	   matches. In other words, you can refine searches by doing
+    	   several in succession.
 	</para>
       <para>
-	   If there are no matches, the card display will be blank. When
-	   you'd like to see all the cards again, press <guilabel>Show
-	   All</guilabel>.
+	   If there are no matches, the card display will be
+	   blank. When you'd like to see all the cards again, press
+	   <guilabel>Show All</guilabel>.
+ <!--  **************************************************
+           If you're sneaky, you can
+	   enter a blank search &mdash; every contact has at least one
+	   space in it, so you'll display them all. NOTE: This may not actually work.
+ ******  -->
       </para>
       <example id="contact-quicksearch-ex">
 	<title>Refining a Quick Search</title>
 	<para>
-	    Tom comes back from lunch and finds a note on his keyboard:
-	    "Curtis in sales called for you, but he didn't leave a number,
-	    and I forgot to write down the name of the company he works
-	    for. He said it was important, though." Tom is not at all
-	    annoyed.
+	    Tom comes back from lunch and finds a note on his
+	    keyboard: "Curtis in sales called for you, but he didn't
+	    leave a number, and I forgot to write down the name of the
+	    company he works for. He said it was important, though."
+	    Tom is not at all annoyed.
          </para>
 	 <para>
 	    He opens his contacts folder, and runs a quick search for
@@ -152,11 +157,11 @@
         Click <guibutton>Add Criterion</guibutton> to increase the
         number of criteria you'd like to use in the search, and
         <guibutton>Remove Criterion</guibutton> to remove one from the
-        bottom of the list.  Your criteria may be a searchs within the
+        bottom of the list.  Your criteria may be a search within the
         <guilabel>Name</guilabel> or <guilabel>Email</guilabel>
         fields; alternately you can choose to search through all the
-        fields with a regular expression.  Then, you can select all
-        the familiar requirements like <guilabel>Begins
+        fields with a regular expression.  Then, you can select from
+        all the familiar requirements like <guilabel>Begins
         With</guilabel> and <guilabel>Does Not Contain</guilabel>,
         decide whether to match <guilabel>All</guilabel> or
         <guilabel>Any</guilabel> of your criteria, and press
@@ -475,15 +480,15 @@
   <sect1 id="usage-contact-sharing">
     <title>Sharing your Cards</title>
     <para>
-       If you keep your cards on a network using an
-       <glossterm linkend="ldap">LDAP</glossterm> server, you can share access to
-       them.  Actually, the server software takes care of that, and
-       also determines who is allowed to see and change them.  This is
-       the sort of feature you'll want to use if your company has a
+       If you keep your cards on a network using an <glossterm
+       linkend="ldap">LDAP</glossterm> server, you can share access to
+       them, browse other address books, or maintain a shared set of
+       contact information for your company or your department.  This
+       is the sort of feature you'll want to use if your company has a
        list of vendors and clients that needs constant updating.  If
        you also share your calendars, people can avoid duplicating
-       work and keep up to date on developments within their work-group
-       or across the entire company.
+       work and keep up to date on developments within their
+       work-group or across the entire company.
     </para>
 
      <example id="usage-contact-sharing-ex">
@@ -496,7 +501,7 @@
 	    already scheduled a meeting with Company X next Thursday.
 	    He can either go to the meeting himself or ask Deanna to
 	    discuss his concerns for him.  Either way, he avoids
-	    scheduling an extra meeting with Company X.
+	    scheduling an extra meeting with Company X. 
 	 </para>
       </example>
     <para>
@@ -576,14 +581,16 @@
 	 <application>Evolution</application> will fill in addresses
 	 from your contact manager's address cards if you let it.  In
 	 addition to that, you can send email to everyone in a
-	 particular group.
+	 particular group if you choose.
       </para>
  <!-- FIXME this feature not yet implemented  -->
       <para>
-         Future versions of <application>Evolution</application> will
-	 allow you to you export a group of cards to a spreadsheet,
-	 database, or word processor so you can print address labels
-	 or prepare large postal mailings.
+         You can also use the contact manager to handle lists of
+	 postal addresses to print for labels.  Future versions of
+	 <application>Evolution</application> will allow you to you
+	 export a group of cards to a spreadsheet, database, or word
+	 processor so you can print address labels or prepare large
+	 mailings.
       </para>
     </sect2>
 <!--
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 6aafdaa492..7dee8e0234 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -112,7 +112,11 @@
           message lists.  To sort by sender, subject, or date, click
           on the bars with those labels at the top of the message
           list.  If you click twice, you'll sort them in reverse
-          order.
+          order. 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
@@ -852,6 +856,48 @@ possibly never will be due to security evil. -->
       Fortunately, <application>Evolution</application> has the tools
       to help you do it.
     </para>
+    <sect2 id="usage-mail-organize-columns">
+      <title>Sorting Mail with Column Headers</title>
+      <para>
+         By default, the columns in a mail message list are an
+         envelope icon indicating whether a message has been read
+         (closed for unread, open for read), an exclamation point
+         indicating priority, and the <guilabel>From</guilabel>,
+         <guilabel>Subject</guilabel>, and <guilabel>Date</guilabel>
+         fields.  However, you can change that if you want.
+      </para>
+      <para>
+         Right-click on one of the column headers to get a list of
+         options:
+             <variablelist>
+
+               <varlistentry>
+                  <term><guimenuitem> </guimenuitem></term>
+                  <listitem><para>
+                  </para></listitem>
+               </varlistentry>
+
+              <varlistentry>
+                  <term><guimenuitem> </guimenuitem></term>
+                  <listitem><para>
+                  </para></listitem>
+               </varlistentry>
+
+              <varlistentry>
+                  <term><guimenuitem> </guimenuitem></term>
+                  <listitem><para>
+                  </para></listitem>
+               </varlistentry>
+
+              <varlistentry>
+                  <term><guimenuitem> </guimenuitem></term>
+                  <listitem><para>
+                  </para></listitem>
+               </varlistentry>
+
+            </variablelist>
+      </para>
+    </sect2>
 
     <sect2 id="usage-mail-organize-folders">
       <title>Getting Organized with Folders</title>
@@ -872,12 +918,15 @@ possibly never will be due to security evil. -->
         When you click <guibutton>OK</guibutton>, your new folder will
 	appear in the <interface>folder view</interface>.  You can
 	then put messages in it by dragging and dropping them, or by
-	using the <guibutton>Move</guibutton> button in the toolbar.
-	If you create a filter with the <interface>filter
-	assistant</interface>, you can have mail moved to your folder
-	automatically.
+	using the <guibutton>Move</guibutton> button in the
+	toolbar. If you want to move several messages at once, click
+	on the ones you want to move while holding down the
+	<keycap>CTRL</keycap> key, or use <keycap>Shift</keycap> to
+	select a range of messages.  If you create a filter with the
+	<interface>filter assistant</interface>, you can have mail
+	moved to your folder automatically.
       </para>
-    </sect2>    
+        </sect2>    
 
     <sect2 id="usage-mail-organize-search">
       <title>Searching for Messages</title>
diff --git a/help/C/usage-print.sgml b/help/C/usage-print.sgml
index 1af298eb42..cc1ac16357 100644
--- a/help/C/usage-print.sgml
+++ b/help/C/usage-print.sgml
@@ -18,19 +18,25 @@
   <sect1 id="printpreview">
     <title>Print Preview</title>
     <para>
-      <guibutton>Print Preview</guibutton>, appears both as a button
-      in the printing dialog and as an item in the
+      <guibutton>Print Preview</guibutton> appears both as a button in
+      the printing dialog and as an item in the
       <guimenu>File</guimenu> menu.  In both places, it does the same
-      thing: it opens a new window that displays an image of the current
-      message, calendar, appointment, or address card.
+      thing: it opens a new window that shows you what would happen if
+      you were to print the current message, calendar, appointment, or
+      address card.
     </para>
     <para>
       That window allows you to select which pages you want to see,
       and how close you'd like to look at them.  Zoom in or out, fit
-      the page to the window (<guibutton>Fit</guibutton>) or match the
-      width of the page and the window (<guibutton>Fit
-      Width</guibutton>).  If you're satisfied with the way it looks,
-      click <guibutton>Print</guibutton> to send your document on its way.
+      the page to the window (the <guibutton>Fit</guibutton> button)
+      or match the width of the page and the window (the
+      <guibutton>Fit Width</guibutton> button).  None of these buttons
+      changes the way the page will be printed, but they do let you
+      get a better look.  If you're satisfied with the way the things
+      look, click <guibutton>Print</guibutton> to send your document
+      on its way.  If you'd like to change it, just close the
+      <guilabel>Print Preview</guilabel> window and make the changes
+      you want from the Mail, Calendar, or Contact Manager.
     </para>
 
 
@@ -90,3 +96,10 @@
     </para>
   </sect1>
 </chapter>
+
+
+
+
+
+
+
diff --git a/help/ChangeLog b/help/ChangeLog
index 3b2a5968d3..e72971a13d 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,29 @@
+2000-11-29  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-setupassist.sgml: added some <glossterms>, added linkends to existing glossterms.
+
+2000-11-28  Aaron Weber  <aaron@helixcode.com>
+
+	* C/evolution-guide.sgml: Changed intro to Config section. Now
+	defines what, exactly, "configurable" means.
+
+	* C/usage-print.sgml: Stylistic revisions.
+
+	* C/usage-calendar.sgml: Stylistic revisions.
+
+	* C/usage-contact.sgml: Stylistic revisions.
+
+2000-11-09  Aaron Weber  <aaron@helixcode.com>
+
+	* C/menuref.sgml: Message heading Right-Click Menu.
+
+2000-11-03  Aaron Weber  <aaron@helixcode.com>
+
+	* C/apx-gloss.sgml: The regexp example was quite wrong. Props to Sasha.
+
+2000-11-02  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-contact.sgml: Style and spelling.
 
 2000-11-01  Aaron Weber  <aaron@helixcode.com>