From 3d83e28b2b3c1fda477256a21e153c99c5611bbd Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Fri, 30 Oct 1998 19:34:40 +0000
Subject: [PATCH] Minor cleanup in markup, especially in the Output section.
---
doc/src/sgml/ref/alter_table.sgml | 15 +------
doc/src/sgml/ref/alter_user.sgml | 16 +-------
doc/src/sgml/ref/begin.sgml | 17 +-------
doc/src/sgml/ref/close.sgml | 17 +-------
doc/src/sgml/ref/cluster.sgml | 12 +-----
doc/src/sgml/ref/commands.sgml | 6 +++
doc/src/sgml/ref/commit.sgml | 15 +------
doc/src/sgml/ref/copy.sgml | 15 +------
doc/src/sgml/ref/create_aggregate.sgml | 15 +------
doc/src/sgml/ref/create_database.sgml | 18 ++-------
doc/src/sgml/ref/create_function.sgml | 15 +------
doc/src/sgml/ref/create_index.sgml | 14 +------
doc/src/sgml/ref/create_language.sgml | 14 -------
doc/src/sgml/ref/create_operator.sgml | 19 ++-------
doc/src/sgml/ref/create_rule.sgml | 16 ++------
doc/src/sgml/ref/create_sequence.sgml | 16 +-------
doc/src/sgml/ref/create_table.sgml | 20 ++-------
doc/src/sgml/ref/create_trigger.sgml | 15 +------
doc/src/sgml/ref/create_type.sgml | 25 +++---------
doc/src/sgml/ref/create_user.sgml | 12 ------
doc/src/sgml/ref/create_view.sgml | 15 +------
doc/src/sgml/ref/createdb.sgml | 2 +
doc/src/sgml/ref/createuser.sgml | 2 +-
doc/src/sgml/ref/current_date.sgml | 41 +++----------------
doc/src/sgml/ref/current_time.sgml | 43 +++-----------------
doc/src/sgml/ref/current_timestamp.sgml | 44 ++++----------------
doc/src/sgml/ref/current_user.sgml | 43 ++++----------------
doc/src/sgml/ref/declare.sgml | 1 -
doc/src/sgml/ref/delete.sgml | 15 +------
doc/src/sgml/ref/destroyuser.sgml | 2 +-
doc/src/sgml/ref/drop_aggregate.sgml | 15 +------
doc/src/sgml/ref/drop_database.sgml | 16 +-------
doc/src/sgml/ref/drop_function.sgml | 16 +-------
doc/src/sgml/ref/drop_index.sgml | 15 +------
doc/src/sgml/ref/drop_language.sgml | 15 +------
doc/src/sgml/ref/drop_operator.sgml | 16 +-------
doc/src/sgml/ref/drop_rule.sgml | 14 -------
doc/src/sgml/ref/drop_sequence.sgml | 15 +------
doc/src/sgml/ref/drop_table.sgml | 14 -------
doc/src/sgml/ref/drop_trigger.sgml | 20 ++-------
doc/src/sgml/ref/drop_type.sgml | 15 +------
doc/src/sgml/ref/drop_user.sgml | 13 +-----
doc/src/sgml/ref/drop_view.sgml | 54 +++++++++----------------
doc/src/sgml/ref/explain.sgml | 8 ----
doc/src/sgml/ref/fetch.sgml | 3 +-
doc/src/sgml/ref/grant.sgml | 37 +++++++++--------
doc/src/sgml/ref/initdb.sgml | 5 ++-
doc/src/sgml/ref/insert.sgml | 9 +----
doc/src/sgml/ref/listen.sgml | 12 ------
doc/src/sgml/ref/load.sgml | 9 -----
doc/src/sgml/ref/lock.sgml | 9 -----
doc/src/sgml/ref/notify.sgml | 15 +------
doc/src/sgml/ref/pg_dump.sgml | 4 +-
doc/src/sgml/ref/psql-ref.sgml | 12 ++++--
doc/src/sgml/ref/reset.sgml | 9 -----
doc/src/sgml/ref/revoke.sgml | 36 ++++++++---------
doc/src/sgml/ref/select.sgml | 22 +++-------
doc/src/sgml/ref/set.sgml | 11 +----
doc/src/sgml/ref/show.sgml | 9 -----
doc/src/sgml/ref/unlisten.sgml | 16 +-------
doc/src/sgml/ref/update.sgml | 2 +-
61 files changed, 168 insertions(+), 818 deletions(-)
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index fe898b0dbe1..c2fb66e6a9a 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -100,13 +100,7 @@ Inputs
Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -137,12 +131,7 @@ Outputs
<LISTITEM>
<PARA>
Message returned if table or column is not available.
-</PARA>
-</LISTITEM>
-</VARLISTENTRY>
-</VARIABLELIST>
-</LISTITEM>
-</VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml
index 674fdcff99b..95a72ce2e46 100644
--- a/doc/src/sgml/ref/alter_user.sgml
+++ b/doc/src/sgml/ref/alter_user.sgml
@@ -92,14 +92,6 @@ ALTER USER <replaceable class="PARAMETER">username</replaceable>
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- <replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -120,13 +112,7 @@ ALTER USER <replaceable class="PARAMETER">username</replaceable>
<PARA>
Error message returned if the user specified doesn't
exist.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
- </para>
- </listitem>
- </varlistentry>
+
</variablelist>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml
index 279ed6db3aa..ab8a0fea2df 100644
--- a/doc/src/sgml/ref/begin.sgml
+++ b/doc/src/sgml/ref/begin.sgml
@@ -41,14 +41,7 @@ BEGIN [ WORK | TRANSACTION ]
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- <replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -68,13 +61,7 @@ BEGIN [ WORK | TRANSACTION ]
<PARA>
This indicates that a transaction was already in progress.
The current transaction is not affected.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </para>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index 4c8c3f2032f..fb9a9598847 100644
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -51,16 +51,6 @@ CLOSE <REPLACEABLE CLASS="PARAMETER">cursor</REPLACEABLE>
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- <replaceable>
- status
- </replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -81,12 +71,7 @@ CLOSE <REPLACEABLE CLASS="PARAMETER">cursor</REPLACEABLE>
This warning is given if
<REPLACEABLE CLASS="PARAMETER">cursor</REPLACEABLE> is not
declared or has already been closed.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml
index b195cb4dc35..050fee754eb 100644
--- a/doc/src/sgml/ref/cluster.sgml
+++ b/doc/src/sgml/ref/cluster.sgml
@@ -62,14 +62,6 @@ CLUSTER <REPLACEABLE CLASS="PARAMETER">indexname</REPLACEABLE> ON <REPLACEABLE C
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -109,9 +101,7 @@ CLUSTER <REPLACEABLE CLASS="PARAMETER">indexname</REPLACEABLE> ON <REPLACEABLE C
</PARA>
</LISTITEM>
</VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
diff --git a/doc/src/sgml/ref/commands.sgml b/doc/src/sgml/ref/commands.sgml
index 812bfeb9153..18830352a16 100644
--- a/doc/src/sgml/ref/commands.sgml
+++ b/doc/src/sgml/ref/commands.sgml
@@ -63,6 +63,10 @@ commands supported by <productname>Postgres</productname>.
</Chapter>
+<!--
+Disable this chapter until we have more functions documented.
+- thomas 1998-10-27
+
<chapter Id="sql-functions">
<title>SQL Functions</title>
@@ -78,6 +82,8 @@ functions supported by <productname>Postgres</productname>.
</chapter>
+-->
+
<chapter Id="utilities">
<title>Utility Applications</title>
diff --git a/doc/src/sgml/ref/commit.sgml b/doc/src/sgml/ref/commit.sgml
index 0ffc07effec..689220993a7 100644
--- a/doc/src/sgml/ref/commit.sgml
+++ b/doc/src/sgml/ref/commit.sgml
@@ -42,13 +42,7 @@ None
Outputs
</TITLE>
<PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -67,12 +61,7 @@ Message returned if the transaction is successfully committed.
<LISTITEM>
<PARA>
If there is no transaction in progress.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 174fd260782..77e652849ee 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -116,13 +116,7 @@ Specifies that output goes to a pipe or terminal.
Outputs
</TITLE>
<PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- <Replaceable>status</Replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -141,12 +135,7 @@ Specifies that output goes to a pipe or terminal.
<LISTITEM>
<PARA>
The copy failed for the reason stated in the error message.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml
index a5b04daa269..273d6087a92 100644
--- a/doc/src/sgml/ref/create_aggregate.sgml
+++ b/doc/src/sgml/ref/create_aggregate.sgml
@@ -163,14 +163,7 @@ The initial value for the second transition function argument.
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -179,12 +172,6 @@ The initial value for the second transition function argument.
<LISTITEM>
<PARA>
Message returned if the command completes successfully.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
- </LISTITEM>
- </VARLISTENTRY>
</VARIABLELIST>
</REFSECT2>
diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index c6fff50184d..77a1a8d2e02 100644
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -65,14 +65,7 @@ CREATE DATABASE <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE> [ WITH LOCATIO
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- <replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -102,13 +95,8 @@ CREATE DATABASE <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE> [ WITH LOCATIO
<LISTITEM>
<PARA>
There was a problem with creating the required directory; this operation will
- need permissions for the <literal>postgres</literal> user on the specified location.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+need permissions for the <literal>postgres</literal> user on the specified location.
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index 96cce89bd9a..e639845a7c5 100644
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -100,14 +100,7 @@ CREATE FUNCTION <replaceable class="parameter">name</replaceable> ( [ <replaceab
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -116,12 +109,6 @@ CREATE FUNCTION <replaceable class="parameter">name</replaceable> ( [ <replaceab
<LISTITEM>
<PARA>
This is returned if the command completes successfully.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index c77226039f3..b5523611566 100644
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -165,13 +165,6 @@ SELECT am.amname AS acc_name,
</TITLE>
<PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -191,12 +184,7 @@ SELECT am.amname AS acc_name,
<LISTITEM>
<PARA>
This error occurs if it is impossible to create the index.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
index 5b2bbaa5a45..7554f7dcae2 100644
--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
@@ -104,14 +104,6 @@ superuser privilege can use
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -133,12 +125,6 @@ superuser privilege can use
This error is returned if the function
<replaceable class="parameter">funcname</replaceable>()
is not found.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
index 5322927fac0..5cb21cda5cc 100644
--- a/doc/src/sgml/ref/create_operator.sgml
+++ b/doc/src/sgml/ref/create_operator.sgml
@@ -18,8 +18,8 @@
<DATE>1998-09-09</DATE>
</REFSYNOPSISDIVINFO>
<SYNOPSIS>
-CREATE OPERATOR <replaceable>name</replaceable>
- ( PROCEDURE = <replaceable class="parameter">func_name</replaceable>
+CREATE OPERATOR <replaceable>name</replaceable> (
+ PROCEDURE = <replaceable class="parameter">func_name</replaceable>
[, LEFTARG = <replaceable class="parameter">type1</replaceable> ]
[, RIGHTARG = <replaceable class="parameter">type2</replaceable> ]
[, COMMUTATOR = <replaceable class="parameter">com_op</replaceable> ]
@@ -155,14 +155,6 @@ Operator to use for sorting.
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -171,12 +163,7 @@ Operator to use for sorting.
<LISTITEM>
<PARA>
Message returned if the operator is successfully created.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index 67215937c2b..132eddf1513 100644
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -102,14 +102,6 @@ CREATE RULE <replaceable class="parameter">name</replaceable>
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -118,11 +110,7 @@ CREATE RULE <replaceable class="parameter">name</replaceable>
<LISTITEM>
<PARA>
Message returned if the rule is successfully created.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
+
</VARLISTENTRY>
</VARIABLELIST>
@@ -204,6 +192,7 @@ Without
of the following two rule definitions are accepted by
<productname>Postgres</productname>, the
retrieve command will cause <productname>Postgres</productname> to crash:
+
<example>
<title>Example of a circular rewrite rule combination.</title>
<programlisting>
@@ -222,6 +211,7 @@ create rule bad_rule_combination_2 is
select * from EMP
</programlisting></para>
</example>
+
</para>
<para>
You must have rule definition access to a class in order
diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index 63644c88ff3..e8fb57f3b4f 100644
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -148,14 +148,7 @@ CREATE SEQUENCE <replaceable class="parameter">seqname</replaceable>
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -204,12 +197,7 @@ CREATE SEQUENCE <replaceable class="parameter">seqname</replaceable>
<LISTITEM>
<PARA>
If the minimum and maximum values are inconsistant.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 4affd2cb26c..b0525ff6ed3 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -163,14 +163,7 @@ requires the <REPLACEABLE CLASS="PARAMETER">column_constraint_clause</REPLACEABL
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- <ReturnValue>status</ReturnValue>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -208,14 +201,7 @@ amcreate: "<replaceable class="parameter">table</replaceable>" relation already
<PARA>
if data type of default value doesn't match the
column definition's data type.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
@@ -1675,13 +1661,13 @@ affect a column or a table.
<REFENTRY ID="SQL-CREATETABLEAS">
<REFMETA>
<REFENTRYTITLE>
- CREATE TABLE
+ CREATE TABLE AS
</REFENTRYTITLE>
<REFMISCINFO>SQL - Language Statements</REFMISCINFO>
</REFMETA>
<REFNAMEDIV>
<REFNAME>
- CREATE TABLE
+ CREATE TABLE AS
</REFNAME>
<REFPURPOSE>
Creates a new table
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index 891cf209fd8..a871a59cce8 100644
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -84,14 +84,6 @@ CREATE TRIGGER <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE> { BEFORE | AFTE
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -100,12 +92,7 @@ CREATE TRIGGER <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE> { BEFORE | AFTE
<LISTITEM>
<PARA>
This message is returned if the trigger is successfully created.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml
index 71858819cfb..1fd0066c52f 100644
--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
@@ -18,12 +18,9 @@
</REFSYNOPSISDIVINFO>
<SYNOPSIS>
CREATE TYPE <replaceable class="parameter">typename</replaceable> (
-<comment>
-Why are parentheses required around the length parameters?
-</comment>
- INPUT = <replaceable class="parameter">input_function</replaceable>
- , OUTPUT = <replaceable class="parameter">output_function</replaceable>
- , INTERNALLENGTH = (<replaceable class="parameter">internallength</replaceable> | VARIABLE)
+ INPUT = <replaceable class="parameter">input_function</replaceable>
+ , OUTPUT = <replaceable class="parameter">output_function</replaceable>
+ , INTERNALLENGTH = (<replaceable class="parameter">internallength</replaceable> | VARIABLE)
[ , EXTERNALLENGTH = (<replaceable class="parameter">externallength</replaceable> | VARIABLE) ]
[ , ELEMENT = <replaceable class="parameter">element</replaceable> ]
[ , DELIMITER = <replaceable class="parameter">delimiter</replaceable> ]
@@ -169,14 +166,7 @@ EXTERNALLENGTH <replaceable class="parameter">externallength</replaceable>
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -185,12 +175,7 @@ EXTERNALLENGTH <replaceable class="parameter">externallength</replaceable>
<LISTITEM>
<PARA>
Message returned if the type is successfully created.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml
index 3744d5ea3ae..2f041e83d94 100644
--- a/doc/src/sgml/ref/create_user.sgml
+++ b/doc/src/sgml/ref/create_user.sgml
@@ -141,13 +141,6 @@ CREATE USER<REPLACEABLE CLASS="PARAMETER"> username</REPLACEABLE>
</TITLE>
<PARA>
</PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -169,11 +162,6 @@ CREATE USER<REPLACEABLE CLASS="PARAMETER"> username</REPLACEABLE>
</PARA>
<comment>I don't understand this and I don't know how to get
this error message.</comment>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml
index 07c3d966398..575e7df1531 100644
--- a/doc/src/sgml/ref/create_view.sgml
+++ b/doc/src/sgml/ref/create_view.sgml
@@ -65,14 +65,6 @@ An SQL query which will provide the columns and rows of the view.
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -112,12 +104,7 @@ An SQL query which will provide the columns and rows of the view.
<programlisting>
CREATE VIEW vista AS SELECT 'Hello World'::text
</programlisting>
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 090f68ccdf0..9f0ce35fd25 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -208,12 +208,14 @@ Usage
<PARA>
To create the database <literal>demo</literal>
using the postmaster on the local host, port 5432:
+
<programlisting>
createdb demo
</programlisting>
To create the database <literal>demo</literal>
using the postmaster on host eden, port 5000:
+
<programlisting>
createdb -p 5000 -h eden demo
</programlisting>
diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index f06b3c025bb..ad51ae5c666 100644
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -213,7 +213,7 @@ and
<envar>PGREALM</envar>
environment variables will be passed on to
<application>psql</application>
-and processed as described in <xref linkend="app-psql" endterm="app-psql">.
+and processed as described in <xref linkend="app-psql" endterm="psql-ref">.
Once invoked, <application>createuser</application>
will ask a series of questions to obtain parameters not specified on
diff --git a/doc/src/sgml/ref/current_date.sgml b/doc/src/sgml/ref/current_date.sgml
index 9c76ebabfc7..7d0e1ec8817 100644
--- a/doc/src/sgml/ref/current_date.sgml
+++ b/doc/src/sgml/ref/current_date.sgml
@@ -7,7 +7,7 @@
</REFMETA>
<REFNAMEDIV>
<REFNAME>
- SQL_CURRENT_DATE
+ CURRENT_DATE
</REFNAME>
<REFPURPOSE>
Returns the current date
@@ -28,27 +28,7 @@ Returns the current date
Inputs
</TITLE>
<PARA>
- </PARA>
-<VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- </TERM>
- <LISTITEM>
- <PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- <ReturnValue>None</ReturnValue>
- </TERM>
- <LISTITEM>
- <PARA>
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
+None.
</REFSECT2>
<REFSECT2 ID="R2-SQL-CURRENT-DATE-2">
@@ -59,26 +39,15 @@ Returns the current date
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
- <ReturnValue>Returns "<replaceable class="parameter">today</replaceable>"</ReturnValue>
+<replaceable>date</replaceable>
+
</TERM>
<LISTITEM>
<PARA>
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+ Returns "<replaceable class="parameter">today</replaceable>".
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/current_time.sgml b/doc/src/sgml/ref/current_time.sgml
index e6b4f21af63..be03cc0bcda 100644
--- a/doc/src/sgml/ref/current_time.sgml
+++ b/doc/src/sgml/ref/current_time.sgml
@@ -7,7 +7,7 @@
</REFMETA>
<REFNAMEDIV>
<REFNAME>
- SQL_CURRENT_TIME
+ CURRENT_TIME
</REFNAME>
<REFPURPOSE>
Returns the current local time
@@ -28,27 +28,7 @@ Returns the current local time
Inputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- </TERM>
- <LISTITEM>
- <PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- <ReturnValue>None</ReturnValue>
- </TERM>
- <LISTITEM>
- <PARA>
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
+None.
</REFSECT2>
@@ -60,26 +40,15 @@ Returns the current local time
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
- <ReturnValue>Returns "<replaceable class="parameter">now</replaceable>"</ReturnValue>
- </TERM>
+ <replaceable>time</replaceable>
+
<LISTITEM>
<PARA>
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
- </LISTITEM>
- </VARLISTENTRY>
+ <ReturnValue>Returns "<replaceable class="parameter">now</replaceable>"</ReturnValue>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/current_timestamp.sgml b/doc/src/sgml/ref/current_timestamp.sgml
index ef68c5fe371..35a84807c10 100644
--- a/doc/src/sgml/ref/current_timestamp.sgml
+++ b/doc/src/sgml/ref/current_timestamp.sgml
@@ -7,7 +7,7 @@
</REFMETA>
<REFNAMEDIV>
<REFNAME>
- SQL_CURRENT_TIMESTAMP
+ CURRENT_TIMESTAMP
</REFNAME>
<REFPURPOSE>
Returns the current date and time
@@ -30,27 +30,8 @@
Inputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- </TERM>
- <LISTITEM>
- <PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- <ReturnValue>None</ReturnValue>
- </TERM>
- <LISTITEM>
- <PARA>
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
+None.
+
</REFSECT2>
<REFSECT2 ID="R2-SQL-CURRENT-TIMESTAMP-2">
@@ -61,26 +42,15 @@
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
- <ReturnValue>Returns "<replaceable class="parameter">today</replaceable>" and "<replaceable class="parameter">now</replaceable>".</ReturnValue>
- </TERM>
+<replaceable>timestamp</replaceable>
+
<LISTITEM>
<PARA>
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
- </LISTITEM>
- </VARLISTENTRY>
+ Returns "<replaceable class="parameter">today</replaceable>" and "<replaceable class="parameter">now</replaceable>".
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/current_user.sgml b/doc/src/sgml/ref/current_user.sgml
index c13951dffdc..a70d7682b27 100644
--- a/doc/src/sgml/ref/current_user.sgml
+++ b/doc/src/sgml/ref/current_user.sgml
@@ -7,7 +7,7 @@
</REFMETA>
<REFNAMEDIV>
<REFNAME>
- SQL_CURRENT_USER
+ CURRENT_USER
</REFNAME>
<REFPURPOSE>
Returns the current user name
@@ -28,27 +28,8 @@
Inputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- </TERM>
- <LISTITEM>
- <PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- <ReturnValue>None</ReturnValue>
- </TERM>
- <LISTITEM>
- <PARA>
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
+
+None.
</REFSECT2>
<REFSECT2 ID="R2-SQL-CURRENT-USER-2">
@@ -59,26 +40,16 @@
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
- <ReturnValue>The name of the current user.</ReturnValue>
+ <replaceable>username</replaceable>
</TERM>
<LISTITEM>
<PARA>
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+The name of the current user.
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml
index b941815b509..954b3b4af03 100644
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -148,7 +148,6 @@ provokes an informational error message.
Outputs
</TITLE>
<PARA>
- </PARA>
<VARIABLELIST>
<VARLISTENTRY>
diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml
index 36c85dcba4b..4a77e02210a 100644
--- a/doc/src/sgml/ref/delete.sgml
+++ b/doc/src/sgml/ref/delete.sgml
@@ -68,14 +68,6 @@
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -90,12 +82,7 @@
<PARA>
If <replaceable class="parameter">count</replaceable> is 0,
no rows were deleted.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/destroyuser.sgml b/doc/src/sgml/ref/destroyuser.sgml
index aeda6a560e0..03bce6e14e7 100644
--- a/doc/src/sgml/ref/destroyuser.sgml
+++ b/doc/src/sgml/ref/destroyuser.sgml
@@ -190,7 +190,7 @@ and
<envar>PGREALM</envar>
environment variables will be passed on to
<application>psql</application>
-and processed as described in <xref linkend="app-psql" endterm="app-psql">.
+and processed as described in <xref linkend="app-psql" endterm="psql-ref">.
<para>
Once invoked, <application>destroyuser</application>
diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml
index b4cdd0a408c..068d69e4924 100644
--- a/doc/src/sgml/ref/drop_aggregate.sgml
+++ b/doc/src/sgml/ref/drop_aggregate.sgml
@@ -65,14 +65,6 @@ DROP AGGREGATE <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE> <REPLACEABLE CL
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -92,12 +84,7 @@ DROP AGGREGATE <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE> <REPLACEABLE CL
<PARA>
This message occurs if the aggregate function specified does not
exist in the database.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_database.sgml b/doc/src/sgml/ref/drop_database.sgml
index 5fe7b48ad5b..d9f42906a25 100644
--- a/doc/src/sgml/ref/drop_database.sgml
+++ b/doc/src/sgml/ref/drop_database.sgml
@@ -51,14 +51,7 @@ DROP DATABASE <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE>
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -87,12 +80,7 @@ DROP DATABASE <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE>
<LISTITEM>
<PARA>
This message occurs if the specified database does not exist.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml
index 54f2b42d56f..9a63ac71e10 100644
--- a/doc/src/sgml/ref/drop_function.sgml
+++ b/doc/src/sgml/ref/drop_function.sgml
@@ -62,14 +62,7 @@ DROP FUNCTION <replaceable class="parameter">name</replaceable> ( [ <replaceable
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -89,12 +82,7 @@ DROP FUNCTION <replaceable class="parameter">name</replaceable> ( [ <replaceable
<PARA>
This message is given if the function specified does not
exist in the current database.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_index.sgml b/doc/src/sgml/ref/drop_index.sgml
index 05559b57610..8e91465a7b9 100644
--- a/doc/src/sgml/ref/drop_index.sgml
+++ b/doc/src/sgml/ref/drop_index.sgml
@@ -51,14 +51,6 @@ DROP INDEX <REPLACEABLE CLASS="PARAMETER">index_name</REPLACEABLE>
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -78,12 +70,7 @@ DROP INDEX <REPLACEABLE CLASS="PARAMETER">index_name</REPLACEABLE>
<PARA>
This message occurs if <REPLACEABLE CLASS="PARAMETER">index_name</REPLACEABLE>
is not an index in the database.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml
index 78a2db5f3b8..4eb3545736f 100644
--- a/doc/src/sgml/ref/drop_language.sgml
+++ b/doc/src/sgml/ref/drop_language.sgml
@@ -51,14 +51,6 @@ DROP PROCEDURAL LANGUAGE '<REPLACEABLE CLASS="PARAMETER">langname</REPLACEABLE>'
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -80,12 +72,7 @@ DROP PROCEDURAL LANGUAGE '<REPLACEABLE CLASS="PARAMETER">langname</REPLACEABLE>'
This message occurs if the language
"<replaceable class="parameter">langname</replaceable>" is
not found.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml
index 48e3e60d025..df488aa5f59 100644
--- a/doc/src/sgml/ref/drop_operator.sgml
+++ b/doc/src/sgml/ref/drop_operator.sgml
@@ -63,14 +63,7 @@ DROP OPERATOR <REPLACEABLE CLASS="PARAMETER">id</REPLACEABLE> ( <REPLACEABLE CLA
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -111,12 +104,7 @@ DROP OPERATOR <REPLACEABLE CLASS="PARAMETER">id</REPLACEABLE> ( <REPLACEABLE CLA
<PARA>
This message occurs if the specified right unary operator
specified does not exist.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml
index 6b543b4d359..f53bd77994e 100644
--- a/doc/src/sgml/ref/drop_rule.sgml
+++ b/doc/src/sgml/ref/drop_rule.sgml
@@ -51,14 +51,6 @@ DROP RULE <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE>
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -77,12 +69,6 @@ DROP RULE <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE>
<LISTITEM>
<PARA>
This message occurs if the specified rule does not exist.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml
index 8288ff08d37..ace32b0850c 100644
--- a/doc/src/sgml/ref/drop_sequence.sgml
+++ b/doc/src/sgml/ref/drop_sequence.sgml
@@ -51,14 +51,7 @@ DROP SEQUENCE <REPLACEABLE CLASS="PARAMETER">seqname</REPLACEABLE> [, ...]
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -77,12 +70,6 @@ DROP SEQUENCE <REPLACEABLE CLASS="PARAMETER">seqname</REPLACEABLE> [, ...]
<LISTITEM>
<PARA>
This message occurs if the specified sequence does not exist.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_table.sgml b/doc/src/sgml/ref/drop_table.sgml
index d8fb78f5f0f..80527cf01a3 100644
--- a/doc/src/sgml/ref/drop_table.sgml
+++ b/doc/src/sgml/ref/drop_table.sgml
@@ -52,14 +52,6 @@ DROP TABLE <REPLACEABLE CLASS="PARAMETER">table</REPLACEABLE> [, ...]
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -78,12 +70,6 @@ DROP TABLE <REPLACEABLE CLASS="PARAMETER">table</REPLACEABLE> [, ...]
<LISTITEM>
<PARA>
If the specified table or view does not exist in the database.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_trigger.sgml b/doc/src/sgml/ref/drop_trigger.sgml
index c4319a35f46..d2729bda824 100644
--- a/doc/src/sgml/ref/drop_trigger.sgml
+++ b/doc/src/sgml/ref/drop_trigger.sgml
@@ -61,15 +61,8 @@ DROP TRIGGER <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE> ON <REPLACEABLE C
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
- <VARIABLELIST>
+
+<VARIABLELIST>
<VARLISTENTRY>
<TERM>
<ReturnValue>DROP</ReturnValue>
@@ -87,13 +80,8 @@ DROP TRIGGER <REPLACEABLE CLASS="PARAMETER">name</REPLACEABLE> ON <REPLACEABLE C
<LISTITEM>
<PARA>
This message occurs if the trigger specified does not exist.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
+
+</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml
index d3a25b0309a..baad378c0db 100644
--- a/doc/src/sgml/ref/drop_type.sgml
+++ b/doc/src/sgml/ref/drop_type.sgml
@@ -51,14 +51,6 @@ DROP TYPE <REPLACEABLE CLASS="PARAMETER">typename</REPLACEABLE>
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -77,12 +69,7 @@ DROP TYPE <REPLACEABLE CLASS="PARAMETER">typename</REPLACEABLE>
<LISTITEM>
<PARA>
This message occurs if the specified type is not found.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_user.sgml b/doc/src/sgml/ref/drop_user.sgml
index 1ab89c284b2..3de3deaa193 100644
--- a/doc/src/sgml/ref/drop_user.sgml
+++ b/doc/src/sgml/ref/drop_user.sgml
@@ -52,14 +52,6 @@ DROP USER <REPLACEABLE CLASS="PARAMETER">username</REPLACEABLE>
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -81,10 +73,7 @@ DROP USER <REPLACEABLE CLASS="PARAMETER">username</REPLACEABLE>
</PARA>
</LISTITEM>
</VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
- </VARIABLELIST>
+ </VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml
index 90a7bf98a69..e49701815ed 100644
--- a/doc/src/sgml/ref/drop_view.sgml
+++ b/doc/src/sgml/ref/drop_view.sgml
@@ -51,42 +51,28 @@ DROP VIEW <REPLACEABLE CLASS="PARAMETER">view</REPLACEABLE>
Outputs
</TITLE>
<PARA>
- </PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
-<replaceable>status</replaceable>
- </TERM>
- <LISTITEM>
- <PARA>
- <VARIABLELIST>
- <VARLISTENTRY>
- <TERM>
- <ReturnValue>DROP</ReturnValue>
- </TERM>
- <LISTITEM>
+
+<VARIABLELIST>
+<VARLISTENTRY>
+<TERM>
+<ReturnValue>DROP</ReturnValue>
+</TERM>
+<LISTITEM>
<PARA>
The message returned if the command is successful.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- <VARLISTENTRY>
- <TERM>
- <ReturnValue>
- ERROR: RewriteGetRuleEventRel: rule "_RET<REPLACEABLE CLASS="PARAMETER">view</REPLACEABLE>" not found</ReturnValue>
- </TERM>
- <LISTITEM>
- <PARA>
- This message occurs if the specified view does not exist in
- the database.
- </PARA>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </LISTITEM>
- </VARLISTENTRY>
- </variablelist>
- </REFSECT2>
+
+<VARLISTENTRY>
+<TERM>
+<ReturnValue>
+ERROR: RewriteGetRuleEventRel: rule "_RET<REPLACEABLE CLASS="PARAMETER">view</REPLACEABLE>" not found</ReturnValue>
+</TERM>
+<LISTITEM>
+<PARA>
+This message occurs if the specified view does not exist in
+the database.
+</variablelist>
+
+</REFSECT2>
</REFSYNOPSISDIV>
<REFSECT1 ID="R1-SQL-DROPVIEW-1">
diff --git a/doc/src/sgml/ref/explain.sgml b/doc/src/sgml/ref/explain.sgml
index 9b2d989964d..6ae69d7abc8 100644
--- a/doc/src/sgml/ref/explain.sgml
+++ b/doc/src/sgml/ref/explain.sgml
@@ -70,13 +70,6 @@ NOTICE: QUERY PLAN:
<PARA>
Explicit query plan from the <productname>Postgres</productname> backend.
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
<VARLISTENTRY>
<TERM>
EXPLAIN
@@ -85,7 +78,6 @@ EXPLAIN
<PARA>
Flag sent after query plan is shown.
-</VARIABLELIST>
</VARIABLELIST>
</REFSECT2>
diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml
index fe2a3718192..10d5df0c6d7 100644
--- a/doc/src/sgml/ref/fetch.sgml
+++ b/doc/src/sgml/ref/fetch.sgml
@@ -19,7 +19,8 @@ Gets rows using a cursor
<SYNOPSIS>
FETCH [ <REPLACEABLE CLASS="PARAMETER">selector</REPLACEABLE> ] [ <REPLACEABLE CLASS="PARAMETER">count</REPLACEABLE> ]
{ IN | FROM } <REPLACEABLE CLASS="PARAMETER">cursor</REPLACEABLE>
-FETCH [ RELATIVE ] [ { [ <REPLACEABLE CLASS="PARAMETER">#</REPLACEABLE> | ALL | NEXT | PRIOR ] } ] FROM ] <REPLACEABLE CLASS="PARAMETER">cursor</REPLACEABLE>
+FETCH [ RELATIVE ] [ { [ <REPLACEABLE CLASS="PARAMETER">#</REPLACEABLE> | ALL | NEXT | PRIOR ] } ]
+ FROM ] <REPLACEABLE CLASS="PARAMETER">cursor</REPLACEABLE>
</SYNOPSIS>
<REFSECT2 ID="R2-SQL-FETCH-1">
diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml
index ce517dbac6d..aefb6251b89 100644
--- a/doc/src/sgml/ref/grant.sgml
+++ b/doc/src/sgml/ref/grant.sgml
@@ -104,16 +104,24 @@ Grant all privileges.
<PARA>
The name of an object to which to grant access.
The possible objects are:
-<simplelist>
-<member>
- table
-<member>
- view
-<member>
- sequence
-<member>
- index
-</simplelist>
+
+<itemizedlist mark="bullet" spacing="compact">
+<listitem>
+<para>
+table
+
+<listitem>
+<para>
+view
+
+<listitem>
+<para>
+sequence
+
+<listitem>
+<para>
+index
+</itemizedlist>
<VARLISTENTRY>
<TERM>
@@ -154,14 +162,6 @@ Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
-
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -183,7 +183,6 @@ if it is impossible
to give privileges to the specified group or users.
</VARIABLELIST>
-</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index dbbed5958e9..ccfcd4bb81c 100644
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -93,8 +93,9 @@ Or just let it default to you (the Unix user who runs
<note>
<para>
-Only the Unix superuser can create a database system with a
-different user as <productname>Postgres</productname> superuser.
+Only the Unix superuser (<literal>root</literal>)
+ can create a database system with an owner
+different from the <productname>Postgres</productname> superuser.
</note>
</variablelist>
diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml
index 7b32f58bd49..2d90cc65fe0 100644
--- a/doc/src/sgml/ref/insert.sgml
+++ b/doc/src/sgml/ref/insert.sgml
@@ -76,13 +76,7 @@ A valid query. Refer to the SELECT statement for a further description
Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -105,7 +99,6 @@ Message returned if more than one rows were inserted.
is the number of rows inserted.
</VARIABLELIST>
-</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/listen.sgml b/doc/src/sgml/ref/listen.sgml
index 97cb349a890..c9ef49ab980 100644
--- a/doc/src/sgml/ref/listen.sgml
+++ b/doc/src/sgml/ref/listen.sgml
@@ -52,13 +52,6 @@ Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -78,11 +71,6 @@ Message returned upon successful completion of registration.
<PARA>
If this backend is already registered for that notify condition.
</PARA>
-</LISTITEM>
-</VARLISTENTRY>
-</variablelist>
-</LISTITEM>
-</VARLISTENTRY>
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/load.sgml b/doc/src/sgml/ref/load.sgml
index 6614e732451..66fafdc887a 100644
--- a/doc/src/sgml/ref/load.sgml
+++ b/doc/src/sgml/ref/load.sgml
@@ -54,14 +54,6 @@ Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
-
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -81,7 +73,6 @@ Message returned if the specified file is not found. The file must be visible
<emphasis>to the <productname>Postgres</productname> backend</emphasis>,
with the appropriate full path name specified, to avoid this message.
-</VARIABLELIST>
</VARIABLELIST>
</REFSECT2>
diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml
index e4f8c1bb1e9..ca973654104 100644
--- a/doc/src/sgml/ref/lock.sgml
+++ b/doc/src/sgml/ref/lock.sgml
@@ -51,14 +51,6 @@ Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
-
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -81,7 +73,6 @@ Message returned if <REPLACEABLE CLASS="PARAMETER">table</REPLACEABLE>
does not exist.
</VARIABLELIST>
-</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/notify.sgml b/doc/src/sgml/ref/notify.sgml
index 414b951f93d..73eb7754268 100644
--- a/doc/src/sgml/ref/notify.sgml
+++ b/doc/src/sgml/ref/notify.sgml
@@ -54,14 +54,6 @@ Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
-
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -70,12 +62,7 @@ NOTIFY
<LISTITEM>
<PARA>
Acknowledgement that notify command has executed.
-</PARA>
-</LISTITEM>
-</VARLISTENTRY>
-</variablelist>
-</LISTITEM>
-</VARLISTENTRY>
+
<VARLISTENTRY>
<TERM>
Notify events
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 3909f651d2d..2a4f59cba88 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,12 +1,12 @@
<REFENTRY ID="APP-PG-DUMP">
<REFMETA>
-<REFENTRYTITLE>
+<REFENTRYTITLE id="pg-dump">
<application>pg_dump</application>
</REFENTRYTITLE>
<REFMISCINFO>Application</REFMISCINFO>
</REFMETA>
<REFNAMEDIV>
-<REFNAME id="pg-dump">
+<REFNAME>
<application>pg_dump</application>
</REFNAME>
<REFPURPOSE>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index a1cf38cb732..2a71416abed 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,12 +1,12 @@
<REFENTRY ID="APP-PSQL">
<REFMETA>
-<REFENTRYTITLE>
+<REFENTRYTITLE id="psql-ref">
<application>psql</application>
</REFENTRYTITLE>
<REFMISCINFO>Application</REFMISCINFO>
</REFMETA>
<REFNAMEDIV>
-<REFNAME id="psql-ref">
+<REFNAME>
<application>psql</application>
</REFNAME>
<REFPURPOSE>
@@ -68,7 +68,7 @@ A single query to run. <application>psql</application> will exit on completion.
</variablelist>
<para>
-The full set of command-line arguments and meta-commands are described in a following
+The full set of command-line arguments and meta-commands are described in a subsequent
section.
<para>
@@ -106,6 +106,8 @@ to be used, rather than the default local Unix domain sockets.
</TERM>
<LISTITEM>
<PARA>
+The port number on which a <productname>Postgres</productname> server is listening.
+Defaults to <literal>5432</literal>.
</PARA>
</LISTITEM>
</VARLISTENTRY>
@@ -116,6 +118,8 @@ to be used, rather than the default local Unix domain sockets.
</TERM>
<LISTITEM>
<PARA>
+The target for display of messages from the client support library.
+Not required.
</PARA>
</LISTITEM>
</VARLISTENTRY>
@@ -128,7 +132,7 @@ to be used, rather than the default local Unix domain sockets.
<PARA>
If <envar>PGOPTION</envar>
is specified, then the options it contains are parsed
-.BR before
+<emphasis>before</emphasis>
any command-line options.
</PARA>
</LISTITEM>
diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml
index fbd5313717c..a1292d3f64a 100644
--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
@@ -52,14 +52,6 @@ Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
-
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -71,7 +63,6 @@ RESET VARIABLE
<REPLACEABLE CLASS="PARAMETER">variable</REPLACEABLE> is successfully reset
to its default value..
-</VARIABLELIST>
</VARIABLELIST>
</REFSECT2>
diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml
index fcedc85d313..abbd2439d8e 100644
--- a/doc/src/sgml/ref/revoke.sgml
+++ b/doc/src/sgml/ref/revoke.sgml
@@ -109,16 +109,23 @@ Rescind all privileges.
<PARA>
The name of an object from which to revoke access.
The possible objects are:
-<simplelist>
-<member>
- table
-<member>
- view
-<member>
- sequence
-<member>
- index
-</simplelist>
+<itemizedlist mark="bullet" spacing="compact">
+<listitem>
+<para>
+table
+
+<listitem>
+<para>
+view
+
+<listitem>
+<para>
+sequence
+
+<listitem>
+<para>
+index
+</itemizedlist>
<VARLISTENTRY>
<TERM>
@@ -166,14 +173,6 @@ Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
-
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -193,7 +192,6 @@ ERROR
to revoke privileges from a group or users.
</VARIABLELIST>
-</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index 491f7a16ae8..a1b0ec4fe33 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -1,13 +1,13 @@
<refentry id="SQL-SELECT">
<refmeta>
<refentrytitle>
- SELECT
+SELECT
</refentrytitle>
<refmiscinfo>SQL - Language Statements</refmiscinfo>
</refmeta>
<refnamediv>
<refname>
- SELECT
+SELECT
</refname>
<refpurpose>
Retrieve rows from a table or view.
@@ -170,14 +170,6 @@ SELECT [ALL|DISTINCT [ON <replaceable class="PARAMETER">column</replaceable>] ]
</listitem>
</varlistentry>
- <varlistentry>
- <term>
- <replaceable>status</replaceable>
- </term>
- <listitem>
- <para>
-
- <variablelist>
<varlistentry>
<term>
<returnvalue><replaceable>count</replaceable></returnvalue>
@@ -185,10 +177,6 @@ SELECT [ALL|DISTINCT [ON <replaceable class="PARAMETER">column</replaceable>] ]
<listitem>
<para>
The count of rows returned by the query.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
</variablelist>
</refsect2>
@@ -569,16 +557,16 @@ SELECT actors.name
<refentry id="SQL-SELECTINTO">
<refmeta>
<refentrytitle>
- SELECT INTO
+SELECT INTO
</refentrytitle>
<refmiscinfo>SQL - Language Statements</refmiscinfo>
</refmeta>
<refnamediv>
<refname>
- SELECT INTO
+SELECT INTO
</refname>
<refpurpose>
- Create a new table from an existing table or view
+Create a new table from an existing table or view
</refpurpose></refnamediv>
<refsynopsisdiv>
<refsynopsisdivinfo>
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index d187d46bb8a..3328d73341e 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -470,14 +470,6 @@ Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
-
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -494,8 +486,7 @@ Outputs
<LISTITEM>
<PARA>
If the command fails to set variable.
-</VARLISTENTRY>
-</VARIABLELIST>
+
</VARIABLELIST>
</REFSECT2>
diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml
index 4bbc18e9d52..36d605eacc9 100644
--- a/doc/src/sgml/ref/show.sgml
+++ b/doc/src/sgml/ref/show.sgml
@@ -52,14 +52,6 @@ Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<REPLACEABLE>status</REPLACEABLE>
-</TERM>
-<LISTITEM>
-<PARA>
-
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -92,7 +84,6 @@ SHOW VARIABLE
If the TZ environment variable is not set.
</VARIABLELIST>
-</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
diff --git a/doc/src/sgml/ref/unlisten.sgml b/doc/src/sgml/ref/unlisten.sgml
index cc187576751..46ed06c9033 100644
--- a/doc/src/sgml/ref/unlisten.sgml
+++ b/doc/src/sgml/ref/unlisten.sgml
@@ -60,13 +60,6 @@ Outputs
</TITLE>
<PARA>
-<VARIABLELIST>
-<VARLISTENTRY>
-<TERM>
-<replaceable>status</replaceable>
-</TERM>
-<LISTITEM>
-<PARA>
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
@@ -75,12 +68,7 @@ Outputs
<LISTITEM>
<PARA>
Acknowledgement that statement has executed.
-</PARA>
-</LISTITEM>
-</VARLISTENTRY>
-</variablelist>
-</LISTITEM>
-</VARLISTENTRY>
+
</VARIABLELIST>
</REFSECT2>
</REFSYNOPSISDIV>
@@ -102,7 +90,7 @@ The special condition wildcard "*" cancels all listener registrations
for the current session.
<para>
-<xref linkend="sql-notify-ref" endterm="sql-notify-ref">
+<xref linkend="sql-notify" endterm="sql-notify-ref">
contains a more extensive
discussion of the use of <command>LISTEN</command> and
<command>NOTIFY</command>.
diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml
index 3de2b83f6de..a02e022329f 100644
--- a/doc/src/sgml/ref/update.sgml
+++ b/doc/src/sgml/ref/update.sgml
@@ -92,7 +92,7 @@ The name of a column in <REPLACEABLE CLASS="PARAMETER">table</replaceable>.
Outputs
</TITLE>
<PARA>
-</PARA>
+
<VARIABLELIST>
<VARLISTENTRY>
<TERM>
--
GitLab