diff --git a/doc/src/sgml/auth-delay.sgml b/doc/src/sgml/auth-delay.sgml
index 91549ffe4f61e019645866fcd98a6f2fb2f52998..9a6e3e9bb4d818d2d9b18f54cddcc333a1fb96e5 100644
--- a/doc/src/sgml/auth-delay.sgml
+++ b/doc/src/sgml/auth-delay.sgml
@@ -28,10 +28,10 @@
    <varlistentry>
     <term>
      <varname>auth_delay.milliseconds</varname> (<type>int</type>)
+     <indexterm>
+      <primary><varname>auth_delay.milliseconds</> configuration parameter</primary>
+     </indexterm>
     </term>
-    <indexterm>
-     <primary><varname>auth_delay.milliseconds</> configuration parameter</primary>
-    </indexterm>
     <listitem>
      <para>
       The number of milliseconds to wait before reporting an authentication
diff --git a/doc/src/sgml/auto-explain.sgml b/doc/src/sgml/auto-explain.sgml
index 1037f1f2e22a404a7cab14b709ab967e0c40cb00..334996b0e668b78845216ba876818d4351dd4585 100644
--- a/doc/src/sgml/auto-explain.sgml
+++ b/doc/src/sgml/auto-explain.sgml
@@ -46,10 +46,10 @@ LOAD 'auto_explain';
    <varlistentry>
     <term>
      <varname>auto_explain.log_min_duration</varname> (<type>integer</type>)
+     <indexterm>
+      <primary><varname>auto_explain.log_min_duration</> configuration parameter</primary>
+     </indexterm>
     </term>
-    <indexterm>
-     <primary><varname>auto_explain.log_min_duration</> configuration parameter</primary>
-    </indexterm>
     <listitem>
      <para>
       <varname>auto_explain.log_min_duration</varname> is the minimum statement
@@ -65,10 +65,10 @@ LOAD 'auto_explain';
    <varlistentry>
     <term>
      <varname>auto_explain.log_analyze</varname> (<type>boolean</type>)
+     <indexterm>
+      <primary><varname>auto_explain.log_analyze</> configuration parameter</primary>
+     </indexterm>
     </term>
-    <indexterm>
-     <primary><varname>auto_explain.log_analyze</> configuration parameter</primary>
-    </indexterm>
     <listitem>
      <para>
       <varname>auto_explain.log_analyze</varname> causes <command>EXPLAIN ANALYZE</>
@@ -89,10 +89,10 @@ LOAD 'auto_explain';
    <varlistentry>
     <term>
      <varname>auto_explain.log_verbose</varname> (<type>boolean</type>)
+     <indexterm>
+      <primary><varname>auto_explain.log_verbose</> configuration parameter</primary>
+     </indexterm>
     </term>
-    <indexterm>
-     <primary><varname>auto_explain.log_verbose</> configuration parameter</primary>
-    </indexterm>
     <listitem>
      <para>
       <varname>auto_explain.log_verbose</varname> causes <command>EXPLAIN VERBOSE</>
@@ -106,10 +106,10 @@ LOAD 'auto_explain';
    <varlistentry>
     <term>
      <varname>auto_explain.log_buffers</varname> (<type>boolean</type>)
+     <indexterm>
+      <primary><varname>auto_explain.log_buffers</> configuration parameter</primary>
+     </indexterm>
     </term>
-    <indexterm>
-     <primary><varname>auto_explain.log_buffers</> configuration parameter</primary>
-    </indexterm>
     <listitem>
      <para>
       <varname>auto_explain.log_buffers</varname> causes <command>EXPLAIN
@@ -125,10 +125,10 @@ LOAD 'auto_explain';
    <varlistentry>
     <term>
      <varname>auto_explain.log_triggers</varname> (<type>boolean</type>)
+     <indexterm>
+      <primary><varname>auto_explain.log_triggers</> configuration parameter</primary>
+     </indexterm>
     </term>
-    <indexterm>
-     <primary><varname>auto_explain.log_triggers</> configuration parameter</primary>
-    </indexterm>
     <listitem>
      <para>
       <varname>auto_explain.log_triggers</varname> causes trigger
@@ -143,10 +143,10 @@ LOAD 'auto_explain';
    <varlistentry>
     <term>
      <varname>auto_explain.log_format</varname> (<type>enum</type>)
+     <indexterm>
+      <primary><varname>auto_explain.log_format</> configuration parameter</primary>
+     </indexterm>
     </term>
-    <indexterm>
-     <primary><varname>auto_explain.log_format</> configuration parameter</primary>
-    </indexterm>
     <listitem>
      <para>
       <varname>auto_explain.log_format</varname> selects the
@@ -161,10 +161,10 @@ LOAD 'auto_explain';
    <varlistentry>
     <term>
      <varname>auto_explain.log_timing</varname> (<type>boolean</type>)
+     <indexterm>
+      <primary><varname>auto_explain.log_timing</> configuration parameter</primary>
+     </indexterm>
     </term>
-    <indexterm>
-     <primary><varname>auto_explain.log_timing</> configuration parameter</primary>
-    </indexterm>
     <listitem>
      <para>
       <varname>auto_explain.log_timing</varname> causes <command>EXPLAIN
@@ -182,10 +182,10 @@ LOAD 'auto_explain';
    <varlistentry>
     <term>
      <varname>auto_explain.log_nested_statements</varname> (<type>boolean</type>)
+     <indexterm>
+      <primary><varname>auto_explain.log_nested_statements</> configuration parameter</primary>
+     </indexterm>
     </term>
-    <indexterm>
-     <primary><varname>auto_explain.log_nested_statements</> configuration parameter</primary>
-    </indexterm>
     <listitem>
      <para>
       <varname>auto_explain.log_nested_statements</varname> causes nested
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 4a33f87491556ce870e69440d6fb1582b0d0bd2e..9ff230aa6d9bb725d16bfa319c19dc4217f21d00 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -331,10 +331,11 @@ include 'filename'
 
      <variablelist>
      <varlistentry id="guc-data-directory" xreflabel="data_directory">
-      <term><varname>data_directory</varname> (<type>string</type>)</term>
+      <term><varname>data_directory</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>data_directory</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
          Specifies the directory to use for data storage.
@@ -344,10 +345,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-config-file" xreflabel="config_file">
-      <term><varname>config_file</varname> (<type>string</type>)</term>
+      <term><varname>config_file</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>config_file</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
          Specifies the main server configuration file
@@ -358,10 +360,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-hba-file" xreflabel="hba_file">
-      <term><varname>hba_file</varname> (<type>string</type>)</term>
+      <term><varname>hba_file</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>hba_file</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
          Specifies the configuration file for host-based authentication
@@ -372,10 +375,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-ident-file" xreflabel="ident_file">
-      <term><varname>ident_file</varname> (<type>string</type>)</term>
+      <term><varname>ident_file</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>ident_file</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
          Specifies the configuration file for
@@ -387,10 +391,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-external-pid-file" xreflabel="external_pid_file">
-      <term><varname>external_pid_file</varname> (<type>string</type>)</term>
+      <term><varname>external_pid_file</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>external_pid_file</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the name of an additional process-ID (PID) file that the
@@ -450,10 +455,11 @@ include 'filename'
      <variablelist>
 
      <varlistentry id="guc-listen-addresses" xreflabel="listen_addresses">
-      <term><varname>listen_addresses</varname> (<type>string</type>)</term>
+      <term><varname>listen_addresses</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>listen_addresses</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
          Specifies the TCP/IP address(es) on which the server is
@@ -480,10 +486,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-port" xreflabel="port">
-      <term><varname>port</varname> (<type>integer</type>)</term>
+      <term><varname>port</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>port</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         The TCP port the server listens on; 5432 by default.  Note that the
@@ -494,10 +501,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-max-connections" xreflabel="max_connections">
-      <term><varname>max_connections</varname> (<type>integer</type>)</term>
+      <term><varname>max_connections</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>max_connections</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Determines the maximum number of concurrent connections to the
@@ -518,10 +526,11 @@ include 'filename'
      <varlistentry id="guc-superuser-reserved-connections"
      xreflabel="superuser_reserved_connections">
       <term><varname>superuser_reserved_connections</varname>
-      (<type>integer</type>)</term>
+      (<type>integer</type>)
       <indexterm>
        <primary><varname>superuser_reserved_connections</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Determines the number of connection <quote>slots</quote> that
