Redid menubar description.

	* C/usage-mainwindow.sgml: Redid menubar description.


	* C/config-prefs.sgml: Added coverage of folder config, requested
	that feature be transferred to config section. Switched to
	variablelist in "Other" config section.

	* C/usage-mail.sgml: Added coverage of right-click on messages,
	threaded-view.

	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.

svn path=/trunk/; revision=4650

12 files changed, 640 insertions, 124 deletions

diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index 7411afb70b..d75adf383a 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -40,11 +40,21 @@
             </para>
           </listitem>
 	</varlistentry>
+
+	<varlistentry>
+	  <term><guilabel>Sources</guilabel></term>
+	  <listitem>
+	    <para>
+               Set your mail-checking protocols and servers here.
+            </para>
+          </listitem>
+	</varlistentry>
+
 	<varlistentry>
-	  <term><guilabel>Transports</guilabel></term>
+	  <term><guilabel>News Servers</guilabel></term>
 	  <listitem>
 	    <para>
-              Here, you can specify how you will send mail.
+              Specify your News Server preferences here.
            </para>
 	  </listitem>
 	</varlistentry>
@@ -94,7 +104,8 @@
 	    <para>
               <guilabel>Full Name:</guilabel> by default, this is the
               same name as the full name described in your user
-              account on your computer.
+              account on your computer.  You can select another if you
+              wish.
             </para>
 	  </listitem>
            <listitem>
@@ -127,7 +138,7 @@
     <sect2 id="config-prefs-mail-network">
       <title>Network Settings</title> 
       <para>
-        In order to do much of anything with
+        In order to send mail with
         <application>Evolution</application>, you need to connect to
         your network.  To do that, you'll need to know your user name
         and password, what sort of mail sending and receiving
@@ -231,16 +242,64 @@
          </para>
 	</sect3>
       </sect2>
-      <sect2 id="config-prefs-mail-other">
+      <sect2 id="config-prefs-network-news">
+
+ <!-- WHY is this in the MAIL config section? WHY is this UI SOOOO bad?-->
+          
+          <title>News Servers</title>
+          <para>
+            When you first select the <guilabel>News
+            Servers</guilabel> tab, you will see a blank box with
+            three familiar buttons on the right:
+            <guibutton>Add</guibutton>, <guibutton>Edit</guibutton>,
+            and <guibutton>Delete</guibutton>.
+          </para>  
+          <para>
+            Click <guibutton>Add</guibutton> to add a news server; you
+            will be prompted for its name.  Enter the name, click
+            <guibutton>OK</guibutton>
+
+
+     <sect2 id="config-prefs-mail-other">
 	<title>Other Mail Preferences</title>
 	<para>
-          Currently, there is only one option that falls into this
-          category: <guilabel>Send messages in HTML format</guilabel>.
-          If you check this box, you will send messages as HTML.  If
-          you leave it unchecked, your messages will be sent without
-          HTML formatting.  See <xref
-          linkend="usage-mail-getnsend-send-html"> for more
-          information about HTML mail.
+          Not everything fits neatly into categories.  This tab
+          contains some miscellaneous configurations that don't have
+          too much to do with each other.
+          <variablelist>
+             <varlistentry>
+                <term> 
+                   <guilabel>Send messages in HTML format</guilabel>
+                </term>
+                <listitem><para>
+                    If you check this box, you will send
+                    messages as HTML by default.  If you leave it unchecked, your
+                    messages will be sent without HTML formatting unless you select 
+                    <menuchoice> <guimenu>Format</guimenu> <guimenuitem>HTML</guimenuitem>
+                    </menuchoice> in the message composer.
+                    See <xref linkend="usage-mail-getnsend-send-html">
+                    for more information about HTML mail.
+                </para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>
+                   <guilabel>Folder Format</guilabel>
+                </term>
+                <listitem> <para> By default,
+                   <application>Evolution</application> saves its mail
+                   in the
+                   <systemitem><filename>mbox</filename></systemitem>
+                   format. You can switch to the
+                   <systemitem><filename>mh</filename></systemitem>
+                   format if you like.  Note that this is an advanced
+                   feature and may cause you to lose some messages, so
+                   you should probably make a backup of your
+                   <systemitem><filename>evolution</filename></systemitem>
+                   directory first. In addition, it will take quite
+                   some time if you have a large mailbox.
+               </para></listitem>
+             </varlistentry>
+           </variablelist>
         </para>
       </sect2>
     </sect1>
@@ -287,8 +346,8 @@
     <sect2 id="config-prefs-cal-time">
       <title>Time Display Settings</title>
       <para>
