From 6b172ea36b87192106909aca4ee5dce70d77088a Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 16 Oct 2010 20:21:36 +0000
Subject: [PATCH] =?utf8?q?Fix=20https://issues.apache.org/bugzilla/show=5F?=
 =?utf8?q?bug.cgi=3Fid=3D22965=20Typos,=20formatting,=20etc=20Based=20on?=
 =?utf8?q?=20a=20patch=20by=20Yann=20C=C3=A9bron?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1023373 13f79535-47bb-0310-9956-ffa450edef68
---
 conf/web.xml               | 22 ++++++++++++----------
 webapps/docs/changelog.xml |  4 ++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/conf/web.xml b/conf/web.xml
index 5e85d7348..4206d438a 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -38,7 +38,7 @@
   <!-- The default servlet for all web applications, that serves static     -->
   <!-- resources.  It processes all requests that are not mapped to other   -->
   <!-- servlets with servlet mappings (defined either here or in your own   -->
-  <!-- web.xml file.  This servlet supports the following initialization    -->
+  <!-- web.xml file).  This servlet supports the following initialization   -->
   <!-- parameters (default values are in square brackets):                  -->
   <!--                                                                      -->
   <!--   debug               Debugging detail level for messages logged     -->
@@ -63,7 +63,7 @@
   <!--                       commands like PUT and DELETE are               -->
   <!--                       rejected?  [true]                              -->
   <!--                                                                      -->
-  <!--   readmeFile          File name to display with the directory        -->
+  <!--   readmeFile          File to display together with the directory    -->
   <!--                       contents. [null]                               -->
   <!--                                                                      -->
   <!--   sendfileSize        If the connector used supports sendfile, this  -->
@@ -221,7 +221,7 @@
   <!--                       actions or directives be trimmed?  [false]     -->
   <!--                                                                      -->
   <!--   xpoweredBy          Determines whether X-Powered-By response       -->
-  <!--                       header is added by generated servlet  [false]  -->
+  <!--                       header is added by generated servlet.  [false] -->
 
     <servlet>
         <servlet-name>jsp</servlet-name>
@@ -357,7 +357,7 @@
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 
-    <!-- The mapping for the JSP servlet -->
+    <!-- The mappings for the JSP servlet -->
     <servlet-mapping>
         <servlet-name>jsp</servlet-name>
         <url-pattern>*.jsp</url-pattern>
@@ -1190,15 +1190,17 @@
 
   <!-- ==================== Default Welcome File List ===================== -->
   <!-- When a request URI refers to a directory, the default servlet looks  -->
-  <!-- for a "welcome file" within that directory and, if present,          -->
-  <!-- to the corresponding resource URI for display.  If no welcome file   -->
-  <!-- is present, the default servlet either serves a directory listing,   -->
-  <!-- or returns a 404 status, depending on how it is configured.          -->
+  <!-- for a "welcome file" within that directory and, if present, to the   -->
+  <!-- corresponding resource URI for display.                              -->
+  <!-- If none welcome file are present, the default servlet either serves  -->
+  <!-- a directory listing (see default servlet configuration on how to     -->
+  <!-- customize) or returns a 404 status, depending on the value of the    -->
+  <!-- listings setting.                                                    -->
   <!--                                                                      -->
   <!-- If you define welcome files in your own application's web.xml        -->
   <!-- deployment descriptor, that list *replaces* the list configured      -->
-  <!-- here, so be sure that you include any of the default values that     -->
-  <!-- you wish to include.                                                 -->
+  <!-- here, so be sure to include any of the default values that you wish  -->
+  <!-- use within your application.                                         -->
 
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1f55bbb67..80dd6da19 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -55,6 +55,10 @@
       <fix>
         Correct a handful of Javadoc warnings. (markt)
       </fix>
+      <fix>
+        <bug>22965</bug>: Fix some typos and formatting issues in the global
+        web.xml file. Based on a patch by Yann Cébron. (markt) 
+      </fix>
     </changelog>
   </subsection>
 </section>
-- 
2.11.0