Skip to content

Commit 845693f

Browse files
tglsfdctglsfdc
committed
Fix a couple of places that still claimed LC_COLLATE and LC_CTYPE can't
be changed after initdb.
1 parent b793e83 commit 845693f

File tree

2 files changed

+29
-28
lines changed

2 files changed

+29
-28
lines changed

‎doc/src/sgml/charset.sgml

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.91 2009/02/10 19:29:39 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.92 2009/03/26 20:55:49 tgl Exp $ -->
22

33
<chapter id="charset">
44
<title>Localization</>
@@ -33,7 +33,7 @@
3333

3434
<sect1 id="locale">
3535
<title>Locale Support</title>
36-
36+
3737
<indexterm zone="locale"><primary>locale</></>
3838

3939
<para>
@@ -65,7 +65,7 @@ initdb --locale=sv_SE
6565
</para>
6666

6767
<para>
68-
This example for Unix systems sets the locale to Swedish
68+
This example for Unix systems sets the locale to Swedish
6969
(<literal>sv</>) as spoken
7070
in Sweden (<literal>SE</>). Other possibilities might be
7171
<literal>en_US</> (U.S. English) and <literal>fr_CA</> (French
@@ -136,18 +136,18 @@ initdb --locale=sv_SE
136136
and <literal>LC_CTYPE</literal> are those categories. They affect
137137
the sort order of indexes, so they must be kept fixed, or indexes on
138138
text columns will become corrupt. The default values for these
139-
categories are defined when <command>initdb</command> is run, and
139+
categories are determined when <command>initdb</command> is run, and
140140
those values are used when new databases are created, unless
141141
specified otherwise in the <command>CREATE DATABASE</command> command.
142142
</para>
143143

144144
<para>
145-
The other locale categories can be changed as desired whenever the
146-
server is running by setting the run-time configuration variables
145+
The other locale categories can be changed whenever desired
146+
by setting the server configuration parameters
147147
that have the same name as the locale categories (see <xref
148-
linkend="runtime-config-client-format"> for details). The defaults
149-
that are chosen by <command>initdb</command> are actually only written into
150-
the configuration file <filename>postgresql.conf</filename> to
148+
linkend="runtime-config-client-format"> for details). The values
149+
that are chosen by <command>initdb</command> are actually only written
150+
into the configuration file <filename>postgresql.conf</filename> to
151151
serve as defaults when the server is started. If you delete these
152152
assignments from <filename>postgresql.conf</filename> then the
153153
server will inherit the settings from its execution environment.
@@ -200,7 +200,8 @@ initdb --locale=sv_SE
200200
<itemizedlist>
201201
<listitem>
202202
<para>
203-
Sort order in queries using <literal>ORDER BY</> on textual data
203+
Sort order in queries using <literal>ORDER BY</> or the standard
204+
comparison operators on textual data
204205
<indexterm><primary>ORDER BY</><secondary>and locales</></indexterm>
205206
</para>
206207
</listitem>
@@ -261,9 +262,9 @@ initdb --locale=sv_SE
261262

262263
<para>
263264
Check that <productname>PostgreSQL</> is actually using the locale
264-
that you think it is. The default <envar>LC_COLLATE</> and <envar>LC_CTYPE</>
265-
settings are determined at <command>initdb</> time and cannot be
266-
changed without repeating <command>initdb</>. Other locale
265+
that you think it is. The <envar>LC_COLLATE</> and <envar>LC_CTYPE</>
266+
settings are determined when a database is created, and cannot be
267+
changed except by creating a new database. Other locale
267268
settings including <envar>LC_MESSAGES</> and <envar>LC_MONETARY</>
268269
are initially determined by the environment the server is started
269270
in, but can be changed on-the-fly. You can check the active locale
@@ -714,7 +715,7 @@ initdb --locale=sv_SE
714715
converting or validating non-ASCII characters.
715716
</para>
716717
</sect2>
717-
718+
718719
<sect2>
719720
<title>Setting the Character Set</title>
720721

