add from branch. merge from branch merge from branch merge from branch

2002-03-27  Aaron Weber  <aaron@ximian.com>

	* C/topic.dat: add from branch.
	* C/figures/*: merge from branch
	* C/usage-calendar.sgml: merge from branch
	* C/usage-mail.sgml: merge from branch
	* C/usage-mail-org.sgml: merge from branch
	* C/Makefile.am: changes from other branch
	* C/usage-print.sgml: merge from branch
	* C/usage-exchange.sgml: merge from branch
	* C/usage-mail.sgml: merge from evolution-1-0-branch branch.

svn path=/trunk/; revision=16267

8 files changed, 230 insertions, 129 deletions

diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index b8ae7f23c3..199d6a84e3 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -1 +1,57 @@
 EXTRA_DIST = sgmldocs.make
+figs = \
+	figures/calendar.png			\
+	figures/config-cal.png			\
+	figures/config-mail.png			\
+	figures/contact-editor.png		\
+	figures/contact.png			\
+	figures/exchange-identity.png		\
+	figures/exchange-receive-options.png	\
+	figures/exchange-receive.png		\
+	figures/filter-assist-fig.png		\
+	figures/filter-new-fig.png		\
+	figures/full-1.png			\
+	figures/full-2.png			\
+	figures/full-3.png			\
+	figures/full-4.png			\
+	figures/full-5.png			\
+	figures/full-6.png			\
+	figures/full-7.png			\
+	figures/mail-composer.png		\
+	figures/mail-druid-pic.png		\
+	figures/mail-inbox.png			\
+	figures/mail-threaded.png		\
+	figures/mainwindow-pic.png		\
+	figures/newmsg.png			\
+	figures/print-dest.png			\
+	figures/print-preview.png		\
+	figures/replymsg.png			\
+	figures/schedule.png			\
+	figures/small_desktop.png		\
+	figures/summary.png			\
+	figures/vfolder-createrule-fig.png	\
+
+
+docname = evolution
+lang = C
+omffile = evolution-C.omf
+sgml_ents =	\
+	apx-authors.sgml	\
+	apx-bugs.sgml		\
+	apx-gloss.sgml		\
+	config-prefs.sgml	\
+	config-sync.sgml	\
+	evolution-faq.sgml	\
+	menuref.sgml		\
+	preface.sgml		\
+	usage-calendar.sgml	\
+	usage-contact.sgml	\
+	usage-exec-summary.sgml	\
+	usage-exchange.sgml	\
+	usage-mail-org.sgml	\
+	usage-mail.sgml		\
+	usage-mainwindow.sgml	\
+	usage-print.sgml	\
+	usage-sync.sgml
+include $(top_srcdir)/help/sgmldocs.make
+dist-hook: app-dist-hook
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 05f5e8e3d8..9da056b3b4 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -372,7 +372,7 @@
       </para>
     </sect2>
 
-    <sect2 id="recieving-rsvp-response">
+    <sect2 id="receiving-rsvp-response">
       <title>Getting Responses to Meeting Requests</title>
       <para>
 	Once you get a reply to your meeting invitation, you'll need
@@ -440,13 +440,14 @@
     </sect2>
  ########## END UNIMPLEMENTED FEATURESET ############ -->
     <sect2 id="usage-calendar-freebusy">
-      <title>The Free/Busy View</title>
+      <title>Scheduling Meetings and The Free/Busy View</title>
       <para>
-	<application>Evolution</application> has a Free/Busy window so
-	that you can view people's schedules together to help you
-	schedule appointments. Read <xref linkend="full-advantage"> to
-	learn about how to use this feature with the Ximian Connector
-	for Microsoft Exchange.
+        In addition to the standard meeting scheduling tools, you can
+	 use the Free/Busy view to check whether people are available
+	 in advance. At this time, the Free/Busy feature only works
+	 with Microsoft Exchange servers. However, you can still use
+	 iCal event invitations to coordinate schedules with other
+	 people no matter what server you're using.
       </para>
       <para>
 	To access the free/busy view:
@@ -548,8 +549,15 @@
           automatically; others will receive email notification of any
           change in plans.
         </para>
+
+        <para>
+         Read <xref linkend="full-advantage"> to learn about how to
+	 use this feature with the Ximian Connector for Microsoft
+	 Exchange.
+       </para>
       </sect3>
     </sect2>
+
   </sect1>
 
   <sect1 id="usage-calendar-todo">
diff --git a/help/C/usage-exchange.sgml b/help/C/usage-exchange.sgml
index b87aee9cdc..e2f0085d4f 100644
--- a/help/C/usage-exchange.sgml
+++ b/help/C/usage-exchange.sgml
@@ -705,6 +705,4 @@ There are, however, some features which are not available:
       </para>
       </tip>
     </sect1>
-</chapter>
-
-
+</chapter>
\ No newline at end of file
diff --git a/help/C/usage-mail-org.sgml b/help/C/usage-mail-org.sgml
index 19f054b73e..e933d6a033 100644
--- a/help/C/usage-mail-org.sgml
+++ b/help/C/usage-mail-org.sgml
@@ -12,6 +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
       email and data so that you don't need to worry about losing your
       old information.
@@ -136,8 +137,8 @@
           </listitem>
           <listitem>
             <para>
-              The left-most column shows the application which your
-              information will be imported from.  Select
+              The left-most column shows the application from which
+              your information will be imported from.  Then, select
               checkboxes on each component to import different
               properties of each application.
             </para>
@@ -154,16 +155,20 @@
           </listitem>
         </orderedlist>
       </para>
-
       <para>
 	<note>
 	  <title>Microsoft Outlook and Outlook Express Users</title>
 	  <para>
 	    Microsoft Outlook, and versions of Outlook Express after
-	    version 4, use proprietary formats that <application>Ximian
-	     Evolution</application> cannot read or import.  For contacts,
-	    you may have to email them to yourself and import them.
-	    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 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:
 	    <orderedlist numeration="arabic">
 	      
 	      <listitem>
@@ -202,7 +207,6 @@
 	    the messages in your Trash folders.
 	  </para>
 	</note>     
-	
       </para>
       
     </sect2>
@@ -521,16 +525,16 @@
 		    looking for messages less than two days old.
 		  </para></listitem>
 		
-		<listitem><para>
-		    Date Recieved - 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
 		    important) to 3 (most important). You can have filters set the
-		    priority of messages you recieve, and then have other filters 
+		    priority of messages you receive, and then have other filters 
 		    applied only to those messages which have a certain priority.
 		  </para></listitem>
 		
@@ -981,7 +985,7 @@
 		  </para></listitem>
 		
 		<listitem><para>
-		    Date Recieved - This works the same way as the <guilabel>Date Sent</guilabel> 
+		    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>
@@ -989,7 +993,7 @@
 		<listitem><para>
 		    Score - Emails have a standard priority range from -3 (least
 		    important) to 3 (most important). You can have vFolders set the
-		    priority of messages you recieve, and then have other
+		    priority of messages you receive, and then have other
 		    vFolders 
 		    applied only to those messages which have a certain priority.
 		  </para></listitem>
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 59c9210ced..70bc78bd1d 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -15,8 +15,7 @@
       them. Read <xref linkend="usage-mail-subscriptions"> to find out

       how.

     </para>

-  </note>

-  

+  </note>  

   

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

     <title>Reading Mail</title>    

@@ -90,7 +89,7 @@
 	<screenshot>

 	  <screeninfo>Threaded Mail View</screeninfo>

 	  <mediaobject><imageobject>

-	      <imagedata  format="PNG" fileref="figures/mail-threaded" srccredit="Aaron Weber">

+	      <imagedata  format="png" fileref="figures/mail-threaded" srccredit="Aaron Weber">

 	    </imageobject></mediaobject>

 	</screenshot>

       </figure>

@@ -120,9 +119,10 @@
 		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 <glossterm

+		linkend="expunge">expunged</glossterm> 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

@@ -152,13 +152,15 @@
       <note>

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

 	<para>

-	  Your trash folder is actually a vFolder that displays all

-          messages you have marked for later deletion.  For more

-          information about vFolders, see <xref

-          linkend="usage-mail-organize-vfolders">.  If you choose

-          <menuchoice> <guimenu>Actions</guimenu> <guimenuitem>Empty

-          Trash</guimenuitem> </menuchoice> you will expunge

-          <emphasis>all</emphasis> your folders.

+	   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

+          your trash expunges the messages in your Trash folder,

+          choosing <menuchoice> <guimenu>Actions</guimenu>

+          <guimenuitem>Empty Trash</guimenuitem> </menuchoice> is the

+          same as expunging deleted mail from <emphasis>all</emphasis>

+          your folders.

 	</para>

       </note>

     </sect2>

@@ -214,17 +216,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>

@@ -513,9 +515,8 @@
       <menuchoice>

 	<guimenu>File</guimenu>

 	<guisubmenu>New</guisubmenu> 

-	<guimenuitem> Mail Message</guimenuitem>

-      </menuchoice>

-      , or by pressing the

+	<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

@@ -527,7 +528,7 @@
         <title>New Message Window</title>

         <screenshot>

           <screeninfo>Evolution Main Window</screeninfo>

-          <mediaobject><imageobject><imagedata fileref="figures/newmsg" format="PNG" srccredit="Aaron Weber">

+          <mediaobject><imageobject><imagedata fileref="figures/newmsg" format="png" srccredit="Aaron Weber">

         </imageobject></mediaobject>

         </screenshot>

       </figure>

@@ -554,7 +555,7 @@
            charges: you can remain offline until you need to send

            mail, then connect and send all your mail at once.  Mail in

            the outbox is sent when you click

-           <guibutton>Send/Recieve</guibutton> in the main window.

+           <guibutton>Send/Receive</guibutton> in the main window.

         </para>

         <para>

            To learn more about how you can specify message queue and

@@ -789,7 +790,7 @@
          <title>Reply Message Window</title>

          <screenshot>

           <screeninfo>Evolution Main Window</screeninfo>

-          <mediaobject><imageobject><imagedata fileref="figures/replymsg" format="PNG" srccredit="Aaron Weber">

+          <mediaobject><imageobject><imagedata fileref="figures/replymsg" format="png" srccredit="Aaron Weber">

         </imageobject></mediaobject>

         </screenshot>

       </figure>

@@ -1605,7 +1606,7 @@
       </para>

     </sect2>

     <sect2 id="fancy-mail">

-      <title>Making Your Email Fancier</title>

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

       <para>

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

 	by utilizing the HTML features.  Making an email functional

@@ -1624,41 +1625,48 @@
 	    <title>Indented Text with Headlines</title>

 	    <screenshot>

 	      <screeninfo></screeninfo>

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

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

 		       srccredit="Kevin Breit">

 	    </screenshot>

 	  </figure>

 	</para>

 	<para>

-	  Notice how professional the email looks, but it gets the

-	  content across well.  Each section is broken up in its own

-	  subsection.  The title is bolded, while the text which

-	  follows is indented one time.

+	  This message is not only more attractive, but more

+	  informative.  Each section is broken down into subsctions.

+	  The title for each section is in bold text, with the

+	  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 Ctrl+4.  You can set your text to regular size later

-	by hitting Ctrl+0.

+	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>.

 	</para>

       </sect3>

       <sect3 id="bulleted-lists">

 	<title>Bulleted Lists</title>

 	<para>

-	  Often times, people use asterisks instead of real bullets.

-	  Not only do asterisks look nicer, but

-	  <application>Evolution</application> will word wrap for you,

-	  which makes your text looks nicer.

+	  Select the <guimenuitem>Bulleted List</guimenuitem> option

+	  from the text style drop-down box to begin making a bulleted

+	  list. <application>Evolution</application> will handle the

+	  word wrap and indentation for you.  If you prefer to send

+	  the message in plain text, you can still write it up in

+	  HTML, and <application>Evolution</application> will convert

+	  to a well-formed plain-text bulleted list, using asterisks

+	  instead of HTML bullets.

 	</para>

       </sect3>

       <sect3 id="inline-images">

 	<title>Images In Your Email</title>

 	<para>

-	  Images can help people to understand your point.  You should

-	  also consider using the HTML Picture Frame Template in

-	  <application>Evolution</application>, as it looks good and

-	  has captions below it.

+	  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.

 	</para>

 	<para>

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

@@ -1671,7 +1679,7 @@
 	    <title>Images in an email</title>

 	    <screenshot>

 	      <screeninfo></screeninfo>

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

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

 	    </screenshot>

 	  </figure>

 	</para>

@@ -1679,9 +1687,10 @@
       <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, as the wrong color

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

+	  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:

 	  <itemizedlist>

 	    <listitem>

 	      <para>

@@ -1699,21 +1708,28 @@
 	      </para>

 	    </listitem>

 	  </itemizedlist>

-	  <!-- Include a screenshot -->

-	  Notice how these colors are similar saturation

+	  <!-- Include a screenshot --> 

+

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

+  easy to read on a white background.

+

 	</para>

       </sect3>

       <sect3 id="signature-howto">

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

 	<para>

-	  A lot of people use signatures to sign their emails to

-	  provide personal information about themselves.

-	  <application>Evolution</application> gives you the option of

-	  easily designing your signatures in HTML.  This can give

-	  your signatures a more professional or fun look.

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

+	  a signature block, typically a few lines of text appended

+	  automatically to every email by the mail program itself. 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.

 	</para>

 	<para>

-	  To setup your HTML signature, read the following steps:

+	  To set up an HTML signature:

 	  <orderedlist numeration="arabic">

 	    <listitem>

 	      <para>

@@ -1756,9 +1772,9 @@
 	    </listitem>

 	    <listitem>

 	      <para>

-		The HTML signature editor uses mostly the same

-		interface as the composer.  You can create your

-		signature in this window.

+		The HTML signature editor uses the same interface as

+		the composer.  You can create your signature in this

+		window.

 	      </para>

 	    </listitem>

 	    <listitem>

@@ -1925,7 +1941,7 @@
 	  <title>Public Key?  Private Key?  What is the difference?</title>

 	  <para>

 	    GPG uses two keys: public and private.  You can give your

-	    public key to anyone you want to recieve

+	    public key to anyone you want to receive

 	    encrypted messages, or put it on a public key server so

 	    that people can look it up before contacting you.

 	    <emphasis>Never give your private key to anyone,

@@ -2028,7 +2044,8 @@
 	  <listitem>

       	   <para>

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

-            long enough.  Some say that 2048 should be used.

+            long enough, and 2048 bits is considered very strong

+            indeed.

 	  </para>

          </listitem>

 

@@ -2158,7 +2175,7 @@ wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
 	  <guimenuitem>Mail Settings</guimenuitem>

 	</menuchoice>

 	Once there, select the account with which you'd like to send

-	and recieve encrypted mail, and click the

+	and receive encrypted mail, and click the

 	<guibutton>Edit</guibutton> button.  In the

 	<guilabel>Security</guilabel> tab is a section labeled

 	<guilabel>Pretty Good Privacy</guilabel>.  Enter your key ID

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

       </sect2>

       <sect2 id="unencrypting">

-	<title>Unencrypting a Recieved Message</title>

+	<title>Unencrypting a Received Message</title>

 	<para>

 	  If you get an encrypted message, you will need to decrypt it

 	  before you read it. Remember, the sender has to have your

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

     </sect2>

   </sect1>

-</chapter>

+</chapter>
\ No newline at end of file
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index b1494a1423..99d914422b 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -52,7 +52,7 @@
       makes displays faster and more efficient, so searches are faster
       and memory usage is lower.  People who get lots of mail will
       appreciate advanced features like <link
-      linkend="usage-mail-organize-vFolders"> Virtual Folders</link>,
+      linkend="usage-mail-organize-vFolders"><trademark>VFolders</trademark></link>,
       which let you save searches as though they were ordinary mail
       folders.
     </para>
@@ -131,10 +131,10 @@
     </sect2>
 
     <sect2 id="second-step">
-      <title>Recieving Email</title>
+      <title>Receiving Email</title>
       <para>
-	The <guilabel>Recieving Email</guilabel> step lets you configure
-	receving email people have sent you.
+	The <guilabel>Receiving Email</guilabel> lets you determine
+	which you will get your email.
 	<itemizedlist>
 	  <listitem>
 	    <para>
@@ -151,7 +151,6 @@
 		    permanent storage.
 		  </para>
 		</listitem>
-
 		<listitem>
 		  <para>
 		    Microsoft Exchange: Available only if you have
@@ -163,6 +162,7 @@
 		  </para>
 		</listitem>
 
+
 		<listitem>
 		  <para>
 		    IMAP: Keeps the email on your server so you can
@@ -174,9 +174,8 @@
 		  <para>
 		    Standard Unix mbox spools: If you want to read and
 		    store mail in the mail spool on your local system,
-		    choose this option. You'll need
-		    to provide the path to the mail spool you want to
-		    use.
+		    choose this option. You'll need to provide the
+		    path to the mail spool you want to use.
 		  </para>
 		</listitem>
 
@@ -320,9 +319,9 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>Create a Global Address List folder: If you would
-	    like to have a seperate folder for the Active Directory's
-	    Global Address List, leave this box checked. </para>
+	    <para>Create a Global Address List folder: If you want to
+	    use your organization's Active Directory or Global Address
+	    List, leave this box checked. </para>
 	  </listitem>
 
 	  <listitem>
@@ -382,15 +381,14 @@
 	    server: If you'd like your filters to work on this account
 	    as well as on locally downloaded mail, check this box.</para>
 	  </listitem>
-
-
 	</itemizedlist>
      </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
+    </listitem>
+  </varlistentry>
+ </variablelist>
 
          <note id="imap-namespace">
+         <note id="imap-namespace">
             <title>What's an IMAP Namespace?</title>
                 <para>
                     For IMAP mail servers, your sysadmin may provide
@@ -431,9 +429,9 @@
 		  <para>
 		    Microsoft Exchange: Sends mail through a Microsoft
 		    Exchange server using the Microsoft Exchange 2000
-		    protocol. Available only if you have purchased the
-		    Ximian Connector for Microsoft Exchange from
-		    <ulink
+		    protocol. Available only if you have are using the
+		    Ximian Connector for Microsoft Exchange. You must
+		    have a valid license key purchased from <ulink
 		    url="http://store.ximian.com">store.ximian.com</ulink>.
 		  </para>
 		</listitem>
@@ -444,7 +442,7 @@
 		    from your system. Sendmail is more flexible, but
 		    is not as easy to configure, so you should only
 		    select this option if you know how to set up a
-		    sendmail service.
+		    Sendmail service.
 		  </para>
 		</listitem>
 	      </itemizedlist>
@@ -466,11 +464,12 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Authentication Type: Chances are you are using
+	      Authentication Type: Unless you've been told otherwise,
+	      your best bet is to leave this set at
 	      <guilabel>Password</guilabel>.  If you're not sure, ask
 	      your system administrator or ISP, or have
-	      <application>Ximian Evolution</application> check for you by
-	      clicking <guibutton>Check for supported
+	      <application>Ximian Evolution</application> check for
+	      you by clicking <guibutton>Check for supported
 	      types</guibutton>.
 	    </para>
 	  </listitem>
@@ -573,7 +572,8 @@ the workaround described in the note below.
 	<para>
 	  Use the <application>Ximian Evolution</application> import
           tool to import the files.  There's more information about
-          why this works, and how, at the Ximian support website.
+          why this works, and how, at the Ximian <ulink
+          url="http://support.ximian.com">support website.</ulink>
       </para>
         </listitem>
      </orderedlist>
@@ -619,11 +619,11 @@ the workaround described in the note below.
     <sect2 id="mutt">
       <title>Importing Mail from mutt</title>
       <para>
-	<application>mutt</application> is a full-featured mail client
-	which is shipped with most Linux and Unix distributions.
+	<application>mutt</application> is a text-based mail client
+	which is shipped with many Linux and Unix distributions.
 	<application>mutt</application> uses the standard mbox,
-	maildir, and MH file formats, which makes importing your mail into
-	<application>Evolution</application> easy.  By default,
+	maildir, and MH file formats, which makes importing your mail
+	into <application>Evolution</application> easy.  By default,
 	<application>mutt</application> uses the mbox file format.
 	<orderedlist numeration="arabic">
 	  <listitem>
@@ -678,9 +678,9 @@ the workaround described in the note below.
     <sect2 id="kmail">
       <title>Importing Mail from KMail</title>
       <para>
-	KMail is a full-featured mail client which is shipped with the
-	KDE desktop environment.  KMail uses the standard mbox file
-	format, which means that importing your mail into
+	KMail is the mail client which is shipped with the KDE desktop
+	environment.  KMail uses the standard mbox file format, which
+	means that importing your mail into
 	<application>Evolution</application> is easy.
 	<orderedlist numeration="arabic">
 	  <listitem>
@@ -1251,7 +1251,7 @@ Shows your pending tasks
 	  <listitem>
 	    <para>
               It can send and receive mail in HTML or as plain text,
-              and makes it easy to send and recieve multiple file
+              and makes it easy to send and receive multiple file
               attachments.
            </para>
 	  </listitem>
@@ -1453,7 +1453,7 @@ Shows your pending tasks
         your cards in alphabetical order, in a <glossterm
         linkend="minicard">minicard</glossterm> view.  You can select
         other views from the <guimenu>View</guimenu> menu, and adjust
-        the width of the columns by clicking and dragging the grey
+        the width of the columns by clicking and dragging the gray
         column dividers.
       </para>
       <para>
diff --git a/help/C/usage-print.sgml b/help/C/usage-print.sgml
index dc088e79da..c36a53fe2a 100644
--- a/help/C/usage-print.sgml
+++ b/help/C/usage-print.sgml
@@ -8,12 +8,12 @@
   </para>
   <para>
     Whether you're printing a message, a calendar page, or a selection
-    of address cards, you can choose to print directly to a printer, or
-    save the print output to a <glossterm linkend="postscript">postscript</glossterm> file.  You can also use the
-    preview feature to see how your printed output will look.
+    of address cards, you can choose to print directly to a printer,
+    or save the print output to a <glossterm
+    linkend="postscript">postscript</glossterm> file.  You can also
+    use the preview feature to see how your printed output will look.
   </para>
   
-  
   <sect1 id="printpreview">
     <title>Print Preview</title>
     <para>
diff --git a/help/ChangeLog b/help/ChangeLog
index 609a1e0c64..4175bc54fc 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,10 +1,24 @@
+2002-03-27  Aaron Weber  <aaron@ximian.com>
+
+	* C/topic.dat: add from branch.
+	* C/figures/*: merge from branch
+	* C/usage-calendar.sgml: merge from branch
+	* C/usage-mail.sgml: merge from branch
+	* C/usage-mail-org.sgml: merge from branch
+	* C/Makefile.am: changes from other branch
+	* C/usage-print.sgml: merge from branch
+	* C/usage-exchange.sgml: merge from branch
+	* C/usage-mail.sgml: merge from evolution-1-0-branch branch.
+
 2002-03-25  Kevin Breit  <mrproper@ximian.com>
 
-	* C/usage-mail.sgml: Added mention that 2048 maybe recommended by some people.  Fixed a typo.
+	* C/usage-mail.sgml: Added mention that 2048 maybe recommended by
+	some people.  Fixed a typo.
 
 2002-03-23  Kevin Breit  <mrproper@ximian.com>
 
-	* C/usage-print.sgml: I fixed a typo which caused the documentation to not build.
+	* C/usage-print.sgml: I fixed a typo which caused the
+	documentation to not build.
 
 2002-03-14  Kevin Breit  <mrproper@ximian.com>
 
@@ -16,15 +30,18 @@
 
 	* C/apx-gloss.sgml: Added Postscript as a glossary definition.
 
-	* C/usage-print.sgml: Changed the introduction of this.  Do users really care about gnome-print?
-	Linked the Postscript line to the glossary.
+	* C/usage-print.sgml: Changed the introduction of this.  Do users
+	really care about gnome-print?  Linked the Postscript line to the
+	glossary.
 
 	* C/usage-mail.sgml: Pulled warning about the HTML mail stuff.
 
 2002-03-12  Kevin Breit  <mrproper@ximian.com>
 
-	* C/usage-mail.sgml: Replaced "png" with "PNG".  This shouldn't break the SGML build and it's a slow start to the XML porting process.
-	Included information about how to create an HTML signature.
+	* C/usage-mail.sgml: Replaced "png" with "PNG".  This shouldn't
+	break the SGML build and it's a slow start to the XML porting
+	process.  Included information about how to create an HTML
+	signature.
 
 2002-03-11  Kevin Breit  <mrproper@ximian.com>
 
@@ -41,8 +58,9 @@
 	C/figures/schedule.png,exchange-identity.png exchange-receive.png,
 	exchange-receive-options.png
 
-	* C/usage-exchange.sgml: expanded note about active directory server.
-	added screenshot for Free/Busy feature. Doubled the size of the config instructions.
+	* C/usage-exchange.sgml: expanded note about active directory
+	server.  added screenshot for Free/Busy feature. Doubled the size
+	of the config instructions.
 
 	* C/figures/schedule.png: New file, screenshot for free/busy feature.