add item about permissions.

2002-09-19  Aaron Weber  <aaron@ximian.com>

	* C/config-sync.sgml: add item about permissions.

	* C/usage-mail-org.sgml: add note about filter applications, tip
	for easy filtering.

	* C/usage-mail.sgml: encryption update

svn path=/trunk/; revision=18125

4 files changed, 339 insertions, 397 deletions

diff --git a/help/C/config-sync.sgml b/help/C/config-sync.sgml
index 5ce42c3467..95b0e71603 100644
--- a/help/C/config-sync.sgml
+++ b/help/C/config-sync.sgml
@@ -23,7 +23,12 @@
        Center</application> by selecting
        <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>,
        and make sure that <application>Pilot Link</application> is
-       properly configured.
+       properly configured. You will need to make sure that you have
+       read and write permissions on the device, which is normally
+       /dev/pilot. If that does not work, check /dev/ttyS0 if you have
+       a serial connection, or /dev/ttyUSB0 for a USB connection. You
+       can do this by becoming root and running the command:
+       <userinput>chmod 777 /dev/ttyUSB0</userinput>.
     </para>
     <para>
         Once your computer and your Palm-OS device are talking happily
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 5b0210ff20..051b1d21da 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -12,8 +12,7 @@
   <sect1 id="importing-mail-and-settings">
     <title>Importing Your Old Email and Settings</title>
     <para>
-
-      <application>Evolution</application> allows you to import your old
+      <application>Evolution</application> allows you to import old
       email and data so that you don't need to worry about losing your
       old information.
     </para>
@@ -27,7 +26,7 @@
             <term>VCard (.vcf, gcrd):</term>
             <listitem>
               <para>
-                The addressbook format used by GNOME, KDE, and
+                The addressbook format used by the GNOME, KDE, and
                 many other contact management applications. You
                 should be able to export to VCard format from any
                 address book application.
@@ -74,16 +73,12 @@
         <orderedlist numeration="arabic">
           <listitem>
             <para>
-              Click <menuchoice>
-		<guimenu>File</guimenu>
-		<guimenuitem>Import</guimenuitem>
-	      </menuchoice>.
+              Click <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
             </para>
           </listitem>
           <listitem>
             <para>
-              Click <guibutton>Next</guibutton> after reading the
-              Welcome screen.
+              Click <guibutton>Next</guibutton> after reading the Welcome screen.
             </para>
           </listitem>
           <listitem>
@@ -93,8 +88,7 @@
           </listitem>
           <listitem>
             <para>
-              Find the file that you wish to import into
-              <application>Evolution</application>.
+              Find the file that you wish to import into <application>Evolution</application>.
             </para>
           </listitem>
           <listitem>
@@ -118,11 +112,7 @@
         <orderedlist numeration="arabic">
           <listitem>
             <para>
-              Click 
-	      <menuchoice>
-		<guimenu>File</guimenu>
-		<guimenuitem>Import</guimenuitem>
-	      </menuchoice>.
+              Click <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
             </para>
           </listitem>
           <listitem>
@@ -137,38 +127,34 @@
           </listitem>
           <listitem>
             <para>
-              The left-most column shows the application from which
-              your information will be imported from.  Then, select
+              The left-most column shows the application which your
+              information will be imported from.  You then select
               checkboxes on each component to import different
               properties of each application.
             </para>
           </listitem>
           <listitem>
             <para>
-              Click <guibutton>Next</guibutton>.
+              Click <guibutton>Next</guibutton>
             </para>
           </listitem>
           <listitem>
             <para>
-              Click <guibutton>Import</guibutton>.
+              Click <guibutton>Import</guibutton>
             </para>
           </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 wish to consider using
-	    OutPort, a third-party conversion tool.  Ximian does not
-	    support OutPort but you can find more information about it
-	    at <ulink
-	    url="http://www.cyberus.ca/~phoenix/outport/">the Outport
-	    homepage.</ulink> For email, there is a more simple
-	    workaround:
+	    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>
@@ -190,7 +176,7 @@
 		<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 <ulink url="http://support.ximian.com">Ximian support website</ulink>.
+		  why this works, and how, at the Ximian support website.
 		</para>
 	      </listitem>
 	    </orderedlist>
@@ -207,6 +193,7 @@
 	    the messages in your Trash folders.
 	  </para>
 	</note>     
+	
       </para>
       
     </sect2>
@@ -454,6 +441,18 @@
 	person with a pile of envelopes.
       </para>
 
+      
+	  <tip id="easy-filter">
+	      <title>Quick Filter Creation</title>
+	      <para>
+		There is an easy shortcut for fast filter or vFolder
+                creation. Right-click on the message in the message
+                list, and select one of the items under the
+                <guimenuitem>Create Rule from Message</guimenuitem>
+                submenu.
+	      </para>
+	    </tip>
+
     <sect2 id="usage-mail-org-filters-new">
       <title>Making New Filters</title>
       <para>
