Add note that if syslog is turned on, then timestamp generation is

suppressed.

diff --git a/doc/adminguide/slonconf.sgml b/doc/adminguide/slonconf.sgml
index dd432a712ada2d7e62b5ec0fcf3175c4686c72e2..367a9414deab66f8e4c179a4b94a680831c1aa0c 100644 (file)
--- a/doc/adminguide/slonconf.sgml
+++ b/doc/adminguide/slonconf.sgml
@@ -122,12 +122,15 @@
         <para>Determines if you would like the timestamp of the event being logged to 
           appear in each log line entry.
         </para>
+
+        <para> Note that if <envar>syslog</envar> usage is configured,
+        then this is ignored; it is assumed that
+        <application>syslog</application> will be supplying
+        timestamps, and timestamps are therefore suppressed.
+        </para>
       </listitem>
     </varlistentry>
 
-
-
-
     <varlistentry id="slon-config-logging-log-timestamp-format" xreflabel="slon_conf_log_timestamp_format">
       <term><varname>log_timestamp_format</varname> (<type>string</type>)</term>
       <indexterm>          

diff --git a/share/slon.conf-sample b/share/slon.conf-sample
index 8618f00ff514ecd45b4cfd3545e65d4c8285bd88..7feaef6270d8ab48e7d0c874e6b67aedc3c78d15 100644 (file)
--- a/share/slon.conf-sample
+++ b/share/slon.conf-sample
@@ -1,4 +1,4 @@
-# $Id: slon.conf-sample,v 1.7.2.2 2009-04-30 15:24:21 cbbrowne Exp $
+# $Id: slon.conf-sample,v 1.7.2.3 2009-04-30 15:45:19 cbbrowne Exp $
 #
 # Sets how many cleanup cycles to run before a vacuum is done.
 # Range: [0,100], default: 3
@@ -66,6 +66,8 @@
 #log_pid=false
 
 # If true, include the timestamp on each log line.  Default is true.
+#    Note that if syslog is activated, then the timestamp is suppressed,
+#    irrespective of the values of log_timestamp or log_timestamp_format
 #log_timestamp=true
 
 # A strftime()-conformant format string for use with log timestamps.