Category stuff improved.

	* C/usage-contact.sgml: Category stuff improved.


	* C/usage-calendar.sgml: Now covers how to add an event properly.

svn path=/trunk/; revision=3571

4 files changed, 480 insertions, 314 deletions

diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index cf655d42fc..dbfbe7d8df 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -1,142 +1,218 @@
+<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+
+<chapter id="usage-calendar">
+  <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
+  <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
+    linkend="usage-calendar-fig">.
+
+   <!-- ============== Figure ============================= -->
+    <figure id="usage-calendar-fig">
+      <title>Evolution Calendar View</title>
+      <screenshot>
+	<screeninfo>Evolution Contact Manager Window</screeninfo>
+	<graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
+	</graphic>
+      </screenshot>
+    </figure>
+  <!-- ============== End of Figure ============================= --> 
+
+  </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.  To do so, use the calendar-shaped
+       buttons on the right side of the toolbar.
+    </para>
+    <para>
+       Describe the less-obvious differences among the views of time
+       here.
+    </para>
+
+    <para>
+       In addition, <application>Evolution</application> supports
+       Hebrew, Muslim, and other calendar formats.  To switch to a
+       different calendar format, choose
+       <guimenuitem>GUIMENUITEM</guimenuitem> from the
+       <guimenu>GUIMENU</guimenu>.
+    </para>
+    <para>
+       Describe the ways that different calendars can work here, and
+       how the different calendars work together.
+    </para>
+  </sect1>
+  <sect1 id="usage-calendar-apts">
+    <title>Scheduling With the Evolution Calendar</title>
+    <para>
+       The <application>Evolution</application> calendar allows you to
+       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
+       your calendar. Basically, it can handle almost any schedule you
+       throw at it.
+    </para>
+    <sect2 id="usage-calendar-apts-basic">
+      <title>Creating events</title>
+      <para>
+	To create a new calendar event, select
+	<guisubmenu>New</guisubmenu> and then <guimenuitem>
+	Appointment</guimenuitem> from the <guimenu>MENU</guimenu>, or
+	click the <guibutton>New</guibutton> button on the left end of
+	the toolbar. The <interface>New Appointment</interface> dialog
+	will pop up with the usual menu bar, tool bar, and window full
+	of choices for you. I'm going to skip the the more
+	self-explanatory items, like the <guilabel>Summary</guilabel>
+	and <guilabel>Owner</guilabel> of the event (which is probably
+	you), and cut right to the more intersting ones.
+      </para>
+      <para>
+        Your event must have a starting and ending date &mdash; by
+        default, it's today &mdash; but you can choose whether to give
+        it starting and ending times or to mark it as an <guilabel>All
+        day event</guilabel>.  For the purposes of the calendar, an
+        <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.  This allows
+        you to include events of shorter duration within it.  A
+        conference might be an all day event, and the various lectures
+        might be timed events that happen during the all day event.
+      </para>
+      <para>
+         You can have as many as four different
+         <guilabel>Alarms</guilabel>, any time prior to the event
+         you've scheduled.  You can have one alarm of each type:
+         <itemizedlist>
+          <listitem>
+	    <para>
+	  <guilabel>Display</guilabel> means a window will pop up on
+	  your screen to remind you of your event.
+            </para>
+	  </listitem>
+          <listitem>
+	    <para>
+	       Click <guilabel>Audio</guilabel> to have your deliver a
+	       sound alarm.
+            </para>
+	  </listitem>
+          <listitem>
+	    <para>
+	      Select <guilabel>Program</guilabel> if you would like
+	      some additional application to run as a reminder.  You
+	      can enter its name in the text field, or find it with
+	      the <guibutton>Browse</guibutton> button.
+            </para>
+	  </listitem>
+
+          <listitem>
+	    <para>
+	       If you select <guilabel>Mail</guilabel>, then
+	       <application>Evolution</application> will send an email
+	       reminder to the address you enter into the text field.
+            </para>
+	  </listitem>
+	</itemizedlist>
+
+      </para>
+      <para>
+         <guilabel>Classification</guilabel> is a little more
+         complicated, and only applies to calendars on a
+         network. <guilabel>Public</guilabel> is the default category,
+         and a public even tcan be viewd by anyone on the calendar
+         sharing network.  <guilabel>Private</guilabel> means
+         (SOMETHING), and <guilabel>Confidential</guilabel> means that
+         (SOMETHING ELSE).
+      </para>
+      <para>
+        The <guilabel>Recurrence</guilabel> tab lets you describe
+        repitition in events ranging from once every day up to once
+        every 100 years.  You can then choose a time when repitition
+        will stop, and, under <guilabel>Exceptions</guilabel>, pick
+        individual days when the event will <emphasis>not</emphasis>
+        recur.
+      </para>
 
-    <chapter id="usage-calendar">
-      <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
       <para>
-        To begin using the calendar, select
-        <guibutton>Calendar</guibutton> from the <interface>shortcut
-        bar</interface>.  By default, the calendar starts in daily view mode 
-        The calendar's daily view is shown in 
-        <xref linkend="usage-calendar-fig">:
+	Once you're done with all those settings, click on the disk
+	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.
+      </para>
+    </sect2>
 
-       <!-- ============== Figure ============================= -->
-	<figure id="usage-calendar-fig">
-	  <title>Evolution Calendar View</title>
-	  <screenshot>
-	    <screeninfo>Evolution Contact Manager Window</screeninfo>
-	    <graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	  </screenshot>
-	</figure>
-      <!-- ============== End of Figure ============================= --> 
+    <sect2 id="usage-calendar-apts-group">
+      <title>Appointments for Groups</title>
+      <para>
+	If you have your calendar set up to work with other
+	calendars over a network, you can see when others are
+	available to meet with you.  To browse other people's
+	calendars over your local network, do this: 
+      </para>
+      <para>
+	In addition, you can use
+	<application>Evolution</application> to mark a meeting
+	request on another person's calendar.  To do so, first
+	select <guimenuitem>New Appointment</guimenuitem> from the
+	<guimenu>MENU</guimenu>, or press <keysym>KEYSYM</keysym>
+	to bring up the <interface>new event</interface> window.
+	Then describe the event as you would any other.  Before
+	you click <guibutton>OK</guibutton>, (INSERT DESCRIPTION
+	HERE...).  <application>Evolution</application> will
+	automatically send email to each person on the request
+	list, notifying of the time and date of the meeting you
+	have requested with them.  In addition, it will mark the
+	event on your calendar and on theirs as tentative, rather than 
+	a confirmed, event.
+      </para>
+      <para>
+	To mark a tentative event as confirmed, click once on the
+	event in the <interface>calendar view</interface> to
+	select it, and then choose <guimenuitem>Event
+	Properties</guimenuitem> from the
+	<guimenu>Settings</guimenu> menu.  In the <interface>Event
+	Properties</interface> dialog window, click the
+	"tentative" button to un-mark the event. (NOTE THAT this
+	feature may not at all exist!)
+      </para>
+    </sect2>
 
+    <sect2 id="usage-calendar-apts-privs">
+      <title>Scheduling privileges</title>
+      <para>
+	There are several levels of scheduling privileges.  You
+	can set whether people can see your calendar, whether they
+	can request meetings or appointments, and whether they can
+	create appointments.  This section may have to be deleted,
+	because I don't know if we are going to support privileges
+	at all.
       </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.  To do so, click the buttons at the top
-           of <application>Evolution</application> with the numbers 1, 5,
-           7, 31 respectivly.
-        </para>
-	<para>
-           Describe the less-obvious differences among the views of
-           time here.
-        </para>
+    </sect2>
+  </sect1>
 
-	<para>
-           In addition, <application>Evolution</application> supports
-           Hebrew, Muslim, and other calendar formats.  To switch to a
-           different calendar format, choose
-           <guimenuitem>GUIMENUITEM</guimenuitem> from the
-           <guimenu>GUIMENU</guimenu>.
-        </para>
-	<para>
-           Describe the ways that different calendars can work here,
-           and how the different calendars work together.
-        </para>
-      </sect1>
-      <sect1 id="usage-calendar-apts">
-	<title>Scheduling With the Evolution Calendar</title>
-	<para>
-	   The <application>Evolution</application> calendar allows
-           you to 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 your calendar. Basically, it can handle almost
-           any schedule you throw at it.
-        </para>
-	<sect2 id="usage-calendar-apts-basic">
-	  <title>Creating events</title>
-	  <para>
-            While looking at the calendar, select <guimenuitem>New
-            Appointment</guimenuitem> from the
-            <guimenu>MENU</guimenu>, or press
-            <keysym>KEYSYM</keysym>. The <interface>New
-            Appointment</interface> dialog will appear. (INSERT
-            DESCRIPTION OF INTERFACE HERE: Date, Time, Recurrence,
-            Reminders, and Tentative/Confirmed)
-          </para>
-	  <para>
-            You can alter those settings later 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.
-          </para>
-	</sect2>
+  <sect1 id="usage-calendar-organize">
+    <title>Organizing your Appointments</title>
+    <para>
+       Until I have <application>Evolution</application> running properly,
+       I have no idea how this sort of organization will actually work.
+    </para>
+    <para>
+       But this section will have at least two paragraphs, and
+       probably a screenshot.
+    </para>
+  </sect1>
+</chapter>
 
