Repository: logging-log4j2 Updated Branches: refs/heads/master aa3c3595c -> 7a81b7eca
[LOG4J2-1126] Site fixes/improvements for 2.4 release. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7a81b7ec Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7a81b7ec Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7a81b7ec Branch: refs/heads/master Commit: 7a81b7eca777e592b6478db68307b396e6b1cf52 Parents: aa3c359 Author: ggregory <[email protected]> Authored: Mon Sep 21 14:57:22 2015 -0700 Committer: ggregory <[email protected]> Committed: Mon Sep 21 14:57:22 2015 -0700 ---------------------------------------------------------------------- .../log4j/core/appender/mom/jeromq/JeroMqAppender.java | 2 +- src/site/xdoc/manual/appenders.xml | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a81b7ec/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java index 704907b..cca824d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppender.java @@ -106,7 +106,7 @@ public final class JeroMqAppender extends AbstractAppender { // @formatter:off @Required(message = "No name provided for JeroMqAppender") @PluginAttribute("name") final String name, @PluginElement("Layout") Layout<?> layout, - @PluginElement("Filters") final Filter filter, + @PluginElement("Filter") final Filter filter, @PluginElement("Properties") final Property[] properties, // Super attributes @PluginAttribute("ignoreExceptions") final boolean ignoreExceptions, http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a81b7ec/src/site/xdoc/manual/appenders.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/manual/appenders.xml b/src/site/xdoc/manual/appenders.xml index 3b0256c..f437d45 100644 --- a/src/site/xdoc/manual/appenders.xml +++ b/src/site/xdoc/manual/appenders.xml @@ -3292,7 +3292,7 @@ public class JpaLogEntity extends AbstractLogEventWrapperEntity { <subsection name="ZeroMQ Appender"> <p> The ZeroMQ appender uses the <a href="https://github.com/zeromq/jeromq";>JeroMQ</a> library to send log - events to one or more endpoints. + events to one or more ZeroMQ endpoints. </p> <p> This is a simple JeroMQ configuration: @@ -3324,17 +3324,19 @@ public class JpaLogEntity extends AbstractLogEventWrapperEntity { <tr> <td>name</td> <td>String</td> - <td>The name of the Appender.</td> + <td>The name of the Appender. Required.</td> </tr> <tr> <td>Layout</td> - <td>Layout</td> - <td>The Layout of the Appender.</td> + <td>layout</td> + <td>The Layout of the Appender. If you do not specify a layout, the appender uses the default + pattern appender returned by + <a href="https://logging.apache.org/log4j/2.x/log4j-core/apidocs/org/apache/logging/log4j/core/layout/PatternLayout.html#createDefaultLayout()">PatternLayout.html.createDefaultLayout()</a></td> </tr> <tr> <td>Filters</td> <td>Filter</td> - <td>The Filters of the Appender.</td> + <td>The Filter(s) of the Appender.</td> </tr> <tr> <td>Property</td>
