Author: rpopma
Date: Mon Jun 23 11:51:27 2014
New Revision: 1604764
URL: http://svn.apache.org/r1604764
Log:
LOG4J2-678 Minor issues with Log4j2 web site/documentation
Modified:
logging/log4j/log4j2/trunk/src/site/xdoc/javastyle.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/customconfig.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/javastyle.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/javastyle.xml?rev=1604764&r1=1604763&r2=1604764&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/javastyle.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/javastyle.xml Mon Jun 23 11:51:27
2014
@@ -119,7 +119,7 @@
<a name="package-statement"/>
<h3>Package statement</h3>
<p>The package statement is <strong>not line-wrapped</strong>. The
column limit
- <a href="#column-limit">Column limit: 120</a>) does not apply to
package statements.</p>
+ (<a href="#column-limit">Column limit: 120</a>) does not apply to
package statements.</p>
<a name="imports"/>
<a name="import-statements"/>
<h3>Import statements</h3>
@@ -131,7 +131,7 @@
<a name="import-line-wrapping"/>
<h4>No line-wrapping</h4>
<p>Import statements are <strong>not line-wrapped</strong>. The column
limit
- <a href="#column-limit">Column limit: 120</a>) does not apply to
import statements.</p>
+ (<a href="#column-limit">Column limit: 120</a>) does not apply to
import statements.</p>
<a name="import-ordering-and-spacing"/>
<h4>Ordering and spacing</h4>
<p>Import statements are divided into the following groups, in this
order, with each group
@@ -248,7 +248,7 @@
<p>Example:</p><pre>
void doNothing() {}
</pre><a name="block-indentation"/>
- <h3>Block indentation: +2 spaces</h3>
+ <h3>Block indentation: +4 spaces</h3>
<p>Each time a new block or block-like construct is opened, the indent
increases by two
spaces. When the block ends, the indent returns to the previous indent
level. The indent level
applies to both code and comments throughout the block. (See the
example in Section 4.1.2,
@@ -311,7 +311,7 @@
</ol>
<a name="indentation"/>
<a name="line-wrapping-indent"/>
- <h4>Indent continuation lines at least +4 spaces</h4>
+ <h4>Indent continuation lines at least +8 spaces</h4>
<p>When line-wrapping, each line after the first (each
<em>continuation line</em>) is indented
at least +4 from the original line.</p>
<p>When there are multiple continuation lines, indentation may be
varied beyond +4 as
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/customconfig.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/customconfig.xml?rev=1604764&r1=1604763&r2=1604764&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/customconfig.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/customconfig.xml Mon Jun 23
11:51:27 2014
@@ -91,7 +91,7 @@ public class MyXMLConfiguration extends
}</pre>
</subsection>
<a name="AddingToCurrent"/>
- <subsection name="Programattically Adding to the Current
Configuration">
+ <subsection name="Programatically Adding to the Current
Configuration">
<p>
Applications sometimes have the need to customize logging
separate from the actual configuration.
Log4j allows this although it suffers from a few limitations:
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml?rev=1604764&r1=1604763&r2=1604764&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml Mon Jun 23 11:51:27
2014
@@ -155,9 +155,9 @@ com.sun.management.jmxremote.ssl=false</
Monitoring and Management</a> provides details on how to configure
JMX more securely with password authentication and SSL.)</b></p>
<p>Then you can run the client with this command:</p>
- <p><code>$JAVA_HOME/bin/java -cp
/path/to/log4j-core-2.0.jar:/path/to/log4j-jmx-gui-2.0.jar
org.apache.logging.log4j.jmx.gui.ClientGui localhost:33445</code></p>
+ <p><code>$JAVA_HOME/bin/java -cp
/path/to/log4j-api-2.0.jar:/path/to/log4j-core-2.0.jar:/path/to/log4j-jmx-gui-2.0.jar
org.apache.logging.log4j.jmx.gui.ClientGui localhost:33445</code></p>
<p>or on Windows:</p>
- <p><code>%JAVA_HOME%\bin\java -cp
\path\to\log4j-core-2.0.jar;\path\to\log4j-jmx-gui-2.0.jar
org.apache.logging.log4j.jmx.gui.ClientGui localhost:33445</code></p>
+ <p><code>%JAVA_HOME%\bin\java -cp
\path\to\log4j-api-2.0.jar;\path\to\log4j-core-2.0.jar;\path\to\log4j-jmx-gui-2.0.jar
org.apache.logging.log4j.jmx.gui.ClientGui localhost:33445</code></p>
<p>The screenshot below shows the StatusLogger panel of the
client
GUI when running as a stand-alone application.</p>
<p><img src="../images/jmx-standalone-statuslogger.png" alt="JMX GUI
screenshot of StatusLogger display" /></p>
