Altered category addition stuff, plus suggestions from Kevin.

2000-07-18  Aaron Weber  <aaron@helixcode.com>

	* C/usage-contact.sgml: Altered category addition stuff, plus
	suggestions from Kevin.

	* C/apx-gloss.sgml: Added ldap and signature definitions (from
	Kevin).

	* C/usage-mail.sgml: Move to variablelists from itemizedlists.

2000-07-14  Aaron Weber  <aaron@helixcode.com>

	* C/usage-contact.sgml: moved to variablelists from itemizedlists
	* C/usage-calendar.sgml: moved to variablelists from itemizedlists

svn path=/trunk/; revision=4210

10 files changed, 590 insertions, 426 deletions

diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml
index 4ecc33d03b..e660a0c798 100644
--- a/doc/C/apx-gloss.sgml
+++ b/doc/C/apx-gloss.sgml
@@ -169,6 +169,16 @@
  </glossentry> 
 
 
+  <glossentry id="ldap">
+   <glossterm>LDAP</glossterm>
+   <glossdef>
+    <para>
+     LDAP is a protocol which allows a client to search through a large database
+     of addresses, phone numbers, and people, as an alternative to a physical
+     phone book.
+    </para>
+   </glossdef>
+  </glossentry>
 
  <glossentry id="mail-client">
   <glossterm>Mail Client</glossterm>
@@ -230,6 +240,18 @@
   </glossdef>
  </glossentry>
 
+  <glossnetry id="signature">
+   <glossterm>Signature</glossterm>
+   <glossdef>
+    <para>
+     Signatures allow a user to specify a message to place at the bottom of
+     every email sent.  A signature can be anything from a favorite quote to
+     a link to a webpage.
+    </para>
+   </glossdef>
+  </glossentry> 
+
+
  <glossentry id="spam">
   <glossterm>Spam</glossterm>
   <glossdef>
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index f8c74c67d2..60e973a188 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -1,4 +1,4 @@
-
+<!-- <!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">  -->
   <preface id="introduction">
 <!-- =============Introduction ============================= -->
     <title>Introduction</title> 
@@ -6,84 +6,73 @@
     <section id="what"> 
       <title> What is Evolution, and What Can It Do for Me?</title>
       <para>
-        The idea of evolution as a process of improvement and
-        development is a strong influence on the developers at Helix
-        Code.  We named our <glossterm>groupware</glossterm> suite
-        "Evolution" because we knew that it would be able to survive
-        in the wilderness of the software marketplace for one reason:
-        it's better.
+        The word "evolution" means "a process of improvement and
+        development."  The GNOME application
+        <application>Evolution</application> is meant to be a more
+        evolved <glossterm>groupware</glossterm> program, and an
+        integral part of the Internet-connected desktop.
       </para>
       <para>
-        <application>Evolution</application> is a suite of groupware
-        applications within the GNOME desktop environment that you can
-        use to send, receive, and organize email, manage address and
-        other contact information, and maintain a calendar.  It
-        enables you to do those things on one or several computers,
-        connected directly or over a network, for one person or for
-        large groups.  <application>Evolution</application> can handle
-        almost all your communications tasks with the power and
-        flexibility of the GNOME desktop environment.
+        <application>Evolution</application> is a suite of tools to
+        help you work in a group.  You can use it to send, receive,
+        and organize email, manage address and other contact
+        information, and maintain a calendar.  It enables you to do
+        those things on one or several computers, connected directly
+        or over a network, for one person or for large groups.
+        <application>Evolution</application> can handle almost all
+        your communications tasks with the power and flexibility of
+        the GNOME desktop environment.
       </para>
       <para>
-        We built <application>Evolution</application> with three groups of
-        people in mind: everyday users, system administrators, and
-        developers.  
+        The developers of <application>Evolution</application> had
+        four major goals for their project:
 
         <itemizedlist>
 	  <listitem>
 	    <para>
-              For <emphasis>everyday users</emphasis>, we made
-              <application>Evolution</application> easy to use without
-              sacrificing power.  We made the interface familiar and
-              intuitive, but also allowed users to customize it to
-              their liking.  We made the setup and configuration as
-              easy as possible.  For any confusion, we wrote a
-              comprehensive manual and help system.
+              The application must be <emphasis>both powerful and easy
+             to use</emphasis>. That means a familiar and intuitive
+             interface that users could customize to their liking, and
+             the development of shortcuts for complex tasks.
             </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-               For <emphasis>administrators</emphasis>, we made sure
-              <application>Evolution</application> met and and
-              exceeded the standards set by currently available
-              groupware products, and we developed support for most
-              major network protocols so that it can integrate
-              seamlessly with existing hardware and network
-              environments.  All of our efforts have made
-              <application>Evolution</application> both easy to use
-              and easy to support.
+              <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.
             </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-               For <emphasis>developers</emphasis>, we built in
-               support for 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> offers developers
-               the ideal environment for cutting-edge application
-               development.
+               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>
+               needed to offer developers an environment for
+               cutting-edge application development.
             </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-               For all three groups, we did our best to ensure the
-               safety of data.
+               Data must be safe: <application>Evolution</application>
+               must not lose mail or corrupt mailbox files.
             </para>
           </listitem>
 	</itemizedlist>
       </para>
       <para>
