From 830ef61bd8d0ac4c89c21a895047c1b3a6b202f3 Mon Sep 17 00:00:00 2001
From: Daniel Gustafsson <dgustafsson@postgresql.org>
Date: Thu, 15 Jul 2021 23:22:58 +0200
Subject: [PATCH] docs: fix inconsistencies in markup and case

Ensure to properly mark up function parameters in text with <parameter>,
avoid using <acronym> for terms which aren't acronyms and properly place
the ", and" in a value list. The acronym removal is a follow-up to commit
fb72a7b8c3 which removed it for minmax-multi.  In passing, also fix an
incorrectly cased word.

Author: Ekaterina Kiryanova <e.kiryanova@postgrespro.ru>
Reviewed-by: Laurenz Albe <laurenz.albe@cybertec.at>
Discussion: https://postgr.es/m/c050ecbc-80b2-b360-3c1d-9fe6a6a11bb5@postgrespro.ru
Backpatch-through: v14
---
 doc/src/sgml/amcheck.sgml  | 4 ++--
 doc/src/sgml/brin.sgml     | 2 +-
 doc/src/sgml/catalogs.sgml | 4 ++--
 doc/src/sgml/config.sgml   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/src/sgml/amcheck.sgml b/doc/src/sgml/amcheck.sgml
index a2571d33ae..c570690b59 100644
--- a/doc/src/sgml/amcheck.sgml
+++ b/doc/src/sgml/amcheck.sgml
@@ -279,7 +279,7 @@ SET client_min_messages = DEBUG1;
         <para>
          If specified, corruption checking begins at the specified block,
          skipping all previous blocks.  It is an error to specify a
-         <literal>startblock</literal> outside the range of blocks in the
+         <parameter>startblock</parameter> outside the range of blocks in the
          target table.
         </para>
         <para>
@@ -293,7 +293,7 @@ SET client_min_messages = DEBUG1;
         <para>
          If specified, corruption checking ends at the specified block,
          skipping all remaining blocks.  It is an error to specify an
-         <literal>endblock</literal> outside the range of blocks in the target
+         <parameter>endblock</parameter> outside the range of blocks in the target
          table.
         </para>
         <para>
diff --git a/doc/src/sgml/brin.sgml b/doc/src/sgml/brin.sgml
index 39c01dc680..caf1ea4cef 100644
--- a/doc/src/sgml/brin.sgml
+++ b/doc/src/sgml/brin.sgml
@@ -716,7 +716,7 @@ LOG:  request for BRIN range summarization for index "brin_wi_idx" page 128 was
    </para>
 
    <para>
-    <acronym>bloom</acronym> operator classes accept these parameters:
+    bloom operator classes accept these parameters:
    </para>
 
    <variablelist>
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 5128f34d40..2b2c70a26e 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -7393,8 +7393,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</replaceable>:<replaceable>&l
        An array containing codes for the enabled statistics kinds;
        valid values are:
        <literal>d</literal> for n-distinct statistics,
-       <literal>f</literal> for functional dependency statistics, and
-       <literal>m</literal> for most common values (MCV) list statistics
+       <literal>f</literal> for functional dependency statistics,
+       <literal>m</literal> for most common values (MCV) list statistics, and
        <literal>e</literal> for expression statistics
       </para></entry>
      </row>
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 43772c2a98..a23ae67ba5 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -7017,7 +7017,7 @@ local0.*    /var/log/postgresql
             </row>
             <row>
              <entry><literal>%Q</literal></entry>
-             <entry>query identifier of the current query.  Query
+             <entry>Query identifier of the current query.  Query
              identifiers are not computed by default, so this field
              will be zero unless <xref linkend="guc-compute-query-id"/>
              parameter is enabled or a third-party module that computes