Fixed sig stuff here and in setupassist.

2000-09-20  Aaron Weber  <aaron@helixcode.com>

	* C/config-prefs.sgml: Fixed sig stuff here and in setupassist.

	* C/config-sync.sgml: Fixed description of conduit usage.

2000-09-18  Aaron Weber  <aaron@helixcode.com>

	* C/preface.sgml: Spelling fixes, etc.

svn path=/trunk/; revision=5518

5 files changed, 46 insertions, 35 deletions

diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index f41bf39185..fa3e118a15 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -127,7 +127,7 @@
               small text file to be appended to every message that you
               send.  Typically, signature files include address or
               other contact information, or a favorite quotation.
-              They should not be more than three lines long.
+              It's good form to keep it to four lines at the maximum.
             </para>
 	  </listitem>
 	</itemizedlist>
diff --git a/help/C/config-setupassist.sgml b/help/C/config-setupassist.sgml
index eb36872aa8..966c62cfc2 100644
--- a/help/C/config-setupassist.sgml
+++ b/help/C/config-setupassist.sgml
@@ -76,8 +76,9 @@
             <para>
              A text file appended to any email you send.  A signature
              file typically consists of your name and email address,
-             or a quotation you like.  It should be fewer than four
-             lines of text.
+             or a quotation you like.  It's good form to keep your
+             "sig" on the short side: four lines is plenty. Remeber,
+             this is attached to every email you send.
             </para>
          </listitem>
        </varlistentry>
diff --git a/help/C/config-sync.sgml b/help/C/config-sync.sgml
index ae78a6daaf..8fcf94e3af 100644
--- a/help/C/config-sync.sgml
+++ b/help/C/config-sync.sgml
@@ -1,19 +1,17 @@
   <chapter id="config-sync">
- 
-       <!-- THIS ENTIRE CHAPTER MAY BE DELETED -->
-
      <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 Evolution
-        as a conduit.  If you haven't used
+        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
-        create the Evolution conduit and press the hotsync button.
+        select the Evolution conduit and press the hotsync button.
       </para>
       <para>
         If that doesn't work, jump up and down several times and swear
@@ -21,26 +19,19 @@
         <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 (for my system, it's tty).
-        Alternately, if you're the only user of your computer and
-        don't care too much about security, just use
-        <command>su</command> to become root, and then use
-        <command>chmod a+rw /dev/[DEVICENAME]</command> to set
-        universal read and write permissions on that port&mdash; just
-        don't tell your sysadmin I said you could.  (Sysadmins, of
-        course, would never do such a thing.)
+        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 where 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:
+        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 most recent mail on your hand-held or your laptop,
-        but all the mail on the LDAP server or your desktop machine?
+        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.
@@ -58,9 +49,9 @@
 	    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
-	    <application>Evolution</application> files.  You can do
-	    this by... <!--DESCRIBE HERE -->
+	    preferences, make a backup of your the
+	    <systemitem><filename>evolution</filename></systemitem>
+	    directory.
           </para>
 	</warning>
        </para>
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 26a8006184..cf40c03d37 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -115,13 +115,14 @@
     <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* -->
       <para>
         This version of the <application>Evolution</application>
-        User's Guide is a <emphasis>draft</emphasis>.  It is missing
-        huge chunks of information, and many of the features it
-        describes are unimplemented.  All the content is subject to
-        change, especially if you help.  Please send comments on the
-        guide to <email>aaron@helixcode.com</email>. If you would like
-        to work on the guide please contact me or see the GNOME
-        Documentation project <ulink
+        User's Guide is a <emphasis>draft</emphasis>. It describes
+        version 0.5.1 of the software.  It is missing huge
+        chunks of information, and many of the features it describes
+        are unimplemented.  All the content is subject to change,
+        especially if you help.  Please send comments on the guide to
+        <email>aaron@helixcode.com</email>. If you would like to work
+        on the guide please contact me or see the GNOME Documentation
+        project <ulink
         url="http://developer.gnome.org/projects/gdp">web
         site</ulink>.  This paragraph will be removed in later
         versions of the manual.
@@ -361,7 +362,6 @@
       <sect2 id="quickref-cal">
         <title>Calendar</title>
         <para>
-
         <variablelist>
 	  <varlistentry>
 	    <term></term>
diff --git a/help/ChangeLog b/help/ChangeLog
index 1bc0f5df95..9b98a70bb0 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,9 +1,28 @@
+2000-09-20  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-prefs.sgml: Fixed sig stuff here and in setupassist.
+
+	* C/config-sync.sgml: Fixed description of conduit usage.
+
+2000-09-18  Aaron Weber  <aaron@helixcode.com>
+
+	* C/preface.sgml: Spelling fixes, etc.
+
+=======
 2000-09-19  Federico Mena Quintero  <federico@helixcode.com>
 
 	* C/Makefile.am: Fixed to install the stylesheet-images as well.
 
+>>>>>>> 1.26
 2000-09-07  Aaron Weber  <aaron@helixcode.com>
 
+	* C/fig/ New files: contact-editor.png, mail-composer.png,
+	filter-assist-fig.png, mail-inbox.png
+
+2000-09-07  Aaron Weber  <aaron@helixcode.com>
+
+	* C/preface.sgml: Redid "soft" intro stuff.
+
 	* C/evolution-guide.sgml: Accidentally broke docs, now valid.
 
 2000-09-06  Aaron Weber  <aaron@helixcode.com>