Update of /home/cvsd/slony1/slony1-engine/doc/adminguide
In directory main.slony.info:/tmp/cvs-serv1594/doc/adminguide

Modified Files:
      Tag: REL_2_0_STABLE
	slonconf.sgml 
Log Message:
Add note that if syslog is turned on, then timestamp generation is
suppressed.


Index: slonconf.sgml
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/doc/adminguide/slonconf.sgml,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -d -r1.21 -r1.21.2.1
*** slonconf.sgml	31 Mar 2008 16:28:24 -0000	1.21
--- slonconf.sgml	30 Apr 2009 15:45:19 -0000	1.21.2.1
***************
*** 123,132 ****
            appear in each log line entry.
          </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>
--- 123,135 ----
            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>