Skip to content

Commit de0c60b

Browse files
committed
Doc: minor improvements for collation-related man pages.
1 parent ddb5fdc commit de0c60b

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

doc/src/sgml/ref/alter_collation.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ ALTER COLLATION <replaceable>name</replaceable> SET SCHEMA <replaceable>new_sche
9292
<term><literal>REFRESH VERSION</literal></term>
9393
<listitem>
9494
<para>
95-
Updated the collation version.
95+
Update the collation's version.
9696
See <xref linkend="sql-altercollation-notes"
9797
endterm="sql-altercollation-notes-title"> below.
9898
</para>
@@ -107,16 +107,16 @@ ALTER COLLATION <replaceable>name</replaceable> SET SCHEMA <replaceable>new_sche
107107
<para>
108108
When using collations provided by the ICU library, the ICU-specific version
109109
of the collator is recorded in the system catalog when the collation object
110-
is created. When the collation is then used, the current version is
110+
is created. When the collation is used, the current version is
111111
checked against the recorded version, and a warning is issued when there is
112112
a mismatch, for example:
113113
<screen>
114-
WARNING: ICU collator version mismatch
115-
DETAIL: The database was created using version 1.2.3.4, the library provides version 2.3.4.5.
116-
HINT: Rebuild all objects affected by this collation and run ALTER COLLATION pg_catalog."xx-x-icu" REFRESH VERSION, or build PostgreSQL with the right version of ICU.
114+
WARNING: collation "xx-x-icu" has version mismatch
115+
DETAIL: The collation in the database was created using version 1.2.3.4, but the operating system provides version 2.3.4.5.
116+
HINT: Rebuild all objects affected by this collation and run ALTER COLLATION pg_catalog."xx-x-icu" REFRESH VERSION, or build PostgreSQL with the right library version.
117117
</screen>
118118
A change in collation definitions can lead to corrupt indexes and other
119-
problems where the database system relies on stored objects having a
119+
problems because the database system relies on stored objects having a
120120
certain sort order. Generally, this should be avoided, but it can happen
121121
in legitimate circumstances, such as when
122122
using <command>pg_upgrade</command> to upgrade to server binaries linked

doc/src/sgml/ref/create_collation.sgml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ CREATE COLLATION [ IF NOT EXISTS ] <replaceable>name</replaceable> FROM <replace
122122
<para>
123123
Specifies the provider to use for locale services associated with this
124124
collation. Possible values
125-
are: <literal>icu</literal>,<indexterm><primary>ICU</></> <literal>libc</literal>.
125+
are: <literal>icu</literal>,<indexterm><primary>ICU</></>
126+
<literal>libc</literal>.
127+
<literal>libc</literal> is the default.
126128
The available choices depend on the operating system and build options.
127129
</para>
128130
</listitem>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy