Repository: logging-log4j2 Updated Branches: refs/heads/master 93b9a4b26 -> 375a1f05e
clarified when each method can be used Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/375a1f05 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/375a1f05 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/375a1f05 Branch: refs/heads/master Commit: 375a1f05e074c0f63c063bfb184a4c97dcb4c17e Parents: 93b9a4b Author: rpopma <[email protected]> Authored: Tue Sep 22 06:38:48 2015 +0200 Committer: rpopma <[email protected]> Committed: Tue Sep 22 06:38:48 2015 +0200 ---------------------------------------------------------------------- src/site/xdoc/manual/customconfig.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/375a1f05/src/site/xdoc/manual/customconfig.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/manual/customconfig.xml b/src/site/xdoc/manual/customconfig.xml index b33d1d4..477ef48 100644 --- a/src/site/xdoc/manual/customconfig.xml +++ b/src/site/xdoc/manual/customconfig.xml @@ -30,8 +30,9 @@ Log4j 2 provides a few ways for applications to create their own programmatic configuration: </p> <ul> - <li>Specify a custom ConfigurationFactory</li> - <li>Use the Configurator</li> + <li>Specify a custom ConfigurationFactory to start Log4j with a programmatic configuration</li> + <li>Use the Configurator to replace the configuration after Log4j started</li> + <li>Initialize Log4j with a combination of a configuration file and programmatic configuration</li> <li>Modify the current Configuration after initialization</li> </ul> <a name="ConfigurationBuilder"/> @@ -89,7 +90,7 @@ </p> </subsection> <a name="Example"/> - <subsection name="Using ConfigurationBuilder with a Custom ConfigurationFactory"> + <subsection name="Initialize Log4j Using ConfigurationBuilder with a Custom ConfigurationFactory"> <p> One way to programmatically configure Log4j 2 is to create a custom ConfigurationFactory that uses the <a href="#ConfigurationBuilder">ConfigurationBuilder</a> to create a Configuration. @@ -140,7 +141,7 @@ public class CustomConfigurationFactory extends ConfigurationFactory { }]]></pre> </subsection> <a name="Configurator"/> - <subsection name="Using ConfigurationBuilder with the Configurator"> + <subsection name="Reconfigure Log4j Using ConfigurationBuilder with the Configurator"> <p> An alternative to a custom ConfigurationFactory is to configure with the <code>Configurator</code>. Once a Configuration object has been constructed, it can be passed to one of the @@ -172,7 +173,7 @@ ctx = Configurator.initialize(builder.build()); </subsection> <a name="Hybrid"/> - <subsection name="Combining Configuration File with Programmatic Configuration"> + <subsection name="Initialize Log4j by Combining Configuration File with Programmatic Configuration"> <p> Sometimes you want to configure with a configuration file but do some additional programmatic configuration. A possible use case might be that you want to allow for a flexible configuration using XML @@ -238,7 +239,7 @@ public class MyXMLConfiguration extends XMLConfiguration { }</pre> </subsection> <a name="AddingToCurrent"/> - <subsection name="Programmatically Adding to the Current Configuration"> + <subsection name="Programmatically Modifying the Current Configuration after Initialization"> <p> Applications sometimes have the need to customize logging separate from the actual configuration. Log4j allows this although it suffers from a few limitations:
