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
Binary files a/doc/C/fig/mail-inbox.png and b/doc/C/fig/mail-inbox.png differ
diff --git a/doc/C/fig/mainwindow-pic.png b/doc/C/fig/mainwindow-pic.png
index 616b310031..18b68c96a5 100644
Binary files a/doc/C/fig/mainwindow-pic.png and b/doc/C/fig/mainwindow-pic.png differ
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 @@
+
+ Evolution Interface Introduction
+
+ Evolution follows a consistent UI. This means
+ that in each component, you will find many UI characteristics the same as
+ others components.
+
+
+
+ Evolution's Interface
+
+ Inbox
+
+
+
+
+
+
+
+ Menubar
+
+
+
+ The Menubar gives you access to nearly all the
+ features that can be found in Evolution.
+
+
+
+
+ Toolbar
+
+
+
+ The Toolbar gives you fast and easy access to the
+ most used features in each component.
+
+
+
+
+ Shortcut Bar
+
+
+
+ The Shortcut Bar lets you go to your favorite
+ components with a click of a button. You can even add your favorite
+ folders to the Shortcut Bar.
+
+
+
+
+ Status Bar
+
+
+
+ Periodically, Evolution 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 Status Bar.
+
+
+
+
+ Search Bar
+
+
+
+ The Search Bar lets you search through your email
+ with precision so you can easily find what you're looking for.
+
+
+
Quick Reference for Common Tasks
- 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
- Evolution. Read 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
+ Evolution. Read if
+ you would like a complete list of keyboard shortcuts for menu commands.
-
+
Opening or Creating Anything
-
+
@@ -415,7 +485,7 @@
-
+
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 @@
Evolution Contact InterfaceEvolution Contact List Window
-
+
-
+ Contact List
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 @@
Evolution MailInbox
-
+
-
+
-
+ -->
+
+
-
+ Email Viewer
@@ -152,7 +153,7 @@
-
+ Email List
@@ -161,18 +162,18 @@
have. This includes all your read, unread, and email that is flagged to
be deleted.
+
+
-
-
+
+ The Search Bar lets you search through your email
+ with precision so you can easily find what you're looking for.
+
+ -->
Most of the mail-related actions you'll want to perform are
listed in the Message 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
Binary files a/help/C/fig/mail-inbox.png and b/help/C/fig/mail-inbox.png differ
diff --git a/help/C/fig/mainwindow-pic.png b/help/C/fig/mainwindow-pic.png
index 616b310031..18b68c96a5 100644
Binary files a/help/C/fig/mainwindow-pic.png and b/help/C/fig/mainwindow-pic.png differ
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 @@
+
+ Evolution Interface Introduction
+
+ Evolution follows a consistent UI. This means
+ that in each component, you will find many UI characteristics the same as
+ others components.
+
+
+
+ Evolution's Interface
+
+ Inbox
+
+
+
+
+
+
+
+ Menubar
+
+
+
+ The Menubar gives you access to nearly all the
+ features that can be found in Evolution.
+
+
+
+
+ Toolbar
+
+
+
+ The Toolbar gives you fast and easy access to the
+ most used features in each component.
+
+
+
+
+ Shortcut Bar
+
+
+
+ The Shortcut Bar lets you go to your favorite
+ components with a click of a button. You can even add your favorite
+ folders to the Shortcut Bar.
+
+
+
+
+ Status Bar
+
+
+
+ Periodically, Evolution 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 Status Bar.
+
+
+
+
+ Search Bar
+
+
+
+ The Search Bar lets you search through your email
+ with precision so you can easily find what you're looking for.
+
+
+
Quick Reference for Common Tasks
- 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
- Evolution. Read 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
+ Evolution. Read if
+ you would like a complete list of keyboard shortcuts for menu commands.
-
+
Opening or Creating Anything
-
+
@@ -415,7 +485,7 @@
-
+
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 @@
Evolution Contact InterfaceEvolution Contact List Window
-
+
-
+ Contact List
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 @@
Evolution MailInbox
-
+
-
+
-
+ -->
+
+
-
+ Email Viewer
@@ -152,7 +153,7 @@
-
+ Email List
@@ -161,18 +162,18 @@
have. This includes all your read, unread, and email that is flagged to
be deleted.
+
+
-
-
+
+ The Search Bar lets you search through your email
+ with precision so you can easily find what you're looking for.
+
+ -->
Most of the mail-related actions you'll want to perform are
listed in the Message menu in the menu