-	<sect2 id="usage-calendar-apts-group">
-	  <title>Appointments for Groups</title>
-	  <para>
-            If you have your calendar set up to work with other
-            calendars over a network, you can see when others are
-            available to meet with you.  To browse other people's
-            calendars over your local network, do this: 
-          </para>
-	  <para>
-            In addition, you can use
-            <application>Evolution</application> to mark a meeting
-            request on another person's calendar.  To do so, first
-            select <guimenuitem>New Appointment</guimenuitem> from the
-            <guimenu>MENU</guimenu>, or press <keysym>KEYSYM</keysym>
-            to bring up the <interface>new event</interface> window.
-            Then describe the event as you would any other.  Before
-            you click <guibutton>OK</guibutton>, (INSERT DESCRIPTION
-            HERE...).  <application>Evolution</application> will
-            automatically send email to each person on the request
-            list, notifying of the time and date of the meeting you
-            have requested with them.  In addition, it will mark the
-            event on your calendar and on theirs as tentative, rather than 
-            a confirmed, event.
-          </para>
-	  <para>
-            To mark a tentative event as confirmed, click once on the
-            event in the <interface>calendar view</interface> to
-            select it, and then choose <guimenuitem>Event
-            Properties</guimenuitem> from the
-            <guimenu>Settings</guimenu> menu.  In the <interface>Event
-            Properties</interface> dialog window, click the
-            "tentative" button to un-mark the event. (NOTE THAT this
-            feature may not at all exist!)
-          </para>
-	</sect2>
-	
-	<sect2 id="usage-calendar-apts-privs">
-	 <title>Scheduling privileges</title>
-	  <para>
-            There are several levels of scheduling privileges.  You
-            can set whether people can see your calendar, whether they
-            can request meetings or appointments, and whether they can
-            create appointments.  This section may have to be deleted,
-            because I don't know if we are going to support privileges
-            at all.
-          </para>
-	</sect2>
-      </sect1>
 
-      <sect1 id="usage-calendar-organize">
-	<title>Organizing your Appointments</title>
-	<para>
-           Until I have <application>Evolution</application> running properly,
-           I have no idea how this sort of organization will actually work.
-        </para>
-	<para>
-           But this section will have at least two paragraphs, and
-           probably a screenshot.
-        </para>
-      </sect1>
-    </chapter>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index fdd988d55d..2291e28548 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -1,4 +1,4 @@
-
+<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 
 <chapter id="usage-contact">
   <title>The Evolution Contact Manager</title>
@@ -67,15 +67,15 @@
   <sect1 id="usage-contact-cards">
     <title>Creating, Deleting, and Adding Cards</title>
     <para>
-       You can create a new card by pressing the <guibutton>New
-       Card</guibutton> button, or by pressing
-       <keysym>KEYSYM</keysym>. The <interface>Contact
-       Editor</interface> window will appear.  It has two tabs,
-       <guilabel>General</guilabel>, for basic contact information,
-       and <guilabel>Details</guilabel>, for a more specific
-       description of the person.  In addition, it contains a full
-       menu bar with all the items from the main window (IS THIS TRUE?
-       DESCRIBE MENUBAR AGAIN?)
+      You can create a new card by pressing the <guibutton>New
+      Card</guibutton> button, or by pressing
+      <keysym>KEYSYM</keysym>. The <interface>Contact
+      Editor</interface> window will appear.  It has two tabs,
+      <guilabel>General</guilabel>, for basic contact information, and
+      <guilabel>Details</guilabel>, for a more specific description of
+      the person.  In addition, it contains a full menu bar with all
+      the items from the main window (IS THIS TRUE?  DESCRIBE MENUBAR
+      AGAIN?)
     </para>
     <para>
       The <guilabel>General</guilabel> tab contains no less than seven
@@ -123,8 +123,7 @@
       </screenshot>
     </figure>
 
-
-!--
+<!--
       <variablelist>
          <listitem>
 	  <term>
@@ -150,6 +149,7 @@
         </para>
     
 -->
+
     <para>
        You can choose which fields an address card has, and create new
        fields for cards.  For example,
@@ -211,11 +211,10 @@
       <title>Groups of contacts</title>
       <para>
          <application>Evolution</application> lets you put cards into
-         folders, mark them as members of different groups, and search
-         through them in a variety of ways.  This section will
-         describe how to organize and find contact information using
-         <application>Evolution</application>.  CHANGE THIS paragraph:
-         it needs a great deal of work.
+         folders and mark them as members of different categories.
+         Although the contact manager does not support vFolders,
+         categories should provide as much flexibility as you need in
+         grouping your address cards.
       </para>
 
       <sect3 id="usage-contact-organize-group-folder">
@@ -226,13 +225,17 @@
 	   <guilabel>Contacts</guilabel> folder.  You can create more
 	   folders inside that one, or create other address book
 	   folders as well.  Each card must be in one and only one
-	   folder.
+	   folder.  If you've read <xref linkend="usage-mainwindow">
+	   then you already know that you can create a new folder by
+	   selecting <guisubmenu>New</guisubmenu> and then
+	   <guimenuitem>Folder</guimenuitem> from the
+	   <guimenu>File</guimenu> menu.
 	 </para>
 	<para>
-           To create a new folder, do this:
-	</para>
-	<para>
-          To put a card into a folder, do this:
+          To put a card into a folder, just drag it there from the
+          folder view, or (SOMETHING ELSE).  Remember that address
+          cards can only go in contact folders, just like mail can
+          only go in mail folders, and calendars in calendar folders.
          </para>
       </sect3>
       
@@ -251,7 +254,11 @@
            and can never remember his phone number.
          </para>
 	<para>
