--- jakarta-tomcat-catalina/webapps/docs/appdev/sample/src/mypackage/Hello.java	(revision 467215)
+++ jakarta-tomcat-catalina/webapps/docs/appdev/sample/src/mypackage/Hello.java	(working copy)
@@ -69,24 +69,11 @@
 	writer.println("<td>");
 	writer.println("<h1>Sample Application Servlet</h1>");
 	writer.println("This is the output of a servlet that is part of");
-	writer.println("the Hello, World application.  It displays the");
-	writer.println("request headers from the request we are currently");
-	writer.println("processing.");
+	writer.println("the Hello, World application.");
 	writer.println("</td>");
 	writer.println("</tr>");
 	writer.println("</table>");
 
-	writer.println("<table border=\"0\" width=\"100%\">");
-	Enumeration names = request.getHeaderNames();
-	while (names.hasMoreElements()) {
-	    String name = (String) names.nextElement();
-	    writer.println("<tr>");
-	    writer.println("  <th align=\"right\">" + name + ":</th>");
-	    writer.println("  <td>" + request.getHeader(name) + "</td>");
-	    writer.println("</tr>");
-	}
-	writer.println("</table>");
-
 	writer.println("</body>");
 	writer.println("</html>");
 
--- jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp	(revision 267240)
+++ jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp	(revision 428048)
@@ -71,15 +71,15 @@
 	  </tr>
 	  <tr>
 	    <td>\${header["host"]}</td>
-	    <td>${header["host"]}</td>
+	    <td>${fn:escapeXml(header["host"])}&nbsp;</td>
 	  </tr>
 	  <tr>
 	    <td>\${header["accept"]}</td>
-	    <td>${header["accept"]}</td>
+	    <td>${fn:escapeXml(header["accept"])}&nbsp;</td>
 	  </tr>
 	  <tr>
 	    <td>\${header["user-agent"]}</td>
-	    <td>${header["user-agent"]}</td>
+	    <td>${fn:escapeXml(header["user-agent"])}&nbsp;</td>
 	  </tr>
 	</table>
       </code>