Author: mturk
Date: Tue Nov 15 17:24:18 2011
New Revision: 1202318
URL: http://svn.apache.org/viewvc?rev=1202318&view=rev
Log:
Use 2.x instead 2.0 in docs where possible since we support any 2.x branch
Modified:
tomcat/jk/trunk/native/BUILDING.txt
tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
Modified: tomcat/jk/trunk/native/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/BUILDING.txt?rev=1202318&r1=1202317&r2=1202318&view=diff
==============================================================================
--- tomcat/jk/trunk/native/BUILDING.txt (original)
+++ tomcat/jk/trunk/native/BUILDING.txt Tue Nov 15 17:24:18 2011
@@ -49,11 +49,11 @@
./configure -with-apxs=/home2/local/apache/bin/apxs
- Build for both Apache HTTP Server 1.3 and 2.0
+ Build for both Apache HTTP Server 1.3 and 2.x
---------------------------------------------
If you want to build mod_jk for Apache HTTP Server
- 1.3 and 2.0, you should :
+ 1.3 and 2.x, you should :
use configure and indicate Apache HTTP Server 1.3
apxs location (--with-apxs)
@@ -61,7 +61,7 @@
copy the mod_jk binary to the apache modules location
make clean (to remove all previously compiled modules)
- use configure and indicate Apache HTTP Server 2.0
+ use configure and indicate Apache HTTP Server 2.x
apxs location,
then make.
@@ -77,7 +77,7 @@
Examples
--------
- Apache HTTP Server 2.0:
+ Apache HTTP Server 2.x:
./configure --with-apxs=/opt/apache2/bin/apxs
@@ -102,7 +102,7 @@
--with-apxs[=FILE]
FILE is the location of the apxs tool. Default is finding apxs in PATH.
It builds a shared Apache module. It detects automaticly the Apache version.
- (2.0 and 1.3)
+ (2.x and 1.3)
* --with-apache=DIR
DIR is the path where apache sources are located.
The apache sources should have been configured before configuring mod_jk.
@@ -129,7 +129,7 @@
./apache-1.3/mod_jk.so if you select to build mod_jk for apache 1.3
- ./apache-2.0/mod_jk.so if you select to build mod_jk for apache 2.0
+ ./apache-2.0/mod_jk.so if you select to build mod_jk for apache 2.x
Modified: tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/apache.xml?rev=1202318&r1=1202317&r2=1202318&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/apache.xml Tue Nov 15 17:24:18 2011
@@ -88,7 +88,7 @@ The mod_jk module was developed and test
<ul>
<li>
Linux, FreeBSD, AIX, HP-UX, MacOS X, Solaris and should works on major Unixes
platforms
-supporting Apache 1.3 and/or 2.0/2.2
+supporting Apache 1.3 and/or 2.x
</li>
<li>
WinNT4.0-i386 SP4/SP5/SP6a (should be able to work with other service packs),
Win2K and WinXP and Win98
@@ -204,7 +204,7 @@ For others, the binary distribution of m
For example JK 1.2.x can be downloaded from a mirror
<a href="http://tomcat.apache.org/download-connectors.cgi";>
here</a> (look for JK 1.2 Binary Releases). The "JK 1.2 Binary Releases" link
contains binary version for a variety of
-operating systems for both Apache 1.3 and Apache 2.
+operating systems for both Apache 1.3 and Apache 2.x.
</p>
</section>
@@ -320,7 +320,7 @@ Here is a simple configuration:
<source>
# Load mod_jk module
LoadModule jk_module libexec/mod_jk.so
- # Declare the module for <IfModule directive> (remove this line on
Apache 2.0.x)
+ # Declare the module for <IfModule directive> (remove this line on
Apache 2.x)
AddModule mod_jk.c
# Where to find workers.properties
JkWorkersFile /etc/httpd/conf/workers.properties
@@ -369,7 +369,7 @@ We'll discuss here the mod_jk directives
</source>
<p>
-Since JK 1.2.3 for Apache 2.0/2.2 and JK 1.2.16 for Apache 1.3 this can also
+Since JK 1.2.3 for Apache 2.x and JK 1.2.16 for Apache 1.3 this can also
be used for piped logging:
</p>
@@ -786,7 +786,7 @@ document space for a VirtualHost:
</source>
<p>
-Starting with mod_jk 1.2.6 for Apache 2.0/2.2 and 1.2.19 for Apache 1.3, it's
possible to exclude some URL/URI from
+Starting with mod_jk 1.2.6 for Apache 2.x and 1.2.19 for Apache 1.3, it's
possible to exclude some URL/URI from
jk processing by setting the env var <b>no-jk</b>, for example with the
SetEnvIf Directive.
</p>
@@ -901,9 +901,9 @@ You could set <b>CFLAGS</b> and <b>LDFLA
</screen>
<p>
-If you want to build mod_jk for different version of Apache httpd, like 1.3,
2.0 and 2.2,
+If you want to build mod_jk for different version of Apache httpd, like 1.3,
2.x,
you need to go through the full build process for each of them.
-Please note, that httpd 2.0 and 2.2 modules are <b>not</b> compatible. The
mod_jk directory
+Please note, that httpd 2.0 and 2.2 or 2.3 modules are <b>not</b> compatible.
The mod_jk directory
used is "apache-2.0" in both cases, but you need to compile separately.
<ul>
<li>
@@ -935,7 +935,7 @@ Start over with the apxs location for yo
<td>--with-apxs[=FILE]</td>
<td>FILE is the location of the apxs tool. Default is finding apxs in PATH.
It builds a shared Apache module. It detects automatically the Apache version.
-(2.0/2.2 and 1.3)</td>
+(2.x and 1.3)</td>
</tr>
<tr valign="top"><td>--with-apache=DIR</td>
<td>DIR is the path where apache sources are located.
@@ -950,10 +950,10 @@ Not needed when --with-apxs has been use
</tr>
<tr valign="top"><td>--enable-prefork</td>
<td>
-In case you build mod_jk for a multi-threaded Apache httpd 2.0/2.2 MPM
(Multi-Processing Module),
+In case you build mod_jk for a multi-threaded Apache httpd 2.x MPM
(Multi-Processing Module),
some areas of mod_jk code need to be synchronised to make it thread-safe.
Because configure can not easily detect, whether your are using a
multi-threaded MPM,
-mod_jk by default is always build thread-safe for Apache httpd 2.0/2.2.
+mod_jk by default is always build thread-safe for Apache httpd 2.x.
If you are sure, that your MPM is not multi-threaded, you can use
"--enable-prefork"
to force the removal of the synchronisation code (thus increasing performance
a bit).
For instance, the prefork MPM is not multi-threaded. For Apache httpd 1.3
@@ -1013,7 +1013,7 @@ some information about your Java Environ
<subsection name="Examples of configure use">
<screen>
-<note>Apache 1.3 and 2.0/2.2 build</note>
+<note>Apache 1.3 and 2.x build</note>
<type>./configure --with-apxs=/usr/sbin/apxs</type><br/>
<type>make</type><br/>
<type>cp ./apache-1.3/mod_jk.so /usr/lib/apache</type><br/>
@@ -1024,7 +1024,7 @@ some information about your Java Environ
</screen>
<screen>
-<note>Apache 2.0/2.2 build with JNI support</note>
+<note>Apache 2.x build with JNI support</note>
<type>./configure --with-apxs2=/opt/apache2/bin/apxs \</type>
<typenext>--with-java-home=${JAVA_HOME} --with-java-platform=2 \</typenext>
<typenext>--enable-jni</typenext><br/>
@@ -1044,12 +1044,12 @@ The steps that you need to take are:
</p>
<ul>
<li>
-Change directory to the apache 1.3 or apache 2.0 source directory depending on
your version of Apache.
+Change directory to the apache-1.3 or apache-2.0 source directory depending on
your version of Apache.
</li>
<li>
If you want to build mod_jk for Apache 1.3, set an <b>APACHE1_HOME</b>
environment variable which points
to where your Apache 1.3 is installed.
-A mod_jk module for Apache 2.0 build will require <b>APACHE2_HOME</b>
environment variable to be set.
+A mod_jk module for Apache 2.x build will require <b>APACHE2_HOME</b>
environment variable to be set.
</li>
<li>
Copy mod_jk.so to Apache's modules directory.
@@ -1070,12 +1070,12 @@ An example on how to build mod_jk for Ap
</screen>
<p>
-An example on how to build mod_jk for Apache 2.0:
+An example on how to build mod_jk for Apache 2.x:
</p>
<screen>
-<note>Set location for Apache 2.0 sources</note>
+<note>Set location for Apache 2.x sources</note>
<typedos>set APACHE2_HOME=c:\apache20</typedos>
-<note>Change directory to the mod_jk module for Apache 2.0</note>
+<note>Change directory to the mod_jk module for Apache 2.x</note>
<typedos>cd c:\home\apache\jk\native\apache-2.0</typedos>
<note>Build the sources using MSDEV</note>
<typedos>MSDEV mod_jk.dsp /MAKE ALL</typedos>
@@ -1213,9 +1213,9 @@ Assuming that you are root :
<type>make -f Makefile.apxs</type>
<type>cp mod_jk.so /etc/libexec/httpd</type>
-<note>For Apache 2.0:</note>
+<note>For Apache 2.x:</note>
<type>./configure --with-apxs=/usr/local/apache2/bin/apxs</type>
-<note>(you should point to the directory where you installed Apache 2.0)</note>
+<note>(you should point to the directory where you installed Apache 2.x)</note>
<type>cd apache-2.0</type>
<type>make -f Makefile.apxs install</type>
</screen>
@@ -1227,11 +1227,11 @@ mod_jk allows to install mod_jk in the A
linked mod_jk. Having mod_jk in the httpd executable brings some performance
improvements. The configure option --with-apache prepare mod_jk to install it
in the Apache source tree.
-The option --with-apache works both for Apache-1.3 and Apache-2.0.
+The option --with-apache works both for Apache 1.3 and Apache 2.x.
The examples below show how to get mod_jk in the httpd process.
</p>
-<subsection name="Installation in Apache-2.0">
+<subsection name="Installation in Apache-2.x">
<screen>
<note> /home/apache20/httpd-2.0.43 is the directory where the httpd-2.0 sources
are located. </note>
@@ -1241,7 +1241,7 @@ are located. </note>
/home/apache20/httpd-2.0.43/modules: </note>
<type>make install</type><br/>
<note> It is not possible to configure Apache directly because the config.m4
of mod_jk must
-be added to the configure of httpd-2.0. </note>
+be added to the configure of httpd-2.x. </note>
<type>cd /home/apache20/httpd-2.0.43</type>
<type>sh buildconf</type>
<type>configure ... --with-mod_jk</type>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
