Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r68cefba7d15519f37436278fb0790fef8abc3b62 -rbf2a34df874b866f597400a381ac8dbe692355d8
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 68cefba7d15519f37436278fb0790fef8abc3b62)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision bf2a34df874b866f597400a381ac8dbe692355d8)
@@ -13,36 +13,28 @@
 
    <tag>
 
-      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
-      <display-name>LAMS URL</display-name>
+      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
+      <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
-      <name>LAMSURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
+      <name>WebAppURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
 
    </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>
+      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+      <display-name>generate unique ID</display-name>
       <icon>    
       </icon>
-      <name>out</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
+      <name>generateID</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</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>
-      <attribute>
-         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
-         <name>escapeXml</name>
+         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+         <name>id</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -52,26 +44,6 @@
    </tag>
    <tag>
 
-      <description>Render html tag with direction and language</description>
-      <display-name>Render html tag with direction and language</display-name>
-      <icon>    
-      </icon>
-      <name>html</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
-      <body-content>JSP</body-content>
-
-      <attribute>
-         <description>Render html tag with direction and language</description>
-         <name>xhtml</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
@@ -92,17 +64,28 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
+      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
+      <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
+      <name>LAMSURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
 
+   </tag>
+   <tag>
+
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
       <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -112,29 +95,26 @@
    </tag>
    <tag>
 
-      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
-      <display-name>Base URL for the current web app</display-name>
+      <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>WebAppURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
+      <name>out</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
 
-   </tag>
-   <tag>
+      <attribute>
+         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>value</name>
+         <required>true</required>
 
-      <description>Converts role name into form usable as message resources key</description>
-      <display-name>Converts role name into form usable as message resources key</display-name>
-      <icon>    
-      </icon>
-      <name>role</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
-      <body-content>empty</body-content>
+           <rtexprvalue>true</rtexprvalue>
 
+      </attribute>
       <attribute>
-         <description>Converts role name into form usable as message resources key</description>
-         <name>role</name>
-         <required>true</required>
+         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeHtml</name>
+         <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
 
@@ -187,17 +167,17 @@
    </tag>
    <tag>
 
-      <description>Output details from the shared session UserDTO object</description>
-      <display-name>user details</display-name>
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
-      <name>user</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
 
       <attribute>
-         <description>Output details from the shared session UserDTO object</description>
-         <name>property</name>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
          <required>true</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -233,7 +213,27 @@
       </attribute>
 
    </tag>
+   <tag>
 
+      <description>Output details from the shared session UserDTO object</description>
+      <display-name>user details</display-name>
+      <icon>    
+      </icon>
+      <name>user</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Output details from the shared session UserDTO object</description>
+         <name>property</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+
   	<tag>
 		<name>STRUTS-textarea</name>
 		<tagclass>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tagclass>
Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
diff -u -rb55ce696b700f625ffd4d10ea140e0952f72d649 -rbf2a34df874b866f597400a381ac8dbe692355d8
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b55ce696b700f625ffd4d10ea140e0952f72d649)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision bf2a34df874b866f597400a381ac8dbe692355d8)
@@ -198,7 +198,7 @@
 						</p>
 					</c:when>
 					<c:otherwise>
-						<p> <lams:out escapeXml="true" value="${sessionMap.reflectEntry}" />  </p>				
+						<p> <lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />  </p>				
 					</c:otherwise>
 				</c:choose>
 				
Index: lams_tool_task/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rbf2a34df874b866f597400a381ac8dbe692355d8
--- lams_tool_task/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 875f56cb6917d1a52bed0545f2933c3b55497a02)
+++ lams_tool_task/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision bf2a34df874b866f597400a381ac8dbe692355d8)
@@ -45,7 +45,7 @@
 						</p>
 					</c:when>
 					<c:otherwise>
-						<p> <lams:out escapeXml="true" value="${sessionMap.reflectEntry}" />  </p>				
+						<p> <lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />  </p>				
 					</c:otherwise>
 				</c:choose>
 				
Index: lams_tool_wiki_orig/web/WEB-INF/lams.tld
===================================================================
diff -u -re8343e8d676900d059435abdef072abc89d3b26b -rbf2a34df874b866f597400a381ac8dbe692355d8
--- lams_tool_wiki_orig/web/WEB-INF/lams.tld	(.../lams.tld)	(revision e8343e8d676900d059435abdef072abc89d3b26b)
+++ lams_tool_wiki_orig/web/WEB-INF/lams.tld	(.../lams.tld)	(revision bf2a34df874b866f597400a381ac8dbe692355d8)
@@ -13,36 +13,28 @@
 
    <tag>
 
-      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
-      <display-name>LAMS URL</display-name>
+      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
+      <display-name>Base URL for the current web app</display-name>
       <icon>    
       </icon>
-      <name>LAMSURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
+      <name>WebAppURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
       <body-content>empty</body-content>
 
    </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>
+      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+      <display-name>generate unique ID</display-name>
       <icon>    
       </icon>
-      <name>out</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
+      <name>generateID</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</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>
-      <attribute>
-         <description>converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
-         <name>escapeXml</name>
+         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+         <name>id</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -52,26 +44,6 @@
    </tag>
    <tag>
 
-      <description>Render html tag with direction and language</description>
-      <display-name>Render html tag with direction and language</display-name>
-      <icon>    
-      </icon>
-      <name>html</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
-      <body-content>JSP</body-content>
-
-      <attribute>
-         <description>Render html tag with direction and language</description>
-         <name>xhtml</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
       <description>Get the configuration value for the specified key</description>
       <display-name>Configuration value</display-name>
       <icon>    
@@ -92,17 +64,28 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
+      <description>Output the Server URL as defined in the lams.xml configuration file.</description>
+      <display-name>LAMS URL</display-name>
       <icon>    
       </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
+      <name>LAMSURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.LAMSURLTag</tag-class>
       <body-content>empty</body-content>
 
+   </tag>
+   <tag>
+
+      <description>Render html tag with direction and language</description>
+      <display-name>Render html tag with direction and language</display-name>
+      <icon>    
+      </icon>
+      <name>html</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HtmlTag</tag-class>
+      <body-content>JSP</body-content>
+
       <attribute>
-         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-         <name>id</name>
+         <description>Render html tag with direction and language</description>
+         <name>xhtml</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -112,29 +95,26 @@
    </tag>
    <tag>
 
-      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
-      <display-name>Base URL for the current web app</display-name>
+      <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>WebAppURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
+      <name>out</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.MultiLinesOutputTag</tag-class>
       <body-content>empty</body-content>
 
-   </tag>
-   <tag>
+      <attribute>
+         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>value</name>
+         <required>true</required>
 
-      <description>Converts role name into form usable as message resources key</description>
-      <display-name>Converts role name into form usable as message resources key</display-name>
-      <icon>    
-      </icon>
-      <name>role</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
-      <body-content>empty</body-content>
+           <rtexprvalue>true</rtexprvalue>
 
+      </attribute>
       <attribute>
-         <description>Converts role name into form usable as message resources key</description>
-         <name>role</name>
-         <required>true</required>
+         <description>Converts text from \n or \r\n to &lt;BR&gt; before rendering</description>
+         <name>escapeHtml</name>
+         <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
 
@@ -187,17 +167,17 @@
    </tag>
    <tag>
 
-      <description>Output details from the shared session UserDTO object</description>
-      <display-name>user details</display-name>
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
-      <name>user</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
+      <name>role</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
 
       <attribute>
-         <description>Output details from the shared session UserDTO object</description>
-         <name>property</name>
+         <description>Converts role name into form usable as message resources key</description>
+         <name>role</name>
          <required>true</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -233,7 +213,27 @@
       </attribute>
 
    </tag>
+   <tag>
 
+      <description>Output details from the shared session UserDTO object</description>
+      <display-name>user details</display-name>
+      <icon>    
+      </icon>
+      <name>user</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.UserTag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <description>Output details from the shared session UserDTO object</description>
+         <name>property</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+
   	<tag>
 		<name>STRUTS-textarea</name>
 		<tagclass>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tagclass>
Index: lams_tool_wiki_orig/web/jsps/learning/viewwiki.jsp
===================================================================
diff -u -r7aa2861ddc577b49cef219ab58f43596019f10ec -rbf2a34df874b866f597400a381ac8dbe692355d8
--- lams_tool_wiki_orig/web/jsps/learning/viewwiki.jsp	(.../viewwiki.jsp)	(revision 7aa2861ddc577b49cef219ab58f43596019f10ec)
+++ lams_tool_wiki_orig/web/jsps/learning/viewwiki.jsp	(.../viewwiki.jsp)	(revision bf2a34df874b866f597400a381ac8dbe692355d8)
@@ -71,7 +71,7 @@
 					</p>
 				</c:when>
 				<c:otherwise>
-					<p> <lams:out escapeXml="true" value="${sessionMap.reflectEntry}" />  </p>				
+					<p> <lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />  </p>				
 				</c:otherwise>
 			</c:choose>