IMAP subscriptions stuff.

2001-02-23  Aaron Weber  <aaron@helixcode.com>

	* C/usage-mail.sgml: IMAP subscriptions stuff.

svn path=/trunk/; revision=8366

6 files changed, 185 insertions, 2 deletions

diff --git a/calendar/gui/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h
index bd61419d04..557a8dcdd4 100644
--- a/calendar/gui/Evolution-Composer.h
+++ b/calendar/gui/Evolution-Composer.h
@@ -15,6 +15,7 @@ extern "C"
 
 /** typedefs **/
 #include <bonobo/Bonobo.h>
+# 13 "/usr/share/idl/Bonobo.idl"
 #if !defined(ORBIT_DECL_GNOME_Evolution_Composer) && !defined(_GNOME_Evolution_Composer_defined)
 #define ORBIT_DECL_GNOME_Evolution_Composer 1
 #define _GNOME_Evolution_Composer_defined 1
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index ca4da49602..9ec12d9e5b 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -189,7 +189,11 @@
 	<application>Evolution</application> will check your mail.
 	New mail will appear in the local <interface>Inbox</interface>
 	if you're using a <glossterm>POP</glossterm> account, and in
-	your <glossterm>IMAP</glossterm> folders if you use IMAP.
+	your <glossterm>IMAP</glossterm> folders if you use IMAP.  If
+	you have chosen to use IMAP, and you have multiple folders on
+	your IMAP server, you may need to subscribe to them.  To learn
+	how to use the subscription manager, read <xref
+	linkend="usage-mail-subscriptions">.
       </para>
    
      <note id="badmailsettings">
@@ -1514,6 +1518,20 @@ possibly never will be due to security evil. -->
          <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
          Subscriptions</guimenuitem> </menuchoice>.
       </para>
+      <para>
+         If you have configured any IMAP (mail) or NNTP (news)
+         servers, you will see them listed in the left half of the
+         subscription management window.  Click on a server to select
+         it, and you will see the folders or newsgroups available to
+         you.  You can then select individual folders and subscribe to
+         them, or remove yourself from the subscription list.
+      </para>
+      <para>
+        Once you have subscribed to a folder or newsgroup, your system
+        will check for new messages whenever you press the
+        <guibutton>Get Mail</guibutton> button.
+      </para>
+
     </sect2>
   </sect1>
 </chapter>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 106ebbd9bb..407bbbdde6 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,19 @@
+2001-02-23  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-mail.sgml: IMAP subscriptions stuff. 
+
+2001-02-21  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-mail.sgml: Advanced search/show all/save search stuff.
+
+	* C/evolution.sgml: This file replaces evolution-guide.sgml, for Nautilus Readiness.
+
+	* C/apx-gloss.sgml: glossterm conduit.
+
+	* C/config-sync.sgml: Glossterm conduit.
+
+	* C/preface.sgml: Checked over for Keyboard-Shortcut and other truthfulness.
+
 2001-02-15  Aaron Weber  <aaron@helixcode.com>
 
 	* C/evolution-guide.sgml: Validated. Verified. Markup fixed in
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index db555323c1..65e02870d6 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -1,11 +1,32 @@
 /* Automatically generated. Do not edit. */
+<<<<<<< libfilter-i18n.h
+<<<<<<< libfilter-i18n.h
+<<<<<<< libfilter-i18n.h
+char *s = N_("after");
+=======
+char *s = N_("Answered");
+>>>>>>> 1.7
+=======
+char *s = N_("after");
+>>>>>>> 1.11
+=======
+>>>>>>> 1.13
 char *s = N_("Assign Colour");
 char *s = N_("Assign Score");
 char *s = N_("Copy to Folder");
 char *s = N_("Date received");
 char *s = N_("Date sent");
 char *s = N_("Delete");
+<<<<<<< libfilter-i18n.h
+<<<<<<< libfilter-i18n.h
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("Deleted");
+char *s = N_("Draft");
+=======
+>>>>>>> 1.13
 char *s = N_("Expression");
+char *s = N_("Flagged");
 char *s = N_("Forward to Address");
 char *s = N_("Mailing list");
 char *s = N_("Message Body");
@@ -13,16 +34,108 @@ char *s = N_("Message Header");
 char *s = N_("Message was received");
 char *s = N_("Message was sent");
 char *s = N_("Move to Folder");
+<<<<<<< libfilter-i18n.h
+char *s = N_("Priority");
+=======
+>>>>>>> 1.13
 char *s = N_("Recipients");
 char *s = N_("Regex Match");
+<<<<<<< libfilter-i18n.h
+char *s = N_("Seen");
+=======
 char *s = N_("Score");
+>>>>>>> 1.13
 char *s = N_("Sender");
+<<<<<<< libfilter-i18n.h
+char *s = N_("Set Flag");
+=======
 char *s = N_("Set Status");
+>>>>>>> 1.13
 char *s = N_("Source");
 char *s = N_("Specific header");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("Status");
+>>>>>>> 1.13
+char *s = N_("Stop Processing");
+char *s = N_("Subject");
+<<<<<<< libfilter-i18n.h
+char *s = N_("after");
+char *s = N_("before");
+char *s = N_("contains");
+>>>>>>> 1.7
+char *s = N_("does not contain");
+char *s = N_("does not end with");
+char *s = N_("does not exist");
+char *s = N_("does not sound like");
+char *s = N_("does not start with");
+char *s = N_("ends with");
+char *s = N_("exists");
+=======
+char *s = N_("does not contain");
+char *s = N_("does not end with");
+char *s = N_("does not exist");
+char *s = N_("does not sound like");
+char *s = N_("does not start with");
+char *s = N_("ends with");
+char *s = N_("exists");
+>>>>>>> 1.11
+char *s = N_("Expression");
+char *s = N_("Forward to Address");
+<<<<<<< libfilter-i18n.h
+char *s = N_("is");
+char *s = N_("is greater than");
+char *s = N_("is less than");
+char *s = N_("is not");
+<<<<<<< libfilter-i18n.h
+char *s = N_("matches regex");
+=======
+char *s = N_("is");
+char *s = N_("is greater than");
+char *s = N_("is less than");
+char *s = N_("is not");
+>>>>>>> 1.11
+char *s = N_("Message Body");
+char *s = N_("Message was received");
+char *s = N_("Message was sent");
+char *s = N_("Move to Folder");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("is");
+>>>>>>> 1.8
+char *s = N_("on or after");
+char *s = N_("on or before");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("on or after");
+char *s = N_("on or before");
+>>>>>>> 1.11
+char *s = N_("Priority");
+char *s = N_("Recipients");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("Regex Match");
+>>>>>>> 1.11
+char *s = N_("Sender");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("Set Status");
+char *s = N_("sounds like");
+>>>>>>> 1.11
+char *s = N_("Source");
+char *s = N_("Specific header");
+<<<<<<< libfilter-i18n.h
+=======
+char *s = N_("sounds like");
+>>>>>>> 1.7
+char *s = N_("starts with");
+=======
+char *s = N_("starts with");
 char *s = N_("Status");
+>>>>>>> 1.11
 char *s = N_("Stop Processing");
 char *s = N_("Subject");
+=======
 char *s = N_("after");
 char *s = N_("before");
 char *s = N_("contains");
@@ -41,5 +154,6 @@ char *s = N_("on or after");
 char *s = N_("on or before");
 char *s = N_("sounds like");
 char *s = N_("starts with");
+>>>>>>> 1.13
 char *s = N_("was after");
 char *s = N_("was before");
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index ca4da49602..9ec12d9e5b 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -189,7 +189,11 @@
 	<application>Evolution</application> will check your mail.
 	New mail will appear in the local <interface>Inbox</interface>
 	if you're using a <glossterm>POP</glossterm> account, and in
-	your <glossterm>IMAP</glossterm> folders if you use IMAP.
+	your <glossterm>IMAP</glossterm> folders if you use IMAP.  If
+	you have chosen to use IMAP, and you have multiple folders on
+	your IMAP server, you may need to subscribe to them.  To learn
+	how to use the subscription manager, read <xref
+	linkend="usage-mail-subscriptions">.
       </para>
    
      <note id="badmailsettings">
@@ -1514,6 +1518,20 @@ possibly never will be due to security evil. -->
          <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
          Subscriptions</guimenuitem> </menuchoice>.
       </para>
+      <para>
+         If you have configured any IMAP (mail) or NNTP (news)
+         servers, you will see them listed in the left half of the
+         subscription management window.  Click on a server to select
+         it, and you will see the folders or newsgroups available to
+         you.  You can then select individual folders and subscribe to
+         them, or remove yourself from the subscription list.
+      </para>
+      <para>
+        Once you have subscribed to a folder or newsgroup, your system
+        will check for new messages whenever you press the
+        <guibutton>Get Mail</guibutton> button.
+      </para>
+
     </sect2>
   </sect1>
 </chapter>
diff --git a/help/ChangeLog b/help/ChangeLog
index 106ebbd9bb..407bbbdde6 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,19 @@
+2001-02-23  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-mail.sgml: IMAP subscriptions stuff. 
+
+2001-02-21  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-mail.sgml: Advanced search/show all/save search stuff.
+
+	* C/evolution.sgml: This file replaces evolution-guide.sgml, for Nautilus Readiness.
+
+	* C/apx-gloss.sgml: glossterm conduit.
+
+	* C/config-sync.sgml: Glossterm conduit.
+
+	* C/preface.sgml: Checked over for Keyboard-Shortcut and other truthfulness.
+
 2001-02-15  Aaron Weber  <aaron@helixcode.com>
 
 	* C/evolution-guide.sgml: Validated. Verified. Markup fixed in