Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitfd4f3b3

Browse files
author
Neil Conway
committed
Improve the locale and character set docs, add some <xref>s pointing
to the character set docs where appropriate, and improve the postmasterreference page. Character set cross-refs suggested by Gavin Kistner.
1 parent5688e45 commitfd4f3b3

File tree

6 files changed

+76
-56
lines changed

6 files changed

+76
-56
lines changed

‎doc/src/sgml/charset.sgml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.43 2004/03/09 16:57:46 neilc Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.44 2004/03/23 02:47:35 neilc Exp $ -->
22

33
<chapter id="charset">
44
<title>Localization</>
@@ -52,24 +52,24 @@
5252
Locale support is automatically initialized when a database
5353
cluster is created using <command>initdb</command>.
5454
<command>initdb</command> will initialize the database cluster
55-
with the locale setting of its execution environment; so if your
56-
system is already set to use the locale that you want in your
57-
database cluster then there is nothing else you need to do. If
58-
you want to use a different locale (or you are not sure which
59-
locale your system is set to), you cantell
60-
<command>initdb</command> exactly which localeyou want with the
61-
option<option>--locale</option>. For example:
55+
with the locale setting of its execution environment by default,
56+
so if yoursystem is already set to use the locale that you want
57+
in yourdatabase cluster then there is nothing else you need to
58+
do. Ifyou want to use a different locale (or you are not sure
59+
whichlocale your system is set to), you caninstruct
60+
<command>initdb</command> exactly which localeto use by
61+
specifying the<option>--locale</option> option. For example:
6262
<screen>
6363
initdb --locale=sv_SE
6464
</screen>
6565
</para>
6666

6767
<para>
68-
This example sets the locale to Swedish (<literal>sv</>) as spoken in
69-
Sweden (<literal>SE</>). Other possibilities might be
70-
<literal>en_US</> (U.S. English) and <literal>fr_CA</> (Canada,
71-
French). If more than one character set can be useful for a locale
72-
then the specifications look like this:
68+
This example sets the locale to Swedish (<literal>sv</>) as spoken
69+
inSweden (<literal>SE</>). Other possibilities might be
70+
<literal>en_US</> (U.S. English) and <literal>fr_CA</> (French
71+
Canadian). If more than one character set can be useful for a
72+
localethen the specifications look like this:
7373
<literal>cs_CZ.ISO8859-2</>. What locales are available under what
7474
names on your system depends on what was provided by the operating
7575
system vendor and what was installed.
@@ -141,7 +141,7 @@ initdb --locale=sv_SE
141141
The other locale categories can be changed as desired whenever the
142142
server is running by setting the run-time configuration variables
143143
that have the same name as the locale categories (see <xref
144-
linkend="runtime-config"> for details). The defaults that are
144+
linkend="runtime-config-client-format"> for details). The defaults that are
145145
chosen by <command>initdb</command> are actually only written into
146146
the configuration file <filename>postgresql.conf</filename> to
147147
serve as defaults when the server is started. If you delete the
@@ -196,7 +196,7 @@ initdb --locale=sv_SE
196196
<itemizedlist>
197197
<listitem>
198198
<para>
199-
Sort order in queries using <command>ORDER BY</>
199+
Sort order in queries using <literal>ORDER BY</>
200200
<indexterm><primary>ORDER BY</><secondary>and locales</></indexterm>
201201
</para>
202202
</listitem>
@@ -286,7 +286,7 @@ initdb --locale=sv_SE
286286
databases each with a different character set.
287287
</para>
288288

289-
<sect2>
289+
<sect2 id="multibyte-charset-supported">
290290
<title>Supported Character Sets</title>
291291

292292
<para>

‎doc/src/sgml/datatype.sgml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.143 2004/03/09 16:57:46 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.144 2004/03/23 02:47:35 neilc Exp $
33
-->
44

