Repository: logging-log4j2 Updated Branches: refs/heads/master d0b97aa94 -> a6479de68
LOG4J2-1254 Fixed typo in Flow Tracing documentation Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a6479de6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a6479de6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a6479de6 Branch: refs/heads/master Commit: a6479de687feb5cca66a7d61053fddafa484847e Parents: d0b97aa Author: rpopma <[email protected]> Authored: Thu Jan 14 07:19:47 2016 +0900 Committer: rpopma <[email protected]> Committed: Thu Jan 14 07:19:47 2016 +0900 ---------------------------------------------------------------------- src/changes/changes.xml | 3 +++ src/site/xdoc/manual/flowtracing.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a6479de6/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 3bf73f7..81ce277 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -86,6 +86,9 @@ <action issue="LOG4J2-1251" dev="mattsicker" type="fix" due-to="Romain Manni-Bucau"> Fix JUL bridge issue where LogRecord.getParameters() is used when null. </action> + <action issue="LOG4J2-1254" dev="rpopma" type="fix" due-to="Josh Trow"> + Fix typo in Flow Tracing documentation. + </action> </release> <release version="2.5" date="2015-12-06" description="GA Release 2.5"> <action issue="LOG4J2-324" dev="rpopma" type="fix"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a6479de6/src/site/xdoc/manual/flowtracing.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/manual/flowtracing.xml b/src/site/xdoc/manual/flowtracing.xml index 443b52a..a7a015f 100644 --- a/src/site/xdoc/manual/flowtracing.xml +++ b/src/site/xdoc/manual/flowtracing.xml @@ -50,7 +50,7 @@ The exit() method should be placed before any return statement or as the last statement of methods without a return. exit() can be called with or without a parameter. Typically, methods that return void will use exit() while methods that return an Object will use exit(Object obj). - The entry() method logs with a level of TRACE and uses a Marker with a name of "EXIT" which is + The exit() method logs with a level of TRACE and uses a Marker with a name of "EXIT" which is also a "FLOW" Marker. </p> <p>
