Slight glossary changes in wording

2001-12-14  Kevin Breit  <mrproper@ximian.com>

	* C/apx-gloss.sgml: Slight glossary changes in wording

	* C/usage-mail.sgml: Indenting changes, minor reorganization.

svn path=/trunk/; revision=15086

5 files changed, 310 insertions, 241 deletions

diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index 61dc2c6449..60d16e3795 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -1,8 +1,17 @@
 <glossary id="apx-gloss">
+  
+  <title>Glossary</title>
+  
+  <glossentry id="assistant">
+    <glossterm>Assistant:</glossterm>
+    <glossdef>
+      <para>
+	See druid
+      </para>
+    </glossdef>
+  </glossentry>
 
- <title>Glossary</title>
-
- <glossentry id="attachment">
+  <glossentry id="attachment">
   <glossterm>Attachment:</glossterm>
   <glossdef>
    <para>
@@ -16,7 +25,7 @@
   <glossterm>Automatic Indexing:</glossterm>
   <glossdef>
    <para>
-     Pre-sorting procedure that allows
+     Pre-fetching procedure that allows
      <application>Evolution</application> to refer to data quickly.
      It enables faster searches and decreases memory usage for
      data displays.
@@ -50,7 +59,7 @@
   <glossterm>Conduit:</glossterm>
   <glossdef>
    <para>
-     A synchronization conduit is a small application which controls
+     A small application which controls
      the transfer of data between a handheld device and a desktop
      computer.
    </para>
@@ -126,7 +135,7 @@
   <glossdef>
    <para>
     Within <application>Evolution</application>, a filter is a method
-    of sorting mail automatically.  You can create filters to perform
+    of sorting mail automatically when it's downloaded.  You can create filters to perform
     one or more actions on a message that meets any (or all) of a wide
     range of criteria.
    </para>
@@ -150,7 +159,7 @@
     Groupware is a term describing an application which helps groups
     of people work together.  Typically, a groupware application will
     have several productivity features built into one program,
-    including email, calendar, and addressbook tools.
+    including: email, calendar, and addressbook tools.
    </para>
   </glossdef>
  </glossentry>
@@ -172,7 +181,7 @@
   <glossdef>
    <para>
     Hot-keys are keyboard combinations used to do actions on a
-    computer instead of using the mouse to do the same action.
+    computer instead of using the mouse.
     Hot-keys can speed up computer usage.
    </para>
   </glossdef>
@@ -194,8 +203,7 @@
   <glossdef>
    <para>
     Depending upon whom you ask, IMAP stands for the Internet Mail
