Described Search features.

2000-10-05  Aaron Weber  <aaron@helixcode.com>

	* C/usage-contact.sgml: Described Search features.

	* C/menuref.sgml: Contact Manager menus fixed.

2000-10-04  Aaron Weber  <aaron@helixcode.com>

	* C/usage-contact.sgml: Fixed glossterms.

	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.

	* C/apx-gloss.sgml: Added "Inline," "VCard".

	* C/usage-mainwindow.sgml: Fixed glossterms, filenames. Spellchecked.

	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.

	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL,
	  which are now included as part of the gnome-help package.

	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
	responded to clahey's suggestions-- notably, commented out the
	"add to master list" category feature. (Not sure if this one is posted
        twice, because I keep overlapping days.

svn path=/trunk/; revision=5744

18 files changed, 820 insertions, 360 deletions

diff --git a/doc/C/apx-bugs.sgml b/doc/C/apx-bugs.sgml
index e7a501acba..e4a96a8155 100644
--- a/doc/C/apx-bugs.sgml
+++ b/doc/C/apx-bugs.sgml
@@ -12,8 +12,12 @@
     </abstract>
 
     <para>
-      The bugs are many, but the application is young, and this is to
-      be expected.
+      Evolution is still beta software, so the bug tracking is best
+      left to the bugzilla system and to the programmers.  However,
+      there are a number of limitations that will not be addressed
+      before version 1.0. The most notable are: Import of Microsoft
+      Outlook .pst files, and compatibility with the Microsoft
+      Exchange protocol.
     </para>
   </appendix>
 
diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
index 7aa5e494dc..24203f64a6 100644
--- a/doc/C/apx-gloss.sgml
+++ b/doc/C/apx-gloss.sgml
@@ -46,19 +46,17 @@
   </glossdef>
  </glossentry>
 
-<!--  Removed pending decision on names
  <glossentry id="druid">
   <glossterm>Druid</glossterm>
   <glossdef>
    <para>
-    A small program or script used to help configure or set up some
-    larger program.  The <application>mail setup druid</application>
-    helps you ready your email system for use.  Druids are the Linux
-    equivalent of "Assistants" and "Wizards." 
+    A tool which guides a user through a series of steps, usually to
+    configure or set up a program.  Equivalent to "Assistant" and
+    "Wizard."
    </para>
   </glossdef>
  </glossentry>
--->
+
 <glossentry id="emoticon">
   <glossterm>Emoticon</glossterm>
   <glossdef>
@@ -95,6 +93,23 @@
   </glossdef>
  </glossentry>
 
+
+ <glossentry id="filetree">
+  <glossterm>File Tree</glossterm>
+  <glossdef>
+   <para>
+     A way of describing a group of files on a computer.  With the
+     perversity typical of computer (and especially Unix and Linux)
+     nomenclature, the top of the tree is called the root directory,
+     and denoted by <systemitem><filename>/</filename></systemitem>.
+     The rest of the "branches" spread downwards from the root.  Don't
+     confuse the root directory with the <systemitem>root</systemitem>
+     account, or root's home directory,
+     <systemitem><filename>/home/root</filename></systemitem>.
+   </para>
+  </glossdef>
+ </glossentry>
+
  <glossentry id="filter">
   <glossterm>Filter</glossterm>
   <glossdef>
@@ -186,6 +201,18 @@
    </para>
   </glossdef>
  </glossentry>
+
+
+ <glossentry id="inline">
+  <glossterm>Inline</glossterm>
+  <glossdef>
+   <para>
+     Displayed as part of a message or other document, rather than
+     attached as a separate file. Contrast with <glossterm
+     linkend="attachment">Attachment</glossterm>.
+   </para>
+  </glossdef>
+ </glossentry>
  
   <glossentry id="ldap">
    <glossterm>LDAP</glossterm>
@@ -285,12 +312,9 @@
   <glossterm>Script</glossterm>
   <glossdef>
    <para>
-    A program, which is written in an interpreted (rather than
-    compiled) language.  Scripts are more likely to work on multiple
-    platforms, but they require an additional layer of software (the
-    interpreter) which mediates between them and the operating system.
-    Because of this, they typically suffer from relatively sluggish
-    performance, and are limited to smaller tasks.
+    A program written in an interpreted (rather than compiled)
+    language.  Often used as a synonym for "macro," to denote a series
+    of pre-recorded commands or actions within an application.
    </para>
   </glossdef>
  </glossentry>
@@ -354,8 +378,7 @@
     newsletters."
    </para>
   </glossdef>
- <
-/glossentry>
+ </glossentry>
 
  <glossentry id="virus">
   <glossterm>Virus</glossterm>
@@ -369,6 +392,18 @@
   </glossdef>
  </glossentry>
 
+ <glossentry id="vcard">
+  <glossterm>vCard</glossterm>
+  <glossdef>
+   <para>
+    A file format for the exchange of contact information. When you
+    get an address card attached to an email, it's probably in vCard
+    format.  Not to be confused with <glossterm
+    linkend="vfolder">vFolder</glossterm>.
+   </para>
+  </glossdef>
+ </glossentry>
+
  <glossentry id="vfolder">
   <glossterm>vFolder</glossterm>
   <glossdef>
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 8ec98271cc..310eea5711 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE Book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
+<!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
 
 <!ENTITY PREFACE SYSTEM "preface.sgml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
@@ -13,8 +13,6 @@
 <!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
-<!ENTITY APX-FDL SYSTEM "apx-fdl.sgml">
-<!ENTITY APX-GPL SYSTEM "apx-gpl.sgml">
 
 ]>
 
@@ -34,44 +32,38 @@ implemented. -->
     </authorgroup>
     <copyright>
       <year>2000</year>
-      <holder>Helix Code, Inc., </holder>
-      <holder>Kevin Breit</holder>
+      <holder> Helix Code, Inc., </holder>
+      <holder> Kevin Breit </holder>
     </copyright>
     
-    <legalnotice>
-      <para>
-        Permission is granted to copy, distribute and/or modify this
-        document under the terms of the <citetitle>GNU Free
-        Documentation License</citetitle>, (FDL) Version 1.1 or any later
-        version published by the Free Software Foundation with no
-        Invariant Sections, no Front-Cover Texts, and no Back-Cover
-        Texts.
-      </para>
-      <para>
-        The software described by this document falls under the
-        <citetitle>GNU General Public License</citetitle>, or GPL.
-      </para>
-      <para>
-        These licenses are included with this document in <xref
-        linkend="fdl">, and <xref linkend="gpl">; you may also obtain
-        a copy from the Free Software Foundation by visiting <ulink
-        type="http" url="http://www.fsf.org">their Web site</ulink> or
-        by writing to: Free Software Foundation, Inc., 59 Temple Place
-        - Suite 330, Boston, MA 02111-1307, USA.
-      </para>
-      <para>
-        Many of the names used by companies to distinguish their
-        products and services are claimed as trademarks. Where those
-        names appear in any GNOME documentation, and those trademarks
-        are made aware to the members of the GNOME Documentation
-        Project, the names have been printed in caps or initial caps.
-      </para>
-
+    <legalnotice id="legalnotice">
+ 
+     <para>
+         Permission is granted to copy, distribute and/or modify this
+         document under the terms of the <ulink type="help"
+         url="gnome-help:fdl"><citetitle>GNU Free Documentation
+         License</citetitle></ulink>, Version 1.1 or any later version
+         published by the Free Software Foundation with no Invariant
+         Sections, no Front-Cover Texts, and no Back-Cover Texts. You
+         may obtain a copy of the <citetitle>GNU Free Documentation
+         License</citetitle> from the Free Software Foundation by
+         visiting <ulink type="http" url="http://www.fsf.org">their
+         Web site</ulink> or by writing to: Free Software Foundation,
+         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+         USA.
+       </para>
+       <para>
+         Many of the names used by companies to distinguish their
+         products and services are claimed as trademarks. Where those
+         names appear in any GNOME documentation, and those trademarks
+         are made aware to the members of the GNOME Documentation
+         Project, the names have been printed in caps or initial caps.
+       </para>
     </legalnotice>
 
     <releaseinfo>
-       This is version 0.4 of the Evolution manual, describing version 
-       0.3.1 of Evolution.  
+       This is version 0.6 of the Evolution manual, describing version 
+       0.6 of Evolution.  
    </releaseinfo>
 
   </bookinfo>
@@ -136,9 +128,6 @@ implemented. -->
   &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS; 
-  &APX-FDL;
-  &APX-GPL;
-
 </book>
 
 
diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml
index a3ba7e7b34..28e2da4ff7 100644
--- a/doc/C/menuref.sgml
+++ b/doc/C/menuref.sgml
@@ -1122,7 +1122,10 @@
   <sect1>
     <title>Contact Manager Menus</title>
     <para>
