# HG changeset patch
# User Bettina Gruenbauer <bettina@intevation.de>
# Date 1358844963 -3600
# Node ID 0f3649285a0c62e373d4c386e5a32176b035734e
# Parent  fbc14d68788519d51c27845d48dae177c9ea6670# Parent  92ba5ffb8ba846742dec136e23f36a4740bff9d7
merge

diff -r 92ba5ffb8ba8 -r 0f3649285a0c flys-artifacts/doc/conf/artifacts/minfo.xml
--- a/flys-artifacts/doc/conf/artifacts/minfo.xml	Mon Jan 21 19:36:53 2013 +0100
+++ b/flys-artifacts/doc/conf/artifacts/minfo.xml	Tue Jan 22 09:56:03 2013 +0100
@@ -109,7 +109,8 @@
             <data name="diffids" type="String" />
         </state>
 
-        <state id="state.minfo.bed.periods" description="state.minfo.bed.periods" state="de.intevation.flys.artifacts.states.minfo.BedQualityPeriodsSelect">
+        <state id="state.minfo.bed.periods" description="state.minfo.bed.periods" state="de.intevation.flys.artifacts.states.minfo.BedQualityPeriodsSelect"
+				helpText="help.state.minfo.bed.periods">
             <data name="periods" type="String"/>
         </state>
 
@@ -244,7 +245,8 @@
             </outputmodes>
         </state>
 
-        <state id="state.minfo.bed.char_diameter" description="state.minfo.bed.char_diameter" state="de.intevation.flys.artifacts.states.minfo.CharDiameter">
+        <state id="state.minfo.bed.char_diameter" description="state.minfo.bed.char_diameter" state="de.intevation.flys.artifacts.states.minfo.CharDiameter"
+				helpText="help.state.minfo.bed.char_diameter">
             <data name="bed_diameter" type="options"/>
             <data name="load_diameter" type="options"/>
         </state>
@@ -396,16 +398,19 @@
             <condition data="ye_select" value="epoch" operator="equal"/>
         </transition>
 
-        <state id="state.minfo.sediment.load.period" description="state.minfo.bed.period" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadYearSelect">
+        <state id="state.minfo.sediment.load.period" description="state.minfo.bed.period" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadYearSelect"
+				helpText="help.state.minfo.sediment.load.period">
             <data name="start" type="Integer"/>
             <data name="end" type="Integer"/>
         </state>
 
-        <state id="state.minfo.sediment.load.epochs" description="state.minfo.bed.epochs" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadEpochSelect">
+        <state id="state.minfo.sediment.load.epochs" description="state.minfo.bed.epochs" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadEpochSelect"
+				helpText="help.state.minfo.sediment.load.epochs">
             <data name="epochs" type="String"/>
         </state>
 
-        <state id="state.minfo.sediment.load.off_epochs" description="state.minfo.bed.off_epochs" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadOffEpochSelect">
+        <state id="state.minfo.sediment.load.off_epochs" description="state.minfo.bed.off_epochs" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadOffEpochSelect"
+				helpText="help.state.minfo.sediment.load.off_epochs">
             <data name="epochs" type="String"/>
         </state>
 
@@ -424,7 +429,8 @@
             <to state="state.minfo.sediment.load.unit"/>
         </transition>
 
-        <state id="state.minfo.sediment.load.unit" description="state.minfo.sediment.load.unit" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadUnit">
+        <state id="state.minfo.sediment.load.unit" description="state.minfo.sediment.load.unit" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadUnit"
+				helpText="help.state.minfo.sediment.load.unit">
             <data name="unit" type="String"/>
         </state>