New file. Contains contents of "COPYING", but marked up (probably not very

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.

svn path=/trunk/; revision=4544

14 files changed, 1314 insertions, 394 deletions

diff --git a/doc/C/apx-gpl.sgml b/doc/C/apx-gpl.sgml
new file mode 100644
index 0000000000..7c7e4cd0f7
--- /dev/null
+++ b/doc/C/apx-gpl.sgml
@@ -0,0 +1,414 @@
+<appendix id="gpl">
+  <title>GNU GENERAL PUBLIC LICENSE</title>
+  <subtitle>Version 2, June 1991</subtitle>
+
+
+<para>
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</para>
+<sect1>
+<title>Preamble</title>
+<para>
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</para>
+<para>
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</para>
+<para>
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</para>
+<para>
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</para>
+<para>
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</para>
+<para>
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</para>
+<para>
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</para>
+<para>
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</para>
+	   
+</sect1>
+
+<sect1>
+<title> GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</title>
+<para>	
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</para>
+<para>	 
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</para>
+<para>	 
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</para>
+<para>	 
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</para>
+<para>	 
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</para>
+<para>	 
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</para>
+<para>	 
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</para>
+<para>	 
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</para>
+<para>	 
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</para>
+<para>	 
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</para>
+<para>	 
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</para>
+<para>	 
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</para>
+<para>	 
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</para>
+<para>	 
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</para>
+<para>	 
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</para>
+<para>	 
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</para>
+<para>	 
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</para>
+<para>	 
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</para>
+<para>	 
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</para>
+<para>	 
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</para>
+<para>	 
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</para>
+<para>	 
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</para>
+<para>	 
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</para>
+<para>	 
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</para>
+<para>	 
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</para>
+<para>	 
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</para>
+<para>	 
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</para>
+<para>	 
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</para>
+</sect1>
+<sect1>
+<title>NO WARRANTY</title>
+<para>
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</para>
+<para>
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</para>
+<para>
+		     END OF TERMS AND CONDITIONS
+</para>
+</sect1>
+  <sect1>
+	 <title>How to Apply These Terms to Your New Programs</title>
+<para>
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</para>
+<para>
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</para>
+<para>
+    &lt;one line to give the program's name and a brief idea of what it does.&gt;
+Copyright (C) &lt; year&gt;  &lt;name of author&gt;
+</para>
+<para>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+</para>
+<para>
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+</para>
+<para>
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+</para>
+<para>
+
+Also add information on how to contact you by electronic and paper mail.
+</para>
+<para>
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</para>
+<para>
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</para>
+<para>
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</para>
+<para>
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</para>
+<para>
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</para>
+<para>
+  &lt;signature of Ty Coon&gt;, 1 April 1989
+  Ty Coon, President of Vice
+</para>
+<para>
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</para>
+</sect1>
+</appendix>
+
+
+
+
+
+
+
+
+
diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index c2839f741b..7411afb70b 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -409,7 +409,7 @@
     </sect2>
 
     <sect2 id="config-prefs-cal-todo">
-      <title>To Do list settings</title>
+      <title>To Do List Settings</title>
      <para>
        You can choose what information the To Do list displays and the
        way it is displayed.  The two areas of the <interface>To Do
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 67b26e4783..59b50120b9 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -13,6 +13,7 @@
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
 <!ENTITY APX-FDL SYSTEM "apx-fdl.sgml">
+<!ENTITY APX-GPL SYSTEM "apx-gpl.sgml">
 
 ]>
 
@@ -35,15 +36,22 @@
       <para>
         Permission is granted to copy, distribute and/or modify this
         document under the terms of the <citetitle>GNU Free
-        Documentation License</citetitle>, Version 1.1 or any later
+        Documentation License</citetitle>, (FDL) Version 1.1 or any later
         version published by the Free Software Foundation with no
         Invariant Sections, no Front-Cover Texts, and no Back-Cover
-        Texts. The license is included with this document in <xref
-        linkend="fdl">, and you may also obtain a copy from the Free
-        Software Foundation by visiting <ulink type="http"
-        url="http://www.fsf.org">their Web site</ulink> or by writing
-        to: Free Software Foundation, Inc., 59 Temple Place - Suite
-        330, Boston, MA 02111-1307, USA.
+        Texts.
+      </para>
+      <para>
+        The software described by this document falls under the
+        <citetitle>GNU General Public License</citetitle>, or GPL.
+      </para>
+      <para>
+        The licenses are included with this document in <xref
+        linkend="fdl">, and <xref linkend="gpl">; you may also obtain
+        a copy from the Free Software Foundation by visiting <ulink
+        type="http" url="http://www.fsf.org">their Web site</ulink> or
+        by writing to: Free Software Foundation, Inc., 59 Temple Place
+        - Suite 330, Boston, MA 02111-1307, USA.
       </para>
       <para>
         Many of the names used by companies to distinguish their
@@ -52,12 +60,13 @@
         are made aware to the members of the GNOME Documentation
         Project, the names have been printed in caps or initial caps.
       </para>
+
     </legalnotice>
 
     <releaseinfo>
-       This is version 0.4 of the Evolution manual.  
-    </releaseinfo> 
-    <!-- this is version of manual, not application -->
+       This is version 0.4 of the Evolution manual, describing version 
+       0.3.1 of Evolution.  
+   </releaseinfo>
 
   </bookinfo>
 
@@ -107,6 +116,7 @@
   &APX-BUGS;
   &APX-AUTHORS; 
   &APX-FDL;
+  &APX-GPL;
 
 </book>
 
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index 5cc7588dcd..9ec3b0f60e 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -7,10 +7,12 @@
   <para>
     To begin using the calendar, select
     <guibutton>Calendar</guibutton> from the <interface>shortcut
-    bar</interface>.  By default, the calendar starts with a display
-    of one day on a yellow ruled background.  There's a month calendar
-    in the upper right and a To-do list in the lower right. The
-    calendar's daily view is shown in <xref
+    bar</interface>.  By default, the calendar starts showing today's
+    schedule on a grey and white ruled background.  At the upper
+    right, there's a monthly calendar you can use to switch days.
+    Below that, there's a <guilabel>TaskPad</guilabel>, where you can
+    keep a sort of glorified to-do list that's not linked to your
+    calendar.  The calendar's daily view is shown in <xref
     linkend="usage-calendar-fig">.
 
    <!-- ============== Figure ============================= -->
@@ -27,11 +29,24 @@
   </para>
     <sect1 id ="usage-calendar-view"> 
     <title>Ways of Looking at your Calendar</title>
+
     <para>
        You can view your calendar by the day, by the week, by the
        month, or by the year; press the calendar-shaped buttons on the
        right side of the toolbar to switch between views.
     </para>
+    <para>
+       To view yesterday's appointments, (last week's, if you're in
+       the weekly view, and last month's for the monthly view), click
+       the <guibutton>Pref</guibutton> button.  For tomorrow, next week,
+       or next month, click <guibutton>Next</guibutton>, and of course,
+       click <guibutton>Today</guibutton> for today.
+    </para>
+    <para>
+       To visit a specific date's calendar entries, click
+       <guibutton>Go To</guibutton> and select the date in the dialog
+       box that appears.
+    </para>
 
 
 <!-- ############### FIXME FIXME FIXME ############
