This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/logging-log4j-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new cf9213c6b LOG4J2-3509 Fix minor doc typos.
cf9213c6b is described below
commit cf9213c6b66a53b682fb4858447aa01222e011ec
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Mon May 16 22:11:54 2022 +0200
LOG4J2-3509 Fix minor doc typos.
---
log4j-2.17.2/manual/configuration.html | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/log4j-2.17.2/manual/configuration.html
b/log4j-2.17.2/manual/configuration.html
index ef4aa43ce..6fcafbe35 100644
--- a/log4j-2.17.2/manual/configuration.html
+++ b/log4j-2.17.2/manual/configuration.html
@@ -573,11 +573,11 @@ public class Bar {
</section>
<a name="Configuration_From_a_URI"></a>
<section>
-<h3><a name="Configuraton_From_a_URI"></a>Configuraton From a URI</h3>
+<h3><a name="Configuraton_From_a_URI"></a>Configuration From a URI</h3>
<p>
- When <code>log4j2.configurationFile</code> references a URL Log4j
will first determine if the URL reference
- a file using the file protocol. If it does Log4j will validate
that the file url is valid and continue
+ When <code>log4j2.configurationFile</code> references a URL, Log4j
will first determine if the URL reference
+ a file using the file protocol. If it does Log4j will validate
that the file URL is valid and continue
processing as previously described. If it contains a protocol
other than file then Log4j will inspect
the value of the
<code>log4j2.Configuration.allowedProtocols</code> system property. If the
provided list
contains the protocol specified then Log4j will use the URI to
locate the specified configuration file. If
@@ -588,7 +588,7 @@ public class Bar {
</p>
<p>
- Log4j supports access to remote urls that require authentication.
Log4j supports basic authentication
+ Log4j supports access to remote URLs that require authentication.
Log4j supports basic authentication
out of the box. If the <code>log4j2.Configuration.username</code>
and <code>log4j2.Configuration.password</code>
are specified those values will be used to perform the
authentication. If the password is encrypted a custom
password decryptor may be supplied by specifying the fully
qualified class name in the
@@ -1994,7 +1994,7 @@ rootLogger = info, STDOUT
<p>
Log4j allows multiple configuration files to be used by
specifying them as a list of comma separated
- file paths on log4j.configurationFile or, when using urls, by
adding secondary configuration
+ file paths on log4j.configurationFile or, when using URLs, by
adding secondary configuration
locations as query parameters named "override". The
merge logic can be controlled by specifying a class
that implements the MergeStrategy interface on the
log4j.mergeStrategy property. The default
merge strategy will merge the files using the following rules:
