Permalink
Browse files

CTR: docs

Merged revision 1354685 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53473
Correct documentation and web.xml comments for SSI isVirtualWebappRelative option since the allowed values are true or false


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1354820 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 8d5128c commit 523dcaf0232393689b9604f1ce2355fd66019db2 Konstantin Kolinko committed Jun 28, 2012
Showing with 11 additions and 6 deletions.
  1. +4 −4 conf/web.xml
  2. +5 −0 webapps/docs/changelog.xml
  3. +2 −2 webapps/docs/ssi-howto.xml
View
8 conf/web.xml
@@ -284,7 +284,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? [false] -->
<!-- -->
<!-- inputEncoding The encoding to assume for SSI resources if -->
<!-- one is not available from the resource. -->
@@ -315,7 +315,7 @@
</init-param>
<init-param>
<param-name>isVirtualWebappRelative</param-name>
- <param-value>0</param-value>
+ <param-value>false</param-value>
</init-param>
<load-on-startup>4</load-on-startup>
</servlet>
@@ -477,7 +477,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? [false] -->
<!-- -->
<!-- allowExec Is use of the exec command enabled? [false] -->
@@ -501,7 +501,7 @@
</init-param>
<init-param>
<param-name>isVirtualWebappRelative</param-name>
- <param-value>0</param-value>
+ <param-value>false</param-value>
</init-param>
</filter>
-->
View
5 webapps/docs/changelog.xml
@@ -265,6 +265,11 @@
Change the index page of ROOT webapp to mention "manager-gui" role
instead of "manager" one. (kkolinko)
</update>
+ <fix>
+ <bug>53473</bug>: Correct the allowed values for the SSI option
+ <code>isVirtualWebappRelative</code> which are <code>true</code> or
+ <code>false</code>. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
View
4 webapps/docs/ssi-howto.xml
@@ -99,7 +99,7 @@ directives will expire. Default behaviour is for all SSI directives to be
evaluated for every request.</li>
<li><strong>isVirtualWebappRelative</strong> - Should "virtual" SSI directive
paths be interpreted as relative to the context root, instead of the server
-root? (0=false, 1=true) Default 0 (false).</li>
+root? Default false.</li>
<li><strong>inputEncoding</strong> - The encoding to be assumed for SSI
resources if one cannot be determined from the resource itself. Default is
the default platform encoding.</li>
@@ -129,7 +129,7 @@ directives will expire. Default behaviour is for all SSI directives to be
evaluated for every request.</li>
<li><strong>isVirtualWebappRelative</strong> - Should "virtual" SSI directive
paths be interpreted as relative to the context root, instead of the server
-root? (0=false, 1=true) Default 0 (false).</li>
+root? Default false.</li>
<li><strong>allowExec</strong> - Is the exec command enabled? Default is
false.</li>
</ul>

0 comments on commit 523dcaf

Please sign in to comment.