Made moderate to major stylistic updates to this, apx-gloss.sgml, and to

	* C/evolution-guide.sgml: Made moderate to major stylistic updates
	to this, apx-gloss.sgml, and to all files beginning with "usage,"
	especially wrt HTML mail.

svn path=/trunk/; revision=3714

1 files changed, 154 insertions, 134 deletions

diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index 2291e28548..222878b145 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -1,37 +1,39 @@
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-
+<!-- uncomment this during validation and debugging -->
 <chapter id="usage-contact">
   <title>The Evolution Contact Manager</title>
-  <para>
-     The <application>Evolution</application> contact manager can
-     handle all of the functions of an address book, phone book, or
-     Rolodex.  Of course, <application>Evolution</application> allows
-     easier updates than an actual paper book. <application> Evolution
-     </application> also allows easy synchronization with handheld and
-     remote devices.  Since <application>Evolution</application>
-     supports most major network protocols, including
-     <glossterm>LDAP</glossterm>, it's easy to use over an existing
-     network.
-  </para>
-  <para>
-     Another advantage of the <application>Evolution</application>
-     address book is its integration with the rest of the application.
-     That means that when you look for someone's address, you can also
-     see a history of appointments with that person.  Or, you can get
-     an e-mail with contact information in it and create a new address
-     card on the spot.  In addition, searches and folders and all work
-     in the same way they do in the other components, so you don't
-     have to learn another system for similar tasks.
-  </para>
-  <para>
-     This chapter will cover using the
-     <application>Evolution</application> contact manager to organize
-     any amount of contact information, share addresses over a
-     network, and several ways to save time with everyday tasks.  To
-     learn about configuring the contact manager, see <xref
-     linkend="config-prefs-contact">.
-  </para>
-
+  <abstract>
+    <para>
+      The <application>Evolution</application> contact manager can
+      handle all of the functions of an address book, phone book, or
+      Rolodex.  Of course, <application>Evolution</application> allows
+      easier updates than an actual paper book. <application>
+      Evolution </application> also allows easy synchronization with
+      handheld and remote devices.  Since
+      <application>Evolution</application> supports most major network
+      protocols, including <glossterm>LDAP</glossterm>, it's easy to
+      use over an existing network.
+    </para>
+    <para>
+      Another advantage of the <application>Evolution</application>
+      address book is its integration with the rest of the
+      application.  That means that when you look for someone's
+      address, you can also see a history of appointments with that
+      person.  Or, you can get an e-mail with contact information in
+      it and create a new address card on the spot.  In addition,
+      searches and folders and all work in the same way they do in the
+      other components, so you don't have to learn another system for
+      similar tasks.
+    </para>
+    <para>
+      This chapter will cover using the
+      <application>Evolution</application> contact manager to organize
+      any amount of contact information, share addresses over a
+      network, and several ways to save time with everyday tasks.  To
+      learn about configuring the contact manager, see <xref
+      linkend="config-prefs-contact">.
+    </para>
+  </abstract>
   <sect1 id="usage-contact-basic">
     <title>Getting Started With the Contact Manager</title>	
     
@@ -53,55 +55,93 @@
     </figure>
 
     <para>
-       The contact manager interface is broken into two main parts.
-       The first part is the contact display section.  This can be
-       found at the bottom right panel of
-       <application>Evolution</application>.  This section is where
-       all your contact information is displayed.  Each of these cards
-       are organized into folders.  The second section is the
-       administrative section which spans the top of the <application>
-       Evolution</application> window.  This is where you can add,
-       edit, or delete records.
+       The toolbar for the address book is quite simple:
+
+       <itemizedlist>
+	<listitem><para>
+           Press <guibutton>New</guibutton> for a new contact.
+	</para></listitem>
+
+	<listitem><para>
+           <guibutton>Find</guibutton> brings up an in-depth search window.
+         </para></listitem>
+	
+	<listitem><para>
+	    Press <guibutton>Print</guibutton> to print.
+	</para></listitem>
+        <listitem><para>
+           <guibutton>Delete</guibutton> deletes a selected card.
+        </para></listitem>
+      </itemizedlist>
+    
+       The last feature is <guilabel>Quick Search</guilabel>; to use
+       it, just enter what you're looking for and hit
+       <keycap>Enter</keycap>.  <application>Evolution</application>
+       will show you all the cards that match; if there are none, the
+       display will be blank.  To display <emphasis>all</emphasis> of
+       your contacts, you can leave the <guilabel>Quick
+       Search</guilabel> field blank, and press enter.
+    </para>
+    <para>
+       The rest of the contact manager is taken up by the display of
+       your cards.  You can view it as a table or as a list of
+       cards&mdash; switch between them in the <guimenu>View</guimenu>
+       menu &mdash; and move through them alphabetically alphanumeric
+       buttons and the scrollbar at the right of the window.
+       
     </para>
   </sect1>
   <sect1 id="usage-contact-cards">
     <title>Creating, Deleting, and Adding Cards</title>
     <para>
-      You can create a new card by pressing the <guibutton>New
-      Card</guibutton> button, or by pressing
-      <keysym>KEYSYM</keysym>. The <interface>Contact
-      Editor</interface> window will appear.  It has two tabs,
+      Open up the contact editor by pressing the <guibutton>New
+      Card</guibutton> button.  The 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 with all
-      the items from the main window (IS THIS TRUE?  DESCRIBE MENUBAR
-      AGAIN?)
+      the person.  In addition, it contains a full menu bar.  FIXME:
+      The contents are still changing rapidly, but you should be able
+      to guess what they're for.
     </para>
+
+    <figure id="usage-contact-editor-fig">
+      <title>Evolution Contact Editor</title>
+      <screenshot>
+	<screeninfo>Evolution Contact Editor</screeninfo>
+	<graphic fileref="fig/contact-new" format="png" srccredit="Aaron Weber">
+	    </graphic>
+      </screenshot>
+    </figure>
+
     <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 handshake for contacts; and a
-      briefcase for categories.  The things that go into most of the
-      text fields should be obvious enough, so we'll just describe the
-      more interesting parts of the window.  Aside from the
-      <guilabel>Categories</guilabel> feature, which is discussed in
-      <xref linkend="usage-contact-organize">, there are two things
-      you'll want to know about.
+      house for postal address; a handshake for contacts (FIXME: I
+      don't understand this feature, and the button doesn't do
+      anything yet.); and a briefcase for categories.  The things that
+      go into most of the text fields should be obvious enough, so
+      we'll just describe the more interesting parts of the window.
+      Aside from the <guilabel>Categories</guilabel> feature, which is
+      discussed in <xref linkend="usage-contact-organize">, there are
+      two things you'll want to know about: the first of these is the
+      <guilabel>File As</guilabel> field.
    </para>
+
    <para>
       Type "Eva Lucianne Tester" into the <guilabel>Full
       Name</guilabel> field.  You'll notice that the <guilabel>File
-      As</guilabel> field also fills up, but in a phone-book fashion:
-      Tester, Lucianne.  You can pick "Eva Tester" from the drop-down,
-      or type in your own.  I suggest that you don't enter something
-      entirely different from the actual name, however.  You might
-      forget that you've filed Eva's information under "C" for "Code, Helix."
+      As</guilabel> field also fills up, but in reverse: Tester,
+      Lucianne.  You can pick "Eva Tester" from the drop-down, or, if
+      you prefer, type in your own, such as "Lucianne Tester, Eva".  I
+      suggest that you don't enter something entirely different from
+      the actual name, however.  You might forget that you've filed
+      Eva's information under "F" for "Fictitious Helix Code
+      Employees"
    </para>
    <para>
-      The other little feature I want to mention involves the little
-      squares next to several of the fields.  Click on them and you'll
-      get a menu of different labels; for the fields in the telephone
+      The other feature I want to mention involves the little squares
+      next to several of the fields.  Click on them and you'll get a
+      menu of different labels; for the fields in the telephone
       section, it's a long list involving things like
       <guilabel>Home</guilabel>, <guilabel>Home 2</guilabel>,
       <guilabel>Other Fax</guilabel>, and <guilabel>Pager</guilabel>.
@@ -114,16 +154,7 @@
       labels, any that you've already filled in will be marked.
    </para>
 
-    <figure id="usage-contact-editor-fig">
-      <title>Evolution Contact Editor</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Editor</screeninfo>
-	<graphic fileref="fig/contact-new" format="png" srccredit="Aaron Weber">
-	    </graphic>
-      </screenshot>
-    </figure>
-
-<!--
+<!--  FIXME: do this whole thing later.
       <variablelist>
          <listitem>
 	  <term>
@@ -149,18 +180,8 @@
         </para>
     
 -->
-
-    <para>
-       You can choose which fields an address card has, and create new
-       fields for cards.  For example,
-       <application>Evolution</application> provides for two line
-       postal addresses by default, but you may have as many or as few
-       lines to an address as you wish.  To change which fields an
-       address card has, choose DESCRIBE HERE HOW TO DO THIS.
-    </para>
-
-    <note>
-      <title>Quick ways to add cards</title>
+    <tip>
+      <title>Contact Shortcuts</title>
       <para>
         You can add cards from within an email message or calendar
         appointment.  While looking at an email, right-click on any
@@ -172,7 +193,7 @@
         Address</guimenuitem>.  (NOTE that feature may change!
         unimplemented!)
       </para>
-    </note>
+    </tip>
     
     <para>
        You delete a card by pressing the <guibutton>Delete
@@ -200,11 +221,11 @@
     <para>
       Another useful UNIMPLEMENTED
       <application>Evolution</application> feature is its ability to
-      recognize when people live together.  If two people in your
-      contact manager share an address, and you change the address for
-      one of them, <application>Evolution</application> will ask you
-      if you wish to change the address for both of them, or just for
-      one.
+      recognize when people live or work together.  If several people
+      in your contact manager share an address, and you change the
+      address for one of them, <application>Evolution</application>
+      will ask you if you wish to change the address for all of them,
+      or just for one.
     </para>
 
     <sect2 id="usage-contact-organize-group">
