diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 6adfd85df0f9d05536636285e15c385728edfbe7..c3c42309b64440d8a176d105526a520095d26441 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.199 2003/08/10 01:20:34 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.200 2003/08/17 22:19:10 tgl Exp $
 -->
 
 <Chapter Id="runtime">
@@ -2396,6 +2396,14 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
       <indexterm><primary>missing from</></>
       <listitem>
        <para>
+        When <literal>true</>, tables that are referenced by a query will be
+	automatically added to the <literal>FROM</> clause if not already
+	present.  The default is <literal>true</> for compatibility with
+	previous releases of <productname>PostgreSQL</>.  However, this
+	behavior is not SQL-standard, and many people dislike it because it
+	can mask mistakes.  Set to <literal>false</> for the SQL-standard
+	behavior of rejecting references to tables that are not listed in
+	<literal>FROM</>.
        </para>
       </listitem>
      </varlistentry>
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 2ff904510ca760565ce2d4c00885f07f9a2bf181..c3c85354ca98a2c556df656248c0b74f199a6de5 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.149 2003/08/11 23:04:49 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.150 2003/08/17 22:19:15 tgl Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -818,7 +818,7 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 	{
 		{"add_missing_from", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
-			gettext_noop("Add missing table references to from clauses"),
+			gettext_noop("Add missing table references to FROM clauses"),
 			NULL
 		},
 		&add_missing_from,