@@ -54,10 +69,8 @@ lack of time, resources, and interest.
        schedule events for yourself or a group of people.  It can
        handle events that repeat, event lengths from ten minutes to
        multiple days, and events that have a date but no specific
-       time.  You can set overlapping events, although
-       <application>Evolution</application> will warn you about trying
-       to do two things at once.  You can also set event reminders so
-       that you don't forget about everything you've just put into
+       time.  Of course, you can also set event reminders and alarms
+       so that you don't forget about everything you've just put into
        your calendar. Basically, it can handle almost any schedule you
        throw at it.
     </para>
@@ -83,13 +96,22 @@ lack of time, resources, and interest.
         <guilabel>All day event</guilabel> begins at ten in the
         morning, runs until eleven at night, and is displayed at the
         top of a day's event list rather than inside it.  That makes
-        it easy to have events that overlap.  For example, a
-        conference might be an all day event, and the meetings at the
-        conference would be timed events.  Events with starting and
-        ending times can also overlap, however, and when they do
-        they're displayed as multiple columns in the day view of the
-        calendar.
+        it easy to have events that overlap and fit inside each other.
+        For example, a conference might be an all day event, and the
+        meetings at the conference would be timed events.  Events with
+        starting and ending times can also overlap, however, and when
+        they do they're displayed as multiple columns in the day view
+        of the calendar.
       </para>
+      <note>
+       <title>Doing Two Things At Once</title>
+         <para>
+           If you create two calendar events that overlap,
+           <application>Evolution</application> will display them as
+           multiple columns in the calendar window.  If you manage to
+           do both things at once, I'd like to meet you.
+         </para>
+      </note>
       <para>
          You can have as many as four different
          <guilabel>Alarms</guilabel>, any time prior to the event
@@ -160,10 +182,8 @@ lack of time, resources, and interest.
 	icon in the toolbar.  That will save the event and close the
 	event editor window. If you want, you can alter an event
 	summary in the calendar view by clicking on it and typing. You
-	can change other settings by clicking once on the event in the
-	<interface>calendar view</interface> to select it, and then
-	choosing <guimenuitem>Event Properties</guimenuitem> from the
-	<guimenu>Settings</guimenu> menu.
+	can change other settings by right-clicking on the event in
+	the and then choosing <guimenuitem>Edit this Appointment</guimenuitem>.
       </para>
     </sect2>
 
@@ -224,12 +244,10 @@ lack of time, resources, and interest.
 
   </sect1>
 
-
-
   <sect1 id="usage-calendar-todo">
-   <title>The To-Do List</title>
+   <title>The Task Pad</title>
     <para>