-        The first tab, <interface>Time display tab</interface>, lets
-        you set the following:
+        The <guilabel>Time display</guilabel> tab lets you set the
+        following:
         <variablelist>
 	  <varlistentry>
 	    <term>Time format</term>
@@ -313,9 +372,10 @@
                  In the day and week views,
                  <application>Evolution</application> displays all the
                  hours in the range you select here, even if there are
-                 no appointments for those times.  Of course, if you
-                 set your days to end before they begin, you may be in
-                 for a little confusion.
+                 no appointments for those times.  Of course, you can
+                 still schedule an appointment outside of these hours,
+                 and if you do, the display will be extended to show
+                 it.
                </para>
 	    </listitem>
 	  </varlistentry>
@@ -461,7 +521,7 @@
     </sect2>
 
     <sect2 id="config-prefs-cal-alarms">
-      <title>Alarms settings</title>
+      <title>Alarms Settings</title>
       <para>  
         The <interface>alarms tab</interface> enables you to select from three boxes:
         <itemizedlist>
diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml
index 2652644ec7..52ca546b9a 100644
--- a/doc/C/config-setupassist.sgml
+++ b/doc/C/config-setupassist.sgml
@@ -69,15 +69,16 @@
       <varlistentry>
 	 <term><guilabel>Signature File:</guilabel></term>
           <listitem>
-            <para> 
-             A text file appended to any email you send.  A
-             signature file typically consists of your name and email
-             address, or a quotation you like.  It should be three or
-             fewer lines of text.</para>
+            <para>
+             A text file appended to any email you send.  A signature
+             file typically consists of your name and email address,
+             or a quotation you like.  It should be fewer than four
+             lines of text.
+            </para>
          </listitem>
-	      </varlistentry>
+       </varlistentry>
 
-     <varlistentry>
+       <varlistentry>
            <term> <guilabel>Mail source type:</guilabel></term>
 	  <listitem>
 	    <para>
@@ -106,11 +107,11 @@
 	  <term><guilabel>Username:</guilabel></term>
 	<listitem>
              <para>
-              <guilabel>Username:</guilabel>Usually, this is
-              the part of your email address before the @ character,
-              and <application>Evolution</application> has selected
-              that value as the default.  If you have a different
-              username, you can enter it here.
+              Normally, this is the part of your email address before
+              the @ character, and
+              <application>Evolution</application> has selected that
+              value as the default.  If you have a different username,
+              you can enter it here.
             </para>
 	  </listitem>
       </varlistentry>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index f193fa71af..3396fb2f70 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -1,6 +1,6 @@
-<!--
+
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
+
 
 <chapter id="usage-mail"> 
   <title>Evolution Mail</title>
@@ -71,7 +71,99 @@
 	message in the <interface>message list</interface> to have it
 	open in a new window.  As is the case with folders, you can
 	right-click on messages in the message list and get a menu of
-	possible actions.
+	possible actions:
+        <variablelist>
+	 
+         <varlistentry>
+	    <term><guimenuitem>View Message</guimenuitem> </term>  
+	    <listitem><para> 
+               Select this item to view the message in
+               the view pane of the <application>Evolution</application>
+               window. 
+            </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Edit Message</guimenuitem></term>
+            <listitem><para>
+               This item is available only for messages and drafts
+               that you have written. Select it to open the message
+               composer and make changes to the message.
+            </para></listitem> 
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Print Message</guimenuitem> </term>
+             <listitem><para>
+               Select this item to print a message.
+             </para></listitem>
+	  </varlistentry>
+	  
+	  <varlistentry>
+	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
+	    <listitem><para>
+               Use this item to reply only to the author of the message.
+            </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Reply to All</guimenuitem></term>
+	    <listitem><para> 
+               Send a reply to the author of the message
+	       and to all others on the recipient list. See <xref
+	       linkend="usage-mail-getnsend-send-reply"> for more information.
+	    </para></listitem>
+	  </varlistentry>
+	  
+          <varlistentry>
+             <term><guimenuitem>Forward Message</guimenuitem> </term>
+             <listitem><para> 
+               Send the message on to another person.
+               See <xref linkend="usage-mail-getnsent-fwd"> for
+               information about how to use the Forward feature.
+             </para></listitem>
+           </varlistentry>
+          
+	  <varlistentry>
+             <term><guimenuitem>Delete Message</guimenuitem> </term>
+             <listitem><para>
+                Mark the message for deletion. Choose <menuchoice> 
+                <guimenu>Actions</guimenu><guimenuitem>Expunge</guimenuitem>
+                </menuchoice> to delete marked messages permanently.
+             </para></listitem>
+           </varlistentry>
+
+	  <varlistentry>
+             <term><guimenuitem>Move Message</guimenuitem> </term>
+             <listitem><para>
+                Select this item to move the message to another folder. 
+                This will open a dialog to let you choose the destination
+                from a folder tree.
+             </para></listitem>
+           </varlistentry>
+	  </variablelist>
+      </para>
+      
+      <para>
+         You can also select the order in which messages appear in
+         that list.  To sort by sender, subject, or date, click on the
+         bars with those labels at the top of the message list.  If
+         you click twice, you'll sort them in reverse order.
+      </para>
+      <para>
+         Aside from sorting the messages, you can opt to have the
+         messages threaded. Select <menuchoice>
+         <guimenu>View</guimenu> <guimenuitem>Threaded Message
+         List</guimenuitem> </menuchoice> to turn the threaded view on
+         or off.  If the option selected,
+         <application>Evolution</application> will attempt to
+         associate related messages by using the
+         <systemitem>References</systemitem>,
+         <systemitem>In-Reply-To</systemitem>, and
+         <systemitem>Subject</systemitem> message headers.  Messages
+         which are related are then placed next to each other, so that
+         it's easier to follow the thread of a conversation from
+         message to message.
       </para>
       <para>
 	Go ahead and click on the message in the <interface>message
