[patch] Fix some typos/formatting, add/update some content

patch-conf_web.xml.txt (text/plain), 12.67 KB, created by Yann Cébron on 2003-09-07 12:59:36 UTC

(hide)

Description: Fix some typos/formatting, add/update some content

Filename:

MIME Type:

Creator: Yann Cébron

Created: 2003-09-07 12:59:36 UTC

Size: 12.67 KB

patch

obsolete

>Index: web.xml >=================================================================== >RCS file: /home/cvspublic/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v >retrieving revision 1.24 >diff -u -r1.24 web.xml >--- web.xml 19 Aug 2003 00:17:03 -0000 1.24 >+++ web.xml 7 Sep 2003 12:53:53 -0000 >@@ -21,7 +21,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 --> >@@ -40,20 +40,20 @@ > <!-- commands like PUT and DELETE are --> > <!-- rejected? [true] --> > <!-- --> >- <!-- readmeFile File name to display with the directory --> >- <!-- contents. [null] --> >+ <!-- readmeFile File to display together with the directory --> >+ <!-- contents. [null] --> > <!-- --> >- <!-- For directory listing customization. Checks localXsltFile, then --> >- <!-- globalXsltFile, then defaults to original behavior. --> >+ <!-- For directory listing customization. Checks 'localXsltFile', then --> >+ <!-- 'globalXsltFile', then defaults to original behavior. --> > <!-- --> > <!-- localXsltFile Make directory listings an XML doc and --> > <!-- pass the result to this style sheet residing --> > <!-- in that directory. This overrides --> >- <!-- globalXsltFile[null] --> >+ <!-- 'globalXsltFile'. [null] --> > <!-- --> > <!-- globalXsltFile Site wide configuration version of --> >- <!-- localXsltFile This argument is expected --> >- <!-- to be a physical file. [null] --> >+ <!-- 'localXsltFile'. This argument is expected --> >+ <!-- to be a physical file. [null] --> > <!-- --> > <!-- --> > >@@ -104,18 +104,19 @@ > > <!-- The JSP page compiler and execution servlet, which is the mechanism --> > <!-- used by Tomcat to support JSP pages. Traditionally, this servlet --> >- <!-- is mapped to URL patterh "*.jsp". This servlet supports the --> >+ <!-- is mapped to URL pattern "*.jsp". This servlet supports the --> > <!-- following initialization parameters (default values are in square --> > <!-- brackets): --> > <!-- --> >- <!-- checkInterval If development is false and reloading is true, --> >- <!-- background compiles are enabled. checkInterval --> >- <!-- is the time in seconds between checks to see --> >- <!-- if a JSP page needs to be recompiled. [300] --> >+ <!-- checkInterval If 'development' is "false" and 'reloading' is --> >+ <!-- "true", background compiles are enabled. --> >+ <!-- 'checkInterval' is the time in seconds between --> >+ <!-- checks to see if a JSP page needs to be --> >+ <!-- recompiled. [300] --> > <!-- --> > <!-- compiler Which compiler Ant should use to compile JSP --> > <!-- pages. See the Ant documentation for more --> >- <!-- information. [javac] --> >+ <!-- information. [javac] --> > <!-- --> > <!-- classdebuginfo Should the class file be compiled with --> > <!-- debugging information? [true] --> >@@ -128,21 +129,21 @@ > <!-- for JSP modification on every access)? [true] --> > <!-- --> > <!-- enablePooling Determines whether tag handler pooling is --> >- <!-- enabled [true] --> >+ <!-- enabled. [true] --> > <!-- --> > <!-- fork Tell Ant to fork compiles of JSP pages so that --> > <!-- a separate JVM is used for JSP page compiles --> >- <!-- from the one Tomcat is running in. [true] --> >+ <!-- from the one Tomcat is running in. [true] --> > <!-- --> > <!-- ieClassId The class-id value to be sent to Internet --> > <!-- Explorer when using <jsp:plugin> tags. --> > <!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] --> > <!-- --> > <!-- javaEncoding Java file encoding to use for generating java --> >- <!-- source files. [UTF8] --> >+ <!-- source files. [UTF8] --> > <!-- --> > <!-- keepgenerated Should we keep the generated Java source code --> >- <!-- for each page instead of deleting it? [true] --> >+ <!-- for each page instead of deleting it? [true] --> > <!-- --> > <!-- mappedfile Should we generate static content with one --> > <!-- print statement per input line, to ease --> >@@ -154,23 +155,23 @@ > <!-- debugging be suppressed? [false] --> > <!-- --> > <!-- dumpSmap Should the SMAP info for JSR45 debugging be --> >- <!-- dumped to a file? [false] --> >- <!-- False if suppressSmap is true --> >+ <!-- dumped to a file? [false] --> >+ <!-- "false" if 'suppressSmap' is "true". --> > <!-- --> > <!-- scratchdir What scratch directory should we use when --> > <!-- compiling JSP pages? [default work directory --> > <!-- for the current web application] --> > <!-- --> >- <!-- tagpoolMaxSize The maximum tag handler pool size [5] --> >+ <!-- tagpoolMaxSize The maximum tag handler pool size. [5] --> > <!-- --> >- <!-- xpoweredBy Determines whether X-Powered-By response --> >- <!-- header is added by generated servlet [false] --> >+ <!-- xpoweredBy Determines whether the "X-Powered-By" response --> >+ <!-- header is added by generated servlet. [false] --> > <!-- --> > <!-- If you wish to use Jikes to compile JSP pages: --> >- <!-- Set the init parameter "compiler" to "jikes". Define --> >+ <!-- Set the init parameter 'compiler' to "jikes". Define --> > <!-- the property "-Dbuild.compiler.emacs=true" when starting Tomcat --> > <!-- by adding the above to your CATALINA_OPTS environment variable. --> >- <!-- If you get an error reporting that jikes can't use UTF8 encoding, --> >+ <!-- If you get an error reporting that Jikes can't use UTF8 encoding, --> > <!-- try setting the init parameter "javaEncoding" to "ISO-8859-1". --> > > <servlet> >@@ -206,7 +207,7 @@ > <!-- isVirtualWebappRelative --> > <!-- Should "virtual" paths be interpreted as --> > <!-- relative to the context root, instead of --> >- <!-- the server root? (0=false, 1=true) [0] --> >+ <!-- the server root? (0=false, 1=true) [0] --> > <!-- --> > <!-- --> > <!-- IMPORTANT: To use the SSI servlet, you also need to rename the --> >@@ -288,9 +289,9 @@ > > > <!-- The servlet mappings for the built in servlets defined above. Note --> >- <!-- that, by default, the CGI and SSI servlets are *not* mapped. You --> >- <!-- must uncomment these mappings (or add them to your application's own --> >- <!-- web.xml deployment descriptor) to enable these services --> >+ <!-- that by default the invoker, SSI and CGI servlets are *not* mapped. --> >+ <!-- You must uncomment these mappings (or add them to your application's --> >+ <!-- own web.xml deployment descriptor) to enable these services. --> > > <!-- The mapping for the default servlet --> > <servlet-mapping> >@@ -306,7 +307,7 @@ > </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> >@@ -326,7 +327,6 @@ > --> > > <!-- The mapping for the CGI Gateway servlet --> >- > <!-- > <servlet-mapping> > <servlet-name>cgi</servlet-name> >@@ -896,15 +896,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 of the welcome files is present, the default servlet either --> >+ <!-- serves a directory listing (see default servlet configuration on how --> >+ <!-- to customize) or returns a HTTP 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 --> >+ <!-- to use within your application. --> > > <welcome-file-list> > <welcome-file>index.html</welcome-file> View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]