This is an automated email from the ASF dual-hosted git repository. ebourg pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5b1b80a62993dbcc6af101c68693af9c9b55a229 Author: Emmanuel Bourg <[email protected]> AuthorDate: Wed Sep 28 13:40:05 2022 +0200 Fix the typos in the documentation --- webapps/docs/changelog.xml | 4 ++-- webapps/docs/config/ajp.xml | 2 +- webapps/docs/config/cluster-interceptor.xml | 2 +- webapps/docs/config/context.xml | 2 +- webapps/docs/config/filter.xml | 2 +- webapps/docs/config/globalresources.xml | 2 +- webapps/docs/config/http.xml | 6 +++--- webapps/docs/config/jaspic.xml | 2 +- webapps/docs/config/realm.xml | 2 +- webapps/docs/config/sessionidgenerator.xml | 2 +- webapps/docs/config/systemprops.xml | 4 ++-- webapps/docs/config/valve.xml | 4 ++-- webapps/docs/jasper-howto.xml | 2 +- webapps/docs/monitoring.xml | 4 ++-- webapps/docs/realm-howto.xml | 2 +- webapps/docs/rewrite.xml | 2 +- webapps/docs/ssi-howto.xml | 2 +- webapps/docs/ssl-howto.xml | 2 +- webapps/docs/tomcat-docs.xsl | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 7394872d6c..aaa0db5c05 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -712,7 +712,7 @@ <add> Effectively disable the <code>WebappClassLoaderBase.getResources()</code> method as it is not - used and if something accidently exposes the class loader this method + used and if something accidentally exposes the class loader this method can be used to gain access to Tomcat internals. (markt) </add> </changelog> @@ -1302,7 +1302,7 @@ getting the passord of a user. (remm) </fix> <docs> - Add Javadoc comment which listeners must be nested whithin + Add Javadoc comment which listeners must be nested within <code>Server</code> elements only. (michaelo) </docs> <add> diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml index 88a1a7b882..505ee56b50 100644 --- a/webapps/docs/config/ajp.xml +++ b/webapps/docs/config/ajp.xml @@ -87,7 +87,7 @@ 7231 section 4.3.8, cookie and authorization headers will be excluded from the response to the TRACE request. If you wish to include these, you can implement the <code>doTrace()</code> method for the target Servlet and - gain full control over the reponse.</p> + gain full control over the response.</p> </attribute> <attribute name="asyncTimeout" required="false"> diff --git a/webapps/docs/config/cluster-interceptor.xml b/webapps/docs/config/cluster-interceptor.xml index 836c4cddcd..1adfcf3336 100644 --- a/webapps/docs/config/cluster-interceptor.xml +++ b/webapps/docs/config/cluster-interceptor.xml @@ -36,7 +36,7 @@ <section name="Introduction"> <p> Apache Tribes supports an interceptor architecture to intercept both messages and membership notifications. - This architecture allows decoupling of logic and opens the way for some very useful feature add ons. + This architecture allows decoupling of logic and opens the way for some very useful feature add-ons. </p> </section> diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 0f7480bae6..312731410d 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -1127,7 +1127,7 @@ <attribute name="value" required="true"> <p>The parameter value that will be presented to the application - when requested from the JNDI context. This value must be convertable + when requested from the JNDI context. This value must be convertible to the Java type defined by the <code>type</code> attribute.</p> </attribute> diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml index 253ec44f73..4070f77e28 100644 --- a/webapps/docs/config/filter.xml +++ b/webapps/docs/config/filter.xml @@ -1120,7 +1120,7 @@ FINE: Request "/docs/config/manager.html" with response status "200" IPv6 are both fully supported. </p> - <p>This filter mimicks Apache httpd's <code>Order</code>, + <p>This filter mimics Apache httpd's <code>Order</code>, <code>Allow from</code> and <code>Deny from</code> directives, with the following limitations: </p> diff --git a/webapps/docs/config/globalresources.xml b/webapps/docs/config/globalresources.xml index 35b533e77a..fba311ff82 100644 --- a/webapps/docs/config/globalresources.xml +++ b/webapps/docs/config/globalresources.xml @@ -118,7 +118,7 @@ <attribute name="value" required="true"> <p>The parameter value that will be presented to the application - when requested from the JNDI context. This value must be convertable + when requested from the JNDI context. This value must be convertible to the Java type defined by the <code>type</code> attribute.</p> </attribute> diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 710cbbd9dd..8f5501044d 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -59,7 +59,7 @@ received, Tomcat will accept new connections until the current number of connections reaches <code>maxConnections</code>. Connections are queued inside the server socket created by the <strong>Connector</strong> until a thread - becomes avaialble to process the connection. Once <code>maxConnections</code> + becomes available to process the connection. Once <code>maxConnections</code> has been reached the operating system will queue further connections. The size of the operating system provided connection queue may be controlled by the <code>acceptCount</code> attribute. If the operating system queue fills, @@ -83,7 +83,7 @@ 7231 section 4.3.8, cookie and authorization headers will be excluded from the response to the TRACE request. If you wish to include these, you can implement the <code>doTrace()</code> method for the target Servlet and - gain full control over the reponse.</p> + gain full control over the response.</p> </attribute> <attribute name="asyncTimeout" required="false"> @@ -164,7 +164,7 @@ expires. For HTTP/1.1 upgrade, the request body is buffered for the duration of the upgrade process. The limit can be disabled by setting this attribute to -1. Setting the attribute to zero will disable the saving of - the requets body data during authentication and HTTP/1.1 upgrade. If not + the request body data during authentication and HTTP/1.1 upgrade. If not specified, this attribute is set to 4096 (4 kilobytes).</p> </attribute> diff --git a/webapps/docs/config/jaspic.xml b/webapps/docs/config/jaspic.xml index 15a611ff41..56d0e8d96f 100644 --- a/webapps/docs/config/jaspic.xml +++ b/webapps/docs/config/jaspic.xml @@ -54,7 +54,7 @@ <p>Users should be aware that if the static JASPIC configuration file configures JASPIC for a given web application then the JASPIC configuration - will take precendence over any <code><login-config></code> present in + will take precedence over any <code><login-config></code> present in the web application's <code>WEB-INF/web.xml</code> file.</p> </section> diff --git a/webapps/docs/config/realm.xml b/webapps/docs/config/realm.xml index 6a84fa1969..a198950b63 100644 --- a/webapps/docs/config/realm.xml +++ b/webapps/docs/config/realm.xml @@ -668,7 +668,7 @@ <attribute name="useStaticPrincipal" required="false"> <p>This allows using a static <code>Principal</code> instance - disconnected from the database if needed. This makes the bahavior of + disconnected from the database if needed. This makes the behavior of authenticated prinicipals equivalent to that of the other realms. If there is a plan to use serialization, it is best to set this to <code>true</code> as the principal will always be replaced by this diff --git a/webapps/docs/config/sessionidgenerator.xml b/webapps/docs/config/sessionidgenerator.xml index 2a1117c19d..d370f29810 100644 --- a/webapps/docs/config/sessionidgenerator.xml +++ b/webapps/docs/config/sessionidgenerator.xml @@ -65,7 +65,7 @@ <attribute name="jvmRoute" required="false"> <p>A routing identifier for this Tomcat instance. It will be added - to the session id to allow for stateless stickyness routing by + to the session id to allow for stateless stickiness routing by load balancers. The details on how the <code>jvmRoute</code> will be included in the id are implementation dependent. See <a href="#Standard_Implementation">Standard Implementation</a> diff --git a/webapps/docs/config/systemprops.xml b/webapps/docs/config/systemprops.xml index 296ff09a92..1dbf0baed0 100644 --- a/webapps/docs/config/systemprops.xml +++ b/webapps/docs/config/systemprops.xml @@ -512,7 +512,7 @@ <properties> <property name="tomcat.util.scan. StandardJarScanFilter.jarsToSkip"> - <p>A list of comma-separated file name patters that is used as the default + <p>A list of comma-separated file name patterns that is used as the default value for <code>pluggabilitySkip</code> and <code>tldSkip</code> attributes of the standard <a href="jar-scan-filter.html">JarScanFilter</a> implementation.</p> @@ -522,7 +522,7 @@ </property> <property name="tomcat.util.scan. StandardJarScanFilter.jarsToScan"> - <p>A list of comma-separated file name patters that is used as the default + <p>A list of comma-separated file name patterns that is used as the default value for <code>pluggabilityScan</code> and <code>tldScan</code> attributes of the standard <a href="jar-scan-filter.html">JarScanFilter</a> implementation.</p> diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml index c54d1d0dd0..0f2a9ed792 100644 --- a/webapps/docs/config/valve.xml +++ b/webapps/docs/config/valve.xml @@ -781,7 +781,7 @@ it will be passed on. </p> - <p>This valve mimicks Apache's <code>Order</code>, + <p>This valve mimics Apache's <code>Order</code>, <code>Allow from</code> and <code>Deny from</code> directives, with the following limitations: </p> @@ -2144,7 +2144,7 @@ <code>fullyQualifiedClassName</code> or a sub-class of it. For example, <code>errorCode.java.io.IOException</code> specifies the file to return for an <code>IOException</code>. The location may be relative or - absolule. If relative, it must be relative to + absolute. If relative, it must be relative to <code>$CATALINA_BASE</code>. If no matching error page is found, the default <strong>Error Report Valve</strong> response will be returned.</p> diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml index d8f6860d97..a0d47edecf 100644 --- a/webapps/docs/jasper-howto.xml +++ b/webapps/docs/jasper-howto.xml @@ -425,7 +425,7 @@ with Jasper. The second extension point is the Expression Language interpreter. Alternative interpreters may be configured through the <code>ServletContext</code>. See the <code>ELInterpreterFactory</code> javadoc for details of how to configure an -alternative EL interpreter. A alternative interpreter primarily targetting tag +alternative EL interpreter. A alternative interpreter primarily targeting tag settings is provided at <code>org.apache.jasper.optimizations.ELInterpreterTagSetters</code>. See the javadoc for details of the optimisations and the impact they have on diff --git a/webapps/docs/monitoring.xml b/webapps/docs/monitoring.xml index b8698b2de3..216c28d597 100644 --- a/webapps/docs/monitoring.xml +++ b/webapps/docs/monitoring.xml @@ -153,12 +153,12 @@ senderAddress=${cluster.server.address},senderPort=${cluster.server.port}" /> <!-- get current maxActiveSession from ClusterTest application echo it to Ant output and store at - property <em>clustertest.maxActiveSessions.orginal</em> + property <em>clustertest.maxActiveSessions.original</em> --> <jmx:get name="Catalina:type=Manager,context=/ClusterTest,host=localhost" attribute="maxActiveSessions" - resultproperty="clustertest.maxActiveSessions.orginal" + resultproperty="clustertest.maxActiveSessions.original" echo="true" /> <!-- set maxActiveSession to 100 diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml index b4c619ebc2..11c9960349 100644 --- a/webapps/docs/realm-howto.xml +++ b/webapps/docs/realm-howto.xml @@ -850,7 +850,7 @@ to all virtual hosts and web applications. The default contents of the with all its roles. The cached user is <strong>not</strong> saved and restored across sessions serialisations. When the user's principal object is serialized for any reason, it will also be replaced by a static - equivalent object with roles that will no longer reflect the databse + equivalent object with roles that will no longer reflect the database contents.</li> </ul> diff --git a/webapps/docs/rewrite.xml b/webapps/docs/rewrite.xml index 81763fc372..61b06b5f2e 100644 --- a/webapps/docs/rewrite.xml +++ b/webapps/docs/rewrite.xml @@ -44,7 +44,7 @@ <p>The rewrite valve can be configured as a valve added in a Host. See <a href="config/host.html">virtual-server</a> documentation for - informations how to configure it. It will use a <code>rewrite.config</code> file + information on how to configure it. It will use a <code>rewrite.config</code> file containing the rewrite directives, it must be placed in the Host configuration folder. </p> diff --git a/webapps/docs/ssi-howto.xml b/webapps/docs/ssi-howto.xml index 7418e771b2..0484404f58 100644 --- a/webapps/docs/ssi-howto.xml +++ b/webapps/docs/ssi-howto.xml @@ -142,7 +142,7 @@ false.</li> whose type will be processed by the SSI servlet. The directives take the form of an HTML comment. The directive is replaced by the results of interpreting it before sending the page to the client. The general form of a directive is: </p> -<p> <code><!--#directive [parm=value] --></code></p> +<p> <code><!--#directive [param=value] --></code></p> <p>The directives are:</p> <ul> <li> diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml index ff4aae5651..c94e6d7413 100644 --- a/webapps/docs/ssl-howto.xml +++ b/webapps/docs/ssl-howto.xml @@ -444,7 +444,7 @@ After that you can proceed with importing your Certificate.</p> <p>Each Certificate Authority tends to differ slightly from the others. They may require slightly different information and/or provide the certificate and associated certificate chain in different formats. Additionally, the rules that -the Certificate Authorities use for issuing certifcates change over time. As a +the Certificate Authorities use for issuing certificates change over time. As a result you may find that the commands given above may need to be modified. If you require assitance then help is available via the <a href="http://tomcat.apache.org/lists.html#tomcat-users";>Apache Tomcat users diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl index 94904bc02f..16071f52e8 100644 --- a/webapps/docs/tomcat-docs.xsl +++ b/webapps/docs/tomcat-docs.xsl @@ -27,7 +27,7 @@ indent="no" doctype-system="about:legacy-compat"/> - <!-- Defined parameters (overrideable) --> + <!-- Defined parameters (overridable) --> <xsl:param name="home-name" select="'The Tomcat Project'"/> <xsl:param name="home-href" select="'https://tomcat.apache.org/'"/> <xsl:param name="home-logo" select="'/images/tomcat.png'"/> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