-       The to-do list, located in the lower right corner of the
+       The Task Pad, located in the lower right corner of the
        calendar, lets you keep a list of tasks separate from your
        calendar events.  Tasks are colored and sorted by priority and
        due-date (see <xref linkend="config-prefs"> for more
@@ -315,12 +333,13 @@ lack of time, resources, and interest.
     <para>
       To create a new calendar, select 
       <menuchoice>
-	<guimenu>File</guimenu>
-	<guisubmenu>New</guisubmenu>
+	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
 	<guimenuitem>Calendar</guimenuitem>
       </menuchoice>.
+
        You can place the calendar in any calendar folder and access it
-       from the folder view.
+       from the folder view.  Alarms, configuration, and display for
+       each calendar are seperate from each other.
     </para>
     
   </sect1>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index c937e957b5..4f9b9fd058 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -1,4 +1,4 @@
-<!--  DEBUGGING COMMENT
+<!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
 
@@ -124,12 +124,12 @@
        than you'd think would fit onto a file card.
     </para>
 
-         <para>
-	  The contact editor 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, which is still evolving rapidly.  <!-- FIXME -->
+      <para>
+	The contact editor 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, which is still evolving rapidly.  <!-- FIXME -->
       </para>
       
       <figure id="usage-contact-editor-fig">
@@ -150,112 +150,109 @@
         Title</guilabel> and <guilabel>Web page address</guilabel>,
         but there are several parts of the window that are a little
         more interesting.
+    </para>
+    <para>
+      The <guilabel>Categories</guilabel> feature is discussed in
+      <xref linkend="usage-contact-organize">, but the remaining
+      features are described here:
+      <variablelist>
+	<varlistentry>
+	  <term>Full Name</term>
+	  <listitem>
+	    <para>
+              The <guilabel>Full Name</guilabel> field has two
+              major features:
+              <itemizedlist>
+		<listitem>
+		  <para>
+                    You can enter a name into the <guibutton>Full
+                    Name</guibutton> field, but you can also click the
+                    <guibutton>Full Name</guibutton> button to bring
+                    up a small dialog box with a few text boxes
+                    <variablelist>
+		      <varlistentry>
+			<term><guilabel>Title: </guilabel></term>
+			<listitem> <para>
+	                  Enter an honorific or select one from the menu.
+	                </para></listitem>
+		      </varlistentry>
+		      <varlistentry>
+			<term><guilabel>First: </guilabel></term>
+			<listitem> <para>
+		             The person's first, or given, name.
+			 </para></listitem> 
+		      </varlistentry>
+		      <varlistentry>
+			<term><guilabel>Middle: </guilabel></term>
+			<listitem> <para>
+			  The middle name or initial, if any, goes here.
+			</para></listitem>
+		      </varlistentry>
+		      <varlistentry>
+			<term><guilabel>Last: </guilabel></term>
+			<listitem> <para>
+			   The last name (surname) belongs here.
+			 </para></listitem>
+		      </varlistentry>
+		      <varlistentry>
+			<term><guilabel>Suffix: </guilabel></term>
+			<listitem> <para>
+			   Suffixes such as "Jr." or "III" can go here. 
+			</para></listitem>
+		      </varlistentry>
+		    </variablelist>
+                   </para>
+		</listitem>
+	        <listitem>
+		  <para>
+                    The <guilabel>Full Name</guilabel> field also
+                    interacts with the <guilabel>File As</guilabel>
+                    box to help you organize your contacts.
+                  </para>
+                  <para>
+                    To see how it works, type a name in the
+                    <guilabel>Full Name</guilabel> field:
+                    <userinput>Eva Lucianne Tester</userinput>.
+                    You'll notice that the <guilabel>File
+                    As</guilabel> field also fills up, but in reverse:
+                    <computeroutput>Tester, Lucianne</computeroutput>.
+                    You can pick <computeroutput>Eva
+                    Tester</computeroutput> from the drop-down, or
+                    type in your own, such as <userinput>Lucianne
+                    Tester, Eva</userinput>.
+                 </para>
+		  <tip>
+		    <title>Filing Suggestion</title>
+		    <para>
+                      Don't enter something entirely different from
+                      the actual name, since you might forget that
+                      you've filed Eva's information under "F" for
+                      "Fictitious Helix Code Employees"
+                    </para>
+		  </tip>
+		</listitem>
+	      </itemizedlist>
+             </para>
+           </listitem>
+	</varlistentry>
+	<varlistentry>
+            <term>Multiple Values for Fields</term>
+            <listitem>
+	      <para>
+                If you click on the small arrow buttons next to the
+                <guilabel>Primary Email</guilabel> field, you can also
+                choose <guilabel>Email 2</guilabel> and
+                <guilabel>Email 3</guilabel>.  Although the contact
+                editor will only display one of those at any given
+                time, <application>Evolution</application> will
+                remember them all.  The arrow buttons next to the
+                telephone and postal address fields work in the same
+                way.
+              </para>
+          </listitem>
+	</varlistentry>
+      </variablelist>
      </para>
-      <para>
-        <guilabel>Categories</guilabel> feature, which is discussed in
-        <xref linkend="usage-contact-organize">, there are a few
-        things you'll want to know about: the first of these is the
-        <guilabel>Full Name</guilabel> button.
-      </para>
-      <para>
-        You can enter a name into the <guibutton>Full Name</guibutton>
-        field, or you can click the button to bring up a small dialog
-        box with a few text boxes:
-        <variablelist>
-          <varlistentry>
-	    <term><guilabel>Title: </guilabel></term>
-            <listitem> <para>
-	    Enter an honorific or select one from the menu.
-	    </para></listitem>
-	  </varlistentry>
-          <varlistentry>
-           <term><guilabel>First: </guilabel></term>
-	    <listitem> <para>The person's first, or given, name.
-    	  </para></listitem>
-          </varlistentry>
-          <varlistentry>
-             <term><guilabel>Middle: </guilabel></term>
-	     <listitem> <para>
-                The middle name or initial, if any, goes here.
-             </para></listitem>
-          </varlistentry>
-          <varlistentry>
-           <term><guilabel>Last: </guilabel></term>
- 	  <listitem> <para>
-	   The last name (the surname, or family name), belongs here.
-	  </para></listitem>
-          </varlistentry>
-          <varlistentry>
-          <term><guilabel>Suffix: </guilabel></term>
-	  <listitem> <para>
-            Suffixes such as "Jr." or "III" can go here. 
-	  </para></listitem>
-          </varlistentry>
-	</variablelist>
-      </para>
-      
-      <para>
-         The <guilabel>Full Name</guilabel> field has one more trick
-         up its sleeve: it interacts with the <guilabel>File
-             As</guilabel> box to help you organize your contacts.  To
-             see how it works, type a name in the <guilabel>Full
-             Name</guilabel> field: <userinput>Eva Lucianne
-             Tester</userinput>.  You'll notice that the
-             <guilabel>File As</guilabel> field also fills up, but in
-             reverse: <computeroutput>Tester,
-             Lucianne</computeroutput>.  You can pick
-         <computeroutput>Eva Tester</computeroutput> from the
-             drop-down, or type in your own, such as
-         <userinput>Lucianne Tester, Eva</userinput>.  I suggest that
-             you don't enter something entirely different from the
-             actual name, since you might forget that you've filed
-             Eva's information under "F" for "Fictitious Helix Code
-             Employees" </para>
-    
-      <para>   
-        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>.  Select from among them to
-        determine which four telephone numbers to display at any given
-        time.  Of course, these connected times mean that people often
-        have more than four telephone numbers.  You can display only
-        four in the editor, but <application>Evolution</application>
-        can remember them all for you.  When you click the little
-        square button for the list of labels, any that you've already
-        filled in will be marked.  </para>
-
-    <!--  FIXME: do this whole thing right before release 0.4! FIXME.
-	  <variablelist>
-	     <listitem>
-	      <term>
-	      <itemizedlist>
-	    <listitem> <para>
-		   <guilabel>Name:</guilabel> Enter the person's name here
-		</para></listitem>
-	    <listitem> <para>
-
-		</para></listitem>
-	    <listitem> <para>
-		  <guilabel>Business:</guilabel>
-		</para></listitem>
-
-	    <listitem> <para>
-		  <guilabel>Job Title:</guilabel>
-		</para></listitem>
-
-	    <listitem> <para>
-		   <guilabel>Home:</guilabel> 
-		</para></listitem>
-	  </itemizedlist>
-	    </para>
-
-    -->
-   
-
 <!--- ############# This section isn't implemented yet either:
     <sect2>
       <title></title>
@@ -362,15 +359,15 @@
 	<para>
            To mark a card as belonging to a category, click the
            <guibutton>Categories</guibutton> button at the lower
-           right.  A dialog box will pop up with check-boxes for
-           different categories in it.  You can select as many or as
-           few categories as you like.
+           right.  From the dialog box that appears, you can check as
+           many or as few categories as you like.
         </para>
 	<para>
            Then, you can refer to all the cards in that category by:
+           FEATURE NOT IMPLEMENTED... FIXME
          </para>
 	<para>
-           If the master list of categories don't suit you, you can
+           If the master list of categories doesn't suit you, you can
            add your own.  Just enter the new category's name in the
            text box, then click <guibutton>Categories</guibutton> and
            choose <guilabel>Add to Master List</guilabel> in the
@@ -430,16 +427,18 @@
   </sect1>
 
   <sect1 id="usage-contact-automate">
-    <title>Extra Contact Manager Tools</title>
+    <title>Contact Manager Tools</title>
     <para>
-       The most obvious contact manager tool is that it works with the
-       mailer and the calendar to help you add new address cards
-       quickly.  However, it can also manage mailing lists and help
-       you find directions between the locations of any two contacts.
+       The contact manager works with
+       <application>Evolution</application> mail and the calendar to
+       help you add new address cards quickly.  However, it can also
+       manage mailing lists.  There are more tools planned, and when
+       they arrive, <!-- FIXME --> they will be described in this
+       section.
     </para>
 
     <sect2 id="contact-automation-basic">
-      <title>Send me a card: Adding New Cards Quickly</title>
+      <title>Send me a Card: Adding New Cards Quickly</title>
       <para>
 	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
@@ -470,8 +469,9 @@
 	 or prepare large postal mailings.
       </para>
     </sect2>
+<!--
     <sect2 id="usage-contact-automation-extra">
-      <title>Map It! and other extra features</title>
+      <title>Map It!</title>
       <para>
 	 Need a map or directions? Click
 	 <guibutton>MapIt</guibutton> from within the contact
@@ -479,6 +479,13 @@
 	 map the address for you online.
       </para>
     </sect2>
+-->
+
+  </sect1>
+  <sect1 id="usage-contact-menubar">
+    <title>Contact Manager Menubar Reference</title>
+     <para>
+     </para>
   </sect1>
 </chapter> 
 
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 60ac9e0303..f193fa71af 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -126,7 +126,7 @@
         your password.  If you'd like
         <application>Evolution</application> to forget your password
         sooner, select
-        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Forget
+        <menuchoice><guimenu>Actions</guimenu><guimenuitem>Forget
         Passwords</guimenuitem></menuchoice>, and it will do so
         immediately.
       </para>
@@ -286,8 +286,8 @@
 	    <example>
 	      <title>Using the Cc: field</title>
 	      <para>
-	         Say, for example, Susan sends an email to a client.
-	         She puts her co-worker, Tim, in the in the
+	         When Susan sends an email to a client, she puts her
+	         co-worker, Tim, in the in the
 	         <guilabel>Cc:</guilabel> field, so that he know
 	         what's going on.  The client can see that Tim also
 	         received the message, and knows that he can talk to
@@ -638,7 +638,7 @@ possibly never will be due to security evil. -->
 	      <para>
 		 Never write anything in email you wouldn't say in
 		 public.  Old messages have a nasty habit of
-		 resurfacing when you least expect them to.
+		 resurfacing when you least expect.
 	      </para>
 	    </listitem>
 
@@ -699,8 +699,9 @@ possibly never will be due to security evil. -->
       <para>
         When you click <guibutton>OK</guibutton>, your new folder will
 	appear in the <interface>folder view</interface>.  You can
-	then put messages in it by dragging and dropping them.  If you
-	create a filter with the <interface>filter
+	then put messages in it by dragging and dropping them, or by
+	using the <guibutton>Move</guibutton> button in the toolbar.
+	If you create a filter with the <interface>filter
 	assistant</interface>, you can have mail moved to your folder
 	automatically.
       </para>
@@ -833,14 +834,17 @@ possibly never will be due to security evil. -->
       <para>
        Then, the filter assistant will ask you which emails it should
        act upon.  You can set criteria based on message size, the
-       sender, primary addressee or Cc: list, or words in the subject
-       or body of the message.  Once you've decided which messages to
-       filter, the assistant will ask you the sort of action you wish
-       to take.  You can file, delete, or forward the message, and you
-       can also have it be exempted from other filters which would
-       otherwise have acted upon it.  
+       sender, primary addressee or Cc: list, words in the subject or
+       body of the message, or any combination of criteria.  Check the
+       boxes next to each criterion you would like to use.
+      </para>
+      <para>
+        Once you've decided which messages to filter, the assistant
+        will ask you the sort of action you wish to take.  You can
+        file, delete, or forward the message, and you can also have it
+        be exempted from other filters which would otherwise have
+        acted upon it.
       </para>
-
 
       <note>
 	<title>Two Notable Filter Features</title>
@@ -862,10 +866,10 @@ possibly never will be due to security evil. -->
     <sect2 id="usage-mail-organize-vFolders">
       <title>Getting Really Organized with Virtual Folders</title>
       <para>
-	If you find that filters aren't flexible enough for you, or
-	end up performing the same search again and again, consider a
-	virtual folder. Virtual folders, or vFolders, are an advanced
-	way of viewing your email messages within
+	If filters aren't flexible enough for you, or you find
+	yourself performing the same search again and again, consider
+	a virtual folder. Virtual folders, or vFolders, are an
+	advanced way of viewing your email messages within
 	<application>Evolution</application>.  If you get a lot of
 	mail or often forget where you put messages, vFolders can help
 	you stay on top of things.
@@ -916,7 +920,7 @@ possibly never will be due to security evil. -->
 	That sounds silly, but imagine a business trying to keep track
 	of mail from hundreds of vendors and clients, or a university
 	with overlapping and changing groups of faculty, staff,
-	administrators and students.  The larger the system, the less
+	administrators and students.  The more mail you need to organize, the less
 	you can afford the sort of confusion that stems from an
 	organizational system that's not flexible enough.  vFolders
 	make for better organization because they can accept
@@ -941,7 +945,7 @@ possibly never will be due to security evil. -->
 	   and when I open the "Project" folder I'm really performing
 	   a search for all the mail about the project.
 
-	<!--  (INSERT SCREENSHOT HERE) -->
+	<!--  (INSERT SCREENSHOT HERE: vFolders in action) -->
 
 	</para>
       </example>
@@ -968,9 +972,10 @@ possibly never will be due to security evil. -->
 	    <term><guilabel>For matching messages:</guilabel></term>
 	    <listitem>
 	      <para>
-	        You may select one or more search criteria; the
-	        vFolder you create will contain messages that match
-	        all of them.
+	        Choose this to create your own set of rules for the
+	        vFolder.  You may select one or more search criteria;
+	        the vFolder you create will contain messages that
+	        match all of them.
 	     </para>
 	    </listitem>
 	  </varlistentry>
@@ -978,8 +983,9 @@ possibly never will be due to security evil. -->
 	    <term><guilabel>Messages from a certain person:</guilabel></term>
 	    <listitem>
 	      <para>
-		 The vFolder will contain messages from an address
-		 you enter.
+		 The remaining three rules are simpler.  Select this
+		 one to create a vFolder that will contain only
+		 messages from an address you enter.
 	     </para>
 	   </listitem>
 	  </varlistentry>
@@ -988,7 +994,8 @@ possibly never will be due to security evil. -->
 	    <listitem>
 	      <para>
 	         Any messages sent directly to this address will be in
-	         the vFolder you create.
+	         the vFolder you create.  This vFolder is an absolute
+	         must for people with multiple email addresses.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -1017,13 +1024,16 @@ possibly never will be due to security evil. -->
       </para>
       <para>
 
-	Once you click <guibutton>Next</guibutton>, you'll
-	customize the vFolder rule.  This process is somewhat
-	complicated, but promises to get much more simple in
-	future versions of <application>Evolution</application>.
-	As it stands now, try clicking different things to have
-	the sentence in the bottom frame make sense.
-
+	Once you click <guibutton>Next</guibutton>, you'll customize
+	the vFolder rule.  The rules for the vFolder you're creating
+	will appear as phrases in the bottom pane of the window.  You
+	can click on the blue underlined text in the phrase to alter
+	it to your liking.  For example, when I create a vFolder to
+	contain all messages from <email>rupert@helixcode.com</email>
+	that have the word "evolution" in the message body, the bottom
+	frame says: <computeroutput>The From address matches
+	rupert@helixcode.com and the body contains
+	"evolution".</computeroutput>.
       </para>
     </sect2>
 
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 051d16b900..cd45aa196e 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -172,9 +172,9 @@
       your own hot keys for functions that don't have any; this is
       covered in <xref linkend="config">.  If you're using the
       keyboard shortcuts you may also want to hide the
-      <interface>shortcut bar</interface> by selecting
-      the <guimenuitem>Show Shortcut Bar</guimenuitem> toggle in the
-      <guimenu>View</guimenu> menu.
+      <interface>shortcut bar</interface> by selecting 
+      <menuchoice> <guimenu>View</guimenu> <guimenuitem>Show Shortcut
+      Bar</guimenuitem> </menuchoice>.
     </para>
 
     <tip>
@@ -191,9 +191,9 @@
   </sect1>
 
   <sect1 id="usage-mainwindow-folderbar">
-    <title>The Folder View</title>
+    <title>The Folder Bar</title>
     <para>
-      The <interface>folder view</interface> is a more comprehensive
+      The <interface>folder bar</interface> is a more comprehensive
       way to view the information you've stored with
       <application>Evolution</application>. It displays all your
       appointments, address cards, and email in a tree that's a lot
@@ -251,7 +251,7 @@
     </para>
 
     <note>
-	  <title>Folders have Limits</title>
+	  <title>Folders Have Limits</title>
 	  <para>
 	      You can always place a folder inside other folders,
 	      regardless of folder type.  However, calendars,
diff --git a/help/C/apx-gpl.sgml b/help/C/apx-gpl.sgml
new file mode 100644
index 0000000000..7c7e4cd0f7
--- /dev/null
+++ b/help/C/apx-gpl.sgml
@@ -0,0 +1,414 @@
+<appendix id="gpl">
+  <title>GNU GENERAL PUBLIC LICENSE</title>
+  <subtitle>Version 2, June 1991</subtitle>
+
+
+<para>
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+</para>
+<sect1>
+<title>Preamble</title>
+<para>
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+</para>
+<para>
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</para>
+<para>
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</para>
+<para>
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</para>
+<para>
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</para>
+<para>
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</para>
+<para>
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</para>
+<para>
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</para>
+	   
+</sect1>
+
+<sect1>
+<title> GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</title>
+<para>	
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</para>
+<para>	 
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</para>
+<para>	 
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</para>
+<para>	 
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</para>
+<para>	 
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</para>
+<para>	 
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+</para>
+<para>	 
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+</para>
+<para>	 
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+</para>
+<para>	 
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</para>
+<para>	 
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</para>
+<para>	 
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</para>
+<para>	 
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</para>
+<para>	 
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+</para>
+<para>	 
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+</para>
+<para>	 
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+</para>
+<para>	 
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</para>
+<para>	 
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</para>
+<para>	 
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</para>
+<para>	 
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</para>
+<para>	 
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</para>
+<para>	 
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</para>
+<para>	 
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</para>
+<para>	 
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</para>
+<para>	 
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</para>
+<para>	 
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</para>
+<para>	 
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</para>
+<para>	 
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</para>
+<para>	 
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</para>
+</sect1>
+<sect1>
+<title>NO WARRANTY</title>
+<para>
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</para>
+<para>
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</para>
+<para>
+		     END OF TERMS AND CONDITIONS
+</para>
+</sect1>
+  <sect1>
+	 <title>How to Apply These Terms to Your New Programs</title>
+<para>
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+</para>
+<para>
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+</para>
+<para>
+    &lt;one line to give the program's name and a brief idea of what it does.&gt;
+Copyright (C) &lt; year&gt;  &lt;name of author&gt;
+</para>
+<para>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+</para>
+<para>
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+</para>
+<para>
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+</para>
+<para>
+
+Also add information on how to contact you by electronic and paper mail.
+</para>
+<para>
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+</para>
+<para>
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+</para>
+<para>
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+</para>
+<para>
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+</para>
+<para>
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+</para>
+<para>
+  &lt;signature of Ty Coon&gt;, 1 April 1989
+  Ty Coon, President of Vice
+</para>
+<para>
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+</para>
+</sect1>
+</appendix>
+
+
+
+
+
+
+
+
+
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index c2839f741b..7411afb70b 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -409,7 +409,7 @@
     </sect2>
 
     <sect2 id="config-prefs-cal-todo">
-      <title>To Do list settings</title>
+      <title>To Do List Settings</title>
      <para>
        You can choose what information the To Do list displays and the
        way it is displayed.  The two areas of the <interface>To Do
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index 67b26e4783..59b50120b9 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -13,6 +13,7 @@
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
 <!ENTITY APX-FDL SYSTEM "apx-fdl.sgml">
+<!ENTITY APX-GPL SYSTEM "apx-gpl.sgml">
 
 ]>
 
