Add SET TRANSACTION ISOLATION LEVEL and SET NAMES mention.

diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index f4e7374e11e06928dbdeff769ce5127a6fff0c2a..f60577f39b10a21f0864d900ed65a2b092e90f53 100644 (file)
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -530,7 +530,7 @@ SET TIME ZONE { '<REPLACEABLE CLASS="PARAMETER">timezone</REPLACEABLE>' | LOCAL
     <variablelist>
      <varlistentry>
       <term>
-       XACTISOLEVEL
+       XACTISOLEVEL | TRANSACTION ISOLATION LEVEL
       </term>
       <listitem>
        <para>
@@ -556,15 +556,88 @@ SET TIME ZONE { '<REPLACEABLE CLASS="PARAMETER">timezone</REPLACEABLE>' | LOCAL
          </term>
          <listitem>
           <para>
-           Sets the cost of a heap scan to the default value.
+               Sets the isolation level for transactions to
+               'SERIALIZABLE' or 'COMMITTED'.
           </para>
          </listitem>
         </varlistentry>
        </variablelist>
        </para>
+
+    <variablelist>
+     <varlistentry>
+      <term>
+       CLIENT_ENCODING | NAMES
+      </term>
+      <listitem>
        <para>
-       The frontend may be initialized by setting the PGCOSTHEAP
-       environment variable.
+       Sets the multi-byte client encoding
+       
+       <variablelist>
+        <varlistentry>
+         <term>
+          <replaceable class="parameter">value</replaceable>
+         </term>
+         <listitem>
+          <para>
+               Sets the multi-byte client encoding.
+          </para>
+         </listitem>
+        </varlistentry>
+   </para>
+        
+        <varlistentry>
+         <term>
+          DEFAULT
+         </term>
+         <listitem>
+          <para>
+               Sets the multi-byte client encoding.
+          </para>
+         </listitem>
+        </varlistentry>
+       </variablelist>
+       </para>
+       <para>
+       This is only enabled if multi-byte was specified to configure.
+       </para>
+
+    <variablelist>
+     <varlistentry>
+      <term>
+       SERVER_ENCODING
+      </term>
+      <listitem>
+       <para>
+       Sets the multi-byte server encoding
+       
+       <variablelist>
+        <varlistentry>
+         <term>
+          <replaceable class="parameter">value</replaceable>
+         </term>
+         <listitem>
+          <para>
+               Sets the multi-byte server encoding.
+          </para>
+         </listitem>
+        </varlistentry>
+   </para>
+        
+        <varlistentry>
+         <term>
+          DEFAULT
+         </term>
+         <listitem>
+          <para>
+               Sets the multi-byte server encoding.
+          </para>
+         </listitem>
+        </varlistentry>
+       </variablelist>
+       </para>
+       <para>
+       This is only enabled if multi-byte was specified to configure.
        </para>
 
 

diff --git a/src/bin/psql/psqlHelp.h b/src/bin/psql/psqlHelp.h
index 1e5791ebf50f80925c0091d1b47b73cca024cd9d..8abb336ec5c2aa533ba5af3adab4d28efaccc663 100644 (file)
--- a/src/bin/psql/psqlHelp.h
+++ b/src/bin/psql/psqlHelp.h
@@ -328,8 +328,8 @@ TIMEZONE|XACTISOLEVEL|CLIENT_ENCODING|SERVER_ENCODING"},
 \tSET KSQO TO 'ON'|'OFF'\n\
 \tSET QUERY_LIMIT TO #\n\
 \tSET TIMEZONE TO 'value'\n\
-\tSET XACTISOLEVEL TO 'SERIALIZABLE'|'COMMITTED'\n\
-\tSET CLIENT_ENCODING TO 'EUC_JP'|'SJIS'|'EUC_CN'|'EUC_KR'|'EUC_TW'|\n\
+\tSET XACTISOLEVEL|TRANSACTION ISOLATION LEVEL TO 'SERIALIZABLE'|'COMMITTED'\n\
+\tSET CLIENT_ENCODING|NAMES TO 'EUC_JP'|'SJIS'|'EUC_CN'|'EUC_KR'|'EUC_TW'|\n\
 \t  'BIG5'|'MULE_INTERNAL'|'LATIN1'|'LATIN2'|'LATIN3'|'LATIN4'|'LATIN5'|\n\
 \t  'KOI8|'WIN'|'ALT'\n\
 \tSET SERVER_ENCODING TO 'EUC_JP'|'SJIS'|'EUC_CN'|'EUC_KR'|'EUC_TW'|\n\

diff --git a/src/man/set.l b/src/man/set.l
index 5d31f331ba76d27bcd3690fa7569ad0ebc09d07a..d7f0e060dc79bce02cda9c2bc960011fe8ae4304 100644 (file)
--- a/src/man/set.l
+++ b/src/man/set.l
@@ -81,13 +81,13 @@ The default is unlimited.
 .IR TIMEZONE
 sets your timezone.
 .PP
-.IR XACTISOLEVEL
+.I XACTISOLEVEL|TRANSACTION ISOLATION LEVEL
 sets the transaction isolation level to
 .IR SERIALIZABLE
 or
 .IR COMMITTED .
 .PP
-.IR CLIENT_ENCODING
+.IR CLIENT_ENCODING|NAMES
 sets the character set encoding of the client.  Only available if multi-byte
 is enabled at configure time.
 .PP