@@ -367,7 +459,7 @@ with quoted materials and the relevant replies interspersed-->
 	  know who is getting a message: it could be a mailing list
 	  with thousands of subscribers.
 	  <example>
-	    <title>Using the Reply-To feature</title>
+	    <title>Using the Reply to All feature</title>
 	    <para>
 	      Susan sends an email to a client, and sends copies to
 	      Tim and to an internal company mailing list of
@@ -694,7 +786,6 @@ possibly never will be due to security evil. -->
 	<application>Evolution</application> will as you for the name
 	and the type of the folder, and will provide you with a folder
 	tree so you can pick where it goes.
-       
       </para>
       <para>
         When you click <guibutton>OK</guibutton>, your new folder will
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index cd45aa196e..17263d01a9 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -1,6 +1,6 @@
-<!--
+
  <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
+
 
 <chapter id="usage-mainwindow">
 
@@ -261,16 +261,15 @@
            </para>
 	</note>
 
-<!-- UNIMPLEMENTED 
     <para>
       Right-clicking will bring up a menu for just about anything
       in GNOME, and <application>Evolution</application> is no
       exception.  If you right-click on a folder, you'll have a
       menu with the following options:
       <itemizedlist>
-	<listitem><para>Something</para></listitem>
-	<listitem><para>Something</para></listitem>
-	<listitem><para>Something</para></listitem>
+	<listitem><para><guimenuitem>View</guimenuitem>, to view a message.</para></listitem>
+	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
+	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
       </itemizedlist>.
     </para>
 
@@ -284,7 +283,6 @@
 	right-click menu is a good way to find out.
       </para>
     </tip>
--->
 
     <para>
       Any time new information arrives in a folder, that folder label
@@ -304,26 +302,99 @@
     <title>The Menu Bar</title>
     <para>
       The <interface>menu bar</interface>'s contents will always
-      provide all the possible actions for any view of your data.
-      That means that, depending on the context, menu bar items will
-      change.  If you're looking at your Inbox, most of the menu items
-      will relate to mail; some will relate to other components of
-      <application>Evolution</application> and some, especially those
-      in the <guimenu>File Menu</guimenu> will relate to the
-      application as a whole. You can probably guess that the
-      <guimenu>Help Menu</guimenu> is where to go for help, and that
-      the <guimenu>View</guimenu> menu controls the way that
-      <application>Evolution</application> looks.  Other menu items
-      are a little less obvious, and change a little more, so we'll
-      cover them later on as we discuss the things you can do with
-      <application>Evolution</application>.
-    </para>
+      provide all the possible actions for any given view of your
+      data.  That means that, depending on the context, menu bar items
+      will change.  If you're looking at your Inbox, most of the menu
+      items will relate to mail; some will relate to other components
+      of <application>Evolution</application> and some, especially
+      those in the <guimenu>File Menu</guimenu> will relate to the
+      application as a whole. This section describes those items that
+      cover the application as a whole; items specific to mailer are
+      discussed in the mail chapter, calendar items in the calendar
+      chapter, and so forth.
+   </para>
+   <para>
+      <variablelist>
+        <varlistentry>
+          <term> <guimenu>File</guimenu> Menu</term>
+
+          <listitem><para> 
+            Anything related to a file falls under this
+            menu:
+              <itemizedlist>
+                <listitem><para>
+                    <guisubmenu>New... &mdash; </guisubmenu> If you
+                    want to create a new folder, calendar,
+                    appointment, address card, or message, this is
+                    where you should look.
+                </para></listitem>
+
+                <listitem><para>
+                   <guimenuitem>Go to Folder &mdash; </guimenuitem> 
+                    Select this item, then choose which folder you'd 
+                    like to view.
+                </para></listitem>
+                <listitem><para>
+                    <guimenuitem>Exit &mdash; </guimenuitem> Quits the application.
+                 </para></listitem>
+
+                <listitem><para>
+                    <guimenuitem>Print... &mdash; </guimenuitem> Opens the printing 
+                     dialog box so you can print items from the view pane of 
+                     <application>Evolution</application>. 
+                 </para></listitem>
+              </itemizedlist>
+            </para></listitem>
+        </varlistentry>
 
-    <para>
+       <varlistentry>
+          <term> <guimenu>Edit</guimenu> Menu </term>
+          <listitem><para>
+              Although it doesn't contain anything at first,
+              the <guimenu>Edit</guimenu> menu fills up with 
+              useful editing tools when you're... editing.
+          </para></listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term> <guimenu>Tools</guimenu> Menu </term>
+          <listitem><para> All of your assistants and configuration
+          tools go here.  For the <interface>Inbox</interface>, that
+          means things like <guimenuitem>Mail
+          Configuration</guimenuitem> and the <guimenuitem>vFolder
+          Editor</guimenuitem>.  For the
+          <interface>Calendar</interface> and the <interface>Contact
+          Manager</interface> </para></listitem>, they'll be different.
+        </varlistentry>
+
+        <varlistentry>
+          <term> <guimenu>Actions</guimenu> Menu </term>
+          <listitem><para>
+            This menu contains a list of actions you can perform on
+            the information you've stored with
+            <application>Evolution</application>.  The contents vary
+            depending on the view, but for the
+            <interface>Inbox</interface>, it contains items like
+            <guimenuitem>Mark All Messages Read</guimenuitem> and
+            <guimenuitem>Expunge</guimenuitem>, to erase all the 
+            messages you've marked for deletion.    
+          </para></listitem>
+        </varlistentry>
+
+       <varlistentry>
+          <term> <guimenu>Help</guimenu> Menu</term>
+          <listitem><para>
+             Select among these items to open the 
+             <application>Help Browser</application> to the appropriate section. 
+          </para></listitem>
+        </varlistentry>
+      </variablelist>
+   </para>
+   <para>
       Once you've familiarized yourself with the <interface>main
-      window</interface> you can start doing things with it.
-      We'll start with your email inbox: you've got a letter
-      waiting for you already.
+      window</interface> you can start doing things with it.  We'lql
+      start with your email inbox: you've got a letter waiting for you
+      already.
     </para>
   </sect1>
 </chapter>
diff --git a/doc/C/usage-sync.sgml b/doc/C/usage-sync.sgml
index f28ebc10cc..07325e1848 100644
--- a/doc/C/usage-sync.sgml
+++ b/doc/C/usage-sync.sgml
@@ -12,8 +12,11 @@
 
       <para>
         If you've already got Gnome-pilot set up to use
-        <application>Evolution</application> all you need to do is put
+        <application>Evolution</application>, put
         your hand-held device on the cradle and press the HotSync
-        button.  No, really.  That's all there is to it.
+        button.
+      </para>
+      <para>
+         No, really.  That's all there is to it.
       </para>
     </chapter>
\ No newline at end of file
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2ea010a3bc..9aedca8af0 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,35 @@
+2000-08-09  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-mainwindow.sgml: Redid menubar description.
+	
+
+	* C/config-prefs.sgml: Added coverage of folder config, requested
+	that feature be transferred to config section. Switched to
+	variablelist in "Other" config section.
+
+	* C/usage-mail.sgml: Added coverage of right-click on messages,
+	threaded-view.
+
+	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.
+
+2000-08-07  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-prefs.sgml: Added news server coverage.  Other config
+	proofing changes.
+	
+
+2000-08-05  Aaron Weber  <aaron@helixcode.com>
+
+	* C/apx-gpl.sgml: New file.  Contains contents of "COPYING",
+	but marked up (probably not very well, but valid) as docbook
+	(SGML).
+
+	* C/evolution-guide.sgml: Subtle change to the legal notice:
+	distinguished manual license from software license. Linked to
+	apx-gpl.sgml above.
+
+	* C/usage-calendar.sgml: I redid all the usage files.
+
 2000-07-21  Aaron Weber  <aaron@helixcode.com>
 
 	* C/usage-mail.sgml: Added password remembering/forgetting feature.
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 7411afb70b..d75adf383a 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -40,11 +40,21 @@
             </para>
           </listitem>
 	</varlistentry>
