new file new file New directory, for figure graphics.

	* C/fig/mainwindow-pic.png: new file
	* C/fig/mail-druid-pic.png: new file
	* C/fig: New directory, for figure graphics.

	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.

	* C/usage-setup.sgml: More accurate description of druid, and
	moved to mail section-- see usage-mail.sgml entry.  This is a new
	location for this entity, and it may move more later.


	* C/usage-mainwindow.sgml: altered description of starting
	evolution. added screenshot for main-window picture.

	* C/usage-mail.sgml: added screenshots, added coverage of setup
	druid and put it into get-and-send section, which is probably not
	where it should stay.  Also started filter druid coverage and
	clarified examples, esp. in Bcc: section.

	* C/usage-contact.sgml: Clarified examples.

	* C/preface.sgml: rewording of "what is" and "about book" sections.

	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered
	phrasing in part intros, changed order of Setup-assistant section.

	* C/config-prefs.sgml: changed wording, removed ref. to re-running
	setup assistant.

svn path=/trunk/; revision=3222

1 files changed, 17 insertions, 24 deletions

diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml
index 67ca0e7577..8ca4dbbc7d 100644
--- a/doc/C/config-prefs.sgml
+++ b/doc/C/config-prefs.sgml
@@ -2,10 +2,11 @@
     <chapter id="config-prefs">
       <title>Advanced Configuration with the Preferences Window</title>
       <para>
-        If you prefer not to use the setup assistant, select
+        To change your configuration settings, select
         <guimenuitem>Preferences</guimenuitem> from the
-        <guimenu>Settings</guimenu> menu, and work your way through
-        the page tabs it offers you.  They are:
+        <guimenu>Settings</guimenu> menu.  This will open the
+        preferences window, illustrated in <xref linkend="config-prefs-fig">.
+        Preferences are seperated into several categories:
         <itemizedlist>
           <listitem>
 	    <para>
@@ -17,37 +18,31 @@
 
 	  <listitem>
 	    <para>
-              <guilabel>Network</guilabel>, which allows you to
-              specify your network settings.  There are no default
-              values for this information.
-             </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
               <guilabel>Mail</guilabel>, which allows you to specify
-              attachment and HTML handling, forwarding behavior,
-              filters, and other <application>Evolution</application>
-              behaviors specific to email.  The default behaviors are
-              those approved by Jamie Zawinski.
+              your email server and protocols, as well as attachment
+              and HTML handling, forwarding behavior, filters, and
+              other <application>Evolution</application> behaviors
+              specific to email.  The default behaviors are those
+              approved by Jamie Zawinski.
             </para>
 	  </listitem>
  
 	  <listitem>
 	    <para>
                <guilabel>Contacts</guilabel>, which allows you to
-               specify behavior that is specific to your contact
-               manager.
+               control addressbook sharing as well as other funcctions
+               specific to your contact manager.
             </para>
 	  </listitem>
 
 	  <listitem>
 	    <para>
               <guilabel>Calendar</guilabel>, which allows you to set
-              the way that your calendar will behave and appear.  The
-              default view is by week and the default calendar is
-              Western.  Date format is determined by the system clock
-              and localization, and cannot be set here.
+              up calendar networking, as well as the way that your
+              calendar will behave and appear.  The default view is by
+              week and the default calendar is Western.  Time and
+              date are determined by the system clock and
+              localization, and cannot be set here.
             </para>
 	  </listitem>
  
@@ -60,9 +55,7 @@
 	  </listitem>
 	</itemizedlist>
       
-        The <interface>Preferences Dialog</interface> is shown in
-        <xref linkend="config-prefs-fig">.
-      </para>
+    </para>
 
       <!-- ==============Figure===================== -->
       <figure id="config-prefs-fig">