diff --git a/doc/src/sgml/ref/analyze.sgml b/doc/src/sgml/ref/analyze.sgml
index ca8a7518ac7..102d1dafccc 100644
--- a/doc/src/sgml/ref/analyze.sgml
+++ b/doc/src/sgml/ref/analyze.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/analyze.sgml,v 1.17 2003/11/29 19:51:38 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/analyze.sgml,v 1.18 2003/12/14 00:15:03 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -134,7 +134,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table</replaceable> [ (<rep
 
   <para>
    The extent of analysis can be controlled by adjusting the
-   <varname>DEFAULT_STATISTICS_TARGET</varname> parameter variable, or
+   <varname>default_statistics_target</varname> parameter variable, or
    on a column-by-column basis by setting the per-column statistics
    target with <command>ALTER TABLE ... ALTER COLUMN ... SET
    STATISTICS</command> (see <xref linkend="sql-altertable"
diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml
index 3a08393e27b..a243d611401 100644
--- a/doc/src/sgml/ref/create_user.sgml
+++ b/doc/src/sgml/ref/create_user.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_user.sgml,v 1.31 2003/11/29 19:51:38 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_user.sgml,v 1.32 2003/12/14 00:15:03 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -98,7 +98,7 @@ where <replaceable class="PARAMETER">option</replaceable> can be:
 	These key words control whether the password is stored
 	encrypted in the system catalogs.  (If neither is specified,
 	the default behavior is determined by the configuration
-	parameter <varname>PASSWORD_ENCRYPTION</varname>.)  If the
+	parameter <varname>password_encryption</varname>.)  If the
 	presented password string is already in MD5-encrypted format,
 	then it is stored encrypted as-is, regardless of whether
 	<literal>ENCRYPTED</> or <literal>UNENCRYPTED</> is specified
diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml
index f3e55507cf0..6623b247de7 100644
--- a/doc/src/sgml/ref/postmaster.sgml
+++ b/doc/src/sgml/ref/postmaster.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.43 2003/12/13 23:59:07 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.44 2003/12/14 00:15:03 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -376,7 +376,7 @@ PostgreSQL documentation
 
     <listitem>
      <para>
-      Default value of the <varname>DATESTYLE</varname> run-time
+      Default value of the <varname>DateStyle</varname> run-time
       parameter.  (The use of this environment variable is deprecated.)
      </para>
     </listitem>
@@ -544,7 +544,7 @@ PostgreSQL documentation
 <prompt>$</prompt> <userinput>postmaster -c sort_mem=1234</userinput>
 <prompt>$</prompt> <userinput>postmaster --sort-mem=1234</userinput>
 </screen>
-   Either form overrides whatever setting might exist for <varname>SORT_MEM</>
+   Either form overrides whatever setting might exist for <varname>sort_mem</>
    in <filename>postgresql.conf</>.  Notice that underscores in parameter
    names can be written as either underscore or dash on the command line.
   </para>
diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml
index d90fb29003b..e94ad782cc9 100644
--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/reset.sgml,v 1.25 2003/11/29 19:51:39 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/reset.sgml,v 1.26 2003/12/14 00:15:03 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -83,14 +83,7 @@ SET <replaceable class="parameter">parameter</replaceable> TO DEFAULT
   <title>Examples</title>
 
   <para>
-   Set <varname>DATESTYLE</> to its default value:
-<screen>
-RESET datestyle;
-</screen>
-  </para>
-
-  <para>
-   Set <varname>GEQO</> to its default value:
+   Set the <varname>geqo</> configuration variable to its default value:
 <screen>
 RESET geqo;
 </screen>
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index 5bd546afa6c..c765329df11 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.73 2003/11/29 19:51:39 pgsql Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.74 2003/12/14 00:15:03 neilc Exp $
 PostgreSQL documentation
 -->
 
@@ -1022,7 +1022,7 @@ SELECT distributors.* FROM distributors d, distributors distributors;
     <command>SELECT</command> statement that also contains an explicit
     <literal>FROM</literal> clause.  Also, it is possible to disable
     the implicit-<literal>FROM</literal> feature by setting the
-    <varname>ADD_MISSING_FROM</> parameter to false.
+    <varname>add_missing_from</> parameter to false.
    </para>
   </refsect2>