@@ -544,10 +553,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-unix-socket-directories" xreflabel="unix_socket_directories">
-      <term><varname>unix_socket_directories</varname> (<type>string</type>)</term>
+      <term><varname>unix_socket_directories</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>unix_socket_directories</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the directory of the Unix-domain socket(s) on which the
@@ -581,10 +591,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-unix-socket-group" xreflabel="unix_socket_group">
-      <term><varname>unix_socket_group</varname> (<type>string</type>)</term>
+      <term><varname>unix_socket_group</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>unix_socket_group</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the owning group of the Unix-domain socket(s).  (The owning
@@ -605,10 +616,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-unix-socket-permissions" xreflabel="unix_socket_permissions">
-      <term><varname>unix_socket_permissions</varname> (<type>integer</type>)</term>
+      <term><varname>unix_socket_permissions</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>unix_socket_permissions</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the access permissions of the Unix-domain socket(s).  Unix-domain
@@ -651,10 +663,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-bonjour" xreflabel="bonjour">
-      <term><varname>bonjour</varname> (<type>boolean</type>)</term>
+      <term><varname>bonjour</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>bonjour</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables advertising the server's existence via
@@ -665,10 +678,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-bonjour-name" xreflabel="bonjour_name">
-      <term><varname>bonjour_name</varname> (<type>string</type>)</term>
+      <term><varname>bonjour_name</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>bonjour_name</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the <productname>Bonjour</productname> service
@@ -682,10 +696,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-tcp-keepalives-idle" xreflabel="tcp_keepalives_idle">
-      <term><varname>tcp_keepalives_idle</varname> (<type>integer</type>)</term>
+      <term><varname>tcp_keepalives_idle</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>tcp_keepalives_idle</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the number of seconds of inactivity after which TCP
@@ -707,10 +722,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-tcp-keepalives-interval" xreflabel="tcp_keepalives_interval">
-      <term><varname>tcp_keepalives_interval</varname> (<type>integer</type>)</term>
+      <term><varname>tcp_keepalives_interval</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>tcp_keepalives_interval</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the number of seconds after which a TCP keepalive message
@@ -732,10 +748,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-tcp-keepalives-count" xreflabel="tcp_keepalives_count">
-      <term><varname>tcp_keepalives_count</varname> (<type>integer</type>)</term>
+      <term><varname>tcp_keepalives_count</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>tcp_keepalives_count</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the number of TCP keepalives that can be lost before
@@ -761,12 +778,13 @@ include 'filename'
 
      <variablelist>
      <varlistentry id="guc-authentication-timeout" xreflabel="authentication_timeout">
-      <term><varname>authentication_timeout</varname> (<type>integer</type>)</term>
+      <term><varname>authentication_timeout</varname> (<type>integer</type>)
       <indexterm><primary>timeout</><secondary>client authentication</></indexterm>
       <indexterm><primary>client authentication</><secondary>timeout during</></indexterm>
       <indexterm>
        <primary><varname>authentication_timeout</> configuration parameter</primary>
       </indexterm>
+      </term>
 
       <listitem>
        <para>
@@ -782,10 +800,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-ssl" xreflabel="ssl">
-      <term><varname>ssl</varname> (<type>boolean</type>)</term>
+      <term><varname>ssl</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>ssl</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables <acronym>SSL</> connections. Please read
@@ -798,10 +817,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-ssl-ca-file" xreflabel="ssl_ca_file">
-      <term><varname>ssl_ca_file</varname> (<type>string</type>)</term>
+      <term><varname>ssl_ca_file</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>ssl_ca_file</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the name of the file containing the SSL server certificate
@@ -815,10 +835,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-ssl-cert-file" xreflabel="ssl_cert_file">
-      <term><varname>ssl_cert_file</varname> (<type>string</type>)</term>
+      <term><varname>ssl_cert_file</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>ssl_cert_file</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the name of the file containing the SSL server certificate.
@@ -830,10 +851,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-ssl-crl-file" xreflabel="ssl_crl_file">
-      <term><varname>ssl_crl_file</varname> (<type>string</type>)</term>
+      <term><varname>ssl_crl_file</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>ssl_crl_file</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the name of the file containing the SSL server certificate
@@ -847,10 +869,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-ssl-key-file" xreflabel="ssl_key_file">
-      <term><varname>ssl_key_file</varname> (<type>string</type>)</term>
+      <term><varname>ssl_key_file</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>ssl_key_file</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the name of the file containing the SSL server private key.
@@ -862,10 +885,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-ssl-renegotiation-limit" xreflabel="ssl_renegotiation_limit">
-      <term><varname>ssl_renegotiation_limit</varname> (<type>integer</type>)</term>
+      <term><varname>ssl_renegotiation_limit</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>ssl_renegotiation_limit</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies how much data can flow over an <acronym>SSL</>-encrypted
@@ -890,10 +914,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-ssl-ciphers" xreflabel="ssl_ciphers">
-      <term><varname>ssl_ciphers</varname> (<type>string</type>)</term>
+      <term><varname>ssl_ciphers</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>ssl_ciphers</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies a list of <acronym>SSL</> cipher suites that are allowed to be
@@ -966,10 +991,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-ssl-prefer-server-ciphers" xreflabel="ssl_prefer_server_ciphers">
-      <term><varname>ssl_prefer_server_ciphers</varname> (<type>bool</type>)</term>
+      <term><varname>ssl_prefer_server_ciphers</varname> (<type>bool</type>)
       <indexterm>
        <primary><varname>ssl_prefer_server_ciphers</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies whether to use the server's SSL cipher preferences, rather
@@ -987,10 +1013,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-ssl-ecdh-curve" xreflabel="ssl_ecdh_curve">
-      <term><varname>ssl_ecdh_curve</varname> (<type>string</type>)</term>
+      <term><varname>ssl_ecdh_curve</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>ssl_ecdh_curve</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the name of the curve to use in ECDH key exchanges.  The
@@ -1005,10 +1032,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-password-encryption" xreflabel="password_encryption">
-      <term><varname>password_encryption</varname> (<type>boolean</type>)</term>
+      <term><varname>password_encryption</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>password_encryption</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When a password is specified in <xref
@@ -1023,10 +1051,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-krb-server-keyfile" xreflabel="krb_server_keyfile">
-      <term><varname>krb_server_keyfile</varname> (<type>string</type>)</term>
+      <term><varname>krb_server_keyfile</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>krb_server_keyfile</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the location of the Kerberos server key file. See
@@ -1038,10 +1067,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-krb-caseins-users" xreflabel="krb_caseins_users">
-      <term><varname>krb_caseins_users</varname> (<type>boolean</type>)</term>
+      <term><varname>krb_caseins_users</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>krb_caseins_users</varname> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets whether GSSAPI user names should be treated
@@ -1053,10 +1083,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-db-user-namespace" xreflabel="db_user_namespace">
-      <term><varname>db_user_namespace</varname> (<type>boolean</type>)</term>
+      <term><varname>db_user_namespace</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>db_user_namespace</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This parameter enables per-database user names.  It is off by default.
@@ -1115,10 +1146,11 @@ include 'filename'
 
      <variablelist>
      <varlistentry id="guc-shared-buffers" xreflabel="shared_buffers">
-      <term><varname>shared_buffers</varname> (<type>integer</type>)</term>
+      <term><varname>shared_buffers</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>shared_buffers</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the amount of memory the database server uses for shared
@@ -1160,10 +1192,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-huge-pages" xreflabel="huge_pages">
-      <term><varname>huge_pages</varname> (<type>enum</type>)</term>
+      <term><varname>huge_pages</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>huge_pages</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables/disables the use of huge memory pages. Valid values are
@@ -1193,10 +1226,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-temp-buffers" xreflabel="temp_buffers">
-      <term><varname>temp_buffers</varname> (<type>integer</type>)</term>
+      <term><varname>temp_buffers</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>temp_buffers</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the maximum number of temporary buffers used by each database
@@ -1221,10 +1255,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-max-prepared-transactions" xreflabel="max_prepared_transactions">
-      <term><varname>max_prepared_transactions</varname> (<type>integer</type>)</term>
+      <term><varname>max_prepared_transactions</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>max_prepared_transactions</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the maximum number of transactions that can be in the
@@ -1253,10 +1288,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-work-mem" xreflabel="work_mem">
-      <term><varname>work_mem</varname> (<type>integer</type>)</term>
+      <term><varname>work_mem</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>work_mem</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the amount of memory to be used by internal sort operations
@@ -1278,10 +1314,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-maintenance-work-mem" xreflabel="maintenance_work_mem">
-      <term><varname>maintenance_work_mem</varname> (<type>integer</type>)</term>
+      <term><varname>maintenance_work_mem</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>maintenance_work_mem</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the maximum amount of memory to be used by maintenance
@@ -1305,10 +1342,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-autovacuum-work-mem" xreflabel="autovacuum_work_mem">
-      <term><varname>autovacuum_work_mem</varname> (<type>integer</type>)</term>
+      <term><varname>autovacuum_work_mem</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>autovacuum_work_mem</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the maximum amount of memory to be used by each
@@ -1321,10 +1359,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-max-stack-depth" xreflabel="max_stack_depth">
-      <term><varname>max_stack_depth</varname> (<type>integer</type>)</term>
+      <term><varname>max_stack_depth</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>max_stack_depth</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the maximum safe depth of the server's execution stack.
@@ -1353,10 +1392,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-dynamic-shared-memory-type" xreflabel="dynamic_shared_memory_type">
-      <term><varname>dynamic_shared_memory_type</varname> (<type>enum</type>)</term>
+      <term><varname>dynamic_shared_memory_type</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>dynamic_shared_memory_type</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the dynamic shared memory implementation that the server
@@ -1386,10 +1426,11 @@ include 'filename'
 
      <variablelist>
      <varlistentry id="guc-temp-file-limit" xreflabel="temp_file_limit">
-      <term><varname>temp_file_limit</varname> (<type>integer</type>)</term>
+      <term><varname>temp_file_limit</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>temp_file_limit</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the maximum amount of disk space that a session can use
@@ -1418,10 +1459,11 @@ include 'filename'
 
      <variablelist>
      <varlistentry id="guc-max-files-per-process" xreflabel="max_files_per_process">
-      <term><varname>max_files_per_process</varname> (<type>integer</type>)</term>
+      <term><varname>max_files_per_process</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>max_files_per_process</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the maximum number of simultaneously open files allowed to each
@@ -1476,10 +1518,11 @@ include 'filename'
 
      <variablelist>
       <varlistentry id="guc-vacuum-cost-delay" xreflabel="vacuum_cost_delay">
-       <term><varname>vacuum_cost_delay</varname> (<type>integer</type>)</term>
+       <term><varname>vacuum_cost_delay</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>vacuum_cost_delay</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          The length of time, in milliseconds, that the process will sleep
@@ -1503,10 +1546,11 @@ include 'filename'
       </varlistentry>
 
       <varlistentry id="guc-vacuum-cost-page-hit" xreflabel="vacuum_cost_page_hit">
-       <term><varname>vacuum_cost_page_hit</varname> (<type>integer</type>)</term>
+       <term><varname>vacuum_cost_page_hit</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>vacuum_cost_page_hit</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          The estimated cost for vacuuming a buffer found in the shared buffer
@@ -1518,10 +1562,11 @@ include 'filename'
       </varlistentry>
 
       <varlistentry id="guc-vacuum-cost-page-miss" xreflabel="vacuum_cost_page_miss">
-       <term><varname>vacuum_cost_page_miss</varname> (<type>integer</type>)</term>
+       <term><varname>vacuum_cost_page_miss</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>vacuum_cost_page_miss</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          The estimated cost for vacuuming a buffer that has to be read from
@@ -1533,10 +1578,11 @@ include 'filename'
       </varlistentry>
 
       <varlistentry id="guc-vacuum-cost-page-dirty" xreflabel="vacuum_cost_page_dirty">
-       <term><varname>vacuum_cost_page_dirty</varname> (<type>integer</type>)</term>
+       <term><varname>vacuum_cost_page_dirty</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>vacuum_cost_page_dirty</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          The estimated cost charged when vacuum modifies a block that was
@@ -1548,10 +1594,11 @@ include 'filename'
       </varlistentry>
 
       <varlistentry id="guc-vacuum-cost-limit" xreflabel="vacuum_cost_limit">
-       <term><varname>vacuum_cost_limit</varname> (<type>integer</type>)</term>
+       <term><varname>vacuum_cost_limit</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>vacuum_cost_limit</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          The accumulated cost that will cause the vacuuming process to sleep.
@@ -1595,10 +1642,11 @@ include 'filename'
 
      <variablelist>
       <varlistentry id="guc-bgwriter-delay" xreflabel="bgwriter_delay">
-       <term><varname>bgwriter_delay</varname> (<type>integer</type>)</term>
+       <term><varname>bgwriter_delay</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>bgwriter_delay</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          Specifies the delay between activity rounds for the
@@ -1619,10 +1667,11 @@ include 'filename'
       </varlistentry>
 
       <varlistentry id="guc-bgwriter-lru-maxpages" xreflabel="bgwriter_lru_maxpages">
-       <term><varname>bgwriter_lru_maxpages</varname> (<type>integer</type>)</term>
+       <term><varname>bgwriter_lru_maxpages</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>bgwriter_lru_maxpages</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          In each round, no more than this many buffers will be written
@@ -1637,10 +1686,11 @@ include 'filename'
       </varlistentry>
 
       <varlistentry id="guc-bgwriter-lru-multiplier" xreflabel="bgwriter_lru_multiplier">
-       <term><varname>bgwriter_lru_multiplier</varname> (<type>floating point</type>)</term>
+       <term><varname>bgwriter_lru_multiplier</varname> (<type>floating point</type>)
        <indexterm>
         <primary><varname>bgwriter_lru_multiplier</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          The number of dirty buffers written in each round is based on the
@@ -1678,10 +1728,11 @@ include 'filename'
 
      <variablelist>
       <varlistentry id="guc-effective-io-concurrency" xreflabel="effective_io_concurrency">
-       <term><varname>effective_io_concurrency</varname> (<type>integer</type>)</term>
+       <term><varname>effective_io_concurrency</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>effective_io_concurrency</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          Sets the number of concurrent disk I/O operations that
@@ -1721,10 +1772,11 @@ include 'filename'
       </varlistentry>
 
       <varlistentry id="guc-max-worker-processes" xreflabel="max_worker_processes">
-       <term><varname>max_worker_processes</varname> (<type>integer</type>)</term>
+       <term><varname>max_worker_processes</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>max_worker_processes</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          Sets the maximum number of background processes that the system
@@ -1755,10 +1807,11 @@ include 'filename'
      <variablelist>
 
      <varlistentry id="guc-wal-level" xreflabel="wal_level">
-      <term><varname>wal_level</varname> (<type>enum</type>)</term>
+      <term><varname>wal_level</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>wal_level</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         <varname>wal_level</> determines how much information is written
@@ -1812,10 +1865,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-fsync" xreflabel="fsync">
-      <term><varname>fsync</varname> (<type>boolean</type>)</term>
+      <term><varname>fsync</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>fsync</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If this parameter is on, the <productname>PostgreSQL</> server
@@ -1873,10 +1927,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-synchronous-commit" xreflabel="synchronous_commit">
-      <term><varname>synchronous_commit</varname> (<type>enum</type>)</term>
+      <term><varname>synchronous_commit</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>synchronous_commit</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies whether transaction commit will wait for WAL records
@@ -1942,10 +1997,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-wal-sync-method" xreflabel="wal_sync_method">
-      <term><varname>wal_sync_method</varname> (<type>enum</type>)</term>
+      <term><varname>wal_sync_method</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>wal_sync_method</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Method used for forcing WAL updates out to disk.
@@ -1997,10 +2053,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-full-page-writes" xreflabel="full_page_writes">
-      <term><varname>full_page_writes</varname> (<type>boolean</type>)</term>
+      <term><varname>full_page_writes</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>full_page_writes</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When this parameter is on, the <productname>PostgreSQL</> server
@@ -2043,10 +2100,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-wal-log-hints" xreflabel="wal_log_hints">
-      <term><varname>wal_log_hints</varname> (<type>boolean</type>)</term>
+      <term><varname>wal_log_hints</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>wal_log_hints</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When this parameter is <literal>on</>, the <productname>PostgreSQL</>
@@ -2069,10 +2127,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-wal-buffers" xreflabel="wal_buffers">
-      <term><varname>wal_buffers</varname> (<type>integer</type>)</term>
+      <term><varname>wal_buffers</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>wal_buffers</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         The amount of shared memory used for WAL data that has not yet been
@@ -2100,10 +2159,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-wal-writer-delay" xreflabel="wal_writer_delay">
-      <term><varname>wal_writer_delay</varname> (<type>integer</type>)</term>
+      <term><varname>wal_writer_delay</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>wal_writer_delay</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the delay between activity rounds for the WAL writer.
@@ -2120,10 +2180,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-commit-delay" xreflabel="commit_delay">
-      <term><varname>commit_delay</varname> (<type>integer</type>)</term>
+      <term><varname>commit_delay</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>commit_delay</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         <varname>commit_delay</varname> adds a time delay, measured in
@@ -2155,10 +2216,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-commit-siblings" xreflabel="commit_siblings">
-      <term><varname>commit_siblings</varname> (<type>integer</type>)</term>
+      <term><varname>commit_siblings</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>commit_siblings</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Minimum number of concurrent open transactions to require
@@ -2177,10 +2239,11 @@ include 'filename'
 
     <variablelist>
      <varlistentry id="guc-checkpoint-segments" xreflabel="checkpoint_segments">
-      <term><varname>checkpoint_segments</varname> (<type>integer</type>)</term>
+      <term><varname>checkpoint_segments</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>checkpoint_segments</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Maximum number of log file segments between automatic WAL
@@ -2194,10 +2257,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-checkpoint-timeout" xreflabel="checkpoint_timeout">
-      <term><varname>checkpoint_timeout</varname> (<type>integer</type>)</term>
+      <term><varname>checkpoint_timeout</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>checkpoint_timeout</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Maximum time between automatic WAL checkpoints, in
@@ -2211,10 +2275,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-checkpoint-completion-target" xreflabel="checkpoint_completion_target">
-      <term><varname>checkpoint_completion_target</varname> (<type>floating point</type>)</term>
+      <term><varname>checkpoint_completion_target</varname> (<type>floating point</type>)
       <indexterm>
        <primary><varname>checkpoint_completion_target</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the target of checkpoint completion, as a fraction of
@@ -2227,10 +2292,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-checkpoint-warning" xreflabel="checkpoint_warning">
-      <term><varname>checkpoint_warning</varname> (<type>integer</type>)</term>
+      <term><varname>checkpoint_warning</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>checkpoint_warning</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Write a message to the server log if checkpoints caused by
@@ -2253,10 +2319,11 @@ include 'filename'
 
     <variablelist>
      <varlistentry id="guc-archive-mode" xreflabel="archive_mode">
-      <term><varname>archive_mode</varname> (<type>boolean</type>)</term>
+      <term><varname>archive_mode</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>archive_mode</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When <varname>archive_mode</> is enabled, completed WAL segments
@@ -2273,10 +2340,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-archive-command" xreflabel="archive_command">
-      <term><varname>archive_command</varname> (<type>string</type>)</term>
+      <term><varname>archive_command</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>archive_command</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         The local shell command to execute to archive a completed WAL file
@@ -2308,10 +2376,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-archive-timeout" xreflabel="archive_timeout">
-      <term><varname>archive_timeout</varname> (<type>integer</type>)</term>
+      <term><varname>archive_timeout</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>archive_timeout</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         The <xref linkend="guc-archive-command"> is only invoked for
@@ -2376,10 +2445,11 @@ include 'filename'
 
      <variablelist>
       <varlistentry id="guc-max-wal-senders" xreflabel="max_wal_senders">
-       <term><varname>max_wal_senders</varname> (<type>integer</type>)</term>
+       <term><varname>max_wal_senders</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>max_wal_senders</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
        <para>
         Specifies the maximum number of concurrent connections from
@@ -2401,10 +2471,11 @@ include 'filename'
       </varlistentry>
 
       <varlistentry id="guc-max-replication-slots" xreflabel="max_replication_slots">
-       <term><varname>max_replication_slots</varname> (<type>integer</type>)</term>
+       <term><varname>max_replication_slots</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>max_replication_slots</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          Specifies the maximum number of replication slots
@@ -2420,10 +2491,11 @@ include 'filename'
       </varlistentry>
 
       <varlistentry id="guc-wal-keep-segments" xreflabel="wal_keep_segments">
-       <term><varname>wal_keep_segments</varname> (<type>integer</type>)</term>
+       <term><varname>wal_keep_segments</varname> (<type>integer</type>)
        <indexterm>
         <primary><varname>wal_keep_segments</> configuration parameter</primary>
        </indexterm>
+       </term>
        <listitem>
        <para>
         Specifies the minimum number of past log file segments kept in the
@@ -2455,10 +2527,11 @@ include 'filename'
       </varlistentry>
 
      <varlistentry id="guc-wal-sender-timeout" xreflabel="wal_sender_timeout">
-      <term><varname>wal_sender_timeout</varname> (<type>integer</type>)</term>
+      <term><varname>wal_sender_timeout</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>wal_sender_timeout</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Terminate replication connections that are inactive longer
@@ -2493,10 +2566,11 @@ include 'filename'
     <variablelist>
 
      <varlistentry id="guc-synchronous-standby-names" xreflabel="synchronous_standby_names">
-      <term><varname>synchronous_standby_names</varname> (<type>string</type>)</term>
+      <term><varname>synchronous_standby_names</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>synchronous_standby_names</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies a comma-separated list of standby names that can support
@@ -2544,10 +2618,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-vacuum-defer-cleanup-age" xreflabel="vacuum_defer_cleanup_age">
-      <term><varname>vacuum_defer_cleanup_age</varname> (<type>integer</type>)</term>
+      <term><varname>vacuum_defer_cleanup_age</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>vacuum_defer_cleanup_age</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the number of transactions by which <command>VACUUM</> and
@@ -2587,10 +2662,11 @@ include 'filename'
     <variablelist>
 
      <varlistentry id="guc-hot-standby" xreflabel="hot_standby">
-      <term><varname>hot_standby</varname> (<type>boolean</type>)</term>
+      <term><varname>hot_standby</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>hot_standby</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies whether or not you can connect and run queries during
@@ -2603,10 +2679,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-max-standby-archive-delay" xreflabel="max_standby_archive_delay">
-      <term><varname>max_standby_archive_delay</varname> (<type>integer</type>)</term>
+      <term><varname>max_standby_archive_delay</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>max_standby_archive_delay</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When Hot Standby is active, this parameter determines how long the
@@ -2633,10 +2710,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-max-standby-streaming-delay" xreflabel="max_standby_streaming_delay">
-      <term><varname>max_standby_streaming_delay</varname> (<type>integer</type>)</term>
+      <term><varname>max_standby_streaming_delay</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>max_standby_streaming_delay</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When Hot Standby is active, this parameter determines how long the
@@ -2664,10 +2742,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-wal-receiver-status-interval" xreflabel="wal_receiver_status_interval">
-      <term><varname>wal_receiver_status_interval</varname> (<type>integer</type>)</term>
+      <term><varname>wal_receiver_status_interval</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>wal_receiver_status_interval</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
       <para>
        Specifies the minimum frequency for the WAL receiver
@@ -2690,10 +2769,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-hot-standby-feedback" xreflabel="hot_standby">
-      <term><varname>hot_standby_feedback</varname> (<type>boolean</type>)</term>
+      <term><varname>hot_standby_feedback</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>hot_standby_feedback</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies whether or not a hot standby will send feedback to the primary
@@ -2715,10 +2795,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-wal-receiver-timeout" xreflabel="wal_receiver_timeout">
-      <term><varname>wal_receiver_timeout</varname> (<type>integer</type>)</term>
+      <term><varname>wal_receiver_timeout</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>wal_receiver_timeout</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Terminate replication connections that are inactive longer
@@ -2763,13 +2844,14 @@ include 'filename'
 
      <variablelist>
      <varlistentry id="guc-enable-bitmapscan" xreflabel="enable_bitmapscan">
-      <term><varname>enable_bitmapscan</varname> (<type>boolean</type>)</term>
+      <term><varname>enable_bitmapscan</varname> (<type>boolean</type>)
       <indexterm>
        <primary>bitmap scan</primary>
       </indexterm>
       <indexterm>
        <primary><varname>enable_bitmapscan</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of bitmap-scan plan
@@ -2779,10 +2861,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-enable-hashagg" xreflabel="enable_hashagg">
-      <term><varname>enable_hashagg</varname> (<type>boolean</type>)</term>
+      <term><varname>enable_hashagg</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>enable_hashagg</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of hashed
@@ -2792,10 +2875,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-enable-hashjoin" xreflabel="enable_hashjoin">
-      <term><varname>enable_hashjoin</varname> (<type>boolean</type>)</term>
+      <term><varname>enable_hashjoin</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>enable_hashjoin</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of hash-join plan
@@ -2805,13 +2889,14 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-enable-indexscan" xreflabel="enable_indexscan">
-      <term><varname>enable_indexscan</varname> (<type>boolean</type>)</term>
+      <term><varname>enable_indexscan</varname> (<type>boolean</type>)
       <indexterm>
        <primary>index scan</primary>
       </indexterm>
       <indexterm>
        <primary><varname>enable_indexscan</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of index-scan plan
@@ -2821,13 +2906,14 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-enable-indexonlyscan" xreflabel="enable_indexonlyscan">
-      <term><varname>enable_indexonlyscan</varname> (<type>boolean</type>)</term>
+      <term><varname>enable_indexonlyscan</varname> (<type>boolean</type>)
       <indexterm>
        <primary>index-only scan</primary>
       </indexterm>
       <indexterm>
        <primary><varname>enable_indexonlyscan</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of index-only-scan plan
@@ -2837,10 +2923,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-enable-material" xreflabel="enable_material">
-      <term><varname>enable_material</varname> (<type>boolean</type>)</term>
+      <term><varname>enable_material</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>enable_material</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of materialization.
@@ -2853,10 +2940,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-enable-mergejoin" xreflabel="enable_mergejoin">
-      <term><varname>enable_mergejoin</varname> (<type>boolean</type>)</term>
+      <term><varname>enable_mergejoin</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>enable_mergejoin</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of merge-join plan
@@ -2866,10 +2954,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-enable-nestloop" xreflabel="enable_nestloop">
-      <term><varname>enable_nestloop</varname> (<type>boolean</type>)</term>
+      <term><varname>enable_nestloop</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>enable_nestloop</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of nested-loop join
@@ -2882,13 +2971,14 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-enable-seqscan" xreflabel="enable_seqscan">
-      <term><varname>enable_seqscan</varname> (<type>boolean</type>)</term>
+      <term><varname>enable_seqscan</varname> (<type>boolean</type>)
       <indexterm>
        <primary>sequential scan</primary>
       </indexterm>
       <indexterm>
        <primary><varname>enable_seqscan</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of sequential scan
@@ -2901,10 +2991,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-enable-sort" xreflabel="enable_sort">
-      <term><varname>enable_sort</varname> (<type>boolean</type>)</term>
+      <term><varname>enable_sort</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>enable_sort</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of explicit sort
@@ -2917,10 +3008,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-enable-tidscan" xreflabel="enable_tidscan">
-      <term><varname>enable_tidscan</varname> (<type>boolean</type>)</term>
+      <term><varname>enable_tidscan</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>enable_tidscan</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of <acronym>TID</>
@@ -2959,10 +3051,11 @@ include 'filename'
      <variablelist>
 
      <varlistentry id="guc-seq-page-cost" xreflabel="seq_page_cost">
-      <term><varname>seq_page_cost</varname> (<type>floating point</type>)</term>
+      <term><varname>seq_page_cost</varname> (<type>floating point</type>)
       <indexterm>
        <primary><varname>seq_page_cost</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the planner's estimate of the cost of a disk page fetch
@@ -2975,10 +3068,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-random-page-cost" xreflabel="random_page_cost">
-      <term><varname>random_page_cost</varname> (<type>floating point</type>)</term>
+      <term><varname>random_page_cost</varname> (<type>floating point</type>)
       <indexterm>
        <primary><varname>random_page_cost</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the planner's estimate of the cost of a
@@ -3033,10 +3127,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-cpu-tuple-cost" xreflabel="cpu_tuple_cost">
-      <term><varname>cpu_tuple_cost</varname> (<type>floating point</type>)</term>
+      <term><varname>cpu_tuple_cost</varname> (<type>floating point</type>)
       <indexterm>
        <primary><varname>cpu_tuple_cost</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the planner's estimate of the cost of processing
@@ -3047,10 +3142,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-cpu-index-tuple-cost" xreflabel="cpu_index_tuple_cost">
-      <term><varname>cpu_index_tuple_cost</varname> (<type>floating point</type>)</term>
+      <term><varname>cpu_index_tuple_cost</varname> (<type>floating point</type>)
       <indexterm>
        <primary><varname>cpu_index_tuple_cost</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the planner's estimate of the cost of processing
@@ -3061,10 +3157,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-cpu-operator-cost" xreflabel="cpu_operator_cost">
-      <term><varname>cpu_operator_cost</varname> (<type>floating point</type>)</term>
+      <term><varname>cpu_operator_cost</varname> (<type>floating point</type>)
       <indexterm>
        <primary><varname>cpu_operator_cost</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the planner's estimate of the cost of processing each
@@ -3075,10 +3172,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-effective-cache-size" xreflabel="effective_cache_size">
-      <term><varname>effective_cache_size</varname> (<type>integer</type>)</term>
+      <term><varname>effective_cache_size</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>effective_cache_size</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the planner's assumption about the effective size of the
@@ -3128,7 +3226,7 @@ include 'filename'
      <variablelist>
 
      <varlistentry id="guc-geqo" xreflabel="geqo">
-      <term><varname>geqo</varname> (<type>boolean</type>)</term>
+      <term><varname>geqo</varname> (<type>boolean</type>)
       <indexterm>
        <primary>genetic query optimization</primary>
       </indexterm>
@@ -3139,6 +3237,7 @@ include 'filename'
       <indexterm>
        <primary><varname>geqo</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables or disables genetic query optimization.
@@ -3150,10 +3249,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-geqo-threshold" xreflabel="geqo_threshold">
-      <term><varname>geqo_threshold</varname> (<type>integer</type>)</term>
+      <term><varname>geqo_threshold</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>geqo_threshold</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Use genetic query optimization to plan queries with at least
@@ -3170,11 +3270,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-geqo-effort" xreflabel="geqo_effort">
-      <term><varname>geqo_effort</varname>
-      (<type>integer</type>)</term>
+      <term><varname>geqo_effort</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>geqo_effort</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls the trade-off between planning time and query plan
@@ -3196,10 +3296,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-geqo-pool-size" xreflabel="geqo_pool_size">
-      <term><varname>geqo_pool_size</varname> (<type>integer</type>)</term>
+      <term><varname>geqo_pool_size</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>geqo_pool_size</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls the pool size used by GEQO, that is the
@@ -3213,10 +3314,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-geqo-generations" xreflabel="geqo_generations">
-      <term><varname>geqo_generations</varname> (<type>integer</type>)</term>
+      <term><varname>geqo_generations</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>geqo_generations</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls the number of generations used by GEQO, that is
@@ -3230,10 +3332,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-geqo-selection-bias" xreflabel="geqo_selection_bias">
-      <term><varname>geqo_selection_bias</varname> (<type>floating point</type>)</term>
+      <term><varname>geqo_selection_bias</varname> (<type>floating point</type>)
       <indexterm>
        <primary><varname>geqo_selection_bias</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls the selection bias used by GEQO. The selection bias
@@ -3244,10 +3347,11 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-geqo-seed" xreflabel="geqo_seed">
-      <term><varname>geqo_seed</varname> (<type>floating point</type>)</term>
+      <term><varname>geqo_seed</varname> (<type>floating point</type>)
       <indexterm>
        <primary><varname>geqo_seed</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls the initial value of the random number generator used
@@ -3267,10 +3371,11 @@ include 'filename'
      <variablelist>
 
      <varlistentry id="guc-default-statistics-target" xreflabel="default_statistics_target">
-      <term><varname>default_statistics_target</varname> (<type>integer</type>)</term>
+      <term><varname>default_statistics_target</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>default_statistics_target</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the default statistics target for table columns without
@@ -3285,13 +3390,14 @@ include 'filename'
      </varlistentry>
 
      <varlistentry id="guc-constraint-exclusion" xreflabel="constraint_exclusion">
-      <term><varname>constraint_exclusion</varname> (<type>enum</type>)</term>
+      <term><varname>constraint_exclusion</varname> (<type>enum</type>)
       <indexterm>
        <primary>constraint exclusion</primary>
       </indexterm>
       <indexterm>
        <primary><varname>constraint_exclusion</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls the query planner's use of table constraints to
@@ -3341,10 +3447,11 @@ SELECT * FROM parent WHERE key = 2400;
      </varlistentry>
 
      <varlistentry id="guc-cursor-tuple-fraction" xreflabel="cursor_tuple_fraction">
-      <term><varname>cursor_tuple_fraction</varname> (<type>floating point</type>)</term>
+      <term><varname>cursor_tuple_fraction</varname> (<type>floating point</type>)
       <indexterm>
        <primary><varname>cursor_tuple_fraction</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the planner's estimate of the fraction of a cursor's rows that
@@ -3361,10 +3468,11 @@ SELECT * FROM parent WHERE key = 2400;
      </varlistentry>
 
      <varlistentry id="guc-from-collapse-limit" xreflabel="from_collapse_limit">
-      <term><varname>from_collapse_limit</varname> (<type>integer</type>)</term>
+      <term><varname>from_collapse_limit</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>from_collapse_limit</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         The planner will merge sub-queries into upper queries if the
@@ -3383,10 +3491,11 @@ SELECT * FROM parent WHERE key = 2400;
      </varlistentry>
 
      <varlistentry id="guc-join-collapse-limit" xreflabel="join_collapse_limit">
-      <term><varname>join_collapse_limit</varname> (<type>integer</type>)</term>
+      <term><varname>join_collapse_limit</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>join_collapse_limit</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         The planner will rewrite explicit <literal>JOIN</>
@@ -3438,10 +3547,11 @@ SELECT * FROM parent WHERE key = 2400;
      <variablelist>
 
      <varlistentry id="guc-log-destination" xreflabel="log_destination">
-      <term><varname>log_destination</varname> (<type>string</type>)</term>
+      <term><varname>log_destination</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>log_destination</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         <productname>PostgreSQL</productname> supports several methods
@@ -3495,10 +3605,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-logging-collector" xreflabel="logging_collector">
-      <term><varname>logging_collector</varname> (<type>boolean</type>)</term>
+      <term><varname>logging_collector</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>logging_collector</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
          This parameter enables the <firstterm>logging collector</>, which
@@ -3541,10 +3652,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-directory" xreflabel="log_directory">
-      <term><varname>log_directory</varname> (<type>string</type>)</term>
+      <term><varname>log_directory</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>log_directory</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When <varname>logging_collector</> is enabled,
@@ -3558,10 +3670,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-filename" xreflabel="log_filename">
-      <term><varname>log_filename</varname> (<type>string</type>)</term>
+      <term><varname>log_filename</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>log_filename</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When <varname>logging_collector</varname> is enabled,
@@ -3605,10 +3718,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-file-mode" xreflabel="log_file_mode">
-      <term><varname>log_file_mode</varname> (<type>integer</type>)</term>
+      <term><varname>log_file_mode</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>log_file_mode</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         On Unix systems this parameter sets the permissions for log files
@@ -3638,10 +3752,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-rotation-age" xreflabel="log_rotation_age">
-      <term><varname>log_rotation_age</varname> (<type>integer</type>)</term>
+      <term><varname>log_rotation_age</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>log_rotation_age</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When <varname>logging_collector</varname> is enabled,
@@ -3656,10 +3771,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-rotation-size" xreflabel="log_rotation_size">
-      <term><varname>log_rotation_size</varname> (<type>integer</type>)</term>
+      <term><varname>log_rotation_size</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>log_rotation_size</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When <varname>logging_collector</varname> is enabled,
@@ -3674,10 +3790,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-truncate-on-rotation" xreflabel="log_truncate_on_rotation">
-      <term><varname>log_truncate_on_rotation</varname> (<type>boolean</type>)</term>
+      <term><varname>log_truncate_on_rotation</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_truncate_on_rotation</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When <varname>logging_collector</varname> is enabled,
@@ -3716,10 +3833,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-syslog-facility" xreflabel="syslog_facility">
-      <term><varname>syslog_facility</varname> (<type>enum</type>)</term>
+      <term><varname>syslog_facility</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>syslog_facility</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When logging to <application>syslog</> is enabled, this parameter
@@ -3738,10 +3856,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-syslog-ident" xreflabel="syslog_ident">
-      <term><varname>syslog_ident</varname> (<type>string</type>)</term>
+      <term><varname>syslog_ident</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>syslog_ident</> configuration parameter</primary>
       </indexterm>
+      </term>
        <listitem>
         <para>
          When logging to <application>syslog</> is enabled, this parameter
@@ -3756,10 +3875,11 @@ local0.*    /var/log/postgresql
       </varlistentry>
 
      <varlistentry id="guc-event-source" xreflabel="event_source">
-      <term><varname>event_source</varname> (<type>string</type>)</term>
+      <term><varname>event_source</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>event_source</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When logging to <application>event log</> is enabled, this parameter
@@ -3780,10 +3900,11 @@ local0.*    /var/log/postgresql
      <variablelist>
 
      <varlistentry id="guc-client-min-messages" xreflabel="client_min_messages">
-      <term><varname>client_min_messages</varname> (<type>enum</type>)</term>
+      <term><varname>client_min_messages</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>client_min_messages</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls which message levels are sent to the client.
@@ -3801,10 +3922,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-min-messages" xreflabel="log_min_messages">
-      <term><varname>log_min_messages</varname> (<type>enum</type>)</term>
+      <term><varname>log_min_messages</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>log_min_messages</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls which message levels are written to the server log.
@@ -3823,10 +3945,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-min-error-statement" xreflabel="log_min_error_statement">
-      <term><varname>log_min_error_statement</varname> (<type>enum</type>)</term>
+      <term><varname>log_min_error_statement</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>log_min_error_statement</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls which SQL statements that cause an error
@@ -3850,10 +3973,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-min-duration-statement" xreflabel="log_min_duration_statement">
-      <term><varname>log_min_duration_statement</varname> (<type>integer</type>)</term>
+      <term><varname>log_min_duration_statement</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>log_min_duration_statement</> configuration parameter</primary>
       </indexterm>
+      </term>
        <listitem>
         <para>
          Causes the duration of each completed statement to be logged
@@ -3985,10 +4109,11 @@ local0.*    /var/log/postgresql
      <variablelist>
 
      <varlistentry id="guc-application-name" xreflabel="application_name">
-      <term><varname>application_name</varname> (<type>string</type>)</term>
+      <term><varname>application_name</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>application_name</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         The <varname>application_name</varname> can be any string of less than
@@ -4005,18 +4130,21 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry>
-      <term><varname>debug_print_parse</varname> (<type>boolean</type>)</term>
-      <term><varname>debug_print_rewritten</varname> (<type>boolean</type>)</term>
-      <term><varname>debug_print_plan</varname> (<type>boolean</type>)</term>
+      <term><varname>debug_print_parse</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>debug_print_parse</> configuration parameter</primary>
       </indexterm>
+      </term>
+      <term><varname>debug_print_rewritten</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>debug_print_rewritten</> configuration parameter</primary>
       </indexterm>
+      </term>
+      <term><varname>debug_print_plan</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>debug_print_plan</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         These parameters enable various debugging output to be emitted.
@@ -4033,10 +4161,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry>
-      <term><varname>debug_pretty_print</varname> (<type>boolean</type>)</term>
+      <term><varname>debug_pretty_print</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>debug_pretty_print</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When set, <varname>debug_pretty_print</varname> indents the messages
@@ -4050,10 +4179,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-checkpoints" xreflabel="log_checkpoints">
-      <term><varname>log_checkpoints</varname> (<type>boolean</type>)</term>
+      <term><varname>log_checkpoints</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_checkpoints</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Causes checkpoints and restartpoints to be logged in the server log.
@@ -4066,10 +4196,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-connections" xreflabel="log_connections">
-      <term><varname>log_connections</varname> (<type>boolean</type>)</term>
+      <term><varname>log_connections</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_connections</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Causes each attempted connection to the server to be logged,
@@ -4090,10 +4221,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-disconnections" xreflabel="log_disconnections">
-      <term><varname>log_disconnections</varname> (<type>boolean</type>)</term>
+      <term><varname>log_disconnections</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_disconnections</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This outputs a line in the server log similar to
@@ -4107,10 +4239,11 @@ local0.*    /var/log/postgresql
 
 
      <varlistentry id="guc-log-duration" xreflabel="log_duration">
-      <term><varname>log_duration</varname> (<type>boolean</type>)</term>
+      <term><varname>log_duration</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_duration</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Causes the duration of every completed statement to be logged.
@@ -4140,10 +4273,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-error-verbosity" xreflabel="log_error_verbosity">
-      <term><varname>log_error_verbosity</varname> (<type>enum</type>)</term>
+      <term><varname>log_error_verbosity</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>log_error_verbosity</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls the amount of detail written in the server log for each
@@ -4161,10 +4295,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-hostname" xreflabel="log_hostname">
-      <term><varname>log_hostname</varname> (<type>boolean</type>)</term>
+      <term><varname>log_hostname</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_hostname</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         By default, connection log messages only show the IP address of the
@@ -4178,10 +4313,11 @@ local0.*    /var/log/postgresql
      </varlistentry>
 
      <varlistentry id="guc-log-line-prefix" xreflabel="log_line_prefix">
-      <term><varname>log_line_prefix</varname> (<type>string</type>)</term>
+      <term><varname>log_line_prefix</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>log_line_prefix</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
          This is a <function>printf</>-style string that is output at the
@@ -4336,10 +4472,11 @@ FROM pg_stat_activity;
      </varlistentry>
 
      <varlistentry id="guc-log-lock-waits" xreflabel="log_lock_waits">
-      <term><varname>log_lock_waits</varname> (<type>boolean</type>)</term>
+      <term><varname>log_lock_waits</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_lock_waits</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls whether a log message is produced when a session waits
@@ -4351,10 +4488,11 @@ FROM pg_stat_activity;
      </varlistentry>
 
      <varlistentry id="guc-log-statement" xreflabel="log_statement">
-      <term><varname>log_statement</varname> (<type>enum</type>)</term>
+      <term><varname>log_statement</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>log_statement</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls which SQL statements are logged. Valid values are
@@ -4395,10 +4533,11 @@ FROM pg_stat_activity;
      </varlistentry>
 
      <varlistentry id="guc-log-temp-files" xreflabel="log_temp_files">
-      <term><varname>log_temp_files</varname> (<type>integer</type>)</term>
+      <term><varname>log_temp_files</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>log_temp_files</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls logging of temporary file names and sizes.
@@ -4415,10 +4554,11 @@ FROM pg_stat_activity;
      </varlistentry>
 
      <varlistentry id="guc-log-timezone" xreflabel="log_timezone">
-      <term><varname>log_timezone</varname> (<type>string</type>)</term>
+      <term><varname>log_timezone</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>log_timezone</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the time zone used for timestamps written in the server log.
@@ -4579,10 +4719,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <variablelist>
 
      <varlistentry id="guc-track-activities" xreflabel="track_activities">
-      <term><varname>track_activities</varname> (<type>boolean</type>)</term>
+      <term><varname>track_activities</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>track_activities</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables the collection of information on the currently
@@ -4598,10 +4739,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-track-activity-query-size" xreflabel="track_activity_query_size">
-      <term><varname>track_activity_query_size</varname> (<type>integer</type>)</term>
+      <term><varname>track_activity_query_size</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>track_activity_query_size</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
        Specifies the number of bytes reserved to track the currently
@@ -4614,10 +4756,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-track-counts" xreflabel="track_counts">
-      <term><varname>track_counts</varname> (<type>boolean</type>)</term>
+      <term><varname>track_counts</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>track_counts</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables collection of statistics on database activity.
@@ -4629,10 +4772,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-track-io-timing" xreflabel="track_io_timing">
-      <term><varname>track_io_timing</varname> (<type>boolean</type>)</term>
+      <term><varname>track_io_timing</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>track_io_timing</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables timing of database I/O calls.  This parameter is off by
@@ -4650,10 +4794,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-track-functions" xreflabel="track_functions">
-      <term><varname>track_functions</varname> (<type>enum</type>)</term>
+      <term><varname>track_functions</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>track_functions</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables tracking of function call counts and time used. Specify
@@ -4674,10 +4819,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-update-process-title" xreflabel="update_process_title">
-      <term><varname>update_process_title</varname> (<type>boolean</type>)</term>
+      <term><varname>update_process_title</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>update_process_title</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables updating of the process title every time a new SQL command
@@ -4690,10 +4836,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-stats-temp-directory" xreflabel="stats_temp_directory">
-      <term><varname>stats_temp_directory</varname> (<type>string</type>)</term>
+      <term><varname>stats_temp_directory</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>stats_temp_directory</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the directory to store temporary statistics data in. This can be
@@ -4715,22 +4862,26 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <variablelist>
 
      <varlistentry>
-      <term><varname>log_statement_stats</varname> (<type>boolean</type>)</term>
-      <term><varname>log_parser_stats</varname> (<type>boolean</type>)</term>
-      <term><varname>log_planner_stats</varname> (<type>boolean</type>)</term>
-      <term><varname>log_executor_stats</varname> (<type>boolean</type>)</term>
+      <term><varname>log_statement_stats</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_statement_stats</> configuration parameter</primary>
       </indexterm>
+      </term>
+      <term><varname>log_parser_stats</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_parser_stats</> configuration parameter</primary>
       </indexterm>
+      </term>
+      <term><varname>log_planner_stats</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_planner_stats</> configuration parameter</primary>
       </indexterm>
+      </term>
+      <term><varname>log_executor_stats</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_executor_stats</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         For each query, output performance statistics of the respective
@@ -4767,10 +4918,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
     <variablelist>
 
      <varlistentry id="guc-autovacuum" xreflabel="autovacuum">
-      <term><varname>autovacuum</varname> (<type>boolean</type>)</term>
+      <term><varname>autovacuum</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>autovacuum</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls whether the server should run the
@@ -4790,10 +4942,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-log-autovacuum-min-duration" xreflabel="log_autovacuum_min_duration">
-      <term><varname>log_autovacuum_min_duration</varname> (<type>integer</type>)</term>
+      <term><varname>log_autovacuum_min_duration</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>log_autovacuum_min_duration</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Causes each action executed by autovacuum to be logged if it ran for at
@@ -4812,10 +4965,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-autovacuum-max-workers" xreflabel="autovacuum_max_workers">
-      <term><varname>autovacuum_max_workers</varname> (<type>integer</type>)</term>
+      <term><varname>autovacuum_max_workers</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>autovacuum_max_workers</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the maximum number of autovacuum processes (other than the
@@ -4826,10 +4980,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-autovacuum-naptime" xreflabel="autovacuum_naptime">
-      <term><varname>autovacuum_naptime</varname> (<type>integer</type>)</term>
+      <term><varname>autovacuum_naptime</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>autovacuum_naptime</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the minimum delay between autovacuum runs on any given
@@ -4844,10 +4999,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-autovacuum-vacuum-threshold" xreflabel="autovacuum_vacuum_threshold">
-      <term><varname>autovacuum_vacuum_threshold</varname> (<type>integer</type>)</term>
+      <term><varname>autovacuum_vacuum_threshold</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>autovacuum_vacuum_threshold</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the minimum number of updated or deleted tuples needed
@@ -4862,10 +5018,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-autovacuum-analyze-threshold" xreflabel="autovacuum_analyze_threshold">
-      <term><varname>autovacuum_analyze_threshold</varname> (<type>integer</type>)</term>
+      <term><varname>autovacuum_analyze_threshold</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>autovacuum_analyze_threshold</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the minimum number of inserted, updated or deleted tuples
@@ -4880,10 +5037,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-autovacuum-vacuum-scale-factor" xreflabel="autovacuum_vacuum_scale_factor">
-      <term><varname>autovacuum_vacuum_scale_factor</varname> (<type>floating point</type>)</term>
+      <term><varname>autovacuum_vacuum_scale_factor</varname> (<type>floating point</type>)
       <indexterm>
        <primary><varname>autovacuum_vacuum_scale_factor</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies a fraction of the table size to add to
@@ -4899,10 +5057,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-autovacuum-analyze-scale-factor" xreflabel="autovacuum_analyze_scale_factor">
-      <term><varname>autovacuum_analyze_scale_factor</varname> (<type>floating point</type>)</term>
+      <term><varname>autovacuum_analyze_scale_factor</varname> (<type>floating point</type>)
       <indexterm>
        <primary><varname>autovacuum_analyze_scale_factor</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies a fraction of the table size to add to
@@ -4918,10 +5077,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-autovacuum-freeze-max-age" xreflabel="autovacuum_freeze_max_age">
-      <term><varname>autovacuum_freeze_max_age</varname> (<type>integer</type>)</term>
+      <term><varname>autovacuum_freeze_max_age</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>autovacuum_freeze_max_age</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the maximum age (in transactions) that a table's
@@ -4945,10 +5105,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <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>)</term>
+      <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>
        <para>
         Specifies the maximum age (in multixacts) that a table's
@@ -4972,10 +5133,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-autovacuum-vacuum-cost-delay" xreflabel="autovacuum_vacuum_cost_delay">
-      <term><varname>autovacuum_vacuum_cost_delay</varname> (<type>integer</type>)</term>
+      <term><varname>autovacuum_vacuum_cost_delay</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>autovacuum_vacuum_cost_delay</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the cost delay value that will be used in automatic
@@ -4991,10 +5153,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-autovacuum-vacuum-cost-limit" xreflabel="autovacuum_vacuum_cost_limit">
-      <term><varname>autovacuum_vacuum_cost_limit</varname> (<type>integer</type>)</term>
+      <term><varname>autovacuum_vacuum_cost_limit</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>autovacuum_vacuum_cost_limit</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the cost limit value that will be used in automatic
@@ -5023,11 +5186,12 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <variablelist>
 
      <varlistentry id="guc-search-path" xreflabel="search_path">
-      <term><varname>search_path</varname> (<type>string</type>)</term>
+      <term><varname>search_path</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>search_path</> configuration parameter</primary>
       </indexterm>
       <indexterm><primary>path</><secondary>for schemas</></>
+      </term>
       <listitem>
        <para>
         This variable specifies the order in which schemas are searched
@@ -5108,11 +5272,12 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-default-tablespace" xreflabel="default_tablespace">
-      <term><varname>default_tablespace</varname> (<type>string</type>)</term>
+      <term><varname>default_tablespace</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>default_tablespace</> configuration parameter</primary>
       </indexterm>
       <indexterm><primary>tablespace</><secondary>default</></>
+      </term>
       <listitem>
        <para>
         This variable specifies the default tablespace in which to create
@@ -5149,11 +5314,12 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-temp-tablespaces" xreflabel="temp_tablespaces">
-      <term><varname>temp_tablespaces</varname> (<type>string</type>)</term>
+      <term><varname>temp_tablespaces</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>temp_tablespaces</> configuration parameter</primary>
       </indexterm>
       <indexterm><primary>tablespace</><secondary>temporary</></>
+      </term>
       <listitem>
        <para>
         This variable specifies tablespaces in which to create temporary
@@ -5197,10 +5363,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-check-function-bodies" xreflabel="check_function_bodies">
-      <term><varname>check_function_bodies</varname> (<type>boolean</type>)</term>
+      <term><varname>check_function_bodies</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>check_function_bodies</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This parameter is normally on. When set to <literal>off</>, it
@@ -5215,7 +5382,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-default-transaction-isolation" xreflabel="default_transaction_isolation">
-      <term><varname>default_transaction_isolation</varname> (<type>enum</type>)</term>
+      <term><varname>default_transaction_isolation</varname> (<type>enum</type>)
       <indexterm>
        <primary>transaction isolation level</primary>
        <secondary>setting default</secondary>
@@ -5223,6 +5390,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <indexterm>
        <primary><varname>default_transaction_isolation</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Each SQL transaction has an isolation level, which can be
@@ -5241,7 +5409,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-default-transaction-read-only" xreflabel="default_transaction_read_only">
-      <term><varname>default_transaction_read_only</varname> (<type>boolean</type>)</term>
+      <term><varname>default_transaction_read_only</varname> (<type>boolean</type>)
       <indexterm>
        <primary>read-only transaction</primary>
        <secondary>setting default</secondary>
@@ -5249,6 +5417,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <indexterm>
        <primary><varname>default_transaction_read_only</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         A read-only SQL transaction cannot alter non-temporary tables.
@@ -5263,7 +5432,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-default-transaction-deferrable" xreflabel="default_transaction_deferrable">
-      <term><varname>default_transaction_deferrable</varname> (<type>boolean</type>)</term>
+      <term><varname>default_transaction_deferrable</varname> (<type>boolean</type>)
       <indexterm>
        <primary>deferrable transaction</primary>
        <secondary>setting default</secondary>
@@ -5271,6 +5440,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <indexterm>
        <primary><varname>default_transaction_deferrable</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When running at the <literal>serializable</> isolation level,
@@ -5297,10 +5467,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
 
 
      <varlistentry id="guc-session-replication-role" xreflabel="session_replication_role">
-      <term><varname>session_replication_role</varname> (<type>enum</type>)</term>
+      <term><varname>session_replication_role</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>session_replication_role</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Controls firing of replication-related triggers and rules for the
@@ -5315,10 +5486,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-statement-timeout" xreflabel="statement_timeout">
-      <term><varname>statement_timeout</varname> (<type>integer</type>)</term>
+      <term><varname>statement_timeout</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>statement_timeout</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Abort any statement that takes more than the specified number of
@@ -5337,10 +5509,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-lock-timeout" xreflabel="lock_timeout">
-      <term><varname>lock_timeout</varname> (<type>integer</type>)</term>
+      <term><varname>lock_timeout</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>lock_timeout</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Abort any statement that waits longer than the specified number of
@@ -5371,10 +5544,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-vacuum-freeze-table-age" xreflabel="vacuum_freeze_table_age">
-      <term><varname>vacuum_freeze_table_age</varname> (<type>integer</type>)</term>
+      <term><varname>vacuum_freeze_table_age</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>vacuum_freeze_table_age</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         <command>VACUUM</> performs a whole-table scan if the table's
@@ -5392,10 +5566,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-vacuum-freeze-min-age" xreflabel="vacuum_freeze_min_age">
-      <term><varname>vacuum_freeze_min_age</varname> (<type>integer</type>)</term>
+      <term><varname>vacuum_freeze_min_age</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>vacuum_freeze_min_age</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the cutoff age (in transactions) that <command>VACUUM</>
@@ -5413,10 +5588,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-vacuum-multixact-freeze-table-age" xreflabel="vacuum_multixact_freeze_table_age">
-      <term><varname>vacuum_multixact_freeze_table_age</varname> (<type>integer</type>)</term>
+      <term><varname>vacuum_multixact_freeze_table_age</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>vacuum_multixact_freeze_table_age</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         <command>VACUUM</> performs a whole-table scan if the table's
@@ -5433,10 +5609,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-vacuum-multixact-freeze-min-age" xreflabel="vacuum_multixact_freeze_min_age">
-      <term><varname>vacuum_multixact_freeze_min_age</varname> (<type>integer</type>)</term>
+      <term><varname>vacuum_multixact_freeze_min_age</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>vacuum_multixact_freeze_min_age</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies the cutoff age (in multixacts) that <command>VACUUM</>
@@ -5454,10 +5631,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-bytea-output" xreflabel="bytea_output">
-      <term><varname>bytea_output</varname> (<type>enum</type>)</term>
+      <term><varname>bytea_output</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>bytea_output</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the output format for values of type <type>bytea</type>.
@@ -5471,10 +5649,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-xmlbinary" xreflabel="xmlbinary">
-      <term><varname>xmlbinary</varname> (<type>enum</type>)</term>
+      <term><varname>xmlbinary</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>xmlbinary</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets how binary values are to be encoded in XML.  This applies
@@ -5498,7 +5677,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      </varlistentry>
 
      <varlistentry id="guc-xmloption" xreflabel="xmloption">
-      <term><varname>xmloption</varname> (<type>enum</type>)</term>
+      <term><varname>xmloption</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>xmloption</> configuration parameter</primary>
       </indexterm>
@@ -5508,6 +5687,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <indexterm>
        <primary>XML option</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets whether <literal>DOCUMENT</literal> or
@@ -5537,10 +5717,11 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <variablelist>
 
      <varlistentry id="guc-datestyle" xreflabel="DateStyle">
-      <term><varname>DateStyle</varname> (<type>string</type>)</term>
+      <term><varname>DateStyle</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>DateStyle</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the display format for date and time values, as well as the
@@ -5564,10 +5745,11 @@ SET XML OPTION { DOCUMENT | CONTENT };
      </varlistentry>
 
      <varlistentry id="guc-intervalstyle" xreflabel="IntervalStyle">
-      <term><varname>IntervalStyle</varname> (<type>enum</type>)</term>
+      <term><varname>IntervalStyle</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>IntervalStyle</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the display format for interval values.
@@ -5594,11 +5776,12 @@ SET XML OPTION { DOCUMENT | CONTENT };
      </varlistentry>
 
      <varlistentry id="guc-timezone" xreflabel="TimeZone">
-      <term><varname>TimeZone</varname> (<type>string</type>)</term>
+      <term><varname>TimeZone</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>TimeZone</> configuration parameter</primary>
       </indexterm>
       <indexterm><primary>time zone</></>
+      </term>
       <listitem>
        <para>
         Sets the time zone for displaying and interpreting time stamps.
@@ -5611,11 +5794,12 @@ SET XML OPTION { DOCUMENT | CONTENT };
      </varlistentry>
 
      <varlistentry id="guc-timezone-abbreviations" xreflabel="timezone_abbreviations">
-      <term><varname>timezone_abbreviations</varname> (<type>string</type>)</term>
+      <term><varname>timezone_abbreviations</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>timezone_abbreviations</> configuration parameter</primary>
       </indexterm>
       <indexterm><primary>time zone names</></>
+      </term>
       <listitem>
        <para>
         Sets the collection of time zone abbreviations that will be accepted
@@ -5629,7 +5813,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
      </varlistentry>
 
      <varlistentry id="guc-extra-float-digits" xreflabel="extra_float_digits">
-      <term><varname>extra_float_digits</varname> (<type>integer</type>)</term>
+      <term><varname>extra_float_digits</varname> (<type>integer</type>)
       <indexterm>
        <primary>significant digits</primary>
       </indexterm>
@@ -5640,6 +5824,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
       <indexterm>
        <primary><varname>extra_float_digits</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This parameter adjusts the number of digits displayed for
@@ -5656,11 +5841,12 @@ SET XML OPTION { DOCUMENT | CONTENT };
      </varlistentry>
 
      <varlistentry id="guc-client-encoding" xreflabel="client_encoding">
-      <term><varname>client_encoding</varname> (<type>string</type>)</term>
+      <term><varname>client_encoding</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>client_encoding</> configuration parameter</primary>
       </indexterm>
       <indexterm><primary>character set</></>
+      </term>
       <listitem>
        <para>
         Sets the client-side encoding (character set).
@@ -5672,10 +5858,11 @@ SET XML OPTION { DOCUMENT | CONTENT };
      </varlistentry>
 
      <varlistentry id="guc-lc-messages" xreflabel="lc_messages">
-      <term><varname>lc_messages</varname> (<type>string</type>)</term>
+      <term><varname>lc_messages</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>lc_messages</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the language in which messages are displayed.  Acceptable
@@ -5703,10 +5890,11 @@ SET XML OPTION { DOCUMENT | CONTENT };
      </varlistentry>
 
      <varlistentry id="guc-lc-monetary" xreflabel="lc_monetary">
-      <term><varname>lc_monetary</varname> (<type>string</type>)</term>
+      <term><varname>lc_monetary</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>lc_monetary</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the locale to use for formatting monetary amounts, for
@@ -5721,10 +5909,11 @@ SET XML OPTION { DOCUMENT | CONTENT };
      </varlistentry>
 
      <varlistentry id="guc-lc-numeric" xreflabel="lc_numeric">
-      <term><varname>lc_numeric</varname> (<type>string</type>)</term>
+      <term><varname>lc_numeric</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>lc_numeric</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the locale to use for formatting numbers, for example
@@ -5739,10 +5928,11 @@ SET XML OPTION { DOCUMENT | CONTENT };
      </varlistentry>
 
      <varlistentry id="guc-lc-time" xreflabel="lc_time">
-      <term><varname>lc_time</varname> (<type>string</type>)</term>
+      <term><varname>lc_time</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>lc_time</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Sets the locale to use for formatting dates and times, for example
@@ -5757,10 +5947,11 @@ SET XML OPTION { DOCUMENT | CONTENT };
      </varlistentry>
 
      <varlistentry id="guc-default-text-search-config" xreflabel="default_text_search_config">
-      <term><varname>default_text_search_config</varname> (<type>string</type>)</term>
+      <term><varname>default_text_search_config</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>default_text_search_config</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Selects the text search configuration that is used by those variants
@@ -5824,13 +6015,14 @@ SET XML OPTION { DOCUMENT | CONTENT };
 
      <variablelist>
      <varlistentry id="guc-local-preload-libraries" xreflabel="local_preload_libraries">
-      <term><varname>local_preload_libraries</varname> (<type>string</type>)</term>
+      <term><varname>local_preload_libraries</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>local_preload_libraries</> configuration parameter</primary>
       </indexterm>
       <indexterm>
        <primary><filename>$libdir/plugins</></primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This variable specifies one or more shared libraries that are to be
@@ -5862,10 +6054,11 @@ SET XML OPTION { DOCUMENT | CONTENT };
 
 
      <varlistentry id="guc-session-preload-libraries" xreflabel="session_preload_libraries">
-      <term><varname>session_preload_libraries</varname> (<type>string</type>)</term>
+      <term><varname>session_preload_libraries</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>session_preload_libraries</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This variable specifies one or more shared libraries that are to be
@@ -5898,10 +6091,11 @@ SET XML OPTION { DOCUMENT | CONTENT };
      </varlistentry>
 
      <varlistentry id="guc-shared-preload-libraries" xreflabel="shared_preload_libraries">
-      <term><varname>shared_preload_libraries</varname> (<type>string</type>)</term>
+      <term><varname>shared_preload_libraries</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>shared_preload_libraries</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This variable specifies one or more shared libraries to be preloaded at
@@ -5950,11 +6144,12 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <variablelist>
 
      <varlistentry id="guc-dynamic-library-path" xreflabel="dynamic_library_path">
-      <term><varname>dynamic_library_path</varname> (<type>string</type>)</term>
+      <term><varname>dynamic_library_path</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>dynamic_library_path</> configuration parameter</primary>
       </indexterm>
       <indexterm><primary>dynamic loading</></>
+      </term>
       <listitem>
        <para>
         If a dynamically loadable module needs to be opened and the
@@ -6003,10 +6198,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-gin-fuzzy-search-limit" xreflabel="gin_fuzzy_search_limit">
-      <term><varname>gin_fuzzy_search_limit</varname> (<type>integer</type>)</term>
+      <term><varname>gin_fuzzy_search_limit</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>gin_fuzzy_search_limit</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Soft upper limit of the size of the set returned by GIN index scans. For more
@@ -6025,7 +6221,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <variablelist>
 
      <varlistentry id="guc-deadlock-timeout" xreflabel="deadlock_timeout">
-      <term><varname>deadlock_timeout</varname> (<type>integer</type>)</term>
+      <term><varname>deadlock_timeout</varname> (<type>integer</type>)
       <indexterm>
        <primary>deadlock</primary>
        <secondary>timeout during</secondary>
@@ -6037,6 +6233,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
       <indexterm>
        <primary><varname>deadlock_timeout</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This is the amount of time, in milliseconds, to wait on a lock
@@ -6067,10 +6264,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-max-locks-per-transaction" xreflabel="max_locks_per_transaction">
-      <term><varname>max_locks_per_transaction</varname> (<type>integer</type>)</term>
+      <term><varname>max_locks_per_transaction</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>max_locks_per_transaction</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         The shared lock table tracks locks on
@@ -6098,10 +6296,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-max-pred-locks-per-transaction" xreflabel="max_pred_locks_per_transaction">
-      <term><varname>max_pred_locks_per_transaction</varname> (<type>integer</type>)</term>
+      <term><varname>max_pred_locks_per_transaction</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>max_pred_locks_per_transaction</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         The shared predicate lock table tracks locks on
@@ -6135,10 +6334,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <variablelist>
 
      <varlistentry id="guc-array-nulls" xreflabel="array_nulls">
-      <term><varname>array_nulls</varname> (<type>boolean</type>)</term>
+      <term><varname>array_nulls</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>array_nulls</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This controls whether the array input parser recognizes
@@ -6160,11 +6360,12 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-backslash-quote" xreflabel="backslash_quote">
-      <term><varname>backslash_quote</varname> (<type>enum</type>)</term>
+      <term><varname>backslash_quote</varname> (<type>enum</type>)
       <indexterm><primary>strings</><secondary>backslash quotes</></>
       <indexterm>
        <primary><varname>backslash_quote</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This controls whether a quote mark can be represented by
@@ -6196,10 +6397,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-default-with-oids" xreflabel="default_with_oids">
-      <term><varname>default_with_oids</varname> (<type>boolean</type>)</term>
+      <term><varname>default_with_oids</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>default_with_oids</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This controls whether <command>CREATE TABLE</command> and
@@ -6224,11 +6426,12 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-escape-string-warning" xreflabel="escape_string_warning">
-      <term><varname>escape_string_warning</varname> (<type>boolean</type>)</term>
+      <term><varname>escape_string_warning</varname> (<type>boolean</type>)
       <indexterm><primary>strings</><secondary>escape warning</></>
       <indexterm>
        <primary><varname>escape_string_warning</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When on, a warning is issued if a backslash (<literal>\</>)
@@ -6247,10 +6450,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-lo-compat-privileges" xreflabel="lo_compat_privileges">
-      <term><varname>lo_compat_privileges</varname> (<type>boolean</type>)</term>
+      <term><varname>lo_compat_privileges</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>lo_compat_privileges</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         In <productname>PostgreSQL</> releases prior to 9.0, large objects
@@ -6272,10 +6476,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
     <varlistentry id="guc-quote-all-identifiers" xreflabel="quote-all-identifiers">
-      <term><varname>quote_all_identifiers</varname> (<type>boolean</type>)</term>
+      <term><varname>quote_all_identifiers</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>quote_all_identifiers</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When the database generates SQL, force all identifiers to be quoted,
@@ -6289,11 +6494,12 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-sql-inheritance" xreflabel="sql_inheritance">
-      <term><varname>sql_inheritance</varname> (<type>boolean</type>)</term>
+      <term><varname>sql_inheritance</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>sql_inheritance</> configuration parameter</primary>
       </indexterm>
       <indexterm><primary>inheritance</></>
+      </term>
       <listitem>
        <para>
         This setting controls whether undecorated table references are
@@ -6318,11 +6524,12 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-standard-conforming-strings" xreflabel="standard_conforming_strings">
-      <term><varname>standard_conforming_strings</varname> (<type>boolean</type>)</term>
+      <term><varname>standard_conforming_strings</varname> (<type>boolean</type>)
       <indexterm><primary>strings</><secondary>standard conforming</></>
       <indexterm>
        <primary><varname>standard_conforming_strings</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This controls whether ordinary string literals
@@ -6342,10 +6549,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-synchronize-seqscans" xreflabel="synchronize_seqscans">
-      <term><varname>synchronize_seqscans</varname> (<type>boolean</type>)</term>
+      <term><varname>synchronize_seqscans</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>synchronize_seqscans</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This allows sequential scans of large tables to synchronize with each
@@ -6371,11 +6579,12 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <variablelist>
 
      <varlistentry id="guc-transform-null-equals" xreflabel="transform_null_equals">
-      <term><varname>transform_null_equals</varname> (<type>boolean</type>)</term>
+      <term><varname>transform_null_equals</varname> (<type>boolean</type>)
       <indexterm><primary>IS NULL</></>
       <indexterm>
        <primary><varname>transform_null_equals</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When on, expressions of the form <literal><replaceable>expr</> =
@@ -6427,10 +6636,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
     <variablelist>
 
      <varlistentry id="guc-exit-on-error" xreflabel="exit_on_error">
-      <term><varname>exit_on_error</varname> (<type>boolean</type>)</term>
+      <term><varname>exit_on_error</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>exit_on_error</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If true, any error will terminate the current session.  By default,
@@ -6441,10 +6651,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-restart-after-crash" xreflabel="restart_after_crash">
-      <term><varname>restart_after_crash</varname> (<type>boolean</type>)</term>
+      <term><varname>restart_after_crash</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>restart_after_crash</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         When set to true, which is the default, <productname>PostgreSQL</>
@@ -6478,10 +6689,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
     <variablelist>
 
      <varlistentry id="guc-block-size" xreflabel="block_size">
-      <term><varname>block_size</varname> (<type>integer</type>)</term>
+      <term><varname>block_size</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>block_size</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports the size of a disk block.  It is determined by the value
@@ -6495,10 +6707,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-data-checksums" xreflabel="data_checksums">
-      <term><varname>data_checksums</varname> (<type>boolean</type>)</term>
+      <term><varname>data_checksums</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>data_checksums</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports whether data checksums are enabled for this cluster.
@@ -6508,10 +6721,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-integer-datetimes" xreflabel="integer_datetimes">
-      <term><varname>integer_datetimes</varname> (<type>boolean</type>)</term>
+      <term><varname>integer_datetimes</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>integer_datetimes</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports whether <productname>PostgreSQL</> was built with
@@ -6524,10 +6738,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-lc-collate" xreflabel="lc_collate">
-      <term><varname>lc_collate</varname> (<type>string</type>)</term>
+      <term><varname>lc_collate</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>lc_collate</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports the locale in which sorting of textual data is done.
@@ -6538,10 +6753,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-lc-ctype" xreflabel="lc_ctype">
-      <term><varname>lc_ctype</varname> (<type>string</type>)</term>
+      <term><varname>lc_ctype</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>lc_ctype</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports the locale that determines character classifications.
@@ -6554,10 +6770,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-max-function-args" xreflabel="max_function_args">
-      <term><varname>max_function_args</varname> (<type>integer</type>)</term>
+      <term><varname>max_function_args</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>max_function_args</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports the maximum number of function arguments. It is determined by
@@ -6568,10 +6785,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-max-identifier-length" xreflabel="max_identifier_length">
-      <term><varname>max_identifier_length</varname> (<type>integer</type>)</term>
+      <term><varname>max_identifier_length</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>max_identifier_length</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports the maximum identifier length. It is determined as one
@@ -6585,10 +6803,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-max-index-keys" xreflabel="max_index_keys">
-      <term><varname>max_index_keys</varname> (<type>integer</type>)</term>
+      <term><varname>max_index_keys</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>max_index_keys</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports the maximum number of index keys. It is determined by
@@ -6599,10 +6818,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-segment-size" xreflabel="segment_size">
-      <term><varname>segment_size</varname> (<type>integer</type>)</term>
+      <term><varname>segment_size</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>segment_size</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports the number of blocks (pages) that can be stored within a file
@@ -6615,11 +6835,12 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-server-encoding" xreflabel="server_encoding">
-      <term><varname>server_encoding</varname> (<type>string</type>)</term>
+      <term><varname>server_encoding</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>server_encoding</> configuration parameter</primary>
       </indexterm>
       <indexterm><primary>character set</></>
+      </term>
       <listitem>
        <para>
         Reports the database encoding (character set).
@@ -6631,10 +6852,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-server-version" xreflabel="server_version">
-      <term><varname>server_version</varname> (<type>string</type>)</term>
+      <term><varname>server_version</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>server_version</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports the version number of the server. It is determined by the
@@ -6644,10 +6866,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-server-version-num" xreflabel="server_version_num">
-      <term><varname>server_version_num</varname> (<type>integer</type>)</term>
+      <term><varname>server_version_num</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>server_version_num</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports the version number of the server as an integer. It is determined
@@ -6657,10 +6880,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-wal-block-size" xreflabel="wal_block_size">
-      <term><varname>wal_block_size</varname> (<type>integer</type>)</term>
+      <term><varname>wal_block_size</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>wal_block_size</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports the size of a WAL disk block.  It is determined by the value
@@ -6671,10 +6895,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-wal-segment-size" xreflabel="wal_segment_size">
-      <term><varname>wal_segment_size</varname> (<type>integer</type>)</term>
+      <term><varname>wal_segment_size</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>wal_segment_size</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Reports the number of blocks (pages) in a WAL segment file.
@@ -6732,10 +6957,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
 
     <variablelist>
      <varlistentry id="guc-allow-system-table-mods" xreflabel="allow_system_table_mods">
-      <term><varname>allow_system_table_mods</varname> (<type>boolean</type>)</term>
+      <term><varname>allow_system_table_mods</varname> (<type>boolean</type>)
       <indexterm>
         <primary><varname>allow_system_table_mods</varname> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Allows modification of the structure of system tables.
@@ -6746,10 +6972,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-debug-assertions" xreflabel="debug_assertions">
-      <term><varname>debug_assertions</varname> (<type>boolean</type>)</term>
+      <term><varname>debug_assertions</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>debug_assertions</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Turns on various assertion checks. This is a debugging aid. If
@@ -6767,10 +6994,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-ignore-system-indexes" xreflabel="ignore_system_indexes">
-      <term><varname>ignore_system_indexes</varname> (<type>boolean</type>)</term>
+      <term><varname>ignore_system_indexes</varname> (<type>boolean</type>)
       <indexterm>
         <primary><varname>ignore_system_indexes</varname> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Ignore system indexes when reading system tables (but still
@@ -6782,10 +7010,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-post-auth-delay" xreflabel="post_auth_delay">
-      <term><varname>post_auth_delay</varname> (<type>integer</type>)</term>
+      <term><varname>post_auth_delay</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>post_auth_delay</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If nonzero, a delay of this many seconds occurs when a new
@@ -6798,10 +7027,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-pre-auth-delay" xreflabel="pre_auth_delay">
-      <term><varname>pre_auth_delay</varname> (<type>integer</type>)</term>
+      <term><varname>pre_auth_delay</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>pre_auth_delay</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If nonzero, a delay of this many seconds occurs just after a
@@ -6816,10 +7046,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-trace-notify" xreflabel="trace_notify">
-      <term><varname>trace_notify</varname> (<type>boolean</type>)</term>
+      <term><varname>trace_notify</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>trace_notify</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Generates a great amount of debugging output for the
@@ -6833,10 +7064,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-trace-recovery-messages" xreflabel="trace_recovery_messages">
-      <term><varname>trace_recovery_messages</varname> (<type>enum</type>)</term>
+      <term><varname>trace_recovery_messages</varname> (<type>enum</type>)
       <indexterm>
        <primary><varname>trace_recovery_messages</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Enables logging of recovery-related debugging output that otherwise
@@ -6858,10 +7090,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry id="guc-trace-sort" xreflabel="trace_sort">
-      <term><varname>trace_sort</varname> (<type>boolean</type>)</term>
+      <term><varname>trace_sort</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>trace_sort</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If on, emit information about resource usage during sort operations.
@@ -6873,10 +7106,11 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      </varlistentry>
 
      <varlistentry>
-      <term><varname>trace_locks</varname> (<type>boolean</type>)</term>
+      <term><varname>trace_locks</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>trace_locks</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If on, emit information about lock usage.  Information dumped
@@ -6913,10 +7147,11 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      </varlistentry>
 
      <varlistentry>
-      <term><varname>trace_lwlocks</varname> (<type>boolean</type>)</term>
+      <term><varname>trace_lwlocks</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>trace_lwlocks</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If on, emit information about lightweight lock usage.  Lightweight
@@ -6932,10 +7167,11 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      </varlistentry>
 
      <varlistentry>
-      <term><varname>trace_userlocks</varname> (<type>boolean</type>)</term>
+      <term><varname>trace_userlocks</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>trace_userlocks</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If on, emit information about user lock usage.  Output is the same
@@ -6950,10 +7186,11 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      </varlistentry>
 
      <varlistentry>
-      <term><varname>trace_lock_oidmin</varname> (<type>integer</type>)</term>
+      <term><varname>trace_lock_oidmin</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>trace_lock_oidmin</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If set, do not trace locks for tables below this OID. (use to avoid
@@ -6968,10 +7205,11 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      </varlistentry>
 
      <varlistentry>
-      <term><varname>trace_lock_table</varname> (<type>integer</type>)</term>
+      <term><varname>trace_lock_table</varname> (<type>integer</type>)
       <indexterm>
        <primary><varname>trace_lock_table</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Unconditionally trace locks on this table (OID).
@@ -6985,10 +7223,11 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      </varlistentry>
 
      <varlistentry>
-      <term><varname>debug_deadlocks</varname> (<type>boolean</type>)</term>
+      <term><varname>debug_deadlocks</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>debug_deadlocks</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If set, dumps information about all current locks when a
@@ -7003,10 +7242,11 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      </varlistentry>
 
      <varlistentry>
-      <term><varname>log_btree_build_stats</varname> (<type>boolean</type>)</term>
+      <term><varname>log_btree_build_stats</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>log_btree_build_stats</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If set, logs system resource usage statistics (memory and CPU) on
@@ -7021,10 +7261,11 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      </varlistentry>
 
      <varlistentry id="guc-wal-debug" xreflabel="wal_debug">
-      <term><varname>wal_debug</varname> (<type>boolean</type>)</term>
+      <term><varname>wal_debug</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>wal_debug</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         If on, emit WAL-related debugging output. This parameter is
@@ -7036,10 +7277,11 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      </varlistentry>
 
     <varlistentry id="guc-ignore-checksum-failure" xreflabel="ignore_checksum_failure">
-      <term><varname>ignore_checksum_failure</varname> (<type>boolean</type>)</term>
+      <term><varname>ignore_checksum_failure</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>ignore_checksum_failure</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Only has effect if <xref linkend="app-initdb-data-checksums"> are enabled.
@@ -7060,10 +7302,11 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      </varlistentry>
 
     <varlistentry id="guc-zero-damaged-pages" xreflabel="zero_damaged_pages">
-      <term><varname>zero_damaged_pages</varname> (<type>boolean</type>)</term>
+      <term><varname>zero_damaged_pages</varname> (<type>boolean</type>)
       <indexterm>
        <primary><varname>zero_damaged_pages</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Detection of a damaged page header normally causes
diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml
index c24ed3742131e66f2d3ac3988574644c0f910712..3d90a36e5278b05f0e21fd606c7908a2c988b678 100644
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -56,8 +56,10 @@
 
   <variablelist>
    <varlistentry>
-    <term><systemitem class="osname">FreeBSD</></term>
-    <indexterm><primary>FreeBSD</><secondary>shared library</></>
+    <term>
+     <systemitem class="osname">FreeBSD</>
+     <indexterm><primary>FreeBSD</><secondary>shared library</></>
+    </term>
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
@@ -74,8 +76,10 @@ gcc -shared -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><systemitem class="osname">HP-UX</></term>
-    <indexterm><primary>HP-UX</><secondary>shared library</></>
+    <term>
+     <systemitem class="osname">HP-UX</>
+     <indexterm><primary>HP-UX</><secondary>shared library</></>
+    </term>
     <listitem>
      <para>
       The compiler flag of the system compiler to create
@@ -101,8 +105,10 @@ ld -b -o foo.sl foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><systemitem class="osname">Linux</></term>
-    <indexterm><primary>Linux</><secondary>shared library</></>
+    <term>
+     <systemitem class="osname">Linux</>
+     <indexterm><primary>Linux</><secondary>shared library</></>
+    </term>
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
@@ -120,8 +126,10 @@ cc -shared -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><systemitem class="osname">Mac OS X</></term>
-    <indexterm><primary>Mac OS X</><secondary>shared library</></>
+    <term>
+     <systemitem class="osname">Mac OS X</>
+     <indexterm><primary>Mac OS X</><secondary>shared library</></>
+    </term>
     <listitem>
      <para>
       Here is an example.  It assumes the developer tools are installed.
@@ -134,8 +142,10 @@ cc -bundle -flat_namespace -undefined suppress -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><systemitem class="osname">NetBSD</></term>
-    <indexterm><primary>NetBSD</><secondary>shared library</></>
+    <term>
+     <systemitem class="osname">NetBSD</>
+     <indexterm><primary>NetBSD</><secondary>shared library</></>
+    </term>
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
@@ -152,8 +162,10 @@ gcc -shared -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><systemitem class="osname">OpenBSD</></term>
-    <indexterm><primary>OpenBSD</><secondary>shared library</></>
+    <term>
+     <systemitem class="osname">OpenBSD</>
+     <indexterm><primary>OpenBSD</><secondary>shared library</></>
+    </term>
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
@@ -168,8 +180,10 @@ ld -Bshareable -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><systemitem class="osname">Solaris</></term>
-    <indexterm><primary>Solaris</><secondary>shared library</></>
+    <term>
+     <systemitem class="osname">Solaris</>
+     <indexterm><primary>Solaris</><secondary>shared library</></>
+    </term>
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
@@ -192,9 +206,11 @@ gcc -G -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><systemitem class="osname">Tru64 UNIX</></term>
-    <indexterm><primary>Tru64 UNIX</><secondary>shared library</></>
-    <indexterm><primary>Digital UNIX</><see>Tru64 UNIX</></>
+    <term>
+     <systemitem class="osname">Tru64 UNIX</>
+     <indexterm><primary>Tru64 UNIX</><secondary>shared library</></>
+     <indexterm><primary>Digital UNIX</><see>Tru64 UNIX</></>
+    </term>
     <listitem>
      <para>
       <acronym>PIC</acronym> is the default, so the compilation command
@@ -211,8 +227,10 @@ ld -shared -expect_unresolved '*' -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><systemitem class="osname">UnixWare</></term>
-    <indexterm><primary>UnixWare</><secondary>shared library</></>
+    <term>
+     <systemitem class="osname">UnixWare</>
+     <indexterm><primary>UnixWare</><secondary>shared library</></>
+    </term>
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is <option>-K
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 32160bf33f22f9a63f867f8a9b41891f9ab4e945..b6b582e24c28f3cf0e9e486044bb1821ad3f6d97 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -788,12 +788,12 @@ su - postgres
       </varlistentry>
 
       <varlistentry>
+       <term><option>--with-openssl</option>
        <indexterm>
         <primary>OpenSSL</primary>
         <seealso>SSL</seealso>
        </indexterm>
-
-       <term><option>--with-openssl</option></term>
+       </term>
        <listitem>
         <para>
          Build with support for <acronym>SSL</> (encrypted)
@@ -1070,10 +1070,11 @@ su - postgres
       </varlistentry>
 
       <varlistentry>
-       <term><option>--with-system-tzdata=<replaceable>DIRECTORY</replaceable></option></term>
+       <term><option>--with-system-tzdata=<replaceable>DIRECTORY</replaceable></option>
        <indexterm>
         <primary>time zone data</primary>
        </indexterm>
+       </term>
        <listitem>
         <para>
          <productname>PostgreSQL</> includes its own time zone database,
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 1f0975ada68f3c382bcae3a8f3b33a4f1c0e3927..e10ccec9f13c9d63633a666133b636f446a871a9 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -2609,11 +2609,13 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-sqlstate">
-          <term><symbol>PG_DIAG_SQLSTATE</></term>
+          <term>
+           <symbol>PG_DIAG_SQLSTATE</>
           <indexterm>
            <primary>error codes</primary>
            <secondary>libpq</secondary>
           </indexterm>
+          </term>
           <listitem>
            <para>
             The SQLSTATE code for the error. The SQLSTATE code identifies
diff --git a/doc/src/sgml/logicaldecoding.sgml b/doc/src/sgml/logicaldecoding.sgml
index 9cbd12c416f6d6ba2131c7577985ea96125bcd34..549f2bc9f5f26993d82b5196d9e35e462cb83e24 100644
--- a/doc/src/sgml/logicaldecoding.sgml
+++ b/doc/src/sgml/logicaldecoding.sgml
@@ -164,10 +164,10 @@ CTRL-C
   <sect1 id="logicaldecoding-explanation">
    <title>Logical Decoding Concepts</title>
    <sect2>
+    <title>Logical Decoding</title>
     <indexterm>
      <primary>Logical Decoding</primary>
     </indexterm>
-    <title>Logical Decoding</title>
     <para>
      Logical decoding is the process of extracting all persistent changes
      to a database's tables into a coherent, easy to understand format which
diff --git a/doc/src/sgml/pageinspect.sgml b/doc/src/sgml/pageinspect.sgml
index f4138558b25c9b25b29c40813ac95904981cf07e..923218389632783281192459a8bac1bf4b201f8f 100644
--- a/doc/src/sgml/pageinspect.sgml
+++ b/doc/src/sgml/pageinspect.sgml
@@ -18,11 +18,11 @@
 
   <variablelist>
    <varlistentry>
-    <indexterm>
-     <primary>get_raw_page</primary>
-    </indexterm>
     <term>
      <function>get_raw_page(relname text, fork text, blkno int) returns bytea</function>
+     <indexterm>
+      <primary>get_raw_page</primary>
+     </indexterm>
     </term>
 
     <listitem>
@@ -52,11 +52,11 @@
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>page_header</primary>
-    </indexterm>
     <term>
      <function>page_header(page bytea) returns record</function>
+     <indexterm>
+      <primary>page_header</primary>
+     </indexterm>
     </term>
 
     <listitem>
@@ -82,11 +82,11 @@ test=# SELECT * FROM page_header(get_raw_page('pg_class', 0));
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>heap_page_items</primary>
-    </indexterm>
     <term>
      <function>heap_page_items(page bytea) returns setof record</function>
+     <indexterm>
+      <primary>heap_page_items</primary>
+     </indexterm>
     </term>
 
     <listitem>
@@ -110,11 +110,11 @@ test=# SELECT * FROM heap_page_items(get_raw_page('pg_class', 0));
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>bt_metap</primary>
-    </indexterm>
     <term>
      <function>bt_metap(relname text) returns record</function>
+     <indexterm>
+      <primary>bt_metap</primary>
+     </indexterm>
     </term>
 
     <listitem>
@@ -136,11 +136,11 @@ fastlevel | 0
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>bt_page_stats</primary>
-    </indexterm>
     <term>
      <function>bt_page_stats(relname text, blkno int) returns record</function>
+     <indexterm>
+      <primary>bt_page_stats</primary>
+     </indexterm>
     </term>
 
     <listitem>
@@ -167,11 +167,11 @@ btpo_flags    | 3
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>bt_page_items</primary>
-    </indexterm>
     <term>
      <function>bt_page_items(relname text, blkno int) returns setof record</function>
+     <indexterm>
+      <primary>bt_page_items</primary>
+     </indexterm>
     </term>
 
     <listitem>
@@ -196,11 +196,11 @@ test=# SELECT * FROM bt_page_items('pg_cast_oid_index', 1);
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>fsm_page_contents</primary>
-    </indexterm>
     <term>
      <function>fsm_page_contents(page bytea) returns text</function>
+     <indexterm>
+      <primary>fsm_page_contents</primary>
+     </indexterm>
     </term>
 
     <listitem>
diff --git a/doc/src/sgml/pgfreespacemap.sgml b/doc/src/sgml/pgfreespacemap.sgml
index 7e070f15002ce14251ad71c3c8f09b91d2339993..f2f99d571efaecafd73d911ef2fd3c2787ae8bd6 100644
--- a/doc/src/sgml/pgfreespacemap.sgml
+++ b/doc/src/sgml/pgfreespacemap.sgml
@@ -25,11 +25,11 @@
 
   <variablelist>
    <varlistentry>
-    <indexterm>
-     <primary>pg_freespace</primary>
-    </indexterm>
     <term>
      <function>pg_freespace(rel regclass IN, blkno bigint IN) returns int2</function>
+     <indexterm>
+      <primary>pg_freespace</primary>
+     </indexterm>
     </term>
 
     <listitem>
diff --git a/doc/src/sgml/pgstatstatements.sgml b/doc/src/sgml/pgstatstatements.sgml
index d39f5a03ca635fcbb7dabac2e6ea87cbe988f09c..db6b10abc4063d7c84783b181814beb7a14c7ca0 100644
--- a/doc/src/sgml/pgstatstatements.sgml
+++ b/doc/src/sgml/pgstatstatements.sgml
@@ -279,12 +279,11 @@
 
   <variablelist>
    <varlistentry>
-   <indexterm>
-    <primary>pg_stat_statements_reset</primary>
-   </indexterm>
-
     <term>
      <function>pg_stat_statements_reset() returns void</function>
+     <indexterm>
+      <primary>pg_stat_statements_reset</primary>
+     </indexterm>
     </term>
 
     <listitem>
@@ -297,13 +296,12 @@
    </varlistentry>
 
    <varlistentry>
-   <indexterm>
-    <primary>pg_stat_statements</primary>
-    <secondary>function</secondary>
-   </indexterm>
-
     <term>
      <function>pg_stat_statements(showtext boolean) returns setof record</function>
+     <indexterm>
+      <primary>pg_stat_statements</primary>
+      <secondary>function</secondary>
+     </indexterm>
     </term>
 
     <listitem>
diff --git a/doc/src/sgml/pgstattuple.sgml b/doc/src/sgml/pgstattuple.sgml
index 81eeef302e17ae81448e81eceaadbbf441504af0..9cabd71166e8e948a610c30f573a7b762b0655ca 100644
--- a/doc/src/sgml/pgstattuple.sgml
+++ b/doc/src/sgml/pgstattuple.sgml
@@ -17,11 +17,10 @@
 
   <variablelist>
    <varlistentry>
-   <indexterm>
-    <primary>pgstattuple</primary>
-   </indexterm>
-
     <term>
+     <indexterm>
+      <primary>pgstattuple</primary>
+     </indexterm>
      <function>pgstattuple(regclass) returns record</>
     </term>
 
diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml
index 34663e475fe01edfc96ab2fd12f43b00b3006cd6..9117769125a9e0b868cc970ed3782796243c7de1 100644
--- a/doc/src/sgml/plperl.sgml
+++ b/doc/src/sgml/plperl.sgml
@@ -380,40 +380,13 @@ use strict;
 
    <variablelist>
     <varlistentry>
-     <indexterm>
-      <primary>spi_exec_query</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-     <indexterm>
-      <primary>spi_query</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-     <indexterm>
-      <primary>spi_fetchrow</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-     <indexterm>
-      <primary>spi_prepare</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-     <indexterm>
-      <primary>spi_exec_prepared</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-     <indexterm>
-      <primary>spi_query_prepared</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-     <indexterm>
-      <primary>spi_cursor_close</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-     <indexterm>
-      <primary>spi_freeplan</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>spi_exec_query</>(<replaceable>query</replaceable> [, <replaceable>max-rows</replaceable>])</literal></term>
+     <term>
+      <literal><function>spi_exec_query</>(<replaceable>query</replaceable> [, <replaceable>max-rows</replaceable>])</literal>
+      <indexterm>
+       <primary>spi_exec_query</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
      <listitem>
       <para>
        <literal>spi_exec_query</literal> executes an SQL command and
@@ -490,9 +463,27 @@ SELECT * FROM test_munge();
     </varlistentry>
 
     <varlistentry>
-     <term><literal><function>spi_query(<replaceable>command</replaceable>)</function></literal></term>
-     <term><literal><function>spi_fetchrow(<replaceable>cursor</replaceable>)</function></literal></term>
-     <term><literal><function>spi_cursor_close(<replaceable>cursor</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>spi_query(<replaceable>command</replaceable>)</function></literal>
+      <indexterm>
+       <primary>spi_query</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
+     <term>
+      <literal><function>spi_fetchrow(<replaceable>cursor</replaceable>)</function></literal>
+      <indexterm>
+       <primary>spi_fetchrow</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
+     <term>
+      <literal><function>spi_cursor_close(<replaceable>cursor</replaceable>)</function></literal>
+      <indexterm>
+       <primary>spi_cursor_close</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
 
     <listitem>
     <para>
@@ -548,10 +539,34 @@ SELECT * from lotsa_md5(500);
     </varlistentry>
 
     <varlistentry>
-     <term><literal><function>spi_prepare(<replaceable>command</replaceable>, <replaceable>argument types</replaceable>)</function></literal></term>
-     <term><literal><function>spi_query_prepared(<replaceable>plan</replaceable>, <replaceable>arguments</replaceable>)</function></literal></term>
-     <term><literal><function>spi_exec_prepared(<replaceable>plan</replaceable> [, <replaceable>attributes</replaceable>], <replaceable>arguments</replaceable>)</function></literal></term>
-     <term><literal><function>spi_freeplan(<replaceable>plan</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>spi_prepare(<replaceable>command</replaceable>, <replaceable>argument types</replaceable>)</function></literal>
+      <indexterm>
+       <primary>spi_prepare</primary>
+       <secondary>in PL/Perl</secondary>
+     </indexterm>
+     </term>
+     <term>
+      <literal><function>spi_query_prepared(<replaceable>plan</replaceable>, <replaceable>arguments</replaceable>)</function></literal>
+      <indexterm>
+       <primary>spi_query_prepared</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
+     <term>
+      <literal><function>spi_exec_prepared(<replaceable>plan</replaceable> [, <replaceable>attributes</replaceable>], <replaceable>arguments</replaceable>)</function></literal>
+      <indexterm>
+       <primary>spi_exec_prepared</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
+     <term>
+      <literal><function>spi_freeplan(<replaceable>plan</replaceable>)</function></literal>
+      <indexterm>
+       <primary>spi_freeplan</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
 
     <listitem>
     <para>
@@ -651,12 +666,13 @@ SELECT release_hosts_query();
 
    <variablelist>
     <varlistentry>
-     <indexterm>
-      <primary>elog</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>elog(<replaceable>level</replaceable>, <replaceable>msg</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>elog(<replaceable>level</replaceable>, <replaceable>msg</replaceable>)</function></literal>
+      <indexterm>
+       <primary>elog</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
      <listitem>
       <para>
        Emit a log or error message. Possible levels are
@@ -680,12 +696,13 @@ SELECT release_hosts_query();
     </varlistentry>
 
     <varlistentry>
-     <indexterm>
-      <primary>quote_literal</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>quote_literal(<replaceable>string</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>quote_literal(<replaceable>string</replaceable>)</function></literal>
+      <indexterm>
+       <primary>quote_literal</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
      <listitem>
       <para>
         Return the given string suitably quoted to be used as a string literal in an SQL
@@ -697,12 +714,13 @@ SELECT release_hosts_query();
     </varlistentry>
 
     <varlistentry>
-     <indexterm>
-      <primary>quote_nullable</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>quote_nullable(<replaceable>string</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>quote_nullable(<replaceable>string</replaceable>)</function></literal>
+      <indexterm>
+       <primary>quote_nullable</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
      <listitem>
       <para>
         Return the given string suitably quoted to be used as a string literal in an SQL
@@ -713,12 +731,13 @@ SELECT release_hosts_query();
     </varlistentry>
 
     <varlistentry>
-     <indexterm>
-      <primary>quote_ident</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>quote_ident(<replaceable>string</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>quote_ident(<replaceable>string</replaceable>)</function></literal>
+      <indexterm>
+       <primary>quote_ident</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
      <listitem>
       <para>
         Return the given string suitably quoted to be used as an identifier in
@@ -730,12 +749,13 @@ SELECT release_hosts_query();
     </varlistentry>
 
     <varlistentry>
-     <indexterm>
-      <primary>decode_bytea</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>decode_bytea(<replaceable>string</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>decode_bytea(<replaceable>string</replaceable>)</function></literal>
+      <indexterm>
+       <primary>decode_bytea</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
      <listitem>
       <para>
         Return the unescaped binary data represented by the contents of the given string,
@@ -745,12 +765,13 @@ SELECT release_hosts_query();
     </varlistentry>
 
     <varlistentry>
-     <indexterm>
-      <primary>encode_bytea</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>encode_bytea(<replaceable>string</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>encode_bytea(<replaceable>string</replaceable>)</function></literal>
+      <indexterm>
+       <primary>encode_bytea</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
      <listitem>
       <para>
         Return the <type>bytea</type> encoded form of the binary data contents of the given string.
@@ -759,13 +780,16 @@ SELECT release_hosts_query();
     </varlistentry>
 
     <varlistentry>
-     <indexterm>
-      <primary>encode_array_literal</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>encode_array_literal(<replaceable>array</replaceable>)</function></literal></term>
-     <term><literal><function>encode_array_literal(<replaceable>array</replaceable>, <replaceable>delimiter</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>encode_array_literal(<replaceable>array</replaceable>)</function></literal>
+      <indexterm>
+       <primary>encode_array_literal</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
+     <term>
+      <literal><function>encode_array_literal(<replaceable>array</replaceable>, <replaceable>delimiter</replaceable>)</function></literal>
+     </term>
      <listitem>
       <para>
         Returns the contents of the referenced array as a string in array literal format
@@ -778,12 +802,13 @@ SELECT release_hosts_query();
     </varlistentry>
 
     <varlistentry>
-     <indexterm>
-      <primary>encode_typed_literal</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>encode_typed_literal(<replaceable>value</replaceable>, <replaceable>typename</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>encode_typed_literal(<replaceable>value</replaceable>, <replaceable>typename</replaceable>)</function></literal>
+      <indexterm>
+       <primary>encode_typed_literal</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
       <listitem>
        <para>
          Converts a Perl variable to the value of the data type passed as a
@@ -794,12 +819,13 @@ SELECT release_hosts_query();
     </varlistentry>
 
     <varlistentry>
-     <indexterm>
-      <primary>encode_array_constructor</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>encode_array_constructor(<replaceable>array</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>encode_array_constructor(<replaceable>array</replaceable>)</function></literal>
+      <indexterm>
+       <primary>encode_array_constructor</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
      <listitem>
       <para>
         Returns the contents of the referenced array as a string in array constructor format
@@ -812,12 +838,13 @@ SELECT release_hosts_query();
     </varlistentry>
 
     <varlistentry>
-     <indexterm>
-      <primary>looks_like_number</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>looks_like_number(<replaceable>string</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>looks_like_number(<replaceable>string</replaceable>)</function></literal>
+      <indexterm>
+       <primary>looks_like_number</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
      <listitem>
       <para>
         Returns a true value if the content of the given string looks like a
@@ -829,12 +856,13 @@ SELECT release_hosts_query();
     </varlistentry>
 
     <varlistentry>
-     <indexterm>
-      <primary>is_array_ref</primary>
-      <secondary>in PL/Perl</secondary>
-     </indexterm>
-
-     <term><literal><function>is_array_ref(<replaceable>argument</replaceable>)</function></literal></term>
+     <term>
+      <literal><function>is_array_ref(<replaceable>argument</replaceable>)</function></literal>
+      <indexterm>
+       <primary>is_array_ref</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
      <listitem>
       <para>
         Returns a true value if the given argument may be treated as an
@@ -1274,10 +1302,12 @@ CREATE EVENT TRIGGER perl_a_snitch
   <variablelist>
 
      <varlistentry id="guc-plperl-on-init" xreflabel="plperl.on_init">
-      <term><varname>plperl.on_init</varname> (<type>string</type>)</term>
+      <term>
+       <varname>plperl.on_init</varname> (<type>string</type>)
       <indexterm>
        <primary><varname>plperl.on_init</> configuration parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies Perl code to be executed when a Perl interpreter is first
@@ -1329,14 +1359,18 @@ DO 'elog(WARNING, join ", ", sort keys %INC)' LANGUAGE plperl;
      </varlistentry>
 
      <varlistentry id="guc-plperl-on-plperl-init" xreflabel="plperl.on_plperl_init">
-      <term><varname>plperl.on_plperl_init</varname> (<type>string</type>)</term>
-      <term><varname>plperl.on_plperlu_init</varname> (<type>string</type>)</term>
-      <indexterm>
-       <primary><varname>plperl.on_plperl_init</> configuration parameter</primary>
-      </indexterm>
-      <indexterm>
-       <primary><varname>plperl.on_plperlu_init</> configuration parameter</primary>
-      </indexterm>
+      <term>
+       <varname>plperl.on_plperl_init</varname> (<type>string</type>)
+       <indexterm>
+        <primary><varname>plperl.on_plperl_init</> configuration parameter</primary>
+       </indexterm>
+      </term>
+      <term>
+       <varname>plperl.on_plperlu_init</varname> (<type>string</type>)
+       <indexterm>
+        <primary><varname>plperl.on_plperlu_init</> configuration parameter</primary>
+       </indexterm>
+      </term>
       <listitem>
        <para>
         These parameters specify Perl code to be executed when a Perl
@@ -1368,10 +1402,12 @@ DO 'elog(WARNING, join ", ", sort keys %INC)' LANGUAGE plperl;
      </varlistentry>
 
      <varlistentry id="guc-plperl-use-strict" xreflabel="plperl.use_strict">
-      <term><varname>plperl.use_strict</varname> (<type>boolean</type>)</term>
-      <indexterm>
-       <primary><varname>plperl.use_strict</> configuration parameter</primary>
-      </indexterm>
+      <term>
+       <varname>plperl.use_strict</varname> (<type>boolean</type>)
+       <indexterm>
+        <primary><varname>plperl.use_strict</> configuration parameter</primary>
+       </indexterm>
+      </term>
       <listitem>
        <para>
         When set true subsequent compilations of PL/Perl functions will have
diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
index 80400fad7b3dfbf5563a01387754797bef4a4783..e47ad96de177802a60528bbe711e346078afbf5a 100644
--- a/doc/src/sgml/pltcl.sgml
+++ b/doc/src/sgml/pltcl.sgml
@@ -418,10 +418,13 @@ $$ LANGUAGE pltcl;
      </varlistentry>
 
      <varlistentry>
-      <indexterm>
-       <primary>spi_lastoid</primary>
-      </indexterm>
-      <term><function>spi_lastoid</></term>
+      <term>
+       <function>spi_lastoid</>
+       <indexterm>
+        <primary>spi_lastoid</primary>
+        <secondary>in PL/Tcl</secondary>
+       </indexterm>
+      </term>
       <listitem>
        <para>
         Returns the OID of the row inserted by the last
@@ -478,11 +481,13 @@ SELECT 'doesn''t' AS ret
      </varlistentry>
 
      <varlistentry>
-      <indexterm>
-       <primary>elog</primary>
-       <secondary>in PL/Tcl</secondary>
-      </indexterm>
-      <term><function>elog</> <replaceable>level</replaceable> <replaceable>msg</replaceable></term>
+      <term>
+       <function>elog</> <replaceable>level</replaceable> <replaceable>msg</replaceable>
+       <indexterm>
+        <primary>elog</primary>
+        <secondary>in PL/Tcl</secondary>
+       </indexterm>
+      </term>
       <listitem>
        <para>
         Emits a log or error message. Possible levels are
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 36d16a557c924b58132e6de431780083126b7e06..c37113cb35ba51b64485148ac856007a7ab15e73 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -1428,8 +1428,7 @@ The commands accepted in walsender mode are:
   </varlistentry>
 
   <varlistentry>
-    <term><literal>CREATE_REPLICATION_SLOT</literal> <replaceable class="parameter">slotname</> <literal>PHYSICAL</literal></term>
-    <indexterm><primary>CREATE_REPLICATION_SLOT</primary></indexterm>
+    <term><literal>CREATE_REPLICATION_SLOT</literal> <replaceable class="parameter">slotname</> <literal>PHYSICAL</literal><indexterm><primary>CREATE_REPLICATION_SLOT</primary></indexterm></term>
     <listitem>
      <para>
       Create a physical replication
diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml
index daba74bd631bc4ad1163d2548f6220abc3667e73..18faace5a14873dfd69d684c59911916f0ea25e8 100644
--- a/doc/src/sgml/queries.sgml
+++ b/doc/src/sgml/queries.sgml
@@ -167,8 +167,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
      <title>Join Types</title>
 
      <varlistentry>
-      <term>Cross join</term>
-
+      <term>Cross join
       <indexterm>
        <primary>join</primary>
        <secondary>cross</secondary>
@@ -177,6 +176,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
       <indexterm>
        <primary>cross join</primary>
       </indexterm>
+      </term>
 
       <listitem>
 <synopsis>
@@ -206,8 +206,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
      </varlistentry>
 
      <varlistentry>
-      <term>Qualified joins</term>
-
+      <term>Qualified joins
       <indexterm>
        <primary>join</primary>
        <secondary>outer</secondary>
@@ -216,6 +215,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
       <indexterm>
        <primary>outer join</primary>
       </indexterm>
+      </term>
 
       <listitem>
 <synopsis>
@@ -297,8 +297,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
         </varlistentry>
 
         <varlistentry>
-         <term><literal>LEFT OUTER JOIN</></term>
-
+         <term><literal>LEFT OUTER JOIN</>
          <indexterm>
           <primary>join</primary>
           <secondary>left</secondary>
@@ -307,6 +306,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
          <indexterm>
           <primary>left join</primary>
          </indexterm>
+         </term>
 
          <listitem>
           <para>
@@ -320,8 +320,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
         </varlistentry>
 
         <varlistentry>
-         <term><literal>RIGHT OUTER JOIN</></term>
-
+         <term><literal>RIGHT OUTER JOIN</>
          <indexterm>
           <primary>join</primary>
           <secondary>right</secondary>
@@ -330,6 +329,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
          <indexterm>
           <primary>right join</primary>
          </indexterm>
+         </term>
 
          <listitem>
           <para>
diff --git a/doc/src/sgml/recovery-config.sgml b/doc/src/sgml/recovery-config.sgml
index c9ed2dffb2d0f41100b31822e0fb7bf351772fbf..0e78d909b5a6f953f491f3774bf82252e0b619f9 100644
--- a/doc/src/sgml/recovery-config.sgml
+++ b/doc/src/sgml/recovery-config.sgml
@@ -36,10 +36,11 @@
      <variablelist>
 
      <varlistentry id="restore-command" xreflabel="restore_command">
-      <term><varname>restore_command</varname> (<type>string</type>)</term>
+      <term><varname>restore_command</varname> (<type>string</type>)
       <indexterm>
         <primary><varname>restore_command</> recovery parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         The local shell command to execute to retrieve an archived segment of
@@ -79,10 +80,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      </varlistentry>
 
      <varlistentry id="archive-cleanup-command" xreflabel="archive_cleanup_command">
-      <term><varname>archive_cleanup_command</varname> (<type>string</type>)</term>
+      <term><varname>archive_cleanup_command</varname> (<type>string</type>)
       <indexterm>
         <primary><varname>archive_cleanup_command</> recovery parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This optional parameter specifies a shell command that will be executed
@@ -119,10 +121,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      </varlistentry>
 
      <varlistentry id="recovery-end-command" xreflabel="recovery_end_command">
-      <term><varname>recovery_end_command</varname> (<type>string</type>)</term>
+      <term><varname>recovery_end_command</varname> (<type>string</type>)
       <indexterm>
         <primary><varname>recovery_end_command</> recovery parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This parameter specifies a shell command that will be executed once only
@@ -159,10 +162,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      <variablelist>
 
      <varlistentry id="recovery-target" xreflabel="recovery_target_name">
-      <term><varname>recovery_target</varname><literal> = 'immediate'</literal></term>
+      <term><varname>recovery_target</varname><literal> = 'immediate'</literal>
       <indexterm>
         <primary><varname>recovery_target</> recovery parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This parameter specifies that recovery should end as soon as a
@@ -178,12 +182,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      </varlistentry>
 
      <varlistentry id="recovery-target-name" xreflabel="recovery_target_name">
-      <term><varname>recovery_target_name</varname>
-           (<type>string</type>)
-      </term>
+      <term><varname>recovery_target_name</varname> (<type>string</type>)
       <indexterm>
         <primary><varname>recovery_target_name</> recovery parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This parameter specifies the named restore point, created with
@@ -193,12 +196,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      </varlistentry>
 
      <varlistentry id="recovery-target-time" xreflabel="recovery_target_time">
-      <term><varname>recovery_target_time</varname>
-           (<type>timestamp</type>)
-      </term>
+      <term><varname>recovery_target_time</varname> (<type>timestamp</type>)
       <indexterm>
         <primary><varname>recovery_target_time</> recovery parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This parameter specifies the time stamp up to which recovery
@@ -210,10 +212,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      </varlistentry>
 
      <varlistentry id="recovery-target-xid" xreflabel="recovery_target_xid">
-      <term><varname>recovery_target_xid</varname> (<type>string</type>)</term>
+      <term><varname>recovery_target_xid</varname> (<type>string</type>)
       <indexterm>
         <primary><varname>recovery_target_xid</> recovery parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         This parameter specifies the transaction ID up to which recovery
@@ -237,12 +240,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
 
      <varlistentry id="recovery-target-inclusive"
                    xreflabel="recovery_target_inclusive">
-      <term><varname>recovery_target_inclusive</varname>
-        (<type>boolean</type>)
-      </term>
+      <term><varname>recovery_target_inclusive</varname> (<type>boolean</type>)
       <indexterm>
         <primary><varname>recovery_target_inclusive</> recovery parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies whether we stop just after the specified recovery target
@@ -259,12 +261,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
 
      <varlistentry id="recovery-target-timeline"
                    xreflabel="recovery_target_timeline">
-      <term><varname>recovery_target_timeline</varname>
-        (<type>string</type>)
-      </term>
+      <term><varname>recovery_target_timeline</varname> (<type>string</type>)
       <indexterm>
         <primary><varname>recovery_target_timeline</> recovery parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies recovering into a particular timeline.  The default is
@@ -281,12 +282,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
 
      <varlistentry id="pause-at-recovery-target"
                    xreflabel="pause_at_recovery_target">
-      <term><varname>pause_at_recovery_target</varname>
-        (<type>boolean</type>)
-      </term>
+      <term><varname>pause_at_recovery_target</varname> (<type>boolean</type>)
       <indexterm>
         <primary><varname>pause_at_recovery_target</> recovery parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         Specifies whether recovery should pause when the recovery target
@@ -317,10 +317,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      <variablelist>
 
        <varlistentry id="standby-mode" xreflabel="standby_mode">
-        <term><varname>standby_mode</varname> (<type>boolean</type>)</term>
+        <term><varname>standby_mode</varname> (<type>boolean</type>)
         <indexterm>
           <primary><varname>standby_mode</> recovery parameter</primary>
         </indexterm>
+        </term>
         <listitem>
          <para>
           Specifies whether to start the <productname>PostgreSQL</> server as
@@ -334,10 +335,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
         </listitem>
        </varlistentry>
        <varlistentry id="primary-conninfo" xreflabel="primary_conninfo">
-        <term><varname>primary_conninfo</varname> (<type>string</type>)</term>
+        <term><varname>primary_conninfo</varname> (<type>string</type>)
         <indexterm>
           <primary><varname>primary_conninfo</> recovery parameter</primary>
         </indexterm>
+        </term>
         <listitem>
          <para>
           Specifies a connection string to be used for the standby server
@@ -369,10 +371,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
         </listitem>
        </varlistentry>
        <varlistentry id="primary-slotname" xreflabel="primary_slotname">
-        <term><varname>primary_slotname</varname> (<type>string</type>)</term>
+        <term><varname>primary_slotname</varname> (<type>string</type>)
         <indexterm>
           <primary><varname>primary_slotname</> recovery parameter</primary>
         </indexterm>
+        </term>
         <listitem>
          <para>
           Optionally specifies an existing replication slot to be used when
@@ -385,10 +388,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
         </listitem>
        </varlistentry>
        <varlistentry id="trigger-file" xreflabel="trigger_file">
-        <term><varname>trigger_file</varname> (<type>string</type>)</term>
+        <term><varname>trigger_file</varname> (<type>string</type>)
         <indexterm>
           <primary><varname>trigger_file</> recovery parameter</primary>
         </indexterm>
+        </term>
         <listitem>
          <para>
           Specifies a trigger file whose presence ends recovery in the
@@ -400,10 +404,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
        </varlistentry>
 
      <varlistentry id="min-recovery-apply-delay" xreflabel="min_recovery_apply_delay">
-      <term><varname>min_recovery_apply_delay</varname> (<type>integer</type>)</term>
+      <term><varname>min_recovery_apply_delay</varname> (<type>integer</type>)
       <indexterm>
         <primary><varname>min_recovery_apply_delay</> recovery parameter</primary>
       </indexterm>
+      </term>
       <listitem>
        <para>
         By default, a standby server keeps restoring WAL records from the
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 43154da06c242f2a90120da65f3c4587768c4312..69a1e14bce3d9ff84b0ed44650f5d09fda59d8f4 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -227,12 +227,13 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>TOAST</primary>
-     <secondary>per-column storage settings</secondary>
-    </indexterm>
-
-    <term><literal>SET STORAGE</literal></term>
+    <term>
+     <literal>SET STORAGE</literal>
+     <indexterm>
+      <primary>TOAST</primary>
+      <secondary>per-column storage settings</secondary>
+     </indexterm>
+    </term>
     <listitem>
      <para>
       This form sets the storage mode for a column. This controls whether this
diff --git a/doc/src/sgml/ref/pg_recvlogical.sgml b/doc/src/sgml/ref/pg_recvlogical.sgml
index 41e5e838ad1d443ae063ed5674b6596031461b4f..4170c8ef9f7db41d430b2533f544b4952ca444c9 100644
--- a/doc/src/sgml/ref/pg_recvlogical.sgml
+++ b/doc/src/sgml/ref/pg_recvlogical.sgml
@@ -4,6 +4,10 @@ PostgreSQL documentation
 -->
 
 <refentry id="app-pgrecvlogical">
+ <indexterm zone="app-pgrecvlogical">
+  <primary>pg_recvlogical</primary>
+ </indexterm>
+
  <refmeta>
   <refentrytitle><application>pg_recvlogical</application></refentrytitle>
   <manvolnum>1</manvolnum>
@@ -16,10 +20,6 @@ PostgreSQL documentation
    streams over a walsender connection.</refpurpose>
  </refnamediv>
 
- <indexterm zone="app-pgrecvlogical">
-  <primary>pg_recvlogical</primary>
- </indexterm>
-
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_recvlogical</command>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index da79d7a90eaf32299baa39b22338c9b081cf8d6d..ee6ec3a811e6774d1944ee002e9f9eda427f4854 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -2731,11 +2731,13 @@ bar
 
     <variablelist>
       <varlistentry>
-      <indexterm>
-       <primary>autocommit</primary>
-       <secondary>psql</secondary>
-      </indexterm>
-        <term><varname>AUTOCOMMIT</varname></term>
+      <term>
+       <varname>AUTOCOMMIT</varname>
+       <indexterm>
+        <primary>autocommit</primary>
+        <secondary>psql</secondary>
+       </indexterm>
+      </term>
         <listitem>
         <para>
         When <literal>on</> (the default), each SQL command is automatically
@@ -2971,11 +2973,13 @@ bar
       </varlistentry>
 
       <varlistentry>
-      <indexterm>
-       <primary>rollback</primary>
-       <secondary>psql</secondary>
-      </indexterm>
-        <term><varname>ON_ERROR_ROLLBACK</varname></term>
+      <term>
+       <varname>ON_ERROR_ROLLBACK</varname>
+       <indexterm>
+        <primary>rollback</primary>
+        <secondary>psql</secondary>
+       </indexterm>
+      </term>
         <listitem>
         <para>
         When <literal>on</>, if a statement in a transaction block
diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml
index a2a3baebd74bf251fe618a15a736cb51d51b5a6c..8e34fb0bf2b083c600412bcd8151f2d558e14a71 100644
--- a/doc/src/sgml/rules.sgml
+++ b/doc/src/sgml/rules.sgml
@@ -99,8 +99,8 @@
     <varlistentry>
     <term>
         the range table
-    </term>
       <indexterm><primary>range table</></>
+    </term>
     <listitem>
     <para>
         The range table is a list of relations that are used in the query.
@@ -150,8 +150,8 @@
     <varlistentry>
     <term>
         the target list
-    </term>
     <indexterm><primary>target list</></>
+    </term>
     <listitem>
     <para>
         The target list is a list of expressions that define the
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 7f4a2358c45382507a561a7b251139911869c784..9fadef5c9da4e2db845fb0cf1d845a01b0b22e70 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -712,8 +712,9 @@ psql: could not connect to server: No such file or directory
 
     <variablelist>
      <varlistentry>
-      <term><systemitem class="osname">AIX</></term>
+      <term><systemitem class="osname">AIX</>
       <indexterm><primary>AIX</><secondary>IPC configuration</></>
+      </term>
       <listitem>
        <para>
         At least as of version 5.1, it should not be necessary to do
@@ -734,8 +735,9 @@ psql: could not connect to server: No such file or directory
 
 
      <varlistentry>
-      <term><systemitem class="osname">FreeBSD</></term>
+      <term><systemitem class="osname">FreeBSD</>
       <indexterm><primary>FreeBSD</><secondary>IPC configuration</></>
+      </term>
       <listitem>
        <para>
         The default settings can be changed using
@@ -791,8 +793,9 @@ kern.ipc.semmnu=256
      </varlistentry>
 
      <varlistentry>
-      <term><systemitem class="osname">NetBSD</></term>
+      <term><systemitem class="osname">NetBSD</>
       <indexterm><primary>NetBSD</><secondary>IPC configuration</></>
+      </term>
       <listitem>
        <para>
         In <systemitem class="osname">NetBSD</> 5.0 and later,
@@ -822,8 +825,9 @@ kern.ipc.semmnu=256
      </varlistentry>
 
      <varlistentry>
-      <term><systemitem class="osname">OpenBSD</></term>
+      <term><systemitem class="osname">OpenBSD</>
       <indexterm><primary>OpenBSD</><secondary>IPC configuration</></>
+      </term>
       <listitem>
        <para>
         The options <varname>SYSVSHM</> and <varname>SYSVSEM</> need
@@ -854,8 +858,9 @@ option        SEMMAP=256
      </varlistentry>
 
      <varlistentry>
-      <term><systemitem class="osname">HP-UX</></term>
+      <term><systemitem class="osname">HP-UX</>
       <indexterm><primary>HP-UX</><secondary>IPC configuration</></>
+      </term>
       <listitem>
        <para>
         The default settings tend to suffice for normal installations.
@@ -875,8 +880,9 @@ option        SEMMAP=256
 
 
      <varlistentry>
-      <term><systemitem class="osname">Linux</></term>
+      <term><systemitem class="osname">Linux</>
       <indexterm><primary>Linux</><secondary>IPC configuration</></>
+      </term>
       <listitem>
        <para>
         The default maximum segment size is 32 MB, and the
@@ -917,8 +923,9 @@ option        SEMMAP=256
 
 
      <varlistentry>
-      <term><systemitem class="osname">Mac OS X</></term>
+      <term><systemitem class="osname">Mac OS X</>
       <indexterm><primary>Mac OS X</><secondary>IPC configuration</></>
+      </term>
       <listitem>
        <para>
         The recommended method for configuring shared memory in OS X
@@ -980,8 +987,9 @@ sysctl -w kern.sysv.shmall
 
 
      <varlistentry>
-      <term><systemitem class="osname">SCO OpenServer</></term>
+      <term><systemitem class="osname">SCO OpenServer</>
       <indexterm><primary>SCO OpenServer</><secondary>IPC configuration</></>
+      </term>
       <listitem>
        <para>
         In the default configuration, only 512 kB of shared memory per
@@ -1008,8 +1016,9 @@ sysctl -w kern.sysv.shmall
 
      <varlistentry>
       <term><systemitem class="osname">Solaris</> 2.6 to 2.9 (Solaris
-      6 to Solaris 9)</term>
+      6 to Solaris 9)
       <indexterm><primary>Solaris</><secondary>IPC configuration</></>
+      </term>
       <listitem>
        <para>
         The relevant settings can be changed in
@@ -1082,8 +1091,9 @@ project.max-msg-ids=(priv,4096,deny)
 
 
      <varlistentry>
-      <term><systemitem class="osname">UnixWare</></term>
+      <term><systemitem class="osname">UnixWare</>
       <indexterm><primary>UnixWare</><secondary>IPC configuration</></>
+      </term>
       <listitem>
        <para>
         On <productname>UnixWare</> 7, the maximum size for shared
diff --git a/doc/src/sgml/sepgsql.sgml b/doc/src/sgml/sepgsql.sgml
index 9a9b5906ba64cd0ba76e55bca7397f04c45ed489..6889e428a4797387ecced588e437ef990759f91c 100644
--- a/doc/src/sgml/sepgsql.sgml
+++ b/doc/src/sgml/sepgsql.sgml
@@ -256,10 +256,12 @@ $ sudo semodule -r sepgsql-regtest
 
   <variablelist>
    <varlistentry id="guc-sepgsql-permissive" xreflabel="sepgsql.permissive">
-    <term><varname>sepgsql.permissive</> (<type>boolean</type>)</term>
-    <indexterm>
-     <primary><varname>sepgsql.permissive</> configuration parameter</primary>
-    </indexterm>
+    <term>
+     <varname>sepgsql.permissive</> (<type>boolean</type>)
+     <indexterm>
+      <primary><varname>sepgsql.permissive</> configuration parameter</primary>
+     </indexterm>
+    </term>
     <listitem>
      <para>
       This parameter enables <filename>sepgsql</> to function
@@ -278,10 +280,12 @@ $ sudo semodule -r sepgsql-regtest
 
    </varlistentry>
    <varlistentry id="guc-sepgsql-debug-audit" xreflabel="sepgsql.debug_audit">
-    <term><varname>sepgsql.debug_audit</> (<type>boolean</>)</>
-    <indexterm>
-     <primary><varname>sepgsql.debug_audit</> configuration parameter</>
-    </indexterm>
+    <term>
+     <varname>sepgsql.debug_audit</> (<type>boolean</>)
+     <indexterm>
+      <primary><varname>sepgsql.debug_audit</> configuration parameter</>
+     </indexterm>
+    </term>
     <listitem>
      <para>
       This parameter enables the printing of audit messages regardless of
diff --git a/doc/src/sgml/sslinfo.sgml b/doc/src/sgml/sslinfo.sgml
index 783e03f0ad6b6f61b1224e4d8340f8322fb2adad..22ef4396abc98fea3db88cabb3a8059c70b1b884 100644
--- a/doc/src/sgml/sslinfo.sgml
+++ b/doc/src/sgml/sslinfo.sgml
@@ -24,11 +24,11 @@
 
   <variablelist>
    <varlistentry>
-    <indexterm>
-     <primary>ssl_is_used</primary>
-    </indexterm>
     <term>
      <function>ssl_is_used() returns boolean</function>
+     <indexterm>
+      <primary>ssl_is_used</primary>
+     </indexterm>
     </term>
     <listitem>
     <para>
@@ -39,11 +39,11 @@
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>ssl_version</primary>
-    </indexterm>
     <term>
      <function>ssl_version() returns text</function>
+     <indexterm>
+      <primary>ssl_version</primary>
+     </indexterm>
     </term>
     <listitem>
     <para>
@@ -54,11 +54,11 @@
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>ssl_cipher</primary>
-    </indexterm>
     <term>
      <function>ssl_cipher() returns text</function>
+     <indexterm>
+      <primary>ssl_cipher</primary>
+     </indexterm>
     </term>
     <listitem>
     <para>
@@ -69,11 +69,11 @@
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>ssl_client_cert_present</primary>
-    </indexterm>
     <term>
      <function>ssl_client_cert_present() returns boolean</function>
+     <indexterm>
+      <primary>ssl_client_cert_present</primary>
+     </indexterm>
     </term>
     <listitem>
     <para>
@@ -85,11 +85,11 @@
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>ssl_client_serial</primary>
-    </indexterm>
     <term>
      <function>ssl_client_serial() returns numeric</function>
+     <indexterm>
+      <primary>ssl_client_serial</primary>
+     </indexterm>
     </term>
     <listitem>
     <para>
@@ -109,11 +109,11 @@
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>ssl_client_dn</primary>
-    </indexterm>
     <term>
      <function>ssl_client_dn() returns text</function>
+     <indexterm>
+      <primary>ssl_client_dn</primary>
+     </indexterm>
     </term>
     <listitem>
     <para>
@@ -132,11 +132,11 @@
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>ssl_issuer_dn</primary>
-    </indexterm>
     <term>
      <function>ssl_issuer_dn() returns text</function>
+     <indexterm>
+      <primary>ssl_issuer_dn</primary>
+     </indexterm>
     </term>
     <listitem>
     <para>
@@ -157,11 +157,11 @@
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>ssl_client_dn_field</primary>
-    </indexterm>
     <term>
      <function>ssl_client_dn_field(fieldname text) returns text</function>
+     <indexterm>
+      <primary>ssl_client_dn_field</primary>
+     </indexterm>
     </term>
     <listitem>
     <para>
@@ -206,11 +206,11 @@ emailAddress
    </varlistentry>
 
    <varlistentry>
-    <indexterm>
-     <primary>ssl_issuer_field</primary>
-    </indexterm>
     <term>
      <function>ssl_issuer_field(fieldname text) returns text</function>
+     <indexterm>
+      <primary>ssl_issuer_field</primary>
+     </indexterm>
     </term>
     <listitem>
     <para>
diff --git a/doc/src/sgml/textsearch.sgml b/doc/src/sgml/textsearch.sgml
index fd54c4425dc641ab973cb37680df836f9dd041ba..891e7fabacaab510a9205a606a954b418bb42080 100644
--- a/doc/src/sgml/textsearch.sgml
+++ b/doc/src/sgml/textsearch.sgml
@@ -854,11 +854,11 @@ SELECT plainto_tsquery('english', 'The Fat &amp; Rats:C');
 
      <varlistentry>
 
-      <indexterm>
-       <primary>ts_rank</primary>
-      </indexterm>
-
       <term>
+       <indexterm>
+        <primary>ts_rank</primary>
+       </indexterm>
+
        <literal>ts_rank(<optional> <replaceable class="PARAMETER">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">normalization</replaceable> <type>integer</> </optional>) returns <type>float4</></literal>
       </term>
 
@@ -871,11 +871,11 @@ SELECT plainto_tsquery('english', 'The Fat &amp; Rats:C');
 
      <varlistentry>
 
+      <term>
       <indexterm>
        <primary>ts_rank_cd</primary>
       </indexterm>
 
-      <term>
        <literal>ts_rank_cd(<optional> <replaceable class="PARAMETER">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">normalization</replaceable> <type>integer</> </optional>) returns <type>float4</></literal>
       </term>
 
@@ -1221,11 +1221,11 @@ FROM (SELECT id, body, q, ts_rank_cd(ti, q) AS rank
 
     <varlistentry>
 
+     <term>
      <indexterm>
       <primary>tsvector concatenation</primary>
      </indexterm>
 
-     <term>
       <literal><type>tsvector</> || <type>tsvector</></literal>
      </term>
 
@@ -1260,11 +1260,11 @@ FROM (SELECT id, body, q, ts_rank_cd(ti, q) AS rank
 
     <varlistentry>
 
+     <term>
      <indexterm>
       <primary>setweight</primary>
      </indexterm>
 
-     <term>
       <literal>setweight(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">weight</replaceable> <type>"char"</>) returns <type>tsvector</></literal>
      </term>
 
@@ -1288,11 +1288,11 @@ FROM (SELECT id, body, q, ts_rank_cd(ti, q) AS rank
     </varlistentry>
 
     <varlistentry>
+     <term>
      <indexterm>
       <primary>length(tsvector)</primary>
      </indexterm>
 
-     <term>
       <literal>length(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>) returns <type>integer</></literal>
      </term>
 
@@ -1305,11 +1305,11 @@ FROM (SELECT id, body, q, ts_rank_cd(ti, q) AS rank
 
     <varlistentry>
 
+     <term>
      <indexterm>
       <primary>strip</primary>
      </indexterm>
 
-     <term>
       <literal>strip(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>) returns <type>tsvector</></literal>
      </term>
 
@@ -1385,11 +1385,11 @@ FROM (SELECT id, body, q, ts_rank_cd(ti, q) AS rank
 
     <varlistentry>
 
+     <term>
      <indexterm>
       <primary>numnode</primary>
      </indexterm>
 
-     <term>
       <literal>numnode(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>) returns <type>integer</></literal>
      </term>
 
@@ -1419,11 +1419,11 @@ SELECT numnode('foo &amp; bar'::tsquery);
 
     <varlistentry>
 
+     <term>
      <indexterm>
       <primary>querytree</primary>
      </indexterm>
 
-     <term>
       <literal>querytree(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>) returns <type>text</></literal>
      </term>
 
@@ -3210,13 +3210,13 @@ SELECT plainto_tsquery('supernovae stars');
 
     <varlistentry>
 
+     <term>
      <indexterm zone="textsearch-indexes">
       <primary>index</primary>
       <secondary>GiST</secondary>
       <tertiary>text search</tertiary>
      </indexterm>
 
-     <term>
       <literal>CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable> USING gist(<replaceable>column</replaceable>);</literal>
      </term>
 
@@ -3231,13 +3231,13 @@ SELECT plainto_tsquery('supernovae stars');
 
     <varlistentry>
 
+     <term>
      <indexterm zone="textsearch-indexes">
       <primary>index</primary>
       <secondary>GIN</secondary>
       <tertiary>text search</tertiary>
      </indexterm>
 
-     <term>
       <literal>CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable> USING gin(<replaceable>column</replaceable>);</literal>
      </term>