aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--help/C/config-prefs.sgml3
-rw-r--r--help/C/usage-mail.sgml50
-rw-r--r--help/C/usage-mainwindow.sgml45
-rw-r--r--help/ChangeLog9
4 files changed, 71 insertions, 36 deletions
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index b3e27fce98..64439b16c5 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -294,6 +294,7 @@
</para>
</sect3>
</sect2>
+<!-- NOT FOR 1.0, see usage-mail.sgml
<sect2 id="config-prefs-network-news">
<title>News Servers</title>
<para>
@@ -314,7 +315,7 @@
<interface>folder bar</interface>.
</para>
</sect2>
-
+-->
<sect2 id="config-prefs-mail-other">
<title>Other Mail Preferences</title>
<para>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 54922ecac4..40234825df 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -11,6 +11,18 @@
your mail account, see <xref linkend="config-prefs-mail">.
</para>
+<note>
+<title>If you use IMAP Mail</title>
+<para>
+If you chose IMAP mail during the setup process, you must subscribe to
+your mail folders before you can read mail in them. Use the
+subscription management tool by selecting
+<menuchoice><guimenu>Tools</guimenu><guimenuitem>Subscribe to
+Folders</guimenuitem></menuchoice>.
+</para>
+</note>
+
+
<sect1 id="usage-mail-getnsend-read">
<title>Reading Mail</title>
<para>
@@ -126,8 +138,8 @@
<note>
<title>Trash is Actually a vFolder?</title>
<para>
- Your trash bin is actually a vFolder that displays
- all messages you have marked for later deletion. For more
+ Your trash folder is actually a vFolder that displays all
+ messages you have marked for later deletion. For more
information about vFolders, see <xref
linkend="usage-mail-organize-vfolders">. If you choose
<menuchoice> <guimenu>Actions</guimenu> <guimenuitem>Empty
@@ -220,6 +232,7 @@
</para>
</note>
+<!-- NOT FOR 1.0
<sect2 id="usage-mail-getnsend-get-news">
<title>Using Evolution for News </title>
<para>
@@ -233,7 +246,7 @@
messages.
</para>
</sect2>
-
+-->
<sect2 id="usage-mail-getnsend-get-attach">
<title>Working with Attachments and HTML Mail</title>
<para>
@@ -285,13 +298,13 @@
image inside the message.
</para>
<para>
- If an HTML mail with images does not include an image, but
- asks <application>Evolution</application> to go download the
- image from a website, <application>Evolution</application>
- won't display the image unless you ask it to. This is because
+ If an HTML mail uses a link to an image, and asks
+ <application>Evolution</application> to download the image
+ from the Internet, <application>Evolution</application> will
+ not display the image unless you ask it to. This is because
remotely hosted images can slow down your system, and can be
- used by spammers to track reads their email. So having them
- not load automatically helps protect your privacy.
+ used by spammers to track who reads their email. Having
+ images not load automatically helps protect your privacy.
</para>
<para>
If you want the images to load, select
@@ -1178,11 +1191,24 @@ with quoted materials and the relevant replies interspersed-->
<sect1 id="usage-mail-subscriptions">
<title>Subscription Management</title>
<para>
- <application>Evolution</application> lets you handle your
- IMAP and newsgroup subscriptions with the same tool: the
+ Since IMAP folders exist on the server, and opening them or
+ checking them takes time, you need fine-grained control over
+ the way that you use IMAP folders. That's why
+ <application>Evolution</application> has an IMAP
subscriptions manager.
-
+ </para>
+ <para>
+ To use it:
<orderedlist numeration="arabic">
+
+ <listitem>
+ <para>
+ Select
+ <menuchoice><guimenu>Tools</guimenu><guimenuitem>Subscribe
+ to Folders</guimenuitem></menuchoice>.
+ </para>
+ </listitem>
+
<listitem>
<para>
In the <guilabel>Store</guilabel> section, click on the
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 7d54c9a033..1603ca4892 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -80,9 +80,12 @@
</listitem>
<listitem>
<para>
- IMAPv4 &mdash; Keeps the email on your server so you can
- access your email from any computer that supports IMAPv4 and
- have everything be the same.
+ IMAPv4 &mdash; Keeps the email on your server so
+ you can access your email from any computer that
+ supports IMAPv4 and have everything be the
+ same. For more information about how to use IMAP
+ mail, see <xref
+ linkend="usage-mail-subscriptions">.
</para>
</listitem>
<listitem>
@@ -255,7 +258,6 @@
</para>
</note>
-
Ask your system administrator if you aren't sure which you use.
</para>
@@ -393,7 +395,7 @@
<term><guibutton>Calendar</guibutton></term>
<listitem>
<para>
- The Calendar can store your appointments and To do lists
+ The Calendar can store your appointments and task lists
for you. Connected to a network, you can use it to keep
a group of people on schedule and up to date.
</para>
@@ -611,14 +613,11 @@
<sect3 id="subfolders">
<title>Subfolders</title>
<para>
- <application>Evolution</application> can also manage subfolders,
- subfolders are folders inside of folders. This works well if
- you want to try to separate your home folders from your work
- folders, or if you like to keep very organized.
+ <application>Evolution</application> lets you nest folders
+ inside of each other, so that you can have a detailed
+ organizational system.
</para>
-
-
<note>
<title>Folders Have Limits</title>
<para>
@@ -648,8 +647,6 @@
dropping them.
</para>
-
-
<!--
<tip>
<title>Context-Sensitive Help</title>
@@ -675,13 +672,12 @@
<para>
The <interface>menu bar</interface>'s contents will always
provide all the possible actions for any given view of your
- data. That means that, depending on the context, menu bar items
- will change. If you're looking at your Inbox, most of the menu
- items will relate to mail; some will relate to other components
- of <application>Evolution</application> and some, especially
- those in the <guimenu>File Menu</guimenu> will relate to the
+ data. If you're looking at your Inbox, most of the menu items
+ will relate to mail; some will relate to other components of
+ <application>Evolution</application> and some, especially those
+ in the <guimenu>File Menu</guimenu> will relate to the
application as a whole.
- </para>
+ </para>
<para>
<variablelist>
<varlistentry>
@@ -808,9 +804,12 @@
linkend="imap">IMAP</glossterm>, <glossterm
linkend="pop">POP3</glossterm>, local
<systemitem><filename>mbox</filename></systemitem> and
- <systemitem><filename>mh</filename></systemitem> files,
+ <systemitem><filename>mh</filename></systemitem> files.
+
+<!-- NOT FOR 1.0, but maybe later
and even NNTP messages (newsgroups), which aren't
technically email.
+-->
</para>
</listitem>
<listitem>
@@ -907,7 +906,7 @@
bar</interface>. By default, the calendar starts showing
today's schedule on a ruled background. At the upper right,
there's a monthly calendar you can use to switch days. Below
- that, there's a <guilabel>TaskPad</guilabel>, where you can
+ that, there's a <guilabel>Task</guilabel> pad, where you can
keep a list of tasks separate from your calendar appointments.
The day view in the calendar looks like this:
@@ -938,11 +937,11 @@
<para>
<inlinegraphic fileref="figures/full-2" format="png"></inlinegraphic>
- <guilabel>Todo List</guilabel>
+ <guilabel>Task List</guilabel>
</para>
<para>
- The <guilabel>Todo List</guilabel> compliments the
+ The <guilabel>Task List</guilabel> compliments the
<guilabel>Appointment List </guilabel> as it keeps track of
tasks which don't have any time associated with them. These
may include "" or "Call Repairman". </para>
diff --git a/help/ChangeLog b/help/ChangeLog
index 5a79ff9520..f707b7adb0 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-22 Aaron Weber <aaron@ximian.com>
+
+ * C/usage-mail.sgml: Removed NNTP docs. Improved IMAP docs. IMAP
+ still needs more work though.
+
+ * C/config-prefs.sgml: Removed NNTP docs.
+
+ * C/usage-mainwindow.sgml: s/todo/task list/, fix grammar/style.
+
2001-08-22 Peter Williams <peterw@ximian.com>
* sgmldocs.make (omf_timestamp): Put in a $(srcdir) here for when