-      Insert Content Here (FIXME).
+     The contact manager has six menus: <guimenu>File</guimenu>,
+     <guimenu>Edit</guimenu>, <guimenu>View</guimenu>,
+     <guimenu>Setting</guimenu>s, <guimenu>Tools</guimenu>, and
+     <guimenu>Help</guimenu>.
     </para>
 
     <sect2 id="menuref-contact-edit">
@@ -1171,7 +1174,17 @@
    <sect2 id="menuref-contact-tools">
       <title>Contact Manager Tools Menu</title>
       <para>
-         This menu is empty.
+         This menu contains one item:
+
+        <variablelist>
+	  <varlistentry>
+	    <term><guimenuitem>Search for
+	    Contacts</guimenuitem></term> <listitem><para> Brings up
+	    the in-depth search window. <xref
+	    linkend="contact-search"> describes how to use this
+	    feature.  </para></listitem>
+            </varlistentry>
+        </variablelist>
       </para>
     </sect2>
 
@@ -1188,11 +1201,56 @@
   <sect1 id="menuref-contact-editor">
     <title>The Contact Editor Menus</title>
     <para>
-      Most, if not all, of the menu items for this section are still
-      inoperable, but there are vast numbers of them, especially in
-      the <guimenu>Actions</guimenu> menu.  When available, I will 
-      describe them.
+       This window has only one menu: the file menu.
     </para>
+   
+   <sect2 id="menuref-contact-editor-file">
+      <title>Contact Editor File Menu</title>
+      <para>
+         This menu contains five items:
+         <variablelist>
+
+	  <varlistentry>
+	  <term><guimenuitem>Save</guimenuitem></term>
+	  <listitem><para>
+             
+           </para></listitem>
+	  </varlistentry>	
+
+	  <varlistentry>
+	  <term><guimenuitem>Save As</guimenuitem></term>
+	  <listitem><para>
+              Allows you to save the contact as an external 
+              file in the <glossterm linkend="vcard">VCard</glossterm> format. 
+           </para></listitem>
+	  </varlistentry>	
+
+	  <varlistentry>
+	  <term><guimenuitem>Print</guimenuitem></term>
+	  <listitem><para>
+             Prints the current contact.
+           </para></listitem>
+	  </varlistentry>	
+
+
+	  <varlistentry>
+	  <term><guimenuitem>Delete</guimenuitem></term>
+	  <listitem><para>
+             Deletes the current contact.
+           </para></listitem>
+	  </varlistentry>	
+
+  
+	  <varlistentry>
+	  <term><guimenuitem>Close</guimenuitem></term>
+	  <listitem><para>
+              Closes the Contact Editor without saving.
+           </para></listitem>
+	  </varlistentry>	
+
+	</variablelist>  
+      </para>
+    </sect2>
   </sect1>
   
 
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index 5e74a2ce0e..d760d5b00a 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -15,7 +15,7 @@
         <application>Evolution</application>'s goal is to make the
         tasks of storing, organizing, and retrieving information
         easier, so you can work and communicate with others.  That is,
-        it's a more evolved <glossterm>groupware</glossterm> program,
+        it's a more evolved <glossterm linkend="groupware">groupware</glossterm> program,
         an integral part of the Internet-connected desktop. On the
         inside, it's a powerful database; on the outside, it's a tool
         to help you get your work done.
@@ -24,10 +24,13 @@
         Because it's part of the GNOME project,
         <application>Evolution</application> is free software.  The
         program and its source code are released under the terms of
-        the GNU Public License (GPL), and the documentation falls
-        under the Free Documentation License (FDL).  For more
-        information about the GPL and the FDL, visit the Free Software
-        Foundation's website at <ulink
+        the <ulink type="help" url="gnome-help:gpl"><citetitle>GNU
+        Public License (GPL)</citetitle></ulink>, and the
+        documentation falls under the <ulink type="help"
+        url="gnome-help:fdl"><citetitle>Free Documentation
+        License</citetitle></ulink> (FDL). For more information about
+        the GPL and the FDL, visit the Free Software Foundation's
+        website at <ulink
         url="http://www.fsf.org">http://www.fsf.org</ulink>.
       </para>
       <para>
@@ -71,20 +74,21 @@
 	    <para>
               <application>Evolution</application> must meet and
               exceed the standards set by other groupware products.
-              It must include support for most major network protocols
-              so that it can integrate seamlessly with existing
-              hardware and network environments.
+              It must include support for most major network
+              <glossterm linkend="protocol">protocols</glossterm> so
+              that it can integrate seamlessly with existing hardware
+              and network environments.
             </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-               The project must support open standards and protocols
-               to turn <application>Evolution</application> into an
-               advanced development platform.  From the simplest
-               scripting to the most complex network and component
-               programming, <application>Evolution</application> must
-               to offer developers an environment for cutting-edge
-               application development.
+               The project must support open standards and be open to
+               expansion, so that it can become a development platform
+               as well as an application.  From the simplest scripting
+               to the most complex network and component programming,
+               <application>Evolution</application> must offer
+               developers an environment for cutting-edge application
+               development.
             </para>
 	  </listitem>
 	  <listitem>
@@ -163,11 +167,12 @@
                           <guimenuitem>Menu Item</guimenuitem>
                      </menuchoice>
             </member>
-	    <member><guibutton>Buttons</guibutton> you can click</member>
-            <member><userinput>Anything you type in</userinput></member>
-	    <member><computeroutput>Text output from a computer</computeroutput></member>
-            <member><glossterm>Words</glossterm> that are defined 
-                    in <xref linkend="apx-gloss">.</member>
+	    <member><guibutton>Buttons</guibutton> you can
+            click</member> <member><userinput>Anything you type
+            in</userinput></member> <member><computeroutput>Text
+            output from a computer</computeroutput></member>
+            <member><glossterm linkend="apx-gloss">Words</glossterm>
+            that are defined in <xref linkend="apx-gloss">.</member>
 	  </simplelist>
         </para>
       </formalpara>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index e983a2367d..f4d7e50ebc 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -13,7 +13,7 @@
       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>LDAP</glossterm>, it can
+      network protocols, including <glossterm linkend="ldap">LDAP</glossterm>, it can
       fit into almost any existing network.
     </para>
     <para>
@@ -41,14 +41,15 @@
     
     <para>
        To open up your address book, click on
-       <guibutton>Contacts</guibutton> in the shortcut bar.  The
-       contact manager is illustrated in <xref
-       linkend="usage-contact-fig">.  By default, the contact manager
-       shows all your cards in alphabetical order, in a
-       <glossterm>minicard</glossterm> format.  You can select other
-       views from the <guimenu>View</guimenu> menu, and adjust the
-       width of the columns by clicking and dragging the grey column
-       dividers.
+       <guibutton>Contacts</guibutton> in the shortcut bar, or select
+       one of your contacts folders from the folder bar.  <xref
+       linkend="usage-contact-fig"> shows the Contact Manager in all
+       its organizational glory.  By default, the contact manager
+       shows all your cards in alphabetical order, in a <glossterm
+       linkend="minicard">minicard</glossterm> format.  You can select
+       other views from the <guimenu>View</guimenu> menu, and adjust
+       the width of the columns by clicking and dragging the grey
+       column dividers.
     </para>
 
 
@@ -79,39 +80,94 @@
            <guibutton>Delete</guibutton> deletes a selected card.
         </para></listitem>
 
-        <listitem><para>
-           <guibutton>Show All</guibutton> Shows all cards.
-        </para></listitem>
-
-        <listitem><para>
-           <guibutton>Stop</guibutton> Stop loading card data from the network.
-        </para></listitem>
+        <listitem><para> <guibutton>View All</guibutton> Displays all
+           the address information in the folder.  Use this button to
+           refresh the display for a network folder, or to switch from
+           viewing the results of a search and see the whole contents.
+           </para></listitem>
 
+        <listitem><para> <guibutton>Stop</guibutton> Stop loading
+           contact data from the network.  This button is only
+           relevant if you are looking at contact information on a
+           network.  </para></listitem>
       </itemizedlist>
     </para>
-    <para>
-       The last feature is <guilabel>Quick Search</guilabel>; to use
-       it, just type in the name of the person you're looking for and
-       hit <keycap>Enter</keycap>.
-       <application>Evolution</application> will search through all
-       the cards to find one that matches.
-    </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>.
-    </para>
+
     <para>
        The rest of the contact manager is taken up by the display of
-       your cards.  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.
+       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.
     </para>
