You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/10/17 10:03:44 UTC
[2/2] logging-log4j2 git commit: LOG4J2-1156 2.4.1 web site
corrections and updates
LOG4J2-1156 2.4.1 web site corrections and updates
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f5878ea3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f5878ea3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f5878ea3
Branch: refs/heads/master
Commit: f5878ea3a3dfa6274da961fb1ad7bc4508f685df
Parents: dfe777f
Author: rpopma <rp...@apache.org>
Authored: Sat Oct 17 17:03:37 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Oct 17 17:03:37 2015 +0900
----------------------------------------------------------------------
log4j-core/src/site/xdoc/index.xml | 2 +-
src/changes/changes.xml | 3 ++
src/site/resources/images/whichjar-2.x.png | Bin 0 -> 68381 bytes
.../resources/images/whichjar-slf4j-2.x.png | Bin 0 -> 26650 bytes
src/site/resources/images/whichjar.xlsx | Bin 14687 -> 14681 bytes
src/site/site.xml | 17 +++++-----
src/site/xdoc/faq.xml | 12 ++++---
src/site/xdoc/manual/api.xml | 19 ++++++-----
src/site/xdoc/manual/appenders.xml | 2 +-
src/site/xdoc/manual/architecture.xml | 2 +-
src/site/xdoc/manual/configuration.xml.vm | 33 ++++++++++++-------
src/site/xdoc/manual/customconfig.xml | 3 +-
src/site/xdoc/manual/extending.xml | 3 +-
src/site/xdoc/manual/index.xml | 8 ++---
src/site/xdoc/manual/layouts.xml.vm | 2 +-
src/site/xdoc/manual/plugins.xml | 4 +--
src/site/xdoc/runtime-dependencies.xml | 2 +-
17 files changed, 66 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/log4j-core/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/site/xdoc/index.xml b/log4j-core/src/site/xdoc/index.xml
index c247785..ccb6208 100644
--- a/log4j-core/src/site/xdoc/index.xml
+++ b/log4j-core/src/site/xdoc/index.xml
@@ -57,7 +57,7 @@
<li>The NoSQL Appender with Apache CouchDB provider requires the LightCouch CouchDB client library.</li>
<li>The NoSQL Appender can be customized with a user-supplied provider, which will require the
appropriate client library.</li>
- <li>bzip2, Deflate, Pack200, and XZ compression on rollover requires
+ <li>Bzip2, Deflate, Pack200, and XZ compression on rollover requires
<a href="http://commons.apache.org/proper/commons-compress/">Apache Commons Compress</a>. In addition,
XZ requires <a href="http://tukaani.org/xz/java.html">XZ for Java</a>.</li>
<li>The CSV layout requires the <a href="https://commons.apache.org/proper/commons-csv/">Apache Commons CSV</a> library.</li>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 14e16b7..f383acb 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,9 @@
</properties>
<body>
<release version="2.5" date="2015-MM-DD" description="GA Release 2.5">
+ <action issue="LOG4J2-1156" dev="rpopma" type="fix">
+ Web site corrections and updates.
+ </action>
<action issue="LOG4J2-1158" dev="ggregory" type="fix" due-to="Michael Fortin, Gary Gregory">
Log4J JUL adapter is using MessageFormat on String passed by java.util.function.Supplier<String>.
</action>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/resources/images/whichjar-2.x.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/whichjar-2.x.png b/src/site/resources/images/whichjar-2.x.png
new file mode 100644
index 0000000..e72a78f
Binary files /dev/null and b/src/site/resources/images/whichjar-2.x.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/resources/images/whichjar-slf4j-2.x.png
----------------------------------------------------------------------
diff --git a/src/site/resources/images/whichjar-slf4j-2.x.png b/src/site/resources/images/whichjar-slf4j-2.x.png
new file mode 100644
index 0000000..b42fb27
Binary files /dev/null and b/src/site/resources/images/whichjar-slf4j-2.x.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/resources/images/whichjar.xlsx
----------------------------------------------------------------------
diff --git a/src/site/resources/images/whichjar.xlsx b/src/site/resources/images/whichjar.xlsx
index d3629b0..6847bca 100644
Binary files a/src/site/resources/images/whichjar.xlsx and b/src/site/resources/images/whichjar.xlsx differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 0618a01..e6cb6e8 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -72,6 +72,7 @@
<item name="Configuring Appenders" href="/manual/configuration.html#Appenders"/>
<item name="Configuring Filters" href="/manual/configuration.html#Filters"/>
<item name="Property Substitution" href="/manual/configuration.html#PropertySubstitution"/>
+ <item name="Lookup Variables" href="/manual/configuration.html#RuntimeLookup"/>
<item name="Scripts" href="/manual/configuration.html#Scripts"/>
<item name="XInclude" href="/manual/configuration.html#XInclude"/>
<item name="Status Messages" href="/manual/configuration.html#StatusMessages"/>
@@ -88,14 +89,6 @@
<item name="Asynchronous Requests" href="/manual/webapp.html#Async" />
</item>
- <item name="Plugins" href="/manual/plugins.html" collapse="true">
- <item name="Core" href="/manual/plugins.html#Core"/>
- <item name="Converters" href="/manual/plugins.html#Converters"/>
- <item name="Key Providers" href="/manual/plugins.html#KeyProviders"/>
- <item name="Lookups" href="/manual/plugins.html#Lookups"/>
- <item name="Preloading" href="/manual/plugins.html#Plugin_Preloading"/>
- </item>
-
<item name="Lookups" href="/manual/lookups.html" collapse="true">
<item name="Context Map" href="/manual/lookups.html#ContextMapLookup"/>
<item name="Date" href="/manual/lookups.html#DateLookup"/>
@@ -188,6 +181,14 @@
<item name="Custom Plugins" href="/manual/extending.html#Custom_Plugins"/>
</item>
+ <item name="Plugins" href="/manual/plugins.html" collapse="true">
+ <item name="Core" href="/manual/plugins.html#Core"/>
+ <item name="Converters" href="/manual/plugins.html#Converters"/>
+ <item name="Key Providers" href="/manual/plugins.html#KeyProviders"/>
+ <item name="Lookups" href="/manual/plugins.html#Lookups"/>
+ <item name="Preloading" href="/manual/plugins.html#Plugin_Preloading"/>
+ </item>
+
<item name="Programmatic Log4j Configuration" href="/manual/customconfig.html" collapse="true">
<item name="ConfigurationBuilder API" href="/manual/customconfig.html#ConfigurationBuilder"/>
<item name="Understanding ConfigurationFactory" href="/manual/customconfig.html#ConfigurationFactory"/>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/xdoc/faq.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/faq.xml b/src/site/xdoc/faq.xml
index 6491624..12f6290 100644
--- a/src/site/xdoc/faq.xml
+++ b/src/site/xdoc/faq.xml
@@ -41,13 +41,13 @@
<subsection>
<a name="which_jars" />
<h4>Which JAR files do I need?</h4>
- <p>You need at least the log4j-api-2.4 and the log4j-core-2.4 jar files.</p>
+ <p>You need at least the log4j-api-2.x and the log4j-core-2.x jar files.</p>
<p>The other jars are necessary if your application calls the API
of another logging framework and you want to route logging calls to the Log4j 2 implementation.</p>
- <p><img src="images/whichjar-2.1.png" alt="Diagram showing which JARs correspond to which systems" /></p>
+ <p><img src="images/whichjar-2.x.png" alt="Diagram showing which JARs correspond to which systems" /></p>
<p>You can use the log4j-to-slf4j adapter jar when your application calls the Log4j 2 API and you
want to route logging calls to a SLF4J implementation.</p>
- <p><img src="images/whichjar-slf4j-2.1.png" alt="Diagram showing the dependency flow to use Log4j 2 API with SLF4J" /></p>
+ <p><img src="images/whichjar-slf4j-2.x.png" alt="Diagram showing the dependency flow to use Log4j 2 API with SLF4J" /></p>
<p>Some of the Log4j components have features with optional dependencies.
The component page will have more detail.
For example, the <a href="log4j-core/index.html">log4j-core component page</a>
@@ -62,8 +62,10 @@
<a name="config_from_code" />
<h4>How do I configure log4j2 in code without a configuration file?</h4>
- <p>Starting with version 2.4, Log4j 2 provides an [API for programmatic configuration|manual/customconfig.html].
- The new ConfigurationBuilder API allows you to create Configurations in code by constructing component definitions
+ <p>Starting with version 2.4, Log4j 2 provides an <a href="manual/customconfig.html">API
+ for programmatic configuration</a>.
+ The new <a href="log4j-core/apidocs/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.html">ConfigurationBuilder
+ API</a> allows you to create Configurations in code by constructing component definitions
without requiring you to know about the internals of actual configuration objects like Loggers and Appenders.</p>
<a name="reconfig_from_code" />
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/xdoc/manual/api.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/api.xml b/src/site/xdoc/manual/api.xml
index 9502c80..15dc6df 100644
--- a/src/site/xdoc/manual/api.xml
+++ b/src/site/xdoc/manual/api.xml
@@ -78,7 +78,7 @@ public class HelloWorld {
</p>
<h4>Formatting Parameters</h4>
<p>
- Substituting parameters leaves formatting up to you if <code>toString()</code> is not what you want.
+ Formatter Loggers leave formatting up to you if <code>toString()</code> is not what you want.
To facilitate formatting, you can use the same format strings as Java's
<a href="http://docs.oracle.com/javase/6/docs/api/java/util/Formatter.html#syntax">Formatter</a>.
For example:
@@ -93,7 +93,7 @@ logger.debug("Long.MAX_VALUE = %,d", Long.MAX_VALUE);
<p>
To use a formatter Logger, you must call one of the LogManager
<a href="../log4j-api/apidocs/org/apache/logging/log4j/LogManager.html#getFormatterLogger(java.lang.Class)">getFormatterLogger</a>
- method. The output for this example shows that Calendar toString() is verbose compared to custom formatting:
+ methods. The output for this example shows that Calendar toString() is verbose compared to custom formatting:
</p>
<pre class="prettyprint linenums">2012-12-12 11:56:19,633 [main] DEBUG: User John Smith with birthday java.util.GregorianCalendar[time=?,areFieldsSet=false,areAllFieldsSet=false,lenient=true,zone=sun.util.calendar.ZoneInfo[id="America/New_York",offset=-18000000,dstSavings=3600000,useDaylight=true,transitions=235,lastRule=java.util.SimpleTimeZone[id=America/New_York,offset=-18000000,dstSavings=3600000,useDaylight=true,startYear=0,startMode=3,startMonth=2,startDay=8,startDayOfWeek=1,startTime=7200000,startTimeMode=0,endMode=3,endMonth=10,endDay=1,endDayOfWeek=1,endTime=7200000,endTimeMode=0]],firstDayOfWeek=1,minimalDaysInFirstWeek=1,ERA=?,YEAR=1995,MONTH=4,WEEK_OF_YEAR=?,WEEK_OF_MONTH=?,DAY_OF_MONTH=23,DAY_OF_YEAR=?,DAY_OF_WEEK=?,DAY_OF_WEEK_IN_MONTH=?,AM_PM=0,HOUR=0,HOUR_OF_DAY=0,MINUTE=0,SECOND=0,MILLISECOND=?,ZONE_OFFSET=?,DST_OFFSET=?]
2012-12-12 11:56:19,643 [main] DEBUG: User John Smith with birthday 05 23, 1995
@@ -118,7 +118,7 @@ logger.printf(Level.INFO, "Logging in user %1$s with birthday %2$tm %2$te,%2$tY"
<a name="LambdaSupport"/>
<h4>Java 8 lambda support for lazy logging</h4>
<p>
- In release 2.4, the <code>Logger</code> interface adds support for lambda expressions.
+ In release 2.4, the <code>Logger</code> interface added support for lambda expressions.
This allows client code to lazily log messages without explicitly checking if the requested log
level is enabled. For example, previously you would write:
</p>
@@ -143,21 +143,24 @@ logger.trace("Some long-running operation returned {}", () -> expensiv
org.apache.logging.appender and org.apache.logging.filter both have org.apache.logging as their parent.
In most cases, applications name their loggers by passing the current class's name to
LogManager.getLogger. Because this usage is so common, Log4j 2 provides that as the default when
- the logger name parameter is either omitted or is null. For example, in both examples below the Logger will
+ the logger name parameter is either omitted or is null. For example, in all examples below the Logger will
have a name of "org.apache.test.MyTest".
</p>
<pre class="prettyprint linenums">package org.apache.test;
public class MyTest {
+ private static final Logger logger = LogManager.getLogger(MyTest.class);
+}</pre>
+ <pre class="prettyprint linenums">package org.apache.test;
+
+public class MyTest {
private static final Logger logger = LogManager.getLogger(MyTest.class.getName());
-}
- </pre>
+}</pre>
<pre class="prettyprint linenums">package org.apache.test;
public class MyTest {
private static final Logger logger = LogManager.getLogger();
-}
- </pre>
+}</pre>
</subsection>
</section>
</body>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/xdoc/manual/appenders.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/appenders.xml b/src/site/xdoc/manual/appenders.xml
index b9346b6..81c6ae2 100644
--- a/src/site/xdoc/manual/appenders.xml
+++ b/src/site/xdoc/manual/appenders.xml
@@ -2106,7 +2106,7 @@ public class JpaLogEntity extends AbstractLogEventWrapperEntity {
dependent on the RolloverPolicy that is used. The DefaultRolloverPolicy will accept both
a date/time pattern compatible with
<a href="http://download.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a>
- and and/or a %i which represents an integer counter. The pattern also supports interpolation at
+ and/or a %i which represents an integer counter. The pattern also supports interpolation at
runtime so any of the Lookups (such as the <a href="./lookups.html#DateLookup">DateLookup</a> can
be included in the pattern.</td>
</tr>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/xdoc/manual/architecture.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/architecture.xml b/src/site/xdoc/manual/architecture.xml
index 1657e21..524e031 100644
--- a/src/site/xdoc/manual/architecture.xml
+++ b/src/site/xdoc/manual/architecture.xml
@@ -580,7 +580,7 @@ Logger y = LogManager.getLogger("wombat");
More than one Appender can be attached to a Logger.
</p>
<p>An Appender can be added to a Logger by calling the
- <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/config/Configuration.html#addLoggerAppender(org.apache.logging.log4j.core.Logger, org.apache.logging.log4j.core.Appender)">addLoggerAppender</a>
+ <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/config/Configuration.html#addLoggerAppender(org.apache.logging.log4j.core.Logger,%20org.apache.logging.log4j.core.Appender)">addLoggerAppender</a>
method of the current Configuration. If a LoggerConfig matching the name of the Logger does
not exist, one will be created, the Appender will be attached to it and then all Loggers
will be notified to update their LoggerConfig references.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/xdoc/manual/configuration.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/configuration.xml.vm b/src/site/xdoc/manual/configuration.xml.vm
index 44d1491..cf88657 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -44,7 +44,7 @@
Configuration of Log4j 2 can be accomplished in 1 of 4 ways:
</p>
<ol>
- <li>Through a configuration file written in XML, JSON, or YAML.</li>
+ <li>Through a configuration file written in XML, JSON, YAML, or properties format.</li>
<li>Programmatically, by creating a ConfigurationFactory and Configuration implementation.</li>
<li>Programmatically, by calling the APIs exposed in the Configuration interface to add
components to the default configuration.</li>
@@ -52,7 +52,8 @@
</ol>
<p>
This page focuses primarily on configuring Log4j through a configuration file. Information on
- programmatically configuring Log4j can be found at <a href="./extending.html">Extending Log4j 2</a>.
+ programmatically configuring Log4j can be found at <a href="./extending.html">Extending Log4j 2</a>
+ and <a href="customconfig.html">Programmatic Log4j Configuration</a>.
</p>
<p>
Note that unlike Log4j 1.x, the public Log4j 2 API does not expose methods to add, modify or remove
@@ -62,21 +63,25 @@
<subsection name="Automatic Configuration">
<p>
Log4j has the ability to automatically configure itself during initialization.
- When Log4j starts it will locate all the ConfigurationFactory plugins and arrange then in weighted
- order from highest to lowest. As delivered, Log4j contains three ConfigurationFactory implementations:
- one for JSON, one for YAML, and one for XML.
+ When Log4j starts it will locate all the ConfigurationFactory plugins and arrange them in weighted
+ order from highest to lowest. As delivered, Log4j contains four ConfigurationFactory implementations:
+ one for JSON, one for YAML, one for properties, and one for XML.
</p>
<ol>
<li>Log4j will inspect the <code>"log4j.configurationFile"</code> system property and, if set, will attempt to
load the configuration using the <code>ConfigurationFactory</code> that matches the file
extension.</li>
- <li>If no system property is set the YAML ConfigurationFactory will look for
+ <li>If no system property is set the properties ConfigurationFactory will look for
+ <code>log4j2-test.properties</code> in the classpath.</li>
+ <li>If no such file is found the YAML ConfigurationFactory will look for
<code>log4j2-test.yaml</code> or <code>log4j2-test.yml</code> in the classpath.</li>
<li>If no such file is found the JSON ConfigurationFactory will look for
<code>log4j2-test.json</code> or <code>log4j2-test.jsn</code> in the classpath.</li>
<li>If no such file is found the XML ConfigurationFactory will look for
<code>log4j2-test.xml</code> in the classpath.</li>
- <li>If a test file cannot be located the YAML ConfigurationFactory will look for
+ <li>If a test file cannot be located the properties ConfigurationFactory will look for
+ <code>log4j2.properties</code> on the classpath.</li>
+ <li>If a properties file cannot be located the YAML ConfigurationFactory will look for
<code>log4j2.yaml</code> or <code>log4j2.yml</code> on the classpath.</li>
<li>If a YAML file cannot be located the JSON ConfigurationFactory will look for
<code>log4j2.json</code> or <code>log4j2.jsn</code> on the classpath.</li>
@@ -190,6 +195,9 @@ public class Bar {
<p>
Note that status logging is disabled when the default configuration is used.
</p>
+ </subsection>
+ <a name="Additivity"/>
+ <subsection name="Additivity">
<p>
Perhaps it is desired to eliminate all the TRACE output from everything except <code>com.foo.Bar</code>.
Simply changing the log level would not accomplish the task. Instead, the solution is to
@@ -205,9 +213,6 @@ public class Bar {
With this configuration all log events from <code>com.foo.Bar</code> will be recorded while only error
events will be recorded from all other components.
</p>
- </subsection>
- <a name="Additivity"/>
- <subsection name="Additivity">
<p>
In the previous example all the events from <code>com.foo.Bar</code> were still written to the Console. This is
because the logger for <code>com.foo.Bar</code> did not have any appenders configured while its parent did. In fact,
@@ -941,8 +946,9 @@ rootLogger.appenderRef.stdout.ref = STDOUT
<p>
While this is useful, there are many more places properties can originate from. To accommodate this,
Log4j also supports the syntax <code>${dollar}{prefix:name}</code> where the prefix identifies tells Log4j
- that variable name should be evaluated in a specific context. The contexts that are built in to Logj4
- are:
+ that variable name should be evaluated in a specific context.
+ See the <a href="lookups.html">Lookups</a> manual page for more details.
+ The contexts that are built in to Logj4 are:
</p>
<table>
<tr>
@@ -1007,6 +1013,9 @@ rootLogger.appenderRef.stdout.ref = STDOUT
pre-populated with a value for "hostName" that is the current system's host name or IP address and
the "contextName" with is the value of the current logging context.
</p>
+ </subsection>
+ <a name="RuntimeLookup"/>
+ <subsection name="Lookup Variables with Multiple Leading '$' Characters">
<p>
An interesting feature of StrLookup processing is that when a variable reference is declared with
multiple leading '$' characters each time the variable is resolved the leading '$' is simply removed.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/xdoc/manual/customconfig.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/customconfig.xml b/src/site/xdoc/manual/customconfig.xml
index aafd136..d34da41 100644
--- a/src/site/xdoc/manual/customconfig.xml
+++ b/src/site/xdoc/manual/customconfig.xml
@@ -72,7 +72,8 @@
<a name="ConfigurationFactory"/>
<subsection name="Understanding ConfigurationFactory">
<p>
- Log4j 2 will search for available ConfigurationFactories and then select the one to use. The
+ During initialization, Log4j 2 will search for available <a href="extending.html#ConfigurationFactory">ConfigurationFactories</a>
+ and then select the one to use. The
selected ConfigurationFactory creates the Configuration that Log4j will use. Here is how Log4j finds
the available ConfigurationFactories:
</p>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/xdoc/manual/extending.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/extending.xml b/src/site/xdoc/manual/extending.xml
index 43bd2e0..3088d82 100644
--- a/src/site/xdoc/manual/extending.xml
+++ b/src/site/xdoc/manual/extending.xml
@@ -93,7 +93,8 @@
<subsection name="ConfigurationFactory">
<p>
Modifying the way in which logging can be configured is usually one of the areas with the most
- interest. The primary method for doing that is by implementing or extending a ConfigurationFactory.
+ interest. The primary method for doing that is by implementing or extending a
+ <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/config/ConfigurationFactory.html">ConfigurationFactory</a>.
Log4j provides two ways of adding new ConfigurationFactories. The first is by defining the system
property named "log4j.configurationFactory" to the name of the class that should be searched first
for a configuration. The second method is by defining the ConfigurationFactory as a Plugin.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/xdoc/manual/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/index.xml b/src/site/xdoc/manual/index.xml
index 35c0077..fde0133 100644
--- a/src/site/xdoc/manual/index.xml
+++ b/src/site/xdoc/manual/index.xml
@@ -88,10 +88,10 @@
</p>
<ol>
<li>Log4j 2 is designed to be usable as an audit logging framework. Both Log4j
- 1.x and Logback will lose events while reconfiguring. Log4j 2 will not. in
- Logback exceptions in Appenders are never visible to the application. In
+ 1.x and Logback will lose events while reconfiguring. Log4j 2 will not. In
+ Logback, exceptions in Appenders are never visible to the application. In
Log4j 2 Appenders can be configured to allow the exception to percolate
- to the application</li>
+ to the application.</li>
<li>Log4j 2 contains next-generation lock-free <a href="async.html">Asynchronous Loggers</a> based
on the <a href="https://lmax-exchange.github.io/disruptor/">LMAX Disruptor library</a>.
In multi-threaded scenarios Asynchronous Loggers have 10 times higher throughput and
@@ -122,7 +122,7 @@
be transported in any format desired.</li>
<li>Layouts in Log4j 1.x and Logback return a String. This resulted in the problems
discussed at <a href="http://logback.qos.ch/manual/encoders.html">Logback Encoders</a>.
- Log4j 2 takes the simpler approach that Layouts always return a byte array. This has
+ Log4j 2 takes the simpler approach that <a href="layouts.html">Layouts</a> always return a byte array. This has
the advantage that it means they can be used in virtually any Appender, not just
the ones that write to an OutputStream.</li>
<!-- and coming up: ByteBuffers, too! -->
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/xdoc/manual/layouts.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/layouts.xml.vm b/src/site/xdoc/manual/layouts.xml.vm
index 879739b..422fa1e 100644
--- a/src/site/xdoc/manual/layouts.xml.vm
+++ b/src/site/xdoc/manual/layouts.xml.vm
@@ -46,7 +46,7 @@
</p>
<p>
The root class for layouts that use a Charset is <code>org.apache.logging.log4j.core.layout.AbstractStringLayout</code>
- where the default is UTF-8. Each layout that extends <code>org.apache.logging.log4j.core.layout.AbstractStringLayout</code>
+ where the default is UTF-8. Each layout that extends <code>AbstractStringLayout</code>
can provide its own default. See each layout below.
</p>
<p>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/xdoc/manual/plugins.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/plugins.xml b/src/site/xdoc/manual/plugins.xml
index 0c80f5b..37aca9c 100644
--- a/src/site/xdoc/manual/plugins.xml
+++ b/src/site/xdoc/manual/plugins.xml
@@ -32,8 +32,8 @@
<p>
Log4j 1.x allowed for extension by requiring class attributes on most of the configuration
declarations. In the case of some elements, notably the PatternLayout, the only way to add
- new pattern converters was to extend the PatternLayout class and add them via code. One of
- goals of Log4j 2 is to make extending it extremely easy through the use of plugins.
+ new pattern converters was to extend the PatternLayout class and add them via code. One
+ goal of Log4j 2 is to make extending it extremely easy through the use of plugins.
</p>
<p>
In Log4j 2 a plugin is declared by adding a
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5878ea3/src/site/xdoc/runtime-dependencies.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/runtime-dependencies.xml b/src/site/xdoc/runtime-dependencies.xml
index ace4141..7186e7c 100644
--- a/src/site/xdoc/runtime-dependencies.xml
+++ b/src/site/xdoc/runtime-dependencies.xml
@@ -95,7 +95,7 @@
</td>
</tr>
<tr>
- <td>bzip2, Deflate, Pack200, and XZ compression on rollover</td>
+ <td>Bzip2, Deflate, Pack200, and XZ compression on rollover</td>
<td><a href="http://commons.apache.org/proper/commons-compress/">Apache Commons Compress</a>.
In addition, XZ requires <a href="http://tukaani.org/xz/java.html">XZ for Java</a>.
</td>