You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2011/09/08 08:09:01 UTC

svn commit: r1166534 - in /logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers: log4j12-api/src/site/ log4j12-api/src/site/xdoc/ log4j2-api/src/main/java/org/apache/logging/log4j/ log4j2-api/src/main/java/org/apache/logging/log4j/spi/ log4j2-api/src/...

Author: rgoers
Date: Thu Sep  8 06:09:00 2011
New Revision: 1166534

URL: http://svn.apache.org/viewvc?rev=1166534&view=rev
Log:
Continued start on documentation

Added:
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j12-api/src/site/xdoc/
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j12-api/src/site/xdoc/index.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/xdoc/
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/xdoc/index.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/site/xdoc/
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/site/xdoc/index.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/site/xdoc/
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/site/xdoc/index.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/site/xdoc/
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/site/xdoc/index.xml
Modified:
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j12-api/src/site/site.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/Level.java
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/site.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/site/site.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/site/site.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/site/site.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml
    logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/index.xml

Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j12-api/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j12-api/src/site/site.xml?rev=1166534&r1=1166533&r2=1166534&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j12-api/src/site/site.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j12-api/src/site/site.xml Thu Sep  8 06:09:00 2011
@@ -25,6 +25,14 @@
     <src>../images/logo.jpg</src>
   </bannerRight>
   <body>
+    <menu name="Log4j">
+      <item name="Overview"                href="../index.html"/>
+      <item name="Download and Build"      href="../download.html"/>
+      <item name="Using the API"           href="../log4j2-api/api.html"/>
+      <item name="API JavaDocs"            href="../log4j2-api/apidocs/index.html"/>
+      <item name="Manual"                  href="../manual.html"/>
+      <item name="Wiki"                    href="http://wiki.apache.org/logging"/>
+    </menu>
     <links>
       <item name="Apache" href="http://www.apache.org/" />
       <item name="Logging Services" href="http://logging.apache.org/"/>

Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j12-api/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j12-api/src/site/xdoc/index.xml?rev=1166534&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j12-api/src/site/xdoc/index.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j12-api/src/site/xdoc/index.xml Thu Sep  8 06:09:00 2011
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+    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>
+    <properties>
+        <title>Log4J 1.2 Bridge</title>
+        <author email="rgoers@apache.org">Ralph Goers</author>
+    </properties>
+
+    <body>
+        <section name="Log4J 1.2 Bridge">
+
+            <p>
+              The Log4j 1.2 Bridge allows applications coded to use Log4j 1.2 API to use
+              Log4j 2.0 instead.
+            </p>
+
+        </section>
+
+        <section name="Requirements">
+           <p>
+             The Log4j 1.2 bridge requires at least Java 5.
+          </p>
+        </section>
+
+    </body>
+</document>
\ No newline at end of file

Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/Level.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/Level.java?rev=1166534&r1=1166533&r2=1166534&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/Level.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/Level.java Thu Sep  8 06:09:00 2011
@@ -18,14 +18,14 @@ package org.apache.logging.log4j;
 
 /**
  * Levels used for identifying the severity of an event. Levels are organized from most specific to least:<br>
- * OFF<br>    (most specific)
+ * OFF   (most specific)<br>
  * FATAL<br>
  * ERROR<br>
  * WARN<br>
  * INFO<br>
  * DEBUG<br>
  * TRACE<br>
- * ALL<br>     (least specific)
+ * AL    (least specific)<br>
  *
  * Typically, configuring a level in a filter or on a logger will cause logging events of that level and those
  * that are more specific to pass through the filter.
@@ -141,6 +141,10 @@ public enum Level {
         return (intLevel <= level);
     }
 
+    /**
+     * Returns the integer value of the Level.
+     * @return the integer value of the Level.
+     */
     public int intLevel() {
         return intLevel;
     }

Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java?rev=1166534&r1=1166533&r2=1166534&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java Thu Sep  8 06:09:00 2011
@@ -26,8 +26,7 @@ import org.apache.logging.log4j.message.
 import org.apache.logging.log4j.message.SimpleMessage;
 
 /**
- * Base implementation of a Logger. While this class is large and contains many methods, it makes implementing an
- * actually Logger relatively easy.
+ * Base implementation of a Logger. It is highly recommended that any Logger implementation extend this class.
  *
  * @doubt See Jira LOG4J2-39.
  */

Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/site.xml?rev=1166534&r1=1166533&r2=1166534&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/site.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/site.xml Thu Sep  8 06:09:00 2011
@@ -25,6 +25,14 @@
     <src>../images/logo.jpg</src>
   </bannerRight>
   <body>
+    <menu name="Log4j">
+      <item name="Overview"                href="../index.html"/>
+      <item name="Download and Build"      href="../download.html"/>
+      <item name="Using the API"           href="api.html"/>
+      <item name="API JavaDocs"            href="apidocs/index.html"/>
+      <item name="Manual"                  href="../manual.html"/>
+      <item name="Wiki"                    href="http://wiki.apache.org/logging"/>
+    </menu>
     <links>
       <item name="Apache" href="http://www.apache.org/" />
       <item name="Logging Services" href="http://logging.apache.org/"/>

Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/xdoc/index.xml?rev=1166534&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/xdoc/index.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/xdoc/index.xml Thu Sep  8 06:09:00 2011
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+    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>
+    <properties>
+        <title>Log4J 2.0 API</title>
+        <author email="rgoers@apache.org">Ralph Goers</author>
+    </properties>
+
+    <body>
+        <section name="Log4j 2.0 API">
+
+            <p>
+              The Log4Jj 2.0 API provides the interface that applications should code to and provides the
+              adapter components required for implementers to create a logging implementation.
+            </p>
+
+        </section>
+
+        <section name="Requirements">
+           <p>
+             The Log4j 2.0 API requires at least Java 5.
+          </p>
+        </section>
+
+    </body>
+</document>
\ No newline at end of file

Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/site/site.xml?rev=1166534&r1=1166533&r2=1166534&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/site/site.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/site/site.xml Thu Sep  8 06:09:00 2011
@@ -25,6 +25,14 @@
     <src>../images/logo.jpg</src>
   </bannerRight>
   <body>
+    <menu name="Log4j">
+      <item name="Overview"                href="../index.html"/>
+      <item name="Download and Build"      href="../download.html"/>
+      <item name="Using the API"           href="../log4j2-api/api.html"/>
+      <item name="API JavaDocs"            href="../log4j2-api/apidocs/index.html"/>
+      <item name="Manual"                  href="../manual.html"/>
+      <item name="Wiki"                    href="http://wiki.apache.org/logging"/>
+    </menu>
     <links>
       <item name="Apache" href="http://www.apache.org/" />
       <item name="Logging Services" href="http://logging.apache.org/"/>

Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/site/xdoc/index.xml?rev=1166534&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/site/xdoc/index.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/site/xdoc/index.xml Thu Sep  8 06:09:00 2011
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+    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>
+    <properties>
+        <title>Log4J 2.0 Implementation</title>
+        <author email="rgoers@apache.org">Ralph Goers</author>
+    </properties>
+
+    <body>
+        <section name="Log4j 2.0 Implementation">
+
+            <p>
+              The Log4Jj 2.0 implementation provides the functional components of the logging system. Users are
+              free to create their own plugins and include them in the logging configuration.
+            </p>
+
+        </section>
+
+        <section name="Requirements">
+           <p>
+             Log4j 2.0 requires Java 5 but has will take advantage of enhancements in Java 6 to improve performance.
+             Some features may require optional dependencies. These dependencies are
+             specified in the documentation for those features.
+          </p>
+        </section>
+
+    </body>
+</document>
\ No newline at end of file

Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/site/site.xml?rev=1166534&r1=1166533&r2=1166534&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/site/site.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/site/site.xml Thu Sep  8 06:09:00 2011
@@ -25,6 +25,14 @@
     <src>../images/logo.jpg</src>
   </bannerRight>
   <body>
