You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2013/06/13 10:49:56 UTC
svn commit: r1492571 - in /tomcat/tc7.0.x/trunk: ./
webapps/docs/config/context.xml webapps/docs/config/host.xml
webapps/docs/config/listeners.xml
Author: kkolinko
Date: Thu Jun 13 08:49:55 2013
New Revision: 1492571
URL: http://svn.apache.org/r1492571
Log:
Merged r1492570 from tomcat/trunk:
Replace anchor links that use spaces with underscore ones.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1492570
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml?rev=1492571&r1=1492570&r2=1492571&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Thu Jun 13 08:49:55 2013
@@ -236,9 +236,9 @@
<p>In addition to explicitly specified Context elements, there are
several techniques by which Context elements can be created automatically
- for you. See <a href="host.html#Automatic Application Deployment">
+ for you. See <a href="host.html#Automatic_Application_Deployment">
Automatic Application Deployment</a> and
- <a href="host.html#User Web Applications">User Web Applications</a>
+ <a href="host.html#User_Web_Applications">User Web Applications</a>
for more information.</p>
<p>To define multiple contexts that use a single WAR file or directory,
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml?rev=1492571&r1=1492570&r2=1492571&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml Thu Jun 13 08:49:55 2013
@@ -93,7 +93,7 @@
to be deployed on this virtual host. You may specify an
absolute pathname, or a pathname that is relative to the
<code>$CATALINA_BASE</code> directory. See
- <a href="#Automatic Application Deployment">Automatic Application
+ <a href="#Automatic_Application_Deployment">Automatic Application
Deployment</a> for more information on automatic recognition and
deployment of web applications. If not specified, the default of
<code>webapps</code> will be used.</p>
@@ -105,7 +105,7 @@
descriptors to be deployed on this virtual host. You may specify an
absolute pathname for this directory, or a pathname that is relative
to the <code>$CATALINA_BASE</code> directory. See
- <a href="#Automatic Application Deployment">Automatic Application
+ <a href="#Automatic_Application_Deployment">Automatic Application
Deployment</a> for more information on automatic recognition and
deployment of web applications. If not specified the default of
<code>conf/<engine_name>/<host_name></code> will be used.</p>
@@ -127,7 +127,7 @@
descriptors found. Updated web applications or context XML descriptors
will trigger a reload of the web application. The flag's value defaults
to true. See
- <a href="#Automatic Application Deployment">Automatic Application
+ <a href="#Automatic_Application_Deployment">Automatic Application
Deployment</a> for more information.</p>
</attribute>
@@ -165,7 +165,7 @@
directory named <code>foo</code> but not <code>foo.war</code>,
<code>foobar</code>, or <code>myfooapp</code>. To match anything with
"foo", you could use <code>.*foo.*</code>.</p>
- <p>See <a href="#Automatic Application Deployment">Automatic Application
+ <p>See <a href="#Automatic_Application_Deployment">Automatic Application
Deployment</a> for more information.</p>
</attribute>
@@ -173,7 +173,7 @@
<p>This flag value indicates if web applications from this host should
be automatically deployed when Tomcat starts. The flag's value defaults
to true. See
- <a href="#Automatic Application Deployment">Automatic Application
+ <a href="#Automatic_Application_Deployment">Automatic Application
Deployment</a> for more information.</p>
</attribute>
@@ -265,7 +265,7 @@
structure, <code>false</code> to run such web applications directly
from a WAR file. WAR files located outside of the Host's
<strong>appBase</strong> will not be expanded. See
- <a href="#Automatic Application Deployment">Automatic Application
+ <a href="#Automatic_Application_Deployment">Automatic Application
Deployment</a> for more information.</p>
</attribute>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml?rev=1492571&r1=1492570&r2=1492571&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml Thu Jun 13 08:49:55 2013
@@ -347,7 +347,7 @@
and a username to a directory (commonly named public_html) in that user's
home directory on the server.</p>
- <p>See the <a href="host.html#User Web Applications">User Web Applications</a>
+ <p>See the <a href="host.html#User_Web_Applications">User Web Applications</a>
special feature on the <strong>Host</strong> element for more information.</p>
<p>The following additional attributes are supported by the
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org