*** a/doc/src/sgml/config.sgml
--- b/doc/src/sgml/config.sgml
***************
*** 6934,6940 **** COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <varlistentry id="guc-log-autovacuum-min-duration" xreflabel="log_autovacuum_min_duration">
        <term><varname>log_autovacuum_min_duration</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>log_autovacuum_min_duration</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
--- 6934,6941 ----
       <varlistentry id="guc-log-autovacuum-min-duration" xreflabel="log_autovacuum_min_duration">
        <term><varname>log_autovacuum_min_duration</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>log_autovacuum_min_duration</varname></primary>
!        <secondary>configuration parameter</secondary>
        </indexterm>
        </term>
        <listitem>
***************
*** 6993,6999 **** COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <varlistentry id="guc-autovacuum-vacuum-threshold" xreflabel="autovacuum_vacuum_threshold">
        <term><varname>autovacuum_vacuum_threshold</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>autovacuum_vacuum_threshold</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
--- 6994,7001 ----
       <varlistentry id="guc-autovacuum-vacuum-threshold" xreflabel="autovacuum_vacuum_threshold">
        <term><varname>autovacuum_vacuum_threshold</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>autovacuum_vacuum_threshold</varname></primary>
!        <secondary>configuration parameter</secondary>
        </indexterm>
        </term>
        <listitem>
***************
*** 7012,7018 **** COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <varlistentry id="guc-autovacuum-analyze-threshold" xreflabel="autovacuum_analyze_threshold">
        <term><varname>autovacuum_analyze_threshold</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>autovacuum_analyze_threshold</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
--- 7014,7021 ----
       <varlistentry id="guc-autovacuum-analyze-threshold" xreflabel="autovacuum_analyze_threshold">
        <term><varname>autovacuum_analyze_threshold</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>autovacuum_analyze_threshold</varname></primary>
!        <secondary>configuration parameter</secondary>
        </indexterm>
        </term>
        <listitem>
***************
*** 7031,7037 **** COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <varlistentry id="guc-autovacuum-vacuum-scale-factor" xreflabel="autovacuum_vacuum_scale_factor">
        <term><varname>autovacuum_vacuum_scale_factor</varname> (<type>floating point</type>)
        <indexterm>
!        <primary><varname>autovacuum_vacuum_scale_factor</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
--- 7034,7041 ----
       <varlistentry id="guc-autovacuum-vacuum-scale-factor" xreflabel="autovacuum_vacuum_scale_factor">
        <term><varname>autovacuum_vacuum_scale_factor</varname> (<type>floating point</type>)
        <indexterm>
!        <primary><varname>autovacuum_vacuum_scale_factor</varname></primary>
!        <secondary>configuration parameter</secondary>
        </indexterm>
        </term>
        <listitem>
***************
*** 7051,7057 **** COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <varlistentry id="guc-autovacuum-analyze-scale-factor" xreflabel="autovacuum_analyze_scale_factor">
        <term><varname>autovacuum_analyze_scale_factor</varname> (<type>floating point</type>)
        <indexterm>
!        <primary><varname>autovacuum_analyze_scale_factor</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
--- 7055,7062 ----
       <varlistentry id="guc-autovacuum-analyze-scale-factor" xreflabel="autovacuum_analyze_scale_factor">
        <term><varname>autovacuum_analyze_scale_factor</varname> (<type>floating point</type>)
        <indexterm>
!        <primary><varname>autovacuum_analyze_scale_factor</varname></primary>
!        <secondary>configuration parameter</secondary>
        </indexterm>
        </term>
        <listitem>
***************
*** 7071,7077 **** COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <varlistentry id="guc-autovacuum-freeze-max-age" xreflabel="autovacuum_freeze_max_age">
        <term><varname>autovacuum_freeze_max_age</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>autovacuum_freeze_max_age</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
--- 7076,7083 ----
       <varlistentry id="guc-autovacuum-freeze-max-age" xreflabel="autovacuum_freeze_max_age">
        <term><varname>autovacuum_freeze_max_age</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>autovacuum_freeze_max_age</varname></primary>
