logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nickwilli...@apache.org
Subject svn commit: r1483567 - in /logging/log4j/log4j2/trunk: ./ api/ api/src/site/ api/src/site/xdoc/ core/ core/src/main/java/org/apache/logging/log4j/core/config/ core/src/main/java/org/apache/logging/log4j/core/jmx/ core/src/main/java/org/apache/logging/l...
Date Thu, 16 May 2013 21:03:21 GMT
Author: nickwilliams
Date: Thu May 16 21:03:20 2013
New Revision: 1483567

URL: http://svn.apache.org/r1483567
Log:
- Using Log4j instead of Log4J Part 1: Log4j is used hundreds of times, but Log4J (capital J) is used about 100 times. Replacing all Log4J with Log4j for consistency.
- Replacing all Log4j2 with Log4j 2 for consistency.
- Fixing numerous spelling errors in documentation.

Modified:
    logging/log4j/log4j2/trunk/BUILDING.txt
    logging/log4j/log4j2/trunk/api/pom.xml
    logging/log4j/log4j2/trunk/api/src/site/site.xml
    logging/log4j/log4j2/trunk/api/src/site/xdoc/index.xml
    logging/log4j/log4j2/trunk/core/pom.xml
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java
    logging/log4j/log4j2/trunk/core/src/site/site.xml
    logging/log4j/log4j2/trunk/core/src/site/xdoc/index.xml
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceComparison.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceRun.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
    logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml
    logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java
    logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml
    logging/log4j/log4j2/trunk/jmx-gui/pom.xml
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java
    logging/log4j/log4j2/trunk/jmx-gui/src/site/site.xml
    logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/index.xml
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/site.xml
    logging/log4j/log4j2/trunk/log4j12-api/pom.xml
    logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml
    logging/log4j/log4j2/trunk/log4j12-api/src/site/xdoc/index.xml
    logging/log4j/log4j2/trunk/log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java
    logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JLoggerFactory.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml
    logging/log4j/log4j2/trunk/src/changes/changes.xml
    logging/log4j/log4j2/trunk/src/site/apt/download.apt.vm
    logging/log4j/log4j2/trunk/src/site/site.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/index.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/api.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/markers.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/maven-artifacts.xml.vm
    logging/log4j/log4j2/trunk/taglib/src/site/site.xml
    logging/log4j/log4j2/trunk/web/src/site/site.xml

Modified: logging/log4j/log4j2/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/BUILDING.txt?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/BUILDING.txt (original)
+++ logging/log4j/log4j2/trunk/BUILDING.txt Thu May 16 21:03:20 2013
@@ -1,6 +1,6 @@
-Building Log4J 2
+Building Log4j 2
   
-To build Log4J 2, you need a JDK implementation version 1.6 or greater, and Apache Maven.
+To build Log4j 2, you need a JDK implementation version 1.6 or greater, and Apache Maven.
 
 To build the site, from a command line, run:
 

Modified: logging/log4j/log4j2/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/pom.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/api/pom.xml Thu May 16 21:03:20 2013
@@ -26,7 +26,7 @@
   <artifactId>log4j-api</artifactId>
   <packaging>jar</packaging>
   <name>Apache Log4j API</name>
-  <description>The Log4J API</description>
+  <description>The Log4j API</description>
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>API Documentation</docLabel>

Modified: logging/log4j/log4j2/trunk/api/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/site/site.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/api/src/site/site.xml Thu May 16 21:03:20 2013
@@ -27,7 +27,7 @@
     <menu ref="reports"/>
 
 	<!-- Overall Project Info -->
-    <menu name="Log4J Project Information" img="icon-info-sign">
+    <menu name="Log4j Project Information" img="icon-info-sign">
       <item name="Dependencies" href="../dependencies.html" />
       <item name="Dependency Convergence" href="../dependency-convergence.html" />
       <item name="Dependency Management" href="../dependency-management.html" />
@@ -39,7 +39,7 @@
       <item name="Project Summary" href="../project-summary.html" />
     </menu>
 
-    <menu name="Log4J Project Reports" img="icon-cog">
+    <menu name="Log4j Project Reports" img="icon-cog">
       <item name="Changes Report" href="../changes-report.html" />
       <item name="JIRA Report" href="../jira-report.html" />
       <item name="Surefire Report" href="../surefire-report.html" />

Modified: logging/log4j/log4j2/trunk/api/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/site/xdoc/index.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/api/src/site/xdoc/index.xml Thu May 16 21:03:20 2013
@@ -18,7 +18,7 @@
 
 <document>
     <properties>
-        <title>Log4J 2 API</title>
+        <title>Log4j 2 API</title>
         <author email="rgoers@apache.org">Ralph Goers</author>
     </properties>
 
@@ -26,7 +26,7 @@
         <section name="Log4j 2 API">
 
             <p>
-              The Log4Jj 2 API provides the interface that applications should code to and provides the
+              The Log4j 2 API provides the interface that applications should code to and provides the
               adapter components required for implementers to create a logging implementation.
             </p>
 

Modified: logging/log4j/log4j2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/pom.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/pom.xml (original)
+++ logging/log4j/log4j2/trunk/core/pom.xml Thu May 16 21:03:20 2013
@@ -25,8 +25,8 @@
   </parent>
   <artifactId>log4j-core</artifactId>
   <packaging>jar</packaging>
-  <name>Apache Log4J Core</name>
-  <description>Apache Log4J Implementation.</description>
+  <name>Apache Log4j Core</name>
+  <description>The Log4j Implementation</description>
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Core Documentation</docLabel>

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java Thu May 16 21:03:20 2013
@@ -16,6 +16,8 @@
  */
 package org.apache.logging.log4j.core.config;
 
+import java.io.Serializable;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.Appender;
 import org.apache.logging.log4j.core.Layout;
@@ -23,12 +25,10 @@ import org.apache.logging.log4j.core.app
 import org.apache.logging.log4j.core.layout.PatternLayout;
 import org.apache.logging.log4j.util.PropertiesUtil;
 
