summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2017-06-25 16:27:04 +0000
committerTom Lane2017-06-25 16:27:04 +0000
commitde0c60b7d3f69c75c69c6577ae44caa3aae44800 (patch)
tree7d58aa3cb4f78915615adbf2967b51463923955d
parentddb5fdc068635d003a0d1c303cb109d1cb3ebeb1 (diff)
Doc: minor improvements for collation-related man pages.
-rw-r--r--doc/src/sgml/ref/alter_collation.sgml12
-rw-r--r--doc/src/sgml/ref/create_collation.sgml4
2 files changed, 9 insertions, 7 deletions
diff --git a/doc/src/sgml/ref/alter_collation.sgml b/doc/src/sgml/ref/alter_collation.sgml
index 71cf4de802..30e8c756a1 100644
--- a/doc/src/sgml/ref/alter_collation.sgml
+++ b/doc/src/sgml/ref/alter_collation.sgml
@@ -92,7 +92,7 @@ ALTER COLLATION <replaceable>name</replaceable> SET SCHEMA <replaceable>new_sche
<term><literal>REFRESH VERSION</literal></term>
<listitem>
<para>
- Updated the collation version.
+ Update the collation's version.
See <xref linkend="sql-altercollation-notes"
endterm="sql-altercollation-notes-title"> below.
</para>
@@ -107,16 +107,16 @@ ALTER COLLATION <replaceable>name</replaceable> SET SCHEMA <replaceable>new_sche
<para>
When using collations provided by the ICU library, the ICU-specific version
of the collator is recorded in the system catalog when the collation object
- is created. When the collation is then used, the current version is
+ is created. When the collation is used, the current version is
checked against the recorded version, and a warning is issued when there is
a mismatch, for example:
<screen>
-WARNING: ICU collator version mismatch
-DETAIL: The database was created using version 1.2.3.4, the library provides version 2.3.4.5.
-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.
+WARNING: collation "xx-x-icu" has version mismatch
+DETAIL: The collation in the database was created using version 1.2.3.4, but the operating system provides version 2.3.4.5.
+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.
</screen>
A change in collation definitions can lead to corrupt indexes and other
- problems where the database system relies on stored objects having a
+ problems because the database system relies on stored objects having a
certain sort order. Generally, this should be avoided, but it can happen
in legitimate circumstances, such as when
using <command>pg_upgrade</command> to upgrade to server binaries linked
diff --git a/doc/src/sgml/ref/create_collation.sgml b/doc/src/sgml/ref/create_collation.sgml
index 47de9a09b6..2d3e050545 100644
--- a/doc/src/sgml/ref/create_collation.sgml
+++ b/doc/src/sgml/ref/create_collation.sgml
@@ -122,7 +122,9 @@ CREATE COLLATION [ IF NOT EXISTS ] <replaceable>name</replaceable> FROM <replace
<para>
Specifies the provider to use for locale services associated with this
collation. Possible values
- are: <literal>icu</literal>,<indexterm><primary>ICU</></> <literal>libc</literal>.
+ are: <literal>icu</literal>,<indexterm><primary>ICU</></>
+ <literal>libc</literal>.
+ <literal>libc</literal> is the default.
The available choices depend on the operating system and build options.
</para>
</listitem>