From: Jeff Davis <jdavis@postgresql.org>
Date: Thu, 6 Jun 2024 23:40:03 +0000 (-0700)
Subject: Collation documentation fixes.
X-Git-Tag: REL_17_BETA2~83
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=8ba34c698d19450ccae9a5aea59a6d0bc8b75c0e;p=postgresql.git

Collation documentation fixes.

Discussion: https://postgr.es/m/9beecdf7-e8c8-4eab-adc7-fa225c2feefd@eisentraut.org
---

diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 15f6255d865..2f52e70b48e 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -2384,9 +2384,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</replaceable>:<replaceable>&l
        <structfield>collprovider</structfield> <type>char</type>
       </para>
       <para>
-       Provider of the collation: <literal>d</literal> = database
-       default, <literal>c</literal> = libc, <literal>i</literal> = icu
-      </para></entry>
+       Provider of the collation: <literal>d</literal> = database default,
+       <literal>b</literal> = builtin, <literal>c</literal> = libc,
+       <literal>i</literal> = icu </para></entry>
      </row>
 
      <row>
@@ -3028,9 +3028,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</replaceable>:<replaceable>&l
        <structfield>datlocprovider</structfield> <type>char</type>
       </para>
       <para>
-       Locale provider for this database: <literal>c</literal> = libc,
-       <literal>i</literal> = icu
-      </para></entry>
+       Locale provider for this database: <literal>b</literal> = builtin,
+       <literal>c</literal> = libc, <literal>i</literal> = icu </para></entry>
      </row>
 
      <row>
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index daf671e6205..834cb30c85a 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -1320,7 +1320,9 @@ SELECT 'w;x*y-z' = 'wxyz' COLLATE num_ignore_punct; -- true
         </row>
         <row>
          <entry>level4</entry>
-         <entry>Punctuation</entry>
+         <entry>Punctuation<footnote><para>only with
+         <literal>ka-shifted</literal>; see <xref
+         linkend="icu-collation-settings-table"/></para></footnote></entry>
          <entry><literal>true</literal></entry>
          <entry><literal>true</literal></entry>
          <entry><literal>false</literal></entry>