Index: lams_tool_sbmt/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.12 -r1.13
--- lams_tool_sbmt/web/WEB-INF/lams.tld	4 Sep 2006 02:20:20 -0000	1.12
+++ lams_tool_sbmt/web/WEB-INF/lams.tld	7 Sep 2006 01:36:49 -0000	1.13
@@ -24,6 +24,26 @@
    </tag>
    <tag>
 
+      <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+      <display-name>converts text from \n or \r\n to &lt;BR&gt; before rendering</display-name>
+      <icon>    
+      </icon>
+      <name>out</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>value</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
       <description>Render html tag with direction and language</description>
       <display-name>Render html tag with direction and language</display-name>
       <icon>    
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.36 -r1.37
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	1 Sep 2006 06:45:16 -0000	1.36
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	7 Sep 2006 01:36:49 -0000	1.37
@@ -187,10 +187,6 @@
 
   <message-resources parameter="org.lamsfoundation.lams.tool.sbmt.ApplicationResources" />
 
-    <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
-    <set-property property="pathnames"
-                     value="/WEB-INF/struts/validator-rules.xml,
-                            /WEB-INF/struts/validation.xml"/>
-  </plug-in>
+   <!-- Define your Struts plugins in a file called struts-plugins.xml and place it in your merge directory. -->
 
 </struts-config>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/sbmtlearner.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	6 Sep 2006 02:20:22 -0000	1.6
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	7 Sep 2006 01:36:49 -0000	1.7
@@ -106,7 +106,7 @@
 									<fmt:message key="label.learner.fileDescription" />
 								</td>
 								<td>
-									<c:out value="${file.fileDescription}" escapeXml="false" />
+									<lams:out value="${file.fileDescription}"/>
 								</td>
 							</tr>
 							<tr>
@@ -184,7 +184,7 @@
 								<fmt:message key="label.learner.fileDescription" />
 							</td>
 							<td>
-								<lams:STRUTS-textarea rows="5" cols="40" tabindex="2" property="description" disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
+								<html:textarea rows="5" cols="40" tabindex="2" property="description" disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
 							</td>
 						</tr>
 						<tr>