!        <secondary>configuration parameter</secondary>
        </indexterm>
        </term>
        <listitem>
***************
*** 7099,7105 **** COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <varlistentry id="guc-autovacuum-multixact-freeze-max-age" xreflabel="autovacuum_multixact_freeze_max_age">
        <term><varname>autovacuum_multixact_freeze_max_age</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>autovacuum_multixact_freeze_max_age</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
--- 7105,7112 ----
       <varlistentry id="guc-autovacuum-multixact-freeze-max-age" xreflabel="autovacuum_multixact_freeze_max_age">
        <term><varname>autovacuum_multixact_freeze_max_age</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>autovacuum_multixact_freeze_max_age</varname></primary>
!        <secondary>configuration parameter</secondary>
        </indexterm>
        </term>
        <listitem>
***************
*** 7127,7133 **** COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <varlistentry id="guc-autovacuum-vacuum-cost-delay" xreflabel="autovacuum_vacuum_cost_delay">
        <term><varname>autovacuum_vacuum_cost_delay</varname> (<type>floating point</type>)
        <indexterm>
!        <primary><varname>autovacuum_vacuum_cost_delay</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
--- 7134,7141 ----
       <varlistentry id="guc-autovacuum-vacuum-cost-delay" xreflabel="autovacuum_vacuum_cost_delay">
        <term><varname>autovacuum_vacuum_cost_delay</varname> (<type>floating point</type>)
        <indexterm>
!        <primary><varname>autovacuum_vacuum_cost_delay</varname></primary>
!        <secondary>configuration parameter</secondary>
        </indexterm>
        </term>
        <listitem>
***************
*** 7147,7153 **** COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <varlistentry id="guc-autovacuum-vacuum-cost-limit" xreflabel="autovacuum_vacuum_cost_limit">
        <term><varname>autovacuum_vacuum_cost_limit</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>autovacuum_vacuum_cost_limit</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
--- 7155,7162 ----
       <varlistentry id="guc-autovacuum-vacuum-cost-limit" xreflabel="autovacuum_vacuum_cost_limit">
        <term><varname>autovacuum_vacuum_cost_limit</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>autovacuum_vacuum_cost_limit</varname></primary>
!        <secondary>configuration parameter</secondary>
        </indexterm>
        </term>
        <listitem>
***************
*** 7746,7752 **** COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <varlistentry id="guc-vacuum-cleanup-index-scale-factor" xreflabel="vacuum_cleanup_index_scale_factor">
        <term><varname>vacuum_cleanup_index_scale_factor</varname> (<type>floating point</type>)
        <indexterm>
!        <primary><varname>vacuum_cleanup_index_scale_factor</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
--- 7755,7762 ----
       <varlistentry id="guc-vacuum-cleanup-index-scale-factor" xreflabel="vacuum_cleanup_index_scale_factor">
        <term><varname>vacuum_cleanup_index_scale_factor</varname> (<type>floating point</type>)
        <indexterm>
!        <primary><varname>vacuum_cleanup_index_scale_factor</varname></primary>
!        <secondary>configuration parameter</secondary>
        </indexterm>
        </term>
        <listitem>
***************
*** 7865,7871 **** SET XML OPTION { DOCUMENT | CONTENT };
       <varlistentry id="guc-gin-pending-list-limit" xreflabel="gin_pending_list_limit">
        <term><varname>gin_pending_list_limit</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>gin_pending_list_limit</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
--- 7875,7882 ----
       <varlistentry id="guc-gin-pending-list-limit" xreflabel="gin_pending_list_limit">
        <term><varname>gin_pending_list_limit</varname> (<type>integer</type>)
        <indexterm>
!        <primary><varname>gin_pending_list_limit</varname></primary>
!        <secondary>configuration parameter</secondary>
        </indexterm>
        </term>
        <listitem>
*** a/doc/src/sgml/ref/create_index.sgml
--- b/doc/src/sgml/ref/create_index.sgml
***************
*** 361,368 **** CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
     </para>
  
     <variablelist>
!    <varlistentry>
!     <term><literal>fillfactor</literal></term>
      <listitem>
       <para>
        The fillfactor for an index is a percentage that determines how full
--- 361,372 ----
     </para>
  
     <variablelist>
!    <varlistentry id="index-reloption-fillfactor" xreflabel="fillfactor">
!     <term><literal>fillfactor</literal>
!      <indexterm>
!       <primary><varname>fillfactor</varname> storage parameter</primary>
!      </indexterm>
!     </term>
      <listitem>
       <para>
        The fillfactor for an index is a percentage that determines how full
***************
*** 388,395 **** CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
     </para>
  
     <variablelist>
!    <varlistentry>
!     <term><literal>vacuum_cleanup_index_scale_factor</literal></term>
      <listitem>
      <para>
        Per-index value for <xref linkend="guc-vacuum-cleanup-index-scale-factor"/>.
--- 392,404 ----
     </para>
  
     <variablelist>
!    <varlistentry id="index-reloption-vacuum-cleanup-index-scale-factor" xreflabel="vacuum_cleanup_index_scale_factor">
!     <term><literal>vacuum_cleanup_index_scale_factor</literal>
!      <indexterm>
!       <primary><varname>vacuum_cleanup_index_scale_factor</varname></primary>
!       <secondary>storage parameter</secondary>
!      </indexterm>
!     </term>
      <listitem>
      <para>
        Per-index value for <xref linkend="guc-vacuum-cleanup-index-scale-factor"/>.
***************
*** 403,410 **** CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
     </para>
  
     <variablelist>
!    <varlistentry>
!     <term><literal>buffering</literal></term>
      <listitem>
      <para>
       Determines whether the buffering build technique described in
--- 412,423 ----
     </para>
  
     <variablelist>
!    <varlistentry id="index-reloption-buffering" xreflabel="buffering">
!     <term><literal>buffering</literal>
!      <indexterm>
!       <primary><varname>buffering</varname> storage parameter</primary>
!      </indexterm>
!     </term>
      <listitem>
      <para>
       Determines whether the buffering build technique described in
***************
*** 422,429 **** CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
     </para>
  
     <variablelist>
!    <varlistentry>
!     <term><literal>fastupdate</literal></term>
      <listitem>
      <para>
       This setting controls usage of the fast update technique described in
--- 435,446 ----
     </para>
  
     <variablelist>
!    <varlistentry id="index-reloption-fastupdate" xreflabel="fastupdate">
!     <term><literal>fastupdate</literal>
!      <indexterm>
!       <primary><varname>fastupdate</varname> storage parameter</primary>
!      </indexterm>
!     </term>
      <listitem>
      <para>
       This setting controls usage of the fast update technique described in
***************
*** 446,454 **** CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
      </listitem>
     </varlistentry>
     </variablelist>
     <variablelist>
!    <varlistentry>
!     <term><literal>gin_pending_list_limit</literal></term>
      <listitem>
      <para>
       Custom <xref linkend="guc-gin-pending-list-limit"/> parameter.
--- 463,477 ----
      </listitem>
     </varlistentry>
     </variablelist>
+ 
     <variablelist>
!    <varlistentry id="index-reloption-gin-pending-list-limit" xreflabel="gin_pending_list_limit">
!     <term><literal>gin_pending_list_limit</literal>
!      <indexterm>
!       <primary><varname>gin_pending_list_limit</varname></primary>
!       <secondary>storage parameter</secondary>
!      </indexterm>
!     </term>
      <listitem>
      <para>
       Custom <xref linkend="guc-gin-pending-list-limit"/> parameter.
***************
*** 463,470 **** CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
     </para>
  
     <variablelist>
!    <varlistentry>
!     <term><literal>pages_per_range</literal></term>
      <listitem>
      <para>
       Defines the number of table blocks that make up one block range for
--- 486,497 ----
     </para>
  
     <variablelist>
!    <varlistentry id="index-reloption-pages-per-range" xreflabel="pages_per_range">
!     <term><literal>pages_per_range</literal>
!      <indexterm>
!       <primary><varname>pages_per_range</varname> storage parameter</primary>
!      </indexterm>
!     </term>
      <listitem>
      <para>
       Defines the number of table blocks that make up one block range for
***************
*** 474,481 **** CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autosummarize</literal></term>
      <listitem>
      <para>
       Defines whether a summarization run is invoked for the previous page
--- 501,512 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="index-reloption-autosummarize" xreflabel="autosummarize">
!     <term><literal>autosummarize</literal>
!      <indexterm>
!       <primary><varname>autosummarize</varname> storage parameter</primary>
!      </indexterm>
!     </term>
      <listitem>
      <para>
       Defines whether a summarization run is invoked for the previous page
*** a/doc/src/sgml/ref/create_table.sgml
--- b/doc/src/sgml/ref/create_table.sgml
***************
*** 1316,1323 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
  
     <variablelist>
  
!    <varlistentry>
!     <term><literal>fillfactor</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        The fillfactor for a table is a percentage between 10 and 100.
--- 1316,1327 ----
  
     <variablelist>
  
!     <varlistentry id="reloption-fillfactor" xreflabel="fillfactor">
!     <term><varname>fillfactor</varname> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>fillfactor</varname> storage parameter</primary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        The fillfactor for a table is a percentage between 10 and 100.
***************
*** 1334,1341 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>toast_tuple_target</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        The toast_tuple_target specifies the minimum tuple length required before
--- 1338,1349 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-toast-tuple-target" xreflabel="toast_tuple_target">
!     <term><literal>toast_tuple_target</literal> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>toast_tuple_target</varname> storage parameter</primary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        The toast_tuple_target specifies the minimum tuple length required before
***************
*** 1355,1362 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>parallel_workers</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        This sets the number of workers that should be used to assist a parallel
--- 1363,1374 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-parallel-workers" xreflabel="parallel_workers">
!     <term><literal>parallel_workers</literal> (<type>integer</type>)
!      <indexterm>
!      <primary><varname>parallel_workers</varname> storage parameter</primary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        This sets the number of workers that should be used to assist a parallel
***************
*** 1368,1375 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_enabled</literal>, <literal>toast.autovacuum_enabled</literal> (<type>boolean</type>)</term>
      <listitem>
       <para>
       Enables or disables the autovacuum daemon for a particular table.
--- 1380,1391 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-enabled" xreflabel="autovacuum_enabled">
!     <term><literal>autovacuum_enabled</literal>, <literal>toast.autovacuum_enabled</literal> (<type>boolean</type>)
!     <indexterm>
!      <primary><varname>autovacuum_enabled</varname> storage parameter</primary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
       Enables or disables the autovacuum daemon for a particular table.
***************
*** 1389,1396 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>vacuum_index_cleanup</literal> (<type>boolean</type>)</term>
      <listitem>
       <para>
        Enables or disables index cleanup when <command>VACUUM</command> is
--- 1405,1416 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-vacuum-index-cleanup" xreflabel="vacuum_index_cleanup">
!     <term><literal>vacuum_index_cleanup</literal> (<type>boolean</type>)
!     <indexterm>
!      <primary><varname>vacuum_index_cleanup</varname> storage parameter</primary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Enables or disables index cleanup when <command>VACUUM</command> is
***************
*** 1404,1411 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>vacuum_truncate</literal>, <literal>toast.vacuum_truncate</literal> (<type>boolean</type>)</term>
      <listitem>
       <para>
        Enables or disables vacuum to try to truncate off any empty pages
