[richfaces-svn-commits] JBoss Rich Faces SVN: r5628 - in branches/3.1.x/docs: userguide/en/src/main/docbook/included and 4 other directories.

richfaces-svn-commits at lists.jboss.org richfaces-svn-commits at lists.jboss.org
Fri Jan 25 10:20:39 EST 2008


Author: artdaw
Date: 2008-01-25 10:20:39 -0500 (Fri, 25 Jan 2008)
New Revision: 5628

Modified:
   branches/3.1.x/docs/faq/en/src/main/docbook/module/RFCfaq.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/actionparam.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/actionparam.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/ajaxListener.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/ajaxListener.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/componentControl.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/contextMenu.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/contextMenu.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataDefinitionList.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataFilterSlider.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataGrid.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataList.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataOrderedList.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator1.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/draggable.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropZone.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/form.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/jQuery.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/jQuery.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/jsFunction.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/loadStyle.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/log.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuGroup.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuItem.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/poll.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/recursiveTreeNodesAdaptor.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/spacer.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/status.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/subTable.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/subTable.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionbox.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionbox.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/toggleControl.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolTip.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolTip.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
   branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml
   branches/3.1.x/docs/userguide/en/src/main/resources/css/html.css
   branches/3.1.x/docs/userguide/en/src/main/resources/images/calendar1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/contextMenu_attached.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/contextMenu_classes.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/dataTable2.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/dataTable3.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/datadefinitionlist2.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/datagrid1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/datagrid2.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/datalist1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/datalist2.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/datalist3.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/dataorderedlist1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/dataorderedlist2.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/datascroller3.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/dropDownMenu1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/dropDownMenu2.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/dropDownMenu3.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/dropDownMenu4.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/dropDownMenu5.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/ico_important.gif
   branches/3.1.x/docs/userguide/en/src/main/resources/images/inputNumberSpinner3.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/listShuttle1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/listShuttle_classes_s.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/listShuttle_classes_t.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/menuGroup1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/menuGroup2.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/menuGroup3.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/menuItem1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/menuItem2.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/menuSeparator1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/message.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/messages.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/messages1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/mp_4.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/orderinList1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/panel3.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/panelMenuGroup_icons.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenu.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenu1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenugroup1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenugroup_col.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenugroup_exp.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenuitem.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/recursiveTreeNodesAdaptor1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/scrollable-dt1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/scrollableDataTable.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/sdt.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/simpleTogglePanel3.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/slider5.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/tab1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/tooltip1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/tree1.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/tree2.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/tree3.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/tree4.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/tree5.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/treeNode.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/treeNode2.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/treeNode3.png
   branches/3.1.x/docs/userguide/en/src/main/resources/images/treeNodesAdaptor1.png
   branches/3.1.x/docs/xslt/en/src/main/xslt/fopdf.xsl
   branches/3.1.x/docs/xslt/en/src/main/xslt/html.xsl
   branches/3.1.x/docs/xslt/en/src/main/xslt/html_chunk.xsl
Log:
http://jira.jboss.com/jira/browse/RF-971 - merged for release 3.1.4

Modified: branches/3.1.x/docs/faq/en/src/main/docbook/module/RFCfaq.xml
===================================================================
--- branches/3.1.x/docs/faq/en/src/main/docbook/module/RFCfaq.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/faq/en/src/main/docbook/module/RFCfaq.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -657,6 +657,20 @@
         </section>
 
         <section>
+                <?dbhtml filename="Howtoavoidaproblemwithtextwrapping.html"?>
+                <title>How to avoid a problem with text wrapping in &lt;rich:tab&gt; in
+                        Internet Explorer 7?</title>
+                <para>A problem with tab height occurs in IE 7. The tab height is correct in Firefox
+                        and IE 6. This is IE&apos;s 7 bug. As a temporary solution you can try
+                        to change doctype declaration from:</para>
+                <programlisting role="XML"><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">]]></programlisting>
+                <para>to:</para>
+                <programlisting role="XML"><![CDATA[<!doctype html public "-//w3c//dtd html 4.0 transitional//en">]]></programlisting>
+                <para>See also <ulink url="http://jira.jboss.com/jira/browse/RF-1011"
+                                >http://jira.jboss.com/jira/browse/RF-1011</ulink>.</para>
+        </section>
+
+        <section>
                 <?dbhtml filename="Howtosaveeffectstatus.html"?>
                 <title>How to save &lt;rich:effect&gt; status?</title>
                 <para><emphasis role="bold">&lt;rich:effect&gt;</emphasis> component has
@@ -752,8 +766,16 @@
                                 >RichFaces User Forum</ulink>.</para>
         </section>
 
+        <section id="Howtoapplybuttonlable">
+                <?dbhtml filename="Howtoapplybuttonlable .html"?>
+                <title>How to apply button lable for &lt;rich: calendar&gt;?</title>
+                <para> Necessary information could be found on the <ulink
+                        url="http://www.jboss.com/index.html?module=bb&amp;op=viewtopic&amp;p=4120993#4120993"
+                        >RichFaces User Forum</ulink>.</para>
+        </section>
 
 
+
         <section id="DecidingWhatToChangeOnTheServerSide">
                 <?dbhtml filename="DecidingWhatToChangeOnTheServerSide.html"?>
                 <title>What should I change on the server side?</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/actionparam.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/actionparam.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/actionparam.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <section>
     <para>The <emphasis role="bold">
-        <property>&lt;a4j:actionparam&gt;</property>
+        <property>&lt;a4j:actionParam&gt;</property>
       </emphasis> component combines the functionality of both JSF components:  <emphasis role="bold">
         <property>&lt;f:param&gt;</property>
       </emphasis> and <emphasis role="bold">

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/actionparam.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/actionparam.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/actionparam.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -47,7 +47,7 @@
     <section>
         <title>Key attributes and ways of usage</title>
         <para>The component <emphasis role="bold">
-                <property>&lt;a4j:actionparam&gt;</property>
+                <property>&lt;a4j:actionParam&gt;</property>
             </emphasis> is a combination of the functionality of two JSF tags: <emphasis role="bold">
                 <property>&lt;f:param&gt;</property>
             </emphasis> and <emphasis role="bold">
@@ -60,7 +60,7 @@
             attribute as its value. If a converter attribute is specified, use it to encode and
             decode the value to a string stored in the html parameter.</para>
         <para><emphasis role="bold">
-                <property>&lt;a4j:actionparam&gt;</property>
+                <property>&lt;a4j:actionParam&gt;</property>
             </emphasis>has a <emphasis><property>&quot;noEscape&quot;</property></emphasis> attribute. If it is set to
             &quot;true&quot;, the value will be evaluated as a JavaScript code. </para>
         <emphasis role="bold">Example:</emphasis>
@@ -86,7 +86,7 @@
 	<para>
 	    <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/actionparam.jsf?c=actionparam">Here</ulink>
 	    you can see the example of <emphasis role="bold"
-	        ><property>&lt;a4j:actionparam&gt;</property></emphasis> usage and sources for the given example. 
+	        ><property>&lt;a4j:actionParam&gt;</property></emphasis> usage and sources for the given example. 
 	</para>
       <para>More information can be found on the <ulink url="http://www.jboss.com/index.html?module=bb&amp;op=viewtopic&amp;p=4063764"
           >Ajax4jsf Users Forum</ulink>.</para>	  

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/ajaxListener.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/ajaxListener.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/ajaxListener.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <section>
   <para>The <emphasis role="bold"><property>&lt;a4j:ajaxListener&gt;</property></emphasis>
-component is the same one as <emphasis><property>&quot;ActionListener&quot;</property></emphasis> 
+component is the same one as <emphasis><property>&quot;actionListener&quot;</property></emphasis> 
 or <emphasis><property>&quot;ValueChangeListener&quot;</property></emphasis>, but for an Ajax container.</para>
 </section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/ajaxListener.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/ajaxListener.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/ajaxListener.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -67,15 +67,15 @@
   <section>
     <title>Key attributes and ways of usage</title>
 	<para>
-Additional to the listeners provided by JSF specification, RichFaces add one more: Ajax Listener (
+Additional to the listeners provided by JSF specification, RichFaces add one more: ajax Listener (
 	<emphasis role="bold"><property>&lt;a4j:ajaxListener&gt;</property>
 	</emphasis>).
-Ajax Listener is invoked before the Render Response phase. Instead of Action Listener of Value Change Listener which are not
-invoked when Validation of Update Model phases failed, Ajax Listener is guarantied to be invoked for each Ajax response. Thus, it is
+Ajax Listener is invoked before the Render Response phase. Instead of action Listener of Value Change Listener which are not
+invoked when Validation of Update Model phases failed, ajax Listener is guarantied to be invoked for each Ajax response. Thus, it is
 a good place for update the list of re-rendered components, for example.
 Ajax Listener is not invoked for non-Ajax request and when RichFaces works in "Ajax Request generates 
-Non-Ajax Response" mode. Therefore, Ajax Listener invocation is a good indicator that Ajax response is going to be processed. 
-Attribute &quot;type&quot; defines the fully qualified Java class name for listener. This class should implement org.ajax4jsf.framework.ajax.AjaxListener
+Non-Ajax Response" mode. Therefore, ajax Listener invocation is a good indicator that Ajax response is going to be processed. 
+Attribute &quot;type&quot; described in <link linkend="ajaxListener attributes">the following chapter</link>. defines the fully qualified Java class name for listener.This class should implement org.ajax4jsf.framework.ajax.ajaxListener
 interface. You can access to the source of the event (Ajax component) using event.getSource() call. 
 	</para>
 

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,12 +10,14 @@
         <para>The <emphasis role="bold">
                 <property>&lt;rich:calendar&gt;</property>
         </emphasis> component is used for creating monthly calendar elements on a page.</para>
-
+        <figure>
+            <title>&lt;rich:calendar&gt; component</title>
         <mediaobject>
             <imageobject>
                 <imagedata fileref="images/calendar.png"/>
             </imageobject>
         </mediaobject>
+        </figure>
     </section>
     <section>
         <title>Key Features</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/calendar.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -82,7 +82,8 @@
   <section>
     <title>Details of Usage</title>
     <para>The <emphasis>
-        <property>&quot;popup&quot;</property>
+      <property>&quot;popup&quot;
+        </property>
       </emphasis> attribute defines calendar representation mode on a page. If it&apos;s
       &quot;true&quot; the calendar is represented on a page as an input field and a button.
       Clicking on the button calls the calendar popup as it&apos;s shown on the picture below. </para>
@@ -248,7 +249,7 @@
     <para>
       <emphasis role="bold">Example:</emphasis>
     </para>
-    <programlisting role="XML"><![CDATA[...
+    <programlisting role="CSS"><![CDATA[...
 <!--Styles for cells -->
 <style>
     .width100{
@@ -258,7 +259,9 @@
         text-align:center;
     }
 </style>
+ ...]]></programlisting>
    
+    <programlisting role="XML"><![CDATA[...
 <rich:calendar id="myCalendar" popup="true" locale="#{calendarBean.locale}" value="#{bean.date}" 
                             preloadRangeBegin="#{bean.date}" preloadRangeEnd="#{bean.date}" selectedDate="#{bean.date}" cellWidth="40px" cellHeight="40px">
 
@@ -311,7 +314,19 @@
       </emphasis> facet, {nextYearControl}, {previousYearControl} are absent. Numbers of weeks are
       red colored.</para>
 
-    <para>The <emphasis role="bold">
+    <para>
+      It is possible to show and manage date. Except scrolling controls you can use quick month and year selection feature. 
+      It&apos;s necessary to click on its field, i.e. current month control, and choose required month and year.  
+    </para>
+    <figure>
+      <title>Quick month and year selection</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/calendar5.png"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+    <para>Also the <emphasis role="bold">
         <property>&lt;rich:calendar&gt;</property>
       </emphasis> component allows to show and manage time. It&apos;s necessary to define time
       in a pattern (for example, it could be defined as &quot;d/M/yy HH:mm&quot;). Then after
@@ -329,6 +344,7 @@
       </mediaobject>
     </figure>
 
+
     <para>It&apos;s possible to program events for calendar from JavaScript code. A simplest
       example of usage JavaScript API is placed below:</para>
     <para>
@@ -715,7 +731,7 @@
     </table>
 
     <table>
-      <title>Skin parameters redefinition for a toolbar and names of months</title>
+      <title>Skin parameters redefinition for a toolBar and names of months</title>
 
       <tgroup cols="2">
         <thead>
@@ -901,6 +917,336 @@
       </tgroup>
     </table>
 
+    <!-- Quick year & month selection-->
+    <table>
+      <title>Skin parameters redefinition for a popup element during quick month and year selection</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          
+          <row>
+            <entry>tableBackgroundColor</entry>
+            <entry>background</entry>
+          </row>
+          
+          <row>
+            <entry>panelBorderColor</entry>
+            <entry>border-color</entry>
+          </row>
+          
+        </tbody>
+      </tgroup>
+    </table>
+    <table>
+      <title>Skin parameters redefinition for a shadow</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          
+          <row>
+            <entry>shadowBackgroundColor</entry>
+            <entry>background-color</entry>
+          </row>
+
+        </tbody>
+      </tgroup>
+    </table>
+  
+    <table>
+      <title>Skin parameters redefinition for a selected month and year</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          
+          <row>
+            <entry>calendarCurrentBackgroundColor</entry>
+            <entry>background-color</entry>
+          </row>
+          
+          <row>
+            <entry>calendarCurrentTextColor</entry>
+            <entry>color</entry>
+          </row>
+          
+        </tbody>
+      </tgroup>
+    </table>
+    
+    <table>
+      <title>Skin parameters redefinition for a hovered month and year</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          
+          <row>
+            <entry>panelBorderColor</entry>
+            <entry>border-color</entry>
+          </row>
+          
+          <row>
+            <entry>calendarSpecBackgroundColor</entry>
+            <entry>background</entry>
+          </row>
+          
+        </tbody>
+      </tgroup>
+    </table>
+    
+    <table>
+      <title>Skin parameters redefinition for a month items near split line</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        <tbody>
+          <row>
+            <entry>panelBorderColor</entry>
+            <entry>border-right-color</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+    
+    <table>
+      <title>Skin parameters redefinition for a hovered toolbar items</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          
+          <row>
+            <entry>calendarWeekBackgroundColor</entry>
+            <entry>background-color</entry>
+          </row>
+          
+          <row>
+            <entry>generalTextColor</entry>
+            <entry>color</entry>
+          </row>
+          
+          <row>
+            <entry>tableBackgroundColor</entry>
+            <entry>border-color</entry>
+          </row>
+          
+          <row>
+            <entry>panelBorderColor</entry>
+            <entry>border-right-color</entry>
+          </row>
+          
+          <row>
+            <entry>panelBorderColor</entry>
+            <entry>border-bottom-color</entry>
+          </row>
+          
+        </tbody>
+      </tgroup>
+    </table>
+    
+    <table>
+      <title>Skin parameters redefinition for a pressed toolbar items</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          
+          <row>
+            <entry>panelBorderColor</entry>
+            <entry>border-color</entry>
+          </row>
+          
+          <row>
+            <entry>tableBackgroundColor</entry>
+            <entry>border-right-color</entry>
+          </row>
+          
+          <row>
+            <entry>tableBackgroundColor</entry>
+            <entry>border-bottom-color</entry>
+          </row>
+          
+        </tbody>
+      </tgroup>
+    </table>
+    
+    <table>
+      <title>Skin parameters redefinition for &quot;ok&quot; and &quot;cancel&quot; buttons</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          
+          <row>
+            <entry>additionalBackgroundColor</entry>
+            <entry>background</entry>
+          </row>
+          
+          <row>
+            <entry>panelBorderColor</entry>
+            <entry>border-top-color</entry>
+          </row>
+          
+        </tbody>
+      </tgroup>
+    </table>
+    
+    <!-- Time selection-->
+    
+    <table>
+      <title>Skin parameters redefinition for a popup element during time selection</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          
+          <row>
+            <entry>additionalBackgroundColor</entry>
+            <entry>background</entry>
+          </row>
+          
+          <row>
+            <entry>panelBorderColor</entry>
+            <entry>border-color</entry>
+          </row>
+          
+        </tbody>
+      </tgroup>
+    </table>
+    
+    <table>
+      <title>Skin parameters redefinition for a wrapper &lt;td&gt; element for an input field</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          
+          <row>
+            <entry>controlBackgroundColor</entry>
+            <entry>background-color</entry>
+          </row>
+          
+          <row>
+            <entry>panelBorderColor</entry>
+            <entry>border-color</entry>
+          </row>
+          
+          <row>
+            <entry>subBorderColor</entry>
+            <entry>border-bottom-color</entry>
+          </row>
+          
+          <row>
+            <entry>subBorderColor</entry>
+            <entry>border-right-color</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+    
+    <table>
+      <title>Skin parameters redefinition for an input field</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          
+          <row>
+            <entry>buttonSizeFont</entry>
+            <entry>font-size</entry>
+          </row>
+          
+          <row>
+            <entry>buttonFamilyFont</entry>
+            <entry>font-family</entry>
+          </row>
+        
+        </tbody>
+      </tgroup>
+    </table>
+    
+    <table>
+      <title>Skin parameters redefinition for a wrapper &lt;td&gt; element for spinner buttons</title>
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Skin parameters</entry>
+            <entry>CSS properties</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          
+          <row>
+            <entry>headerBackgroundColor</entry>
+            <entry>background-color</entry>
+          </row>
+          
+          <row>
+            <entry>headerBackgroundColor</entry>
+            <entry>border-color</entry>
+          </row>
+          
+        </tbody>
+      </tgroup>
+    </table>
+    
   </section>
 
   <section>
@@ -910,12 +1256,37 @@
 
     <figure>
       <title>Style classes</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/calendar_cn1.png" scalefit="1"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+    <figure>
+      <title>Style classes</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/calendar_cn2.png" scalefit="1"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+    <figure>
+      <title>Style classes</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/calendar_cn3.png" scalefit="1"/>
+        </imageobject>
+      </mediaobject>
 
+    </figure>
+    <figure>
+      <title>Style classes</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/calendar1.png" scalefit="1"/>
+          <imagedata fileref="images/calendar_cn4.png" scalefit="1"/>
         </imageobject>
       </mediaobject>
+      
     </figure>
 
     <table>
@@ -1095,6 +1466,122 @@
       </tgroup>
     </table>
 
+    <table>
+      <title>Classes names that define a popup element during quick month and year selection</title>
+      
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Class name</entry>
+            <entry>Description</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          <row>
+            <entry>rich-calendar-date-layout</entry>
+            <entry>Defines styles for a popup element during quick year selection</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-editor-layout-shadow</entry>
+            <entry>Defines styles for a shadow</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-editor-btn</entry>
+            <entry>Defines styles for an inactive boundary date</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-date-layout-split</entry>
+            <entry>Defines styles for a wrapper &lt;td&gt; element for month items near split line</entry>
+            </row>
+          <row>
+            <entry>rich-calendar-editor-btn-selected</entry>
+            <entry>Defines styles for an selected boundary date</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-editor-btn-over</entry>
+            <entry>Defines styles for a boundary date when pointer was moved onto</entry>
+          </row>
+          
+          <row>
+            <entry>rich-calendar-editor-tool-over</entry>
+            <entry>Defines styles for a hovered toolbar items</entry>
+          </row>
+          
+          <row>
+            <entry>rich-calendar-editor-tool-press</entry>
+            <entry>Defines styles for a pressed toolbar items</entry>
+          </row>
+          
+          <row>
+            <entry>rich-calendar-date-layout-ok</entry>
+            <entry>Defines styles for a &quot;ok&quot; button</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-date-layout-cancel</entry>
+            <entry>Defines styles for a &quot;cancel&quot; button</entry>
+          </row>
+
+        </tbody>
+      </tgroup>
+    </table>
+    
+    <table>
+      <title>Classes names that define a popup element during time selection</title>
+      
+      <tgroup cols="2">
+        <thead>
+          <row>
+            <entry>Class name</entry>
+            <entry>Description</entry>
+          </row>
+        </thead>
+        
+        <tbody>
+          <row>
+            <entry>rich-calendar-time-layout</entry>
+            <entry>Defines styles for a popup element during time selection</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-editor-layout-shadow</entry>
+            <entry>Defines styles for a shadow</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-time-layout-fields</entry>
+            <entry>Defines styles for a wrapper &lt;td&gt; element for input fields and buttons</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-spinner-input-container</entry>
+            <entry>Defines styles for a wrapper &lt;td&gt; element for an input field</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-spinner-input</entry>
+            <entry>Defines styles for an input field</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-spinner-buttons</entry>
+            <entry>Defines styles for a wrapper &lt;td&gt; element for spinner buttons</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-spinner-up</entry>
+            <entry>Defines styles for a &quot;up&quot; button</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-spinner-down</entry>
+            <entry>Defines styles for a &quot;down&quot; button</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-time-layout-ok</entry>
+            <entry>Defines styles for a &quot;ok&quot; button</entry>
+          </row>
+          <row>
+            <entry>rich-calendar-time-layout-cancel</entry>
+            <entry>Defines styles for a &quot;cancel&quot; button</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+    
     <para>In order to redefine styles for all <emphasis role="bold">
         <property>&lt;rich:calendar&gt;</property>
       </emphasis> components on a page using CSS, it&apos;s enough to create classes with the
@@ -1106,6 +1593,27 @@
         role="bold">
         <property>&lt;rich:calendar&gt;</property>
       </emphasis>attributes.</para>
+    
+    <para>CSS code piece used on a page:</para>
+    
+    <para>
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+    <programlisting role="CSS"><![CDATA[...
+.rich-calendar-today {
+    background-color: #00FA9A;
+}
+ .myClass {
+     font-size: xx-large;
+}
+...]]></programlisting>
+    <para>The component is defined in the following way:</para>
+    
+    <para>
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+    <programlisting role="XML"><![CDATA[<rich:calendar ... inputClass="myClass" .../>]]></programlisting>
+    
   </section>
 
   <section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,10 +9,10 @@
 <title>Description</title>
     <para>The component for row rendering for a UIData component.</para>
     <figure>
-        <title>Column component</title>
+        <title>&lt;rich:column&gt; component</title>
       <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/column1.gif"/>
+            <imagedata fileref="images/column1.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/column.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -101,10 +101,10 @@
 ]]></programlisting>
  <para>The result is:</para>
  <figure>
-        <title>Generated column component</title>
+     <title>Generated &lt;rich:column&gt; component</title>
       <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/column2.gif"/>
+            <imagedata fileref="images/column2.png"/>
         </imageobject>
     </mediaobject>
     </figure>
@@ -135,10 +135,10 @@
 ]]></programlisting>
 <para>As a result the following structure is rendered:</para>
 <figure>
-        <title>Column modified with colspan and breakbefore attributes</title>
+    <title>&lt;rich:column&gt; modified with colspan and breakbefore attributes</title>
       <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/column3.gif"/>
+            <imagedata fileref="images/column3.png"/>
         </imageobject>
     </mediaobject>
     </figure>
@@ -170,10 +170,10 @@
 ]]></programlisting>
 <para>As a result:</para>
 <figure>
-        <title>Column generated with rowspan attribute</title>
+    <title>&lt;rich:column&gt; generated with rowspan attribute</title>
       <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/column4.gif"/>
+            <imagedata fileref="images/column4.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,10 +9,10 @@
 <title>Description</title>
     <para>The component combines columns in one row to organize complex subparts of a table.</para>
     <figure>
-        <title>ColumnGroup component</title>
+        <title>&lt;rich:columnGroup&gt; component</title>
       <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/columngroup1.gif"/>
+            <imagedata fileref="images/columngroup1.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/columnGroup.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -3,7 +3,7 @@
 <sectioninfo>
 <keywordset>
 <keyword>rich:columnGroup</keyword>
-<keyword>HtmlColumnGroup</keyword>
+<keyword>HtmlcolumnGroup</keyword>
 </keywordset>
 </sectioninfo>
      <table>
@@ -125,10 +125,10 @@
 ]]></programlisting>
 <para>The result is:</para>
 <figure>
-        <title>Generated columnGroup component</title>
+    <title>Generated &lt;rich:columnGroup&gt; component</title>
       <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/columngroup2.gif"/>
+            <imagedata fileref="images/columngroup2.png"/>
         </imageobject>
     </mediaobject>
     </figure>
@@ -162,10 +162,10 @@
 ]]></programlisting>
 <para>Generated on a page as:</para>
 <figure>
-        <title>ColumnGroup with complex headers</title>
+    <title>&lt;rich:columnGroup&gt; with complex headers</title>
       <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/columngroup3.gif"/>
+            <imagedata fileref="images/columngroup3.png"/>
         </imageobject>
     </mediaobject>
     </figure>     

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/componentControl.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/componentControl.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/componentControl.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -123,7 +123,7 @@
     <para>In the example the <emphasis>
         <property>&quot;for&quot;</property>
       </emphasis> attribute contains value of an Id of <emphasis role="bold">
-        <property>&lt;rich:modalpanel&gt;</property>
+        <property>&lt;rich:modalPanel&gt;</property>
       </emphasis> component. The <emphasis>
         <property>&quot;operation&quot;</property>
       </emphasis> attribute contains a name of JavaScript API function. An <emphasis>
@@ -181,13 +181,13 @@
             <f:param name="cmdParam" value="menu" />
         </rich:menuItem>
         <rich:menuSeparator />
-        <rich:menuItem icon="/pics/info.gif" value="a" reRender="cmInfoID">
+        <rich:menuItem icon="/pics/info.png" value="a" reRender="cmInfoID">
             <f:param name="cmdParam" value="a" />
         </rich:menuItem>
-        <rich:menuItem icon="/pics/info.gif" value=" b" reRender="cmInfoID">
+        <rich:menuItem icon="/pics/info.png" value=" b" reRender="cmInfoID">
             <f:param name="cmdParam" value="b" />
         </rich:menuItem>
-        <rich:menuItem icon="/pics/info.gif" value="c" reRender="cmInfoID">
+        <rich:menuItem icon="/pics/info.png" value="c" reRender="cmInfoID">
             <f:param name="cmdParam" value="c" />
         </rich:menuItem>
     </rich:contextMenu>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/contextMenu.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/contextMenu.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/contextMenu.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -12,11 +12,14 @@
         </emphasis> component is used for creation multileveled
             context menus that are activated after a user defines an event (onmouseover, onclick,
             etc.) on any element on the page.</para>
+            <figure>
+                <title>&lt;rich:contextMenu&gt; component</title>
         <mediaobject>
             <imageobject>
                 <imagedata fileref="images/contextMenu1.png"/>
             </imageobject>
         </mediaobject>
+        </figure>
     </section>
     <section>
         <title>Key Features</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/contextMenu.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/contextMenu.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/contextMenu.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -95,7 +95,7 @@
         <programlisting role="XML"><![CDATA[...
         <h:panelGrid columns="1" columnClasses="cent">
                 <h:panelGroup id="picture">
-                        <h:graphicImage value="/richfaces/jQuery/images/pic1.jpg" id="pic"/>
+                        <h:graphicImage value="/richfaces/jQuery/images/pic1.png" id="pic"/>
                         <rich:contextMenu event="oncontextmenu" attached="true" submitMode="none">
                                 <rich:menuItem value="Zoom In" onclick="enlarge();" id="zin"></rich:menuItem>
                                 <rich:menuItem value="Zoom Out" onclick="decrease();" id="zout"></rich:menuItem>
@@ -164,19 +164,19 @@
                 <rich:contextMenu attached="false" id="menu" submitMode="ajax">
                         <rich:menuItem ajaxSingle="true">
                                 <b>{car} {model}</b> details
-                                <a4j:actionparam name="det" assignTo="#{ddmenu.current}" value="{car} {model} details"/>
+                                <a4j:actionParam name="det" assignTo="#{ddmenu.current}" value="{car} {model} details"/>
                         </rich:menuItem>
                         <rich:menuGroup value="Actions">  
                                 <rich:menuItem ajaxSingle="true">
                                         Put <b>{car} {model}</b> To Basket
-                                        <a4j:actionparam name="bask" assignTo="#{ddmenu.current}" value="Put {car} {model} To Basket"/>
+                                        <a4j:actionParam name="bask" assignTo="#{ddmenu.current}" value="Put {car} {model} To Basket"/>
                                 </rich:menuItem>
                                 <rich:menuItem value="Read Comments" ajaxSingle="true">
-                                        <a4j:actionparam name="bask" assignTo="#{ddmenu.current}" value="Read Comments"/>
+                                        <a4j:actionParam name="bask" assignTo="#{ddmenu.current}" value="Read Comments"/>
                                 </rich:menuItem>                
                                 <rich:menuItem ajaxSingle="true">
                                         Go to <b>{car}</b> site
-                                        <a4j:actionparam name="bask" assignTo="#{ddmenu.current}" value="Go to {car} site"/>
+                                        <a4j:actionParam name="bask" assignTo="#{ddmenu.current}" value="Go to {car} site"/>
                                 </rich:menuItem>
                         </rich:menuGroup>
                 </rich:contextMenu> 

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataDefinitionList.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataDefinitionList.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataDefinitionList.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,7 +10,7 @@
     <para>The component for definition lists rendering that allows choosing data from a model
      and obtains built-in support of Ajax updates.</para>
     <figure>
-        <title>DataDefinitionList component</title>
+        <title>&lt;rich:dataDefinitionList&gt; component</title>
       <mediaobject> 
         <imageobject>
             <imagedata fileref="images/datadefinitionlist1.png"/>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataFilterSlider.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataFilterSlider.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataFilterSlider.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,10 +9,10 @@
 <title>Description</title>
     <para>A slider-based action component is used for filtering table data.</para>
     <figure>
-    <title>DataFilterSlider component</title>
+        <title>&lt;rich:dataFilterSlider&gt; component</title>
      <mediaobject> 
      <imageobject>
-         <imagedata fileref="images/dataFilterSlider.gif"/>
+         <imagedata fileref="images/dataFilterSlider.png"/>
      </imageobject>
      </mediaobject>
      </figure>
@@ -24,7 +24,7 @@
         <listitem>Fully skinnable control and input elements</listitem>
         <listitem>Optional value text field with an attribute-managed position</listitem>
         <listitem>Optional disablement of the component on a page</listitem>
-        <listitem>Optional ToolTip to display the current value while a handle is dragged</listitem>
+        <listitem>Optional toolTip to display the current value while a handle is dragged</listitem>
         <listitem>Dragged state is stable after the mouse moves</listitem>
         <listitem>Optional manual input possible if a text input field is present</listitem>
         <listitem>Validation of manual input</listitem>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataGrid.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataGrid.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataGrid.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,7 +10,7 @@
     <para>The component to render data as a grid that allows choosing data from a model
       and obtains built-in support of Ajax updates.</para>
     <figure>
-        <title>DataGrid component</title>
+        <title>&lt;rich:dataGrid&gt; component</title>
       <mediaobject> 
         <imageobject>
             <imagedata fileref="images/datagrid1.png"/>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataList.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataList.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataList.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,7 +10,7 @@
     <para>The component for unordered lists rendering that allows choosing data from a model
     and obtains built-in support of Ajax updates.</para>
     <figure>
-        <title>dataList component</title>
+        <title>&lt;rich:dataList&gt; component</title>
       <mediaobject> 
         <imageobject>
             <imagedata fileref="images/datalist1.png"/>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataOrderedList.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataOrderedList.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataOrderedList.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,7 +10,7 @@
     <para>The component for ordered lists rendering that allows choosing data from a model
     and obtains built-in support of Ajax updates.</para>
     <figure>
-        <title>DataOrderedList component</title>
+        <title>&lt;rich:dataOderedList&gt; component</title>
       <mediaobject> 
         <imageobject>
             <imagedata fileref="images/dataorderedlist1.png"/>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,10 +10,10 @@
         <para>The component for tables rendering that allows choosing data from a model and obtains
             built-in support of Ajax updates.</para>
         <figure>
-            <title>DataTable component</title>
+            <title>&lt;rich:dataTable&gt; component</title>
             <mediaobject>
                 <imageobject>
-                    <imagedata fileref="images/datatable1.gif"/>
+                    <imagedata fileref="images/datatable1.png"/>
                 </imageobject>
             </mediaobject>
         </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dataTable.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -314,7 +314,7 @@
     <para>On the screenshot there are classes names that define styles for component elements.</para>
 
     <figure>
-      <title>DataTable class names</title>
+      <title>&lt;rich:dataTable&gt; class names</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/dataTable2.png" scalefit="1"/>
@@ -465,7 +465,7 @@
     <para>How to use <emphasis role="bold">
         <property>&lt;rich:dataTable&gt;</property>
       </emphasis> and <emphasis role="bold">
-        <property>&lt;rich:dataScroller&gt;</property>
+        <property>&lt;rich:datascroller&gt;</property>
       </emphasis> in a context of Extended Data Model see <ulink
         url="http://www.jboss.com/index.html?module=bb&amp;op=viewtopic&amp;t=115636"
       >here</ulink>.</para>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,10 +10,10 @@
     <para>The component designed for providing the functionality of tables scrolling using Ajax 
     requests.</para>
     <figure>
-        <title>Datascroller component</title>
+        <title>&lt;rich:datascroller&gt; component</title>
       <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/datascroller1.gif"/>
+            <imagedata fileref="images/datascroller1.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/datascroller.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -74,7 +74,7 @@
   <section>
     <title>Details of Usage</title>
     <para>The <emphasis role="bold">
-      <property>&lt;rich:Datascroller&gt;</property>
+      <property>&lt;rich:datascroller&gt;</property>
     </emphasis> component provides table scrolling functionalitity the same as TOMAHAWK scroller but
       with Ajax requests usage.</para>
     <para>The component should be placed into footer of the parent table or be bound to it with the <emphasis>
@@ -127,10 +127,10 @@
 ...
 ]]></programlisting>
     <figure>
-      <title>Datascroller controls</title>
+      <title>&lt;rich:datascroller&gt; controls</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/datascroller2.gif"/>
+          <imagedata fileref="images/datascroller2.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -164,7 +164,7 @@
     </emphasis> and <emphasis>
       <property>&quot;pagesVar&quot;</property>
     </emphasis> attributes provide an ability to show the current page and the number of pages in
-      the dataScroller. These attributes are used for definition the names of variables, that will
+      the datascroller. These attributes are used for definition the names of variables, that will
       be used in the facet with name<emphasis>
         <property>&quot;pages&quot;.</property>
       </emphasis> An example can be found below: </para>
@@ -193,7 +193,7 @@
     </emphasis> facet. An example is placed below. </para>
     <programlisting role="XML"><![CDATA[ ...
       <f:facet name="controlSeparator">
-            <h:graphicImage value="/image/sep.gif"/>
+            <h:graphicImage value="/image/sep.png"/>
       </f:facet>
 ...
 ]]></programlisting>
@@ -423,6 +423,27 @@
         role="bold">
         <property>&lt;rich:datascroller&gt;</property>
       </emphasis>attributes.</para>
+      
+      <para>CSS code piece used on a page:</para>
+      
+      <para>
+        <emphasis role="bold">Example:</emphasis>
+      </para>
+      <programlisting role="CSS"><![CDATA[...
+.rich-datascr-button{
+    color: #A52A2A;
+}
+.myClass{
+    font-size: xx-large;
+}
+...]]></programlisting>
+      <para>The component is defined in the following way:</para>
+      
+      <para>
+        <emphasis role="bold">Example:</emphasis>
+      </para>
+      <programlisting role="XML"><![CDATA[<rich:datascroller ... inputClass="myClass" .../>]]></programlisting>
+      
   </section>
   <section>
     <title>Relevant Resources Links</title>
@@ -430,13 +451,13 @@
       <ulink
         url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTableScroller.jsf?c=dataTableScroller"
         >Here</ulink> you can see the example of <emphasis role="bold"
-        ><property>&lt;rich:dataScroller&gt;</property></emphasis> usage and sources for the given example. </para>
+        ><property>&lt;rich:datascroller&gt;</property></emphasis> usage and sources for the given example. </para>
     <para> The solution about how to do correct pagination using datascroller (load a part of data from
       database) can be found on the <ulink
         url="http://www.jboss.com/index.html?module=bb&amp;op=viewtopic&amp;p=4060199#4060199"
         >RichFaces Users Forum</ulink>. </para>
     <para>How to use <emphasis role="bold"><property>&lt;rich:dataTable&gt;</property></emphasis> and <emphasis
-      role="bold"><property>&lt;rich:dataScroller&gt;</property></emphasis> in a context of Extended
+      role="bold"><property>&lt;rich:datascroller&gt;</property></emphasis> in a context of Extended
       Data Model see <ulink
         url="http://www.jboss.com/index.html?module=bb&amp;op=viewtopic&amp;t=115636"
         >here</ulink>.</para>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -12,11 +12,11 @@
       operations. The displayed drag indicator can show information about the dragged elements.</para>
 
     <figure>
-      <title>DragIndicator component</title>
+      <title>&lt;rich:dragIndicator&gt; component</title>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/dragIndicator1.gif"/>
+          <imagedata fileref="images/dragIndicator1.png"/>
         </imageobject>
       </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -81,7 +81,7 @@
     <para> In the simplest way the component could be defined empty - in that case a default
       indicator will be shown like this: </para>
     <figure>
-      <title>Simplest dragIndicator </title>
+      <title>Simplest &lt;rich:dragIndicator&gt; </title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/dragIndicator3.png"/>
@@ -187,7 +187,7 @@
         <title>DragIndicator informational part</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/dragIndicator2.gif"/>
+            <imagedata fileref="images/dragIndicator2.png"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -218,7 +218,7 @@
     </para>
       <programlisting role="XML"><![CDATA[...
     <f:dndParam name="accept">
-        <h:graphicImage value="./images/1.gif"/>
+        <h:graphicImage value="./images/1.png"/>
     </f:dndParam>
 ...
 ]]></programlisting>
@@ -269,5 +269,5 @@
         <property>&lt;rich:dragIndicator&gt;</property>
       </emphasis> usage and sources for the given example. </para>
   </section>
-
+ 
 </section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator1.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator1.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragIndicator1.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -87,7 +87,7 @@
 	<title>DragIndicator informational part</title>
  <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/dragIndicator2.gif"/>
+          <imagedata fileref="images/dragIndicator2.png"/>
         </imageobject>
     </mediaobject>
     </figure>
@@ -118,7 +118,7 @@
 	  <para>Here is an example for an accept facet:</para>
 	  <programlisting role="XML"><![CDATA[
 	  <f:facet name="accept">
-			<h:graphicImage value="./images/1.gif"/>
+			<h:graphicImage value="./images/1.png"/>
 	  </f:facet>
 ]]></programlisting>
 <para>Each of these three facets have a default structure for icons rendering on the left side.</para>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,7 +9,7 @@
 	<section>
         <title>Description</title>
         <para>The <emphasis role="bold"><property>&lt;rich:dragListener&gt;</property></emphasis>
-		represents an action listener method that will be notified after drag operation.
+		represents an action listener method that will be notified after a drag operation.
 		</para>	
     </section>	
 	  

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragListener.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -68,11 +68,11 @@
     <title>Details of Usage</title>
 
 <para>
-The <property>&lt;rich:dragListener&gt;</property> is used as nested tag with components like
+The <property>&lt;rich:dragListener&gt;</property> is used as a nested tag with components like
 <property>&lt;rich:dragSupport&gt;</property>, <property>&lt;rich:tree&gt;</property> and <property>&lt;rich:treeNode&gt;</property>.
 </para>
 <para>
-Attribute <emphasis><property>&quot;type&quot;</property></emphasis> defines the fully qualified Java class name for listener.
+Attribute <emphasis><property>&quot;type&quot;</property></emphasis> defines the fully qualified Java class name for a listener.
 This class should implement org.richfaces.event.DragListener interface.
 </para>
 	

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -14,11 +14,11 @@
   supporting drag-and-drop operations.</para>
 
   <figure>
-    <title>DragSupport component</title>
+    <title>&lt;rich:dragSupport&gt; component</title>
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/dragsupport1.gif" />
+        <imagedata fileref="images/dragsupport1.png" />
       </imageobject>
     </mediaobject>
   </figure>
@@ -27,11 +27,20 @@
     <title>Key Features</title>
 
     <itemizedlist>
-      <listitem>Encodes all necessary JavaScript to perform drag
-      actions</listitem>
+      <listitem>
+        Encodes all necessary JavaScript to perform drag
+      actions
+      </listitem>
 
-      <listitem>Can be used within any component type that provides the
-      required properties for drag operations</listitem>
+      <listitem>
+        Can be used within any component type that provides the
+      required properties for drag operations
+      </listitem>
+      
+      <listitem>
+        Supports drag-and-drop between different forms
+      </listitem>
+      
     </itemizedlist>
   </section>
 </section>
\ No newline at end of file

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dragSupport.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -104,7 +104,7 @@
     <programlisting role="XML"><![CDATA[...
     <h:column>
         <rich:dragSupport dragIndicator=":form:iii" dragType="text">
-            <a4j:actionparam value="#{caps.name}" name="name"/>
+            <a4j:actionParam value="#{caps.name}" name="name"/>
         </rich:dragSupport>
         <h:outputText value="#{caps.name}"/> 
     </h:column>
@@ -122,7 +122,7 @@
     <h:column>
         <a4j:outputPanel>
             <rich:dragSupport dragIndicator=":form:iii" dragType="text">
-                <a4j:actionparam value="#{caps.name}" name="name"/>
+                <a4j:actionParam value="#{caps.name}" name="name"/>
             </rich:dragSupport>
             <h:outputText value="#{caps.name}"/> 
         </a4j:outputPanel>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/draggable.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/draggable.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/draggable.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,10 +10,10 @@
     button on the content and drag it to any drop zone. It encodes all necessary JavaScript
      code for supporting drag operations.</para>
      <figure>
-     <title>Draggable component</title>
+         <title>&lt;rich:draggable&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/draggable1.gif"/>
+            <imagedata fileref="images/draggable1.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -105,7 +105,7 @@
     </para>
     <programlisting role="XML"><![CDATA[...
     <f:facet name="label">
-        <h:graphicImage value="/images/img1.gif"/>
+        <h:graphicImage value="/images/img1.png"/>
     </f:facet>
 ...
   ]]></programlisting>
@@ -241,8 +241,16 @@
       <emphasis role="bold">Example:</emphasis>
     </para>
     <programlisting role="XML"><![CDATA[...
-    <rich:dropDownMenu value="Item1" direction="bottom-right" jointPoint="tr">
-        <!--Nested menu components-->
+    <rich:dropDownMenu value="File" direction="bottom-right" jointPoint="tr">
+        <rich:menuItem submitMode="ajax" value="New" action="#{ddmenu.doNew}"/>
+        <rich:menuItem   submitMode="ajax"  value="Open" action="#{ddmenu.doOpen}"/>
+        <rich:menuGroup value="Save As...">
+            <rich:menuItem   submitMode="ajax" value="Text File"  action="#{ddmenu.doSaveText}"/>
+            <rich:menuItem   submitMode="ajax" value="PDF File"  action="#{ddmenu.doSavePDF}"/>
+        </rich:menuGroup>
+        <rich:menuItem  submitMode="ajax" value="Close" action="#{ddmenu.doClose}"/>
+        <rich:menuSeparator id="menuSeparator11"/>
+        <rich:menuItem  submitMode="ajax" value="Exit"  action="#{ddmenu.doExit}"/>
     </rich:dropDownMenu>
 ...
 ]]></programlisting>
@@ -274,8 +282,16 @@
     </para>
 
     <programlisting role="XML"><![CDATA[...
-    <rich:dropDownMenu value="Item1" direction="bottom-right" jointPoint="tr" horizontalOffset="-15" verticalOffset="0">
-        <!--Nested menu components-->
+    <rich:dropDownMenu value="File" direction="bottom-right" jointPoint="tr" horizontalOffset="-15" verticalOffset="0">
+        <rich:menuItem submitMode="ajax" value="New" action="#{ddmenu.doNew}"/>
+        <rich:menuItem   submitMode="ajax"  value="Open" action="#{ddmenu.doOpen}"/>
+        <rich:menuGroup value="Save As...">
+            <rich:menuItem   submitMode="ajax" value="Text File"  action="#{ddmenu.doSaveText}"/>
+            <rich:menuItem   submitMode="ajax" value="PDF File"  action="#{ddmenu.doSavePDF}"/>
+        </rich:menuGroup>
+        <rich:menuItem  submitMode="ajax" value="Close" action="#{ddmenu.doClose}"/>
+        <rich:menuSeparator id="menuSeparator11"/>
+        <rich:menuItem  submitMode="ajax" value="Exit"  action="#{ddmenu.doExit}"/>
     </rich:dropDownMenu>
 ...
   ]]></programlisting>
@@ -339,7 +355,7 @@
     <programlisting role="XML"><![CDATA[...
     <rich:dropDownMenu  disabled="true">
         <f:facet name="labelDisabled">
-            <h:graphicImage value="/images/ico1.gif"/>
+            <h:graphicImage value="/images/ico1.png"/>
         </f:facet>
         <!--Nested menu components-->
     </rich:dropDownMenu>
@@ -627,6 +643,28 @@
         role="bold">
         <property>&lt;rich:dropDownMenu&gt;</property>
       </emphasis>attributes.</para>
+    
+    <para>CSS code piece used on a page:</para>
+    
+    <para>
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+    <programlisting role="CSS"><![CDATA[...
+.rich-ddmenu-label-select{
+    font-size: 15px;
+    color: #FFF0F5;
+}
+.myClass{
+    background-color: #2F4F4F;
+}
+...]]></programlisting>
+    <para>The component is defined in the following way:</para>
+    
+    <para>
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+    <programlisting role="XML"><![CDATA[<rich:dropDownMenu ... inputClass="myClass" .../>]]></programlisting>
+    
   </section>
 
   <section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,7 +9,7 @@
 	<section>
         <title>Description</title>
         <para>The <emphasis role="bold"><property>&lt;rich:dropListener&gt;</property></emphasis>
-		represents an action listener method that will be notified after drop operation.
+		represents an action listener method that will be notified after a drop operation.
 		</para>	
     </section>	
 	  

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropListener.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -68,11 +68,11 @@
     <title>Details of Usage</title>
 
 <para>
-The <property>&lt;rich:dropListener&gt;</property> is used as nested tag with components like
+The <property>&lt;rich:dropListener&gt;</property> is used as a nested tag with components like
 <property>&lt;rich:dropSupport&gt;</property>, <property>&lt;rich:tree&gt;</property> and <property>&lt;rich:treeNode&gt;</property>.
 </para>
 <para>
-Attribute <emphasis><property>&quot;type&quot;</property></emphasis> defines the fully qualified Java class name for listener.
+Attribute <emphasis><property>&quot;type&quot;</property></emphasis> defines the fully qualified Java class name for the listener.
 This class should implement org.richfaces.event.DropListener interface.
 </para>
 	

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -13,11 +13,11 @@
   started.</para>
 
   <figure>
-    <title>DropSupport component</title>
+    <title>&lt;rich:dropSupport&gt; component</title>
 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/dropSupport1.gif" />
+        <imagedata fileref="images/dropSupport1.png" />
       </imageobject>
     </mediaobject>
   </figure>
@@ -26,17 +26,20 @@
     <title>Key Features</title>
     <itemizedlist>
       <listitem>
-        <para>Encodes all necessary JavaScript to perform drop actions</para>
+        Encodes all necessary JavaScript to perform drop actions
       </listitem>
       
       <listitem>
-        <para>Can be used within any component type that provides the required properties for drop operations</para>
+       Can be used within any component type that provides the required properties for drop operations
       </listitem>
       
       <listitem>
-        <para>Built-in Ajax processing</para>
+        Built-in Ajax processing
       </listitem>
-    
+      
+      <listitem>
+        Supports drag-and-drop between different forms
+      </listitem>
     </itemizedlist>
   </section>
 </section>
\ No newline at end of file

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropSupport.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -142,7 +142,7 @@
         <h:column>
         <a4j:outputPanel>
             <rich:dragSupport dragIndicator=":form:ind" dragType="text">
-                <a4j:actionparam value="#{caps.name}" name="name"/>
+                <a4j:actionParam value="#{caps.name}" name="name"/>
             </rich:dragSupport>
             <h:outputText value="#{caps.name}"/> 
         </a4j:outputPanel>
@@ -206,7 +206,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/dropSupport2.gif"/>
+          <imagedata fileref="images/dropSupport2.png"/>
         </imageobject>
       </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropZone.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropZone.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/dropZone.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,10 +10,10 @@
     dropped onto the area of this component, <property>dropZone</property> performs an Ajax request
      processing this event.</para>
      <figure>
-     <title>DropZone with dragged element</title>
+         <title>&lt;rich:dropZone&gt; with dragged element</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/dropZone.gif"/>
+            <imagedata fileref="images/dropZone.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/form.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/form.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/form.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -53,35 +53,46 @@
   <section>
     <title>Key attributes and ways of usage</title>
     <para>The difference with the original component is that all hidden fields required for command links are always rendered and it doesn't depend on links rendering on the initial page. It solves the problem with invalid links that weren't rendered on a page immediately, but after some Ajax request.</para>
-    <para>Beginning with release 1.0.5 additional attributes that make this form variant universal have appeared. With a new attribute definition as ajax=<emphasis >
-        <property>&quot;true&quot;</property>
-      </emphasis>, it becomes possible to set Ajax submission way for any components inside, i.e. not a page URL is used as an <emphasis >
-        <property>&quot;action&quot;</property>
-      </emphasis> attribute, but the javascript:A4J.AJAX.Submit(...) call. In this case, rendering is defined as &quot;reRender&quot;=list of Ids for the form element itself.</para>
-	<para>Example</para>
+    <para>Beginning with release 1.0.5 additional attributes that make this form variant universal have appeared. 
+    </para>
+    <para>
+      If <emphasis><property>&quot;ajaxSubmit&quot;</property></emphasis> attribute is true, 
+      it becomes possible to set Ajax submission way for any components inside, 
+      i.e. not a page URL is used as an <emphasis><property>&quot;action&quot;</property></emphasis> attribute, but the javascript:A4J.AJAX.Submit(...) call. 
+      In this case, the <emphasis><property>&quot;reRender&quot;</property></emphasis> attribute contains a list of Ids of components defined for re-rendering.
+      If you have <emphasis role="bold"><property>&lt;h:commandButton&gt;</property></emphasis> or 
+      <emphasis role="bold"><property>&lt;h:commandLink&gt;</property></emphasis> inside the form, they work as <emphasis role="bold"><property>&lt;a4j:commandButton&gt;</property></emphasis>. 
+    </para>
+    <para><emphasis role="bold">Example:</emphasis></para>
 	<programlisting role="XML"><![CDATA[<a4j:form id="helloForm" ajaxSubmit="true" reRender="table">
 	...
 	<t:dataTable id="table"... >
 		...
 	</t:dataTable>
 	...
-	<t:dataScroller for="table"... >
+	<t:datascroller for="table"... >
 		...
-	</t:dataScroller>
+	</t:datascroller>
 	...
 </a4j:form
 ]]></programlisting>
 <para>This example shows that in order to make  <emphasis role="bold">
-        <property>&lt;t:dataScroller&gt;</property>
+        <property>&lt;t:datascroller&gt;</property>
       </emphasis> submissions to be Ajax ones it's required only to place this <emphasis role="bold">
-        <property>&lt;t:dataScroller&gt;</property>
+        <property>&lt;t:datascroller&gt;</property>
       </emphasis> into <emphasis role="bold">
         <property>&lt;a4j:form&gt;</property>
       </emphasis>. In the other case it is necessary to redefine renders for its child links elements that are defined as <emphasis role="bold">
         <property>&lt;h:commandLink&gt;</property>
       </emphasis> and can't be made Ajax ones with using e.g. <emphasis role="bold">
         <property>&lt;a4j:support&gt;</property>
-      </emphasis>.</para>
+      </emphasis>.
+</para>
+    <para>
+      With the help of <emphasis><property>&quot;limitToList&quot;</property></emphasis> attribute you can limit areas, which are updated after the responses. 
+      If <emphasis><property>&quot;limitToList&quot;</property></emphasis> is true, only the reRender attribute is taken in account. 
+      Therefore, if you use blocks of text wrapped with <emphasis role="bold"><property>&lt;a4j:outputPanel&gt;</property></emphasis> and <emphasis><property>&quot;ajaxRendered&quot;</property></emphasis>= <property>true</property>, blocks of text are ignored.
+    </para>
   </section>
   <section>
     <title>Relevant resources links</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,10 +9,10 @@
 <title>Description</title>
     <para>Component that presents the Google <property>map</property> in the JSF applications.</para>
     <figure>
-    <title>Gmap component</title>
+        <title>&lt;rich:gmap&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/gmap.gif"/>
+            <imagedata fileref="images/gmap.png"/>
         </imageobject>
     </mediaobject>
 	</figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/gmap.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -105,10 +105,10 @@
         <property>&quot;zoom&quot;</property>
       </emphasis>= 5.</para>
     <figure>
-      <title>Gmap initial rendering</title>
+      <title>&lt;rich:gmap&gt; initial rendering</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/gmap1.gif"/>
+          <imagedata fileref="images/gmap1.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -130,10 +130,10 @@
         rendered </listitem>
     </itemizedlist>
     <figure>
-      <title>Gmap accessible controls</title>
+      <title>&lt;rich:gmap&gt; accessible controls</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/gmap3.gif"/>
+          <imagedata fileref="images/gmap3.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -153,7 +153,18 @@
       <listitem> onmouseout </listitem>
       <listitem> etc. </listitem>
     </itemizedlist>
-
+    
+    <note>
+      <para>
+        Google Map does not support XHTML format of the page. 
+        Thus, if you use Facelets and JSF 1.2, do not forget to put the following tags somewhere on the page:
+      </para>
+        <programlisting role="XML"><![CDATA[...
+<f:view contentType="text/html">...</f:view>
+...
+]]></programlisting>
+    </note>
+    
   </section>
   <section>
     <title>Look-and-Feel Customization</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,13 +9,13 @@
 <title>Description</title>
     <para>A component that lets selecting a number from a numeric region. It&apos;s a horizontal 
     aligned scroll-like control with its own input field (optional) present. The keyboard input in a
-     field is possible (optional). Also it&apos;s possible to see the current value in the tooltip
+     field is possible (optional). Also it&apos;s possible to see the current value in the toolTip
       above a dragged handle control.</para>
       <figure>
-      <title>InputNumberSlider component</title>
+          <title>&lt;rich:inputNumberSlider&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/slider.gif"/>
+            <imagedata fileref="images/slider.png"/>
         </imageobject>
     </mediaobject>
     </figure>
@@ -26,7 +26,7 @@
         <listitem>Fully skinnable control and input elements</listitem>
         <listitem>Optional value text field with an attribute-managed position</listitem>
         <listitem>Optional disablement of the component on a page</listitem>
-        <listitem>Optional ToolTip to display the current value while a handle is dragged</listitem>
+        <listitem>Optional toolTip to display the current value while a handle is dragged</listitem>
         <listitem>Dragged state is stable after the mouse moves</listitem>
         <listitem>Optional manual input possible if a text input field is present</listitem>
         <listitem>Validation of manual input</listitem>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -87,10 +87,10 @@
 
     <para>It generates on a page:</para>
     <figure>
-      <title>Generated inputNumberSlider</title>
+      <title>Generated &lt;rich:inputNumberSlider&gt;</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/slider2.gif"/>
+          <imagedata fileref="images/slider2.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -110,21 +110,21 @@
     <programlisting role="XML"><![CDATA[<rich:inputNumberSlider minValue="1"  maxValue="100" showInput="false"/>]]></programlisting>
     <para>It looks at page like:</para>
     <figure>
-      <title>InputNumberSlider without input field</title>
+      <title>&lt;rich:inputNumberSlider&gt; without input field</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/slider3.gif"/>
+          <imagedata fileref="images/slider3.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <para>It&apos;s also possible to switch off displaying of &quot;boundary
-      values&quot; and a tooltip showing on a handle drawing. This could be performed with the
+      values&quot; and a toolTip showing on a handle drawing. This could be performed with the
       help of the component defined attributes: <emphasis>
         <property>&quot;showBoundaryValues&quot;</property>
       </emphasis> which is responsible for &quot;boundary values&quot; displaying (default
       is true) and <emphasis>
         <property>&quot;showToolTip&quot;</property>
-      </emphasis> which is responsible for tooltip displaying (default is true).</para>
+      </emphasis> which is responsible for tooltTip displaying (default is true).</para>
 
     <para>Moreover, to add e.g. some JavaScript effects, events defined on it are used.</para>
     <itemizedlist>
@@ -168,7 +168,7 @@
   <section>   
     <title>Skin Parameters Redefinition</title>
     
-    <table>
+    <table id="tab_cn">
       <title>Skin parameters redefinition for a bar</title>
       <tgroup cols="2">
         <thead>
@@ -356,38 +356,66 @@
     <para>In order to redefine styles for all <emphasis role="bold">
       <property>&lt;rich:inputNumberSlider&gt;</property>
     </emphasis> components on a page using CSS, it&apos;s enough to create classes with the
-      same names and define necessary properties in them.</para>
+      same names (possible classes could be found in the table <link linkend="tab_cn">above</link>) and define necessary properties in them. An example is placed below:</para>
+  
+    <para>
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+    <programlisting role="CSS"><![CDATA[...
+.rich-inslider-tip{
+    background-color: #FFDAB9;
+    font-family: Arial Black;
+}	
+...]]></programlisting>  
     
-    <para>To change styles of particular <emphasis role="bold">
-      <property>&lt;rich:inputNumberSlider&gt;</property>
-    </emphasis> components, define your own style classes in the corresponding <emphasis
-      role="bold">
-      <property>&lt;rich:inputNumberSlider&gt;</property>
-    </emphasis>attributes.</para>
+    <para>This is a result:</para>
     
-    <para>CSS code piece used on a page:</para>
-
+    <figure>
+      <title>Redefinition styles with predefined classes</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/inputNumberSlider_CS2.png"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+  
+    <para>In the example a tip background color and font family was changed.</para>
+   
+    <para>Also it’s possible to change styles of particular <emphasis role="bold"
+      ><property>&lt;rich:inputNumberSlider&gt;</property></emphasis> component. In this case you should create own style classes and use them in corresponding <emphasis role="bold"
+        ><property>&lt;rich:inputNumberSlider&gt;</property></emphasis> <emphasis><property>styleClass</property></emphasis> attributes. An example is placed below:</para>
+   
     <para>
       <emphasis role="bold">Example:</emphasis>
     </para>
     <programlisting role="CSS"><![CDATA[...
-    .rich-slider-handle{
-        border:2px solid;
-    }
-    .myClass{
-        font-style:italic;
-    }
-...
-]]></programlisting>
-    <para>The component is defined in the following way:</para>
-
+.myClass{
+    font-style: italic;
+}
+...]]></programlisting>  
+    <para>The <emphasis><property>&quot;inputClass&quot;</property></emphasis> attribute for <emphasis role="bold"
+      ><property>&lt;rich:inputNumberSlider&gt; </property></emphasis> is defined as it’s shown in the example below:</para>
+    
     <para>
       <emphasis role="bold">Example:</emphasis>
     </para>
-    <programlisting role="XML"><![CDATA[<rich:inputNumberSlider ... inputClass="myClass" .../>
-]]></programlisting>
-    <para>Hence, header border width of all <property>sliders</property> is redefined on a page as
-      well as a style font for an input field of a particular <property>slider</property>.</para>
+    <programlisting role="CSS"><![CDATA[<rich: inputNumberSlider ... inputClass="myClass"/>
+]]></programlisting>    
+    
+    <para>This is a result:</para>
+    
+    <figure>
+      <title>Redefinition styles with own classes and styleClass attributes</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/inputNumberSlider_CS1.png"/>
+        </imageobject>
+      </mediaobject>
+    </figure>  
+    
+    <para>As it could be seen on the picture above, the font style for input text was changed.</para>   
+   
+   
   </section>
   <section>
     <title>Relevant Resources Links</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -14,10 +14,10 @@
      attribute. When arrow
       controls are pressed, the cursor can be moved in any way without losing a dragged state.</para>
       <figure>
-      <title>InputNumberSpinner component</title>
+          <title>&lt;rich:InputNumberSpinner&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/inputNumberSpinnerMain.gif"/>
+            <imagedata fileref="images/inputNumberSpinnerMain.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -88,10 +88,10 @@
 ]]></programlisting>
     <para>It generates on a page:</para>
     <figure>
-      <title>Generated inputNumberSpinner</title>
+      <title>Generated &lt;rich:inputNumberSpinner&gt;</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/inputNumberSpinner2.gif"/>
+          <imagedata fileref="images/inputNumberSpinner2.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -154,7 +154,7 @@
     
     <section>
       <title>Skin Parameters Redefinition</title>
-    <table>
+      <table id="tab_cn1">
       <title>Skin parameters redefinition for a container</title>
       <tgroup cols="2">
         <thead>
@@ -248,41 +248,68 @@
         </tbody>
       </tgroup>
     </table>
+   
     <para>In order to redefine styles for all <emphasis role="bold">
       <property>&lt;rich:inputNumberSpinner&gt;</property>
     </emphasis> components on a page using CSS, it&apos;s enough to create classes with the
-      same names and define necessary properties in them.</para>
+      same names (possible classes could be found in the table <link linkend="tab_cn1">above</link>) and define necessary properties in them. An example is placed below:</para>
     
-    <para>To change styles of particular <emphasis role="bold">
-      <property>&lt;rich:inputNumberSpinner&gt;</property>
-    </emphasis> components, define your own style classes in the corresponding <emphasis
-      role="bold">
-      <property>&lt;rich:inputNumberSpinner&gt;</property>
-    </emphasis>attributes.</para>
+    <para>
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+    <programlisting role="CSS"><![CDATA[...
+.rich-spinner-input{
+    font-style:italic;
+}
+...]]></programlisting>  
     
-    <para>CSS code piece used on a page:</para>
-
+    <para>This is a result:</para>
+    
+    <figure>
+      <title>Redefinition styles with predefined classes</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/inputNumberSpinner_CS1.png"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+    
+    <para>In the example an input text font style was changed.</para>
+    
+    <para>Also it’s possible to change styles of particular <emphasis role="bold"
+      ><property>&lt;rich:inputNumberSpinner&gt;</property></emphasis> component. In this case you should create own style classes and use them in corresponding <emphasis role="bold"
+        ><property>&lt;rich:inputNumberSpinner&gt;</property></emphasis> <emphasis><property>styleClass</property></emphasis> attributes. An example is placed below:</para>
+    
     <para>
       <emphasis role="bold">Example:</emphasis>
     </para>
-    <programlisting role="XML"><![CDATA[...
-    . rich-spinner-input {
-            font-style:italic;
-        }
-    .myClass {
-            font-weight: bold;
-        }
-...
-]]></programlisting>
-    <para>The component is defined in the following way:</para>
-
+    <programlisting role="CSS"><![CDATA[...
+.myClass{
+    font-family: Arial Black;
+}
+...]]></programlisting>  
+    <para>The <emphasis><property>&quot;inputClass&quot;</property></emphasis> attribute for <emphasis role="bold"
+      ><property>&lt;rich:inputNumberSpinner&gt; </property></emphasis> is defined as it’s shown in the example below:</para>
+    
     <para>
       <emphasis role="bold">Example:</emphasis>
     </para>
-    <programlisting role="XML"><![CDATA[<rich:inputNumberSpinner inputClass="myClass" .../>
-]]></programlisting>
-    <para>Hence, a font-style of all <property>spinners</property> is redefined on a page as well as
-      a font-weight for an entry field of the particular <property>spinner</property>.</para>
+    <programlisting role="CSS"><![CDATA[<rich: inputNumberSpinner ... inputClass="myClass"/>
+]]></programlisting>    
+    
+    <para>This is a result:</para>
+    
+    <figure>
+      <title>Redefinition styles with own classes and styleClass attributes</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/inputNumberSpinner_CS2.png"/>
+        </imageobject>
+      </mediaobject>
+    </figure>  
+    
+    <para>As it could be seen on the picture above, the font family for input text was changed.</para>   
+   
   </section>
   <section>
     <title>Relevant Resources Links</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/jQuery.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/jQuery.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/jQuery.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -21,7 +21,7 @@
         <title>Key Features</title>
         <itemizedlist>
             <listitem>Presents jQuery JavaScript framework functionality</listitem>
-            <listitem>Allows to apply onto JSF components and other DOM objects.</listitem>
+            <listitem>Able to apply onto JSF components and other DOM objects.</listitem>
             <listitem>Works without conflicts with prototype.js library</listitem>
         </itemizedlist>
     </section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/jQuery.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/jQuery.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/jQuery.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -117,14 +117,15 @@
     <para>
       <emphasis role="bold">Example:</emphasis>
     </para>
+    <programlisting role="CSS"><![CDATA[...
+<style>
+    .odd {
+          background-color: #FFC;
+    }
+</style>
+...]]></programlisting>
+    
     <programlisting role="XML"><![CDATA[...
-    <style>
-        .odd {
-                background-color: #FFC;
-        }
-    </style>
-    ...
-
     <rich:table id="customList" ...>
         ...
     </rich:table>
@@ -239,7 +240,7 @@
 
     <para>In addition, RichFaces allows using either a component id or client id if you apply the
       query to a JSF component. When you define a selector, RichFaces examines its content and
-      tries to replace the defined in the selector id with component id if it's found.</para>
+      tries to replace the defined in the selector id with a component id if it's found.</para>
     <para>For example, you have the following code:</para>
 
     <programlisting role="XML"><![CDATA[...
@@ -278,13 +279,13 @@
       </emphasis> generates a JavaScript function that might be used from any place of JavaScript
       code on a page.</para>
 
-    <para>There is an example of how to enlarge the picture smoothly on mouse over event and return
+    <para>There is an example of how to enlarge the picture smoothly on a mouse over event and return
       back to the normal size on mouse out:</para>
 
     <programlisting role="XML"><![CDATA[...
-    <h:graphicImage onmouseover="enlargePic(this)" width="50" value="/images/price.gif"
+    <h:graphicImage onmouseover="enlargePic(this)" width="50" value="/images/price.png"
                 onmouseover="enlargePic(this, {pwidth:'60px'})" onmouseover="releasePic(this)"  />
-    <h:graphicImage onmouseover="enlargePic(this)" width="50" value="/images/discount.gif"
+    <h:graphicImage onmouseover="enlargePic(this)" width="50" value="/images/discount.png"
                 onmouseover="enlargePic(this, {pwidth:'100px'})" onmouseover="releasePic(this)"  />
     ...
     <rich:jQuery name="enlargePic" timing="onJScall" query="animate({width:param.pwidth})" />
@@ -301,15 +302,15 @@
     <para><emphasis role="bold">
         <property>&lt;rich:jQuery&gt;</property>
       </emphasis> adds styles and behavior to the DOM object dynamically. This means if you replace
-      something on a page during an Ajax response, the applied artifacts will be overwritten. You
-      are resistible to apply them again after the Ajax response is complete.</para>
+      something on a page during an Ajax response, the applied artifacts will be overwritten. But you
+      are allowed to apply them again after the Ajax response is complete.</para>
     <para>Usually, it could be done with reRendering the <emphasis role="bold">
         <property>&lt;rich:jQuery&gt;</property>
       </emphasis> components in the same Ajax interaction with the components these queries are
       applied to. Note, that queries with <emphasis>
         <property>&quot;timing&quot;</property>
       </emphasis> attribute set to <property>&quot;onload&quot;</property> are not
-      invoked even the query is reRendered, because a DOM document is not fully reloaded during
+      invoked even if the query is reRendered, because a DOM document is not fully reloaded during
       the Ajax interaction. If you need to re-applies query with
         <property>&quot;onload&quot;</property> value of <emphasis>
         <property>&quot;timing&quot;</property>
@@ -323,14 +324,14 @@
       without defining the <emphasis role="bold">
         <property>&lt;rich:jQuery&gt;</property>
       </emphasis> component on a page if it is convenient for you. To start using the jQuery feature
-      on the page, include the library to the page with the following code:</para>
+      on the page, include the library into a page with the following code:</para>
 
     <programlisting role="XML"><![CDATA[...
     <a4j:loadScript src="resource://jquery.js"/>
 ...]]></programlisting>
 
     <para>Refer to the <ulink url="http://docs.jquery.com/">jQuery documentation </ulink> for the
-      right sintax. Remember to use jQuery() function instead of $(), as soon as jQuery works
+      right syntax. Remember to use jQuery() function instead of $(), as soon as jQuery works
       without conflicts with prototype.js.</para>
   </section>
   

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/jsFunction.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/jsFunction.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/jsFunction.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -17,15 +17,15 @@
         </row>
         <row>
           <entry>component-family</entry>
-          <entry>org.ajax4jsf.components.AjaxFunction</entry>
+          <entry>org.ajax4jsf.components.ajaxFunction</entry>
         </row>
         <row>
           <entry>component-class</entry>
-          <entry>org.ajax4jsf.component.html.HtmlAjaxFunction</entry>
+          <entry>org.ajax4jsf.component.html.HtmlajaxFunction</entry>
         </row>
         <row>
           <entry>renderer-type</entry>
-          <entry>org.ajax4jsf.components.AjaxFunctionRenderer</entry>
+          <entry>org.ajax4jsf.components.ajaxFunctionRenderer</entry>
         </row>
       </tbody>
     </tgroup>
@@ -59,9 +59,9 @@
   <para>
       <emphasis role="bold">Example:</emphasis>
  </para>
-    <programlisting role="JAVA"><![CDATA[import org.ajax4jsf.component.html.HtmlAjaxFunction;
+    <programlisting role="JAVA"><![CDATA[import org.ajax4jsf.component.html.HtmlajaxFunction;
 ...
-HtmlAjaxFunction myFunction = new HtmlAjaxFunction();
+HtmlajaxFunction myFunction = new HtmlajaxFunction();
 ...
 ]]></programlisting>
   </section>
@@ -82,8 +82,8 @@
     ...
     <a4j:jsFunction name="callScript" data="#{bean.someProperty1 }
                     "reRender="someComponent" oncomplete="myScript(data.subProperty1, data.subProperty2)">
-        <a4j:actionparam name="param_name" assignTo="#{bean.someProperty2}">
-        </a4j:actionparam>
+        <a4j:actionParam name="param_name" assignTo="#{bean.someProperty2}">
+        </a4j:actionParam>
     </a4j:jsFunction>
     ...
     </h:form>
@@ -93,7 +93,7 @@
     <para> The <emphasis role="bold">
         <property>&lt;a4j:jsFunction&gt;</property>
       </emphasis> allows to use <emphasis role="bold">
-        <property>&lt;a4j:actionparam&gt;</property>
+        <property>&lt;a4j:actionParam&gt;</property>
       </emphasis> or pure <emphasis role="bold">
         <property>&lt;f:param&gt;</property>
       </emphasis> for passing any number of parameters of the JavaScript function into Ajax request.

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,12 +10,16 @@
         <para>The <emphasis role="bold">
             <property>&lt;rich:listShuttle&gt;</property>
         </emphasis> component is used for moving chosen items
-            from one list into another with their optional reordering there.</para>
+        from one list into another with their optional reordering there.</para>
+        <figure>
+            <title>&lt;rich:ListShuttle&gt; component</title>
         <mediaobject>
             <imageobject>
                 <imagedata fileref="images/listShuttle1.png"/>
             </imageobject>
         </mediaobject>
+        </figure>
+        
     </section>
     <section>
         <title>Key Features</title>    

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -49,26 +49,33 @@
         </para>
         <para> The <emphasis>
             <property>&quot;sourceValue&quot; </property>
-        </emphasis> attribute defines the collection to be shown in the source list.</para>
+        </emphasis> attribute defines a List or Array of items to be shown in the source list.</para>
         <para>The <emphasis>
             <property>&quot;targetValue&quot; </property>
-        </emphasis> attribute defines the collection to be shown in the target list.</para>
+        </emphasis> attribute defines a List or Array of items to be shown in the target list.</para>
         <para> The <emphasis>
             <property>&quot;var&quot; </property>
-        </emphasis> could be shared between both collections to defined lists on the page.</para>
+        </emphasis> attribute could be shared between both Lists or Arrays to define lists on the page.</para>
         <para>
             The <emphasis>
                 <property>&quot;converter&quot; </property>
             </emphasis> attribute is used to convert component data to a particular component&apos;s value.
             For example, when you select items in a list, a converter is used to format a set of objects to a strings to be displayed.  
         </para>
+        <note>
+            <para>
+                It is necessary to override the <emphasis>
+                    <property>&quot;equals&quot;</property></emphasis> and <emphasis>
+                        <property>&quot;hashCode&quot;</property></emphasis> methods in your own class!
+            </para>
+        </note>
         <para>
             The <emphasis>
                 <property>&quot;sourceSelection&quot; </property>
-            </emphasis> attribute stores the collection of items selected by user in the source list. 
+            </emphasis> attribute stores the collection of items selected by you in the source list. 
             The <emphasis>
                 <property>&quot;targetSelection&quot; </property>
-            </emphasis> attribute stores the collection of items selected by user in the target list. 
+            </emphasis> attribute stores the collection of items selected by you in the target list. 
         </para>
         <para>Captions could be added to a list only after it was defined as a <emphasis>
                 <property>&quot;sourceCaption&quot;</property>
@@ -141,7 +148,7 @@
         <f:facet name="bottomControl">
                 <h:outputText value="Move to bottom" />
         </f:facet>
-<rich:orderingList>
+</rich:listShuttle>
 ...
 ]]></programlisting>
        
@@ -181,7 +188,7 @@
                 </f:facet>
                 <h:outputText value="#{item.name}" />
         </h:column>
-<rich:orderingList>
+</rich:listShuttle>
 ...
 ]]></programlisting>        
         
@@ -803,12 +810,12 @@
             
             <mediaobject>
                 <imageobject>
-                    <imagedata fileref="images/listShuttle_classes_s.png" scalefit="1"/>
+                    <imagedata fileref="images/listShuttle_classes_s.png" scale="80" />
                 </imageobject>
             </mediaobject>
             <mediaobject>
                 <imageobject>
-                    <imagedata fileref="images/listShuttle_classes_t.png" scalefit="1"/>
+                    <imagedata fileref="images/listShuttle_classes_t.png" scale="80"/>
                 </imageobject>
             </mediaobject>
         </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/loadStyle.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/loadStyle.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/loadStyle.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -68,6 +68,13 @@
     	page while using <property>facelets templates</property>.
     </para>
 </section>
-
+  <section>
+    <title>Relevant resources links</title>
+    <para>
+      Some additional information about usage of component can be found 
+      <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/style.jsf?c=loadStyle">here.
+      </ulink>
+    </para>
+  </section>
   
 </chapter>   
\ No newline at end of file

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/log.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/log.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/log.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <chapter>
-  <section>
-     <para><table frame="all">
+  
+  <table frame="all">
          <title>Component identification parameters</title>
         <tgroup cols="2">
 	  <thead>
@@ -29,8 +29,8 @@
             </row>
           </tbody>
         </tgroup>
-      </table></para>
-  </section>
+      </table>
+
   <section>
     <title>Creating on a page</title>
     <para>To use the component, it&apos;s necessary to place the following string on a page:</para><programlisting role="XML"><![CDATA[<a4j:log/>]]></programlisting>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuGroup.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuGroup.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuGroup.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -142,9 +142,10 @@
             </emphasis>. </para>
         <para> Here is an example: </para>
         <programlisting role="XML"><![CDATA[...
-    <rich:menuGroup value="Active" direction="left-down"
-        <!--Nested menu components-->
-    </rich:menuGroup>
+        <rich:menuGroup value="Save As..." direction="left-down">
+                <rich:menuItem   submitMode="ajax" value="Text File"  action="#{ddmenu.doSaveText}"/>
+                <rich:menuItem   submitMode="ajax" value="PDF File"  action="#{ddmenu.doSavePDF}"/>
+        </rich:menuGroup>
 ...
 ]]></programlisting>
         <para> This would be the result: </para>
@@ -156,6 +157,9 @@
                 </imageobject>
             </mediaobject>
         </figure>
+        <note><title>Note:</title> The <emphasis role="bold">
+            <property>&lt;rich:menuGroup&gt;</property>
+        </emphasis> component was designed to be used only for pop-up menu list creation.</note>
     </section>
 
     <section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuItem.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuItem.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuItem.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -130,8 +130,8 @@
                 <property>"action"</property>
             </emphasis> and <emphasis>
                 <property>"actionListener"</property>
-            </emphasis> item&apos;s attributes are ignored. Menu items don&apos; fire any submits themselves.
-            The behavior is fully defined by the components nested into items.</para>
+            </emphasis> item&apos;s attributes are ignored. Menu items don&apos; fire any
+            submits themselves. The behavior is fully defined by the components nested into items.</para>
         <para> For example, you can put any content into an item, but, in this case, you should set
             the <emphasis>
                 <property>&quot;mode&quot;</property>
@@ -159,36 +159,39 @@
     <rich:dropDownMenu>
 ...
 ]]></programlisting>
+        <note><title>Note:</title> The <emphasis role="bold">
+                <property>&lt;rich:menuItem&gt;</property>
+            </emphasis> component was designed to be used only for pop-up menu list creation.</note>
     </section>
 
     <section>
         <title>Look-and-Feel Customization</title>
-        
+
         <para>For skinnability implementation, the components use a <emphasis>
-            <property>style class redefinition method.</property>
-        </emphasis> Default style classes are mapped on <emphasis>
-            <property>skin parameters.</property>
-        </emphasis></para>
-        
+                <property>style class redefinition method.</property>
+            </emphasis> Default style classes are mapped on <emphasis>
+                <property>skin parameters.</property>
+            </emphasis></para>
+
         <para>There are two ways to redefine the appearance of all <emphasis role="bold">
-            <property>&lt;rich:menuItem&gt;</property>
-        </emphasis> components at once:</para>
-        
+                <property>&lt;rich:menuItem&gt;</property>
+            </emphasis> components at once:</para>
+
         <itemizedlist>
             <listitem>
                 <para>Redefine the corresponding skin parameters</para>
             </listitem>
-            
+
             <listitem>
                 <para>Add to your style sheets <emphasis>
-                    <property>style classes</property>
-                </emphasis> used by a <emphasis role="bold">
-                    <property>&lt;rich:menuItem&gt;</property>
-                </emphasis> component</para>
+                        <property>style classes</property>
+                    </emphasis> used by a <emphasis role="bold">
+                        <property>&lt;rich:menuItem&gt;</property>
+                    </emphasis> component</para>
             </listitem>
         </itemizedlist>
     </section>
-    
+
     <section>
         <title>Skin Parameters Redefinition</title>
         <table>
@@ -295,7 +298,8 @@
                 <tbody>
                     <row>
                         <entry>rich-menu-item</entry>
-                        <entry>Defines styles for a wrapper &lt;div&gt; element for an item</entry>
+                        <entry>Defines styles for a wrapper &lt;div&gt; element for an
+                        item</entry>
                     </row>
                     <row>
                         <entry>rich-menu-item-label</entry>
@@ -308,8 +312,8 @@
                 </tbody>
             </tgroup>
         </table>
-       <table>
-           <title>Classes names that define different states</title>
+        <table>
+            <title>Classes names that define different states</title>
             <tgroup cols="2">
                 <thead>
                     <row>
@@ -320,15 +324,18 @@
                 <tbody>
                     <row>
                         <entry>rich-menu-item-disabled</entry>
-                        <entry>Defines styles for a wrapper &lt;div&gt; element of an item</entry>
+                        <entry>Defines styles for a wrapper &lt;div&gt; element of an
+                        item</entry>
                     </row>
                     <row>
                         <entry>rich-menu-item-enabled</entry>
-                        <entry>Defines styles for a wrapper &lt;div&gt; element of an enabled item</entry>
+                        <entry>Defines styles for a wrapper &lt;div&gt; element of an
+                            enabled item</entry>
                     </row>
                     <row>
                         <entry>rich-menu-item-hover</entry>
-                        <entry>Defines styles for a wrapper &lt;div&gt; element of a hover item</entry>
+                        <entry>Defines styles for a wrapper &lt;div&gt; element of a hover
+                            item</entry>
                     </row>
 
                     <row>
@@ -359,21 +366,23 @@
             </tgroup>
         </table>
         <para>In order to redefine styles for all <emphasis role="bold">
-            <property>&lt;rich:menuItem&gt;</property>
-        </emphasis> components on a page using CSS, it&apos;s enough to create classes with the
-            same names and define necessary properties in them.</para>
-        
+                <property>&lt;rich:menuItem&gt;</property>
+            </emphasis> components on a page using CSS, it&apos;s enough to create classes with
+            the same names and define necessary properties in them.</para>
+
         <para>To change styles of particular <emphasis role="bold">
-            <property>&lt;rich:menuItem&gt;</property>
-        </emphasis> components, define your own style classes in the corresponding <emphasis
-            role="bold">
-            <property>&lt;rich:menuItem&gt;</property>
-        </emphasis>attributes.</para>
+                <property>&lt;rich:menuItem&gt;</property>
+            </emphasis> components, define your own style classes in the corresponding <emphasis
+                role="bold">
+                <property>&lt;rich:menuItem&gt;</property>
+            </emphasis>attributes.</para>
     </section>
     <section>
         <title>Relevant Resources Links</title>
-        <para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=menuItem"
-            >Here</ulink> you can see the example of <emphasis role="bold"
-                ><property>&lt;rich:menuItem&gt;</property></emphasis> usage and sources for the given example. </para>
-    </section>    
+        <para><ulink
+                url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=menuItem"
+                >Here</ulink> you can see the example of <emphasis role="bold">
+                <property>&lt;rich:menuItem&gt;</property>
+            </emphasis> usage and sources for the given example. </para>
+    </section>
 </section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,7 +9,7 @@
 <title>Description</title>
         <para>The <emphasis role="bold"><property>&lt;rich:menuSeparator&gt;</property></emphasis> component is used for the  definition of a horizontal separator that can be placed between groups or items.</para>
     <figure>
-        <title>&lt;rich:menuSeparator&gt;</title> 
+        <title>&lt;rich:menuSeparator&gt; component</title> 
          <mediaobject>
              <imageobject>
                 <imagedata fileref="images/menuSeparator1.png" /> 

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/menuSeparator.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -2,7 +2,7 @@
 <section>
     <sectioninfo>
          <keywordset>
-            <keyword>menuseparator</keyword> 
+            <keyword>menuSeparator</keyword> 
         </keywordset>
     </sectioninfo>
   

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -7,9 +7,9 @@
     </sectioninfo>
     <section>
         <title>Description</title>
-        <para>The component used for rendering a single message for a specific component. </para>
+        <para>The component is used for rendering a single message for a specific component. </para>
         <figure>
-            <title>Message component</title>
+            <title>&lt;rich:message&gt; component</title>
             <mediaobject>
                 <imageobject>
                     <imagedata fileref="images/message.png"/>
@@ -21,10 +21,10 @@
         <title>Key Features</title>
         <itemizedlist>
             <listitem>Highly customizable look and feel </listitem>
-            <listitem>Track both traditional and Ajax based requests</listitem>
-            <listitem>Optional tooltip to display the detail portion of the message</listitem>
-            <listitem>Additionally customizable via attributes and facets</listitem>
-            <listitem>Additionally provides of two parts to be optionally defined: marker and
+            <listitem>Tracking both traditional and Ajax based requests</listitem>
+            <listitem>Optional toolTip to display the detail portion of the message</listitem>
+            <listitem>Additionally customizable with attributes and facets</listitem>
+            <listitem>Additionally provides two parts to be optionally defined: marker and
             label</listitem>
         </itemizedlist>
     </section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/message.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -76,30 +76,29 @@
       </emphasis>component except next two features: <itemizedlist>
         <listitem>It's ajaxRendered. It means that the component is reRendered after Ajax request
           automatically without outputPanel usage</listitem>
-        <listitem>The component optionally provides "passed" state which will be shown if no message
-          to be displayed</listitem>
-        <listitem>Provides possibility to add some marker to message. By default marker element
+        <listitem>The component optionally provides "passed" state which will be shown if no message is displayed</listitem>
+        <listitem>Provides possibility to add some marker to message. By default  a marker element
           isn't shown</listitem>
       </itemizedlist>
     </para>
-    <para> Set of facet which can be used for marker defining: <itemizedlist>
-        <listitem>passedMarker. This facet is provided to allow set a marker to be displayed if
+    <para> A set of facets which can be used for marker defining: <itemizedlist>
+        <listitem>passedMarker. This facet is provided to allow setting a marker to display if
           there is no message</listitem>
-        <listitem>errorMarker. This facet is provided to allow set a marker to be displayed if there
+        <listitem>errorMarker. This facet is provided to allow setting a marker to display if there
           is a message with a severity class of "ERROR"</listitem>
-        <listitem>fatalMarker. This facet is provided to allow set a marker to be displayed if there
+        <listitem>fatalMarker. This facet is provided to allow setting a marker to display if there
           is a message with a severity class of "FATAL"</listitem>
-        <listitem>infoMarker. This facet is provided to allow set a marker to be displayed if there
+        <listitem>infoMarker. This facet is provided to allow setting a marker to display if there
           is a message with a severity class of "INFO"</listitem>
-        <listitem>warnMarker. This facet is provided to allow set a marker to be displayed if there
-          is an message with a severity class of "WARN"</listitem>
+        <listitem>warnMarker. This facet is provided to allow setting a marker to display if there
+          is a message with a severity class of "WARN"</listitem>
       </itemizedlist>
     </para>
 
-    <para> The following example shows different variants of customization of the component. The
-      attribute 'passedLabel' is used for definition the label to be displayed when no message
-      appears. But the message component isn't appears before the form submission even with passed
-      state defined (on initial rendering).Boolean attribute<emphasis><property> &quot;showSummary&quot; </property></emphasis>defines possibility to
+    <para> The following example shows different variants for component customization. The
+      attribute 'passedLabel' is used for definition of the label to display when no message
+      appears. But the message component doesn't appear before the form submission even when 
+      state is defined as passed (on initial rendering). Boolean attribute<emphasis><property> &quot;showSummary&quot; </property></emphasis>defines possibility to
       display summary portion of displayed messages. The facets "errorMarker" and 'passedMarker' set
       corresponding images for markers. </para>
 
@@ -109,10 +108,10 @@
     <programlisting role="XML"><![CDATA[...
       	<rich:message for="id" passedLabel="No errors' showSummary="true">
       		<f:facet name="errorMarker">
-      			<h:graphicImage url="/image/error.gif"/>
+      			<h:graphicImage url="/image/error.png"/>
       		</f:facet>
 			<f:facet name="passedMarker">
-      			<h:graphicImage url="/image/passed.gif"/>
+      			<h:graphicImage url="/image/passed.png"/>
       		</f:facet>  	
 		</rich:message> 	
 ...

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -13,7 +13,7 @@
             <property>&lt;rich:message&gt;</property>
         </emphasis> component but used for rendering all messages for the components.</para>
         <figure>
-            <title>Message component</title>
+            <title>&lt;rich:message&gt; component</title>
             <mediaobject>
                 <imageobject>
                     <imagedata fileref="images/messages.png"/>
@@ -26,7 +26,7 @@
         <itemizedlist>
             <listitem>Highly customizable look and feel</listitem>
             <listitem>Track both traditional and Ajax based requests</listitem>
-            <listitem>Optional tooltip to display a detailed part of the messages</listitem>
+            <listitem>Optional ToolTip to display a detailed part of the messages</listitem>
             <listitem>Additionally customizable via attributes and facets</listitem>
             <listitem>Additionally provides of three parts to be optionally defined: marker, label and header</listitem>
         </itemizedlist>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/messages.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -101,13 +101,13 @@
     <programlisting role="XML"><![CDATA[...
     <rich:messages layout="table" tooltip="true" showDetail="false" showSummary="true" passedLabel="No Errors" var="messages">
         <f:facet name="errorMarker">
-            <h:graphicImage url="/image/error.gif"/>
+            <h:graphicImage url="/image/error.png"/>
         </f:facet>
         <f:facet name="infoMarker">
-            <h:graphicImage url="/image/info.gif"/>
+            <h:graphicImage url="/image/info.png"/>
         </f:facet>
         <f:facet name="passedMarker">
-            <h:graphicImage url="/image/passed.gif"/>
+            <h:graphicImage url="/image/passed.png"/>
         </f:facet> 
     </rich:messages>
 ...

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -14,7 +14,7 @@
     code.</para>
 
     <figure>
-      <title>ModalPanel component</title>
+      <title>&lt;rich:modalPanel&gt; component</title>
 
       <mediaobject>
         <imageobject>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/modalPanel.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -74,7 +74,7 @@
         <!--Any Content inside-->
         ...
         <a href="javascript:RichFaces.hideModalPanel('form:panel')">Hide</a>
-    </rich:modalpanel>
+    </rich:modalPanel>
 ...
     <a href="javascript:RichFaces.showModalPanel('form:panel')">Show</a>
 ...
@@ -149,7 +149,7 @@
             <f:facet name="header">
                 <h:outputText value="Modal Panel"/>
             </f:facet>
-        <h:graphicImage value="/pages/california_large.gif"/>
+        <h:graphicImage value="/pages/california_large.png"/>
         <a href="javascript:Richfaces.hideModalPanel('form:panel')">Close</a>
         </rich:modalPanel>
         <a href="javascript:Richfaces.showModalPanel('form:panel');">Open</a>
@@ -161,7 +161,7 @@
       on this link makes the modal window content appear.</para>
 
     <figure>
-      <title>ModalPanel with links</title>
+      <title>&lt;rich:modalPanel&gt; with links</title>
 
       <mediaobject>
         <imageobject>
@@ -183,14 +183,14 @@
         <f:facet name="controls">
              <h:graphicImage value="/pages/close.png" style="cursor:pointer" onclick="Richfaces.hideModalPanel('mp')" />
         </f:facet>
-        <h:graphicImage value="/pages/california_large.gif"/>
+        <h:graphicImage value="/pages/california_large.png"/>
     </rich:modalPanel>
 ]]></programlisting>
 
     <para>The result is displayed here:</para>
 
     <figure>
-      <title>ModalPanel with control element</title>
+      <title>&lt;rich:modalPanel&gt; with control element</title>
 
       <mediaobject>
         <imageobject>
@@ -322,13 +322,13 @@
           <row>
             <entry>Show()</entry>
             
-            <entry>Shows the corresponding tooltip</entry>
+            <entry>Shows the corresponding ToolTip</entry>
           </row>
           
           <row>
             <entry>Hide()</entry>
             
-            <entry>Hides the corresponding tooltip</entry>
+            <entry>Hides the corresponding ToolTip</entry>
           </row>
           
         </tbody>
@@ -503,7 +503,7 @@
     <title>Definition of Custom Style Classes</title>
 
     <figure>
-      <title>Modal Panel class names</title>
+      <title>&lt;rich:modalPanel&gt; class name</title>
 
       <mediaobject>
         <imageobject>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,7 +9,7 @@
 	<section>
         <title>Description</title>
         <para>The <emphasis role="bold"><property>&lt;rich:nodeSelectListener&gt;</property></emphasis>
-		represents an action listener method that will be notified after selection of node.
+		represents an action listener method that will be notified after selection of a node.
 		</para>	
     </section>	
 	  

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/nodeSelectListener.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -29,7 +29,6 @@
       </tgroup>
     </table>
 	
-
   <section>
     <title>Creating the Component with a  Page Tag</title>
     <para>Simple Component definition on a page:</para>
@@ -68,7 +67,7 @@
     <title>Details of usage</title>
 
 <para>
-The <property>&lt;rich:nodeSelectListener&gt;</property> is used as nested tag with <property>&lt;rich:tree&gt;</property>
+The <property>&lt;rich:nodeSelectListener&gt;</property> is used as a nested tag with <property>&lt;rich:tree&gt;</property>
 and <property>&lt;rich:treeNode&gt;</property> components.
 </para>
 <para>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,11 +10,15 @@
      <para>The <emphasis role="bold">
          <property>&lt;rich:orderingList&gt;</property>
      </emphasis> is a component for ordering items in a list.  This component provides possibilities to reorder a list and sort it on the client side.</para>
+     <figure>
+         <title>&lt;rich:orderingList&gt; component</title>
      <mediaobject> 
          <imageobject>
              <imagedata fileref="images/orderinList1.png"/>
          </imageobject>
      </mediaobject>
+     </figure>
+     
  </section>
 <section>
     <title>Key Features</title>    

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/orderingList.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -113,7 +113,7 @@
 
         <para> The <emphasis>
                 <property>&quot;selection&quot; </property>
-            </emphasis> attribute stores the collection of items selected by user. In the example
+            </emphasis> attribute stores the collection of items selected by you. In the example
             below after submitting the form the current collection is placed in the object's
             property and then <emphasis role="bold">
                 <property>&lt;rich:dataTable&gt;</property>
@@ -888,13 +888,14 @@
 
 
         <figure>
-            <title>Style classes</title>
+            <title>Classes names</title>
 
             <mediaobject>
                 <imageobject>
-                    <imagedata fileref="images/orderingList_classes.png" scalefit="1"/>
+                    <imagedata fileref="images/orderingList_classes_1.png"/>
                 </imageobject>
             </mediaobject>
+          
         </figure>
 
         <table>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,10 +10,10 @@
     <para>Create image by painting from a managed bean method, same as <emphasis><property>&quot;paint&quot;</property></emphasis> (Graphics2D) 
     in <emphasis><property>&quot;SWING&quot;</property></emphasis> components. </para>
     <figure>
-    <title>Paint2D component</title>
+        <title>&lt;rich:paint2D&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/paint2D2.gif"/>
+            <imagedata fileref="images/paint2D2.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/paint2D.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -111,37 +111,35 @@
       </emphasis> and <emphasis>
         <property>&quot;data&quot;</property>
       </emphasis> attributes.</para>
-    <para><emphasis role="bold">Example:</emphasis>
-    </para>
 
     <para>
       <emphasis role="bold">Example:</emphasis>
     </para>
     <programlisting role="JAVA"><![CDATA[paintBean.java:
-
-    public void paint(Graphics2D g2, Object obj) {
-        // code that gets data from the data Bean (PaintData)
-        PaintData data = (PaintData) obj;
-        ...
-        // a code drawing a rectangle
-        g2.drawRect(0, 0, data.Width, data.Height);
-        ...      
-        // some more code placing graphical data into g2 stream below
-    }
-
+      
+      public void paint(Graphics2D g2, Object obj) {
+          // code that gets data from the data Bean (PaintData)
+          PaintData data = (PaintData) obj;
+          ...
+          // a code drawing a rectangle
+          g2.drawRect(0, 0, data.Width, data.Height);
+          ...
+          // some more code placing graphical data into g2 stream below
+     }
+     
 dataBean.java:
-
+    
     public class PaintData implements Serializable{
         private static final long serialVersionUID = 1L;
         Integer Width=100;
         Integer Height=50;
         ...
     }
-
-page.xhtml:
-...
+    
+    page.xhtml:
+    ...
     <rich:paint2D paint="#{paint2D.paint}" data="#{paint2DModel.data}"/>
-... 
+    ... 
 ]]></programlisting>
 
   </section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,10 +10,10 @@
     <para>A skinnable <property>panel</property> that is rendered as a bordered rectangle with or
     without a header.</para>
     <figure>
-        <title>Panel component</title>
+        <title>&lt;rich:panel&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/panelMain.gif"/>
+            <imagedata fileref="images/panelMain.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panel.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -78,7 +78,7 @@
     <programlisting role="XML"><![CDATA[...
     <rich:panel>
         <f:facet name="header">  
-            <h:graphicImage value="/images/img1.gif"/>
+            <h:graphicImage value="/images/img1.png"/>
         </f:facet>
         ...
         <!--Any Content inside-->
@@ -106,7 +106,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/panel.gif"/>
+          <imagedata fileref="images/panel.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -131,11 +131,11 @@
 ]]></programlisting>
     <para>It&apos;s displayed on a page in the following way:</para>
     <figure>
-      <title>Panel with header</title>
+      <title>&lt;rich:panel&gt; with header</title>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/panel2.gif"/>
+          <imagedata fileref="images/panel2.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -323,7 +323,7 @@
     <para>
       <emphasis role="bold">Example:</emphasis>
     </para>
-    <programlisting role="XML"><![CDATA[...
+    <programlisting role="CSS"><![CDATA[...
     .rich-panel-header{
         background-color:#F99;
     }
@@ -337,11 +337,11 @@
       particular <property>panel</property>. As a result, the <property>panel</property> with a
       header redefined color and a text style in body is got.</para>
     <figure>
-      <title>Panel with redefined header and body text style</title>
+      <title>&lt;rich:panel&gt; with redefined header and body text style</title>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/panel4.gif"/>
+          <imagedata fileref="images/panel4.png"/>
         </imageobject>
       </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,10 +10,10 @@
     <para><property>panelBar</property> is used for grouping any content which is loaded on the client
      side and appears as groups divided on child panels after the header is clicked.</para>
     <figure>
-        <title>PanelBar with content inside</title>
+        <title>&lt;rich:panelBar&gt; with content inside</title>
         <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/panelBarMain.gif"/>
+            <imagedata fileref="images/panelBarMain.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBar.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -146,11 +146,11 @@
             </emphasis>, which is applicable to a whole component, specifying padding, borders, and
             etc.</para>
         <figure>
-            <title>Style class</title>
+            <title>Style classes</title>
 
             <mediaobject>
                 <imageobject>
-                    <imagedata fileref="images/panelBar2.gif" scalefit="1"/>
+                    <imagedata fileref="images/panelBar2.png" scalefit="1"/>
                 </imageobject>
             </mediaobject>
         </figure>
@@ -218,7 +218,7 @@
         <para>
             <emphasis role="bold">Example:</emphasis>
         </para>
-        <programlisting role="HTML"><![CDATA[...
+        <programlisting role="CSS"><![CDATA[...
     . rich-panelbar{
         padding:10px;
     }
@@ -233,7 +233,7 @@
         <para>
             <emphasis role="bold">Example:</emphasis>
         </para>
-        <programlisting role="HTML"><![CDATA[...
+        <programlisting role="CSS"><![CDATA[...
     .headerClass{
         ...
     }

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -11,10 +11,10 @@
      panelBar which is loaded on client side and appears as groups divided on child panels after 
      header is clicked.</para>
     <figure>
-        <title>PanelBarItem component</title>
+        <title>&lt;rich:panelBarItem&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/panelBarItem.gif" scalefit="1"/>
+            <imagedata fileref="images/panelBarItem.png" scalefit="1"/>
         </imageobject>
     </mediaobject>
     </figure>    

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelBarItem.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -86,7 +86,7 @@
     <programlisting role="XML"><![CDATA[...
     <rich:panelBarItem...>
         <f:facet name="label">  
-            <h:graphicImage value="/images/img1.gif"/>
+            <h:graphicImage value="/images/img1.png"/>
         </f:facet>
         ...
         <!--Any Content inside-->
@@ -199,7 +199,7 @@
       <title>Style classes</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/panelBar3.gif" scalefit="1"/>
+          <imagedata fileref="images/panelBar3.png" scalefit="1"/>
         </imageobject>
       </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,12 +10,14 @@
         <para>The <emphasis role="bold">
                 <property>&lt;rich:panelMenu&gt;</property>
             </emphasis> component is used to define an inline vertical menu on a page.</para>
-
+        <figure>
+            <title>&lt;rich:panelMenu&gt; component</title> 
         <mediaobject>
             <imageobject>
                 <imagedata fileref="images/panelmenu.png"/>
             </imageobject>
         </mediaobject>
+        </figure>
     </section>
     <section>
         <title>Key Features</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenu.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -170,7 +170,6 @@
 
     <figure>
       <title>Using the <emphasis><property>&quot;expandSingle&quot;</property></emphasis> attribute</title>
-
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/panelmenu1.png"/>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,12 +10,14 @@
         <para>The <emphasis role="bold">
                 <property>&lt;rich:panelMenuGroup&gt;</property>
         </emphasis> component is used to define an expandable group of items inside the panel menu or other group.</para>
-
+        <figure>
+            <title>&lt;rich:panelMenuGroup&gt; component</title>
         <mediaobject>
             <imageobject>
                 <imagedata fileref="images/panelmenu.png"/>
             </imageobject>
         </mediaobject>
+        </figure>
     </section>
     <section>
         <title>Key Features</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuGroup.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -123,7 +123,7 @@
     <para><emphasis>
         <property>&quot;Action&quot;</property>
       </emphasis> and <emphasis>
-        <property>&quot;ActionListener&quot;</property>
+        <property>&quot;actionListener&quot;</property>
       </emphasis> attributes are ignored. Items don&apos;t fire any submits itself. Behavior is
       fully defined by the components nested into items.</para>
 
@@ -186,7 +186,7 @@
 
     <programlisting role="XML"><![CDATA[...
       <rich:panelMenu>
-            <rich:panelMenuGroup label="Group1" iconExpanded="\images\img1.gif" iconCollapsed="\images\img2.gif">
+            <rich:panelMenuGroup label="Group1" iconExpanded="\images\img1.png" iconCollapsed="\images\img2.png">
                   <!--Nested menu components-->
             </rich:panelMenuGroup>
       </rich:panelMenu>
@@ -557,5 +557,12 @@
       <property>&lt;rich:panelMenuGroup&gt;</property>
     </emphasis>attributes.</para>
   </section>
-
+  <section>
+    <title>Relevant resources links</title>
+    <para>
+      Some additional information about usage of component can be found 
+      <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=menuGroup">here.
+      </ulink>
+    </para>
+  </section>
 </section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,12 +10,14 @@
         <para>The <emphasis role="bold">
                 <property>&lt;rich:panelMenuItem&gt;</property>
         </emphasis> component is used to define a single item inside popup list.</para>
-
+        <figure>
+            <title>&lt;rich:panelMenuItem&gt; component</title>
         <mediaobject>
             <imageobject>
                 <imagedata fileref="images/panelmenu.png"/>
             </imageobject>
         </mediaobject>
+        </figure>
     </section>
     <section>
         <title>Key Features</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/panelMenuItem.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -120,7 +120,7 @@
     <para><emphasis>
         <property>&quot;Action&quot;</property>
       </emphasis> and <emphasis>
-        <property>&quot;ActionListener&quot;</property>
+        <property>&quot;actionListener&quot;</property>
       </emphasis> attributes are ignored. Items don&apos;t fire any submits itself. Behavior is
       fully defined by the components nested into items.</para>
 
@@ -190,7 +190,7 @@
     <programlisting role="XML"><![CDATA[...
       <rich:panelMenu>
             ...
-            <rich:panelMenuItem ="Item 1.1" icon="\images\img1.gif" />
+            <rich:panelMenuItem ="Item 1.1" icon="\images\img1.png" />
             ...	
       </rich:panelMenu>
 ...]]></programlisting>
@@ -464,5 +464,12 @@
       <property>&lt;rich:panelMenuItem&gt;</property>
     </emphasis>attributes.</para>
   </section>
-
+  <section>
+    <title>Relevant resources links</title>
+    <para>
+      Some additional information about usage of component can be found 
+      <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=menuItem">here.
+      </ulink>
+    </para>
+  </section>
 </section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/poll.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/poll.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/poll.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -115,7 +115,7 @@
                 <a4j:commandButton style="width:120px" id="control"
                                    value="#{userBean.pollEnabled?'Stop':'Start'} Polling"
                                    reRender="poll, grid">
-                    <a4j:actionparam name="polling" value="#{!userBean.pollEnabled}"
+                    <a4j:actionParam name="polling" value="#{!userBean.pollEnabled}"
                                      assignTo="#{userBean.pollEnabled}"/>
                 </a4j:commandButton>
             </h:panelGrid>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/recursiveTreeNodesAdaptor.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/recursiveTreeNodesAdaptor.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/recursiveTreeNodesAdaptor.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -12,7 +12,7 @@
 		</para>
 		
 		<figure>
-        <title>Expanded tree with recursiveTreeNodesAdaptor</title>    
+		    <title>Expanded tree with recursive &lt;rich:treeNodesAdaptor&gt;</title>    
 		<mediaobject> 
 			<imageobject>
 				<imagedata fileref="images/recursiveTreeNodesAdaptor1.png"/>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -13,7 +13,7 @@
 		</para>
 		
 		<figure>
-        <title>ScrollableDataTable component</title>
+		    <title>&lt;rich:scrollableDataTable&gt; component</title>
       <mediaobject> 
         <imageobject>
             <imagedata fileref="images/scrollable-dt1.png"/>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -71,9 +71,9 @@
   <section>
     <title>Details of Usage</title>
     <para> The component represents on a page as a scrollable table with some fixed (non-scrollable)
-      rows (header, footer) and columns. Columns of the table are optionally resizable. Resizing is
+      rows ( with header and  footer) and  columns. Like other tables &lt;rich:scrollableDataTable&gt; also has optional footer and header that could be  implemented using the corresponding facets. Columns of the table are optionally resizable. Resizing is
       available using "drag and drop" of the column vertical borders. There is possibility to expand
-      or collapse the columns through JS API on the client side. User can define the number of the
+      or collapse the columns through JS API on the client side. You can define the number of the
       fixed columns from the left side using attribute <emphasis>
         <property>&quot;frozenColCount&quot;</property>
       </emphasis> that will not be scrolled via horizontal scroll. </para>
@@ -130,9 +130,9 @@
         rows mode</property>.</para>
     <para>This attribute is a reference to object to the instace of
         <property>org.richfaces.model.selection.Selection</property> interface, containing current
-      collection of objects selected by user.</para>
-    <para>In the following example when user submits the form current collection of objects selected
-      by user is placed in the object's property. Then on complete action the <emphasis role="bold">
+      collection of objects selected by you.</para>
+    <para>In the following example when you submits the form current collection of objects selected
+      by you is placed in the object's property. Then on complete action the <emphasis role="bold">
         <property>&lt;rich:modalPanel&gt;</property>
       </emphasis> with selected data will be shown.</para>
     <para>
@@ -451,7 +451,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/sdt.png"/>
+          <imagedata fileref="images/sdt.png" scale="90"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -500,7 +500,7 @@
           </row>
 
           <row>
-            <entry>rich-sdt-header-raw</entry>
+            <entry>rich-sdt-header-row</entry>
 
             <entry>Defines styles for a header raw</entry>
           </row>
@@ -517,7 +517,7 @@
           </row>
 
           <row>
-            <entry>rich-sdt-footer-raw</entry>
+            <entry>rich-sdt-footer-row</entry>
 
             <entry>Defines styles for a footer raw</entry>
           </row>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,10 +10,10 @@
     <para>A horizontal line to use as a <property>separator</property> in a layout. The line type 
     can be customized with the <emphasis ><property>&quot;lineType&quot;</property></emphasis> parameter.</para>
     <figure>
-        <title>Separator component</title>
+        <title>&lt;rich:separator&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/separator.gif"/>
+            <imagedata fileref="images/separator.png"/>
         </imageobject>
     </mediaobject>
      </figure>   

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/separator.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -90,10 +90,10 @@
       </emphasis>
     </para>
     <figure>
-      <title>Different line types of separator</title>
+      <title>Different line types of &lt;rich:separator&gt;</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/separator1.gif"/>
+          <imagedata fileref="images/separator1.png"/>
         </imageobject>
       </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,10 +9,10 @@
 <title>Description</title>
     <para>A collapsible panel, which content shows/hides after activating a header control.</para>
     <figure>
-        <title>SimpleTogglePanel component</title>
+        <title>&lt;rich:simpleTogglePanel&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/simpleTogglePanel.gif"/>
+            <imagedata fileref="images/simpleTogglePanel.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -105,10 +105,10 @@
       <listitem> etc. </listitem>
     </itemizedlist>
     <figure>
-      <title>SimpleTogglePanel states</title>
+      <title>&lt;rich:simpleTooglePanel&gt; states</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/simpleTogglePanel2.gif"/>
+          <imagedata fileref="images/simpleTogglePanel2.png"/>
         </imageobject>
       </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/spacer.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/spacer.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/spacer.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,10 +9,10 @@
 <title>Description</title>
     <para> A <property>spacer</property> that is used in layout and rendered as a transparent image.</para>
     <figure>
-        <title>Spacer component</title>
+        <title>&lt;rich:spacer&gt; component</title>
          <mediaobject> 
      <imageobject>
-         <imagedata fileref="images/spacer.gif"/>
+         <imagedata fileref="images/spacer.png"/>
      </imageobject>
      </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/status.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/status.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/status.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -48,10 +48,10 @@
             With &quot;Start&quot;/&quot;Stop&quot; facets definition:
 			<programlisting role="XML"><![CDATA[<a4j:status for="stat2">
 	<f:facet name="start">
-		<h:graphicImage value="ajax_process.gif" />
+		<h:graphicImage value="ajax_process.png" />
 	</f:facet>
 	<f:facet name="stop">
-		<h:graphicImage value="ajax_stoped.gif" />
+		<h:graphicImage value="ajax_stoped.png" />
 	</f:facet>
 </a4j:status>]]></programlisting>
             <para>In this case, the elements are generated for each  status and correspond the facets content.</para>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/subTable.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/subTable.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/subTable.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -15,10 +15,10 @@
     <para>The component is used for inserting <property>subtables</property> into tables with opportunity to choose data from a model 
     and built-in Ajax updates support.</para>
     <figure>
-        <title>SubTable element</title>
+        <title>&lt;rich:subTable&gt; element</title>
         <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/subtable1.gif"/>
+            <imagedata fileref="images/subtable1.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/subTable.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/subTable.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/subTable.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -2,7 +2,7 @@
 <section>
   <sectioninfo>
     <keywordset>
-      <keyword>rich:subtable</keyword>
+      <keyword>rich:subTable</keyword>
       <keyword>HtmlSubTable</keyword>
     </keywordset>
   </sectioninfo>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionbox.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionbox.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionbox.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -13,10 +13,10 @@
     list of possible values, it pop ups them inside the 
       <emphasis role="bold"><property>&lt;div&gt;</property></emphasis> element bellow the input.</para>
     <figure>
-        <title>SuggestionBox component</title>
+        <title>&lt;rich:suggestionBox&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/suggestionbox1.gif"/>
+            <imagedata fileref="images/suggestionbox1.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionbox.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionbox.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/suggestionbox.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -4,7 +4,7 @@
         <keywordset>
             <keyword>on-keypress suggestion</keyword>
             <keyword>rich:suggestionBox</keyword>
-            <keyword>HtmlSuggestionBox</keyword>
+            <keyword>HtmlsuggestionBox</keyword>
         </keywordset>
     </sectioninfo>
 
@@ -51,12 +51,12 @@
     </para>
         <programlisting role="XML"><![CDATA[...
     <h:inputText value="#{bean.property}" id="suggest"/>
-    <rich:suggestionbox for="suggest" suggestionAction="#{bean.autocomplete}" 
+    <rich:suggestionBox for="suggest" suggestionAction="#{bean.autocomplete}" 
                         var="suggest">
         <h:column>
             <h:outputText value="#{suggest.text}"/>	
         </h:column>
-    </rich:suggestionbox>
+    </rich:suggestionbBox>
 ...
 ]]></programlisting>
         <para>Here is the <emphasis>
@@ -101,7 +101,7 @@
                 <emphasis>
                     <property>&quot;suggestionAction&quot;</property>
                 </emphasis>
-                <para> is an accepting parameter of a SuggestionEvent type that returns as a result
+                <para> is an accepting parameter of a suggestionEvent type that returns as a result
                     a collection for rendering in a tool tip window.</para>
             </listitem>
             <listitem>
@@ -119,10 +119,10 @@
             </emphasis>) that are obligatory for the suggestion component. The attributes have
             initial Defaults but should be specified manually in order to be changed.</para>
         <para>The <property>suggestionBox</property> component, as it is shown on the screenshot,
-            could get any collection for an output and outputs it in a tooltip window the same as a
+            could get any collection for an output and outputs it in a ToolTip window the same as a
             custom dataTable (in several columns)</para>
         <programlisting role="XML"><![CDATA[...
-    <rich:suggestionbox for="test"
+    <rich:suggestionBox for="test"
                         suggestionAction="#{bean.autocomplete}" var="cit" fetchValue="#{cit.text}">
         <h:column>
             <h:outputText value="#{cit.label}"/>
@@ -130,15 +130,15 @@
         <h:column>
             <h:outputText value="#{cit.text}"/>
         </h:column>
-    </rich:suggestionbox>
+    </rich:suggestionBox>
 ...
 ]]></programlisting>
         <para>It looks on a page in the following way:</para>
         <figure>
-            <title>SuggestionBox with tooltip window</title>
+            <title>&lt;rich:suggestionBox&gt; with ToolTip window</title>
             <mediaobject>
                 <imageobject>
-                    <imagedata fileref="images/suggestionbox2.gif"/>
+                    <imagedata fileref="images/suggestionbox2.png"/>
                 </imageobject>
             </mediaobject>
         </figure>
@@ -152,22 +152,22 @@
             <emphasis role="bold">Example:</emphasis>
         </para>
         <programlisting role="XML"><![CDATA[...
-    <rich:suggestiobox for="test" suggestionAction="#{bean.autocomplete}" var="cit" 
+    <rich:suggestionBox for="test" suggestionAction="#{bean.autocomplete}" var="cit" 
                         selfRendered="true" tokens=","> 
         <h:column>
             <h:outputText value="#{cit.text}"/>
         </h:column>
-    </rich:suggestionbox>
+    </rich:suggestionBox>
 ...
 ]]></programlisting>
         <para>This example shows that when a city is chosen and a comma and first letter character
             are input, Ajax request is called again, but it submits a value starting from the last
             token:</para>
         <figure>
-            <title>SuggestionBox with chosen word</title>
+            <title>&lt;rich:suggestionBox&gt; with chosen word</title>
             <mediaobject>
                 <imageobject>
-                    <imagedata fileref="images/suggestionbox3.gif"/>
+                    <imagedata fileref="images/suggestionbox3.png"/>
                 </imageobject>
             </mediaobject>
         </figure>
@@ -199,25 +199,25 @@
             <emphasis role="bold">Example:</emphasis>
         </para>				
         <programlisting role="XML"><![CDATA[...
-    <rich:suggestiobox nothingLabel="Empty" for="test" suggestionAction="#{bean.autocomplete}" var="cit"> 
+    <rich:suggestionBox nothingLabel="Empty" for="test" suggestionAction="#{bean.autocomplete}" var="cit"> 
         <h:column>
             <h:outputText value="#{cit.text}"/>
         </h:column>
-    </rich:suggestionbox>
+    </rich:suggestionBox>
 ...
 ]]></programlisting>
 		<para>
             <emphasis role="bold">Example:</emphasis>
         </para>
         <programlisting role="XML"><![CDATA[...
-<rich:suggestiobox for="test" suggestionAction="#{bean.autocomplete}" var="cit"> 
+<rich:suggestioBox for="test" suggestionAction="#{bean.autocomplete}" var="cit"> 
 	<facet name="nothingLabel">
 		<h:outputText value="Empty"/>
 	</facet>		
 	<h:column>
 		<h:outputText value="#{cit.text}"/>
 	</h:column>
-</rich:suggestionbox>
+</rich:suggestionBox>
 ...
 ]]></programlisting>				
 	
@@ -225,10 +225,10 @@
     <para>It looks on a page in the following way:</para>       
 
 	<figure>
-            <title>SuggestionBox with empty list</title>
+	    <title>&lt;rich:suggestionBox&gt; with empty list</title>
             <mediaobject>
                 <imageobject>
-                    <imagedata fileref="images/suggestionbox5.gif"/>
+                    <imagedata fileref="images/suggestionbox5.png"/>
                 </imageobject>
             </mediaobject>
         </figure>
@@ -410,7 +410,7 @@
             
             <mediaobject>
                 <imageobject>
-                    <imagedata fileref="images/suggestionbox4.gif"/>
+                    <imagedata fileref="images/suggestionbox4.png"/>
                 </imageobject>
             </mediaobject>
         </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,10 +9,10 @@
 <title>Description</title>
     <para>A <property>tab</property> section within a tab panel.</para>
     <figure>
-        <title>Tab component</title>
+        <title>&lt;rich:tab&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/tab.gif"/>
+            <imagedata fileref="images/tab.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/tab.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -79,7 +79,7 @@
     <programlisting role="XML"><![CDATA[...
     <rich:tab>
         <f:facet name="label">  
-            <h:graphicImage value="/images/img1.gif"/>
+            <h:graphicImage value="/images/img1.png"/>
         </f:facet>
         ...
         <!--Any Content inside-->
@@ -109,10 +109,10 @@
 <para>With this example it&apos;s possible to generate the <property>tab panel</property>
  with the second disabled and two active <property>tabs</property> (see the picture).</para>
 <figure>
-  <title>Tab Panel with disabled tab</title>
+  <title>&lt;rich:tabPanel&gt; with disabled &lt;rich:tab&gt;</title>
 <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/tab2.gif"/>
+            <imagedata fileref="images/tab2.png"/>
         </imageobject>
 </mediaobject>
   </figure>
@@ -316,7 +316,7 @@
             </row>
             
             <row>
-              <entry>rich-tab-lable</entry>
+              <entry>rich-tab-label</entry>
               <entry>Defines styles for a tab lable</entry>
             </row>
           </tbody>
@@ -358,5 +358,6 @@
         role="bold">
         <property>&lt;rich:tab&gt;</property>
       </emphasis>attribute.</para>
-	</section>
+    </section>
+  
 </section>
\ No newline at end of file

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,10 +9,10 @@
 <title>Description</title>
     <para>A <property>tab panel</property> displaying tabs for grouping content of the panel.</para>
   <figure>
-    <title>TabPanel component</title>
+    <title>&lt;rich:tabPanel&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/tabPanel.gif"/>
+            <imagedata fileref="images/tabPanel.png"/>
         </imageobject>
     </mediaobject>
   </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/tabPanel.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -4,7 +4,7 @@
     <keywordset>
       <keyword>tab</keyword>
       <keyword>rich:tabPanel</keyword>
-      <keyword>HtmlTabPanel</keyword>
+      <keyword>HtmltabPanel</keyword>
     </keywordset>
   </sectioninfo>
 
@@ -20,23 +20,23 @@
       <tbody>
         <row>
           <entry>component-type</entry>
-          <entry>org.richfaces.TabPanel</entry>
+          <entry>org.richfaces.tabPanel</entry>
         </row>
         <row>
           <entry>component-class</entry>
-          <entry>org.richfaces.component.html.HtmlTabPanel</entry>
+          <entry>org.richfaces.component.html.HtmltabPanel</entry>
         </row>
         <row>
           <entry>component-family</entry>
-          <entry>org.richfaces.TabPanel</entry>
+          <entry>org.richfaces.tabPanel</entry>
         </row>
         <row>
           <entry>renderer-type</entry>
-          <entry>org.richfaces.TabPanelRenderer</entry>
+          <entry>org.richfaces.tabPanelRenderer</entry>
         </row>
         <row>
           <entry>tag-class</entry>
-          <entry>org.richfaces.taglib.TabPanelTag</entry>
+          <entry>org.richfaces.taglib.tabPanelTag</entry>
         </row>
       </tbody>
     </tgroup>
@@ -65,15 +65,15 @@
     <para>
       <emphasis role="bold">Example:</emphasis>
     </para>
-    <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlTabPanel;
+    <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmltabPanel;
 ...	
-HtmlTabPanel myTabPanel = new HtmlTabPanel();
+HtmltabPanel mytabPanel = new HtmltabPanel();
 ...
 ]]></programlisting>
   </section>
   <section>
     <title>Details of Usage</title>
-    <para>As it was mentioned <link linkend="tabPanel">above</link>, <property>TabPanel</property> groups content on panels and
+    <para>As it was mentioned <link linkend="tabPanel">above</link>, <property>tabPanel</property> groups content on panels and
       performs switching from one to another. Hence, modes of switching between panels are described
       first of all.</para>
     <note><title>Note:</title> All <property>tabPanels</property> should be wrapped into a form
@@ -134,10 +134,10 @@
 ]]></programlisting>
 
     <figure>
-      <title>TabPanel with right aligned tabs</title>
+      <title>&lt;rich:tabPanel&gt; with right aligned tabs</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tabPanel1.gif"/>
+          <imagedata fileref="images/tabPanel1.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -252,7 +252,7 @@
       <title>Style classes</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/tabPanel4.gif" scalefit="1"/>
+          <imagedata fileref="images/tabPanel4.png" scalefit="1"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -269,7 +269,7 @@
         <tbody>
           <row>
             <entry>rich-tabpanel</entry>
-            <entry>Defines styles for all tabpanel</entry>
+            <entry>Defines styles for all tabPanel</entry>
           </row>
           <row>
             <entry>rich-tabpanel-content</entry>
@@ -277,12 +277,12 @@
           </row>
           <row>
             <entry>rich-tabpanel-content-position</entry>
-            <entry>Defines styles for a wrapper element of a tabpanel content. It should define a shift equal to borders
+            <entry>Defines styles for a wrapper element of a tabPanel content. It should define a shift equal to borders
               width in order to overlap panel tabs</entry>
           </row>
           <row>
             <entry>rich-tabhdr-side-border</entry>
-            <entry>Defines styles for side elements of a tabpanel header</entry>
+            <entry>Defines styles for side elements of a tabPanel header</entry>
           </row>
           <row>
             <entry>rich-tabhdr-side-cell</entry>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/toggleControl.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/toggleControl.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/toggleControl.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -16,10 +16,10 @@
       <emphasis ><property>&quot;stateOrder&quot;</property></emphasis> attributes) is 
       shown.</para>
     <figure>
-        <title>ToggleControl component</title>
+        <title>&lt;rich:toggleControl&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/toggleControl.gif"/>
+            <imagedata fileref="images/toggleControl.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -11,10 +11,10 @@
     the corresponding <property>toggleControl</property>
     (the other is hidden).</para>
     <figure>
-        <title>TogglePanel component</title>
+        <title>&lt;rich:togglePanel&gt; component</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/togglePanel.gif"/>
+            <imagedata fileref="images/togglePanel.png"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/togglePanel.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -4,7 +4,7 @@
     <keywordset>
       <keyword>facet</keyword>
       <keyword>rich:togglePanel</keyword>
-      <keyword>HtmlTogglePanel</keyword>
+      <keyword>HtmltogglePanel</keyword>
     </keywordset>
   </sectioninfo>
 
@@ -36,7 +36,7 @@
         </row>
         <row>
           <entry>tag-class</entry>
-          <entry>org.richfaces.taglib.TogglePanelTag</entry>
+          <entry>org.richfaces.Taglib.togglePanelTag</entry>
         </row>
       </tbody>
     </tgroup>
@@ -70,9 +70,9 @@
     <para>
       <emphasis role="bold">Example:</emphasis>
     </para>
-    <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlTogglePanel;
+    <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmltogglePanel;
 ...	
-HtmlTogglePanel myPanel = new HtmlTogglePanel();
+HtmltogglePanel myPanel = new HtmltogglePanel();
 ...
 ]]></programlisting>
   </section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,11 +9,11 @@
 <title>Description</title>
     <para>A horizontal bar with Action items on it that accepts any JSF components as children.</para>
     <figure>
-        <title>Toolbar with action items</title>
+        <title>&lt;rich:toolBar&gt; with action items</title>
     
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/toolBarMain.gif" scalefit="1"/>
+            <imagedata fileref="images/toolBarMain.png" scalefit="1"/>
         </imageobject>
     </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBar.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -87,11 +87,11 @@
     </itemizedlist>
     <para>For example, when setting a separator of a disc type, the following result is produced:</para>
     <figure>
-      <title>Toolbar with a <emphasis><property>&quot;disc&quot;</property></emphasis> separator</title>
+      <title>&lt;rich:toolBar&gt; with a <emphasis><property>&quot;disc&quot;</property></emphasis> separator</title>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/toolBar2.gif" scalefit="1"/>
+          <imagedata fileref="images/toolBar2.png" scalefit="1"/>
         </imageobject>
       </mediaobject>
     </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,10 +9,10 @@
 <title>Description</title>
     <para>A group of items inside a tool bar.</para>
     <figure>
-        <title>ToolbarGroup with items on it</title>
+        <title>&lt;rich:toolbarGroup&gt; with items on it</title>
     <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/toolbarGroup.gif" scalefit="1"/>
+            <imagedata fileref="images/toolbarGroup.png" scalefit="1"/>
         </imageobject>
     </mediaobject>
         </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolBarGroup.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -117,10 +117,10 @@
 ]]></programlisting>
 <para>The code result is the following:</para>
     <figure>
-      <title>Stylized toolBarGroup</title>
+      <title>Stylized &lt;rich:toolBarGroup&gt;</title>
 <mediaobject> 
         <imageobject>
-            <imagedata fileref="images/toolBar3.gif"/>
+            <imagedata fileref="images/toolBar3.png"/>
         </imageobject>
 </mediaobject>
       </figure>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolTip.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolTip.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolTip.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -2,7 +2,7 @@
 <section>
 <sectioninfo>
 <keywordset>
-<keyword>tooltip</keyword>
+<keyword>toolTip</keyword>
 </keywordset>
 </sectioninfo>
 <section>
@@ -10,7 +10,7 @@
     <para>The component used for creation non-modal popup that activated on some event and display some information.
 	</para>
     <figure>
-        <title>Tooltip component</title>
+        <title>&lt;rich:toolTip&gt; component</title>
       <mediaobject> 
         <imageobject>
             <imagedata fileref="images/tooltip1.png"/>
@@ -22,7 +22,7 @@
     <title>Key Features</title> 
     <itemizedlist>
 		<listitem>Highly customizable look and feel </listitem>
-		<listitem>Different ways of data loading to tooltip</listitem>
+		<listitem>Different ways of data loading to toolTip</listitem>
 		<listitem>Disablement support</listitem>
     </itemizedlist>  
 </section>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolTip.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolTip.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/toolTip.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -102,7 +102,7 @@
 This is the result:
 </para>
     <figure>
-        <title>toolTip component with default content</title>
+      <title>&lt;rich:toolTip&gt; component with default content</title>
       <mediaobject> 
         <imageobject>
             <imagedata fileref="images/toolTip2.png"/>
@@ -113,7 +113,7 @@
 And after <property>toolTip</property> loaded it will be changed to next one:
 </para>
     <figure>
-        <title>toolTip component with loaded content</title>
+      <title>&lt;rich:toolTip&gt; component with loaded content</title>
       <mediaobject> 
         <imageobject>
             <imagedata fileref="images/toolTip3.png"/>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -10,16 +10,16 @@
         <para>A component for a tree-like presentation of data. It includes built-in drag and drop
             support for its child elements.</para>
         <figure>
-            <title>Expanded tree with child elements</title>
+            <title>Expanded &lt;rich:tree&gt; with child elements</title>
             <mediaobject>
                 <imageobject>
                     <imagedata fileref="images/tree1.png"/>
                 </imageobject>
             </mediaobject>
         </figure>
-        <para>On the screenshot above, there is an example of the <property>tree</property> with an expanded node. This node
+        <!--para>On the screenshot above, there is an example of the <property>tree</property> with an expanded node. This node
             contains its own node with several leaves. Besides, it&apos;s possible to choose your own
-            icons for tree nodes.</para>
+            icons for tree nodes.</para-->
     </section>
     <section>
         <title>Key Features</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/tree.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -90,7 +90,7 @@
 HtmlTree myTree = new HtmlTree();
 ...]]></programlisting>
   </section>
-  <section>
+  <!--section>
     <title>Details of Usage</title>
     <para>As it has been mentioned <link linkend="tree">above</link> the <emphasis role="bold">
         <property>&lt;rich:tree&gt;</property>
@@ -129,13 +129,13 @@
     <programlisting role="JAVA"><![CDATA[...
       <h:form>    
         <rich:tree style="width:300px" value="#{library.data}" var="item" nodeFace="#{item.type}">
-            <rich:treeNode type="artist" iconLeaf="/images/tree/singer.gif" icon="/images/tree/singer.gif">
+            <rich:treeNode type="artist" iconLeaf="/images/tree/singer.png" icon="/images/tree/singer.png">
                 <h:outputText value="#{item.name}" />
             </rich:treeNode>
-            <rich:treeNode type="album" iconLeaf="/images/tree/disc.gif" icon="/images/tree/disc.gif">
+            <rich:treeNode type="album" iconLeaf="/images/tree/disc.png" icon="/images/tree/disc.png">
                 <h:outputText value="#{item.title}" />
             </rich:treeNode>
-            <rich:treeNode type="song" iconLeaf="/images/tree/song.gif" icon="/images/tree/song.gif">
+            <rich:treeNode type="song" iconLeaf="/images/tree/song.png" icon="/images/tree/song.png">
                 <h:outputText value="#{item.title}" />
             </rich:treeNode>
         </rich:tree>
@@ -200,11 +200,11 @@
     <programlisting role="JAVA"><![CDATA[...
       <h:form>    
         <rich:tree style="width:300px" value="#{library.data}" var="item" nodeFace="#{item.type}">
-            <rich:treeNode type="artist" iconLeaf="/images/tree/singer.gif" icon="/images/tree/singer.gif"
+            <rich:treeNode type="artist" iconLeaf="/images/tree/singer.png" icon="/images/tree/singer.png"
                       rendered="#{item.exist}">
                 <h:outputText value="#{item.name}" />
             </rich:treeNode>
-          <rich:treeNode type="artist" iconLeaf="/images/tree/singer.gif" icon="/images/tree/singer_absent.gif"
+          <rich:treeNode type="artist" iconLeaf="/images/tree/singer.png" icon="/images/tree/singer_absent.png"
                       rendered="#{not item.exist}">
                 <h:outputText value="#{item.name}" />
             </rich:treeNode>
@@ -278,16 +278,16 @@
     <rich:tree ....>
         ...
         <f:facet name="icon">
-            <h:graphicImage value="/images/tree/singer.gif "/>
+            <h:graphicImage value="/images/tree/singer.png "/>
         </f:facet>
         <f:facet name="iconCollapsed">
-            <h:graphicImage value="/images/tree/singer.gif " />
+            <h:graphicImage value="/images/tree/singer.png " />
         </f:facet>      
         <f:facet name="iconExpanded">
-            <h:graphicImage value="/images/tree/singer.gif " />
+            <h:graphicImage value="/images/tree/singer.png " />
         </f:facet>
         <f:facet name="iconLeaf">
-            <h:graphicImage value="/images/tree/song.gif " />
+            <h:graphicImage value="/images/tree/song.png " />
         </f:facet>
           ...
     </rich:tree>
@@ -307,7 +307,298 @@
         <property>&quot;ajaxSubmitSelection&quot;</property>
       </emphasis>, for instance. </para>
 
+  </section-->
+
+  <section>
+    <title>Details of Usage</title>
+    <para>As it has been mentioned <link linkend="tree">above</link> the <emphasis role="bold">
+        <property>&lt;rich:tree&gt;</property>
+      </emphasis> component allows rendering any tree-like data model.</para>
+    <para>The component interacts with data model through
+      <property>&quot;TreeNode&quot;</property> interface (<ulink
+        url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone/docs/apidoc_framework/org/richfaces/model/TreeNode.html"
+        >org.richfaces.model.TreeNode</ulink>) that is used for tree nodes representation. The <emphasis>
+        <property>&quot;value&quot;</property>
+      </emphasis> attribute of the <emphasis role="bold">
+        <property>&lt;rich:tree&gt;</property>
+      </emphasis> component contains a nodes structure defined in a bean property. The property
+      keeps a structure of objects that implement <property>&quot;TreeNode&quot;</property>
+      interface.</para>
+    <para><property>&quot;TreeNode&quot;</property> has a property
+        <property>&quot;data&quot;</property> (see <ulink
+        url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone/docs/apidoc_framework/org/richfaces/model/TreeNode.html"
+        >org.richfaces.model.TreeNode</ulink>). Data contained in the property are placed in a
+      request scope variable, which name is defined with <emphasis>
+        <property>&quot;var&quot;</property>
+      </emphasis> attribute for the <emphasis role="bold">
+        <property>&lt;rich:tree&gt;</property>
+      </emphasis> component.</para>
+    <para>You can develop and use your own implementation for the
+        <property>&quot;TreeNode&quot;</property> interface or use a default implementation,
+      which is defined with a default class <property>&quot;TreeNodeImpl&quot;</property>
+        (<ulink
+        url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone/docs/apidoc_framework/org/richfaces/model/TreeNodeImpl.html"
+        >org.richfaces.model.TreeNodeImpl</ulink>).</para>
+    <para>There is <property>&quot;XmlTreeDataBuilder&quot;</property> class (<ulink
+        url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/xml/XmlTreeDataBuilder.html"
+        >org.richfaces.component.xml.XmlTreeDataBuilder</ulink>) that allows transforming XML into
+      structures of objects containing <property>&quot;XmlNodeData&quot;</property> (<ulink
+        url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone/docs/apidoc_framework/org/richfaces/component/xml/XmlNodeData.html"
+        >org.richfaces.component.xml.XmlNodeData</ulink>) instances as data, which could be
+      represented by the <emphasis role="bold">
+        <property>&lt;rich:tree&gt;</property>
+      </emphasis> component.</para>
+    <para>It&apos;s possible to define a visual representation of a data model node (to define a
+      node icon) and its behavior in a compliance with data contained in this node (with a value of
+      the <emphasis>
+        <property>&quot;var&quot;</property>
+      </emphasis> attribute). The node behavior is defined by components nested to the <emphasis
+        role="bold">
+        <property>&lt;rich:treeNode&gt;</property>
+      </emphasis> (it could be links or buttons, for example). For these purposes you should use <emphasis>
+        <property>&quot;nodeFace&quot;</property>
+      </emphasis> attribute. For each tree node a value of <emphasis>
+        <property>&quot;nodeFace&quot;</property>
+      </emphasis> attribute is evaluated and <emphasis role="bold">
+        <property>&lt;rich:treeNode&gt;</property>
+      </emphasis> with a value of <emphasis>
+        <property>&quot;type&quot;</property>
+      </emphasis> attribute equal to a value of <emphasis>
+        <property>&quot;nodeFace&quot;</property>
+      </emphasis> is used for node representation. An example is placed below.</para>
+
+    <para id="example">
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+
+    <programlisting role="JAVA"><![CDATA[...
+      <h:form>    
+        <rich:tree style="width:300px" value="#{library.data}" var="item" nodeFace="#{item.type}">
+            <rich:treeNode type="artist" iconLeaf="/images/tree/singer.png" icon="/images/tree/singer.png">
+                <h:outputText value="#{item.name}" />
+            </rich:treeNode>
+            <rich:treeNode type="album" iconLeaf="/images/tree/disc.png" icon="/images/tree/disc.png">
+                <h:outputText value="#{item.title}" />
+            </rich:treeNode>
+            <rich:treeNode type="song" iconLeaf="/images/tree/song.png" icon="/images/tree/song.png">
+                <h:outputText value="#{item.title}" />
+            </rich:treeNode>
+        </rich:tree>
+</h:form>
+...]]></programlisting>
+    <para>This is a result: </para>
+    <figure>
+      <title>The <emphasis>
+          <property>&quot;nodeFace&quot;</property>
+        </emphasis> attribute usage</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/tree2.png"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+    <para>In the example when each node of data model is processed, data contained in the property
+        <property>&quot;data&quot;</property> of
+      <property>&quot;TreeNode&quot;</property> interface are placed in a request scope
+      variable, which name is defined with <emphasis>
+        <property>&quot;var&quot;</property>
+      </emphasis> attribute. The value of the <emphasis>
+        <property>&quot;nodeFace&quot;</property>
+      </emphasis> attribute is evaluated in compliance with data placed in the <emphasis>
+        <property>&quot;var&quot;</property>
+      </emphasis> attribute. And for the node representation is used corresponding <emphasis
+        role="bold">
+        <property>&lt;rich:treeNode&gt;</property>
+      </emphasis> component (with a value of <emphasis>
+        <property>&quot;type&quot;</property>
+      </emphasis> attribute equal to a value of <emphasis>
+        <property>&quot;nodeFace&quot;</property>
+      </emphasis>). For example, during processing of data model an object with name &quot;Chris
+      Rea&quot; was placed in the <emphasis>
+        <property>&quot;var&quot;</property>
+      </emphasis> attribute. Then value of <emphasis>
+        <property>&quot;nodeFace&quot;</property>
+      </emphasis> attribute is evaluated as &quot;artist&quot;. Thus, for node
+      representation the <emphasis role="bold">
+        <property>&lt;rich:treeNode&gt;</property>
+      </emphasis> with <emphasis>
+        <property>&quot;type&quot;</property>
+      </emphasis> equal to &quot;artist&quot; is used.</para>
+    <para>Also you can define an EL-expression as value of the <emphasis>
+        <property>&quot;nodeFace&quot;</property>
+      </emphasis> attribute. See an example below: </para>
+    <para>
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+    <programlisting role="JAVA"><![CDATA[nodeFace="#{data.name != 'param-value' ? 'artist' : 'album'}" ]]></programlisting>
+    <para>There are some essential moments in a <emphasis>
+        <property>&quot;nodeFace&quot;</property>
+      </emphasis> attribute usage. For their description it&apos;s necessary to define notions
+      of a <property>&quot;typeless node&quot;</property> and a <property>&quot;default
+        node&quot;</property>.</para>
+    <para>The <property>typeless node</property> is the first <emphasis role="bold">
+        <property>&lt;rich:treeNode&gt;</property>
+      </emphasis> component (from all children nodes nested to the <emphasis role="bold">
+        <property>&lt;rich:tree&gt;</property>
+      </emphasis> component) with not defined <emphasis>
+        <property>&quot;type&quot;</property>
+      </emphasis> attribute and defined <emphasis>
+        <property>&quot;rendered&quot;</property>
+      </emphasis> attribute. The <property>typeless node</property> is used for representation when <emphasis>
+        <property>&quot;nodeFace&quot;</property>
+      </emphasis> attribute is null.</para>
+    <para><property>Default node</property> has the following interior presentation:</para>
+    <para>
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+    <programlisting role="JAVA"><![CDATA[<h: outputText value="#{varAttributeName}">]]></programlisting>
+    <para>
+      <property>&quot;varAttributeName&quot;</property> is a value for <emphasis>
+        <property>&quot;var&quot;</property>
+      </emphasis> attribute. </para>
+    <para><property>Default node</property> is used in the following cases:</para>
+    <itemizedlist>
+      <listitem><emphasis>
+          <property>&quot;nodeFace&quot;</property>
+        </emphasis> attribute is defined, but its value isn&apos;t equal to any <emphasis>
+          <property>&quot;type&quot;</property>
+        </emphasis> attribute value from all children nodes;</listitem>
+      <listitem><emphasis>
+          <property>&quot;nodeFace&quot;</property>
+        </emphasis> attribute is defined and its value is equal to a value of some <emphasis>
+          <property>&quot;type&quot;</property>
+        </emphasis> attribute from all children nodes , but the value of <emphasis>
+          <property>&quot;rendered&quot;</property>
+        </emphasis> attribute for this node is
+      <property>&quot;false&quot;</property>.</listitem>
+    </itemizedlist>
+    <para>There is also one especial moment in the <emphasis>
+        <property>&quot;type&quot;</property>
+      </emphasis> and <emphasis>
+        <property>&quot;rendered&quot;</property>
+      </emphasis> attributes usage. It&apos;s possible to define several <emphasis role="bold">
+        <property>&lt;rich:treeNode&gt;</property>
+      </emphasis> components with the equal values of <emphasis>
+        <property>&quot;type&quot;</property>
+      </emphasis> attribute and different values of <emphasis>
+        <property>&quot;rendered&quot;</property>
+      </emphasis> attribute. It provides the possibility to define different representation for the
+      same nodes type. In the example with artists and their albums (see <link linkend="example"
+        >above</link>) it&apos;s possible to represent albums that are available for sale and
+      albums that are not available. An example is placed below:</para>
+    <para>
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+
+    <programlisting role="JAVA"><![CDATA[...
+      <h:form>    
+        <rich:tree style="width:300px" value="#{library.data}" var="item" nodeFace="#{item.type}">
+            ...
+            <rich:treeNode type="album" iconLeaf="/images/tree/album.gif" icon="/images/tree/album.gif"
+                      rendered="#{item.exist}">
+                <h:outputText value="#{item.name}" />
+            </rich:treeNode>
+          <rich:treeNode type="album" iconLeaf="/images/tree/album_absent.gif" icon="/images/tree/album_absent.gif"
+                      rendered="#{not item.exist}">
+                <h:outputText value="#{item.name}" />
+            </rich:treeNode>
+            ...
+        </rich:tree>
+</h:form>
+...]]></programlisting>
+    <para>This is a result: </para>
+    <figure>
+      <title>The <emphasis>
+          <property>&quot;type&quot;</property>
+        </emphasis> and the <emphasis>
+          <property>&quot;rendered&quot;</property>
+        </emphasis> attributes usage</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/tree4.png"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+    <para>In the example the <emphasis role="bold">
+        <property>&lt;rich:treeNode&gt;</property>
+      </emphasis> components has equal values of the <emphasis>
+        <property>&quot;type&quot;</property>
+      </emphasis> attribute. In a compliance with value of the <emphasis>
+        <property>&quot;rendered&quot;</property>
+      </emphasis> attribute corresponding <emphasis role="bold">
+        <property>&lt;rich:treeNode&gt;</property>
+      </emphasis> component is selected for node representation. If an album is available for sale
+      the value of the <emphasis>
+        <property>&quot;rendered&quot;</property>
+      </emphasis> for the first <emphasis>
+        <property>&lt;rich:treeNode&gt;</property>
+      </emphasis> component is <property>&quot;true&quot;</property>, for the second one is
+        <property>&quot;false&quot;</property>. Thus, the first <emphasis role="bold">
+        <property>&lt;rich:treeNode&gt;</property>
+      </emphasis> is selected for node representation. </para>
+    <para>Switching on tree nodes could be performed in three modes. Modes could be specified with <emphasis>
+        <property>&quot;switchType&quot;</property>
+      </emphasis> attribute for<emphasis role="bold">
+        <property>&lt;rich:tree&gt;</property>
+      </emphasis> component.</para>
+    <itemizedlist>
+      <listitem>Ajax (default value) - Ajax submission is used for switching. Note, that for
+        collapse/expand operations it is sent an Ajax request to the server. It could be seen a
+        short delay in this case.</listitem>
+      <listitem>Server - regular form submission request is used. Note, that all nodes actually
+        render up-front and expanding/collapsing do not require server call.</listitem>
+      <listitem>Client - switching is done as a whole on a client, no interaction with a server
+        presents. Full page content is reloaded after every click.</listitem>
+    </itemizedlist>
+    <para> The <emphasis>
+      <property>&quot;icon&quot;</property>
+    </emphasis>, <emphasis>
+      <property>&quot;iconCollapsed&quot;</property>
+    </emphasis>, <emphasis>
+      <property>&quot;iconExpanded&quot;</property>
+    </emphasis>, <emphasis>
+      <property>&quot;iconLeaf&quot;</property>
+    </emphasis> attributes define icons for the component. Also you can define icons using facets
+      with the same names. If the facets are defined, the corresponding attributes are ignored and
+      facets contents are used as icons. By default the width of a rendered facet area is 16px. </para>
+    <para>
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+    
+    <programlisting role="JAVA"><![CDATA[...
+    <rich:tree ....>
+        ...
+        <f:facet name="icon">
+            <h:graphicImage value="/images/tree/singer.png "/>
+        </f:facet>
+        <f:facet name="iconCollapsed">
+            <h:graphicImage value="/images/tree/singer.png " />
+        </f:facet>      
+        <f:facet name="iconExpanded">
+            <h:graphicImage value="/images/tree/singer.png " />
+        </f:facet>
+        <f:facet name="iconLeaf">
+            <h:graphicImage value="/images/tree/song.png " />
+        </f:facet>
+          ...
+    </rich:tree>
+...]]></programlisting>
+    
+    <para> The <emphasis role="bold">
+      <property>&lt;rich: tree&gt;</property>
+    </emphasis> component can be used together with <emphasis role="bold">
+      <property>&lt;rich: treeNodeAdaptor&gt;</property>
+    </emphasis>. In this case there is no need to specify the attributes <emphasis>
+      <property>&quot;value&quot;</property>
+    </emphasis> and <emphasis>
+      <property>&quot;var&quot;</property>
+    </emphasis>. Besides, visual representation shouldn&apos;t be defined right in the
+      <property>tree</property>. In this case a tree tag is intended mainly for defining common
+      attributes such as <emphasis>
+        <property>&quot;ajaxSubmitSelection&quot;</property>
+      </emphasis>, for instance. </para>
   </section>
+
   <section>
     <title>Built-In Drag and Drop</title>
     <para>The <emphasis role="bold">
@@ -382,14 +673,14 @@
     <programlisting role="JAVA"><![CDATA[...
     <h:form>    
         <rich:tree dragIndicator=":treeDragIndicator" dropListener="#{libraryAjaxTree.processDrop}" style="width:300px" value="#{libraryAjaxTree.data}" var="item" nodeFace="#{item.type}">
-            <rich:treeNode type="artist" acceptedTypes="album" iconLeaf="/images/tree/group.gif" icon="/images/tree/group.gif">
+            <rich:treeNode type="artist" acceptedTypes="album" iconLeaf="/images/tree/group.png" icon="/images/tree/group.png">
                 <h:outputText value="#{item.name}" />
             </rich:treeNode>
-            <rich:treeNode type="album" dragType="album" acceptedTypes="song" iconLeaf="/images/tree/cd.gif" icon="/images/tree/cd.gif">
+            <rich:treeNode type="album" dragType="album" acceptedTypes="song" iconLeaf="/images/tree/cd.png" icon="/images/tree/cd.png">
                 <h:outputText value="#{item.title}" />
                 <rich:dndParam name="label" type="drag" value="Album: #{item.title}" />
             </rich:treeNode>
-            <rich:treeNode type="song" dragType="song" iconLeaf="/images/tree/music.gif" icon="/images/tree/music.gif">
+            <rich:treeNode type="song" dragType="song" iconLeaf="/images/tree/music.png" icon="/images/tree/music.png">
                 <h:outputText value="#{item.title}" />
                 <rich:dndParam name="label" type="drag" value="Song: #{item.title}" />
             </rich:treeNode>
@@ -404,8 +695,8 @@
         <property>&quot;acceptedTypes&quot;</property>
       </emphasis>=&quot;song&quot;. Its value is equal to the value of the<emphasis>
         <property>&quot;type&quot;</property>
-      </emphasis>attribute defined for the third treeNode (see picture below).
-      Also an album can be dragged into <property>treeNode</property> with <emphasis>
+      </emphasis>attribute defined for the third treeNode (see picture below). Also an album can be
+      dragged into <property>treeNode</property> with <emphasis>
         <property>&quot;type&quot;</property>
       </emphasis>=&quot;artist&quot;.</para>
 

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,7 +9,7 @@
 <title>Description</title>
     <para>A component is used for designing templates for nodes definition.</para>
     <figure>
-    <title>TreeNode component</title>
+        <title>&lt;rich:treeNode&gt; component</title>
     <mediaobject> 
         <imageobject>
             <imagedata fileref="images/treeNode.png"/>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNode.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -70,45 +70,9 @@
 ...
 ]]></programlisting>
   </section>
+  
   <section>
     <title>Details of Usage</title>
-    <para> The <emphasis>
-        <property>&quot;icon&quot;</property>
-      </emphasis>, <emphasis>
-        <property>&quot;iconCollapsed&quot;</property>
-      </emphasis>, <emphasis>
-        <property>&quot;iconExpanded&quot;</property>
-      </emphasis>, <emphasis>
-        <property>&quot;iconLeaf&quot;</property>
-      </emphasis> attributes define icons for the component. Also you can define icons using facets
-      with the same names. If the facets are defined, the corresponding attributes are ignored and
-      facets contents are used as icons. The width of a rendered facet area is 16px. </para>
-	  
-	  <programlisting role="JAVA"><![CDATA[...
-    <rich:tree ...>
-        ...
-        <rich:treeNode ...>
-            <f:facet name="icon">
-                <hutputText value="A"/>
-            </f:facet>
-            <f:facet name="iconCollapsed">
-                <hutputText value="B"/>
-            </f:facet>		
-            <f:facet name="iconExpanded">
-                <hutputText value="C"/>
-            </f:facet>
-            <f:facet name="iconLeaf">
-                <hutputText value="D"/>
-            </f:facet>
-        </rich:treeNode>
-        ...
-    </rich:tree>
-...
-]]></programlisting>
-
-  </section>
-  <section>
-    <title>Details of Usage</title>
     <para>As it has been mentioned <link linkend="treeNode">above</link>, <property>treeNode</property> defines a template for nodes
       rendering in a tree. Thus, during XML document rendering (a web.xml application) as a tree,
       the following nodes output (passed via var=&quot;data&quot; on a tree) happens:</para>
@@ -146,6 +110,39 @@
       mouse, it&apos;s managed with the <emphasis>
         <property>&quot;ajaxSubmitSelection&quot;</property>
       </emphasis> attribute (true/false).</para>
+    <para> The <emphasis>
+      <property>&quot;icon&quot;</property>
+    </emphasis>, <emphasis>
+      <property>&quot;iconCollapsed&quot;</property>
+    </emphasis>, <emphasis>
+      <property>&quot;iconExpanded&quot;</property>
+    </emphasis>, <emphasis>
+      <property>&quot;iconLeaf&quot;</property>
+    </emphasis> attributes define icons for the component. Also you can define icons using facets
+      with the same names. If the facets are defined, the corresponding attributes are ignored and
+      facets contents are used as icons. By default the width of a rendered facet area is 16px. </para>
+    <para>
+      <emphasis role="bold">Example:</emphasis>
+    </para>
+    
+    <programlisting role="JAVA"><![CDATA[...
+    <rich:tree ....>
+        ...
+        <f:facet name="icon">
+            <h:graphicImage value="/images/tree/singer.png "/>
+        </f:facet>
+        <f:facet name="iconCollapsed">
+            <h:graphicImage value="/images/tree/singer.png " />
+        </f:facet>      
+        <f:facet name="iconExpanded">
+            <h:graphicImage value="/images/tree/singer.png " />
+        </f:facet>
+        <f:facet name="iconLeaf">
+            <h:graphicImage value="/images/tree/song.png " />
+        </f:facet>
+          ...
+    </rich:tree>
+...]]></programlisting>
   </section>
   <section>
     <title>Built-in Drag and Drop</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -12,7 +12,7 @@
 		</para>
 		
 		<figure>
-        <title>Expanded tree with treeNodesAdaptor</title>    
+		    <title>Expanded tree with &lt;rich:treeNodesAdaptor&gt;</title>    
 		<mediaobject> 
 			<imageobject>
 				<imagedata fileref="images/treeNodesAdaptor1.png"/>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.desc.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -9,7 +9,7 @@
 <title>Description</title>
     <para>The component presents the Microsoft <property>Virtual Earth map</property> in the JSF applications.</para>
     <figure>
-        <title>virtualEarth component</title>
+        <title>&lt;rich:virtualEarth&gt; component</title>
     <mediaobject> 
         <imageobject>
             <imagedata fileref="images/virtualEarth.png"/>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/virtualEarth.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -99,7 +99,7 @@
         <property>&quot;zoom&quot;</property>
       </emphasis>= 11.</para>
     <figure>
-      <title>virtualEarth initial rendering</title>
+      <title>&lt;rich:virtualEarth&gt; initial rendering</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/virtualEarth1.png"/>
@@ -130,7 +130,18 @@
       <listitem> onmouseout </listitem>
       <listitem> etc. </listitem>
     </itemizedlist>
-
+    
+    <note>
+      <para>
+        Virtual Earth does not support XHTML format of the page. 
+        Thus, if you use Facelets and JSF 1.2, do not forget to put the following tags somewhere on the page:
+      </para>
+      <programlisting role="XML"><![CDATA[...
+<f:view contentType="text/html">...</f:view>
+...
+]]></programlisting>
+    </note>
+    
   </section>
   <section>
     <title>Look-and-Feel Customization</title>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -28,7 +28,7 @@
     </figure>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/newpic1.jpg" scalefit="1"/>
+        <imagedata fileref="images/newpic1.png" scalefit="1"/>
       </imageobject>
     </mediaobject>
     <para><property>RichFaces</property> allows to define (by means of JSF tags) different parts of
@@ -47,7 +47,7 @@
     </figure>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/newpic2.jpg"/>
+        <imagedata fileref="images/newpic2.png"/>
       </imageobject>
     </mediaobject>
     <formalpara>
@@ -68,7 +68,7 @@
     </figure>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/newpic3.jpg" scalefit="1"/>
+        <imagedata fileref="images/newpic3.png" scalefit="1"/>
       </imageobject>
     </mediaobject>
     <para>In both cases, the information about required static or dynamic resources that your
@@ -84,7 +84,7 @@
     </figure>
     <mediaobject>
       <imageobject>
-        <imagedata fileref="images/newpic4.jpg" scalefit="1"/>
+        <imagedata fileref="images/newpic4.png" scalefit="1"/>
       </imageobject>
     </mediaobject>
     <formalpara>
@@ -293,7 +293,7 @@
         </emphasis> attribute is defined. In addition, Richfaces starts to remove from the queue
         &quot;similar&quot; requests. &quot;Similar'&quot;requests are the requests
         produced by the same event. For example, according to the following code, only the newest
-        request will be sent to the server if a user types very fast and has typed the several
+        request will be sent to the server if you type very fast and has typed the several
         characters already before the previous Ajax Response is back.</para>
 
       <programlisting role="XML"><![CDATA[...
@@ -344,7 +344,7 @@
       <?dbhtml filename="DataProcessingOptions.html"?>
       <title>Data Processing Options</title>
       <para>RichFaces uses form based approach for Ajax request sending. This means each time, when
-        a user click an Ajax button or <emphasis role="bold">
+         you click an Ajax button or <emphasis role="bold">
           <property>&lt;a4j:poll&gt;</property>
         </emphasis> produces an asynchronous request, the data from the closest JSF form is
         submitted with the XMLHTTPRequest object. The form data contains the values from the form
@@ -400,7 +400,7 @@
       <para><emphasis>
           <property>&quot;bypassUpdates&quot;</property>
         </emphasis> attribute allows to bypass the Update Model phase. It might be useful if you
-        need to check user input against the available validator, but not to update the model with
+        need to check your input against the available validator, but not to update the model with
         those data. Note, that an action will be invoked at the end of the Validation phase only if
         the Validation phase is passed successfully. The listeners of the Application phase will not
         be invoked in any case.</para>
@@ -445,7 +445,7 @@
           </emphasis> with <emphasis role="bold">
             <property>&lt;a4j:commandButton&gt;</property>
           </emphasis> and point to the action method that navigates to the next page. If Validation
-          process fails, the partial page update will occur and a user will see an error message.
+          process fails, the partial page update will occur and you will see an error message.
           Otherwize, the application proceeds to the next page. Make sure, you define
           &lt;redirect/&gt; option for the navigation rule to avoid memory leaks.</listitem>
       </itemizedlist>
@@ -915,6 +915,19 @@
       use it unless you obtain the newest (or modified) version of the script and want to include
       it manually in a page header. </para>
     
+    <note>
+      <para>
+        If you use &quot;ALL&quot; value of Scripts Load Strategy, make sure you turn the JavaScript files compression off:
+      </para>
+      <programlisting role="XML"><![CDATA[...
+<context-param>
+	  <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
+	  <param-value>false</param-value>
+</context-param>	
+...
+]]></programlisting>
+    </note>
+    
     <para>
       <emphasis role="bold">org.richfaces.LoadStyleStrategy</emphasis>
     </para>

Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/modules/RFCtechreqs.xml	2008-01-25 15:20:39 UTC (rev 5628)
@@ -71,7 +71,7 @@
     <title>Supported Java Versions</title>
 
     <itemizedlist>
-      <listitem>JDK 1.5 and higher</listitem>
+      <listitem>JDK 1.4 and higher</listitem>
     </itemizedlist>
   </section>
 

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/css/html.css
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/resources/css/html.css	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/userguide/en/src/main/resources/css/html.css	2008-01-25 15:20:39 UTC (rev 5628)
@@ -127,7 +127,7 @@
 	MARGIN-TOP: 0px; MARGIN-BOTTOM: 1em; PADDING-BOTTOM: 0px; PADDING-TOP: 0px
 }
 DIV.important {
-	BORDER: #CECECE  1px solid; PADDING: 3px 10px 10px 50px; line-height : 14px;   MARGIN: 10px 0px 10px 0px; FONT-SIZE: 11px; WIDTH: 500px; BACKGROUND-COLOR: #CFE3FF;
+	BORDER: #CECECE  1px solid; PADDING: 3px 10px 10px 50px; line-height : 14px;   MARGIN: 10px 0px 10px 0px; FONT-SIZE: 11px; WIDTH: 500px; BACKGROUND-COLOR: #fee3d9;
 	background-image : url('../images/ico_important.gif'); background-repeat : no-repeat; background-position :top left; 
 }
 
@@ -140,7 +140,19 @@
 
 }
 
+DIV.tip {
+	BORDER: #CECECE  1px solid; PADDING: 3px 10px 10px 50px; line-height : 14px;   MARGIN: 10px 0px 10px 0px; FONT-SIZE: 11px; WIDTH: 500px; BACKGROUND-COLOR: #CFE3FF; background-repeat : no-repeat; background-position :top left; background-image : url('../images/ico_tip.gif');
+}
 
+DIV.tip *{
+	line-height : 14px;
+}
+
+.tip pre.XML {
+PADDING: 1px 1px 1px 10px;
+
+}
+
 TABLE {
 	BORDER: #cccccc 1px solid; FONT-SIZE: 11px; BORDER-COLLAPSE: collapse;  border-spacing: 0; empty-cells: hide; margin-bottom : 10px;
 }

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/calendar1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/contextMenu_attached.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/contextMenu_classes.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/dataTable2.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/dataTable3.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/datadefinitionlist2.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/datagrid1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/datagrid2.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/datalist1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/datalist2.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/datalist3.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/dataorderedlist1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/dataorderedlist2.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/datascroller3.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/dropDownMenu1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/dropDownMenu2.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/dropDownMenu3.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/dropDownMenu4.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/dropDownMenu5.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/ico_important.gif
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/inputNumberSpinner3.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/listShuttle1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/listShuttle_classes_s.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/listShuttle_classes_t.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/menuGroup1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/menuGroup2.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/menuGroup3.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/menuItem1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/menuItem2.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/menuSeparator1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/message.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/messages.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/messages1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/mp_4.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/orderinList1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/panel3.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/panelMenuGroup_icons.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenu.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenu1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenugroup1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenugroup_col.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenugroup_exp.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/panelmenuitem.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/recursiveTreeNodesAdaptor1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/scrollable-dt1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/scrollableDataTable.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/sdt.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/simpleTogglePanel3.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/slider5.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/tab1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/tooltip1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/tree1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/tree2.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/tree3.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/tree4.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/tree5.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/treeNode.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/treeNode2.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/treeNode3.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/userguide/en/src/main/resources/images/treeNodesAdaptor1.png
===================================================================
(Binary files differ)

Modified: branches/3.1.x/docs/xslt/en/src/main/xslt/fopdf.xsl
===================================================================
--- branches/3.1.x/docs/xslt/en/src/main/xslt/fopdf.xsl	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/xslt/en/src/main/xslt/fopdf.xsl	2008-01-25 15:20:39 UTC (rev 5628)
@@ -295,8 +295,15 @@
                              Images
         ################################################### -->
 
-	<xsl:param name="default.image.width" select="'175mm'"></xsl:param>
+	<!--xsl:param name="default.image.width" select="'175mm'"></xsl:param-->
+        
+    <xsl:attribute-set name="figure.properties" 
+        use-attribute-sets="mediaobject.imageobject.properties"/>
     
+    <xsl:attribute-set name="mediaobject.imageobject.properties">
+        <xsl:attribute name="text-align">center</xsl:attribute>
+    </xsl:attribute-set>
+    
     <!--###################################################
                              Labels
         ################################################### -->

Modified: branches/3.1.x/docs/xslt/en/src/main/xslt/html.xsl
===================================================================
--- branches/3.1.x/docs/xslt/en/src/main/xslt/html.xsl	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/xslt/en/src/main/xslt/html.xsl	2008-01-25 15:20:39 UTC (rev 5628)
@@ -85,4 +85,7 @@
     <xsl:template match="section[@role = 'NotInToc']//*"  mode="toc" />
     <xsl:template match="chapter[@role = 'NotInToc']//section//*"  mode="toc" />
 	    
+    <!-- Ignore image scaling in html version -->
+    <xsl:param name="ignore.image.scaling" select="1"/>	    
+    
 </xsl:stylesheet>

Modified: branches/3.1.x/docs/xslt/en/src/main/xslt/html_chunk.xsl
===================================================================
--- branches/3.1.x/docs/xslt/en/src/main/xslt/html_chunk.xsl	2008-01-25 14:34:08 UTC (rev 5627)
+++ branches/3.1.x/docs/xslt/en/src/main/xslt/html_chunk.xsl	2008-01-25 15:20:39 UTC (rev 5628)
@@ -91,4 +91,96 @@
     <xsl:template match="chapter[@role = 'NotInToc']//section//*"  mode="toc" />
     <xsl:template match="book" mode="object.title.markup"/>
     
+  <!-- Ignore image scaling in html version -->
+  <xsl:param name="ignore.image.scaling" select="1"/>	   
+  
+<!--###################################################
+                          Forse chunks
+    ################################################### -->   
+
+
+<xsl:template name="chunk">
+  <xsl:param name="node" select="."/>
+  
+  <xsl:choose>
+    <xsl:when test="not($node/parent::*)">1</xsl:when>
+    <xsl:when test="$node/parent::node()/processing-instruction('forseChanks')">1</xsl:when>
+    <xsl:when test="local-name($node) = 'sect1'
+                    and $chunk.section.depth &gt;= 1
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::sect1) &gt; 0)">
+      <xsl:text>1</xsl:text>
+    </xsl:when>
+    <xsl:when test="local-name($node) = 'sect2'
+                    and $chunk.section.depth &gt;= 2
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::sect2) &gt; 0)">
+      <xsl:call-template name="chunk">
+        <xsl:with-param name="node" select="$node/parent::*"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="local-name($node) = 'sect3'
+                    and $chunk.section.depth &gt;= 3
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::sect3) &gt; 0)">
+      <xsl:call-template name="chunk">
+        <xsl:with-param name="node" select="$node/parent::*"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="local-name($node) = 'sect4'
+                    and $chunk.section.depth &gt;= 4
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::sect4) &gt; 0)">
+      <xsl:call-template name="chunk">
+        <xsl:with-param name="node" select="$node/parent::*"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="local-name($node) = 'sect5'
+                    and $chunk.section.depth &gt;= 5
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::sect5) &gt; 0)">
+      <xsl:call-template name="chunk">
+        <xsl:with-param name="node" select="$node/parent::*"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="local-name($node) = 'section'
+                    and $chunk.section.depth &gt;= count($node/ancestor::section)+1
+                    and ($chunk.first.sections != 0
+                         or count($node/preceding-sibling::section) &gt; 0)">
+      <xsl:call-template name="chunk">
+        <xsl:with-param name="node" select="$node/parent::*"/>
+      </xsl:call-template>
+    </xsl:when>
+
+    <xsl:when test="local-name($node)='preface'">1</xsl:when>
+    <xsl:when test="local-name($node)='chapter'">1</xsl:when>
+    <xsl:when test="local-name($node)='appendix'">1</xsl:when>
+    <xsl:when test="local-name($node)='article'">1</xsl:when>
+    <xsl:when test="local-name($node)='part'">1</xsl:when>
+    <xsl:when test="local-name($node)='reference'">1</xsl:when>
+    <xsl:when test="local-name($node)='refentry'">1</xsl:when>
+    <xsl:when test="local-name($node)='index' and ($generate.index != 0 or count($node/*) > 0)
+                    and (local-name($node/parent::*) = 'article'
+                    or local-name($node/parent::*) = 'book'
+                    or local-name($node/parent::*) = 'part'
+                    )">1</xsl:when>
+    <xsl:when test="local-name($node)='bibliography'
+                    and (local-name($node/parent::*) = 'article'
+                    or local-name($node/parent::*) = 'book'
+                    or local-name($node/parent::*) = 'part'
+                    )">1</xsl:when>
+    <xsl:when test="local-name($node)='glossary'
+                    and (local-name($node/parent::*) = 'article'
+                    or local-name($node/parent::*) = 'book'
+                    or local-name($node/parent::*) = 'part'
+                    )">1</xsl:when>
+    <xsl:when test="local-name($node)='colophon'">1</xsl:when>
+    <xsl:when test="local-name($node)='book'">1</xsl:when>
+    <xsl:when test="local-name($node)='set'">1</xsl:when>
+    <xsl:when test="local-name($node)='setindex'">1</xsl:when>
+    <xsl:when test="local-name($node)='legalnotice'
+                    and $generate.legalnotice.link != 0">1</xsl:when>
+    <xsl:otherwise>0</xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
 </xsl:stylesheet>




More information about the richfaces-svn-commits mailing list