+
+	<varlistentry>
+	  <term><guilabel>Sources</guilabel></term>
+	  <listitem>
+	    <para>
+               Set your mail-checking protocols and servers here.
+            </para>
+          </listitem>
+	</varlistentry>
+
 	<varlistentry>
-	  <term><guilabel>Transports</guilabel></term>
+	  <term><guilabel>News Servers</guilabel></term>
 	  <listitem>
 	    <para>
-              Here, you can specify how you will send mail.
+              Specify your News Server preferences here.
            </para>
 	  </listitem>
 	</varlistentry>
@@ -94,7 +104,8 @@
 	    <para>
               <guilabel>Full Name:</guilabel> by default, this is the
               same name as the full name described in your user
-              account on your computer.
+              account on your computer.  You can select another if you
+              wish.
             </para>
 	  </listitem>
            <listitem>
@@ -127,7 +138,7 @@
     <sect2 id="config-prefs-mail-network">
       <title>Network Settings</title> 
       <para>
-        In order to do much of anything with
+        In order to send mail with
         <application>Evolution</application>, you need to connect to
         your network.  To do that, you'll need to know your user name
         and password, what sort of mail sending and receiving
@@ -231,16 +242,64 @@
          </para>
 	</sect3>
       </sect2>
-      <sect2 id="config-prefs-mail-other">
+      <sect2 id="config-prefs-network-news">
+
+ <!-- WHY is this in the MAIL config section? WHY is this UI SOOOO bad?-->
+          
+          <title>News Servers</title>
+          <para>
+            When you first select the <guilabel>News
+            Servers</guilabel> tab, you will see a blank box with
+            three familiar buttons on the right:
+            <guibutton>Add</guibutton>, <guibutton>Edit</guibutton>,
+            and <guibutton>Delete</guibutton>.
+          </para>  
+          <para>
+            Click <guibutton>Add</guibutton> to add a news server; you
+            will be prompted for its name.  Enter the name, click
+            <guibutton>OK</guibutton>
+
+
+     <sect2 id="config-prefs-mail-other">
 	<title>Other Mail Preferences</title>
 	<para>
-          Currently, there is only one option that falls into this
-          category: <guilabel>Send messages in HTML format</guilabel>.
-          If you check this box, you will send messages as HTML.  If
-          you leave it unchecked, your messages will be sent without
-          HTML formatting.  See <xref
-          linkend="usage-mail-getnsend-send-html"> for more
-          information about HTML mail.
+          Not everything fits neatly into categories.  This tab
+          contains some miscellaneous configurations that don't have
+          too much to do with each other.
+          <variablelist>
+             <varlistentry>
+                <term> 
+                   <guilabel>Send messages in HTML format</guilabel>
+                </term>
+                <listitem><para>
+                    If you check this box, you will send
+                    messages as HTML by default.  If you leave it unchecked, your
+                    messages will be sent without HTML formatting unless you select 
+                    <menuchoice> <guimenu>Format</guimenu> <guimenuitem>HTML</guimenuitem>
+                    </menuchoice> in the message composer.
+                    See <xref linkend="usage-mail-getnsend-send-html">
+                    for more information about HTML mail.
+                </para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>
+                   <guilabel>Folder Format</guilabel>
+                </term>
+                <listitem> <para> By default,
+                   <application>Evolution</application> saves its mail
+                   in the
+                   <systemitem><filename>mbox</filename></systemitem>
+                   format. You can switch to the
+                   <systemitem><filename>mh</filename></systemitem>
+                   format if you like.  Note that this is an advanced
+                   feature and may cause you to lose some messages, so
+                   you should probably make a backup of your
+                   <systemitem><filename>evolution</filename></systemitem>
+                   directory first. In addition, it will take quite
+                   some time if you have a large mailbox.
+               </para></listitem>
+             </varlistentry>
+           </variablelist>
         </para>
       </sect2>
     </sect1>
@@ -287,8 +346,8 @@
     <sect2 id="config-prefs-cal-time">
       <title>Time Display Settings</title>
       <para>
-        The first tab, <interface>Time display tab</interface>, lets
-        you set the following:
+        The <guilabel>Time display</guilabel> tab lets you set the
+        following:
         <variablelist>
 	  <varlistentry>
 	    <term>Time format</term>
@@ -313,9 +372,10 @@
                  In the day and week views,
                  <application>Evolution</application> displays all the
                  hours in the range you select here, even if there are
-                 no appointments for those times.  Of course, if you
-                 set your days to end before they begin, you may be in
-                 for a little confusion.
+                 no appointments for those times.  Of course, you can
+                 still schedule an appointment outside of these hours,
+                 and if you do, the display will be extended to show
+                 it.
                </para>
 	    </listitem>
 	  </varlistentry>
@@ -461,7 +521,7 @@
     </sect2>
 
     <sect2 id="config-prefs-cal-alarms">
-      <title>Alarms settings</title>
+      <title>Alarms Settings</title>
       <para>  
         The <interface>alarms tab</interface> enables you to select from three boxes:
         <itemizedlist>
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index 2652644ec7..52ca546b9a 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -69,15 +69,16 @@
       <varlistentry>
 	 <term><guilabel>Signature File:</guilabel></term>
           <listitem>
-            <para> 
-             A text file appended to any email you send.  A
-             signature file typically consists of your name and email
-             address, or a quotation you like.  It should be three or
-             fewer lines of text.</para>
+            <para>
+             A text file appended to any email you send.  A signature
+             file typically consists of your name and email address,
+             or a quotation you like.  It should be fewer than four
+             lines of text.
+            </para>
          </listitem>
-	      </varlistentry>
+       </varlistentry>
 
-     <varlistentry>
+       <varlistentry>
            <term> <guilabel>Mail source type:</guilabel></term>
 	  <listitem>
 	    <para>
@@ -106,11 +107,11 @@
 	  <term><guilabel>Username:</guilabel></term>
 	<listitem>
              <para>
-              <guilabel>Username:</guilabel>Usually, this is
-              the part of your email address before the @ character,
-              and <application>Evolution</application> has selected
-              that value as the default.  If you have a different
-              username, you can enter it here.
+              Normally, this is the part of your email address before
+              the @ character, and
+              <application>Evolution</application> has selected that
+              value as the default.  If you have a different username,
+              you can enter it here.
             </para>
 	  </listitem>
       </varlistentry>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index f193fa71af..3396fb2f70 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1,6 +1,6 @@
-<!--
+
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
+
 
 <chapter id="usage-mail"> 
   <title>Evolution Mail</title>
@@ -71,7 +71,99 @@
 	message in the <interface>message list</interface> to have it
 	open in a new window.  As is the case with folders, you can
 	right-click on messages in the message list and get a menu of
-	possible actions.
+	possible actions:
+        <variablelist>
+	 
+         <varlistentry>
+	    <term><guimenuitem>View Message</guimenuitem> </term>  
+	    <listitem><para> 
+               Select this item to view the message in
+               the view pane of the <application>Evolution</application>
+               window. 
+            </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Edit Message</guimenuitem></term>
+            <listitem><para>
+               This item is available only for messages and drafts
+               that you have written. Select it to open the message
+               composer and make changes to the message.
+            </para></listitem> 
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Print Message</guimenuitem> </term>
+             <listitem><para>
+               Select this item to print a message.
+             </para></listitem>
+	  </varlistentry>
+	  
+	  <varlistentry>
+	    <term><guimenuitem>Reply to Sender</guimenuitem></term>
+	    <listitem><para>
+               Use this item to reply only to the author of the message.
+            </para></listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term><guimenuitem>Reply to All</guimenuitem></term>
+	    <listitem><para> 
+               Send a reply to the author of the message
+	       and to all others on the recipient list. See <xref
+	       linkend="usage-mail-getnsend-send-reply"> for more information.
+	    </para></listitem>
+	  </varlistentry>
+	  
+          <varlistentry>
+             <term><guimenuitem>Forward Message</guimenuitem> </term>
+             <listitem><para> 
+               Send the message on to another person.
+               See <xref linkend="usage-mail-getnsent-fwd"> for
+               information about how to use the Forward feature.
+             </para></listitem>
+           </varlistentry>
+          
+	  <varlistentry>
+             <term><guimenuitem>Delete Message</guimenuitem> </term>
+             <listitem><para>
+                Mark the message for deletion. Choose <menuchoice> 
+                <guimenu>Actions</guimenu><guimenuitem>Expunge</guimenuitem>
+                </menuchoice> to delete marked messages permanently.
+             </para></listitem>
+           </varlistentry>
+
+	  <varlistentry>
+             <term><guimenuitem>Move Message</guimenuitem> </term>
+             <listitem><para>
+                Select this item to move the message to another folder. 
+                This will open a dialog to let you choose the destination
+                from a folder tree.
+             </para></listitem>
+           </varlistentry>
+	  </variablelist>
+      </para>
+      
+      <para>
+         You can also select the order in which messages appear in
+         that list.  To sort by sender, subject, or date, click on the
+         bars with those labels at the top of the message list.  If
+         you click twice, you'll sort them in reverse order.
+      </para>
+      <para>
+         Aside from sorting the messages, you can opt to have the
+         messages threaded. Select <menuchoice>
+         <guimenu>View</guimenu> <guimenuitem>Threaded Message
+         List</guimenuitem> </menuchoice> to turn the threaded view on
+         or off.  If the option selected,
+         <application>Evolution</application> will attempt to
+         associate related messages by using the
+         <systemitem>References</systemitem>,
+         <systemitem>In-Reply-To</systemitem>, and
+         <systemitem>Subject</systemitem> message headers.  Messages
+         which are related are then placed next to each other, so that
+         it's easier to follow the thread of a conversation from
+         message to message.
       </para>
       <para>
 	Go ahead and click on the message in the <interface>message