55
<chapter id="datatype">
@@ -945,7 +945,10 @@ CREATE TABLE <replaceable class="parameter">tablename</replaceable> (
945945
<para>
946946
Refer to <xref linkend="sql-syntax-strings"> for information about
947947
the syntax of string literals, and to <xref linkend="functions">
948-
for information about available operators and functions.
948+
for information about available operators and functions. The
949+
database character set determines the character set used to store
950+
textual values; for more information on character set support,
951+
refer to <xref linkend="multibyte">.
949952
</para>
950953

951954
<example>

‎doc/src/sgml/ref/create_database.sgml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/create_database.sgml,v 1.37 2003/11/29 19:51:38 pgsql Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_database.sgml,v 1.38 2004/03/23 02:47:35 neilc Exp $
33
PostgreSQL documentation
44
-->
55

@@ -139,10 +139,12 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
139139
<term><replaceable class="parameter">encoding</replaceable></term>
140140
<listitem>
141141
<para>
142-
Character set encoding to use in the new database. Specify
142+
Character set encoding to use in the new database. Specify
143143
a string constant (e.g., <literal>'SQL_ASCII'</literal>),
144144
or an integer encoding number, or <literal>DEFAULT</literal>
145-
to use the default encoding.
145+
to use the default encoding. The character sets supported by the
146+
<productname>PostgreSQL</productname> server are described in
147+
<xref linkend="multibyte-charset-supported">.
146148
</para>
147149
</listitem>
148150
</varlistentry>

‎doc/src/sgml/ref/createdb.sgml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.37 2003/11/29 19:51:38 pgsql Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/createdb.sgml,v 1.38 2004/03/23 02:47:35 neilc Exp $
33
PostgreSQL documentation
44
-->
55

@@ -112,7 +112,10 @@ PostgreSQL documentation
112112
<term><option>--encoding <replaceable class="parameter">encoding</replaceable></></term>
113113
<listitem>
114114
<para>
115-
Specifies the character encoding scheme to be used in this database.
115+
Specifies the character encoding scheme to be used in this
116+
database. The character sets supported by the
117+
<productname>PostgreSQL</productname> server are described in
118+
<xref linkend="multibyte-charset-supported">.
116119
</para>
117120
</listitem>
118121
</varlistentry>

‎doc/src/sgml/ref/initdb.sgml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.28 2003/11/29 19:51:39 pgsql Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.29 2004/03/23 02:47:35 neilc Exp $
33
PostgreSQL documentation
44
-->
55

@@ -120,8 +120,11 @@ PostgreSQL documentation
120120
<listitem>
121121
<para>
122122
Selects the encoding of the template database. This will also
123-
be the default encoding of any database you create later, unless you
124-
override it there. The default is <literal>SQL_ASCII</literal>.
123+
be the default encoding of any database you create later,
124+
unless you override it there. The default is
125+
<literal>SQL_ASCII</literal>. The character sets supported by
126+
the <productname>PostgreSQL</productname> server are described
127+
in <xref linkend="multibyte-charset-supported">.
125128
</para>
126129
</listitem>
127130
</varlistentry>
@@ -132,7 +135,8 @@ PostgreSQL documentation
132135
<para>
133136
Sets the default locale for the database cluster. If this
134137
option is not specified, the locale is inherited from the
135-
environment that <command>initdb</command> runs in.
138+
environment that <command>initdb</command> runs in. Locale
139+
support is described in <xref linkend="locale">.
136140
</para>
137141
</listitem>
138142
</varlistentry>

‎doc/src/sgml/ref/postmaster.sgml

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.47 2004/03/2301:23:48 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.48 2004/03/2302:47:35 neilc Exp $
33
PostgreSQL documentation
44
-->
55

@@ -93,8 +93,9 @@ PostgreSQL documentation
9393
<listitem>
9494
<para>
9595
Enables run-time assertion checks, which is a debugging aid to
96-
detect programming mistakes. This is only available if it was
97-
enabled during compilation. If so, the default is on.
96+
detect programming mistakes. This option is only available if
97+
assertions were enabled when <productname>PostgreSQL</> was
98+
compiled. If so, the default is on.
9899
</para>
99100
</listitem>
100101
</varlistentry>
@@ -104,8 +105,9 @@ PostgreSQL documentation
104105
<listitem>
105106
<para>
106107
Sets the number of shared buffers for use by the server
107-
processes. This value defaults to 64 buffers, where each
108-
buffer is 8 kB.
108+
processes. The default value of this parameter is chosen
109+
automatically by <application>initdb</application>; refer to <xref
110+
linkend="runtime-config-resource-memory"> for more information.
109111
</para>
110112
</listitem>
111113
</varlistentry>
@@ -114,11 +116,12 @@ PostgreSQL documentation
114116
<term><option>-c <replaceable>name</replaceable>=<replaceable>value</replaceable></option></term>
115117
<listitem>
116118
<para>
117-
Sets a named run-time parameter. Consult <xref linkend="runtime-config"> for
118-
a list and descriptions. Most of the other command line
119-
options are in fact short forms of such a parameter
120-
assignment. <option>-c</> can appear multiple times to set
121-
multiple parameters.
119+
Sets a named run-time parameter. The configuration parameters
120+
supported by <productname>PostgreSQL</productname> are
121+
described in <xref linkend="runtime-config">. Most of the
122+
other command line options are in fact short forms of such a
123+
parameter assignment. <option>-c</> can appear multiple times
124+
to set multiple parameters.
122125
</para>
123126
</listitem>
124127
</varlistentry>
@@ -129,7 +132,7 @@ PostgreSQL documentation
129132
<para>
130133
Sets the debug level. The higher this value is set, the more
131134
debugging output is written to the server log. Values are from
132-
1 to 5.
135+
1 to 5.
133136
</para>
134137
</listitem>
135138
</varlistentry>
@@ -150,10 +153,11 @@ PostgreSQL documentation
150153
<para>
151154
Disables <function>fsync</function> calls for performance
152155
improvement, at the risk of data corruption in event of a
153-
system crash.Thisoptioncorresponds to setting
154-
<literal>fsync=false</> in <filename>postgresql.conf</>. Read the detailed
155-
documentation before using this!
156+
system crash.Specifying thisoptionis equivalent to
157+
disabling the <xref linkend="guc-fsync"> configuration
158+
parameter. Read the detaileddocumentation before using this!
156159
</para>
160+
157161
<para>
158162
<option>--fsync=true</option> has the opposite effect
159163
of this option.
@@ -167,15 +171,15 @@ PostgreSQL documentation
167171
<para>
168172
Specifies the IP host name or address on which the
169173
<command>postmaster</command> is to listen for TCP/IP
170-
connections from client applications. The value can also be
171-
aspace-separated list of addresses, or <literal>*</> to specify
172-
listening on all available interfaces. An empty value specifies
173-
not listening on any IP addresses, in which case only Unix-domain
174-
sockets can be used to connect to the <command>postmaster</command>.
175-
Defaults to listening only
176-
on<systemitem class="systemname">localhost</systemitem>.
177-
Thisoption is equivalent to setting<literal>listen_addresses</> in
178-
<filename>postgresql.conf</>.
174+
connections from client applications. The value can also be a
175+
space-separated list of addresses, or <literal>*</> to specify
176+
listening on all available interfaces. An empty value
177+
specifiesnot listening on any IP addresses, in which case
178+
only Unix-domainsockets can be used to connect to the
179+
<command>postmaster</command>.Defaults to listening only on
180+
<systemitem class="systemname">localhost</systemitem>.
181+
Specifying thisoption is equivalent to settingthe <xref
182+
linkend="guc-listen-addresses">.
179183
</para>
180184
</listitem>
181185
</varlistentry>
@@ -187,13 +191,13 @@ PostgreSQL documentation
187191
Allows remote clients to connect via TCP/IP (Internet domain)
188192
connections. Without this option, only local connections are
189193
accepted. This option is equivalent to setting
190-
<literal>listen_addresses</> to <literal>*</> in
194+
<varname>listen_addresses</> to <literal>*</> in
191195
<filename>postgresql.conf</> or via <option>-h</>.
192196
</para>
193197
<para>
194198
This option is deprecated since it does not allow access to the
195-
full functionality of <literal>listen_addresses</>. It's usually
196-
better to set <literal>listen_addresses</> directly.
199+
full functionality of <xref linkend="guc-listen-addresses">.
200+
It's usuallybetter to set <varname>listen_addresses</> directly.
197201
</para>
198202
</listitem>
199203
</varlistentry>
@@ -214,8 +218,11 @@ PostgreSQL documentation
214218
<term><option>-l</option></term>
215219
<listitem>
216220
<para>
217-
Enables secure connections using SSL. You must have compiled with SSL
218-
enabled to use this option.
221+
Enables secure connections using <acronym>SSL</acronym>.
222+
<productname>PostgreSQL</productname> must have been compiled with
223+
support for <acronym>SSL</acronym> for this option to be
224+
available. For more information on using <acronym>SSL</acronym>,
225+
refer to <xref linkend="ssl-tcp">.
219226
</para>
220227
</listitem>
221228
</varlistentry>
@@ -231,7 +238,8 @@ PostgreSQL documentation
231238
<option>-B</option> is required to be at least twice
232239
<option>-N</option>. See <xref linkend="kernel-resources"> for a discussion of
233240
system resource requirements for large numbers of client
234-
connections.)
241+
connections.) Specifying this option is equivalent to setting the
242+
<xref linkend="guc-max-connections"> configuration parameter.
235243
</para>
236244
</listitem>
237245
</varlistentry>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp