typos, redescribe 1.1 bugs.

2001-10-29  Aaron Weber  <aaron@ximian.com>

	* C/apx-bugs.sgml: typos, redescribe 1.1 bugs.

	* C/apx-authors.sgml: Added last few authors, a few more credits,
	etc. Also changed contact info and URL for evolution.

	* C/menuref.sgml: did we have only 1 item in the calendar?
	yes. Also, s/Contact Manager/Addressbook/

	* C/usage-calendar.sgml: phrasing. UI. Spelling. Validation.

	* C/Makefile.am: removed config-encryption and
	usage-encryption. Stray files. Do not use, ship, etc. All
	encryption info is in the mail docs.

	* C/config-sync.sgml: call it the addressbook. added : for <terms>

	* C/config-prefs.sgml: commented out empty section.

	* C/figures/print-preview.png: ch. screenshot

	* C/usage-contact.sgml: address book--> addressbook

	* C/usage-mail-org.sgml: added "the note below" (duplicate of data
	in mainwindow.sgml, but so is all the import information. The
	import process is available in two places, we should document it
	in two places. Also typos.  removed a commented-out section on
	subscription management-- now in usage-mail and mainwindow.

	* C/usage-mail.sgml: mdash correction.

	* C/usage-mainwindow.sgml: replaced &mdash; with :

	* C/apx-gloss.sgml: typo.

	* C/preface.sgml: gnome-help-browser doesn't understand &mdash;

svn path=/trunk/; revision=14421

1 files changed, 83 insertions, 49 deletions

diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 88dec18187..ce6f75e69c 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -21,7 +21,7 @@
         files:
         <variablelist>
           <varlistentry>
-            <term>VCard (.vcf, gcrd)</term>
+            <term>VCard (.vcf, gcrd):</term>
             <listitem>
               <para>
                 The addressbook format used by the GNOME, KDE, and
@@ -33,7 +33,7 @@
           </varlistentry>
 
 	  <varlistentry>
-	    <term>iCalendar (.ics)</term>
+	    <term>iCalendar (.ics):</term>
 	    <listitem>
 	      <para>
 		A format for storing calendar files.  iCalendar is used by 
@@ -43,7 +43,7 @@
 	  </varlistentry>
 
           <varlistentry>
-            <term>Microsoft Outlook Express 4 (.mbx)</term>
+            <term>Microsoft Outlook Express 4 (.mbx):</term>
             <listitem>
               <para>
                 Email file format used by Microsoft Outlook Express
@@ -54,7 +54,7 @@
           </varlistentry>
 
           <varlistentry>
-            <term>MBox (mbox)</term>
+            <term>MBox (mbox):</term>
             <listitem>
               <para>
                 The email box format used by Mozilla, Netscape,
@@ -135,6 +135,57 @@
           </listitem>
         </orderedlist>
       </para>
+
+<para>
+    <note>
+      <title>Microsoft Outlook and Outlook Express Users</title>
+      <para>
+	Microsoft Outlook, and versions of Outlook Express after
+	version 4, use proprietary formats that <application>Ximian
+	Evolution</application> cannot read or import.  For contacts,
+	you may have to email them to yourself and import them that
+	way.  For email, there is a simpler workaround:
+	<orderedlist numeration="arabic">
+
+	<listitem>
+	<para>
+	  While using Windows, import the files into Mozilla Mail (or
+	  another mailer, such as Netscape or Eudora, that uses the
+	  standard mbox format).
+        </para>
+        </listitem>
+	
+	<listitem>
+	<para>
+          Copy the files to the system or partition you use for
+          <application>Ximian Evolution</application>.  
+         </para>
+        </listitem>
+
+	<listitem>
+	<para>
+	  Use the <application>Ximian Evolution</application> import
+          tool to import the files.  There's more information about
+          why this works, and how, at the Ximian support website.
+      </para>
+        </listitem>
+     </orderedlist>
+    </para>
+    </note>     
+
+    <note>
+      <title>Netscape Users</title>
+      <para>
+	Before importing mail from Netscape, make sure you select
+	<menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
+	Folders</guimenuitem></menuchoice>. If you don't,
+	<application>Ximian Evolution</application> will import and undelete
+	the messages in your Trash folders.
+      </para>
+    </note>     
+
+    </para>
+
     </sect2>
   </sect1>
   <sect1 id="usage-mail-organize-columns">
@@ -173,21 +224,21 @@
 	options:
 	<variablelist>	  
 	<varlistentry>
-	  <term><guimenuitem>Sort Ascending</guimenuitem></term>
+	  <term><guimenuitem>Sort Ascending</guimenuitem>:</term>
 	  <listitem><para>
 	      Sorts the messages top to bottom.
 	    </para></listitem>
 	</varlistentry>
 	  
 	  <varlistentry>
-	    <term><guimenuitem>Sort Descending</guimenuitem></term>
+	    <term><guimenuitem>Sort Descending</guimenuitem>:</term>
 	    <listitem><para>
 		Sorts the messages bottom to top.
 	      </para></listitem>
 	  </varlistentry>
 	  
 	  <varlistentry>
-	    <term><guimenuitem>Group By this Field</guimenuitem></term>
+	    <term><guimenuitem>Group By this Field</guimenuitem>:</term>
 	    <listitem><para>
 	      Groups messages instead of sorting them. This makes each contact
 	      with identical properties in the specified field to be placed in
@@ -197,7 +248,7 @@
 	  
 	  <varlistentry>
 	    <term><guimenuitem>Remove this
-		Column</guimenuitem></term> <listitem><para> Remove
+		Column</guimenuitem>:</term> <listitem><para> Remove
 		this column from the display. You can also remove
 		columns by dragging the header off the list and
 		letting it drop.  </para></listitem>
@@ -205,7 +256,7 @@
 	  
 	  <varlistentry>
 	    <term><guimenuitem>Field
-		Chooser</guimenuitem></term> <listitem><para> 
+		Chooser</guimenuitem>:</term> <listitem><para> 
 	      When you choose this item, a list
 	      of column headers will appear; just drag and drop them into
 	      place between two existing headers. A red arrow will
@@ -259,7 +310,7 @@
 	right below the toolbar, and choose a search type:
 	<variablelist>
 	  <varlistentry>
-	    <term><guilabel>Body or subject contains</guilabel></term>
+	    <term><guilabel>Body or subject contains</guilabel>:</term>
 	  <listitem>
 	      <para>
 	        This will search message subjects and the messages
@@ -269,7 +320,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term> <guilabel>Body contains</guilabel> </term>
+	    <term> <guilabel>Body contains</guilabel>:</term>
 	    <listitem>
 	      <para>
 	        This will search only in message text, not the subject
@@ -278,7 +329,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guilabel>Subject contains</guilabel></term>
+	    <term><guilabel>Subject contains:</guilabel></term>
 	    <listitem>
 	      <para>
 	        This will show you messages where the search text is
@@ -288,7 +339,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guilabel>Body does not contain</guilabel></term>
+	    <term><guilabel>Body does not contain:</guilabel></term>
 	    <listitem>
 	      <para>
 	        This finds every email message that does not have the
@@ -299,7 +350,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guilabel>Subject does not contain</guilabel></term>
+	    <term><guilabel>Subject does not contain:</guilabel></term>
 	    <listitem>
 	      <para>
 	        This finds every mail whose subject does not contain
@@ -471,18 +522,24 @@
 		    Mailing List - Filter based on the mailing list it came from.
 		  </para>
 		  <note>
-		    <title>How Does Filterint on Mailing Lists Work?</title>
+		    <title>How Does Filtering on Mailing Lists Work?</title>
 		    <para>
-		      Filtering on mailing lists uses the domain part (@ximian.com) of the address and the user part (the part before the @).  However, if you wish to exclude the domain section from being filtered, simply don't put anything after the user.
+		      Filtering on mailing list actually looks for a
+		      specific mailing-list header called the
+		      <computeroutput>X-BeenThere</computeroutput>
+		      header, used to identify mailing lists or other
+		      redistributors of mail.
 		    </para>
 		  </note>
 		</listitem>
 		
 		<listitem>
 		  <para>
-		    Regex Match - If you know your way around a <glossterm
-									   linkend="regular-expression">regex</glossterm>, or
-		    regular expression, put your knowledge to use here.
+		    Regex Match - If you know your way around a
+		    <glossterm
+		    linkend="regular-expression">regex</glossterm>, or
+		    regular expression, put your knowledge to use
+		    here.
 		  </para>
 		</listitem>
 		
@@ -638,7 +695,7 @@
 	      Select
 	      <menuchoice>
 		<guimenu>Tools</guimenu>
-		<guimenu>Filters</guimenu>
+		<guimenuitem>Filters</guimenuitem>
 	      </menuchoice>
 	    </para>
 	  </listitem>
@@ -751,12 +808,14 @@
 
 
     <note id="unmatched-vfolder">
-      <title>The Unmatched vFolder</title>
+      <title>The "Unmatched" vFolder</title>
       <para>
 	Obviously, not all messages will fit into all your Virtual
-	Folders.  That's why <application>Ximian Evolution</application>
-	includes an UNMATCHED vFolder.  The UNMATCHED 
-	vFolder displays messages that are not matched by other rules.
+	Folders.  That's why <application>Ximian
+	Evolution</application> includes an Unmatched vFolder.  The
+	Unmatched vFolder displays messages that are not matched by
+	other rules. If you have no vFolders, the Unmatched folder
+	will contain all of your mail.
       </para>
     </note>
 
@@ -959,29 +1018,4 @@ include any messages from that source.
       </para>
     </sect2>
   </sect1>
-  <!--
-    <sect1 id="usage-mail-subscriptions">
-      <title>Subscription Management</title>
-      <para>
-         <application>Ximian Evolution</application> lets you handle your
-         IMAP and newsgroup subscriptions with the same tool: the
-         subscriptions manager.  To start using it, choose
-         <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>
-  </sect1>
--->
 </chapter>