Repository: logging-log4j2
Updated Branches:
  refs/heads/master 2129ae818 -> 57169eb88


LOG4J2-1802: Convert site pages to AsciiDoc


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/57169eb8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/57169eb8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/57169eb8

Branch: refs/heads/master
Commit: 57169eb889cc014fa0ddc1648931125f036e5c50
Parents: 2129ae8
Author: Matt Sicker <boa...@gmail.com>
Authored: Fri Apr 6 12:37:57 2018 -0500
Committer: Matt Sicker <boa...@gmail.com>
Committed: Fri Apr 6 12:37:57 2018 -0500

----------------------------------------------------------------------
 src/site/asciidoc/articles.adoc  | 209 +++++++++++++++++++++++++++++++++
 src/site/asciidoc/build.adoc     |  28 ++---
 src/site/asciidoc/changelog.adoc |  33 ++++++
 src/site/asciidoc/javadoc.adoc   |  94 +++++++++++++++
 src/site/markdown/articles.md    | 210 ----------------------------------
 src/site/markdown/changelog.md   |  34 ------
 src/site/markdown/javadoc.md     |  53 ---------
 7 files changed, 350 insertions(+), 311 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/57169eb8/src/site/asciidoc/articles.adoc
----------------------------------------------------------------------
diff --git a/src/site/asciidoc/articles.adoc b/src/site/asciidoc/articles.adoc
new file mode 100644
index 0000000..2c6d310
--- /dev/null
+++ b/src/site/asciidoc/articles.adoc
@@ -0,0 +1,209 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License. You may obtain a copy of the License at
+    
+        https://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+= Articles and Tutorials
+
+A collection of external articles and tutorials about Log4j 2. The 
manual/index.html[Log4j 2 manual] is the ultimate
+guide for up-to-date and detailed information on how to configure and use 
Log4j 2.
+
+== Chinese
+
+* http://www.infoq.com/cn/news/2016/06/log4j-garbage-free[Log4j 2.6å…
åžƒåœ¾æ”¶é›†]
+(June 12, 2016)
+* http://blog.csdn.net/autfish/article/details/51203709[详解log4j2(上) - 
从基础到实战]
+(April 20, 2016)
+* http://www.jianshu.com/p/7aec512a003c[Log4j2使用笔记]
+(November 3, 2015)
+* http://www.infoq.com/cn/news/2015/09/interview-log4j-pmc[过渡到å…
¨æ–°Log4j:Log4j项目管理委员会访谈]
+(September 14, 2015)
+* 
http://www.infoq.com/cn/news/2015/09/log4j-version-1-reaches-eol[Log4j版本1生命周期终结]
+(September 3, 2015)
+* http://www.infoq.com/cn/news/2014/08/apache-log4j2[Apache Log4j 
2.0值得升级吗]
+(August 5, 2014)
+* http://www.importnew.com/19467.html[Log4j2架构分析与实战]
+(January 15, 2013)
+* http://blog.csdn.net/lrenjun/article/details/8178875[log4j2 使用详解]
+(November 13, 2012)
+* https://my.oschina.net/xianggao/blog/523401[Log4j2配置文件详解]
+(Undated)
+
+== English
+
+* 
https://www.javacodegeeks.com/2018/03/tales-from-the-field-migrating-from-log4j-to-log4j2.html[Tales
 from the Field: Migrating from Log4J to Log4J2]
+(March 12th, 2018)
+* https://www.youtube.com/watch?v=sdOiA1Xql0o[Log4J2 and Java configuration 
with properties file]
+(February 18, 2018)
+* https://www.youtube.com/watch?v=BbcSNOtEGWs[Apache Log4j 2 Configuration| 
Log4j2 with JDK 9.0]
+(January 8, 2018)
+* https://www.youtube.com/watch?v=KKO5wGi_vEc[Spring Boot - log4j 2 
configuration example]
+(December 30,2017)
+* 
https://examples.javacodegeeks.com/enterprise-java/log4j/log4j-2-best-practices-example/[Log4j
 2 Best Practices example]
+(November 14, 2017)
+* http://www.baeldung.com/log4j2-appenders-layouts-filters[Intro to Log4j2 - 
Appenders, Layouts and Filters]
+(November 14, 2017)
+* http://musigma.org/logging/2017/11/06/logging.html[Logging Fundamentals]
+(November 6, 2017)
+* 
http://www.rationaljava.com/2017/10/allocation-free-logging-with-log4j2.html[Allocation
 free logging with Log4j2]
+(October 27, 2017)
+* 
https://www.loggly.com/blog/benchmarking-java-logging-frameworks/[Benchmarking 
Java logging frameworks]
+(October 25, 2017)
+* http://www.baeldung.com/log4j-2-lazy-logging[Log4j 2 and Lambda Expressions]
+(August 22, 2017)
+* https://www.callicoder.com/spring-boot-log4j-2-example/[How to use Log4j 2 
with Spring Boot]
+(August 11, 2017)
+* https://www.boraji.com/log4j-2-rollingfileappender-example[Log4j 2 - 
RollingFileAppender example]
+(July 26, 2017)
+* https://stackify.com/log4j2-java/[How Log4J2 Works: 10 Ways to Get the Most 
Out Of It]
+(June 14, 2017)
+* http://www.baeldung.com/log4j2-appenders-layouts-filters[Intro to Log4j2 – 
Appenders, Layouts and Filters]
+(February 28, 2017)
+* 
https://dzone.com/articles/getting-own-log4j2-file-for-mule-via-spring[Getting 
Your Own Log4j2 File for Mule via Spring]
+(December 29, 2016)
+* https://www.youtube.com/watch?v=-XNvCNHjIKw[Understanding and working with 
Log4j2 for logging in Selenium framework (Part B)]
+(December 20, 2016)
+* https://www.youtube.com/watch?v=RWZ0gsfkkc4[Understanding and working with 
Log4j2 for logging in Selenium framework (Part A)]
+(December 18, 2016)
+* 
https://garygregory.wordpress.com/2016/11/27/loading-a-log4j-configuration-for-a-specific-ejb/[Loading
 a Log4j Configuration for a specific EJB]
