Author: markt
Date: Wed Jul 30 14:38:33 2008
New Revision: 681212
URL: http://svn.apache.org/viewvc?rev=681212&view=rev
Log:
Fix JK docs references
Modified:
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/build.xml
tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/index.xml
tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/project.xml
tomcat/current/tc4.1.x/STATUS.txt
Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=681212&r1=681211&r2=681212&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Wed Jul 30 14:38:33
2008
@@ -486,8 +486,7 @@
[4.1.31] #14193
Startup and Admin webapp
Exceptions on startup and errors in admin webapp when default
- context is
- defined with loader and/or manager.
+ context is defined with loader and/or manager.
[4.1.31] #22268
Admin webapp
@@ -549,8 +548,7 @@
[4.1.31] #20885
Docs
Align the description of the reload target in application
- developer guide with the
- description of reload from the manager
+ developer guide with the description of reload from the manager
documentation.
[4.1.31] #19869
@@ -699,6 +697,9 @@
[4.1.38] Docs
Update JNDI data source docs for use of maxActive
+[4.1.38] Docs
+ Reference docs for latest JK release rather latest JK/JK2 docs from
svn
+
------------------
Catalina Bug Fixes:
Modified: tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/build.xml?rev=681212&r1=681211&r2=681212&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/build.xml Wed Jul 30
14:38:33 2008
@@ -10,8 +10,6 @@
<property file="../../build.properties"/>
<property file="${user.home}/build.properties"/>
- <property name="tomcat-jk.home" value="${jtc.home}/jk"/>
-
<property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
@@ -166,14 +164,6 @@
<param name="project-menu" expression="nomenu"/>
</style>
- <!-- Build Coyote JK documentation -->
- <mkdir dir="${webapps.build}/${webapp.name}/jk"/>
- <mkdir dir="${webapps.build}/${webapp.name}/jk/printer"/>
- <ant dir="${tomcat-jk.home}/xdocs" >
- <property name="build.dir" value="${webapps.build}/${webapp.name}" />
- <property name="dist.name" value="jk" />
- </ant>
-
</target>
Modified: tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/index.xml?rev=681212&r1=681211&r2=681212&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/index.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/index.xml Wed Jul 30
14:38:33 2008
@@ -77,7 +77,7 @@
<strong>JNDI DataSource HOW-TO</strong></a>
- Configuring a JNDI DataSoure with a dB connection pool.
Examples for many popular databases.</li>
-<li><a href="jk2/index.html"><strong>JK Documenation</strong></a>
+<li><a href="http://tomcat.apache.org/connectors-doc/";><strong>JK
Documenation</strong></a>
- Complete documentation and HOWTOs on the JK native webserver connector,
used to interface Tomcat with servers like Apache HTTPd, IIS
and others.</li>
Modified: tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/project.xml?rev=681212&r1=681211&r2=681212&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/project.xml (original)
+++ tomcat/container/branches/tc4.1.x/webapps/tomcat-docs/project.xml Wed Jul
30 14:38:33 2008
@@ -31,7 +31,7 @@
<item name="Class Loader HOW-TO" href="class-loader-howto.html"/>
<item name="Connectors List" href="config/connectors.html"/>
<item name="HTML Manager App HOW-TO" href="html-manager-howto.html"/>
- <item name="JK Documentation" href="jk/index.html"/>
+ <item name="JK Documentation"
href="http://tomcat.apache.org/connectors-doc/"/>
<item name="JNDI DataSource HOW-TO"
href="jndi-datasource-examples-howto.html"/>
<item name="JNDI Resources HOW-TO" href="jndi-resources-howto.html"/>
Modified: tomcat/current/tc4.1.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=681212&r1=681211&r2=681212&view=diff
==============================================================================
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Wed Jul 30 14:38:33 2008
@@ -37,13 +37,6 @@
+1: markt, yoavs
-1:
-* Fix docs: don't include dev snapshots of JK docs, link to released version
instead
- http://people.apache.org/~rjung/patches/tc4_1-jk-docs.patch
- +1: rjung, markt, yoavs
- -1:
- rjung: Mark, I didn't actually try to build it. I guess it's much easier for
you :)
- markt: Yep. Your patch is fine. I can't believe there was still a ref to the
jk2 docs!
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45301
Remove a JDK 1.4 dep for the few users that still run TC4 on 1.3 JDKs
http://people.apache.org/~markt/patches/2008-07-07-bug45301-tc4.patch
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
