From: Rich Bowen <rbowen@apache.org>
Date: Sun, 18 Sep 2011 02:54:33 +0000 (+0000)
Subject: Altering the "somewhat similar" to default example to actually be the
X-Git-Tag: 2.3.15~238
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=753d2588d1b62a23c3bc73100ae7a477e70a9683;p=thirdparty%2Fapache%2Fhttpd.git

Altering the "somewhat similar" to default example to actually be the
default format.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1172173 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 676423e396e..73e8f09e790 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -1464,11 +1464,20 @@ in case of an error</td></tr>
     with error log lines. If <code class="module"><a href="../mod/mod_unique_id.html">mod_unique_id</a></code> is loaded, its
     unique id will be used as log ID for requests.</p>
 
-    <div class="example"><h3>Example (somewhat similar to default format)</h3><p><code>
-        ErrorLogFormat "[%{u}t] [%-m:%l] [pid %P] %7F: %E: [client\ %a]
+    <div class="example"><h3>Example (default format)</h3><p><code>
+        ErrorLogFormat "[%{u}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a]
         %M%&nbsp;,\&nbsp;referer\&nbsp;%{Referer}i"
     </code></p></div>
 
+    <p>This would result in error messages such as:</p>
+
+    <div class="example"><p><code>
+    [Thu May 12 08:28:57.652118 2011] [core:error] [pid 8777:tid 4326490112] [client ::1:58619] File does not exist: /usr/local/apache2/htdocs/favicon.ico
+    </code></p></div>
+
+    <p>Notice that, as discussed above, some fields are ommitted
+    entirely because they are not defined.</p>
+
     <div class="example"><h3>Example (similar to the 2.2.x format)</h3><p><code>
         ErrorLogFormat "[%t] [%l] %7F: %E: [client\ %a]
         %M%&nbsp;,\&nbsp;referer\&nbsp;%{Referer}i"
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index d2436f93a74..a319045ad07 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1432,11 +1432,20 @@ in case of an error</description>
     with error log lines. If <module>mod_unique_id</module> is loaded, its
     unique id will be used as log ID for requests.</p>
 
-    <example><title>Example (somewhat similar to default format)</title>
-        ErrorLogFormat "[%{u}t] [%-m:%l] [pid %P] %7F: %E: [client\ %a]
+    <example><title>Example (default format)</title>
+        ErrorLogFormat "[%{u}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a]
         %M%&nbsp;,\&nbsp;referer\&nbsp;%{Referer}i"
     </example>
 
+    <p>This would result in error messages such as:</p>
+
+    <example>
+    [Thu May 12 08:28:57.652118 2011] [core:error] [pid 8777:tid 4326490112] [client ::1:58619] File does not exist: /usr/local/apache2/htdocs/favicon.ico
+    </example>
+
+    <p>Notice that, as discussed above, some fields are ommitted
+    entirely because they are not defined.</p>
+
     <example><title>Example (similar to the 2.2.x format)</title>
         ErrorLogFormat "[%t] [%l] %7F: %E: [client\ %a]
         %M%&nbsp;,\&nbsp;referer\&nbsp;%{Referer}i"