~james-page/ubuntu/oneiric/tomcat6/CVE-2011-3190

« back to all changes in this revision

Viewing changes to webapps/docs/windows-service-howto.xml

  • Committer: Bazaar Package Importer
  • Author(s): tony mancill
  • Date: 2011-04-18 20:38:29 UTC
  • mfrom: (2.2.27 sid)
  • Revision ID: james.westby@ubuntu.com-20110418203829-ogfwstmnzl4o3nby
Tags: 6.0.32-3
* Team upload.
* Include upstream patch for ASF Bugzilla - Bug 50700
  (Context parameters are being overridden with parameters from the 
   web application deployment descriptor) (Closes: #623242)

Show diffs side-by-side

added added

removed removed

Lines of Context:
167
167
    <tr>
168
168
    <td>--JavaHome</td>
169
169
    <td>JAVA_HOME</td>
170
 
    <td>Set a different JAVA_HOME then defined by JAVA_HOME environment
 
170
    <td>Set a different JAVA_HOME than defined by JAVA_HOME environment
171
171
        variable</td>
172
172
    </tr>
173
173
    <tr>