+
+    <sect2 id="contact-search">
+      <title>Searching for Contacts</title>
+      <para>
+	   Between <guilabel>Delete</guilabel> and <guilabel>View
+    	   All</guilabel> is <guilabel>Quick Search</guilabel>. To use
+    	   it, just type in one or more words you're looking for and
+    	   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.
+	</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>.
+      </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.
+         </para>
+	 <para>
+	    He opens his contacts folder, and runs a quick search for
+	    "Curtis;" there are eighteen different people with that name
+	    in the file. He then enters "Sales," and
+	    <application>Evolution</application> narrows it down to the
+	    right Curtis. He only becomes annoyed when he discovers that
+	    the call was not actually important.
+          </para>
+      </example>
+    
+      <para>
+        If you prefer to perform a more complex search, press
+        <guibutton>Find</guibutton> or choose
+        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for
+        Contact</guimenuitem></menuchoice>. This will open the in-depth search window, which
+        lets you use multiple search criteria in the same way that
+        email filters and <glossterm linkend="vfolder">vFolders</glossterm> do..
+      </para>    
+      <para>
+        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
+        <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
+        With</guilabel> and <guilabel>Does Not Contain</guilabel>,
+        decide whether to match <guilabel>All</guilabel> or
+        <guilabel>Any</guilabel> of your criteria, and press
+        <guibutton>Search</guibutton> to set it all off.
+      </para>
+    
+    </sect2>
+
   </sect1>
   <sect1 id="usage-contact-cards">
-    <title>Destroy, Create, or Change Cards</title>
-
+    <title>Destroy, Create, and Change: The Contact Editor</title>
     <para>
        To delete a card, click on it once to select it, then press the
        <guibutton>Delete Card</guibutton> button.  If you have
@@ -136,8 +192,13 @@
 	The contact editor window has two tabs,
     	<guilabel>General</guilabel>, for basic contact information,
     	and <guilabel>Details</guilabel>, for a more specific
-    	description of the person.  In addition, it contains a full
-    	menu bar, covered in <xref linkend="menuref">.
+    	description of the person.  In addition, it contains a
+    	<guimenu>File</guimenu> menu, covered in <xref
+    	linkend="menuref-contact-editor">, and a toolbar with three
+    	items: <guilabel>Save and Close</guilabel>,
+    	<guilabel>Print</guilabel>, and <guilabel>Delete</guilabel>.
+    	After that, however, it gets slightly more complicated, as you
+    	can see in <xref linkend="usage-contact-editor-fig">.
       </para>
       
       <figure id="usage-contact-editor-fig">
@@ -152,19 +213,14 @@
       <para> The <guilabel>General</guilabel> tab contains no less
         than seven sections, each with an icon: a face, for name and
         company; a telephone for phone numbers; an envelope for email
-        address; a house for postal address; a file folder for
-        contacts, and a briefcase for categories.  You can guess what
-        sort of information belongs in fields like <guilabel>Job
-        Title</guilabel> and <guilabel>Web page address</guilabel>,
-        but there are several parts of the window that are a little
-        more interesting.
+        address; a globe for web page address; a house for postal
+        address; a file folder for contacts, and a briefcase for
+        categories.  You can guess what sort of information belongs in
+        fields like <guilabel>Job Title</guilabel> and <guilabel>Web
+        page address</guilabel>, but there are several parts of the
+        window that are a little more interesting.
     </para>
     <para>
-      For more information about the <guilabel>Categories</guilabel>
-      organization tool, have a look at <xref
-      linkend="usage-contact-organize">.  The rest of the features in
-      the window are here:
- 
      <variablelist>
 	<varlistentry>
 	  <term>Full Name</term>
@@ -264,6 +320,27 @@
 	</varlistentry>
       </variablelist>
      </para>
+     <para>
+      The last item in the <guilabel>General</guilabel> tab is the
+       <guilabel>Categories</guilabel> organization tool.  That's
+       really its own topic; for information on that, read <xref
+       linkend="usage-contact-organize">.
+     </para>
+     <para>
+       The <guilabel>Details</guilabel> tab is, fortunately, much more
+       simple: three sections, all of which are more or less obvious:
+       the briefcase next to the details about the contact's
+       professional life; the face next to the details about their
+       personal life; the globe next to a big blank space you can use
+       for anything and everything else you'd like to note about them.
+       If you ever wanted to have that uncanny knack for remembering
+       obscure details like the date of someone's anniversary (perhaps
+       your own) this is the answer.
+     </para>
+
+
+
+
 <!--- ############# This section isn't implemented yet either:
     <sect2>
       <title></title>
@@ -399,7 +476,7 @@
     <title>Sharing your Cards</title>
     <para>
        If you keep your cards on a network using an
-       <glossterm>LDAP</glossterm> server, you can share access to
+       <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
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 1b3cb4a6fc..ebada4540a 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -26,9 +26,12 @@ implemented with a stable UI yet, and are described wrong -->
        </listitem>
        <listitem>
 	 <para>
-	   It supports multiple mail sources, including IMAP, POP3,
-	   local <filename>mbox</filename> files, and even NNTP data
-	   (newsgroups), which isn't technically email.
+	   It supports multiple mail sources, including <glossterm
+	   linkend="imap">IMAP</glossterm>, <glossterm
+	   linkend="pop">POP3</glossterm>, local
+	   <systemitem><filename>mbox</filename></systemitem> and
+	   <systemitem><filename>mh</filename></systemitem> files, and
+	   even NNTP data (newsgroups), which isn't technically email.
 	 </para>
        </listitem>
      </itemizedlist>
@@ -123,7 +126,7 @@ implemented with a stable UI yet, and are described wrong -->
 	    <term><guimenuitem>Expunge</guimenuitem></term>
 	    <listitem><para>
                Clicking the <guibutton>Delete</guibutton> button marks 
-               messages for deleteion. <guimenuitem>Expunge</guimenuitem> 
+               messages for deletion. <guimenuitem>Expunge</guimenuitem> 
                wipes them off the face of the earth.               
              </para></listitem>
 	    </varlistentry>
@@ -183,13 +186,14 @@ implemented with a stable UI yet, and are described wrong -->
 	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>POP</glossterm>), or storing it on
-	the network (using <glossterm>IMAP</glossterm>).  If you store
-	your mail on your local hard disk, you can read it whether
-	you're online or not, but you can only read it from one
-	computer.  If you store it on the network, you can only read
-	it when you're online, but you can access it from almost any
-	computer with a network connection, even if it doesn't have
+	hard disk (using <glossterm linkend="pop">POP</glossterm>), or
+	storing it on the network (using <glossterm
+	linkend="imap">IMAP</glossterm>).  If you store your mail on
+	your local hard disk, you can read it whether you're online or
+	not, but you can only read it from one computer.  If you store
+	it on the network, you can only read it when you're online,
+	but you can access it from almost any computer with a network
+	connection, even if it doesn't have
 	<application>Evolution</application>.
       </para>
       <para>
@@ -210,11 +214,11 @@ implemented with a stable UI yet, and are described wrong -->
 	needs to check your mail (see <xref
 	linkend="config-setupassist"> for more information).  If
 	you're checking mail over a network (instead of from local
-	<filename>mbox</filename> files), you'll need to enter your
-	email password.  Type it in, click <guibutton>OK</guibutton>
-	and <application>Evolution</application> will download your
-	mail.  New mail will appear in your
-	<interface>Inbox</interface>.
+	<systemitem><filename>mbox</filename></systemitem> files),
+	you'll need to enter your email password.  Type it in, click
+	<guibutton>OK</guibutton> and
+	<application>Evolution</application> will download your mail.
+	New mail will appear in your <interface>Inbox</interface>.
       </para>
       <para>
         Once you've entered your password,
@@ -278,16 +282,6 @@ implemented with a stable UI yet, and are described wrong -->
 	   turn it off if you prefer.
 	</para>
 
-<!--  ######## Feature will probably not be implemented ******
-	<para>
-	   It can also display <glossterm>live
-	   documents</glossterm>, which have scripted or
-	   executable contents&mdash; for example, a working
-	   spreadsheet page or a chess game.  
-	</para> 
-
--->
-
       </sect3>
     </sect2>
 
@@ -567,7 +561,8 @@ with quoted materials and the relevant replies interspersed-->
 	      <term><guimenuitem>Find Regex</guimenuitem></term>
 	      <listitem>
 		<para>
-                  Perform a search for a <glossterm>regular
+                  Perform a search for a <glossterm
+                  linkend="regular-expression">regular
                   expression</glossterm>, or "regex."
                </para>
              </listitem>
@@ -607,7 +602,7 @@ with quoted materials and the relevant replies interspersed-->
             You can't normally use text treatments or pictures in
             emails, which is why you've probably seen people use far
             too many exclamation points for emphasis or use
