lots of minor fixes to language. added desc. of clahey's cool

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

	* C/usage-mail.sgml: lots of minor fixes to language. added
	desc. of clahey's cool button-address thing.

	* C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut
	bar & folder descs, removed refs to trash.

svn path=/trunk/; revision=4219

1 files changed, 99 insertions, 106 deletions

diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 4ba1c29292..e9d2babb3b 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -1,7 +1,6 @@
-
-<!-- UNComment the following during debugging:
- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
-
+<!--
+ <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+-->
 
 <chapter id="usage-mainwindow">
 
@@ -21,9 +20,9 @@
      bar</interface>, and below that, the <interface>tool
      bar</interface> with buttons for different functions. The largest
      part of the <interface>main window</interface> is taken up by the
-     actual <interface>Inbox</interface>, with a listing of messages
-     you have recieved.  If you're running the program for the first
-     time, you'll just have one: a welcome message from Helix Code.
+     actual <interface>Inbox</interface>, where messages are listed
+     and displayed for .  If you're running the program for the first
+     time, you'll have just one message: a welcome from Helix Code.
 
 
 <!-- ==============Figure=================================== -->
@@ -75,59 +74,71 @@ Can these things be labelled with little arrows & stuff?
     </para>
     <para>
        The category buttons are labelled <guilabel>Evolution
-       Shortcuts</guilabel> <guilabel>Internet Directories</guilabel>.
-       When you click on them, they'll slide up and down to give you
-       access to different sorts of shortcuts.  When you first start
-       <application>Evolution</application>, you are looking at the
-       <guilabel>Evolution Shortcuts</guilabel> category.  If you click
-       <guilabel>Internet Directories</guilabel>, it will slide up and
-       you'll see buttons for the <guilabel>Bigfoot</guilabel> and
+       Shortcuts</guilabel> and <guilabel>Internet
+       Directories</guilabel>.  When you click on them, they'll slide
+       up and down to give you access to different sorts of shortcuts.
+       When you first start <application>Evolution</application>, you
+       are looking at the <guilabel>Evolution Shortcuts</guilabel>
+       category.  If you click <guilabel>Internet
+       Directories</guilabel>, it will slide up and you'll see buttons
+       for the <guilabel>Bigfoot</guilabel> and
        <guilabel>Netcenter</guilabel> directories, as well as any
        others you or your system administrator might have added.
-       Click on <guibutton>Evolution Shortcuts</guibutton> to look at
-       the shortcuts again.
-    </para>
+       Internet directories behave a lot like the local contact
+       manager, which is covered in <xref linkend="usage-contact">.
+    </para>     
     <para>
-     They are:
-      <itemizedlist>
+       Take a look at the <guilabel>Evolution Shortcuts</guilabel>
+       again.  They are:
+
+      <variablelist>
 
 <!--  NOT IMPLEMENTED! 
+	<varlistentry>
+	<term> <guibutton>Today</guibutton></term>
 	<listitem>
 	  <para>
-	    <guibutton>Today</guibutton>, which will bring up a summary
-	    of any new messages you've recieved, along with the tasks and
-	    appointments you have lined up for today.
-	  </para>
-	</listitem>
+	This will bring up a summary of any new messages you've
+	recieved, along with the tasks and appointments you have
+	lined up for today.
+      </para>
+      </listitem>
+      </varlistentry>
 -->
-	<listitem>
-	  <para>
-	    <guibutton>Inbox</guibutton>, which will show you all
-	    of your email.  Your Inbox is also where you can
-	    access Evolution's tools to filter, sort, organize,
-	    and search your mail.
-	  </para>
-	</listitem>
 
-	<listitem>
-	   <para>
-	      The <guibutton>Calendar</guibutton>, which can store
-	      appointments for you.  Connected to a network, you
-	      can use it to keep a group of people on schedule and
-	      up to date.
+	<varlistentry>
+	  <term> <guibutton>Inbox</guibutton></term>
+	  <listitem>
+	    <para>
+	      The Inbox will show you all of your email.  Your Inbox
+	      is also where you can access Evolution's tools to
+	      filter, sort, organize, and search your mail.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><guibutton>Calendar</guibutton></term>
+	  <listitem>
+	    <para>
+	      The Calendar can store your appointments and To do lists
+	      for you.  Connected to a network, you can use it to keep
+	      a group of people on schedule and up to date.
+	    </para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><guibutton>Contacts</guibutton></term>
+	  <listitem>
+	    <para>
+	      The Contact Manager holds your addresses, phone numbers,
+	      and contact information.  Like calendar information,
+	      contact data can be synchronized with hand-held devices
+	      and shared over a network.
 	   </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    The <guibutton>Contacts</guibutton> tool holds your
-	    addresses, phone numbers, and contact information.
-	    Like calendar information, contact data can be
-	    synchronized with hand-held devices and shared over a
-	    network.  
-	  </para>
-	</listitem>
-
+	  </listitem>
+	</varlistentry>
 <!-- NOT IMPLEMENTED YET
 
 	<listitem>
@@ -138,19 +149,19 @@ Can these things be labelled with little arrows & stuff?
 	  </para>
 	</listitem>
 -->
+	<varlistentry>
+	  <term> <guibutton>Notes</guibutton></term>
 	<listitem>