@@ -35,15 +36,22 @@
       <para>
         Permission is granted to copy, distribute and/or modify this
         document under the terms of the <citetitle>GNU Free
-        Documentation License</citetitle>, Version 1.1 or any later
+        Documentation License</citetitle>, (FDL) Version 1.1 or any later
         version published by the Free Software Foundation with no
         Invariant Sections, no Front-Cover Texts, and no Back-Cover
-        Texts. The license is included with this document in <xref
-        linkend="fdl">, and you may also obtain a copy from the Free
-        Software Foundation by visiting <ulink type="http"
-        url="http://www.fsf.org">their Web site</ulink> or by writing
-        to: Free Software Foundation, Inc., 59 Temple Place - Suite
-        330, Boston, MA 02111-1307, USA.
+        Texts.
+      </para>
+      <para>
+        The software described by this document falls under the
+        <citetitle>GNU General Public License</citetitle>, or GPL.
+      </para>
+      <para>
+        The licenses are included with this document in <xref
+        linkend="fdl">, and <xref linkend="gpl">; you may also obtain
+        a copy from the Free Software Foundation by visiting <ulink
+        type="http" url="http://www.fsf.org">their Web site</ulink> or
+        by writing to: Free Software Foundation, Inc., 59 Temple Place
+        - Suite 330, Boston, MA 02111-1307, USA.
       </para>
       <para>
         Many of the names used by companies to distinguish their
