From b99cdde0d7fb513572fe57482c221712ef19388a Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 8 Apr 2000 02:39:02 +0000
Subject: [PATCH] Fix cross-references, update examples, copy-edit.

---
 doc/src/sgml/ref/reset.sgml | 16 +++++-----------
 doc/src/sgml/ref/show.sgml  | 25 +++++++++++--------------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml
index 3630fcc54b..e8f98aba3b 100644
--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/reset.sgml,v 1.7 1999/07/22 15:09:14 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/reset.sgml,v 1.8 2000/04/08 02:39:02 tgl Exp $
 Postgres documentation
 -->
 
@@ -41,8 +41,7 @@ RESET <replaceable class="PARAMETER">variable</replaceable>
        <para>
 	Refer to
 	<xref linkend="sql-set-title" endterm="sql-set-title">
-	for more information on available
-	variables.
+	for more information on available variables.
        </para>
       </listitem>
      </varlistentry>
@@ -68,7 +67,7 @@ RESET VARIABLE
        <para>
 	Message returned if 
 	<replaceable class="PARAMETER">variable</replaceable> is successfully reset
-	to its default value..
+	to its default value.
        </para>
       </listitem>
      </varlistentry>
@@ -85,7 +84,7 @@ RESET VARIABLE
    Description
   </title>
   <para>
-   <command>RESET</command> restores variables to the
+   <command>RESET</command> restores variables to their
    default values.
    Refer to
    <xref linkend="sql-set-title" endterm="sql-set-title">
@@ -106,12 +105,7 @@ SET <replaceable class="parameter">variable</replaceable> = DEFAULT
    </title>
 
    <para>
-    <command>RESET</command> is a <productname>Postgres</productname>
-    language extension.
-   </para>
-
-   <para>
-    Use to
+    See also
     <xref linkend="sql-set-title" endterm="sql-set-title"> and
     <xref linkend="sql-show-title" endterm="sql-show-title">
     to manipulate variable values.
diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml
index 39fbde16ae..7cacd634e7 100644
--- a/doc/src/sgml/ref/show.sgml
+++ b/doc/src/sgml/ref/show.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/show.sgml,v 1.8 2000/02/15 20:49:07 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/show.sgml,v 1.9 2000/04/08 02:39:02 tgl Exp $
 Postgres documentation
 -->
 
@@ -40,8 +40,9 @@ SHOW <replaceable class="PARAMETER">keyword</replaceable>
       <term><replaceable class="PARAMETER">keyword</replaceable></term>
       <listitem>
        <para>
-	Refer to <command>SET</command> for more information on available
-	arguments.
+	Refer to
+	<xref linkend="sql-set-title" endterm="sql-set-title">
+	for more information on available variables.
        </para>
       </listitem>
      </varlistentry>
@@ -62,7 +63,6 @@ SHOW <replaceable class="PARAMETER">keyword</replaceable>
      <varlistentry>
       <term><computeroutput>
 NOTICE: <replaceable class="PARAMETER">variable</replaceable> is <replaceable>value</replaceable>
-SHOW VARIABLE
        </computeroutput></term>
       <listitem>
        <para>
@@ -76,7 +76,7 @@ NOTICE:  Unrecognized variable <replaceable>value</replaceable>
        </computeroutput></term>
       <listitem>
        <para>
-	Message returned if <returnvalue>value</returnvalue> does not exist.
+	Message returned if <returnvalue>variable</returnvalue> does not exist.
        </para>
       </listitem>
      </varlistentry>
@@ -84,7 +84,6 @@ NOTICE:  Unrecognized variable <replaceable>value</replaceable>
      <varlistentry>
       <term><computeroutput>
 NOTICE:  Time zone is unknown
-SHOW VARIABLE
        </computeroutput></term>
       <listitem>
        <para>
@@ -125,12 +124,10 @@ SHOW VARIABLE
     Notes
    </title>
    <para>
-    <command>SHOW</command> is a <productname>Postgres</productname>
-    language extension.
-   </para>
-   <para>
-    Refer to  <command>SET</command>/<command>RESET</command> 
-    to set/reset variable values.
+    See also
+    <xref linkend="sql-set-title" endterm="sql-set-title"> and
+    <xref linkend="sql-reset-title" endterm="sql-reset-title">
+    to manipulate variable values.
    </para>
   </refsect2>
  </refsect1>
@@ -144,7 +141,7 @@ SHOW VARIABLE
 
    <programlisting>
 SHOW DateStyle;
-NOTICE:DateStyle is Postgres with US (NonEuropean) conventions
+NOTICE:  DateStyle is ISO with US (NonEuropean) conventions
    </programlisting>
   </para>
 
@@ -152,7 +149,7 @@ NOTICE:DateStyle is Postgres with US (NonEuropean) conventions
    Show the current genetic optimizer (<literal>geqo</literal>) setting:
    <programlisting>
 SHOW GEQO;
-NOTICE:GEQO is ON
+NOTICE:  GEQO is ON beginning with 11 relations
    </programlisting>
   </para>
  </refsect1>