You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2015/02/23 11:02:53 UTC
svn commit: r1661631 - in /tomcat/jk/trunk/xdocs: ./ ajp/ common_howto/
generic_howto/ miscellaneous/ news/ reference/ webserver_howto/
Author: rjung
Date: Mon Feb 23 10:02:52 2015
New Revision: 1661631
URL: http://svn.apache.org/r1661631
Log:
Reorg mod_jk docs:
- Menu item "Generic HowTo" -> "Common HowTo"
- plus dir and links "generic_howto" -> "common_howto"
- User friendly ordering: first HowTos, then Reference
Added:
tomcat/jk/trunk/xdocs/common_howto/
- copied from r1658173, tomcat/jk/trunk/xdocs/generic_howto/
Removed:
tomcat/jk/trunk/xdocs/generic_howto/
Modified:
tomcat/jk/trunk/xdocs/ajp/project.xml
tomcat/jk/trunk/xdocs/build.xml
tomcat/jk/trunk/xdocs/common_howto/project.xml
tomcat/jk/trunk/xdocs/common_howto/workers.xml
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/miscellaneous/faq.xml
tomcat/jk/trunk/xdocs/miscellaneous/project.xml
tomcat/jk/trunk/xdocs/news/20090301.xml
tomcat/jk/trunk/xdocs/news/project.xml
tomcat/jk/trunk/xdocs/project.xml
tomcat/jk/trunk/xdocs/reference/apache.xml
tomcat/jk/trunk/xdocs/reference/project.xml
tomcat/jk/trunk/xdocs/reference/uriworkermap.xml
tomcat/jk/trunk/xdocs/reference/workers.xml
tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
tomcat/jk/trunk/xdocs/webserver_howto/iis.xml
tomcat/jk/trunk/xdocs/webserver_howto/nes.xml
tomcat/jk/trunk/xdocs/webserver_howto/project.xml
Modified: tomcat/jk/trunk/xdocs/ajp/project.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/project.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/ajp/project.xml (original)
+++ tomcat/jk/trunk/xdocs/ajp/project.xml Mon Feb 23 10:02:52 2015
@@ -29,20 +29,12 @@
<item name="Docs Home" href="../index.html"/>
</menu>
- <menu name="Reference Guide">
- <item name="workers.properties" href="../reference/workers.html"/>
- <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
- <item name="Status Worker" href="../reference/status.html"/>
- <item name="Apache HTTP Server" href="../reference/apache.html"/>
- <item name="IIS" href="../reference/iis.html"/>
- </menu>
-
- <menu name="Generic HowTo">
- <item name="For the impatient" href="../generic_howto/quick.html"/>
- <item name="All about workers" href="../generic_howto/workers.html"/>
- <item name="Timeouts" href="../generic_howto/timeouts.html"/>
- <item name="Load Balancing" href="../generic_howto/loadbalancers.html"/>
- <item name="Reverse Proxy" href="../generic_howto/proxy.html"/>
+ <menu name="Common HowTo">
+ <item name="For the impatient" href="../common_howto/quick.html"/>
+ <item name="All about workers" href="../common_howto/workers.html"/>
+ <item name="Timeouts" href="../common_howto/timeouts.html"/>
+ <item name="Load Balancing" href="../common_howto/loadbalancers.html"/>
+ <item name="Reverse Proxy" href="../common_howto/proxy.html"/>
</menu>
<menu name="Webserver HowTo">
@@ -51,6 +43,14 @@
<item name="Netscape/SunOne/Sun" href="../webserver_howto/nes.html"/>
</menu>
+ <menu name="Reference Guide">
+ <item name="workers.properties" href="../reference/workers.html"/>
+ <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
+ <item name="Status Worker" href="../reference/status.html"/>
+ <item name="Apache HTTP Server" href="../reference/apache.html"/>
+ <item name="IIS" href="../reference/iis.html"/>
+ </menu>
+
<menu name="AJP Protocol Reference">
<item name="AJPv13" href="../ajp/ajpv13a.html"/>
<item name="AJPv13 Extension Proposal" href="../ajp/ajpv13ext.html"/>
Modified: tomcat/jk/trunk/xdocs/build.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/build.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/build.xml (original)
+++ tomcat/jk/trunk/xdocs/build.xml Mon Feb 23 10:02:52 2015
@@ -101,18 +101,18 @@
<param name="project-menu" expression="nomenu"/>
</style>
- <!-- Generic Howto -->
- <style basedir="generic_howto"
- destdir="${build.dir}/${dist.name}/generic_howto"
+ <!-- Common Howto -->
+ <style basedir="common_howto"
+ destdir="${build.dir}/${dist.name}/common_howto"
extension=".html"
style="style.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
</style>
- <mkdir dir="${build.dir}/${dist.name}/generic_howto/printer"/>
- <style basedir="generic_howto"
- destdir="${build.dir}/${dist.name}/generic_howto/printer"
+ <mkdir dir="${build.dir}/${dist.name}/common_howto/printer"/>
+ <style basedir="common_howto"
+ destdir="${build.dir}/${dist.name}/common_howto/printer"
extension=".html"
style="style.xsl"
excludes="project.xml"
Modified: tomcat/jk/trunk/xdocs/common_howto/project.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/project.xml?rev=1661631&r1=1658173&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/common_howto/project.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/project.xml Mon Feb 23 10:02:52 2015
@@ -15,13 +15,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache Tomcat Connector Documentation - Generic HowTo"
+<project name="Apache Tomcat Connector Documentation - Common HowTo"
href="http://tomcat.apache.org/">
- <title>The Apache Tomcat Connector - Generic HowTo</title>
+ <title>The Apache Tomcat Connector - Common HowTo</title>
<logo href="/images/tomcat.gif">
- The Apache Tomcat Connector - Generic HowTo
+ The Apache Tomcat Connector - Common HowTo
</logo>
<body>
@@ -29,20 +29,12 @@
<item name="Docs Home" href="../index.html"/>
</menu>
- <menu name="Reference Guide">
- <item name="workers.properties" href="../reference/workers.html"/>
- <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
- <item name="Status Worker" href="../reference/status.html"/>
- <item name="Apache HTTP Server" href="../reference/apache.html"/>
- <item name="IIS" href="../reference/iis.html"/>
- </menu>
-
- <menu name="Generic HowTo">
- <item name="For the impatient" href="../generic_howto/quick.html"/>
- <item name="All about workers" href="../generic_howto/workers.html"/>
- <item name="Timeouts" href="../generic_howto/timeouts.html"/>
- <item name="Load Balancing" href="../generic_howto/loadbalancers.html"/>
- <item name="Reverse Proxy" href="../generic_howto/proxy.html"/>
+ <menu name="Common HowTo">
+ <item name="For the impatient" href="../common_howto/quick.html"/>
+ <item name="All about workers" href="../common_howto/workers.html"/>
+ <item name="Timeouts" href="../common_howto/timeouts.html"/>
+ <item name="Load Balancing" href="../common_howto/loadbalancers.html"/>
+ <item name="Reverse Proxy" href="../common_howto/proxy.html"/>
</menu>
<menu name="Webserver HowTo">
@@ -51,6 +43,14 @@
<item name="Netscape/SunOne/Sun" href="../webserver_howto/nes.html"/>
</menu>
+ <menu name="Reference Guide">
+ <item name="workers.properties" href="../reference/workers.html"/>
+ <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
+ <item name="Status Worker" href="../reference/status.html"/>
+ <item name="Apache HTTP Server" href="../reference/apache.html"/>
+ <item name="IIS" href="../reference/iis.html"/>
+ </menu>
+
<menu name="AJP Protocol Reference">
<item name="AJPv13" href="../ajp/ajpv13a.html"/>
<item name="AJPv13 Extension Proposal" href="../ajp/ajpv13ext.html"/>
Modified: tomcat/jk/trunk/xdocs/common_howto/workers.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/workers.xml?rev=1661631&r1=1658173&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/common_howto/workers.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/workers.xml Mon Feb 23 10:02:52 2015
@@ -166,7 +166,7 @@ the ajp12 worker properties are :
<p>
<b>lbfactor</b> property is used when working with a load balancer worker, this is the load-balancing factor for the worker.
-We'll see more on this in the <a href="../generic_howto/loadbalancers.html">lb worker</a> section.
+We'll see more on this in the <a href="../common_howto/loadbalancers.html">lb worker</a> section.
</p>
<source>
Modified: tomcat/jk/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/index.xml (original)
+++ tomcat/jk/trunk/xdocs/index.xml Mon Feb 23 10:02:52 2015
@@ -239,29 +239,29 @@ Apache web server.
</ul>
</section>
-<section name="Generic HowTo">
+<section name="Common HowTo">
<br />
<ul>
-<li><a href="generic_howto/quick.html"><b>Quick Start</b></a>
+<li><a href="common_howto/quick.html"><b>Quick Start</b></a>
<p>This page describes the configuration files used by JK on the
Web Server side for the 'impatients'.
</p>
</li>
-<li><a href="generic_howto/workers.html"><b>All about workers</b></a>
+<li><a href="common_howto/workers.html"><b>All about workers</b></a>
<p>This page contains an overview about the various aspects of defining
and using workers.
</p>
</li>
-<li><a href="generic_howto/timeouts.html"><b>Timeouts</b></a>
+<li><a href="common_howto/timeouts.html"><b>Timeouts</b></a>
<p>This page describes the possible timeout settings you can use.
</p>
</li>
-<li><a href="generic_howto/loadbalancers.html"><b>Load Balancing</b></a>
+<li><a href="common_howto/loadbalancers.html"><b>Load Balancing</b></a>
<p>This page contains an introduction on load balancing with JK.
</p>
</li>
-<li><a href="generic_howto/proxy.html"><b>Reverse Proxy</b></a>
+<li><a href="common_howto/proxy.html"><b>Reverse Proxy</b></a>
<p>This page contains an introduction to reverse proxies, how JK
handles this situation and how you can influence the JK proxying behaviour.
</p>
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Feb 23 10:02:52 2015
@@ -1000,7 +1000,7 @@
</fix>
<update>
Documentation: Remove JNI parameters from sample configuration
- in the workers generic howto. (rjung)
+ in the workers common howto. (rjung)
</update>
<fix>
<bug>45026</bug>: For Apache httpd 2.x add "Unknown Reason"
Modified: tomcat/jk/trunk/xdocs/miscellaneous/faq.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/faq.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/faq.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/faq.xml Mon Feb 23 10:02:52 2015
@@ -90,7 +90,7 @@ For <b>JK 1.2.x</b>, you should read :
<ul>
<li>
-<a href="../generic_howto/quick.html">For the impatient</a>
+<a href="../common_howto/quick.html">For the impatient</a>
</li>
<li>
@@ -106,7 +106,7 @@ For <b>JK 1.2.x</b>, you should read :
</li>
<li>
-<a href="../generic_howto/workers.html">Workers configuration</a>
+<a href="../common_howto/workers.html">Workers configuration</a>
</li>
</ul>
@@ -137,7 +137,7 @@ Firewalls use to drop inactive connectio
</p>
<p>
Starting with JK 1.2.0, a <b>socket_keepalive</b> property as been added to ajp13 settings, and you should take a look at
-it in <a href="../generic_howto/workers.html">Workers HowTo</a> and
+it in <a href="../common_howto/workers.html">Workers HowTo</a> and
<a href="../reference/workers.html">workers.properties reference</a>.
If nothing else helps, you can try <b>JkOptions +DisableReuse</b>, but this will have strong performance implications.
</p>
Modified: tomcat/jk/trunk/xdocs/miscellaneous/project.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/project.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/project.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/project.xml Mon Feb 23 10:02:52 2015
@@ -29,20 +29,12 @@
<item name="Docs Home" href="../index.html"/>
</menu>
- <menu name="Reference Guide">
- <item name="workers.properties" href="../reference/workers.html"/>
- <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
- <item name="Status Worker" href="../reference/status.html"/>
- <item name="Apache HTTP Server" href="../reference/apache.html"/>
- <item name="IIS" href="../reference/iis.html"/>
- </menu>
-
- <menu name="Generic HowTo">
- <item name="For the impatient" href="../generic_howto/quick.html"/>
- <item name="All about workers" href="../generic_howto/workers.html"/>
- <item name="Timeouts" href="../generic_howto/timeouts.html"/>
- <item name="Load Balancing" href="../generic_howto/loadbalancers.html"/>
- <item name="Reverse Proxy" href="../generic_howto/proxy.html"/>
+ <menu name="Common HowTo">
+ <item name="For the impatient" href="../common_howto/quick.html"/>
+ <item name="All about workers" href="../common_howto/workers.html"/>
+ <item name="Timeouts" href="../common_howto/timeouts.html"/>
+ <item name="Load Balancing" href="../common_howto/loadbalancers.html"/>
+ <item name="Reverse Proxy" href="../common_howto/proxy.html"/>
</menu>
<menu name="Webserver HowTo">
@@ -51,6 +43,14 @@
<item name="Netscape/SunOne/Sun" href="../webserver_howto/nes.html"/>
</menu>
+ <menu name="Reference Guide">
+ <item name="workers.properties" href="../reference/workers.html"/>
+ <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
+ <item name="Status Worker" href="../reference/status.html"/>
+ <item name="Apache HTTP Server" href="../reference/apache.html"/>
+ <item name="IIS" href="../reference/iis.html"/>
+ </menu>
+
<menu name="AJP Protocol Reference">
<item name="AJPv13" href="../ajp/ajpv13a.html"/>
<item name="AJPv13 Extension Proposal" href="../ajp/ajpv13ext.html"/>
Modified: tomcat/jk/trunk/xdocs/news/20090301.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20090301.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/news/20090301.xml (original)
+++ tomcat/jk/trunk/xdocs/news/20090301.xml Mon Feb 23 10:02:52 2015
@@ -51,7 +51,7 @@ The most important new features in this
<p>
Local and global error states have been improved. You can fine tune the
behaviour with the new "error_escalation_time" attribute
-(see the <a href="../generic_howto/timeouts.html">timeouts documentation</a>).
+(see the <a href="../common_howto/timeouts.html">timeouts documentation</a>).
</p>
<h3>Dynamic Address and Port Change Using the Status Worker</h3>
<p>
@@ -74,7 +74,7 @@ worker errors.
<p>
You can now overwrite more request metadata before the request gets send to the backend.
This is helpful in case there are other reverse proxies in front of your web server.
-A new <a href="../generic_howto/proxy.html">documentation page</a> explains this in detail.
+A new <a href="../common_howto/proxy.html">documentation page</a> explains this in detail.
</p>
<h3>Improved IIS Support</h3>
<p>
Modified: tomcat/jk/trunk/xdocs/news/project.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/project.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/news/project.xml (original)
+++ tomcat/jk/trunk/xdocs/news/project.xml Mon Feb 23 10:02:52 2015
@@ -29,20 +29,12 @@
<item name="Docs Home" href="../index.html"/>
</menu>
- <menu name="Reference Guide">
- <item name="workers.properties" href="../reference/workers.html"/>
- <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
- <item name="Status Worker" href="../reference/status.html"/>
- <item name="Apache HTTP Server" href="../reference/apache.html"/>
- <item name="IIS" href="../reference/iis.html"/>
- </menu>
-
- <menu name="Generic HowTo">
- <item name="For the impatient" href="../generic_howto/quick.html"/>
- <item name="All about workers" href="../generic_howto/workers.html"/>
- <item name="Timeouts" href="../generic_howto/timeouts.html"/>
- <item name="Load Balancing" href="../generic_howto/loadbalancers.html"/>
- <item name="Reverse Proxy" href="../generic_howto/proxy.html"/>
+ <menu name="Common HowTo">
+ <item name="For the impatient" href="../common_howto/quick.html"/>
+ <item name="All about workers" href="../common_howto/workers.html"/>
+ <item name="Timeouts" href="../common_howto/timeouts.html"/>
+ <item name="Load Balancing" href="../common_howto/loadbalancers.html"/>
+ <item name="Reverse Proxy" href="../common_howto/proxy.html"/>
</menu>
<menu name="Webserver HowTo">
@@ -51,6 +43,14 @@
<item name="Netscape/SunOne/Sun" href="../webserver_howto/nes.html"/>
</menu>
+ <menu name="Reference Guide">
+ <item name="workers.properties" href="../reference/workers.html"/>
+ <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
+ <item name="Status Worker" href="../reference/status.html"/>
+ <item name="Apache HTTP Server" href="../reference/apache.html"/>
+ <item name="IIS" href="../reference/iis.html"/>
+ </menu>
+
<menu name="AJP Protocol Reference">
<item name="AJPv13" href="../ajp/ajpv13a.html"/>
<item name="AJPv13 Extension Proposal" href="../ajp/ajpv13ext.html"/>
Modified: tomcat/jk/trunk/xdocs/project.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/project.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/project.xml (original)
+++ tomcat/jk/trunk/xdocs/project.xml Mon Feb 23 10:02:52 2015
@@ -29,20 +29,12 @@
<item name="Docs Home" href="index.html"/>
</menu>
- <menu name="Reference Guide">
- <item name="workers.properties" href="reference/workers.html"/>
- <item name="uriworkermap.properties" href="reference/uriworkermap.html"/>
- <item name="Status Worker" href="reference/status.html"/>
- <item name="Apache HTTP Server" href="reference/apache.html"/>
- <item name="IIS" href="reference/iis.html"/>
- </menu>
-
- <menu name="Generic HowTo">
- <item name="For the impatient" href="generic_howto/quick.html"/>
- <item name="All about workers" href="generic_howto/workers.html"/>
- <item name="Timeouts" href="generic_howto/timeouts.html"/>
- <item name="Load Balancing" href="generic_howto/loadbalancers.html"/>
- <item name="Reverse Proxy" href="generic_howto/proxy.html"/>
+ <menu name="Common HowTo">
+ <item name="For the impatient" href="common_howto/quick.html"/>
+ <item name="All about workers" href="common_howto/workers.html"/>
+ <item name="Timeouts" href="common_howto/timeouts.html"/>
+ <item name="Load Balancing" href="common_howto/loadbalancers.html"/>
+ <item name="Reverse Proxy" href="common_howto/proxy.html"/>
</menu>
<menu name="Webserver HowTo">
@@ -51,6 +43,14 @@
<item name="Netscape/SunOne/Sun" href="webserver_howto/nes.html"/>
</menu>
+ <menu name="Reference Guide">
+ <item name="workers.properties" href="reference/workers.html"/>
+ <item name="uriworkermap.properties" href="reference/uriworkermap.html"/>
+ <item name="Status Worker" href="reference/status.html"/>
+ <item name="Apache HTTP Server" href="reference/apache.html"/>
+ <item name="IIS" href="reference/iis.html"/>
+ </menu>
+
<menu name="AJP Protocol Reference">
<item name="AJPv13" href="ajp/ajpv13a.html"/>
<item name="AJPv13 Extension Proposal" href="ajp/ajpv13ext.html"/>
Modified: tomcat/jk/trunk/xdocs/reference/apache.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/apache.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/reference/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/apache.xml Mon Feb 23 10:02:52 2015
@@ -378,7 +378,7 @@ The default value is "SSL_CIPHER_USEKEYS
Name of the Apache environment variable which can be used to overwrite
the forwarded local name.
Use this only if you need to adjust the data (see the
-<a href="../generic_howto/proxy.html">proxy</a> documentation).
+<a href="../common_howto/proxy.html">proxy</a> documentation).
<br/>
The default value is "JK_LOCAL_NAME".
<br/>
@@ -398,7 +398,7 @@ This directive has been added in version
Name of the Apache environment variable which can be used to overwrite
the forwarded local IP address.
Use this only if you need to adjust the data (see the
-<a href="../generic_howto/proxy.html">proxy</a> documentation).
+<a href="../common_howto/proxy.html">proxy</a> documentation).
<br/>
The default value is "JK_LOCAL_ADDR".
<br/>
@@ -408,7 +408,7 @@ This directive has been added in version
Name of the Apache environment variable which can be used to overwrite
the forwarded local port.
Use this only if you need to adjust the data (see the
-<a href="../generic_howto/proxy.html">proxy</a> documentation).
+<a href="../common_howto/proxy.html">proxy</a> documentation).
<br/>
The default value is "JK_LOCAL_PORT".
<br/>
@@ -418,7 +418,7 @@ This directive has been added in version
Name of the Apache environment variable which can be used to overwrite
the forwarded remote (client) host name.
Use this only if you need to adjust the data (see the
-<a href="../generic_howto/proxy.html">proxy</a> documentation).
+<a href="../common_howto/proxy.html">proxy</a> documentation).
<br/>
The default value is "JK_REMOTE_HOST".
<br/>
@@ -428,7 +428,7 @@ This directive has been added in version
Name of the Apache environment variable which can be used to overwrite
the forwarded remote (client) IP address.
Use this only if you need to adjust the data (see the
-<a href="../generic_howto/proxy.html">proxy</a> documentation).
+<a href="../common_howto/proxy.html">proxy</a> documentation).
<br/>
The default value is "JK_REMOTE_ADDR".
<br/>
@@ -438,7 +438,7 @@ This directive has been added in version
Name of the Apache environment variable which can be used to overwrite
the forwarded remote (client) IP address.
Use this only if you need to adjust the data (see the
-<a href="../generic_howto/proxy.html">proxy</a> documentation).
+<a href="../common_howto/proxy.html">proxy</a> documentation).
<br/>
The default value is "JK_REMOTE_PORT".
<br/>
@@ -448,7 +448,7 @@ This directive has been added in version
Name of the Apache environment variable which can be used to overwrite
the forwarded user name.
Use this only if you need to adjust the data (see the
-<a href="../generic_howto/proxy.html">proxy</a> documentation).
+<a href="../common_howto/proxy.html">proxy</a> documentation).
<br/>
The default value is "JK_REMOTE_USER".
<br/>
@@ -458,7 +458,7 @@ This directive has been added in version
Name of the Apache environment variable which can be used to overwrite
the forwarded authentication type.
Use this only if you need to adjust the data (see the
-<a href="../generic_howto/proxy.html">proxy</a> documentation).
+<a href="../common_howto/proxy.html">proxy</a> documentation).
<br/>
The default value is "JK_AUTH_TYPE".
<br/>
Modified: tomcat/jk/trunk/xdocs/reference/project.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/project.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/reference/project.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/project.xml Mon Feb 23 10:02:52 2015
@@ -29,20 +29,12 @@
<item name="Docs Home" href="../index.html"/>
</menu>
- <menu name="Reference Guide">
- <item name="workers.properties" href="../reference/workers.html"/>
- <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
- <item name="Status Worker" href="../reference/status.html"/>
- <item name="Apache HTTP Server" href="../reference/apache.html"/>
- <item name="IIS" href="../reference/iis.html"/>
- </menu>
-
- <menu name="Generic HowTo">
- <item name="For the impatient" href="../generic_howto/quick.html"/>
- <item name="All about workers" href="../generic_howto/workers.html"/>
- <item name="Timeouts" href="../generic_howto/timeouts.html"/>
- <item name="Load Balancing" href="../generic_howto/loadbalancers.html"/>
- <item name="Reverse Proxy" href="../generic_howto/proxy.html"/>
+ <menu name="Common HowTo">
+ <item name="For the impatient" href="../common_howto/quick.html"/>
+ <item name="All about workers" href="../common_howto/workers.html"/>
+ <item name="Timeouts" href="../common_howto/timeouts.html"/>
+ <item name="Load Balancing" href="../common_howto/loadbalancers.html"/>
+ <item name="Reverse Proxy" href="../common_howto/proxy.html"/>
</menu>
<menu name="Webserver HowTo">
@@ -51,6 +43,14 @@
<item name="Netscape/SunOne/Sun" href="../webserver_howto/nes.html"/>
</menu>
+ <menu name="Reference Guide">
+ <item name="workers.properties" href="../reference/workers.html"/>
+ <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
+ <item name="Status Worker" href="../reference/status.html"/>
+ <item name="Apache HTTP Server" href="../reference/apache.html"/>
+ <item name="IIS" href="../reference/iis.html"/>
+ </menu>
+
<menu name="AJP Protocol Reference">
<item name="AJPv13" href="../ajp/ajpv13a.html"/>
<item name="AJPv13 Extension Proposal" href="../ajp/ajpv13ext.html"/>
Modified: tomcat/jk/trunk/xdocs/reference/uriworkermap.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/uriworkermap.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/reference/uriworkermap.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/uriworkermap.xml Mon Feb 23 10:02:52 2015
@@ -243,7 +243,7 @@ It overrides any <code>reply_timeout</co
to set a reasonable default reply timeout to the worker, and a more relaxed
reply timeout to URLs, which are known to start time intensive tasks.
For a general description of reply timeouts see the
-<a href="../generic_howto/timeouts.html#Reply Timeout">timeouts</a> documentation.
+<a href="../common_howto/timeouts.html#Reply Timeout">timeouts</a> documentation.
</p>
</subsection>
<subsection name="Extension sticky_ignore">
Modified: tomcat/jk/trunk/xdocs/reference/workers.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/workers.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/reference/workers.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/workers.xml Mon Feb 23 10:02:52 2015
@@ -146,7 +146,7 @@ Each worker configuration directive cons
The first word is always <b>worker</b>.
The second word is the worker name you can choose. In the case of load-balancing,
the worker name has an additional meaning. Please consult the
-<a href="../generic_howto/loadbalancers.html">Load Balancer HowTo</a>.
+<a href="../common_howto/loadbalancers.html">Load Balancer HowTo</a>.
</p>
<warn>
The name of the worker can contain only the alphanumeric characters
Modified: tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/apache.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/apache.xml Mon Feb 23 10:02:52 2015
@@ -36,7 +36,7 @@ You can use mod_jk, the Tomcat redirecto
<p>
It is recommended that you also read the
-<a href="../generic_howto/workers.html">Workers HowTo</a> document
+<a href="../common_howto/workers.html">Workers HowTo</a> document
to learn how to setup the working entities between your web server and Tomcat Engines.
For more detailed configuration information consult the Reference Guide for
<a href="../reference/worker.html">workers.properties</a>,
@@ -77,7 +77,7 @@ ${tomcat_home}\bin - Where you place web
</p>
<p>
In all the examples in this document ${tomcat_home} will be <b>/var/tomcat3</b>.
-A <a href="../generic_howto/workers.html">worker</a> is defined to be a tomcat process that accepts work from the Apache server.
+A <a href="../common_howto/workers.html">worker</a> is defined to be a tomcat process that accepts work from the Apache server.
</p>
</subsection>
Modified: tomcat/jk/trunk/xdocs/webserver_howto/iis.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/iis.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/webserver_howto/iis.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/iis.xml Mon Feb 23 10:02:52 2015
@@ -42,7 +42,7 @@ JSP requests to Tomcat (and this way, se
<p>
It is recommended that you also read the
-<a href="../generic_howto/workers.html">Workers HowTo</a> document
+<a href="../common_howto/workers.html">Workers HowTo</a> document
to learn how to setup the working entities between your web server and Tomcat Engines.
For more detailed configuration information consult the Reference Guide for
<a href="../reference/workers.html">workers.properties</a>,
@@ -452,7 +452,7 @@ As you can see the <b>examples</b> conte
</p>
<p>
-More information on using and configuring workers in the <a href="../generic_howto/workers.html">Workers HowTo</a>
+More information on using and configuring workers in the <a href="../common_howto/workers.html">Workers HowTo</a>
and in the <a href="../reference/workers.html">worker.properties configuration reference</a>.
</p>
Modified: tomcat/jk/trunk/xdocs/webserver_howto/nes.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/nes.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/webserver_howto/nes.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/nes.xml Mon Feb 23 10:02:52 2015
@@ -43,7 +43,7 @@ using the NSAPI redirector plugin.
</p>
<p>
-It is recommended that you also read the <a href="../generic_howto/workers.html">Workers HowTo</a> document
+It is recommended that you also read the <a href="../common_howto/workers.html">Workers HowTo</a> document
to learn how to setup the working entities between your web server and Tomcat Engines.
</p>
@@ -426,7 +426,7 @@ For example, if we want to submit the <b
</source>
<p>
-More informations on using and configuring workers in the <a href="../generic_howto/workers.html">Workers HowTo</a>
+More informations on using and configuring workers in the <a href="../common_howto/workers.html">Workers HowTo</a>
and in the <a href="../reference/workers.html">worker.properties configuration reference</a>.
</p>
Modified: tomcat/jk/trunk/xdocs/webserver_howto/project.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/project.xml?rev=1661631&r1=1661630&r2=1661631&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/webserver_howto/project.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/project.xml Mon Feb 23 10:02:52 2015
@@ -29,20 +29,12 @@
<item name="Docs Home" href="../index.html"/>
</menu>
- <menu name="Reference Guide">
- <item name="workers.properties" href="../reference/workers.html"/>
- <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
- <item name="Status Worker" href="../reference/status.html"/>
- <item name="Apache HTTP Server" href="../reference/apache.html"/>
- <item name="IIS" href="../reference/iis.html"/>
- </menu>
-
- <menu name="Generic HowTo">
- <item name="For the impatient" href="../generic_howto/quick.html"/>
- <item name="All about workers" href="../generic_howto/workers.html"/>
- <item name="Timeouts" href="../generic_howto/timeouts.html"/>
- <item name="Load Balancing" href="../generic_howto/loadbalancers.html"/>
- <item name="Reverse Proxy" href="../generic_howto/proxy.html"/>
+ <menu name="Common HowTo">
+ <item name="For the impatient" href="../common_howto/quick.html"/>
+ <item name="All about workers" href="../common_howto/workers.html"/>
+ <item name="Timeouts" href="../common_howto/timeouts.html"/>
+ <item name="Load Balancing" href="../common_howto/loadbalancers.html"/>
+ <item name="Reverse Proxy" href="../common_howto/proxy.html"/>
</menu>
<menu name="Webserver HowTo">
@@ -51,6 +43,14 @@
<item name="Netscape/SunOne/Sun" href="../webserver_howto/nes.html"/>
</menu>
+ <menu name="Reference Guide">
+ <item name="workers.properties" href="../reference/workers.html"/>
+ <item name="uriworkermap.properties" href="../reference/uriworkermap.html"/>
+ <item name="Status Worker" href="../reference/status.html"/>
+ <item name="Apache HTTP Server" href="../reference/apache.html"/>
+ <item name="IIS" href="../reference/iis.html"/>
+ </menu>
+
<menu name="AJP Protocol Reference">
<item name="AJPv13" href="../ajp/ajpv13a.html"/>
<item name="AJPv13 Extension Proposal" href="../ajp/ajpv13ext.html"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org