@@ -52,12 +60,13 @@
         are made aware to the members of the GNOME Documentation
         Project, the names have been printed in caps or initial caps.
       </para>
+
     </legalnotice>
 
     <releaseinfo>
-       This is version 0.4 of the Evolution manual.  
-    </releaseinfo> 
-    <!-- this is version of manual, not application -->
+       This is version 0.4 of the Evolution manual, describing version 
+       0.3.1 of Evolution.  
+   </releaseinfo>
 
   </bookinfo>
 
@@ -107,6 +116,7 @@
   &APX-BUGS;
   &APX-AUTHORS; 
   &APX-FDL;
+  &APX-GPL;
 
 </book>
 
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 5cc7588dcd..9ec3b0f60e 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -7,10 +7,12 @@
   <para>
     To begin using the calendar, select
     <guibutton>Calendar</guibutton> from the <interface>shortcut
-    bar</interface>.  By default, the calendar starts with a display
-    of one day on a yellow ruled background.  There's a month calendar
-    in the upper right and a To-do list in the lower right. The
-    calendar's daily view is shown in <xref
+    bar</interface>.  By default, the calendar starts showing today's
+    schedule on a grey and white ruled background.  At the upper
+    right, there's a monthly calendar you can use to switch days.
+    Below that, there's a <guilabel>TaskPad</guilabel>, where you can
+    keep a sort of glorified to-do list that's not linked to your
+    calendar.  The calendar's daily view is shown in <xref
     linkend="usage-calendar-fig">.
 
    <!-- ============== Figure ============================= -->
@@ -27,11 +29,24 @@
   </para>
     <sect1 id ="usage-calendar-view"> 
     <title>Ways of Looking at your Calendar</title>
+
     <para>
        You can view your calendar by the day, by the week, by the
        month, or by the year; press the calendar-shaped buttons on the
        right side of the toolbar to switch between views.
     </para>
+    <para>
+       To view yesterday's appointments, (last week's, if you're in
+       the weekly view, and last month's for the monthly view), click
+       the <guibutton>Pref</guibutton> button.  For tomorrow, next week,
+       or next month, click <guibutton>Next</guibutton>, and of course,
+       click <guibutton>Today</guibutton> for today.
+    </para>
+    <para>
+       To visit a specific date's calendar entries, click
+       <guibutton>Go To</guibutton> and select the date in the dialog
+       box that appears.
+    </para>
 
 
 <!-- ############### FIXME FIXME FIXME ############
