More minor updates and copy-editing.

diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index ac2f184ec3c5ceea15f3663c6d701a55861a1b92..fb74988f1a085ac41bca5762234c25f783a5b621 100644 (file)
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.46 2004/11/15 06:32:13 neilc Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.47 2004/12/27 22:30:10 tgl Exp $ -->
 
 <chapter id="charset">
  <title>Localization</>
@@ -72,14 +72,15 @@ initdb --locale=sv_SE
     locale then the specifications look like this:
     <literal>cs_CZ.ISO8859-2</>. What locales are available under what
     names on your system depends on what was provided by the operating
-    system vendor and what was installed.
+    system vendor and what was installed.  (On most systems, the command
+    <literal>locale -a</> will provide a list of available locales.)
    </para>
 
    <para>
     Occasionally it is useful to mix rules from several locales, e.g.,
     use English collation rules but Spanish messages.  To support that, a
     set of locale subcategories exist that control only a certain
-    aspect of the localization rules.
+    aspect of the localization rules:
 
     <informaltable>
      <tgroup cols="2">
@@ -90,7 +91,7 @@ initdb --locale=sv_SE
        </row>
        <row>
         <entry><envar>LC_CTYPE</></>
-        <entry>Character classification (What is a letter? The upper-case equivalent?)</>
+        <entry>Character classification (What is a letter? Its upper-case equivalent?)</>
        </row>
        <row>
         <entry><envar>LC_MESSAGES</></>
@@ -154,7 +155,7 @@ initdb --locale=sv_SE
     environment variables seen by the server, not by the environment
     of any client.  Therefore, be careful to configure the correct locale settings
     before starting the server.  A consequence of this is that if
-    client and server are set up to different locales, messages may
+    client and server are set up in different locales, messages may
     appear in different languages depending on where they originated.
    </para>
 
@@ -181,7 +182,7 @@ initdb --locale=sv_SE
    </note>
 
    <para>
-    To enable messages translated to the user's preferred language,
+    To enable messages to be translated to the user's preferred language,
     <acronym>NLS</acronym> must have been enabled at build time.  This
     choice is independent of the other locale support.
    </para>
@@ -234,8 +235,8 @@ initdb --locale=sv_SE
     changed without repeating <command>initdb</>.  Other locale
     settings including <envar>LC_MESSAGES</> and <envar>LC_MONETARY</>
     are initially determined by the environment the server is started
-    in.  You can check the <envar>LC_COLLATE</> and <envar>LC_CTYPE</>
-    settings of a database using the <command>SHOW</> command.
+    in, but can be changed on-the-fly.  You can check the active locale
+    settings using the <command>SHOW</> command.
    </para>
 
    <para>
@@ -256,9 +257,9 @@ initdb --locale=sv_SE
     Maintaining catalogs of message translations requires the on-going
     efforts of many volunteers that want to see
     <productname>PostgreSQL</> speak their preferred language well.
-    If messages in your language is currently not available or fully
+    If messages in your language are currently not available or not fully
     translated, your assistance would be appreciated.  If you want to
-    help, refer to the <xref linkend="nls"> or write to the developers'
+    help, refer to <xref linkend="nls"> or write to the developers'
     mailing list.
    </para>
   </sect2>
@@ -298,128 +299,128 @@ initdb --locale=sv_SE
       <title>Server Character Sets</title>
       <tgroup cols="2">
        <thead>
-       <row>
-        <entry>Name</entry>
-        <entry>Description</entry>
-       </row>
+        <row>
+         <entry>Name</entry>
+         <entry>Description</entry>
+        </row>
        </thead>
        <tbody>
