Author: rjung Date: Wed Dec 6 06:20:35 2006 New Revision: 483087 URL: http://svn.apache.org/viewvc?view=rev&rev=483087 Log: Renaming the config dir of the docs to reference and using the title Reference Guide in the docs.
Added: tomcat/connectors/trunk/jk/xdocs/reference/ tomcat/connectors/trunk/jk/xdocs/reference/apache.xml - copied unchanged from r483077, tomcat/connectors/trunk/jk/xdocs/config/apache.xml tomcat/connectors/trunk/jk/xdocs/reference/iis.xml - copied unchanged from r483077, tomcat/connectors/trunk/jk/xdocs/config/iis.xml tomcat/connectors/trunk/jk/xdocs/reference/project.xml - copied, changed from r483077, tomcat/connectors/trunk/jk/xdocs/config/project.xml tomcat/connectors/trunk/jk/xdocs/reference/uriworkermap.xml - copied unchanged from r483077, tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml tomcat/connectors/trunk/jk/xdocs/reference/workers.xml - copied, changed from r483077, tomcat/connectors/trunk/jk/xdocs/config/workers.xml Removed: tomcat/connectors/trunk/jk/xdocs/config/ Modified: tomcat/connectors/trunk/jk/xdocs/ajp/project.xml tomcat/connectors/trunk/jk/xdocs/build.xml tomcat/connectors/trunk/jk/xdocs/generic_howto/loadbalancers.xml tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml tomcat/connectors/trunk/jk/xdocs/index.xml tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml tomcat/connectors/trunk/jk/xdocs/miscellaneous/faq.xml tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml tomcat/connectors/trunk/jk/xdocs/news/20060101.xml tomcat/connectors/trunk/jk/xdocs/news/project.xml tomcat/connectors/trunk/jk/xdocs/project.xml tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml tomcat/connectors/trunk/jk/xdocs/webserver_howto/iis.xml tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml Modified: tomcat/connectors/trunk/jk/xdocs/ajp/project.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/ajp/project.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/ajp/project.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/ajp/project.xml Wed Dec 6 06:20:35 2006 @@ -13,11 +13,11 @@ <item name="Docs Home" href="../index.html"/> </menu> - <menu name="Configuration Reference"> - <item name="Workers.properties" href="../config/workers.html"/> - <item name="Uriworkermap.properties" href="../config/uriworkermap.html"/> - <item name="Apache" href="../config/apache.html"/> - <item name="IIS" href="../config/iis.html"/> + <menu name="Reference Guide"> + <item name="Workers.properties" href="../reference/workers.html"/> + <item name="Uriworkermap.properties" href="../reference/uriworkermap.html"/> + <item name="Apache" href="../reference/apache.html"/> + <item name="IIS" href="../reference/iis.html"/> </menu> <menu name="Generic HowTo"> @@ -53,4 +53,4 @@ </menu> </body> -</project> \ No newline at end of file +</project> Modified: tomcat/connectors/trunk/jk/xdocs/build.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/build.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/build.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/build.xml Wed Dec 6 06:20:35 2006 @@ -64,18 +64,18 @@ <param name="project-menu" expression="nomenu"/> </style> - <!-- Configuration Reference --> - <style basedir="config" - destdir="${build.dir}/${dist.name}/config" + <!-- Reference Guide --> + <style basedir="reference" + destdir="${build.dir}/${dist.name}/reference" extension=".html" style="style.xsl" excludes="project.xml" includes="*.xml"> <param name="relative-path" expression=".."/> </style> - <mkdir dir="${build.dir}/${dist.name}/config/printer"/> - <style basedir="config" - destdir="${build.dir}/${dist.name}/config/printer" + <mkdir dir="${build.dir}/${dist.name}/reference/printer"/> + <style basedir="reference" + destdir="${build.dir}/${dist.name}/reference/printer" extension=".html" style="style.xsl" excludes="project.xml" Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/loadbalancers.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/loadbalancers.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/generic_howto/loadbalancers.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/generic_howto/loadbalancers.xml Wed Dec 6 06:20:35 2006 @@ -33,7 +33,7 @@ Instead it is responsible for the management of several "real" workers. The worker is supposed to be a load balancer if its worker type is <b>lb</b>. See workers <b>type</b> directive. For a complete reference of all load balancer configuration -items, please consult the worker <a href="../config/workers.html">reference</a>. +items, please consult the worker <a href="../reference/workers.html">reference</a>. The comprehensive status management features of the load balancer together with the status worker, makes its use an interesting option, even if only combined with a single "real" worker. <warn>The workers that are member of load balancer do not need to appear in the Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml Wed Dec 6 06:20:35 2006 @@ -13,11 +13,11 @@ <item name="Docs Home" href="../index.html"/> </menu> - <menu name="Configuration Reference"> - <item name="Workers.properties" href="../config/workers.html"/> - <item name="Uriworkermap.properties" href="../config/uriworkermap.html"/> - <item name="Apache" href="../config/apache.html"/> - <item name="IIS" href="../config/iis.html"/> + <menu name="Reference Guide"> + <item name="Workers.properties" href="../reference/workers.html"/> + <item name="Uriworkermap.properties" href="../reference/uriworkermap.html"/> + <item name="Apache" href="../reference/apache.html"/> + <item name="IIS" href="../reference/iis.html"/> </menu> <menu name="Generic HowTo"> Modified: tomcat/connectors/trunk/jk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/index.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/index.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/index.xml Wed Dec 6 06:20:35 2006 @@ -52,10 +52,10 @@ </ul> </section> -<section name="Configuration Reference"> +<section name="Reference Guide"> <br /> <ul> -<li><a href="config/workers.html"><b>workers.properties</b></a> +<li><a href="reference/workers.html"><b>workers.properties</b></a> <p>A Tomcat worker is a Tomcat instance that is waiting to execute servlets on behalf of some web server. For example, we can have a web server such as Apache forwarding servlet requests to a Tomcat process (the worker) running behind it. @@ -65,20 +65,20 @@ </p> </li> -<li><a href="config/uriworkermap.html"><b>uriworkermap.properties</b></a> +<li><a href="reference/uriworkermap.html"><b>uriworkermap.properties</b></a> <p> The forwarding of requests from the web server to tomcat gets configured by defining mapping rules. The so-called <b>uriworkermap</b> file is a mechanism of defining those rules. </p> </li> -<li><a href="config/apache.html"><b>Apache</b></a> +<li><a href="reference/apache.html"><b>Apache</b></a> <p>This page contains detailed description of all directives related to Apache web server. </p> </li> -<li><a href="config/iis.html"><b>IIS</b></a> +<li><a href="reference/iis.html"><b>IIS</b></a> <p>This page contains detailed description of all IIS directives. </p> </li> Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Dec 6 06:20:35 2006 @@ -27,6 +27,10 @@ <subsection name="Native"> <changelog> <update> + Docs: Renaming the config dir to reference and using the title + Reference Guide in the docs. (rjung) + </update> + <update> Added retry_on_status for workers directive. (mturk) </update> <update> Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/faq.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/faq.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/faq.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/faq.xml Wed Dec 6 06:20:35 2006 @@ -111,7 +111,7 @@ </ul> <p> -For more detailed information, have a look at the configuration reference pages. +For more detailed information, have a look at the Reference Guide. You could also try searching the mailing list archives for "JK" or look at the source. </p> </subsection> @@ -139,7 +139,7 @@ <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 -<a href="../config/workers.html">workers.properties reference</a>. +<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> </subsection> @@ -156,7 +156,7 @@ </p> <p> To close connections after some time of inactivity you can use <b>connection_pool_timeout</b>, -for more informations refer to <a href="../config/workers.html">workers.properties reference</a>. +for more informations refer to <a href="../reference/workers.html">workers.properties reference</a>. </p> </subsection> Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml Wed Dec 6 06:20:35 2006 @@ -13,11 +13,11 @@ <item name="Docs Home" href="../index.html"/> </menu> - <menu name="Configuration Reference"> - <item name="Workers.properties" href="../config/workers.html"/> - <item name="Uriworkermap.properties" href="../config/uriworkermap.html"/> - <item name="Apache" href="../config/apache.html"/> - <item name="IIS" href="../config/iis.html"/> + <menu name="Reference Guide"> + <item name="Workers.properties" href="../reference/workers.html"/> + <item name="Uriworkermap.properties" href="../reference/uriworkermap.html"/> + <item name="Apache" href="../reference/apache.html"/> + <item name="IIS" href="../reference/iis.html"/> </menu> <menu name="Generic HowTo"> Modified: tomcat/connectors/trunk/jk/xdocs/news/20060101.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20060101.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/news/20060101.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/news/20060101.xml Wed Dec 6 06:20:35 2006 @@ -81,7 +81,7 @@ <p>Version 1.2.16 of Tomcat Connectors 1.2.16 has not been released due to a bug in the jk status worker. This version adds some features and a few bug fixes to the 1.2.15 version. Furthermore some worker attributes -have been <a href="../config/workers.html">deprecated</a>. +have been <a href="../reference/workers.html">deprecated</a>. </p> <p> Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes. Modified: tomcat/connectors/trunk/jk/xdocs/news/project.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/project.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/news/project.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/news/project.xml Wed Dec 6 06:20:35 2006 @@ -13,11 +13,11 @@ <item name="Docs Home" href="../index.html"/> </menu> - <menu name="Configuration Reference"> - <item name="Workers.properties" href="../config/workers.html"/> - <item name="Uriworkermap.properties" href="../config/uriworkermap.html"/> - <item name="Apache" href="../config/apache.html"/> - <item name="IIS" href="../config/iis.html"/> + <menu name="Reference Guide"> + <item name="Workers.properties" href="../reference/workers.html"/> + <item name="Uriworkermap.properties" href="../reference/uriworkermap.html"/> + <item name="Apache" href="../reference/apache.html"/> + <item name="IIS" href="../reference/iis.html"/> </menu> <menu name="Generic HowTo"> Modified: tomcat/connectors/trunk/jk/xdocs/project.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/project.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/project.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/project.xml Wed Dec 6 06:20:35 2006 @@ -13,11 +13,11 @@ <item name="Docs Home" href="index.html"/> </menu> - <menu name="Configuration Reference"> - <item name="Workers.properties" href="config/workers.html"/> - <item name="Uriworkermap.properties" href="config/uriworkermap.html"/> - <item name="Apache" href="config/apache.html"/> - <item name="IIS" href="config/iis.html"/> + <menu name="Reference Guide"> + <item name="Workers.properties" href="reference/workers.html"/> + <item name="Uriworkermap.properties" href="reference/uriworkermap.html"/> + <item name="Apache" href="reference/apache.html"/> + <item name="IIS" href="reference/iis.html"/> </menu> <menu name="Generic HowTo"> Copied: tomcat/connectors/trunk/jk/xdocs/reference/project.xml (from r483077, tomcat/connectors/trunk/jk/xdocs/config/project.xml) URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/project.xml?view=diff&rev=483087&p1=tomcat/connectors/trunk/jk/xdocs/config/project.xml&r1=483077&p2=tomcat/connectors/trunk/jk/xdocs/reference/project.xml&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/config/project.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/reference/project.xml Wed Dec 6 06:20:35 2006 @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project name="Apache Tomcat Connector Documentation - Configuration Reference" +<project name="Apache Tomcat Connector Documentation - Reference Guide" href="http://tomcat.apache.org/"> - <title>The Apache Tomcat Connector - Configuration Reference</title> + <title>The Apache Tomcat Connector - Reference Guide</title> <logo href="/images/tomcat.gif"> - The Apache Tomcat Connector - Configuration Reference + The Apache Tomcat Connector - Reference Guide </logo> <body> @@ -13,11 +13,11 @@ <item name="Docs Home" href="../index.html"/> </menu> - <menu name="Configuration Reference"> - <item name="Workers.properties" href="../config/workers.html"/> - <item name="Uriworkermap.properties" href="../config/uriworkermap.html"/> - <item name="Apache" href="../config/apache.html"/> - <item name="IIS" href="../config/iis.html"/> + <menu name="Reference Guide"> + <item name="Workers.properties" href="../reference/workers.html"/> + <item name="Uriworkermap.properties" href="../reference/uriworkermap.html"/> + <item name="Apache" href="../reference/apache.html"/> + <item name="IIS" href="../reference/iis.html"/> </menu> <menu name="Generic HowTo"> Copied: tomcat/connectors/trunk/jk/xdocs/reference/workers.xml (from r483077, tomcat/connectors/trunk/jk/xdocs/config/workers.xml) URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/workers.xml?view=diff&rev=483087&p1=tomcat/connectors/trunk/jk/xdocs/config/workers.xml&r1=483077&p2=tomcat/connectors/trunk/jk/xdocs/reference/workers.xml&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/config/workers.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/reference/workers.xml Wed Dec 6 06:20:35 2006 @@ -711,7 +711,7 @@ </p> </directive> -<directive name="retry_on_status" default="0" required="false"> +<directive name="fail_on_status" default="0" required="false"> Set this value to the HTTP status code that will cause a worker to fail if returned from Servlet contatiner. Use this directive to deal with cases when the servlet container can temporary return non-200 responses Modified: tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml Wed Dec 6 06:20:35 2006 @@ -38,10 +38,10 @@ <p> It is recommended that you also read the <a href="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 documentation for -<a href="../config/worker.html">workers.properties</a>, -<a href="../config/uriworkermap.html">uriworkermap</a> -and <a href="../config/apache.html">Apache</a>. +For more detailed configuration information consult the Reference Guide for +<a href="../reference/worker.html">workers.properties</a>, +<a href="../reference/uriworkermap.html">uriworkermap</a> +and <a href="../reference/apache.html">Apache</a>. </p> <p> Modified: tomcat/connectors/trunk/jk/xdocs/webserver_howto/iis.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/iis.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/webserver_howto/iis.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/iis.xml Wed Dec 6 06:20:35 2006 @@ -43,10 +43,10 @@ <p> It is recommended that you also read the <a href="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 documentation for -<a href="../config/worker.html">workers.properties</a>, -<a href="../config/uriworkermap.html">uriworkermap</a> -and <a href="../config/iis.html">IIS</a>. +For more detailed configuration information consult the Reference Guide for +<a href="../reference/worker.html">workers.properties</a>, +<a href="../reference/uriworkermap.html">uriworkermap</a> +and <a href="../reference/iis.html">IIS</a>. </p> @@ -164,11 +164,11 @@ <b>isapi_redirect.dll</b> - The IIS server plugin, either obtain a pre-built DLL or build it yourself (see the build section). </li> <li> -<b><a href="../config/workers.html">workers.properties</a></b> - A file that describes the host(s) and port(s) used by the workers (Tomcat processes). +<b><a href="../reference/workers.html">workers.properties</a></b> - A file that describes the host(s) and port(s) used by the workers (Tomcat processes). A sample workers.properties can be found under the conf directory. </li> <li> -<b><a href="../config/uriworkermap.html">uriworkermap.properties</a></b> - A file that maps URL-Path patterns to workers. +<b><a href="../reference/uriworkermap.html">uriworkermap.properties</a></b> - A file that maps URL-Path patterns to workers. A sample uriworkermap.properties can be found under the conf directory as well. </li> </ul> @@ -426,7 +426,7 @@ <p> More informations on using and configuring workers in the <a href="../generic_howto/workers.html">Workers HowTo</a> -and in the <a href="../config/workers.html">worker.properties configuration reference</a>. +and in the <a href="../reference/workers.html">worker.properties configuration reference</a>. </p> </subsection> Modified: tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml Wed Dec 6 06:20:35 2006 @@ -404,7 +404,7 @@ <p> More informations on using and configuring workers in the <a href="../generic_howto/workers.html">Workers HowTo</a> -and in the <a href="../config/workers.html">worker.properties configuration reference</a>. +and in the <a href="../reference/workers.html">worker.properties configuration reference</a>. </p> </subsection> Modified: tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml?view=diff&rev=483087&r1=483086&r2=483087 ============================================================================== --- tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml (original) +++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml Wed Dec 6 06:20:35 2006 @@ -13,11 +13,11 @@ <item name="Docs Home" href="../index.html"/> </menu> - <menu name="Configuration Reference"> - <item name="Workers.properties" href="../config/workers.html"/> - <item name="Uriworkermap.properties" href="../config/uriworkermap.html"/> - <item name="Apache" href="../config/apache.html"/> - <item name="IIS" href="../config/iis.html"/> + <menu name="Reference Guide"> + <item name="Workers.properties" href="../reference/workers.html"/> + <item name="Uriworkermap.properties" href="../reference/uriworkermap.html"/> + <item name="Apache" href="../reference/apache.html"/> + <item name="IIS" href="../reference/iis.html"/> </menu> <menu name="Generic HowTo"> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]