@@ -367,7 +459,7 @@ with quoted materials and the relevant replies interspersed-->
 	  know who is getting a message: it could be a mailing list
 	  with thousands of subscribers.
 	  <example>
-	    <title>Using the Reply-To feature</title>
+	    <title>Using the Reply to All feature</title>
 	    <para>
 	      Susan sends an email to a client, and sends copies to
 	      Tim and to an internal company mailing list of
@@ -694,7 +786,6 @@ possibly never will be due to security evil. -->
 	<application>Evolution</application> will as you for the name
 	and the type of the folder, and will provide you with a folder
 	tree so you can pick where it goes.
-       
       </para>
       <para>
         When you click <guibutton>OK</guibutton>, your new folder will
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index cd45aa196e..17263d01a9 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -1,6 +1,6 @@
-<!--
+
  <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
+
 
 <chapter id="usage-mainwindow">
 
@@ -261,16 +261,15 @@
            </para>
 	</note>
 
-<!-- UNIMPLEMENTED 
     <para>
       Right-clicking will bring up a menu for just about anything
       in GNOME, and <application>Evolution</application> is no
       exception.  If you right-click on a folder, you'll have a
       menu with the following options:
       <itemizedlist>
-	<listitem><para>Something</para></listitem>
-	<listitem><para>Something</para></listitem>
-	<listitem><para>Something</para></listitem>
+	<listitem><para><guimenuitem>View</guimenuitem>, to view a message.</para></listitem>
+	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
+	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
       </itemizedlist>.
     </para>
 
@@ -284,7 +283,6 @@
 	right-click menu is a good way to find out.
       </para>
     </tip>
--->
 
     <para>
       Any time new information arrives in a folder, that folder label
@@ -304,26 +302,99 @@
     <title>The Menu Bar</title>
     <para>
       The <interface>menu bar</interface>'s contents will always
-      provide all the possible actions for any view of your data.
-      That means that, depending on the context, menu bar items will
-      change.  If you're looking at your Inbox, most of the menu items
-      will relate to mail; some will relate to other components of
-      <application>Evolution</application> and some, especially those
-      in the <guimenu>File Menu</guimenu> will relate to the
-      application as a whole. You can probably guess that the
-      <guimenu>Help Menu</guimenu> is where to go for help, and that
-      the <guimenu>View</guimenu> menu controls the way that
-      <application>Evolution</application> looks.  Other menu items
-      are a little less obvious, and change a little more, so we'll
-      cover them later on as we discuss the things you can do with
-      <application>Evolution</application>.
-    </para>
+      provide all the possible actions for any given view of your
+      data.  That means that, depending on the context, menu bar items
+      will change.  If you're looking at your Inbox, most of the menu
+      items will relate to mail; some will relate to other components
+      of <application>Evolution</application> and some, especially
+      those in the <guimenu>File Menu</guimenu> will relate to the
+      application as a whole. This section describes those items that
+      cover the application as a whole; items specific to mailer are
+      discussed in the mail chapter, calendar items in the calendar
+      chapter, and so forth.
+   </para>
+   <para>
+      <variablelist>
+        <varlistentry>
+          <term> <guimenu>File</guimenu> Menu</term>
+
+          <listitem><para> 
+            Anything related to a file falls under this
+            menu:
+              <itemizedlist>
+                <listitem><para>
+                    <guisubmenu>New... &mdash; </guisubmenu> If you
+                    want to create a new folder, calendar,
+                    appointment, address card, or message, this is
+                    where you should look.
+                </para></listitem>
+
+                <listitem><para>
+                   <guimenuitem>Go to Folder &mdash; </guimenuitem> 
+                    Select this item, then choose which folder you'd 
+                    like to view.
+                </para></listitem>
+                <listitem><para>
+                    <guimenuitem>Exit &mdash; </guimenuitem> Quits the application.
+                 </para></listitem>
+
+                <listitem><para>
+                    <guimenuitem>Print... &mdash; </guimenuitem> Opens the printing 
+                     dialog box so you can print items from the view pane of 
+                     <application>Evolution</application>. 
+                 </para></listitem>
+              </itemizedlist>
+            </para></listitem>
+        </varlistentry>
 