@@ -264,8 +285,11 @@
            Then, you can refer to all the cards in that category by:
          </para>
 	<para>
-           If the default categories don't suit you, you can add your
-           own.  Here's how:
+           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
+           choose <guilabel>Add to Master List</guilabel> in the
+           window that appears. (FIXME: This isn't quite accurate.)
          </para>
       </sect3>
     </sect2>
@@ -285,70 +309,66 @@
      <example id="usage-contact-sharing-ex">
 	<title>Sharing Address Cards and Calendar Data</title>
 	  <para>
-	    Ray wants to schedule a meeting with someone at
-	    Company X, so he checks the network for the Company X
-	    address card that states his contacts there.  Since
-	    his company also shares calendars, he then learns that
-	    his co-worker Deanna has already scheduled a meeting
-	    with them next Thursday.  He can either go to the
-	    meeting himself or ask Deanna to discuss his concerns
-	    for him.  Either way, I avoid scheduling an extra
-	    meeting with Company X.
+	    Ray wants to schedule a meeting with Company X, so he
+	    checks the network for the Company X address card so he
+	    knows whom to call there.  Since his company also shares
+	    calendars, he then learns that his co-worker Deanna has
+	    already scheduled a meeting with Company X next Thursday.
+	    He can either go to the meeting himself or ask Deanna to
+	    discuss his concerns for him.  Either way, he avoids
+	    scheduling an extra meeting with Company X.
 	 </para>
       </example>
-
     <para>
-       Of course, you don't want to share all of your cards&mdash;
-       why overload the network with a list of babysitters, or
-       tell everyone on your network you're talking to new job
-       prospects?  <application>Evolution</application> lets you
-       decide which folders you want to make accessible to others.
+       Of course, you don't want to share all of your cards&mdash; why
+       overload the network with a list of babysitters, or tell
+       everyone on your network you're talking to new job prospects?
+       <application>Evolution</application> lets you decide which
+       folders you want to make accessible to others.
     </para>
     <para>
-       To begin sharing a folder of address cards, select (something) <!--
-       DESCRIBE PROCESS HERE -->.  The
-       <interface>Sharing</interface> window will pop up.  It contains:
-       <!--DESCRIBE INTERFACE HERE-->
+       To begin sharing a folder of address cards, wait until
+       <application>Evolution</application> supports this
+       feature. (FIXME!)
     </para>
   </sect1>
 
   <sect1 id="usage-contact-automate">
     <title>Automating the Contact Manager</title>
     <para>
-      The <application>Evolution</application> contact manager
-      can perform a wide variety of tasks for you.  From speeding
-      up basic tasks like adding a new address card to managing
-      mailing lists, you'll find that the contact manager is more
-      than a mere address book.
+       In addition to working with the mailer and the calendar to add
+       new cards quickly, the contact manager can do some pretty cool
+       stuff on its own. (FIXME: This para is terrible)
     </para>
 
     <sect2 id="contact-automation-basic">
       <title>Send me a card: Adding New Cards Quickly</title>
       <para>
-	When you get information in the mail or in a calendar
-	entry, you can add it to an address card.  To do so, right
-	click on any email address or email message, and select
-	<guimenuitem>Add Address Card</guimenuitem> from the menu
-	that appears.  Of course, <application>
-	Evolution</application> adds cards from a hand-held device
-	during HotSync operation.  For more information about
-	that, see <xref linkend="usage-sync">.
+	As noted before, when you get information about a person in
+	the mail or in a calendar entry, you can add it to an address
+	card.  To do so, right click on any email address or email
+	message, and select <guimenuitem>Add Address
+	Card</guimenuitem> from the menu that appears.  Of course,
+	<application> Evolution</application> also adds cards from a
+	hand-held device during HotSync operation.  For more
+	information about that, see <xref linkend="usage-sync">.
       </para>
     </sect2>
 
     <sect2 id="contact-automation-lists">
       <title>Managing a Mailing list</title>
       <para>
-	 You already know that when you are writing an email, you
-	 can address it to one or more people, and that
-	 <application>Evolution</application> will fill in
-	 addresses from your contact manager's address cards if
-	 you let it.  In addition to that, you can send email to
-	 everyone in a particular group by doing SOMETHING HERE.
-	 Future versions of <application>Evolution</application>
-	 will allow you to you export a group of cards to a
-	 spreadsheet, database, or word processor so you can print
-	 address labels or prepare large postal mailings.
+	 You already know that when you are writing an email, you can
+	 address it to one or more people, and that
+	 <application>Evolution</application> will fill in addresses
+	 from your contact manager's address cards if you let it.  In
+	 addition to that, you can send email to everyone in a
+	 particular group by (FIXME: wait for feature implementation,
+	 then document). Future versions of
+	 <application>Evolution</application> will allow you to you
+	 export a group of cards to a spreadsheet, database, or word
+	 processor so you can print address labels or prepare large
+	 postal mailings.
       </para>
     </sect2>
     <sect2 id="usage-contact-automation-extra">