+(November 27, 2016)
+* 
https://medium.com/@anishekagarwal/log4j2-logging-a-primer-f10ed18e9de6#.ojlde7jib[Log4j2
 Logging: A Primer]
+(October 15, 2016)
+* 
http://www.journaldev.com/7128/log4j2-example-tutorial-configuration-levels-appenders[Log4j2
 Example Tutorial – Configuration, Levels, Appenders]
+(July 6, 2016)
+* 
http://howtodoinjava.com/log4j2/log4j2-htmllayout-configuration-example/[Log4j2 
HTMLLayout Configuration Example]
+(June 27, 2016)
+* 
http://javaevangelist.blogspot.jp/2016/06/log4j2-javautillogging-jul-adapter.html[Log4j2
 java.util.logging (JUL) Adapter Example]
+(June 24, 2016)
+* https://vimeo.com/169542136[Matt Sicker - Asynchronous Logging in Log4j 2.6 
(CJUG Lightning Talk)]
+(June 2, 2016)
+  * Errata: "ThresholdFilter" should be "BurstFilter"
+* https://dzone.com/articles/log4j-2-configuration-using-properties-file[Log4J 
2 Configuration: Using the Properties File]
+(May 18, 2016)
+* https://springframework.guru/using-log4j-2-spring-boot/[Using Log4j 2 with 
Sprint Boot]
+(April 7, 2016)
+* https://www.infoq.com/news/2016/05/log4j-garbage-free[Log4j 2.6 Goes 
Garbage-Free]
+(May 30, 2016)
+* http://musigma.org/java/log4j/2016/05/29/log4j-2.6.html[What's New in Log4j 
2.6]
+(May 29, 2016)
+* https://springframework.guru/asynchronous-logging-with-log4j-2/[Asynchronous 
Logging With Log4j 2]
+(March 31, 2016)
+* https://springframework.guru/log4j-2-configuration-using-yaml/[Log4J 2 
Configuration: Using YAML]
+(March 26, 2016)
+* https://springframework.guru/log4j-2-configuration-using-json/[Log4J 2 
Configuration: Using JSON]
+(March 23, 2016)
+* https://qbox.io/blog/getting-logstash-2x-ready-for-log4j2[Getting Logstash 
2.x Ready for Log4j2]
+(March 10, 2016)
+* https://springframework.guru/log4j-2-configuration-using-xml/[Log4J 2 
Configuration: Using XML]
+(March 10, 2016)
+* 
https://springframework.guru/log4j-2-configuration-using-properties-file/[Log4J 
2 Configuration: Using Properties File]
+(March 8, 2016)
+* 
https://springframework.guru/introducing-log4j-enterprise-class-logging/[Introducing
 Log4j 2 – Enterprise Class Logging]
+(February 8, 2016)
+* 
https://www.javacodegeeks.com/2015/10/better-performing-non-logging-logger-calls-in-log4j2.html[Better
 Performing Non-Logging Logger Calls in Log4j2]
+(October 20, 2015)
+* 
http://marxsoftware.blogspot.com/2015/10/log4j2-non-logging-performance.html[Better
 Performing Non-Logging Logger Calls in Log4j2]
+(October 15, 2015)
+* https://www.youtube.com/watch?v=Yv0n-4AsOiI[Nancy M Schorr - Log4j2 with 
Java and Maven for Logging]
+(October 14, 2015)
+* 
https://www.javacodegeeks.com/2015/10/easy-and-consistent-log4j2-logger-naming.html[Easy
 and Consistent Log4j2 Logger Naming]
+(October 10, 2015)
+* 
https://garygregory.wordpress.com/2015/09/16/a-gentle-introduction-to-the-log4j-api-and-lambda-basics/[Writing
 clean logging code using Java 8 lambdas]
+(September 16, 2015)
+* 
https://garygregory.wordpress.com/2015/09/10/the-art-of-test-driven-development-understanding-logging/[The
 Art of Test Driven Development: Understanding Logging]
+(September 10, 2015)
+* 
https://garygregory.wordpress.com/2015/09/08/the-art-of-test-driven-development-per-test-logging/[The
 Art of Test Driven Development: Per-Test Logging]
+(September 8, 2015)
+* http://www.infoq.com/news/2015/09/interview-log4j-pmc[The Transition to a 
New Log4j: a Q&amp;A with Log4j's Project Management Committee]
+(September 8, 2015)
+* http://www.infoq.com/news/2015/08/log4j-version-1-reaches-eol[Log4j Version 
1 Reaches End of Life]
+(August 26, 2015)
+* 
https://blogs.apache.org/foundation/entry/apache_logging_services_project_announces[Apache
 Logging Services Project Announces Log4j 1 End-Of-Life; Recommends Upgrade to 
