This is an automated email from the ASF dual-hosted git repository. ebourg pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1865e916fc2aac56c98fdca95e9b98ff96449e98 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/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 | 4 ++-- webapps/docs/config/http2.xml | 2 +- webapps/docs/config/jaspic.xml | 2 +- webapps/docs/config/listeners.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 | 6 +++--- webapps/docs/jasper-howto.xml | 2 +- webapps/docs/monitoring.xml | 4 ++-- webapps/docs/rewrite.xml | 2 +- webapps/docs/ssi-howto.xml | 2 +- webapps/docs/ssl-howto.xml | 4 ++-- webapps/docs/tomcat-docs.xsl | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 8247e4aa34..9cbd8f06ba 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -661,7 +661,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> @@ -1183,7 +1183,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> <update> 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 5129e7bbc0..9a2f1ec89f 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -1106,7 +1106,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 5c2f232942..47d0b923bf 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, @@ -160,7 +160,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/http2.xml b/webapps/docs/config/http2.xml index 87c3d31ab8..34d4c9e603 100644 --- a/webapps/docs/config/http2.xml +++ b/webapps/docs/config/http2.xml @@ -189,7 +189,7 @@ </attribute> <attribute name="noCompressionStrongETag" required="false"> - <p>This flag configures whether resources with a stong ETag will be + <p>This flag configures whether resources with a strong ETag will be considered for compression. If <code>true</code>, resources with a strong ETag will not be compressed. The default value is <code>true</code>.</p> <p>This attribute is deprecated. It will be removed in Tomcat 10 onwards 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/listeners.xml b/webapps/docs/config/listeners.xml index 82a2a5dc8d..1842406599 100644 --- a/webapps/docs/config/listeners.xml +++ b/webapps/docs/config/listeners.xml @@ -307,7 +307,7 @@ method of this class to ensure that the static initializer is not triggered by a web application. Defaults to <code>true</code>.</p> <p>Note: The underlying leak has been fixed in Java 7 update 51 onwards - and Java 8 onwards. This protection is therefor disabled if running on + and Java 8 onwards. This protection is therefore disabled if running on Java 8 onwards.</p> </attribute> diff --git a/webapps/docs/config/realm.xml b/webapps/docs/config/realm.xml index 554a99c1c4..d61406ff3c 100644 --- a/webapps/docs/config/realm.xml +++ b/webapps/docs/config/realm.xml @@ -1057,7 +1057,7 @@ <p>Note: The <strong>JDBC Database Realm</strong> uses a single connection to the database with synchronisation to prevenbt concurrent usage. It is not - recommended for production usage. Use the DataSource Realm instaead.</p> + recommended for production usage. Use the DataSource Realm instead.</p> <p>A rich set of additional attributes lets you configure the required connection to the underlying database, as well as the table and 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 aa302c3f8b..0448008e48 100644 --- a/webapps/docs/config/systemprops.xml +++ b/webapps/docs/config/systemprops.xml @@ -513,7 +513,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> @@ -523,7 +523,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 cc54106592..a6f4f571a2 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> @@ -2129,7 +2129,7 @@ <p>The location of the UTF-8 encoded HTML file to return for the HTTP error code represented by <code>nnn</code>. For example, <code>errorCode.404</code> specifies the file to return for an HTTP 404 - error. The location may be relative or absolule. If relative, it must be + error. The location may be relative or absolute. If relative, it must be relative to <code>$CATALINA_BASE</code>. The special value of <code>errorCode.0</code> may be used to define a default error page to be used if no error page is defined for a status code. If no matching @@ -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 e4b4133b76..74f0bdce88 100644 --- a/webapps/docs/jasper-howto.xml +++ b/webapps/docs/jasper-howto.xml @@ -405,7 +405,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/rewrite.xml b/webapps/docs/rewrite.xml index 40c0f99908..038e671eef 100644 --- a/webapps/docs/rewrite.xml +++ b/webapps/docs/rewrite.xml @@ -43,7 +43,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..668b4fc507 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 @@ -622,7 +622,7 @@ SSL communications, and what to do about them.</p> </li> <li>My Java-based client aborts handshakes with exceptions such as - "java.lang.RuntimeException: Could not generate DH keypair" and + "java.lang.RuntimeException: Could not generate DH key pair" and "java.security.InvalidAlgorithmParameterException: Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)" diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl index a225298edb..cee3a4abe2 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]
