Minor fixes.

	* C/preface.sgml: Minor fixes.

	* C/usage-notes.sgml: New File for feature that is yet to come.
	* C/evolution-guide.sgml: Added entity for notes chapter.
	* C/usage-mainwindow.sgml: Un-commented references to notes section.

	* C/apx-authors.sgml: Removed dcm from author list.

	* C/usage-calendar.sgml: Added to-do list features.

svn path=/trunk/; revision=3818

16 files changed, 242 insertions, 46 deletions

diff --git a/doc/C/apx-authors.sgml b/doc/C/apx-authors.sgml
index 6cd1fc3b7f..647bf0b49a 100644
--- a/doc/C/apx-authors.sgml
+++ b/doc/C/apx-authors.sgml
@@ -15,7 +15,6 @@
     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
     <member>Christopher J. Lahey: <email>clahey@helixcode.com</email></member>
     <member>Matthew Loper:  <email>matt@helixcode.com</email></member>
-    <member>Dave Mason <email>dcm@redhat.com</email></member>
     <member> Federico Mena: <email>federico@helixcode.com</email></member>
     <member>Eskil Heyn Olsen<email>deity@eski.dk</email></member>
     <member> Nat Friedman: <email>nat@helixcode.com</email></member>
diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml
index 02b03c3851..b322e106a5 100644
--- a/doc/C/evolution-guide.sgml
+++ b/doc/C/evolution-guide.sgml
@@ -4,6 +4,7 @@
 <!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
 <!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
+<!ENTITY USAGE-NOTES SYSTEM "usage-notes.sgml">
 <!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
 <!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
@@ -73,6 +74,7 @@ standardize on second person, not 1st pers. plural.
     &USAGE-MAIL;
     &USAGE-CONTACT;
     &USAGE-CALENDAR;
+    &USAGE-NOTES;
     &USAGE-SYNC;
 
   </part>
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index 551c5b5ec5..f8c74c67d2 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -130,8 +130,8 @@
 	    <member><application>Applications</application></member>
 	    <member><command>Commands</command> typed at the command line</member>
 	    <member><guilabel>Labels</guilabel> for menu items and buttons</member>
-	    <member>Other text treatments</member>
-	    <member>Other text treatments</member>
+	    <member><userinput>Anything you type in</userinput></member>
+	    <member><computeroutput>Text output from a computer</computeroutput></member>
 	  </simplelist>
         </para>
       </formalpara>
diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml
index 6270b16a83..962cdf2fac 100644
--- a/doc/C/usage-calendar.sgml
+++ b/doc/C/usage-calendar.sgml
@@ -1,4 +1,7 @@
 
+<!-- UNCOMMENT FOR VALIDATION ONLY:
+ <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+-->
 
 <chapter id="usage-calendar">
   <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
@@ -27,14 +30,11 @@
     <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.
+       month, or by the year; press the calendar-shaped buttons on the
+       right side of the toolbar to switch between views.
     </para>
 
+
 <!-- ############### FIXME FIXME FIXME ############
 Feature not yet implemented, and may not be implemented due to
 lack of time, resources, and interest.
@@ -45,11 +45,8 @@ lack of time, resources, and interest.
        <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>
+################  END FIXME AREA   ##################   -->
+
   </sect1>
   <sect1 id="usage-calendar-apts">
     <title>Scheduling With the Evolution Calendar</title>
@@ -168,7 +165,7 @@ lack of time, resources, and interest.
       <para>
 	In addition, you can use
 	<application>Evolution</application> to mark a meeting
-	request on another person's calendar.  To do so, first
+	request on another person's calendar.  To do it, 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.
@@ -206,6 +203,58 @@ lack of time, resources, and interest.
     </sect2>
   </sect1>
 
+  <sect1 id="usage-calendar-todo">
+   <title>The To-Do List</title>
+    <para>
+       The to-do list, located in the lower right corner of the
+       calendar, lets you keep a list of tasks seperate from your
+       calendar events.  Tasks are colored by priority and due-date
+       (see <xref linkend="config-prefs">), and are included with
+       calendar data during synchronization with a hand-held device.
+    </para>
+    <para>
+       To record a new task, click the <guibutton>Add</guibutton>
+       button below the list.  <application>Evolution</application>
+       will pop up a small window with five items in it:
+       <itemizedlist>
+         <listitem>
+	  <para>
+            <guilabel>Summary:</guilabel>The description you enter
+            here will appear in the To Do list itself.
+          </para>
+	 </listitem>
+
+        <listitem>
+	  <para>
+            <guilabel>Due Date:</guilabel> Decide when this item is
+            due.  You can either type in a date and time, or select one from
+            the <guibutton>Calendar</guibutton> and time drop-down menus.
+          </para>
+	</listitem>
+ 
+	<listitem>
+	  <para>
+            <guilabel>Priority:</guilabel>Select a level of importance from 1 to 9.
+          </para>
+	</listitem> 
+	<listitem>
+	  <para>
+            <guilabel>Item Comments:</guilabel>If you wish, you can
+            keep a more detailed description of the item here.
+          </para>
+	</listitem> 
+      </itemizedlist>
+    </para>
+    <para>
+       Once you've added a task to your to-do list, its summary
+       appears in the <guilabel>Summary</guilabel> section of the
+       calendar window.  To edit an item, double-click on it, or
+       select it and click <guibutton>Edit</guibutton>.  You can
+       delete items by selecting them and clicking on the
+       <guibutton>Delete</guibutton> button.
+    </para>
+  </sect1>
+
   <sect1 id="usage-calendar-organize">
     <title>Organizing your Appointments</title>
     <para>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index 7fefa9d707..65af93e000 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -1,5 +1,7 @@
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-<!-- uncomment this during validation and debugging -->
+
+<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+ uncomment this during validation and debugging -->
+
 <chapter id="usage-contact">
   <title>The Evolution Contact Manager</title>
   <abstract>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index a0d64b6d74..656fdb9a44 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -377,7 +377,7 @@ with quoted materials and the relevant replies interspersed-->
 	    unless you explicitly ask for HTML.  To send HTML mail,
 	    you will need to select <guilabel>Send Messages as
 	    HTML</guilabel> in the mail settings dialog box.  See
-	    <xref linkend="config-mail"> for more information.
+	    <xref linkend="config-prefs-mail-other"> for more information.
           </para>
 	  <para>
             If you format a message with HTML, but do not have
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 99f108aa0f..4ba1c29292 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -1,4 +1,8 @@
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+
+<!-- UNComment the following during debugging:
+ <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
+
+
 <chapter id="usage-mainwindow">
 
   <title>The Main Window: Evolution Basics</title>
@@ -133,15 +137,16 @@ Can these things be labelled with little arrows & stuff?
 	     daily events.
 	  </para>
 	</listitem>
-
+-->
 	<listitem>
 	  <para> <guibutton>Notes</guibutton> is your catch-all
 	    notepad: write <glossterm>haiku</glossterm>, take down
-	    messages from phone conversations, or keep small
-	    things organized.
+	    messages from phone conversations, or keep small things
+	    organized. This feature is not yet implemented, but will
+	    be soon. See <xref linkend="usage-notes"> for more information.
 	  </para>
 	</listitem>
--->
+
 
       </itemizedlist>
 
diff --git a/doc/C/usage-notes.sgml b/doc/C/usage-notes.sgml
new file mode 100644
index 0000000000..184d0c5709
--- /dev/null
+++ b/doc/C/usage-notes.sgml
@@ -0,0 +1,41 @@
+<chapter id="usage-notes">
+  <title>Evolution Notes</title>
+  <abstract>
+    <title> An Overview of the Evolution Notes</title>
+    <para>
+      Sticky Notes(tm) have become an almost necessary part of our lives.
+      They can be used to write school notes on and take down phone numbers,
+      among other things.  Thus, it only makes sense that <application>
+      Evolution</application> has a Notes feature.  <application>Evolution
+      </application> can help you take notes in the following ways:
+     <itemizedlist>
+       <listitem>
+         <para>
+           You can take down phone numbers, take school notes, take phone
+	   messages, or even write poetry.
+         </para>
+       </listitem>
+       <listitem>
+         <para>
+           You can color code each note to help cateogrize each note into
+           a topic.
+         </para>
+       </listitem>
+       <listitem>
+         <para>
+           Something
+         </para>
+       </listitem>
+       <listitem>
+         <para>
+           Something
+         </para>
+       </listitem>
+     </itemizedlist>
+   </para>
+   <para>
+     You can start reading notes by clicking <guibutton>Notes</guibutton> in the
+     shortcut bar.
+   </para>
+  </abstract>
+</chapter>
diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
index 6cd1fc3b7f..647bf0b49a 100644
--- a/help/C/apx-authors.sgml
+++ b/help/C/apx-authors.sgml
@@ -15,7 +15,6 @@
     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
     <member>Christopher J. Lahey: <email>clahey@helixcode.com</email></member>
     <member>Matthew Loper:  <email>matt@helixcode.com</email></member>
