Index: branches/5.3.x/admin_templates/manufacturers/manufacturers_edit.tpl
===================================================================
diff -u -r15671 -r15687
--- branches/5.3.x/admin_templates/manufacturers/manufacturers_edit.tpl	(.../manufacturers_edit.tpl)	(revision 15671)
+++ branches/5.3.x/admin_templates/manufacturers/manufacturers_edit.tpl	(.../manufacturers_edit.tpl)	(revision 15687)
@@ -61,7 +61,7 @@
 			<inp2:m_RenderElement name="subsection" title="la_title_General"/>
 				<inp2:m_RenderElement name="inp_id_label" prefix="manuf" field="ManufacturerId" title="la_fld_Id"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="Name" title="la_fld_Name" size="40"/>
-				<inp2:m_RenderElement name="inp_edit_textarea" prefix="manuf" field="Description" title="la_fld_Description" control_options="{min_height: 100}" allow_html="1" cols="40" rows="5"/>
+				<inp2:m_RenderElement name="inp_edit_codemirror" prefix="manuf" field="Description" title="la_fld_Description" control_options="{min_height: 100}" allow_html="1" language="text/html"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="manuf" field="URL" title="la_fld_URL" size="40"/>
 				<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="manuf" field="Logo" thumbnail="120x120" title="la_fld_Logo"/>
 				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="manuf" field="IsPopular" title="la_fld_Popular"/>
Index: branches/5.3.x/admin_templates/products/products_edit.tpl
===================================================================
diff -u -r15671 -r15687
--- branches/5.3.x/admin_templates/products/products_edit.tpl	(.../products_edit.tpl)	(revision 15671)
+++ branches/5.3.x/admin_templates/products/products_edit.tpl	(.../products_edit.tpl)	(revision 15687)
@@ -72,7 +72,7 @@
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="p" field="Name" title="la_fld_Title" size="70"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="p" field="SKU" title="la_fld_SKU" size="70"/>
 
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="p" field="Description" title="la_fld_Description" allow_html="1" cols="70" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_codemirror" prefix="p" field="Description" title="la_fld_Description" allow_html="1" language="text/html"/>
 			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="p" field="DescriptionExcerpt" title="la_fld_DescriptionExcerpt" cols="70" rows="3"/>
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()"/>