--- 1424,1435 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-vacuum-truncate" xreflabel="vacuum_truncate">
!     <term><literal>vacuum_truncate</literal>, <literal>toast.vacuum_truncate</literal> (<type>boolean</type>)
!     <indexterm>
!      <primary><varname>vacuum_truncate</varname> storage parameter</primary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Enables or disables vacuum to try to truncate off any empty pages
***************
*** 1419,1426 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_vacuum_threshold</literal>, <literal>toast.autovacuum_vacuum_threshold</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-vacuum-threshold"/>
--- 1443,1455 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-vacuum-threshold" xreflabel="autovacuum_vacuum_threshold">
!     <term><literal>autovacuum_vacuum_threshold</literal>, <literal>toast.autovacuum_vacuum_threshold</literal> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>autovacuum_vacuum_threshold</varname></primary>
!      <secondary>storage parameter</secondary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-vacuum-threshold"/>
***************
*** 1429,1436 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_vacuum_scale_factor</literal>, <literal>toast.autovacuum_vacuum_scale_factor</literal> (<type>float4</type>)</term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-vacuum-scale-factor"/>
--- 1458,1470 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-vauum-scale-factor" xreflabel="autovacuum_vacuum_scale_factor">
!     <term><literal>autovacuum_vacuum_scale_factor</literal>, <literal>toast.autovacuum_vacuum_scale_factor</literal> (<type>float4</type>)
!     <indexterm>
!      <primary><varname>autovacuum_vacuum_scale_factor</varname> </primary>
!      <secondary>storage parameter</secondary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-vacuum-scale-factor"/>
***************
*** 1439,1446 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_analyze_threshold</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-analyze-threshold"/>
--- 1473,1485 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-analyze-threshold" xreflabel="autovacuum_analyze_threshold">
!     <term><literal>autovacuum_analyze_threshold</literal> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>autovacuum_analyze_threshold</varname></primary>
!      <secondary>storage parameter</secondary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-analyze-threshold"/>
***************
*** 1449,1456 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_analyze_scale_factor</literal> (<type>float4</type>)</term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-analyze-scale-factor"/>
--- 1488,1500 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-analyze-scale-factor" xreflabel="autovacuum_analyze_scale_factor">
!     <term><literal>autovacuum_analyze_scale_factor</literal> (<type>float4</type>)
!     <indexterm>
!      <primary><varname>autovacuum_analyze_scale_factor</varname></primary>
!      <secondary>storage parameter</secondary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-analyze-scale-factor"/>
***************
*** 1459,1466 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_vacuum_cost_delay</literal>, <literal>toast.autovacuum_vacuum_cost_delay</literal> (<type>floating point</type>)</term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-vacuum-cost-delay"/>
--- 1503,1515 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-vacuum-cost-delay" xreflabel="autovacuum_vacuum_cost_delay">
!     <term><literal>autovacuum_vacuum_cost_delay</literal>, <literal>toast.autovacuum_vacuum_cost_delay</literal> (<type>floating point</type>)
!     <indexterm>
!      <primary><varname>autovacuum_vacuum_cost_delay</varname></primary>
!      <secondary>storage parameter</secondary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-vacuum-cost-delay"/>
***************
*** 1469,1476 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_vacuum_cost_limit</literal>, <literal>toast.autovacuum_vacuum_cost_limit</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-vacuum-cost-limit"/>
--- 1518,1530 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-vauum-cost-limit" xreflabel="autovacuum_vacuum_cost_limit">
!     <term><literal>autovacuum_vacuum_cost_limit</literal>, <literal>toast.autovacuum_vacuum_cost_limit</literal> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>autovacuum_vacuum_cost_limit</varname></primary>
!      <secondary>storage parameter</secondary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-vacuum-cost-limit"/>
***************
*** 1479,1486 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_freeze_min_age</literal>, <literal>toast.autovacuum_freeze_min_age</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-vacuum-freeze-min-age"/>
--- 1533,1544 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-freeze-min-age" xreflabel="autovacuum_freeze_min_age">
!     <term><literal>autovacuum_freeze_min_age</literal>, <literal>toast.autovacuum_freeze_min_age</literal> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>autovacuum_freeze_min_age</varname> storage parameter</primary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-vacuum-freeze-min-age"/>
***************
*** 1492,1499 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_freeze_max_age</literal>, <literal>toast.autovacuum_freeze_max_age</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-freeze-max-age"/>
--- 1550,1562 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-freeze-max-age" xreflabel="autovacuum_freeze_max_age">
!     <term><literal>autovacuum_freeze_max_age</literal>, <literal>toast.autovacuum_freeze_max_age</literal> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>autovacuum_freeze_max_age</varname></primary>
!      <secondary>storage parameter</secondary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-autovacuum-freeze-max-age"/>
***************
*** 1504,1511 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_freeze_table_age</literal>, <literal>toast.autovacuum_freeze_table_age</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-vacuum-freeze-table-age"/>
--- 1567,1578 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-freeze-table-age" xreflabel="autovacuum_freeze_table_age">
!     <term><literal>autovacuum_freeze_table_age</literal>, <literal>toast.autovacuum_freeze_table_age</literal> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>autovacuum_freeze_table_age</varname> storage parameter</primary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-vacuum-freeze-table-age"/>
***************
*** 1514,1521 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_multixact_freeze_min_age</literal>, <literal>toast.autovacuum_multixact_freeze_min_age</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-vacuum-multixact-freeze-min-age"/>
--- 1581,1592 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-multixact-freeze-min-age" xreflabel="autovacuum_multixact_freeze_min_age">
!     <term><literal>autovacuum_multixact_freeze_min_age</literal>, <literal>toast.autovacuum_multixact_freeze_min_age</literal> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>autovacuum_multixact_freeze_min_age</varname> storage parameter</primary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-vacuum-multixact-freeze-min-age"/>
***************
*** 1528,1535 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_multixact_freeze_max_age</literal>, <literal>toast.autovacuum_multixact_freeze_max_age</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        Per-table value
--- 1599,1611 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-multixact-freeze-max-age" xreflabel="autovacuum_multixact_freeze_max_age">
!     <term><literal>autovacuum_multixact_freeze_max_age</literal>, <literal>toast.autovacuum_multixact_freeze_max_age</literal> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>autovacuum_multixact_freeze_max_age</varname></primary>
!      <secondary>storage parameter</secondary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value
***************
*** 1542,1549 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>autovacuum_multixact_freeze_table_age</literal>, <literal>toast.autovacuum_multixact_freeze_table_age</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        Per-table value
--- 1618,1629 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-autovacuum-multixact-freeze-table-age" xreflabel="autovacuum_multixact_freeze_table_age">
!     <term><literal>autovacuum_multixact_freeze_table_age</literal>, <literal>toast.autovacuum_multixact_freeze_table_age</literal> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>autovacuum_multixact_freeze_table_age</varname> storage parameter</primary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value
***************
*** 1552,1559 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>log_autovacuum_min_duration</literal>, <literal>toast.log_autovacuum_min_duration</literal> (<type>integer</type>)</term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-log-autovacuum-min-duration"/>
--- 1632,1644 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-log-autovacuum-min-duration" xreflabel="log_autovacuum_min_duration">
!     <term><literal>log_autovacuum_min_duration</literal>, <literal>toast.log_autovacuum_min_duration</literal> (<type>integer</type>)
!     <indexterm>
!      <primary><varname>log_autovacuum_min_duration</varname></primary>
!      <secondary>storage parameter</secondary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Per-table value for <xref linkend="guc-log-autovacuum-min-duration"/>
***************
*** 1562,1569 **** WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
      </listitem>
     </varlistentry>
  
!    <varlistentry>
!     <term><literal>user_catalog_table</literal> (<type>boolean</type>)</term>
      <listitem>
       <para>
        Declare the table as an additional catalog table for purposes of
--- 1647,1658 ----
      </listitem>
     </varlistentry>
  
!    <varlistentry id="reloption-user-catalog-table" xreflabel="user_catalog_table">
!     <term><literal>user_catalog_table</literal> (<type>boolean</type>)
!     <indexterm>
!      <primary><varname>user_catalog_table</varname> storage parameter</primary>
!     </indexterm>
!     </term>
      <listitem>
       <para>
        Declare the table as an additional catalog table for purposes of