-        In action, <application>Evolution</application> makes most
-        daily tasks faster, because we built it to work with you
-        instead of against you.  For example, it takes only one or two
+        <application>Evolution</application> is designed to make most
+        daily tasks faster.  For example, it takes only one or two
         clicks to enter an appointment or an address card sent to you
         by email, or to send email to a contact or appointment.
         <application>Evolution</application> makes displays faster and
         more efficient, so searches are faster and memory usage is
-        lower.  People who get lots of mail will appreciate
-        advanced features like <link
+        lower.  People who get lots of mail will appreciate advanced
+        features like <link
         linkend="usage-mail-organize-vFolders">vFolders</link>, which
         let you save searches as though they were ordinary mail
         folders.
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index 962cdf2fac..56e5a4e65e 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -1,7 +1,5 @@
+<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
 
-<!-- UNCOMMENT FOR VALIDATION ONLY:
- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
 
 <chapter id="usage-calendar">
   <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
@@ -92,37 +90,47 @@ lack of time, resources, and interest.
          You can have as many as four different
          <guilabel>Alarms</guilabel>, any time prior to the event
          you've scheduled.  You can have one alarm of each type:
-         <itemizedlist>
-          <listitem>
-	    <para>
-	  <guilabel>Display</guilabel> means a window will pop up on
-	  your screen to remind you of your event.
-            </para>
-	  </listitem>
-          <listitem>
-	    <para>
-	       Click <guilabel>Audio</guilabel> to have your deliver a
-	       sound alarm.
-            </para>
-	  </listitem>
-          <listitem>
-	    <para>
-	      Select <guilabel>Program</guilabel> if you would like
-	      some additional application to run as a reminder.  You
-	      can enter its name in the text field, or find it with
-	      the <guibutton>Browse</guibutton> button.
-            </para>
-	  </listitem>
-
-          <listitem>
-	    <para>
-	       If you select <guilabel>Mail</guilabel>, then
-	       <application>Evolution</application> will send an email
-	       reminder to the address you enter into the text field.
-            </para>
-	  </listitem>
-	</itemizedlist>
-
+         <variablelist>
+           <varlistentry>
+	    <term><guilabel>Display</guilabel></term>
+	    <listitem>
+	      <para>
+	        A window will pop up on your screen to remind you of
+	        your event.
+              </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry> 
+	    <term><guilabel>Audio</guilabel></term>
+	    <listitem>
+	      <para>
+	        Choose this to have your deliver a sound alarm.
+              </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Program</guilabel></term>
+	    <listitem>
+	      <para>
+	        Select this if you would like some additional application
+	        to run as a reminder.  You can enter its name in the
+	        text field, or find it with the
+	        <guibutton>Browse</guibutton> button.
+              </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Mail</guilabel></term>
+	    <listitem>
+	      <para>
+	         <application>Evolution</application> will send an
+	         email reminder to the address you enter into the text
+	         field.
+              </para>
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
+	    
       </para>
       <para>
          <guilabel>Classification</guilabel> is a little more
@@ -216,34 +224,47 @@ lack of time, resources, and interest.
        To record a new task, click the <guibutton>Add</guibutton>
        button below the list.  <application>Evolution</application>
        will pop up a small window with five items in it:
-       <itemizedlist>
-         <listitem>
-	  <para>
-            <guilabel>Summary:</guilabel>The description you enter
-            here will appear in the To Do list itself.
+     
+        <variablelist>
+	  <varlistentry>
+	  <term> <guilabel>Summary:</guilabel></term>
+	  <listitem>
+            <para>
+              The description you enter here will appear in the To Do
+              list itself.
           </para>
-	 </listitem>
-
-        <listitem>
-	  <para>
-            <guilabel>Due Date:</guilabel> Decide when this item is
+	  </listitem>
+	  </varlistentry>
+	
+	<varlistentry>
+	  <term> <guilabel>Due Date:</guilabel></term>
+	  <listitem>
+	    <para>
+            Decide when this item is
             due.  You can either type in a date and time, or select one from
             the <guibutton>Calendar</guibutton> and time drop-down menus.
           </para>
-	</listitem>
- 
-	<listitem>
-	  <para>
-            <guilabel>Priority:</guilabel>Select a level of importance from 1 to 9.
-          </para>
-	</listitem> 
-	<listitem>
-	  <para>
-            <guilabel>Item Comments:</guilabel>If you wish, you can
-            keep a more detailed description of the item here.
-          </para>
-	</listitem> 
-      </itemizedlist>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Priority:</guilabel></term>
+	  <listitem>
+	    <para>
+             Select a level of importance from 1 (most important) to 9
+              (least important).
+            </para>
+	  </listitem> 
+	</varlistentry>
+	<varlistentry>
+	  <term> <guilabel>Item Comments:</guilabel></term>
+	  <listitem>
+	    <para>
+              If you wish, you can keep a more detailed description of
+              the item here.
+            </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
     </para>
     <para>
        Once you've added a task to your to-do list, its summary
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index 65af93e000..30729f96ab 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -60,7 +60,6 @@
 
     <para>
        The toolbar for the address book is quite simple:
