Author: rjung
Date: Wed May 2 19:39:01 2012
New Revision: 1333168
URL: http://svn.apache.org/viewvc?rev=1333168&view=rev
Log:
Removing obsolete bug warning.
Jira says "fixed in commons daemon 1.0.2", which
happended long ago. Hope that's right ...
Backport of r1333161 form trunk resp.
r1333164 from tc7.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1333161
Merged /tomcat/tc7.0.x/trunk:r1333164
Propchange: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/
------------------------------------------------------------------------------
Merged /tomcat/tc7.0.x/trunk/java/org/apache/catalina/core:r1333164
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1333168&r1=1333167&r2=1333168&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed May 2 19:39:01 2012
@@ -167,6 +167,10 @@
Patch provided by Felix Schumacher. (rjung)
</fix>
<fix>
+ Remove obsolete bug warning from windows service
+ documentation page. (rjung)
+ </fix>
+ <fix>
<bug>53158</bug>: Fix documented defaults for DBCP.
Patch provided by ph.dezanneau at gmail.com. (rjung)
</fix>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml?rev=1333168&r1=1333167&r2=1333168&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml Wed May 2
19:39:01 2012
@@ -108,10 +108,6 @@
<source>--Classpath=xx.jar</source>
</p>
<p> as command line parameter.</p>
- <p><strong>Note:</strong> PR_DEPENDSON, PR_ENVIRONMENT, PR_JVMOPTIONS,
- PR_JVMMS, PR_JVMMX, PR_JVMSS, PR_STARTPARAMS, PR_STOPPARAMS and
- PR_STOPTIMEOUT will not work until this bug is fixed:
- <a href="http://issues.apache.org/jira/browse/DAEMON-49";>DAEMON-49</a></p>
<p>
<table>
<tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