-    <para>
+       <varlistentry>
+          <term> <guimenu>Edit</guimenu> Menu </term>
+          <listitem><para>
+              Although it doesn't contain anything at first,
+              the <guimenu>Edit</guimenu> menu fills up with 
+              useful editing tools when you're... editing.
+          </para></listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term> <guimenu>Tools</guimenu> Menu </term>
+          <listitem><para> All of your assistants and configuration
+          tools go here.  For the <interface>Inbox</interface>, that
+          means things like <guimenuitem>Mail
+          Configuration</guimenuitem> and the <guimenuitem>vFolder
+          Editor</guimenuitem>.  For the
+          <interface>Calendar</interface> and the <interface>Contact
+          Manager</interface> </para></listitem>, they'll be different.
+        </varlistentry>
+
+        <varlistentry>
+          <term> <guimenu>Actions</guimenu> Menu </term>
+          <listitem><para>
+            This menu contains a list of actions you can perform on
+            the information you've stored with
+            <application>Evolution</application>.  The contents vary
+            depending on the view, but for the
+            <interface>Inbox</interface>, it contains items like
+            <guimenuitem>Mark All Messages Read</guimenuitem> and
+            <guimenuitem>Expunge</guimenuitem>, to erase all the 
+            messages you've marked for deletion.    
+          </para></listitem>
+        </varlistentry>
+
+       <varlistentry>
+          <term> <guimenu>Help</guimenu> Menu</term>
+          <listitem><para>
+             Select among these items to open the 
+             <application>Help Browser</application> to the appropriate section. 
+          </para></listitem>
+        </varlistentry>
+      </variablelist>
+   </para>
+   <para>
       Once you've familiarized yourself with the <interface>main
-      window</interface> you can start doing things with it.
-      We'll start with your email inbox: you've got a letter
-      waiting for you already.
+      window</interface> you can start doing things with it.  We'lql
+      start with your email inbox: you've got a letter waiting for you
+      already.
     </para>
   </sect1>
 </chapter>
diff --git a/help/C/usage-sync.sgml b/help/C/usage-sync.sgml
index f28ebc10cc..07325e1848 100644
--- a/help/C/usage-sync.sgml
+++ b/help/C/usage-sync.sgml
@@ -12,8 +12,11 @@
 
       <para>
         If you've already got Gnome-pilot set up to use
-        <application>Evolution</application> all you need to do is put
+        <application>Evolution</application>, put
         your hand-held device on the cradle and press the HotSync
-        button.  No, really.  That's all there is to it.
+        button.
+      </para>
+      <para>
+         No, really.  That's all there is to it.
       </para>
     </chapter>
\ No newline at end of file
diff --git a/help/ChangeLog b/help/ChangeLog
index 2ea010a3bc..9aedca8af0 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,35 @@
+2000-08-09  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-mainwindow.sgml: Redid menubar description.
+	
+
+	* C/config-prefs.sgml: Added coverage of folder config, requested
+	that feature be transferred to config section. Switched to
+	variablelist in "Other" config section.
+
+	* C/usage-mail.sgml: Added coverage of right-click on messages,
+	threaded-view.
+
+	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.
+
+2000-08-07  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-prefs.sgml: Added news server coverage.  Other config
+	proofing changes.
+	
+
+2000-08-05  Aaron Weber  <aaron@helixcode.com>
+
+	* C/apx-gpl.sgml: New file.  Contains contents of "COPYING",
+	but marked up (probably not very well, but valid) as docbook
+	(SGML).
+
+	* C/evolution-guide.sgml: Subtle change to the legal notice:
+	distinguished manual license from software license. Linked to
+	apx-gpl.sgml above.
+
+	* C/usage-calendar.sgml: I redid all the usage files.
+
 2000-07-21  Aaron Weber  <aaron@helixcode.com>
 
 	* C/usage-mail.sgml: Added password remembering/forgetting feature.