-           To mark a card as belonging to a category, do this:
+           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.
         </para>
 	<para>
            Then, you can refer to all the cards in that category by:
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index cf655d42fc..dbfbe7d8df 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -1,142 +1,218 @@
+<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+
+<chapter id="usage-calendar">
+  <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
+  <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
+    linkend="usage-calendar-fig">.
+
+   <!-- ============== Figure ============================= -->
+    <figure id="usage-calendar-fig">
+      <title>Evolution Calendar View</title>
+      <screenshot>
+	<screeninfo>Evolution Contact Manager Window</screeninfo>
+	<graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
+	</graphic>
+      </screenshot>
+    </figure>
+  <!-- ============== End of Figure ============================= --> 
+
+  </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.  To do so, use the calendar-shaped
+       buttons on the right side of the toolbar.
+    </para>
+    <para>
+       Describe the less-obvious differences among the views of time
+       here.
+    </para>
+
+    <para>
+       In addition, <application>Evolution</application> supports
+       Hebrew, Muslim, and other calendar formats.  To switch to a
+       different calendar format, choose
+       <guimenuitem>GUIMENUITEM</guimenuitem> from the
+       <guimenu>GUIMENU</guimenu>.
+    </para>
+    <para>
+       Describe the ways that different calendars can work here, and
+       how the different calendars work together.
+    </para>
+  </sect1>
+  <sect1 id="usage-calendar-apts">
+    <title>Scheduling With the Evolution Calendar</title>
+    <para>
+       The <application>Evolution</application> calendar allows you to
+       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
+       your calendar. Basically, it can handle almost any schedule you
+       throw at it.
+    </para>
+    <sect2 id="usage-calendar-apts-basic">
+      <title>Creating events</title>
+      <para>
+	To create a new calendar event, select
+	<guisubmenu>New</guisubmenu> and then <guimenuitem>
+	Appointment</guimenuitem> from the <guimenu>MENU</guimenu>, or
+	click the <guibutton>New</guibutton> button on the left end of
+	the toolbar. The <interface>New Appointment</interface> dialog
+	will pop up with the usual menu bar, tool bar, and window full
+	of choices for you. I'm going to skip the the more
+	self-explanatory items, like the <guilabel>Summary</guilabel>
+	and <guilabel>Owner</guilabel> of the event (which is probably
+	you), and cut right to the more intersting ones.
+      </para>
+      <para>
+        Your event must have a starting and ending date &mdash; by
+        default, it's today &mdash; but you can choose whether to give
+        it starting and ending times or to mark it as an <guilabel>All
+        day event</guilabel>.  For the purposes of the calendar, an
+        <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.  This allows
+        you to include events of shorter duration within it.  A
+        conference might be an all day event, and the various lectures
+        might be timed events that happen during the all day event.
+      </para>
+      <para>
+         You can have as many as four different
+         <guilabel>Alarms</guilabel>, any time prior to the event
+         you've scheduled.  You can have one alarm of each type:
+         <itemizedlist>
+          <listitem>
+	    <para>
+	  <guilabel>Display</guilabel> means a window will pop up on
+	  your screen to remind you of your event.
+            </para>
+	  </listitem>
+          <listitem>
+	    <para>
+	       Click <guilabel>Audio</guilabel> to have your deliver a
+	       sound alarm.
+            </para>
+	  </listitem>
+          <listitem>
+	    <para>
+	      Select <guilabel>Program</guilabel> if you would like
+	      some additional application to run as a reminder.  You
+	      can enter its name in the text field, or find it with
+	      the <guibutton>Browse</guibutton> button.
+            </para>
+	  </listitem>
+
+          <listitem>
+	    <para>
+	       If you select <guilabel>Mail</guilabel>, then
+	       <application>Evolution</application> will send an email
+	       reminder to the address you enter into the text field.
+            </para>
+	  </listitem>
+	</itemizedlist>
+
+      </para>
+      <para>
+         <guilabel>Classification</guilabel> is a little more
+         complicated, and only applies to calendars on a
+         network. <guilabel>Public</guilabel> is the default category,
+         and a public even tcan be viewd by anyone on the calendar
+         sharing network.  <guilabel>Private</guilabel> means
+         (SOMETHING), and <guilabel>Confidential</guilabel> means that
+         (SOMETHING ELSE).
+      </para>
+      <para>
+        The <guilabel>Recurrence</guilabel> tab lets you describe
+        repitition in events ranging from once every day up to once
+        every 100 years.  You can then choose a time when repitition
+        will stop, and, under <guilabel>Exceptions</guilabel>, pick
+        individual days when the event will <emphasis>not</emphasis>
+        recur.
+      </para>
 
-    <chapter id="usage-calendar">
-      <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
       <para>
-        To begin using the calendar, select
-        <guibutton>Calendar</guibutton> from the <interface>shortcut
-        bar</interface>.  By default, the calendar starts in daily view mode 
-        The calendar's daily view is shown in 
-        <xref linkend="usage-calendar-fig">:
+	Once you're done with all those settings, click on the disk
+	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.
+      </para>
+    </sect2>
 
-       <!-- ============== Figure ============================= -->
-	<figure id="usage-calendar-fig">
-	  <title>Evolution Calendar View</title>
-	  <screenshot>
-	    <screeninfo>Evolution Contact Manager Window</screeninfo>
-	    <graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	  </screenshot>
-	</figure>
-      <!-- ============== End of Figure ============================= --> 
+    <sect2 id="usage-calendar-apts-group">
+      <title>Appointments for Groups</title>
+      <para>
+	If you have your calendar set up to work with other
+	calendars over a network, you can see when others are
+	available to meet with you.  To browse other people's
+	calendars over your local network, do this: 
+      </para>
+      <para>
+	In addition, you can use
+	<application>Evolution</application> to mark a meeting
+	request on another person's calendar.  To do so, first
+	select <guimenuitem>New Appointment</guimenuitem> from the
+	<guimenu>MENU</guimenu>, or press <keysym>KEYSYM</keysym>
+	to bring up the <interface>new event</interface> window.
+	Then describe the event as you would any other.  Before
+	you click <guibutton>OK</guibutton>, (INSERT DESCRIPTION
+	HERE...).  <application>Evolution</application> will
+	automatically send email to each person on the request
+	list, notifying of the time and date of the meeting you
+	have requested with them.  In addition, it will mark the
+	event on your calendar and on theirs as tentative, rather than 
+	a confirmed, event.
+      </para>
+      <para>
+	To mark a tentative event as confirmed, click once on the
+	event in the <interface>calendar view</interface> to
+	select it, and then choose <guimenuitem>Event
+	Properties</guimenuitem> from the
+	<guimenu>Settings</guimenu> menu.  In the <interface>Event
+	Properties</interface> dialog window, click the
+	"tentative" button to un-mark the event. (NOTE THAT this
+	feature may not at all exist!)
+      </para>
+    </sect2>
 