@@ -907,66 +908,66 @@ $ <userinput>psql -l</userinput>
907908
<literal>WIN1251</literal>
908909
</entry>
909910
</row>
910-
<row>
911+
<row>
911912
<entry><literal>LATIN1</literal></entry>
912913
<entry><emphasis>LATIN1</emphasis>,
913914
<literal>MULE_INTERNAL</literal>,
914915
<literal>UTF8</literal>
915916
</entry>
916917
</row>
917-
<row>
918+
<row>
918919
<entry><literal>LATIN2</literal></entry>
919920
<entry><emphasis>LATIN2</emphasis>,
920921
<literal>MULE_INTERNAL</literal>,
921922
<literal>UTF8</literal>,
922923
<literal>WIN1250</literal>
923924
</entry>
924925
</row>
925-
<row>
926+
<row>
926927
<entry><literal>LATIN3</literal></entry>
927928
<entry><emphasis>LATIN3</emphasis>,
928929
<literal>MULE_INTERNAL</literal>,
929930
<literal>UTF8</literal>
930931
</entry>
931932
</row>
932-
<row>
933+
<row>
933934
<entry><literal>LATIN4</literal></entry>
934935
<entry><emphasis>LATIN4</emphasis>,
935936
<literal>MULE_INTERNAL</literal>,
936937
<literal>UTF8</literal>
937938
</entry>
938939
</row>
939-
<row>
940+
<row>
940941
<entry><literal>LATIN5</literal></entry>
941942
<entry><emphasis>LATIN5</emphasis>,
942943
<literal>UTF8</literal>
943944
</entry>
944945
</row>
945-
<row>
946+
<row>
946947
<entry><literal>LATIN6</literal></entry>
947948
<entry><emphasis>LATIN6</emphasis>,
948949
<literal>UTF8</literal>
949950
</entry>
950951
</row>
951-
<row>
952+
<row>
952953
<entry><literal>LATIN7</literal></entry>
953954
<entry><emphasis>LATIN7</emphasis>,
954955
<literal>UTF8</literal>
955956
</entry>
956957
</row>
957-
<row>
958+
<row>
958959
<entry><literal>LATIN8</literal></entry>
959960
<entry><emphasis>LATIN8</emphasis>,
960961
<literal>UTF8</literal>
961962
</entry>
962963
</row>
963-
<row>
964+
<row>
964965
<entry><literal>LATIN9</literal></entry>
965966
<entry><emphasis>LATIN9</emphasis>,
966967
<literal>UTF8</literal>
967968
</entry>
968969
</row>
969-
<row>
970+
<row>
970971
<entry><literal>LATIN10</literal></entry>
971972
<entry><emphasis>LATIN10</emphasis>,
972973
<literal>UTF8</literal>
@@ -989,7 +990,7 @@ $ <userinput>psql -l</userinput>
989990
<literal>WIN1251</literal>
990991
</entry>
991992
</row>
992-
<row>
993+
<row>
993994
<entry><literal>SJIS</literal></entry>
994995
<entry><emphasis>not supported as a server encoding</emphasis>
995996
</entry>

‎doc/src/sgml/config.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.212 2009/03/23 15:14:14 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.213 2009/03/26 20:55:49 tgl Exp $ -->
22

33
<chapter Id="runtime-config">
44
<title>Server Configuration</title>
@@ -4880,7 +4880,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
48804880
<para>
48814881
Reports the locale in which sorting of textual data is done.
48824882
See <xref linkend="locale"> for more information.
4883-
The value is determined when the database cluster is initialized.
4883+
This value is determined when a database is created.
48844884
</para>
48854885
</listitem>
48864886
</varlistentry>
@@ -4894,7 +4894,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
48944894
<para>
48954895
Reports the locale that determines character classifications.
48964896
See <xref linkend="locale"> for more information.
4897-
The value is determined when the database cluster is initialized.
4897+
This value is determined when a database is created.
48984898
Ordinarily this will be the same as <varname>lc_collate</varname>,
48994899
but for special applications it might be set differently.
49004900
</para>

0 commit comments

Comments
 (0)