diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 128dc24437..5b53ff727e 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -729,7 +729,7 @@ smtp.omniport.com:143
Search scope
- The scope of the search
+How broad the search is in the directory.
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 5c883fec47..574d7cedd5 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -418,7 +418,7 @@
many or as few categories as you like.
-
+ network directory. You do this by dragging and dropping your desired contacts into the local contacts list.
@@ -601,7 +600,7 @@
particular group if you choose.
-
+
+ Importing Your Old Email and Settings
+
+ Evolution allows you to import old email and data so that you don't need to worry about losing your old information.
+
+
+ Importing Email
+
+ Ximian Evolution can import the following types of
+ files:
+
+
+ VCard (.vcf, gcrd)
+
+
+ The addressbook format used by the GNOME, KDE, and
+ many other contact management applications. You
+ should be able to export to VCard format from any
+ address book application.
+
+
+
-
+
+ Microsoft Outlook Express 4 (.mbx)
+
+
+ Email file format used by Microsoft Outlook Express
+ 4. For other versions of Microsoft Outlook and Outlook Express, see
+ the workaround described in the note below.
+
+
+
+
+
+ MBox (mbox)
+
+
+ The email box format used by Mozilla, Netscape,
+ Ximian Evolution, Eudora, and many other email clients.
+
+
+
+
+
+
+ To import your old email:
+
+
+
+ Click FileImport.
+
+
+
+
+ Click Next after reading the Welcome screen.
+
+
+
+
+ Select Import a single file.
+
+
+
+
+ Find the file that you wish to import into Evolution.
+
+
+
+
+ Click Import
+
+
+
+
+
+
+ Importing Preferences
+
+ Evolution can import all your old mail, contacts, and other information from other applications, making your transition to Evolution even easier.
+
+
+ To import your old information:
+
+
+
+ Click FileImport.
+
+
+
+
+ Click Next after reading the Welcome screen.
+
+
+
+
+ Select Import data and settings from older programs.
+
+
+
+
+ The left-most column shows the application which your information will be imported from. You then select checkboxes on each component to import different properties of each application.
+
+
+
+
+ Click Next
+
+
+
+
+ Click Import
+
+
+
+
+
+
+
Sorting Mail with Column Headers
By default, the message list has columns with the following
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 96ba586190..8add1bf202 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -2000,122 +2000,4 @@ wwwkeys.pgp.net 32j38dk2. Substitute your key ID for
-
- Importing Your Old Email and Settings
-
- Evolution allows you to import old email and data so that you don't need to worry about losing your old information.
-
-
- Importing Email
-
- Ximian Evolution can import the following types of
- files:
-
-
- VCard (.vcf, gcrd)
-
-
- The addressbook format used by the GNOME, KDE, and
- many other contact management applications. You
- should be able to export to VCard format from any
- address book application.
-
-
-
-
-
- Microsoft Outlook Express 4 (.mbx)
-
-
- Email file format used by Microsoft Outlook Express
- 4. For other versions of Microsoft Outlook and Outlook Express, see
- the workaround described in the note below.
-
-
-
-
-
- MBox (mbox)
-
-
- The email box format used by Mozilla, Netscape,
- Ximian Evolution, Eudora, and many other email clients.
-
-
-
-
-
-
- To import your old email:
-
-
-
- Click FileImport.
-
-
-
-
- Click Next after reading the Welcome screen.
-
-
-
-
- Select Import a single file.
-
-
-
-
- Find the file that you wish to import into Evolution.
-
-
-
-
- Click Import
-
-
-
-
-
-
- Importing Preferences
-
- Evolution can import all your old mail, contacts, and other information from other applications, making your transition to Evolution even easier.
-
-
- To import your old information:
-
-
-
- Click FileImport.
-
-
-
-
- Click Next after reading the Welcome screen.
-
-
-
-
- Select Import data and settings from older programs.
-
-
-
-
- The left-most column shows the application which your information will be imported from. You then select checkboxes on each component to import different properties of each application.
-
-
-
-
- Click Next
-
-
-
-
- Click Import
-
-
-
-
-
-
diff --git a/help/ChangeLog b/help/ChangeLog
index dd95ff1882..6a32af4ce7 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,5 +1,13 @@
2001-10-26 Kevin Breit
+ * C/usage-contact.sgml: One more FIXME...done
+
+ * C/config-prefs.sgml: Fixed a definition, one less FIXME to deal with.
+
+ * C/usage-mail-org.sgml: Moved importing information here.
+
+ * C/usage-mail.sgml: Moved importing information to -org.sgml
+
* C/usage-mail-org.sgml: Added a note
* C/usage-mainwindow.sgml: Added screenshot and labels of stuff for summary.
@@ -42,6 +50,7 @@
2001-10-07 Kjartan Maraas
* C/usage-mail-org.sgml: Add a missing
+
* C/apx-authors.sgml: Fix my name.
2001-10-05 Aaron Weber