-
        <itemizedlist>
 	<listitem><para>
            Press <guibutton>New</guibutton> for a new contact.
@@ -162,26 +161,37 @@
         You can enter a name into the <guibutton>Full Name</guibutton>
         field, or you can click the button to bring up a small dialog
         box with a few text boxes:
-	<itemizedlist>
-	  <listitem> <para>
-	    <guilabel>Title:</guilabel>Enter an honorific or select one from the menu.
-	  </para></listitem>
-	  
-	  <listitem> <para> <guilabel>First:</guilabel>The person's first, or given, name.
+        <variablelist>
+          <varlistentry>
+	    <term><guilabel>Title:</guilabel></term>
+            <listitem> <para>
+	    Enter an honorific or select one from the menu.
+	    </para></listitem>
+	  </varlistentry>
+          <varlistentry>
+           <term><guilabel>First:</guilabel></term>
+	    <listitem> <para>The person's first, or given, name.
     	  </para></listitem>
-
-	  <listitem> <para>
-             <guilabel>Middle:</guilabel>The middle name or initial, if any, goes here.
-          </para></listitem>
-
-	  <listitem> <para>
-	     <guilabel>Last:</guilabel>The last name (surname, family name), belongs here.
+          </varlistentry>
+          <varlistentry>
+             <term><guilabel>Middle:</guilabel></term>
+	     <listitem> <para>
+                The middle name or initial, if any, goes here.
+             </para></listitem>
+          </varlistentry>
+          <varlistentry>
+           <term><guilabel>Last:</guilabel></term>
+ 	  <listitem> <para>
+	   The last name (the surname, or family name), belongs here.
 	  </para></listitem>
-
+          </varlistentry>
+          <varlistentry>
+          <term><guilabel>Suffix:</guilabel></term>
 	  <listitem> <para>
-             <guilabel>Suffix:</guilabel>Suffixes such as "Jr." or "III" can go here. 
+            Suffixes such as "Jr." or "III" can go here. 
 	  </para></listitem>
-	</itemizedlist>
+          </varlistentry>
+	</variablelist>
       </para>
       
       <para>
@@ -340,8 +350,7 @@
            card in the "Business" category, because he works with me,
            the "Friends" category, because he's also my friend, and
            the "Frequent" category, because I call him all the time
-           and can never remember his phone number.
-         </para>
+           and can never remember his phone number.  
 	<para>
            To mark a card as belonging to a category, click the
            <guibutton>Categories</guibutton> button at the lower
@@ -355,10 +364,21 @@
 	<para>
            If the master list of categories don't suit you, you can
            add your own.  Just enter the new category's name in the
