From d4019b7cd33e7d820013c8a58917e31cdcca57ed Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 9 Sep 2003 18:28:53 +0000
Subject: Remove a bunch of content-free Diagnostics sections, as per previous
 discussion.  (Still have some work to do editing the remainder.)

---
 doc/src/sgml/ref/commit.sgml | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

(limited to 'doc/src/sgml/ref/commit.sgml')

diff --git a/doc/src/sgml/ref/commit.sgml b/doc/src/sgml/ref/commit.sgml
index b4992f73eab..1c72ea0b459 100644
--- a/doc/src/sgml/ref/commit.sgml
+++ b/doc/src/sgml/ref/commit.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/commit.sgml,v 1.16 2003/08/31 17:32:21 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/commit.sgml,v 1.17 2003/09/09 18:28:52 tgl Exp $
 PostgreSQL documentation
 -->
 
@@ -49,30 +49,6 @@ COMMIT [ WORK | TRANSACTION ]
    </varlistentry>
   </variablelist>
  </refsect1>
-   
- <refsect1>
-  <title>Diagnostics</title>
-
-  <variablelist>
-   <varlistentry>
-    <term><computeroutput>COMMIT</computeroutput></term>
-    <listitem>
-     <para>
-      Message returned if the transaction was successfully committed.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><computeroutput>WARNING:  COMMIT: no transaction in progress</computeroutput></term>
-    <listitem>
-     <para>
-      Message if there is no transaction in progress.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
 
  <refsect1>
   <title>Notes</title>
@@ -81,6 +57,11 @@ COMMIT [ WORK | TRANSACTION ]
    Use <xref linkend="SQL-ROLLBACK" endterm="SQL-ROLLBACK-TITLE"> to
    abort a transaction.
   </para>
+
+  <para>
+   Issuing <command>COMMIT</> when not inside a transaction does
+   no harm, but it will provoke a warning message.
+  </para>
  </refsect1>
 
  <refsect1>
@@ -103,6 +84,15 @@ COMMIT;
    WORK</literal>. Otherwise, this command is fully conforming.
   </para>
  </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-begin" endterm="sql-begin-title"></member>
+   <member><xref linkend="sql-rollback" endterm="sql-rollback-title"></member>
+  </simplelist>
+ </refsect1>
 </refentry>
 
 <!-- Keep this comment at the end of the file
-- 
cgit v1.2.3