-       <row>
-        <entry><literal>SQL_ASCII</literal></entry>
-        <entry><acronym>ASCII</acronym></entry>
-       </row>
-       <row>
-        <entry><literal>EUC_JP</literal></entry>
-        <entry>Japanese <acronym>EUC</></entry>
-       </row>
-       <row>
-        <entry><literal>EUC_CN</literal></entry>
-        <entry>Chinese <acronym>EUC</></entry>
-       </row>
-       <row>
-        <entry><literal>EUC_KR</literal></entry>
-        <entry>Korean <acronym>EUC</></entry>
-       </row>
-       <row>
-        <entry><literal>JOHAB</literal></entry>
-        <entry>Korean <acronym>EUC</> (Hangle base)</entry>
-       </row>
-       <row>
-        <entry><literal>EUC_TW</literal></entry>
-        <entry>Taiwan <acronym>EUC</acronym></entry>
-       </row>
-       <row>
-        <entry><literal>UNICODE</literal></entry>
-        <entry>Unicode (<acronym>UTF</acronym>-8)</entry>
-       </row>
-       <row>
-        <entry><literal>MULE_INTERNAL</literal></entry>
-        <entry>Mule internal code</entry>
-       </row>
-       <row>
-        <entry><literal>LATIN1</literal></entry>
-        <entry>ISO 8859-1/<acronym>ECMA</> 94 (Latin alphabet no.1)</entry>
-       </row>
-       <row>
-        <entry><literal>LATIN2</literal></entry>
-        <entry>ISO 8859-2/<acronym>ECMA</> 94 (Latin alphabet no.2)</entry>
-       </row>
-       <row>
-        <entry><literal>LATIN3</literal></entry>
-        <entry>ISO 8859-3/<acronym>ECMA</> 94 (Latin alphabet no.3)</entry>
-       </row>
-       <row>
-        <entry><literal>LATIN4</literal></entry>
-        <entry>ISO 8859-4/<acronym>ECMA</> 94 (Latin alphabet no.4)</entry>
-       </row>
-       <row>
-        <entry><literal>LATIN5</literal></entry>
-        <entry>ISO 8859-9/<acronym>ECMA</> 128 (Latin alphabet no.5)</entry>
-       </row>
-       <row>
-        <entry><literal>LATIN6</literal></entry>
-        <entry>ISO 8859-10/<acronym>ECMA</> 144 (Latin alphabet no.6)</entry>
-       </row>
-       <row>
-        <entry><literal>LATIN7</literal></entry>
-        <entry>ISO 8859-13 (Latin alphabet no.7)</entry>
-       </row>
-       <row>
-        <entry><literal>LATIN8</literal></entry>
-        <entry>ISO 8859-14 (Latin alphabet no.8)</entry>
-       </row>
-       <row>
-        <entry><literal>LATIN9</literal></entry>
-        <entry>ISO 8859-15 (Latin alphabet no.9)</entry>
-       </row>
-       <row>
-        <entry><literal>LATIN10</literal></entry>
-        <entry>ISO 8859-16/<acronym>ASRO</> SR 14111 (Latin alphabet no.10)</entry>
-       </row>
-       <row>
-        <entry><literal>ISO_8859_5</literal></entry>
-        <entry>ISO 8859-5/<acronym>ECMA</> 113 (Latin/Cyrillic)</entry>
-       </row>
-       <row>
-        <entry><literal>ISO_8859_6</literal></entry>
-        <entry>ISO 8859-6/<acronym>ECMA</> 114 (Latin/Arabic)</entry>
-       </row>
-       <row>
-        <entry><literal>ISO_8859_7</literal></entry>
-        <entry>ISO 8859-7/<acronym>ECMA</> 118 (Latin/Greek)</entry>
-       </row>
-       <row>
-        <entry><literal>ISO_8859_8</literal></entry>
-        <entry>ISO 8859-8/<acronym>ECMA</> 121 (Latin/Hebrew)</entry>
-       </row>
-       <row>
-        <entry><literal>KOI8</literal></entry>
-        <entry><acronym>KOI</acronym>8-R(U)</entry>
-       </row>
-       <row>
-        <entry><literal>ALT</literal></entry>
-        <entry>Windows CP866</entry>
-       </row>
-       <row>
-        <entry><literal>WIN874</literal></entry>
-        <entry>Windows CP874 (Thai)</entry>
-       </row>
-       <row>
-        <entry><literal>WIN1250</literal></entry>
-        <entry>Windows CP1250</entry>
-       </row>
-       <row>
-        <entry><literal>WIN</literal></entry>
-        <entry>Windows CP1251</entry>
-       </row>
-       <row>
-        <entry><literal>WIN1256</literal></entry>
-        <entry>Windows CP1256 (Arabic)</entry>
-       </row>
-       <row>
-        <entry><literal>TCVN</literal></entry>
-        <entry><acronym>TCVN</>-5712/Windows CP1258 (Vietnamese)</entry>
-       </row>
+        <row>
+         <entry><literal>SQL_ASCII</literal></entry>
+         <entry><acronym>ASCII</acronym></entry>
+        </row>
+        <row>
+         <entry><literal>EUC_JP</literal></entry>
+         <entry>Japanese <acronym>EUC</></entry>
+        </row>
+        <row>
+         <entry><literal>EUC_CN</literal></entry>
+         <entry>Chinese <acronym>EUC</></entry>
+        </row>
+        <row>
+         <entry><literal>EUC_KR</literal></entry>
+         <entry>Korean <acronym>EUC</></entry>
+        </row>
+        <row>
+         <entry><literal>JOHAB</literal></entry>
+         <entry>Korean <acronym>EUC</> (Hangle base)</entry>
+        </row>
+        <row>
+         <entry><literal>EUC_TW</literal></entry>
+         <entry>Taiwan <acronym>EUC</acronym></entry>
+        </row>
+        <row>
+         <entry><literal>UNICODE</literal></entry>
+         <entry>Unicode (<acronym>UTF</acronym>-8)</entry>
+        </row>
+        <row>
+         <entry><literal>MULE_INTERNAL</literal></entry>
+         <entry>Mule internal code</entry>
+        </row>
+        <row>
+         <entry><literal>LATIN1</literal></entry>
+         <entry>ISO 8859-1/<acronym>ECMA</> 94 (Latin alphabet no.1)</entry>
+        </row>
+        <row>
+         <entry><literal>LATIN2</literal></entry>
+         <entry>ISO 8859-2/<acronym>ECMA</> 94 (Latin alphabet no.2)</entry>
+        </row>
+        <row>
+         <entry><literal>LATIN3</literal></entry>
+         <entry>ISO 8859-3/<acronym>ECMA</> 94 (Latin alphabet no.3)</entry>
+        </row>
+        <row>
+         <entry><literal>LATIN4</literal></entry>
+         <entry>ISO 8859-4/<acronym>ECMA</> 94 (Latin alphabet no.4)</entry>
+        </row>
+        <row>
+         <entry><literal>LATIN5</literal></entry>
+         <entry>ISO 8859-9/<acronym>ECMA</> 128 (Latin alphabet no.5)</entry>
+        </row>
+        <row>
+         <entry><literal>LATIN6</literal></entry>
+         <entry>ISO 8859-10/<acronym>ECMA</> 144 (Latin alphabet no.6)</entry>
+        </row>
+        <row>
+         <entry><literal>LATIN7</literal></entry>
+         <entry>ISO 8859-13 (Latin alphabet no.7)</entry>
+        </row>
+        <row>
+         <entry><literal>LATIN8</literal></entry>
+         <entry>ISO 8859-14 (Latin alphabet no.8)</entry>
+        </row>
+        <row>
+         <entry><literal>LATIN9</literal></entry>
+         <entry>ISO 8859-15 (Latin alphabet no.9)</entry>
+        </row>
+        <row>
+         <entry><literal>LATIN10</literal></entry>
+         <entry>ISO 8859-16/<acronym>ASRO</> SR 14111 (Latin alphabet no.10)</entry>
+        </row>
+        <row>
+         <entry><literal>ISO_8859_5</literal></entry>
+         <entry>ISO 8859-5/<acronym>ECMA</> 113 (Latin/Cyrillic)</entry>
+        </row>
+        <row>
+         <entry><literal>ISO_8859_6</literal></entry>
+         <entry>ISO 8859-6/<acronym>ECMA</> 114 (Latin/Arabic)</entry>
+        </row>
+        <row>
+         <entry><literal>ISO_8859_7</literal></entry>
+         <entry>ISO 8859-7/<acronym>ECMA</> 118 (Latin/Greek)</entry>
+        </row>
+        <row>
+         <entry><literal>ISO_8859_8</literal></entry>
+         <entry>ISO 8859-8/<acronym>ECMA</> 121 (Latin/Hebrew)</entry>
+        </row>
+        <row>
+         <entry><literal>KOI8</literal></entry>
+         <entry><acronym>KOI</acronym>8-R(U)</entry>
+        </row>
+        <row>
+         <entry><literal>ALT</literal></entry>
+         <entry>Windows CP866</entry>
+        </row>
+        <row>
+         <entry><literal>WIN874</literal></entry>
+         <entry>Windows CP874 (Thai)</entry>
+        </row>
+        <row>
+         <entry><literal>WIN1250</literal></entry>
+         <entry>Windows CP1250</entry>
+        </row>
+        <row>
+         <entry><literal>WIN</literal></entry>
+         <entry>Windows CP1251</entry>
+        </row>
+        <row>
+         <entry><literal>WIN1256</literal></entry>
+         <entry>Windows CP1256 (Arabic)</entry>
+        </row>
+        <row>
+         <entry><literal>TCVN</literal></entry>
+         <entry><acronym>TCVN</>-5712/Windows CP1258 (Vietnamese)</entry>
+        </row>
        </tbody>
       </tgroup>
      </table>
@@ -498,6 +499,31 @@ $ <userinput>psql -l</userinput>
 (9 rows)
 </screen>
     </para>
+
+    <important>
+     <para>
+      Although you can specify any encoding you want for a database, it is
+      unwise to choose an encoding that is not what is expected by the locale
+      you have selected.  The <literal>LC_COLLATE</literal> and
+      <literal>LC_CTYPE</literal> settings imply a particular encoding,
+      and locale-dependent operations (such as sorting) are likely to
+      misinterpret data that is in an incompatible encoding.
+     </para>
+
+     <para>
+      Since these locale settings are frozen by <command>initdb</>, the
+      apparent flexibility to use different encodings in different databases
+      of a cluster is more theoretical than real.  It is likely that these
+      mechanisms will be revisited in future versions of
+      <productname>PostgreSQL</productname>.
+     </para>
+
+     <para>
+      One way to use multiple encodings safely is to set the locale to
+      <literal>C</> or <literal>POSIX</> during <command>initdb</>, thus
+      disabling any real locale awareness.
+     </para>
+    </important>
    </sect2>
 
    <sect2>
@@ -518,206 +544,206 @@ $ <userinput>psql -l</userinput>
       <title>Client/Server Character Set Conversions</title>
       <tgroup cols="2">
        <thead>
-       <row>
-        <entry>Server Character Set</entry>
-        <entry>Available Client Character Sets</entry>
-       </row>
+        <row>
+         <entry>Server Character Set</entry>
+         <entry>Available Client Character Sets</entry>
+        </row>
        </thead>
        <tbody>
