diff options
author | Jeff Davis <jdavis@postgresql.org> | 2023-06-21 11:10:03 -0700 |
---|---|---|
committer | Jeff Davis <jdavis@postgresql.org> | 2023-06-21 11:10:03 -0700 |
commit | 2535c74b1a6190cc42e13f6b6b55d94bff4b7dd6 (patch) | |
tree | cbcc0270e62e44f582ade6691b1011cdf0f30845 /doc/src | |
parent | 555b929bbe7bd2f228e804d2c5bf4a246a319358 (diff) | |
download | postgresql-2535c74b1a6190cc42e13f6b6b55d94bff4b7dd6.tar.gz postgresql-2535c74b1a6190cc42e13f6b6b55d94bff4b7dd6.zip |
initdb: change default --locale-provider back to libc.
Reverts 27b62377b4.
Discussion: https://postgr.es/m/eff031036baa07f325de29215371a4c9e69d61f3.camel@j-davis.com
Discussion: https://postgr.es/m/3353947.1682092131@sss.pgh.pa.us
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/sgml/ref/initdb.sgml | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml index f850dc404d1..22f1011781f 100644 --- a/doc/src/sgml/ref/initdb.sgml +++ b/doc/src/sgml/ref/initdb.sgml @@ -93,24 +93,10 @@ PostgreSQL documentation </para> <para> - By default, <command>initdb</command> uses the ICU library to provide - locale services if the server was built with ICU support; otherwise it uses - the <literal>libc</literal> locale provider (see <xref - linkend="locale-providers"/>). To choose the specific ICU locale ID to - apply, use the option <option>--icu-locale</option>. Note that for - implementation reasons and to support legacy code, - <command>initdb</command> will still select and initialize libc locale - settings when the ICU locale provider is used. - </para> - - <para> - Alternatively, <command>initdb</command> can use the locale provider - <literal>libc</literal>. To select this option, specify - <literal>--locale-provider=libc</literal>, or build the server without ICU - support. The <literal>libc</literal> locale provider takes the locale - settings from the environment, and determines the encoding from the locale - settings. This is almost always sufficient, unless there are special - requirements. + By default, <command>initdb</command> uses the locale provider + <literal>libc</literal> (see <xref linkend="locale-providers"/>). The + <literal>libc</literal> locale provider takes the locale settings from the + environment, and determines the encoding from the locale settings. </para> <para> @@ -123,6 +109,16 @@ PostgreSQL documentation </para> <para> + Alternatively, <command>initdb</command> can use the ICU library to provide + locale services by specifying <literal>--locale-provider=icu</literal>. The + server must be built with ICU support. To choose the specific ICU locale ID + to apply, use the option <option>--icu-locale</option>. Note that for + implementation reasons and to support legacy code, + <command>initdb</command> will still select and initialize libc locale + settings when the ICU locale provider is used. + </para> + + <para> When <command>initdb</command> runs, it will print out the locale settings it has chosen. If you have complex requirements or specified multiple options, it is advisable to check that the result matches what was @@ -251,11 +247,6 @@ PostgreSQL documentation Specifies the ICU locale when the ICU provider is used. Locale support is described in <xref linkend="locale"/>. </para> - <para> - If this option is not specified, the locale is inherited from the - environment in which <command>initdb</command> runs. The environment's - locale is matched to a similar ICU locale name, if possible. - </para> </listitem> </varlistentry> @@ -330,9 +321,8 @@ PostgreSQL documentation This option sets the locale provider for databases created in the new cluster. It can be overridden in the <command>CREATE DATABASE</command> command when new databases are subsequently - created. The default is <literal>icu</literal> if the server was - built with ICU support; otherwise the default is - <literal>libc</literal> (see <xref linkend="locale-providers"/>). + created. The default is <literal>libc</literal> (see <xref + linkend="locale-providers"/>). </para> </listitem> </varlistentry> |