Added password remembering/forgetting feature.

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

	* C/usage-mail.sgml: Added password remembering/forgetting feature.

	* C/config-prefs.sgml: Mostly moved to variablelists, a few
	language changes.

	* C/config-setupassist.sgml: Minor changes to formatting, wording.

	* C/usage-notes.sgml: Changed trademark references, other minor
	changes.

	* C/usage-calendar.sgml: Minor fixes, added additional calendar
	section, removed references to unimplemented features. Spellcheck,
	prep for 0.3 release.

svn path=/trunk/; revision=4258

8 files changed, 317 insertions, 230 deletions

diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml
index e660a0c798..e474d54b5c 100644
--- a/help/C/apx-gloss.sgml
+++ b/help/C/apx-gloss.sgml
@@ -1,5 +1,3 @@
-
-
 <glossary id="glossary">
 
  <title>Glossary</title>
@@ -240,7 +238,7 @@
   </glossdef>
  </glossentry>
 
-  <glossnetry id="signature">
+  <glossentry id="signature">
    <glossterm>Signature</glossterm>
    <glossdef>
     <para>
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 65ea822cfe..de8c8beae7 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -1,14 +1,7 @@
-
+<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
 
 <chapter id="config-prefs">
 
-<!--this chapter needs a LOT of work.  structurally it needs for the
-mail and other sections to be similar.  it needs content in the
-Calendar section and the Contact section.  Calendar prefs functions
-documentation-ready, although subject to substantial change. Contact
-functions are not yet available for doc'ing.  . aaron, june 5. 7 am.
--->
-
       <title>Advanced Configuration</title>
       <para>
         Perhaps your mail server has changed names.  Perhaps you've
@@ -28,29 +21,34 @@ functions are not yet available for doc'ing.  . aaron, june 5. 7 am.
         window</interface>, illustrated in <xref
         linkend="config-prefs-mail-fig">.  Mail Preferences are
         seperated into several categories:
-        <itemizedlist>
+        <variablelist>
+	<varlistentry>
+          <term><guilabel>Identity</guilabel></term>
           <listitem>
 	    <para>
-               <guilabel>Identity</guilabel>, which allows you to set
+               This allows you to set
                your name, email address, and other information.  The
                default values are the ones found on your system account.
 	    </para>
 	  </listitem>
-
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Sources</guilabel></term>
 	  <listitem>
 	    <para>
-              <guilabel>Sources</guilabel>, which allows you to specify
-              your mail receiving server and protocols.
+               Set your mail-checking protocols and servers here.
             </para>
           </listitem>
-
-        <listitem>
-         <para>
-           <guilabel>Transports</guilabel>, which allows you to
-           specify how you will send mail.
+	</varlistentry>
+	<varlistentry>
+	  <term><guilabel>Transports</guilabel></term>
+	  <listitem>
+	    <para>
+              Here, you can specify how you will send mail.
            </para>
-         </listitem>
-         </itemizedlist>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
 
 <!-- THE FOLLOWING MAY BE REINSTATED:
               as well as attachment
@@ -144,79 +142,88 @@ functions are not yet available for doc'ing.  . aaron, june 5. 7 am.
         determine how you want to send your mail.
       </para>
  
-	<sect3 id="config-prefs-network-sources">
-	  <title>Mail Sources</title>
-	  <para>
-            The <interface>Mail Sources</interface> tab allows you to
-            edit, add, or delete methods of retreiving mail from
-            servers.  Clicking on <guibutton>Add</guibutton> or
-            <guibutton>Edit</guibutton> will bring up a dialog box to
-            offer you the following options:
-         <itemizedlist>
-
-           <listitem>
-	    <para>
-              <guilabel>Mail source type:</guilabel>At this point, you
-              can only select from POP or Unix-style mbox files, but
-              additional types will be supported in the future.
-            </para>
-	  </listitem>
-
-           <listitem>
-	    <para>
-              <guilabel>Server:</guilabel>Enter the name of your mail
-              server in this field, eg: mail.mycompany.com
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Username:</guilabel>Enter your user name here.
-              Eva Lucy Ann Tester's user name is eltester.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Authentication:</guilabel> Your system
-              administrator will know which type of authentication
-              your system requires.
-              <application>Evolution</application> can also detect
-              what sorts of authentication are available once it knows
-              where to find the server.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Test these values before continuing</guilabel>
-              If this box is checked,
-              <application>Evolution</application> will attempt to
-              make sure that all the other entries in the dialog box
-              are correct.
-            </para>
-        </listitem>
-	</itemizedlist>
+      <sect3 id="config-prefs-network-sources">
+	<title>Mail Sources</title>
+	<para>
+          The <interface>Mail Sources</interface> tab allows you to
+          edit, add, or delete methods of retreiving mail from
+          servers.  Clicking on <guibutton>Add</guibutton> or
+          <guibutton>Edit</guibutton> will bring up a dialog box to
+          offer you the following options:
+           <variablelist>
+	    <varlistentry>
+	      <term><guilabel>Mail source type:</guilabel></term>
+	      <listitem>
+		<para>
+                  Select from IMAP, POP or Unix-style
+                  <filename>mbox</filename> files.
+                </para>
+	      </listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term> <guilabel>Server:</guilabel></term>
+	      <listitem>
+		<para>
+                  Enter the name of your mail server in this field,
+                  eg: <userinput>mail.mycompany.com</userinput>
+                </para>
+	      </listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term><guilabel>Username:</guilabel></term>
+	      <listitem>
+		<para>
+                  Enter your user name here.  Eva Lucy Ann Tester's
+                  user name is <userinput>eltester</userinput>.
+                </para>
+	      </listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term><guilabel>Authentication:</guilabel></term>
+	      <listitem>
+		<para>
+                  Your system administrator will know which type of
+                  authentication your system requires.
+                  <application>Evolution</application> can also detect
+                  what sorts of authentication are available once it
+                  knows where to find the server.
+               </para>
+	      </listitem>
+	    </varlistentry>
+	    <varlistentry>
+	      <term><guilabel>Test values before continuing</guilabel></term>
+	      <listitem>
+		<para>
+                  If this box is checked,
+                  <application>Evolution</application> will attempt to
+                  make sure that all the other entries in the dialog
+                  window are correct.
+                </para>
+	      </listitem>
+	    </varlistentry>
+	  </variablelist>
           </para>
-	  </sect3>
-          <sect3 id="config-prefs-mail-network-transports">
-          <title>Transports</title>
-          <para>
-            The <interface>Transports</interface> tab lets you set how
-            you will send mail.  As of this writing, you have two
-            choices: <guilabel>SMTP</guilabel>, which uses a remote
-            mail server, and <guilabel>sendmail</guilabel>,
-            which uses the <application>sendmail</application> program
-            on your local system.
-         </para>
-         <para>
-            If you choose <guilabel>SMTP</guilabel>, you will need
-            to know the name of your mail server.  Your system
+      </sect3>
+      <sect3 id="config-prefs-mail-network-transports">
+	<title>Transports</title>
+	<para>
+           The <interface>Transports</interface> tab lets you set how
+           you will send mail.  As of this writing, you have two
+           choices: <guilabel>SMTP</guilabel>, which uses a remote
+           mail server, and <guilabel>sendmail</guilabel>, which uses
+           the <application>sendmail</application> program on your
+           local system.
+        </para>
+	<para>
+            If you choose <guilabel>SMTP</guilabel>, you will need to
+            know the name of your mail server.  Your system
             administrator or ISP has probably included that
             information on the piece of paper you lost about five
             minutes ago.  <application>Evolution</application> can
-            attempt to determine if you have entered the right
-            server name.  To have it do so,
-            check the box labelled <guilabel>Test these values before
-            continuing</guilabel> before you click
-            <guibutton>OK</guibutton>.
+            attempt to determine if you have entered the right server
+            name.  To have it do so, check the box labelled
+            <guilabel>Test these values before continuing</guilabel>
+            before you click <guibutton>OK</guibutton>.
          </para>
 	</sect3>
       </sect2>
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index ea78865037..519bd81414 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -17,23 +17,24 @@
       <para>
         The first time you try to send or receive mail with
 	<application>Evolution</application>, the <interface>mail
-	setup druid</interface> will pop up to help you
-	set up your email preferences.  If you don't plan to use
-	email, or if you'd rather configure your email preferences
-	later, click <guibutton>Cancel</guibutton>.
+	setup assistant</interface> will pop up to help you with your
+	email preferences.  If you don't plan to use email, or if
+	you'd rather deal with your email preferences later, click
+	<guibutton>Cancel</guibutton>.
       </para>
       <para>
-         The setup <glossterm>druid</glossterm>
-	 will guide you through the network configuration process.  It
-	 will ask you for some basic information; your system
-	 administrator or ISP should have the answers you'll need.
-	 The mail setup druid is pictured in <xref
-	 linkend="usage-setup-fig">.
+         The setup assistant (sometimes called a
+	 <glossterm>Druid</glossterm>) will guide you through the
+	 network configuration process.  It will ask you for some
+	 basic information; your system administrator or ISP should
+	 have the answers you'll need.  The mail setup assistant is
+	 pictured in <xref linkend="usage-setup-fig">.
 
 <!-- ==============Figure=================================== -->
+<!-- druid-pic should eventually become assistant-pic -->
 
 	<figure id="usage-setup-fig">
-	<title>Mail Setup Druid</title>
+	<title>Mail Setup Assistant</title>
 	<screenshot>
 	  <screeninfo>Evolution Main Window</screeninfo>
 	  <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Aaron Weber">
@@ -44,31 +45,31 @@
 
 
 
-  The druid will ask you for the following information:
+  The assistant will ask you for the following information:
         <itemizedlist>
 	  <listitem> <para> <guilabel>Name&mdash; </guilabel> Your
             full name: eg. Eva Lucianne Tester </para></listitem>
 
-	  <listitem><para> <guilabel>Email address&mdash</guilabel>;
+	  <listitem><para> <guilabel>Email address&mdash </guilabel>;
                  Your email address: eg. eltester@helixcode.com
                  </para></listitem>
 
 	  <listitem>
 	    <para>
-               <guilabel> Organization&mdash;</guilabel> Any
+               <guilabel> Organization&mdash; </guilabel> Any
               organization you represent.  Leave this blank if you
               wish.
             </para>
 	  </listitem>
 
-	  <listitem><para> <guilabel>Signature File&mdash;</guilabel> A text
-             file appended to any email you send, typically your name
-             and email address, or a quotation you like.  It should be
-             under three lines of text.</para></listitem>
+	  <listitem><para> <guilabel>Signature File&mdash; </guilabel>
+             A text file appended to any email you send, typically
+             your name and email address, or a quotation you like.  It
+             should be three or fewer lines of text.</para></listitem>
 	  
 	  <listitem>
 	    <para>
-              <guilabel>Mail source type&mdash;</guilabel>
+              <guilabel>Mail source type&mdash; </guilabel>
               <application>Evolution</application> supports two mail
               sources: POP servers, the most common email server type,
               and UNIX-style MBOX files.  Ask your system
@@ -78,7 +79,7 @@
 	  
 	  <listitem>
 	    <para>
-                <guilabel>Server&mdash;</guilabel> This should be the
+                <guilabel>Server&mdash; </guilabel> This should be the
               name of your mail server, eg.
               mailserver.organization.org
             </para>
@@ -96,7 +97,7 @@
 
 	  <listitem>
 	    <para>
-              <guilabel>Authentication&mdash;</guilabel> Select the
+              <guilabel>Authentication&mdash; </guilabel> Select the
               type of authentication you will use.  You can click
               <guibutton>Detect supported types</guibutton> to find
               out which authentication protocols your network allows.
@@ -106,7 +107,7 @@
 
 	  <listitem>
 	    <para>
-             <guilabel>Mail Transport&mdash;</guilabel> This is the
+             <guilabel>Mail Transport&mdash; </guilabel> This is the
               mail sending protocol you will want to use.  Sendmail is
               the default.
             </para>
@@ -120,7 +121,7 @@
       </para>
     </sect1>
 
-    </chapter>
+</chapter>
 
 
 
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 56e5a4e65e..f0772e9948 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -1,5 +1,6 @@
-<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
-
+<!--
+<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+-->
 
 <chapter id="usage-calendar">
   <title>The Evolution Calendar: Time-Tamer Extraordinaire</title>
@@ -64,27 +65,30 @@ lack of time, resources, and interest.
       <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.
+        <menuchoice>
+	  <guimenu>File</guimenu>
+	  <guisubmenu>New</guisubmenu> 
+	  <guimenuitem>Appointment</guimenuitem>
+	</menuchoice>
+	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.
       </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
+        default, 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.
+        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.
       </para>
       <para>
          You can have as many as four different
@@ -136,15 +140,15 @@ lack of time, resources, and interest.
          <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
+         and a public event can be viewed 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
+        repetition in events ranging from once every day up to once
+        every 100 years.  You can then choose a time when repetition
         will stop, and, under <guilabel>Exceptions</guilabel>, pick
         individual days when the event will <emphasis>not</emphasis>
         recur.
@@ -162,42 +166,48 @@ lack of time, resources, and interest.
       </para>
     </sect2>
 
+<!-- ############UNIMPLEMENTED FEATURES ###################
+
     <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: 
+	available to meet with you. 
       </para>
+      <note>
+	<title>Unimplemented Feature</title>
+	<para>This feature is not yet implemented.</para>
+      </note>
+
       <para>
-	In addition, you can use
-	<application>Evolution</application> to mark a meeting
-	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.
-	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.
+	In addition, you can use <application>Evolution</application>
+	to mark a meeting request on another person's calendar.  To do
+	it, click <guibutton>New</guibutton> in the calendar toolbar,
+	or select <menuchoice> <guimenu>File</guimenu>
+	<guisubmenu>New</guisubmenu>
+	<guimenuitem>Appointment</guimenuitem> </menuchoice> 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!)
+	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 deselect the
+	event.
       </para>
     </sect2>
 
+
     <sect2 id="usage-calendar-apts-privs">
       <title>Scheduling privileges</title>
       <para>
@@ -209,16 +219,21 @@ lack of time, resources, and interest.
 	at all.
       </para>
     </sect2>
+ ########## END UNIMPLEMENTED FEATURESET ############ -->
+
   </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.
+       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
+       information), 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>
@@ -269,24 +284,55 @@ lack of time, resources, and interest.
     <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.
+       calendar window.  To view or edit a detailed description of 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>
+  <sect1 id="usage-calendar-multiple">
+    <title>Multiple Calendars</title>
     <para>
-       Until I have <application>Evolution</application> running properly,
-       I have no idea how this sort of organization will actually work.
+       <application>Evolution</application> permits you to have and
+       maintain multiple calendars.  This is useful if you maintain
+       schedules for other people, if you are responsible for resource
+       or room allocation, or if you have multiple personalities.
     </para>
+   
+    <example>
+      <title>Keeping Multiple Calendars</title>
+      <para>
+        Keelyn has one calendar for her own schedule.  Next to that
+        she maintains one for the conference room, so people know when
+        they can schedule meetings.  On the local network, she
+        maintains a calendar that reflects when consultants are going
+        to be on site, and another that keeps track of the various
+        company managers, so that people know where to find each
+        other.
+      </para>
+    </example>
     <para>
-       But this section will have at least two paragraphs, and
-       probably a screenshot.
+      To create a new calendar, select 
+      <menuchoice>
+	<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.
     </para>
+    
   </sect1>
 </chapter>
 
 
+
+
+
+
+
+
+
+
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 30729f96ab..07bc5af973 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -1,6 +1,6 @@
-
-<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
- uncomment this during validation and debugging -->
+<!--  DEBUGGING COMMENT
+<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
+-->
 
 <chapter id="usage-contact">
   <title>The Evolution Contact Manager</title>
@@ -8,13 +8,13 @@
     <para>
       The <application>Evolution</application> contact manager can
       handle all of the functions of an address book, phone book, or
-      Rolodex.  Of course, <application>Evolution</application> allows
-      easier updates than an actual paper book. <application>
-      Evolution </application> also allows easy synchronization with
-      handheld and remote devices.  Since
-      <application>Evolution</application> supports most major network
-      protocols, including <glossterm>LDAP</glossterm>, it's easy to
-      use over an existing network.
+      Rolodex.  Of course, it's a lot easier to update
+      <application>Evolution</application> than it is to change an
+      actual paper book. <application>Evolution</application> also
+      allows easy synchronization with handheld and remote devices.
+      Since <application>Evolution</application> supports most major
+      network protocols, including <glossterm>LDAP</glossterm>, it can
+      fit into almost any existing network.
     </para>
     <para>
       Another advantage of the <application>Evolution</application>
@@ -70,7 +70,7 @@
          </para></listitem>
 	
 	<listitem><para>
-	    Press <guibutton>Print</guibutton> to print.
+	    Press <guibutton>Print</guibutton> to print one or more cards.
 	</para></listitem>
         <listitem><para>
            <guibutton>Delete</guibutton> deletes a selected card.
@@ -79,10 +79,10 @@
     </para>
     <para>
        The last feature is <guilabel>Quick Search</guilabel>; to use
-       it, just type in the person you're looking for and hit
-       <keycap>Enter</keycap>.  <application>Evolution</application>
-       will search through the name fields of all the cards to find
-       one that matches.  The search is currently case-sensitive.
+       it, just type in the name of the person you're looking for and
+       hit <keycap>Enter</keycap>.
+       <application>Evolution</application> will search through all
+       the cards to find one that matches.
     </para>
     <para>
        If there are no matches, the card display will be blank.  To
@@ -163,30 +163,30 @@
         box with a few text boxes:
         <variablelist>
           <varlistentry>
-	    <term><guilabel>Title:</guilabel></term>
+	    <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>
+           <term><guilabel>First: </guilabel></term>
 	    <listitem> <para>The person's first, or given, name.
     	  </para></listitem>
           </varlistentry>
           <varlistentry>
-             <term><guilabel>Middle:</guilabel></term>
+             <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>
+           <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>
+          <term><guilabel>Suffix: </guilabel></term>
 	  <listitem> <para>
             Suffixes such as "Jr." or "III" can go here. 
 	  </para></listitem>
@@ -293,9 +293,12 @@
        mail.  You can have folders and searches the same way you can
        with mail, but the contact manager does not allow vFolders.  It
        does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.  We'll
-       go over categories in a bit.
+       categories, and allow you to create your own categories.
+       Categories are discussed <xref
+       linkend="usage-contact-organize-group-category">.
     </para>
+
+<!--
     <para>
       Another useful UNIMPLEMENTED
       <application>Evolution</application> feature is its ability to
@@ -305,15 +308,16 @@
       will ask you if you wish to change the address for all of them,
       or just for one.
     </para>
+-->
 
     <sect2 id="usage-contact-organize-group">
       <title>Groups of contacts</title>
       <para>
-         <application>Evolution</application> lets you put cards into
-         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.
+         <application>Evolution</application> offers two ways for you
+         to organize your cards.  The first way is to use folders;
+         this works the same way that mail folders do.  For more
+         flexibility, you can also mark contacts as members of
+         different categories.
       </para>
 
       <sect3 id="usage-contact-organize-group-folder">
@@ -321,20 +325,23 @@
 	<para>
 	   The simplest way to group address cards is to use folders.
 	   By default, cards start in the
-	   <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.  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.
+	   <guilabel>Contacts</guilabel> folder.  If you've read <xref
+	   linkend="usage-mainwindow"> then you already know that you
+	   can create a new folder by selecting 
+           <menuchoice>
+           <guimenu>File</guimenu>
+	   <guisubmenu>New</guisubmenu>
+	   <guimenuitem>Folder</guimenuitem>
+           </menuchoice>
+           and that you can put new folders anywhere you like.  Note
+	   that each card must be in one and only one folder, unless
+	   you want to have duplicate cards.
 	 </para>
 	<para>
           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.
+          folder view.  Remember that contact cards can only go in
+          contact folders, just like mail can only go in mail folders,
+          and calendars in calendar folders.
          </para>
       </sect3>
       
@@ -351,6 +358,7 @@
            the "Friends" category, because he's also my friend, and
            the "Frequent" category, because I call him all the time
            and can never remember his phone number.  
+        </para>
 	<para>
            To mark a card as belonging to a category, click the
            <guibutton>Categories</guibutton> button at the lower
@@ -410,7 +418,7 @@
     <para>
        Of course, you don't want to share all of your cards&mdash; why
        overload the network with a list of babysitters, or tell
-       everyone on your network you're talking to new job prospects?
+       everyone in the office you're talking to new job prospects?
        <application>Evolution</application> lets you decide which
        folders you want to make accessible to others.
     </para>
@@ -422,11 +430,12 @@
   </sect1>
 
   <sect1 id="usage-contact-automate">
-    <title>Automating the Contact Manager</title>
+    <title>Extra Contact Manager Tools</title>
     <para>
-       In addition to working with the mailer and the calendar to add
-       new cards quickly, the contact manager can do some pretty cool
-       stuff on its own. (FIXME: This para is terrible)
+       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.
     </para>
 
     <sect2 id="contact-automation-basic">
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 16edcf15ca..bd00601fb3 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -108,12 +108,26 @@
 	you've done so, the <interface>mail setup
 	assistant</interface> will ask you for the information it
 	needs to check your mail (see <xref
-	linkend="config-setupassist"> for more information).  Then,
+	linkend="config-setupassist"> for more information). You'll
+	need to enter your password.  Then,
 	<application>Evolution</application> will download your mail.
 	New mail will appear in your <interface>Inbox</interface>.
-        <!-- FIXME: add mention of Today if Today feature appears -->
+	<!-- FIXME: add mention of Today if Today feature appears -->
+      </para>
+      <para>
+        Once you've entered your password,
+        <application>Evolution</application> will hold it in memory so
+        that you don't have to retype it every time you want to check
+        mail.  It will only remember the password until you quit the
+        application; each time you run
+        <application>Evolution</application>, you need to re-enter
+        your password.  If you'd like
+        <application>Evolution</application> to forget your password
+        sooner, select
+        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Forget
+        Passwords</guimenuitem></menuchoice>, and it will do so
+        immediately.
       </para>
-
       <para>
 	If you get an error message instead of mail, you probably
 	need to change your network settings.  To learn how to
@@ -246,10 +260,10 @@
           added to the appropriate form field.
         </para>
 	<para>
-          For more information about using email
-	  together with the contact manager and the calendar, see
-	  <xref linkend="usage-contact-automate"> and <xref
-	  linkend="usage-calendar-apts-group">.
+          For more information about using email together with the
+	  contact manager and the calendar, see <xref
+	  linkend="usage-contact-automate"> and <xref
+	  linkend="usage-calendar-apts">.
 	</para>
 
 	<sect4 id="usage-mail-getnsend-send-to-mult">
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index e9d2babb3b..bc6b6c27d4 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -174,7 +174,19 @@ Can these things be labelled with little arrows & stuff?
       the <guimenuitem>Show Shortcut Bar</guimenuitem> toggle in the
       <guimenu>View</guimenu> menu.
     </para>
- </sect1>
+
+    <tip>
+       <title>Two Shortcut Bar Tricks</title>
+       <para>
+         To remove a shortcut from the shortcut bar, right-click on it
+         and select <guimenuitem>Remove</guimenuitem>.  </para>
+       <para>
+         To change the way the shortcut bar looks, right-click in the
+         shortcut bar but not on a button.  From the menu that
+         appears, you can select icon sizes.
+       </para>
+    </tip>
+  </sect1>
 
   <sect1 id="usage-mainwindow-folderview">
     <title>The Folder View</title>
@@ -187,7 +199,7 @@ Can these things be labelled with little arrows & stuff?
       at the top, and branches downwards. On most computers, there
       will be three folders at the base.  The first one is
       <guilabel>VFolders</guilabel>, for virtual folders (discussed in
-      <xref linkend="usage-mail-vfolders">.  The next one is
+      <xref linkend="usage-mail-organize-vfolders">.  The next one is
       <guilabel>External Directories</guilabel>, which (FIXME: What is
       this for?). The most important one is probably
       <guilabel>Local</guilabel>, which contains all the data that's
diff --git a/help/C/usage-notes.sgml b/help/C/usage-notes.sgml
index 184d0c5709..a4161da810 100644
--- a/help/C/usage-notes.sgml
+++ b/help/C/usage-notes.sgml
@@ -3,11 +3,11 @@
   <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:
+      In the dark ages before email was invented, there were notes.
+      Even now, notes are an almost necessary part of our lives.  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>
@@ -34,7 +34,7 @@
      </itemizedlist>
    </para>
    <para>
-     You can start reading notes by clicking <guibutton>Notes</guibutton> in the
+     You can start writing notes by clicking <guibutton>Notes</guibutton> in the
      shortcut bar.
    </para>
   </abstract>