some of this was shamefully inaccurate.

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

	* C/usage-contact.sgml: some of this was shamefully inaccurate.

	* C/preface.sgml: add original location.

svn path=/trunk/; revision=17156

4 files changed, 67 insertions, 83 deletions

diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index aa9502cfdb..3e3a7d8dfd 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -106,7 +106,6 @@ Lastly, we'll have warnings, in cases where you should be careful:
 	    </listitem>
 	  </varlistentry>
 
-
 	  <varlistentry>
 	    <term>Performance Improvements</term>
 	    <listitem>
@@ -129,28 +128,38 @@ Lastly, we'll have warnings, in cases where you should be careful:
                 again and it will go to the next folder that starts
                 with that letter.  Similarly, you can press a letter
                 key in the message list and the message selection will
-                move to the next message whose sender begins with that
-                letter. For example, you could press the
-                <keycap>r</keycap> key to go to the next message that
-                Russell sent you.
+                move to the next message whose sender or subject
+                begins with that letter, depending on which column you
+                sort by.
               </para>
 	      <para>
                 That means that unmodified letter shortcuts from
-                Evolution 1.0 won't work any more. The changes are:
+                Evolution 1.0 won't work any more. The displaced
+                shortcuts are:
                 <simplelist>
 		  <member>
                     <keycap>,</keycap> (comma) and <keycap>.</keycap>
                     (period) are now the keyboard shortcuts for Next
-                    and Previous unread messages
+                    and Previous unread messages. You can also use the
+                    square brackets <keycap>]</keycap> and
+                    <keycap>[</keycap>.
                  </member>
 		 <member>
-                   <keycap>'</keycap> (the single apostrophe) toggles
+                   <keycap>`</keycap> (backtick) toggles
                    the message preview pane.
                  </member>
 		</simplelist>
                 Shortcuts that used the <keycap>Control</keycap> key
                 are not affected.
              </para>
+             <para>
+               The shortcuts
+               <keycombo><keycap>Alt</keycap><keycap>l</keycap></keycombo>
+               <keycombo><keycap>Alt</keycap><keycap>c</keycap></keycombo>
+               <keycombo><keycap>Alt</keycap><keycap>u</keycap></keycombo> will
+               change the selection or current word to lowercase,
+               title case, or uppercase, respectively.
+             </para>
 	    </listitem>
 	  </varlistentry>
 
@@ -183,12 +192,11 @@ Lastly, we'll have warnings, in cases where you should be careful:
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Folder Naming Limits Removed</term>
+	    <term>Folder Naming Internationalization</term>
 	    <listitem>
 	      <para>
-                You can now have IMAP folders with names including the
-                ampersand (&amp;) and dash (-) characters, and even
-                UTF-8 (unicode) characters.
+                You can now use Unicode (UTF-8) characters in the
+                names for IMAP folders.
               </para>
 	    </listitem>
 	  </varlistentry>
@@ -204,24 +212,26 @@ Lastly, we'll have warnings, in cases where you should be careful:
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Additional Message Status Options</term>
+	    <term>Filters and vFolders Notice Moved or Missing Folders</term>
 	    <listitem>
 	      <para>
-                You can now mark messages by color (Right click on a
-                menu and select "Labels), or flag them for a follow-up
-                action. Filters can now be based on these criteria.
+                vFolders and filters now notice if you move or delete
+                a folder that they use, and update themselves
+                accordingly.
               </para>
 	    </listitem>
 	  </varlistentry>
 
-
 	  <varlistentry>
-	    <term>Filters and vFolders Notice Moved or Missing Folders</term>
+	    <term>vFolder "Original Location" Feature</term>
 	    <listitem>
 	      <para>
-                vFolders and filters now notice if you move or delete
-                a folder that they use, and update themselves
-                accordingly.
+                vFolders can now display the actual folder location
+                for each message they contain.  To do so, right click
+                on the column headers in the message list of any
+                vFolder, select <guimenuitem>Add a
+                Column</guimenuitem>, and drag the <guibutton>Original
+                Location</guibutton> item into position.
               </para>
 	    </listitem>
 	  </varlistentry>
@@ -238,29 +248,22 @@ Lastly, we'll have warnings, in cases where you should be careful:
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>New Filter Criteria and Actions</term>
+	    <term>New Criteria and Actions</term>
 	    <listitem>
 	      <para>
-                 You can now filter based on score, flag-for-followup
-                 or message coloration status, or the existence of
-                 attachments. New actions include beeping, playing
-                 sounds, running shell commands, and piping messages
-                 to external processes.
+                 There are many new filter criteria and actions,
+                 including additional message flags such as Flag for
+                 Followup.
               </para>
 	    </listitem>
 	  </varlistentry>
 
          <varlistentry>
-	    <term>Folder Preferences for Autocompletion and Offline Mode</term>
+	    <term>Folder Selection for Offline Mode</term>
 	    <listitem>
               <para>
                You may now select which network folders which will be
-               cached locally when you go into Offline mode. Offline
-               mode now works better in general.
-             </para>
-	      <para>
-                You may also select which contact folders will be used
-                to autocomplete addresses in the mail composer.
+               cached locally when you go into Offline mode.
              </para>
 	    </listitem>
 	  </varlistentry>
@@ -290,9 +293,9 @@ Lastly, we'll have warnings, in cases where you should be careful:
 	    <term>Digest-mode Display of Forwarded Messages</term>
 	    <listitem>
 	      <para>
-                Messages that have been forwarded to you as
-                attachments are now displayed in "Digest Mode" rather
-                than inline.
+                Messages that contain multiple forwarded messages are
+                now displayed as a digest rather than inline or as a
+                series of attachments.
              </para>
 	    </listitem>
 	  </varlistentry>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index aff3da93fe..c66de53b7a 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -493,47 +493,26 @@
            right-click on the list's address card in the Addressbook
            and select <guimenuitem>Send Message to List</guimenuitem>.
         </para>
-      </sect3>
-
+        <para>
+           Ximian Evolution cannot store contact lists on Exchange
+           servers.
+        </para>
 
+      </sect3>
     </sect2>
   </sect1>
   
-<!-- we need a LDAP server up for me to test this -->
   <sect1 id="usage-contact-sharing">
     <title>Sharing your Cards</title>
     <para>
       The <glossterm linkend="ldap">LDAP</glossterm> protocol was
       created to let users share contact information over a network.
-      LDAP allows for users to browse other people's addressbooks, or
-      maintain a shared set of contact information for a company or
-      department.  This feature comes in handy if you are in a group
-      where there are lots of people using the same contacts.  Such an
-      example would be the sales department of a company with their
-      client list.
+      LDAP allows a company to maintain a shared set of contact
+      information for a company or department.  Many companies keep a
+      common LDAP address book for all their employees or for client
+      contacts.
     </para>
 
-     <example id="usage-contact-sharing-ex">
-	<title>Sharing Address Cards and Calendar Data</title>
-	  <para>
-	    Rich wants to schedule a meeting with Company X, so he
-	    checks the network for the Company X address card so he
-	    knows whom to call there.  Since his company also shares
-	    calendars, he then learns that his co-worker Deanna has
-	    already scheduled a meeting with Company X next Thursday.
-	    He can either go to the meeting himself or ask Deanna to
-	    discuss his concerns for him.  Either way, he avoids
-	    scheduling an extra meeting with Company X. 
-	 </para>
-      </example>
-
-    <para>
-       Of course, you don't want to share all of your cards&mdash; why
-       overload the network with a list of babysitters or tell
-       everyone in the office you're talking to new job prospects?  If
-       you keep cards on your own computer, you can decide which items
-       you want to make accessible to others.
-    </para>
     <para>
        To learn how to add a remote directory to your available
        contact folders, see <xref linkend="config-prefs-contact">.
@@ -567,8 +546,8 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-              Your ability to view, change, add, and delete contacts
-              depends on the settings of the LDAP server. 
+              LDAP servers do not normally permit individual users to
+              alter or delete cards.
 	    </para>
 	  </listitem>
 	</itemizedlist>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 1d8d53ba6b..ad984dd335 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -587,7 +587,9 @@
 	      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>

 

@@ -2183,16 +2185,6 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
         plain text file and enter the command <command>gpg --import

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

       </para>

-      <tip>

-	<title>Recieving Keys Without the Command Line</title>

-	<para>

-	  <application>gpg</application> allows you to automatically

-	  download keys off the servers without using a command line.

-	  To do this, simply type:<command>keyserver

-	  wwwkeys.pgp.net</command> in the

-	  <filename>~/.gnupg/options</filename> file.

-	</para>

-      </tip>

     </sect2>

 

     <sect2 id="encrypt-evo-integ">

diff --git a/help/ChangeLog b/help/ChangeLog
index fbaa8fca1c..796d92acc2 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,11 +1,21 @@
+2002-06-10  Aaron Weber  <aaron@ximian.com>
+
+	* C/usage-contact.sgml: some of this was shamefully inaccurate.
+
+	* C/preface.sgml: add original location.
+
 2002-06-04  Kevin Breit  <mrproper@ximian.com>
 
-	* C/usage-mail.sgml: Added a tip mentioning that gpg can automagically contact the server for keys without having to use a console.
+	* C/usage-mail.sgml: Added a tip mentioning that gpg can
+	automagically contact the server for keys without having to use a
+	console.
 
 2002-05-30  Kevin Breit  <mrproper@ximian.com>
 
-	* C/usage-mail.sgml: Reworded the signature introduction paragraph. 
-	Started work on documenting the new signature editor.  I am kind of unsure of the full functionality, so I'm going to wait a little bit on it.
+	* C/usage-mail.sgml: Reworded the signature introduction
+	paragraph.  Started work on documenting the new signature editor.
+	I am kind of unsure of the full functionality, so I'm going to
+	wait a little bit on it.
 
 2002-05-30  Aaron Weber  <aaron@ximian.com>