@@ -54,10 +69,8 @@ lack of time, resources, and interest.
        schedule events for yourself or a group of people.  It can
        handle events that repeat, event lengths from ten minutes to
        multiple days, and events that have a date but no specific
-       time.  You can set overlapping events, although
-       <application>Evolution</application> will warn you about trying
-       to do two things at once.  You can also set event reminders so
-       that you don't forget about everything you've just put into
+       time.  Of course, you can also set event reminders and alarms
+       so that you don't forget about everything you've just put into
        your calendar. Basically, it can handle almost any schedule you
        throw at it.
     </para>
@@ -83,13 +96,22 @@ lack of time, resources, and interest.
         <guilabel>All day event</guilabel> begins at ten in the
         morning, runs until eleven at night, and is displayed at the
         top of a day's event list rather than inside it.  That makes
-        it easy to have events that overlap.  For example, a
-        conference might be an all day event, and the meetings at the
-        conference would be timed events.  Events with starting and
-        ending times can also overlap, however, and when they do
-        they're displayed as multiple columns in the day view of the
-        calendar.
+        it easy to have events that overlap and fit inside each other.
+        For example, a conference might be an all day event, and the
+        meetings at the conference would be timed events.  Events with
+        starting and ending times can also overlap, however, and when
+        they do they're displayed as multiple columns in the day view
+        of the calendar.
       </para>
+      <note>
+       <title>Doing Two Things At Once</title>
+         <para>
+           If you create two calendar events that overlap,
+           <application>Evolution</application> will display them as
+           multiple columns in the calendar window.  If you manage to
+           do both things at once, I'd like to meet you.
+         </para>
+      </note>
       <para>
          You can have as many as four different
          <guilabel>Alarms</guilabel>, any time prior to the event
@@ -160,10 +182,8 @@ lack of time, resources, and interest.
 	icon in the toolbar.  That will save the event and close the
 	event editor window. If you want, you can alter an event
 	summary in the calendar view by clicking on it and typing. You
-	can change other settings by clicking once on the event in the
-	<interface>calendar view</interface> to select it, and then
-	choosing <guimenuitem>Event Properties</guimenuitem> from the
-	<guimenu>Settings</guimenu> menu.
+	can change other settings by right-clicking on the event in
+	the and then choosing <guimenuitem>Edit this Appointment</guimenuitem>.
       </para>
     </sect2>
 
@@ -224,12 +244,10 @@ lack of time, resources, and interest.
 
   </sect1>
 
-
-
   <sect1 id="usage-calendar-todo">
-   <title>The To-Do List</title>
+   <title>The Task Pad</title>
     <para>