-    <member>Dave Mason <email>dcm@redhat.com</email></member>
     <member> Federico Mena: <email>federico@helixcode.com</email></member>
     <member>Eskil Heyn Olsen<email>deity@eski.dk</email></member>
     <member> Nat Friedman: <email>nat@helixcode.com</email></member>
diff --git a/help/C/evolution-guide.sgml b/help/C/evolution-guide.sgml
index 02b03c3851..b322e106a5 100644
--- a/help/C/evolution-guide.sgml
+++ b/help/C/evolution-guide.sgml
@@ -4,6 +4,7 @@
 <!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
 <!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
 <!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
+<!ENTITY USAGE-NOTES SYSTEM "usage-notes.sgml">
 <!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
 <!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
@@ -73,6 +74,7 @@ standardize on second person, not 1st pers. plural.
     &USAGE-MAIL;
     &USAGE-CONTACT;
     &USAGE-CALENDAR;
+    &USAGE-NOTES;
     &USAGE-SYNC;
 
   </part>
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 551c5b5ec5..f8c74c67d2 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -130,8 +130,8 @@
 	    <member><application>Applications</application></member>
 	    <member><command>Commands</command> typed at the command line</member>
 	    <member><guilabel>Labels</guilabel> for menu items and buttons</member>
-	    <member>Other text treatments</member>
-	    <member>Other text treatments</member>
+	    <member><userinput>Anything you type in</userinput></member>
+	    <member><computeroutput>Text output from a computer</computeroutput></member>
 	  </simplelist>
         </para>
       </formalpara>
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 6270b16a83..962cdf2fac 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -1,4 +1,7 @@
 
+<!-- UNCOMMENT FOR VALIDATION ONLY:
+ <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+-->
 
 <chapter id="usage-calendar">
   <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
@@ -27,14 +30,11 @@
     <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.
+       month, or by the year; press the calendar-shaped buttons on the
+       right side of the toolbar to switch between views.
     </para>
 
+
 <!-- ############### FIXME FIXME FIXME ############
 Feature not yet implemented, and may not be implemented due to
 lack of time, resources, and interest.
@@ -45,11 +45,8 @@ lack of time, resources, and interest.
        <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>
+################  END FIXME AREA   ##################   -->
+
   </sect1>
   <sect1 id="usage-calendar-apts">
     <title>Scheduling With the Evolution Calendar</title>
@@ -168,7 +165,7 @@ lack of time, resources, and interest.
       <para>
 	In addition, you can use
 	<application>Evolution</application> to mark a meeting
-	request on another person's calendar.  To do so, first
+	request on another person's calendar.  To do it, 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.
@@ -206,6 +203,58 @@ lack of time, resources, and interest.
     </sect2>
   </sect1>
 
+  <sect1 id="usage-calendar-todo">
+   <title>The To-Do List</title>
+    <para>
+       The to-do list, located in the lower right corner of the
+       calendar, lets you keep a list of tasks seperate from your
+       calendar events.  Tasks are colored by priority and due-date
+       (see <xref linkend="config-prefs">), and are included with
+       calendar data during synchronization with a hand-held device.
+    </para>
+    <para>
+       To record a new task, click the <guibutton>Add</guibutton>
+       button below the list.  <application>Evolution</application>
+       will pop up a small window with five items in it:
+       <itemizedlist>
+         <listitem>
+	  <para>
+            <guilabel>Summary:</guilabel>The description you enter
+            here will appear in the To Do list itself.
+          </para>
+	 </listitem>
+
+        <listitem>
+	  <para>
+            <guilabel>Due Date:</guilabel> Decide when this item is
+            due.  You can either type in a date and time, or select one from
+            the <guibutton>Calendar</guibutton> and time drop-down menus.
+          </para>
+	</listitem>
+ 
+	<listitem>
+	  <para>
+            <guilabel>Priority:</guilabel>Select a level of importance from 1 to 9.
+          </para>
+	</listitem> 
+	<listitem>
+	  <para>
+            <guilabel>Item Comments:</guilabel>If you wish, you can
+            keep a more detailed description of the item here.
+          </para>
+	</listitem> 
+      </itemizedlist>
+    </para>
+    <para>
+       Once you've added a task to your to-do list, its summary
+       appears in the <guilabel>Summary</guilabel> section of the
+       calendar window.  To edit an item, double-click on it, or
+       select it and click <guibutton>Edit</guibutton>.  You can
+       delete items by selecting them and clicking on the
+       <guibutton>Delete</guibutton> button.
+    </para>
+  </sect1>
+
   <sect1 id="usage-calendar-organize">
     <title>Organizing your Appointments</title>
     <para>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 7fefa9d707..65af93e000 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -1,5 +1,7 @@
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
-<!-- uncomment this during validation and debugging -->
+
+<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+ uncomment this during validation and debugging -->
+
 <chapter id="usage-contact">
   <title>The Evolution Contact Manager</title>
   <abstract>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index a0d64b6d74..656fdb9a44 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -377,7 +377,7 @@ with quoted materials and the relevant replies interspersed-->
 	    unless you explicitly ask for HTML.  To send HTML mail,
 	    you will need to select <guilabel>Send Messages as
 	    HTML</guilabel> in the mail settings dialog box.  See
-	    <xref linkend="config-mail"> for more information.
+	    <xref linkend="config-prefs-mail-other"> for more information.
           </para>
 	  <para>
             If you format a message with HTML, but do not have
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 99f108aa0f..4ba1c29292 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -1,4 +1,8 @@
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+
+<!-- UNComment the following during debugging:
+ <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
+
+
 <chapter id="usage-mainwindow">
 
   <title>The Main Window: Evolution Basics</title>
@@ -133,15 +137,16 @@ Can these things be labelled with little arrows & stuff?
 	     daily events.
 	  </para>
 	</listitem>
-
+-->
 	<listitem>
 	  <para> <guibutton>Notes</guibutton> is your catch-all
 	    notepad: write <glossterm>haiku</glossterm>, take down
-	    messages from phone conversations, or keep small
-	    things organized.
+	    messages from phone conversations, or keep small things
+	    organized. This feature is not yet implemented, but will
+	    be soon. See <xref linkend="usage-notes"> for more information.
 	  </para>
 	</listitem>
--->
+
 
       </itemizedlist>
 
diff --git a/help/C/usage-notes.sgml b/help/C/usage-notes.sgml
new file mode 100644
index 0000000000..184d0c5709
--- /dev/null
+++ b/help/C/usage-notes.sgml
@@ -0,0 +1,41 @@
+<chapter id="usage-notes">
+  <title>Evolution Notes</title>
+  <abstract>
+    <title> An Overview of the Evolution Notes</title>
+    <para>
+      Sticky Notes(tm) have become an almost necessary part of our lives.
+      They can be used to write school notes on and take down phone numbers,
+      among other things.  Thus, it only makes sense that <application>
+      Evolution</application> has a Notes feature.  <application>Evolution
+      </application> can help you take notes in the following ways:
+     <itemizedlist>
+       <listitem>
+         <para>
+           You can take down phone numbers, take school notes, take phone
+	   messages, or even write poetry.
+         </para>
+       </listitem>
+       <listitem>
+         <para>
+           You can color code each note to help cateogrize each note into
+           a topic.
+         </para>
+       </listitem>
+       <listitem>
+         <para>
+           Something
+         </para>
+       </listitem>
+       <listitem>
+         <para>
+           Something
+         </para>
+       </listitem>
+     </itemizedlist>
+   </para>
+   <para>
+     You can start reading notes by clicking <guibutton>Notes</guibutton> in the
+     shortcut bar.
+   </para>
+  </abstract>
+</chapter>