From 8f91d87d43d021db92c6edd966a4bb8c3a81ae39 Mon Sep 17 00:00:00 2001
From: Andres Freund
Date: Sun, 24 Apr 2016 12:26:55 -0700
Subject: Fix documentation & config inconsistencies around 428b1d6b2.

Several issues:
1) checkpoint_flush_after doc and code disagreed about the default
2) new GUCs were missing from postgresql.conf.sample
3) Outdated source-code comment about bgwriter_flush_after's default
4) Sub-optimal categories assigned to new GUCs
5) Docs suggested backend_flush_after is PGC_SIGHUP, but it's PGC_USERSET.
6) Spell out int as integer in the docs, as done elsewhere

Reported-By: Magnus Hagander, Fujii Masao
Discussion: CAHGQGwETyTG5VYQQ5C_srwxWX7RXvFcD3dKROhvAWWhoSBdmZw@mail.gmail.com
---
 doc/src/sgml/config.sgml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'doc/src')

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index f9ba1487822..909b3e23c52 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1884,7 +1884,7 @@ include_dir 'conf.d'
       </varlistentry>
 
       <varlistentry id="guc-bgwriter-flush-after" xreflabel="bgwriter_flush_after">
-       <term><varname>bgwriter_flush_after</varname> (<type>int</type>)
+       <term><varname>bgwriter_flush_after</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>bgwriter_flush_after</> configuration parameter</primary>
        </indexterm>
@@ -2014,7 +2014,7 @@ include_dir 'conf.d'
       </varlistentry>
 
       <varlistentry id="guc-backend-flush-after" xreflabel="backend_flush_after">
-       <term><varname>backend_flush_after</varname> (<type>int</type>)
+       <term><varname>backend_flush_after</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>backend_flush_after</> configuration parameter</primary>
        </indexterm>
@@ -2036,8 +2036,6 @@ include_dir 'conf.d'
          and <literal>2MB</literal>.  The default is <literal>128Kb</> on
          Linux, <literal>0</> elsewhere.  (Non-default values of
          <symbol>BLCKSZ</symbol> change the default and maximum.)
-         This parameter can only be set in the <filename>postgresql.conf</>
-         file or on the server command line.
         </para>
        </listitem>
       </varlistentry>
@@ -2607,7 +2605,7 @@ include_dir 'conf.d'
      </varlistentry>
 
      <varlistentry id="guc-checkpoint-flush-after" xreflabel="checkpoint_flush_after">
-      <term><varname>checkpoint_flush_after</varname> (<type>int</type>)
+      <term><varname>checkpoint_flush_after</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>checkpoint_flush_after</> configuration parameter</primary>
       </indexterm>
@@ -2626,7 +2624,7 @@ include_dir 'conf.d'
         than the OS's page cache, where performance might degrade.  This
         setting may have no effect on some platforms.  The valid range is
         between <literal>0</literal>, which disables controlled writeback,
-        and <literal>2MB</literal>.  The default is <literal>128Kb</> on
+        and <literal>2MB</literal>.  The default is <literal>256Kb</> on
         Linux, <literal>0</> elsewhere.  (Non-default values of
         <symbol>BLCKSZ</symbol> change the default and maximum.)
         This parameter can only be set in the <filename>postgresql.conf</>
-- 
cgit v1.2.3