From 93000e97271436d0c27a2f31c469e0a4622b4bc8 Mon Sep 17 00:00:00 2001
From: Aaron Weber <aaron@ximian.com>
Date: Wed, 22 Aug 2001 22:01:04 +0000
Subject: Removed NNTP docs. Improved IMAP docs. IMAP still needs more work
 though.

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.

svn path=/trunk/; revision=12399
---
 help/C/usage-mail.sgml | 50 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 12 deletions(-)

(limited to 'help/C/usage-mail.sgml')

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
-- 
cgit