+    <sect2 id="usage-calendar-apts-privs">
+      <title>Scheduling privileges</title>
+      <para>
+	There are several levels of scheduling privileges.  You
+	can set whether people can see your calendar, whether they
+	can request meetings or appointments, and whether they can
+	create appointments.  This section may have to be deleted,
+	because I don't know if we are going to support privileges
+	at all.
       </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.  To do so, click the buttons at the top
-           of <application>Evolution</application> with the numbers 1, 5,
-           7, 31 respectivly.
-        </para>
-	<para>
-           Describe the less-obvious differences among the views of
-           time here.
-        </para>
+    </sect2>
+  </sect1>
 
-	<para>
-           In addition, <application>Evolution</application> supports
-           Hebrew, Muslim, and other calendar formats.  To switch to a
-           different calendar format, choose
-           <guimenuitem>GUIMENUITEM</guimenuitem> from the
-           <guimenu>GUIMENU</guimenu>.
-        </para>
-	<para>
-           Describe the ways that different calendars can work here,
-           and how the different calendars work together.
-        </para>
-      </sect1>
-      <sect1 id="usage-calendar-apts">
-	<title>Scheduling With the Evolution Calendar</title>
-	<para>
-	   The <application>Evolution</application> calendar allows
-           you to 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 your calendar. Basically, it can handle almost
-           any schedule you throw at it.
-        </para>
-	<sect2 id="usage-calendar-apts-basic">
-	  <title>Creating events</title>
-	  <para>
-            While looking at the calendar, select <guimenuitem>New
-            Appointment</guimenuitem> from the
-            <guimenu>MENU</guimenu>, or press
-            <keysym>KEYSYM</keysym>. The <interface>New
-            Appointment</interface> dialog will appear. (INSERT
-            DESCRIPTION OF INTERFACE HERE: Date, Time, Recurrence,
-            Reminders, and Tentative/Confirmed)
-          </para>
-	  <para>
-            You can alter those settings later 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.
-          </para>
-	</sect2>
+  <sect1 id="usage-calendar-organize">
+    <title>Organizing your Appointments</title>
+    <para>
+       Until I have <application>Evolution</application> running properly,
+       I have no idea how this sort of organization will actually work.
+    </para>
+    <para>
+       But this section will have at least two paragraphs, and
+       probably a screenshot.
+    </para>
+  </sect1>
+</chapter>
 
-	<sect2 id="usage-calendar-apts-group">
-	  <title>Appointments for Groups</title>
-	  <para>
-            If you have your calendar set up to work with other
-            calendars over a network, you can see when others are
-            available to meet with you.  To browse other people's
-            calendars over your local network, do this: 
-          </para>
-	  <para>
-            In addition, you can use
-            <application>Evolution</application> to mark a meeting
-            request on another person's calendar.  To do so, first
-            select <guimenuitem>New Appointment</guimenuitem> from the
-            <guimenu>MENU</guimenu>, or press <keysym>KEYSYM</keysym>
-            to bring up the <interface>new event</interface> window.
-            Then describe the event as you would any other.  Before
-            you click <guibutton>OK</guibutton>, (INSERT DESCRIPTION
-            HERE...).  <application>Evolution</application> will
-            automatically send email to each person on the request
-            list, notifying of the time and date of the meeting you
-            have requested with them.  In addition, it will mark the
-            event on your calendar and on theirs as tentative, rather than 
-            a confirmed, event.
-          </para>
-	  <para>
-            To mark a tentative event as confirmed, click once on the
-            event in the <interface>calendar view</interface> to
-            select it, and then choose <guimenuitem>Event
-            Properties</guimenuitem> from the
-            <guimenu>Settings</guimenu> menu.  In the <interface>Event
-            Properties</interface> dialog window, click the
-            "tentative" button to un-mark the event. (NOTE THAT this
-            feature may not at all exist!)
-          </para>
-	</sect2>
-	
-	<sect2 id="usage-calendar-apts-privs">
-	 <title>Scheduling privileges</title>
-	  <para>
-            There are several levels of scheduling privileges.  You
-            can set whether people can see your calendar, whether they
-            can request meetings or appointments, and whether they can
-            create appointments.  This section may have to be deleted,
-            because I don't know if we are going to support privileges
-            at all.
-          </para>
-	</sect2>
-      </sect1>
 