-           text box, then click <guibutton>Categories</guibutton>e and
+           text box, then click <guibutton>Categories</guibutton> and
            choose <guilabel>Add to Master List</guilabel> in the
            window that appears. (FIXME: This isn't quite accurate.)
          </para>
+
+         <tip id="usage-contact-categories-multiple">
+            <title>Another way to use Categories</title>
+            <para>
+               You can categorize contacts by typing the category
+               names into the <guilabel>Categories</guilabel>
+               field. You can also create new categories that way:
+               just type in a category name, and it counts as a
+               category.
+            </para>
+          </tip>
       </sect3>
     </sect2>
   </sect1>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 656fdb9a44..88b7db86eb 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -1,4 +1,4 @@
-<!-- uncomment the declaration during validation and debugging
+<!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
 
@@ -399,12 +399,13 @@ with quoted materials and the relevant replies interspersed-->
             The icons in the toolbar are explained in tool-tips, which
             appear when you hold your mouse over the buttons.  The
             buttons fall into four categories:
-            <itemizedlist>
+            <variablelist>
+             <varlistentry>
+             <term>Headers and lists</term>
 	      <listitem>
 		<para>
-                  Headers and lists: Choose
-                  <guilabel>Normal</guilabel> for your default text
-                  style, or <guilabel>Header 1</guilabel> through
+                  Choose <guilabel>Normal</guilabel> for your default
+                  text style, or <guilabel>Header 1</guilabel> through
                   <guilabel>Header 6</guilabel> for varying sizes of
                   header.  You can also select
                   <guilabel>pre</guilabel> for preformatted text
@@ -412,19 +413,25 @@ with quoted materials and the relevant replies interspersed-->
                   Item</guilabel>.
                 </para>
 	      </listitem>
-
+           </varlistentry>
+           <varlistentry>
+             <term>Text style</term>
 	      <listitem>
 		<para>
-                  Text style: <guilabel>B</guilabel> is for bold text,
-                  <guilabel>I</guilabel> for italics,
-                  <guilabel>U</guilabel> for an underline, and
-                  <guilabel>S</guilabel> for a strikethrough.
-                </para>
+                  <itemizedlist mark="none">      
+		  <listitem><para><guilabel>B</guilabel> is for bold text</para></listitem>		    
+                  <listitem><para><guilabel>I</guilabel> for italics</para></listitem>
+		  <listitem><para><guilabel>U</guilabel> to underline</para></listitem>
+		  <listitem><para><guilabel>S</guilabel> for a strikethrough.</para></listitem>
+                 </itemizedlist>
+               </para>               
 	      </listitem>    
-
+	    </varlistentry>
+	    <varlistentry>
+	      <term>Alignment</term>
 	      <listitem>
 		<para>
-                   Alignment: Located next to the text style buttons,
+                  Located next to the text style buttons,
                    these three paragraph icons should be familiar to
                    users of most word processing software.  The
                    leftmost button will make your text left-justified,
@@ -432,15 +439,19 @@ with quoted materials and the relevant replies interspersed-->
                    button, right-justified.
                 </para>
 	      </listitem>
+	      </varlistentry>
 
+	    <varlistentry>
+	      <term>Indentation rules</term>
 	      <listitem>
 		<para>
-                  Indentation rules: The button with the arrow
-                  pointing left will reduce a paragraph's indentation,
-                  and the right arrow will increase its indentation.
+                  The button with the arrow pointing left will reduce
+                  a paragraph's indentation, and the right arrow will
+                  increase its indentation.
                </para>
 	    </listitem>
-	  </itemizedlist>
+	  </varlistentry>
+	  </variablelist>
         </para>
 	<para>
            There are two tools that you can find only in the
@@ -663,49 +674,57 @@ possibly never will be due to security evil. -->
       <para>
 	To start searching, enter a word or phrase in the text area
 	right below the toolbar, and choose a search type:
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      <guilabel>Body or subject contains:</guilabel> This
-	      will search message subjects and the messages
-	      themselves for the word or phrase you've entered in
-	      the search field.
-	   </para>
-	 </listitem>
-
-	  <listitem>
-	    <para>
-	      <guilabel>Body contains:</guilabel> This will search
-	       only in message text, not the subject lines.
-	   </para>
-	 </listitem>
-
-	  <listitem>
-	    <para>
-	      <guilabel>Subject contains:</guilabel> This will
-	      show you messages where the search text is in the
-	      subject line.  It will not search in the message body.
-	   </para>
-	 </listitem>
-
+	<variablelist>
+	  <varlistentry>
+	    <term><guilabel>Body or subject contains:</guilabel></term>
 	  <listitem>
-	    <para>
-	      <guilabel>Body does not contain:</guilabel> This
-	      finds every email message that does not have the
-	      search text in the message body.  It will still show
-	      messages that have the search text in the subject
-	      line, if it is not also in the body.
-	   </para>
-	 </listitem>
-
-	  <listitem>
-	    <para>
-	      <guilabel>Subject does not contain:</guilabel>This
-	      finds every mail whose subject does not
-	      contain the search text.
-	   </para>
-	 </listitem>
-	</itemizedlist>
+	      <para>
+	        This will search message subjects and the messages
+	        themselves for the word or phrase you've entered in
+	        the search field.
+   	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term> <guilabel>Body contains:</guilabel> </term>
+	    <listitem>
+	      <para>
+	        This will search only in message text, not the subject
+	        lines.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Subject contains:</guilabel></term>
+	    <listitem>
+	      <para>
+	        This will show you messages where the search text is
+	        in the subject line.  It will not search in the
+	        message body.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Body does not contain:</guilabel></term>
+	    <listitem>
+	      <para>
+	        This finds every email message that does not have the
+	        search text in the message body.  It will still show
+	        messages that have the search text in the subject
+	        line, if it is not also in the body.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Subject does not contain:</guilabel></term>
+	    <listitem>
+	      <para>
+	        This finds every mail whose subject does not contain
+	        the search text.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
 
         Then, press <keycap>Enter</keycap>.
         <application>Evolution</application> will show your search
@@ -901,37 +920,48 @@ possibly never will be due to security evil. -->
 	 You'll be prompted to create a filtering rule. To do so,
 	 select one of the base rules, and click
 	 <guibutton>Next</guibutton> to customize it.  Your options are:
-    <itemizedlist>
-	 <listitem>
-	    <para>
-	       For matching messages: you may select one or more
-	       search criteria; the vFolder you create will
-	       contain messages that match all of
-	       them.
+    <variablelist>
+	 <varlistentry>
+	    <term><guilabel>For matching messages:</guilabel></term>
+	    <listitem>
+	      <para>
+	        You may select one or more search criteria; the
+	        vFolder you create will contain messages that match
+	        all of them.
 	     </para>
-	   </listitem>
-	   <listitem>
-	     <para>
-		Messages from a certain person: you enter an email
-		address, and the vFolder will contain any messages
-		from that address.
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Messages from a certain person:</guilabel></term>
+	    <listitem>
+	      <para>
+		 Enter an email address, and the vFolder will contain
+		 any messages from that address.
 	     </para>
 	   </listitem>
-	   <listitem>
-	     <para>
-	       Messages to a certain address: any messages sent
-	       directly to this address will be in the vFolder you create.
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Messages to a certain address:</guilabel</term>
+	    <listitem>
+	      <para>
+	         Any messages sent directly to this address will be in
+	         the vFolder you create.
 	      </para>
-	   </listitem>
-	   <listitem>
-	     <para>
-		Messages with a given subject: enter a subject,
-		and the vFolder will contain messages with that
-		subject.
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Messages with a given subject:</guilabel></term>
+	    <listitem>
+	      <para>
+		Enter a subject, and the vFolder will contain messages
+		with that subject.
 	     </para>
-	   </listitem>
-	  </itemizedlist>
-	as is shown in <xref linkend="usage-mail-vfolder-fig-createrule">
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
+
+	as is shown in <xref
+	linkend="usage-mail-vfolder-fig-createrule">
 
        <figure id="usage-mail-vfolder-fig-createrule">
 	 <title>Selecting a vFolder Rule</title>
diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 4ecc33d03b..e660a0c798 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -169,6 +169,16 @@
  </glossentry> 
 
 
+  <glossentry id="ldap">
+   <glossterm>LDAP</glossterm>
+   <glossdef>
+    <para>
+     LDAP is a protocol which allows a client to search through a large database
+     of addresses, phone numbers, and people, as an alternative to a physical
+     phone book.
+    </para>
+   </glossdef>
+  </glossentry>
 
  <glossentry id="mail-client">
   <glossterm>Mail Client</glossterm>
@@ -230,6 +240,18 @@
   </glossdef>
  </glossentry>
 
+  <glossnetry id="signature">
+   <glossterm>Signature</glossterm>
+   <glossdef>
+    <para>
+     Signatures allow a user to specify a message to place at the bottom of
+     every email sent.  A signature can be anything from a favorite quote to
+     a link to a webpage.
+    </para>
+   </glossdef>
+  </glossentry> 
+
+
  <glossentry id="spam">
   <glossterm>Spam</glossterm>
   <glossdef>
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index f8c74c67d2..60e973a188 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -1,4 +1,4 @@
-
+<!-- <!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">  -->
   <preface id="introduction">
 <!-- =============Introduction ============================= -->
     <title>Introduction</title> 
@@ -6,84 +6,73 @@
     <section id="what"> 
       <title> What is Evolution, and What Can It Do for Me?</title>
       <para>
-        The idea of evolution as a process of improvement and
-        development is a strong influence on the developers at Helix
-        Code.  We named our <glossterm>groupware</glossterm> suite
-        "Evolution" because we knew that it would be able to survive
-        in the wilderness of the software marketplace for one reason:
-        it's better.
+        The word "evolution" means "a process of improvement and
+        development."  The GNOME application
+        <application>Evolution</application> is meant to be a more
+        evolved <glossterm>groupware</glossterm> program, and an
+        integral part of the Internet-connected desktop.
       </para>
       <para>
-        <application>Evolution</application> is a suite of groupware
-        applications within the GNOME desktop environment that you can
-        use to send, receive, and organize email, manage address and
-        other contact information, and maintain a calendar.  It
-        enables you to do those things on one or several computers,
-        connected directly or over a network, for one person or for
-        large groups.  <application>Evolution</application> can handle
-        almost all your communications tasks with the power and
-        flexibility of the GNOME desktop environment.
+        <application>Evolution</application> is a suite of tools to
+        help you work in a group.  You can use it to send, receive,
+        and organize email, manage address and other contact
+        information, and maintain a calendar.  It enables you to do
+        those things on one or several computers, connected directly
+        or over a network, for one person or for large groups.
+        <application>Evolution</application> can handle almost all
+        your communications tasks with the power and flexibility of
+        the GNOME desktop environment.
       </para>
       <para>
-        We built <application>Evolution</application> with three groups of
-        people in mind: everyday users, system administrators, and
-        developers.  
+        The developers of <application>Evolution</application> had
+        four major goals for their project:
 
         <itemizedlist>
 	  <listitem>
 	    <para>
-              For <emphasis>everyday users</emphasis>, we made
-              <application>Evolution</application> easy to use without
-              sacrificing power.  We made the interface familiar and
-              intuitive, but also allowed users to customize it to
-              their liking.  We made the setup and configuration as
-              easy as possible.  For any confusion, we wrote a
-              comprehensive manual and help system.
+              The application must be <emphasis>both powerful and easy
+             to use</emphasis>. That means a familiar and intuitive
+             interface that users could customize to their liking, and
+             the development of shortcuts for complex tasks.
             </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-               For <emphasis>administrators</emphasis>, we made sure
-              <application>Evolution</application> met and and
-              exceeded the standards set by currently available
-              groupware products, and we developed support for most
-              major network protocols so that it can integrate
-              seamlessly with existing hardware and network
-              environments.  All of our efforts have made
-              <application>Evolution</application> both easy to use
-              and easy to support.
+              <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.
             </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-               For <emphasis>developers</emphasis>, we built in
-               support for 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> offers developers
-               the ideal environment for cutting-edge application
-               development.
+               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>
+               needed to offer developers an environment for
+               cutting-edge application development.
             </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-               For all three groups, we did our best to ensure the
-               safety of data.
+               Data must be safe: <application>Evolution</application>
+               must not lose mail or corrupt mailbox files.
             </para>
           </listitem>
 	</itemizedlist>
       </para>
       <para>
-        In action, <application>Evolution</application> makes most
-        daily tasks faster, because we built it to work with you
-        instead of against you.  For example, it takes only one or two
+        <application>Evolution</application> is designed to make most
+        daily tasks faster.  For example, it takes only one or two
         clicks to enter an appointment or an address card sent to you
         by email, or to send email to a contact or appointment.
         <application>Evolution</application> makes displays faster and
         more efficient, so searches are faster and memory usage is
-        lower.  People who get lots of mail will appreciate
-        advanced features like <link
+        lower.  People who get lots of mail will appreciate advanced
+        features like <link
         linkend="usage-mail-organize-vFolders">vFolders</link>, which
         let you save searches as though they were ordinary mail
         folders.
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 962cdf2fac..56e5a4e65e 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -1,7 +1,5 @@
+<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
 
-<!-- UNCOMMENT FOR VALIDATION ONLY:
- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
 
 <chapter id="usage-calendar">
   <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
@@ -92,37 +90,47 @@ lack of time, resources, and interest.
          You can have as many as four different
          <guilabel>Alarms</guilabel>, any time prior to the event
          you've scheduled.  You can have one alarm of each type:
-         <itemizedlist>
-          <listitem>
-	    <para>
-	  <guilabel>Display</guilabel> means a window will pop up on
-	  your screen to remind you of your event.
-            </para>
-	  </listitem>
-          <listitem>
-	    <para>
-	       Click <guilabel>Audio</guilabel> to have your deliver a
-	       sound alarm.
-            </para>
-	  </listitem>
-          <listitem>
-	    <para>
-	      Select <guilabel>Program</guilabel> if you would like
-	      some additional application to run as a reminder.  You
-	      can enter its name in the text field, or find it with
-	      the <guibutton>Browse</guibutton> button.
-            </para>
-	  </listitem>
-
-          <listitem>
-	    <para>
-	       If you select <guilabel>Mail</guilabel>, then
-	       <application>Evolution</application> will send an email
-	       reminder to the address you enter into the text field.
-            </para>
-	  </listitem>
-	</itemizedlist>
-
+         <variablelist>
+           <varlistentry>
+	    <term><guilabel>Display</guilabel></term>
+	    <listitem>
+	      <para>
+	        A window will pop up on your screen to remind you of
+	        your event.
+              </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry> 
+	    <term><guilabel>Audio</guilabel></term>
+	    <listitem>
+	      <para>
+	        Choose this to have your deliver a sound alarm.
+              </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Program</guilabel></term>
+	    <listitem>
+	      <para>
+	        Select this if you would like some additional application
+	        to run as a reminder.  You can enter its name in the
+	        text field, or find it with the
+	        <guibutton>Browse</guibutton> button.
+              </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Mail</guilabel></term>
+	    <listitem>
+	      <para>
+	         <application>Evolution</application> will send an
+	         email reminder to the address you enter into the text
+	         field.
+              </para>
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
+	    
       </para>
       <para>
          <guilabel>Classification</guilabel> is a little more
@@ -216,34 +224,47 @@ lack of time, resources, and interest.
        To record a new task, click the <guibutton>Add</guibutton>
        button below the list.  <application>Evolution</application>
        will pop up a small window with five items in it:
-       <itemizedlist>
-         <listitem>
-	  <para>
-            <guilabel>Summary:</guilabel>The description you enter
-            here will appear in the To Do list itself.
+     
+        <variablelist>
+	  <varlistentry>
+	  <term> <guilabel>Summary:</guilabel></term>
+	  <listitem>
+            <para>
+              The description you enter here will appear in the To Do
+              list itself.
           </para>
-	 </listitem>
-
-        <listitem>
-	  <para>
-            <guilabel>Due Date:</guilabel> Decide when this item is
+	  </listitem>
+	  </varlistentry>
+	
+	<varlistentry>
+	  <term> <guilabel>Due Date:</guilabel></term>
+	  <listitem>
+	    <para>
+            Decide when this item is
             due.  You can either type in a date and time, or select one from
             the <guibutton>Calendar</guibutton> and time drop-down menus.
           </para>
-	</listitem>
- 
-	<listitem>
-	  <para>
-            <guilabel>Priority:</guilabel>Select a level of importance from 1 to 9.
-          </para>
-	</listitem> 
-	<listitem>
-	  <para>
-            <guilabel>Item Comments:</guilabel>If you wish, you can
-            keep a more detailed description of the item here.
-          </para>
-	</listitem> 
-      </itemizedlist>
+	  </listitem>
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Priority:</guilabel></term>
+	  <listitem>
+	    <para>
+             Select a level of importance from 1 (most important) to 9
+              (least important).
+            </para>
+	  </listitem> 
+	</varlistentry>
+	<varlistentry>
+	  <term> <guilabel>Item Comments:</guilabel></term>
+	  <listitem>
+	    <para>
+              If you wish, you can keep a more detailed description of
+              the item here.
+            </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
     </para>
     <para>
        Once you've added a task to your to-do list, its summary
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 65af93e000..30729f96ab 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -60,7 +60,6 @@
 
     <para>
        The toolbar for the address book is quite simple:
-
        <itemizedlist>
 	<listitem><para>
            Press <guibutton>New</guibutton> for a new contact.
@@ -162,26 +161,37 @@
         You can enter a name into the <guibutton>Full Name</guibutton>
         field, or you can click the button to bring up a small dialog
         box with a few text boxes:
-	<itemizedlist>
-	  <listitem> <para>
-	    <guilabel>Title:</guilabel>Enter an honorific or select one from the menu.
-	  </para></listitem>
-	  
-	  <listitem> <para> <guilabel>First:</guilabel>The person's first, or given, name.
+        <variablelist>
+          <varlistentry>
+	    <term><guilabel>Title:</guilabel></term>
+            <listitem> <para>
+	    Enter an honorific or select one from the menu.
+	    </para></listitem>
+	  </varlistentry>
+          <varlistentry>
+           <term><guilabel>First:</guilabel></term>
+	    <listitem> <para>The person's first, or given, name.
     	  </para></listitem>
-
-	  <listitem> <para>
-             <guilabel>Middle:</guilabel>The middle name or initial, if any, goes here.
-          </para></listitem>
-
-	  <listitem> <para>
-	     <guilabel>Last:</guilabel>The last name (surname, family name), belongs here.
+          </varlistentry>
+          <varlistentry>
+             <term><guilabel>Middle:</guilabel></term>
+	     <listitem> <para>
+                The middle name or initial, if any, goes here.
+             </para></listitem>
+          </varlistentry>
+          <varlistentry>
+           <term><guilabel>Last:</guilabel></term>
+ 	  <listitem> <para>
+	   The last name (the surname, or family name), belongs here.
 	  </para></listitem>
-
+          </varlistentry>
+          <varlistentry>
+          <term><guilabel>Suffix:</guilabel></term>
 	  <listitem> <para>
-             <guilabel>Suffix:</guilabel>Suffixes such as "Jr." or "III" can go here. 
+            Suffixes such as "Jr." or "III" can go here. 
 	  </para></listitem>
-	</itemizedlist>
+          </varlistentry>
+	</variablelist>
       </para>
       
       <para>
@@ -340,8 +350,7 @@
            card in the "Business" category, because he works with me,
            the "Friends" category, because he's also my friend, and
            the "Frequent" category, because I call him all the time
-           and can never remember his phone number.
-         </para>
+           and can never remember his phone number.  
 	<para>
            To mark a card as belonging to a category, click the
            <guibutton>Categories</guibutton> button at the lower
@@ -355,10 +364,21 @@
 	<para>
            If the master list of categories don't suit you, you can
            add your own.  Just enter the new category's name in the
-           text box, then click <guibutton>Categories</guibutton>e and
+           text box, then click <guibutton>Categories</guibutton> and
            choose <guilabel>Add to Master List</guilabel> in the
            window that appears. (FIXME: This isn't quite accurate.)
          </para>
+
+         <tip id="usage-contact-categories-multiple">
+            <title>Another way to use Categories</title>
+            <para>
+               You can categorize contacts by typing the category
+               names into the <guilabel>Categories</guilabel>
+               field. You can also create new categories that way:
+               just type in a category name, and it counts as a
+               category.
+            </para>
+          </tip>
       </sect3>
     </sect2>
   </sect1>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 656fdb9a44..88b7db86eb 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1,4 +1,4 @@
-<!-- uncomment the declaration during validation and debugging
+<!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
 
@@ -399,12 +399,13 @@ with quoted materials and the relevant replies interspersed-->
             The icons in the toolbar are explained in tool-tips, which
             appear when you hold your mouse over the buttons.  The
             buttons fall into four categories:
-            <itemizedlist>
+            <variablelist>
+             <varlistentry>
+             <term>Headers and lists</term>
 	      <listitem>
 		<para>
-                  Headers and lists: Choose
-                  <guilabel>Normal</guilabel> for your default text
-                  style, or <guilabel>Header 1</guilabel> through
+                  Choose <guilabel>Normal</guilabel> for your default
+                  text style, or <guilabel>Header 1</guilabel> through
                   <guilabel>Header 6</guilabel> for varying sizes of
                   header.  You can also select
                   <guilabel>pre</guilabel> for preformatted text
@@ -412,19 +413,25 @@ with quoted materials and the relevant replies interspersed-->
                   Item</guilabel>.
                 </para>
 	      </listitem>
-
+           </varlistentry>
+           <varlistentry>
+             <term>Text style</term>
 	      <listitem>
 		<para>
-                  Text style: <guilabel>B</guilabel> is for bold text,
-                  <guilabel>I</guilabel> for italics,
-                  <guilabel>U</guilabel> for an underline, and
-                  <guilabel>S</guilabel> for a strikethrough.
-                </para>
+                  <itemizedlist mark="none">      
+		  <listitem><para><guilabel>B</guilabel> is for bold text</para></listitem>		    
+                  <listitem><para><guilabel>I</guilabel> for italics</para></listitem>
+		  <listitem><para><guilabel>U</guilabel> to underline</para></listitem>
+		  <listitem><para><guilabel>S</guilabel> for a strikethrough.</para></listitem>
+                 </itemizedlist>
+               </para>               
 	      </listitem>    
-
+	    </varlistentry>
+	    <varlistentry>
+	      <term>Alignment</term>
 	      <listitem>
 		<para>
-                   Alignment: Located next to the text style buttons,
+                  Located next to the text style buttons,
                    these three paragraph icons should be familiar to
                    users of most word processing software.  The
                    leftmost button will make your text left-justified,
@@ -432,15 +439,19 @@ with quoted materials and the relevant replies interspersed-->
                    button, right-justified.
                 </para>
 	      </listitem>
+	      </varlistentry>
 
+	    <varlistentry>
+	      <term>Indentation rules</term>
 	      <listitem>
 		<para>
-                  Indentation rules: The button with the arrow
-                  pointing left will reduce a paragraph's indentation,
-                  and the right arrow will increase its indentation.
+                  The button with the arrow pointing left will reduce
+                  a paragraph's indentation, and the right arrow will
+                  increase its indentation.
                </para>
 	    </listitem>
-	  </itemizedlist>
+	  </varlistentry>
+	  </variablelist>
         </para>
 	<para>
            There are two tools that you can find only in the
@@ -663,49 +674,57 @@ possibly never will be due to security evil. -->
       <para>
 	To start searching, enter a word or phrase in the text area
 	right below the toolbar, and choose a search type:
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      <guilabel>Body or subject contains:</guilabel> This
-	      will search message subjects and the messages
-	      themselves for the word or phrase you've entered in
-	      the search field.
-	   </para>
-	 </listitem>
-
-	  <listitem>
-	    <para>
-	      <guilabel>Body contains:</guilabel> This will search
-	       only in message text, not the subject lines.
-	   </para>
-	 </listitem>
-
-	  <listitem>
-	    <para>
-	      <guilabel>Subject contains:</guilabel> This will
-	      show you messages where the search text is in the
-	      subject line.  It will not search in the message body.
-	   </para>
-	 </listitem>
-
+	<variablelist>
+	  <varlistentry>
+	    <term><guilabel>Body or subject contains:</guilabel></term>
 	  <listitem>
-	    <para>
-	      <guilabel>Body does not contain:</guilabel> This
-	      finds every email message that does not have the
-	      search text in the message body.  It will still show
-	      messages that have the search text in the subject
-	      line, if it is not also in the body.
-	   </para>
-	 </listitem>
-
-	  <listitem>
-	    <para>
-	      <guilabel>Subject does not contain:</guilabel>This
-	      finds every mail whose subject does not
-	      contain the search text.
-	   </para>
-	 </listitem>
-	</itemizedlist>
+	      <para>
+	        This will search message subjects and the messages
+	        themselves for the word or phrase you've entered in
+	        the search field.
+   	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term> <guilabel>Body contains:</guilabel> </term>
+	    <listitem>
+	      <para>
+	        This will search only in message text, not the subject
+	        lines.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Subject contains:</guilabel></term>
+	    <listitem>
+	      <para>
+	        This will show you messages where the search text is
+	        in the subject line.  It will not search in the
+	        message body.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Body does not contain:</guilabel></term>
+	    <listitem>
+	      <para>
+	        This finds every email message that does not have the
+	        search text in the message body.  It will still show
+	        messages that have the search text in the subject
+	        line, if it is not also in the body.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Subject does not contain:</guilabel></term>
+	    <listitem>
+	      <para>
+	        This finds every mail whose subject does not contain
+	        the search text.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
 
         Then, press <keycap>Enter</keycap>.
         <application>Evolution</application> will show your search
@@ -901,37 +920,48 @@ possibly never will be due to security evil. -->
 	 You'll be prompted to create a filtering rule. To do so,
 	 select one of the base rules, and click
 	 <guibutton>Next</guibutton> to customize it.  Your options are:
-    <itemizedlist>
-	 <listitem>
-	    <para>
-	       For matching messages: you may select one or more
-	       search criteria; the vFolder you create will
-	       contain messages that match all of
-	       them.
+    <variablelist>
+	 <varlistentry>
+	    <term><guilabel>For matching messages:</guilabel></term>
+	    <listitem>
+	      <para>
+	        You may select one or more search criteria; the
+	        vFolder you create will contain messages that match
+	        all of them.
 	     </para>
-	   </listitem>
-	   <listitem>
-	     <para>
-		Messages from a certain person: you enter an email
-		address, and the vFolder will contain any messages
-		from that address.
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Messages from a certain person:</guilabel></term>
+	    <listitem>
+	      <para>
+		 Enter an email address, and the vFolder will contain
+		 any messages from that address.
 	     </para>
 	   </listitem>
-	   <listitem>
-	     <para>
-	       Messages to a certain address: any messages sent
-	       directly to this address will be in the vFolder you create.
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Messages to a certain address:</guilabel</term>
+	    <listitem>
+	      <para>
+	         Any messages sent directly to this address will be in
+	         the vFolder you create.
 	      </para>
-	   </listitem>
-	   <listitem>
-	     <para>
-		Messages with a given subject: enter a subject,
-		and the vFolder will contain messages with that
-		subject.
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term><guilabel>Messages with a given subject:</guilabel></term>
+	    <listitem>
+	      <para>
+		Enter a subject, and the vFolder will contain messages
+		with that subject.
 	     </para>
-	   </listitem>
-	  </itemizedlist>
-	as is shown in <xref linkend="usage-mail-vfolder-fig-createrule">
+	    </listitem>
+	  </varlistentry>
+	</variablelist>
+
+	as is shown in <xref
+	linkend="usage-mail-vfolder-fig-createrule">
 
        <figure id="usage-mail-vfolder-fig-createrule">
 	 <title>Selecting a vFolder Rule</title>