Merge branch 'master' of 
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

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

Branch: refs/heads/master
Commit: 86e8caa1e76be69e6126b77cb9c1137c14278431
Parents: 0578540 db18f5a
Author: Gary Gregory <garydgreg...@gmail.com>
Authored: Sun Apr 8 15:11:34 2018 -0600
Committer: Gary Gregory <garydgreg...@gmail.com>
Committed: Sun Apr 8 15:11:34 2018 -0600

----------------------------------------------------------------------
 src/site/asciidoc/faq.adoc                 |   2 +-
 src/site/asciidoc/manual/customconfig.adoc | 386 +++++++++++++++
 src/site/asciidoc/manual/extending.adoc    | 624 ++++++++++++++++++++++++
 src/site/asciidoc/manual/logsep.adoc       | 121 +++++
 src/site/asciidoc/manual/migration.adoc    | 359 ++++++++++++++
 src/site/asciidoc/manual/plugins.adoc      | 262 ++++++++++
 src/site/asciidoc/manual/webapp.adoc       | 486 ++++++++++++++++++
 src/site/xdoc/manual/customconfig.xml      | 375 --------------
 src/site/xdoc/manual/extending.xml         | 565 ---------------------
 src/site/xdoc/manual/logsep.xml            | 123 -----
 src/site/xdoc/manual/migration.xml         | 351 -------------
 src/site/xdoc/manual/plugins.xml           | 257 ----------
 src/site/xdoc/manual/webapp.xml            | 451 -----------------
 13 files changed, 2239 insertions(+), 2123 deletions(-)
----------------------------------------------------------------------


Reply via email to