-      <sect1 id="usage-calendar-organize">
-	<title>Organizing your Appointments</title>
-	<para>
-           Until I have <application>Evolution</application> running properly,
-           I have no idea how this sort of organization will actually work.
-        </para>
-	<para>
-           But this section will have at least two paragraphs, and
-           probably a screenshot.
-        </para>
-      </sect1>
-    </chapter>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index fdd988d55d..2291e28548 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -1,4 +1,4 @@
-
+<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 
 <chapter id="usage-contact">
   <title>The Evolution Contact Manager</title>
@@ -67,15 +67,15 @@
   <sect1 id="usage-contact-cards">
     <title>Creating, Deleting, and Adding Cards</title>
     <para>
-       You can create a new card by pressing the <guibutton>New
-       Card</guibutton> button, or by pressing
-       <keysym>KEYSYM</keysym>. The <interface>Contact
-       Editor</interface> window will appear.  It has two tabs,
-       <guilabel>General</guilabel>, for basic contact information,
-       and <guilabel>Details</guilabel>, for a more specific
-       description of the person.  In addition, it contains a full
-       menu bar with all the items from the main window (IS THIS TRUE?
-       DESCRIBE MENUBAR AGAIN?)
+      You can create a new card by pressing the <guibutton>New
+      Card</guibutton> button, or by pressing
+      <keysym>KEYSYM</keysym>. The <interface>Contact
+      Editor</interface> window will appear.  It has two tabs,
+      <guilabel>General</guilabel>, for basic contact information, and
+      <guilabel>Details</guilabel>, for a more specific description of
+      the person.  In addition, it contains a full menu bar with all
+      the items from the main window (IS THIS TRUE?  DESCRIBE MENUBAR
+      AGAIN?)
     </para>
     <para>
       The <guilabel>General</guilabel> tab contains no less than seven
@@ -123,8 +123,7 @@
       </screenshot>
     </figure>
 
-
-!--
+<!--
       <variablelist>
          <listitem>
 	  <term>
@@ -150,6 +149,7 @@
         </para>
     
 -->
+
     <para>
        You can choose which fields an address card has, and create new
        fields for cards.  For example,
@@ -211,11 +211,10 @@
       <title>Groups of contacts</title>
       <para>
          <application>Evolution</application> lets you put cards into
-         folders, mark them as members of different groups, and search
-         through them in a variety of ways.  This section will
-         describe how to organize and find contact information using
-         <application>Evolution</application>.  CHANGE THIS paragraph:
-         it needs a great deal of work.
+         folders and mark them as members of different categories.
+         Although the contact manager does not support vFolders,
+         categories should provide as much flexibility as you need in
+         grouping your address cards.
       </para>
 
       <sect3 id="usage-contact-organize-group-folder">
@@ -226,13 +225,17 @@
 	   <guilabel>Contacts</guilabel> folder.  You can create more
 	   folders inside that one, or create other address book
 	   folders as well.  Each card must be in one and only one
-	   folder.
+	   folder.  If you've read <xref linkend="usage-mainwindow">
+	   then you already know that you can create a new folder by
+	   selecting <guisubmenu>New</guisubmenu> and then
+	   <guimenuitem>Folder</guimenuitem> from the
+	   <guimenu>File</guimenu> menu.
 	 </para>
 	<para>
-           To create a new folder, do this:
-	</para>
-	<para>
-          To put a card into a folder, do this:
+          To put a card into a folder, just drag it there from the
+          folder view, or (SOMETHING ELSE).  Remember that address
+          cards can only go in contact folders, just like mail can
+          only go in mail folders, and calendars in calendar folders.
          </para>
       </sect3>
       
@@ -251,7 +254,11 @@
            and can never remember his phone number.
          </para>
 	<para>
-           To mark a card as belonging to a category, do this:
+           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.
         </para>
 	<para>
            Then, you can refer to all the cards in that category by: