=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2015-04-08 22:57:51 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2015-04-08 23:26:45 +0000
@@ -265,6 +265,9 @@
         executeSql( "ALTER TABLE expression ALTER expression TYPE text" );
         executeSql( "ALTER TABLE translation ALTER value TYPE text" );
         executeSql( "ALTER TABLE organisationunit ALTER comment TYPE text" );
+        executeSql( "ALTER TABLE program ALTER description TYPE text" );
+        executeSql( "ALTER TABLE trackedentityattribute ALTER description TYPE text" );
+        executeSql( "ALTER TABLE trackedentityattributegroup ALTER description TYPE text" );
 
         executeSql( "ALTER TABLE minmaxdataelement RENAME minvalue TO minimumvalue" );
         executeSql( "ALTER TABLE minmaxdataelement RENAME maxvalue TO maximumvalue" );

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttribute.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttribute.hbm.xml	2015-04-08 04:43:57 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttribute.hbm.xml	2015-04-08 23:26:45 +0000
@@ -17,7 +17,7 @@
 
     <property name="shortName" column="shortname" not-null="false" unique="true" length="50" />
 
-    <property name="description" />
+    <property name="description" type="text"/>
 
     <property name="valueType" column="valuetype" not-null="true" />
 

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttributeGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttributeGroup.hbm.xml	2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttributeGroup.hbm.xml	2015-04-08 23:26:45 +0000
@@ -15,7 +15,7 @@
 
     <property name="name" column="name" not-null="true" unique="true" length="230" />
 
-    <property name="description" />
+    <property name="description" type="text"/>
 
     <property name="sortOrder" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2015-03-11 11:01:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js	2015-04-08 23:26:45 +0000
@@ -338,9 +338,6 @@
             "required" : true,
             "rangelength" : [ 2, 160 ]
         },
-        "description" : {
-            "rangelength" : [ 2, 160 ]
-        },
         "importance" : {
             "required" : true
         },
@@ -389,9 +386,6 @@
         "name" : {
             "required" : true,
             "rangelength" : [ 2, 160 ]
-        },
-        "description" : {
-            "rangelength" : [ 2, 160 ]
         }
     },
     "constant" : {
@@ -425,10 +419,6 @@
         "shortName" : {
             "required" : true,
             "rangelength" : [ 2, 50 ]
-        },
-        "description" : {
-            "required" : true,
-            "minlength" : 2
         }
     },
     "trackedEntityAttributeGroup" : {
@@ -436,10 +426,6 @@
             "required" : true,
             "rangelength" : [ 2,160 ]
         },
-        "description" : {
-            "required" : true,
-            "rangelength" : [ 2, 255 ]
-        },
         "attributeList" : {
             "required" : true
         }
@@ -462,10 +448,6 @@
         "name" : {
             "required" : true,
             "rangelength" : [ 2,160 ]
-        },
-        "description" : {
-            "required" : true,
-            "minlength" : 2
         }
     },
     "program" : {
@@ -473,10 +455,6 @@
             "required" : true,
             "rangelength" : [ 2,160 ]
         },
-        "description" : {
-            "required" : true,
-            "minlength" : 2
-        },
         "trackedEntityId" : {
             "required" : true
         },

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm	2015-04-08 04:43:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm	2015-04-08 23:26:45 +0000
@@ -46,8 +46,8 @@
     </tr>
     
     <tr>
-        <td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-        <td><textarea id="description" name="description" ></textarea></td>
+        <td><label for="description">$i18n.getString( "description" )</label></td>
+        <td><textarea id="description" name="description"></textarea></td>
         <td></td>
     </tr>
 	

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm	2014-09-26 11:31:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm	2015-04-08 23:26:45 +0000
@@ -13,8 +13,8 @@
 		<td><input type="text" id="name" name="name" /></td>
 	</tr> 	
 	<tr>
-		<td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="description" name="description" /></td>
+		<td><label for="description">$i18n.getString( "description" )</label></td>
+		<td><textarea id="description" name="description"></textarea></td>
 	</tr>
 	<tr>
 		<td colspan="2">&nbsp;</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm	2014-12-23 18:03:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm	2015-04-08 23:26:45 +0000
@@ -80,8 +80,8 @@
 		</tr>	
 		
 		<tr>
-			<td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-			<td><input type="text" id="description" name="description" ></td>
+			<td><label for="description">$i18n.getString( "description" )</label></td>
+			<td><textarea id="description" name="description"></textarea></td>
 			<td></td>
 		</tr>	
 		

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addTrackedEntity.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addTrackedEntity.vm	2015-03-19 09:11:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addTrackedEntity.vm	2015-04-08 23:26:45 +0000
@@ -30,7 +30,7 @@
 		</tr>   
 		
 		<tr>
-			<td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+			<td><label for="description">$i18n.getString( "description" )</label></td>
 			<td><input type="text" id="description" name="description" /></td>
 			<td></td>
 		</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm	2015-04-08 04:43:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm	2015-04-08 23:26:45 +0000
@@ -43,8 +43,8 @@
         <td><input type="text" id="code" name="code" value="$!encoder.htmlEncode( $attribute.code )"></label></td>
       </tr>      
       <tr>
-        <td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><textarea id="description" name="description" >$!encoder.htmlEncode( $attribute.description )</textarea></td>
+        <td><label for="description">$i18n.getString( "description" )</label></td>
+        <td><textarea id="description" name="description">$!encoder.htmlEncode( $attribute.description )</textarea></td>
       </tr>
       
     <tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm	2014-09-26 11:31:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm	2015-04-08 23:26:45 +0000
@@ -16,8 +16,8 @@
 		<td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $attributeGroup.name )" /></td>
 	</tr>   
 	<tr>
-		<td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
-		<td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $attributeGroup.description )" /></td>
+		<td><label for="description">$i18n.getString( "description" )</label></td>
+		<td><textarea id="description" name="description">$!encoder.htmlEncode( $attributeGroup.description )</textarea></td>
 	</tr>
 	<tr>
 		<td colspan="2" height="15px"></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm	2014-12-23 18:03:44 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm	2015-04-08 23:26:45 +0000
@@ -81,8 +81,8 @@
 		</tr>	
 		
 		<tr>
-			<td><label for="description">$i18n.getString( "description" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-			<td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $program.description )" class="{validate:{required:true,minlength:2}}"></td>
+			<td><label for="description">$i18n.getString( "description" )</label></td>
+			<td><textarea id="description" name="description">$!encoder.htmlEncode( $program.description )</textarea></td>
 			<td></td>
 		</tr>
 

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm	2014-12-20 13:15:34 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm	2015-04-08 23:26:45 +0000
@@ -48,7 +48,7 @@
     </tr>
     <tr>
         <td><label for="description">$i18n.getString( "description" )</label></td>
-        <td><input type="text" id="description" name="description"></td>
+        <td><textarea name="description"></textarea></td>
     </tr>
 </table>
 

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm	2014-12-20 13:15:34 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm	2015-04-08 23:26:45 +0000
@@ -48,8 +48,8 @@
         <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $validationRuleGroup.name )"></td>
     </tr>
     <tr>
-        <td><label for="description">$i18n.getString( "description" )<em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-        <td><input type="text" id="description" name="description" value="$encoder.htmlEncode( $validationRuleGroup.description )"></td>
+        <td><label for="description">$i18n.getString( "description" )</label></td>
+        <td><textarea name="description">$!encoder.htmlEncode( $validationRuleGroup.description )</textarea>></td>
     </tr>
 
 </table>