fix typo

build.xml

@@ -1926,6 +1926,26 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
         <path location="${ant.core.lib}"/>
       </classpath>
     </javadoc>
+    <javadoc packagenames="javax.security.auth.message.*"
+      sourcepath="${tomcat.dist}/src/java"
+      destdir="${tomcat.dist}/webapps/docs/jaspicapi"
+      version="true"
+      windowtitle="JASPIC 1.1 API Documentation - Apache Tomcat ${version}"
+      doctitle="JASPIC 1.1 API - Apache Tomcat ${version}"
+      header="&lt;b&gt;JASPIC 1.1 - Apache Tomcat ${version}&lt;/b&gt;"
+      bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
+      encoding="UTF-8"
+      docencoding="UTF-8"
+      charset="UTF-8"
+      additionalparam="-breakiterator -notimestamp"
+      maxmemory="512m"
+      failonerror="true"
+      failonwarning="true">
+      <classpath>
+        <path refid="compile.classpath"/>
+        <path location="${ant.core.lib}"/>
+      </classpath>
+    </javadoc>
     <javadoc packagenames="org.apache.*"
       destdir="${tomcat.dist}/webapps/docs/api"
       version="true"

conf/server.xml

@@ -76,7 +76,7 @@
                connectionTimeout="20000"
                redirectPort="8443" />
     -->
-    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
          This connector uses the NIO implementation. The default
          SSLImplementation will depend on the presence of the APR/native
          library and the useOpenSSL attribute of the
@@ -93,7 +93,7 @@
         </SSLHostConfig>
     </Connector>
     -->
-    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
          This connector uses the APR/native implementation which always uses
          OpenSSL for TLS.
          Either JSSE or OpenSSL style configuration may be used. OpenSSL style

java/javax/servlet/http/HttpServletRequest.java

@@ -353,7 +353,7 @@ public default PushBuilder newPushBuilder() {
      * <td>/xyz
      * </table>
      * <p>
-     * To reconstruct an URL with a scheme and host, use
+     * To reconstruct a URL with a scheme and host, use
      * {@link #getRequestURL}.
      *
      * @return a <code>String</code> containing the part of the URL from the

java/javax/servlet/http/PushBuilder.java

@@ -84,7 +84,7 @@ public interface PushBuilder {
     PushBuilder sessionId(String sessionId);
 
     /**
-     * Sets a HTTP header on the request. Any existing headers of the same name
+     * Sets an HTTP header on the request. Any existing headers of the same name
      * are first remove.
      *
      * @param name  The name of the header to set
@@ -95,7 +95,7 @@ public interface PushBuilder {
     PushBuilder setHeader(String name, String value);
 
     /**
-     * Adds a HTTP header to the request.
+     * Adds an HTTP header to the request.
      *
      * @param name  The name of the header to add
      * @param value The value of the header to add

java/javax/servlet/resources/web-app_2_5.xsd

@@ -471,7 +471,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
     <xsd:simpleType name="http-methodType">
         <xsd:annotation>
             <xsd:documentation>
-                A HTTP method type as defined in HTTP 1.1 section 2.2.
+                An HTTP method type as defined in HTTP 1.1 section 2.2.
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:token">

java/javax/servlet/resources/web-common_3_0.xsd

@@ -593,7 +593,7 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        A HTTP method type as defined in HTTP 1.1 section 2.2.
+        An HTTP method type as defined in HTTP 1.1 section 2.2.
 
       </xsd:documentation>
     </xsd:annotation>

java/javax/servlet/resources/web-common_3_1.xsd

@@ -566,7 +566,7 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        A HTTP method type as defined in HTTP 1.1 section 2.2.
+        An HTTP method type as defined in HTTP 1.1 section 2.2.
 
       </xsd:documentation>
     </xsd:annotation>

java/javax/servlet/resources/web-common_4_0.xsd

@@ -566,7 +566,7 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        A HTTP method type as defined in HTTP 1.1 section 2.2.
+        An HTTP method type as defined in HTTP 1.1 section 2.2.
 
       </xsd:documentation>
     </xsd:annotation>

java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java

@@ -35,7 +35,7 @@
  * <p>
  * Examples:
  * <br>
- * Get a Mbean IDataSender attribute nrOfRequests and create a new ant property <em>IDataSender.9025.nrOfRequests</em>
+ * Get an Mbean IDataSender attribute nrOfRequests and create a new ant property <em>IDataSender.9025.nrOfRequests</em>
  * </p>
  * <pre>
  *   &lt;jmx:get

java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java

@@ -37,7 +37,7 @@
  * </ul>
  * <p>
  * Examples:
- * Set a Mbean Manager attribute maxActiveSessions.
+ * Set an Mbean Manager attribute maxActiveSessions.
  * Set this attribute with fresh jmx connection without save reference
  * </p>
  * <pre>

java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java

@@ -22,7 +22,7 @@
 import org.apache.tools.ant.BuildException;
 
 /**
- * unregister a MBean at <em>JMX</em> JSR 160 MBeans Server.
+ * unregister an MBean at <em>JMX</em> JSR 160 MBeans Server.
  * <ul>
  * <li>unregister Mbeans</li>
  * </ul>

java/org/apache/catalina/ant/jmx/package.html

@@ -41,13 +41,13 @@
   <tr>
     <td>username</td>
     <td>
-      The username of a MBeanServer auth, when configured.
+      The username of an MBeanServer auth, when configured.
     </td>
   </tr>
   <tr>
     <td>password</td>
     <td>
-      The password of a MBeanServer auth, when configured.
+      The password of an MBeanServer auth, when configured.
     </td>
   </tr>
   <tr>

java/org/apache/catalina/connector/LocalStrings.properties

@@ -21,7 +21,6 @@ coyoteAdapter.checkRecycled.request=Encountered a non-recycled request and recyc
 coyoteAdapter.checkRecycled.response=Encountered a non-recycled response and recycled it forcedly.
 coyoteAdapter.debug=The variable [{0}] has value [{1}]
 coyoteAdapter.nullRequest=An asynchronous dispatch may only happen on an existing request
-coyoteAdapter.parsePathParam=Unable to parse the path parameters using encoding [{0}]. The path parameters in the URL will be ignored.
 
 coyoteConnector.invalidEncoding=The encoding [{0}] is not recognised by the JRE. The Connector will continue to use [{1}]
 coyoteConnector.invalidPort=The connector cannot start since the specified port value of [{0}] is invalid

java/org/apache/catalina/connector/LocalStrings_cs.properties

@@ -15,7 +15,6 @@
 
 coyoteAdapter.checkRecycled.response=Nerecyklovatelná odpověď byla nalezena a vynuceně recyklována.
 coyoteAdapter.debug=Proměnná [{0}] má hodnotu [{1}]
-coyoteAdapter.parsePathParam=Nelze načíst URL parametr pomocí kódování [{0}]. Parametry URL budou ignorovány..
 
 coyoteConnector.invalidEncoding=Kódování [{0}] není rozeznáno JRE. Kontektor použije [{1}]
 coyoteConnector.invalidPort=Konektor nemůže nastartova, neboť uvedená hodnota portu [{0}] není platná

java/org/apache/catalina/connector/LocalStrings_de.properties

@@ -15,7 +15,6 @@
 
 coyoteAdapter.checkRecycled.response=Eine nicht recycelte Antwort wurde erkannt und recylet
 coyoteAdapter.debug=Die Variable [{0}] hat den Wert [{1}]
-coyoteAdapter.parsePathParam=Das Parsen der Pfadparameter ist schlug mit der Kodierung [{0}] fehl. Die Parameter im Pfad werden ignoriert
 
 coyoteConnector.invalidEncoding=Das Encoding [{0}] wird von der JRE nicht erkannt. Der Konnektor wird weiterhin [{1}] nutzen
 coyoteConnector.invalidPort=Der Konnektor kann nicht starten, da der als Port angegebene Wert [{0}] nicht gültig ist.

java/org/apache/catalina/connector/LocalStrings_es.properties

@@ -16,7 +16,6 @@
 coyoteAdapter.accesslogFail=Excepción al intentar añadir una entrada al historial de acceso
 coyoteAdapter.checkRecycled.response=Se encontró una respuesta no reciclable y se crecicló a la fuerza
 coyoteAdapter.debug=La variable [{0}] tiene el valor [{1}]
-coyoteAdapter.parsePathParam=No puedo analizar los parámetros de ruta mediante la codificación [{0}]. Se ignoran los parámetros de la URL.
 
 coyoteConnector.invalidEncoding=La codificación  [{0}]  no esta reconocida por  JRE. El conector continuará usando [{1}]\n
 coyoteConnector.invalidPort=El conector no puede inciar debido a que el valor del puerto especificado [{0}] no es válido

java/org/apache/catalina/connector/LocalStrings_fr.properties

@@ -21,7 +21,6 @@ coyoteAdapter.checkRecycled.request=Trouvé une requête non recyclée dont le r
 coyoteAdapter.checkRecycled.response=Trouvé une réponse non recyclée, et forcé son recyclage
 coyoteAdapter.debug=La variable [{0}] a la valeur [{1}]
 coyoteAdapter.nullRequest=Un dispatch asynchrone peut seulement se produire sur une requête existante
-coyoteAdapter.parsePathParam=Impossible de parser les paramètres du chemin en utilisant l''encodage [{0}]. Les paramètres du chemin (path) dans le URL seront ignorés.
 
 coyoteConnector.invalidEncoding=L''encodage [{0}] n''est pas reconnu par la JRE. Le connecteur (Connector) continuera à utiliser [{1}]
 coyoteConnector.invalidPort=Le connecteur ne peut pas démarrer, parce que la valeur spécifiée du port [{0}] n''est pas valide

java/org/apache/catalina/connector/LocalStrings_ja.properties

@@ -21,7 +21,6 @@ coyoteAdapter.checkRecycled.request=リサイクルされていないリクエ
 coyoteAdapter.checkRecycled.response=リサイクルされていないレスポンスが発生、強制的にリサイクルされました。
 coyoteAdapter.debug=変数[{0}]に値[{1}]があります
 coyoteAdapter.nullRequest=非同期ディスパッチは、既存のリクエストでのみ発生する可能性があります
-coyoteAdapter.parsePathParam=エンコード[{0}]を使用してパスパラメータを解析できません。 URLのパスパラメータは無視されます。
 
 coyoteConnector.invalidEncoding=[{0}] は JRE の理解できない符号化方式です。Connector は [{1}] で処理を続行します。
 coyoteConnector.invalidPort=[{0}]の指定されたポート値が無効であるため、コネクタを開始できません

java/org/apache/catalina/connector/LocalStrings_ko.properties

@@ -21,7 +21,6 @@ coyoteAdapter.checkRecycled.request=참조 해제 되지않은 요청을 발견
 coyoteAdapter.checkRecycled.response=참조 해제되지 않은 응답이 발견되어 강제로 참조 해제합니다.
 coyoteAdapter.debug=변수 [{0}]이(가) 값 [{1}]을(를) 가지고 있습니다.
 coyoteAdapter.nullRequest=비동기 디스패치는, 기존 요청에 대해 오직 한번만 일어나야 합니다.
-coyoteAdapter.parsePathParam=인코딩 [{0}]을(를) 사용하여 경로 파라미터들을 파싱할 수 없습니다. URL 내의 경로 파라미터들은 무시될 것입니다.
 
 coyoteConnector.invalidEncoding=인코딩 [{0}]은(는) JRE에 의해 인식되지 않습니다. Connector는 [{1}]을(를) 계속 사용할 것입니다.
 coyoteConnector.invalidPort=지정된 포트 번호, [{0}]이(가) 유효하지 않기 때문에, Connector가 시작될 수 없습니다.

java/org/apache/catalina/connector/LocalStrings_ru.properties

@@ -14,4 +14,3 @@
 # limitations under the License.
 
 coyoteAdapter.debug=Переменная [{0}] имеет значение [{1}]
-coyoteAdapter.parsePathParam=Невозможно разобрать параметры пути используя кодировку [{0}]. Параметры будут проигнорированы.

java/org/apache/catalina/connector/LocalStrings_zh_CN.properties

@@ -15,7 +15,6 @@
 
 coyoteAdapter.checkRecycled.response=遇到非回收的相应并强行回收。
 coyoteAdapter.debug=变量[{0}]的值为[{1}]。
-coyoteAdapter.parsePathParam=无法使用编码[{0}]解析地址参数，url中的该地址参数将被忽略
 
 coyoteConnector.invalidEncoding=编码 [{0}] 不能被 JRE 识别，Connector 将继续使用 [{1}]
 coyoteConnector.invalidPort=连接器不能启动，因为指定的端口 [{0}]无效

java/org/apache/catalina/connector/Request.java

@@ -284,7 +284,7 @@ public org.apache.coyote.Request getCoyoteRequest() {
 
 
     /**
-     * Using writer flag.
+     * Using reader flag.
      */
     protected boolean usingReader = false;
 

java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java

@@ -70,7 +70,7 @@ public class JreMemoryLeakPreventionListener implements LifecycleListener {
      * Protect against the memory leak caused when the first call to
      * <code>sun.awt.AppContext.getAppContext()</code> is triggered by a web
      * application. Defaults to <code>false</code> since Tomcat code no longer
-     * triggers this althoguh application code may.
+     * triggers this although application code may.
      */
     private boolean appContextProtection = false;
     public boolean isAppContextProtection() { return appContextProtection; }

java/org/apache/catalina/core/LocalStrings.properties

@@ -106,7 +106,6 @@ asyncContextImpl.response.ise=It is illegal to call getResponse() after complete
 containerBase.backgroundProcess.cluster=Exception processing cluster [{0}] background process
 containerBase.backgroundProcess.error=Exception processing background thread
 containerBase.backgroundProcess.realm=Exception processing realm [{0}] background process
-containerBase.backgroundProcess.unexpectedThreadDeath=Unexpected death of background thread [{0}]
 containerBase.backgroundProcess.valve=Exception processing valve [{0}] background process
 containerBase.child.destroy=Error destroying child
 containerBase.child.notUnique=Child name [{0}] is not unique
@@ -138,7 +137,6 @@ jniLifecycleListener.load.name=Loaded native library [{0}]
 jniLifecycleListener.load.path=Loaded native library from [{0}]
 jniLifecycleListener.missingPathOrName=One of libraryName or libraryPath must be set
 
-jreLeakListener.authPolicyFail=Error whilst attempting to prevent memory leak in javax.security.auth.Policy class
 jreLeakListener.classToInitializeFail=Failed to load class [{0}] during Tomcat start to prevent possible memory leaks.
 jreLeakListener.gcDaemonFail=Failed to trigger creation of the GC Daemon thread during Tomcat start to prevent possible memory leaks. This is expected on non-Sun JVMs.
 jreLeakListener.jarUrlConnCacheFail=Failed to disable Jar URL connection caching by default
@@ -197,7 +195,6 @@ standardContext.manager=Configured a manager of class [{0}]
 standardContext.managerFail=The session manager failed to start
 standardContext.namingResource.destroy.fail=Failed to destroy old naming resources
 standardContext.namingResource.init.fail=Failed to init new naming resources
-standardContext.noResourceJar=Resource JARs are not supported. The JAR found at [{0}] will not be used to provide static content for context with name [{1}]
 standardContext.notStarted=Context with name [{0}] has not yet been started
 standardContext.notWrapper=Child of a Context must be a Wrapper
 standardContext.parameter.duplicate=Duplicate context initialization parameter [{0}]
@@ -229,7 +226,6 @@ standardContext.stop.asyncWaitInterrupted=Interrupt received while waiting unloa
 standardContext.stoppingContext=Exception stopping Context with name [{0}]
 standardContext.suspiciousUrl=Suspicious URL pattern: [{0}] in context [{1}], see sections 12.1 and 12.2 of the Servlet specification
 standardContext.threadBindingListenerError=An error occurred in the thread binding listener configured for Context [{0}]
-standardContext.unknownCookieEncoding=The unknown encoding [{0}] was specified for setCookieEncoding(String) so the default of UTF-8 will be used instead
 standardContext.urlPattern.patternWarning=WARNING: URL pattern [{0}] must start with a ''/'' in Servlet 2.4
 standardContext.webappClassLoader.missingProperty=Unable to set the web application class loader property [{0}] to [{1}] as the property does not exist.
 standardContext.workCreateException=Failed to determine absolute work directory from directory [{0}] and CATALINA_HOME [{1}] for context [{2}]

java/org/apache/catalina/core/LocalStrings_cs.properties

@@ -27,7 +27,6 @@ applicationFilterRegistration.nullInitParams=Není možné nastavit inicializač
 aprListener.initializingFIPS=Inicializace FIPS módu...
 
 containerBase.backgroundProcess.cluster=Výjimka při zpracování procesu na pozadí v clusteru [{0}]
-containerBase.backgroundProcess.unexpectedThreadDeath=Neočekávaní ukončení vlákna na pozadí [{0}]
 
 defaultInstanceManager.invalidInjection=Neplatá anotace pro vložení zdroje (resource) na metodě
 defaultInstanceManager.restrictedContainerServlet=Přístup ke třídě [{0}] je zakázán. Jedná se o exkluzivní třítu (implementující interface ContainerServlet). Webová aplikace musí mít nakonfigurované potřebné právo (pro nahrání této třídy).

java/org/apache/catalina/core/LocalStrings_de.properties

@@ -26,7 +26,6 @@ aprListener.initializingFIPS=FIPS-Modus wird initialisiert...
 
 containerBase.backgroundProcess.cluster=Ausnahme beim Abarbeiten des Cluster [{0}] Hintergrundprozesses
 containerBase.backgroundProcess.error=Während der Hintergrund Thread abgearbeitet wurde trat eine Exception auf
-containerBase.backgroundProcess.unexpectedThreadDeath=Unerwarteter Tod des Hintergrund-Threads [{0}]
 
 defaultInstanceManager.invalidInjection=Ungültige ressource injection Annotation
 

java/org/apache/catalina/core/LocalStrings_es.properties

@@ -68,7 +68,6 @@ asyncContextImpl.requestEnded=El requerimiento asociado con AsyncContext ya ha c
 
 containerBase.backgroundProcess.cluster=Excepción al procesar clúster [{0}] de proceso en segundo plano
 containerBase.backgroundProcess.realm=Excepción al procesar reino [{0}] de proceso en segundo plano
-containerBase.backgroundProcess.unexpectedThreadDeath=Muerte inesperada de un hilo en segudo plano [{0}]\n
 containerBase.backgroundProcess.valve=Excepción al procesar válvula [{0}] de proceso en segundo plano
 
 defaultInstanceManager.invalidInjection=Método inválido para el recurso de inserción de anotación
@@ -80,7 +79,6 @@ defaultInstanceManager.restrictedServletsResource=No se ha hallado el fichero de
 filterChain.filter=La ejecución del Filtro lanzó una excepción
 filterChain.servlet=La ejecución del Servlet lanzó una excepción
 
-jreLeakListener.authPolicyFail=Error mientras intentaba prevenir fallos de memoria en javax.security.auth.Policy class
 jreLeakListener.gcDaemonFail=No pude disparar la creación del hilo Daemon GC durante el arranque de Tomcat para prevenir posibles fallos de memoria. Esto es lo esperado en JVMs no Sun.
 jreLeakListener.jarUrlConnCacheFail=No pude desactivar la caché de conexión URL de Jar por defecto
 jreLeakListener.ldapPoolManagerFail=No pude disparar la creación de la clase com.sun.jndi.ldap.LdapPoolManager durante el arranque de Tomcat para prevenir posibles fallos de memoria. Esto es lo que se espera si las JVMs no son Sun.
@@ -121,7 +119,6 @@ standardContext.manager=Configurado un gestor de la clase [{0}]
 standardContext.managerFail=El manejador de sesiones falló al iniciar
 standardContext.namingResource.destroy.fail=No pude destruir recursos de viejo nombre
 standardContext.namingResource.init.fail=No pude inicializar recursos de nuevo nombre
-standardContext.noResourceJar=Los JARs de recurso no están soportados. El JAR hallado en [{0}] no se utilizará para proveer de contenido estático para el contexto con nombre [{1}]
 standardContext.notStarted=Aún no se ha arrancado el Contexto [{0}]
 standardContext.notWrapper=El Hijo de un Contexto debe de ser un Arropador (Wrapper)
 standardContext.parameter.duplicate=Duplicado parámetro de inicialización de contexto [{0}]
@@ -139,7 +136,6 @@ standardContext.servletMap.pattern=<url-pattern> [{0}] inválida en mapeo de ser
 standardContext.startFailed=Falló en arranque del Contexto [{0}] debido a errores previos
 standardContext.startingContext=Excepción arrancando Contexto con nombre [{0}]
 standardContext.stoppingContext=Excepción parando Context [{0}]
-standardContext.unknownCookieEncoding=La codificación desconocida [{0}] fue especificada para setCookieEncoding(String) por lo cual la default UTF-8 será usada en su lugar
 standardContext.urlPattern.patternWarning=AVISO: el patrón URL [{0}] debe de comenzar con ''/'' en Servlet 2.4
 standardContext.workCreateException=No pude determinar directorio absoluto de trabajo a partir del directorio [{0}] y  CATALINA_HOME [{1}] para el contexto [{2}]
 standardContext.workCreateFail=No pude crear el directorio de trabajo [{0}] para el contexto [{1}]