-            <glossterm>emoticons</glossterm> to convey their feelings.
+            <glossterm linkend="emoticon">emoticons</glossterm> to convey their feelings.
             However, most of the newer email programs can include and
             display images and text treatments as well as basic
             alignment and paragraph formatting.
@@ -704,7 +699,7 @@ with quoted materials and the relevant replies interspersed-->
 	      <listitem>
 		<para>
                   At the far right is the color section tool.  You can
-                  choose from several colors by clickin on the arrow,
+                  choose from several colors by clicking on the arrow,
                   or create your own custom color by clicking on the
                   color box itself.  If you have text selected, the
                   color will apply to the selected text.  If you do
@@ -798,7 +793,7 @@ possibly never will be due to security evil. -->
 	  have received a message and you think someone else would
 	  like to see it.  You can forward a message as an attachment
 	  to a new message (this is the default) or
-	  you can send it <glossterm>inline</glossterm> as a quoted
+	  you can send it <glossterm linkend="inline">inline</glossterm> as a quoted
 	  portion of the message you are sending.  Attachment
 	  forwarding is best if you want to send the full, unaltered
 	  message on to someone else.  Inline forwarding is best if
@@ -813,7 +808,7 @@ possibly never will be due to security evil. -->
 	  <guibutton>Forward</guibutton> on the toolbar, or select
 	  <menuchoice> <guimenu>Message</guimenu>
 	  <guimenuitem>Forward</guimenuitem> </menuchoice>.  If you
-	  prefer to forward the message <glossterm>inline</glossterm>
+	  prefer to forward the message <glossterm linkend="inline">inline</glossterm>
 	  instead of attached, select <menuchoice>
 	  <guimenu>Message</guimenu> <guimenuitem>Forward
 	  Inline</guimenuitem> </menuchoice> from the menu.  Choose an
@@ -828,7 +823,7 @@ possibly never will be due to security evil. -->
 	<title>Seven Tips for Email Usage</title>
 	<para>
 	  I started with ten, but four were "Don't send
-	  <glossterm>spam</glossterm>."
+	  <glossterm linkend="spam">spam</glossterm>."
 	  <itemizedlist>
 
 	    <listitem>
@@ -1140,7 +1135,7 @@ possibly never will be due to security evil. -->
 	  <varlistentry>
 	    <term><guilabel>Expression</guilabel></term>
 	    <listitem><para>
-               Enter a <glossterm>regular expression</glossterm>, and
+               Enter a <glossterm linkend="regular-expression">regular expression</glossterm>, and
 	       <application>Evolution</application> will match it for
 	       you.
            </para></listitem>
@@ -1339,7 +1334,7 @@ possibly never will be due to security evil. -->
 	<!--  (INSERT SCREENSHOT HERE: vFolders in action) -->
 
       <para>
-	 To create a vFolder, select <guimenuitem>VFolder
+	 To create a vFolder, select <guimenuitem>vFolder
 	 Editor</guimenuitem> from the <guimenu>Tools</guimenu>
 	 menu in the <interface>main window</interface>.  This
 	 will bring up a dialog box that looks suspiciously like
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 394c634c27..900f8a8866 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -150,24 +150,26 @@
 	  </para>
 	</listitem>
       </varlistentry>
--->
+
 	<varlistentry>
 	  <term> <guibutton>Notes:</guibutton></term>
 	<listitem>
 	  <para> The note pad is your catch-all tool: use it to take
 	    messages from phone conversations, keep small things
-	    organized, write <glossterm>haiku</glossterm>, or whatever
+	    organized, write <glossterm linkend="haiku">haiku</glossterm>, or whatever
 	    you like. This feature is not yet implemented, but will be
 	    soon. See <xref linkend="usage-notes"> for more
 	    information.
 	  </para>
 	</listitem>
 	</varlistentry>
+-->
+
       </variablelist>
     </para>
     <para>
       If you don't like the shortcut bar, you can use the menu bar, or
-      keyboard shortcuts, also called <glossterm>hot keys</glossterm>.
+      keyboard shortcuts, also called <glossterm linkend="hot-key">hot keys</glossterm>.
       They're shown next to their equivalent menu items in the menu
       bar. You can also set your own hot keys for functions that don't
       have any; this is covered in <xref linkend="config">.  If you're
@@ -187,14 +189,14 @@
          Shortcut</guimenuitem> </menuchoice>. </para>
        <para>
          To change the way the shortcut bar looks, right-click in an
-         empoy space on the shortcut bar.  From the menu that appears,
+         empty space on the shortcut bar.  From the menu that appears,
          you can select icon sizes.
        </para>
        <para>
          You don't need the folder bar to move between folders. You
          can use <menuchoice> <guimenu>File</guimenu> <guimenuitem>Go
          to Folder...</guimenuitem> </menuchoice> to move to a
-         particular foder.  It's faster, however, to click on the
+         particular folder.  It's faster, however, to click on the
          <guilabel>Inbox</guilabel> label just below the toolbar, to
          the right of the shortcut bar, and select a folder from
          there.  The <guilabel>Inbox</guilabel> label will change to
@@ -210,16 +212,17 @@
       way to view the information you've stored with
       <application>Evolution</application>. It displays all your
       appointments, address cards, and email in a tree that's a lot
