fix misprints in comments and javadoc

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@784614 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java
index 625c7d5..0f6c20a 100644 (file)
--- a/java/org/apache/catalina/Context.java
+++ b/java/org/apache/catalina/Context.java
@@ -1060,7 +1060,7 @@ public interface Context extends Container {
 
 
     /**
-     * Get the server.xml <host> attribute's xmlNamespaceAware.
+     * Get the server.xml &lt;host&gt; attribute's xmlNamespaceAware.
      * @return true if namespace awarenes is enabled.
      */
     public boolean getTldNamespaceAware();

diff --git a/java/org/apache/catalina/Host.java b/java/org/apache/catalina/Host.java
index a9413d3..296839f 100644 (file)
--- a/java/org/apache/catalina/Host.java
+++ b/java/org/apache/catalina/Host.java
@@ -167,7 +167,7 @@ public interface Host extends Container {
 
 
     /**
-     * Get the server.xml <host> attribute's xmlNamespaceAware.
+     * Get the server.xml &lt;host&gt; attribute's xmlNamespaceAware.
      * @return true if namespace awarenes is enabled.
      *
      */
@@ -175,7 +175,7 @@ public interface Host extends Container {
 
 
     /**
-     * Get the server.xml <host> attribute's xmlValidation.
+     * Get the server.xml &lt;host&gt; attribute's xmlValidation.
      * @return true if validation is enabled.
      *
      */

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 1838ef1..d26802b 100644 (file)
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5650,7 +5650,7 @@ public class StandardContext
     }
 
     /**
-     * Get the server.xml <host> attribute's xmlNamespaceAware.
+     * Get the server.xml &lt;host&gt; attribute's xmlNamespaceAware.
      * @return true if namespace awarenes is enabled.
      */
     public boolean getTldNamespaceAware(){

diff --git a/java/org/apache/catalina/core/StandardHost.java b/java/org/apache/catalina/core/StandardHost.java
index 72c5e1f..c94586c 100644 (file)
--- a/java/org/apache/catalina/core/StandardHost.java
+++ b/java/org/apache/catalina/core/StandardHost.java
@@ -479,7 +479,7 @@ public class StandardHost
     }
 
     /**
-     * Get the server.xml <host> attribute's xmlValidation.
+     * Get the server.xml &lt;host&gt; attribute's xmlValidation.
      * @return true if validation is enabled.
      *
      */
@@ -488,7 +488,7 @@ public class StandardHost
     }
 
     /**
-     * Get the server.xml <host> attribute's xmlNamespaceAware.
+     * Get the server.xml &lt;host&gt; attribute's xmlNamespaceAware.
      * @return true if namespace awarenes is enabled.
      *
      */

diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java
index ec80600..588698d 100644 (file)
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -255,7 +255,7 @@ public class HostConfig
     }
 
     /**
-     * Get the server.xml <host> attribute's xmlValidation.
+     * Get the server.xml &lt;host&gt; attribute's xmlValidation.
      * @return true if validation is enabled.
      *
      */
@@ -264,7 +264,7 @@ public class HostConfig
     }
 
     /**
-     * Get the server.xml <host> attribute's xmlNamespaceAware.
+     * Get the server.xml &lt;host&gt; attribute's xmlNamespaceAware.
      * @return true if namespace awarenes is enabled.
      *
      */

diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index 79489ed..e8b1bf6 100644 (file)
--- a/java/org/apache/catalina/startup/TldConfig.java
+++ b/java/org/apache/catalina/startup/TldConfig.java
@@ -228,7 +228,7 @@ public final class TldConfig  implements LifecycleListener {
     }
 
     /**
-     * Get the server.xml <host> attribute's xmlValidation.
+     * Get the server.xml &lt;host&gt; attribute's xmlValidation.
      * @return true if validation is enabled.
      *
      */
@@ -237,7 +237,7 @@ public final class TldConfig  implements LifecycleListener {
     }
 
     /**
-     * Get the server.xml <host> attribute's xmlNamespaceAware.
+     * Get the server.xml &lt;host&gt; attribute's xmlNamespaceAware.
      * @return true if namespace awarenes is enabled.
      *
      */

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index cb6c584..3ec3dee 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -213,7 +213,7 @@ Section "Service" SecTomcatService
   Pop $2
 
   nsExec::ExecToLog '"$INSTDIR\bin\tomcat@VERSION_MAJOR@.exe" //US//Tomcat@VERSION_MAJOR@ --Startup auto'
-  ; Bahave like Apache Httpd (put the icon in try on login)
+  ; Behave like Apache Httpd (put the icon in tray on login)
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor" '"$INSTDIR\bin\tomcat@VERSION_MAJOR@w.exe" //MS//Tomcat@VERSION_MAJOR@'
 
   ClearErrors