1- <!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.71 2005/03/17 00:22:24 neilc Exp $ -->
1+ <!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.72 2005/04/16 16:50:01 tgl Exp $ -->
22
33<chapter id="charset">
44 <title>Localization</>
@@ -145,9 +145,9 @@ initdb --locale=sv_SE
145145 linkend="runtime-config-client-format"> for details). The defaults that are
146146 chosen by <command>initdb</command> are actually only written into
147147 the configuration file <filename>postgresql.conf</filename> to
148- serve as defaults when the server is started. If you deletethe
148+ serve as defaults when the server is started. If you deletethese
149149 assignments from <filename>postgresql.conf</filename> then the
150- server will inherit the settings fromthe execution environment.
150+ server will inherit the settings fromits execution environment.
151151 </para>
152152
153153 <para>
@@ -192,12 +192,12 @@ initdb --locale=sv_SE
192192 <title>Behavior</>
193193
194194 <para>
195- Locale support influences the following features:
195+ The locale settings influence the following SQL features:
196196
197197 <itemizedlist>
198198 <listitem>
199199 <para>
200- Sort order in queries using <literal>ORDER BY</>
200+ Sort order in queries using <literal>ORDER BY</> on textual data
201201 <indexterm><primary>ORDER BY</><secondary>and locales</></indexterm>
202202 </para>
203203 </listitem>
@@ -209,9 +209,19 @@ initdb --locale=sv_SE
209209 </para>
210210 </listitem>
211211
212+ <listitem>
213+ <para>
214+ The <function>upper</>, <function>lower</>, and <function>initcap</>
215+ functions
216+ <indexterm><primary>upper</><secondary>and locales</></indexterm>
217+ <indexterm><primary>lower</><secondary>and locales</></indexterm>
218+ </para>
219+ </listitem>
220+
212221 <listitem>
213222 <para>
214223 The <function>to_char</> family of functions
224+ <indexterm><primary>to_char</><secondary>and locales</></indexterm>
215225 </para>
216226 </listitem>
217227 </itemizedlist>
@@ -294,7 +304,7 @@ initdb --locale=sv_SE
294304 allows you to store text in a variety of character sets, including
295305 single-byte character sets such as the ISO 8859 series and
296306 multiple-byte character sets such as <acronym>EUC</> (Extended Unix
297- Code),UTF8 , and Mule internal code. All character sets can be
307+ Code),UTF-8 , and Mule internal code. All character sets can be
298308 used transparently throughout the server. (If you use extension
299309 functions from other sources, it depends on whether they wrote
300310 their code correctly.) The default character set is selected while
@@ -603,7 +613,8 @@ initdb -E EUC_JP
603613 can use <option>--encoding</option> instead of
604614 <option>-E</option> if you prefer to type longer option strings.
605615 If no <option>-E</> or <option>--encoding</option> option is
606- given, <literal>SQL_ASCII</> is used.
616+ given, <command>initdb</> attempts to determine the appropriate
617+ encoding to use based on the specified or default locale.
607618 </para>
608619
609620 <para>