diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 16007ef273..f81dd576bd 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.112 2010/04/03 07:22:57 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.113 2010/05/13 18:54:18 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -200,7 +200,8 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form sets the storage mode for a column. This controls whether this
-      column is held inline or in a supplementary table, and whether the data
+      column is held inline or in a secondary <acronym>TOAST</> table, and
+      whether the data
       should be compressed or not. <literal>PLAIN</literal> must be used
       for fixed-length values such as <type>integer</type> and is
       inline, uncompressed. <literal>MAIN</literal> is for inline,
@@ -208,9 +209,9 @@ ALTER TABLE <replaceable class="PARAMETER">name</replaceable>
       uncompressed data, and <literal>EXTENDED</literal> is for external,
       compressed data.  <literal>EXTENDED</literal> is the default for most
       data types that support non-<literal>PLAIN</literal> storage.
-      Use of <literal>EXTERNAL</literal> will
-      make substring operations on <type>text</type> and <type>bytea</type>
-      columns faster, at the penalty of increased storage space.  Note that
+      Use of <literal>EXTERNAL</literal> will make substring operations on
+      very large <type>text</type> and <type>bytea</type> values run faster,
+      at the penalty of increased storage space.  Note that
       <literal>SET STORAGE</> doesn't itself change anything in the table,
       it just sets the strategy to be pursued during future table updates.
       See <xref linkend="storage-toast"> for more information.
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 064656bbc5..d195c5de68 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.126 2010/04/16 02:22:33 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.127 2010/05/13 18:54:18 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -152,7 +152,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PAR
       table is going to be used in complex queries, it is wise to run
       <command>ANALYZE</> on the temporary table after it is populated.
      </para>
-      
+
      <para>
       Optionally, <literal>GLOBAL</literal> or <literal>LOCAL</literal>
       can be written before <literal>TEMPORARY</> or <literal>TEMP</>.
@@ -803,13 +803,15 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PAR
     for tables, and for indexes associated with a <literal>UNIQUE</literal>,
     <literal>PRIMARY KEY</literal>, or <literal>EXCLUDE</> constraint.
     Storage parameters for
-    indexes are documented in <xref linkend="SQL-CREATEINDEX">.  The storage parameters currently
+    indexes are documented in <xref linkend="SQL-CREATEINDEX">.
+    The storage parameters currently
     available for tables are listed below.  For each parameter, unless noted,
-    there is an additional, identically named parameter, prefixed with
-    <literal>toast.</literal> which can be used to control the behavior of the
-    supplementary storage table, if any; see <xref linkend="storage-toast">.
-    Note that the supplementary storage table inherits the
-    <literal>autovacuum</literal> values from its parent table, if there are
+    there is an additional parameter with the same name prefixed with
+    <literal>toast.</literal>, which can be used to control the behavior of the
+    table's secondary <acronym>TOAST</> table, if any
+    (see <xref linkend="storage-toast"> for more information about TOAST).
+    Note that the TOAST table inherits the
+    <literal>autovacuum_*</literal> values from its parent table, if there are
     no <literal>toast.autovacuum_*</literal> settings set.
    </para>
 
@@ -828,8 +830,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE <replaceable class="PAR
       original, which is more efficient than placing it on a different page.
       For a table whose entries are never updated, complete packing is the
       best choice, but in heavily updated tables smaller fillfactors are
-      appropriate.  This parameter cannot be set for the supplementary
-      storage table.
+      appropriate.  This parameter cannot be set for TOAST tables.
      </para>
     </listitem>
    </varlistentry>