Overhaul. Now accurate and truthful and clear.

2001-02-09  Aaron Weber  <aaron@helixcode.com>

	* C/config-sync.sgml: Overhaul. Now accurate and truthful and clear.

	* C/usage-calendar.sgml: Minor Changes.

svn path=/trunk/; revision=8155

6 files changed, 136 insertions, 58 deletions

diff --git a/help/C/config-sync.sgml b/help/C/config-sync.sgml
index 8fcf94e3af..68d4ebdb88 100644
--- a/help/C/config-sync.sgml
+++ b/help/C/config-sync.sgml
@@ -2,57 +2,118 @@
      <title>Setting up your synchronization system</title> 
      <para>
         Synchronization presents you with two issues you'll need to
-        deal with.  The first one is pretty simple: you'll need to get
-        the data to move among the various devices you're using.  If
-        you've already got <application>Gnome-Pilot</application>
-        working, then all you have to do is tell it to use the
-        <application>Evolution</application>
-        <glossterm>conduit</glossterm>.  If you haven't used
-        <application>Gnome-Pilot</application> before, you'll need to
-        run the GNOME <application>Control Center</application> and go
-        through the hand-held device setup assistant.  Then you can
-        select the Evolution conduit and press the hotsync button.
+        deal with. 
+        <simplelist>
+          <member>
+            Your computer needs to recognize and access your handheld.
+            At this time, <application>Evolution</application> only
+            supports Palm-OS devices like the PalmPilot and the
+            Handspring Visor.
+          </member>
+          <member>
+           You should decide what sort of synchronization behavior you
+           want.
+          </member>
+        </simplelist>
+
+    </para>
+    <para>
+       If you haven't used a handheld device with your computer
+       before, you'll need to run the GNOME <application>Control
+       Center</application> and make sure that <application>Pilot
+       Link</application> is properly configured. Then, select the
+       <application>Evolution</application> conduits under the
+       <guilabel>Pilot Conduits</guilabel> section of the Control
+       Center.
       </para>
-      <para>
-        If that doesn't work, jump up and down several times and swear
-        loudly.  Then make sure you've got
-        <application>Gnome-Pilot</application> going to the right
-        device (for my serial port, it's /dev/ttys0, not the default
-        /dev/pilot) and that you have read and write permission on
-        that device.  If you don't, you'll need to be added to whatever
-        group has those permissions (probably tty).
-     </para>
      <para>
-        Once <application>Evolution</application> knows how to get the
-        mail, address, and calendar data, it needs to know what to do
-        with it.  When you synchronize your local data with the data
-        on a server or handheld device, you may run into conflicts:
-        perhaps you have ended up with two cards with the same name
-        and different addresses, or old mail that has been deleted
-        from one device but not the other.  What if you want to keep
-        only the a few contacts or messages on your hand-held or your
-        laptop, but keep all the data server or your desktop machine?
-        Select the <guibutton>Synchronization</guibutton> tab from the
-        <interface>Preferences</interface> window to set up the
-        conflict resolution preferences.
-     </para>
-      <para> 
-         You can set <application>Evolution</application>'s
-         synchronization behavior in the following ways: 
-         <!-- LIST HERE -->
-      </para>
+        Once your computer and your Palm-OS device are talking happily
+        to each other, you'll have to decide what exactly you want
+        them to do with the data they exchange.  Your options may vary
+        depending on the conduit, but typically they will be:
+
+        <variablelist>
+         <varlistentry>
+            <term>Disabled </term>
+            <listitem> 
+               <para>
+                  Do nothing.
+               </para>
+            </listitem>
+          </varlistentry>
+
+         <varlistentry>
+            <term>Synchronize</term>
+            <listitem> 
+               <para>
+                  Copy new data from the computer to the handheld, and
+                  from the handheld to the computer.  Remove items
+                  that were on both systems but have been deleted on
+                  one.
+               </para>
+            </listitem>
+          </varlistentry>
+
+         <varlistentry>
+            <term>Copy From Pilot</term>
+            <listitem> 
+               <para>
+                  If there is any new data on the the handheld device,
+                  copy it to the computer.
+               </para>
+            </listitem>
+          </varlistentry>
+
+         <varlistentry>
+            <term>Copy To Pilot</term>
+            <listitem> 
+               <para>
+                 Copy new data from the computer to the handheld. 
+               </para>
+            </listitem>
+          </varlistentry>
+
+         <varlistentry>
+            <term>Merge From Pilot</term>
+            <listitem> 
+               <para>
+                  Copy new data from the handheld to the computer, and
+                  remove any information from the computer that has
+                  been deleted on the handheld.
+               </para>
+            </listitem>
+          </varlistentry>
+
+         <varlistentry>
+            <term>Merge To Pilot</term>
+            <listitem> 
+               <para>
+                  Copy new data from the computer to the handheld, and
+                  remove any information from the handheld that has
+                  been deleted on the computer.
+               </para>
+            </listitem>
+          </varlistentry>
+
+    </para>
+
+    <para>
+      Select a behavior for each conduit available.  For the most
+      part, you'll want to stick with
+      <guilabel>Synchronize</guilabel>.  Then, put your handheld on
+      its cradle and press the synchronization button.
+    </para>
+
+
       <para> 
          <warning> 
 	  <title>Data Loss Prevention</title> 
 	  <para>
-	    It's always a good idea to make a backup.  If you set your
-	    synchronization behaviors wrong, you could end up deleting
-	    the messages and cards you want to keep, and keeping the
-	    ones you want to delete.  Before you change these
-	    preferences, make a backup of your the
-	    <systemitem><filename>evolution</filename></systemitem>
-	    directory.
+	    It's always a good idea to make a backup.  To do that,
+	    make a copy of your <systemitem>
+	    <filename>~/evolution</filename> </systemitem> directory.
           </para>
 	</warning>
        </para>
+
     </chapter>
diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml
index 77dc66c1d5..d82191cb17 100644
--- a/help/C/menuref.sgml
+++ b/help/C/menuref.sgml
@@ -173,7 +173,7 @@
    <para>
      We'll leave this section blank until the UI stabilizes a little
      more.
-   <para>
+   </para>
   </sect1>
 
 
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 8bcda744d0..409d63bf90 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -37,11 +37,12 @@
        the small calendar at the upper right.
     </para>
     <para>
-       To view yesterday's appointments, &mdash;last week's, if you're in
-       the weekly view, and last month's for the monthly view&mdash; click
-       the <guibutton>Prev</guibutton> button.  For tomorrow, next week,
-       or next month, click <guibutton>Next</guibutton>, and of course,
-       click <guibutton>Today</guibutton> for today.
+       To view yesterday's appointments, &mdash;last week's, if you're
+       in the weekly view, and last month's for the monthly
+       view&mdash; click the <guibutton>Prev</guibutton> button.  For
+       tomorrow, next week, or next month, click
+       <guibutton>Next</guibutton>.  Of course, click
+       <guibutton>Today</guibutton> for today.
     </para>
     <para>
        To visit a specific date's calendar entries, click
@@ -177,10 +178,13 @@ lack of time, resources, and interest.
       <para>
         The <guilabel>Recurrence</guilabel> tab lets you describe
         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.
+        every 100 years.  You can then choose a time and date when the
+        event will stop recurring, and, under
+        <guilabel>Exceptions</guilabel>, pick individual days when the
+        event will <emphasis>not</emphasis> recur. Make your
+        selections from left to right, and you'll form a sentence:
+        "Every two weeks on Monday and Friday until January 3, 2003"
+        or "Every month on the first Friday for 12 occurrences."
       </para>
 
       <para>
@@ -258,7 +262,7 @@ lack of time, resources, and interest.
        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.  You can also see the
+       synchronization with a hand-held device.  You can also use the
        list in a larger format by choosing the
        <guibutton>Tasks</guibutton> button in the shortcut bar or in
        the folder tree.
@@ -331,7 +335,7 @@ lack of time, resources, and interest.
     <example>
       <title>Keeping Multiple Calendars</title>
       <para>
-        Keelyn. the office manager for a small company, has one
+        Keelyn, the office manager for a small company, has one
         calendar for her own schedule.  On the local network, she
         maintains one for the conference room, so people know when
         they can schedule meetings.  Next to that, she maintains a
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
index 2b16ffa98d..3cdb1a5cb6 100644
--- a/help/C/usage-exec-summary.sgml
+++ b/help/C/usage-exec-summary.sgml
@@ -1,4 +1,4 @@
-<chapter="usage-exec-summary">
+<chapter id="usage-exec-summary">
    <title>The Executive Summary</title>
     <para>
       The Evolution Executive Summary is designed to show you a
@@ -24,3 +24,10 @@
      </para>
    </sect1>
 </chapter>
+
+
+
+
+
+
+
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 7fabfed099..71163e1975 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -108,7 +108,7 @@
 	 <para>
 	 To look at the entire source of your email message, including
 	 all the header information, select
-	 <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenu></menuchoice>
+	 <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenuitem></menuchoice>
 	 </para>
 	 </tip>
        </para>
diff --git a/help/ChangeLog b/help/ChangeLog
index fdcb46140d..22a8b99862 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-09  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-sync.sgml: Overhaul. Now accurate and truthful and clear.
+
+	* C/usage-calendar.sgml: Minor Changes.
+
 2001-02-08  Aaron Weber  <aaron@helixcode.com>
 
 	* C/usage-contact.sgml: Minor Changes.