Repository: logging-log4j2
Updated Branches:
  refs/heads/master 3d380a553 -> 67ea5ea23


fix velocity template: '$' has special meaning


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/583fc36c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/583fc36c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/583fc36c

Branch: refs/heads/master
Commit: 583fc36c4b2b3c7abac2f56b65bd0f6c375a63a7
Parents: 3d380a5
Author: rpopma <rpo...@apache.org>
Authored: Sun Jan 15 21:55:45 2017 +0900
Committer: rpopma <rpo...@apache.org>
Committed: Sun Jan 15 21:55:45 2017 +0900

----------------------------------------------------------------------
 src/site/xdoc/manual/layouts.xml.vm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/583fc36c/src/site/xdoc/manual/layouts.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/layouts.xml.vm 
b/src/site/xdoc/manual/layouts.xml.vm
index a447e1a..695c930 100644
--- a/src/site/xdoc/manual/layouts.xml.vm
+++ b/src/site/xdoc/manual/layouts.xml.vm
@@ -201,7 +201,7 @@ logger.debug("one={}, two={}, three={}", 1, 2, 3);
     &lt;Socket name="Graylog" protocol="udp" host="graylog.domain.com" 
port="12201"&gt;
         &lt;GelfLayout host="someserver" compressionType="GZIP" 
compressionThreshold="1024"&gt;
             &lt;KeyValuePair key="additionalField1" value="constant value"/&gt;
-            &lt;KeyValuePair key="additionalField2" value="$${ctx:key}"/&gt;
+            &lt;KeyValuePair key="additionalField2" 
value="${dollar}${dollar}{ctx:key}"/&gt;
         &lt;/GelfLayout&gt;
     &lt;/Socket&gt;
   &lt;/Appenders&gt;
@@ -1065,8 +1065,8 @@ WARN  [main]: Message 2</pre>
                 </p>
                 <pre class="prettyprint linenums">logger.info("@|KeyStyle {}|@ 
= @|ValueStyle {}|@", entry.getKey(), entry.getValue());</pre>
                 <p>
-                  Use <code>{nolookups}</code> to log messages like 
<code>"${esc.d}{date:YYYY-MM-dd}"</code> 
-                  without using any lookups. Normally calling 
<code>logger.info("Try ${esc.d}{date:YYYY-MM-dd}")</code> 
+                  Use <code>{nolookups}</code> to log messages like 
<code>"${esc.d}{date:YYYY-MM-dd}"</code>
+                  without using any lookups. Normally calling 
<code>logger.info("Try ${esc.d}{date:YYYY-MM-dd}")</code>
                   would replace the date template 
<code>${esc.d}{date:YYYY-MM-dd}</code> with an actual date.
                   Using <code>nolookups</code> disables this feature and logs 
the message string untouched.
                 </p>
@@ -1481,7 +1481,7 @@ WARN  [main]: Message 2</pre>
                   <b>%xEx{short}</b>
                   which will only output the first line of the Throwable or 
<b>%xEx{n}</b> where
                   the first n lines of the stacktrace will be printed. The 
conversion word can also be
-                  followed by "filters(packages)" where packages is a 
comma-sepaarted list of package names that 
+                  followed by "filters(packages)" where packages is a 
comma-sepaarted list of package names that
                   should be suppressed from stack traces. Specifying 
<b>%xEx{none}</b>
                   or <b>%xEx{0}</b> will suppress printing of the exception.
                 </p>
@@ -1513,15 +1513,15 @@ WARN  [main]: Message 2</pre>
                     <li>ExtraClassInfo.Container</li>
                     <li>ExtraClassInfo.ContainerSeparator</li>
                     <li>ExtraClassInfo.Location</li>
-                    <li>ExtraClassInfo.Version</li>                   
-                  </ul> 
+                    <li>ExtraClassInfo.Version</li>
+                  </ul>
                 <p>
-                  The values are names from JAnsi's 
+                  The values are names from JAnsi's
                   <a 
href="https://fusesource.github.io/jansi/documentation/api/org/fusesource/jansi/AnsiRenderer.Code.html";>Code</a>
-                  class like <code>blue</code>, <code>bg_red</code>, and so on 
(Log4j ignores case.)                  
+                  class like <code>blue</code>, <code>bg_red</code>, and so on 
(Log4j ignores case.)
                 </p>
                 <p>
-                  The special key <code>StyleMapName</code> can be set to one 
of the following prefedined maps: 
+                  The special key <code>StyleMapName</code> can be set to one 
of the following prefedined maps:
                   <code>Spock</code>, <code>Kirk</code>.
                 </p>
               </td>

Reply via email to