Author: ihabunek Date: Tue Apr 3 12:00:37 2012 New Revision: 1308831 URL: http://svn.apache.org/viewvc?rev=1308831&view=rev Log: Added missing conversion patterns to the Pattern layout doc.
Modified:
logging/log4php/trunk/src/site/xdoc/docs/layouts/pattern.xml
Modified: logging/log4php/trunk/src/site/xdoc/docs/layouts/pattern.xml
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/xdoc/docs/layouts/pattern.xml?rev=1308831&r1=1308830&r2=1308831&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/xdoc/docs/layouts/pattern.xml (original)
+++ logging/log4php/trunk/src/site/xdoc/docs/layouts/pattern.xml Tue Apr 3
12:00:37 2012
@@ -250,6 +250,13 @@
</tr>
<tr>
<td>
+
<p><strong>%M</strong></p>
+
<p><strong>%method</strong></p>
+ </td>
+ <td>The method or function name
from which the logging request was issued.</td>
+ </tr>
+ <tr>
+ <td>
<p><strong>%n</strong></p>
<p><strong>%newline</strong></p>
</td>
@@ -260,13 +267,6 @@
</tr>
<tr>
<td>
-
<p><strong>%M</strong></p>
-
<p><strong>%method</strong></p>
- </td>
- <td>The method or function name
from which the logging request was issued.</td>
- </tr>
- <tr>
- <td>
<p><strong>%p</strong></p>
<p><strong>%le</strong></p>
<p><strong>%level</strong></p>
@@ -290,23 +290,43 @@
<p>If no key is given,
will return all values in key=value format.</p>
</td>
</tr>
- <tr>
- <td>
-
<p><strong>%s</strong>{key}</p>
-
<p><strong>%server</strong>{key}</p>
- </td>
- <td>
- <p>A value from the
$_SERVER superglobal array corresponding to the given key.</p>
- <p>If no key is given,
will return all values in key=value format.</p>
- </td>
- </tr>
+ <tr>
+ <td>
+ <p><strong>%s</strong>{key}</p>
+
<p><strong>%server</strong>{key}</p>
+ </td>
+ <td>
+ <p>A value from the $_SERVER
superglobal array corresponding to the given key.</p>
+ <p>If no key is given, will
return all values in key=value format.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+
<p><strong>%ses</strong>{key}</p>
+
<p><strong>%session</strong>{key}</p>
+ </td>
+ <td>
+ <p>A value from the $_SESSION
superglobal array corresponding to the given key.</p>
+ <p>If no key is given, will
return all values in key=value format.</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p><strong>%sid</strong></p>
+
<p><strong>%sessionid</strong></p>
+ </td>
+ <td>
+ <p>The active session ID, or an
empty string if not in session.</p>
+ <p>Equivalent to calling
<code>session_id()</code>.</p>
+ </td>
+ </tr>
<tr>
<td>
<p><strong>%t</strong></p>
<p><strong>%pid</strong></p>
<p><strong>%process</strong></p>
</td>
- <td>The ID of the process that
generated the logging event.</td>
+ <td>The ID of the process that
generated the logging event.</td>
</tr>
<tr>
<td>