-    Access Protocol, or the Interim Mail Access Protocol.  Whatever it
-    stands for, it allows access to email which is typically (although
+    Access Protocol, or the Interim Mail Access Protocol.  It allows access to email which is typically (although
     not always) stored remotely on a server rather than on a local
     hard disk.  Often contrasted with <glossterm>POP:</glossterm>.
     This will not be on the test.
@@ -226,17 +234,17 @@
    </glossdef>
   </glossentry>
 
- <glossentry id="mail-client">
-  <glossterm>Mail Client:</glossterm>
-  <glossdef>
-   <para>
-    A mail client is the application with which a person reads and
-    sends e-mail.  Its counterparts are the various types of mail
-    servers, which handle user authentication and direct messages from
-    sender to recipient.
-   </para>
-  </glossdef>
- </glossentry>
+  <glossentry id="mail-client">
+    <glossterm>Mail Client:</glossterm>
+    <glossdef>
+      <para>
+	A mail client is the application with which a person reads and
+	sends e-mail.  Its counterparts are the various types of mail
+	servers, which handle user authentication and direct messages from
+	sender to recipient.
+      </para>
+    </glossdef>
+  </glossentry>
 
 
  <glossentry id="minicard">
@@ -254,7 +262,7 @@
   <glossdef>
    <para>
     <application>Nautilus</application> is the next generation file
-    manager for <acronym>GNOME</acronym> being written by Eazel.
+    manager for <acronym>GNOME</acronym>.
    </para>
   </glossdef>
  </glossentry>
@@ -308,7 +316,8 @@
       'soap'".  If you searched for that expression, you'd find both
       "fly in my soup" and "fly in my soap."  There's not room here to
       go into depth, but if you want, have a look at the documentation
-      for the <command>grep</command> command.
+      for the <command>grep</command> command by opening a command
+      line and typing in <command>moan grep</command>.
    </para>
   </glossdef>
  </glossentry>
@@ -319,7 +328,9 @@
    <para>
     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.
+    of pre-recorded commands or actions within an application.  Often
+    times,  accomplish repetitive and tedious tasks, to save the
+    user time.
    </para>
   </glossdef>
  </glossentry>
@@ -354,7 +365,7 @@
    <glossdef>
     <para>
      In email terms, a signature is a piece of text placed at the end
-     of every email sent, like a hand-written signature at the bottom
+     of every email sent, similar to a hand-written signature at the bottom
      of a written letter.  A signature can be anything from a favorite
      quotation to a link to a web page; courtesy dictates that it be
      fewer than four lines long.
@@ -372,17 +383,17 @@
     </para>
    </glossdef>
   </glossentry> 
-
- <glossentry id="tooltip">
-  <glossterm>Tool-Tip:</glossterm>
-  <glossdef>
-   <para>
-      A small box of explanatory text which appears when the mouse
-      pointer is held motionless over a button or other interface
-      element.
-   </para>
-  </glossdef>
- </glossentry>
+  
+  <glossentry id="tooltip">
+    <glossterm>Tool-Tip:</glossterm>
+    <glossdef>
+      <para>
+	A small box of explanatory text which appears when the mouse
+	pointer is held motionless over a button or other interface
+	element.
+      </para>
+    </glossdef>
+  </glossentry>
 
  <glossentry id="virus">
   <glossterm>Virus:</glossterm>
@@ -397,18 +408,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="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/figures/small_desktop.png b/help/C/figures/small_desktop.png
new file mode 100644
index 0000000000..029a9629d4
--- /dev/null
+++ b/help/C/figures/small_desktop.png
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 0f665da24f..f9c55edb39 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -12,13 +12,15 @@
   <sect1 id="importing-mail-and-settings">
     <title>Importing Your Old Email and Settings</title>
     <para>
-      <application>Evolution</application> allows you to import old email and data so that you don't need to worry about losing your old information.
+      <application>Evolution</application> allows you to import old
+      email and data so that you don't need to worry about losing your
+      old information.
     </para>
     <sect2 id="importing-mail">
       <title>Importing Email</title>
       <para>
-        <application>Ximian Evolution</application> can import the following types of
-        files:
+        <application>Ximian Evolution</application> can import the
+        following types of files:
         <variablelist>
           <varlistentry>
             <term>VCard (.vcf, gcrd):</term>
@@ -37,7 +39,9 @@
 	    <listitem>
 	      <para>
 		A format for storing calendar files.  iCalendar is used by 
-		PalmOS based handhelds, Ximian <application>Evolution</application>, and Microsoft <application>Outlook</application>.
+		PalmOS based handhelds, Ximian
+                <application>Evolution</application>, and Microsoft
+		<application>Outlook</application>.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -98,7 +102,10 @@
     <sect2 id="importing-preferences">
       <title>Importing Preferences</title>
       <para>
-        <application>Evolution</application> can import all your old mail, contacts, and other information from other applications, making your transition to <application>Evolution</application> even easier.
+        <application>Evolution</application> can import all your old
+        mail, contacts, and other information from other applications,
+        making your transition to <application>Evolution</application>
+        easy.
       </para>
       <para>
         To import your old information:
@@ -120,7 +127,10 @@
           </listitem>
           <listitem>
             <para>
-              The left-most column shows the application which your information will be imported from.  You then select checkboxes on each component to import different properties of each application.
+              The left-most column shows the application which your
+              information will be imported from.  You then select
+              checkboxes on each component to import different
+              properties of each application.
             </para>
           </listitem>
           <listitem>
@@ -136,68 +146,68 @@
         </orderedlist>
       </para>
 
-<para>
-    <note>
-      <title>Microsoft Outlook and Outlook Express Users</title>
       <para>
-	Microsoft Outlook, and versions of Outlook Express after
-	version 4, use proprietary formats that <application>Ximian
-	Evolution</application> cannot read or import.  For contacts,
-	you may have to email them to yourself and import them that
-	way.  For email, there is a simpler workaround:
-	<orderedlist numeration="arabic">
-
-	<listitem>
-	<para>
-	  While using Windows, import the files into Mozilla Mail (or
-	  another mailer, such as Netscape or Eudora, that uses the
-	  standard mbox format).
-        </para>
-        </listitem>
+	<note>
+	  <title>Microsoft Outlook and Outlook Express Users</title>
+	  <para>
+	    Microsoft Outlook, and versions of Outlook Express after
+	    version 4, use proprietary formats that <application>Ximian
+	      Evolution</application> cannot read or import.  For contacts,
+	    you may have to email them to yourself and import them that
+	    way.  For email, there is a simpler workaround:
+	    <orderedlist numeration="arabic">
+	      
+	      <listitem>
+		<para>
+		  While using Windows, import the files into Mozilla Mail (or
+		  another mailer, such as Netscape or Eudora, that uses the
+		  standard mbox format).
+		</para>
+	      </listitem>
+	      
+	      <listitem>
+		<para>
+		  Copy the files to the system or partition you use for
+		  <application>Ximian Evolution</application>.  
+		</para>
+	      </listitem>
+	      
+	      <listitem>
+		<para>
+		  Use the <application>Ximian Evolution</application> import
+		  tool to import the files.  There's more information about
+		  why this works, and how, at the Ximian support website.
+		</para>
+	      </listitem>
+	    </orderedlist>
+	  </para>
+	</note>     
+	
+	<note>
+	  <title>Netscape Users</title>
+	  <para>
+	    Before importing mail from Netscape, make sure you select
+	    <menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
+		Folders</guimenuitem></menuchoice>. If you don't,
+	    <application>Ximian Evolution</application> will import and undelete
+	    the messages in your Trash folders.
+	  </para>
+	</note>     
 	
-	<listitem>
-	<para>
-          Copy the files to the system or partition you use for
-          <application>Ximian Evolution</application>.  
-         </para>
-        </listitem>
-
-	<listitem>
-	<para>
-	  Use the <application>Ximian Evolution</application> import
-          tool to import the files.  There's more information about
-          why this works, and how, at the Ximian support website.
-      </para>
-        </listitem>
-     </orderedlist>
-    </para>
-    </note>     
-
-    <note>
-      <title>Netscape Users</title>
-      <para>
-	Before importing mail from Netscape, make sure you select
-	<menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
-	Folders</guimenuitem></menuchoice>. If you don't,
-	<application>Ximian Evolution</application> will import and undelete
-	the messages in your Trash folders.
       </para>
-    </note>     
-
-    </para>
-
+      
     </sect2>
   </sect1>
   <sect1 id="usage-mail-organize-columns">
-      <title>Sorting Mail with Column Headers</title>
-      <para>
-         By default, the message list has columns with the following
-         headings: an envelope icon indicating whether you have read
-         or replied to a message, an exclamation point indicating priority, and the
-         <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and
-         <guilabel>Date</guilabel> fields. You can change their order
-         and remove them by dragging and dropping them.  
-
+    <title>Sorting Mail with Column Headers</title>
+    <para>
+      By default, the message list has columns with the following
+      headings: an envelope icon indicating whether you have read
+      or replied to a message, an exclamation point indicating priority, and the
+      <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and
+      <guilabel>Date</guilabel> fields. You can change their order
+      and remove them by dragging and dropping them.  
+      
       To add columns:
       <orderedlist numeration="arabic">
 	<listitem>
@@ -246,13 +256,17 @@
 	    </para></listitem>
 	  </varlistentry>
 	  
-	  <varlistentry>
-	    <term><guimenuitem>Remove this
-		Column</guimenuitem>:</term> <listitem><para> Remove
-		this column from the display. You can also remove
-		columns by dragging the header off the list and
-		letting it drop.  </para></listitem>
-	  </varlistentry>
+	<varlistentry>
+	  <term><guimenuitem>Remove this
+	      Column</guimenuitem>:</term> 
+	  <listitem>
+	    <para>
+	      Remove this column from the display. You can also remove
+	      columns by dragging the header off the list and
+	      letting it drop.  
+	    </para>
+	  </listitem>
+	</varlistentry>
 	  
 	  <varlistentry>
 	    <term><guimenuitem>Field
@@ -273,7 +287,7 @@
       <para>
 	<application>Ximian Evolution</application> keeps mail, as well as
 	address cards and calendars, in folders.  You start out with a
-	few, like <guilabel>Inbox</guilabel>,
+	few mail folders, such as <guilabel>Inbox</guilabel>,
 	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
 	but you can create as many as you like.  Create new folders by
 	selecting <guisubmenu>New</guisubmenu> and then
@@ -298,78 +312,78 @@
   </sect1>    
 
   <sect1 id="usage-mail-organize-search">
-      <title>Searching for Messages</title>
-      <para>
-	Most mail clients can search through your messages for you,
-	but <application>Ximian Evolution</application> does it faster. You
-	can search through just the message subjects, just the message
-	body, or both body and subject.
-      </para>
-      <para>
-	To start searching, enter a word or phrase in the text area
-	right below the toolbar, and choose a search type:
-	<variablelist>
-	  <varlistentry>
-	    <term><guilabel>Body or subject contains</guilabel>:</term>
+    <title>Searching for Messages</title>
+    <para>
+      Most mail clients can search through your messages for you,
+      but <application>Ximian Evolution</application> does it faster. You
+      can search through just the message subjects, just the message
+      body, or both body and subject.
+    </para>
+    <para>
+      To start searching, enter a word or phrase in the text area
+      right below the toolbar, and choose a search type:
+      <variablelist>
+	<varlistentry>
+	  <term><guilabel>Body or subject contains</guilabel>:</term>
 	  <listitem>
-	      <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>
-
-        When you've entered your search phrase, press
-        <keycap>Enter</keycap>.  <application>Ximian Evolution</application>
-        will show your search results in the message list.
-      </para>
-
-      <para>
-         If you think you'll want to return to a search again, you can
-         save it as a virtual folder by selecting <guilabel>Store
-         Search as vFolder</guilabel>.
-      </para>
+	    <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>
+      
+      When you've entered your search phrase, press
+      <keycap>Enter</keycap>.  <application>Ximian Evolution</application>
+      will show your search results in the message list.
+    </para>
+    
+    <para>
+      If you think you'll want to return to a search again, you can
+      save it as a virtual folder by selecting <guilabel>Store
+	Search as vFolder</guilabel>.
+    </para>
 
       <para>
          When you're done with the search, go back to seeing all your
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 0dd31b38a6..ae074d6032 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -939,8 +939,18 @@
                   of bullet points for the highly

                   organized.

                 </para>

-              </listitem>

-           </varlistentry>

+	      <tip>

+		<title>Using Bullets to Make Your Email More

+		Attractive</title>

+		<para>

+		  Often times, people use asterisks instead of real bullets.

+		  Not only do asterisks look nicer, but

+		  <application>Evolution</application> will word wrap for you,

+		  which makes your text looks nicer.

+		</para>

+	      </tip>

+	    </listitem>

+	  </varlistentry>

 	  <varlistentry>

 	    <term>Text style:</term>

 	    <listitem>

@@ -1135,10 +1145,10 @@
 

 		  <listitem>

 		    <para>

-		    Choose the alignment and style.  For the plain

-		    line, you can choose the thickness of the line,

-		    and whether it will be shaded, or solid.  For the

-		    other types, you can only choose alignment.

+		      Choose the alignment and style.  For the plain

+		      line, you can choose the thickness of the line,

+		      and whether it will be shaded, or solid.  For the

+		      other types, you can only choose alignment.

 		    </para>

 		  </listitem>

 

@@ -1335,7 +1345,7 @@
 	    </listitem>

 	    <listitem>

 	      <para>

-	      Set the size and alignment of the HTML template.

+		Set the size and alignment of the HTML template.

 	      </para>

 	    </listitem>

 

@@ -1347,8 +1357,8 @@
 	    </listitem>

 	    <listitem>

 	      <para>

-		Once you have inserted the template, click on the text

-		in the template, and enter the text you want to use.

+		Click on the text in the template, and enter the text

+		you want to use.

               </para>

 	      <para>

 		If you have selected an image frame template,

@@ -1562,12 +1572,19 @@
     <sect2 id="fancy-mail">

       <title>Making Your Email More Fancy</title>

       <para>

-	<application>Evolution</application> can do a lot with email by utilizing the HTML features.  Making an email functional and visually attractive can be challenging.  The following section provides tips to make your mail functional, while being more visually attractive than ever.

+	<application>Evolution</application> can do a lot with email

+	by utilizing the HTML features.  Making an email functional

+	and visually attractive can be challenging.  The following

+	section provides tips to make your mail functional, while

+	being more visually attractive than ever.

       </para>

       <sect3 id="sections-bolded-title">

 	<title>Sections Outlined in Bold</title>

 	<para>

-	  Indented sections are a great way to categorize and group your thoughts together.  Below is an example of indented text with headings to help separate your thoughts into the proper sections:

+	  Indented sections are a great way to categorize and group

+	  your thoughts together.  Below is an example of indented

+	  text with headings to help separate your thoughts into the

+	  proper sections:

 	  <figure>

 	    <title>Indented Text with Headlines</title>

 	    <screenshot>

@@ -1580,54 +1597,75 @@
 	  Notice how professional the email looks, but it gets the content across well.  Each section is broken up in its own subsection.  The title is bolded, while the text which follows is indented one time.

 	</para>

 	<para>

-<!-- Typed 1800 to 1830 -->

-	Making your headlines a larger size instead of bold can help as well.  Header size 4 is often the best alternative for bold.  You can change your text to size 4 by selecting it and pressing Ctrl+4.  You can set your text to regular size later by hitting Ctrl+0.

+	Making your headlines a larger size instead of bold can help

+	as well.  Header size 4 is often the best alternative for

+	bold.  You can change your text to size 4 by selecting it and

+	pressing Ctrl+4.  You can set your text to regular size later

+	by hitting Ctrl+0.

 	</para>

       </sect3>

       <sect3 id="bulleted-lists">

-      <title>Bulleted Lists</title>

-      <para>

-      Often times, people use asterisks instead of real bullets.  Not only do asterisks look nicer, but <application>Evolution</application> will word wrap for you, which makes your text looks nicer.

-      </para>

+	<title>Bulleted Lists</title>

+	<para>

+	  Often times, people use asterisks instead of real bullets.

+	  Not only do asterisks look nicer, but

+	  <application>Evolution</application> will word wrap for you,

+	  which makes your text looks nicer.

+	</para>

       </sect3>

       <sect3 id="inline-images">

-      <title>Images In Your Email</title>

-      <para>

-      Images can help people to understand your point.  You should also consider using the HTML Picture Frame Template in <application>Evolution</application>, as it looks good and has captions below it.

-      </para>

-      <para>

-      If you do choose to use images, try to keep them narrow.  If your images are wider than 400 pixels, the image may not fit in the whole email window, making it hard for your reader to read the email and view the image.  Instead, you should consider using a thumbnail and creating a link on the image which opens a browser with the full image.

-      </para>

+	<title>Images In Your Email</title>

+	<para>

+	  Images can help people to understand your point.  You should

+	  also consider using the HTML Picture Frame Template in

+	  <application>Evolution</application>, as it looks good and

+	  has captions below it.

+	</para>

+	<para>

+	  If you do choose to use images, try to keep them narrow.  If

+	  your images are wider than 400 pixels, the image may not fit

+	  in the whole email window, making it hard for your reader to

+	  read the email and view the image.  Instead, you should

+	  consider using a thumbnail and creating a link on the image

+	  which opens a browser with the full image.

+	  <figure>

+	    <title>Images in an email</title>

+	    <screenshot>

+	      <screeninfo></screeninfo>

+	      <graphic  format="png" fileref="small_desktop" srccredit="Kevin Breit">

+	    </screenshot>

+	  </figure>

+	</para>

       </sect3>

       <sect3 id="color-suggestions">

-      <title>Coloring Your Text</title>

-      <para>

-      Colors can help bring words or sentences out for emphasis.  You

-      should choose your colors carefully though, as the wrong color

-      can be distracting.  Some good colors to use would be:

-      <itemizedlist>

-      <listitem>

-      <para>

-      Light brown

-      </para>

-      </listitem>

-      <listitem>

-      <para>

-      Dull purple

-      </para>

-      </listitem>

-      <listitem>

-      <para>

-      Dark red

-      </para>

-      </listitem>

-      </itemizedlist>

-      <!-- Include a screenshot -->

-      Notice how these colors are similar saturation <!-- Confirm I am using the right word -->

-      </para>

-    <para>

-    Happy mailing!

-    </para>

+	<title>Coloring Your Text</title>

+	<para>

+	  Colors can help bring words or sentences out for emphasis.  You

+	  should choose your colors carefully though, as the wrong color

+	  can be distracting.  Some good colors to use would be:

+	  <itemizedlist>

+	    <listitem>

+	      <para>

+		Light brown

+	      </para>

+	    </listitem>

+	    <listitem>

+	      <para>

+		Dull purple

+	      </para>

+	    </listitem>

+	    <listitem>

+	      <para>

+		Dark red

+	      </para>

+	    </listitem>

+	  </itemizedlist>

+	  <!-- Include a screenshot -->

+	  Notice how these colors are similar saturation <!-- Confirm I am using the right word -->

+	</para>

+	<para>

+	  Happy mailing!

+	</para>

       </sect3>

     </sect2>

   </sect1>

diff --git a/help/ChangeLog b/help/ChangeLog
index 3aba5534f5..a6ec3582e7 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-14  Kevin Breit  <mrproper@ximian.com>
+
+	* C/apx-gloss.sgml: Slight glossary changes in wording
+
+	* C/usage-mail.sgml: Indenting changes, minor reorganization.
+
 2001-12-05  Aaron Weber  <aaron@ximian.com>
 
 	* C/usage-calendar.sgml: added "meeting-announce" note ("Simple