-       <row>
-        <entry><literal>SQL_ASCII</literal></entry>
-        <entry><literal>SQL_ASCII</literal>, <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>EUC_JP</literal></entry>
-        <entry><literal>EUC_JP</literal>, <literal>SJIS</literal>,
-        <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>EUC_CN</literal></entry>
-        <entry><literal>EUC_CN</literal>, <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>EUC_KR</literal></entry>
-        <entry><literal>EUC_KR</literal>, <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>JOHAB</literal></entry>
-        <entry><literal>JOHAB</literal>, <literal>UNICODE</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>EUC_TW</literal></entry>
-        <entry><literal>EUC_TW</literal>, <literal>BIG5</literal>,
-        <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>  
-        <entry><literal>LATIN1</literal></entry>
-        <entry><literal>LATIN1</literal>, <literal>UNICODE</literal>
-        <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>  
-        <entry><literal>LATIN2</literal></entry>
-        <entry><literal>LATIN2</literal>, <literal>WIN1250</literal>,
-        <literal>UNICODE</literal>,
-        <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>  
-        <entry><literal>LATIN3</literal></entry>
-        <entry><literal>LATIN3</literal>, <literal>UNICODE</literal>,
-        <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>  
-        <entry><literal>LATIN4</literal></entry>
-        <entry><literal>LATIN4</literal>, <literal>UNICODE</literal>,
-        <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>  
-        <entry><literal>LATIN5</literal></entry>
-        <entry><literal>LATIN5</literal>, <literal>UNICODE</literal>
-        </entry>
-       </row>
-       <row>  
-        <entry><literal>LATIN6</literal></entry>
-        <entry><literal>LATIN6</literal>, <literal>UNICODE</literal>,
-        <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>  
-        <entry><literal>LATIN7</literal></entry>
-        <entry><literal>LATIN7</literal>, <literal>UNICODE</literal>,
-        <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>  
-        <entry><literal>LATIN8</literal></entry>
-        <entry><literal>LATIN8</literal>, <literal>UNICODE</literal>,
-        <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>  
-        <entry><literal>LATIN9</literal></entry>
-        <entry><literal>LATIN9</literal>, <literal>UNICODE</literal>,
-        <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>  
-        <entry><literal>LATIN10</literal></entry>
-        <entry><literal>LATIN10</literal>, <literal>UNICODE</literal>,
-        <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>ISO_8859_5</literal></entry>
-        <entry><literal>ISO_8859_5</literal>,
-        <literal>UNICODE</literal>,
-        <literal>MULE_INTERNAL</literal>,
-        <literal>WIN</literal>,
-        <literal>ALT</literal>,
-        <literal>KOI8</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>ISO_8859_6</literal></entry>
-        <entry><literal>ISO_8859_6</literal>,
-        <literal>UNICODE</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>ISO_8859_7</literal></entry>
-        <entry><literal>ISO_8859_7</literal>,
-        <literal>UNICODE</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>ISO_8859_8</literal></entry>
-        <entry><literal>ISO_8859_8</literal>,
-        <literal>UNICODE</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>UNICODE</literal></entry>
-        <entry>
-        <literal>EUC_JP</literal>, <literal>SJIS</literal>, 
-        <literal>EUC_KR</literal>, <literal>UHC</literal>, <literal>JOHAB</literal>,
-        <literal>EUC_CN</literal>, <literal>GBK</literal>,
-        <literal>EUC_TW</literal>, <literal>BIG5</literal>, 
-        <literal>LATIN1</literal> to <literal>LATIN10</literal>, 
-        <literal>ISO_8859_5</literal>, 
-        <literal>ISO_8859_6</literal>,
-        <literal>ISO_8859_7</literal>, 
-        <literal>ISO_8859_8</literal>, 
-        <literal>WIN</literal>, <literal>ALT</literal>, 
-        <literal>KOI8</literal>, 
-        <literal>WIN1256</literal>,
-        <literal>TCVN</literal>,
-        <literal>WIN874</literal>,
-        <literal>GB18030</literal>,
-        <literal>WIN1250</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>MULE_INTERNAL</literal></entry>
-        <entry><literal>EUC_JP</literal>, <literal>SJIS</literal>, <literal>EUC_KR</literal>, <literal>EUC_CN</literal>, 
-         <literal>EUC_TW</literal>, <literal>BIG5</literal>, <literal>LATIN1</literal> to <literal>LATIN5</literal>, 
-         <literal>WIN</literal>, <literal>ALT</literal>,
-        <literal>WIN1250</literal>,
-         <literal>BIG5</literal>, <literal>ISO_8859_5</literal>, <literal>KOI8</literal></entry>
-       </row>
-       <row>
-        <entry><literal>KOI8</literal></entry>
-        <entry><literal>ISO_8859_5</literal>, <literal>WIN</literal>, 
-        <literal>ALT</literal>, <literal>KOI8</literal>,
-        <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>ALT</literal></entry>
-        <entry><literal>ISO_8859_5</literal>, <literal>WIN</literal>, 
-        <literal>ALT</literal>, <literal>KOI8</literal>,
-        <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>WIN874</literal></entry>
-        <entry><literal>WIN874</literal>,
-        <literal>UNICODE</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>WIN1250</literal></entry>
-        <entry><literal>LATIN2</literal>, <literal>WIN1250</literal>,
+        <row>
+         <entry><literal>SQL_ASCII</literal></entry>
+         <entry><literal>SQL_ASCII</literal>, <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>EUC_JP</literal></entry>
+         <entry><literal>EUC_JP</literal>, <literal>SJIS</literal>,
+         <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>EUC_CN</literal></entry>
+         <entry><literal>EUC_CN</literal>, <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>EUC_KR</literal></entry>
+         <entry><literal>EUC_KR</literal>, <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>JOHAB</literal></entry>
+         <entry><literal>JOHAB</literal>, <literal>UNICODE</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>EUC_TW</literal></entry>
+         <entry><literal>EUC_TW</literal>, <literal>BIG5</literal>,
+         <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>  
+         <entry><literal>LATIN1</literal></entry>
+         <entry><literal>LATIN1</literal>, <literal>UNICODE</literal>
+         <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>  
+         <entry><literal>LATIN2</literal></entry>
+         <entry><literal>LATIN2</literal>, <literal>WIN1250</literal>,
+         <literal>UNICODE</literal>,
+         <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>  
+         <entry><literal>LATIN3</literal></entry>
+         <entry><literal>LATIN3</literal>, <literal>UNICODE</literal>,
+         <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>  
+         <entry><literal>LATIN4</literal></entry>
+         <entry><literal>LATIN4</literal>, <literal>UNICODE</literal>,
+         <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>  
+         <entry><literal>LATIN5</literal></entry>
+         <entry><literal>LATIN5</literal>, <literal>UNICODE</literal>
+         </entry>
+        </row>
+        <row>  
+         <entry><literal>LATIN6</literal></entry>
+         <entry><literal>LATIN6</literal>, <literal>UNICODE</literal>,
+         <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>  
+         <entry><literal>LATIN7</literal></entry>
+         <entry><literal>LATIN7</literal>, <literal>UNICODE</literal>,
+         <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>  
+         <entry><literal>LATIN8</literal></entry>
+         <entry><literal>LATIN8</literal>, <literal>UNICODE</literal>,
+         <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>  
+         <entry><literal>LATIN9</literal></entry>
+         <entry><literal>LATIN9</literal>, <literal>UNICODE</literal>,
+         <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>  
+         <entry><literal>LATIN10</literal></entry>
+         <entry><literal>LATIN10</literal>, <literal>UNICODE</literal>,
+         <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>ISO_8859_5</literal></entry>
+         <entry><literal>ISO_8859_5</literal>,
+         <literal>UNICODE</literal>,
+         <literal>MULE_INTERNAL</literal>,
+         <literal>WIN</literal>,
+         <literal>ALT</literal>,
+         <literal>KOI8</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>ISO_8859_6</literal></entry>
+         <entry><literal>ISO_8859_6</literal>,
+         <literal>UNICODE</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>ISO_8859_7</literal></entry>
+         <entry><literal>ISO_8859_7</literal>,
+         <literal>UNICODE</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>ISO_8859_8</literal></entry>
+         <entry><literal>ISO_8859_8</literal>,
+         <literal>UNICODE</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>UNICODE</literal></entry>
+         <entry>
+         <literal>EUC_JP</literal>, <literal>SJIS</literal>, 
+         <literal>EUC_KR</literal>, <literal>UHC</literal>, <literal>JOHAB</literal>,
+         <literal>EUC_CN</literal>, <literal>GBK</literal>,
+         <literal>EUC_TW</literal>, <literal>BIG5</literal>, 
+         <literal>LATIN1</literal> to <literal>LATIN10</literal>, 
+         <literal>ISO_8859_5</literal>, 
+         <literal>ISO_8859_6</literal>,
+         <literal>ISO_8859_7</literal>, 
+         <literal>ISO_8859_8</literal>, 
+         <literal>WIN</literal>, <literal>ALT</literal>, 
+         <literal>KOI8</literal>, 
+         <literal>WIN1256</literal>,
+         <literal>TCVN</literal>,
+         <literal>WIN874</literal>,
+         <literal>GB18030</literal>,
+         <literal>WIN1250</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>MULE_INTERNAL</literal></entry>
+         <entry><literal>EUC_JP</literal>, <literal>SJIS</literal>, <literal>EUC_KR</literal>, <literal>EUC_CN</literal>, 
+          <literal>EUC_TW</literal>, <literal>BIG5</literal>, <literal>LATIN1</literal> to <literal>LATIN5</literal>, 
+          <literal>WIN</literal>, <literal>ALT</literal>,
+         <literal>WIN1250</literal>,
+          <literal>BIG5</literal>, <literal>ISO_8859_5</literal>, <literal>KOI8</literal></entry>
+        </row>
+        <row>
+         <entry><literal>KOI8</literal></entry>
+         <entry><literal>ISO_8859_5</literal>, <literal>WIN</literal>, 
+         <literal>ALT</literal>, <literal>KOI8</literal>,
+         <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>ALT</literal></entry>
+         <entry><literal>ISO_8859_5</literal>, <literal>WIN</literal>, 
+         <literal>ALT</literal>, <literal>KOI8</literal>,
+         <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>WIN874</literal></entry>
+         <entry><literal>WIN874</literal>,
+         <literal>UNICODE</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>WIN1250</literal></entry>
+         <entry><literal>LATIN2</literal>, <literal>WIN1250</literal>,
+         <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>WIN</literal></entry>
+         <entry><literal>ISO_8859_5</literal>, <literal>WIN</literal>, 
+         <literal>ALT</literal>, <literal>KOI8</literal>,
          <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>WIN</literal></entry>
-        <entry><literal>ISO_8859_5</literal>, <literal>WIN</literal>, 
-        <literal>ALT</literal>, <literal>KOI8</literal>,
-        <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>WIN1256</literal></entry>
-        <entry><literal>WIN1256</literal>,
-        <literal>UNICODE</literal>
-        </entry>
-       </row>
-       <row>
-        <entry><literal>TCVN</literal></entry>
-        <entry><literal>TCVN</literal>,
-        <literal>UNICODE</literal>
-        </entry>
-       </row>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>WIN1256</literal></entry>
+         <entry><literal>WIN1256</literal>,
+         <literal>UNICODE</literal>
+         </entry>
+        </row>
+        <row>
+         <entry><literal>TCVN</literal></entry>
+         <entry><literal>TCVN</literal>,
+         <literal>UNICODE</literal>
+         </entry>
+        </row>
        </tbody>
       </tgroup>
      </table>
@@ -731,11 +757,11 @@ $ <userinput>psql -l</userinput>
      <itemizedlist>
       <listitem>
        <para>
-       Using the <command>\encoding</command> command in
-       <application>psql</application>.
-       <command>\encoding</command> allows you to change client
-       encoding on the fly. For
-       example, to change the encoding to <literal>SJIS</literal>, type:
+        Using the <command>\encoding</command> command in
+        <application>psql</application>.
+        <command>\encoding</command> allows you to change client
+        encoding on the fly. For
+        example, to change the encoding to <literal>SJIS</literal>, type:
 
 <programlisting>
 \encoding SJIS
