Index: trunk/client/src/com/mirth/connect/client/ui/ChannelSetup.form
===================================================================
diff -u -N -r5324 -r5797
--- trunk/client/src/com/mirth/connect/client/ui/ChannelSetup.form	(.../ChannelSetup.form)	(revision 5324)
+++ trunk/client/src/com/mirth/connect/client/ui/ChannelSetup.form	(.../ChannelSetup.form)	(revision 5797)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <NonVisualComponents>
@@ -242,6 +242,7 @@
                   </Border>
                 </Property>
                 <Property name="text" type="java.lang.String" value="Encrypt messages in database"/>
+                <Property name="toolTipText" type="java.lang.String" value="&lt;html&gt;Encrypt messages that are stored in the database. Messages that&lt;br&gt;are stored while this option is enabled will still be viewable in the&lt;br&gt;message browser, but their contents will not be searchable.&lt;/html&gt;"/>
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[0, 0, 0, 0]"/>
                 </Property>
@@ -258,6 +259,7 @@
                   </Border>
                 </Property>
                 <Property name="text" type="java.lang.String" value="Store message data"/>
+                <Property name="toolTipText" type="java.lang.String" value="&lt;html&gt;Store messages processed by this channel for viewing in the&lt;br&gt;message browser. Limiting or disabling message storage&lt;br&gt;entirely will improve performance.&lt;/html&gt;"/>
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[0, 0, 0, 0]"/>
                 </Property>
@@ -280,6 +282,7 @@
                   <ComponentRef name="buttonGroup1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" value="Store indefinitely"/>
+                <Property name="toolTipText" type="java.lang.String" value="Store messages in the database until they are removed manually."/>
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[0, 0, 0, 0]"/>
                 </Property>
@@ -302,6 +305,7 @@
                   <ComponentRef name="buttonGroup1"/>
                 </Property>
                 <Property name="text" type="java.lang.String" value="Prune messages after"/>
+                <Property name="toolTipText" type="java.lang.String" value="Let the message pruner remove messages older than the specified number of days."/>
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[0, 0, 0, 0]"/>
                 </Property>
@@ -316,6 +320,9 @@
               </Properties>
             </Component>
             <Component class="com.mirth.connect.client.ui.components.MirthTextField" name="numDays">
+              <Properties>
+                <Property name="toolTipText" type="java.lang.String" value="Let the message pruner remove messages older than the specified number of days."/>
+              </Properties>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel3">
               <Properties>
@@ -333,6 +340,7 @@
                   </Border>
                 </Property>
                 <Property name="text" type="java.lang.String" value="With errors only"/>
+                <Property name="toolTipText" type="java.lang.String" value="Only store messages that error."/>
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[0, 0, 0, 0]"/>
                 </Property>
@@ -349,6 +357,7 @@
                   </Border>
                 </Property>
                 <Property name="text" type="java.lang.String" value="Do not store filtered messages"/>
+                <Property name="toolTipText" type="java.lang.String" value="Do not store messages that are filtered out by this channel&apos;s filter rules."/>
                 <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                   <Insets value="[0, 0, 0, 0]"/>
                 </Property>
@@ -412,6 +421,7 @@
                     </Property>
                     <Property name="selected" type="boolean" value="true"/>
                     <Property name="text" type="java.lang.String" value="Enabled"/>
+                    <Property name="toolTipText" type="java.lang.String" value="Enable this channel so that it can be deployed."/>
                     <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                       <Insets value="[0, 0, 0, 0]"/>
                     </Property>
@@ -428,6 +438,7 @@
                       </Border>
                     </Property>
                     <Property name="text" type="java.lang.String" value="Use transactional endpoints"/>
+                    <Property name="toolTipText" type="java.lang.String" value="Cause multiple Database Writer destinations to execute SQL as a single transaction."/>
                     <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                       <Insets value="[0, 0, 0, 0]"/>
                     </Property>
@@ -444,6 +455,7 @@
                       </Border>
                     </Property>
                     <Property name="text" type="java.lang.String" value="Synchronize channel"/>
+                    <Property name="toolTipText" type="java.lang.String" value="&lt;html&gt;Disabling synchronization will cause your destinations to run on separate concurrent threads.&lt;br&gt;It not recommended for the following reasons:&lt;br&gt;1) Destinations are not guaranteed to run in order, so they cannot reference each other.&lt;br&gt;2) Your source cannot send a response from any of the destinations.&lt;br&gt;3) Your source connector may be modified to to ensure compatibility with requirement #2.&lt;br&gt;4) Turning off synchronization will disable the post-processor.&lt;/html&gt;"/>
                     <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                       <Insets value="[0, 0, 0, 0]"/>
                     </Property>
@@ -466,7 +478,7 @@
                       </Border>
                     </Property>
                     <Property name="text" type="java.lang.String" value="Clear global channel map on deploy"/>
-                    <Property name="toolTipText" type="java.lang.String" value="This will clear the global channel map on both single channel deploy and a full redeploy."/>
+                    <Property name="toolTipText" type="java.lang.String" value="Clear the global channel map on both single channel deploy and a full redeploy."/>
                     <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
                       <Insets value="[0, 0, 0, 0]"/>
                     </Property>