-	  <para> <guibutton>Notes</guibutton> is your catch-all
-	    notepad: write <glossterm>haiku</glossterm>, take down
-	    messages from phone conversations, or keep small things
-	    organized. This feature is not yet implemented, but will
-	    be soon. See <xref linkend="usage-notes"> for more information.
+	  <para> The notepad is your catch-all tool: use it to take
+	    messages from phone conversations, keep small things
+	    organized, write <glossterm>haiku</glossterm>, or whatever
+	    you like. This feature is not yet implemented, but will be
+	    soon. See <xref linkend="usage-notes"> for more
+	    information.
 	  </para>
 	</listitem>
-
-
-      </itemizedlist>
-
-
+	</varlistentry>
+      </variablelist>
     </para>
     <para>
       If you prefer to use a keyboard shortcut, or <glossterm>hot
@@ -173,43 +184,42 @@ Can these things be labelled with little arrows & stuff?
       <application>Evolution</application>. It displays all your
       appointments, address cards, and email in a tree that's a lot
       like a <glossterm>file tree</glossterm>&mdash; it starts small
-      at the top, and branches downwards. On my computer, I have only
-      one: <guilabel>Local</guilabel>.  When I click on the plus sign
-      next to the label, I see the contents:
+      at the top, and branches downwards. On most computers, there
+      will be three folders at the base.  The first one is
+      <guilabel>VFolders</guilabel>, for virtual folders (discussed in
+      <xref linkend="usage-mail-vfolders">.  The next one is
+      <guilabel>External Directories</guilabel>, which (FIXME: What is
+      this for?). The most important one is probably
+      <guilabel>Local</guilabel>, which contains all the data that's
+      actually stored on your computer.  If you click on the plus sign
+      plus sign next to the <guilabel>Local</guilabel> folder, you'll
+      see the contents:
       <itemizedlist>
 	 <listitem>
 	    <para>
-	      <guilabel>Calendar</guilabel>, where I keep
-	      appointments and event listings.
+	      <guilabel>Calendar</guilabel>, for appointments and
+	      event listings.
 	   </para>
 	 </listitem> 
 	 <listitem>
 	    <para>
-	    <guilabel>Contacts</guilabel>, where address
-	    cards are stored.
+	    <guilabel>Contacts</guilabel>, for address cards.
 	   </para>
 	 </listitem>
 	 <listitem>
 	    <para>
-	  <guilabel>Directories</guilabel>, for search directories, which
-	  have not been implemented yet.
+	  <guilabel>Directories</guilabel>, for Internet contact directories.
 	   </para>
 	 </listitem>
 	 <listitem>
 	    <para>
-	     <guilabel>Inbox</guilabel>, for incoming mail, and all
-	     the rest of my mail folders.
+	     <guilabel>Inbox</guilabel>, for incoming mail.
 	   </para>
 	 </listitem>
 	<listitem>
 	    <para>
-	    <guilabel>Outbox</guilabel>, which is for 
-	    drafts of messages and mail that's already been sent.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	    <guilabel>Trash</guilabel>, which is for trash.
+	    <guilabel>Outbox</guilabel>, which is for drafts of
+	    messages and mail that's already been sent.
 	   </para>
 	 </listitem>
       </itemizedlist>
@@ -240,36 +250,20 @@ Can these things be labelled with little arrows & stuff?
     </tip>
 
     <para>
-      If a folder has other folders inside it, there will be a plus
-      sign next to it. Click on the plus sign, and the folder will
-      open to let you see the other folders inside.  This may
-      change in the future to something more attractive, like
-      triangles that drop down as you click on them to display the
-      rest of the tree.
+      Any time new information arrives in a folder, that folder label
+      is displayed as bold text.
     </para>
 
     <para>
-      Any time new information arrives in a folder, that folder
-      will be highlighted, or its label displayed as bold
-      text. You can learn more about customizing
-      <application>Evolution</application> alerts and appearance
-      in <xref linkend="config">.
-    </para>
-
-    <para>
-      Moving and deleting folders and other items works in one of
-      two ways: using <glossterm>drag-and-drop</glossterm> or by
-      right-clicking and selecting an item from the
-      <interface>right-click menu</interface>.  You can drag the
-      folders inside the folder view to change their order or put
-      one folder inside another.  To delete a folder, drag it into
-      the trash folder or right-click it and select
-      <guimenuitem>Delete</guimenuitem> from the menu that pops
-      up.  The same goes for individual messages, appointments,
-      and address cards, whether they're in the <interface>folder
-      view</interface> or not: drag them where you want them, and
-      they will go there.  <!-- ****This paragraph could use some
-      work**** -->
+      You can move folders and other items using
+      <glossterm>drag-and-drop</glossterm>.  You can drag the folders
+      inside the folder view to change their order or put one folder
+      inside another.  To delete a folder, right-click it and select
+      <guimenuitem>Delete</guimenuitem> from the menu that pops up.
+      The same goes for individual messages, appointments, and address
+      cards, whether they're in the <interface>folder view</interface>
+      or not: drag them where you want them, and they will go there.
+      <!-- ****This paragraph could use some work**** -->
     </para>
   </sect1>
   <sect1 id="usage-mainwindow-menubar">
@@ -291,7 +285,6 @@ Can these things be labelled with little arrows & stuff?
       <application>Evolution</application>.
     </para>
 
-
     <para>
       Once you've familiarized yourself with the <interface>main
       window</interface> you can start doing things with it.