Author: kkolinko
Date: Thu Mar 14 21:01:13 2013
New Revision: 1456684
URL: http://svn.apache.org/r1456684
Log:
CTR: docs
Merged revisions r1456666 r1456678 from tomcat/trunk:
Correct typos
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1456666-1456678
Modified: tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml?rev=1456684&r1=1456683&r2=1456684&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml Thu Mar 14 21:01:13
2013
@@ -117,7 +117,7 @@
The locations for Context Descriptors are:
</p>
<ol>
-
<li>$CATALINA_BASE/conf/[enginename]/[hostname]/context.xml</li>
+
<li>$CATALINA_BASE/conf/[enginename]/[hostname]/[webappname].xml</li>
<li>$CATALINA_BASE/webapps/[webappname]/META-INF/context.xml</li>
</ol>
<p>
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=1456684&r1=1456683&r2=1456684&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 Thu Mar 14
21:01:13 2013
@@ -53,7 +53,7 @@
</tr>
<tr><th>//MS//</th>
<td>Monitor service</td>
- <td>Put the icon in the system try</td>
+ <td>Put the icon in the system tray</td>
</tr>
</table>
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
