Author: kkolinko
Date: Sun Apr 27 04:39:56 2014
New Revision: 1590346
URL: http://svn.apache.org/r1590346
Log:
Merged r1590322 r1590345 from tomcat/trunk:
Correct formatting and a few minor typos.
No substantial changes to the text.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/jar-scanner.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1590322,1590345
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/jar-scanner.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/jar-scanner.xml?rev=1590346&r1=1590345&r2=1590346&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/jar-scanner.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/jar-scanner.xml Sun Apr 27
04:39:56 2014
@@ -78,30 +78,31 @@
<attributes>
<attribute name="scanAllDirectories" required="false">
- <p>If true, any directories found on the classpath will be checked to
see
- if are expanded Jar files. The default is <code>false</code>. Tomcat
- determines if directory is an expanded JAR file by looking for a
META-INF
- sub-directory. Only if the META-INF sub-directory exists, is the
- directory to be an expanded JAR file.</p>
+ <p>If <code>true</code>, any directories found on the classpath will be
+ checked to see if they are expanded JAR files.
+ The default is <code>false</code>.</p>
+ <p>Tomcat determines if a directory is an expanded JAR file by looking
+ for a META-INF sub-directory. Only if the META-INF sub-directory exists,
+ the directory is assumed to be an expanded JAR file.</p>
</attribute>
<attribute name="scanAllFiles" required="false">
- <p>If true, any files found on the classpath will be checked to see if
- they are Jar files rather than relying on the file extension being
- <code>.jar</code>. The default is <code>false</code></p>
+ <p>If <code>true</code>, any files found on the classpath will be
checked
+ to see if they are Jar files rather than relying on the file extension
+ being <code>.jar</code>. The default is <code>false</code>.</p>
</attribute>
<attribute name="scanClassPath" required="false">
- <p>If true, the full web application classpath, including the shared and
- common classloaders and the system classpath (but not the bootstrap
- classpath) will be scanned for Jar files in addition to the web
+ <p>If <code>true</code>, the full web application classpath, including
+ the shared and common classloaders and the system classpath (but not the
+ bootstrap classpath) will be scanned for Jar files in addition to the
web
application. The default is <code>true</code>. </p>
</attribute>
<attribute name="scanBootstrapClassPath" required="false">
- <p>If <code>scanClassPath</code> is true and this is true the bootstrap
- classpath will also be scanned for Jar files. The default is
- <code>false</code>.</p>
+ <p>If <strong>scanClassPath</strong> is <code>true</code> and this is
+ <code>true</code> the bootstrap classpath will also be scanned for Jar
+ files. The default is <code>false</code>.</p>
</attribute>
</attributes>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
