aboutsummaryrefslogtreecommitdiffstats
path: root/help
diff options
context:
space:
mode:
Diffstat (limited to 'help')
-rw-r--r--help/C/config-prefs.sgml2
-rw-r--r--help/C/usage-contact.sgml9
-rw-r--r--help/C/usage-mail-org.sgml122
-rw-r--r--help/C/usage-mail.sgml118
-rw-r--r--help/ChangeLog9
5 files changed, 133 insertions, 127 deletions
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
<term>Search scope</term>
<listitem>
<para>
- The scope of the search <!-- FIXME: THIS DEFINITION SUCKS -->
+How broad the search is in the directory.
</para>
</listitem>
</varlistentry>
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.
</para>
- <!-- FIXME: Feature Not Implemented
+ <!-- Feature Not Implemented
<para>
If the master list of categories doesn't suit you, you can
@@ -550,8 +550,7 @@
Network folders are only available when you are
connected to the network. If you use a laptop or have a
modem connection, you may wish to copy or cache the
- network directory and then synchronize your copy with
- the networked version periodically. <!-- FIXME: HOW? -->
+ network directory. You do this by dragging and dropping your desired contacts into the local contacts list.
</para>
</listitem>
@@ -601,7 +600,7 @@
particular group if you choose.
</para>
-<!-- FIXME this feature not yet implemented
+<!-- this feature not yet implemented
<para>
You can also use the address book to print postal addresses
@@ -615,7 +614,7 @@
</sect1>
- <!--- FIXME this feature not yet implemented
+ <!--- this feature not yet implemented
<sect1 id="usage-contact-automation-extra">
<title>Map It!</title>
<para>
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 80822f5fb1..3d9745fa8c 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -9,9 +9,125 @@
to help you do it.
</para>
-<!-- Kevin, i'd suggest putting an "IMporting old mail" section here." -->
-
- <sect1 id="usage-mail-organize-columns">
+ <sect1 id="importing-mail-and-settings">
+ <title>Importing Your Old Email and Settings</title>
+ <para>
+ <application>Evolution</application> allows you to import old email and data so that you don't need to worry about losing your old information.
+ </para>
+ <sect2 id="importing-mail">
+ <title>Importing Email</title>
+ <para>
+ <application>Ximian Evolution</application> can import the following types of
+ files:
+ <variablelist>
+ <varlistentry>
+ <term>VCard (.vcf, gcrd)</term>
+ <listitem>
+ <para>
+ 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.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Microsoft Outlook Express 4 (.mbx)</term>
+ <listitem>
+ <para>
+ 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.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>MBox (mbox)</term>
+ <listitem>
+ <para>
+ The email box format used by Mozilla, Netscape,
+ Ximian Evolution, Eudora, and many other email clients.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ <para>
+ To import your old email:
+ <orderedlist numeration="arabic">
+ <listitem>
+ <para>
+ Click <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Click <guibutton>Next</guibutton> after reading the Welcome screen.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Select <guibutton>Import a single file</guibutton>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Find the file that you wish to import into <application>Evolution</application>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Click <guibutton>Import</guibutton>
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+ </sect2>
+ <sect2 id="importing-preferences">
+ <title>Importing Preferences</title>
+ <para>
+ <application>Evolution</application> can import all your old mail, contacts, and other information from other applications, making your transition to <application>Evolution</application> even easier.
+ </para>
+ <para>
+ To import your old information:
+ <orderedlist numeration="arabic">
+ <listitem>
+ <para>
+ Click <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Click <guibutton>Next</guibutton> after reading the Welcome screen.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Select <guibutton>Import data and settings from older programs</guibutton>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ 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.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Click <guibutton>Next</guibutton>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Click <guibutton>Import</guibutton>
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+ </sect2>
+ </sect1>
+ <sect1 id="usage-mail-organize-columns">
<title>Sorting Mail with Column Headers</title>
<para>
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</command>. Substitute your key ID for
</para>
</sect2>
</sect1>
- <sect1 id="importing-mail-and-settings">
- <title>Importing Your Old Email and Settings</title>
- <para>
- <application>Evolution</application> allows you to import old email and data so that you don't need to worry about losing your old information.
- </para>
- <sect2 id="importing-mail">
- <title>Importing Email</title>
- <para>
- <application>Ximian Evolution</application> can import the following types of
- files:
- <variablelist>
- <varlistentry>
- <term>VCard (.vcf, gcrd)</term>
- <listitem>
- <para>
- 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.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Microsoft Outlook Express 4 (.mbx)</term>
- <listitem>
- <para>
- 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.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>MBox (mbox)</term>
- <listitem>
- <para>
- The email box format used by Mozilla, Netscape,
- Ximian Evolution, Eudora, and many other email clients.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
- <para>
- To import your old email:
- <orderedlist numeration="arabic">
- <listitem>
- <para>
- Click <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
- </para>
- </listitem>
- <listitem>
- <para>
- Click <guibutton>Next</guibutton> after reading the Welcome screen.
- </para>
- </listitem>
- <listitem>
- <para>
- Select <guibutton>Import a single file</guibutton>.
- </para>
- </listitem>
- <listitem>
- <para>
- Find the file that you wish to import into <application>Evolution</application>.
- </para>
- </listitem>
- <listitem>
- <para>
- Click <guibutton>Import</guibutton>
- </para>
- </listitem>
- </orderedlist>
- </para>
- </sect2>
- <sect2 id="importing-preferences">
- <title>Importing Preferences</title>
- <para>
- <application>Evolution</application> can import all your old mail, contacts, and other information from other applications, making your transition to <application>Evolution</application> even easier.
- </para>
- <para>
- To import your old information:
- <orderedlist numeration="arabic">
- <listitem>
- <para>
- Click <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
- </para>
- </listitem>
- <listitem>
- <para>
- Click <guibutton>Next</guibutton> after reading the Welcome screen.
- </para>
- </listitem>
- <listitem>
- <para>
- Select <guibutton>Import data and settings from older programs</guibutton>.
- </para>
- </listitem>
- <listitem>
- <para>
- 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.
- </para>
- </listitem>
- <listitem>
- <para>
- Click <guibutton>Next</guibutton>
- </para>
- </listitem>
- <listitem>
- <para>
- Click <guibutton>Import</guibutton>
- </para>
- </listitem>
- </orderedlist>
- </para>
- </sect2>
- </sect1>
</chapter>
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 <mrproper@ximian.com>
+ * 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 <kmaraas@gnome.org>
* C/usage-mail-org.sgml: Add a missing </orderedlist>
+
* C/apx-authors.sgml: Fix my name.
2001-10-05 Aaron Weber <aaron@ximian.com>