Created its own file.

2001-07-02  Kevin Breit  <battery841@mediaone.net>

	* C/apx-common-tasks.sgml: Created its own file.

	* C/usage-mainwindow.sgml: You name it.

	* C/preface.sgml: Pulled shortcuts from here into its own apx

	* C/evolution.sgml: Reordered entities

svn path=/trunk/; revision=10686

14 files changed, 706 insertions, 812 deletions

diff --git a/doc/C/evolution.sgml b/doc/C/evolution.sgml
index 647aa488f7..b78cfc233a 100644
--- a/doc/C/evolution.sgml
+++ b/doc/C/evolution.sgml
@@ -16,6 +16,7 @@
 <!ENTITY MENUREF SYSTEM "menuref.sgml">
 <!ENTITY FAQ SYSTEM "evolution-faq.sgml">
 <!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
+<!ENTITY APX-COMMON-TASKS SYSTEM "apx-common-tasks.sgml">
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
 
@@ -136,6 +137,7 @@ implemented. -->
   &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS; 
+
 </book>
 
 
diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml
index 3e507dc8f5..67779dc0af 100644
--- a/doc/C/preface.sgml
+++ b/doc/C/preface.sgml
@@ -302,7 +302,6 @@
       import your files right back in.
     </para>
   </sect1>
-  
   <sect1 id="quickref-commontasks">
     <title>Quick Reference for Common Tasks</title>
     <para>
@@ -530,8 +529,8 @@
 	  </variablelist>
 
         </para>
-      </sect2>
-      <sect2 id="quickref-contact">
+  </sect2>
+    <sect2 id="quickref-contact">
         <title>Contact Manager</title>
         <para>
 	Here are the most frequent tasks that are done in the Contact Manager,
@@ -598,19 +597,7 @@
 	  </varlistentry>
 	</variablelist>
 
-        </para>
-      </sect2>
-    </sect1>
-  </preface>
-
-
-
-
-
-
-
-
-
-
-
-
+      </para>
+    </sect2>
+  </sect1>
+</preface>
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index a2e4558d5d..3b233baba0 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -108,75 +108,9 @@
        more than a few people listed, you'll want some way of finding
        them more quickly, which is why there's a search feature.
     </para>
-
-    <sect2 id="contact-search">
-      <title>Searching for Contacts</title>
-      <para>
-	   Between <guilabel>Delete</guilabel> and <guilabel>View
-    	   All</guilabel> is a quick search field. To use it, select
-    	   from the drop-down list which sort of search you'd like to
-    	   perform (the whole card, just the name, or just the email
-    	   address), then enter one or more words in the text entry
-    	   box, and press <keycap>Enter</keycap>.
-    	   <application>Evolution</application> will search through
-    	   the contents of every displayed card to find one that
-    	   matches. You can refine searches by doing several in
-    	   succession, or start over by pressing the <guibutton>View
-    	   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>
-        If you prefer to perform a more complex search, press
-        <guibutton>Find</guibutton> or choose
-        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for
-        Contact</guimenuitem></menuchoice>. This will open the
-        in-depth search window, which lets you use multiple search
-        criteria in the same way that email filters and <glossterm
-        linkend="vfolder">virtual folders</glossterm> do.  
-      </para>
-      <para>
-        Click <guibutton>Add Criterion</guibutton> to increase the
-        number of criteria you'd like to use in the search, and
-        <guibutton>Remove Criterion</guibutton> to remove one from the
-        bottom of the list.  Your criteria may be a search within the
-        <guilabel>Name</guilabel> or <guilabel>Email</guilabel>
-        fields; alternately you can choose to search through all the
-        fields with a regular expression.  Then, you can select from
-        all the familiar requirements like <guilabel>Begins
-        With</guilabel> and <guilabel>Does Not Contain</guilabel>,
-        decide whether to match <guilabel>All</guilabel> or
-        <guilabel>Any</guilabel> of your criteria, and press
-        <guibutton>Search</guibutton> to set it all off.
-      </para>
-    
-    </sect2>
-
   </sect1>
   <sect1 id="usage-contact-cards">
-    <title>Destroy, Create, and Change: The Contact Editor</title>
+    <title>The Contact Editor</title>
     <para>
        To delete a card, click on it once to select it, then press the
        <guibutton>Delete</guibutton> button.  If you have multiple
@@ -370,6 +304,70 @@
 
   </sect1>
 
+  <sect1 id="contact-search">
+    <title>Searching for Contacts</title>
+    <para>
+      Between <guilabel>Delete</guilabel> and <guilabel>View
+	All</guilabel> is a quick search field. To use it, select
+      from the drop-down list which sort of search you'd like to
+    	   perform (the whole card, just the name, or just the email
+      address), then enter one or more words in the text entry
+      box, and press <keycap>Enter</keycap>.
+      <application>Evolution</application> will search through
+      the contents of every displayed card to find one that
+      matches. You can refine searches by doing several in
+      succession, or start over by pressing the <guibutton>View
+	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>
+      If you prefer to perform a more complex search, press
+      <guibutton>Find</guibutton> or choose
+      <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for
+	  Contact</guimenuitem></menuchoice>. This will open the
+      in-depth search window, which lets you use multiple search
+      criteria in the same way that email filters and <glossterm
+								 linkend="vfolder">virtual folders</glossterm> do.  
+    </para>
+    <para>
+      Click <guibutton>Add Criterion</guibutton> to increase the
+      number of criteria you'd like to use in the search, and
+      <guibutton>Remove Criterion</guibutton> to remove one from the
+      bottom of the list.  Your criteria may be a search within the
+      <guilabel>Name</guilabel> or <guilabel>Email</guilabel>
+      fields; alternately you can choose to search through all the
+      fields with a regular expression.  Then, you can select from
+      all the familiar requirements like <guilabel>Begins
+        With</guilabel> and <guilabel>Does Not Contain</guilabel>,
+      decide whether to match <guilabel>All</guilabel> or
+      <guilabel>Any</guilabel> of your criteria, and press
+      <guibutton>Search</guibutton> to set it all off.
+    </para>
+  </sect1>
+
   <sect1 id="usage-contact-organize">
     <title>Organizing your Address Book</title>
     <para>
@@ -595,33 +593,18 @@
  -->
 
     </sect2>
-<!---  FIXME this feature not yet implemented 
-    <sect2 id="usage-contact-automation-extra">
-      <title>Map It!</title>
-      <para>
-	 Need a map or directions? Click
-	 <guibutton>MapIt</guibutton> from within the contact
-	 manager, and <application>Evolution</application> will
-	 map the address for you online.
-      </para>
-    </sect2>
--->
-
-
+    <!---  FIXME this feature not yet implemented 
+  <sect2 id="usage-contact-automation-extra">
+  <title>Map It!</title>
+  <para>
+    Need a map or directions? Click
+  <guibutton>MapIt</guibutton> from within the contact
+    manager, and <application>Evolution</application> will
+    map the address for you online.
+  </para>
+  </sect2>
+    -->
+    
+    
   </sect1>
-
 </chapter> 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/C/usage-mail-org.sgml b/doc/C/usage-mail-org.sgml
index 9a2a775740..6668623cf0 100644
--- a/doc/C/usage-mail-org.sgml
+++ b/doc/C/usage-mail-org.sgml
@@ -201,7 +201,7 @@
     </sect1>
 
     <sect1 id="usage-mail-organize-filters">
-      <title>Staying organized: Mail Filters in Evolution</title>
+      <title>Create Rules to Automatically Organize Mail</title>
       <para>
 	Filters work very much like the mail room in a large company.
 	Their purpose is to bundle, sort, and distribute mail to the
@@ -537,30 +537,30 @@
 	</itemizedlist>
       </para>
     </note>
-  </sect1>
-  <sect1 id="usage-mail-organize-filters-mailing-lists">
-    <title>Filtering by Mailing List</title>
+    
+    <sect2 id="usage-mail-organize-filters-mailing-lists">
+      <title>Filtering by Mailing List</title>
       <para>
 	  You can tell <application>Evolution</application> to filter by
-	  mailing list.  This means that <application>Evolution</application>
-	  will look at the mailing list address, and find out automatically
-	  what list this is.  If you are subscribed to mailing lists, you
-	  should use the <guibutton>Filter by List</guibutton> instead of by
-	  sender.
-	  <example>
+	mailing list.  This means that <application>Evolution</application>
+	will look at the mailing list address, and find out automatically
+	what list this is.  If you are subscribed to mailing lists, you
+	should use the <guibutton>Filter by List</guibutton> instead of by
+	sender.
+	<example>
 	    <title>Filter by List</title>
-	    <para>
-	      Kevin subscribes to bananas@ximian.com.  However, there is also
-	      a bananas@ximian.org address.  If he used a regular
-	      <guibutton>Filter by Sender</guibutton>, he would need to specify
-	      one for each address.  However, <guibutton>Filter by
+	  <para>
+	    Kevin subscribes to bananas@ximian.com.  However, there is also
+	    a bananas@ximian.org address.  If he used a regular
+	    <guibutton>Filter by Sender</guibutton>, he would need to specify
+	    one for each address.  However, <guibutton>Filter by
 	      List</guibutton> will recognize that both of them are the same
-	      list.
-	    </para>
-	  </example>
-	</para>
-      </sect1>
-      
+	    list.
+	  </para>
+	</example>
+      </para>
+    </sect2>
+  </sect1>
       
     <sect1 id="usage-mail-organize-vFolders">
       <title>Getting Really Organized with Virtual Folders</title>
@@ -674,7 +674,7 @@
       </figure>
       </para>
     </sect1>
-
+<!--
     <sect1 id="usage-mail-subscriptions">
       <title>Subscription Management</title>
       <para>
@@ -696,153 +696,7 @@
         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>
-
-  
-  <sect1 id="encryption">
-    <title>Encryption</title>
-    <sect2 id="encryption-whatis">
-      <title>What is Encryption?</title>
-      <para>
-	Encryption is an ancient method of changing readable text to unreadable
-	text that dates back to Egyptian times.  Encryption takes the statement
-	"Evolution" and turns it into something which cannot be read without help
-	through decryption.
-	<example>
-	  <title>Encryption Example</title>
-	  <para>
-	    Kevin orders an <application>Evolution</application> t-shirt from
-	    Ximian, Inc. over the internet.  He puts in his credit card number
-	    which is 1234-567-8901.  For security, his computer encrypts the
-	    credit card number so it can be safely transmitted over the internet.
-	    The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
-	    resemblance to the inital number.  When the information gets to
-	    Ximian, Inc. it'll be decrypted into the inital number.
-	  </para>
-	</example>
-	Encryption can be used in email in two ways: to verify that the sender is
-	the real sender, and to hide the message while in transmission.
-	<application>Evolution</application> has the capability to do both.  
-      </para>
-    </sect2>
-    <sect2 id="encryption-keygen">
-      <title>Generating your PGP key</title>
-      <para>
-	First, you need to create a PGP key.  To do this, you'll need GPG
-	installed.
-      </para>
-      <tip>
-	<title>GPG Versions</title>
-	<para>
-	  This manual covers version 1.0.6 of GPG.  If your version is different,
-	  this may not be entirely accurate.  You may find out your version number
-	  by typing in: <command>gpg --version</command>.
-	</para>
-      </tip>
-      <para>
-	You can start by typing in: <command>gpg --gen-key</command>.  At the
-	first question, select 1.  The next question asks you about key length.
-	The longer the key, more stronger it is.  However, the longer the key, the
-	longer it takes to generate.  This is your choice.  However, 1024 bits
-	(default) should be adequate.  The next question asks you if you want your
-	key to expire.  Expiring keys make your key invalid after a certain amount
-	of time, so old keys don't float around active.  This is the same concept
-	as a coupon at a supermarket.  Next, you'll type in your Real name, your
-	email address, and a comment.  You should not forge this information, as
-	it is used later to verify who you are.  Assuming that all your
-	information is correct, press "O" to continue.  GPG now asks you for a
-	passphrase.  This is a password which you will need to decrypt and encrypt
-	messages.  This can be any length, with any characters in it.  It is case
-	sensitive, which means that it does know the difference between capital
-	letters and lower-case.  Now your key is generated.  It is recommend you
-	surf the internet, read your email, or write a letter in a word
-	processor.  This help creates randomness in the key.
-      </para>
-      <para>
-	Once this is completed, you'll be dropped back to the command line.
-	Now you can view your key information by typing <command>gpg
-	  --list-keys</command>.  You should see something similar to this:
-	<example id="gpg-list-keys">
-	  <title>GPG Listing Keys</title>
-	  <para>
-	    /home/bob/.gnupg/pubring.gpg
-	    ----------------------------
-	    pub 1024D/32j38dk2 2001-06-20 bob &lt;bob@bob.com&gt;
-	    sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
-	  </para>
-	</example>
-	You'll now need to upload your public key to a keyserver, so that your
-	friends can use your key.  You'll need to know the ID of your key, which
-	is after the 1024D on the line beginning with pub.  For this example, it
-	is 32j38dk2.  You now type in <command>gpg --send-keys --keyserver
-	  wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for 32j38dk2.
-	You will be prompted to type in your password <!-- verify that you need to
-	enter your password here --> and your key will be uploaded for your
-	friends to download.
-      </para>
-    </sect2>
-    <sect2 id="encrypt-evo-integ">
-      <title>Setting up Evolution's Encryption</title>
-      <para>
-	You'll need to open
-	<menuchoice>
-	  <guimenu>Tools</guimenu>
-	  <guimenuitem>Mail Settings</guimenuitem>
-	</menuchoice>
-	Once there, select the account you'd like to associate the key to and click
-	the <guibutton>Edit</guibutton> button.  In the
-	<guilabel>Security</guilabel> tab is a section labeled <guilabel>Pretty
-	  Goog Privacy</guilabel>.  Enter your key ID and click
-	<guibutton>OK</guibutton>.  Your key is now integrated into your identity
-	in <application>Evolution</application>.
-      </para>
-    </sect2>
-    <sect2 id="encrypt-sending">
-      <title>Sending Encrypted Messages</title>
-      <para>
-	You can either sign or encrypt a message.  When you sign a message, verify
-	that you were the one who sent it, and that no one is forging your
-	identity.  Encrypting a message makes it impossible for someone with
-	prying eyes to view it while it's in tranmission.
-      </para>
-    </sect2>
-    
-    <sect2 id="sign-msg">
-      <title>Signing a Message</title>
-      <para>
-	To sign a message, you simply click
-	<menuchoice>
-	  <guimenu>Security</guimenu>
-	  <guimenuitem>PGP Sign</guimenuitem>
-	</menuchoice>
-	.  You will be prompted for your PGP password.  Once you enter it,
-	click <guibutton>OK</guibutton> and your message will be signed.
-      </para>
-    </sect2>
-      
-      <sect2 id="encrypt-msg">
-	<title>Encrypting a Message</title>
-	<para>
-	  Encrypting a message is very similar to signing a message.  You simply
-	  click the menu item 
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Encrypt</guimenuitem>
-	  </menuchoice>
-	</para>
-      </sect2>
-      <sect2 id="unencrypting">
-	<title>Unencrypting a Recieved Message</title>
-	<para>
-	  Sometimes, a friend will send you a message which is encrypted.  In order
-	  for you to read it, you need to unencrypt it.
-	</para>
-	<para>
-	  When you view the encrypted message, <application>Evolution</application>
-	  will prompt you for your PGP password.  You type in your PGP password and
-	  the message is then decrypted.
-	</para>
-      </sect2>
+    </para>
   </sect1>
+-->
 </chapter>
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index 87d97b4561..1217109a25 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -47,11 +47,7 @@
     </para>
   </abstract>
 
-
-  <sect1 id="usage-mail-getnsend">
-    <title>Reading, Getting and Sending Mail</title>
-
-    <sect2 id="usage-mail-getnsend-read">
+  <sect1 id="usage-mail-getnsend-read">
       <title>Reading Mail</title>
       <para>
        You can start reading email by clicking
@@ -127,7 +123,7 @@
         </tip>
       </para>
 
-      <sect3 id="usage-mail-listorder">
+      <sect2 id="usage-mail-listorder">
         <title>Sorting the message list</title>
         <para>
           One of the ways <application>Evolution</application> lets
@@ -155,8 +151,8 @@
           message with the original, so you can follow the thread of a
           conversation from one message to the next.
         </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-delete">
+      </sect2>
+      <sect2 id="usage-mail-getnsend-delete">
         <title>Deleting Mail</title>
         <para>
           Once you've read your mail, you may want to get rid of
@@ -177,10 +173,10 @@
           <guimenu>Folder</guimenu> menu.  That will delete it
           permanently.
         </para>
-      </sect3>
-    </sect2>
+      </sect2>
+    </sect1>
 
-    <sect2 id="usage-mail-getnsend-get">
+    <sect1 id="usage-mail-getnsend-get">
       <title>Checking Mail</title>
       <para>
         Now that you've had a look around the
@@ -220,7 +216,7 @@
       </para>
     </note>
 
-      <sect3 id="usage-mail-getnsend-get-news">
+      <sect2 id="usage-mail-getnsend-get-news">
          <title>Using Evolution for News </title>
        <para>
          Newsgroups are so similar to email that there's no reason not
@@ -232,9 +228,9 @@
          <application>Evolution</application> will also check for news
          messages.
        </para>
-       </sect3>
+       </sect2>
 
-      <sect3 id="usage-mail-getnsend-get-attach">
+      <sect2 id="usage-mail-getnsend-get-attach">
         <title>Attachments and HTML Mail</title>
         <para>
           If someone sends you an <glossterm>attachment</glossterm>, a
@@ -257,11 +253,11 @@
            HTML-formatted mail, complete with graphics.  HTML
            formatting will display automatically, although you can
            turn it off if you prefer.
-        </para>
-      </sect3>
+      </para>
     </sect2>
+  </sect1>
 
-    <sect2 id="usage-mail-getnsend-send">
+    <sect1 id="usage-mail-getnsend-send">
       <title>Writing and Sending Mail</title>
       <para>
          You can start writing a new email message by selecting
@@ -296,7 +292,7 @@
          <guibutton>Send</guibutton>.
        </para>
 
-      <sect3 id="usage-mail-getnsend-send-delay">
+      <sect2 id="usage-mail-getnsend-send-delay">
         <title>Saving Messages for Later</title>
         <para>
            Evolution will send mail immediately unless you tell it to
@@ -330,8 +326,8 @@
           <guimenu>File</guimenu> <guimenuitem>Save In
           Folder</guimenuitem> </menuchoice>.
         </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-compose">
+      </sect2>
+      <sect2 id="usage-mail-getnsend-send-compose">
         <title>Advanced Mail Composition</title>
         <para>
           You can probably guess the purpose of the buttons labelled
@@ -343,7 +339,7 @@
           additional features, including large recipient lists,
           attachments, and forwarding.
         </para>
-      <sect4 id="usage-mail-getnsend-send-attach">
+      <sect3 id="usage-mail-getnsend-send-attach">
         <title>Attachments</title>
         <para>
             If you want to attach a file to your email message, you
@@ -374,8 +370,8 @@
             always shown, load images only if the sender is in your
             addressbook, or never load images.
         </para>
-        </sect4>
-        <sect4 id="usage-mail-getnsend-send-to-types">
+      </sect3>
+      <sect3 id="usage-mail-getnsend-send-to-types">
          <title>Types of Recipients</title>
         <para>
             <application>Evolution</application>, like most email
@@ -428,9 +424,9 @@
              </para>
             </example>
           </para>
-        </sect4>
+        </sect3>
 
-        <sect4 id="usage-mail-getnsend-send-to">
+        <sect3 id="usage-mail-getnsend-send-to">
         <title>Choosing Recipients Quickly</title>
         <para>
 f you have created address cards in the contact manager,
@@ -461,10 +457,10 @@ f you have created address cards in the contact manager,
             linkend="usage-contact-automate"> and <xref
             linkend="usage-calendar-apts">.
           </para>
-        </sect4>
-      </sect3>
+        </sect3>
+      </sect2>
 
-      <sect3 id="usage-mail-getnsend-send-reply">
+      <sect2 id="usage-mail-getnsend-send-reply">
         <title>Replying to Messages</title>
         <para>
            To reply to a message, press the
@@ -542,9 +538,9 @@ with quoted materials and the relevant replies interspersed-->
             </para>
           </note>
         </para>
-      </sect3>
+      </sect2>
 
-      <sect3 id="usage-mail-getnsend-send-find">
+      <sect2 id="usage-mail-getnsend-send-find">
         <title>Searching and Replacing with the Composer</title>
         <para>
            You're probably familiar with search and replace features,
@@ -601,8 +597,8 @@ with quoted materials and the relevant replies interspersed-->
             be <guilabel>Case Sensitive</guilabel> when it determines
             a match.
         </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-html">
+      </sect2>
+      <sect2 id="usage-mail-getnsend-send-html">
         <title>Embellish your email with HTML</title>
         <para>
             Normally, you can't set text styles or insert pictures in
@@ -779,7 +775,7 @@ with quoted materials and the relevant replies interspersed-->
               composition tool or text editor would.
             </para>
         </note>
-      </sect3>
+      </sect2>
 
 
 <!-- Function not implemented, possibly never will be due to security evil. -->
@@ -796,7 +792,7 @@ with quoted materials and the relevant replies interspersed-->
         </sect3>
 -->
 
-      <sect3 id="usage-mail-getnsend-fwd">
+      <sect2 id="usage-mail-getnsend-fwd">
         <title>Forwarding Mail</title>
         <para>
           The post office forwards your mail for you when you change
@@ -831,8 +827,8 @@ with quoted materials and the relevant replies interspersed-->
           <interface>composition frame</interface>, and press
           <guibutton>Send</guibutton>.
         </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-ettiquette">
+      </sect2>
+      <sect2 id="usage-mail-getnsend-ettiquette">
         <title>Seven Tips for Email Courtesy</title>
         <para>
           I started with ten, but four were "Don't send
@@ -860,7 +856,7 @@ with quoted materials and the relevant replies interspersed-->
             <listitem>
               <para>
                 ALL CAPS MEANS YOU'RE SHOUTING! Don't write a whole
-                message in capital letters.  It hurts people's ears.
+                messagge in capital letters.  It hurts people's ears.
               </para>
             </listitem>
 
@@ -876,18 +872,189 @@ with quoted materials and the relevant replies interspersed-->
                 don't write back.
               </para>
             </listitem>
-
-            <listitem>
-              <para>
-                 When you reply or forward, include just enough of
-                 the previous message to provide context: not too
-                 much, not too little.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </para>
-        <para> Happy mailing! </para>
-      </sect3>
+	  
+	  <listitem>
+	    <para>
+	      When you reply or forward, include just enough of
+	      the previous message to provide context: not too
+	      much, not too little.
+	    </para>
+	  </listitem>
+	</itemizedlist>
+      </para>
+      <para> Happy mailing! </para>
     </sect2>
   </sect1>
+
+
+    <sect1 id="usage-mail-subscriptions">
+      <title>Subscription Management</title>
+      <para>
+         <application>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>
+
+  
+<sect1 id="encryption">
+    <title>Encryption</title>
+    <sect2 id="encryption-whatis">
+      <title>What is Encryption?</title>
+      <para>
+	Encryption is an ancient method of changing readable text to unreadable
+	text that dates back to Egyptian times.  Encryption takes the statement
+	"Evolution" and turns it into something which cannot be read without help
+	through decryption.
+	<example>
+	  <title>Encryption Example</title>
+	  <para>
+	    Kevin orders an <application>Evolution</application> t-shirt from
+	    Ximian, Inc. over the internet.  He puts in his credit card number
+	    which is 1234-567-8901.  For security, his computer encrypts the
+	    credit card number so it can be safely transmitted over the internet.
+	    The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
+	    resemblance to the inital number.  When the information gets to
+	    Ximian, Inc. it'll be decrypted into the inital number.
+	  </para>
+	</example>
+	Encryption can be used in email in two ways: to verify that the sender is
+	the real sender, and to hide the message while in transmission.
+	<application>Evolution</application> has the capability to do both.  
+      </para>
+    </sect2>
+    <sect2 id="encryption-keygen">
+      <title>Generating your PGP key</title>
+      <para>
+	First, you need to create a PGP key.  To do this, you'll need GPG
+	installed.
+      </para>
+      <tip>
+	<title>GPG Versions</title>
+	<para>
+	  This manual covers version 1.0.6 of GPG.  If your version is different,
+	  this may not be entirely accurate.  You may find out your version number
+	  by typing in: <command>gpg --version</command>.
+	</para>
+      </tip>
+      <para>
+	You can start by typing in: <command>gpg --gen-key</command>.  At the
+	first question, select 1.  The next question asks you about key length.
+	The longer the key, more stronger it is.  However, the longer the key, the
+	longer it takes to generate.  This is your choice.  However, 1024 bits
+	(default) should be adequate.  The next question asks you if you want your
+	key to expire.  Expiring keys make your key invalid after a certain amount
+	of time, so old keys don't float around active.  This is the same concept
+	as a coupon at a supermarket.  Next, you'll type in your Real name, your
+	email address, and a comment.  You should not forge this information, as
+	it is used later to verify who you are.  Assuming that all your
+	information is correct, press "O" to continue.  GPG now asks you for a
+	passphrase.  This is a password which you will need to decrypt and encrypt
+	messages.  This can be any length, with any characters in it.  It is case
+	sensitive, which means that it does know the difference between capital
+	letters and lower-case.  Now your key is generated.  It is recommend you
+	surf the internet, read your email, or write a letter in a word
+	processor.  This help creates randomness in the key.
+      </para>
+      <para>
+	Once this is completed, you'll be dropped back to the command line.
+	Now you can view your key information by typing <command>gpg
+	  --list-keys</command>.  You should see something similar to this:
+	<example id="gpg-list-keys">
+	  <title>GPG Listing Keys</title>
+	  <para>
+	    /home/bob/.gnupg/pubring.gpg
+	    ----------------------------
+	    pub 1024D/32j38dk2 2001-06-20 bob &lt;bob@bob.com&gt;
+	    sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
+	  </para>
+	</example>
+	You'll now need to upload your public key to a keyserver, so that your
+	friends can use your key.  You'll need to know the ID of your key, which
+	is after the 1024D on the line beginning with pub.  For this example, it
+	is 32j38dk2.  You now type in <command>gpg --send-keys --keyserver
+	  wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for 32j38dk2.
+	You will be prompted to type in your password <!-- verify that you need to
+	enter your password here --> and your key will be uploaded for your
+	friends to download.
+      </para>
+    </sect2>
+    <sect2 id="encrypt-evo-integ">
+      <title>Setting up Evolution's Encryption</title>
+      <para>
+	You'll need to open
+	<menuchoice>
+	  <guimenu>Tools</guimenu>
+	  <guimenuitem>Mail Settings</guimenuitem>
+	</menuchoice>
+	Once there, select the account you'd like to associate the key to and click
+	the <guibutton>Edit</guibutton> button.  In the
+	<guilabel>Security</guilabel> tab is a section labeled <guilabel>Pretty
+	  Goog Privacy</guilabel>.  Enter your key ID and click
+	<guibutton>OK</guibutton>.  Your key is now integrated into your identity
+	in <application>Evolution</application>.
+      </para>
+    </sect2>
+    <sect2 id="encrypt-sending">
+      <title>Sending Encrypted Messages</title>
+      <para>
+	You can either sign or encrypt a message.  When you sign a message, verify
+	that you were the one who sent it, and that no one is forging your
+	identity.  Encrypting a message makes it impossible for someone with
+	prying eyes to view it while it's in tranmission.
+      </para>
+    </sect2>
+    
+    <sect2 id="sign-msg">
+      <title>Signing a Message</title>
+      <para>
+	To sign a message, you simply click
+	<menuchoice>
+	  <guimenu>Security</guimenu>
+	  <guimenuitem>PGP Sign</guimenuitem>
+	</menuchoice>
+	.  You will be prompted for your PGP password.  Once you enter it,
+	click <guibutton>OK</guibutton> and your message will be signed.
+      </para>
+    </sect2>
+      
+      <sect2 id="encrypt-msg">
+	<title>Encrypting a Message</title>
+	<para>
+	  Encrypting a message is very similar to signing a message.  You simply
+	  click the menu item 
+	  <menuchoice>
+	    <guimenu>Security</guimenu>
+	    <guimenuitem>PGP Encrypt</guimenuitem>
+	  </menuchoice>
+	</para>
+      </sect2>
+      <sect2 id="unencrypting">
+	<title>Unencrypting a Recieved Message</title>
+	<para>
+	  Sometimes, a friend will send you a message which is encrypted.  In order
+	  for you to read it, you need to unencrypt it.
+	</para>
+	<para>
+	  When you view the encrypted message, <application>Evolution</application>
+	  will prompt you for your PGP password.  You type in your PGP password and
+	  the message is then decrypted.
+	</para>
+      </sect2>
+</sect1>
 </chapter>
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 22f58d5c40..2b29191ed6 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -36,10 +36,7 @@
 	the message list view, where  a summary of your email is displayed.
 	If you're running the program for the first time,
 	you'll have one message: a welcome from Ximian.
-
-
-
-<!-- ==============Figure=================================== -->
+	<!-- ==============Figure=================================== -->
     <figure id="usage-mainwindow-fig">
     <title>Evolution Main Window and Inbox</title>
     <screenshot>
@@ -49,17 +46,7 @@
     </screenshot>
     </figure>
 <!-- ==============End of Figure=================================== -->
-  </para>
-  </sect1>
-  <sect1 id="usage-mainwindow-looks">
-    <title>The Way Evolution Looks</title>
-    <para>
-      Both <application>GNOME</application> and <application>
-	Evolution</application>'s appearances can be customized,
-      so your graphics may not look the same as the screenshots.
     </para>
-
-  
   <sect2 id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
     <para>
@@ -77,33 +64,19 @@
        Take a look at the <guilabel>Shortcut Bar</guilabel>
        The shortcut buttons in that category are:
 
-      <variablelist>
-
-<!--  NOT IMPLEMENTED! 
-	<varlistentry>
-	<term> <guibutton>Today:</guibutton></term>
-	<listitem>
-	  <para>
-	This will bring up a summary of any new messages you've
-	received, along with the tasks and appointments you have
-	lined up for today.
-      </para>
-      </listitem>
-      </varlistentry>
--->
-	<varlistentry>
-	  <term> <guibutton>My Evolution</guibutton></term>
-	  <listitem>
+	    <variablelist>
+	      <varlistentry>
+		<term> <guibutton>My Evolution</guibutton></term>
+		<listitem>
 	    <para>
-	      Start your day here.  <guilabel>My Evolution</guilabel>
-              gives you a quick summary of new or important messages,
-              daily appointments and urgent tasks.  You can customize
-              its appearance and content, and use it to access
-              Evolution services.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
+		    Start your day here.  <guilabel>My Evolution</guilabel>
+		    gives you a quick summary of new or important messages,
+		    daily appointments and urgent tasks.  You can customize
+		    its appearance and content, and use it to access
+		    Evolution services.
+		  </para>
+		</listitem>
+	      </varlistentry>
 
 	<varlistentry>
 	  <term> <guibutton>Inbox</guibutton></term>
@@ -166,38 +139,9 @@
 	</varlistentry>
 -->
 
-      </variablelist>
-    </para>
-    <para>
-      If you don't like the shortcut bar, you can use the folder bar
-      or the menu bar to navigate the main window. Press 
-            <keycombo action="simul">
-                 <keycap>Ctrl</keycap> 
-                 <keycap>O</keycap> 
-             </keycombo>
-      to choose from a list of folders you'd like to visit, or use the
-      drop-down folder bar.  You can hide and show the folder bar and
-      the shortcut bar by selecting those items in the
-      <guimenu>View</guimenu> menu.
-    </para>
-
-    <tip>
-       <title>Shortcut Bar Tricks</title>
-       <para>
-         To remove a shortcut from the shortcut bar, right-click on it
-         and select <guimenuitem>Remove</guimenuitem>.  To add one,
-         select <menuchoice> <guimenu>File</guimenu>
-         <guisubmenu>New</guisubmenu> <guimenuitem>Evolution Bar
-         Shortcut</guimenuitem> </menuchoice>.
-      </para>
-       <para>
-         To change the way the shortcut bar looks, right-click in an
-         empty space on the shortcut bar.  From the menu that appears,
-         you can select icon sizes.
-       </para>
-    </tip>
-  </sect2>
-
+	    </variablelist>
+	  </para>
+	</sect2>
   <sect2 id="usage-mainwindow-folderbar">
     <title>Folders and The Folder Bar</title>
     <para>
@@ -372,7 +316,7 @@
 	</para>
       </sect3>
       </sect2>
-  <sect2 id="usage-mainwindow-menubar">
+	  <sect2 id="usage-mainwindow-menubar">
     <title>The Menu Bar</title>
     <para>
       The <interface>menu bar</interface>'s contents will always
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f99f016625..70235f3930 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-02  Kevin Breit  <battery841@mediaone.net>
+
+	* C/apx-common-tasks.sgml: Created its own file.
+
+	* C/usage-mainwindow.sgml: You name it.
+
+	* C/preface.sgml: Pulled shortcuts from here into its own apx
+
+	* C/evolution.sgml: Reordered entities
+	
 2001-06-30  Kevin Breit  <battery841@mediaone.net>
 
 	* C/usage-mail.sgml: Pulled organizing stuff, made its own file.
diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml
index 647aa488f7..b78cfc233a 100644
--- a/help/C/evolution.sgml
+++ b/help/C/evolution.sgml
@@ -16,6 +16,7 @@
 <!ENTITY MENUREF SYSTEM "menuref.sgml">
 <!ENTITY FAQ SYSTEM "evolution-faq.sgml">
 <!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
+<!ENTITY APX-COMMON-TASKS SYSTEM "apx-common-tasks.sgml">
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
 <!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
 
@@ -136,6 +137,7 @@ implemented. -->
   &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS; 
+
 </book>
 
 
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 3e507dc8f5..67779dc0af 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -302,7 +302,6 @@
       import your files right back in.
     </para>
   </sect1>
-  
   <sect1 id="quickref-commontasks">
     <title>Quick Reference for Common Tasks</title>
     <para>
@@ -530,8 +529,8 @@
 	  </variablelist>
 
         </para>
-      </sect2>
-      <sect2 id="quickref-contact">
+  </sect2>
+    <sect2 id="quickref-contact">
         <title>Contact Manager</title>
         <para>
 	Here are the most frequent tasks that are done in the Contact Manager,
@@ -598,19 +597,7 @@
 	  </varlistentry>
 	</variablelist>
 
-        </para>
-      </sect2>
-    </sect1>
-  </preface>
-
-
-
-
-
-
-
-
-
-
-
-
+      </para>
+    </sect2>
+  </sect1>
+</preface>
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index a2e4558d5d..3b233baba0 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -108,75 +108,9 @@
        more than a few people listed, you'll want some way of finding
        them more quickly, which is why there's a search feature.
     </para>
-
-    <sect2 id="contact-search">
-      <title>Searching for Contacts</title>
-      <para>
-	   Between <guilabel>Delete</guilabel> and <guilabel>View
-    	   All</guilabel> is a quick search field. To use it, select
-    	   from the drop-down list which sort of search you'd like to
-    	   perform (the whole card, just the name, or just the email
-    	   address), then enter one or more words in the text entry
-    	   box, and press <keycap>Enter</keycap>.
-    	   <application>Evolution</application> will search through
-    	   the contents of every displayed card to find one that
-    	   matches. You can refine searches by doing several in
-    	   succession, or start over by pressing the <guibutton>View
-    	   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>
-        If you prefer to perform a more complex search, press
-        <guibutton>Find</guibutton> or choose
-        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for
-        Contact</guimenuitem></menuchoice>. This will open the
-        in-depth search window, which lets you use multiple search
-        criteria in the same way that email filters and <glossterm
-        linkend="vfolder">virtual folders</glossterm> do.  
-      </para>
-      <para>
-        Click <guibutton>Add Criterion</guibutton> to increase the
-        number of criteria you'd like to use in the search, and
-        <guibutton>Remove Criterion</guibutton> to remove one from the
-        bottom of the list.  Your criteria may be a search within the
-        <guilabel>Name</guilabel> or <guilabel>Email</guilabel>
-        fields; alternately you can choose to search through all the
-        fields with a regular expression.  Then, you can select from
-        all the familiar requirements like <guilabel>Begins
-        With</guilabel> and <guilabel>Does Not Contain</guilabel>,
-        decide whether to match <guilabel>All</guilabel> or
-        <guilabel>Any</guilabel> of your criteria, and press
-        <guibutton>Search</guibutton> to set it all off.
-      </para>
-    
-    </sect2>
-
   </sect1>
   <sect1 id="usage-contact-cards">
-    <title>Destroy, Create, and Change: The Contact Editor</title>
+    <title>The Contact Editor</title>
     <para>
        To delete a card, click on it once to select it, then press the
        <guibutton>Delete</guibutton> button.  If you have multiple
@@ -370,6 +304,70 @@
 
   </sect1>
 
+  <sect1 id="contact-search">
+    <title>Searching for Contacts</title>
+    <para>
+      Between <guilabel>Delete</guilabel> and <guilabel>View
+	All</guilabel> is a quick search field. To use it, select
+      from the drop-down list which sort of search you'd like to
+    	   perform (the whole card, just the name, or just the email
+      address), then enter one or more words in the text entry
+      box, and press <keycap>Enter</keycap>.
+      <application>Evolution</application> will search through
+      the contents of every displayed card to find one that
+      matches. You can refine searches by doing several in
+      succession, or start over by pressing the <guibutton>View
+	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>
+      If you prefer to perform a more complex search, press
+      <guibutton>Find</guibutton> or choose
+      <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for
+	  Contact</guimenuitem></menuchoice>. This will open the
+      in-depth search window, which lets you use multiple search
+      criteria in the same way that email filters and <glossterm
+								 linkend="vfolder">virtual folders</glossterm> do.  
+    </para>
+    <para>
+      Click <guibutton>Add Criterion</guibutton> to increase the
+      number of criteria you'd like to use in the search, and
+      <guibutton>Remove Criterion</guibutton> to remove one from the
+      bottom of the list.  Your criteria may be a search within the
+      <guilabel>Name</guilabel> or <guilabel>Email</guilabel>
+      fields; alternately you can choose to search through all the
+      fields with a regular expression.  Then, you can select from
+      all the familiar requirements like <guilabel>Begins
+        With</guilabel> and <guilabel>Does Not Contain</guilabel>,
+      decide whether to match <guilabel>All</guilabel> or
+      <guilabel>Any</guilabel> of your criteria, and press
+      <guibutton>Search</guibutton> to set it all off.
+    </para>
+  </sect1>
+
   <sect1 id="usage-contact-organize">
     <title>Organizing your Address Book</title>
     <para>
@@ -595,33 +593,18 @@
  -->
 
     </sect2>
-<!---  FIXME this feature not yet implemented 
-    <sect2 id="usage-contact-automation-extra">
-      <title>Map It!</title>
-      <para>
-	 Need a map or directions? Click
-	 <guibutton>MapIt</guibutton> from within the contact
-	 manager, and <application>Evolution</application> will
-	 map the address for you online.
-      </para>
-    </sect2>
--->
-
-
+    <!---  FIXME this feature not yet implemented 
+  <sect2 id="usage-contact-automation-extra">
+  <title>Map It!</title>
+  <para>
+    Need a map or directions? Click
+  <guibutton>MapIt</guibutton> from within the contact
+    manager, and <application>Evolution</application> will
+    map the address for you online.
+  </para>
+  </sect2>
+    -->
+    
+    
   </sect1>
-
 </chapter> 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 9a2a775740..6668623cf0 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -201,7 +201,7 @@
     </sect1>
 
     <sect1 id="usage-mail-organize-filters">
-      <title>Staying organized: Mail Filters in Evolution</title>
+      <title>Create Rules to Automatically Organize Mail</title>
       <para>
 	Filters work very much like the mail room in a large company.
 	Their purpose is to bundle, sort, and distribute mail to the
@@ -537,30 +537,30 @@
 	</itemizedlist>
       </para>
     </note>
-  </sect1>
-  <sect1 id="usage-mail-organize-filters-mailing-lists">
-    <title>Filtering by Mailing List</title>
+    
+    <sect2 id="usage-mail-organize-filters-mailing-lists">
+      <title>Filtering by Mailing List</title>
       <para>
 	  You can tell <application>Evolution</application> to filter by
-	  mailing list.  This means that <application>Evolution</application>
-	  will look at the mailing list address, and find out automatically
-	  what list this is.  If you are subscribed to mailing lists, you
-	  should use the <guibutton>Filter by List</guibutton> instead of by
-	  sender.
-	  <example>
+	mailing list.  This means that <application>Evolution</application>
+	will look at the mailing list address, and find out automatically
+	what list this is.  If you are subscribed to mailing lists, you
+	should use the <guibutton>Filter by List</guibutton> instead of by
+	sender.
+	<example>
 	    <title>Filter by List</title>
-	    <para>
-	      Kevin subscribes to bananas@ximian.com.  However, there is also
-	      a bananas@ximian.org address.  If he used a regular
-	      <guibutton>Filter by Sender</guibutton>, he would need to specify
-	      one for each address.  However, <guibutton>Filter by
+	  <para>
+	    Kevin subscribes to bananas@ximian.com.  However, there is also
+	    a bananas@ximian.org address.  If he used a regular
+	    <guibutton>Filter by Sender</guibutton>, he would need to specify
+	    one for each address.  However, <guibutton>Filter by
 	      List</guibutton> will recognize that both of them are the same
-	      list.
-	    </para>
-	  </example>
-	</para>
-      </sect1>
-      
+	    list.
+	  </para>
+	</example>
+      </para>
+    </sect2>
+  </sect1>
       
     <sect1 id="usage-mail-organize-vFolders">
       <title>Getting Really Organized with Virtual Folders</title>
@@ -674,7 +674,7 @@
       </figure>
       </para>
     </sect1>
-
+<!--
     <sect1 id="usage-mail-subscriptions">
       <title>Subscription Management</title>
       <para>
@@ -696,153 +696,7 @@
         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>
-
-  
-  <sect1 id="encryption">
-    <title>Encryption</title>
-    <sect2 id="encryption-whatis">
-      <title>What is Encryption?</title>
-      <para>
-	Encryption is an ancient method of changing readable text to unreadable
-	text that dates back to Egyptian times.  Encryption takes the statement
-	"Evolution" and turns it into something which cannot be read without help
-	through decryption.
-	<example>
-	  <title>Encryption Example</title>
-	  <para>
-	    Kevin orders an <application>Evolution</application> t-shirt from
-	    Ximian, Inc. over the internet.  He puts in his credit card number
-	    which is 1234-567-8901.  For security, his computer encrypts the
-	    credit card number so it can be safely transmitted over the internet.
-	    The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
-	    resemblance to the inital number.  When the information gets to
-	    Ximian, Inc. it'll be decrypted into the inital number.
-	  </para>
-	</example>
-	Encryption can be used in email in two ways: to verify that the sender is
-	the real sender, and to hide the message while in transmission.
-	<application>Evolution</application> has the capability to do both.  
-      </para>
-    </sect2>
-    <sect2 id="encryption-keygen">
-      <title>Generating your PGP key</title>
-      <para>
-	First, you need to create a PGP key.  To do this, you'll need GPG
-	installed.
-      </para>
-      <tip>
-	<title>GPG Versions</title>
-	<para>
-	  This manual covers version 1.0.6 of GPG.  If your version is different,
-	  this may not be entirely accurate.  You may find out your version number
-	  by typing in: <command>gpg --version</command>.
-	</para>
-      </tip>
-      <para>
-	You can start by typing in: <command>gpg --gen-key</command>.  At the
-	first question, select 1.  The next question asks you about key length.
-	The longer the key, more stronger it is.  However, the longer the key, the
-	longer it takes to generate.  This is your choice.  However, 1024 bits
-	(default) should be adequate.  The next question asks you if you want your
-	key to expire.  Expiring keys make your key invalid after a certain amount
-	of time, so old keys don't float around active.  This is the same concept
-	as a coupon at a supermarket.  Next, you'll type in your Real name, your
-	email address, and a comment.  You should not forge this information, as
-	it is used later to verify who you are.  Assuming that all your
-	information is correct, press "O" to continue.  GPG now asks you for a
-	passphrase.  This is a password which you will need to decrypt and encrypt
-	messages.  This can be any length, with any characters in it.  It is case
-	sensitive, which means that it does know the difference between capital
-	letters and lower-case.  Now your key is generated.  It is recommend you
-	surf the internet, read your email, or write a letter in a word
-	processor.  This help creates randomness in the key.
-      </para>
-      <para>
-	Once this is completed, you'll be dropped back to the command line.
-	Now you can view your key information by typing <command>gpg
-	  --list-keys</command>.  You should see something similar to this:
-	<example id="gpg-list-keys">
-	  <title>GPG Listing Keys</title>
-	  <para>
-	    /home/bob/.gnupg/pubring.gpg
-	    ----------------------------
-	    pub 1024D/32j38dk2 2001-06-20 bob &lt;bob@bob.com&gt;
-	    sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
-	  </para>
-	</example>
-	You'll now need to upload your public key to a keyserver, so that your
-	friends can use your key.  You'll need to know the ID of your key, which
-	is after the 1024D on the line beginning with pub.  For this example, it
-	is 32j38dk2.  You now type in <command>gpg --send-keys --keyserver
-	  wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for 32j38dk2.
-	You will be prompted to type in your password <!-- verify that you need to
-	enter your password here --> and your key will be uploaded for your
-	friends to download.
-      </para>
-    </sect2>
-    <sect2 id="encrypt-evo-integ">
-      <title>Setting up Evolution's Encryption</title>
-      <para>
-	You'll need to open
-	<menuchoice>
-	  <guimenu>Tools</guimenu>
-	  <guimenuitem>Mail Settings</guimenuitem>
-	</menuchoice>
-	Once there, select the account you'd like to associate the key to and click
-	the <guibutton>Edit</guibutton> button.  In the
-	<guilabel>Security</guilabel> tab is a section labeled <guilabel>Pretty
-	  Goog Privacy</guilabel>.  Enter your key ID and click
-	<guibutton>OK</guibutton>.  Your key is now integrated into your identity
-	in <application>Evolution</application>.
-      </para>
-    </sect2>
-    <sect2 id="encrypt-sending">
-      <title>Sending Encrypted Messages</title>
-      <para>
-	You can either sign or encrypt a message.  When you sign a message, verify
-	that you were the one who sent it, and that no one is forging your
-	identity.  Encrypting a message makes it impossible for someone with
-	prying eyes to view it while it's in tranmission.
-      </para>
-    </sect2>
-    
-    <sect2 id="sign-msg">
-      <title>Signing a Message</title>
-      <para>
-	To sign a message, you simply click
-	<menuchoice>
-	  <guimenu>Security</guimenu>
-	  <guimenuitem>PGP Sign</guimenuitem>
-	</menuchoice>
-	.  You will be prompted for your PGP password.  Once you enter it,
-	click <guibutton>OK</guibutton> and your message will be signed.
-      </para>
-    </sect2>
-      
-      <sect2 id="encrypt-msg">
-	<title>Encrypting a Message</title>
-	<para>
-	  Encrypting a message is very similar to signing a message.  You simply
-	  click the menu item 
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Encrypt</guimenuitem>
-	  </menuchoice>
-	</para>
-      </sect2>
-      <sect2 id="unencrypting">
-	<title>Unencrypting a Recieved Message</title>
-	<para>
-	  Sometimes, a friend will send you a message which is encrypted.  In order
-	  for you to read it, you need to unencrypt it.
-	</para>
-	<para>
-	  When you view the encrypted message, <application>Evolution</application>
-	  will prompt you for your PGP password.  You type in your PGP password and
-	  the message is then decrypted.
-	</para>
-      </sect2>
+    </para>
   </sect1>
+-->
 </chapter>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 87d97b4561..1217109a25 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -47,11 +47,7 @@
     </para>
   </abstract>
 
-
-  <sect1 id="usage-mail-getnsend">
-    <title>Reading, Getting and Sending Mail</title>
-
-    <sect2 id="usage-mail-getnsend-read">
+  <sect1 id="usage-mail-getnsend-read">
       <title>Reading Mail</title>
       <para>
        You can start reading email by clicking
@@ -127,7 +123,7 @@
         </tip>
       </para>
 
-      <sect3 id="usage-mail-listorder">
+      <sect2 id="usage-mail-listorder">
         <title>Sorting the message list</title>
         <para>
           One of the ways <application>Evolution</application> lets
@@ -155,8 +151,8 @@
           message with the original, so you can follow the thread of a
           conversation from one message to the next.
         </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-delete">
+      </sect2>
+      <sect2 id="usage-mail-getnsend-delete">
         <title>Deleting Mail</title>
         <para>
           Once you've read your mail, you may want to get rid of
@@ -177,10 +173,10 @@
           <guimenu>Folder</guimenu> menu.  That will delete it
           permanently.
         </para>
-      </sect3>
-    </sect2>
+      </sect2>
+    </sect1>
 
-    <sect2 id="usage-mail-getnsend-get">
+    <sect1 id="usage-mail-getnsend-get">
       <title>Checking Mail</title>
       <para>
         Now that you've had a look around the
@@ -220,7 +216,7 @@
       </para>
     </note>
 
-      <sect3 id="usage-mail-getnsend-get-news">
+      <sect2 id="usage-mail-getnsend-get-news">
          <title>Using Evolution for News </title>
        <para>
          Newsgroups are so similar to email that there's no reason not
@@ -232,9 +228,9 @@
          <application>Evolution</application> will also check for news
          messages.
        </para>
-       </sect3>
+       </sect2>
 
-      <sect3 id="usage-mail-getnsend-get-attach">
+      <sect2 id="usage-mail-getnsend-get-attach">
         <title>Attachments and HTML Mail</title>
         <para>
           If someone sends you an <glossterm>attachment</glossterm>, a
@@ -257,11 +253,11 @@
            HTML-formatted mail, complete with graphics.  HTML
            formatting will display automatically, although you can
            turn it off if you prefer.
-        </para>
-      </sect3>
+      </para>
     </sect2>
+  </sect1>
 
-    <sect2 id="usage-mail-getnsend-send">
+    <sect1 id="usage-mail-getnsend-send">
       <title>Writing and Sending Mail</title>
       <para>
          You can start writing a new email message by selecting
@@ -296,7 +292,7 @@
          <guibutton>Send</guibutton>.
        </para>
 
-      <sect3 id="usage-mail-getnsend-send-delay">
+      <sect2 id="usage-mail-getnsend-send-delay">
         <title>Saving Messages for Later</title>
         <para>
            Evolution will send mail immediately unless you tell it to
@@ -330,8 +326,8 @@
           <guimenu>File</guimenu> <guimenuitem>Save In
           Folder</guimenuitem> </menuchoice>.
         </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-compose">
+      </sect2>
+      <sect2 id="usage-mail-getnsend-send-compose">
         <title>Advanced Mail Composition</title>
         <para>
           You can probably guess the purpose of the buttons labelled
@@ -343,7 +339,7 @@
           additional features, including large recipient lists,
           attachments, and forwarding.
         </para>
-      <sect4 id="usage-mail-getnsend-send-attach">
+      <sect3 id="usage-mail-getnsend-send-attach">
         <title>Attachments</title>
         <para>
             If you want to attach a file to your email message, you
@@ -374,8 +370,8 @@
             always shown, load images only if the sender is in your
             addressbook, or never load images.
         </para>
-        </sect4>
-        <sect4 id="usage-mail-getnsend-send-to-types">
+      </sect3>
+      <sect3 id="usage-mail-getnsend-send-to-types">
          <title>Types of Recipients</title>
         <para>
             <application>Evolution</application>, like most email
@@ -428,9 +424,9 @@
              </para>
             </example>
           </para>
-        </sect4>
+        </sect3>
 
-        <sect4 id="usage-mail-getnsend-send-to">
+        <sect3 id="usage-mail-getnsend-send-to">
         <title>Choosing Recipients Quickly</title>
         <para>
 f you have created address cards in the contact manager,
@@ -461,10 +457,10 @@ f you have created address cards in the contact manager,
             linkend="usage-contact-automate"> and <xref
             linkend="usage-calendar-apts">.
           </para>
-        </sect4>
-      </sect3>
+        </sect3>
+      </sect2>
 
-      <sect3 id="usage-mail-getnsend-send-reply">
+      <sect2 id="usage-mail-getnsend-send-reply">
         <title>Replying to Messages</title>
         <para>
            To reply to a message, press the
@@ -542,9 +538,9 @@ with quoted materials and the relevant replies interspersed-->
             </para>
           </note>
         </para>
-      </sect3>
+      </sect2>
 
-      <sect3 id="usage-mail-getnsend-send-find">
+      <sect2 id="usage-mail-getnsend-send-find">
         <title>Searching and Replacing with the Composer</title>
         <para>
            You're probably familiar with search and replace features,
@@ -601,8 +597,8 @@ with quoted materials and the relevant replies interspersed-->
             be <guilabel>Case Sensitive</guilabel> when it determines
             a match.
         </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-html">
+      </sect2>
+      <sect2 id="usage-mail-getnsend-send-html">
         <title>Embellish your email with HTML</title>
         <para>
             Normally, you can't set text styles or insert pictures in
@@ -779,7 +775,7 @@ with quoted materials and the relevant replies interspersed-->
               composition tool or text editor would.
             </para>
         </note>
-      </sect3>
+      </sect2>
 
 
 <!-- Function not implemented, possibly never will be due to security evil. -->
@@ -796,7 +792,7 @@ with quoted materials and the relevant replies interspersed-->
         </sect3>
 -->
 
-      <sect3 id="usage-mail-getnsend-fwd">
+      <sect2 id="usage-mail-getnsend-fwd">
         <title>Forwarding Mail</title>
         <para>
           The post office forwards your mail for you when you change
@@ -831,8 +827,8 @@ with quoted materials and the relevant replies interspersed-->
           <interface>composition frame</interface>, and press
           <guibutton>Send</guibutton>.
         </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-ettiquette">
+      </sect2>
+      <sect2 id="usage-mail-getnsend-ettiquette">
         <title>Seven Tips for Email Courtesy</title>
         <para>
           I started with ten, but four were "Don't send
@@ -860,7 +856,7 @@ with quoted materials and the relevant replies interspersed-->
             <listitem>
               <para>
                 ALL CAPS MEANS YOU'RE SHOUTING! Don't write a whole
-                message in capital letters.  It hurts people's ears.
+                messagge in capital letters.  It hurts people's ears.
               </para>
             </listitem>
 
@@ -876,18 +872,189 @@ with quoted materials and the relevant replies interspersed-->
                 don't write back.
               </para>
             </listitem>
-
-            <listitem>
-              <para>
-                 When you reply or forward, include just enough of
-                 the previous message to provide context: not too
-                 much, not too little.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </para>
-        <para> Happy mailing! </para>
-      </sect3>
+	  
+	  <listitem>
+	    <para>
+	      When you reply or forward, include just enough of
+	      the previous message to provide context: not too
+	      much, not too little.
+	    </para>
+	  </listitem>
+	</itemizedlist>
+      </para>
+      <para> Happy mailing! </para>
     </sect2>
   </sect1>
+
+
+    <sect1 id="usage-mail-subscriptions">
+      <title>Subscription Management</title>
+      <para>
+         <application>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>
+
+  
+<sect1 id="encryption">
+    <title>Encryption</title>
+    <sect2 id="encryption-whatis">
+      <title>What is Encryption?</title>
+      <para>
+	Encryption is an ancient method of changing readable text to unreadable
+	text that dates back to Egyptian times.  Encryption takes the statement
+	"Evolution" and turns it into something which cannot be read without help
+	through decryption.
+	<example>
+	  <title>Encryption Example</title>
+	  <para>
+	    Kevin orders an <application>Evolution</application> t-shirt from
+	    Ximian, Inc. over the internet.  He puts in his credit card number
+	    which is 1234-567-8901.  For security, his computer encrypts the
+	    credit card number so it can be safely transmitted over the internet.
+	    The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
+	    resemblance to the inital number.  When the information gets to
+	    Ximian, Inc. it'll be decrypted into the inital number.
+	  </para>
+	</example>
+	Encryption can be used in email in two ways: to verify that the sender is
+	the real sender, and to hide the message while in transmission.
+	<application>Evolution</application> has the capability to do both.  
+      </para>
+    </sect2>
+    <sect2 id="encryption-keygen">
+      <title>Generating your PGP key</title>
+      <para>
+	First, you need to create a PGP key.  To do this, you'll need GPG
+	installed.
+      </para>
+      <tip>
+	<title>GPG Versions</title>
+	<para>
+	  This manual covers version 1.0.6 of GPG.  If your version is different,
+	  this may not be entirely accurate.  You may find out your version number
+	  by typing in: <command>gpg --version</command>.
+	</para>
+      </tip>
+      <para>
+	You can start by typing in: <command>gpg --gen-key</command>.  At the
+	first question, select 1.  The next question asks you about key length.
+	The longer the key, more stronger it is.  However, the longer the key, the
+	longer it takes to generate.  This is your choice.  However, 1024 bits
+	(default) should be adequate.  The next question asks you if you want your
+	key to expire.  Expiring keys make your key invalid after a certain amount
+	of time, so old keys don't float around active.  This is the same concept
+	as a coupon at a supermarket.  Next, you'll type in your Real name, your
+	email address, and a comment.  You should not forge this information, as
+	it is used later to verify who you are.  Assuming that all your
+	information is correct, press "O" to continue.  GPG now asks you for a
+	passphrase.  This is a password which you will need to decrypt and encrypt
+	messages.  This can be any length, with any characters in it.  It is case
+	sensitive, which means that it does know the difference between capital
+	letters and lower-case.  Now your key is generated.  It is recommend you
+	surf the internet, read your email, or write a letter in a word
+	processor.  This help creates randomness in the key.
+      </para>
+      <para>
+	Once this is completed, you'll be dropped back to the command line.
+	Now you can view your key information by typing <command>gpg
+	  --list-keys</command>.  You should see something similar to this:
+	<example id="gpg-list-keys">
+	  <title>GPG Listing Keys</title>
+	  <para>
+	    /home/bob/.gnupg/pubring.gpg
+	    ----------------------------
+	    pub 1024D/32j38dk2 2001-06-20 bob &lt;bob@bob.com&gt;
+	    sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
+	  </para>
+	</example>
+	You'll now need to upload your public key to a keyserver, so that your
+	friends can use your key.  You'll need to know the ID of your key, which
+	is after the 1024D on the line beginning with pub.  For this example, it
+	is 32j38dk2.  You now type in <command>gpg --send-keys --keyserver
+	  wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for 32j38dk2.
+	You will be prompted to type in your password <!-- verify that you need to
+	enter your password here --> and your key will be uploaded for your
+	friends to download.
+      </para>
+    </sect2>
+    <sect2 id="encrypt-evo-integ">
+      <title>Setting up Evolution's Encryption</title>
+      <para>
+	You'll need to open
+	<menuchoice>
+	  <guimenu>Tools</guimenu>
+	  <guimenuitem>Mail Settings</guimenuitem>
+	</menuchoice>
+	Once there, select the account you'd like to associate the key to and click
+	the <guibutton>Edit</guibutton> button.  In the
+	<guilabel>Security</guilabel> tab is a section labeled <guilabel>Pretty
+	  Goog Privacy</guilabel>.  Enter your key ID and click
+	<guibutton>OK</guibutton>.  Your key is now integrated into your identity
+	in <application>Evolution</application>.
+      </para>
+    </sect2>
+    <sect2 id="encrypt-sending">
+      <title>Sending Encrypted Messages</title>
+      <para>
+	You can either sign or encrypt a message.  When you sign a message, verify
+	that you were the one who sent it, and that no one is forging your
+	identity.  Encrypting a message makes it impossible for someone with
+	prying eyes to view it while it's in tranmission.
+      </para>
+    </sect2>
+    
+    <sect2 id="sign-msg">
+      <title>Signing a Message</title>
+      <para>
+	To sign a message, you simply click
+	<menuchoice>
+	  <guimenu>Security</guimenu>
+	  <guimenuitem>PGP Sign</guimenuitem>
+	</menuchoice>
+	.  You will be prompted for your PGP password.  Once you enter it,
+	click <guibutton>OK</guibutton> and your message will be signed.
+      </para>
+    </sect2>
+      
+      <sect2 id="encrypt-msg">
+	<title>Encrypting a Message</title>
+	<para>
+	  Encrypting a message is very similar to signing a message.  You simply
+	  click the menu item 
+	  <menuchoice>
+	    <guimenu>Security</guimenu>
+	    <guimenuitem>PGP Encrypt</guimenuitem>
+	  </menuchoice>
+	</para>
+      </sect2>
+      <sect2 id="unencrypting">
+	<title>Unencrypting a Recieved Message</title>
+	<para>
+	  Sometimes, a friend will send you a message which is encrypted.  In order
+	  for you to read it, you need to unencrypt it.
+	</para>
+	<para>
+	  When you view the encrypted message, <application>Evolution</application>
+	  will prompt you for your PGP password.  You type in your PGP password and
+	  the message is then decrypted.
+	</para>
+      </sect2>
+</sect1>
 </chapter>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 22f58d5c40..2b29191ed6 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -36,10 +36,7 @@
 	the message list view, where  a summary of your email is displayed.
 	If you're running the program for the first time,
 	you'll have one message: a welcome from Ximian.
-
-
-
-<!-- ==============Figure=================================== -->
+	<!-- ==============Figure=================================== -->
     <figure id="usage-mainwindow-fig">
     <title>Evolution Main Window and Inbox</title>
     <screenshot>
@@ -49,17 +46,7 @@
     </screenshot>
     </figure>
 <!-- ==============End of Figure=================================== -->
-  </para>
-  </sect1>
-  <sect1 id="usage-mainwindow-looks">
-    <title>The Way Evolution Looks</title>
-    <para>
-      Both <application>GNOME</application> and <application>
-	Evolution</application>'s appearances can be customized,
-      so your graphics may not look the same as the screenshots.
     </para>
-
-  
   <sect2 id="usage-mainwindow-shortcutbar">
     <title>The Shortcut Bar</title>
     <para>
@@ -77,33 +64,19 @@
        Take a look at the <guilabel>Shortcut Bar</guilabel>
        The shortcut buttons in that category are:
 
-      <variablelist>
-
-<!--  NOT IMPLEMENTED! 
-	<varlistentry>
-	<term> <guibutton>Today:</guibutton></term>
-	<listitem>
-	  <para>
-	This will bring up a summary of any new messages you've
-	received, along with the tasks and appointments you have
-	lined up for today.
-      </para>
-      </listitem>
-      </varlistentry>
--->
-	<varlistentry>
-	  <term> <guibutton>My Evolution</guibutton></term>
-	  <listitem>
+	    <variablelist>
+	      <varlistentry>
+		<term> <guibutton>My Evolution</guibutton></term>
+		<listitem>
 	    <para>
-	      Start your day here.  <guilabel>My Evolution</guilabel>
-              gives you a quick summary of new or important messages,
-              daily appointments and urgent tasks.  You can customize
-              its appearance and content, and use it to access
-              Evolution services.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
+		    Start your day here.  <guilabel>My Evolution</guilabel>
+		    gives you a quick summary of new or important messages,
+		    daily appointments and urgent tasks.  You can customize
+		    its appearance and content, and use it to access
+		    Evolution services.
+		  </para>
+		</listitem>
+	      </varlistentry>
 
 	<varlistentry>
 	  <term> <guibutton>Inbox</guibutton></term>
@@ -166,38 +139,9 @@
 	</varlistentry>
 -->
 
-      </variablelist>
-    </para>
-    <para>
-      If you don't like the shortcut bar, you can use the folder bar
-      or the menu bar to navigate the main window. Press 
-            <keycombo action="simul">
-                 <keycap>Ctrl</keycap> 
-                 <keycap>O</keycap> 
-             </keycombo>
-      to choose from a list of folders you'd like to visit, or use the
-      drop-down folder bar.  You can hide and show the folder bar and
-      the shortcut bar by selecting those items in the
-      <guimenu>View</guimenu> menu.
-    </para>
-
-    <tip>
-       <title>Shortcut Bar Tricks</title>
-       <para>
-         To remove a shortcut from the shortcut bar, right-click on it
-         and select <guimenuitem>Remove</guimenuitem>.  To add one,
-         select <menuchoice> <guimenu>File</guimenu>
-         <guisubmenu>New</guisubmenu> <guimenuitem>Evolution Bar
-         Shortcut</guimenuitem> </menuchoice>.
-      </para>
-       <para>
-         To change the way the shortcut bar looks, right-click in an
-         empty space on the shortcut bar.  From the menu that appears,
-         you can select icon sizes.
-       </para>
-    </tip>
-  </sect2>
-
+	    </variablelist>
+	  </para>
+	</sect2>
   <sect2 id="usage-mainwindow-folderbar">
     <title>Folders and The Folder Bar</title>
     <para>
@@ -372,7 +316,7 @@
 	</para>
       </sect3>
       </sect2>
-  <sect2 id="usage-mainwindow-menubar">
+	  <sect2 id="usage-mainwindow-menubar">
     <title>The Menu Bar</title>
     <para>
       The <interface>menu bar</interface>'s contents will always
diff --git a/help/ChangeLog b/help/ChangeLog
index f99f016625..70235f3930 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-02  Kevin Breit  <battery841@mediaone.net>
+
+	* C/apx-common-tasks.sgml: Created its own file.
+
+	* C/usage-mainwindow.sgml: You name it.
+
+	* C/preface.sgml: Pulled shortcuts from here into its own apx
+
+	* C/evolution.sgml: Reordered entities
+	
 2001-06-30  Kevin Breit  <battery841@mediaone.net>
 
 	* C/usage-mail.sgml: Pulled organizing stuff, made its own file.