Author: markt
Date: Tue Jun 26 19:04:50 2012
New Revision: 1354171
URL: http://svn.apache.org/viewvc?rev=1354171&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53464
Correct file location (it was moved from Commons Daemon to bin/)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/setup.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1354170
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1354171&r1=1354170&r2=1354171&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jun 26 19:04:50 2012
@@ -117,6 +117,10 @@
<bug>53459</bug>: Correction and clarifications to the SSL Connector
configuration examples in the SSL how-to. (markt)
</fix>
+ <fix>
+ <bug>53464</bug>: Correct reference to sample init.d script for use
with
+ jsvc in the documentation web application. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/setup.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/setup.xml?rev=1354171&r1=1354170&r2=1354171&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/setup.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/setup.xml Tue Jun 26 19:04:50 2012
@@ -143,11 +143,9 @@
information. In particular, the <code>-debug</code> option is useful
to debug issues running jsvc.</p>
- <p>The file <code>
-
$CATALINA_HOME/bin/commons-daemon-1.0.x-native-src/unix/native/Tomcat5.sh
- </code> can be used as a template for starting Tomcat automatically at
- boot time from <code>/etc/init.d</code>. The file is currently setup for
- running Tomcat 5.5.x, so it will be necessary to edit it a little.</p>
+ <p>The file <code>$CATALINA_HOME/bin/daemon.sh</code> can be used as a
+ template for starting Tomcat automatically at boot time from
+ <code>/etc/init.d</code> with jsvc.</p>
<p>Note that the Commons-Daemon JAR file must be on your runtime classpath
to run Tomcat in this manner. The Commons-Daemon JAR file is in the
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
