Repository: logging-log4j2 Updated Branches: refs/heads/master 46dc92deb -> fe9e5f2ad
Format. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b5790f77 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b5790f77 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b5790f77 Branch: refs/heads/master Commit: b5790f779ecbe6d880cb223014233ccc533b1f59 Parents: 46dc92d Author: ggregory <[email protected]> Authored: Mon Sep 21 14:34:13 2015 -0700 Committer: ggregory <[email protected]> Committed: Mon Sep 21 14:34:13 2015 -0700 ---------------------------------------------------------------------- src/site/xdoc/changelog.xml | 87 +++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b5790f77/src/site/xdoc/changelog.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/changelog.xml b/src/site/xdoc/changelog.xml index 66dd349..2b88e92 100644 --- a/src/site/xdoc/changelog.xml +++ b/src/site/xdoc/changelog.xml @@ -1,45 +1,42 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> -<document xmlns="http://maven.apache.org/XDOC/2.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> - - <properties> - <title>Releases</title> - </properties> - - <body> - <section name="Release Change Logs"> - - <p><a href="jira-report.html#a1.0-alpha1">JIRA change log</a></p> - <p><a href="changes-report.html#a1.0-alpha1">Manual change log</a></p> - - <p>Apache Log4j 2 is not compatible with the previous versions. Please have the following in mind - when upgrading to Log4j 2 in your project:</p> - - <ul> - <li>Log4j 2.4 and greater requires Java 7, versions 2.0-alpha1 to 2.3 required Java 6.</li> - <li>The XML configuration has been simplified and is not compatible with Log4j 1.x</li> - <li>Configuration via property files is not supported.</li> - <li>Configuration via JSON or YAML is supported.</li> - <li>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.</li> - </ul> - - </section> - </body> -</document> +<?xml version="1.0" encoding="UTF-8"?> +<!-- 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. --> +<document + xmlns="http://maven.apache.org/XDOC/2.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> + + <properties> + <title>Releases</title> + </properties> + + <body> + <section name="Release Change Logs"> + <p> + <a href="jira-report.html#a1.0-alpha1">JIRA change log</a> + </p> + <p> + <a href="changes-report.html#a1.0-alpha1">Manual change log</a> + </p> + + <p>Apache Log4j 2 is not compatible with the previous versions. Please have the following in mind + when upgrading to Log4j 2 in your project: + </p> + + <ul> + <li>Log4j 2.4 and greater requires Java 7, versions 2.0-alpha1 to 2.3 required Java 6.</li> + <li>The XML configuration has been simplified and is not compatible with Log4j 1.x</li> + <li>Configuration via property files is not supported.</li> + <li>Configuration via JSON or YAML is supported.</li> + <li>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. + </li> + </ul> + + </section> + </body> +</document>
