database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-21 05:21:08 +03:00
Code Activity

Add more appropriate markup.

Browse Source
This commit is contained in:
Peter Eisentraut
2002-09-21 18:32:54 +00:00
parent 7233aae50b
commit bc49968764
77 changed files with 1481 additions and 1347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/sgml/ref/alter_table.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.49 2002/08/15 02:59:18 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.50 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -249,7 +249,7 @@ ALTER TABLE <replaceable class="PARAMETER">table</replaceable>
<para>
These forms change whether a column is marked to allow NULL
values or to reject NULL values. You may only <literal>SET NOT NULL</>
when the table contains no NULLs in the column.
when the table contains no null values in the column.
</para>
</listitem>
</varlistentry>
@@ -279,7 +279,7 @@ ALTER TABLE <replaceable class="PARAMETER">table</replaceable>
compressible data. <literal>EXTERNAL</literal> is for external,
uncompressed data and <literal>EXTENDED</literal> is for external,
compressed data. <literal>EXTENDED</literal> is the default for all
datatypes that support it. The use of <literal>EXTERNAL</literal> will
data types that support it. The use of <literal>EXTERNAL</literal> will
make substring operations on a TEXT column faster, at the penalty of
increased storage space.
</para>

4
doc/src/sgml/ref/alter_user.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.22 2002/05/17 01:19:16 tgl Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.23 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -226,7 +226,7 @@ ALTER USER manuel VALID UNTIL 'Jan 31 2030';
<para>
Change a user's valid until date, specifying that his
authorization should expire at midday on 4th May 1998 using
the time zone which is one hour ahead of UTC:
the time zone which is one hour ahead of <acronym>UTC</>:
<programlisting>
ALTER USER chris VALID UNTIL 'May 4 12:00:00 1998 +1';
</programlisting>

4
doc/src/sgml/ref/begin.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/begin.sgml,v 1.19 2002/08/30 22:45:25 tgl Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/begin.sgml,v 1.20 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -125,7 +125,7 @@ WARNING: BEGIN: already a transaction in progress
Guide</citetitle> for details.)
In SERIALIZABLE mode queries will see only changes committed before
the entire
transaction began (actually, before execution of the first DML statement
transaction began (actually, before execution of the first <acronym>DML</> statement
in the transaction).
</para>

4
doc/src/sgml/ref/cluster.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/cluster.sgml,v 1.19 2002/08/11 02:43:57 tgl Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/cluster.sgml,v 1.20 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -169,7 +169,7 @@ SELECT <replaceable class="parameter">columnlist</replaceable> INTO TABLE <repla
which uses the <productname>PostgreSQL</productname> sorting code in
the ORDER BY clause to create the desired order; this is usually much
faster than an indexscan for
faster than an index scan for
unordered data. You then drop the old table, use
<command>ALTER TABLE...RENAME</command>
to rename <replaceable class="parameter">newtable</replaceable> to the old name, and

38
doc/src/sgml/ref/clusterdb.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.3 2002/09/05 22:05:50 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.4 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -71,8 +71,8 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-d <replaceable class="parameter">dbname</replaceable></term>
<term>--dbname <replaceable class="parameter">dbname</replaceable></term>
<term><option>-d <replaceable class="parameter">dbname</replaceable></></term>
<term><option>--dbname <replaceable class="parameter">dbname</replaceable></></term>
<listitem>
<para>
Specifies the name of the database to be clustered.
@@ -86,8 +86,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-a</term>
<term>--all</term>
<term><option>-a</></term>
<term><option>--all</></term>
<listitem>
<para>
Cluster all databases.
@@ -96,8 +96,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-t <replaceable class="parameter">table</replaceable></term>
<term>--table <replaceable class="parameter">table</replaceable></term>
<term><option>-t <replaceable class="parameter">table</replaceable></></term>
<term><option>--table <replaceable class="parameter">table</replaceable></></term>
<listitem>
<para>
Clusters <replaceable class="parameter">table</replaceable> only.
@@ -114,8 +114,8 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-h <replaceable class="parameter">host</replaceable></term>
<term>--host <replaceable class="parameter">host</replaceable></term>
<term><option>-h <replaceable class="parameter">host</replaceable></></term>
<term><option>--host <replaceable class="parameter">host</replaceable></></term>
<listitem>
<para>
Specifies the host name of the machine on which the
@@ -127,8 +127,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-p <replaceable class="parameter">port</replaceable></term>
<term>--port <replaceable class="parameter">port</replaceable></term>
<term><option>-p <replaceable class="parameter">port</replaceable></></term>
<term><option>--port <replaceable class="parameter">port</replaceable></></term>
<listitem>
<para>
Specifies the Internet TCP/IP port or local Unix domain socket file
@@ -139,8 +139,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-U <replaceable class="parameter">username</replaceable></term>
<term>--username <replaceable class="parameter">username</replaceable></term>
<term><option>-U <replaceable class="parameter">username</replaceable></></term>
<term><option>--username <replaceable class="parameter">username</replaceable></></term>
<listitem>
<para>
User name to connect as
@@ -149,8 +149,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-W</term>
<term>--password</term>
<term><option>-W</></term>
<term><option>--password</></term>
<listitem>
<para>
Force password prompt.
@@ -159,8 +159,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-e</term>
<term>--echo</term>
<term><option>-e</></term>
<term><option>--echo</></term>
<listitem>
<para>
Echo the commands that <application>clusterdb</application> generates
@@ -170,8 +170,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-q</term>
<term>--quiet</term>
<term><option>-q</></term>
<term><option>--quiet</></term>
<listitem>
<para>
Do not display a response.

20
doc/src/sgml/ref/copy.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.39 2002/08/30 16:00:41 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.40 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -477,7 +477,7 @@ order is detected here.
<listitem>
<para>
int32 bit mask to denote important aspects of the file format. Bits are
numbered from 0 (LSB) to 31 (MSB) --- note that this field is stored
numbered from 0 (<acronym>LSB</>) to 31 (<acronym>MSB</>) --- note that this field is stored
with source's endianness, as are all subsequent integer fields. Bits
16-31 are reserved to denote critical file format issues; a reader
should abort if it finds an unexpected bit set in this range. Bits 0-15
@@ -539,8 +539,8 @@ is left for a later release.
Each tuple begins with an int16 count of the number of fields in the
tuple. (Presently, all tuples in a table will have the same count, but
that might not always be true.) Then, repeated for each field in the
tuple, there is an int16 typlen word possibly followed by field data.
The typlen field is interpreted thus:
tuple, there is an int16 <structfield>typlen</> word possibly followed by field data.
The <structfield>typlen</> field is interpreted thus:
<variablelist>
<varlistentry>
@@ -557,7 +557,7 @@ The typlen field is interpreted thus:
<listitem>
<para>
Field is a fixed-length data type. Exactly N
bytes of data follow the typlen word.
bytes of data follow the <structfield>typlen</> word.
</para>
</listitem>
</varlistentry>
@@ -566,8 +566,8 @@ The typlen field is interpreted thus:
<term>-1</term>
<listitem>
<para>
Field is a varlena data type. The next four
bytes are the varlena header, which contains
Field is a <literal>varlena</> data type. The next four
bytes are the <literal>varlena</> header, which contains
the total value length including itself.
</para>
</listitem>
@@ -585,8 +585,8 @@ The typlen field is interpreted thus:
</para>
<para>
For non-NULL fields, the reader can check that the typlen matches the
expected typlen for the destination column. This provides a simple
For non-NULL fields, the reader can check that the <structfield>typlen</> matches the
expected <structfield>typlen</> for the destination column. This provides a simple
but very useful check that the data is as expected.
</para>
@@ -602,7 +602,7 @@ you from moving a binary file across machines).
<para>
If OIDs are included in the dump, the OID field immediately follows the
field-count word. It is a normal field except that it's not included
in the field-count. In particular it has a typlen --- this will allow
in the field-count. In particular it has a <structfield>typlen</> --- this will allow
handling of 4-byte vs 8-byte OIDs without too much pain, and will allow
OIDs to be shown as NULL if that ever proves desirable.
</para>

4
doc/src/sgml/ref/create_aggregate.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.20 2002/05/18 15:44:47 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.21 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -233,7 +233,7 @@ CREATE AGGREGATE
If the state transition function is not strict, then it will be called
unconditionally at each input value, and must deal with NULL inputs
and NULL transition values for itself. This allows the aggregate
author to have full control over the aggregate's handling of NULLs.
author to have full control over the aggregate's handling of null values.
</para>
<para>

4
doc/src/sgml/ref/create_conversion.sgml
View File

@@ -1,4 +1,4 @@
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.3 2002/08/22 00:01:40 tgl Exp $ -->
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.4 2002/09/21 18:32:54 petere Exp $ -->
<refentry id="SQL-CREATECONVERSION">
<refmeta>
@@ -139,7 +139,7 @@ CREATE [DEFAULT] CONVERSION <replaceable>conversion_name</replaceable>
<title>Examples</title>
<para>
To create a conversion from encoding UNICODE to LATIN1 using myfunc:
To create a conversion from encoding UNICODE to LATIN1 using <function>myfunc</>:
<programlisting>
CREATE CONVERSION myconv FOR 'UNICODE' TO 'LATIN1' FROM myfunc;
</programlisting>

6
doc/src/sgml/ref/create_database.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.28 2002/06/17 05:40:32 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.29 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -114,7 +114,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
<term><computeroutput>ERROR: user '<replaceable class="parameter">username</replaceable>' is not allowed to create/drop databases</computeroutput></term>
<listitem>
<para>
You must have the special CREATEDB privilege to create databases.
You must have the special <literal>CREATEDB</> privilege to create databases.
See <xref linkend="SQL-CREATEUSER" endterm="SQL-CREATEUSER-title">.
</para>
</listitem>
@@ -186,7 +186,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
Normally, the creator becomes the owner of the new database.
Superusers can create databases owned by other users using the
<option>OWNER</> clause. They can even create databases owned by
users with no special privileges. Non-superusers with CREATEDB
users with no special privileges. Non-superusers with <literal>CREATEDB</>
privilege can only create databases owned by themselves.
</para>

10
doc/src/sgml/ref/create_function.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_function.sgml,v 1.42 2002/08/22 00:01:40 tgl Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_function.sgml,v 1.43 2002/09/21 18:32:54 petere Exp $
-->
<refentry id="SQL-CREATEFUNCTION">
@@ -77,7 +77,7 @@ CREATE [ OR REPLACE ] FUNCTION <replaceable class="parameter">name</replaceable>
Depending on the implementation language it may also be allowed
to specify <quote>pseudo-types</> such as <type>cstring</>.
Pseudo-types indicate that the actual argument type is either
incompletely specified, or outside the set of ordinary SQL datatypes.
incompletely specified, or outside the set of ordinary SQL data types.
</para>
</listitem>
</varlistentry>
@@ -171,7 +171,7 @@ CREATE [ OR REPLACE ] FUNCTION <replaceable class="parameter">name</replaceable>
<literal>CALLED ON NULL INPUT</literal> (the default) indicates
that the function will be called normally when some of its
arguments are null. It is then the function author's
responsibility to check for NULLs if necessary and respond
responsibility to check for null values if necessary and respond
appropriately.
</para>
@@ -247,7 +247,7 @@ CREATE [ OR REPLACE ] FUNCTION <replaceable class="parameter">name</replaceable>
<variablelist>
<varlistentry>
<term>isStrict</term>
<term><literal>isStrict</></term>
<listitem>
<para>
Equivalent to <literal>STRICT</literal> or <literal>RETURNS NULL ON NULL INPUT</literal>
@@ -256,7 +256,7 @@ CREATE [ OR REPLACE ] FUNCTION <replaceable class="parameter">name</replaceable>
</varlistentry>
<varlistentry>
<term>isCachable</term>
<term><literal>isCachable</></term>
<listitem>
<para>
<literal>isCachable</literal> is an obsolete equivalent of

6
doc/src/sgml/ref/create_index.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.36 2002/08/13 20:40:43 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.37 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -266,7 +266,7 @@ ERROR: Cannot create index: 'index_name' already exists.
<para>
The expression used in the <command>WHERE</command> clause may refer
only to columns of the underlying table (but it can use all columns,
not only the one(s) being indexed). Presently, sub-SELECTs and
not only the one(s) being indexed). Presently, subqueries and
aggregate expressions are also forbidden in <command>WHERE</command>.
</para>
@@ -331,7 +331,7 @@ ERROR: Cannot create index: 'index_name' already exists.
</para>
<para>
Testing has shown PostgreSQL's hash indexes to be similar or slower
than btree indexes, and the index size and build time for hash
than B-tree indexes, and the index size and build time for hash
indexes is much worse. Hash indexes also suffer poor performance
under high concurrency. For these reasons, hash index use is
discouraged.

28
doc/src/sgml/ref/create_opclass.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.2 2002/08/22 00:01:40 tgl Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.3 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -52,8 +52,8 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
<listitem>
<para>
If present, the operator class will become the default index
operator class for its datatype. At most one operator class
can be the default for a specific datatype and access method.
operator class for its data type. At most one operator class
can be the default for a specific data type and access method.
</para>
</listitem>
</varlistentry>
@@ -61,7 +61,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
<term><replaceable class="parameter">data_type</replaceable></term>
<listitem>
<para>
The column datatype that this operator class is for.
The column data type that this operator class is for.
</para>
</listitem>
</varlistentry>
@@ -95,10 +95,10 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
<term><replaceable class="parameter">type</replaceable></term>
<listitem>
<para>
The input datatype(s) of an operator, or <literal>NONE</> to
signify a left-unary or right-unary operator. The input datatypes
The input data type(s) of an operator, or <literal>NONE</> to
signify a left-unary or right-unary operator. The input data types
may be omitted in the normal case where they are the same as the
operator class's datatype.
operator class's data type.
</para>
</listitem>
</varlistentry>
@@ -135,7 +135,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
<term><replaceable class="parameter">parameter_types</replaceable></term>
<listitem>
<para>
The parameter datatype(s) of the function.
The parameter data type(s) of the function.
</para>
</listitem>
</varlistentry>
@@ -143,8 +143,8 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
<term><replaceable class="parameter">storage_type</replaceable></term>
<listitem>
<para>
The datatype actually stored in the index. Normally this is the
same as the column datatype, but some index access methods (only
The data type actually stored in the index. Normally this is the
same as the column data type, but some index access methods (only
GIST at this writing) allow it to be different. The
<literal>STORAGE</> clause must be omitted unless the index access
method allows a different type to be used.
@@ -191,9 +191,9 @@ CREATE OPERATOR CLASS
<replaceable class="parameter">name</replaceable>.
</para>
<para>
An operator class defines how a particular datatype can be used with
An operator class defines how a particular data type can be used with
an index. The operator class specifies that certain operators will fill
particular roles or <quote>strategies</> for this datatype and this
particular roles or <quote>strategies</> for this data type and this
access method. The operator class also specifies the support procedures to
be used by
the index access method when the operator class is selected for an
@@ -210,7 +210,7 @@ CREATE OPERATOR CLASS
</para>
<para>
The user who defines an operator class becomes its owner. The user
must own the datatype for which the operator class is being defined,
must own the data type for which the operator class is being defined,
and must have execute permission for all referenced operators and functions.
</para>
@@ -248,7 +248,7 @@ CREATE OPERATOR CLASS
</title>
<para>
The following example command defines a GiST index operator class
for datatype <literal>_int4</> (array of int4). See
for data type <literal>_int4</> (array of int4). See
<filename>contrib/intarray/</> for the complete example.
</para>

89
doc/src/sgml/ref/create_operator.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.31 2002/08/23 02:54:18 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.32 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -268,10 +268,10 @@ CREATE OPERATOR
are always equivalent.
</para>
<para>
At least one of LEFTARG and RIGHTARG must be defined. For
At least one of <literal>LEFTARG</> and <literal>RIGHTARG</> must be defined. For
binary operators, both should be defined. For right unary
operators, only LEFTARG should be defined, while for left
unary operators only RIGHTARG should be defined.
operators, only <literal>LEFTARG</> should be defined, while for left
unary operators only <literal>RIGHTARG</> should be defined.
</para>
<para>
The
@@ -335,39 +335,43 @@ MYBOXES.description !== box '((0,0), (1,1))'
it also works to just have both operators refer to each other.)
</para>
<para>
The HASHES, MERGES, SORT1, SORT2, LTCMP, and GTCMP options are present to
support the query optimizer in performing joins.
<productname>PostgreSQL</productname> can always evaluate a join (i.e.,
processing a clause with two tuple variables separated by an operator that
returns a <type>boolean</type>) by iterative substitution [WONG76]. In
addition, <productname>PostgreSQL</productname> can use a hash-join
algorithm along the lines of [SHAP86]; however, it must know whether this
strategy is applicable. The current hash-join algorithm is only correct
for operators that represent equality tests; furthermore, equality of the
data type must mean bitwise equality of the representation of the type.
(For example, a data type that contains unused bits that don't matter for
equality tests could not be hash-joined.) The HASHES flag indicates to the
query optimizer that a hash join may safely be used with this
operator.
The <literal>HASHES</>, <literal>MERGES</>, <literal>SORT1</>,
<literal>SORT2</>, <literal>LTCMP</>, and <literal>GTCMP</> options
are present to support the query optimizer in performing joins.
<productname>PostgreSQL</productname> can always evaluate a join
(i.e., processing a clause with two tuple variables separated by an
operator that returns a <type>boolean</type>) by iterative
substitution <!--[WONG76]-->. In addition,
<productname>PostgreSQL</productname> can use a hash-join algorithm
<!--along the lines of [SHAP86]-->; however, it must know whether this
strategy is applicable. The current hash-join algorithm is only
correct for operators that represent equality tests; furthermore,
equality of the data type must mean bitwise equality of the
representation of the type. (For example, a data type that
contains unused bits that don't matter for equality tests could not
be hash-joined.) The <literal>HASHES</> flag indicates to the query optimizer
that a hash join may safely be used with this operator.
</para>
<para>
Similarly, the MERGES flag indicates whether merge-sort is a usable join
strategy for this operator. A merge join requires that the two input
datatypes have consistent orderings, and that the mergejoin operator
behave like equality with respect to that ordering. For example, it is
possible to merge-join equality between an integer and a float variable by
sorting both inputs in ordinary
numeric order. Execution of a merge join requires that the system be
able to identify four operators related to the mergejoin equality operator:
less-than comparison for the left input datatype,
less-than comparison for the right input datatype,
less-than comparison between the two datatypes, and
greater-than comparison between the two datatypes. It is possible to
specify these by name, as the SORT1, SORT2, LTCMP, and GTCMP options
respectively. The system will fill in the default names <literal>&lt;</>,
<literal>&lt;</>, <literal>&lt;</>, <literal>&gt;</> respectively if
any of these are omitted when MERGES is specified. Also, MERGES will
be assumed to be implied if any of these four operator options appear.
Similarly, the <literal>MERGES</> flag indicates whether merge-sort
is a usable join strategy for this operator. A merge join requires
that the two input data types have consistent orderings, and that
the merge-join operator behave like equality with respect to that
ordering. For example, it is possible to merge-join equality
between an integer and a float variable by sorting both inputs in
ordinary numeric order. Execution of a merge join requires that
the system be able to identify four operators related to the
merge-join equality operator: less-than comparison for the left
input data type, less-than comparison for the right input data
type, less-than comparison between the two data types, and
greater-than comparison between the two data types. It is possible
to specify these by name, as the <literal>SORT1</>,
<literal>SORT2</>, <literal>LTCMP</>, and <literal>GTCMP</> options
respectively. The system will fill in the default names
<literal>&lt;</>, <literal>&lt;</>, <literal>&lt;</>,
<literal>&gt;</> respectively if any of these are omitted when
<literal>MERGES</> is specified. Also, <literal>MERGES</> will be
assumed to be implied if any of these four operator options appear.
</para>
<para>
If other join strategies are found to be practical,
@@ -380,14 +384,15 @@ MYBOXES.description !== box '((0,0), (1,1))'
be worth the complexity involved.
</para>
<para>
The RESTRICT and JOIN options assist the query optimizer in estimating
result sizes. If a clause of the form:
<programlisting>
MYBOXES.description &lt;&lt;&lt; box '((0,0), (1,1))'
</programlisting>
The <literal>RESTRICT</> and <literal>JOIN</> options assist the
query optimizer in estimating result sizes. If a clause of the
form:
<programlisting>
myboxes.description &lt;&lt;&lt; box '((0,0), (1,1))'
</programlisting>
is present in the qualification,
then <productname>PostgreSQL</productname> may have to
estimate the fraction of the instances in MYBOXES that
estimate the fraction of the instances in <literal>myboxes</> that
satisfy the clause. The function
<replaceable class="parameter">res_proc</replaceable>
must be a registered function (meaning it is already defined using
@@ -400,7 +405,7 @@ MYBOXES.description &lt;&lt;&lt; box '((0,0), (1,1))'
<para>
Similarly, when the operands of the operator both contain
instance variables, the query optimizer must estimate the
size of the resulting join. The function join_proc will
size of the resulting join. The function <function>join_proc</> will
return another floating-point number which will be multiplied
by the cardinalities of the two tables involved to
compute the expected result size.

6
doc/src/sgml/ref/create_schema.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_schema.sgml,v 1.2 2002/05/18 15:44:47 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_schema.sgml,v 1.3 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -33,7 +33,7 @@ CREATE SCHEMA AUTHORIZATION <replaceable class="parameter">username</replaceable
<term><replaceable class="parameter">schemaname</replaceable></term>
<listitem>
<para>
The name of a schema to be created. If this is omitted, the username
The name of a schema to be created. If this is omitted, the user name
is used as the schema name.
</para>
</listitem>
@@ -111,7 +111,7 @@ ERROR: namespace "<replaceable class="parameter">schemaname</replaceable>" alre
<para>
A schema is essentially a namespace:
it contains named objects (tables, datatypes, functions, and operators)
it contains named objects (tables, data types, functions, and operators)
whose names may duplicate those of other objects existing in other
schemas. Named objects are accessed either by <quote>qualifying</>
their names with the schema name as a prefix, or by setting a search

18
doc/src/sgml/ref/create_type.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.34 2002/08/29 00:17:01 tgl Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.35 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -208,7 +208,7 @@ CREATE TYPE
specified schema. Otherwise it is created in the current schema (the one
at the front of the search path; see <literal>CURRENT_SCHEMA()</>).
The type name must be distinct from the name of any existing type or
domain in the same schema. (Because tables have associated datatypes,
domain in the same schema. (Because tables have associated data types,
type names also must not conflict with table names in the same schema.)
</para>
@@ -231,10 +231,10 @@ CREATE TYPE
<type>cstring</type>, <type>OID</type>, <type>int4</type>.
(The first argument is the input text as a C string, the second
argument is the element type in case this is an array type,
and the third is the typmod of the destination column, if known.)
It should return a value of the datatype itself.
and the third is the <literal>typmod</> of the destination column, if known.)
It should return a value of the data type itself.
The output function may be
declared as taking one argument of the new datatype, or as taking
declared as taking one argument of the new data type, or as taking
two arguments of which the second is type <type>OID</type>.
(The second argument is again the array element type for array types.)
The output function should return type <type>cstring</type>.
@@ -245,9 +245,9 @@ CREATE TYPE
can be declared to have results or inputs of the new type, when they have
to be created before the new type can be created. The answer is that the
input function must be created first, then the output function, then the
datatype.
data type.
<productname>PostgreSQL</productname> will first see the name of the new
datatype as the return type of the input function. It will create a
data type as the return type of the input function. It will create a
<quote>shell</> type, which is simply a placeholder entry in
<literal>pg_type</>, and link the input function definition to the shell
type. Similarly the output function will be linked to the (now already
@@ -273,7 +273,7 @@ CREATE TYPE
positive integer, or variable length, indicated by setting
<replaceable class="parameter">internallength</replaceable>
to <option>VARIABLE</option>. (Internally, this is represented
by setting typlen to -1.) The internal representation of all
by setting <literal>typlen</> to -1.) The internal representation of all
variable-length types must start with an integer giving the total
length of this value of the type.
</para>
@@ -346,7 +346,7 @@ CREATE TYPE
<para>
The second form of <command>CREATE TYPE</command>
creates a composite type.
The composite type is specified by a list of column names and datatypes.
The composite type is specified by a list of column names and data types.
This is essentially the same as the row type
of a table, but using <command>CREATE TYPE</command> avoids the need to
create an actual table when all that is wanted is to define a type.

4
doc/src/sgml/ref/create_view.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_view.sgml,v 1.19 2002/09/02 20:04:39 tgl Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_view.sgml,v 1.20 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -235,7 +235,7 @@ CREATE VIEW <replaceable class="parameter">view</replaceable> [ <replaceable cla
<listitem>
<para>
This option is to do with updatable views.
All INSERTs and UPDATEs on the view will be
All <command>INSERT</> and <command>UPDATE</> commands on the view will be
checked to ensure data satisfy the view-defining
condition. If they do not, the update will be rejected.
</para>

32
doc/src/sgml/ref/createdb.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.28 2002/08/10 16:57:31 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.29 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -61,7 +61,8 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-h, --host <replaceable class="parameter">host</replaceable></term>
<term><option>-h <replaceable class="parameter">host</replaceable></></term>
<term><option>--host <replaceable class="parameter">host</replaceable></></term>
<listitem>
<para>
Specifies the host name of the machine on which the
@@ -72,7 +73,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-p, --port <replaceable class="parameter">port</replaceable></term>
<term><option>-p <replaceable class="parameter">port</replaceable></></term>
<term><option>--port <replaceable class="parameter">port</replaceable></></term>
<listitem>
<para>
Specifies the Internet TCP/IP port or the local Unix domain socket file
@@ -82,7 +84,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-U, --username <replaceable class="parameter">username</replaceable></term>
<term><option>-U <replaceable class="parameter">username</replaceable></></term>
<term><option>--username <replaceable class="parameter">username</replaceable></></term>
<listitem>
<para>
User name to connect as
@@ -91,7 +94,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-W, --password</term>
<term><option>-W</></term>
<term><option>--password</></term>
<listitem>
<para>
Force password prompt.
@@ -100,7 +104,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-e, --echo</term>
<term><option>-e</></term>
<term><option>--echo</></term>
<listitem>
<para>
Echo the queries that <application>createdb</application> generates
@@ -110,7 +115,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-q, --quiet</term>
<term><option>-q</></term>
<term><option>--quiet</></term>
<listitem>
<para>
Do not display a response.
@@ -119,7 +125,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-O, --owner <replaceable class="parameter">owner</replaceable></term>
<term><option>-O <replaceable class="parameter">owner</replaceable></></term>
<term><option>--owner <replaceable class="parameter">owner</replaceable></></term>
<listitem>
<para>
Specifies the database user who will own the new database.
@@ -128,7 +135,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-D, --location <replaceable class="parameter">datadir</replaceable></term>
<term><option>-D <replaceable class="parameter">datadir</replaceable></></term>
<term><option>--location <replaceable class="parameter">datadir</replaceable></></term>
<listitem>
<para>
Specifies the alternative location for the database. See also <xref
@@ -138,7 +146,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-T, --template <replaceable class="parameter">template</replaceable></term>
<term><option>-T <replaceable class="parameter">template</replaceable></></term>
<term><option>--template <replaceable class="parameter">template</replaceable></></term>
<listitem>
<para>
Specifies the template database from which to build this database.
@@ -147,7 +156,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-E, --encoding <replaceable class="parameter">encoding</replaceable></term>
<term><option>-E <replaceable class="parameter">encoding</replaceable></></term>
<term><option>--encoding <replaceable class="parameter">encoding</replaceable></></term>
<listitem>
<para>
Specifies the character encoding scheme to be used in this database.

25
doc/src/sgml/ref/createlang.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.26 2002/08/10 16:57:31 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.27 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -69,7 +69,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-d, --dbname <replaceable class="parameter">dbname</replaceable></term>
<term><option>-d <replaceable class="parameter">dbname</replaceable></></term>
<term><option>--dbname <replaceable class="parameter">dbname</replaceable></></term>
<listitem>
<para>
Specifies to which database the language should be added.
@@ -80,7 +81,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-e, --echo</term>
<term><option>-e</></term>
<term><option>--echo</></term>
<listitem>
<para>
Displays SQL commands as they are executed.
@@ -89,7 +91,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-l, --list</term>
<term><option>-l</></term>
<term><option>--list</></term>
<listitem>
<para>
Shows a list of already installed languages in the target database
@@ -99,7 +102,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>--L <replaceable class="parameter">directory</replaceable></term>
<term><option>-L <replaceable class="parameter">directory</replaceable></></term>
<listitem>
<para>
Specifies the directory in which the language interpreter is
@@ -118,7 +121,8 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-h, --host <replaceable class="parameter">host</replaceable></term>
<term><option>-h <replaceable class="parameter">host</replaceable></></term>
<term><option>--host <replaceable class="parameter">host</replaceable></></term>
<listitem>
<para>
Specifies the host name of the machine on which the
@@ -130,7 +134,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-p, --port <replaceable class="parameter">port</replaceable></term>
<term><option>-p <replaceable class="parameter">port</replaceable></></term>
<term><option>--port <replaceable class="parameter">port</replaceable></></term>
<listitem>
<para>
Specifies the Internet TCP/IP port or local Unix domain socket file
@@ -141,7 +146,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-U, --username <replaceable class="parameter">username</replaceable></term>
<term><option>-U <replaceable class="parameter">username</replaceable></></term>
<term><option>--username <replaceable class="parameter">username</replaceable></></term>
<listitem>
<para>
User name to connect as
@@ -150,7 +156,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-W, --password</term>
<term><option>-W</></term>
<term><option>--password</></term>
<listitem>
<para>
Force password prompt.

40
doc/src/sgml/ref/createuser.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.27 2002/08/10 16:57:31 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.28 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -39,7 +39,7 @@ PostgreSQL documentation
<para>
Being a superuser also implies the ability to bypass access permission
checks within the database, so superuser-dom should not be granted lightly.
checks within the database, so superuserdom should not be granted lightly.
</para>
<para>
@@ -64,7 +64,8 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-h, --host <replaceable class="parameter">host</replaceable></term>
<term><option>-h <replaceable class="parameter">host</replaceable></></term>
<term><option>--host <replaceable class="parameter">host</replaceable></></term>
<listitem>
<para>
Specifies the host name of the machine on which the
@@ -76,7 +77,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-p, --port <replaceable class="parameter">port</replaceable></term>
<term><option>-p <replaceable class="parameter">port</replaceable></></term>
<term><option>--port <replaceable class="parameter">port</replaceable></></term>
<listitem>
<para>
Specifies the Internet TCP/IP port or local Unix domain socket file
@@ -87,7 +89,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-e, --echo</term>
<term><option>-e</></term>
<term><option>--echo</></term>
<listitem>
<para>
Echo the queries that <application>createuser</application> generates
@@ -97,7 +100,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-q, --quiet</term>
<term><option>-q</></term>
<term><option>--quiet</></term>
<listitem>
<para>
Do not display a response.
@@ -106,7 +110,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-d, --createdb</term>
<term><option>-d</></term>
<term><option>--createdb</></term>
<listitem>
<para>
The new user is allowed to create databases.
@@ -115,7 +120,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-D, --no-createdb</term>
<term><option>-D</></term>
<term><option>--no-createdb</></term>
<listitem>
<para>
The new user is not allowed to create databases.
@@ -124,7 +130,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-a, --adduser</term>
<term><option>-a</></term>
<term><option>--adduser</></term>
<listitem>
<para>
The new user is allowed to create other users.
@@ -135,7 +142,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-A, --no-adduser</term>
<term><option>-A</></term>
<term><option>--no-adduser</></term>
<listitem>
<para>
The new user is not allowed to create other users (i.e.,
@@ -145,7 +153,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-P, --pwprompt</term>
<term><option>-P</></term>
<term><option>--pwprompt</></term>
<listitem>
<para>
If given, <application>createuser</application> will issue a prompt for
@@ -156,7 +165,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-i, --sysid <replaceable class="parameter">uid</replaceable></term>
<term><option>-i <replaceable class="parameter">uid</replaceable></></term>
<term><option>--sysid <replaceable class="parameter">uid</replaceable></></term>
<listitem>
<para>
Allows you to pick a non-default user id for the new user. This is not
@@ -166,7 +176,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-E, --encrypted</term>
<term><option>-E</></term>
<term><option>--encrypted</></term>
<listitem>
<para>
Encrypts the user's password stored in the database. If not
@@ -176,7 +187,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-N, --unencrypted</term>
<term><option>-N</></term>
<term><option>--unencrypted</></term>
<listitem>
<para>
Does not encrypt the user's password stored in the database. If

4
doc/src/sgml/ref/drop_conversion.sgml
View File

@@ -1,4 +1,4 @@
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_conversion.sgml,v 1.2 2002/07/22 13:00:00 ishii Exp $ -->
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_conversion.sgml,v 1.3 2002/09/21 18:32:54 petere Exp $ -->
<refentry id="SQL-DROPCONVERSION">
<refmeta>
@@ -76,7 +76,7 @@ DROP CONVERSION <replaceable>conversion_name</replaceable>
<title>Examples</title>
<para>
To drop the conversion named myname:
To drop the conversion named <literal>myname</>:
<programlisting>
DROP CONVERSION myname;
</programlisting>

4
doc/src/sgml/ref/drop_opclass.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_opclass.sgml,v 1.1 2002/07/29 22:14:10 tgl Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_opclass.sgml,v 1.2 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -134,7 +134,7 @@ DROP OPERATOR CLASS
Usage
</title>
<para>
Remove btree operator class <literal>widget_ops</literal>:
Remove B-tree operator class <literal>widget_ops</literal>:
<programlisting>
DROP OPERATOR CLASS widget_ops USING btree;

23
doc/src/sgml/ref/dropdb.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.17 2002/08/10 16:57:31 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.18 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -54,7 +54,8 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-h, --host <replaceable class="parameter">host</replaceable></term>
<term><option>-h <replaceable class="parameter">host</replaceable></></term>
<term><option>--host <replaceable class="parameter">host</replaceable></></term>
<listitem>
<para>
Specifies the host name of the machine on which the
@@ -66,7 +67,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-p, --port <replaceable class="parameter">port</replaceable></term>
<term><option>-p <replaceable class="parameter">port</replaceable></></term>
<term><option>--port <replaceable class="parameter">port</replaceable></></term>
<listitem>
<para>
Specifies the Internet TCP/IP port or local Unix domain socket file
@@ -77,7 +79,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-U, --username <replaceable class="parameter">username</replaceable></term>
<term><option>-U <replaceable class="parameter">username</replaceable></></term>
<term><option>--username <replaceable class="parameter">username</replaceable></></term>
<listitem>
<para>
User name to connect as
@@ -86,7 +89,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-W, --password</term>
<term><option>-W</></term>
<term><option>--password</></term>
<listitem>
<para>
Force password prompt.
@@ -95,7 +99,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-e, --echo</term>
<term><option>-e</></term>
<term><option>--echo</></term>
<listitem>
<para>
Echo the queries that <application>dropdb</application> generates
@@ -105,7 +110,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-q, --quiet</term>
<term><option>-q</></term>
<term><option>--quiet</></term>
<listitem>
<para>
Do not display a response.
@@ -114,7 +120,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-i, --interactive</term>
<term><option>-i</></term>
<term><option>--interactive</></term>
<listitem>
<para>
Issues a verification prompt before doing anything destructive.

23
doc/src/sgml/ref/droplang.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.20 2002/08/10 16:57:31 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.21 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -69,7 +69,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>[-d, --dbname] <replaceable class="parameter">dbname</replaceable></term>
<term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
<term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
<listitem>
<para>
Specifies from which database the language should be removed.
@@ -80,7 +81,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-e, --echo</term>
<term><option>-e</></term>
<term><option>--echo</></term>
<listitem>
<para>
Displays SQL commands as they are executed.
@@ -89,7 +91,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-l, --list</term>
<term><option>-l</></term>
<term><option>--list</></term>
<listitem>
<para>
Shows a list of already installed languages in the target database
@@ -107,7 +110,8 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-h, --host <replaceable class="parameter">host</replaceable></term>
<term><option>-h <replaceable class="parameter">host</replaceable></></term>
<term><option>--host <replaceable class="parameter">host</replaceable></></term>
<listitem>
<para>
Specifies the host name of the machine on which the
@@ -119,7 +123,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-p, --port <replaceable class="parameter">port</replaceable></term>
<term><option>-p <replaceable class="parameter">port</replaceable></></term>
<term><option>--port <replaceable class="parameter">port</replaceable></></term>
<listitem>
<para>
Specifies the Internet TCP/IP port or local Unix domain socket file
@@ -130,7 +135,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-U, --username <replaceable class="parameter">username</replaceable></term>
<term><option>-U <replaceable class="parameter">username</replaceable></></term>
<term><option>--username <replaceable class="parameter">username</replaceable></></term>
<listitem>
<para>
User name to connect as
@@ -139,7 +145,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-W, --password</term>
<term><option>-W</></term>
<term><option>--password</></term>
<listitem>
<para>
Force password prompt.

17
doc/src/sgml/ref/dropuser.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.20 2002/08/10 16:57:31 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.21 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -56,7 +56,8 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-h, --host <replaceable class="parameter">host</replaceable></term>
<term><option>-h <replaceable class="parameter">host</replaceable></></term>
<term><option>--host <replaceable class="parameter">host</replaceable></></term>
<listitem>
<para>
Specifies the host name of the machine on which the
@@ -68,7 +69,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-p, --port <replaceable class="parameter">port</replaceable></term>
<term><option>-p <replaceable class="parameter">port</replaceable></></term>
<term><option>--port <replaceable class="parameter">port</replaceable></></term>
<listitem>
<para>
Specifies the Internet TCP/IP port or local Unix domain socket file
@@ -79,7 +81,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-e, --echo</term>
<term><option>-e</></term>
<term><option>--echo</></term>
<listitem>
<para>
Echo the queries that <application>dropuser</application> generates
@@ -89,7 +92,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-q, --quiet</term>
<term><option>-q</></term>
<term><option>--quiet</></term>
<listitem>
<para>
Do not display a response.
@@ -98,7 +102,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-i, --interactive</term>
<term><option>-i</></term>
<term><option>--interactive</></term>
<listitem>
<para>
Prompt for confirmation before actually removing the user.

44
doc/src/sgml/ref/initdb.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/initdb.sgml,v 1.21 2002/04/21 19:02:39 thomas Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/initdb.sgml,v 1.22 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -114,8 +114,8 @@ PostgreSQL documentation
<para>
<variablelist>
<varlistentry>
<term>--pgdata=<replaceable class="parameter">directory</replaceable></term>
<term>-D <replaceable class="parameter">directory</replaceable></term>
<term><option>--pgdata=<replaceable class="parameter">directory</replaceable></option></term>
<term><option>-D <replaceable class="parameter">directory</replaceable></option></term>
<listitem>
<para>
This option specifies the directory where the database system
@@ -130,23 +130,23 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>--username=<replaceable class="parameter">username</replaceable></term>
<term>-U <replaceable class="parameter">username</replaceable></term>
<term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
<term><option>-U <replaceable class="parameter">username</replaceable></option></term>
<listitem>
<para>
Selects the user name of the database superuser. This defaults
to the name of the effective user running
<command>initdb</command>. It is really not important what the
superuser's name is, but one might choose to keep the
customary name <quote>postgres</quote>, even if the operating
customary name <systemitem>postgres</systemitem>, even if the operating
system user's name is different.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>--pwprompt</term>
<term>-W</term>
<term><option>--pwprompt</option></term>
<term><option>-W</option></term>
<listitem>
<para>
Makes <command>initdb</command> prompt for a password
@@ -159,8 +159,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>--encoding=<replaceable class="parameter">encoding</replaceable></term>
<term>-E <replaceable class="parameter">encoding</replaceable></term>
<term><option>--encoding=<replaceable class="parameter">encoding</replaceable></option></term>
<term><option>-E <replaceable class="parameter">encoding</replaceable></option></term>
<listitem>
<para>
Selects the encoding of the template database. This will also
@@ -173,7 +173,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>--locale=<replaceable>locale</replaceable></term>
<term><option>--locale=<replaceable>locale</replaceable></option></term>
<listitem>
<para>
Sets the default locale for the database cluster. If this
@@ -184,12 +184,12 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>--lc-collate=<replaceable>locale</replaceable></term>
<term>--lc-ctype=<replaceable>locale</replaceable></term>
<term>--lc-messages=<replaceable>locale</replaceable></term>
<term>--lc-monetary=<replaceable>locale</replaceable></term>
<term>--lc-numeric=<replaceable>locale</replaceable></term>
<term>--lc-time=<replaceable>locale</replaceable></term>
<term><option>--lc-collate=<replaceable>locale</replaceable></option></term>
<term><option>--lc-ctype=<replaceable>locale</replaceable></option></term>
<term><option>--lc-messages=<replaceable>locale</replaceable></option></term>
<term><option>--lc-monetary=<replaceable>locale</replaceable></option></term>
<term><option>--lc-numeric=<replaceable>locale</replaceable></option></term>
<term><option>--lc-time=<replaceable>locale</replaceable></option></term>
<listitem>
<para>
@@ -206,7 +206,7 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-L <replaceable class="parameter">directory</replaceable></term>
<term><option>-L <replaceable class="parameter">directory</replaceable></option></term>
<listitem>
<para>
Specifies where <command>initdb</command> should find
@@ -218,8 +218,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>--noclean</term>
<term>-n</term>
<term><option>-n</option></term>
<term><option>--noclean</option></term>
<listitem>
<para>
By default, when <command>initdb</command>
@@ -232,8 +232,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>--debug</term>
<term>-d</term>
<term><option>-d</option></term>
<term><option>--debug</option></term>
<listitem>
<para>
Print debugging output from the bootstrap backend and a few other

6
doc/src/sgml/ref/insert.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/insert.sgml,v 1.18 2002/04/24 02:31:30 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/insert.sgml,v 1.19 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -55,8 +55,8 @@ INSERT INTO <replaceable class="PARAMETER">table</replaceable> [ ( <replaceable
<term>DEFAULT VALUES</term>
<listitem>
<para>
All columns will be filled by NULLs or by values specified
when the table was created using DEFAULT clauses.
All columns will be filled by null values or by values specified
when the table was created using <literal>DEFAULT</> clauses.
</para>
</listitem>
</varlistentry>

8
doc/src/sgml/ref/listen.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/listen.sgml,v 1.14 2002/08/13 20:40:43 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/listen.sgml,v 1.15 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -115,12 +115,12 @@ WARNING: Async_Listen: We are already listening on <replaceable class="PARAMETE
<para>
The method a frontend application must use to detect notify events depends on
which <productname>PostgreSQL</productname> application programming interface it
uses. With the basic libpq library, the application issues
uses. With the <application>libpq</> library, the application issues
<command>LISTEN</command> as an ordinary SQL command, and then must
periodically call the routine <function>PQnotifies</function> to find out
whether any notify events have been received. Other interfaces such as
libpgtcl provide higher-level methods for handling notify events; indeed,
with libpgtcl the application programmer should not even issue
<application>libpgtcl</> provide higher-level methods for handling notify events; indeed,
with <application>libpgtcl</> the application programmer should not even issue
<command>LISTEN</command> or <command>UNLISTEN</command> directly. See the
documentation for the library you are using for more details.
</para>

8
doc/src/sgml/ref/lock.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.33 2002/05/30 20:45:18 tgl Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.34 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -118,7 +118,7 @@ where <replaceable class="PARAMETER">lockmode</replaceable> is one of:
Conflicts with SHARE UPDATE EXCLUSIVE, SHARE, SHARE ROW EXCLUSIVE,
EXCLUSIVE and
ACCESS EXCLUSIVE modes. This mode protects a table against
concurrent schema changes and VACUUMs.
concurrent schema changes and <command>VACUUM</> runs.
</para>
<note>
@@ -289,8 +289,8 @@ ERROR <replaceable class="PARAMETER">name</replaceable>: Table does not exist.
To achieve a similar effect when running a transaction
at the SERIALIZABLE isolation level, you have to execute the
<command>LOCK TABLE</>
statement before executing any DML statement. A serializable
transaction's view of data will be frozen when its first DML statement
statement before executing any <acronym>DML</> statement. A serializable
transaction's view of data will be frozen when its first <acronym>DML</> statement
begins. A later <command>LOCK</> will still prevent concurrent writes
--- but it
won't ensure that what the transaction reads corresponds to the latest

12
doc/src/sgml/ref/notify.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/notify.sgml,v 1.18 2002/08/13 20:40:44 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/notify.sgml,v 1.19 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -95,7 +95,7 @@ NOTIFY
</para>
<para>
The information passed to the frontend for a notify event includes the notify
condition name and the notifying backend process's PID. It is up to the
condition name and the notifying backend process's <acronym>PID</>. It is up to the
database designer to define the condition names that will be used in a given
database and what each one means.
</para>
@@ -109,7 +109,7 @@ NOTIFY
</para>
<para>
<command>NOTIFY</command> provides a simple form of signal or
IPC (interprocess communication) mechanism for a collection of processes
<acronym>IPC</> (interprocess communication) mechanism for a collection of processes
accessing the same <productname>PostgreSQL</productname> database.
Higher-level mechanisms can be built by using tables in the database to
pass additional data (beyond a mere condition name) from notifier to
@@ -158,8 +158,8 @@ NOTIFY
re-reading a database table to find the same updates that that frontend just
wrote out. In <productname>PostgreSQL</productname> 6.4 and later, it is
possible to avoid such extra work by noticing whether the notifying backend
process's PID (supplied in the notify event message) is the same as one's own
backend's PID (available from libpq). When they are the same, the notify
process's <acronym>PID</> (supplied in the notify event message) is the same as one's own
backend's <acronym>PID</> (available from <application>libpq</>). When they are the same, the notify
event is one's own work bouncing back, and can be ignored. (Despite what was
said in the preceding paragraph, this is a safe technique.
<productname>PostgreSQL</productname> keeps self-notifies separate from notifies
@@ -191,7 +191,7 @@ NOTIFY
</para>
<para>
In <productname>PostgreSQL</productname> releases prior to 6.4, the backend
PID delivered in a notify message was always the PID of the frontend's own
<acronym>PID</> delivered in a notify message was always the <acronym>PID</> of the frontend's own
backend. So it was not possible to distinguish one's own notifies from other
clients' notifies in those earlier releases.
</para>

4
doc/src/sgml/ref/pg_ctl-ref.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.15 2002/07/28 15:22:20 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.16 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -148,7 +148,7 @@ PostgreSQL documentation
<para>
Append the server log output to
<replaceable>filename</replaceable>. If the file does not
exist, it is created. The umask is set to 077, so access to
exist, it is created. The <systemitem>umask</> is set to 077, so access to
the log file from other users is disallowed by default.
</para>
</listitem>

19
doc/src/sgml/ref/postmaster.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.31 2002/07/28 15:22:21 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.32 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -146,7 +146,7 @@ PostgreSQL documentation
Disables <function>fsync</function> calls for performance
improvement, at the risk of data corruption in event of a
system crash. This parameter corresponds to setting
fsync=false in postgresql.conf. Read the detailed
<literal>fsync=false</> in <filename>postgresql.conf</>. Read the detailed
documentation before using this!
</para>
<para>
@@ -176,7 +176,7 @@ PostgreSQL documentation
Allows clients to connect via TCP/IP (Internet domain)
connections. Without this option, only local Unix domain
socket connections are accepted. This option corresponds
to setting tcpip_socket=true in postgresql.conf.
to setting <literal>tcpip_socket=true</> in <filename>postgresql.conf</>.
</para>
<para>
<option>--tcpip_socket=false</option> has the opposite
@@ -350,7 +350,7 @@ PostgreSQL documentation
<listitem>
<para>
Default character encoding used by clients. (The clients may
override this invidiually.) This value can also be set in the
override this individually.) This value can also be set in the
configuration file.
</para>
</listitem>
@@ -382,7 +382,7 @@ PostgreSQL documentation
<listitem>
<para>
Default port (preferrably set in the configuration file)
Default port (preferably set in the configuration file)
</para>
</listitem>
</varlistentry>
@@ -520,10 +520,11 @@ StreamServerPort: cannot bind to port
</para>
<para>
The <option>--</> options will not work on FreeBSD or OpenBSD.
The <option>--</> options will not work on <systemitem
class="osname">FreeBSD</> or <systemitem class="osname">OpenBSD</>.
Use <option>-c</> instead. This is a bug in the affected operating
systems; a future release of <productname>PostgreSQL</productname> will
provide a workaround if this is not fixed.
systems; a future release of <productname>PostgreSQL</productname>
will provide a workaround if this is not fixed.
</para>
</refsect1>
@@ -547,7 +548,7 @@ StreamServerPort: cannot bind to port
</screen>
This command will start up <application>postmaster</application>
communicating through the port 1234. In order to connect to this
<application>postmaster</application> using psql, you would need to
<application>postmaster</application> using <application>psql</>, you would need to
run it as
<screen>
<prompt>$</prompt> <userinput>psql -p 1234</userinput>

191
doc/src/sgml/ref/psql-ref.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.75 2002/09/18 20:09:32 petere Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.76 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -51,19 +51,21 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-a, --echo-all</term>
<term><option>-a</></term>
<term><option>--echo-all</></term>
<listitem>
<para>
Print all the lines to the screen as they are read. This is more
useful for script processing rather than interactive mode. This is
equivalent to setting the variable <envar>ECHO</envar> to
equivalent to setting the variable <varname>ECHO</varname> to
<literal>all</literal>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-A, --no-align</term>
<term><option>-A</></term>
<term><option>--no-align</></term>
<listitem>
<para>
Switches to unaligned output mode. (The default output mode is
@@ -73,7 +75,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-c, --command <replaceable class="parameter">query</replaceable></term>
<term><option>-c <replaceable class="parameter">query</replaceable></></term>
<term><option>--command <replaceable class="parameter">query</replaceable></></term>
<listitem>
<para>
Specifies that <application>psql</application> is to execute one
@@ -82,7 +85,7 @@ PostgreSQL documentation
</para>
<para>
<replaceable class="parameter">query</replaceable> must be either
a query string that is completely parseable by the backend (i.e.,
a query string that is completely parsable by the backend (i.e.,
it contains no <application>psql</application> specific features),
or it is a single backslash command. Thus you cannot mix
<acronym>SQL</acronym> and <application>psql</application>
@@ -94,7 +97,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-d, --dbname <replaceable class="parameter">dbname</replaceable></term>
<term><option>-d <replaceable class="parameter">dbname</replaceable></></term>
<term><option>--dbname <replaceable class="parameter">dbname</replaceable></></term>
<listitem>
<para>
Specifies the name of the database to connect to. This is
@@ -106,31 +110,34 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-e, --echo-queries</term>
<term><option>-e</></term>
<term><option>--echo-queries</></term>
<listitem>
<para>
Show all queries that are sent to the backend. This is equivalent
to setting the variable <envar>ECHO</envar> to
to setting the variable <varname>ECHO</varname> to
<literal>queries</literal>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-E, --echo-hidden</term>
<term><option>-E</></term>
<term><option>--echo-hidden</></term>
<listitem>
<para>
Echoes the actual queries generated by \d and other backslash
commands. You can use this if you wish to include similar
functionality into your own programs. This is equivalent to
setting the variable <envar>ECHO_HIDDEN</envar> from within
setting the variable <varname>ECHO_HIDDEN</varname> from within
<application>psql</application>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-f, --file <replaceable class="parameter">filename</replaceable></term>
<term><option>-f <replaceable class="parameter">filename</replaceable></></term>
<term><option>--file <replaceable class="parameter">filename</replaceable></></term>
<listitem>
<para>
Use the file <replaceable class="parameter">filename</replaceable>
@@ -161,7 +168,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-F, --field-separator <replaceable class="parameter">separator</replaceable></term>
<term><option>-F <replaceable class="parameter">separator</replaceable></></term>
<term><option>--field-separator <replaceable class="parameter">separator</replaceable></></term>
<listitem>
<para>
Use <replaceable class="parameter">separator</replaceable> as the
@@ -172,19 +180,21 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-h, --host <replaceable class="parameter">hostname</replaceable></term>
<term><option>-h <replaceable class="parameter">hostname</replaceable></></term>
<term><option>--host <replaceable class="parameter">hostname</replaceable></></term>
<listitem>
<para>
Specifies the host name of the machine on which the
<application>postmaster</application> is running. If host begins
with a slash, it is used as the directory for the unix domain
with a slash, it is used as the directory for the Unix-domain
socket.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-H, --html</term>
<term><option>-H</></term>
<term><option>--html</></term>
<listitem>
<para>
Turns on <acronym>HTML</acronym> tabular output. This is
@@ -195,7 +205,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-l, --list</term>
<term><option>-l</></term>
<term><option>--list</></term>
<listitem>
<para>
Lists all available databases, then exits. Other non-connection
@@ -206,7 +217,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-o, --output <replaceable class="parameter">filename</replaceable></term>
<term><option>-o <replaceable class="parameter">filename</replaceable></></term>
<term><option>--output <replaceable class="parameter">filename</replaceable></></term>
<listitem>
<para>
Put all query output into file <replaceable
@@ -217,7 +229,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-p, --port <replaceable class="parameter">port</replaceable></term>
<term><option>-p <replaceable class="parameter">port</replaceable></></term>
<term><option>--port <replaceable class="parameter">port</replaceable></></term>
<listitem>
<para>
Specifies the TCP/IP port or, by omission, the local Unix domain
@@ -231,7 +244,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-P, --pset <replaceable class="parameter">assignment</replaceable></term>
<term><option>-P <replaceable class="parameter">assignment</replaceable></></term>
<term><option>--pset <replaceable class="parameter">assignment</replaceable></></term>
<listitem>
<para>
Allows you to specify printing options in the style of
@@ -244,7 +258,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-q</term>
<term><option>-q</></term>
<term><option>--quiet</></term>
<listitem>
<para>
Specifies that <application>psql</application> should do its work
@@ -252,13 +267,14 @@ PostgreSQL documentation
informational output. If this option is used, none of this
happens. This is useful with the <option>-c</option> option.
Within <application>psql</application> you can also set the
<envar>QUIET</envar> variable to achieve the same effect.
<varname>QUIET</varname> variable to achieve the same effect.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>-R, --record-separator <replaceable class="parameter">separator</replaceable></term>
<term><option>-R <replaceable class="parameter">separator</replaceable></></term>
<term><option>--record-separator <replaceable class="parameter">separator</replaceable></></term>
<listitem>
<para>
Use <replaceable class="parameter">separator</replaceable> as the
@@ -269,7 +285,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-s, --single-step</term>
<term><option>-s</></term>
<term><option>--single-step</></term>
<listitem>
<para>
Run in single-step mode. That means the user is prompted before
@@ -280,7 +297,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-S, --single-line</term>
<term><option>-S</></term>
<term><option>--single-line</></term>
<listitem>
<para>
Runs in single-line mode where a newline terminates a query, as a
@@ -299,7 +317,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-t, --tuples-only</term>
<term><option>-t</></term>
<term><option>--tuples-only</></term>
<listitem>
<para>
Turn off printing of column names and result row count footers,
@@ -310,7 +329,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-T, --table-attr <replaceable class="parameter">table_options</replaceable></term>
<term><option>-T <replaceable class="parameter">table_options</replaceable></></term>
<term><option>--table-attr <replaceable class="parameter">table_options</replaceable></></term>
<listitem>
<para>
Allows you to specify options to be placed within the
@@ -321,7 +341,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-u</term>
<term><option>-u</></term>
<listitem>
<para>
Makes <application>psql</application> prompt for the user name and
@@ -339,7 +359,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-U, --username <replaceable class="parameter">username</replaceable></term>
<term><option>-U <replaceable class="parameter">username</replaceable></></term>
<term><option>--username <replaceable class="parameter">username</replaceable></></term>
<listitem>
<para>
Connects to the database as the user <replaceable
@@ -350,7 +371,9 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-v, --variable, --set <replaceable class="parameter">assignment</replaceable></term>
<term><option>-v <replaceable class="parameter">assignment</replaceable></></term>
<term><option>--set <replaceable class="parameter">assignment</replaceable></></term>
<term><option>--variable <replaceable class="parameter">assignment</replaceable></></term>
<listitem>
<para>
Performs a variable assignment, like the <command>\set</command>
@@ -365,7 +388,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-V, --version</term>
<term><option>-V</></term>
<term><option>--version</></term>
<listitem>
<para>
Shows the <application>psql</application> version.
@@ -374,7 +398,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-W, --password</term>
<term><option>-W</></term>
<term><option>--password</></term>
<listitem>
<para>
Requests that <application>psql</application> should prompt for a
@@ -396,7 +421,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-x, --expanded</term>
<term><option>-x</></term>
<term><option>--expanded</></term>
<listitem>
<para>
Turns on extended row format mode. This is equivalent to the
@@ -406,7 +432,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-X, --no-psqlrc</term>
<term><option>-X,</></term>
<term><option>--no-psqlrc</></term>
<listitem>
<para>
Do not read the start-up file <filename>~/.psqlrc</filename>.
@@ -415,7 +442,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-?, --help</term>
<term><option>-?</></term>
<term><option>--help</></term>
<listitem>
<para>
Shows help about <application>psql</application> command line
@@ -435,7 +463,7 @@ PostgreSQL documentation
finished normally, 1 if a fatal error of its own (out of memory,
file not found) occurs, 2 if the connection to the backend went bad
and the session is not interactive, and 3 if an error occurred in a
script and the variable <envar>ON_ERROR_STOP</envar> was set.
script and the variable <varname>ON_ERROR_STOP</varname> was set.
</para>
</refsect1>
@@ -458,7 +486,7 @@ PostgreSQL documentation
not belong to any option it will be interpreted as the database name
(or the user name, if the database name is also given). Not all
these options are required, defaults do apply. If you omit the host
name psql will connect via a Unix domain socket to a server on the
name, <application>psql</> will connect via a Unix domain socket to a server on the
local host. The default port number is compile-time determined.
Since the database server uses the same default, you will not have
to specify the port in most cases. The default user name is your
@@ -556,11 +584,11 @@ testdb=>
</para>
<para>
Arguments that are quoted in <quote>backticks</quote>
(<literal>`</literal>) are taken as a command line that is passed to
the shell. The output of the command (with any trailing newline
removed) is taken as the argument value. The above escape sequences
also apply in backticks.
Arguments that are enclosed in backquotes (<literal>`</literal>)
are taken as a command line that is passed to the shell. The
output of the command (with any trailing newline removed) is taken
as the argument value. The above escape sequences also apply in
backquotes.
</para>
<para>
@@ -665,13 +693,13 @@ testdb=>
</varlistentry>
<varlistentry>
<term><literal>\copy</literal> <replaceable class="parameter">table</replaceable>
<term><literal>\copy <replaceable class="parameter">table</replaceable>
{ <literal>from</literal> | <literal>to</literal> }
<replaceable class="parameter">filename</replaceable> | stdin | stdout
[ <literal>with</literal> ]
[ <literal>oids</literal> ]
[ <literal>delimiter [as] </literal> '<replaceable class="parameter">character</replaceable>' ]
[ <literal>null [as] </literal> '<replaceable class="parameter">string</replaceable>' ]
[ <literal>null [as] </literal> '<replaceable class="parameter">string</replaceable>' ]</literal>
</term>
<listitem>
@@ -838,7 +866,7 @@ testdb=>
<note>
<para>
To reduce clutter, <literal>\df</> does not show datatype I/O
To reduce clutter, <literal>\df</> does not show data type I/O
functions. This is implemented by ignoring functions that accept
or return type <type>cstring</>.
</para>
@@ -1087,7 +1115,7 @@ Tue Oct 26 21:40:57 CEST 1999
<note>
<para>
If you want to see the lines on the screen as they are read you
must set the variable <envar>ECHO</envar> to
must set the variable <varname>ECHO</varname> to
<literal>all</literal>.
</para>
</note>
@@ -1132,7 +1160,7 @@ Tue Oct 26 21:40:57 CEST 1999
</tip>
<note>
<para>
See the description of the <envar>LO_TRANSACTION</envar>
See the description of the <varname>LO_TRANSACTION</varname>
variable for important information concerning all large object
operations.
</para>
@@ -1169,7 +1197,7 @@ lo_import 152801
<note>
<para>
See the description of the <envar>LO_TRANSACTION</envar>
See the description of the <varname>LO_TRANSACTION</varname>
variable for important information concerning all large object
operations.
</para>
@@ -1206,7 +1234,7 @@ lo_import 152801
</tip>
<note>
<para>
See the description of the <envar>LO_TRANSACTION</envar>
See the description of the <varname>LO_TRANSACTION</varname>
variable for important information concerning all large object
operations.
</para>
@@ -1426,7 +1454,7 @@ lo_import 152801
<term><literal>pager</literal></term>
<listitem>
<para>
Toggles the use of a pager for query and psql help output. If the
Toggles the use of a pager for query and <application>psql</> help output. If the
environment variable <envar>PAGER</envar> is set, the output
is piped to the specified program. Otherwise a platform-dependent default (such as
<filename>more</filename>) is used.
@@ -1775,7 +1803,7 @@ bar
such variables. A list of all specially treated variables follows.
<variablelist>
<varlistentry>
<term><envar>DBNAME</envar></term>
<term><varname>DBNAME</varname></term>
<listitem>
<para>
The name of the database you are currently connected to. This is
@@ -1786,7 +1814,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>ECHO</envar></term>
<term><varname>ECHO</varname></term>
<listitem>
<para>
If set to <quote><literal>all</literal></quote>, all lines
@@ -1802,14 +1830,14 @@ bar
</varlistentry>
<varlistentry>
<term><envar>ECHO_HIDDEN</envar></term>
<term><varname>ECHO_HIDDEN</varname></term>
<listitem>
<para>
When this variable is set and a backslash command queries the
database, the query is first shown. This way you can study the
<productname>PostgreSQL</productname> internals and provide
similar functionality in your own programs. If you set the
variable to the value <quote>noexec</quote>, the queries are
variable to the value <literal>noexec</literal>, the queries are
just shown but are not actually sent to the backend and
executed.
</para>
@@ -1817,7 +1845,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>ENCODING</envar></term>
<term><varname>ENCODING</varname></term>
<listitem>
<para>
The current client multibyte encoding. If you are not set up to
@@ -1828,7 +1856,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>HISTCONTROL</envar></term>
<term><varname>HISTCONTROL</varname></term>
<listitem>
<para>
If this variable is set to <literal>ignorespace</literal>,
@@ -1849,7 +1877,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>HISTSIZE</envar></term>
<term><varname>HISTSIZE</varname></term>
<listitem>
<para>
The number of commands to store in the command history. The
@@ -1865,7 +1893,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>HOST</envar></term>
<term><varname>HOST</varname></term>
<listitem>
<para>
The database server host you are currently connected to. This is
@@ -1876,15 +1904,16 @@ bar
</varlistentry>
<varlistentry>
<term><envar>IGNOREEOF</envar></term>
<term><varname>IGNOREEOF</varname></term>
<listitem>
<para>
If unset, sending an EOF character (usually Control-D) to an
interactive session of <application>psql</application> will
terminate the application. If set to a numeric value, that many
EOF characters are ignored before the application terminates.
If the variable is set but has no numeric value, the default is
10.
If unset, sending an <acronym>EOF</> character (usually
<keycombo action="simul"><keycap>Control</><keycap>D</></>)
to an interactive session of <application>psql</application>
will terminate the application. If set to a numeric value,
that many <acronym>EOF</> characters are ignored before the
application terminates. If the variable is set but has no
numeric value, the default is 10.
</para>
<note>
<para>
@@ -1896,10 +1925,10 @@ bar
</varlistentry>
<varlistentry>
<term><envar>LASTOID</envar></term>
<term><varname>LASTOID</varname></term>
<listitem>
<para>
The value of the last affected oid, as returned from an
The value of the last affected OID, as returned from an
<command>INSERT</command> or <command>lo_insert</command>
command. This variable is only guaranteed to be valid until
after the result of the next <acronym>SQL</acronym> command has
@@ -1909,7 +1938,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>LO_TRANSACTION</envar></term>
<term><varname>LO_TRANSACTION</varname></term>
<listitem>
<para>
If you use the <productname>PostgreSQL</productname> large
@@ -1943,7 +1972,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>ON_ERROR_STOP</envar></term>
<term><varname>ON_ERROR_STOP</varname></term>
<listitem>
<para>
By default, if non-interactive scripts encounter an error, such
@@ -1963,7 +1992,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>PORT</envar></term>
<term><varname>PORT</varname></term>
<listitem>
<para>
The database server port to which you are currently connected.
@@ -1974,7 +2003,9 @@ bar
</varlistentry>
<varlistentry>
<term><envar>PROMPT1</envar>, <envar>PROMPT2</envar>, <envar>PROMPT3</envar></term>
<term><varname>PROMPT1</varname></term>
<term><varname>PROMPT2</varname></term>
<term><varname>PROMPT3</varname></term>
<listitem>
<para>
These specify what the prompt <application>psql</application>
@@ -1986,7 +2017,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>QUIET</envar></term>
<term><varname>QUIET</varname></term>
<listitem>
<para>
This variable is equivalent to the command line option
@@ -1997,7 +2028,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>SINGLELINE</envar></term>
<term><varname>SINGLELINE</varname></term>
<listitem>
<para>
This variable is set by the command line option
@@ -2007,7 +2038,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>SINGLESTEP</envar></term>
<term><varname>SINGLESTEP</varname></term>
<listitem>
<para>
This variable is equivalent to the command line option
@@ -2017,7 +2048,7 @@ bar
</varlistentry>
<varlistentry>
<term><envar>USER</envar></term>
<term><varname>USER</varname></term>
<listitem>
<para>
The database user you are currently connected as. This is set
@@ -2105,8 +2136,8 @@ testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\'
<para>
The prompts <application>psql</application> issues can be customized
to your preference. The three variables <envar>PROMPT1</envar>,
<envar>PROMPT2</envar>, and <envar>PROMPT3</envar> contain strings
to your preference. The three variables <varname>PROMPT1</varname>,
<varname>PROMPT2</varname>, and <varname>PROMPT3</varname> contain strings
and special escape sequences that describe the appearance of the
prompt. Prompt 1 is the normal prompt that is issued when
<application>psql</application> requests a new query. Prompt 2 is
@@ -2251,11 +2282,11 @@ testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\'
</refsect3>
<refsect3>
<title>Readline</title>
<title>Command-Line Editing</title>
<para>
<application>psql</application> supports the readline and history
libraries for convenient line editing and retrieval. The command
<application>psql</application> supports the <application>Readline</application>
library for convenient line editing and retrieval. The command
history is stored in a file named <filename>.psql_history</filename>
in your home directory and is reloaded when
<application>psql</application> starts up. Tab-completion is also

7
doc/src/sgml/ref/reindex.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/reindex.sgml,v 1.12 2002/06/23 03:45:15 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/reindex.sgml,v 1.13 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -193,14 +193,15 @@ REINDEX
as there is in <application>psql</>. To continue a command
across multiple lines, you must type backslash just before each
newline except the last one.
Also, you won't have any of the conveniences of readline processing
Also, you won't have any of the conveniences of command-line editing
(no command history, for example).
</para>
</listitem>
<listitem>
<para>
To quit the backend, type EOF (control-D, usually).
To quit the backend, type <acronym>EOF</> (<keycombo
action="simul"><keycap>Control</><keycap>D</></>, usually).
</para>
</listitem>

6
doc/src/sgml/ref/reset.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/reset.sgml,v 1.14 2002/05/17 01:19:16 tgl Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/reset.sgml,v 1.15 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -79,7 +79,7 @@ SET <replaceable class="parameter">variable</replaceable> TO DEFAULT
<refsect1>
<title>Examples</title>
<para>
Set DateStyle to its default value:
Set <varname>DateStyle</> to its default value:
<screen>
RESET DateStyle;
@@ -87,7 +87,7 @@ RESET DateStyle;
</para>
<para>
Set Geqo to its default value:
Set <varname>geqo</> to its default value:
<screen>
RESET GEQO;

24
doc/src/sgml/ref/select.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.60 2002/08/30 16:00:41 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.61 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -451,8 +451,8 @@ where <replaceable class="PARAMETER">from_item</replaceable> can be:
(i.e., all combined rows that pass its ON condition), plus one copy of each
row in the left-hand table for which there was no right-hand row that
passed the ON condition. This left-hand row is extended to the full
width of the joined table by inserting NULLs for the right-hand columns.
Note that only the JOIN's own ON or USING condition is considered while
width of the joined table by inserting null values for the right-hand columns.
Note that only the <literal>JOIN</>'s own ON or USING condition is considered while
deciding which rows have matches. Outer ON or WHERE conditions are
applied afterwards.
</para>
@@ -647,11 +647,13 @@ SELECT name FROM distributors ORDER BY code;
</para>
<para>
Optionally one may add the keyword DESC (descending)
or ASC (ascending) after each column name in the ORDER BY clause.
If not specified, ASC is assumed by default. Alternatively, a
specific ordering operator name may be specified. ASC is equivalent
to USING &lt; and DESC is equivalent to USING &gt;.
Optionally one may add the key word <literal>DESC</> (descending)
or <literal>ASC</> (ascending) after each column name in the
<literal>ORDER BY</> clause. If not specified, <literal>ASC</> is
assumed by default. Alternatively, a specific ordering operator
name may be specified. <literal>ASC</> is equivalent to
<literal>USING &lt;</> and <literal>DESC</> is equivalent to
<literal>USING &gt;</>.
</para>
<para>
@@ -689,7 +691,7 @@ SELECT name FROM distributors ORDER BY code;
<para>
The UNION operator computes the collection (set union) of the rows
returned by the queries involved.
The two SELECTs that represent the direct operands of the UNION must
The two SELECT statements that represent the direct operands of the UNION must
produce the same number of columns, and corresponding columns must be
of compatible data types.
</para>
@@ -1064,7 +1066,7 @@ SELECT * FROM distributors_2(111) AS (f1 int, f2 text);
<para>
<productname>PostgreSQL</productname> allows one to omit
the <command>FROM</command> clause from a query. This feature
was retained from the original PostQuel query language. It has
was retained from the original PostQUEL query language. It has
a straightforward use to compute the results of simple expressions:
<programlisting>
@@ -1075,7 +1077,7 @@ SELECT 2+2;
4
</programlisting>
Some other DBMSes cannot do this except by introducing a dummy one-row
Some other SQL databases cannot do this except by introducing a dummy one-row
table to do the select from. A less obvious use is to abbreviate a
normal select from one or more tables:

30
doc/src/sgml/ref/set.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.64 2002/08/04 05:09:36 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.65 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -113,7 +113,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
<variablelist>
<varlistentry>
<term>DATESTYLE</term>
<term><varname>DATESTYLE</></term>
<listitem>
<para>
Choose the date/time representation style. Two separate
@@ -126,7 +126,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
<variablelist>
<varlistentry>
<term>ISO</term>
<term><literal>ISO</></term>
<listitem>
<para>
Use ISO 8601-style dates and times (<literal>YYYY-MM-DD
@@ -136,7 +136,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
</varlistentry>
<varlistentry>
<term>SQL</term>
<term><literal>SQL</></term>
<listitem>
<para>
Use Oracle/Ingres-style dates and times. Note that this
@@ -147,7 +147,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
</varlistentry>
<varlistentry>
<term>PostgreSQL</term>
<term><literal>PostgreSQL</></term>
<listitem>
<para>
Use traditional <productname>PostgreSQL</productname> format.
@@ -156,7 +156,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
</varlistentry>
<varlistentry>
<term>German</term>
<term><literal>German</></term>
<listitem>
<para>
Use <literal>dd.mm.yyyy</literal> for numeric date representations.
@@ -173,7 +173,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
<variablelist>
<varlistentry>
<term>European</term>
<term><literal>European</></term>
<listitem>
<para>
Use <literal>dd/mm/yyyy</literal> for numeric date representations.
@@ -182,8 +182,8 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
</varlistentry>
<varlistentry>
<term>NonEuropean</term>
<term>US</term>
<term><literal>NonEuropean</></term>
<term><literal>US</></term>
<listitem>
<para>
Use <literal>mm/dd/yyyy</literal> for numeric date representations.
@@ -209,7 +209,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
</para>
<para>
There are several now-deprecated means for setting the datestyle
There are several now-deprecated means for setting the date style
in addition to the normal methods of setting it via <command>SET</> or
a configuration-file entry:
<simplelist>
@@ -225,9 +225,9 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
</member>
<member>
Setting the client's <envar>PGDATESTYLE</envar> environment variable.
If PGDATESTYLE is set in the frontend environment of a client
based on libpq, libpq will automatically set DATESTYLE to the
value of PGDATESTYLE during connection start-up. This is
If <envar>PGDATESTYLE</envar> is set in the frontend environment of a client
based on <application>libpq</>, <application>libpq</> will automatically set <varname>DATESTYLE</> to the
value of <envar>PGDATESTYLE</envar> during connection start-up. This is
equivalent to a manually issued <command>SET DATESTYLE</>.
</member>
</simplelist>
@@ -283,7 +283,7 @@ SELECT setseed(<replaceable>value</replaceable>);
<para>
Shows the server-side multibyte encoding. (At present, this
parameter can be shown but not set, because the encoding is
determined at initdb time.)
determined at <application>initdb</> time.)
</para>
</listitem>
</varlistentry>
@@ -373,7 +373,7 @@ SELECT setseed(<replaceable>value</replaceable>);
<para>
If the <envar>PGTZ</envar> environment variable is set in the frontend
environment of a client based on libpq, libpq will automatically
environment of a client based on <application>libpq</>, <application>libpq</> will automatically
<command>SET TIMEZONE</command> to the value of
<envar>PGTZ</envar> during connection start-up.
</para>

4
doc/src/sgml/ref/set_session_auth.sgml
View File

@@ -1,4 +1,4 @@
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.6 2002/05/17 01:19:16 tgl Exp $ -->
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.7 2002/09/21 18:32:54 petere Exp $ -->
<refentry id="SQL-SET-SESSION-AUTHORIZATION">
<docinfo>
<date>2001-04-21</date>
@@ -48,7 +48,7 @@ RESET SESSION AUTHORIZATION
The session user identifier may be changed only if the initial session
user (the <firstterm>authenticated user</firstterm>) had the
superuser privilege. Otherwise, the command is accepted only if it
specifies the authenticated username.
specifies the authenticated user name.
</para>
<para>

8
doc/src/sgml/ref/unlisten.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/unlisten.sgml,v 1.19 2002/08/13 20:40:44 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/unlisten.sgml,v 1.20 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -90,7 +90,7 @@ UNLISTEN { <replaceable class="PARAMETER">notifyname</replaceable> | * }
<para>
<command>UNLISTEN</command>
is used to remove an existing <command>NOTIFY</command> registration.
UNLISTEN cancels any existing registration of the current
<command>UNLISTEN</command> cancels any existing registration of the current
<productname>PostgreSQL</productname> session as a listener on the notify
condition <replaceable class="PARAMETER">notifyname</replaceable>.
The special condition wildcard <literal>*</literal> cancels all listener registrations
@@ -117,7 +117,7 @@ UNLISTEN { <replaceable class="PARAMETER">notifyname</replaceable> | * }
as a name up to 64 characters long.
</para>
<para>
The backend does not complain if you UNLISTEN something you were not
The backend does not complain if you unlisten something you were not
listening for.
Each backend will automatically execute <command>UNLISTEN *</command> when
exiting.
@@ -143,7 +143,7 @@ Asynchronous NOTIFY 'virtual' from backend with pid '8448' received
</para>
<para>
Once UNLISTEN has been executed, further NOTIFY commands will be
Once <command>UNLISTEN</> has been executed, further <command>NOTIFY</> commands will be
ignored:
<programlisting>

4
doc/src/sgml/ref/vacuum.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.25 2002/04/23 02:07:16 tgl Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.26 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -162,7 +162,7 @@ INFO: Index <replaceable class="PARAMETER">index</replaceable>: Pages 28;
<para>
<command>VACUUM</command> reclaims storage occupied by deleted tuples.
In normal <productname>PostgreSQL</productname> operation, tuples that
are DELETEd or obsoleted by UPDATE are not physically removed from
are deleted or obsoleted by UPDATE are not physically removed from
their table; they remain present until a <command>VACUUM</command> is
done. Therefore it's necessary to do <command>VACUUM</command>
periodically, especially on frequently-updated tables.

50
doc/src/sgml/ref/vacuumdb.sgml
View File

@@ -1,5 +1,5 @@
<!--
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.25 2002/09/05 22:05:50 momjian Exp $
$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.26 2002/09/21 18:32:54 petere Exp $
PostgreSQL documentation
-->
@@ -79,8 +79,8 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-d <replaceable class="parameter">dbname</replaceable></term>
<term>--dbname <replaceable class="parameter">dbname</replaceable></term>
<term><option>-d <replaceable class="parameter">dbname</replaceable></option></term>
<term><option>--dbname <replaceable class="parameter">dbname</replaceable></option></term>
<listitem>
<para>
Specifies the name of the database to be cleaned or analyzed.
@@ -94,8 +94,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-a</term>
<term>--all</term>
<term><option>-a</option></term>
<term><option>--all</option></term>
<listitem>
<para>
Vacuum all databases.
@@ -104,8 +104,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-f</term>
<term>--full</term>
<term><option>-f</option></term>
<term><option>--full</option></term>
<listitem>
<para>
Perform <quote>full</quote> vacuuming.
@@ -114,8 +114,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-v</term>
<term>--verbose</term>
<term><option>-v</option></term>
<term><option>--verbose</option></term>
<listitem>
<para>
Print detailed information during processing.
@@ -124,8 +124,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-z</term>
<term>--analyze</term>
<term><option>-z</option></term>
<term><option>--analyze</option></term>
<listitem>
<para>
Calculate statistics for use by the optimizer.
@@ -134,8 +134,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-t <replaceable class="parameter">table</replaceable> [ (<replaceable class="parameter">column</replaceable> [,...]) ]</term>
<term>--table <replaceable class="parameter">table</replaceable> [ (<replaceable class="parameter">column</replaceable> [,...]) ]</term>
<term><option>-t <replaceable class="parameter">table</replaceable> [ (<replaceable class="parameter">column</replaceable> [,...]) ]</option></term>
<term><option>--table <replaceable class="parameter">table</replaceable> [ (<replaceable class="parameter">column</replaceable> [,...]) ]</option></term>
<listitem>
<para>
Clean or analyze <replaceable class="parameter">table</replaceable> only.
@@ -160,8 +160,8 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term>-h <replaceable class="parameter">host</replaceable></term>
<term>--host <replaceable class="parameter">host</replaceable></term>
<term><option>-h <replaceable class="parameter">host</replaceable></></term>
<term><option>--host <replaceable class="parameter">host</replaceable></></term>
<listitem>
<para>
Specifies the host name of the machine on which the
@@ -173,8 +173,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-p <replaceable class="parameter">port</replaceable></term>
<term>--port <replaceable class="parameter">port</replaceable></term>
<term><option>-p <replaceable class="parameter">port</replaceable></></term>
<term><option>--port <replaceable class="parameter">port</replaceable></></term>
<listitem>
<para>
Specifies the Internet TCP/IP port or local Unix domain socket file
@@ -185,8 +185,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-U <replaceable class="parameter">username</replaceable></term>
<term>--username <replaceable class="parameter">username</replaceable></term>
<term><option>-U <replaceable class="parameter">username</replaceable></></term>
<term><option>--username <replaceable class="parameter">username</replaceable></></term>
<listitem>
<para>
User name to connect as
@@ -195,8 +195,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-W</term>
<term>--password</term>
<term><option>-W</></term>
<term><option>--password</></term>
<listitem>
<para>
Force password prompt.
@@ -205,8 +205,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-e</term>
<term>--echo</term>
<term><option>-e</></term>
<term><option>--echo</></term>
<listitem>
<para>
Echo the commands that <application>vacuumdb</application> generates
@@ -216,8 +216,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term>-q</term>
<term>--quiet</term>
<term><option>-q</></term>
<term><option>--quiet</></term>
<listitem>
<para>
Do not display a response.