commit d6569a063fa2b6c2865cc876bbb78b02001bf432 Author: Petros Marios Prokopiou Date: Fri Sep 20 14:21:53 2019 +0300 Spelling errors patch PR: 62960 Submitted by: Xavier Guimard diff --git a/LICENSE b/LICENSE index 568495a10e..ccdc6372be 100644 --- a/LICENSE +++ b/LICENSE @@ -516,7 +516,7 @@ This program is Copyright (C) Zeus Technology Limited 1996. This program may be used and copied freely providing this copyright notice is not removed. -This software is provided "as is" and any express or implied waranties, +This software is provided "as is" and any express or implied warranties, including but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, diff --git a/docs/man/httxt2dbm.1 b/docs/man/httxt2dbm.1 index 2f3a94e1a8..b4370b686b 100644 --- a/docs/man/httxt2dbm.1 +++ b/docs/man/httxt2dbm.1 @@ -50,7 +50,7 @@ More verbose output Specify the DBM type to be used for the output\&. If not specified, will use the APR Default\&. Available types are: \fBGDBM\fR for GDBM files, \fBSDBM\fR for SDBM files, \fBDB\fR for berkeley DB files, \fBNDBM\fR for NDBM files, \fBdefault\fR for the default DBM type\&. .TP \fB-i \fISOURCE_TXT\fR\fR -Input file from which the dbm is to be created\&. The file should be formated with one record per line, of the form: \fBkey value\fR\&. See the documentation for RewriteMap for further details of this file's format and meaning\&. +Input file from which the dbm is to be created\&. The file should be formatted with one record per line, of the form: \fBkey value\fR\&. See the documentation for RewriteMap for further details of this file's format and meaning\&. .TP \fB-o \fIOUTPUT_DBM\fR\fR Name of the output dbm files\&. diff --git a/docs/manual/howto/htaccess.html.ja.utf8 b/docs/manual/howto/htaccess.html.ja.utf8 index 13e0cbed92..4057f0c97b 100644 --- a/docs/manual/howto/htaccess.html.ja.utf8 +++ b/docs/manual/howto/htaccess.html.ja.utf8 @@ -247,7 +247,7 @@

As discussed in the documentation on Configuration Sections, .htaccess files can override the <Directory> sections for - the corresponding directory, but will be overriden by other types + the corresponding directory, but will be overridden by other types of configuration sections from the main configuration files. This fact can be used to enforce certain configurations, even in the presence of a liberal AllowOverride setting. For example, to @@ -414,4 +414,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/mod/core.html.es.utf8 b/docs/manual/mod/core.html.es.utf8 index a221f0fe6d..28a1a56bff 100644 --- a/docs/manual/mod/core.html.es.utf8 +++ b/docs/manual/mod/core.html.es.utf8 @@ -1242,7 +1242,7 @@ in case of an error error rather than masking it. More information is available in Microsoft Knowledge Base article Q294807.

-

Although most error messages can be overriden, there are certain +

Although most error messages can be overridden, there are certain circumstances where the internal messages are used regardless of the setting of ErrorDocument. In particular, if a malformed request is detected, normal request processing @@ -4616,4 +4616,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/docs/manual/programs/httxt2dbm.html.en b/docs/manual/programs/httxt2dbm.html.en index c7ec45527d..99b538c7da 100644 --- a/docs/manual/programs/httxt2dbm.html.en +++ b/docs/manual/programs/httxt2dbm.html.en @@ -66,7 +66,7 @@

-i SOURCE_TXT
-
Input file from which the dbm is to be created. The file should be formated +
Input file from which the dbm is to be created. The file should be formatted with one record per line, of the form: key value. See the documentation for RewriteMap for further details of this file's format and meaning. @@ -111,4 +111,4 @@ if (typeof(prettyPrint) !== 'undefined') { prettyPrint(); } //--> - \ No newline at end of file + diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c index a0cbc0ff77..045e9887be 100644 --- a/modules/metadata/mod_remoteip.c +++ b/modules/metadata/mod_remoteip.c @@ -393,7 +393,7 @@ static void remoteip_warn_enable_conflict(remoteip_addr_info *prev, server_rec * ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, new, APLOGNO(03491) "RemoteIPProxyProtocol: previous setting for %s:%hu from virtual " - "host {%s:%hu in %s} is being overriden by virtual host " + "host {%s:%hu in %s} is being overridden by virtual host " "{%s:%hu in %s}; new setting is '%s'", buf, prev->addr->port, prev->source->server_hostname, prev->source->addrs->host_port, prev->source->defn_name, diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index b9e1ded137..e61ec7e81e 100644 --- a/modules/ssl/mod_ssl.c +++ b/modules/ssl/mod_ssl.c @@ -99,7 +99,7 @@ static const command_rec ssl_config_cmds[] = { "Enable FIPS-140 mode " "(`on', `off')") SSL_CMD_ALL(CipherSuite, TAKE12, - "Colon-delimited list of permitted SSL Ciphers, optional preceeded " + "Colon-delimited list of permitted SSL Ciphers, optional preceded " "by protocol identifier ('XXX:...:XXX' - see manual)") SSL_CMD_SRV(CertificateFile, TAKE1, "SSL Server Certificate file " @@ -192,7 +192,7 @@ static const command_rec ssl_config_cmds[] = { "('[+-][" SSL_PROTOCOLS "] ...' - see manual)") SSL_CMD_PXY(ProxyCipherSuite, TAKE12, "SSL Proxy: colon-delimited list of permitted SSL ciphers " - ", optionally preceeded by protocol specifier ('XXX:...:XXX' - see manual)") + ", optionally preceded by protocol specifier ('XXX:...:XXX' - see manual)") SSL_CMD_PXY(ProxyVerify, TAKE1, "SSL Proxy: whether to verify the remote certificate " "('on' or 'off')") diff --git a/support/ab.c b/support/ab.c index 410d58e56e..d29c19f64c 100644 --- a/support/ab.c +++ b/support/ab.c @@ -18,7 +18,7 @@ ** This program is based on ZeusBench V1.0 written by Adam Twiss ** which is Copyright (c) 1996 by Zeus Technology Ltd. http://www.zeustech.net/ ** - ** This software is provided "as is" and any express or implied waranties, + ** This software is provided "as is" and any express or implied warranties, ** including but not limited to, the implied warranties of merchantability and ** fitness for a particular purpose are disclaimed. In no event shall ** Zeus Technology Ltd. be liable for any direct, indirect, incidental, special,