Log4j 2]
+(August 6, 2015)
+* https://www.innoq.com/en/blog/per-request-debugging-with-log4j2/[Per request 
debugging with Log4j 2 filters]
+(May 8, 2015)
+* 
https://blog.oio.de/2015/04/27/log4j-2-configuration-depending-environment/[Log4j
 2 configuration depending on environment]
+(April 27, 2015)
+* https://www.youtube.com/watch?v=EWftNoRhS_M[Ramesh Rajaram - Log4j Key 
Features]
+(April 10, 2015)
+* 
http://www.journaldev.com/7128/apache-log4j-2-tutorial-configuration-levels-appenders-lookup-layouts-and-filters-example[Apache
 Log4j 2 Tutorial – Configuration, Levels, Appenders, Lookup, Layouts and 
Filters Example]
+(March 16, 2015)
+* 
http://blogs.mulesoft.com/dev/mule-dev/mule-3-6-asynchronous-logging/[Disrupting
 your Asynchronous Loggers]
+(March 5, 2015)
+* http://andrew-flower.com/blog/Create_Custom_Log4j_Plugins[Extending Log4j2 - 
Creating Custom Log4j2 Plugins]
+(February 20, 2015)
+* http://andrew-flower.com/blog/Basic_Log4j2_Configuration[Log4j2 - a crash 
course...]
+(February 10, 2015)
+* 
http://memorynotfound.com/log4j2-with-log4j2-xml-configuration-example/[Log4j2 
with log4j2.xml Configuration Example]
+(February 10, 2015)
+* 
https://blog.logentries.com/2015/02/logging-from-your-java-application-using-log4j2/?utm_content=11878557&amp;utm_medium=social&amp;utm_source=facebook[Logging
 From Your Java Application Using Log4j2]
+(February 5, 2015)
+* 
http://blogs.mulesoft.com/dev/mule-dev/mule-3-6-asynchronous-logging/[Asynchronous
 Logging in Mule 3.6]
+(January 20, 2015)
+* http://www.infoq.com/news/2014/07/apache-log4j2[Apache Log4j 2.0 - Worth the 
Upgrade?]
+(July 31, 2014)
+* http://mycuteblog.com/log4j2-xml-configuration-example/[log4j2 xml 
configuration example]
+(July 26, 2014)
+* http://tech.finn.no/2014/07/01/log4j2-in-production-making-it-fly/[Log4j 2 
in Production – Making it Fly]
+(July 2, 2014)
+* https://www.youtube.com/watch?v=ZzVSs_JEhgs[Matt Sicker - Introducing Log4j 
2.0]
+(May 6, 2014)
+* https://www.youtube.com/watch?v=HB0r5DuxGPI[Nicholas Williams - Log4j 2 in 
Web Applications: A Deeper Look at Effective Java EE Logging]
+(May 6, 2014)
+* 
http://www.grobmeier.de/log4j-2-performance-close-to-insane-20072013.html[Log4j 
2: Performance Close to Insane]
+(July 20, 2013)
+* https://news.ycombinator.com/item?id=5612035[Hacker News: Asynchronous 
Loggers for Low-Latency Logging]
+(April 26, 2013)
+* http://www.grobmeier.de/the-new-log4j-2-0-05122012.html[The New Log4j 2.0]
+(December 5, 2012)
+
+== German
+
+* https://jaxenter.de/apache-log4j-2-6-laeuft-nun-auch-ohne-muell-41098[Apache 
Log4j 2.6 läuft nun auch ohne Müll]
+(May 31, 2016)
+* 
https://www.innoq.com/en/articles/2015/01/logging-konsolidieren-log4j2/[Logging 
konsolidieren und Performance gewinnen]
+(January 23, 2015)
+
+== Japanese
+
+* 
http://tm-b.hatenablog.com/entry/2016/08/18/200715[中年プログラマーの息抜き]
+(August 18, 2016)
+* 
http://minor.hatenablog.com/entry/2016/05/22/193556[【log4j2】ThreadContextを利用してすべてのログに追åŠ
 æƒ…報を出力する]
+(May 22, 2016)
+* http://qiita.com/kazurof/items/abbd42f11bfc125f3190[Log4j 
2でログ出力をテストするサンプルソース]
+(February 22, 2016)
+* 
https://www.infoq.com/jp/news/2015/09/interview-log4j-pmc[新Log4jへの移行: 
Log4jプロジェクト管理グループとのQ&amp;A]
+(September 27, 2015)
+* 
https://www.infoq.com/jp/news/2015/09/log4j-version-1-reaches-eol[Log4jバージョン1のサポートが終了]
+(September 23, 2015)
+* 
http://qiita.com/pica/items/f801c74848f748f76b58[log4j2の設定ファイル(XML)]
+(July 27, 2015)
+* http://japanengineers.seesaa.net/article/412195201.html[Apache 
log4j2によるロギング機能の基本サンプル]
+(January 12, 2015)
+* 
http://yamashiro0110.hatenadiary.jp/entry/2014/08/24/093336[Log4j2の使い方めも]
+(August 24, 2014)
+* https://www.infoq.com/jp/news/2014/08/apache-log4j2[Apache Log4j 2.0 - 
アップグレードする価値はあるか?]
+(August 17, 2014)
+* http://d.hatena.ne.jp/Kazuhira/20140628/1403959552[Log4j2を試してみる]
+(June 28, 2014)
+* http://nabedge.blogspot.jp/2013/10/log4j2.html[log4j2にログを集める]
+(October 26, 2013)
+
+== Korean
+
+* http://dveamer.github.io/java/Log4j2.html[Log4j 2 설정하기]
+(January 24, 2016)
+* 
http://www.egovframe.go.kr/wiki/doku.php?id=egovframework:rte3:fdl:%EC%84%A4%EC%A0%95_%ED%8C%8C%EC%9D%BC%EC%9D%84_%EC%82%AC%EC%9A%A9%ED%95%98%EB%8A%94_%EB%B0%A9%EB%B2%95[Log4j
 2 환경설정 [설정 파일 사용 시]]
+(May 14, 2014)

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/57169eb8/src/site/asciidoc/build.adoc
----------------------------------------------------------------------
diff --git a/src/site/asciidoc/build.adoc b/src/site/asciidoc/build.adoc
index bed1412..b06567c 100644
--- a/src/site/asciidoc/build.adoc
+++ b/src/site/asciidoc/build.adoc
@@ -1,18 +1,18 @@
 ////
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License. You may obtain a copy of the License at
+
+        https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 ////
 
 = Building and Installing Log4j

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/57169eb8/src/site/asciidoc/changelog.adoc
----------------------------------------------------------------------
diff --git a/src/site/asciidoc/changelog.adoc b/src/site/asciidoc/changelog.adoc
new file mode 100644
index 0000000..ad69c8d
--- /dev/null
+++ b/src/site/asciidoc/changelog.adoc
@@ -0,0 +1,33 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License. You may obtain a copy of the License at
+    
+        https://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+= Release Changelog
+
+link:jira-report.html[JIRA-generated changelog]
+
+link:changes-report.html[Manual change log]
+
+Apache Log4j 2 is not compatible with the previous versions. Please have the 
following in mind when upgrading to
+Log4j 2 in your project:
+
+* Log4j 2.4 and greater requires Java 7, versions 2.0-alpha1 to 2.3 required 
Java 6.
+* The XML configuration has been simplified and is not compatible with Log4j 
1.x.
+* Configuration via property files is supported from version 2.4, but is not 
compatible with Log4j 1.x.
+* Configuration via JSON or YAML is supported, but these formats require
+link:runtime-dependencies.html[additional runtime dependencies].
+* Although Log4j 2 is not directly compatible with Log4j 1.x a compatibility 
bridge has been provided to reduce the
+need to make coding changes.

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/57169eb8/src/site/asciidoc/javadoc.adoc
----------------------------------------------------------------------
diff --git a/src/site/asciidoc/javadoc.adoc b/src/site/asciidoc/javadoc.adoc
new file mode 100644
index 0000000..8a0ed75
--- /dev/null
+++ b/src/site/asciidoc/javadoc.adoc
@@ -0,0 +1,94 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License. You may obtain a copy of the License at
+    
+        https://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+= Log4j 2 Javadoc API Documentation and TLD Documentation
+
+== Javadoc API Documentation
+
+The table below contains links to the Javadoc API Documentation for the 
components you are most likely to use
+directly in code. You can also use the menu links on the left.
+
+|===
+|Component |Description
+
+|link:log4j-api/apidocs/index.html[Log4j 2 API]
+|The interface that applications should use and code against.
+
+|link:log4j-core/apidocs/index.html[Implementation]
+|The standard implementation, also called the Log4j 2 Core, that contains 
Appenders, Filters, and more.
+
+|link:log4j-iostreams/apidocs/index.html[Log4j IO Streams]
+|Extra classes for dealing with older APIs that expect classes from `java.io` 
for logging.
+
+|link:log4j-taglib/apidocs/index.html[JSP Tag Library]
+|The tag library that enables Java-free logging in JavaServer Pages™ using 
Log4j 2.
+
+|link:log4j-taglib/tlddoc/index.html[JSP Tag Library (TLD Doc)]
+|The special Javadoc-like Tag Library Documentation for the Log4j 2 JSP Tag 
Library.
+|===
+
+The table below contains links to the Javadoc API Documentation for all the 
other Log4j 2 components, which you
+likely will not use directly in code but instead will only configure or 
include in your dependencies.
+
+|===
+|Component |Description
+
+|link:log4j-jcl/apidocs/index.html[Commons Logging Bridge]
+|A bridge that permits applications written against the Apache Commons Logging 
API to log using Log4j 2.
+
+|link:log4j-slf4j-impl/apidocs/index.html[SLF4J Binding]
+|A bridge that permits applications written against the SLF4J API to log using 
Log4j 2.
+
+|link:log4j-jul/apidocs/index.html[Java Util Logging Adapter]
+|A bridge that permits applications written against the `java.util.logging` 
API to log using Log4j 2.
+
+|link:log4j-1.2-api/apidocs/index.html[Log4j 1.2 API Bridge]
+|A bridge that permits applications written against the Log4j 1.2.x API to log 
using Log4j 2.
+
+|link:log4j-to-slf4j/apidocs/index.html[Log4j 2 to SLF4J Adapter]
+|An adapter that permits applications written against the Log4j 2 API to log 
using SLF4J.
+
+|link:log4j-flume-ng/apidocs/index.html[Apache Flume Appender]
+|An Appender that allows applications to send logging events to Apache Flume 
Agents.
+
+|link:log4j-jmx-gui/apidocs/index.html[Log4j JMX GUI]
+|A Java Swing-based client for remotely viewing the status logger and editing 
the Log4j configuration.
+
+|link:log4j-jpa/apidocs/index.html[Log4j JPA]
+|Apache Log4j Java Persistence API Appender.
+
+|link:log4j-web/apidocs/index.html[Log4j Web Application Support]
+|Additional classes that enable multiple configurations within a Servlet 
Container.
+
+|link:log4j-couchdb/apidocs/index.html[Log4j CouchDB Support]
+|Additional Appender for CouchDB.
+
+|link:log4j-jdbc-dbcp2/apidocs/index.html[Log4j JDBC DBCP 2]
+|Connection source for the JDBC Appender using Apache Commons DBCP2.
+
+|link:log4j-liquibase/apidocs/index.html[Log4j Liquibase Binding]
+|The Apache Log4j Liquibase binding to Log4j 2 Core.
+
+|link:log4j-mongodb2/apidocs/index.html[Log4j MongoDB 2 Support]
+|Additional Appender for MongoDB using the version 2 driver.
+
+|link:log4j-mongodb3/apidocs/index.html[Log4j MongoDB 3 Support]
+|Additional Appender for MongoDB using the version 3 driver.
+
+|link:log4j-cassandra/apidocs/index.html[Log4j Cassandra Support]
+|Additional Appender for Cassandra.
+|===

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/57169eb8/src/site/markdown/articles.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/articles.md b/src/site/markdown/articles.md
deleted file mode 100644
index cd70431..0000000
--- a/src/site/markdown/articles.md
+++ /dev/null
@@ -1,210 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Articles and Tutorials
-
-A collection of external articles and tutorials about Log4j 2. The [Log4j 2 
manual](manual/index.html) is the ultimate
-guide for up-to-date and detailed information on how to configure and use 
Log4j 2.
-
-## Chinese
-
-* [Log4j 2.6å…
åžƒåœ¾æ”¶é›†](http://www.infoq.com/cn/news/2016/06/log4j-garbage-free)
-(June 12, 2016)
-* [详解log4j2(上) - 
从基础到实战](http://blog.csdn.net/autfish/article/details/51203709)
-(April 20, 2016)
-* [Log4j2使用笔记](http://www.jianshu.com/p/7aec512a003c)
-(November 3, 2015)
-* [过渡到å…
¨æ–°Log4j:Log4j项目管理委员会访谈](http://www.infoq.com/cn/news/2015/09/interview-log4j-pmc)
-(September 14, 2015)
-* 
[Log4j版本1生命周期终结](http://www.infoq.com/cn/news/2015/09/log4j-version-1-reaches-eol)
-(September 3, 2015)
-* [Apache Log4j 
2.0值得升级吗](http://www.infoq.com/cn/news/2014/08/apache-log4j2)
-(August 5, 2014)
-* [Log4j2架构分析与实战](http://www.importnew.com/19467.html)
-(January 15, 2013)
-* [log4j2 使用详解](http://blog.csdn.net/lrenjun/article/details/8178875)
-(November 13, 2012)
-* [Log4j2配置文件详解](https://my.oschina.net/xianggao/blog/523401)
-(Undated)
-
-## English
-
-* [Tales from the Field: Migrating from Log4J to 
Log4J2](https://www.javacodegeeks.com/2018/03/tales-from-the-field-migrating-from-log4j-to-log4j2.html)
-(March 12th, 2018)
-* [Log4J2 and Java configuration with properties 
file](https://www.youtube.com/watch?v=sdOiA1Xql0o)
-(February 18, 2018)
-* [Apache Log4j 2 Configuration| Log4j2 with JDK 
9.0](https://www.youtube.com/watch?v=BbcSNOtEGWs)
-(January 8, 2018)
-* [Spring Boot - log4j 2 configuration 
example](https://www.youtube.com/watch?v=KKO5wGi_vEc)
-(December 30,2017)
-* [Log4j 2 Best Practices 
example](https://examples.javacodegeeks.com/enterprise-java/log4j/log4j-2-best-practices-example/)
-(November 14, 2017)
-* [Intro to Log4j2 - Appenders, Layouts and 
Filters](http://www.baeldung.com/log4j2-appenders-layouts-filters)
-(November 14, 2017)
-* [Logging Fundamentals](http://musigma.org/logging/2017/11/06/logging.html)
-(November 6, 2017)
-* [Allocation free logging with 
Log4j2](http://www.rationaljava.com/2017/10/allocation-free-logging-with-log4j2.html)
-(October 27, 2017)
-* [Benchmarking Java logging 
frameworks](https://www.loggly.com/blog/benchmarking-java-logging-frameworks/)
-(October 25, 2017)
-* [Log4j 2 and Lambda 
Expressions](http://www.baeldung.com/log4j-2-lazy-logging)
-(August 22, 2017)
-* [How to use Log4j 2 with Spring 
Boot](https://www.callicoder.com/spring-boot-log4j-2-example/)
-(August 11, 2017)
-* [Log4j 2 - RollingFileAppender 
example](https://www.boraji.com/log4j-2-rollingfileappender-example)
-(July 26, 2017)
-* [How Log4J2 Works: 10 Ways to Get the Most Out Of 
It](https://stackify.com/log4j2-java/)
-(June 14, 2017)
-* [Intro to Log4j2 – Appenders, Layouts and 
Filters](http://www.baeldung.com/log4j2-appenders-layouts-filters)
-(February 28, 2017)
-* [Getting Your Own Log4j2 File for Mule via 
Spring](https://dzone.com/articles/getting-own-log4j2-file-for-mule-via-spring)
-(December 29, 2016)
-* [Understanding and working with Log4j2 for logging in Selenium framework 
(Part B)](https://www.youtube.com/watch?v=-XNvCNHjIKw)
-(December 20, 2016)
-* [Understanding and working with Log4j2 for logging in Selenium framework 
(Part A)](https://www.youtube.com/watch?v=RWZ0gsfkkc4)
-(December 18, 2016)
-* [Loading a Log4j Configuration for a specific 
EJB](https://garygregory.wordpress.com/2016/11/27/loading-a-log4j-configuration-for-a-specific-ejb/)
-(November 27, 2016)
-* [Log4j2 Logging: A 
Primer](https://medium.com/@anishekagarwal/log4j2-logging-a-primer-f10ed18e9de6#.ojlde7jib)
-(October 15, 2016)
-* [Log4j2 Example Tutorial – Configuration, Levels, 
Appenders](http://www.journaldev.com/7128/log4j2-example-tutorial-configuration-levels-appenders)
-(July 6, 2016)
-* [Log4j2 HTMLLayout Configuration 
Example](http://howtodoinjava.com/log4j2/log4j2-htmllayout-configuration-example/)
-(June 27, 2016)
-* [Log4j2 java.util.logging (JUL) Adapter 
Example](http://javaevangelist.blogspot.jp/2016/06/log4j2-javautillogging-jul-adapter.html)
-(June 24, 2016)
-* [Matt Sicker - Asynchronous Logging in Log4j 2.6 (CJUG Lightning 
Talk)](https://vimeo.com/169542136)
-(June 2, 2016)
-  * Errata: "ThresholdFilter" should be "BurstFilter"
-* [Log4J 2 Configuration: Using the Properties 
File](https://dzone.com/articles/log4j-2-configuration-using-properties-file)
-(May 18, 2016)
-* [Using Log4j 2 with Sprint 
Boot](https://springframework.guru/using-log4j-2-spring-boot/)
-(April 7, 2016)
-* [Log4j 2.6 Goes 
Garbage-Free](https://www.infoq.com/news/2016/05/log4j-garbage-free)
-(May 30, 2016)
-* [What's New in Log4j 
2.6](http://musigma.org/java/log4j/2016/05/29/log4j-2.6.html)
-(May 29, 2016)
-* [Asynchronous Logging With Log4j 
2](https://springframework.guru/asynchronous-logging-with-log4j-2/)
-(March 31, 2016)
-* [Log4J 2 Configuration: Using 
YAML](https://springframework.guru/log4j-2-configuration-using-yaml/)
-(March 26, 2016)
-* [Log4J 2 Configuration: Using 
JSON](https://springframework.guru/log4j-2-configuration-using-json/)
-(March 23, 2016)
-* [Getting Logstash 2.x Ready for 
Log4j2](https://qbox.io/blog/getting-logstash-2x-ready-for-log4j2)
-(March 10, 2016)
-* [Log4J 2 Configuration: Using 
XML](https://springframework.guru/log4j-2-configuration-using-xml/)
-(March 10, 2016)
-* [Log4J 2 Configuration: Using Properties 
File](https://springframework.guru/log4j-2-configuration-using-properties-file/)
-(March 8, 2016)
-* [Introducing Log4j 2 – Enterprise Class 
Logging](https://springframework.guru/introducing-log4j-enterprise-class-logging/)
-(February 8, 2016)
-* [Better Performing Non-Logging Logger Calls in 
Log4j2](https://www.javacodegeeks.com/2015/10/better-performing-non-logging-logger-calls-in-log4j2.html)
-(October 20, 2015)
-* [Better Performing Non-Logging Logger Calls in 
Log4j2](http://marxsoftware.blogspot.com/2015/10/log4j2-non-logging-performance.html)
-(October 15, 2015)
-* [Nancy M Schorr - Log4j2 with Java and Maven for 
Logging](https://www.youtube.com/watch?v=Yv0n-4AsOiI)
-(October 14, 2015)
-* [Easy and Consistent Log4j2 Logger 
Naming](https://www.javacodegeeks.com/2015/10/easy-and-consistent-log4j2-logger-naming.html)
-(October 10, 2015)
-* [Writing clean logging code using Java 8 
lambdas](https://garygregory.wordpress.com/2015/09/16/a-gentle-introduction-to-the-log4j-api-and-lambda-basics/)
-(September 16, 2015)
-* [The Art of Test Driven Development: Understanding 
Logging](https://garygregory.wordpress.com/2015/09/10/the-art-of-test-driven-development-understanding-logging/)
-(September 10, 2015)
-* [The Art of Test Driven Development: Per-Test 
Logging](https://garygregory.wordpress.com/2015/09/08/the-art-of-test-driven-development-per-test-logging/)
-(September 8, 2015)
-* [The Transition to a New Log4j: a Q&amp;A with Log4j's Project Management 
Committee](http://www.infoq.com/news/2015/09/interview-log4j-pmc)
-(September 8, 2015)
-* [Log4j Version 1 Reaches End of 
Life](http://www.infoq.com/news/2015/08/log4j-version-1-reaches-eol)
-(August 26, 2015)
-* [Apache Logging Services Project Announces Log4j 1 End-Of-Life; Recommends 
Upgrade to Log4j 
2](https://blogs.apache.org/foundation/entry/apache_logging_services_project_announces)
-(August 6, 2015)
-* [Per request debugging with Log4j 2 
filters](https://www.innoq.com/en/blog/per-request-debugging-with-log4j2/)
-(May 8, 2015)
-* [Log4j 2 configuration depending on 
environment](https://blog.oio.de/2015/04/27/log4j-2-configuration-depending-environment/)
-(April 27, 2015)
-* [Ramesh Rajaram - Log4j Key 
Features](https://www.youtube.com/watch?v=EWftNoRhS_M)
-(April 10, 2015)
-* [Apache Log4j 2 Tutorial – Configuration, Levels, Appenders, Lookup, 
Layouts and Filters 
Example](http://www.journaldev.com/7128/apache-log4j-2-tutorial-configuration-levels-appenders-lookup-layouts-and-filters-example)
-(March 16, 2015)
-* [Disrupting your Asynchronous 
Loggers](http://blogs.mulesoft.com/dev/mule-dev/mule-3-6-asynchronous-logging/)
-(March 5, 2015)
-* [Extending Log4j2 - Creating Custom Log4j2 
Plugins](http://andrew-flower.com/blog/Create_Custom_Log4j_Plugins)
-(February 20, 2015)
-* [Log4j2 - a crash 
course...](http://andrew-flower.com/blog/Basic_Log4j2_Configuration)
-(February 10, 2015)
-* [Log4j2 with log4j2.xml Configuration 
Example](http://memorynotfound.com/log4j2-with-log4j2-xml-configuration-example/)
-(February 10, 2015)
-* [Logging From Your Java Application Using 
Log4j2](https://blog.logentries.com/2015/02/logging-from-your-java-application-using-log4j2/?utm_content=11878557&amp;utm_medium=social&amp;utm_source=facebook)
-(February 5, 2015)
-* [Asynchronous Logging in Mule 
3.6](http://blogs.mulesoft.com/dev/mule-dev/mule-3-6-asynchronous-logging/)
-(January 20, 2015)
-* [Apache Log4j 2.0 - Worth the 
Upgrade?](http://www.infoq.com/news/2014/07/apache-log4j2)
-(July 31, 2014)
-* [log4j2 xml configuration 
example](http://mycuteblog.com/log4j2-xml-configuration-example/)
-(July 26, 2014)
-* [Log4j 2 in Production – Making it 
Fly](http://tech.finn.no/2014/07/01/log4j2-in-production-making-it-fly/)
-(July 2, 2014)
-* [Matt Sicker - Introducing Log4j 
2.0](https://www.youtube.com/watch?v=ZzVSs_JEhgs)
-(May 6, 2014)
-* [Nicholas Williams - Log4j 2 in Web Applications: A Deeper Look at Effective 
Java EE Logging](https://www.youtube.com/watch?v=HB0r5DuxGPI)
-(May 6, 2014)
-* [Log4j 2: Performance Close to 
Insane](http://www.grobmeier.de/log4j-2-performance-close-to-insane-20072013.html)
-(July 20, 2013)
-* [Hacker News: Asynchronous Loggers for Low-Latency 
Logging](https://news.ycombinator.com/item?id=5612035)
-(April 26, 2013)
-* [The New Log4j 2.0](http://www.grobmeier.de/the-new-log4j-2-0-05122012.html)
-(December 5, 2012)
-
-## German
-
-* [Apache Log4j 2.6 läuft nun auch ohne 
Müll](https://jaxenter.de/apache-log4j-2-6-laeuft-nun-auch-ohne-muell-41098)
-(May 31, 2016)
-* [Logging konsolidieren und Performance 
gewinnen](https://www.innoq.com/en/articles/2015/01/logging-konsolidieren-log4j2/)
-(January 23, 2015)
-
-## Japanese
-
-* 
[中年プログラマーの息抜き](http://tm-b.hatenablog.com/entry/2016/08/18/200715)
-(August 18, 2016)
-* [【log4j2】ThreadContextを利用してすべてのログに追加情å 
±ã‚’出力する](http://minor.hatenablog.com/entry/2016/05/22/193556)
-(May 22, 2016)
-* [Log4j 
2でログ出力をテストするサンプルソース](http://qiita.com/kazurof/items/abbd42f11bfc125f3190)
-(February 22, 2016)
-* [新Log4jへの移行: 
Log4jプロジェクト管理グループとのQ&amp;A](https://www.infoq.com/jp/news/2015/09/interview-log4j-pmc)
-(September 27, 2015)
-* 
[Log4jバージョン1のサポートが終了](https://www.infoq.com/jp/news/2015/09/log4j-version-1-reaches-eol)
-(September 23, 2015)
-* 
[log4j2の設定ファイル(XML)](http://qiita.com/pica/items/f801c74848f748f76b58)
-(July 27, 2015)
-* [Apache 
log4j2によるロギング機能の基本サンプル](http://japanengineers.seesaa.net/article/412195201.html)
-(January 12, 2015)
-* 
[Log4j2の使い方めも](http://yamashiro0110.hatenadiary.jp/entry/2014/08/24/093336)
-(August 24, 2014)
-* [Apache Log4j 2.0 - 
アップグレードする価値はあるか?](https://www.infoq.com/jp/news/2014/08/apache-log4j2)
-(August 17, 2014)
-* 
[Log4j2を試してみる](http://d.hatena.ne.jp/Kazuhira/20140628/1403959552)
-(June 28, 2014)
-* [log4j2にログを集める](http://nabedge.blogspot.jp/2013/10/log4j2.html)
-(October 26, 2013)
-
-## Korean
-
-* [Log4j 2 설정하기](http://dveamer.github.io/java/Log4j2.html)
-(January 24, 2016)
-* [Log4j 2 환경설정 [설정 파일 사용 
시]](http://www.egovframe.go.kr/wiki/doku.php?id=egovframework:rte3:fdl:%EC%84%A4%EC%A0%95_%ED%8C%8C%EC%9D%BC%EC%9D%84_%EC%82%AC%EC%9A%A9%ED%95%98%EB%8A%94_%EB%B0%A9%EB%B2%95)
-(May 14, 2014)

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/57169eb8/src/site/markdown/changelog.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/changelog.md b/src/site/markdown/changelog.md
deleted file mode 100644
index d021ed1..0000000
--- a/src/site/markdown/changelog.md
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Release Changelog
-
-[JIRA-generated changelog](jira-report.html)
-
-[Manual change log](changes-report.html)
-
-Apache Log4j 2 is not compatible with the previous versions. Please have the 
following in mind when upgrading to
-Log4j 2 in your project:
-
-* Log4j 2.4 and greater requires Java 7, versions 2.0-alpha1 to 2.3 required 
Java 6.
-* The XML configuration has been simplified and is not compatible with Log4j 
1.x.
-* Configuration via property files is supported from version 2.4, but is not 
compatible with Log4j 1.x.
-* Configuration via JSON or YAML is supported, but these formats require
-[additional runtime dependencies](runtime-dependencies.html).
-* Although Log4j 2 is not directly compatible with Log4j 1.x a compatibility 
bridge has been provided to reduce the
-need to make coding changes.

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/57169eb8/src/site/markdown/javadoc.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/javadoc.md b/src/site/markdown/javadoc.md
deleted file mode 100644
index a8c1eba..0000000
--- a/src/site/markdown/javadoc.md
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- vim: set syn=markdown : -->
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-# Log4j 2 Javadoc API Documentation and TLD Documentation
-
-## Javadoc API Documentation
-
-The table below contains links to the Javadoc API Documentation for the 
components you are most likely to use
-directly in code. You can also use the menu links on the left.
-
-Component | Description
---------- | -----------
-[Log4j 2 API](log4j-api/apidocs/index.html) | The interface that applications 
should use and code against.
-[Implementation](log4j-core/apidocs/index.html) | The standard implementation, 
also called the Log4j 2 Core, that contains Appenders, Filters, and more.
-[Log4j IO Streams](log4j-iostreams/apidocs/index.html) | Extra classes for 
dealing with older APIs that expect classes from `java.io` for logging.
-[JSP Tag Library](log4j-taglib/apidocs/index.html) | The tag library that 
enables Java-free logging in JavaServer Pages™ using Log4j 2.
-[JSP Tag Library (TLD Doc)](log4j-taglib/tlddoc/index.html) | The special 
Javadoc-like Tag Library Documentation for the Log4j 2 JSP Tag Library.
-
-The table below contains links to the Javadoc API Documentation for all the 
other Log4j 2 components, which you
-likely will not use directly in code but instead will only configure or 
include in your dependencies.
-
-Component | Description
---------- | -----------
-[Commons Logging Bridge](log4j-jcl/apidocs/index.html) | A bridge that permits 
applications written against the Apache Commons Logging API to log using Log4j 
2.
-[SLF4J Binding](log4j-slf4j-impl/apidocs/index.html) | A bridge that permits 
applications written against the SLF4J API to log using Log4j 2.
-[Java Util Logging Adapter](log4j-jul/apidocs/index.html) | A bridge that 
permits applications written against the `java.util.logging` API to log using 
Log4j 2.
-[Log4j 1.2 API Bridge](log4j-1.2-api/apidocs/index.html) | A bridge that 
permits applications written against the Log4j 1.2.x API to log using Log4j 2.
-[Log4j 2 to SLF4J Adapter](log4j-to-slf4j/apidocs/index.html) | An adapter 
that permits applications written against the Log4j 2 API to log using SLF4J.
-[Apache Flume Appender](log4j-flume-ng/apidocs/index.html) | An Appender that 
allows applications to send logging events to Apache Flume Agents.
-[Log4j JMX GUI](log4j-jmx-gui/apidocs/index.html) | A Java Swing-based client 
for remotely viewing the status logger and editing the Log4j configuration.
-[Log4j JPA](log4j-jpa/apidocs/index.html) | Apache Log4j Java Persistence API 
Appender.
-[Log4j Web Application Support](log4j-web/apidocs/index.html) | Additional 
classes that enable multiple configurations within a Servlet Container.
-[Log4j CouchDB Support](log4j-couchdb/apidocs/index.html) | Additional 
Appender for CouchDB.
-[Log4j JDBC DBCP 2](log4j-jdbc-dbcp2/apidocs/index.html) | Connection source 
for the JDBC Appender using Apache Commons DBCP2.
-[Log4j Liquibase Binding](log4j-liquibase/apidocs/index.html) | The Apache 
Log4j Liquibase binding to Log4j 2 Core.
-[Log4j MongoDB 2 Support](log4j-mongodb2/apidocs/index.html) | Additional 
Appender for MongoDB using the version 2 driver.
-[Log4j MongoDB 3 Support](log4j-mongodb3/apidocs/index.html) | Additional 
Appender for MongoDB using the version 3 driver.
-[Log4j Cassandra Support](log4j-cassandra/apidocs/index.html) | Additional 
Appender for Cassandra.

Reply via email to