@@ -511,8 +510,25 @@
 		    expression you write in the Scheme language, used to
 		    define filters in <application>Ximian Evolution</application>.
 		  </para>
+
+<para>
+
+      <note id="lots-of-filters">
+        <title>What if Multiple Filters Match One Message?</title>
+         <para>
+            If you have several filters that match a single message,
+            they will all be applied to the message, in order, unless
+            one of the filters has the action <guibutton>Stop
+            Processing</guibutton>. If you use that action in a
+            filter, the messages that it affects will not be touched
+            by other filters.
+         </para>
+      </note>
+</para>
 		</listitem>
-		
+	
+
+	
 		<listitem><para> Date sent - Filter messages according to the date on
 		    which they were sent: First, choose the conditions you
 		    want a message to meet &mdash; <guilabel>before</guilabel>
@@ -525,11 +541,11 @@
 		    looking for messages less than two days old.
 		  </para></listitem>
 		
-		<listitem><para> Date Received - This works the same
-		    way as the <guilabel>Date Sent</guilabel> option,
-		    except that it compares the time you got the
-		    message with the dates you specify.
-		    </para></listitem>
+		<listitem><para>
+		    Date Received - This works the same way as the <guilabel>Date Sent</guilabel> 
+		    option, except that it compares the time you got the message 
+		    with the dates you specify.
+		  </para></listitem>
 		
 		<listitem><para>
 		    Score - Emails have a standard priority range from -3 (least
@@ -655,17 +671,8 @@
 	  <listitem>
 	    <para>
 	      Set Status - If you want to add multiple actions for this filter, press
-	      <guibutton>Add filter</guibutton> and repeat the previous step.
+	      <guibutton>Add action</guibutton> and repeat the previous step.
 	    </para>
-            <note>
-              <para>
-                If you wish to set status while moving an email to a
-                different folder at the same time, you will need to
-                tell <application>Ximian Evolution</application> to
-                set status before you move the message to another
-                folder.
-              </para>
-            </note>
 	  </listitem>
 	  <listitem>
 	    <para>
@@ -674,6 +681,7 @@
 	  </listitem>
 	</orderedlist>
       </para>
+      
       <note id="when-filters-go-wrong">
         <title>When Are Filters Applied?</title>
          <para>
@@ -682,11 +690,19 @@
            time you check for mail.
         </para>
         <para>
-           If you use an IMAP or Microsoft Exchange server and keep
-           your mail on the server, filters are applied to the INBOX
-           when you open it. In some cases, you will see a number of
-           unread messages in the INBOX, click the INBOX, and then
-           have the messages move elsewhere as they are filtered out.
+           If you store your mail on the mail server and check your
+           mail with IMAP, filters are applied to the INBOX when you
+           open it. In some cases, you will see a number of unread
+           messages in the INBOX, click the INBOX, and then have the
+           messages move elsewhere as they are filtered out.
+         </para>
+         <para>
+           If you use Ximian Connector to store your mail on an
+           Exchange server, filters are not applied until you open
+           your INBOX folder and select
+           <menuchoice><guimenu>Actions</guimenu><guimenuitem>Apply
+           Filters</guimenuitem></menuchoice> or press
+           <keycombo><keycap>Ctrl</keycap><keycap>Y</keycap></keycombo>
          </para>
       </note>
       <example id="filter-example">
@@ -700,6 +716,8 @@
            However, if you filter out all the mail with that header,
            you'll catch a lot of the mail you don't want to get.
          </para>
+
+
          <para>
            To catch them and automatically mark them for deletion, do
            the following:
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index a027162286..52f997224a 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -15,7 +15,8 @@
       them. Read <xref linkend="usage-mail-subscriptions"> to find out

       how.

     </para>

-  </note>  

+  </note>

+  

   

   <sect1 id="usage-mail-getnsend-read">

     <title>Reading Mail</title>    

@@ -119,16 +120,15 @@
 		When you press <guibutton>Delete</guibutton> or click

 		the trash button, your mail isn't actually deleted,

 		but is marked for deletion.  Your email is not gone

-		until you have <glossterm

-		linkend="expunge">expunged</glossterm> it. When you

-		expunge a folder, you remove all the mail that you

-		have marked for deletion.

+		until you have expunged it. When you "Expunge" a

+		folder, you remove all the mail that you have marked

+		for deletion.

 	      </para>

               <para>

                  If you don't like this behavior, select

                  <menuchoice><guimenu>View</guimenu><guimenuitem>Hide

-                 Deleted Messages</guimenuitem></menuchoice>.

-                 You will only see deleted messages when you look in

+                 Deleted Messages</guimenuitem></menuchoice>. Then,

+                 you will only see deleted messages when you look in

                  your <guilabel>Trash</guilabel> folder.

               </para>

 	    </note>

@@ -152,7 +152,7 @@
       <note>

 	<title>Trash is Actually a vFolder?</title>

 	<para>

-	   Both local and IMAP Trash folders are actually vFolders that

+	  Both local and IMAP Trash folders are actually vFolders that

           display all messages you have marked for later deletion.

           For more information about vFolders, see <xref

           linkend="usage-mail-organize-vfolders">.  Since emptying

@@ -162,6 +162,12 @@
           same as expunging deleted mail from <emphasis>all</emphasis>

           your folders.

 	</para>

+        <para>

+           This is not, however, true for the Trash folder on Exchange

+           servers, which behaves just the same as it would in

+           Outlook. That is to say, the Trash folder on an Exchange

+           server is a normal folder with actual messages in it.

+        </para>

       </note>

     </sect2>

     <sect2 id="usage-mail-getnsend-undelete">

@@ -190,7 +196,7 @@
 	      <title>What does Undelete actually do?</title>

 	      <para>

                 If you have marked a message for deletion, undeleting

-		it will unmark it and the message will be removed

+		it will unmark it, and the message will be removed

 		from the Trash folder. However, it can't bring back

 		messages that have been expunged.

 	      </para>

@@ -216,17 +222,17 @@
       <itemizedlist>

 	<listitem>

 	  <para>

-	    Your personal information.

+	    your personal information

 	  </para>

 	</listitem>

 	<listitem>

 	  <para>

-	    Your outgoing email server information.

+	    your outgoing email server information

 	  </para>

 	</listitem>

 	<listitem>

 	  <para>

-	    Your mail account identity name.

+	    your mail account identity name

 	  </para>

 	</listitem>

       </itemizedlist>

@@ -242,52 +248,54 @@
       <title>Can't Check Mail?</title>

       <para>

 	If you get an error message instead of mail, you probably need

-	to check your network settings.  For more information on your

-	network seeings, refer to <xref linkend="config-prefs-mail">,

-	or ask your system administrator.

+	to check your network settings.  To learn how to do that, have

+	a look at <xref linkend="config-prefs-mail">, or ask your

+	system administrator.

        </para>

      </note>

 

-    <tip>

-      <title>Sharing Mailboxes with Other Mail Programs</title>

-      <para>

-	If you want to use <application>Evolution</application>

-	and another email client, such as

-	<application>Mutt</application>, at the same time,

-	here's how:

-	<orderedlist numeration="arabic">

-	  <listitem>

-	    <para>

-	      Download your mail in the other application as

-	      you would normally.

-	    </para>

-	  </listitem>

-	  <listitem>

-	    <para>

-              Select

-	      <menuchoice><guimenu>Tools</guimenu><guimenuitem>Configure</guimenuitem></menuchoice>,

-	      click the <guibutton>Mail Accounts</guibutton> button,

-	      and pick the account you'd like to use to share

-	      mail. You may want to create a new account just for this

-	      source of mail.

-	    </para>

-	  </listitem>                     

-	  <listitem>

-	    <para>

-	      Under the <guilabel>Receiving Mail</guilabel>

-	      tab, select the type of mail file that your

-	      other mail application uses, and then enter the

-	      full path to that file.

-	    </para>

-	  </listitem>

-	  <listitem>

-	    <para>

-	      Click the <guibutton>OK</guibutton> button.

-	    </para>

-	  </listitem>

-	</orderedlist>

-      </para>

-    </tip>

+

+

+          <tip>

+            <title>Sharing Mailboxes with Other Mail Programs</title>

+            <para>

+              If you want to use <application>Evolution</application>

+              and another email client, such as

+              <application>Mutt</application>, at the same time,

+              here's how:

+              <orderedlist numeration="arabic">

+                <listitem>

+                   <para>

+                      Download your mail in the other application as

+                      you would normally.

+                   </para>

+                  </listitem>

+                <listitem>

+                   <para>

+                      In <application>Evolution</application>

+                      <menuchoice><guimenu>Tools</guimenu><guimenuitem>Mail

+                      Settings</guimenuitem></menuchoice>, and pick the account

+                      you'd like to use to share mail. You may want to

+                      create a new account just for this source of

+                      mail.

+                   </para>

+               </listitem>                     

+               <listitem>

+                   <para>

+                      Under the <guilabel>Receiving Mail</guilabel>

+                      tab, select the type of mail file that your

+                      other mail application uses, and then enter the

+                      full path to that file.

+                   </para>

+                  </listitem>

+                <listitem>

+                   <para>

+                      Click the <guibutton>OK</guibutton> button.

+                   </para>

+                  </listitem>

+                </orderedlist>

+               </para>

+            </tip>

 

 

 <!-- NOT FOR 1.0

@@ -307,93 +315,90 @@
 -->

 

      <sect2 id="usage-mail-getnsend-get-attach">

-      <title>Working with Attachments and HTML Mail</title>

-      <para>

-	If someone sends you an <glossterm linkend="attachment">attachment</glossterm>,

-	a file attached to an email,

-	<application>Evolution</application> will display the file

-	at the bottom of the message to which it's attached.  Text,

-	including HTML formatting and embedded images, will appear

-	as part of the message, rather than at the end of the

-	message as an attachment.

-      </para>

+	 <title>Working with Attachments and HTML Mail</title>

+	 <para>

+	   If someone sends you an <glossterm linkend="attachment">attachment</glossterm>,

+	   a file attached to an email,

+	   <application>Evolution</application> will display the file

+	   at the bottom of the message to which it's attached.  Text,

+	   including HTML formatting and embedded images, will appear

+	   as part of the message, rather than at the end of the

+	   message as an attachment.

+     </para>

 

      <sect3 id="usage-mail-getnsend-get-attach-actions">

-	<title>Saving or Opening Attachments</title>

-	<para>

-	  If you get an attachment with an email message,

-	  <application>Ximian Evolution</application> can help you save

-	  it or open it with the appropriate applications.

-	</para>

-	<para>

-	  To save an attachment to disk:

-	  <orderedlist numeration="arabic">

-	    <listitem>

-	      <para>

-		Click the downward pointing arrow on the attachment icon

-		and select <guimenuitem>Save to Disk</guimenuitem>.

-	      </para>

-	    </listitem>

-	    <listitem>

-	      <para>

-		Choose a location and name for the file.

-	      </para>

-	    </listitem>

-	    <listitem>

-	      <para>

-		Click <guibutton>OK</guibutton>.

-	      </para>

-	    </listitem>

-	  </orderedlist>

-	</para>

-	

-	<para>

-	  To Open an Attachment in a Program:

-	  <orderedlist numeration="arabic">

-	    <listitem>

-	      <para>

-		Open the mail message with the attachment you want to read.

-	      </para>

-	    </listitem>

-	    <listitem>

-	      <para>

-		Click the arrow next the attachment icon.

-	      </para>

-	    </listitem>

-	    <listitem>

-	      <para>

-		Select the program you'd like to use. It will start up

-		and open the document.

-	      </para>

-	    </listitem>

-	  </orderedlist>

-	</para>

-	<para>

-	</para>

+     <title>Saving or Opening Attachments</title>

+     <para>

+        If you get an attachment with an email message,

+        <application>Ximian Evolution</application> can help you save

+        it or open it with the appropriate applications.

+     </para>

+     <para>

+       To save an attachment to disk:

+       <orderedlist numeration="arabic">

+	 <listitem>

+	   <para>

+	     Click the downward pointing arrow on the attachment icon

+	     and select <guimenuitem>Save to Disk</guimenuitem>.

+	   </para>

+	 </listitem>

+	 <listitem>

+	   <para>

+	     Choose a location and name for the file.

+	   </para>

+	 </listitem>

+	 <listitem>

+	   <para>

+	     Click <guibutton>OK</guibutton>.

+	   </para>

+	 </listitem>

+       </orderedlist>

+      </para>

+

+      <para>

+	To Open an Attachment in a Program:

+	<orderedlist numeration="arabic">

+	  <listitem>

+	    <para>

+	      Open the mail message with the attachment you want to read.

+	    </para>

+	  </listitem>

+	  <listitem>

+	    <para>

+	      Click the arrow next the attachment icon.

+	    </para>

+	  </listitem>

+	  <listitem>

+	    <para>

+	      Select the program you'd like to use. It will start up

+	      and open the document.

+	    </para>

+	  </listitem>

+	</orderedlist>

+      </para>

+      <para>

+      </para>

       </sect3>

-      

+

       <sect3 id="usage-mail-getnsend-get-attach-html">

-	<title>Inline Images in HTML Mail</title>

-	<para>

-	  When someone sends you HTML mail that includes an image in

-	  the body of the message (for example, the welcome message in your

-	  Inbox when you first start <application>Ximian

-	   Evolution</application>) <application>Evolution</application>

-	  will display the image inside the message.  You can create

-	  messages like this by using the

-	  <menuchoice>

-	    <guimenu>Insert</guimenu>

-	    <guimenuitem>Image</guimenuitem>

-	  </menuchoice>

-	  tool in the message composer.

-	</para>

+      <title>Inline Images in HTML Mail</title>

+      <para>

+         When someone sends you HTML mail that includes an image in

+         the body of the message (for example, the welcome message in your

+         Inbox when you first start <application>Ximian

+         Evolution</application>) <application>Evolution</application>

+         will display the image inside the message.  You can create

+         messages like this by using the

+         <menuchoice><guimenu>Insert</guimenu><guimenuitem>Image</guimenuitem></menuchoice>

+         tool in the message composer.

+      </para>

 

       <para>

-         If the image isn't included in the message, but is

-         a link to an image, <application>Evolution</application> can

-         download the image from the Internet for you.  By default,

-         <application>Evolution</application> will not display the image.

-         This is because remotely hosted

+         If the image isn't included in the message, but is, instead,

+         a link to an image, <application>Evolution</application> can 

+         download the image from the Internet for you.  However,

+         <application>Evolution</application> will not display the

+         image unless you ask it to. This is because remotely hosted

          images can be slow to load and display, and can even be used

          by spammers to track who reads their email.  Having images

          not load automatically helps protect your privacy.

@@ -407,15 +412,12 @@
          </menuchoice>.  

 

          If you want <application>Ximian Evolution</application> to

-         load remotely hosted images more often, select the

+         load remotely hosted images more often, go to the

+         <guilabel>Display</guilabel> tab of the

          <menuchoice>

 	   <guimenu>Tools</guimenu>

-	   <guimenuitem>Configure</guimenuitem> </menuchoice> menu

-	   item and click the <guibutton>Mail Preferences</guibutton>

-	   button in the configuration tool. There, select the

-	   <guibutton>HTML Mail</guibutton> tab and choose

-	   <guilabel>Load images if sender is in

-	   addressbook</guilabel> or <guilabel>Always load images off the net</guilabel>

+	   <guimenuitem>Mail Settings</guimenuitem>

+         </menuchoice> dialog.

       </para>

       <note id="http-proxy">

 	<title>Loading Images from the Net through an HTTP Proxy</title>

@@ -426,54 +428,16 @@
            before it can load images from the Internet.  This is also

            the case if you wish to access weather and news information

            through the Summary tool. You can tell the GNOME Virtual

-           File System about your HTTP proxy in one of three

-           ways. From easiest to most complicated, they are:

+           File System about your HTTP proxy in one of two ways:

             <variablelist>

-

-	      <varlistentry>

-	      <term>Configure it with the Gnome-VFS Proxy Configuration Tool</term>

-	      <listitem>

-		<para>

-                  Ximian ships a small utility called the Gnome-VFS

-                  Proxy Configuration Tool, which you can run from the

-                  <guimenu>Desktop Preferences</guimenu> menu or with

-                  the <command>gnome-vfs-proxy-capplet</command>

-                  command. All it does is let you tell GNOME what your

-                  HTTP proxy is:

-         <orderedlist numeration="arabic">

-		    <listitem>

-		      <para>

-	               Run the configuration tool with the

-	               <command>gnome-vfs-proxy-capplet</command>

-	               command or by selecting it from the

-	               <guimenu>Desktop Preferences</guimenu> menu.

-	               </para>

-		    </listitem>

-      		    <listitem>

-		      <para>

-                          Enter the name of your HTTP proxy where

-                          indicated. If you are not sure what it is,

-                          ask your system administrator.

-	               </para>

-		    </listitem>

-      		    <listitem>

-		      <para>

-                        Click OK. You're done.

-	               </para>

-		    </listitem>

-		  </orderedlist>

-                </para>

-	      </listitem>

-	    </varlistentry>

-

-	      <varlistentry>

+	    <varlistentry>

 	      <term>Configure it with Nautilus</term>

 	      <listitem>

 		<para>

                  <orderedlist numeration="arabic">

 		    <listitem>

 		      <para>

-			Open a Nautilus window.

+			Open a Nautilus window

 	               </para>

 		    </listitem>

       		    <listitem>

@@ -501,19 +465,44 @@
 	      </listitem>

 	    </varlistentry>

 	    <varlistentry>

-	      <term>Configure it with gconftool or gconf-editor </term>

+	      <term>Configure it with the gconftool command</term>

 	      <listitem>

 	      <para>

-                  There are two tools you can use to edit the GNOME

-                  configuration system directly:

-                  <command>gconftool</command> is a command-line

-                  application for experts only, and

-                  <application>gconf-editor</application> is a

-                  graphical tool that is easier to use, but is still

-                  strictly a power-user application. Both programs are

-                  beyond the scope of this manual.  For more

-                  information about gconftool and gconf-editor, read

-                  their man pages.

+                 <orderedlist numeration="arabic">

+		    <listitem>

+		      <para>

+                        Open a terminal.

+                      </para>

+		    </listitem>

+		    <listitem>

+		      <para>

+                        Enter the command 

+                        <command>

+                        gconftool --type=bool --set /system/gnome-vfs/use-http-proxy "TRUE"

+                        </command>

+                      </para>

+		    </listitem>

+		    <listitem>

+		      <para>

+                        Enter the command 

+                        <command>

+      gconftool --type=string --set /system/gnome-vfs/http-proxy-host "your-proxy-url"

+                        </command>

+                      </para>

+		    </listitem>

+		    <listitem>

+		      <para>

+                        Enter the command 

+                        <command>

+                        gconftool --type=int --set /system/gnome-vfs/http-proxy-port "8080"

+                        </command>                  

+                      </para>

+		    </listitem>

+		  </orderedlist>

+                </para>

+		<para>

+                  For more information about the gconftool command,

+                  read the gconftool man page.

                 </para>

 	      </listitem>

 	    </varlistentry>

@@ -524,20 +513,18 @@
     </sect2>

   </sect1>

 

-  <sect1 id="usage-mail-getnsend-send">

-    <title>Composing New Email Messages</title>

-    <para>

-      You can start writing a new email message by selecting

-      <menuchoice>

-	<guimenu>File</guimenu>

-	<guisubmenu>New</guisubmenu> 

-	<guimenuitem>Mail Message</guimenuitem>

-      </menuchoice>, or by pressing the

-      <guibutton>Compose</guibutton> button in the Inbox toolbar.

-      When you do so, the <interface>New Message</interface> window

-      will open, as shown in <xref

-				   linkend="usage-mail-newmsg-fig">.

-    </para>

+    <sect1 id="usage-mail-getnsend-send">

+      <title>Composing New Email Messages</title>

+      <para>

+         You can start writing a new email message by selecting

+         <menuchoice> <guimenu>File</guimenu>

+         <guisubmenu>New</guisubmenu> <guimenuitem>

+         Mail Message</guimenuitem></menuchoice>, or by pressing the

+         <guibutton>Compose</guibutton> button in the Inbox toolbar.

+         When you do so, the <interface>New Message</interface> window

+         will open, as shown in <xref

+         linkend="usage-mail-newmsg-fig">.

+      </para>

 

 <!--   ==============Figure=================================== -->

       <figure id="usage-mail-newmsg-fig">

@@ -587,9 +574,7 @@
 	      from the Internet while you work. When you want to

 	      reconnect, choose

 	      <menuchoice><guimenu>File</guimenu><guimenuitem>Work

-	      Online</guimenuitem></menuchoice>.  Alternativly, you

-	      can click the connection button at the bottom left side

-	      of the window.

+	      Online</guimenuitem></menuchoice>.  Alternativly, you can click the connection button at the bottom left side of the window.

             </para>

          </note>

 

@@ -639,12 +624,12 @@
 	  <orderedlist numeration="arabic">

 	    <listitem>

 	      <para>

-		Push the attach button in the composer toolbar.

+		Push the attach button in the composer toolbar

 	      </para>

 	    </listitem>

 	    <listitem>

 	      <para>

-		Select the file you want to attach.

+		Select the file you want to attach

 	      </para>

 	    </listitem>

 	    <listitem>

@@ -659,19 +644,19 @@
 	  attach it as well.

         </para>

         <para>

-	  To hide the display of files you've attached to the

-	  message, select <menuchoice>

+            To hide the display of files you've attached to the

+            message, select <menuchoice>

             <guimenu>View</guimenu> <guimenuitem>Hide

-	      Attachments</guimenuitem> </menuchoice>; to show them

-	  again, choose <guimenuitem>Show Attachments</guimenuitem>.

+            Attachments</guimenuitem> </menuchoice>; to show them

+            again, choose <guimenuitem>Show Attachments</guimenuitem>.

         </para>

         <para>

-	  When you send the message, a copy of the attached file

-	  will go with it.  Be aware that big attachments can take a

-	  long time to download.

+            When you send the message, a copy of the attached file

+            will go with it.  Be aware that big attachments can take a

+            long time to download.

         </para>

-      </sect3>

-      

+       </sect3>

+

       <sect3 id="usage-mail-getnsend-send-to-types">

 	<title>Specifying Recipients for Email</title>

         <para>

@@ -964,7 +949,7 @@
 	  <para>

             To send all your mail as HTML by default, set your mail

             format preferences in the mail configuration dialog.  See

-            <xref linkend="config-prefs-mail"> for more

+            <xref linkend="config-prefs-mail-other"> for more

             information.

       </para>

       <para>

@@ -1624,7 +1609,7 @@
       </para>

     </sect2>

     <sect2 id="fancy-mail">

-      <title>Improving Email Appearance with HTML</title>

+      <title>Making Your Email More Fancy</title>

       <para>

 	<application>Evolution</application> can do a lot with email

 	by utilizing the HTML features.  Making an email functional

@@ -1643,8 +1628,7 @@
 	    <title>Indented Text with Headlines</title>

 	    <screenshot>

 	      <screeninfo></screeninfo>

-	      <graphic  format="png" fileref="figures/outline"

-		       srccredit="Kevin Breit">

+	      <graphic  format="png" fileref="figures/outline" srccredit="Kevin Breit">

 	    </screenshot>

 	  </figure>

 	</para>

@@ -1655,13 +1639,12 @@
 	  following content indented.

 	</para>

 	<para>

-	Making your headlines a larger size instead of bold can help

-	as well.  Header size 4 is often the best alternative for

-	bold.  You can change your text to size 4 by selecting it and

-	pressing <keycombo

-	action="simul"><keycap>Ctrl</keycap><keycap>4</keycap></keycombo>,

-	and change it back to normal size with <keycombo

-	action="simul"><keycap>Ctrl</keycap><keycap>0</keycap></keycombo>.

+	You may want to increase the size of your section headlings

+	instead of merely putting them in bold.  Header size 4 is

+	often the best choice, since it is not too large.  You can

+	change your text to size 4 by selecting it and pressing

+	Ctrl+4.  You can set your text to the normal text size by

+	hitting Ctrl+0.

 	</para>

       </sect3>

       <sect3 id="bulleted-lists">

@@ -1680,24 +1663,25 @@
       <sect3 id="inline-images">

 	<title>Images In Your Email</title>

 	<para>

-	  Another way to improve the appearance of messages is to add

-	  images to them.  Especially if you want to discuss a

-	  particular image in the message, the the HTML picture frame

-	  template in <application>Evolution</application>, as it

-	  looks good and has captions below it.

+	  Images can help people to understand your point.  You can

+	  even use a HTML Picture Frame Template in

+	  <application>Evolution</application>, which looks very

+	  attractive and sets your image off from the rest of your

+	  message with a border and caption.

 	</para>

 	<para>

 	  If you do choose to use images, try to keep them narrow.  If

 	  your images are wider than 400 pixels, the image may not fit

 	  in the whole email window, making it hard for your reader to

-	  read the email and view the image.  Instead, you should

-	  consider using a thumbnail and creating a link on the image

-	  which opens a browser with the full image.

+	  read the email and view the image.  Consider using a smaller

+	  version ("thumbnail") of your image, and offering a link to

+	  the larger version your readers can view in a web browser if

+	  they want.

 	  <figure>

 	    <title>Images in an email</title>

 	    <screenshot>

 	      <screeninfo></screeninfo>

-	      <graphic  format="png" fileref="small_desktop" srccredit="Kevin Breit">

+	      <graphic  format="png" fileref="figures/small_desktop" srccredit="Kevin Breit">

 	    </screenshot>

 	  </figure>

 	</para>

@@ -1705,10 +1689,9 @@
       <sect3 id="color-suggestions">

 	<title>Coloring Your Text</title>

 	<para>

-	  Colors can help bring words or sentences out for emphasis.

-	  You should choose your colors carefully though, because the

-	  wrong color can be distracting.  Some good colors to use

-	  are:

+	  Colors can help bring words or sentences out for emphasis.  You

+	  should choose your colors carefully though, as the wrong color

+	  can be distracting.  Some good colors to use would be:

 	  <itemizedlist>

 	    <listitem>

 	      <para>

@@ -1726,95 +1709,12 @@
 	      </para>

 	    </listitem>

 	  </itemizedlist>

-	  <!-- Include a screenshot --> 

-

-  All of these colors are of a similar level of saturation and are

-  easy to read on a white background.

-

+	  <!-- Include a screenshot -->

+	  Notice how these colors are similar saturation <!-- Confirm I am using the right word -->

 	</para>

-      </sect3>

-      <sect3 id="signature-howto">

-	<title>HTML Signatures in Your Email</title>

 	<para>

-	  The last few lines of an email message are often devoted to

-	  a signature block.  Typically, the signature block is

-	  inserted by the mail program.   You

-	  can use the signature to add your address and any other

-	  contact information you think is important, or simply to

-	  provide an amusing or interesting closing line for your

-	  message.  <application>Evolution</application> gives you the

-	  option of designing your signatures in HTML or in plain

-	  text.

+	  Happy mailing!

 	</para>

-	<sect4 id="html-signature-howto">

-	  <title>Setting Up Your HTML Signature</title>

-	  <para>

-	    To set up an HTML signature:

-	    <orderedlist numeration="arabic">

-	      <listitem>

-		<para>

-                Select

-		  <menuchoice>

-		    <guimenu>Tools</guimenu>

-		    <guimenuitem>Configure</guimenuitem>

-		  </menuchoice>.

-		</para>

-	      </listitem>

-	      <listitem>

-		<para>

-		  Click the <guibutton>Composer

-		  Preferences</guibutton> on the left side of the

-		  configuration window.

-		</para>

-	      </listitem>

-	      <listitem>

-		<para>

-		  In the <guilabel>Composer Preferences</guilabel>

-		  window, click the second tab on the top labeled

-		  <guibutton>Signatures</guibutton>.

-		</para>

-	      </listitem>

-	      <listitem>

-		<para>

-		  If you have a pre-made signature, click the

-		  <guibutton>Browse</guibutton> to select your

-		  signature.  You can find pre-made signatures at <ulink

-									 url="http://www.ximian.com/devzone/projects/art/signatures.html">the

-		    Ximian signature page</ulink>.

-		</para>

-	      </listitem>

-	      <listitem>

-		<para>

-		  If you are creating a new signature, click the

-		  <guibutton>Edit</guibutton> button to open up the HTML

-		  signature editor.

-		</para>

-	      </listitem>

-	      <listitem>

-		<para>

-		  The HTML signature editor uses the same interface as

-		  the composer.  You can create your signature in this

-		  window.

-		</para>

-	      </listitem>

-	      <listitem>

-		<para>

-		  Once you have completed your signature, click

-		  <menuchoice>

-		    <guimenu>File</guimenu>

-		    <guimenuitem>Save and Close</guimenuitem>

-		  </menuchoice>

-		</para>

-	      </listitem>

-	      <listitem>

-		<para>

-		  When you select your mail to be composed in HTML

-		  format, your HTML signature will automatically show up.

-		</para>

-	      </listitem>

-	    </orderedlist>

-	  </para>

-	</sect4>

       </sect3>

     </sect2>

   </sect1>

@@ -1976,7 +1876,11 @@
         message that is encrypted, you must encrypt it using your

         intended recipient's public key.  To <emphasis>get</emphasis>

         an encrypted message, you must make sure that the sender has

-        your public key in advance.

+        your public key in advance. For signing messages, it's

+        reversed: you encrypt the signature with your private key, so

+        only your public key can unlock it. When you send it, the

+        recipient gets your public key and unlocks the signature,

+        verifying your identity.

       </para>

 

       <para>

@@ -1987,14 +1891,15 @@
           </member>

           <member>

             Attach an encrypted signature to a plain text message, so

-            that the recipient can read the message without decrypting it, and 

-            only needs decryption to verify the sender's identity.

+            that the recipient can read the message without decrypting

+            it, and only needs decryption to verify the sender's

+            identity. 

            </member>

          </simplelist>

       </para>

 

 	<example> 

-         <title>Sending an Encrypted Message</title>

+         <title>Sending an Encrypted Messagee</title>

 	  <para>

 	    Kevin wants to send an encrypted message to his friend

 	    Rachel.  He looks up her public key on a general key

@@ -2009,8 +1914,7 @@
       <tip id="always-sign">

 	<title>Always Sign</title>

 	<para>

-	  You can set <application>Evolution</application> to always

-	  sign your email messages:

+	  You can set <application>Evolution</application> to always sign your email messages:

 	  <orderedlist numeration="arabic">

 	    <listitem>

 	      <para>

@@ -2024,8 +1928,7 @@
 	    </listitem>

 	    <listitem>

 	      <para>

-		Click the <guibutton>Always sign outgoing messages

-		when using this account</guibutton> button.

+		Click the <guibutton>Always sign outgoing messages when using this account</guibutton> button.

 	      </para>

 	    </listitem>

 	  </orderedlist>

@@ -2033,6 +1936,8 @@
       </tip>

     </sect2>

 

+

+

     <sect2 id="encryption-keygen">

       <title>Making Encryption Keys</title>

       <para>

@@ -2065,8 +1970,7 @@
 	  <listitem>

       	   <para>

             Choose a key length. The default, 1024 bits, should be

-            long enough, and 2048 bits is considered very strong

-            indeed.

+            long enough.

 	  </para>

          </listitem>

 

@@ -2156,6 +2060,12 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
 	    and then let people download them from the keyserver when

 	    they want.

 	  </para>

+          <para>

+             If you don't have a key you need to unlock or encrypt a

+             message, you can have your encryption tool set to look it

+             up automatically. If it can't find the key, then you'll

+             get an error message.

+          </para>

 	</note>

 

       </para>

@@ -2182,7 +2092,7 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
       </para>

       <para>

         If someone sends you their public key directly, save it as a

-        plain text file and enter the command <command>gpg --import

+        plain text file and enter the command <command>gpg

         filename</command>. This will add it to your keyring.

       </para>

     </sect2>

@@ -2262,4 +2172,4 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
        </para>

     </sect2>

   </sect1>

-</chapter>
\ No newline at end of file
+</chapter>

diff --git a/help/ChangeLog b/help/ChangeLog
index ace5436c31..05c43ad187 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-19  Aaron Weber  <aaron@ximian.com>
+
+	* C/config-sync.sgml: add item about permissions.
+
+	* C/usage-mail-org.sgml: add note about filter applications, tip
+	for easy filtering.
+
+	* C/usage-mail.sgml: encryption update
+
 2002-08-28  Aaron Weber  <aaron@ximian.com>
 
 	* C/preface.sgml: nav-by-letters