+    <menu name="Log4j">
+      <item name="Overview"                href="../index.html"/>
+      <item name="Download and Build"      href="../download.html"/>
+      <item name="Using the API"           href="../log4j2-api/api.html"/>
+      <item name="API JavaDocs"            href="../log4j2-api/apidocs/index.html"/>
+      <item name="Manual"                  href="../manual.html"/>
+      <item name="Wiki"                    href="http://wiki.apache.org/logging"/>
+    </menu>
     <links>
       <item name="Apache" href="http://www.apache.org/" />
       <item name="Logging Services" href="http://logging.apache.org/"/>

Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/site/xdoc/index.xml?rev=1166534&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/site/xdoc/index.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-jcl/src/site/xdoc/index.xml Thu Sep  8 06:09:00 2011
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+    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>
+    <properties>
+        <title>Commons Logging Bridge</title>
+        <author email="rgoers@apache.org">Ralph Goers</author>
+    </properties>
+
+    <body>
+        <section name="Commons Logging Bridge">
+
+            <p>
+              The Commons Logging Bridge allows applications coded to the Commons Logging API to use
+              Log4j 2.0 as the implementation.
+            </p>
+
+        </section>
+
+        <section name="Requirements">
+           <p>
+             The Commons Logging bridge requires at least Java 5.
+          </p>
+        </section>
+
+    </body>
+</document>
\ No newline at end of file

Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/site/site.xml?rev=1166534&r1=1166533&r2=1166534&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/site/site.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/site/site.xml Thu Sep  8 06:09:00 2011
@@ -25,6 +25,14 @@
     <src>../images/logo.jpg</src>
   </bannerRight>
   <body>
+    <menu name="Log4j">
+      <item name="Overview"                href="../index.html"/>
+      <item name="Download and Build"      href="../download.html"/>
+      <item name="Using the API"           href="../log4j2-api/api.html"/>
+      <item name="API JavaDocs"            href="../log4j2-api/apidocs/index.html"/>
+      <item name="Manual"                  href="../manual.html"/>
+      <item name="Wiki"                    href="http://wiki.apache.org/logging"/>
+    </menu>
     <links>
       <item name="Apache" href="http://www.apache.org/" />
       <item name="Logging Services" href="http://logging.apache.org/"/>

Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/site/xdoc/index.xml?rev=1166534&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/site/xdoc/index.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/site/xdoc/index.xml Thu Sep  8 06:09:00 2011
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+    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>
+    <properties>
+        <title>SLF4J Bridge</title>
+        <author email="rgoers@apache.org">Ralph Goers</author>
+    </properties>
+
+    <body>
+        <section name="SLF4J Bridge">
+
+            <p>
+              The SLF4J Bridge allows applications coded to the SLF4J API to use
+              Log4j 2.0 as the implementation.
+            </p>
+
+        </section>
+
+        <section name="Requirements">
+           <p>
+             The SLF4J bridge requires at least Java 5.
+          </p>
+        </section>
+
+    </body>
+</document>
\ No newline at end of file

Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml?rev=1166534&r1=1166533&r2=1166534&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml Thu Sep  8 06:09:00 2011
@@ -28,8 +28,8 @@
     <menu name="Log4j">
       <item name="Overview"                href="/index.html"/>
       <item name="Download and Build"      href="/download.html"/>
-      <item name="Using the API"           href="/api.html"/>
-      <item name="API JavaDocs"            href="/apidocs/index.html"/>
+      <item name="Using the API"           href="log4j2-api/api.html"/>
+      <item name="API JavaDocs"            href="log4j2-api/apidocs/index.html"/>
       <item name="Manual"                  href="/manual.html"/>
       <item name="Wiki"                    href="http://wiki.apache.org/logging"/>
     </menu>

Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/index.xml?rev=1166534&r1=1166533&r2=1166534&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/index.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/index.xml Thu Sep  8 06:09:00 2011
@@ -72,7 +72,8 @@
 
         <section name="Requirements">
            <p>
-             Log4j 2.0 requires Java 5. Some features may require optional dependencies. These dependencies are
+             Log4j 2.0 requires Java 5 but has will take advantage of enhancements in Java 6 to improve performance.
+             Some features may require optional dependencies. These dependencies are
              specified in the documentation for those features.
           </p>
         </section>
@@ -80,8 +81,8 @@
         <section name="News">
           <p>
             Log4j 2.0 is now available. The API for Log4j 2.0 is not compatible with Log4j 1.x, however an adapter
-            is
-
+            is available to allow applications to continue to use the Log4j 1.x API. Adapters are also available for
+            Commons Logging and SLF4J.
           </p>
         </section>