remove the search-refining feature, which isn't actually true, i think.

2002-06-26  Aaron Weber  <aaron@ximian.com>

	* C/usage-contact.sgml: remove the search-refining feature, which
	isn't actually true, i think.

	* C/apx-authors.sgml: update slightly.

	* C/apx-bugs.sgml: remove list of 1.1.x features.

	* C/usage-mainwindow.sgml: minor tweaks

svn path=/trunk/; revision=17298

5 files changed, 73 insertions, 96 deletions

diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml
index 9a0e3d2f42..971301475c 100644
--- a/help/C/apx-authors.sgml
+++ b/help/C/apx-authors.sgml
@@ -17,9 +17,10 @@
     </para>
 
     <para>
-     Ximian would like to thank Miles Lane for his contributions in
-     quality assurance, and the staff of the El Pelon Taqueria, on
-     Peterborough St. in Boston, for sustenance.
+     Ximian would like to thank everyone who helped out with the bug
+     tracking process, particularly Miles Lane, and also the staff of
+     El Pelon Taqueria, on Peterborough St. in Boston, for
+     sustenance.
     </para>
 
    <para>
@@ -31,7 +32,7 @@
       url="http://bugzilla.ximian.com" type="http">Ximian bug tracking
       database</ulink>. Instructions for submitting bug reports can be
       found on-line at the same location. You can also use the GNOME
-      bug report tool, <command>bug-buddy,</command> to submit your
+      bug report tool, <command>bug-buddy</command>, to submit your
       defect reports.
     </para>
     <para>
diff --git a/help/C/apx-bugs.sgml b/help/C/apx-bugs.sgml
index 7de959dda8..686305fbce 100644
--- a/help/C/apx-bugs.sgml
+++ b/help/C/apx-bugs.sgml
@@ -17,22 +17,13 @@
     </para>
   </abstract>
   
+
   <para>
-    A number of often-requested features will not make it into
-    Ximian Evolution 1.0, but we plan to include them for version
-    1.1.  Some of them are:
-    <simplelist>
-      <member>Direct import of Microsoft Outlook contact cards</member>
-      <member>Synchronization of email with handheld devices</member>
-      <member>S/MIME support</member>
-      <member>Read foreign mail folders without importing them</member>
-      <member>Import of WINMAIL.DAT attachments</member>
-      <member>Playing a sound to indicate new mail arriving</member>
-    </simplelist>
-  </para>
-  <para>
-     A more complete list of feature requests and other issues with
+     A complete list of feature requests and other issues with
     Evolution is available online in the Ximian bug tracking system.
+    You can learn more about the Ximian Evolution development process
+    at <ulink
+    url="http://developer.ximian.com">developer.ximian.com</ulink>.
   </para>
   
 </appendix>
diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 070412a6e9..13c9d191c8 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -229,7 +229,8 @@ smtp.omniport.com:143
            <listitem>
 	    <para>
               Here, decide whether you'd like to check for mail
-              automatically and how often. 
+              automatically and how often, as well as other message
+              retrieval options.
 
               <variablelist>
                 <varlistentry>
@@ -253,7 +254,19 @@ smtp.omniport.com:143
 	                      this option.
                            </para>
 			  </listitem>
-			</itemizedlist>
+		
+			
+                           <listitem>
+			    <para>Store Store status headers in
+			    Elm/Pine/Mutt format: If you would like to
+			    use the X-Status header format used by the
+			    mail clients Elm, Pine, and Mutt, select
+			    this option. This option is useful if you
+			    plan to check your mail with those clients
+			    from time to time.
+                           </para>
+			  </listitem>
+	               </itemizedlist>
                       </para>
 		    </listitem>
                   </varlistentry> 
@@ -345,6 +358,16 @@ smtp.omniport.com:143
 	    server: If you'd like your filters to work on this account
 	    as well as on locally downloaded mail, check this box.</para>
 	  </listitem>
+
+	   <listitem>
+	    <para>Store Store status headers in Elm/Pine/Mutt format:
+	    If you would like to use the X-Status header format used
+	    by the mail clients Elm, Pine, and Mutt, select this
+	    option. This option is useful if you plan to check your
+	    mail with those clients from time to time.
+	   </para>
+	  </listitem>
+
 	</itemizedlist>
                      </para>
                    </listitem>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 5424ce17c5..ff94b3393e 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -267,35 +267,6 @@
       </orderedlist>
     </para>
     <para>
-      You can refine searches by doing several in
-      succession, or start over by pressing the <guibutton>Show
-	All</guibutton> button.
-    </para>
-    <para>
-      If there are no matches, the card display will be
-      blank. When you'd like to see all the cards again, press
-      <guilabel>Show All</guilabel>.
-    </para>
-    <example id="contact-quicksearch-ex">
-      <title>Refining a Quick Search</title>
-      <para>
-	Tom comes back from lunch and finds a note on his
-	keyboard: "Curtis in sales called for you, but he didn't
-	leave a number, and I forgot to write down the name of the
-	company he works for. He said it was important, though."
-	Tom is not at all annoyed.
-      </para>
-      <para>
-	He opens his contacts folder, and runs a quick search for
-	"Curtis." There are eighteen different people with that name
-	in the file. He then enters "Sales," and
-	<application>Evolution</application> narrows it down to the
-	right Curtis. He only becomes annoyed when he discovers that
-	the call was not actually important.
-      </para>
-    </example>
-    
-    <para>
       To perform a complex search through your contacts:
       <orderedlist numeration="arabic">
 	<listitem>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index a5f197d0f2..bb4e9af493 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -111,17 +111,9 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Organization: The company where you work (optional).
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Signature file: If you'd like to use an email
-	      <glossterm linkend="signature">signature</glossterm>,
-	      select your signature file here.  Normally, the
-	      signature will be the contents of the
-	      <filename>.signature</filename> file in your home
-	      directory.
+	      Organization: The company where you work, or the
+	      organization you represent when you send email
+	      (optional).
 	    </para>
 	  </listitem>
 	</itemizedlist>
@@ -170,10 +162,11 @@
 
 		<listitem>
 		  <para>
-		    Standard Unix mbox spools: If you want to read and
-		    store mail in the mail spool on your local system,
-		    choose this option. You'll need to provide the
-		    path to the mail spool you want to use.
+		    Standard Unix mbox spools: If you want
+		    to read and store mail in the mail spool on your
+		    local system, choose this option. You'll need to
+		    provide the path to the mail spool
+		    you want to use.
 		  </para>
 		</listitem>
 
@@ -186,6 +179,14 @@
 		    use.
 		  </para>
 		</listitem>
+		<listitem>
+		  <para>
+		    MH format mail directories: If you download your
+		    mail using mh or another MH-style program, you'll
+		    want to use this option.  You'll need to provide
+		    the path to the mail directory you want to use.
+		  </para>
+		</listitem>
 
 		<listitem>
 		  <para>
@@ -202,6 +203,18 @@
 
 		<listitem>
 		  <para>
+		    Directory Tree of mbox files: If you wish to use a
+		    directory tree full of mbox files, select this
+		    option and enter the directory you wish to
+		    use. This option is useful if you wish to use pine
+		    or other email clients at the same time as
+		    Evolution, while storing mail on your local system
+		    in mbox format.
+		  </para>
+		</listitem>
+
+		<listitem>
+		  <para>
 		    None: Select this if you do not plan to
 		    check mail with this account.
 		  </para>
@@ -249,12 +262,12 @@
 			</para>
 		      </listitem>
 		    </itemizedlist>
-
-      </para>
+              </para>
+      <para>
       <tip id="exchange-info">
-	<title>Can Ximian Evolution Talk to Microsoft Exchange?</title>
-	<para>
-           If you have purchased the Ximian Connector for Microsoft
+	<title>Ximian Evolution Talk to Microsoft Exchange?</title>
+         <para>
+	   If you have purchased Ximian Connector for Microsoft
 	   Exchange, you can access Microsoft Exchange 2000 servers
 	   natively.  If you do not have the Connector, or if you use
 	   an older version of Microsoft Exchange, talk to your system
@@ -262,6 +275,7 @@
 	   like POP and IMAP.
 	</para>
       </tip> 
+</para>
     </sect2>
     <sect2 id="more-mail-options">
       <title>More Mail Configuration Options</title>
@@ -615,7 +629,7 @@ the workaround described in the note below.
   </sect1>
 
   <sect1 id="importing-mail-from-clients">
-    <title>Importing Mail from Individual Mail Clients</title>
+    <title>Importing Mail from Other Mail Clients</title>
     <para>
       Chances are, you already have your email in another mail program
       and don't want to lose the information.  The following section
@@ -884,25 +898,7 @@ the workaround described in the note below.
 	      and shared over a network.
 	   </para>
 	  </listitem>
-	</varlistentry>
-
-<!-- NOT IMPLEMENTED YET
-
-
-	<varlistentry>
-	  <term> <guibutton>Notes:</guibutton></term>
-	<listitem>
-	  <para> The note pad is your catch-all tool: use it to take
-	    messages from phone conversations, keep small things
-	    organized, write <glossterm linkend="haiku">haiku</glossterm>, or whatever
-	    you like. This feature is not yet implemented, but will be
-	    soon. See <xref linkend="usage-notes"> for more
-	    information.
-	  </para>
-	</listitem>
-	</varlistentry>
--->
-	  
+	</varlistentry>	  
 	</variablelist>
       </para>
     </sect2>
@@ -1264,14 +1260,9 @@ Shows your pending tasks
 	    <para>
               It supports multiple mail sources, including <glossterm
               linkend="imap">IMAP</glossterm>, <glossterm
-              linkend="pop">POP3</glossterm>, local
-              <filename>mbox</filename> and <filename>mh</filename>
+              linkend="pop">POP3</glossterm>, and local
+              <filename>mbox</filename> or <filename>mh</filename>
               spools and files created by other mail programs.
-
-<!-- NOT FOR 1.0, but maybe later 
-              and even NNTP messages (newsgroups), which aren't
-              technically email.
--->
             </para>
 	  </listitem>
 	  <listitem>