@@ -745,27 +771,27 @@ $ <userinput>psql -l</userinput>
 
       <listitem>
        <para>
-       Using <application>libpq</> functions.
-       <command>\encoding</command> actually calls
-       <function>PQsetClientEncoding()</function> for its purpose.
+        Using <application>libpq</> functions.
+        <command>\encoding</command> actually calls
+        <function>PQsetClientEncoding()</function> for its purpose.
 
 <synopsis>
 int PQsetClientEncoding(PGconn *<replaceable>conn</replaceable>, const char *<replaceable>encoding</replaceable>);
 </synopsis>
 
-       where <replaceable>conn</replaceable> is a connection to the server,
-       and <replaceable>encoding</replaceable> is the encoding you
-       want to use. If the function successfully sets the encoding, it returns 0,
-       otherwise -1. The current encoding for this connection can be determined by
-       using:
+        where <replaceable>conn</replaceable> is a connection to the server,
+        and <replaceable>encoding</replaceable> is the encoding you
+        want to use. If the function successfully sets the encoding, it returns 0,
+        otherwise -1. The current encoding for this connection can be determined by
+        using:
 
 <synopsis>
 int PQclientEncoding(const PGconn *<replaceable>conn</replaceable>);
 </synopsis>
 
-       Note that it returns the encoding ID, not a symbolic string
-       such as <literal>EUC_JP</literal>. To convert an encoding ID to an encoding name, you
-       can use:
+        Note that it returns the encoding ID, not a symbolic string
+        such as <literal>EUC_JP</literal>. To convert an encoding ID to an encoding name, you
+        can use:
 
 <synopsis>
 char *pg_encoding_to_char(int <replaceable>encoding_id</replaceable>);
@@ -775,27 +801,27 @@ char *pg_encoding_to_char(int <replaceable>encoding_id</replaceable>);
 
       <listitem>
        <para>
-       Using <command>SET client_encoding TO</command>.
+        Using <command>SET client_encoding TO</command>.
 
-       Setting the client encoding can be done with this SQL command:
+        Setting the client encoding can be done with this SQL command:
 
 <programlisting>
 SET CLIENT_ENCODING TO '<replaceable>value</>';
 </programlisting>
 
-       Also you can use the more standard SQL syntax <literal>SET NAMES</literal> for this purpose:
+        Also you can use the more standard SQL syntax <literal>SET NAMES</literal> for this purpose:
 
 <programlisting>
 SET NAMES '<replaceable>value</>';
 </programlisting>
 
-       To query the current client encoding:
+        To query the current client encoding:
 
 <programlisting>
 SHOW client_encoding;
 </programlisting>
 
-       To return to the default encoding:
+        To return to the default encoding:
 
 <programlisting>
 RESET client_encoding;
@@ -805,7 +831,7 @@ RESET client_encoding;
 
       <listitem>
        <para>