-import java.io.Serializable;
-
 /**
  * The default configuration writes all output to the Console using the default logging level. You configure default
  * logging level by setting the system property "org.apache.logging.log4j.level" to a level name. If you do not
- * specify the property, Log4J uses the ERROR Level. Log Events will be printed using the basic formatting provided
+ * specify the property, Log4j uses the ERROR Level. Log Events will be printed using the basic formatting provided
  * by each Message.
  */
 public class DefaultConfiguration extends BaseConfiguration {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java Thu May 16 21:03:20 2013
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.status.S
 /**
  * Creates MBeans to instrument various classes in the log4j class hierarchy.
  * <p>
- * All instrumentation for Log4J2 classes can be disabled by setting system
+ * All instrumentation for Log4j 2 classes can be disabled by setting system
  * property {@code -Dlog4j2.disable.jmx=true}.
  */
 public final class Server {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java Thu May 16 21:03:20 2013
@@ -16,8 +16,18 @@
  */
 package org.apache.logging.log4j.core.layout;
 
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.LineNumberReader;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -27,16 +37,6 @@ import org.apache.logging.log4j.core.hel
 import org.apache.logging.log4j.core.helpers.Constants;
 import org.apache.logging.log4j.core.helpers.Transform;
 
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.LineNumberReader;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.lang.management.ManagementFactory;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-
 /**
  * This layout outputs events in a HTML table.
  * <p/>
@@ -52,7 +52,7 @@ public final class HTMLLayout extends Ab
 
     private static final String REGEXP = Constants.LINE_SEP.equals("\n") ? "\n" : Constants.LINE_SEP + "|\n";
 
-    private static final String DEFAULT_TITLE = "Log4J Log Messages";
+    private static final String DEFAULT_TITLE = "Log4j Log Messages";
 
     private static final String DEFAULT_CONTENT_TYPE = "text/html";
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java Thu May 16 21:03:20 2013
@@ -16,11 +16,6 @@
  */
 package org.apache.logging.log4j.core.selector;
 
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.helpers.Loader;
-import org.apache.logging.log4j.core.impl.ContextAnchor;
-import org.apache.logging.log4j.status.StatusLogger;
-
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -34,6 +29,11 @@ import java.util.concurrent.ConcurrentHa
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.helpers.Loader;
+import org.apache.logging.log4j.core.impl.ContextAnchor;
+import org.apache.logging.log4j.status.StatusLogger;
+
 /**
  * This ContextSelector chooses a LoggerContext based upon the ClassLoader of the caller. This allows Loggers
  * assigned to static variables to be released along with the classes that own then. Other ContextSelectors
@@ -252,7 +252,7 @@ public class ClassLoaderContextSelector 
     }
 
     /**
-     * SecurityManager that will locate the caller of the Log4j2 API.
+     * SecurityManager that will locate the caller of the Log4j 2 API.
      */
     private static class PrivateSecurityManager extends SecurityManager {
 

Modified: logging/log4j/log4j2/trunk/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/site/site.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/site/site.xml Thu May 16 21:03:20 2013
@@ -27,7 +27,7 @@
     <menu ref="reports"/>
 
 	<!-- Overall Project Info -->
-    <menu name="Log4J Project Information" img="icon-info-sign">
+    <menu name="Log4j Project Information" img="icon-info-sign">
       <item name="Dependencies" href="../dependencies.html" />
       <item name="Dependency Convergence" href="../dependency-convergence.html" />
       <item name="Dependency Management" href="../dependency-management.html" />
@@ -39,7 +39,7 @@
       <item name="Project Summary" href="../project-summary.html" />
     </menu>
 
-    <menu name="Log4J Project Reports" img="icon-cog">
+    <menu name="Log4j Project Reports" img="icon-cog">
       <item name="Changes Report" href="../changes-report.html" />
       <item name="JIRA Report" href="../jira-report.html" />
       <item name="Surefire Report" href="../surefire-report.html" />

Modified: logging/log4j/log4j2/trunk/core/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/site/xdoc/index.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/site/xdoc/index.xml Thu May 16 21:03:20 2013
@@ -18,7 +18,7 @@
 
 <document>
     <properties>
-        <title>Log4J 2 Implementation</title>
+        <title>Log4j 2 Implementation</title>
         <author email="rgoers@apache.org">Ralph Goers</author>
     </properties>
 
@@ -26,7 +26,7 @@
         <section name="Log4j 2 Implementation">
 
             <p>
-              The Log4Jj 2 implementation provides the functional components of the logging system.
+              The Log4j 2 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>
 

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceComparison.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceComparison.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceComparison.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceComparison.java Thu May 16 21:03:20 2013
@@ -16,12 +16,6 @@
  */
 package org.apache.logging.log4j;
 
-import org.apache.logging.log4j.core.config.XMLConfigurationFactory;
-import org.apache.logging.log4j.core.util.Profiler;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import java.io.BufferedOutputStream;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
@@ -30,8 +24,14 @@ import java.io.Writer;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
+import org.apache.logging.log4j.core.config.XMLConfigurationFactory;
+import org.apache.logging.log4j.core.util.Profiler;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 /**
- * Use this class to analyze performance between Log4J and other logging frameworks.
+ * Use this class to analyze performance between Log4j and other logging frameworks.
  * 
  * @version $Id$
  */

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceRun.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceRun.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceRun.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/PerformanceRun.java Thu May 16 21:03:20 2013
@@ -30,7 +30,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
- * Use this class to analyze Log4J-only performance.
+ * Use this class to analyze Log4j-only performance.
  * <p/>
  * See {@linkplain PerformanceComparison} to compare performance with other logging frameworks.
  * 

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java Thu May 16 21:03:20 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.logging.log4j.core.async.perftest;
 
-import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -29,6 +27,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector;
+
 /**
  * Runs a sequence of performance tests.
  */
@@ -80,8 +80,8 @@ public class PerfTestDriver {
             // args.add("-XX:+PrintGCApplicationConcurrentTime");
             // args.add("-XX:+PrintSafepointStatistics");
 
-            args.add("-Dlog4j.configuration=" + _log4jConfig); // log4j1.2
-            args.add("-Dlog4j.configurationFile=" + _log4jConfig); // log4j2
+            args.add("-Dlog4j.configuration=" + _log4jConfig); // log4j 1.2
+            args.add("-Dlog4j.configurationFile=" + _log4jConfig); // log4j 2
             args.add("-Dlogback.configurationFile=" + _log4jConfig);// logback
 
             int ringBufferSize = getUserSpecifiedRingBufferSize();

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java Thu May 16 21:03:20 2013
@@ -16,23 +16,22 @@
  */
 package org.apache.logging.log4j.core.layout;
 
+import java.util.List;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.ThreadContext;
 import org.apache.logging.log4j.core.BasicConfigurationFactory;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.test.appender.ListAppender;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.helpers.Charsets;
+import org.apache.logging.log4j.test.appender.ListAppender;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.List;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 /**
  *
@@ -112,7 +111,7 @@ public class HTMLLayoutTest {
         assertTrue("Incorrect number of lines. Require at least 85 " + list.size(), list.size() > 85);
         final String string = list.get(3);
         assertTrue("Incorrect header: " + string, string.equals("<meta charset=\"UTF-8\"/>"));
-        assertTrue("Incorrect title", list.get(4).equals("<title>Log4J Log Messages</title>"));
+        assertTrue("Incorrect title", list.get(4).equals("<title>Log4j Log Messages</title>"));
         assertTrue("Incorrect footer", list.get(list.size() - 1).equals("</body></html>"));
         assertTrue("Incorrect multiline", list.get(50).equals(multiLine));
         assertTrue("Incorrect body", list.get(71).equals(body));

Modified: logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml Thu May 16 21:03:20 2013
@@ -27,7 +27,7 @@
     <menu ref="reports"/>
 
 	<!-- Overall Project Info -->
-    <menu name="Log4J Project Information" img="icon-info-sign">
+    <menu name="Log4j Project Information" img="icon-info-sign">
       <item name="Dependencies" href="../dependencies.html" />
       <item name="Dependency Convergence" href="../dependency-convergence.html" />
       <item name="Dependency Management" href="../dependency-management.html" />
@@ -39,7 +39,7 @@
       <item name="Project Summary" href="../project-summary.html" />
     </menu>
 
-    <menu name="Log4J Project Reports" img="icon-cog">
+    <menu name="Log4j Project Reports" img="icon-cog">
       <item name="Changes Report" href="../changes-report.html" />
       <item name="JIRA Report" href="../jira-report.html" />
       <item name="Surefire Report" href="../surefire-report.html" />

Modified: logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java (original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java Thu May 16 21:03:20 2013
@@ -16,6 +16,11 @@
  */
 package org.apache.logging.log4j.jcl;
 
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogConfigurationException;
 import org.apache.commons.logging.LogFactory;
@@ -23,11 +28,6 @@ import org.apache.logging.log4j.LogManag
 import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.spi.LoggerContext;
 
-import java.util.Map;
-import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 /**
  *
  */
@@ -51,7 +51,7 @@ public class LogFactoryImpl extends LogF
             return loggers.get(name);
         }
         throw new LogConfigurationException(
-            "Commons Logging Adapter requires base logging system to extend Log4J AbstractLogger");
+            "Commons Logging Adapter requires base logging system to extend Log4j AbstractLogger");
     }
 
     private ConcurrentMap<String, Log> getLoggersMap() {

Modified: logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml Thu May 16 21:03:20 2013
@@ -27,7 +27,7 @@
     <menu ref="reports"/>
 
 	<!-- Overall Project Info -->
-    <menu name="Log4J Project Information" img="icon-info-sign">
+    <menu name="Log4j Project Information" img="icon-info-sign">
       <item name="Dependencies" href="../dependencies.html" />
       <item name="Dependency Convergence" href="../dependency-convergence.html" />
       <item name="Dependency Management" href="../dependency-management.html" />
@@ -39,7 +39,7 @@
       <item name="Project Summary" href="../project-summary.html" />
     </menu>
 
-    <menu name="Log4J Project Reports" img="icon-cog">
+    <menu name="Log4j Project Reports" img="icon-cog">
       <item name="Changes Report" href="../changes-report.html" />
       <item name="JIRA Report" href="../jira-report.html" />
       <item name="Surefire Report" href="../surefire-report.html" />

Modified: logging/log4j/log4j2/trunk/jmx-gui/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/pom.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jmx-gui/pom.xml (original)
+++ logging/log4j/log4j2/trunk/jmx-gui/pom.xml Thu May 16 21:03:20 2013
@@ -25,7 +25,7 @@
   </parent>
   <artifactId>log4j-jmx-gui</artifactId>
   <packaging>jar</packaging>
-  <name>Apache Log4J JMX GUI</name>
+  <name>Apache Log4j JMX GUI</name>
   <description>
     Swing-based client for remotely editing the log4j configuration and remotely monitoring StatusLogger output.
     Includes a JConsole plug-in.

Modified: logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java (original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java Thu May 16 21:03:20 2013
@@ -38,7 +38,7 @@ import javax.swing.JTextField;
 import org.apache.logging.log4j.core.jmx.LoggerContextAdminMBean;
 
 /**
- * Panel for editing Log4J configurations.
+ * Panel for editing Log4j configurations.
  */
 public class ClientEditConfigPanel extends JPanel {
     private static final long serialVersionUID = -7544651740950723394L;

Modified: logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java (original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java Thu May 16 21:03:20 2013
@@ -53,7 +53,7 @@ import org.apache.logging.log4j.core.jmx
 
 /**
  * Swing GUI that connects to a Java process via JMX and allows the user to view and
- * modify the log4j2 configuration, as well as monitor status logs.
+ * modify the Log4j 2 configuration, as well as monitor status logs.
  * 
  * @see <a href=
  *      "http://docs.oracle.com/javase/6/docs/technotes/guides/management/jconsole.html"
@@ -168,7 +168,7 @@ public class ClientGUI extends JPanel im
         }
         final JMXConnector connector = JMXConnectorFactory.connect(url, paramMap);
         final Client client = new Client(connector);
-        final String title = "Log4J2 JMX Client - " + url;
+        final String title = "Log4j JMX Client - " + url;
 
         SwingUtilities.invokeLater(new Runnable() {
             @Override

Modified: logging/log4j/log4j2/trunk/jmx-gui/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/site/site.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jmx-gui/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/site/site.xml Thu May 16 21:03:20 2013
@@ -27,7 +27,7 @@
     <menu ref="reports"/>
 
 	<!-- Overall Project Info -->
-    <menu name="Log4J Project Information" img="icon-info-sign">
+    <menu name="Log4j Project Information" img="icon-info-sign">
       <item name="Dependencies" href="../dependencies.html" />
       <item name="Dependency Convergence" href="../dependency-convergence.html" />
       <item name="Dependency Management" href="../dependency-management.html" />
@@ -39,7 +39,7 @@
       <item name="Project Summary" href="../project-summary.html" />
     </menu>
 
-    <menu name="Log4J Project Reports" img="icon-cog">
+    <menu name="Log4j Project Reports" img="icon-cog">
       <item name="Changes Report" href="../changes-report.html" />
       <item name="JIRA Report" href="../jira-report.html" />
       <item name="Surefire Report" href="../surefire-report.html" />

Modified: logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/index.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/index.xml Thu May 16 21:03:20 2013
@@ -18,12 +18,12 @@
 
 <document>
     <properties>
-        <title>Log4J JMX GUI</title>
+        <title>Log4j JMX GUI</title>
         <author email="rpopma@apache.org">Remko Popma</author>
     </properties>
 
     <body>
-        <section name="Log4J JMX GUI">
+        <section name="Log4j JMX GUI">
 
             <p>
               JMX GUI provides a Swing-based client for remotely editing the log4j configuration 

Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/site.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/site/site.xml Thu May 16 21:03:20 2013
@@ -27,7 +27,7 @@
     <menu ref="reports"/>
 
 	<!-- Overall Project Info -->
-    <menu name="Log4J Project Information" img="icon-info-sign">
+    <menu name="Log4j Project Information" img="icon-info-sign">
       <item name="Dependencies" href="../dependencies.html" />
       <item name="Dependency Convergence" href="../dependency-convergence.html" />
       <item name="Dependency Management" href="../dependency-management.html" />
@@ -39,7 +39,7 @@
       <item name="Project Summary" href="../project-summary.html" />
     </menu>
 
-    <menu name="Log4J Project Reports" img="icon-cog">
+    <menu name="Log4j Project Reports" img="icon-cog">
       <item name="Changes Report" href="../changes-report.html" />
       <item name="JIRA Report" href="../jira-report.html" />
       <item name="Surefire Report" href="../surefire-report.html" />

Modified: logging/log4j/log4j2/trunk/log4j12-api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/pom.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/pom.xml Thu May 16 21:03:20 2013
@@ -26,7 +26,7 @@
   <artifactId>log4j-1.2-api</artifactId>
   <packaging>jar</packaging>
   <name>Apache Log4j 1.x Compatibility API</name>
-  <description>The Log4J Compatibility API</description>
+  <description>The Log4j 1.x Compatibility API</description>
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Log4j 1.2 Documentation</docLabel>

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml Thu May 16 21:03:20 2013
@@ -27,7 +27,7 @@
     <menu ref="reports"/>
 
 	<!-- Overall Project Info -->
-    <menu name="Log4J Project Information" img="icon-info-sign">
+    <menu name="Log4j Project Information" img="icon-info-sign">
       <item name="Dependencies" href="../dependencies.html" />
       <item name="Dependency Convergence" href="../dependency-convergence.html" />
       <item name="Dependency Management" href="../dependency-management.html" />
@@ -39,7 +39,7 @@
       <item name="Project Summary" href="../project-summary.html" />
     </menu>
 
-    <menu name="Log4J Project Reports" img="icon-cog">
+    <menu name="Log4j Project Reports" img="icon-cog">
       <item name="Changes Report" href="../changes-report.html" />
       <item name="JIRA Report" href="../jira-report.html" />
       <item name="Surefire Report" href="../surefire-report.html" />

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/site/xdoc/index.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/site/xdoc/index.xml Thu May 16 21:03:20 2013
@@ -18,12 +18,12 @@
 
 <document>
     <properties>
-        <title>Log4J 1.2 Bridge</title>
+        <title>Log4j 1.2 Bridge</title>
         <author email="rgoers@apache.org">Ralph Goers</author>
     </properties>
 
     <body>
-        <section name="Log4J 1.2 Bridge">
+        <section name="Log4j 1.2 Bridge">
 
             <p>
               The Log4j 1.2 Bridge allows applications coded to use Log4j 1.2 API to use

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java Thu May 16 21:03:20 2013
@@ -17,6 +17,9 @@
 
 package org.apache.log4j;
 
+import java.lang.reflect.Method;
+import java.util.List;
+
 import org.apache.logging.log4j.core.Layout;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.LoggerContext;
@@ -30,9 +33,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.lang.reflect.Method;
-import java.util.List;
-
 import static org.junit.Assert.*;
 
 
@@ -127,7 +127,7 @@ public class CategoryTest {
     }
 
     /**
-     * Test using a pre-existing log4j2 logger
+     * Test using a pre-existing Log4j 2 logger
      */
     @Test
     public void testExistingLog4j2Logger() {

Modified: logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/pom.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/pom.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/pom.xml Thu May 16 21:03:20 2013
@@ -26,7 +26,7 @@
   <artifactId>log4j-slf4j-impl</artifactId>
   <packaging>jar</packaging>
   <name>Apache Log4j SLF4J Binding</name>
-  <description>Binding between SLF4J API and Log4J2 Core</description>
+  <description>Binding between SLF4J API and Log4j 2 Core</description>
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>SLF4J Documentation</docLabel>

Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JLoggerFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JLoggerFactory.java?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JLoggerFactory.java (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JLoggerFactory.java Thu May 16 21:03:20 2013
@@ -16,6 +16,11 @@
  */
 package org.slf4j.helpers;
 
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.spi.LoggerContext;
@@ -25,11 +30,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.impl.SLF4JLogger;
 
-import java.util.Map;
-import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 /**
  *
  */
@@ -55,7 +55,7 @@ public class Log4JLoggerFactory implemen
             loggers.putIfAbsent(name, new SLF4JLogger((AbstractLogger) logger, name));
             return loggers.get(name);
         }
-        throw new SLF4JLoggingException("SLF4J Adapter requires base logging system to extend Log4J AbstractLogger");
+        throw new SLF4JLoggingException("SLF4J Adapter requires base logging system to extend Log4j AbstractLogger");
     }
 
     private ConcurrentMap<String, Logger> getLoggersMap(final LoggerContext context) {

Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml Thu May 16 21:03:20 2013
@@ -27,7 +27,7 @@
     <menu ref="reports"/>
 
 	<!-- Overall Project Info -->
-    <menu name="Log4J Project Information" img="icon-info-sign">
+    <menu name="Log4j Project Information" img="icon-info-sign">
       <item name="Dependencies" href="../dependencies.html" />
       <item name="Dependency Convergence" href="../dependency-convergence.html" />
       <item name="Dependency Management" href="../dependency-management.html" />
@@ -39,7 +39,7 @@
       <item name="Project Summary" href="../project-summary.html" />
     </menu>
 
-    <menu name="Log4J Project Reports" img="icon-cog">
+    <menu name="Log4j Project Reports" img="icon-cog">
       <item name="Changes Report" href="../changes-report.html" />
       <item name="JIRA Report" href="../jira-report.html" />
       <item name="Surefire Report" href="../surefire-report.html" />

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Thu May 16 21:03:20 2013
@@ -220,7 +220,7 @@
         Expose file appender configuration details via an advertisement mechanism.
       </action>
       <action issue="LOG4J2-159" dev="rgoers" type="fix" due-to="Jan Winter">
-        Add Fragment-Host to MANIFEST.MF for log4j2-core.
+        Add Fragment-Host to MANIFEST.MF for log4j-core.
       </action>
       <action issue="LOG4J2-167" dev="rgoers" type="fix">
         Configurator throws a ClassCastException if LogManager returns a SimpleLoggerContext.

Modified: logging/log4j/log4j2/trunk/src/site/apt/download.apt.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/apt/download.apt.vm?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/apt/download.apt.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/apt/download.apt.vm Thu May 16 21:03:20 2013
@@ -66,7 +66,7 @@ Download Apache Log4j 2
   All previous releases of Apache log4j can be found in the
   {{{http://archive.apache.org/dist/logging/log4j}archive repository}}.
 
-* Using Log4J on your classpath
+* Using Log4j on your classpath
 
   To use Log4j 2 in your application make sure that both the API and Core jars are in the application's classpath. Add
   the dependencies listed below to your classpath.

Modified: logging/log4j/log4j2/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/site.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/site.xml Thu May 16 21:03:20 2013
@@ -144,7 +144,7 @@
       <item name="API" href="log4j-api/index.html"/>
       <item name="Implementation" href="log4j-core/index.html"/>
       <item name="Commons Logging Bridge" href="log4j-jcl/index.html"/>
-      <item name="Log4J 1.2 API" href="log4j-1.2-api/index.html"/>
+      <item name="Log4j 1.2 API" href="log4j-1.2-api/index.html"/>
       <item name="SLF4J Binding" href="log4j-slf4j-impl/index.html"/>
       <item name="Log4j 2 to SLF4J Adapter" href="log4j-to-slf4j/index.html"/>
       <item name="Apache Flume" href="log4j-flume-ng/index.html"/>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/index.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/index.xml Thu May 16 21:03:20 2013
@@ -18,7 +18,7 @@
 
 <document>
     <properties>
-        <title>Log4J2 Guide</title>
+        <title>Log4j 2 Guide</title>
         <author email="rgoers@apache.org">Ralph Goers</author>
         <author email="ggregory@apache.org">Gary Gregory</author>
         <author email="sdeboy@apache.org">Scott Deboy</author>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/api.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/api.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/api.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/api.xml Thu May 16 21:03:20 2013
@@ -28,7 +28,7 @@
           <a name="Overview"/>
           <subsection name="Overview">
             <p>
-              The Log4Jj 2 API provides the interface that applications should code to and provides the
+              The Log4j 2 API provides the interface that applications should code to and provides the
               adapter components required for implementers to create a logging implementation. Although Log4j 2
               is broken up between an API and an implementation, the primary purpose of doing so was not to
               allow multiple implementations, although that is certainly possible, but to clearly define

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml Thu May 16 21:03:20 2013
@@ -297,7 +297,7 @@
 					file I/O. While FastFileAppender
 					from different Configurations
 					cannot be shared, the FastFileManagers can be if the Manager is
-					accessible. For example, two webapps in a
+					accessible. For example, two web applications in a
 					servlet container can have
 					their own configuration and safely
 					write to the same file if Log4j
@@ -420,7 +420,7 @@
 					from different Configurations cannot be
 					shared, the FastRollingFileManagers can be
 					if the Manager is accessible.
-					For example, two webapps in a servlet
+					For example, two web applications in a servlet
 					container can have their own configuration and safely write to the
 					same file if Log4j is in a ClassLoader that is common to both of them.
 				</p>
@@ -655,8 +655,8 @@
           <p>The FileAppender is an OutputStreamAppender that writes to the File named in the fileName parameter. The
             FileAppender uses a FileManager (which extends OutputStreamManager) to actually perform the file I/O. While
             FileAppenders from different Configurations cannot be shared, the FileManagers can be if the Manager is
-            accessible. For example, two webapps in a servlet container can have their own configuration and safely
-            write to the same file if Log4J is in a ClassLoader that is common to both of them.</p>
+            accessible. For example, two web applications in a servlet container can have their own configuration and
+            safely write to the same file if Log4j is in a ClassLoader that is common to both of them.</p>
           <table>
             <tr>
               <th>Parameter Name</th>
@@ -763,7 +763,7 @@
               <li>It can act as a remote Flume client which sends Flume events via Avro to a Flume Agent configured
               with an Avro Source.</li>
               <li>It can act as an embedded Flume Agent where Flume events pass directly into Flume for processing.</li>
-              <li>It can persist events to a local BerkeleyDB datastore and then asynchronously send the events to
+              <li>It can persist events to a local BerkeleyDB data store and then asynchronously send the events to
               Flume, similar to the embedded Flume Agent but without most of the Flume dependencies.</li>
             </ol>
             Usage as an embedded agent will cause the messages to be directly passed to the Flume Channel and then
@@ -790,7 +790,7 @@
             <tr>
               <td>agentRetries</td>
               <td>integer</td>
-              <td>The number of times the agent should be retried before failing to a secondary. This paramenter is
+              <td>The number of times the agent should be retried before failing to a secondary. This parameter is
                 ignored when type="persistent" is specified (agents are tried once before failing to the next).</td>
             </tr>
             <tr>
@@ -1598,7 +1598,7 @@ public class JpaLogEntity extends LogEve
             </tr>
             <tr>
               <td>rewritePolicy</td>
-              <td>RewritePolciy</td>
+              <td>RewritePolicy</td>
               <td>The RewritePolicy that will manipulate the LogEvent.</td>
             </tr>
             <tr>
@@ -1712,9 +1712,9 @@ public class JpaLogEntity extends LogEve
             and rolls the file over according the TriggeringPolicy and the RolloverPolicy. The
             RollingFileAppender uses a RollingFileManager (which extends OutputStreamManager) to actually perform the
             file I/O and perform the rollover. While RolloverFileAppenders from different Configurations cannot be
-            shared, the RollingFileManagers can be if the Manager is accessible. For example, two webapps in a
+            shared, the RollingFileManagers can be if the Manager is accessible. For example, two web applications in a
             servlet container can have their own configuration and safely
-            write to the same file if Log4J is in a ClassLoader that is common to both of them.</p>
+            write to the same file if Log4j is in a ClassLoader that is common to both of them.</p>
           <p>
             A RollingFileAppender requires a <a href="#TriggeringPolicies">TriggeringPolicy</a> and a
             <a href="#RolloverStrategies">RolloverStrategy</a>. The triggering policy determines if a rollover should
@@ -1734,7 +1734,7 @@ public class JpaLogEntity extends LogEve
               <td>append</td>
               <td>boolean</td>
               <td>When true - the default, records will be appended to the end of the file. When set to false,
-                the file will be cleared before new reocrds are written.</td>
+                the file will be cleared before new records are written.</td>
             </tr>
             <tr>
               <td>bufferedIO</td>
@@ -2098,7 +2098,7 @@ public class JpaLogEntity extends LogEve
             </tr>
             <tr>
               <td>rewritePolicy</td>
-              <td>RewritePolciy</td>
+              <td>RewritePolicy</td>
               <td>The RewritePolicy that will manipulate the LogEvent.</td>
             </tr>
             <tr>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml Thu May 16 21:03:20 2013
@@ -324,7 +324,7 @@ Logger y = Logger.getLogger("wombat");
           and
           <code>X.Y.Z</code>
           do not have configured LoggerConfigs and so get their Level from the LoggerConfig
-          assigned to them,<code>X</code>, since it is the LoggerCofnig whose name has the
+          assigned to them,<code>X</code>, since it is the LoggerConfig whose name has the
           longest match to the start of the Logger's name.
         </p>
 
@@ -363,14 +363,14 @@ Logger y = Logger.getLogger("wombat");
           have a Configured LoggerConfig with the same name. The logger
           <code>X.YZ</code>
           does not have configured LoggerConfig and so gets its Level from the LoggerConfig
-          assigned to it,<code>X</code>, since it is the LoggerCofnig whose name has the
+          assigned to it,<code>X</code>, since it is the LoggerConfig whose name has the
           longest match to the start of the Logger's name. It is not associated with LoggerConfig
           <code>X.Y</code>
           since tokens after periods must match exactly.
         </p>
         <p>The table below provides illustrates how Level filtering works. Im the table, the vertical
           header shows the Level of the LogEvent, while the horizontal header shows the Level associated
-          with the appopriate LoggerConfig. The intersection identifies whether the LogEvent would
+          with the appropriate LoggerConfig. The intersection identifies whether the LogEvent would
           be allowed to pass for further processing (Yes) or discarded (No).
         </p>
         <table>
@@ -471,7 +471,7 @@ Logger y = Logger.getLogger("wombat");
           each Filter can return one of three results, Accept, Deny or Neutral. A response of Accept means
           that no other Filters should be called and the event should progress. A response of Deny means
           the event should be immediately ignored and control should be returned to the caller. A response
-          of Neutral indicates the event should be passed to other Filters. If there are no other Fitlers the
+          of Neutral indicates the event should be passed to other Filters. If there are no other Filters the
           event will be processed.
         </p>
         <p>Although an event may be accepted by a Filter the event still might not be logged. This can happen
@@ -610,7 +610,7 @@ Logger y = Logger.getLogger("wombat");
           message according to user specified criteria. For example, if you
           frequently need to log <code>Oranges</code>, an object type used in
           your current project, then you can create an OrangeMessage that accepts an
-          Orange instance and pass that to Log4J so that the Orange object can
+          Orange instance and pass that to Log4j so that the Orange object can
           be formatted into an appropriate byte array when required.
         </p>
 

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml Thu May 16 21:03:20 2013
@@ -11,7 +11,7 @@
 	language governing permissions and limitations under the License. -->
 <document>
 	<properties>
-		<title>Log4j2 Asynchronous Loggers for Low-Latency Logging</title>
+		<title>Log4j 2 Asynchronous Loggers for Low-Latency Logging</title>
 		<author email="rpopma@apache.org">Remko Popma</author>
 	</properties>
 	<body>
@@ -20,12 +20,12 @@
 				Asynchronous logging can improve your application's 
 				performance by executing the I/O operations
 				in a separate thread.
-				Log4j2 makes a number of improvements in this area.
+				Log4j 2 makes a number of improvements in this area.
 			</p>
 			<ul>
 				<li>
 					<b>Asynchronous Loggers</b>
-					are a new addition to Log4j2.
+					are a new addition to Log4j 2.
 					Their aim is to return from the call
 					to Logger.log to the application as
 					soon as possible. You can choose
@@ -562,7 +562,7 @@
 				  <th>64 threads</th>
 				 </tr>
 				 <tr>
-				  <td>Log4j2: Loggers all asynchronous</td>
+				  <td>Log4j 2: Loggers all asynchronous</td>
 				  <td align="right">2,652,412</td>
 				  <td align="right">909,119</td>
 				  <td align="right">776,993</td>
@@ -572,7 +572,7 @@
 				  <td align="right">288,997</td>
 				 </tr>
 				 <tr>
-				  <td>Log4j2: Loggers mixed sync/async</td>
+				  <td>Log4j 2: Loggers mixed sync/async</td>
 				  <td align="right">2,454,358</td>
 				  <td align="right">839,394</td>
 				  <td align="right">854,578</td>
@@ -582,7 +582,7 @@
 				  <td align="right">218,937</td>
 				 </tr>
 				 <tr>
-				  <td>Log4j2: Async Appender</td>
+				  <td>Log4j 2: Async Appender</td>
 				  <td align="right">1,713,429</td>
 				  <td align="right">603,019</td>
 				  <td align="right">331,506</td>
@@ -612,7 +612,7 @@
 				  <td align="right">21,303</td>
 				 </tr>
 				 <tr>
-				  <td>Log4j2: Synchronous</td>
+				  <td>Log4j 2: Synchronous</td>
 				  <td align="right">273,536</td>
 				  <td align="right">136,523</td>
 				  <td align="right">67,609</td>
@@ -658,7 +658,7 @@
 				  <th>32 threads</th>
 				 </tr>
 				 <tr>
-				  <td>Log4j2: Loggers all asynchronous</td>
+				  <td>Log4j 2: Loggers all asynchronous</td>
 				  <td align="right">1,715,344</td>
 				  <td align="right">928,951</td>
 				  <td align="right">1,045,265</td>
@@ -667,7 +667,7 @@
 				  <td align="right">773,565</td>
 				 </tr>
 				 <tr>
-				  <td>Log4j2: Loggers mixed sync/async</td>
+				  <td>Log4j 2: Loggers mixed sync/async</td>
 				  <td align="right">571,099</td>
 				  <td align="right">1,204,774</td>
 				  <td align="right">1,632,204</td>
@@ -676,7 +676,7 @@
 				  <td align="right">908,529</td>
 				 </tr>
 				 <tr>
-				  <td>Log4j2: Async Appender</td>
+				  <td>Log4j 2: Async Appender</td>
 				  <td align="right">1,236,548</td>
 				  <td align="right">1,006,287</td>
 				  <td align="right">511,571</td>
@@ -703,7 +703,7 @@
 				  <td align="right">133,435</td>
 				 </tr>
 				 <tr>
-				  <td>Log4j2: Synchronous</td>
+				  <td>Log4j 2: Synchronous</td>
 				  <td align="right">281,250</td>
 				  <td align="right">225,731</td>
 				  <td align="right">129,015</td>
@@ -819,7 +819,7 @@
 			  <th>64 threads</th>
 			 </tr>
 			 <tr>
-			  <td>Log4j2: Loggers all async</td>
+			  <td>Log4j 2: Loggers all async</td>
 			  <td align="right">677</td>
 			  <td align="right">4,135</td>
 			  <td align="right">1,638</td>
@@ -828,7 +828,7 @@
 			  <td align="right">16,128</td>
 			 </tr>
 			 <tr>
-			  <td>Log4j2: Loggers mixed
+			  <td>Log4j 2: Loggers mixed
 			  sync/async</td>
 			  <td align="right">648</td>
 			  <td align="right">4,873</td>
@@ -838,7 +838,7 @@
 			  <td align="right">16,384</td>
 			 </tr>
 			 <tr>
-			  <td>Log4j2: Async Appender</td>
+			  <td>Log4j 2: Async Appender</td>
 			  <td align="right">2,423</td>
 			  <td align="right">2,117,722</td>
 			  <td align="right">4,096</td>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/filters.xml Thu May 16 21:03:20 2013
@@ -18,7 +18,7 @@
 
 <document>
     <properties>
-        <title>Log4J2 Filters</title>
+        <title>Log4j Filters</title>
         <author email="rgoers@apache.org">Ralph Goers</author>
     </properties>
 
@@ -128,7 +128,7 @@
             <pre class="prettyprint linenums"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <configuration status="warn" name="MyApp" packages="">
   <filters>
-    <Marker marker="EVENT" onMatch="ACCEPT" onMismatch="NETURAL"/>
+    <Marker marker="EVENT" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
     <DynamicThresholdFilter key="loginId" defaultThreshold="ERROR"
                             onMatch="ACCEPT" onMismatch="NEUTRAL">
       <KeyValuePair key="User1" value="DEBUG"/>
@@ -164,7 +164,7 @@
         <subsection name="DynamicThresholdFilter">
           <p>
             The DynamicThresholdFilter allows filtering by log level based on specific attributes. For example,
-            if the user's loginid is being captured in the ThreadContext Map then it is possible to enable
+            if the user's loginId is being captured in the ThreadContext Map then it is possible to enable
             debug logging for only that user.
           </p>
           <table>
@@ -270,7 +270,7 @@
 <configuration status="warn" name="MyApp" packages="">
   <MapFilter onMatch="ACCEPT" onMismatch="NEUTRAL" operator="or">
     <KeyValuePair key="eventId" value="Login"/>
-    <KeyValuePari key="eventId" value="Logout"/>
+    <KeyValuePair key="eventId" value="Logout"/>
   </MapFilter>
   <appenders>
     <RollingFile name="RollingFile" fileName="logs/app.log"
@@ -309,7 +309,7 @@
     <root level="error">
       <MapFilter onMatch="ACCEPT" onMismatch="NEUTRAL" operator="or">
         <KeyValuePair key="eventId" value="Login"/>
-        <KeyValuePari key="eventId" value="Logout"/>
+        <KeyValuePair key="eventId" value="Logout"/>
       </MapFilter>
       <appender-ref ref="RollingFile">
       </appender-ref>
@@ -338,7 +338,7 @@
       <appender-ref ref="RollingFile">
         <MapFilter onMatch="ACCEPT" onMismatch="NEUTRAL" operator="or">
           <KeyValuePair key="eventId" value="Login"/>
-          <KeyValuePari key="eventId" value="Logout"/>
+          <KeyValuePair key="eventId" value="Logout"/>
         </MapFilter>
       </appender-ref>
     </root>
@@ -509,7 +509,7 @@
 <configuration status="warn" name="MyApp" packages="">
   <StructuredDataFilter onMatch="ACCEPT" onMismatch="NEUTRAL" operator="or">
     <KeyValuePair key="id" value="Login"/>
-    <KeyValuePari key="id" value="Logout"/>
+    <KeyValuePair key="id" value="Logout"/>
   </StructuredDataFilter>
   <appenders>
     <RollingFile name="RollingFile" fileName="logs/app.log"
@@ -731,7 +731,7 @@
   <appenders>
     <RollingFile name="RollingFile" fileName="logs/app.log"
                  filePattern="logs/app-%d{MM-dd-yyyy}.log.gz">
-      <TiemFilter start="05:00:00" end="05:30:00" onMatch="ACCEPT" onMismatch="DENY"/>
+      <TimeFilter start="05:00:00" end="05:30:00" onMatch="ACCEPT" onMismatch="DENY"/>
       <PatternLayout>
         <pattern>%d %p %c{1.} [%t] %m%n</pattern>
       </PatternLayout>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml Thu May 16 21:03:20 2013
@@ -25,20 +25,20 @@
     <body>
       <section name="JMX">
         <p>
-          Log4J2 has built-in support for JMX. 
+          Log4j 2 has built-in support for JMX.
           The StatusLogger, ContextSelector, and all LoggerContexts,
           LoggerConfigs and Appenders are instrumented with MBeans and can
           be remotely monitored and controlled.
         </p>
         <p>Also included is a simple client GUI that can be used to
         monitor the StatusLogger output, as well as to remotely reconfigure
-        Log4J with a different configuration file, or to edit the
+        Log4j with a different configuration file, or to edit the
         current configuration directly.
         </p>
       </section>
       <a name="Enabling_JMX" />
       <section name="Enabling JMX">
-        <p>JMX support is enabled by default. When Log4J initializes,
+        <p>JMX support is enabled by default. When Log4j initializes,
         the StatusLogger, ContextSelector, and all LoggerContexts,
           LoggerConfigs and Appenders are instrumented with MBeans.
         To disable JMX completely, and prevent these MBeans from being created,
@@ -68,58 +68,58 @@
         Monitoring and Management</a>.</p>
         </subsection>
       </section>
-		<a name="Log4J_MBeans" />
-      <section name="Log4J Instrumented Components">
+		<a name="Log4j_MBeans" />
+      <section name="Log4j Instrumented Components">
       <p>The best way to find out which methods and attributes of the various
-      Log4J components are accessible via JMX is to look at the
+      Log4j components are accessible via JMX is to look at the
       <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/jmx/package-summary.html"
       >Javadoc</a> or by exploring directly in JConsole.</p>
-      <p>The screenshot below shows the Log4J MBeans in JConsole.</p>
+      <p>The screenshot below shows the Log4j MBeans in JConsole.</p>
       <p><img src="../images/jmx-jconsole-mbeans.png" /></p>
       </section>
 		<a name="ClientGUI" />
       <section name="Client GUI">
-      <p>Log4J includes a basic client GUI that can be used to
-        monitor the StatusLogger output and to remotely modify the Log4J 
+      <p>Log4j includes a basic client GUI that can be used to
+        monitor the StatusLogger output and to remotely modify the Log4j
         configuration. The client GUI can be run as a stand-alone application
         or as a JConsole plug-in.</p>
 		<subsection name="Running the Client GUI as a JConsole Plug-in">
-		<p>To run the Log4J JMX Client GUI as a JConsole Plug-in, 
+		<p>To run the Log4j JMX Client GUI as a JConsole Plug-in,
 		start JConsole with the following command:
 		</p>
 		<p><code>$JAVA_HOME/bin/jconsole -pluginpath /path/to/log4j-core-2.0.jar:/path/to/log4j-jmx-gui-2.0.jar</code></p>
 		<p>or on Windows:</p>
 		<p><code>%JAVA_HOME%\bin\jconsole -pluginpath \path\to\log4j-core-2.0.jar;\path\to\log4j-jmx-gui-2.0.jar</code></p>
 		<p>If you execute the above command and connect to your application,
-		you will see an extra "Log4j2" tab in the JConsole window.
+		you will see an extra "Log4j 2" tab in the JConsole window.
 		This tab contains the client GUI, with the StatusLogger selected.
 		The screenshot below shows the StatusLogger panel in JConsole.
 		</p>
         <p><img src="../images/jmx-jconsole-statuslogger.png" /></p>
 		</subsection>
-		<subsection name="Remotely Editing the Log4J Configuration">
+		<subsection name="Remotely Editing the Log4j Configuration">
 		<p>The client GUI also contains a simple editor that can be used
-		to remotely change the Log4J configuration.
+		to remotely change the Log4j configuration.
 		</p><p>
 		The screenshot below shows the configuration edit panel in JConsole.
 		</p>
         <p><img src="../images/jmx-jconsole-editconfig.png" /></p>
         <p>The configuration edit panel provides two ways to modify
-        the Log4J configuration: specifying a different configuration location 
+        the Log4j configuration: specifying a different configuration location
         URI, or modifying the configuration XML directly in the editor panel.</p>
         <p>If you specify a different configuration location URI and
         click the "Reconfigure from Location" button, the specified file
         or resource must exist and be readable by the application,
         or an error will occur and the configuration will not change.
         If an error occurred while processing the contents of the specified resource,
-        Log4J will keep its original configuration, but the editor panel
+        Log4j will keep its original configuration, but the editor panel
         will show the contents of the file you specified. </p>
         <p>
         The text area showing the contents of the configuration file is 
         editable, and you can directly modify the configuration in this 
         editor panel. Clicking the "Reconfigure with XML below" button will
         send the configuration text to the remote application where it
-        will be used to reconfigure Log4J on the fly.
+        will be used to reconfigure Log4j on the fly.
         This will not overwrite any configuration file.
         Reconfiguring with text from the editor happens in memory only and
         the text is not permanently stored anywhere.
@@ -127,7 +127,7 @@
 		</subsection>
 		<a name="ClientStandAlone" />
 		<subsection name="Running the Client GUI as a Stand-alone Application">
-		<p>To run the Log4J JMX Client GUI as a stand-alone application, 
+		<p>To run the Log4j JMX Client GUI as a stand-alone application,
 		run the following command:
 		</p>
 		<p><code>$JAVA_HOME/bin/java -cp /path/to/log4j-core-2.0.jar:/path/to/log4j-jmx-gui-2.0.jar org.apache.logging.log4j.jmx.gui.ClientGUI &lt;options&gt;</code></p>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/markers.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/markers.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/markers.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/markers.xml Thu May 16 21:03:20 2013
@@ -86,7 +86,7 @@ public class MyApp {
                 <li>Markers must be unique. They are permanently registered by name so care should be taken
                   to insure that Markers used in your application are distinct from those in the application's
                   dependencies, unless that is what is desired.</li>
-                <li>Like many objects in Log4J2, Markers are immutable. If a marker has a parent, the parent
+                <li>Like many objects in Log4j 2, Markers are immutable. If a marker has a parent, the parent
                   must be named when the Marker is created and the parent cannot be changed after creation.</li>
                 <li>Markers only have a single parent. Markers can, however, have many children that reference
                   them.</li>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml Thu May 16 21:03:20 2013
@@ -59,7 +59,7 @@
               </ol>
             </p>
           </subsection>
-          <subsection name="Configuring Log4J 2">
+          <subsection name="Configuring Log4j 2">
             <p>
               Although the Log4j 2 configuration syntax is different than that of Log4j 1.x, most, if not all, of
               the same functionality is available. Below are the example configurations for Log4j 1.x and their

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/maven-artifacts.xml.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/maven-artifacts.xml.vm?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/maven-artifacts.xml.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/maven-artifacts.xml.vm Thu May 16 21:03:20 2013
@@ -25,7 +25,7 @@
   <body>
     <section name="Maven and Ivy Artifacts">
 
-      <subsection name="Using Log4J in your Apache Maven build">
+      <subsection name="Using Log4j in your Apache Maven build">
         <p>
           To build with <a href="http://maven.apache.org/">Apache Maven</a>, add the dependencies listed below to your
           <code>pom.xml</code> file.
@@ -45,7 +45,7 @@
 </dependencies>
 ]]></pre>
       </subsection>
-      <subsection name="Using Log4J in your Apache Ivy build">
+      <subsection name="Using Log4j in your Apache Ivy build">
         <p>
           To build with <a href="https://ant.apache.org/ivy/">Apache Ivy</a>, add the dependencies listed below to your
           <code>ivy.xml</code> file.

Modified: logging/log4j/log4j2/trunk/taglib/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/taglib/src/site/site.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/taglib/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/taglib/src/site/site.xml Thu May 16 21:03:20 2013
@@ -36,7 +36,7 @@
     <menu ref="reports"/>
 
 	<!-- Overall Project Info -->
-    <menu name="Log4J Project Information" img="icon-info-sign">
+    <menu name="Log4j Project Information" img="icon-info-sign">
       <item name="Dependencies" href="../dependencies.html" />
       <item name="Dependency Convergence" href="../dependency-convergence.html" />
       <item name="Dependency Management" href="../dependency-management.html" />
@@ -48,7 +48,7 @@
       <item name="Project Summary" href="../project-summary.html" />
     </menu>
 
-    <menu name="Log4J Project Reports" img="icon-cog">
+    <menu name="Log4j Project Reports" img="icon-cog">
       <item name="Changes Report" href="../changes-report.html" />
       <item name="JIRA Report" href="../jira-report.html" />
       <item name="Surefire Report" href="../surefire-report.html" />

Modified: logging/log4j/log4j2/trunk/web/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/src/site/site.xml?rev=1483567&r1=1483566&r2=1483567&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/web/src/site/site.xml Thu May 16 21:03:20 2013
@@ -36,7 +36,7 @@
     <menu ref="reports"/>
 
 	<!-- Overall Project Info -->
-    <menu name="Log4J Project Information" img="icon-info-sign">
+    <menu name="Log4j Project Information" img="icon-info-sign">
       <item name="Dependencies" href="../dependencies.html" />
       <item name="Dependency Convergence" href="../dependency-convergence.html" />
       <item name="Dependency Management" href="../dependency-management.html" />
@@ -48,7 +48,7 @@
       <item name="Project Summary" href="../project-summary.html" />
     </menu>
 
-    <menu name="Log4J Project Reports" img="icon-cog">
+    <menu name="Log4j Project Reports" img="icon-cog">
       <item name="Changes Report" href="../changes-report.html" />
       <item name="JIRA Report" href="../jira-report.html" />
       <item name="Surefire Report" href="../surefire-report.html" />



Mime
View raw message