-      like a <glossterm>file tree</glossterm>&mdash; it starts small
-      at the top, and branches downwards. On most computers, there
-      will be three folders at the base.  The first one is
-      <guilabel>VFolders</guilabel>, for virtual folders (discussed in
-      <xref linkend="usage-mail-organize-vfolders">.  After that come
-      any <glossterm>IMAP</glossterm> mail folders you might have
-      available to you over your network.  The next folder is called
-      <guilabel>External Directories</guilabel>, and holds
-      <glossterm>LDAP</glossterm> contact directories stored on a
-      network.  The most important one is probably
+      like a <glossterm linkend="filetree">file
+      tree</glossterm>&mdash; it starts small at the top, and branches
+      downwards. On most computers, there will be three folders at the
+      base.  At the top are your <guilabel>vFolders</guilabel>, or
+      virtual folders, discussed in <xref
+      linkend="usage-mail-organize-vfolders">.  After that come any
+      <glossterm linkend="imap">IMAP</glossterm> mail folders you
+      might have available to you over your network.  The next folder
+      is called <guilabel>External Directories</guilabel>, and holds
+      <glossterm linkend="ldap">LDAP</glossterm> contact directories
+      stored on a network.  The most important one is probably
       <guilabel>Local</guilabel>, which you can use to access all the
       data that's stored on your computer.  If you click on the plus
       sign plus sign next to the <guilabel>Local</guilabel> folder,
@@ -266,7 +269,7 @@
        <guilabel>Contacts</guilabel> for storing contacts.
     </para>
 
-    <note>
+       <note>
 	  <title>Folders Have Limits</title>
 	  <para>
 	      You can always place a folder inside other folders,
@@ -308,7 +311,7 @@
       To delete a folder, right-click it and select
       <guimenuitem>Delete</guimenuitem> from the menu that pops up.
       To change the order of folders, or put one inside another, use
-      <glossterm>drag-and-drop</glossterm>.  To move individual
+      drag-and-drop.  To move individual
       messages, appointments, and address cards between folders, you
       can do the same thing: drag them where you want them, and
       they'll go.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 501a85e914..40bb14634b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,67 @@
+2000-10-05  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-contact.sgml: Described Search features.
+
+	* C/menuref.sgml: Contact Manager menus fixed.
+
+2000-10-04  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-contact.sgml: Fixed glossterms.
+
+	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.
+
+	* C/apx-gloss.sgml: Added "Inline," "VCard".
+
+	* C/usage-mainwindow.sgml: Fixed glossterms, filenames. Spellchecked.
+
+	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.
+
+	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL, 
+	  which are now included as part of the gnome-help package.
+
+	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
+	responded to clahey's suggestions-- notably, commented out the
+	"add to master list" category feature.
+
+	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap
+        description.
+	
+	* C/evolution-guide.sgml: Spellcheck. Commented out Notes
+	entities.
+
+	* C/usage-notes.sgml: Spellchecked, then decided to comment out
+	this file/chapter and all references to it, since it's unlikely to
+	be implemented any time soon.
+
+	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May
+	  need more work in the near future.
+
+	* C/usage-sync.sgml: Now it's really short. And spelled correctly.
+
+2000-10-03  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-prefs.sgml: Mostly spelling. Still needs major
+	alteration.
+
+	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,
+	ran spellcheck. Still needs lots of work, since many menus have
+	changed.
+
+	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,
+	spellchecked.
+
+2000-09-26  Aaron Weber  <aaron@helixcode.com>
+
+	* C/apx-gloss.sgml:  Added sendmail and SMTP.
+
+2000-09-22  Aaron Weber  <aaron@helixcode.com>
+
+	* C/menuref.sgml: Changed to reflect new menu layout.
+
+	* C/usage-mainwindow.sgml: Changed to reflect new menu layout. Again.
+
+	* C/usage-contact.sgml: Stop and Display All features.
+
 2000-09-21  Aaron Weber  <aaron@helixcode.com>
 
 	* C/evolution-guide.sgml: Switched to the "official" FSF markup.
diff --git a/help/C/apx-bugs.sgml b/help/C/apx-bugs.sgml
index e7a501acba..e4a96a8155 100644
--- a/help/C/apx-bugs.sgml
+++ b/help/C/apx-bugs.sgml
@@ -12,8 +12,12 @@
     </abstract>
 
     <para>
-      The bugs are many, but the application is young, and this is to
-      be expected.
+      Evolution is still beta software, so the bug tracking is best
+      left to the bugzilla system and to the programmers.  However,
+      there are a number of limitations that will not be addressed
+      before version 1.0. The most notable are: Import of Microsoft
+      Outlook .pst files, and compatibility with the Microsoft
+      Exchange protocol.
     </para>
   </appendix>
 
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 7aa5e494dc..24203f64a6 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -46,19 +46,17 @@
   </glossdef>
  </glossentry>
 
-<!--  Removed pending decision on names
  <glossentry id="druid">
   <glossterm>Druid</glossterm>
   <glossdef>
    <para>
-    A small program or script used to help configure or set up some
-    larger program.  The <application>mail setup druid</application>
-    helps you ready your email system for use.  Druids are the Linux
-    equivalent of "Assistants" and "Wizards." 
+    A tool which guides a user through a series of steps, usually to
+    configure or set up a program.  Equivalent to "Assistant" and
+    "Wizard."
    </para>
   </glossdef>
  </glossentry>
--->
+
 <glossentry id="emoticon">
   <glossterm>Emoticon</glossterm>
   <glossdef>
@@ -95,6 +93,23 @@
   </glossdef>
  </glossentry>
 
+
+ <glossentry id="filetree">
+  <glossterm>File Tree</glossterm>
+  <glossdef>
+   <para>
+     A way of describing a group of files on a computer.  With the
+     perversity typical of computer (and especially Unix and Linux)
+     nomenclature, the top of the tree is called the root directory,
+     and denoted by <systemitem><filename>/</filename></systemitem>.
+     The rest of the "branches" spread downwards from the root.  Don't
+     confuse the root directory with the <systemitem>root</systemitem>
+     account, or root's home directory,
+     <systemitem><filename>/home/root</filename></systemitem>.
+   </para>
+  </glossdef>
+ </glossentry>
+
  <glossentry id="filter">
   <glossterm>Filter</glossterm>
   <glossdef>
@@ -186,6 +201,18 @@
    </para>
   </glossdef>
  </glossentry>
+
+
+ <glossentry id="inline">
+  <glossterm>Inline</glossterm>
+  <glossdef>
+   <para>
+     Displayed as part of a message or other document, rather than
+     attached as a separate file. Contrast with <glossterm
+     linkend="attachment">Attachment</glossterm>.
+   </para>
+  </glossdef>
+ </glossentry>
  
   <glossentry id="ldap">
    <glossterm>LDAP</glossterm>
@@ -285,12 +312,9 @@
   <glossterm>Script</glossterm>
   <glossdef>
    <para>
-    A program, which is written in an interpreted (rather than
-    compiled) language.  Scripts are more likely to work on multiple
-    platforms, but they require an additional layer of software (the
-    interpreter) which mediates between them and the operating system.
-    Because of this, they typically suffer from relatively sluggish
-    performance, and are limited to smaller tasks.
+    A program written in an interpreted (rather than compiled)
+    language.  Often used as a synonym for "macro," to denote a series
+    of pre-recorded commands or actions within an application.
    </para>
   </glossdef>
  </glossentry>
@@ -354,8 +378,7 @@
     newsletters."
    </para>
   </glossdef>
- <
-/glossentry>
+ </glossentry>
 
  <glossentry id="virus">
   <glossterm>Virus</glossterm>
@@ -369,6 +392,18 @@
   </glossdef>
  </glossentry>
 
+ <glossentry id="vcard">
+  <glossterm>vCard</glossterm>
+  <glossdef>
+   <para>
+    A file format for the exchange of contact information. When you
+    get an address card attached to an email, it's probably in vCard
+    format.  Not to be confused with <glossterm
+    linkend="vfolder">vFolder</glossterm>.
+   </para>
+  </glossdef>
+ </glossentry>
+
  <glossentry id="vfolder">
   <glossterm>vFolder</glossterm>
   <glossdef>
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index 8ec98271cc..310eea5711 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE Book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
+<!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
 
 <!ENTITY PREFACE SYSTEM "preface.sgml">
 <!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
@@ -13,8 +13,6 @@
 <!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
-<!ENTITY APX-FDL SYSTEM "apx-fdl.sgml">
-<!ENTITY APX-GPL SYSTEM "apx-gpl.sgml">
 
 ]>
 
@@ -34,44 +32,38 @@ implemented. -->
     </authorgroup>
     <copyright>
       <year>2000</year>
-      <holder>Helix Code, Inc., </holder>
-      <holder>Kevin Breit</holder>
+      <holder> Helix Code, Inc., </holder>
+      <holder> Kevin Breit </holder>
     </copyright>
     
-    <legalnotice>
-      <para>
-        Permission is granted to copy, distribute and/or modify this
-        document under the terms of the <citetitle>GNU Free
-        Documentation License</citetitle>, (FDL) Version 1.1 or any later
-        version published by the Free Software Foundation with no
-        Invariant Sections, no Front-Cover Texts, and no Back-Cover
-        Texts.
-      </para>
-      <para>
-        The software described by this document falls under the
-        <citetitle>GNU General Public License</citetitle>, or GPL.
-      </para>
-      <para>
-        These licenses are included with this document in <xref
-        linkend="fdl">, and <xref linkend="gpl">; you may also obtain
-        a copy from the Free Software Foundation by visiting <ulink
-        type="http" url="http://www.fsf.org">their Web site</ulink> or
-        by writing to: Free Software Foundation, Inc., 59 Temple Place
-        - Suite 330, Boston, MA 02111-1307, USA.
-      </para>
-      <para>
-        Many of the names used by companies to distinguish their
-        products and services are claimed as trademarks. Where those
-        names appear in any GNOME documentation, and those trademarks
-        are made aware to the members of the GNOME Documentation
-        Project, the names have been printed in caps or initial caps.
-      </para>
-
+    <legalnotice id="legalnotice">
+ 
+     <para>
+         Permission is granted to copy, distribute and/or modify this
+         document under the terms of the <ulink type="help"
+         url="gnome-help:fdl"><citetitle>GNU Free Documentation
+         License</citetitle></ulink>, Version 1.1 or any later version
+         published by the Free Software Foundation with no Invariant
+         Sections, no Front-Cover Texts, and no Back-Cover Texts. You
+         may obtain a copy of the <citetitle>GNU Free Documentation
+         License</citetitle> from the Free Software Foundation by
+         visiting <ulink type="http" url="http://www.fsf.org">their
+         Web site</ulink> or by writing to: Free Software Foundation,
+         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+         USA.
+       </para>
+       <para>
+         Many of the names used by companies to distinguish their
+         products and services are claimed as trademarks. Where those
+         names appear in any GNOME documentation, and those trademarks
+         are made aware to the members of the GNOME Documentation
+         Project, the names have been printed in caps or initial caps.
+       </para>
     </legalnotice>
 
     <releaseinfo>
-       This is version 0.4 of the Evolution manual, describing version 
-       0.3.1 of Evolution.  
+       This is version 0.6 of the Evolution manual, describing version 
+       0.6 of Evolution.  
    </releaseinfo>
 
   </bookinfo>
@@ -136,9 +128,6 @@ implemented. -->
   &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS; 
-  &APX-FDL;
-  &APX-GPL;
-
 </book>
 
 
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index a3ba7e7b34..28e2da4ff7 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -1122,7 +1122,10 @@
   <sect1>
     <title>Contact Manager Menus</title>
     <para>
-      Insert Content Here (FIXME).
+     The contact manager has six menus: <guimenu>File</guimenu>,
+     <guimenu>Edit</guimenu>, <guimenu>View</guimenu>,
+     <guimenu>Setting</guimenu>s, <guimenu>Tools</guimenu>, and
+     <guimenu>Help</guimenu>.
     </para>
 
     <sect2 id="menuref-contact-edit">
