Merge code for a few more elements
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Sat, 24 Oct 2009 20:52:46 +0000 (20:52 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Sat, 24 Oct 2009 20:52:46 +0000 (20:52 +0000)
commitbff2601f0de723b93115b1ebb28492f2a6e37e47
tree6e7585df99d8a5c463fcd64057909c0f3ac25602
parentcde993ae7788a18497e641400e840b6c6a7f9b99
Merge code for a few more elements

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@829448 13f79535-47bb-0310-9956-ffa450edef68
java/org/apache/catalina/deploy/ErrorPage.java
java/org/apache/catalina/startup/LocalStrings.properties
java/org/apache/catalina/startup/WebXml.java