-       The to-do list, located in the lower right corner of the
+       The Task Pad, located in the lower right corner of the
        calendar, lets you keep a list of tasks separate from your
        calendar events.  Tasks are colored and sorted by priority and
        due-date (see <xref linkend="config-prefs"> for more
@@ -315,12 +333,13 @@ lack of time, resources, and interest.
     <para>
       To create a new calendar, select 
       <menuchoice>
-	<guimenu>File</guimenu>
-	<guisubmenu>New</guisubmenu>
+	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
 	<guimenuitem>Calendar</guimenuitem>
       </menuchoice>.
+
        You can place the calendar in any calendar folder and access it
-       from the folder view.
+       from the folder view.  Alarms, configuration, and display for
+       each calendar are seperate from each other.
     </para>
     
   </sect1>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index c937e957b5..4f9b9fd058 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -1,4 +1,4 @@
-<!--  DEBUGGING COMMENT
+<!--
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
 
@@ -124,12 +124,12 @@
        than you'd think would fit onto a file card.
     </para>
 
-         <para>
-	  The contact editor 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, which is still evolving rapidly.  <!-- FIXME -->
+      <para>
+	The contact editor 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, which is still evolving rapidly.  <!-- FIXME -->
       </para>
       
       <figure id="usage-contact-editor-fig">
@@ -150,112 +150,109 @@
         Title</guilabel> and <guilabel>Web page address</guilabel>,
         but there are several parts of the window that are a little
         more interesting.
+    </para>
+    <para>
+      The <guilabel>Categories</guilabel> feature is discussed in
+      <xref linkend="usage-contact-organize">, but the remaining
+      features are described here:
+      <variablelist>
+	<varlistentry>
+	  <term>Full Name</term>
+	  <listitem>
+	    <para>
+              The <guilabel>Full Name</guilabel> field has two
+              major features:
+              <itemizedlist>
+		<listitem>
+		  <para>
+                    You can enter a name into the <guibutton>Full
+                    Name</guibutton> field, but you can also click the
+                    <guibutton>Full Name</guibutton> button to bring
+                    up a small dialog box with a few text boxes
+                    <variablelist>
+		      <varlistentry>
+			<term><guilabel>Title: </guilabel></term>
+			<listitem> <para>
+	                  Enter an honorific or select one from the menu.
+	                </para></listitem>
+		      </varlistentry>
+		      <varlistentry>
+			<term><guilabel>First: </guilabel></term>
+			<listitem> <para>
+		             The person's first, or given, name.
+			 </para></listitem> 
+		      </varlistentry>
+		      <varlistentry>
+			<term><guilabel>Middle: </guilabel></term>
+			<listitem> <para>
+			  The middle name or initial, if any, goes here.
+			</para></listitem>
+		      </varlistentry>
+		      <varlistentry>
+			<term><guilabel>Last: </guilabel></term>
+			<listitem> <para>
+			   The last name (surname) belongs here.
+			 </para></listitem>
+		      </varlistentry>
+		      <varlistentry>
+			<term><guilabel>Suffix: </guilabel></term>
+			<listitem> <para>
+			   Suffixes such as "Jr." or "III" can go here. 
+			</para></listitem>
+		      </varlistentry>
+		    </variablelist>
+                   </para>
+		</listitem>
+	        <listitem>
+		  <para>
+                    The <guilabel>Full Name</guilabel> field also
+                    interacts with the <guilabel>File As</guilabel>
+                    box to help you organize your contacts.
+                  </para>
+                  <para>
+                    To see how it works, type a name in the
+                    <guilabel>Full Name</guilabel> field:
+                    <userinput>Eva Lucianne Tester</userinput>.
+                    You'll notice that the <guilabel>File
+                    As</guilabel> field also fills up, but in reverse:
+                    <computeroutput>Tester, Lucianne</computeroutput>.
+                    You can pick <computeroutput>Eva
+                    Tester</computeroutput> from the drop-down, or
+                    type in your own, such as <userinput>Lucianne
+                    Tester, Eva</userinput>.
+                 </para>
+		  <tip>
+		    <title>Filing Suggestion</title>
+		    <para>
+                      Don't enter something entirely different from
+                      the actual name, since you might forget that
+                      you've filed Eva's information under "F" for
+                      "Fictitious Helix Code Employees"
+                    </para>
+		  </tip>
+		</listitem>
+	      </itemizedlist>
+             </para>
+           </listitem>
+	</varlistentry>
+	<varlistentry>
+            <term>Multiple Values for Fields</term>
+            <listitem>
+	      <para>
+                If you click on the small arrow buttons next to the
+                <guilabel>Primary Email</guilabel> field, you can also
+                choose <guilabel>Email 2</guilabel> and
+                <guilabel>Email 3</guilabel>.  Although the contact
+                editor will only display one of those at any given
+                time, <application>Evolution</application> will
+                remember them all.  The arrow buttons next to the
+                telephone and postal address fields work in the same
+                way.
+              </para>
+          </listitem>
+	</varlistentry>
+      </variablelist>
      </para>
-      <para>
-        <guilabel>Categories</guilabel> feature, which is discussed in
-        <xref linkend="usage-contact-organize">, there are a few
-        things you'll want to know about: the first of these is the
-        <guilabel>Full Name</guilabel> button.
-      </para>
-      <para>
-        You can enter a name into the <guibutton>Full Name</guibutton>
-        field, or you can click the button to bring up a small dialog
-        box with a few text boxes:
-        <variablelist>
-          <varlistentry>
-	    <term><guilabel>Title: </guilabel></term>
-            <listitem> <para>
-	    Enter an honorific or select one from the menu.
-	    </para></listitem>
-	  </varlistentry>
-          <varlistentry>
-           <term><guilabel>First: </guilabel></term>
-	    <listitem> <para>The person's first, or given, name.
-    	  </para></listitem>
-          </varlistentry>
-          <varlistentry>
-             <term><guilabel>Middle: </guilabel></term>
-	     <listitem> <para>
-                The middle name or initial, if any, goes here.
-             </para></listitem>
-          </varlistentry>
-          <varlistentry>
-           <term><guilabel>Last: </guilabel></term>
- 	  <listitem> <para>
-	   The last name (the surname, or family name), belongs here.
-	  </para></listitem>
-          </varlistentry>
-          <varlistentry>
-          <term><guilabel>Suffix: </guilabel></term>
-	  <listitem> <para>
-            Suffixes such as "Jr." or "III" can go here. 
-	  </para></listitem>
-          </varlistentry>
-	</variablelist>
-      </para>
-      
-      <para>
-         The <guilabel>Full Name</guilabel> field has one more trick
-         up its sleeve: it interacts with the <guilabel>File
-             As</guilabel> box to help you organize your contacts.  To
-             see how it works, type a name in the <guilabel>Full
-             Name</guilabel> field: <userinput>Eva Lucianne
-             Tester</userinput>.  You'll notice that the
-             <guilabel>File As</guilabel> field also fills up, but in
-             reverse: <computeroutput>Tester,
-             Lucianne</computeroutput>.  You can pick
-         <computeroutput>Eva Tester</computeroutput> from the
-             drop-down, or type in your own, such as
-         <userinput>Lucianne Tester, Eva</userinput>.  I suggest that
-             you don't enter something entirely different from the
-             actual name, since you might forget that you've filed
-             Eva's information under "F" for "Fictitious Helix Code
-             Employees" </para>
-    
-      <para>   
-        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>.  Select from among them to
-        determine which four telephone numbers to display at any given
-        time.  Of course, these connected times mean that people often
-        have more than four telephone numbers.  You can display only
-        four in the editor, but <application>Evolution</application>
-        can remember them all for you.  When you click the little
-        square button for the list of labels, any that you've already
-        filled in will be marked.  </para>
-
-    <!--  FIXME: do this whole thing right before release 0.4! FIXME.
-	  <variablelist>
-	     <listitem>
-	      <term>
-	      <itemizedlist>
-	    <listitem> <para>
-		   <guilabel>Name:</guilabel> Enter the person's name here
-		</para></listitem>
-	    <listitem> <para>
-
-		</para></listitem>
-	    <listitem> <para>
-		  <guilabel>Business:</guilabel>
-		</para></listitem>
-
-	    <listitem> <para>
-		  <guilabel>Job Title:</guilabel>
-		</para></listitem>
-
-	    <listitem> <para>
-		   <guilabel>Home:</guilabel> 
-		</para></listitem>
-	  </itemizedlist>
-	    </para>
-
-    -->
-   
-
 <!--- ############# This section isn't implemented yet either:
     <sect2>
       <title></title>
@@ -362,15 +359,15 @@
 	<para>
            To mark a card as belonging to a category, click the
            <guibutton>Categories</guibutton> button at the lower
-           right.  A dialog box will pop up with check-boxes for
-           different categories in it.  You can select as many or as
-           few categories as you like.
+           right.  From the dialog box that appears, you can check as
+           many or as few categories as you like.
         </para>
 	<para>
            Then, you can refer to all the cards in that category by:
+           FEATURE NOT IMPLEMENTED... FIXME
          </para>
 	<para>
-           If the master list of categories don't suit you, you can
+           If the master list of categories doesn't suit you, you can
            add your own.  Just enter the new category's name in the
            text box, then click <guibutton>Categories</guibutton> and
            choose <guilabel>Add to Master List</guilabel> in the
@@ -430,16 +427,18 @@
   </sect1>
 
   <sect1 id="usage-contact-automate">
-    <title>Extra Contact Manager Tools</title>
+    <title>Contact Manager Tools</title>
     <para>
-       The most obvious contact manager tool is that it works with the
-       mailer and the calendar to help you add new address cards
-       quickly.  However, it can also manage mailing lists and help
-       you find directions between the locations of any two contacts.
+       The contact manager works with
+       <application>Evolution</application> mail and the calendar to
+       help you add new address cards quickly.  However, it can also
+       manage mailing lists.  There are more tools planned, and when
+       they arrive, <!-- FIXME --> they will be described in this
+       section.
     </para>
 
     <sect2 id="contact-automation-basic">
-      <title>Send me a card: Adding New Cards Quickly</title>
+      <title>Send me a Card: Adding New Cards Quickly</title>
       <para>
 	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
@@ -470,8 +469,9 @@
 	 or prepare large postal mailings.
       </para>
     </sect2>
+<!--
     <sect2 id="usage-contact-automation-extra">
-      <title>Map It! and other extra features</title>
+      <title>Map It!</title>
       <para>
 	 Need a map or directions? Click
 	 <guibutton>MapIt</guibutton> from within the contact
@@ -479,6 +479,13 @@
 	 map the address for you online.
       </para>
     </sect2>
+-->
+
+  </sect1>
+  <sect1 id="usage-contact-menubar">
+    <title>Contact Manager Menubar Reference</title>
+     <para>
+     </para>
   </sect1>
 </chapter> 
 
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 60ac9e0303..f193fa71af 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -126,7 +126,7 @@
         your password.  If you'd like
         <application>Evolution</application> to forget your password
         sooner, select
-        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Forget
+        <menuchoice><guimenu>Actions</guimenu><guimenuitem>Forget
         Passwords</guimenuitem></menuchoice>, and it will do so
         immediately.
       </para>
@@ -286,8 +286,8 @@
 	    <example>
 	      <title>Using the Cc: field</title>
 	      <para>
-	         Say, for example, Susan sends an email to a client.
-	         She puts her co-worker, Tim, in the in the
+	         When Susan sends an email to a client, she puts her
+	         co-worker, Tim, in the in the
 	         <guilabel>Cc:</guilabel> field, so that he know
 	         what's going on.  The client can see that Tim also
 	         received the message, and knows that he can talk to
@@ -638,7 +638,7 @@ possibly never will be due to security evil. -->
 	      <para>
 		 Never write anything in email you wouldn't say in
 		 public.  Old messages have a nasty habit of
-		 resurfacing when you least expect them to.
+		 resurfacing when you least expect.
 	      </para>
 	    </listitem>
 
@@ -699,8 +699,9 @@ possibly never will be due to security evil. -->
       <para>
         When you click <guibutton>OK</guibutton>, your new folder will
 	appear in the <interface>folder view</interface>.  You can
-	then put messages in it by dragging and dropping them.  If you
-	create a filter with the <interface>filter
+	then put messages in it by dragging and dropping them, or by
+	using the <guibutton>Move</guibutton> button in the toolbar.
+	If you create a filter with the <interface>filter
 	assistant</interface>, you can have mail moved to your folder
 	automatically.
       </para>
@@ -833,14 +834,17 @@ possibly never will be due to security evil. -->
       <para>
        Then, the filter assistant will ask you which emails it should
        act upon.  You can set criteria based on message size, the
-       sender, primary addressee or Cc: list, or words in the subject
-       or body of the message.  Once you've decided which messages to
-       filter, the assistant will ask you the sort of action you wish
-       to take.  You can file, delete, or forward the message, and you
-       can also have it be exempted from other filters which would
-       otherwise have acted upon it.  
+       sender, primary addressee or Cc: list, words in the subject or
+       body of the message, or any combination of criteria.  Check the
+       boxes next to each criterion you would like to use.
+      </para>
+      <para>
+        Once you've decided which messages to filter, the assistant
+        will ask you the sort of action you wish to take.  You can
+        file, delete, or forward the message, and you can also have it
+        be exempted from other filters which would otherwise have
+        acted upon it.
       </para>
-
 
       <note>
 	<title>Two Notable Filter Features</title>
@@ -862,10 +866,10 @@ possibly never will be due to security evil. -->
     <sect2 id="usage-mail-organize-vFolders">
       <title>Getting Really Organized with Virtual Folders</title>
       <para>
-	If you find that filters aren't flexible enough for you, or
-	end up performing the same search again and again, consider a
-	virtual folder. Virtual folders, or vFolders, are an advanced
-	way of viewing your email messages within
+	If filters aren't flexible enough for you, or you find
+	yourself performing the same search again and again, consider
+	a virtual folder. Virtual folders, or vFolders, are an
+	advanced way of viewing your email messages within
 	<application>Evolution</application>.  If you get a lot of
 	mail or often forget where you put messages, vFolders can help
 	you stay on top of things.
@@ -916,7 +920,7 @@ possibly never will be due to security evil. -->
 	That sounds silly, but imagine a business trying to keep track
 	of mail from hundreds of vendors and clients, or a university
 	with overlapping and changing groups of faculty, staff,
-	administrators and students.  The larger the system, the less
+	administrators and students.  The more mail you need to organize, the less
 	you can afford the sort of confusion that stems from an
 	organizational system that's not flexible enough.  vFolders
 	make for better organization because they can accept
@@ -941,7 +945,7 @@ possibly never will be due to security evil. -->
 	   and when I open the "Project" folder I'm really performing
 	   a search for all the mail about the project.
 
-	<!--  (INSERT SCREENSHOT HERE) -->
+	<!--  (INSERT SCREENSHOT HERE: vFolders in action) -->
 
 	</para>
       </example>
@@ -968,9 +972,10 @@ possibly never will be due to security evil. -->
 	    <term><guilabel>For matching messages:</guilabel></term>
 	    <listitem>
 	      <para>
-	        You may select one or more search criteria; the
-	        vFolder you create will contain messages that match
-	        all of them.
+	        Choose this to create your own set of rules for the
+	        vFolder.  You may select one or more search criteria;
+	        the vFolder you create will contain messages that
+	        match all of them.
 	     </para>
 	    </listitem>
 	  </varlistentry>
@@ -978,8 +983,9 @@ possibly never will be due to security evil. -->
 	    <term><guilabel>Messages from a certain person:</guilabel></term>
 	    <listitem>
 	      <para>
-		 The vFolder will contain messages from an address
-		 you enter.
+		 The remaining three rules are simpler.  Select this
+		 one to create a vFolder that will contain only
+		 messages from an address you enter.
 	     </para>
 	   </listitem>
 	  </varlistentry>
@@ -988,7 +994,8 @@ possibly never will be due to security evil. -->
 	    <listitem>
 	      <para>
 	         Any messages sent directly to this address will be in
-	         the vFolder you create.
+	         the vFolder you create.  This vFolder is an absolute
+	         must for people with multiple email addresses.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -1017,13 +1024,16 @@ possibly never will be due to security evil. -->
       </para>
       <para>
 
-	Once you click <guibutton>Next</guibutton>, you'll
-	customize the vFolder rule.  This process is somewhat
-	complicated, but promises to get much more simple in
-	future versions of <application>Evolution</application>.
-	As it stands now, try clicking different things to have
-	the sentence in the bottom frame make sense.
-
+	Once you click <guibutton>Next</guibutton>, you'll customize
+	the vFolder rule.  The rules for the vFolder you're creating
+	will appear as phrases in the bottom pane of the window.  You
+	can click on the blue underlined text in the phrase to alter
+	it to your liking.  For example, when I create a vFolder to
+	contain all messages from <email>rupert@helixcode.com</email>
+	that have the word "evolution" in the message body, the bottom
+	frame says: <computeroutput>The From address matches
+	rupert@helixcode.com and the body contains
+	"evolution".</computeroutput>.
       </para>
     </sect2>
 
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 051d16b900..cd45aa196e 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -172,9 +172,9 @@
       your own hot keys for functions that don't have any; this is
       covered in <xref linkend="config">.  If you're using the
       keyboard shortcuts you may also want to hide the
-      <interface>shortcut bar</interface> by selecting
-      the <guimenuitem>Show Shortcut Bar</guimenuitem> toggle in the
-      <guimenu>View</guimenu> menu.
+      <interface>shortcut bar</interface> by selecting 
+      <menuchoice> <guimenu>View</guimenu> <guimenuitem>Show Shortcut
+      Bar</guimenuitem> </menuchoice>.
     </para>
 
     <tip>
@@ -191,9 +191,9 @@
   </sect1>
 
   <sect1 id="usage-mainwindow-folderbar">
-    <title>The Folder View</title>
+    <title>The Folder Bar</title>
     <para>
-      The <interface>folder view</interface> is a more comprehensive
+      The <interface>folder bar</interface> is a more comprehensive
       way to view the information you've stored with
       <application>Evolution</application>. It displays all your
       appointments, address cards, and email in a tree that's a lot
@@ -251,7 +251,7 @@
     </para>
 
     <note>
-	  <title>Folders have Limits</title>
+	  <title>Folders Have Limits</title>
 	  <para>
 	      You can always place a folder inside other folders,
 	      regardless of folder type.  However, calendars,