diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index f4e7374e11e..f60577f39b1 100644
--- 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>
+	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>
-	The frontend may be initialized by setting the PGCOSTHEAP
-	environment variable.
+	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 43f6e5819c6..6840786358f 100644
--- a/src/bin/psql/psqlHelp.h
+++ b/src/bin/psql/psqlHelp.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: psqlHelp.h,v 1.65 1999/06/03 18:25:27 momjian Exp $
+ * $Id: psqlHelp.h,v 1.66 1999/06/03 18:37:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 8a3e060797b..b838341530a 100644
--- a/src/man/set.l
+++ b/src/man/set.l
@@ -1,6 +1,6 @@
 .\" This is -*-nroff-*-
 .\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/set.l,v 1.17 1999/06/03 18:18:43 momjian Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/set.l,v 1.18 1999/06/03 18:38:00 momjian Exp $
 .TH SET SQL 05/14/97 PostgreSQL PostgreSQL
 .SH NAME
 set - set run-time parameters for session
@@ -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