spamfiltering charsets and input methods. assign copyright to Novell, add

2004-01-27  Aaron Weber <aaron@ximian.com>
	* C/usage-mail-org.xml: spamfiltering
	* C/usage-mail.xml: charsets and input methods.
	* C/evolution-1.5.xml: assign copyright to Novell, add 2004.
	* C/legal.xml: Novell/XImian switcheroo

svn path=/trunk/; revision=24480

4 files changed, 133 insertions, 9 deletions

diff --git a/help/C/evolution-1.5.xml b/help/C/evolution-1.5.xml
index f2eb2bc621..af43ca88da 100644
--- a/help/C/evolution-1.5.xml
+++ b/help/C/evolution-1.5.xml
@@ -38,11 +38,11 @@ entity names correspond.  APX is for appendix.  -->
 <!-- filenames use  command tags so they appear in the same font as commands -->
 <!-- there is one bar and it is the Shortcut Bar. The folder bar is dead. -->
 
-<!-- FIXME, TODO: Expand spam checking doc, update security docs   take new screenshots. -->
+<!-- FIXME, TODO:   take new screenshots, -->
 
 <book id="index">
   <bookinfo>
-    <title>A User's Guide to Ximian Evolution 1.4</title>
+    <title>A User's Guide to  Evolution 1.5</title>
     <authorgroup>
       <author><firstname>Aaron</firstname><surname>Weber</surname></author>
       <author><firstname>Kevin</firstname><surname>Breit</surname></author>
@@ -50,8 +50,8 @@ entity names correspond.  APX is for appendix.  -->
       <author><firstname>Duncan</firstname><surname>Mak</surname></author>
     </authorgroup>
     <copyright>
-      <year>2000-2003</year>
-      <holder>Ximian, Inc.</holder>
+      <year>2000-2004</year>
+      <holder>Novell, Inc.</holder>
     </copyright>
     
    <releaseinfo>
diff --git a/help/C/legal.xml b/help/C/legal.xml
index e3591f6fb5..3bb42ad3a8 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -19,7 +19,7 @@
         software. The Ximian Connector for Microsoft Exchange 2000 is
         proprietary software and is subject to a different license. Copyright
         for all three pieces of software and their documentation belongs to
-        Ximian, Inc.
+        Novell, Inc.
       </para>
     </note>
     <para>
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
index 0667ad08c3..f700e69103 100644
--- a/help/C/usage-mail-org.xml
+++ b/help/C/usage-mail-org.xml
@@ -485,8 +485,9 @@
       </para>
       <para>
         The junk mail filter can "learn" which kinds of mail are
-        legitimate and which are not if you train it. When you first start using
-        junk mail blocking, check the <guilabel>Junk</guilabel> folder
+        legitimate and which are not if you train it. When you first
+        start using junk mail blocking, check the
+        <guilabel>Junk</guilabel> folder
         to be sure that legitimate mail doesn't get flagged as junk
         mail. If good mail, also known as "ham," is mis-flagged, remove
         it from the <guilabel>Junk</guilabel> folder by right-clicking
@@ -500,9 +501,72 @@
         To change your junk mail filtering preferences, select <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Settings</guimenuitem>
     </menuchoice> and click the <guilabel>Mail Preferences</guilabel>
     button. In the mail preferences tool, select the
-    <guilabel>Junk</guilabel> tab. <!-- FIXME: expand when available -->
+    <guilabel>Junk</guilabel> tab.  Here, you have several options:
+  </para>
+
+  <variablelist>
+    <varlistentry>
+      <term>Check Incoming Mail</term>
+      <listitem>
+      <para>
+        This option turns automatic junk mail filtering on or off.
       </para>