-        Using <envar>PGCLIENTENCODING</envar>. If environment variable
+        Using <envar>PGCLIENTENCODING</envar>. If the environment variable
         <envar>PGCLIENTENCODING</envar> is defined in the client's
         environment, that client encoding is automatically selected
         when a connection to the server is made.  (This can
@@ -874,7 +900,7 @@ RESET client_encoding;
 
        <listitem>
         <para>
-        <acronym>UTF</acronym>-8 is defined here.
+         <acronym>UTF</acronym>-8 is defined here.
         </para>
        </listitem>
       </varlistentry>

diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml
index 02db43f049bf49bb906593f012d2cddddfe63f33..663cc931be0ceb8dc474b5bf2723956c35fea815 100644 (file)
--- a/doc/src/sgml/maintenance.sgml
+++ b/doc/src/sgml/maintenance.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.39 2004/12/13 18:05:08 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.40 2004/12/27 22:30:10 tgl Exp $
 -->
 
 <chapter id="maintenance">
@@ -79,7 +79,7 @@ $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.39 2004/12/13 18:05:08 pete
    Therefore, database administrators must understand these issues and
    develop an appropriate maintenance strategy.  This section concentrates
    on explaining the high-level issues; for details about command syntax
-   and so on, see the <command>VACUUM</> command reference page.
+   and so on, see the <xref linkend="sql-vacuum"> reference page.
   </para>
 
   <para>
@@ -91,6 +91,13 @@ $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.39 2004/12/13 18:05:08 pete
    times of day.
   </para>
 
+  <para>
+   Beginning in <productname>PostgreSQL</productname> 8.0, there are
+   configuration parameters that can be adjusted to further reduce the
+   performance impact of background vacuuming.  See
+   <xref linkend="runtime-config-resource-vacuum-cost">.
+  </para>
+
   <sect2 id="vacuum-for-space-recovery">
    <title>Recovering disk space</title>
 
@@ -162,13 +169,20 @@ $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.39 2004/12/13 18:05:08 pete
     Recommended practice for most sites is to schedule a database-wide
     <command>VACUUM</> once a day at a low-usage time of day,
     supplemented by more frequent vacuuming of heavily-updated tables
-    if necessary. In fact, some installations with an extremely high
-    rate of data modification <command>VACUUM</command> some tables as
-    often as once very five minutes.  (If you have multiple databases
+    if necessary. (Some installations with an extremely high
+    rate of data modification <command>VACUUM</command> busy tables as
+    often as once every few minutes.)  If you have multiple databases
     in a cluster, don't forget to <command>VACUUM</command> each one;
-    the program <filename>vacuumdb</> may be helpful.)
+    the program <filename>vacuumdb</> may be helpful.
    </para>
 
+   <tip>
+    <para>
+     The <filename>contrib/pg_autovacuum</> program can be useful for
+     automating high-frequency vacuuming operations.
+    </para>
+   </tip>
+
    <para>
     <command>VACUUM FULL</> is recommended for cases where you know
     you have deleted the majority of rows in a table, so that the
@@ -404,6 +418,18 @@ VACUUM
     you to ensure that such databases are frozen correctly.
    </para>
 
+   <warning>
+    <para>
+     To be sure of safety against transaction wraparound, it is necessary
+     to vacuum <emphasis>every</> table, including system catalogs, in
+     <emphasis>every</> database at least once every billion transactions.
+     We have seen data loss situations caused by people deciding that they
+     only needed to vacuum their active user tables, rather than issuing
+     database-wide vacuum commands.  That will appear to work fine ...
+     for a while.
+    </para>
+   </warning>
+
   </sect2>
  </sect1>
 
@@ -475,7 +501,7 @@ VACUUM
    If you start the server with
    <command>pg_ctl</>, then <systemitem>stderr</>
    is already redirected to <systemitem>stdout</>, so you just need a
-   pipe command:
+   pipe command, for example:
 
 <programlisting>
 pg_ctl start | rotatelogs /var/log/pgsql_log 86400
@@ -499,7 +525,7 @@ pg_ctl start | rotatelogs /var/log/pgsql_log 86400
   <para>
    On many systems, however, <application>syslog</> is not very reliable,
    particularly with large log messages; it may truncate or drop messages
-   just when you need them the most.  Also, on <productname>linux</>,
+   just when you need them the most.  Also, on <productname>Linux</>,
    <application>syslog</> will sync each message to disk, yielding poor
    performance.  (You can use a <literal>-</> at the start of the file name
    in the <application>syslog</> configuration file to disable this behavior.)
@@ -508,8 +534,10 @@ pg_ctl start | rotatelogs /var/log/pgsql_log 86400
   <para>
    Note that all the solutions described above take care of starting new
    log files at configurable intervals, but they do not handle deletion
-   of old, no-longer-interesting log files.  You will also want to set
-   up a batch job to periodically delete old log files.
+   of old, no-longer-interesting log files.  You will probably want to set
+   up a batch job to periodically delete old log files.  Another possibility
+   is to configure the rotation program so that old log files are overwritten
+   cyclically.
   </para>
  </sect1>
 </chapter>

diff --git a/doc/src/sgml/manage-ag.sgml b/doc/src/sgml/manage-ag.sgml
index c78b8fefb8498be0f3988489bec0b430b0006e10..0deb3cc8b16c9bf1fca643cc40ce4978b303b4d9 100644 (file)
--- a/doc/src/sgml/manage-ag.sgml
+++ b/doc/src/sgml/manage-ag.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.38 2004/12/13 18:05:08 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.39 2004/12/27 22:30:10 tgl Exp $
 -->
 
 <chapter id="managing-databases">
@@ -37,23 +37,21 @@ $PostgreSQL: pgsql/doc/src/sgml/manage-ag.sgml,v 2.38 2004/12/13 18:05:08 petere
   </para>
 
   <para>
-   An application that connects to the database server specifies in
+   When connecting to the database server, a client must specify in
    its connection request the name of the database it wants to connect
    to. It is not possible to access more than one database per
    connection. (But an application is not restricted in the number of
-   connections it opens to the same or other databases.)  It is
-   possible, however, to access more than one schema from the same
-   connection.  Schemas are a purely logical structure and who can
-   access what is managed by the privilege system.  Databases are
+   connections it opens to the same or other databases.)  Databases are
    physically separated and access control is managed at the
    connection level.  If one <productname>PostgreSQL</> server
    instance is to house projects or users that should be separate and
    for the most part unaware of each other, it is therefore
    recommendable to put them into separate databases.  If the projects
    or users are interrelated and should be able to use each other's
-   resources they should be put in the same databases but possibly
-   into separate schemas.  More information about managing schemas is
-   in <xref linkend="ddl-schemas">.
+   resources they should be put in the same database, but possibly
+   into separate schemas.  Schemas are a purely logical structure and who can
+   access what is managed by the privilege system.  More information about
+   managing schemas is in <xref linkend="ddl-schemas">.
   </para>
 
   <note>
@@ -116,7 +114,7 @@ CREATE DATABASE <replaceable>name</>;
   </para>
 
   <para>
-   As an extra convenience, there is also a program that you can
+   As a convenience, there is a program that you can
    execute from the shell to create new databases,
    <command>createdb</>.<indexterm><primary>createdb</></>
 
@@ -127,7 +125,7 @@ createdb <replaceable class="parameter">dbname</replaceable>
    <command>createdb</> does no magic. It connects to the <literal>template1</>
    database and issues the <command>CREATE DATABASE</> command,
    exactly as described above.
-   The reference page on <command>createdb</> contains the invocation
+   The <xref linkend="app-createdb"> reference page contains the invocation
    details. Note that <command>createdb</> without any arguments will create
    a database with the current user name, which may or may not be what
    you want.
@@ -285,10 +283,11 @@ createdb -T template0 <replaceable>dbname</>
 <programlisting>
 ALTER DATABASE mydb SET geqo TO off;
 </programlisting>
-   This will save the setting (but not set it immediately) and in
-   subsequent connections it will appear as though <literal>SET geqo
-   TO off;</literal> had been called right before the session started.
-   Note that users can still alter this setting during the session; it
+   This will save the setting (but not set it immediately).  In
+   subsequent connections to this database it will appear as though
+   <literal>SET geqo TO off;</literal> had been executed just before the
+   session started.
+   Note that users can still alter this setting during their sessions; it
    will only be the default.  To undo any such setting, use
    <literal>ALTER DATABASE <replaceable>dbname</> RESET
    <replaceable>varname</>;</literal>.
@@ -322,7 +321,7 @@ DROP DATABASE <replaceable>name</>;
 
   <para>
    For convenience, there is also a shell program to drop
-   databases:<indexterm><primary>dropdb</></>
+   databases, <xref linkend="app-dropdb">:<indexterm><primary>dropdb</></>
 <synopsis>
 dropdb <replaceable class="parameter">dbname</replaceable>
 </synopsis>

diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml
index 0fda608285b7e767d7bd32cf8ab94349fd0f06b2..c09d2facda4674cdbfd4e98fe06b5a4f8b7ccf2e 100644 (file)
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/user-manag.sgml,v 1.25 2004/02/17 09:07:16 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/user-manag.sgml,v 1.26 2004/12/27 22:30:10 tgl Exp $
 -->
 
 <chapter id="user-manag">
@@ -175,9 +175,10 @@ dropuser <replaceable>name</replaceable>
 <programlisting>
 ALTER USER myname SET enable_indexscan TO off;
 </programlisting>
-   This will save the setting (but not set it immediately) and in
-   subsequent connections it will appear as though <literal>SET enable_indexscan
-   TO off;</literal> had been called right before the session started.
+   This will save the setting (but not set it immediately).  In
+   subsequent connections by this user it will appear as though
+   <literal>SET enable_indexscan TO off;</literal> had been executed
+   just before the session started.
    You can still alter this setting during the session; it will only
    be the default. To undo any such setting, use <literal>ALTER USER
    <replaceable>username</> RESET <replaceable>varname</>;</literal>.
@@ -243,7 +244,7 @@ ALTER GROUP <replaceable>name</replaceable> DROP USER <replaceable>uname1</repla
    <literal>RULE</>, <literal>REFERENCES</>, <literal>TRIGGER</>,
    <literal>CREATE</>, <literal>TEMPORARY</>, <literal>EXECUTE</>,
    <literal>USAGE</>, and <literal>ALL PRIVILEGES</>. For more
-   information on the different types of privileges support by
+   information on the different types of privileges supported by
    <productname>PostgreSQL</productname>, see the
    <xref linkend="sql-grant" endterm="sql-grant-title"> reference page.
    The right to modify or
@@ -289,18 +290,21 @@ REVOKE ALL ON accounts FROM PUBLIC;
    Functions and triggers allow users to insert code into the backend
    server that other users may execute without knowing it. Hence, both
    mechanisms permit users to <quote>Trojan horse</quote>
-   others with relative impunity. The only real protection is tight
+   others with relative ease. The only real protection is tight
    control over who can define functions.
   </para>
 
   <para>
-   Functions written in any language except SQL run inside the backend
-   server process with the operating systems permissions of the
-   database server daemon process. It is possible to change the
-   server's internal data structures from inside of trusted functions.
+   Functions run inside the backend
+   server process with the operating system permissions of the
+   database server daemon.  If the programmming language
+   used for the function allows unchecked memory accesses, it is
+   possible to change the server's internal data structures.
    Hence, among many other things, such functions can circumvent any
-   system access controls. This is an inherent problem with
-   user-defined C functions.
+   system access controls.  Function languages that allow such access
+   are considered <quote>untrusted</>, and
+   <productname>PostgreSQL</productname> allows only superusers to
+   create functions written in those languages.
   </para>
  </sect1>