@@ -1171,7 +1174,17 @@
    <sect2 id="menuref-contact-tools">
       <title>Contact Manager Tools Menu</title>
       <para>
-         This menu is empty.
+         This menu contains one item:
+
+        <variablelist>
+	  <varlistentry>
+	    <term><guimenuitem>Search for
+	    Contacts</guimenuitem></term> <listitem><para> Brings up
+	    the in-depth search window. <xref
+	    linkend="contact-search"> describes how to use this
+	    feature.  </para></listitem>
+            </varlistentry>
+        </variablelist>
       </para>
     </sect2>
 
@@ -1188,11 +1201,56 @@
   <sect1 id="menuref-contact-editor">
     <title>The Contact Editor Menus</title>
     <para>
-      Most, if not all, of the menu items for this section are still
-      inoperable, but there are vast numbers of them, especially in
-      the <guimenu>Actions</guimenu> menu.  When available, I will 
-      describe them.
+       This window has only one menu: the file menu.
     </para>
+   
+   <sect2 id="menuref-contact-editor-file">
+      <title>Contact Editor File Menu</title>
+      <para>
+         This menu contains five items:
+         <variablelist>
+
+	  <varlistentry>
+	  <term><guimenuitem>Save</guimenuitem></term>
+	  <listitem><para>
+             
+           </para></listitem>
+	  </varlistentry>	
+
+	  <varlistentry>
+	  <term><guimenuitem>Save As</guimenuitem></term>
+	  <listitem><para>
+              Allows you to save the contact as an external 
+              file in the <glossterm linkend="vcard">VCard</glossterm> format. 
+           </para></listitem>
+	  </varlistentry>	
+
+	  <varlistentry>
+	  <term><guimenuitem>Print</guimenuitem></term>
+	  <listitem><para>
+             Prints the current contact.
+           </para></listitem>
+	  </varlistentry>	
+
+
+	  <varlistentry>
+	  <term><guimenuitem>Delete</guimenuitem></term>
+	  <listitem><para>
+             Deletes the current contact.
+           </para></listitem>
+	  </varlistentry>	
+
+  
+	  <varlistentry>
+	  <term><guimenuitem>Close</guimenuitem></term>
+	  <listitem><para>
+              Closes the Contact Editor without saving.
+           </para></listitem>
+	  </varlistentry>	
+
+	</variablelist>  
+      </para>
+    </sect2>
   </sect1>
   
 
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 5e74a2ce0e..d760d5b00a 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -15,7 +15,7 @@
         <application>Evolution</application>'s goal is to make the
         tasks of storing, organizing, and retrieving information
         easier, so you can work and communicate with others.  That is,
-        it's a more evolved <glossterm>groupware</glossterm> program,
+        it's a more evolved <glossterm linkend="groupware">groupware</glossterm> program,
         an integral part of the Internet-connected desktop. On the
         inside, it's a powerful database; on the outside, it's a tool
         to help you get your work done.
@@ -24,10 +24,13 @@
         Because it's part of the GNOME project,
         <application>Evolution</application> is free software.  The
         program and its source code are released under the terms of
-        the GNU Public License (GPL), and the documentation falls
-        under the Free Documentation License (FDL).  For more
-        information about the GPL and the FDL, visit the Free Software
-        Foundation's website at <ulink
+        the <ulink type="help" url="gnome-help:gpl"><citetitle>GNU
+        Public License (GPL)</citetitle></ulink>, and the
+        documentation falls under the <ulink type="help"
+        url="gnome-help:fdl"><citetitle>Free Documentation
+        License</citetitle></ulink> (FDL). For more information about
+        the GPL and the FDL, visit the Free Software Foundation's
+        website at <ulink
         url="http://www.fsf.org">http://www.fsf.org</ulink>.
       </para>
       <para>
@@ -71,20 +74,21 @@
 	    <para>
               <application>Evolution</application> must meet and
               exceed the standards set by other groupware products.
-              It must include support for most major network protocols
-              so that it can integrate seamlessly with existing
-              hardware and network environments.
+              It must include support for most major network
+              <glossterm linkend="protocol">protocols</glossterm> so
+              that it can integrate seamlessly with existing hardware
+              and network environments.
             </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-               The project must support open standards and protocols
-               to turn <application>Evolution</application> into an
-               advanced development platform.  From the simplest
-               scripting to the most complex network and component
-               programming, <application>Evolution</application> must
-               to offer developers an environment for cutting-edge
-               application development.
+               The project must support open standards and be open to
+               expansion, so that it can become a development platform
+               as well as an application.  From the simplest scripting
+               to the most complex network and component programming,
+               <application>Evolution</application> must offer
+               developers an environment for cutting-edge application
+               development.
             </para>
 	  </listitem>
 	  <listitem>
@@ -163,11 +167,12 @@
                           <guimenuitem>Menu Item</guimenuitem>
                      </menuchoice>
             </member>
-	    <member><guibutton>Buttons</guibutton> you can click</member>
-            <member><userinput>Anything you type in</userinput></member>
-	    <member><computeroutput>Text output from a computer</computeroutput></member>
-            <member><glossterm>Words</glossterm> that are defined 
-                    in <xref linkend="apx-gloss">.</member>
+	    <member><guibutton>Buttons</guibutton> you can
+            click</member> <member><userinput>Anything you type
+            in</userinput></member> <member><computeroutput>Text
+            output from a computer</computeroutput></member>
+            <member><glossterm linkend="apx-gloss">Words</glossterm>
+            that are defined in <xref linkend="apx-gloss">.</member>
 	  </simplelist>
         </para>
       </formalpara>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index e983a2367d..f4d7e50ebc 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -13,7 +13,7 @@
       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>LDAP</glossterm>, it can
+      network protocols, including <glossterm linkend="ldap">LDAP</glossterm>, it can
       fit into almost any existing network.
     </para>
     <para>
@@ -41,14 +41,15 @@
     
     <para>
        To open up your address book, click on
-       <guibutton>Contacts</guibutton> in the shortcut bar.  The
-       contact manager is illustrated in <xref
-       linkend="usage-contact-fig">.  By default, the contact manager
-       shows all your cards in alphabetical order, in a
-       <glossterm>minicard</glossterm> format.  You can select other
-       views from the <guimenu>View</guimenu> menu, and adjust the
-       width of the columns by clicking and dragging the grey column
-       dividers.
+       <guibutton>Contacts</guibutton> in the shortcut bar, or select
+       one of your contacts folders from the folder bar.  <xref
+       linkend="usage-contact-fig"> shows the Contact Manager in all
+       its organizational glory.  By default, the contact manager
+       shows all your cards in alphabetical order, in a <glossterm
+       linkend="minicard">minicard</glossterm> format.  You can select
+       other views from the <guimenu>View</guimenu> menu, and adjust
+       the width of the columns by clicking and dragging the grey
+       column dividers.
     </para>
 
 
@@ -79,39 +80,94 @@
            <guibutton>Delete</guibutton> deletes a selected card.
         </para></listitem>
 
-        <listitem><para>
-           <guibutton>Show All</guibutton> Shows all cards.
-        </para></listitem>
-
-        <listitem><para>
-           <guibutton>Stop</guibutton> Stop loading card data from the network.
-        </para></listitem>
+        <listitem><para> <guibutton>View All</guibutton> Displays all
+           the address information in the folder.  Use this button to
+           refresh the display for a network folder, or to switch from
+           viewing the results of a search and see the whole contents.
+           </para></listitem>
 
+        <listitem><para> <guibutton>Stop</guibutton> Stop loading
+           contact data from the network.  This button is only
+           relevant if you are looking at contact information on a
+           network.  </para></listitem>
       </itemizedlist>
     </para>
-    <para>
-       The last feature is <guilabel>Quick Search</guilabel>; to use
-       it, just type in the name of the person you're looking for and
-       hit <keycap>Enter</keycap>.
-       <application>Evolution</application> will search through all
-       the cards to find one that matches.
-    </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>.
-    </para>
+
     <para>
        The rest of the contact manager is taken up by the display of
-       your cards.  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.
+       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.
     </para>
+
+    <sect2 id="contact-search">
+      <title>Searching for Contacts</title>
+      <para>
+	   Between <guilabel>Delete</guilabel> and <guilabel>View
+    	   All</guilabel> is <guilabel>Quick Search</guilabel>. To use
+    	   it, just type in one or more words you're looking for and
+    	   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.
+	</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>.
+      </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.
+         </para>
+	 <para>
+	    He opens his contacts folder, and runs a quick search for
+	    "Curtis;" there are eighteen different people with that name
+	    in the file. He then enters "Sales," and
+	    <application>Evolution</application> narrows it down to the
+	    right Curtis. He only becomes annoyed when he discovers that
+	    the call was not actually important.
+          </para>
+      </example>
+    
+      <para>
+        If you prefer to perform a more complex search, press
+        <guibutton>Find</guibutton> or choose
+        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for
+        Contact</guimenuitem></menuchoice>. This will open the in-depth search window, which
+        lets you use multiple search criteria in the same way that
+        email filters and <glossterm linkend="vfolder">vFolders</glossterm> do..
+      </para>    
+      <para>
+        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
+        <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
+        With</guilabel> and <guilabel>Does Not Contain</guilabel>,
+        decide whether to match <guilabel>All</guilabel> or
+        <guilabel>Any</guilabel> of your criteria, and press
+        <guibutton>Search</guibutton> to set it all off.
+      </para>
+    
+    </sect2>
+
   </sect1>
   <sect1 id="usage-contact-cards">
-    <title>Destroy, Create, or Change Cards</title>
-
+    <title>Destroy, Create, and Change: The Contact Editor</title>
     <para>
        To delete a card, click on it once to select it, then press the
        <guibutton>Delete Card</guibutton> button.  If you have
@@ -136,8 +192,13 @@
 	The contact editor window has two tabs,
     	<guilabel>General</guilabel>, for basic contact information,
     	and <guilabel>Details</guilabel>, for a more specific
-    	description of the person.  In addition, it contains a full
-    	menu bar, covered in <xref linkend="menuref">.
+    	description of the person.  In addition, it contains a
+    	<guimenu>File</guimenu> menu, covered in <xref
+    	linkend="menuref-contact-editor">, and a toolbar with three
+    	items: <guilabel>Save and Close</guilabel>,
+    	<guilabel>Print</guilabel>, and <guilabel>Delete</guilabel>.
+    	After that, however, it gets slightly more complicated, as you
+    	can see in <xref linkend="usage-contact-editor-fig">.
       </para>
       
       <figure id="usage-contact-editor-fig">
@@ -152,19 +213,14 @@
       <para> The <guilabel>General</guilabel> tab contains no less
         than seven sections, each with an icon: a face, for name and
         company; a telephone for phone numbers; an envelope for email
-        address; a house for postal address; a file folder for
-        contacts, and a briefcase for categories.  You can guess what
-        sort of information belongs in fields like <guilabel>Job
-        Title</guilabel> and <guilabel>Web page address</guilabel>,
-        but there are several parts of the window that are a little
-        more interesting.
+        address; a globe for web page address; a house for postal
+        address; a file folder for contacts, and a briefcase for
+        categories.  You can guess what sort of information belongs in
+        fields like <guilabel>Job Title</guilabel> and <guilabel>Web
+        page address</guilabel>, but there are several parts of the
+        window that are a little more interesting.
     </para>
     <para>
-      For more information about the <guilabel>Categories</guilabel>
-      organization tool, have a look at <xref
-      linkend="usage-contact-organize">.  The rest of the features in
-      the window are here:
- 
      <variablelist>
 	<varlistentry>
 	  <term>Full Name</term>
@@ -264,6 +320,27 @@
 	</varlistentry>
       </variablelist>
      </para>
+     <para>
+      The last item in the <guilabel>General</guilabel> tab is the
+       <guilabel>Categories</guilabel> organization tool.  That's
+       really its own topic; for information on that, read <xref
+       linkend="usage-contact-organize">.
+     </para>
+     <para>
+       The <guilabel>Details</guilabel> tab is, fortunately, much more
+       simple: three sections, all of which are more or less obvious:
+       the briefcase next to the details about the contact's
+       professional life; the face next to the details about their
+       personal life; the globe next to a big blank space you can use
+       for anything and everything else you'd like to note about them.
+       If you ever wanted to have that uncanny knack for remembering
+       obscure details like the date of someone's anniversary (perhaps
+       your own) this is the answer.
+     </para>
+
+
+
+
 <!--- ############# This section isn't implemented yet either:
     <sect2>
       <title></title>
@@ -399,7 +476,7 @@
     <title>Sharing your Cards</title>
     <para>
        If you keep your cards on a network using an
-       <glossterm>LDAP</glossterm> server, you can share access to
+       <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
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 1b3cb4a6fc..ebada4540a 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -26,9 +26,12 @@ implemented with a stable UI yet, and are described wrong -->
        </listitem>
        <listitem>
 	 <para>
-	   It supports multiple mail sources, including IMAP, POP3,
-	   local <filename>mbox</filename> files, and even NNTP data
-	   (newsgroups), which isn't technically email.
+	   It supports multiple mail sources, including <glossterm
+	   linkend="imap">IMAP</glossterm>, <glossterm
+	   linkend="pop">POP3</glossterm>, local
+	   <systemitem><filename>mbox</filename></systemitem> and
+	   <systemitem><filename>mh</filename></systemitem> files, and
+	   even NNTP data (newsgroups), which isn't technically email.
 	 </para>
        </listitem>
      </itemizedlist>
@@ -123,7 +126,7 @@ implemented with a stable UI yet, and are described wrong -->
 	    <term><guimenuitem>Expunge</guimenuitem></term>
 	    <listitem><para>
                Clicking the <guibutton>Delete</guibutton> button marks 
-               messages for deleteion. <guimenuitem>Expunge</guimenuitem> 
+               messages for deletion. <guimenuitem>Expunge</guimenuitem> 
                wipes them off the face of the earth.               
              </para></listitem>
 	    </varlistentry>
@@ -183,13 +186,14 @@ implemented with a stable UI yet, and are described wrong -->
 	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>POP</glossterm>), or storing it on
-	the network (using <glossterm>IMAP</glossterm>).  If you store
-	your mail on your local hard disk, you can read it whether
-	you're online or not, but you can only read it from one
-	computer.  If you store it on the network, you can only read
-	it when you're online, but you can access it from almost any
-	computer with a network connection, even if it doesn't have
+	hard disk (using <glossterm linkend="pop">POP</glossterm>), or
+	storing it on the network (using <glossterm
+	linkend="imap">IMAP</glossterm>).  If you store your mail on
+	your local hard disk, you can read it whether you're online or
+	not, but you can only read it from one computer.  If you store
+	it on the network, you can only read it when you're online,
+	but you can access it from almost any computer with a network
+	connection, even if it doesn't have
 	<application>Evolution</application>.
       </para>
       <para>
@@ -210,11 +214,11 @@ implemented with a stable UI yet, and are described wrong -->
 	needs to check your mail (see <xref
 	linkend="config-setupassist"> for more information).  If
 	you're checking mail over a network (instead of from local
-	<filename>mbox</filename> files), you'll need to enter your
-	email password.  Type it in, click <guibutton>OK</guibutton>
-	and <application>Evolution</application> will download your
-	mail.  New mail will appear in your
-	<interface>Inbox</interface>.
+	<systemitem><filename>mbox</filename></systemitem> files),
+	you'll need to enter your email password.  Type it in, click
+	<guibutton>OK</guibutton> and
+	<application>Evolution</application> will download your mail.
+	New mail will appear in your <interface>Inbox</interface>.
       </para>
       <para>
         Once you've entered your password,
@@ -278,16 +282,6 @@ implemented with a stable UI yet, and are described wrong -->
 	   turn it off if you prefer.
 	</para>
 
-<!--  ######## Feature will probably not be implemented ******
-	<para>
-	   It can also display <glossterm>live
-	   documents</glossterm>, which have scripted or
-	   executable contents&mdash; for example, a working
-	   spreadsheet page or a chess game.  
-	</para> 
-
--->
-
       </sect3>
     </sect2>
 
@@ -567,7 +561,8 @@ with quoted materials and the relevant replies interspersed-->
 	      <term><guimenuitem>Find Regex</guimenuitem></term>
 	      <listitem>
 		<para>
-                  Perform a search for a <glossterm>regular
+                  Perform a search for a <glossterm
+                  linkend="regular-expression">regular
                   expression</glossterm>, or "regex."
                </para>
              </listitem>
@@ -607,7 +602,7 @@ with quoted materials and the relevant replies interspersed-->
             You can't normally use text treatments or pictures in
             emails, which is why you've probably seen people use far
             too many exclamation points for emphasis or use
-            <glossterm>emoticons</glossterm> to convey their feelings.
+            <glossterm linkend="emoticon">emoticons</glossterm> to convey their feelings.
             However, most of the newer email programs can include and
             display images and text treatments as well as basic
             alignment and paragraph formatting.
@@ -704,7 +699,7 @@ with quoted materials and the relevant replies interspersed-->
 	      <listitem>
 		<para>
                   At the far right is the color section tool.  You can
-                  choose from several colors by clickin on the arrow,
+                  choose from several colors by clicking on the arrow,
                   or create your own custom color by clicking on the
                   color box itself.  If you have text selected, the
                   color will apply to the selected text.  If you do
@@ -798,7 +793,7 @@ possibly never will be due to security evil. -->
 	  have received a message and you think someone else would
 	  like to see it.  You can forward a message as an attachment
 	  to a new message (this is the default) or
-	  you can send it <glossterm>inline</glossterm> as a quoted
+	  you can send it <glossterm linkend="inline">inline</glossterm> as a quoted
 	  portion of the message you are sending.  Attachment
 	  forwarding is best if you want to send the full, unaltered
 	  message on to someone else.  Inline forwarding is best if
@@ -813,7 +808,7 @@ possibly never will be due to security evil. -->
 	  <guibutton>Forward</guibutton> on the toolbar, or select
 	  <menuchoice> <guimenu>Message</guimenu>
 	  <guimenuitem>Forward</guimenuitem> </menuchoice>.  If you
-	  prefer to forward the message <glossterm>inline</glossterm>
+	  prefer to forward the message <glossterm linkend="inline">inline</glossterm>
 	  instead of attached, select <menuchoice>
 	  <guimenu>Message</guimenu> <guimenuitem>Forward
 	  Inline</guimenuitem> </menuchoice> from the menu.  Choose an
@@ -828,7 +823,7 @@ possibly never will be due to security evil. -->
 	<title>Seven Tips for Email Usage</title>
 	<para>
 	  I started with ten, but four were "Don't send
-	  <glossterm>spam</glossterm>."
+	  <glossterm linkend="spam">spam</glossterm>."
 	  <itemizedlist>
 
 	    <listitem>
@@ -1140,7 +1135,7 @@ possibly never will be due to security evil. -->
 	  <varlistentry>
 	    <term><guilabel>Expression</guilabel></term>
 	    <listitem><para>
-               Enter a <glossterm>regular expression</glossterm>, and
+               Enter a <glossterm linkend="regular-expression">regular expression</glossterm>, and
 	       <application>Evolution</application> will match it for
 	       you.
            </para></listitem>
@@ -1339,7 +1334,7 @@ possibly never will be due to security evil. -->
 	<!--  (INSERT SCREENSHOT HERE: vFolders in action) -->
 
       <para>
-	 To create a vFolder, select <guimenuitem>VFolder
+	 To create a vFolder, select <guimenuitem>vFolder
 	 Editor</guimenuitem> from the <guimenu>Tools</guimenu>
 	 menu in the <interface>main window</interface>.  This
 	 will bring up a dialog box that looks suspiciously like
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 394c634c27..900f8a8866 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -150,24 +150,26 @@
 	  </para>
 	</listitem>
       </varlistentry>
--->
+
 	<varlistentry>
 	  <term> <guibutton>Notes:</guibutton></term>
 	<listitem>
 	  <para> The note pad is your catch-all tool: use it to take
 	    messages from phone conversations, keep small things
-	    organized, write <glossterm>haiku</glossterm>, or whatever
+	    organized, write <glossterm linkend="haiku">haiku</glossterm>, or whatever
 	    you like. This feature is not yet implemented, but will be
 	    soon. See <xref linkend="usage-notes"> for more
 	    information.
 	  </para>
 	</listitem>
 	</varlistentry>
+-->
+
       </variablelist>
     </para>
     <para>
       If you don't like the shortcut bar, you can use the menu bar, or
-      keyboard shortcuts, also called <glossterm>hot keys</glossterm>.
+      keyboard shortcuts, also called <glossterm linkend="hot-key">hot keys</glossterm>.
       They're shown next to their equivalent menu items in the menu
       bar. You can also set your own hot keys for functions that don't
       have any; this is covered in <xref linkend="config">.  If you're
@@ -187,14 +189,14 @@
          Shortcut</guimenuitem> </menuchoice>. </para>
        <para>
          To change the way the shortcut bar looks, right-click in an
-         empoy space on the shortcut bar.  From the menu that appears,
+         empty space on the shortcut bar.  From the menu that appears,
          you can select icon sizes.
        </para>
        <para>
          You don't need the folder bar to move between folders. You
          can use <menuchoice> <guimenu>File</guimenu> <guimenuitem>Go
          to Folder...</guimenuitem> </menuchoice> to move to a
-         particular foder.  It's faster, however, to click on the
+         particular folder.  It's faster, however, to click on the
          <guilabel>Inbox</guilabel> label just below the toolbar, to
          the right of the shortcut bar, and select a folder from
          there.  The <guilabel>Inbox</guilabel> label will change to
@@ -210,16 +212,17 @@
       way to view the information you've stored with
       <application>Evolution</application>. It displays all your
       appointments, address cards, and email in a tree that's a lot
-      like a <glossterm>file tree</glossterm>&mdash; it starts small
-      at the top, and branches downwards. On most computers, there
-      will be three folders at the base.  The first one is
-      <guilabel>VFolders</guilabel>, for virtual folders (discussed in
-      <xref linkend="usage-mail-organize-vfolders">.  After that come
-      any <glossterm>IMAP</glossterm> mail folders you might have
-      available to you over your network.  The next folder is called
-      <guilabel>External Directories</guilabel>, and holds
-      <glossterm>LDAP</glossterm> contact directories stored on a
-      network.  The most important one is probably
+      like a <glossterm linkend="filetree">file
+      tree</glossterm>&mdash; it starts small at the top, and branches
+      downwards. On most computers, there will be three folders at the
+      base.  At the top are your <guilabel>vFolders</guilabel>, or
+      virtual folders, discussed in <xref
+      linkend="usage-mail-organize-vfolders">.  After that come any
+      <glossterm linkend="imap">IMAP</glossterm> mail folders you
+      might have available to you over your network.  The next folder
+      is called <guilabel>External Directories</guilabel>, and holds
+      <glossterm linkend="ldap">LDAP</glossterm> contact directories
+      stored on a network.  The most important one is probably
       <guilabel>Local</guilabel>, which you can use to access all the
       data that's stored on your computer.  If you click on the plus
       sign plus sign next to the <guilabel>Local</guilabel> folder,
@@ -266,7 +269,7 @@
        <guilabel>Contacts</guilabel> for storing contacts.
     </para>
 
-    <note>
+       <note>
 	  <title>Folders Have Limits</title>
 	  <para>
 	      You can always place a folder inside other folders,
@@ -308,7 +311,7 @@
       To delete a folder, right-click it and select
       <guimenuitem>Delete</guimenuitem> from the menu that pops up.
       To change the order of folders, or put one inside another, use
-      <glossterm>drag-and-drop</glossterm>.  To move individual
+      drag-and-drop.  To move individual
       messages, appointments, and address cards between folders, you
       can do the same thing: drag them where you want them, and
       they'll go.
diff --git a/help/ChangeLog b/help/ChangeLog
index 501a85e914..40bb14634b 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,67 @@
+2000-10-05  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-contact.sgml: Described Search features.
+
+	* C/menuref.sgml: Contact Manager menus fixed.
+
+2000-10-04  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-contact.sgml: Fixed glossterms.
+
+	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.
+
+	* C/apx-gloss.sgml: Added "Inline," "VCard".
+
+	* C/usage-mainwindow.sgml: Fixed glossterms, filenames. Spellchecked.
+
+	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.
+
+	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL, 
+	  which are now included as part of the gnome-help package.
+
+	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
+	responded to clahey's suggestions-- notably, commented out the
+	"add to master list" category feature.
+
+	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap
+        description.
+	
+	* C/evolution-guide.sgml: Spellcheck. Commented out Notes
+	entities.
+
+	* C/usage-notes.sgml: Spellchecked, then decided to comment out
+	this file/chapter and all references to it, since it's unlikely to
+	be implemented any time soon.
+
+	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May
+	  need more work in the near future.
+
+	* C/usage-sync.sgml: Now it's really short. And spelled correctly.
+
+2000-10-03  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-prefs.sgml: Mostly spelling. Still needs major
+	alteration.
+
+	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,
+	ran spellcheck. Still needs lots of work, since many menus have
+	changed.
+
+	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,
+	spellchecked.
+
+2000-09-26  Aaron Weber  <aaron@helixcode.com>
+
+	* C/apx-gloss.sgml:  Added sendmail and SMTP.
+
+2000-09-22  Aaron Weber  <aaron@helixcode.com>
+
+	* C/menuref.sgml: Changed to reflect new menu layout.
+
+	* C/usage-mainwindow.sgml: Changed to reflect new menu layout. Again.
+
+	* C/usage-contact.sgml: Stop and Display All features.
+
 2000-09-21  Aaron Weber  <aaron@helixcode.com>
 
 	* C/evolution-guide.sgml: Switched to the "official" FSF markup.