Updated screenshots and redid layout for graphics on pages.

	2001-06-21  battery841  <battery841@mediaone.net>

	* C/preface.sgml, C/fig/mail-inbox.png, C/fig/mainwindow-pic.png, C/usage-mail.sgml: Updated screenshots and redid layout for graphics on pages.

svn path=/trunk/; revision=10394

12 files changed, 200 insertions, 56 deletions

diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 67b44d27b3..60158b03ce 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -5,6 +5,7 @@ GUIDE_SGML_FILES =		\
 	apx-authors.sgml	\
 	apx-bugs.sgml		\
 	apx-gloss.sgml		\
+	config-encryption.sgml	\
 	config-prefs.sgml	\
 	config-setupassist.sgml	\
 	config-sync.sgml	\
diff --git a/doc/C/fig/mail-inbox.png b/doc/C/fig/mail-inbox.png
index 79e4cdbad7..7659cb003a 100644
--- a/doc/C/fig/mail-inbox.png
+++ b/doc/C/fig/mail-inbox.png
diff --git a/doc/C/fig/mainwindow-pic.png b/doc/C/fig/mainwindow-pic.png
index 616b310031..18b68c96a5 100644
--- a/doc/C/fig/mainwindow-pic.png
+++ b/doc/C/fig/mainwindow-pic.png
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index fe104d6819..2568b1ac77 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -173,21 +173,91 @@
         </para>
       </formalpara>
   </sect1>
+  <sect1 id="ui-intro">
+    <title>Evolution Interface Introduction</title>
+    <para>
+      <application>Evolution</application> follows a consistent UI.  This means
+      that in each component, you will find many UI characteristics the same as
+      others components.
+    </para>
+
+    <figure id="preface-basic-interface">
+      <title>Evolution's Interface</title>
+      <screenshot>
+	<screeninfo>Inbox</screeninfo>
+	<graphic fileref="fig/mainwindow-pic.png" srccredit="Kevin Breit">
+	</graphic>
+      </screenshot>
+    </figure>
+    
+    <para>
+      <inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
+      <guilabel>Menubar</guilabel>
+    </para>
+    
+    <para>
+      The <guilabel>Menubar</guilabel> gives you access to nearly all the
+      features that can be found in <application>Evolution</application>.
+    </para>
+
+    <para>
+      <inlinegraphic fileref="fig/full-2.png"></inlinegraphic>
+      <guilabel>Toolbar</guilabel>
+    </para>
+
+    <para>
+      The <guilabel>Toolbar</guilabel> gives you fast and easy access to the
+      most used features in each component.
+    </para>
+    
+    <para>
+      <inlinegraphic fileref="fig/full-3.png"></inlinegraphic>
+      <guilabel>Shortcut Bar</guilabel>
+    </para>
+    
+    <para>
+      The <guilabel>Shortcut Bar</guilabel> lets you go to your favorite
+      components with a click of a button.  You can even add your favorite
+      folders to the <guilabel>Shortcut Bar</guilabel>.
+    </para>
+    
+    <para>
+      <inlinegraphic fileref="fig/full-4.png"></inlinegraphic>
+      <guilabel>Status Bar</guilabel>
+    </para>
+    
+    <para>
+      Periodically, <application>Evolution</application> will need to quietly
+      display a message, or tell you the progress of something.  This most
+      often happens when you're checking or sending email.  These progress
+      queues are shown here, in the <guilabel>Status Bar</guilabel>.  
+    </para>
+    
+    <para>
+      <inlinegraphic fileref="fig/full-5.png"></inlinegraphic>
+      <guilabel>Search Bar</guilabel>
+    </para>
+    
+    <para>
+      The <guilabel>Search Bar</guilabel> lets you search through your email
+      with precision so you can easily find what you're looking for.
+    </para>
+  </sect1>
+
   <sect1 id="commontasks">
     <title>Quick Reference for Common Tasks</title>
     <para>
-        You might want to copy this section and tape it to the wall
-        next to your computer: it's a very short summary of most of
-        the things you'll want to do with
-        <application>Evolution</application>.  Read <xref
-        linkend="menuref"> if you would like a complete list of
-        keyboard shortcuts for menu commands.
+      You might want to copy this section and tape it to the wall
+      next to your computer: it's a very short summary of most of
+      the things you'll want to do with
+      <application>Evolution</application>.  Read <xref linkend="menuref"> if
+        you would like a complete list of keyboard shortcuts for menu commands.
     </para>
-
+    
     <sect2 id="quickref-newthings">
       <title>Opening or Creating Anything</title>
       <para>
-         
+	
           <variablelist>
 
 	  <varlistentry>
@@ -415,7 +485,7 @@
 	    </listitem>
 	    </varlistentry>
 	  </variablelist>
-
+	  
 
         </para>
       </sect2>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index dacc0d2ea2..887050fc5c 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -42,13 +42,13 @@
       <title>Evolution Contact Interface</title>
       <screenshot>
 	<screeninfo>Evolution Contact List Window</screeninfo>
-	<graphic fileref="fig/contact" format="png" srccredit="Kevin Breit">
+	<graphic fileref="fig/contact.png" srccredit="Kevin Breit">
 	</graphic>
       </screenshot>
     </figure>
 
     <para>
-      <inlinegraphic fileref="fig/fill-1.png"></inlinegraphic>
+      <inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
       <guilabel>Contact List</guilabel>
     </para>
 
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 765773a222..e9d8da7df1 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -89,12 +89,12 @@
 	  <title>Evolution Mail</title>
 	  <screenshot>
 	    <screeninfo>Inbox</screeninfo>
-	    <graphic fileref="fig/mainwindow-pic.png" srccredit="Kevin Breit">
+	    <graphic fileref="fig/mail-inbox.png" srccredit="Kevin Breit">
 	</graphic>
 	</screenshot>
       </figure>
 <!-- ==============End of Figure============================== -->
-
+<!--
       <para>
 	<inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
 	<guimenu>Menu Bar</guimenu>
@@ -139,11 +139,12 @@
 	display a message, or tell you the progress of something.  This most
 	often happens when you're checking or sending email.  These progress
 	queues are shown here, in the <guilabel>Status Bar</guilabel>.  
-	<!-- This sucks, rewrite this paragraph! -->
       </para>
-      
+    -->  
+
+
       <para>
-	<inlinegraphic fileref="fig/full-5.png"></inlinegraphic>
+	<inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
 	<guilabel>Email Viewer</guilabel>
       </para>
       
@@ -152,7 +153,7 @@
       </para>
 
       <para>
-	<inlinegraphic fileref="fig/full-6.png"></inlinegraphic>
+	<inlinegraphic fileref="fig/full-2.png"></inlinegraphic>
 	<guilabel>Email List</guilabel>
       </para>
       
@@ -161,18 +162,18 @@
 	have.  This includes all your read, unread, and email that is flagged to
 	be deleted.
       </para>
+
+      <!--
+    <para>
+    <inlinegraphic fileref="fig/full-7.png"></inlinegraphic>
+    <guilabel>Search Bar</guilabel>
+    </para>
       
-      <para>
-	<inlinegraphic fileref="fig/full-7.png"></inlinegraphic>
-	<guilabel>Search Bar</guilabel>
-      </para>
-      
-      <para>
-	The <guilabel>Search Bar</guilabel> lets you search through your email
-	with precision so you can easily find what you're looking for.
-	<!-- End Marketing Sounding Stuff Here -->
-      </para>
-      
+    <para>
+      The <guilabel>Search Bar</guilabel> lets you search through your email
+      with precision so you can easily find what you're looking for.
+    </para>
+      -->      
       <para>
 	Most of the mail-related actions you'll want to perform are
 	listed in the <guimenu>Message</guimenu> menu in the menu
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index 67b44d27b3..60158b03ce 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -5,6 +5,7 @@ GUIDE_SGML_FILES =		\
 	apx-authors.sgml	\
 	apx-bugs.sgml		\
 	apx-gloss.sgml		\
+	config-encryption.sgml	\
 	config-prefs.sgml	\
 	config-setupassist.sgml	\
 	config-sync.sgml	\
diff --git a/help/C/fig/mail-inbox.png b/help/C/fig/mail-inbox.png
index 79e4cdbad7..7659cb003a 100644
--- a/help/C/fig/mail-inbox.png
+++ b/help/C/fig/mail-inbox.png
diff --git a/help/C/fig/mainwindow-pic.png b/help/C/fig/mainwindow-pic.png
index 616b310031..18b68c96a5 100644
--- a/help/C/fig/mainwindow-pic.png
+++ b/help/C/fig/mainwindow-pic.png
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index fe104d6819..2568b1ac77 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -173,21 +173,91 @@
         </para>
       </formalpara>
   </sect1>
+  <sect1 id="ui-intro">
+    <title>Evolution Interface Introduction</title>
+    <para>
+      <application>Evolution</application> follows a consistent UI.  This means
+      that in each component, you will find many UI characteristics the same as
+      others components.
+    </para>
+
+    <figure id="preface-basic-interface">
+      <title>Evolution's Interface</title>
+      <screenshot>
+	<screeninfo>Inbox</screeninfo>
+	<graphic fileref="fig/mainwindow-pic.png" srccredit="Kevin Breit">
+	</graphic>
+      </screenshot>
+    </figure>
+    
+    <para>
+      <inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
+      <guilabel>Menubar</guilabel>
+    </para>
+    
+    <para>
+      The <guilabel>Menubar</guilabel> gives you access to nearly all the
+      features that can be found in <application>Evolution</application>.
+    </para>
+
+    <para>
+      <inlinegraphic fileref="fig/full-2.png"></inlinegraphic>
+      <guilabel>Toolbar</guilabel>
+    </para>
+
+    <para>
+      The <guilabel>Toolbar</guilabel> gives you fast and easy access to the
+      most used features in each component.
+    </para>
+    
+    <para>
+      <inlinegraphic fileref="fig/full-3.png"></inlinegraphic>
+      <guilabel>Shortcut Bar</guilabel>
+    </para>
+    
+    <para>
+      The <guilabel>Shortcut Bar</guilabel> lets you go to your favorite
+      components with a click of a button.  You can even add your favorite
+      folders to the <guilabel>Shortcut Bar</guilabel>.
+    </para>
+    
+    <para>
+      <inlinegraphic fileref="fig/full-4.png"></inlinegraphic>
+      <guilabel>Status Bar</guilabel>
+    </para>
+    
+    <para>
+      Periodically, <application>Evolution</application> will need to quietly
+      display a message, or tell you the progress of something.  This most
+      often happens when you're checking or sending email.  These progress
+      queues are shown here, in the <guilabel>Status Bar</guilabel>.  
+    </para>
+    
+    <para>
+      <inlinegraphic fileref="fig/full-5.png"></inlinegraphic>
+      <guilabel>Search Bar</guilabel>
+    </para>
+    
+    <para>
+      The <guilabel>Search Bar</guilabel> lets you search through your email
+      with precision so you can easily find what you're looking for.
+    </para>
+  </sect1>
+
   <sect1 id="commontasks">
     <title>Quick Reference for Common Tasks</title>
     <para>
-        You might want to copy this section and tape it to the wall
-        next to your computer: it's a very short summary of most of
-        the things you'll want to do with
-        <application>Evolution</application>.  Read <xref
-        linkend="menuref"> if you would like a complete list of
-        keyboard shortcuts for menu commands.
+      You might want to copy this section and tape it to the wall
+      next to your computer: it's a very short summary of most of
+      the things you'll want to do with
+      <application>Evolution</application>.  Read <xref linkend="menuref"> if
+        you would like a complete list of keyboard shortcuts for menu commands.
     </para>
-
+    
     <sect2 id="quickref-newthings">
       <title>Opening or Creating Anything</title>
       <para>
-         
+	
           <variablelist>
 
 	  <varlistentry>
@@ -415,7 +485,7 @@
 	    </listitem>
 	    </varlistentry>
 	  </variablelist>
-
+	  
 
         </para>
       </sect2>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index dacc0d2ea2..887050fc5c 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -42,13 +42,13 @@
       <title>Evolution Contact Interface</title>
       <screenshot>
 	<screeninfo>Evolution Contact List Window</screeninfo>
-	<graphic fileref="fig/contact" format="png" srccredit="Kevin Breit">
+	<graphic fileref="fig/contact.png" srccredit="Kevin Breit">
 	</graphic>
       </screenshot>
     </figure>
 
     <para>
-      <inlinegraphic fileref="fig/fill-1.png"></inlinegraphic>
+      <inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
       <guilabel>Contact List</guilabel>
     </para>
 
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 765773a222..e9d8da7df1 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -89,12 +89,12 @@
 	  <title>Evolution Mail</title>
 	  <screenshot>
 	    <screeninfo>Inbox</screeninfo>
-	    <graphic fileref="fig/mainwindow-pic.png" srccredit="Kevin Breit">
+	    <graphic fileref="fig/mail-inbox.png" srccredit="Kevin Breit">
 	</graphic>
 	</screenshot>
       </figure>
 <!-- ==============End of Figure============================== -->
-
+<!--
       <para>
 	<inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
 	<guimenu>Menu Bar</guimenu>
@@ -139,11 +139,12 @@
 	display a message, or tell you the progress of something.  This most
 	often happens when you're checking or sending email.  These progress
 	queues are shown here, in the <guilabel>Status Bar</guilabel>.  
-	<!-- This sucks, rewrite this paragraph! -->
       </para>
-      
+    -->  
+
+
       <para>
-	<inlinegraphic fileref="fig/full-5.png"></inlinegraphic>
+	<inlinegraphic fileref="fig/full-1.png"></inlinegraphic>
 	<guilabel>Email Viewer</guilabel>
       </para>
       
@@ -152,7 +153,7 @@
       </para>
 
       <para>
-	<inlinegraphic fileref="fig/full-6.png"></inlinegraphic>
+	<inlinegraphic fileref="fig/full-2.png"></inlinegraphic>
 	<guilabel>Email List</guilabel>
       </para>
       
@@ -161,18 +162,18 @@
 	have.  This includes all your read, unread, and email that is flagged to
 	be deleted.
       </para>
+
+      <!--
+    <para>
+    <inlinegraphic fileref="fig/full-7.png"></inlinegraphic>
+    <guilabel>Search Bar</guilabel>
+    </para>
       
-      <para>
-	<inlinegraphic fileref="fig/full-7.png"></inlinegraphic>
-	<guilabel>Search Bar</guilabel>
-      </para>
-      
-      <para>
-	The <guilabel>Search Bar</guilabel> lets you search through your email
-	with precision so you can easily find what you're looking for.
-	<!-- End Marketing Sounding Stuff Here -->
-      </para>
-      
+    <para>
+      The <guilabel>Search Bar</guilabel> lets you search through your email
+      with precision so you can easily find what you're looking for.
+    </para>
+      -->      
       <para>
 	Most of the mail-related actions you'll want to perform are
 	listed in the <guimenu>Message</guimenu> menu in the menu