You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by sd...@apache.org on 2013/02/28 07:57:38 UTC

svn commit: r1451117 - in /logging/log4j/log4j2/trunk: api/src/main/java/org/apache/logging/log4j/message/ api/src/main/java/org/apache/logging/log4j/simple/ api/src/main/java/org/apache/logging/log4j/status/ api/src/test/java/org/apache/logging/log4j/...

Author: sdeboy
Date: Thu Feb 28 06:57:37 2013
New Revision: 1451117

URL: http://svn.apache.org/r1451117
Log:
Fixing typo's

Modified:
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFactory.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/TimestampMessage.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusListener.java
    logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
    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/helpers/Loader.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Transform.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractJMSManager.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/CachedDateFormat.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
    logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java
    logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Level.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetter.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/ErrorHandler.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/HierarchyEventListener.java
    logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/RepositorySelector.java
    logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/apache/logging/slf4j/SLF4JLoggingException.java
    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/eventlogging.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/messages.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/thread-context.xml
    logging/log4j/log4j2/trunk/web/pom.xml

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFactory.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFactory.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/MessageFactory.java Thu Feb 28 06:57:37 2013
@@ -47,7 +47,7 @@ public interface MessageFactory {
      * Creates a new parameterized message.
      *
      * @param message
-     *            a message template, the kind of message template depends on the implementaion.
+     *            a message template, the kind of message template depends on the implementation.
      * @param params
      *            the message parameters
      * @return a new message

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/TimestampMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/TimestampMessage.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/TimestampMessage.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/TimestampMessage.java Thu Feb 28 06:57:37 2013
@@ -17,7 +17,7 @@
 package org.apache.logging.log4j.message;
 
 /**
- * Messages that use this interface will cause the timestamp in the message to be used instead of the timestmap in
+ * Messages that use this interface will cause the timestamp in the message to be used instead of the timestamp in
  * the LogEvent.
  */
 public interface TimestampMessage {

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java Thu Feb 28 06:57:37 2013
@@ -35,7 +35,7 @@ import org.apache.logging.log4j.util.Pro
  */
 public class SimpleLoggerContext implements LoggerContext {
 
-    /** The default format to use when formating dates */
+    /** The default format to use when formatting dates */
     protected static final String DEFAULT_DATE_TIME_FORMAT = "yyyy/MM/dd HH:mm:ss:SSS zzz";
 
     /** All system properties used by <code>SimpleLog</code> start with this */

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusListener.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusListener.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusListener.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/status/StatusListener.java Thu Feb 28 06:57:37 2013
@@ -17,7 +17,7 @@
 package org.apache.logging.log4j.status;
 
 /**
- * Interface that allows implementors to be notified of events in the logging system.
+ * Interface that allows implementers to be notified of events in the logging system.
  */
 public interface StatusListener {
 

Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java (original)
+++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java Thu Feb 28 06:57:37 2013
@@ -42,7 +42,7 @@ public class FormattedMessageTest {
     }
 
     @Test
-    public void tesStringtOneArg() {
+    public void tesStringOneArg() {
         final String testMsg = "Test message %1s";
         final FormattedMessage msg = new FormattedMessage(testMsg, "Apache");
         final String result = msg.getFormattedMessage();

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java Thu Feb 28 06:57:37 2013
@@ -127,9 +127,9 @@ public abstract class AbstractAppender<T
     }
 
     /**
-     * Some appenders need to propogate exceptions back to the application. When suppressException is false the
+     * Some appenders need to propagate exceptions back to the application. When suppressException is false the
      * AppenderControl will allow the exception to percolate.
-     * @return true if exceptions will be supressed, false otherwise.
+     * @return true if exceptions will be suppressed, false otherwise.
      */
     public boolean isExceptionSuppressed() {
         return handleException;

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=1451117&r1=1451116&r2=1451117&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 Feb 28 06:57:37 2013
@@ -36,7 +36,7 @@ public class DefaultConfiguration extend
      */
     public static final String DEFAULT_NAME = "Default";
     /**
-     * The System Proerty used to specify the logging level.
+     * The System Property used to specify the logging level.
      */
     public static final String DEFAULT_LEVEL = "org.apache.logging.log4j.level";
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Loader.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Loader.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Loader.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Loader.java Thu Feb 28 06:57:37 2013
@@ -113,7 +113,7 @@ public final class Loader {
         }
 
         // Last ditch attempt: get the resource from the class path. It
-        // may be the case that clazz was loaded by the Extentsion class
+        // may be the case that clazz was loaded by the Extension class
         // loader which the parent of the system class loader. Hence the
         // code below.
         LOGGER.trace("Trying to find [" + resource + "] using ClassLoader.getSystemResource().");
@@ -190,7 +190,7 @@ public final class Loader {
         }
 
         // Last ditch attempt: get the resource from the class path. It
-        // may be the case that clazz was loaded by the Extentsion class
+        // may be the case that clazz was loaded by the Extension class
         // loader which the parent of the system class loader. Hence the
         // code below.
         LOGGER.trace("Trying to find [" + resource + "] using ClassLoader.getSystemResource().");

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/OptionConverter.java Thu Feb 28 06:57:37 2013
@@ -42,7 +42,7 @@ public final class OptionConverter {
     private OptionConverter() {
     }
 
-    public static String[] concatanateArrays(final String[] l, final String[] r) {
+    public static String[] concatenateArrays(final String[] l, final String[] r) {
         final int len = l.length + r.length;
         final String[] a = new String[len];
 
@@ -245,7 +245,7 @@ public final class OptionConverter {
      * Perform variable substitution in string <code>val</code> from the
      * values of keys found in the system propeties.
      * <p/>
-     * <p>The variable substitution delimeters are <b>${</b> and <b>}</b>.
+     * <p>The variable substitution delimiters are <b>${</b> and <b>}</b>.
      * <p/>
      * <p>For example, if the System properties contains "key=value", then
      * the call
@@ -259,7 +259,7 @@ public final class OptionConverter {
      * <code>props</code> parameter is searched, if the value could not
      * be found there, then substitution defaults to the empty string.
      * <p/>
-     * <p>For example, if system propeties contains no value for the key
+     * <p>For example, if system properties contains no value for the key
      * "inexistentKey", then the call
      * <p/>
      * <pre>

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Transform.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Transform.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Transform.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Transform.java Thu Feb 28 06:57:37 2013
@@ -80,7 +80,7 @@ public final class Transform {
     }
 
     /**
-     * Ensures that embeded CDEnd strings (]]>) are handled properly
+     * Ensures that embedded CDEnd strings (]]>) are handled properly
      * within message, NDC and throwable tag text.
      *
      * @param buf StringBuffer holding the XML data to this point.  The

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StrMatcher.java Thu Feb 28 06:57:37 2013
@@ -218,10 +218,10 @@ public abstract class StrMatcher {
      * The API guarantees that <code>pos</code> is a valid index for <code>buffer</code>.
      * <p>
      * The character array may be larger than the active area to be matched.
-     * Only values in the buffer between the specifed indices may be accessed.
+     * Only values in the buffer between the specified indices may be accessed.
      * <p>
      * The matching code may check one character or many.
-     * It may check characters preceeding <code>pos</code> as well as those
+     * It may check characters preceding <code>pos</code> as well as those
      * after, so long as no checks exceed the bounds specified.
      * <p>
      * It must return zero for no match, or a positive number if a match was found.
@@ -245,7 +245,7 @@ public abstract class StrMatcher {
      * The API guarantees that <code>pos</code> is a valid index for <code>buffer</code>.
      * <p>
      * The matching code may check one character or many.
-     * It may check characters preceeding <code>pos</code> as well as those after.
+     * It may check characters preceding <code>pos</code> as well as those after.
      * <p>
      * It must return zero for no match, or a positive number if a match was found.
      * The number indicates the number of characters that matched.

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java Thu Feb 28 06:57:37 2013
@@ -131,7 +131,7 @@ public class StrSubstitutor {
      */
     private StrMatcher suffixMatcher;
     /**
-     * Variable resolution is delegated to an implementor of VariableResolver.
+     * Variable resolution is delegated to an implementer of VariableResolver.
      */
     private StrLookup variableResolver;
     /**
@@ -241,7 +241,7 @@ public class StrSubstitutor {
 
     /**
      * Replaces all the occurrences of variables in the given source object with
-     * their matching values from the map. This method allows to specifiy a
+     * their matching values from the map. This method allows to specify a
      * custom variable prefix and suffix
      *
      * @param source  the source text containing the variables to substitute, null returns null
@@ -931,7 +931,7 @@ public class StrSubstitutor {
     /**
      * Gets the variable prefix matcher currently in use.
      * <p>
-     * The variable prefix is the characer or characters that identify the
+     * The variable prefix is the character or characters that identify the
      * start of a variable. This prefix is expressed in terms of a matcher
      * allowing advanced prefix matches.
      *
@@ -944,7 +944,7 @@ public class StrSubstitutor {
     /**
      * Sets the variable prefix matcher currently in use.
      * <p>
-     * The variable prefix is the characer or characters that identify the
+     * The variable prefix is the character or characters that identify the
      * start of a variable. This prefix is expressed in terms of a matcher
      * allowing advanced prefix matches.
      *
@@ -977,7 +977,7 @@ public class StrSubstitutor {
     /**
      * Sets the variable prefix to use.
      * <p>
-     * The variable prefix is the characer or characters that identify the
+     * The variable prefix is the character or characters that identify the
      * start of a variable. This method allows a string prefix to be easily set.
      *
      * @param prefix  the prefix for variables, not null
@@ -996,7 +996,7 @@ public class StrSubstitutor {
     /**
      * Gets the variable suffix matcher currently in use.
      * <p>
-     * The variable suffix is the characer or characters that identify the
+     * The variable suffix is the character or characters that identify the
      * end of a variable. This suffix is expressed in terms of a matcher
      * allowing advanced suffix matches.
      *
@@ -1009,7 +1009,7 @@ public class StrSubstitutor {
     /**
      * Sets the variable suffix matcher currently in use.
      * <p>
-     * The variable suffix is the characer or characters that identify the
+     * The variable suffix is the character or characters that identify the
      * end of a variable. This suffix is expressed in terms of a matcher
      * allowing advanced suffix matches.
      *
@@ -1028,7 +1028,7 @@ public class StrSubstitutor {
     /**
      * Sets the variable suffix to use.
      * <p>
-     * The variable suffix is the characer or characters that identify the
+     * The variable suffix is the character or characters that identify the
      * end of a variable. This method allows a single character suffix to
      * be easily set.
      *

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractJMSManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractJMSManager.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractJMSManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractJMSManager.java Thu Feb 28 06:57:37 2013
@@ -100,7 +100,7 @@ public abstract class AbstractJMSManager
             if (providerURL != null) {
                 props.put(Context.PROVIDER_URL, providerURL);
             } else {
-                LOGGER.warn("The InitalContext factory name has been provided without a ProviderURL. " +
+                LOGGER.warn("The InitialContext factory name has been provided without a ProviderURL. " +
                     "This is likely to cause problems");
             }
             if (urlPkgPrefixes != null) {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/CachedDateFormat.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/CachedDateFormat.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/CachedDateFormat.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/CachedDateFormat.java Thu Feb 28 06:57:37 2013
@@ -104,7 +104,7 @@ final class CachedDateFormat extends Dat
     private int millisecondStart;
 
     /**
-     * Integral second preceding the previous convered Date.
+     * Integral second preceding the previous converted Date.
      */
     private long slotBegin;
 
@@ -313,7 +313,7 @@ final class CachedDateFormat extends Dat
     /**
      * Formats a count of milliseconds (0-999) into a numeric representation.
      *
-     * @param millis Millisecond coun between 0 and 999.
+     * @param millis Millisecond count between 0 and 999.
      * @param buf    String buffer, may not be null.
      * @param offset Starting position in buffer, the length of the
      *               buffer must be at least offset + 3.

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java Thu Feb 28 06:57:37 2013
@@ -156,7 +156,7 @@ public final class HighlightConverter ex
             if (STYLE_KEY.equalsIgnoreCase(key)) {
                 final EnumMap<Level, String> enumMap = STYLES.get(value.toUpperCase(Locale.ENGLISH));
                 if (enumMap == null) {
-                    LOGGER.error("Unkown level style: " + value + ". Use one of " +
+                    LOGGER.error("Unknown level style: " + value + ". Use one of " +
                         Arrays.toString(STYLES.keySet().toArray()));
                 } else {
                     levelStyles.putAll(enumMap);
@@ -164,7 +164,7 @@ public final class HighlightConverter ex
             } else {
                 final Level level = Level.valueOf(key);
                 if (level == null) {
-                    LOGGER.error("Unkown level name: " + key + ". Use one of " +
+                    LOGGER.error("Unknown level name: " + key + ". Use one of " +
                         Arrays.toString(DEFAULT_STYLES.keySet().toArray()));
                 } else {
                     levelStyles.put(level, value);

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java Thu Feb 28 06:57:37 2013
@@ -176,7 +176,7 @@ public abstract class NameAbbreviator {
         @Override
         public String abbreviate(final String buf) {
 
-            // We substract 1 from 'len' when assigning to 'end' to avoid out of
+            // We subtract 1 from 'len' when assigning to 'end' to avoid out of
             // bounds exception in return r.substring(end+1, len). This can happen if
             // precision is 1 and the category name ends with a dot.
             int end = buf.length() - 1;

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java Thu Feb 28 06:57:37 2013
@@ -191,7 +191,7 @@ public class SimpleSmtpServer implements
             final SmtpResponse response = request.execute();
             // Move to next internal state
             smtpState = response.getNextState();
-            // Send reponse to client
+            // Send response to client
             sendResponse(out, response);
 
             // Store input in message

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java Thu Feb 28 06:57:37 2013
@@ -95,7 +95,7 @@ public class FailoverAppenderTest {
         Thread.sleep(1100);
         onceLogger.error("Fail after recovery interval");
         events = app.getEvents();
-        assertTrue("Did not recoever", events.size() == 0);
+        assertTrue("Did not recover", events.size() == 0);
         events = foApp.getEvents();
         assertTrue("No events in primary appender", events.size() == 1);
     }

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java Thu Feb 28 06:57:37 2013
@@ -85,7 +85,7 @@ public class PatternParserTest {
     }
 
     /**
-     * Test the custome pattern
+     * Test the custom pattern
      */
     @Test
     public void testCustomPattern() {

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java Thu Feb 28 06:57:37 2013
@@ -108,7 +108,7 @@ public final class FlumeAppender extends
      * Create a Flume Avro Appender.
      * @param agents An array of Agents.
      * @param properties Properties to pass to the embedded agent.
-     * @param embedded true if the embedded agent manager should be used. otherwise the Avro mangaer will be used.
+     * @param embedded true if the embedded agent manager should be used. otherwise the Avro manager will be used.
      * @param dataDir The directory where the Flume FileChannel should write its data.
      * @param delay The amount of time in milliseconds to wait between retries.
      * @param agentRetries The number of times to retry an agent before failing to the next agent.

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java Thu Feb 28 06:57:37 2013
@@ -64,7 +64,7 @@ public class FlumeAvroManager extends Ab
      * Constructor
      * @param name The unique name of this manager.
      * @param agents An array of Agents.
-     * @param batchSize The number of evetns to include in a batch.
+     * @param batchSize The number of events to include in a batch.
      */
     protected FlumeAvroManager(final String name, final String shortName, final Agent[] agents, final int batchSize) {
         super(name);

Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeConfigurationBuilder.java Thu Feb 28 06:57:37 2013
@@ -274,7 +274,7 @@ public class FlumeConfigurationBuilder {
                 conf.getSinkRunners().put(comp.getComponentName(), new SinkRunner(group.getProcessor()));
             }
         }
-        // add any unasigned sinks to solo collectors
+        // add any unassigned sinks to solo collectors
         for (final Map.Entry<String, Sink> entry : sinks.entrySet()) {
             if (!usedSinks.containsValue(entry.getKey())) {
                 final SinkProcessor pr = new DefaultSinkProcessor();

Modified: logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java Thu Feb 28 06:57:37 2013
@@ -163,7 +163,7 @@ public class FlumeAppenderTest {
         eventLogger.addAppender(avroAppender);
         eventLogger.setLevel(Level.ALL);
 
-        final StructuredDataMessage msg = new StructuredDataMessage("Transer", "Success", "Audit");
+        final StructuredDataMessage msg = new StructuredDataMessage("Tranfser", "Success", "Audit");
         msg.put("memo", "This is a memo");
         msg.put("acct", "12345");
         msg.put("amount", "100.00");
@@ -266,7 +266,7 @@ public class FlumeAppenderTest {
         try {
             avroLogger.info("message 1");
         } catch (final Throwable t) {
-            //logger.debug("Logging to a non-existant server failed (as expected)", t);
+            //logger.debug("Logging to a non-existent server failed (as expected)", t);
 
             caughtException = true;
         }

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Level.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Level.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Level.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/Level.java Thu Feb 28 06:57:37 2013
@@ -240,14 +240,14 @@ public class Level extends Priority impl
 
     /**
      * Resolved deserialized level to one of the stock instances.
-     * May be overriden in classes derived from Level.
+     * May be overridden in classes derived from Level.
      *
      * @return resolved object.
      * @throws ObjectStreamException if exception during resolution.
      */
     protected Object readResolve() throws ObjectStreamException {
         //
-        //  if the deserizalized object is exactly an instance of Level
+        //  if the deserialized object is exactly an instance of Level
         //
         if (getClass() == Level.class) {
             return toLevel(level);

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetter.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetter.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/config/PropertySetter.java Thu Feb 28 06:57:37 2013
@@ -27,7 +27,7 @@ public class PropertySetter {
 
     /**
      * Create a new PropertySetter for the specified Object. This is done
-     * in prepartion for invoking {@link #setProperty} one or more times.
+     * in preparation for invoking {@link #setProperty} one or more times.
      *
      * @param obj  the object for which to set properties
      */
@@ -48,7 +48,7 @@ public class PropertySetter {
 
 
     /**
-     * Set the properites for the object that match the <code>prefix</code> passed as parameter.
+     * Set the properties for the object that match the <code>prefix</code> passed as parameter.
      */
     public void setProperties(final Properties properties, final String prefix) {
     }

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/ErrorHandler.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/ErrorHandler.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/ErrorHandler.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/ErrorHandler.java Thu Feb 28 06:57:37 2013
@@ -64,8 +64,8 @@ public interface ErrorHandler {
     /**
      * This method is invoked to handle the error.
      *
-     * @param message   The message assoicated with the error.
-     * @param e         The Exption that was thrown when the error occured.
+     * @param message   The message associated with the error.
+     * @param e         The Exception that was thrown when the error occurred.
      * @param errorCode The error code associated with the error.
      * @param event     The logging event that the failing appender is asked
      *                  to log.
@@ -82,7 +82,7 @@ public interface ErrorHandler {
     void setAppender(Appender appender);
 
     /**
-     * Set the appender to falkback upon in case of failure.
+     * Set the appender to fallback upon in case of failure.
      *
      * @since 1.2
      */

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/HierarchyEventListener.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/HierarchyEventListener.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/HierarchyEventListener.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/HierarchyEventListener.java Thu Feb 28 06:57:37 2013
@@ -20,7 +20,7 @@ import org.apache.log4j.Appender;
 import org.apache.log4j.Category;
 
 /**
- Listen to events occuring within a Hierarchy.
+ Listen to events occurring within a Hierarchy.
 
  @since 1.2
 

Modified: logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/RepositorySelector.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/RepositorySelector.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/RepositorySelector.java (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/src/main/java/org/apache/log4j/spi/RepositorySelector.java Thu Feb 28 06:57:37 2013
@@ -35,7 +35,7 @@ public interface RepositorySelector {
 
     /**
      * Returns a {@link org.apache.log4j.spi.LoggerRepository} depending on the
-     * context. Implementors must make sure that a valid (non-null)
+     * context. Implementers must make sure that a valid (non-null)
      * LoggerRepository is returned.
      * @return a LoggerRepository.
      */

Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/apache/logging/slf4j/SLF4JLoggingException.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/apache/logging/slf4j/SLF4JLoggingException.java?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/apache/logging/slf4j/SLF4JLoggingException.java (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/src/main/java/org/apache/logging/slf4j/SLF4JLoggingException.java Thu Feb 28 06:57:37 2013
@@ -17,7 +17,7 @@
 package org.apache.logging.slf4j;
 
 /**
- * Exception thrown when the SLF4J apapter encounters a problem.
+ * Exception thrown when the SLF4J adapter encounters a problem.
  *
  */
 public class SLF4JLoggingException extends RuntimeException {

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=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/appenders.xml Thu Feb 28 06:57:37 2013
@@ -286,7 +286,7 @@
               <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>

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=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml Thu Feb 28 06:57:37 2013
@@ -45,7 +45,7 @@
           developer-chosen criteria.
         </p>
         <p>In Log4j 1.x the Logger Hierarchy was maintained through a relationship between Loggers.
-          In Log4j 2 this relationship no longers exists. Instead, the hierarchy is maintained
+          In Log4j 2 this relationship no longer exists. Instead, the hierarchy is maintained
           in the relationship between LoggerConfig objects.
         </p>
 
@@ -84,7 +84,7 @@
           <a href="../log4j-api/apidocs/org/apache/logging/log4j/LogManager.html#getLogger(java.lang.String)">
             LogManager.getLogger
           </a>
-          static method and passing the name of the desired Logger. Further informaiton on the Logging
+          static method and passing the name of the desired Logger. Further information on the Logging
           API can be found at<a href="../log4j-api/api.html">Log4j 2 API</a>.
         </p>
         <h4>LoggerContext</h4>
@@ -100,7 +100,7 @@
           <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/config/Configuration.html">
             Configuration</a>.
           The Configuration contains all the Appenders,
-          context-wide Filtes, LoggerConfigs and contains the reference to the StrSubstitutor. During
+          context-wide Filters, LoggerConfigs and contains the reference to the StrSubstitutor. During
           reconfiguration two Configuration objects will exist. Once all Loggers have been redirected to
           the new Configuration, the old Configuration will be stopped and discarded.
         </p>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/eventlogging.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/eventlogging.xml?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/eventlogging.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/eventlogging.xml Thu Feb 28 06:57:37 2013
@@ -27,7 +27,7 @@
           <a name="EventLogging"/>
           <subsection name="Event Logging">
             <p>
-              The EventLogger class provides a simple mechansim for logging events that occur in an application.
+              The EventLogger class provides a simple mechanism for logging events that occur in an application.
               While the EventLogger is useful as a way of initiating events that should be processed by an audit
               Logging system, by itself it does not implement any of the features an audit logging system would require
               such as guaranteed delivery.

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/flowtracing.xml Thu Feb 28 06:57:37 2013
@@ -34,7 +34,7 @@
               <ul>
                 <li>aid in problem diagnosis in development without requiring a debug session</li>
                 <li>aid in problem diagnosis in production where no debugging is possible</li>
-                <li>help educate new deveopers in learning the application.</li>
+                <li>help educate new developers in learning the application.</li>
               </ul>
             </p>
             <p>
@@ -53,19 +53,19 @@
             </p>
             <p>
               The throwing() method can be used by an application when it is throwing an exception that is
-              unlikely to be handled, such as a RuntimeExcpetion. This will insure that proper diagnostics
+              unlikely to be handled, such as a RuntimeException. This will insure that proper diagnostics
               are available if needed. The logging event generated will have a level of ERROR and will have
               an associated Marker with a name of "THROWING" which is also an "EXCEPTION" Marker.
             </p>
             <p>
               The catching() method can be used by an application when it catches an Exception that it is not
-              going to rethrow, either explicitely or attached to another Exception. The logging event generated
+              going to rethrow, either explicitly or attached to another Exception. The logging event generated
               will have a level of ERROR and will have an associated Marker with a name of "CATCHING" which is
               also an "EXCEPTION" Marker.
             </p>
             <p>
               The following example shows a simple application using these methods in a fairly typcial manner. The
-              throwing() is not present since no Exceptions are explicitely thrown and not handled.
+              throwing() is not present since no Exceptions are explicitly thrown and not handled.
             </p>
 <pre class="prettyprint linenums">
 package com.test;

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml Thu Feb 28 06:57:37 2013
@@ -45,7 +45,7 @@
           multithreaded applications and distributed applications at large.</p>
 
           <p>Experience indicates that logging was an important component of the
-          development cycle. It offeres several advantages. It provides precise
+          development cycle. It offers several advantages. It provides precise
           <em>context</em> about a run of the application. Once inserted into
           the code, the generation of logging output requires no human
           intervention.  Moreover, log output can be saved in persistent medium

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/messages.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/messages.xml?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/messages.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/messages.xml Thu Feb 28 06:57:37 2013
@@ -27,7 +27,7 @@
       <a name="Messages"/>
       <subsection name="Messages">
         <p>
-          Although Log4j 2 provides Logger methods that accept Strings and Objects, all of these are ulitmately
+          Although Log4j 2 provides Logger methods that accept Strings and Objects, all of these are ultimately
           captured in Message objects that are then associated with the log event. Applications are free to
           construct Messages of their own and pass them to the Logger. Although it may seem more expensive than
           passing the message format and parameters directly to the event, testing has shown that with modern

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=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml Thu Feb 28 06:57:37 2013
@@ -44,7 +44,7 @@
               made.
               <ol>
                 <li>Calls to Logger.getLogger must be modified to LogManager.getLogger.</li>
-                <li>Calls to Logger.getRootLogger or LogManager.getRootLogger must be replaced woth
+                <li>Calls to Logger.getRootLogger or LogManager.getRootLogger must be replaced with
                   LogManager.getLogger("").</li>
                 <li>Calls to LogManager.getLogger that accept a LoggerFactory must remove the LoggerFactory and
                   use one of Log4j 2's other extension mechanisms.</li>

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/thread-context.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/thread-context.xml?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/thread-context.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/thread-context.xml Thu Feb 28 06:57:37 2013
@@ -30,7 +30,7 @@
           <p>Log4j introduced the concept of the Mapped Diagnostic Context or MDC. It has been documented and
             discussed in numerous places including
             <a href="http://veerasundar.com/blog/2009/10/log4j-mdc-mapped-diagnostic-context-what-and-why/">Log4j MDC: What and Why</a> and
-            <a href="http://blog.f12.no/wp/2004/12/09/log4j-and-the-mapped-diagnostic-context/">Log4j and the Mappend Diagnostic Context</a>.
+            <a href="http://blog.f12.no/wp/2004/12/09/log4j-and-the-mapped-diagnostic-context/">Log4j and the Mapped Diagnostic Context</a>.
             In addition, Log4j 1.x provides support for a Nested Diagnostic Context or NDC. It too has been documented
             and discussed in various places such as
             <a href="http://lstierneyltd.com/blog/development/log4j-nested-diagnostic-contexts-ndc/">Log4j NDC</a>.
@@ -44,7 +44,7 @@
           </p>
           <h4>Fish Tagging</h4>
           <p>Most real-world systems have to deal with multiple clients simultaneously. In a typical multithreaded
-            implementation of such asystem, different threads will handle different clients. Logging is
+            implementation of such a system, different threads will handle different clients. Logging is
             especially well suited to trace and debug complex distributed applications. A common approach to
             differentiate the logging output of one client from another is to instantiate a new separate logger for
             each client. This promotes the proliferation of loggers and increases the management overhead of logging.

Modified: logging/log4j/log4j2/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/pom.xml?rev=1451117&r1=1451116&r2=1451117&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/pom.xml (original)
+++ logging/log4j/log4j2/trunk/web/pom.xml Thu Feb 28 06:57:37 2013
@@ -27,7 +27,7 @@
   <artifactId>log4j-web</artifactId>
   <packaging>jar</packaging>
   <name>Log4j Web Adapters</name>
-  <description>Log4j Adpaters for Web Applications</description>
+  <description>Log4j Adapters for Web Applications</description>
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Log4j Web Application Documentation</docLabel>