Remove obsolete example of CSV log file name from log_filename document.

7380b63 changed log_filename so that epoch was not appended to it
when no format specifier is given. But the example of CSV log file name
with epoch still left in log_filename document. This commit removes
such obsolete example.

This commit also documents the defaults of log_directory and
log_filename.

Backpatch to all supported versions.

Christoph Berg

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index fe474227ad2c9e484d7e289e8e6b2d515185b16b..cc6dcaf227a3892a7cef819c120b2706a7b23f3a 100644 (file)
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -3349,6 +3349,7 @@ local0.*    /var/log/postgresql
         cluster data directory.
         This parameter can only be set in the <filename>postgresql.conf</>
         file or on the server command line.
+        The default is <literal>pg_log</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3374,6 +3375,7 @@ local0.*    /var/log/postgresql
         </ulink> specification.
         Note that the system's <systemitem>strftime</systemitem> is not used
         directly, so platform-specific (nonstandard) extensions do not work.
+        The default is <literal>postgresql-%Y-%m-%d_%H%M%S.log</literal>.
        </para>
        <para>
         If you specify a file name without escapes, you should plan to
@@ -3390,8 +3392,6 @@ local0.*    /var/log/postgresql
         log file name to create the file name for CSV-format output.
         (If <varname>log_filename</> ends in <literal>.log</>, the suffix is
         replaced instead.)
-        In the case of the example above, the CSV
-        file name will be <literal>server_log.1093827753.csv</literal>.
        </para>
        <para>
         This parameter can only be set in the <filename>postgresql.conf</>