Added info about tables, rules, and images

2001-08-24  Kevin Breit  <battery841@mediaone.net>

	* C/usage-mail.sgml: Added info about tables, rules, and images

	* C/usage-calendar.sgml: Rename a few titles

svn path=/trunk/; revision=12456

4 files changed, 197 insertions, 63 deletions

diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml
index 64439b16c5..f702f304c0 100644
--- a/help/C/config-prefs.sgml
+++ b/help/C/config-prefs.sgml
@@ -324,11 +324,12 @@
           too much to do with each other.
           <variablelist>
 
-             <varlistentry>
+	  <varlistentry>
 	    <term> 
 	      <guilabel>Send messages in HTML format</guilabel>
 	    </term>
-	    <listitem><para>
+	    <listitem>
+	      <para>
 		If you check this box, you will send
 		messages as HTML by default.  If you leave it unchecked, your
 		messages will be sent without HTML formatting unless you select 
@@ -336,36 +337,41 @@
 		</menuchoice> in the message composer.
 		See <xref linkend="usage-mail-getnsend-send-html">
 		  for more information about HTML mail.
-	      </para></listitem>
+	      </para>
+	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-                <term> 
-                   <guilabel>Mark Messages as Read After</guilabel>
-                </term>
-                <listitem><para> 
-                    When you click on a message,
-                    <application>Evolution</application> will wait a
-                    moment before marking it as read. You can set the
-                    delay, in milliseconds, here.
-                 </para></listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>
-                   <guilabel>Folder Format</guilabel>
-                </term>
-                <listitem> <para> By default,
-                   <application>Evolution</application> saves its mail
-                   in the
-                   <systemitem><filename>mbox</filename></systemitem>
-                   format. You can switch to the
-                   <systemitem><filename>mh</filename></systemitem>
-                   format if you like.  Note that this is an advanced
-                   feature and may cause you to lose some messages, so
-                   you should probably make a backup of your
-                   <systemitem><filename>evolution</filename></systemitem>
-                   directory first. In addition, it will take quite
-                   some time if you have a large mailbox.
-               </para></listitem>
+	    <term> 
+	      <guilabel>Mark Messages as Read After</guilabel>
+	    </term>
+	    <listitem>
+	      <para> 
+		When you click on a message,
+		<application>Evolution</application> will wait a
+		moment before marking it as read. You can set the
+		delay, in milliseconds, here.
+	      </para>
+	    </listitem>
+	  </varlistentry>
+	  <varlistentry>
+	    <term>
+	      <guilabel>Folder Format</guilabel>
+	    </term>
+	    <listitem> 
+	      <para> 
+		By default,
+		<application>Evolution</application> saves its mail
+		in the
+		<systemitem><filename>mbox</filename></systemitem>
+		format. You can switch to the
+		<systemitem><filename>mh</filename></systemitem>
+		format if you like.  Note that this is an advanced
+		feature and may cause you to lose some messages, so
+		you should probably make a backup of your
+		<systemitem><filename>evolution</filename></systemitem>
+		directory first. In addition, it will take quite
+		some time if you have a large mailbox.
+	      </para></listitem>
              </varlistentry>
            </variablelist>
         </para>
diff --git a/help/C/usage-calendar.sgml b/help/C/usage-calendar.sgml
index 8c4b48ebc2..72458ad74b 100644
--- a/help/C/usage-calendar.sgml
+++ b/help/C/usage-calendar.sgml
@@ -82,7 +82,7 @@
         multiple columns in the day view of the calendar.
       </para>
       <note>
-       <title>Doing Two Things At Once</title>
+       <title>Multiple Simultanious Appointments</title>
          <para>
            If you create calendar appointments that overlap,
            <application>Evolution</application> will display them side
@@ -157,7 +157,7 @@
       </para>
       
       <tip>
-      <title>Adding a New Category</title>
+      <title>Adding a New Appointment Category</title>
 	<para>
 	 You can add a new category to your category list by clicking on
          <guibutton>Edit Master Category List...</guibutton> and single-clicking
@@ -204,7 +204,7 @@
       </para>
     </sect2>
     <sect2 id="usage-calendar-rsvp">
-      <title>RSVPs with the Calendar</title>
+      <title>Sending a RSVP with the Calendar</title>
       <para>
 	<application>Evolution</application> can be used to setup group appointments
 	and help you manage RSVPs.
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index 45c7e52abd..ef02915fd3 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -5,35 +5,35 @@
 <chapter id="usage-mail">
   <title>Using Evolution for Email</title>
   <para>
-     This chapter, and <xref linkend="usage-mail-organize">, will
-     provide you with an in-depth guide to the capabilities of
-     Evolution as a mail client.  For information about how to set up
-     your mail account, see <xref linkend="config-prefs-mail">.
+    This chapter, and <xref linkend="usage-mail-organize">, will
+      provide you with an in-depth guide to the capabilities of
+      Evolution as a mail client.  For information about how to set up
+      your mail account, see <xref linkend="config-prefs-mail">.
   </para>
-
-<note>
-<title>If you use IMAP Mail</title>
-<para>
-If you chose IMAP mail during the setup process, you must subscribe to
-your mail folders before you can read mail in them. Read <xref
-linkend="usage-mail-subscriptions"> to find out how.
-</para>
-</note>
-
-
+  
+  <note>
+    <title>If you use IMAP Mail</title>
+    <para>
+      If you chose IMAP mail during the setup process, you must subscribe to
+      your mail folders before you can read mail in them. Read <xref
+								     linkend="usage-mail-subscriptions"> to find out how.
+    </para>
+  </note>
+  
+  
   <sect1 id="usage-mail-getnsend-read">
-      <title>Reading Mail</title>    
+    <title>Reading Mail</title>    
     <para>
-        Start the mail client by clicking on the
-        <guibutton>Inbox</guibutton> icon in the shortcut bar, or by
-        selecting a mail folder in the folder bar.  To read a message,
-        select it in the message list; if you'd like to see it in its
-        own window, double-click on it or press
-          <keycombo action="simul">
-		<keycap>Ctrl</keycap>
-		<keycap>O</keycap>
-	      </keycombo>.
-     </para>
+      Start the mail client by clicking on the
+      <guibutton>Inbox</guibutton> icon in the shortcut bar, or by
+      selecting a mail folder in the folder bar.  To read a message,
+      select it in the message list; if you'd like to see it in its
+      own window, double-click on it or press
+      <keycombo action="simul">
+	<keycap>Ctrl</keycap>
+	<keycap>O</keycap>
+      </keycombo>.
+    </para>
 
       <tip id="spaceandbs">
 	<title>Reading Mail with the Keyboard</title>
@@ -946,6 +946,40 @@ with quoted materials and the relevant replies interspersed-->
 	      <para>
 		Lets you put an image alongside text.
 	      </para>
+	      <para>
+		To insert an image into your email:
+		<orderedlist numeration="arabic">
+		  <listitem>
+		    <para>
+		      Open a new email by clicking <guibutton>New Message</guibutton>
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Make the email HTML mail by clicking
+		      <menuchoice>
+			<guimenu>Format</guimenu>
+			<guimenuitem>HTML</guimenuitem>
+		      </menuchoice>
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Click the <guibutton>Image</guibutton> button in the <guilabel>Toolbar</guilabel>.
+		      </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Choose your image by clicking the <guibutton>Browse</guibutton> button.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Press <guibutton>Insert</guibutton> to insert the image.
+		    </para>
+		  </listitem>
+		</orderedlist>
+	      </para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
@@ -955,6 +989,40 @@ with quoted materials and the relevant replies interspersed-->
 		Inserts a horizontal line into the text to help divide two
 		sections.
 	      </para>
+	      <para>
+		To insert a rule:
+		<orderedlist numeration="arabic">
+		  <listitem>
+		    <para>
+		      Open a new email by clicking <guibutton>New Message</guibutton>
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Make the email HTML mail by clicking
+		      <menuchoice>
+			<guimenu>Format</guimenu>
+			<guimenuitem>HTML</guimenuitem>
+		      </menuchoice>
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Click the <guibutton>Rule</guibutton> button in the <guilabel>Toolbar</guilabel>.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Select the template to use for the rule.
+		    </para>
+		  </listitem>
+		  <listitem>
+		    <para>
+		      Click <guibutton>Insert</guibutton> to insert the rule.
+		    </para>
+		  </listitem>
+		</orderedlist>
+	      </para>
 	    </listitem>
 	  </varlistentry>
 	  </variablelist>
@@ -1003,7 +1071,7 @@ with quoted materials and the relevant replies interspersed-->
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Select the image you want
+	      Select the image you want to include in your email.
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -1045,6 +1113,11 @@ with quoted materials and the relevant replies interspersed-->
 	  <orderedlist numeration="arabic">
 	    <listitem>
 	      <para>
+		Create a new email by clicking <guibutton>New Message</guibutton>.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
 		Enable HTML in your email by clicking
 		<menuchoice>
 		  <guimenu>
@@ -1083,9 +1156,58 @@ with quoted materials and the relevant replies interspersed-->
 	  </orderedlist>
 	</para>
       </sect3>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-fwd">
+      <sect3 id="composer-tables">
+	<title>Tables in Email</title>
+	<para>
+	  <application>Evolution</application> allows you to put tables in your HTML email to help organize your thoughts.  These tables are a simplified version of what you might find in a spreadsheet program such as <application>Gnumeric</application>.
+	</para>
+	<para>
+	  To include a table in your email:
+	  <orderedlist numeration="arabic">
+	    <listitem>
+	      <para>
+		Create a new email by clicking <guibutton>New Message</guibutton>.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Enable HTML in your email by clicking
+		<menuchoice>
+		  <guimenu>
+		    Format
+		  </guimenu>
+		  <guimenuitem>
+		    HTML
+		  </guimenuitem>
+		</menuchoice>
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Select the template to use for the table.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Set up how many rows and columns you want.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Click the <guibutton>Insert</guibutton> button.
+	      </para>
+	    </listitem>
+	    <listitem>
+	      <para>
+		Click in a cell and type to insert text into the table.
+	      </para>
+	    </listitem>
+	  </orderedlist>
+	</para>
+      </sect3>
+    </sect2>
+    
+    <sect2 id="usage-mail-getnsend-fwd">
         <title>Forwarding Mail</title>
         <para>
           The post office forwards your mail for you when you change
diff --git a/help/ChangeLog b/help/ChangeLog
index b77efd112f..2b26cc5bfb 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-24  Kevin Breit  <battery841@mediaone.net>
+
+	* C/usage-mail.sgml: Added info about tables, rules, and images
+
+	* C/usage-calendar.sgml: Rename a few titles
+
 2001-08-22  Aaron Weber  <aaron@ximian.com>
 
 	* C/apx-gloss.sgml: public key.