[logging-log4j2] branch master updated: Doc fixes

[rg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/master by this push:
     new fa6f438  Doc fixes
fa6f438 is described below

commit fa6f43813b7f6337b5f4ff909b5a1c0a4803644c
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Tue Dec 3 07:58:59 2019 -0700

    Doc fixes
---
 src/changes/changes.xml         | 2 +-
 src/site/asciidoc/articles.adoc | 2 ++
 src/site/asciidoc/index.adoc    | 8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0ac056c..66793c0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -172,7 +172,7 @@
         be retrieved from the Spring environment if it is available.
       </action>
       <action issue="LOG4J2-2710" dev="rgoers" type="add">
-        Allow Spring Boot application properties to be accessed in the Log4j 2 configuraiton. Add
+        Allow Spring Boot application properties to be accessed in the Log4j 2 configuration. Add
         lower and upper case Lookups.
       </action>
       <action issue="LOG4J2-2709" dev="rgoers" type="update">
diff --git a/src/site/asciidoc/articles.adoc b/src/site/asciidoc/articles.adoc
index 4b7eb03..abef9e6 100644
--- a/src/site/asciidoc/articles.adoc
+++ b/src/site/asciidoc/articles.adoc
@@ -43,6 +43,8 @@ guide for up-to-date and detailed information on how to configure and use Log4j
 
 == English
 
+* [A guide to logging in Java](https://www.marcobehler.com/guides/a-guide-to-logging-in-java)
+(June 23, 2019)
 * [Exploring the Secrets of Java Logs: Log4j 2 Log System](https://www.alibabacloud.com/blog/exploring-the-secrets-of-java-logs-log4j-2-log-system_594821)
 (May 17, 2019)
 * https://howtodoinjava.com/log4j2[Log4j2 Tutorial]
diff --git a/src/site/asciidoc/index.adoc b/src/site/asciidoc/index.adoc
index c2ef444..5a425d5 100644
--- a/src/site/asciidoc/index.adoc
+++ b/src/site/asciidoc/index.adoc
@@ -113,7 +113,13 @@ Version 2.10.0 introduces a the module log4j-appserver to improve integration wi
 Version 2.12.0 introduces support for accessing Docker container information via a Lookup and for accessing
 and updating the Log4j configuration through Spring Cloud Configuration. This support was enhanced in
 version 2.13.0 to add support for accessing Spring Boot properties as well as Kubernetes information.
-See [Logging in the Cloud](manual/cloud.html) for details.
+See link:manual/cloud.html[Logging in the Cloud] for details.
+
+=== Compatible with Log4j 1.x
+
+The Log4j-1.2-api module of Log4j 2 provides compatiblity for applications using the Log4j 1 logging methods. As
+of Log4j 2.13.0 Log4j 2 also provides experimental support for Log4j 1.x configuration files. See
+link:manual/compatiblity.html[Log4j 2 Compatiblity with Log4j 1] for more information.
 
 == Documentation