-    </sect1>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+      <term>Do Not Check Incoming Mail for IMAP Accounts</term>
+      <listitem>
+      <para>
+        Evolution must download mail to determine whether it is junk
+        mail, so junk mail filtering can slow IMAP performance as it
+        downloads every message in its entirity. To turn filtering off
+        for IMAP mail, but leave it on for other mail accounts, select
+        this box.
+      </para>
+    </listitem>
+  </varlistentry> 
+
+  <varlistentry>
+    <term>Local Tests Only</term>
+    <listitem>
+      <para>
+        This option skips tests that require a network connection,
+        such as checking to see if a message is in a list of known
+        junk messages, or if the sender or gateway are blacklisted by
+        anti-spam organizations. Selecting this option will increase
+        the speed of operation, but may decrease accuracy.
+      </para>
+    </listitem>
+  </varlistentry>
+  
+  <varlistentry>
+    <term>Use Daemon</term>
+    <listitem>
+      <para>
+        If you select this option, Evolution will try to use the mail
+        filtering daemon <command>spamd</command> if it is available.
+        Using the daemon can improve filtering speed, but the daemon
+        must already be running. Starting a daemon normally requires
+        root privileges, but you may be able to use it as non-root,
+        depending on your OS and configuration.
+    </para>
+    <para>
+      You can can start spamd with the command
+      <command>/etc/init.d/spamd start</command>, or if you prefer,
+      have it started automatically by editing your system services
+      (for SUSE systems, this is the "Runlevel Editor" in
+      YAST). More traditional UNIX users, of course, know how
+      to put links to the initialization script in the
+      <command>/etc/rc5.d/</command> or <command>/etc/rc3.d</command>
+      directory.
+      </para>
+    </listitem>
+  </varlistentry>
+     
+</variablelist>
+</sect1>
+
 
 
     <sect1 id="usage-mail-organize-filters">
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
index c90bffba79..21de0b77a1 100644
--- a/help/C/usage-mail.xml
+++ b/help/C/usage-mail.xml
@@ -511,6 +511,66 @@ load images off the net.</guilabel>
       <guilabel>Send</guilabel>.
     </para>
 
+    <sect2 id="usage-mail-getnsend-send-charsets">
+      <title>Unicode, ASCII, and Non-Latin Alphabets</title>
+
+      <para>
+        If you want to write in a non-Latin alphabet while using a
+        Latin keyboard, try selecting a different an input method in
+        the message composer. Right-click on the message composition
+        area and select from the <guimenu>Input Methods</guimenu>
+      menu, then begin typing. The actual keys vary by language and
+      input style. For example, the Cyrillic input method uses
+      transliterated Latin keyboard combinations to get the Cyrillic
+      alphabet, combining letters where necessary. "Zh" and "ya"
+      produce the appropriate single Cyrillic letters, and the
+      single-quote ' produces a soft-sign character.
+    </para>
+
+      <para>
+        For greater language display capabilities, check your
+        character settings. In both the mail composer and mail reader
+        settings dialogs, you can select from dozens of character
+        sets. If you aren't sure which one to choose, go ahead and
+        choose UTF-8, which offers the greatest range of character
+        displays for the greatest range of languages.
+      </para>
+
+      <para>
+        To delve a little deeper into the issue, a character set is a
+        computer's version of an alphabet. One of the most popular
+        early character sets was called ASCII. It consisted of 128
+        numbers, letters, and assorted symbols used by computers for
+        almost everything. It was convenient, and didn't take up much
+        space, but it didn't handle Cyrillic, Kanjii, or other
+        non-Latin alphabets. Programmers developed a
+        variety of mostly incompatible ways to work around their
+        language display problems, and today, many human languages
+        have their own specific character sets, and items written in
+        other character sets will display incorrectly.  Eventually,
+        standards organizations developed the Unicode character sets
+        (UTF-7 and UTF-8) to provide a single compatible set of codes
+        for everyone.
+      </para>
+
+      <para>
+        Most email messages state in advance which character set they
+        use, so Evolution usually knows what to display for a given
+        binary number. However, if you find that messages are
+        displayed as rows of incomprehensible characters, try
+        selecting a different character set in the mail settings
+        screen. If your recipients can't read your messages, try
+        selecting a different character set in the composer options
+        dialog.  For some languages, such as Turkish or Korean, it may
+        work best for you to select the language-specific character
+        set. However, the best choice for most users is UTF-8, which
+        offers the widest range of characters for the widest range of
+        languages.
+      </para>
+
+    </sect2>
+
+  
      <sect2 id="usage-mail-getnsend-send-delay">
         <title>Sending Composed Messages Later</title>
         <para>