Author: kkolinko Date: Mon May 28 17:50:14 2012 New Revision: 1343337 URL: http://svn.apache.org/viewvc?rev=1343337&view=rev Log: Merged revision 1343335 from tomcat/trunk: Correct broken HTML in Javadoc comment. <engine> -> <engine>
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1343335 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1343337&r1=1343336&r2=1343337&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Mon May 28 17:50:14 2012 @@ -124,8 +124,9 @@ public class StandardHost extends Contai /** - * Should XML files be copied to $CATALINA_BASE/conf/<engine>/<host> by - * default when a web application is deployed? + * Should XML files be copied to + * $CATALINA_BASE/conf/<engine>/<host> by default when + * a web application is deployed? */ private boolean copyXML = false; Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1343337&r1=1343336&r2=1343337&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Mon May 28 17:50:14 2012 @@ -129,8 +129,9 @@ public class HostConfig /** - * Should XML files be copied to $CATALINA_BASE/conf/<engine>/<host> by - * default when a web application is deployed? + * Should XML files be copied to + * $CATALINA_BASE/conf/<engine>/<host> by default when + * a web application is deployed? */ protected boolean copyXML = false; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org