4 files changed, 30 insertions, 6 deletions
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 7fd7fb92d17..006b0224121 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -248,7 +248,7 @@ Specifies that output goes to a pipe or terminal.
    </para>
    <para>
     The backslash character has other special meanings.  NULL attributes are
-    output as "\N".  A literal backslash character is output as two
+    represented as "\N".  A literal backslash character is represented as two
     consecutive backslashes ("\\").  A literal tab character is represented
     as a backslash and a tab.  A literal newline character is
     represented as a backslash and a newline.  When loading text data
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 998c370a3b8..acf0603ab85 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -18,7 +18,7 @@
    <DATE>1998-09-11</DATE>
   </REFSYNOPSISDIVINFO>
   <SYNOPSIS>
-CREATE TABLE <REPLACEABLE CLASS="PARAMETER">table</REPLACEABLE> (
+CREATE [TEMP] TABLE <REPLACEABLE CLASS="PARAMETER">table</REPLACEABLE> (
     <REPLACEABLE CLASS="PARAMETER">column</REPLACEABLE> <REPLACEABLE CLASS="PARAMETER">type</REPLACEABLE>
     [ NULL | NOT NULL ] [ UNIQUE ] [ DEFAULT <REPLACEABLE CLASS="PARAMETER">value</REPLACEABLE> ]
     [<REPLACEABLE>column_constraint_clause</REPLACEABLE> | PRIMARY KEY } [ ... ] ]
@@ -38,6 +38,18 @@ CREATE TABLE <REPLACEABLE CLASS="PARAMETER">table</REPLACEABLE> (
    </TITLE>
    <PARA>
    
+    <VARLISTENTRY>
+     <TERM>
+     TEMP
+     </TERM>
+     <LISTITEM>
+      <PARA>
+	The table is created unique to this session, and is
+	automatically dropped on session exit.
+      </PARA>
+     </LISTITEM>
+    </VARLISTENTRY>
+
    <VARIABLELIST>
     <VARLISTENTRY>
      <TERM>
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index f5be4b9aa1b..6306b490e3b 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -19,7 +19,7 @@ SELECT
   <synopsis>
 SELECT [ALL|DISTINCT [ON <replaceable class="PARAMETER">column</replaceable>] ]
     <replaceable class="PARAMETER">expression</replaceable> [ AS <replaceable class="PARAMETER">name</replaceable> ] [, ...]
-    [ INTO [TABLE] <replaceable class="PARAMETER">new_table</replaceable> ]
+    [ INTO [TEMP] [TABLE] <replaceable class="PARAMETER">new_table</replaceable> ]
     [ FROM <replaceable class="PARAMETER">table</replaceable> [<replaceable class="PARAMETER">alias</replaceable> ] [, ...] ]
     [ WHERE <replaceable class="PARAMETER">condition</replaceable> ]
     [ GROUP BY <replaceable class="PARAMETER">column</replaceable> [, ...] ]
@@ -64,6 +64,18 @@ SELECT [ALL|DISTINCT [ON <replaceable class="PARAMETER">column</replaceable>] ]
       </listitem>
      </varlistentry>
      
+    <VARLISTENTRY>
+     <TERM>
+     TEMP
+     </TERM>
+     <LISTITEM>
+      <PARA>
+	The table is created unique to this session, and is
+	automatically dropped on session exit.
+      </PARA>
+     </LISTITEM>
+    </VARLISTENTRY>
+
      <varlistentry>
       <term>
        <replaceable class="PARAMETER">new_table</replaceable>
@@ -599,7 +611,7 @@ Create a new table from an existing table or view
   </refsynopsisdivinfo>
   <synopsis>
 SELECT [ ALL | DISTINCT ] <replaceable class="PARAMETER">expression</replaceable> [ AS <replaceable class="PARAMETER">name</replaceable> ] [, ...]
-    INTO [ TABLE ] <replaceable class="PARAMETER">new_table</replaceable> ]
+    INTO [TEMP] [ TABLE ] <replaceable class="PARAMETER">new_table</replaceable> ]
     [ FROM <replaceable class="PARAMETER">table</replaceable> [<replaceable class="PARAMETER">alias</replaceable>] [, ...] ]
     [ WHERE <replaceable class="PARAMETER">condition</replaceable> ]
     [ GROUP BY <replaceable class="PARAMETER">column</replaceable> [, ...] ]
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index 4edea532c4a..9627c1f354c 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -363,7 +363,7 @@ SET TIME ZONE { '<REPLACEABLE CLASS="PARAMETER">timezone</REPLACEABLE>' | LOCAL
 				  <listitem>
 					<para>
 					  enables the genetic optimizer algorithm
-					  for statements with 8 or more tables.
+					  for statements with 6 or more tables.
 					</para>
 				  </listitem>
 				</varlistentry>
@@ -406,7 +406,7 @@ SET TIME ZONE { '<REPLACEABLE CLASS="PARAMETER">timezone</REPLACEABLE>' | LOCAL
 	  </para>
 	  <para>
 		This algorithm is on by default, which used GEQO for
-		statements of eight or more tables. 
+		statements of six or more tables.
 		(See the chapter on GEQO in the Programmer's Guide
 		for more information).
 	  </para>