Last round of reference page editing.

d1b4327d · Peter Eisentraut · ac5fdea6 · d1b4327d · d1b4327d · d1b4327d
Commit d1b4327d authored May 04, 2003 by Peter Eisentraut
31 changed files
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
--- a/doc/src/sgml/ref/drop_aggregate.sgml
+++ b/doc/src/sgml/ref/drop_aggregate.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.21 2003/03/25 16:15:39 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.22 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,30 +8,31 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPAGGREGATE-TITLE">DROP AGGREGATE</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP AGGREGATE</refname>
-   DROP AGGREGATE
+  <refpurpose>remove a user-defined aggregate function</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a user-defined aggregate function
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-07-20</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP AGGREGATE <replaceable class="PARAMETER">name</replaceable> ( <replaceable class="PARAMETER">type</replaceable> ) [ CASCADE | RESTRICT ]
-  </synopsis>
+</synopsis>
+ </refsynopsisdiv>
-  <refsect2 id="R2-SQL-DROPAGGREGATE-1">
-   <refsect2info>
+ <refsect1>
-    <date>1998-04-15</date>
+  <title>Description</title>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP AGGREGATE</command> will delete an existing
+   aggregate function. To execute this command the current
+   user must be the owner of the aggregate function.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="parameter">name</replaceable></term>
@@ -41,134 +42,92 @@ DROP AGGREGATE <replaceable class="PARAMETER">name</replaceable> ( <replaceable
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
    <term><replaceable class="parameter">type</replaceable></term>
    <listitem>
     <para>
-	The input data type of the aggregate function,
+      The argument data type of the aggregate function, or
-	or <literal>*</literal> if the function accepts any input type.
+      <literal>*</literal> if the function accepts any data type.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
-        Automatically drop objects that depend on the aggregate.
+      Automatically drop objects that depend on the aggregate function.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the aggregate if there are any dependent objects.
+      Refuse to drop the aggregate function if any objects depend on
-	This is the default.
+      it.  This is the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPAGGREGATE-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>1998-04-15</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP AGGREGATE</computeroutput></term>
-DROP AGGREGATE
-       </computeroutput></term>
    <listitem>
     <para>
-	Message returned if the command is successful.
+      Message returned if the command was successful.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR: RemoveAggregate: aggregate '<replaceable class="parameter">name</replaceable>' for type <replaceable class="parameter">type</replaceable> does not exist</computeroutput></term>
-ERROR: RemoveAggregate: aggregate '<replaceable class="parameter">name</replaceable>' for type <replaceable class="parameter">type</replaceable> does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if the aggregate function specified does not
+      This message is returned if the specified aggregate function
-	exist in the database.
+      does not exist.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPAGGREGATE-1">
-  <refsect1info>
-   <date>1998-04-15</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP AGGREGATE</command> will delete an existing
-   aggregate definition. To execute this command the current
-   user must be the owner of the aggregate.
-  </para>
-  <refsect2 id="R2-SQL-DROPAGGREGATE-3">
+ <refsect1>
-   <refsect2info>
+  <title>Examples</title>
-    <date>1998-04-15</date>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
  <para>
-    Use
+   To remove the aggregate function <literal>myavg</literal> for type
-    <xref linkend="sql-createaggregate" endterm="sql-createaggregate-title">
+   <type>integer</type>:
-    to create aggregate functions.
+<programlisting>
+DROP AGGREGATE myavg(integer);
+</programlisting>
  </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-DROPAGGREGATE-2">
+ <refsect1>
-  <title>
+  <title>Compatibility</title>
-   Usage
-  </title>
  <para>
-   To remove the <literal>myavg</literal> aggregate for type
+   There is no <command>DROP AGGREGATE</command> statement in the SQL
-   <literal>int4</literal>:
+   standard.
  </para>
-  <programlisting>
-DROP AGGREGATE myavg(int4);
-  </programlisting>
 </refsect1>
- <refsect1 id="R1-SQL-DROPAGGREGATE-3">
+ <refsect1>
-  <title>
+  <title>See Also</title>
-   Compatibility
-  </title>
-  <refsect2 id="R2-SQL-DROPAGGREGATE-4">
-   <refsect2info>
-    <date>1998-04-15</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
-   <para>
+  <simplelist type="inline">
-    There is no <command>DROP AGGREGATE</command> statement
+   <member><xref linkend="sql-createaggregate" endterm="sql-createaggregate-title"></member>
-    in <acronym>SQL92</acronym>; the statement is a
+  </simplelist>
-    <productname>PostgreSQL</productname>
-    language extension.
-   </para>
-  </refsect2>
 </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_cast.sgml
+++ b/doc/src/sgml/ref/drop_cast.sgml
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_cast.sgml,v 1.2 2002/08/11 17:44:12 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_cast.sgml,v 1.3 2003/05/04 02:23:16 petere Exp $ -->
 <refentry id="SQL-DROPCAST">
 <refmeta>
@@ -13,8 +13,7 @@
 <refsynopsisdiv>
 <synopsis>
-DROP CAST (<replaceable>sourcetype</replaceable> AS <replaceable>targettype</replaceable>)
+DROP CAST (<replaceable>sourcetype</replaceable> AS <replaceable>targettype</replaceable>) [ CASCADE | RESTRICT ]
-    [ CASCADE | RESTRICT ]
 </synopsis>
 </refsynopsisdiv>
@@ -30,10 +29,12 @@ DROP CAST (<replaceable>sourcetype</replaceable> AS <replaceable>targettype</rep
   data type.  These are the same privileges that are required to
   create a cast.
  </para>
+ </refsect1>
-   <variablelist>
+ <refsect1>
  <title>Parameters</title>
+   <variablelist>
    <varlistentry>
     <term><replaceable>sourcetype</replaceable></term>
@@ -66,45 +67,33 @@ DROP CAST (<replaceable>sourcetype</replaceable> AS <replaceable>targettype</rep
     </listitem>
    </varlistentry>
   </variablelist>
- </refsect1>
- <refsect1 id="sql-dropcast-notes">
-  <title>Notes</title>
-  <para>
-   Use <command>CREATE CAST</command> to create user-defined casts.
-  </para>
 </refsect1>
 <refsect1 id="sql-dropcast-examples">
  <title>Examples</title>
  <para>
   To drop the cast from type <type>text</type> to type <type>int</type>:
 <programlisting>
-DROP CAST (text AS int4);
+DROP CAST (text AS int);
 </programlisting>
  </para>
 </refsect1>
 <refsect1 id="sql-dropcast-compat">
  <title>Compatibility</title>
  <para>
-   The <command>DROP CAST</command> command conforms to SQL99.
+   The <command>DROP CAST</command> command conforms to the SQL standard.
  </para>
 </refsect1>
+ <refsect1>
- <refsect1 id="sql-dropcast-seealso">
  <title>See Also</title>
-  <para>
+  <simplelist type="inline">
-   <xref linkend="sql-createcast" endterm="sql-createcast-title">
+   <member><xref linkend="sql-createcast" endterm="sql-createcast-title"></member>
-  </para>
+  </simplelist>
 </refsect1>
 </refentry>

--- a/doc/src/sgml/ref/drop_conversion.sgml
+++ b/doc/src/sgml/ref/drop_conversion.sgml
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_conversion.sgml,v 1.3 2002/09/21 18:32:54 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_conversion.sgml,v 1.4 2003/05/04 02:23:16 petere Exp $ -->
 <refentry id="SQL-DROPCONVERSION">
 <refmeta>
@@ -13,8 +13,7 @@
 <refsynopsisdiv>
 <synopsis>
-DROP CONVERSION <replaceable>conversion_name</replaceable>
+DROP CONVERSION <replaceable>conversion_name</replaceable> [ CASCADE | RESTRICT ]
-    [ CASCADE | RESTRICT ]
 </synopsis>
 </refsynopsisdiv>
@@ -23,15 +22,14 @@ DROP CONVERSION <replaceable>conversion_name</replaceable>
  <para>
   <command>DROP CONVERSION</command> removes a previously defined conversion.
-  </para>
-  <para>
   To be able to drop a conversion, you must own the conversion.
  </para>
+ </refsect1>
-   <variablelist>
+ <refsect1>
  <title>Parameters</title>
+   <variablelist>
    <varlistentry>
     <term><replaceable>conversion_name</replaceable></term>
@@ -55,23 +53,8 @@ DROP CONVERSION <replaceable>conversion_name</replaceable>
     </listitem>
    </varlistentry>
   </variablelist>
- </refsect1>
- <refsect1 id="sql-dropconversion-notes">
-  <title>Notes</title>
-  <para>
-   Use <command>CREATE CONVERSION</command> to create user-defined conversions.
-  </para>
-  <para>
-   The privileges required to drop a conversion may be changed in a future
-   release.
-  </para>
 </refsect1>
 <refsect1 id="sql-dropconversion-examples">
  <title>Examples</title>
@@ -83,25 +66,21 @@ DROP CONVERSION myname;
  </para>
 </refsect1>
 <refsect1 id="sql-dropconversion-compat">
  <title>Compatibility</title>
  <para>
-    <command>DROP CONVERSION</command>
+   There is no <command>DROP CONVERSION</command> statement in the SQL
-    is a <productname>PostgreSQL</productname> extension.
+   standard.
-    There is no <command>DROP CONVERSION</command>
-    statement in <acronym>SQL99</acronym>.
  </para>
 </refsect1>
+ <refsect1>
- <refsect1 id="sql-dropconversion-seealso">
  <title>See Also</title>
-  <para>
+  <simplelist type="inline">
-   <xref linkend="sql-createconversion" endterm="sql-createconversion-title">
+   <member><xref linkend="sql-createconversion" endterm="sql-createconversion-title"></member>
-  </para>
+  </simplelist>
 </refsect1>
 </refentry>

--- a/doc/src/sgml/ref/drop_database.sgml
+++ b/doc/src/sgml/ref/drop_database.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_database.sgml,v 1.15 2002/04/21 19:02:39 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_database.sgml,v 1.16 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,59 +8,56 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPDATABASE-TITLE">DROP DATABASE</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP DATABASE</refname>
-   DROP DATABASE
+  <refpurpose>remove a database</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a database
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-12-11</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP DATABASE <replaceable class="PARAMETER">name</replaceable>
-  </synopsis>
+</synopsis>
+ </refsynopsisdiv>
-  <refsect2 id="R2-SQL-DROPDATABASE-1">
-   <refsect2info>
+ <refsect1>
-    <date>1999-12-11</date>
+  <title>Description</title>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP DATABASE</command> drops a database. It removes the
+   catalog entries for the database and deletes the directory
+   containing the data.  It can only be executed by the database owner.
+  </para>
+  <para>
+   <command>DROP DATABASE</command> cannot be undone.  Use it with care!
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="PARAMETER">name</replaceable></term>
    <listitem>
     <para>
-	The name of an existing database to remove.
+      The name of the database to remove.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
-  <refsect2 id="R2-SQL-DROPDATABASE-2">
-   <refsect2info>
-    <date>1999-12-11</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
-    <variablelist>
+ <refsect1>
+  <title>Diagnostics</title>
+    <variablelist>
     <varlistentry>
      <term><computeroutput>DROP DATABASE</computeroutput></term>
      <listitem>
       <para>
-	This message is returned if the command is successful.
+        This message is returned if the command was successful.
       </para>
      </listitem>
     </varlistentry>
@@ -84,72 +81,34 @@ DROP DATABASE <replaceable class="PARAMETER">name</replaceable>
       </para>
      </listitem>
     </varlistentry>
    </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPDATABASE-1">
-  <refsect1info>
-   <date>1999-12-11</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP DATABASE</command> removes the catalog entries for an existing
-   database and deletes the directory containing the data.
-   It can only be executed by the database owner (usually the user that created
-   it).
-  </para>
-  <para>
-   <command>DROP DATABASE</command> cannot be undone.  Use it with care!
-  </para>
-  <refsect2 id="R2-SQL-DROPDATABASE-3">
+ <refsect1>
-   <refsect2info>
+  <title>Notes</title>
-    <date>1999-12-11</date>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
  <para>
   This command cannot be executed while connected to the target
-    database. Thus, it might be more convenient to use the shell
+   database. Thus, it might be more convenient to use the program
-    script <xref linkend="app-dropdb" endterm="app-dropdb-title">,
+   <xref linkend="app-dropdb" endterm="app-dropdb-title"> instead,
-    which is a wrapper around this command, instead.
+   which is a wrapper around this command.
  </para>
+ </refsect1>
+ <refsect1>
+  <title>Compatibility</title>
  <para>
-    Refer to
+   The is no <command>DROP DATABASE</command> statement in the SQL standard.
-    <xref linkend="sql-createdatabase" endterm="sql-createdatabase-title">
-    for information on how to create a database.
  </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-DROPDATABASE-3">
+ <refsect1>
-  <title>
+  <title>See Also</title>
-   Compatibility
-  </title>
-  <refsect2 id="R2-SQL-DROPDATABASE-4">
-   <refsect2info>
-    <date>1998-04-15</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
-   <para>
+  <simplelist type="inline">
-    <command>DROP DATABASE</command> statement is a
+   <member><xref linkend="sql-createdatabase" endterm="sql-createdatabase-title"></member>
-    <productname>PostgreSQL</productname> language extension;
+  </simplelist>
-    there is no such command in <acronym>SQL92</acronym>.
-   </para>
-  </refsect2>
 </refsect1>
 </refentry>

--- a/doc/src/sgml/ref/drop_domain.sgml
+++ b/doc/src/sgml/ref/drop_domain.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_domain.sgml,v 1.9 2002/11/21 23:34:43 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_domain.sgml,v 1.10 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
 <refentry id="SQL-DROPDOMAIN">
 <refmeta>
-  <refentrytitle id="SQL-DROPDOMAIN-TITLE">
+  <refentrytitle id="SQL-DROPDOMAIN-TITLE">DROP DOMAIN</refentrytitle>
-   DROP DOMAIN
-  </refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP DOMAIN</refname>
-   DROP DOMAIN
+  <refpurpose>remove a domain</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a user-defined domain
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-07-20</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP DOMAIN <replaceable class="PARAMETER">domainname</replaceable> [, ...]  [ CASCADE | RESTRICT ]
-  </synopsis>
+</synopsis>
+ </refsynopsisdiv>
-  <refsect2 id="R2-SQL-DROPDOMAIN-1">
-   <refsect2info>
+ <refsect1>
-    <date>2002-02-24</date>
+  <title>Description</title>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP DOMAIN</command> will remove a domain.  Only the
+   owner of a domain can remove it.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="PARAMETER">domainname</replaceable></term>
@@ -48,8 +46,8 @@ DROP DOMAIN <replaceable class="PARAMETER">domainname</replaceable> [, ...]  [ C
    <term><literal>CASCADE</></term>
    <listitem>
     <para>
-        Automatically drop objects that depend on the domain
+      Automatically drop objects that depend on the domain (such as
-	(such as table columns).
+      table columns).
     </para>
    </listitem>
   </varlistentry>
@@ -58,69 +56,43 @@ DROP DOMAIN <replaceable class="PARAMETER">domainname</replaceable> [, ...]  [ C
    <term><literal>RESTRICT</></term>
    <listitem>
     <para>
-        Refuse to drop the domain if there are any dependent objects.
+      Refuse to drop the domain if any objects depend on it.  This is
-	This is the default.
+      the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPDOMAIN-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>2002-02-24</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP DOMAIN</computeroutput></term>
-DROP DOMAIN
-       </computeroutput></term>
    <listitem>
     <para>
-	The message returned if the command is successful.
+      Message returned if the command was successful.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR:  RemoveDomain: type '<replaceable class="parameter">domainname</replaceable>' does not exist</computeroutput></term>
-ERROR:  RemoveDomain: type '<replaceable class="parameter">domainname</replaceable>' does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if the specified domain (or type) is not found.
+      This message occurs if the specified domain does not exist.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPDOMAIN-1">
-  <refsect1info>
-   <date>2002-02-24</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP DOMAIN</command> will remove a user domain from the
-   system catalogs.
-  </para>
-  <para>
-   Only the owner of a domain can remove it.
-  </para>
 </refsect1>
 <refsect1 id="SQL-DROPDOMAIN-examples">
  <title>Examples</title>
  <para>
-   To remove the <type>box</type> domain:
+   To remove the domain <type>box</type>:
 <programlisting>
 DROP DOMAIN box;
@@ -131,13 +103,9 @@ DROP DOMAIN box;
 <refsect1 id="SQL-DROPDOMAIN-compatibility">
  <title>Compatibility</title>
-  <refsect2 id="R2-SQL-DROPDOMAIN-sql92">
+  <para>
-   <title>
+   This command conforms to the SQL standard.
-    SQL92
+  </para>
-   </title>
-   <para></para>
-  </refsect2>
 </refsect1>
 <refsect1 id="SQL-DROPDOMAIN-see-also">

--- a/doc/src/sgml/ref/drop_function.sgml
+++ b/doc/src/sgml/ref/drop_function.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_function.sgml,v 1.23 2002/11/21 23:34:43 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_function.sgml,v 1.24 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,30 +8,33 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPFUNCTION-TITLE">DROP FUNCTION</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP FUNCTION</refname>
-   DROP FUNCTION
+  <refpurpose>remove a user-defined function</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a user-defined function
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-07-20</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP FUNCTION <replaceable class="parameter">name</replaceable> ( [ <replaceable class="parameter">type</replaceable> [, ...] ] ) [ CASCADE | RESTRICT ]
-  </synopsis>
+</synopsis>
+ </refsynopsisdiv>
-  <refsect2 id="R2-SQL-DROPFUNCTION-1">
-   <refsect2info>
+ <refsect1>
-    <date>1998-04-15</date>
+  <title>Description</title>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP FUNCTION</command> removes the definition of an existing
+   function. To execute this command the user must be the
+   owner of the function. The argument types to the
+   function must be specified, since several different functions
+   may exist with the same name and different argument lists.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="parameter">name</replaceable></term>
@@ -41,96 +44,60 @@ DROP FUNCTION <replaceable class="parameter">name</replaceable> ( [ <replaceable
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
    <term><replaceable class="parameter">type</replaceable></term>
    <listitem>
     <para>
-	The type of a parameter of the function.
+      The data type of an argument of the function.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
-        Automatically drop objects that depend on the function
+      Automatically drop objects that depend on the function (such as
-	(such as operators or triggers).
+      operators or triggers).
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the function if there are any dependent objects.
+      Refuse to drop the function if any objects depend on it.  This
-	This is the default.
+      is the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPFUNCTION-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>1998-04-15</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP FUNCTION</computeroutput></term>
-DROP FUNCTION
-       </computeroutput></term>
    <listitem>
     <para>
      Message returned if the command completes successfully.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>WARNING:  RemoveFunction: Function <replaceable class="parameter">name</replaceable> (<replaceable class="parameter">types</replaceable>) does not exist</computeroutput></term>
-WARNING:  RemoveFunction: Function "<replaceable class="parameter">name</replaceable>" ("<replaceable class="parameter">types</replaceable>") does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message is given if the function specified does not
+      This message is output if the function specified does not exist.
-	exist in the current database.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPFUNCTION-1">
-  <refsect1info>
-   <date>1998-04-15</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   DROP FUNCTION will remove the definition of an existing
-   function. To execute this command the user must be the
-   owner of the function. The input argument types to the
-   function must be specified, since several different functions
-   may exist with the same name and different argument lists.
-  </para>
- </refsect1>
- <refsect1 id="SQL-DROPFUNCTION-notes">
-  <title>Notes</title>
-   <para>
-    Refer to
-    <xref linkend="sql-createfunction" endterm="sql-createfunction-title">
-    for information on creating functions.
-   </para>
 </refsect1>
 <refsect1 id="SQL-DROPFUNCTION-examples">
@@ -149,8 +116,8 @@ DROP FUNCTION sqrt(integer);
  <title>Compatibility</title>
  <para>
-   A <command>DROP FUNCTION</command> statement is defined in SQL99.  One of
+   A <command>DROP FUNCTION</command> statement is defined in the SQL
-   its syntax forms is similar to PostgreSQL's.
+   standard, but it is not compatible with this command.
  </para>
 </refsect1>
@@ -161,6 +128,7 @@ DROP FUNCTION sqrt(integer);
   <member><xref linkend="sql-createfunction" endterm="sql-createfunction-title"></member>
  </simplelist>
 </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_group.sgml
+++ b/doc/src/sgml/ref/drop_group.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_group.sgml,v 1.4 2002/04/21 19:02:39 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_group.sgml,v 1.5 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,30 +8,29 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPGROUP-TITLE">DROP GROUP</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP GROUP</refname>
-   DROP GROUP
+  <refpurpose>remove a user group</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a user group
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>2000-01-14</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP GROUP <replaceable class="PARAMETER">name</replaceable>
-  </synopsis>
+</synopsis>
+ </refsynopsisdiv>
-  <refsect2 id="R2-SQL-DROPGROUP-1">
-   <refsect2info>
+ <refsect1>
-    <date>2000-01-14</date>
+  <title>Description</title>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP GROUP</command> removes the specified group.  The
+   users in the group are not deleted.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
@@ -43,54 +42,26 @@ DROP GROUP <replaceable class="PARAMETER">name</replaceable>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPGROUP-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>2000-01-14</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
    <term><computeroutput>DROP GROUP</computeroutput></term>
    <listitem>
     <para>
-	The message returned if the group is successfully deleted.
+      Message returned if the group was successfully removed.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPGROUP-1">
-  <refsect1info>
-   <date>2000-01-14</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP GROUP</command> removes the specified group from the database.
-   The users in the group are not deleted.
-  </para>
-  <para>
-   Use <xref linkend="SQL-CREATEGROUP" endterm="SQL-CREATEGROUP-title">
-   to add new groups, and <xref linkend="SQL-ALTERGROUP"
-   endterm="SQL-ALTERGROUP-title"> to change a group's membership.
-  </para>  
 </refsect1>
- <refsect1 id="R1-SQL-DROPGROUP-2">
+ <refsect1>
-  <title>
+  <title>Examples</title>
-   Usage
-  </title>
  <para>
   To drop a group:
 <programlisting>
@@ -99,23 +70,23 @@ DROP GROUP staff;
  </para>
 </refsect1>
- <refsect1 id="R1-SQL-DROPGROUP-3">
+ <refsect1>
-  <title>
+  <title>Compatibility</title>
-   Compatibility
-  </title>
-  <refsect2 id="R2-SQL-DROPGROUP-4">
-   <refsect2info>
-    <date>2000-01-14</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
  <para>
-    There is no <command>DROP GROUP</command> in <acronym>SQL92</acronym>.
+   There is no <command>DROP GROUP</command> statement in the SQL standard.
  </para>
-  </refsect2>
 </refsect1>
+ <refsect1>
+  <title>See Also</title>
+  <simplelist type="inline">
+   <member><xref linkend="sql-altergroup" endterm="sql-altergroup-title"></member>
+   <member><xref linkend="sql-creategroup" endterm="sql-creategroup-title"></member>
+  </simplelist>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_index.sgml
+++ b/doc/src/sgml/ref/drop_index.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_index.sgml,v 1.16 2002/07/12 18:43:13 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_index.sgml,v 1.17 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,30 +8,31 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPINDEX-TITLE">DROP INDEX</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP INDEX</refname>
-   DROP INDEX
+  <refpurpose>remove an index</refpurpose>
-  </refname>
-  <refpurpose>
-   remove an index
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-07-20</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP INDEX <replaceable class="PARAMETER">index_name</replaceable> [, ...] [ CASCADE | RESTRICT ]
-  </synopsis>
+</synopsis>
+ </refsynopsisdiv>
-  <refsect2 id="R2-SQL-DROPINDEX-1">
-   <refsect2info>
+ <refsect1>
-    <date>1998-04-15</date>
+  <title>Description</title>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP INDEX</command> drops an existing index from the database
+   system. To execute this command you must be the owner of
+   the index.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="PARAMETER">index_name</replaceable></term>
@@ -41,128 +42,84 @@ DROP INDEX <replaceable class="PARAMETER">index_name</replaceable> [, ...] [ CAS
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
      Automatically drop objects that depend on the index.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the index if there are any dependent objects.
+      Refuse to drop the index if any objects depend on it.  This is
-	This is the default.
+      the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPINDEX-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>1998-04-15</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP INDEX</computeroutput></term>
-DROP INDEX
-       </computeroutput></term>
    <listitem>
     <para>
-	The message returned if the command completes successfully.
+      Message returned if the command completes successfully.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR: index "<replaceable class="PARAMETER">index_name</replaceable>" does not exist</computeroutput></term>
-ERROR: index "<replaceable class="PARAMETER">index_name</replaceable>" does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if <replaceable class="PARAMETER">index_name</replaceable>
+      This message is returned if <replaceable
-	is not an index in the database.
+      class="PARAMETER">index_name</replaceable> is not an existing
+      index.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPINDEX-1">
+ <refsect1>
-  <refsect1info>
+  <title>Examples</title>
-   <date>1998-04-15</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP INDEX</command> drops an existing index from the database
-   system. To execute this command you must be the owner of
-   the index.
-  </para>
-  <refsect2 id="R2-SQL-DROPINDEX-3">
-   <refsect2info>
-    <date>1998-04-15</date>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
  <para>
-    <command>DROP INDEX</command> is a <productname>PostgreSQL</productname>
+   This command will remove the index <literal>title_idx</literal>:
-    language extension.
-   </para>
+<programlisting>
-   <para>
+DROP INDEX title_idx;
-    Refer to 
+</programlisting>
-    <xref linkend="sql-createindex" endterm="sql-createindex-title">
-    for information on how to create indexes.
  </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-DROPINDEX-2">
+ <refsect1>
-  <title>
+  <title>Compatibility</title>
-   Usage
-  </title>
-  <para>
-   This command will remove the <literal>title_idx</literal> index:
-   <programlisting>
+  <para>
-    DROP INDEX title_idx;
+   <command>DROP INDEX</command> is a
-   </programlisting>
+   <productname>PostgreSQL</productname> language extension.  There
+   are no provisions for indexes in the SQL standard.
  </para>
 </refsect1>
- <refsect1 id="R1-SQL-DROPINDEX-3">
+ <refsect1>
-  <title>
+  <title>See Also</title>
-   Compatibility
-  </title>
+  <simplelist type="inline">
+   <member><xref linkend="sql-createindex" endterm="sql-createindex-title"></member>
-  <refsect2 id="R2-SQL-DROPINDEX-4">
+  </simplelist>
-   <refsect2info>
-    <date>1998-04-15</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
-   <para>
-    <acronym>SQL92</acronym> defines commands by which to access
-    a generic relational database.
-    Indexes are an implementation-dependent feature and hence
-    there are no index-specific commands or definitions in the
-    <acronym>SQL92</acronym> language.
-   </para>
-  </refsect2>
 </refsect1>
 </refentry>

--- a/doc/src/sgml/ref/drop_language.sgml
+++ b/doc/src/sgml/ref/drop_language.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.15 2002/07/12 18:43:13 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.16 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,30 +8,30 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPLANGUAGE-TITLE">DROP LANGUAGE</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP LANGUAGE</refname>
-   DROP LANGUAGE
+  <refpurpose>remove a user-defined procedural language</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a user-defined procedural language
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-07-20</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP [ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
-  </synopsis>
+</synopsis>
+ </refsynopsisdiv>
-  <refsect2 id="R2-SQL-DROPLANGUAGE-1">
-   <refsect2info>
+ <refsect1>
-    <date>1998-04-15</date>
+  <title>Description</title>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP LANGUAGE</command> will remove the definition
+   of the previously registered procedural language called
+   <replaceable class="parameter">name</replaceable>.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
@@ -43,128 +43,85 @@ DROP [ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">name</replaceable> [
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
-        Automatically drop objects that depend on the language
+      Automatically drop objects that depend on the language (such as
-	(such as functions in the language).
+      functions in the language).
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the language if there are any dependent objects.
+      Refuse to drop the language if any objects depend on it.  This
-	This is the default.
+      is the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
+ </refsect1>
+ <refsect1>
+  <title>Diagnostics</title>
-   </para>
-  </refsect2>
-  <refsect2 id="R2-SQL-DROPLANGUAGE-2">
-   <refsect2info>
-    <date>1998-04-15</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP LANGUAGE</computeroutput></term>
-DROP LANGUAGE
-       </computeroutput></term>
    <listitem>
     <para>
-	This message is returned if the language is successfully dropped.
+      This message is returned if the language was successfully dropped.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR: Language "<replaceable class="parameter">name</replaceable>" doesn't exist</computeroutput></term>
-ERROR: Language "<replaceable class="parameter">name</replaceable>" doesn't exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if a language called
+      This message is returned if a language called <replaceable
-	<replaceable class="parameter">name</replaceable> is
+      class="parameter">name</replaceable> is not found in the
-	not found in the database.
+      database.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPLANGUAGE-1">
-  <refsect1info>
-   <date>1998-04-15</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP PROCEDURAL LANGUAGE</command> will remove the definition
-   of the previously registered procedural language called
-   <replaceable class="parameter">name</replaceable>.
-  </para>
-  <refsect2 id="R2-SQL-DROPLANGUAGE-3">
-   <refsect2info>
-    <date>1998-04-15</date>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
-   <para>
-    The <command>DROP PROCEDURAL LANGUAGE</command> statement is
-    a <productname>PostgreSQL</productname> language extension.
-   </para>
-   <para>
-    Refer to
-    <xref linkend="sql-createlanguage" endterm="sql-createlanguage-title">
-    for information on how to create procedural languages.
-   </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-DROPLANGUAGE-2">
+ <refsect1>
-  <title>
+  <title>Examples</title>
-   Usage
-  </title>
  <para>
-   This command removes the PL/Sample language:
+   This command removes the procedural language
+   <literal>plsample</literal>:
-   <programlisting>
+<programlisting>
 DROP LANGUAGE plsample;
-   </programlisting>
+</programlisting>
  </para>
 </refsect1>
- <refsect1 id="R1-SQL-DROPLANGUAGE-3">
+ <refsect1>
-  <title>
+  <title>Compatibility</title>
-   Compatibility
-  </title>
-  <refsect2 id="R2-SQL-DROPLANGUAGE-5">
-   <refsect2info>
-    <date>1998-04-15</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
  <para>
-    There is no <command>DROP PROCEDURAL LANGUAGE</command> in 
+   There is no <command>DROP LANGUAGE</command> statement in the SQL
-    <acronym>SQL92</acronym>.
+   standard.
  </para>
-  </refsect2>
 </refsect1>
+ <refsect1>
+  <title>See Also</title>
+  <simplelist type="inline">
+   <member><xref linkend="sql-createlanguage" endterm="sql-createlanguage-title"></member>
+  </simplelist>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_opclass.sgml
+++ b/doc/src/sgml/ref/drop_opclass.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_opclass.sgml,v 1.2 2002/09/21 18:32:54 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_opclass.sgml,v 1.3 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,31 +8,30 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPOPCLASS-TITLE">DROP OPERATOR CLASS</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP OPERATOR CLASS</refname>
-   DROP OPERATOR CLASS
+  <refpurpose>remove a user-defined operator class</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a user-defined operator class
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>2002-07-28</date>
+DROP OPERATOR CLASS <replaceable class="PARAMETER">name</replaceable> USING <replaceable class="PARAMETER">index_method</replaceable> [ CASCADE | RESTRICT ]
-  </refsynopsisdivinfo>
+</synopsis>
-  <synopsis>
+ </refsynopsisdiv>
-DROP OPERATOR CLASS <replaceable class="PARAMETER">name</replaceable> USING <replaceable class="PARAMETER">access_method</replaceable> [ CASCADE | RESTRICT ]
-  </synopsis>
+ <refsect1>
+  <title>Description</title>
-  <refsect2 id="R2-SQL-DROPOPCLASS-1">
-   <refsect2info>
-    <date>2002-07-28</date>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP OPERATOR CLASS</command> drops an existing operator class.
+   To execute this command you must be the owner of the operator class.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="parameter">name</replaceable></term>
@@ -42,128 +41,85 @@ DROP OPERATOR CLASS <replaceable class="PARAMETER">name</replaceable> USING <rep
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><replaceable class="parameter">access_method</replaceable></term>
+    <term><replaceable class="parameter">index_method</replaceable></term>
    <listitem>
     <para>
      The name of the index access method the operator class is for.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
      Automatically drop objects that depend on the operator class.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the operator class if there are any dependent objects.
+      Refuse to drop the operator class if any objects depend on it.
      This is the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPOPCLASS-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>2002-07-28</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP OPERATOR CLASS</computeroutput></term>
-DROP OPERATOR CLASS
-       </computeroutput></term>
    <listitem>
     <para>
-	The message returned if the command is successful.
+      Message returned if the command was successful.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPOPCLASS-1">
-  <refsect1info>
-   <date>2002-07-28</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP OPERATOR CLASS</command> drops an existing operator class
-   from the database.
-   To execute this command you must be the owner of the operator class.
-  </para>
-  <refsect2 id="R2-SQL-DROPOPCLASS-3">
-   <refsect2info>
-    <date>2002-07-28</date>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
-   <para>
-    The <command>DROP OPERATOR CLASS</command> statement is a 
-    <productname>PostgreSQL</productname>
-    language extension.
-   </para>
-   <para>
-    Refer to
-    <xref linkend="sql-createopclass" endterm="sql-createopclass-title">
-    for information on how to create operator classes.
-   </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-DROPOPCLASS-2">
+ <refsect1>
-  <title>
+  <title>Examples</title>
-   Usage
-  </title>
  <para>
-   Remove B-tree operator class <literal>widget_ops</literal>:
+   Remove the B-tree operator class <literal>widget_ops</literal>:
-   <programlisting>
+<programlisting>
 DROP OPERATOR CLASS widget_ops USING btree;
-   </programlisting>
+</programlisting>
-   This command will not execute if there are any existing indexes
+   This command will not succeed if there are any existing indexes
   that use the operator class.  Add <literal>CASCADE</> to drop
   such indexes along with the operator class.
  </para>
 </refsect1>
- <refsect1 id="R1-SQL-DROPOPCLASS-3">
+ <refsect1>
-  <title>
+  <title>Compatibility</title>
-   Compatibility
-  </title>
-  <refsect2 id="R2-SQL-DROPOPCLASS-4">
-   <refsect2info>
-    <date>2002-07-28</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
  <para>
-    There is no <command>DROP OPERATOR CLASS</command> in
+   There is no <command>DROP OPERATOR CLASS</command> statement in the
-    <acronym>SQL92</acronym>.
+   SQL standard.
  </para>
-  </refsect2>
 </refsect1>
+ <refsect1>
+  <title>See Also</title>
+  <simplelist type="inline">
+   <member><xref linkend="sql-createopclass" endterm="sql-createopclass-title"></member>
+  </simplelist>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_operator.sgml
+++ b/doc/src/sgml/ref/drop_operator.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.18 2002/07/29 22:14:10 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.19 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,216 +8,169 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPOPERATOR-TITLE">DROP OPERATOR</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP OPERATOR</refname>
-   DROP OPERATOR
+  <refpurpose>remove a user-defined operator</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a user-defined operator
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-07-20</date>
+DROP OPERATOR <replaceable class="PARAMETER">name</replaceable> ( <replaceable class="PARAMETER">lefttype</replaceable> | NONE , <replaceable class="PARAMETER">righttype</replaceable> | NONE ) [ CASCADE | RESTRICT ]
-  </refsynopsisdivinfo>
+</synopsis>
-  <synopsis>
+ </refsynopsisdiv>
-DROP OPERATOR <replaceable class="PARAMETER">id</replaceable> ( <replaceable class="PARAMETER">lefttype</replaceable> | NONE , <replaceable class="PARAMETER">righttype</replaceable> | NONE ) [ CASCADE | RESTRICT ]
-  </synopsis>
+ <refsect1>
+  <title>Description</title>
-  <refsect2 id="R2-SQL-DROPOPERATOR-1">
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP OPERATOR</command> drops an existing operator from
+   the database system.  To execute this command you must be the owner
+   of the operator.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
-      <term><replaceable class="parameter">id</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
    <listitem>
     <para>
-	The identifier (optionally schema-qualified) of an existing operator.
+      The name (optionally schema-qualified) of an existing operator.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
    <term><replaceable class="parameter">lefttype</replaceable></term>
    <listitem>
     <para>
-	The type of the operator's left argument; write <literal>NONE</literal> if the
+      The data type of the operator's left operand; write
-	operator has no left argument.
+      <literal>NONE</literal> if the operator has no left operand.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
    <term><replaceable class="parameter">righttype</replaceable></term>
    <listitem>
     <para>
-	The type of the operator's right argument; write <literal>NONE</literal> if the
+      The data type of the operator's right operand; write
-	operator has no right argument.
+      <literal>NONE</literal> if the operator has no right operand.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
      Automatically drop objects that depend on the operator.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the operator if there are any dependent objects.
+      Refuse to drop the operator if any objects depend on it.  This
-	This is the default.
+      is the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPOPERATOR-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP OPERATOR</computeroutput></term>
-DROP OPERATOR
-       </computeroutput></term>
    <listitem>
     <para>
-	The message returned if the command is successful.
+      Message returned if the command was successful.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR:  RemoveOperator: binary operator '<replaceable class="PARAMETER">name</replaceable>' taking '<replaceable class="PARAMETER">lefttype</replaceable>' and '<replaceable class="PARAMETER">righttype</replaceable>' does not exist</computeroutput></term>
-ERROR:  RemoveOperator: binary operator '<replaceable class="PARAMETER">oper</replaceable>' taking '<replaceable class="PARAMETER">lefttype</replaceable>' and '<replaceable class="PARAMETER">righttype</replaceable>' does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if the specified binary operator does not exist.
+      This message is returned if the specified binary operator does not exist.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR: RemoveOperator: left unary operator '<replaceable class="PARAMETER">name</replaceable>' taking '<replaceable class="PARAMETER">lefttype</replaceable>' does not exist</computeroutput></term>
-ERROR: RemoveOperator: left unary operator '<replaceable class="PARAMETER">oper</replaceable>' taking '<replaceable class="PARAMETER">lefttype</replaceable>' does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if the left unary operator
+      This message is returned if the specified left unary operator
-	specified does not exist.
+      does not exist.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR: RemoveOperator: right unary operator '<replaceable class="PARAMETER">name</replaceable>' taking '<replaceable class="PARAMETER">righttype</replaceable>' does not exist</computeroutput></term>
-ERROR: RemoveOperator: right unary operator '<replaceable class="PARAMETER">oper</replaceable>' taking '<replaceable class="PARAMETER">righttype</replaceable>' does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if the right unary operator
+      This message is returned if the specified right unary operator
-	specified does not exist.
+      does not exist.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
- </refsynopsisdiv>
+ <refsect1>
+  <title>Examples</title>
- <refsect1 id="R1-SQL-DROPOPERATOR-1">
-  <refsect1info>
-   <date>1998-09-22</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP OPERATOR</command> drops an existing operator from the
-   database.
-   To execute this command you must be the owner of the operator.
-  </para>
  <para>
-   The left or right type of a left or right unary
+   Remove the power operator <literal>a^b</literal> for type <type>integer</type>:
-   operator, respectively, must be specified as <literal>NONE</literal>.
+<programlisting>
+DROP OPERATOR ^ (integer, integer);
+</programlisting>
  </para>
-  <refsect2 id="R2-SQL-DROPOPERATOR-3">
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
  <para>
-    The <command>DROP OPERATOR</command> statement is a 
+   Remove the left unary bitwise complement operator
-    <productname>PostgreSQL</productname>
+   <literal>~b</literal> for type <type>bit</type>:
-    language extension.
+<programlisting>
+DROP OPERATOR ~ (none, bit);
+</programlisting>
  </para>
  <para>
-    Refer to
+   Remove the right unary factorial operator <literal>x!</literal>
-    <xref linkend="sql-createoperator" endterm="sql-createoperator-title">
+   for type <type>integer</type>:
-    for information on how to create operators.
+<programlisting>
+DROP OPERATOR ! (integer, none);
+</programlisting>
  </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-DROPOPERATOR-2">
+ <refsect1>
-  <title>
+  <title>Compatibility</title>
-   Usage
-  </title>
-  <para>
-   Remove power operator <literal>a^n</literal> for <literal>int4</literal>:
-   <programlisting>
-DROP OPERATOR ^ (int4, int4);
-   </programlisting>
-  </para>
-  <para>
-   Remove left unary negation operator (<literal>! b</literal>) for <type>boolean</type>:
-   <programlisting>
-DROP OPERATOR ! (none, bool);
-   </programlisting>
-  </para>
  <para>
-   Remove right unary factorial operator (<literal>i !</literal>) for
+   There is no <command>DROP OPERATOR</command> statement in the SQL standard.
-   <literal>int4</literal>:
-   <programlisting>
-DROP OPERATOR ! (int4, none);
-   </programlisting>
  </para>
 </refsect1>
- <refsect1 id="R1-SQL-DROPOPERATOR-3">
+ <refsect1>
-  <title>
+  <title>See Also</title>
-   Compatibility
-  </title>
+  <simplelist type="inline">
+   <member><xref linkend="sql-createoperator" endterm="sql-createoperator-title"></member>
-  <refsect2 id="R2-SQL-DROPOPERATOR-4">
+  </simplelist>
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
-   <para>
-    There is no <command>DROP OPERATOR</command> in <acronym>SQL92</acronym>.
-   </para>
-  </refsect2>
 </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_rule.sgml
+++ b/doc/src/sgml/ref/drop_rule.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.16 2002/07/12 18:43:13 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.17 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,169 +8,122 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPRULE-TITLE">DROP RULE</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP RULE</refname>
-   DROP RULE
+  <refpurpose>remove a rewrite rule</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a rewrite rule
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1998-09-22</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP RULE <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">relation</replaceable> [ CASCADE | RESTRICT ]
-  </synopsis>
+</synopsis>
+ </refsynopsisdiv>
-  <refsect2 id="R2-SQL-DROPRULE-1">
-   <refsect2info>
+ <refsect1>
-    <date>1998-09-22</date>
+  <title>Description</title>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP RULE</command> drops a rewrite rule.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="parameter">name</replaceable></term>
    <listitem>
     <para>
-	The name of an existing rule to drop.
+      The name of the rule to drop.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
    <term><replaceable class="parameter">relation</replaceable></term>
    <listitem>
     <para>
-	The name (optionally schema-qualified) of the relation the rule
+      The name (optionally schema-qualified) of the table or view that
-	applies to.
+      the rule applies to.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
      Automatically drop objects that depend on the rule.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the rule if there are any dependent objects.
+      Refuse to drop the rule if any objects depend on it.  This is
-	This is the default.
+      the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
+ </refsect1>
+ <refsect1>
+  <title>Diagnostics</title>
-   </para>
-  </refsect2>
-  <refsect2 id="R2-SQL-DROPRULE-2">
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP RULE</computeroutput></term>
-DROP RULE
-       </computeroutput></term>
    <listitem>
     <para>
-	Message returned if successful.
+      Message returned if the command was successful.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR:  Rule "<replaceable class="parameter">name</replaceable>" not found</computeroutput></term>
-ERROR:  Rule "<replaceable class="parameter">name</replaceable>" not found
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if the specified rule does not exist.
+      Message if the specified rule does not exist.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPRULE-1">
-  <refsect1info>
-   <date>1998-09-22</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP RULE</command> drops a rule from the specified
-   <productname>PostgreSQL</productname> rule
-   system. <productname>PostgreSQL</productname>
-   will immediately cease enforcing it and
-   will purge its definition from the system catalogs.
-  </para>
-  <refsect2 id="R2-SQL-DROPRULE-3">
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
-   <para>
-    The <command>DROP RULE</command> statement is a
-    <productname>PostgreSQL</productname>
-    language extension.
-   </para>
-   <para>
-    Refer to <command>CREATE RULE</command> for
-    information on how to create rules.
-   </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-DROPRULE-2">
+ <refsect1>
-  <title>
+  <title>Examples</title>
-   Usage
-  </title>
  <para>
   To drop the rewrite rule <literal>newrule</literal>:
-   <programlisting>
+<programlisting>
 DROP RULE newrule ON mytable;
-   </programlisting>
+</programlisting>
  </para>
 </refsect1>
- <refsect1 id="R1-SQL-DROPRULE-3">
+ <refsect1>
-  <title>
+  <title>Compatibility</title>
-   Compatibility
-  </title>
-  <refsect2 id="R2-SQL-DROPRULE-5">
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
  <para>
-    There is no <command>DROP RULE</command> in SQL92.
+   There is no <command>DROP RULE</command> statement in the SQL standard.
  </para>
-  </refsect2>
 </refsect1>
+ <refsect1>
+  <title>See Also</title>
+  <simplelist type="inline">
+   <member><xref linkend="sql-createrule" endterm="sql-createrule-title"></member>
+  </simplelist>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_schema.sgml
+++ b/doc/src/sgml/ref/drop_schema.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_schema.sgml,v 1.1 2002/07/18 16:47:22 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_schema.sgml,v 1.2 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,31 +8,35 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPSCHEMA-TITLE">DROP SCHEMA</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP SCHEMA</refname>
-   DROP SCHEMA
+  <refpurpose>remove a schema</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a schema
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>2002-07-18</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP SCHEMA <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+</synopsis>
+ </refsynopsisdiv>
-  </synopsis>
+ <refsect1>
+  <title>Description</title>
+  <para>
+   <command>DROP SCHEMA</command> removes schemas from the database.
+  </para>
-  <refsect2 id="R2-SQL-DROPSCHEMA-1">
-   <refsect2info>
-    <date>2002-07-18</date>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   A schema can only be dropped by its owner or a superuser.  Note that
+   the owner can drop the schema (and thereby all contained objects)
+   even if he does not own some of the objects within the schema.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="PARAMETER">name</replaceable></term>
@@ -42,128 +46,84 @@ DROP SCHEMA <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
-        Automatically drop objects (tables, functions, etc) that are contained
+      Automatically drop objects (tables, functions, etc.) that are
-	in the schema.
+      contained in the schema.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the schema if it contains any objects.
+      Refuse to drop the schema if it contains any objects.  This is
-	This is the default.
+      the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPSCHEMA-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>2002-07-18</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP SCHEMA</computeroutput></term>
-DROP SCHEMA
-       </computeroutput></term>
    <listitem>
     <para>
-	The message returned if the schema is successfully dropped.
+      Message returned if the schema was successfully dropped.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR: Schema "<replaceable class="parameter">name</replaceable>" does not exist</computeroutput></term>
-ERROR: Schema "<replaceable class="parameter">name</replaceable>" does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if the specified schema does not exist.
+      This message is returned if the specified schema does not exist.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPSCHEMA-1">
-  <refsect1info>
-   <date>2002-07-18</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP SCHEMA</command> removes schemas from the data base.
-  </para>
-  <para>
-   A schema can only be dropped by its owner or a superuser.  Note that
-   the owner can drop the schema (and thereby all contained objects)
-   even if he does not own some of the objects within the schema.
-  </para>
-  <refsect2 id="R2-SQL-DROPSCHEMA-3">
-   <refsect2info>
-    <date>2002-07-18</date>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
-   <para>
-    Refer to the <command>CREATE SCHEMA</command> statement for
-    information on how to create a schema.
-   </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-DROPSCHEMA-2">
+ <refsect1>
-  <title>
+  <title>Examples</title>
-   Usage
-  </title>
  <para>
   To remove schema <literal>mystuff</literal> from the database,
   along with everything it contains:
-   <programlisting>
+<programlisting>
 DROP SCHEMA mystuff CASCADE;
-   </programlisting>
+</programlisting>
  </para>
 </refsect1>
- <refsect1 id="R1-SQL-DROPSCHEMA-3">
+ <refsect1>
-  <title>
+  <title>Compatibility</title>
-   Compatibility
-  </title>
-  <refsect2 id="R2-SQL-DROPSCHEMA-4">
-   <refsect2info>
-    <date>2002-07-18</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
  <para>
-    <command>DROP SCHEMA</command> is fully compatible with
+   <command>DROP SCHEMA</command> is fully conforming with the SQL
-    <acronym>SQL92</acronym>, except that the standard only allows
+   standard, except that the standard only allows one schema to be
-    one schema to be dropped per command.
+   dropped per command.
  </para>
-  </refsect2>
 </refsect1>
+ <refsect1>
+  <title>See Also</title>
+  <simplelist type="inline">
+   <member><xref linkend="sql-createschema" endterm="sql-createschema-title"></member>
+  </simplelist>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_sequence.sgml
+++ b/doc/src/sgml/ref/drop_sequence.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.16 2002/07/18 15:49:08 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_sequence.sgml,v 1.17 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,31 +8,29 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPSEQUENCE-TITLE">DROP SEQUENCE</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP SEQUENCE</refname>
-   DROP SEQUENCE
+  <refpurpose>remove a sequence</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a sequence
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-07-20</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP SEQUENCE <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+</synopsis>
+ </refsynopsisdiv>
-  </synopsis>
+ <refsect1>
+  <title>Description</title>
-  <refsect2 id="R2-SQL-DROPSEQUENCE-1">
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP SEQUENCE</command> removes sequence number generators.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="PARAMETER">name</replaceable></term>
@@ -42,126 +40,80 @@ DROP SEQUENCE <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCAD
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
      Automatically drop objects that depend on the sequence.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the sequence if there are any dependent objects.
+      Refuse to drop the sequence if any objects depend on it.  This
-	This is the default.
+      is the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPSEQUENCE-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP SEQUENCE</computeroutput></term>
-DROP SEQUENCE
-       </computeroutput></term>
    <listitem>
     <para>
-	The message returned if the sequence is successfully dropped.
+      Message returned if the sequence was successfully dropped.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR: sequence "<replaceable class="parameter">name</replaceable>" does not exist</computeroutput></term>
-ERROR: sequence "<replaceable class="parameter">name</replaceable>" does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if the specified sequence does not exist.
+      Message returned if the specified sequence does not exist.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
+ </refsect1>
-   </para>
+ <refsect1>
-  </refsect2>
+  <title>Examples</title>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPSEQUENCE-1">
-  <refsect1info>
-   <date>1998-09-22</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
  <para>
-   <command>DROP SEQUENCE</command> removes sequence number generators from the
+   To remove the sequence <literal>serial</literal>:
-   data base. With the current implementation of sequences as
-   special tables it works just like the <command>DROP TABLE</command>
-   statement.
-  </para>
-  <refsect2 id="R2-SQL-DROPSEQUENCE-3">
+<programlisting>
-   <refsect2info>
+DROP SEQUENCE serial;
-    <date>1998-09-22</date>
+</programlisting>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
-   <para>
-    The <command>DROP SEQUENCE</command> statement is a
-    <productname>PostgreSQL</productname>
-    language extension.
-   </para>
-   <para>
-    Refer to the <command>CREATE SEQUENCE</command> statement for
-    information on how to create a sequence.
  </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-DROPSEQUENCE-2">
+ <refsect1>
-  <title>
+  <title>Compatibility</title>
-   Usage
-  </title>
-  <para>
-   To remove sequence <literal>serial</literal> from database:
-   <programlisting>
+  <para>
-DROP SEQUENCE serial;
+   There is no <command>DROP SEQUENCE</command> statement in the SQL standard.
-   </programlisting>
  </para>
 </refsect1>
- <refsect1 id="R1-SQL-DROPSEQUENCE-3">
+ <refsect1>
-  <title>
+  <title>See Also</title>
-   Compatibility
-  </title>
+  <simplelist type="inline">
+   <member><xref linkend="sql-createsequence" endterm="sql-createsequence-title"></member>
-  <refsect2 id="R2-SQL-DROPSEQUENCE-4">
+  </simplelist>
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
-   <para>
-    There is no <command>DROP SEQUENCE</command> in <acronym>SQL92</acronym>.
-   </para>
-  </refsect2>
 </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_table.sgml
+++ b/doc/src/sgml/ref/drop_table.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_table.sgml,v 1.17 2002/07/14 22:47:56 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_table.sgml,v 1.18 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,158 +8,126 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPTABLE-TITLE">DROP TABLE</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP TABLE</refname>
-   DROP TABLE
+  <refpurpose>remove a table</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a table
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-07-20</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP TABLE <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+</synopsis>
+ </refsynopsisdiv>
-  </synopsis>
+ <refsect1>
+  <title>Description</title>
+  <para>
+   <command>DROP TABLE</command> removes tables from the database.
+   Only its owner may destroy a table.  To empty a table of rows,
+   without destroying the table, use <command>DELETE</command>.
+  </para>
-  <refsect2 id="R2-SQL-DROPTABLE-1">
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP TABLE</command> always removes any indexes, rules,
+   triggers, and constraints that exist for the target table.
+   However, to drop a table that is referenced by a foreign-key
+   constraint of another table, <literal>CASCADE</> must be
+   specified. (<literal>CASCADE</> will remove the foreign-key
+   constraint, not the other table entirely.)
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="PARAMETER">name</replaceable></term>
    <listitem>
     <para>
-	The name (optionally schema-qualified) of an existing table to drop.
+      The name (optionally schema-qualified) of the table to drop.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
-        Automatically drop objects that depend on the table
+      Automatically drop objects that depend on the table (such as
-	(such as views).
+      views).
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the table if there are any dependent objects.
+      Refuse to drop the table if any objects depend on it.  This is
-	This is the default.
+      the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPTABLE-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP TABLE</computeroutput></term>
-DROP TABLE
-       </computeroutput></term>
    <listitem>
     <para>
-	The message returned if the command completes successfully.
+      Message returned if the command completes successfully.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR: table "<replaceable class="parameter">name</replaceable>" does not exist</computeroutput></term>
-ERROR: table "<replaceable class="parameter">name</replaceable>" does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	If the specified table does not exist in the database.
+      Message returned if the specified table does not exist.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPTABLE-1">
-  <refsect1info>
-   <date>1998-09-22</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP TABLE</command> removes tables from the database.
-   Only its owner may destroy a table. A table may be emptied of rows, but not
-   destroyed, by using <command>DELETE</command>.
-  </para>
-  <para>
-   <command>DROP TABLE</command> always removes any indexes, rules,
-   triggers, and constraints that exist for the target table.  However,
-   to drop a table that is referenced by a foreign-key constraint of another
-   table, CASCADE must be specified. (CASCADE will remove the foreign-key
-   constraint, not the other table itself.)
-  </para>
-  <refsect2 id="R2-SQL-DROPTABLE-3">
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
-   <para>
-    Refer to <command>CREATE TABLE</command> and
-    <command>ALTER TABLE</command> for information on
-    how to create or modify tables.
-   </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-DROPTABLE-2">
+ <refsect1>
-  <title>
+  <title>Examples</title>
-   Usage
-  </title>
  <para>
   To destroy two tables, <literal>films</literal> and 
   <literal>distributors</literal>:
-   <programlisting>
+<programlisting>
 DROP TABLE films, distributors;
-   </programlisting>
+</programlisting>
  </para>
 </refsect1>
- <refsect1 id="R1-SQL-DROPTABLE-3">
+ <refsect1>
-   <title>
+  <title>Compatibility</title>
-   Compatibility
-  </title>
-  <refsect2 id="R2-SQL-DROPTABLE-4">
-   <title>
-    SQL92
-   </title>
  <para>
+   This command conforms to the SQL standard.
  </para>
-   </refsect2>
 </refsect1>
+ <refsect1>
+  <title>See Also</title>
+  <simplelist type="inline">
+   <member><xref linkend="sql-altertable" endterm="sql-altertable-title"></member>
+   <member><xref linkend="sql-createtable" endterm="sql-createtable-title"></member>
+  </simplelist>
+ </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_trigger.sgml
+++ b/doc/src/sgml/ref/drop_trigger.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_trigger.sgml,v 1.14 2002/11/21 23:34:43 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_trigger.sgml,v 1.15 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,124 +8,102 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPTRIGGER-TITLE">DROP TRIGGER</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP TRIGGER</refname>
-   DROP TRIGGER
+  <refpurpose>remove a trigger</refpurpose> 
-  </refname>
-  <refpurpose>
-   remove a trigger
-  </refpurpose> 
 </refnamediv>            
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1998-09-22</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table</replaceable> [ CASCADE | RESTRICT ]
-  </synopsis>
+</synopsis>
+ </refsynopsisdiv>
-  <refsect2 id="R2-SQL-DROPTRIGGER-1">
-   <refsect2info>
+ <refsect1>
-    <date>1998-09-22</date>
+  <title>Description</title>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP TRIGGER</command> will remove an existing
+   trigger definition. To execute this command, the current
+   user must be the owner of the table for which the trigger is defined.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="PARAMETER">name</replaceable></term>
    <listitem>
     <para>
-	The name of an existing trigger.
+      The name of the trigger to remove.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
    <term><replaceable class="PARAMETER">table</replaceable></term>
    <listitem>
     <para>
-	The name (optionally schema-qualified) of a table.
+      The name (optionally schema-qualified) of a table for which the
+      trigger is defined.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
      Automatically drop objects that depend on the trigger.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the trigger if there are any dependent objects.
+      Refuse to drop the trigger if any objects depend on it.  This is
-	This is the default.
+      the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPTRIGGER-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP TRIGGER</computeroutput></term>
-DROP TRIGGER
-       </computeroutput></term>
    <listitem>
     <para>
-	The message returned if the trigger is successfully dropped.
+      Message returned if the trigger was successfully dropped.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR: DropTrigger: there is no trigger <replaceable class="PARAMETER">name</replaceable> on relation "<replaceable class="parameter">table</replaceable>"</computeroutput></term>
-ERROR: DropTrigger: there is no trigger <replaceable class="PARAMETER">name</replaceable> on relation "<replaceable class="parameter">table</replaceable>"
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if the trigger specified does not exist.
+      Message returned if the specified trigger does not exist.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPTRIGGER-1">
-  <refsect1info>
-   <date>1998-09-22</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP TRIGGER</command> will remove an existing
-   trigger definition. To execute this command the current
-   user must be the owner of the table for which the trigger is defined.
-  </para>
 </refsect1>
 <refsect1 id="SQL-DROPTRIGGER-examples">
  <title>Examples</title>
  <para>
-   Destroy the <literal>if_dist_exists</literal> trigger
+   Destroy the trigger <literal>if_dist_exists</literal> on the table
-   on table <literal>films</literal>:
+   <literal>films</literal>:
 <programlisting>
 DROP TRIGGER if_dist_exists ON films;
@@ -136,30 +114,13 @@ DROP TRIGGER if_dist_exists ON films;
 <refsect1 id="SQL-DROPTRIGGER-compatibility">
  <title>Compatibility</title>
-  <variablelist>
-   <varlistentry>
-    <term>SQL92</term>
-    <listitem>
-     <para>
-      There is no <command>DROP TRIGGER</command> statement in
-      <acronym>SQL92</acronym>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>SQL99</term>
-    <listitem>
  <para>
   The <command>DROP TRIGGER</command> statement in
-      <productname>PostgreSQL</productname> is incompatible with
+   <productname>PostgreSQL</productname> is incompatible with the SQL
-      SQL99.  In SQL99, trigger names are not local to tables, so the
+   standard.  In the SQL standard, trigger names are not local to
-      command is simply <literal>DROP TRIGGER
+   tables, so the command is simply <literal>DROP TRIGGER
   <replaceable>name</replaceable></literal>.
  </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
 </refsect1>
 <refsect1>
@@ -169,6 +130,7 @@ DROP TRIGGER if_dist_exists ON films;
   <member><xref linkend="sql-createtrigger" endterm="sql-createtrigger-title"></member>
  </simplelist>
 </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_type.sgml
+++ b/doc/src/sgml/ref/drop_type.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.20 2002/11/21 23:34:43 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.21 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,118 +8,91 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPTYPE-TITLE">DROP TYPE</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP TYPE</refname>
-   DROP TYPE
+  <refpurpose>remove a user-defined data type</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a user-defined data type
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-07-20</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP TYPE <replaceable class="PARAMETER">typename</replaceable> [, ...] [ CASCADE | RESTRICT ]
+</synopsis>
+ </refsynopsisdiv>
-  </synopsis>
+ <refsect1>
+  <title>Description</title>
-  <refsect2 id="R2-SQL-DROPTYPE-1">
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP TYPE</command> will remove a user-defined data type.
+   Only the owner of a type can remove it.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="PARAMETER">typename</replaceable></term>
    <listitem>
     <para>
-	The name (optionally schema-qualified) of an existing type.
+      The name (optionally schema-qualified) of the data type to remove.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
-        Automatically drop objects that depend on the type
+      Automatically drop objects that depend on the type (such as
-	(such as table columns, functions, operators, etc).
+      table columns, functions, operators).
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the type if there are any dependent objects.
+      Refuse to drop the type if any objects depend on it.  This is
-	This is the default.
+      the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
+ <refsect1>
-  <refsect2 id="R2-SQL-DROPTYPE-2">
+  <title>Diagnostics</title>
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP TYPE</computeroutput></term>
-DROP TYPE
-       </computeroutput></term>
    <listitem>
     <para>
-	The message returned if the command is successful.
+      Message returned if the command was successful.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR:  RemoveType: type '<replaceable class="parameter">typename</replaceable>' does not exist</computeroutput></term>
-ERROR:  RemoveType: type '<replaceable class="parameter">typename</replaceable>' does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if the specified type is not found.
+      Message returned if the specified type does not exist.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPTYPE-1">
-  <refsect1info>
-   <date>1998-09-22</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP TYPE</command> will remove a user type from the
-   system catalogs.
-  </para>
-  <para>
-   Only the owner of a type can remove it.
-  </para>
 </refsect1>
 <refsect1 id="SQL-DROPTYPE-examples">
  <title>Examples</title>
-  <para>
-   To remove the <type>box</type> type:
+  <para>
+   To remove the data type <type>box</type>:
 <programlisting>
 DROP TYPE box;
 </programlisting>
@@ -130,9 +103,10 @@ DROP TYPE box;
  <title>Compatibility</title>
  <para>
-   Note that the <command>CREATE TYPE</command> command and the data
+   This command is similar to the corresponding command in the SQL
-   type extension mechanisms in <productname>PostgreSQL</productname>
+   standard, but note that the <command>CREATE TYPE</command> command
-   differ from SQL99.
+   and the data type extension mechanisms in
+   <productname>PostgreSQL</productname> differ from the SQL standard.
  </para>
 </refsect1>
@@ -143,6 +117,7 @@ DROP TYPE box;
   <member><xref linkend="sql-createtype" endterm="sql-createtype-title"></member>
  </simplelist>
 </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/drop_user.sgml
+++ b/doc/src/sgml/ref/drop_user.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.15 2002/02/27 21:14:54 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.16 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,6 +8,7 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPUSER-TITLE">DROP USER</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
  <refname>DROP USER</refname>
  <refpurpose>remove a database user account</refpurpose>
@@ -23,40 +24,36 @@ DROP USER <replaceable class="PARAMETER">name</replaceable>
  <title>Description</title>
  <para>
-   <command>DROP USER</command> removes the specified user from the database.
+   <command>DROP USER</command> removes the specified user.
   It does not remove tables, views, or other objects owned by the user. If the
   user owns any database, an error is raised.
  </para>
+ </refsect1>
-  <refsect2>
+ <refsect1>
  <title>Parameters</title>
-   <para>
  <variablelist>
   <varlistentry>
    <term><replaceable class="PARAMETER">name</replaceable></term>
    <listitem>
     <para>
-	The name of an existing user.
+      The name of the user to remove.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
-  </refsect2>
 </refsect1>
 <refsect1>
  <title>Diagnostics</title>
-  <para>
   <variablelist>
    <varlistentry>
     <term><computeroutput>DROP USER</computeroutput></term>
     <listitem>
      <para>
-       The message returned if the user is successfully deleted.
+       Message returned if the user was successfully deleted.
      </para>
     </listitem>
    </varlistentry>
@@ -65,7 +62,7 @@ DROP USER <replaceable class="PARAMETER">name</replaceable>
     <term><computeroutput>ERROR:  DROP USER: user "<replaceable class="parameter">name</replaceable>" does not exist</computeroutput></term>
     <listitem>
      <para>
-       This message occurs if the user name is not found.
+       Message returned if the specified user does not exist.
      </para>
     </listitem>
    </varlistentry>
@@ -78,18 +75,13 @@ DROP USER <replaceable class="PARAMETER">name</replaceable>
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
-  </para>
 </refsect1>
 <refsect1>
  <title>Notes</title>
  <para>
-   Use <xref linkend="SQL-CREATEUSER" endterm="SQL-CREATEUSER-title">
-   to add new users, and <xref linkend="SQL-ALTERUSER"
-   endterm="SQL-ALTERUSER-title"> to change a user's attributes.
   <productname>PostgreSQL</productname> includes a program <xref
   linkend="APP-DROPUSER" endterm="APP-DROPUSER-title"> that has the
   same functionality as this command (in fact, it calls this command)
@@ -122,9 +114,8 @@ DROP USER jonathan;
  <title>See Also</title>
  <simplelist type="inline">
-   <member><xref linkend="sql-createuser" endterm="sql-createuser-title"></member>
   <member><xref linkend="sql-alteruser" endterm="sql-alteruser-title"></member>
-   <member><xref linkend="app-dropuser"></member>
+   <member><xref linkend="sql-createuser" endterm="sql-createuser-title"></member>
  </simplelist>
 </refsect1>

--- a/doc/src/sgml/ref/drop_view.sgml
+++ b/doc/src/sgml/ref/drop_view.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_view.sgml,v 1.16 2002/11/21 23:34:43 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_view.sgml,v 1.17 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,154 +8,113 @@ PostgreSQL documentation
  <refentrytitle id="SQL-DROPVIEW-TITLE">DROP VIEW</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>DROP VIEW</refname>
-   DROP VIEW
+  <refpurpose>remove a view</refpurpose>
-  </refname>
-  <refpurpose>
-   remove a view
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-07-20</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 DROP VIEW <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
-  </synopsis>
+</synopsis>
+ </refsynopsisdiv>
-  <refsect2 id="R2-SQL-DROPVIEW-1">
-   <refsect2info>
+ <refsect1>
-    <date>1998-09-22</date>
+  <title>Description</title>
-   </refsect2info>
-   <title>
-    Inputs
-   </title>
  <para>
+   <command>DROP VIEW</command> drops an existing view.  To execute
+   this command you must be the owner of the view.
+  </para>
+ </refsect1>
+ <refsect1>
+  <title>Parameters</title>
  <variablelist>
   <varlistentry>
    <term><replaceable class="PARAMETER">name</replaceable></term>
    <listitem>
     <para>
-	The name (optionally schema-qualified) of an existing view.
+      The name (optionally schema-qualified) of the view to remove.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>CASCADE</term>
+    <term><literal>CASCADE</literal></term>
    <listitem>
     <para>
-        Automatically drop objects that depend on the view
+      Automatically drop objects that depend on the view (such as
-	(such as other views).
+      other views).
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term>RESTRICT</term>
+    <term><literal>RESTRICT</literal></term>
    <listitem>
     <para>
-        Refuse to drop the view if there are any dependent objects.
+      Refuse to drop the view if any objects depend on it.  This is
-	This is the default.
+      the default.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
+ </refsect1>
-   </para>
+ <refsect1>
-  </refsect2>
+  <title>Diagnostics</title>
-  <refsect2 id="R2-SQL-DROPVIEW-2">
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Outputs
-   </title>
-   <para>
  <variablelist>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>DROP VIEW</computeroutput></term>
-DROP VIEW
-       </computeroutput></term>
    <listitem>
     <para>
-	The message returned if the command is successful.
+      Message returned if the command was successful.
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-      <term><computeroutput>
+    <term><computeroutput>ERROR: view <replaceable class="parameter">name</replaceable> does not exist</computeroutput></term>
-ERROR: view <replaceable class="parameter">name</replaceable> does not exist
-       </computeroutput></term>
    <listitem>
     <para>
-	This message occurs if the specified view does not exist in
+      Message returned if the specified view does not exist.
-	the database.
     </para>
    </listitem>
   </varlistentry>
  </variablelist>
-   </para>
+ </refsect1>
-  </refsect2>
- </refsynopsisdiv>
- <refsect1 id="R1-SQL-DROPVIEW-1">
+ <refsect1>
-  <refsect1info>
+  <title>Examples</title>
-   <date>1998-09-22</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
-  <para>
-   <command>DROP VIEW</command> drops an existing view from the database.
-   To execute this command you must be the owner of the
-   view.
-  </para>
-  <refsect2 id="R2-SQL-DROPVIEW-3">
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
  <para>
-    Refer to <xref linkend="sql-createview" endterm="sql-createview-title">
+   This command will remove the view called <literal>kinds</literal>:
-    for information on how to create views.
+<programlisting>
+DROP VIEW kinds;
+</programlisting>
  </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-DROPVIEW-2">
+ <refsect1>
-  <title>
+  <title>Compatibility</title>
-   Usage
-  </title>
  <para>
-   This command will remove the view called <literal>kinds</literal>:
+   This command conforms to the SQL standard.
  </para>
-  <programlisting>
-DROP VIEW kinds;
-  </programlisting>
 </refsect1>
- <refsect1 id="R1-SQL-DROPVIEW-3">
+ <refsect1>
-  <title>
+  <title>See Also</title>
-   Compatibility
-  </title>
+  <simplelist type="inline">
+   <member><xref linkend="sql-createview" endterm="sql-createview-title"></member>
-  <refsect2 id="R2-SQL-DROPVIEW-4">
+  </simplelist>
-   <refsect2info>
-    <date>1998-09-22</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
-   <para>
-   </para>
-  </refsect2>
 </refsect1>
 </refentry>
 <!-- Keep this comment at the end of the file

--- a/doc/src/sgml/ref/fetch.sgml
+++ b/doc/src/sgml/ref/fetch.sgml
--- a/doc/src/sgml/ref/move.sgml
+++ b/doc/src/sgml/ref/move.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/move.sgml,v 1.21 2003/03/27 16:51:27 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/move.sgml,v 1.22 2003/05/04 02:23:16 petere Exp $
 PostgreSQL documentation
 -->
@@ -8,112 +8,74 @@ PostgreSQL documentation
  <refentrytitle id="SQL-MOVE-TITLE">MOVE</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
 </refmeta>
 <refnamediv>
-  <refname>
+  <refname>MOVE</refname>
-   MOVE
+  <refpurpose>reposition a cursor</refpurpose>
-  </refname>
-  <refpurpose>
-   reposition a cursor
-  </refpurpose>
 </refnamediv>
 <refsynopsisdiv>
-  <refsynopsisdivinfo>
+<synopsis>
-   <date>1999-07-20</date>
-  </refsynopsisdivinfo>
-  <synopsis>
 MOVE [ <replaceable class="PARAMETER">direction</replaceable> { FROM | IN } ] <replaceable class="PARAMETER">cursor</replaceable>
-  </synopsis>
+</synopsis>
 </refsynopsisdiv>
- <refsect1 id="R1-SQL-MOVE-1">
+ <refsect1>
-  <refsect1info>
+  <title>Description</title>
-   <date>1998-09-24</date>
-  </refsect1info>
-  <title>
-   Description
-  </title>
  <para>
   <command>MOVE</command> repositions a cursor without retrieving any data.
   <command>MOVE</command> works exactly like the <command>FETCH</command>
   command, except it only repositions the cursor and does not return rows.
  </para>
  <para>
   Refer to 
   <xref linkend="sql-fetch" endterm="sql-fetch-title">
   for details on syntax and usage.
  </para>
+ </refsect1>
-  <refsect2 id="R2-SQL-MOVE-3">
+ <refsect1>
-   <refsect2info>
+  <title>Diagnostics</title>
-    <date>1998-09-24</date>
-   </refsect2info>
-   <title>
-    Notes
-   </title>
  <para>
-    The count returned in <command>MOVE</command>'s status string is the
+   The count returned in <command>MOVE</command>'s status string is
-    count of the number of rows that would have been returned by the
+   the count of the number of rows that would have been returned by
-    equivalent <command>FETCH</command> command.
+   the equivalent <command>FETCH</command> command.
  </para>
-   <para>
-    Refer to
-    <xref linkend="sql-fetch" endterm="sql-fetch-title">
-    for a description of valid arguments.
-    Refer to 
-    <xref linkend="sql-declare" endterm="sql-declare-title">
-    to define a cursor.
-   </para>
-  </refsect2>
 </refsect1>
- <refsect1 id="R1-SQL-MOVE-2">
+ <refsect1>
-  <title>
+  <title>Examples</title>
-   Usage
-  </title>
-  <para>
-   Set up and use a cursor:
 <programlisting>
 BEGIN WORK;
 DECLARE liahona CURSOR FOR SELECT * FROM films;
-- Skip first 5 rows:
+-- Skip the first 5 rows:
 MOVE FORWARD 5 IN liahona;
-<computeroutput>
 MOVE 5
-</computeroutput>
-- Fetch 6th row in the cursor liahona:
+-- Fetch the 6th row from the cursor liahona:
-FETCH 1 IN liahona;
+FETCH 1 FROM liahona;
-<computeroutput>
 code  | title  | did | date_prod  |  kind  |  len
-------+--------+-----+-----------+--------+-------
+-------+--------+-----+------------+--------+-------
- P_303 | 48 Hrs | 103 | 1982-10-22| Action | 01:37
+ P_303 | 48 Hrs | 103 | 1982-10-22 | Action | 01:37
 (1 row)
-</computeroutput>
-- close the cursor liahona and commit work:
+-- Close the cursor liahona and end the transaction:
 CLOSE liahona;
 COMMIT WORK;
 </programlisting>
-  </para>
 </refsect1>
- <refsect1 id="R1-SQL-MOVE-3">
+ <refsect1>
-  <title>
+  <title>Compatibility</title>
-   Compatibility
-  </title>
-  <refsect2 id="R2-SQL-MOVE-4">
-   <refsect2info>
-    <date>1998-09-01</date>
-   </refsect2info>
-   <title>
-    SQL92
-   </title>
  <para>
-    There is no <acronym>SQL92</acronym> <command>MOVE</command> statement. 
+   There is no <command>MOVE</command> statement in the SQL standard.
  </para>
-  </refsect2>
 </refsect1>
 </refentry>

--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
--- a/doc/src/sgml/ref/select_into.sgml
+++ b/doc/src/sgml/ref/select_into.sgml
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
--- a/doc/src/sgml/ref/set_constraints.sgml
+++ b/doc/src/sgml/ref/set_constraints.sgml
--- a/doc/src/sgml/ref/set_session_auth.sgml
+++ b/doc/src/sgml/ref/set_session_auth.sgml
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.8 2003/02/19 04:06:28 momjian Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.9 2003/05/04 02:23:16 petere Exp $ -->
 <refentry id="SQL-SET-SESSION-AUTHORIZATION">
- <docinfo>
-  <date>2001-04-21</date>
- </docinfo>
 <refmeta>
  <refentrytitle id="sql-set-session-authorization-title">SET SESSION AUTHORIZATION</refentrytitle>
  <refmiscinfo>SQL - Language Statements</refmiscinfo>
@@ -16,7 +12,7 @@
 <refsynopsisdiv>
 <synopsis>
-SET [ SESSION | LOCAL ] SESSION AUTHORIZATION <replaceable class="PARAMETER">username</replaceable>
+SET [ SESSION | LOCAL ] SESSION AUTHORIZATION <replaceable class="parameter">username</replaceable>
 SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT
 RESET SESSION AUTHORIZATION
 </synopsis>
@@ -28,11 +24,10 @@ RESET SESSION AUTHORIZATION
  <para>
   This command sets the session user identifier and the current user
   identifier of the current SQL-session context to be <replaceable
-   class="PARAMETER">username</replaceable>.  The user name may be
+   class="parameter">username</replaceable>.  The user name may be
-   written as either an identifier or a string literal.  The session
+   written as either an identifier or a string literal.  Using this
-   user identifier is valid for the duration of a connection; for
+   command, it is possible, for example, to temporarily become an
-   example, it is possible to temporarily become an unprivileged user
+   unprivileged user and later switch back to become a superuser.
-   and later switch back to become a superuser.
  </para>
  <para>
@@ -52,7 +47,7 @@ RESET SESSION AUTHORIZATION
  </para>
  <para>
-   The <option>SESSION</> and <option>LOCAL</> modifiers act the same
+   The <literal>SESSION</> and <literal>LOCAL</> modifiers act the same
   as for the regular <xref linkend="SQL-SET" endterm="SQL-SET-title">
   command.
  </para>
@@ -60,9 +55,8 @@ RESET SESSION AUTHORIZATION
  <para>
   The <literal>DEFAULT</> and <literal>RESET</> forms reset the session
   and current user identifiers to be the originally authenticated user
-   name.  These forms are always accepted.
+   name.  These forms may be executed by any user.
  </para>
 </refsect1>
 <refsect1>
@@ -88,18 +82,16 @@ SELECT SESSION_USER, CURRENT_USER;
 <refsect1>
  <title>Compatibility</title>
-  <simpara>SQL99</simpara>
  <para>
-   SQL99 allows some other expressions to appear in place of the
+   The SQL standard allows some other expressions to appear in place
-   literal <parameter>username</parameter> which are not important in
+   of the literal <replaceable>username</replaceable> which are not
-   practice.  <application>PostgreSQL</application> allows identifier
+   important in practice.  <application>PostgreSQL</application>
-   syntax (<literal>"username"</literal>), which SQL does not.  SQL
+   allows identifier syntax (<literal>"username"</literal>), which SQL
-   does not allow this command during a transaction;
+   does not.  SQL does not allow this command during a transaction;
-   <application>PostgreSQL</application> does not make
+   <application>PostgreSQL</application> does not make this
-   this restriction because there is no reason to.  The
+   restriction because there is no reason to.  The privileges
-   privileges necessary to execute this command are left
+   necessary to execute this command are left implementation-defined
-   implementation-defined by the standard.
+   by the standard.
  </para>
 </refsect1>
 </refentry>

--- a/doc/src/sgml/ref/set_transaction.sgml
+++ b/doc/src/sgml/ref/set_transaction.sgml
--- a/doc/src/sgml/ref/show.sgml
+++ b/doc/src/sgml/ref/show.sgml
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml