LOG4J2-435 small documentation fixes Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/99897502 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/99897502 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/99897502
Branch: refs/heads/master Commit: 9989750230825814416e47b069cc35d52b3c684e Parents: 2af86c3 Author: rpopma <[email protected]> Authored: Sun Nov 29 01:14:06 2015 +0900 Committer: rpopma <[email protected]> Committed: Sun Nov 29 01:14:06 2015 +0900 ---------------------------------------------------------------------- src/site/xdoc/manual/appenders.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/99897502/src/site/xdoc/manual/appenders.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/manual/appenders.xml b/src/site/xdoc/manual/appenders.xml index ff0c1b8..f5e6bf1 100644 --- a/src/site/xdoc/manual/appenders.xml +++ b/src/site/xdoc/manual/appenders.xml @@ -2540,13 +2540,14 @@ public class JpaLogEntity extends AbstractLogEventWrapperEntity { </p> <p>Users can create custom conditions or use the built-in conditions:</p> <ul> - <li>IfFileName - accepts files whose name matches a regular expression or a + <li><a href="#DeleteIfFileName">IfFileName</a> - accepts files whose path (relative to the base path) matches a + <a href="https://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html";>regular expression</a> or a <a href="https://docs.oracle.com/javase/7/docs/api/java/nio/file/FileSystem.html#getPathMatcher(java.lang.String)">glob</a>.</li> - <li>IfLastModified - accepts files that are as old as or older than the specified + <li><a href="#DeleteIfLastModified">IfLastModified</a> - accepts files that are as old as or older than the specified <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/appender/rolling/action/Duration.html#parse(CharSequence)">duration</a>. </li> - <li>IfAccumulatedFileCount - accepts paths after some count threshold is exceeded during the file tree walk.</li> - <li>IfAccumulatedFileCount - accepts paths after the accumulated file size threshold is exceeded during the file tree walk.</li> + <li><a href="#DeleteIfAccumulatedFileCount">IfAccumulatedFileCount</a> - accepts paths after some count threshold is exceeded during the file tree walk.</li> + <li><a href="#DeleteIfAccumulatedFileSize">IfAccumulatedFileSize</a> - accepts paths after the accumulated file size threshold is exceeded during the file tree walk.</li> <li>IfAll - accepts a path if all nested conditions accept it (logical AND). Nested conditions may be evaluated in any order.</li> <li>IfAny - accepts a path if one of the nested conditions accept it (logical OR). @@ -2577,7 +2578,7 @@ public class JpaLogEntity extends AbstractLogEventWrapperEntity { <td>String</td> <td><em>Required if glob not specified.</em> Matches the relative path (relative to the base path) using a regular expression as defined by the - <a href="http://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html";>Pattern</a> class. + <a href="https://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html";>Pattern</a> class. </td> </tr> <tr> @@ -2585,7 +2586,7 @@ public class JpaLogEntity extends AbstractLogEventWrapperEntity { <td>PathCondition[]</td> <td>An optional set of nested <a href="#DeletePathCondition">PathConditions</a>. If any nested conditions exist they all need to accept the file before it is deleted. Nested conditions are only evaluated if the - outer condition accepts a file (because the path name matches). + outer condition accepts a file (if the path name matches). </td> </tr> </table> @@ -2610,7 +2611,7 @@ public class JpaLogEntity extends AbstractLogEventWrapperEntity { <td>PathCondition[]</td> <td>An optional set of nested <a href="#DeletePathCondition">PathConditions</a>. If any nested conditions exist they all need to accept the file before it is deleted. Nested conditions are only evaluated if the - outer condition accepts a file (because the file is old enough). + outer condition accepts a file (if the file is old enough). </td> </tr> </table> @@ -2634,7 +2635,7 @@ public class JpaLogEntity extends AbstractLogEventWrapperEntity { <td>PathCondition[]</td> <td>An optional set of nested <a href="#DeletePathCondition">PathConditions</a>. If any nested conditions exist they all need to accept the file before it is deleted. Nested conditions are only evaluated if the - outer condition accepts a file (because the threshold count has been exceeded). + outer condition accepts a file (if the threshold count has been exceeded). </td> </tr> </table> @@ -2659,7 +2660,7 @@ public class JpaLogEntity extends AbstractLogEventWrapperEntity { <td>PathCondition[]</td> <td>An optional set of nested <a href="#DeletePathCondition">PathConditions</a>. If any nested conditions exist they all need to accept the file before it is deleted. Nested conditions are only evaluated if the - outer condition accepts a file (because the threshold accumulated file size has been exceeded). + outer condition accepts a file (if the threshold accumulated file size has been exceeded). </td> </tr> </table>
