diff --git a/doc/src/sgml/bki.sgml b/doc/src/sgml/bki.sgml
index 75d32e42cbc432afd32e6d179d9b785a41e592a0..4ea0f5f92ba91236f687f7f2683e7bb11e2ce1b7 100644
--- a/doc/src/sgml/bki.sgml
+++ b/doc/src/sgml/bki.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/bki.sgml,v 1.9 2001/11/21 22:57:01 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/bki.sgml,v 1.10 2002/03/22 19:20:02 petere Exp $
-->
<chapter id="bki">
@@ -23,7 +23,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/bki.sgml,v 1.9 2001/11/21 22:57:01 tgl Exp
part of building and installing <productname>PostgreSQL</productname>
by a program named <filename>genbki.sh</filename> from some
specially formatted C header files in the source tree. The created
- BKI file is called <filename>postgres.bki</filename> and is
+ <acronym>BKI</acronym> file is called <filename>postgres.bki</filename> and is
normally installed in the
<filename>share</filename> subdirectory of the installation tree.
</para>
@@ -46,7 +46,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/bki.sgml,v 1.9 2001/11/21 22:57:01 tgl Exp
</para>
<para>
- BKI input consists of a sequence of commands. Commands are made up
+ <acronym>BKI</acronym> input consists of a sequence of commands. Commands are made up
of a number of tokens, depending on the syntax of the command.
Tokens are usually separated by whitespace, but need not be if
there is no ambiguity. There is no special command separator; the
@@ -64,7 +64,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/bki.sgml,v 1.9 2001/11/21 22:57:01 tgl Exp
</sect1>
<sect1 id="bki-commands">
- <title>BKI Commands</title>
+ <title><acronym>BKI</acronym> Commands</title>
<variablelist>
<varlistentry>
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 5db408f6d0f1f529716ed04ea6152a76ac551aed..b72b083617981df3a558446d9fb648e347bedf00 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -1,6 +1,6 @@
<!--
Documentation of the system catalogs, directed toward PostgreSQL developers
- $Header: /cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v 2.35 2002/03/20 19:43:24 tgl Exp $
+ $Header: /cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v 2.36 2002/03/22 19:20:03 petere Exp $
-->
<chapter id="catalogs">
@@ -222,7 +222,7 @@
<entry>aggbasetype</entry>
<entry><type>oid</type></entry>
<entry>pg_type.oid</entry>
- <entry>The input datatype for this aggregate function</entry>
+ <entry>The input data type for this aggregate function</entry>
</row>
<row>
<entry>aggtranstype</entry>
@@ -386,8 +386,8 @@
of statistics accumulated for this column by
<command>ANALYZE</command>.
A zero value indicates that no statistics should be collected.
- The exact meaning of positive values is datatype-dependent.
- For scalar datatypes, <structfield>attstattarget</structfield>
+ The exact meaning of positive values is data type-dependent.
+ For scalar data types, <structfield>attstattarget</structfield>
is both the target number of <quote>most common values</quote>
to collect, and the target number of histogram bins to create.
</entry>
@@ -533,7 +533,7 @@
<title>pg_class</title>
<para>
- <structname>pg_class</structname> catalogues tables and mostly
+ <structname>pg_class</structname> catalogs tables and mostly
everything else that has columns or is otherwise similar to a
table. This includes indexes (but see also
<structname>pg_index</structname>), sequences, views, and some
@@ -584,7 +584,7 @@
<entry>relam</entry>
<entry><type>oid</type></entry>
<entry>pg_am.oid</entry>
- <entry>If this is an index, the access method used (btree, hash, etc.)</entry>
+ <entry>If this is an index, the access method used (B-tree, hash, etc.)</entry>
</row>
<row>
@@ -624,7 +624,7 @@
<entry><type>oid</type></entry>
<entry>pg_class.oid</entry>
<entry>
- Oid of the TOAST table associated with this table, 0 if none.
+ OID of the TOAST table associated with this table, 0 if none.
The TOAST table stores large attributes <quote>out of
line</quote> in a secondary table.
</entry>
@@ -909,7 +909,7 @@
The pg_description table can store an optional description or
comment for each database object. Descriptions can be manipulated
with the <command>COMMENT</command> command. Client applications
- can view the descriptions by joining with this table. Many builtin
+ can view the descriptions by joining with this table. Many built-in
system objects have comments associated with them that are shown by
<application>psql</application>'s <literal>\d</literal> commands.
</para>
@@ -1648,7 +1648,7 @@
<entry><type>bool</type></entry>
<entry></entry>
<entry>Function returns a set (ie, multiple values of the specified
- datatype)</entry>
+ data type)</entry>
</row>
<row>
@@ -2128,7 +2128,7 @@
<entry></entry>
<entry>Column data values of the appropriate kind for the Nth
<quote>slot</quote>, or NULL if the slot kind does not store any data values.
- For datatype independence, all column data values are converted
+ For data-type independence, all column data values are converted
to external textual form and stored as TEXT datums.
</entry>
</row>
@@ -2271,7 +2271,7 @@
<title>pg_type</title>
<para>
- This catalog stores information about datatypes. Scalar types
+ This catalog stores information about data types. Scalar types
(<quote>base types</>) are created with <command>CREATE TYPE</command>.
A complex type is also created for each table in the database, to
represent the row structure of the table. It is also possible to create
@@ -2369,7 +2369,7 @@
<entry></entry>
<entry>Character that separates two values of this type when parsing
array input. Note that the delimiter is associated with the array
- element datatype, not the array datatype.</entry>
+ element data type, not the array data type.</entry>
</row>
<row>
@@ -2402,7 +2402,7 @@
<type>name</type> and <type>oidvector</type>.
If a fixed-length type has a <structfield>typelem</structfield> then
its internal representation must be N values of the
- <structfield>typelem</structfield> datatype with no other data.
+ <structfield>typelem</structfield> data type with no other data.
Variable-length array types have a header defined by the array
subroutines.
</entry>
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index a5f1506145eaad95ed50a20e4b614561dc42bbd1..29cc7e528efb1ca77583c3edf79f22381e234e3d 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.22 2002/03/05 05:52:42 momjian Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.23 2002/03/22 19:20:05 petere Exp $ -->
<chapter id="charset">
<title>Localization</>
@@ -178,7 +178,7 @@ export LANG=sv_SE
by recording the values of <envar>LC_COLLATE</> and <envar>LC_CTYPE</>
that are seen by <application>initdb</>. The server automatically adopts
those two values when it is started; only the other <envar>LC_</>
- categories can be set from the environment at server startup.
+ categories can be set from the environment at server start-up.
In short, only one collation order can be used in a database cluster,
and it is chosen at <application>initdb</> time.
</para>
diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index 0f0b2eeac62bb4e985905250847cfa564eb05453..76542f987206319ff13e490b078245918dfa2d59 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/client-auth.sgml,v 1.32 2002/01/20 22:19:55 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/client-auth.sgml,v 1.33 2002/03/22 19:20:06 petere Exp $
-->
<chapter id="client-authentication">
@@ -366,7 +366,7 @@ hostssl <replaceable>database</replaceable> <replaceable>IP-address</replaceable
<indexterm>
<primary>SIGHUP</primary>
</indexterm>
- The <filename>pg_hba.conf</filename> file is read on startup
+ The <filename>pg_hba.conf</filename> file is read on start-up
and when the <application>postmaster</> receives a
<systemitem>SIGHUP</systemitem> signal. If you edit the file on an
active system, you will need to signal the <application>postmaster</>
@@ -750,7 +750,7 @@ local all md5 admins
<indexterm>
<primary>SIGHUP</primary>
</indexterm>
- The <filename>pg_ident.conf</filename> file is read on startup
+ The <filename>pg_ident.conf</filename> file is read on start-up
and when the <application>postmaster</> receives a
<systemitem>SIGHUP</systemitem> signal. If you edit the file on an
active system, you will need to signal the <application>postmaster</>
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 4738954ab79b844c2af771aa3c4266868e7e166e..a792d52e42486fb2f2ac4961f53913f457d728b6 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.85 2002/03/05 06:14:45 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.86 2002/03/22 19:20:07 petere Exp $
-->
<chapter id="datatype">
@@ -1522,31 +1522,31 @@ SELECT b, char_length(b) FROM test2;
</thead>
<tbody>
<row>
- <entry>04:05:06.789</entry>
+ <entry><literal>04:05:06.789</literal></entry>
<entry>ISO 8601</entry>
</row>
<row>
- <entry>04:05:06</entry>
+ <entry><literal>04:05:06</literal></entry>
<entry>ISO 8601</entry>
</row>
<row>
- <entry>04:05</entry>
+ <entry><literal>04:05</literal></entry>
<entry>ISO 8601</entry>
</row>
<row>
- <entry>040506</entry>
+ <entry><literal>040506</literal></entry>
<entry>ISO 8601</entry>
</row>
<row>
- <entry>04:05 AM</entry>
+ <entry><literal>04:05 AM</literal></entry>
<entry>Same as 04:05; AM does not affect value</entry>
</row>
<row>
- <entry>04:05 PM</entry>
+ <entry><literal>04:05 PM</literal></entry>
<entry>Same as 16:05; input hour must be <= 12</entry>
</row>
<row>
- <entry>allballs</entry>
+ <entry><literal>allballs</literal></entry>
<entry>Same as 00:00:00</entry>
</row>
</tbody>
@@ -1811,39 +1811,39 @@ January 8 04:05:06 1999 PST
</thead>
<tbody>
<row>
- <entry>epoch</entry>
+ <entry><literal>epoch</literal></entry>
<entry>1970-01-01 00:00:00+00 (Unix system time zero)</entry>
</row>
<row>
- <entry>infinity</entry>
+ <entry><literal>infinity</literal></entry>
<entry>Later than other valid times</entry>
</row>
<row>
- <entry>-infinity</entry>
+ <entry><literal>-infinity</literal></entry>
<entry>Earlier than other valid times</entry>
</row>
<row>
- <entry>invalid</entry>
+ <entry><literal>invalid</literal></entry>
<entry>Illegal entry</entry>
</row>
<row>
- <entry>now</entry>
+ <entry><literal>now</literal></entry>
<entry>Current transaction time</entry>
</row>
<row>
- <entry>today</entry>
+ <entry><literal>today</literal></entry>
<entry>Midnight today</entry>
</row>
<row>
- <entry>tomorrow</entry>
+ <entry><literal>tomorrow</literal></entry>
<entry>Midnight tomorrow</entry>
</row>
<row>
- <entry>yesterday</entry>
+ <entry><literal>yesterday</literal></entry>
<entry>Midnight yesterday</entry>
</row>
<row>
- <entry>zulu, allballs, z</entry>
+ <entry><literal>zulu</>, <literal>allballs</>, <literal>z</></entry>
<entry>00:00:00.00 GMT</entry>
</row>
</tbody>
@@ -2083,7 +2083,7 @@ January 8 04:05:06 1999 PST
</listitem>
<listitem>
<para>
- The <envar>PGTZ</envar> environment variable, if set at the client, is used by libpq
+ The <envar>PGTZ</envar> environment variable, if set at the client, is used by <application>libpq</application>
to send a <command>SET TIME ZONE</command> command to the backend upon
connection.
</para>
@@ -2117,7 +2117,7 @@ January 8 04:05:06 1999 PST
<note>
<para>
- If the runtime option <literal>AUSTRALIAN_TIMEZONES</literal> is set
+ If the run-time option <literal>AUSTRALIAN_TIMEZONES</literal> is set
then <literal>CST</literal> and <literal>EST</literal> refer to
Australian time zones, not American ones.
</para>
diff --git a/doc/src/sgml/datetime.sgml b/doc/src/sgml/datetime.sgml
index 2bafee88539770fa2d17e6cb7b5dd9183fb1f550..47f857af8b78392bfc4e37a03ecc5f6127a437f0 100644
--- a/doc/src/sgml/datetime.sgml
+++ b/doc/src/sgml/datetime.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.26 2002/01/20 22:19:55 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.27 2002/03/22 19:20:07 petere Exp $
Date/time details
-->
@@ -150,31 +150,31 @@ Date/time details
</thead>
<tbody>
<row>
- <entry>ABSTIME</entry>
+ <entry><literal>ABSTIME</literal></entry>
<entry>Keyword ignored</entry>
</row>
<row>
- <entry>AM</entry>
+ <entry><literal>AM</literal></entry>
<entry>Time is before 12:00</entry>
</row>
<row>
- <entry>AT</entry>
+ <entry><literal>AT</literal></entry>
<entry>Keyword ignored</entry>
</row>
<row>
- <entry>JULIAN, JD, J</entry>
+ <entry><literal>JULIAN</>, <literal>JD</>, <literal>J</></entry>
<entry>Next field is Julian Day</entry>
</row>
<row>
- <entry>ON</entry>
+ <entry><literal>ON</literal></entry>
<entry>Keyword ignored</entry>
</row>
<row>
- <entry>PM</entry>
+ <entry><literal>PM</literal></entry>
<entry>Time is on or after after 12:00</entry>
</row>
<row>
- <entry>T</entry>
+ <entry><literal>T</literal></entry>
<entry>Next field is time</entry>
</row>
</tbody>
@@ -186,7 +186,7 @@ Date/time details
The keyword <literal>ABSTIME</literal> is ignored for historical
reasons; in very old releases of
<productname>PostgreSQL</productname> invalid <type>ABSTIME</type>
- fields were emitted as <quote>Invalid Abstime</quote>. This is no
+ fields were emitted as <literal>Invalid Abstime</literal>. This is no
longer the case however and this keyword will likely be dropped in
a future release.
</para>
@@ -753,7 +753,7 @@ Date/time details
</para>
<para>
- If the runtime option <literal>AUSTRALIAN_TIMEZONES</literal> is set
+ If the run-time option <literal>AUSTRALIAN_TIMEZONES</literal> is set
then <literal>CST</literal>, <literal>EST</literal>, and
<literal>SAT</literal> will be
interpreted as Australian timezone names. Without this option,
diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index 4d975d73b599eb3ffffeca4365b15fccc60df232..7df4995cfb858624ce23747eab1bf4c0c5306359 100644
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.40 2002/01/20 22:19:55 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.41 2002/03/22 19:20:08 petere Exp $ -->
<appendix id="docguide">
<title>Documentation</title>
@@ -116,7 +116,7 @@
<sect1 id="doc-toolsets">
- <title>Toolsets</title>
+ <title>Tool Sets</title>
<para>
The following tools are used to process the documentation. Some
@@ -304,7 +304,7 @@ apt-get install docbook-stylesheets
<para>
The manual installation process of the DocBook tools is somewhat
complex, so if you have pre-built packages available, use them.
- We describe here only a standard setup, with reasonabley standard
+ We describe here only a standard setup, with reasonably standard
installation paths, and no <quote>fancy</quote> features. For
details, you should study the documentation of the respective
package, and read <acronym>SGML</acronym> introductory material.
@@ -682,7 +682,7 @@ gmake man
<para>
The hardcopy Postscript documentation is generated by converting the
<acronym>SGML</acronym> source code to <acronym>RTF</acronym>, then
- importing into <productname>ApplixWare</productname>.
+ importing into <productname>Applixware</productname>.
After a little cleanup (see the following
section) the output is <quote>printed</quote> to a postscript file.
</para>
@@ -710,14 +710,14 @@ gmake man
</para>
<procedure>
- <title>Applixware <acronym>RTF</acronym> Cleanup</title>
+ <title><productname>Applixware</productname> <acronym>RTF</acronym> Cleanup</title>
<para>
<application>jade</application>, an integral part of the
hardcopy procedure, omits specifying a default style for body
text. In the past, this undiagnosed problem led to a long process
of Table of Contents (ToC) generation. However, with great help
- from the ApplixWare folks the symptom was diagnosed and a
+ from the <productname>Applixware</productname> folks the symptom was diagnosed and a
workaround is available.
</para>
@@ -759,7 +759,7 @@ gmake man
<para>
The script adds <literal>{\s0 Normal;}</literal> as
- the zero-th style in the document. According to ApplixWare, the
+ the zero-th style in the document. According to <productname>Applixware</productname>, the
RTF standard would prohibit adding an implicit zero-th style,
though M$Word happens to handle this case. For repairing
<sgmltag>REFENTRY</sgmltag> sections, the script replaces
@@ -769,14 +769,14 @@ gmake man
<step performance="required">
<para>
- Open a new document in <productname>Applix Words</productname> and
+ Open a new document in <productname>Applixware Words</productname> and
then import the <acronym>RTF</acronym> file.
</para>
</step>
<step performance="required">
<para>
- Generate a new ToC using ApplixWare.
+ Generate a new ToC using <productname>Applixware</productname>.
</para>
<substeps>
@@ -795,7 +795,7 @@ gmake man
first three levels of headers for inclusion in the ToC.
This will
replace the existing lines imported in the RTF with a native
- ApplixWare ToC.
+ <productname>Applixware</productname> ToC.
</para>
</step>
@@ -887,7 +887,7 @@ gmake man
<listitem>
<para>
Insert figures into the document. Center each figure on the page using
- the centering margins button on the ApplixWare toolbar.
+ the centering margins button on the <productname>Applixware</productname> toolbar.
<note>
<para>
@@ -969,7 +969,7 @@ Later stylesheets seem to not need this adjustment - thomas 2001-11-29
<step performance="required">
<para>
- Save the document as native Applix Words format to allow easier last
+ Save the document as native <productname>Applixware Words</productname> format to allow easier last
minute editing later.
</para>
</step>
@@ -1110,7 +1110,7 @@ Later stylesheets seem to not need this adjustment - thomas 2001-11-29
<para>
<acronym>SGML</acronym> and <productname>DocBook</productname> do
not suffer from an oversupply of open-source authoring tools. The
- most common toolset is the
+ most common tool set is the
<productname>Emacs</productname>/<productname>XEmacs</productname>
editor with appropriate editing mode. On some systems
these tools are provided in a typical full installation.
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 56c7b6ac052598ddc95022df0afaecc2e58e87c2..c62394e9145ae03e56321b2b4c0b8141a07400f3 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.93 2002/01/30 21:55:33 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.94 2002/03/22 19:20:09 petere Exp $
PostgreSQL documentation
-->
@@ -3592,13 +3592,13 @@ SELECT TIMESTAMP 'now';
<row>
<entry><function>lseg</function>(<type>box</type>)</entry>
<entry><type>lseg</type></entry>
- <entry>box diagonal to lseg</entry>
+ <entry>box diagonal to <type>lseg</type></entry>
<entry><literal>lseg(box '((-1,0),(1,0))')</literal></entry>
</row>
<row>
<entry><function>lseg</function>(<type>point</type>, <type>point</type>)</entry>
<entry><type>lseg</type></entry>
- <entry>points to lseg</entry>
+ <entry>points to <type>lseg</type></entry>
<entry><literal>lseg(point '(-1,0)', point '(1,0)')</literal></entry>
</row>
<row>
@@ -3773,7 +3773,7 @@ SELECT TIMESTAMP 'now';
<row>
<entry><function>set_masklen</function>(<type>inet</type>,<type>integer</type>)</entry>
<entry><type>inet</type></entry>
- <entry>set netmask length for inet value</entry>
+ <entry>set netmask length for <type>inet</type> value</entry>
<entry><literal>set_masklen('192.168.1.5/24',16)</literal></entry>
<entry><literal>192.168.1.5/16</literal></entry>
</row>
diff --git a/doc/src/sgml/indexcost.sgml b/doc/src/sgml/indexcost.sgml
index af66a9f94a3d1b717626b6c377aa91b61c4ad79f..c30be63166c921e3fab571b807e5bdf685f50cb2 100644
--- a/doc/src/sgml/indexcost.sgml
+++ b/doc/src/sgml/indexcost.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/indexcost.sgml,v 2.10 2001/11/21 05:53:41 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/indexcost.sgml,v 2.11 2002/03/22 19:20:10 petere Exp $
-->
<chapter id="indexcost">
@@ -201,7 +201,7 @@ amcostestimate (Query *root,
<para>
Estimate and return the fraction of main-table tuples that will be visited
based on the given qual conditions. In the absence of any index-type-specific
- knowledge, use the standard optimizer function clauselist_selectivity():
+ knowledge, use the standard optimizer function <function>clauselist_selectivity()</function>:
<programlisting>
*indexSelectivity = clauselist_selectivity(root, indexQuals,
diff --git a/doc/src/sgml/jdbc.sgml b/doc/src/sgml/jdbc.sgml
index 241be88054a41dbd156414df6df688d8e8c8e048..c77817d16a49cad3032411ca3d042a5b3aa5fa51 100644
--- a/doc/src/sgml/jdbc.sgml
+++ b/doc/src/sgml/jdbc.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.35 2002/01/20 22:19:56 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.36 2002/03/22 19:20:11 petere Exp $
-->
<chapter id="jdbc">
@@ -1210,7 +1210,7 @@ public void addFunctions(ResultSet rs) throws SQLException
</para>
<para>
- Do not think that manually converting them to the oid's will
+ Do not think that manually converting them to the OIDs will
work. OK, they will for now, but they can change during
development (there was some discussion about this for V7.0),
so this is implemented to prevent any unwarranted headaches
@@ -2505,7 +2505,7 @@ public void unlink(int oid) throws SQLException
<sect1 id="jdbc-thread">
- <title>Using the driver in a multi-threaded or a servlet environment</title>
+ <title>Using the driver in a multithreaded or a servlet environment</title>
<para>
A problem with many <acronym>JDBC</acronym> drivers is that only
diff --git a/doc/src/sgml/libpgtcl.sgml b/doc/src/sgml/libpgtcl.sgml
index a6ebe9bf5aa1e426d782a328372ad5e814fb1714..7257062c0034e3e8bfc64b386707f33b5774a90f 100644
--- a/doc/src/sgml/libpgtcl.sgml
+++ b/doc/src/sgml/libpgtcl.sgml
@@ -1173,7 +1173,7 @@ pg_lo_creat <REPLACEABLE CLASS="PARAMETER">conn</REPLACEABLE> <REPLACEABLE CLASS
</TERM>
<LISTITEM>
<PARA>
-The oid of the large object created.
+The OID of the large object created.
</PARA>
</LISTITEM>
</VARLISTENTRY>
@@ -1247,7 +1247,7 @@ pg_lo_open <REPLACEABLE CLASS="PARAMETER">conn</REPLACEABLE> <REPLACEABLE CLASS=
<REPLACEABLE CLASS="PARAMETER">objOid</REPLACEABLE>
</TERM>
<LISTITEM>
-<PARA>Specifies a valid large object oid.
+<PARA>Specifies a valid large object OID.
</PARA>
</LISTITEM>
</VARLISTENTRY>
diff --git a/doc/src/sgml/libpq++.sgml b/doc/src/sgml/libpq++.sgml
index b5a24e0e2e2d66ec974e77aa23e274e4bc53ed1d..cd6d2a6a9113669fc60c0e935093df0f3e15d49d 100644
--- a/doc/src/sgml/libpq++.sgml
+++ b/doc/src/sgml/libpq++.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.40 2002/01/07 02:29:12 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.41 2002/03/22 19:20:12 petere Exp $
-->
<chapter id="libpqplusplus">
@@ -139,7 +139,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/libpq++.sgml,v 1.40 2002/01/07 02:29:
</listitem>
<listitem>
<para>
- <envar>PGOPTIONS</envar> sets additional runtime options for
+ <envar>PGOPTIONS</envar> sets additional run-time options for
the <productname>PostgreSQL</productname> backend.
</para>
</listitem>
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 843e96be883d5f45b969ab3be21bed32e690f2ea..1fb6519806a384cedc02db82107d9b97413c4d22 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.89 2002/03/11 05:03:51 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.90 2002/03/22 19:20:13 petere Exp $
-->
<chapter id="libpq">
@@ -2056,7 +2056,7 @@ used if Kerberos authentication is selected by the backend.
</listitem>
<listitem>
<para>
-<envar>PGOPTIONS</envar> sets additional runtime options for
+<envar>PGOPTIONS</envar> sets additional run-time options for
the <productname>PostgreSQL</productname> backend.
</para>
</listitem>
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 882a98382fc6c9cf14ee0729768233b7425bfef8..88b7e29a9248780ff0d36e3b8cb45ab59d8de0a0 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/monitoring.sgml,v 1.6 2001/11/29 20:43:43 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/monitoring.sgml,v 1.7 2002/03/22 19:20:14 petere Exp $
-->
<chapter id="monitoring">
@@ -132,7 +132,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
The variables <varname>STATS_COMMAND_STRING</varname>,
<varname>STATS_BLOCK_LEVEL</varname>,
and <varname>STATS_ROW_LEVEL</varname> control how much information is
- actually sent to the collector, and thus determine how much runtime
+ actually sent to the collector, and thus determine how much run-time
overhead occurs. These respectively determine whether a server process
sends its current command string, disk-block-level access statistics, and
row-level access statistics to the collector. Normally these variables are
diff --git a/doc/src/sgml/nls.sgml b/doc/src/sgml/nls.sgml
index 8bef35c57259c1c5336c36b242b7739669187c6f..75dc5859cd9d57be423f5dece3107b2366aabe19 100644
--- a/doc/src/sgml/nls.sgml
+++ b/doc/src/sgml/nls.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/nls.sgml,v 1.3 2002/01/20 22:19:56 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/nls.sgml,v 1.4 2002/03/22 19:20:15 petere Exp $ -->
<chapter id="nls">
<docinfo>
@@ -141,7 +141,7 @@ msgstr "another translated"
<title>Creating and maintaining message catalogs</title>
<para>
- Okay, so how does one create a <quote>blank</quote> message
+ OK, so how does one create a <quote>blank</quote> message
catalog? First, go into the directory that contains the program
whose messages you want to translate. If there is a file
<filename>nls.mk</filename>, then this program has been prepared
@@ -312,7 +312,7 @@ msgstr "Die Datei %2$s hat %1$u Zeichen."
<step>
<para>
- Insert this code into the startup sequence of the program:
+ Insert this code into the start-up sequence of the program:
<programlisting>
#ifdef ENABLE_NLS
#include <locale.h>
@@ -473,7 +473,7 @@ printf("number of copied files: %d", n);
<para>
If you want to communicate something to the translator, such as
about how a message is intended to line up with other output,
- precede the occurrance of the string with a comment that starts
+ precede the occurrence of the string with a comment that starts
with <literal>translator</literal>, e.g.,
<programlisting>
/* translator: This message is not what it seems to be. */
diff --git a/doc/src/sgml/odbc.sgml b/doc/src/sgml/odbc.sgml
index af6e2a8aefc7d9a275ca7a50c57e738a2785de05..cbc4062476767e7cd574f2bfa1521f462ec75028 100644
--- a/doc/src/sgml/odbc.sgml
+++ b/doc/src/sgml/odbc.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.29 2002/01/07 02:29:12 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/odbc.sgml,v 1.30 2002/03/22 19:20:16 petere Exp $
-->
<chapter id="odbc">
@@ -328,14 +328,14 @@ InstallDir = /opt/applix/axdata/axshlib
<title><application>ApplixWare</application></title>
<indexterm zone="odbc-applixware">
- <primary>ApplixWare</primary>
+ <primary>Applixware</primary>
</indexterm>
<para>
- <productname>ApplixWare</productname> has an
+ <productname>Applixware</productname> has an
<acronym>ODBC</acronym> database interface
supported on at least some platforms.
- <productname>ApplixWare</productname> 4.4.2 has been
+ <productname>Applixware</productname> 4.4.2 has been
demonstrated under Linux with <productname>PostgreSQL</productname> 7.0
using the <productname>psqlODBC</productname>
driver contained in the <productname>PostgreSQL</productname> distribution.
@@ -345,18 +345,18 @@ InstallDir = /opt/applix/axdata/axshlib
<title>Configuration</title>
<para>
- <productname>ApplixWare</productname> must be configured correctly
+ <productname>Applixware</productname> must be configured correctly
in order for it to
be able to access the <productname>PostgreSQL</productname>
<acronym>ODBC</acronym> software drivers.
</para>
<procedure>
- <title>Enabling <application>ApplixWare</application> Database Access</title>
+ <title>Enabling <application>Applixware</application> Database Access</title>
<para>
These instructions are for the 4.4.2 release of
- <productname>ApplixWare</productname> on <productname>Linux</productname>.
+ <productname>Applixware</productname> on <productname>Linux</productname>.
Refer to the <citetitle>Linux Sys Admin</citetitle> on-line book
for more detailed information.
</para>
@@ -367,7 +367,7 @@ InstallDir = /opt/applix/axdata/axshlib
<filename>elfodbc</filename> can
find <filename>libodbc.so</filename>
(the <acronym>ODBC</acronym> driver manager) shared library.
- This library is included with the <application>ApplixWare</application> distribution,
+ This library is included with the <application>Applixware</application> distribution,
but <filename>axnet.cnf</filename> needs to be modified to point to the
correct location.
</para>
@@ -425,7 +425,7 @@ TextAsLongVarchar=0
</procedure>
<procedure>
- <title>Testing <application>ApplixWare</application> ODBC Connections</title>
+ <title>Testing <application>Applixware</application> ODBC Connections</title>
<step performance="required">
<para>
@@ -550,7 +550,7 @@ TextAsLongVarchar=0
<listitem>
<para>
- The September release of <application>ApplixWare</application> 4.4.1 (the first release with official
+ The September release of <application>Applixware</application> 4.4.1 (the first release with official
<acronym>ODBC</acronym> support under Linux) shows problems when user names
exceed eight (8) characters in length.
Problem description contributed by Steve Campbell
@@ -583,7 +583,7 @@ TextAsLongVarchar=0
</sect2>
<sect2>
- <title>Debugging <application>ApplixWare</application> ODBC Connections</title>
+ <title>Debugging <application>Applixware</application> ODBC Connections</title>
<para>
One good tool for debugging connection problems uses the Unix system
@@ -594,7 +594,7 @@ TextAsLongVarchar=0
<step performance="required">
<para>
- Start <application>ApplixWare</application>.
+ Start <application>Applixware</application>.
</para>
</step>
<step performance="required">
@@ -631,7 +631,7 @@ cary 27883 0.9 31.0 12692 4596 ? S 10:24 0:04 axmain
<title>Note from Cary</title>
<para>
- Many of the error messages from <productname>ApplixWare</productname>
+ Many of the error messages from <productname>Applixware</productname>
go to <filename>stderr</filename>,
but I'm not sure where <filename>stderr</filename>
is sent, so <command>strace</command> is the way to find out.
@@ -656,13 +656,13 @@ cary 27883 0.9 31.0 12692 4596 ? S 10:24 0:04 axmain
</sect2>
<sect2>
- <title>Running the <application>ApplixWare</application> Demo</title>
+ <title>Running the <application>Applixware</application> Demo</title>
<comment>I think the condition this refers to is gone. -- petere 2002-01-07</comment>
<para>
In order to go through the
- <citetitle>ApplixWare Data Tutorial</citetitle>, you need to create
+ <citetitle>Applixware Data Tutorial</citetitle>, you need to create
the sample tables that the Tutorial refers to. The ELF Macro used to
create the tables tries to use a NULL condition
on many of the database columns,
@@ -674,7 +674,7 @@ cary 27883 0.9 31.0 12692 4596 ? S 10:24 0:04 axmain
</para>
<procedure>
- <title>Modifying the <application>ApplixWare</application> Demo</title>
+ <title>Modifying the <application>Applixware</application> Demo</title>
<step performance="required">
<para>
diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml
index d4f0c9bcd77ddd2d56f92a1eb6e6e2e41514aa25..94f49921f7e039988daab237caee836911a4003f 100644
--- a/doc/src/sgml/perform.sgml
+++ b/doc/src/sgml/perform.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.17 2002/03/06 06:44:31 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.18 2002/03/22 19:20:17 petere Exp $
-->
<chapter id="performance-tips">
@@ -252,7 +252,7 @@ Hash Join (cost=181.22..564.83 rows=49 width=296)
<para>
It is possible to check on the accuracy of the planner's estimated costs
by using EXPLAIN ANALYZE. This command actually executes the query,
- and then displays the true runtime accumulated within each plan node
+ and then displays the true run time accumulated within each plan node
along with the same estimated costs that a plain EXPLAIN shows.
For example, we might get a result like this:
@@ -289,12 +289,12 @@ Total runtime: 30.67 msec
</para>
<para>
- The <quote>total runtime</quote> shown by EXPLAIN ANALYZE includes
- executor startup and shutdown time, as well as time spent processing
+ The <literal>Total runtime</literal> shown by <command>EXPLAIN ANALYZE</command> includes
+ executor start-up and shutdown time, as well as time spent processing
the result tuples. It does not include parsing, rewriting, or planning
- time. For a SELECT query, the total runtime will normally be just a
+ time. For a SELECT query, the total run time will normally be just a
little larger than the total time reported for the top-level plan node.
- For INSERT, UPDATE, and DELETE queries, the total runtime may be
+ For INSERT, UPDATE, and DELETE queries, the total run time may be
considerably larger, because it includes the time spent processing the
output tuples. In these queries, the time for the top plan node
essentially is the time spent computing the new tuples and/or locating
diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index e0840c822a3efc562542a3250636abf6aa591fa2..2e38a5c7917d3ce2c03abe99d14192c2409e340f 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/plpython.sgml,v 1.9 2002/03/06 19:05:57 momjian Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/plpython.sgml,v 1.10 2002/03/22 19:20:18 petere Exp $ -->
<chapter id="plpython">
<title>PL/Python - Python Procedural Language</title>
@@ -92,7 +92,7 @@ def __plpython_procedure_myfunc_23456():
return args[0]
</programlisting>
- where 23456 is the Oid of the function.
+ where 23456 is the OID of the function.
</para>
<para>
diff --git a/doc/src/sgml/plsql.sgml b/doc/src/sgml/plsql.sgml
index b05e965bd46ccadbffe5cf47ff2d3dfab04c7aa1..8e87b41d9b7d111e7e7c516f3a878f42da75ec5a 100644
--- a/doc/src/sgml/plsql.sgml
+++ b/doc/src/sgml/plsql.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/plsql.sgml,v 2.53 2002/01/07 02:29:13 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/plsql.sgml,v 2.54 2002/03/22 19:20:18 petere Exp $
-->
<chapter id="plpgsql">
@@ -392,7 +392,7 @@ url VARCHAR;
The CONSTANT option prevents the variable from being assigned to,
so that its value remains constant for the duration of the block.
If NOT NULL
- is specified, an assignment of a NULL value results in a runtime
+ is specified, an assignment of a NULL value results in a run-time
error. All variables declared as NOT NULL
must have a non-NULL default value specified.
</para>
@@ -453,7 +453,7 @@ END;
</sect2>
<sect2 id="plpgsql-declaration-rowtypes">
- <title>Rowtypes</title>
+ <title>Row Types</title>
<para>
<synopsis>
@@ -463,7 +463,7 @@ END;
<para>
A variable of a composite type is called a <firstterm>row</>
- variable (or <firstterm>rowtype</> variable). Such a variable can hold a
+ variable (or <firstterm>row-type</> variable). Such a variable can hold a
whole row of a SELECT or FOR
query result, so long as that query's column set matches the declared
type of the variable. The individual fields of the row value are
@@ -487,8 +487,8 @@ END;
<para>
Only the user-defined attributes of a table row are accessible in a
- rowtype variable, not OID or other system attributes (because the
- row could be from a view). The fields of the rowtype inherit the
+ row-type variable, not OID or other system attributes (because the
+ row could be from a view). The fields of the row type inherit the
table's field size or precision for data types such as
<type>char(n)</type>.
</para>
@@ -504,17 +504,17 @@ END;
</para>
<para>
- Record variables are similar to rowtype variables, but they have no
+ Record variables are similar to row-type variables, but they have no
predefined structure. They take on the actual row structure of the
row they are assigned during a SELECT or FOR command. The substructure
of a record variable can change each time it is assigned to.
A consequence of this is that until a record variable is first assigned
to, <emphasis>it has no</> substructure, and any attempt to access a
- field in it will draw a runtime error.
+ field in it will draw a run-time error.
</para>
<para>
- Note that <literal>RECORD</> is not a true datatype, only a placeholder.
+ Note that <literal>RECORD</> is not a true data type, only a placeholder.
Thus, for example, one cannot declare a function returning
<literal>RECORD</>.
</para>
@@ -711,7 +711,7 @@ CREATE FUNCTION logfunc2 (TEXT) RETURNS TIMESTAMP AS '
<application>PL/pgSQL</application> interpreter casts this
string to the <type>timestamp</type> type by calling the
<function>text_out()</function> and <function>timestamp_in()</function>
- functions for the conversion. So, the computed timestamp is updated
+ functions for the conversion. So, the computed time stamp is updated
on each execution as the programmer expects.
</para>
@@ -720,7 +720,7 @@ CREATE FUNCTION logfunc2 (TEXT) RETURNS TIMESTAMP AS '
connection. When fields of a record variable are used in expressions or
statements, the data types of the
fields must not change between calls of one and the same expression,
- since the expression will be planned using the datatype that is present
+ since the expression will be planned using the data type that is present
when the expression is first reached.
Keep this in mind when writing trigger procedures that handle events
for more than one table. (EXECUTE can be used to get around this
@@ -766,7 +766,7 @@ CREATE FUNCTION logfunc2 (TEXT) RETURNS TIMESTAMP AS '
converted by the <application>PL/pgSQL</application> interpreter using
the result type's output-function and
the variable type's input-function. Note that this could potentially
- result in runtime errors generated by the input function, if the
+ result in run-time errors generated by the input function, if the
string form of the result value is not acceptable to the input function.
</para>
@@ -784,7 +784,7 @@ tax := subtotal * 0.06;
<para>
The result of a SELECT command yielding multiple columns (but
- only one row) can be assigned to a record variable, rowtype
+ only one row) can be assigned to a record variable, row-type
variable, or list of scalar variables. This is done by:
<synopsis>
@@ -802,9 +802,9 @@ SELECT INTO <replaceable>target</replaceable> <replaceable>expressions</replacea
<para>
If a row or a variable list is used as target, the selected values
- must exactly match the structure of the target(s), or a runtime error
+ must exactly match the structure of the target(s), or a run-time error
occurs. When a record variable is the target, it automatically
- configures itself to the rowtype of the query result columns.
+ configures itself to the row type of the query result columns.
</para>
<para>
@@ -908,7 +908,7 @@ PERFORM create_mv(''cs_session_page_requests_mv'',''
<para>
Oftentimes you will want to generate dynamic queries inside
your <application>PL/pgSQL</application> functions, that is,
- queries that will involve different tables or different datatypes
+ queries that will involve different tables or different data types
each time they are executed. <application>PL/pgSQL</application>'s
normal attempts to cache plans for queries will not work in such
scenarios. To handle this sort of problem, the EXECUTE statement
@@ -1034,7 +1034,7 @@ GET DIAGNOSTICS <replaceable>variable</replaceable> = <replaceable>item</replace
status items are <varname>ROW_COUNT</>, the number of rows
processed by the last <acronym>SQL</acronym> query sent down to
the <acronym>SQL</acronym> engine; and <varname>RESULT_OID</>,
- the Oid of the last row inserted by the most recent
+ the OID of the last row inserted by the most recent
<acronym>SQL</acronym> query. Note that <varname>RESULT_OID</>
is only useful after an INSERT query.
</para>
@@ -1063,14 +1063,14 @@ RETURN <replaceable>expression</replaceable>;
The function terminates and the value of
<replaceable>expression</replaceable> will be returned to the
upper executor.
- The expression's result will be automatically casted into the
+ The expression's result will be automatically cast into the
function's return type as described for assignments.
</para>
<para>
The return value of a function cannot be left undefined. If control
reaches the end of the top-level block of
- the function without hitting a RETURN statement, a runtime error
+ the function without hitting a RETURN statement, a run-time error
will occur.
</para>
</sect2>
@@ -1429,7 +1429,7 @@ END LOOP;
two kinds of FOR loops (integer or record-returning) by checking
whether the target variable mentioned just after FOR has been
declared as a record/row variable. If not, it's presumed to be
- an integer FOR loop. This can cause rather unintuitive error
+ an integer FOR loop. This can cause rather nonintuitive error
messages when the true problem is, say, that one has
misspelled the FOR variable name.
</para>
@@ -1450,7 +1450,7 @@ END LOOP;
use a cursor internally to avoid memory problems.) A more interesting
possibility is that a function can return a reference to a cursor
that it has set up, allowing the caller to read the rows. This
- provides one way of returning a rowset from a function.
+ provides one way of returning a row set from a function.
</para>
<sect2 id="plpgsql-cursor-declarations">
@@ -1458,7 +1458,7 @@ END LOOP;
<para>
All access to cursors in <application>PL/pgSQL</> goes through
- cursor variables, which are always of the special datatype
+ cursor variables, which are always of the special data type
<type>refcursor</>. One way to create a cursor variable
is just to declare it as a variable of type <type>refcursor</>.
Another way is to use the cursor declaration syntax,
@@ -1482,7 +1482,7 @@ DECLARE
curs2 CURSOR FOR SELECT * from tenk1;
curs3 CURSOR (key int) IS SELECT * from tenk1 where unique1 = key;
</programlisting>
- All three of these variables have the datatype <type>refcursor</>,
+ All three of these variables have the data type <type>refcursor</>,
but the first may be used with any query, while the second has
a fully specified query already <firstterm>bound</> to it, and the last
has a parameterized query bound to it. (<literal>key</> will be
diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
index af00cb733255ac02914d61b4c360a1ea4c0c3193..a6109b0195da7df4b2303a76dda74055dbaa561c 100644
--- a/doc/src/sgml/pltcl.sgml
+++ b/doc/src/sgml/pltcl.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.19 2002/03/06 19:05:58 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.20 2002/03/22 19:20:21 petere Exp $
-->
<chapter id="pltcl">
@@ -120,7 +120,7 @@ CREATE FUNCTION tcl_max (integer, integer) RETURNS integer AS '
if the actual value of an argument is NULL, the corresponding
<literal>$n</literal> variable will be set to an empty string.
To detect whether a particular argument is NULL, use the function
- <literal>argisnull</>. For example, suppose that we wanted tcl_max
+ <literal>argisnull</>. For example, suppose that we wanted <function>tcl_max</function>
with one null and one non-null argument to return the non-null
argument, rather than NULL:
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index f8848a3fe429eef0b7812d53c31bf50b8b5fb099..06901a8e335295a1fac75177ecedd2661ee5a46f 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/protocol.sgml,v 1.23 2001/11/22 01:22:10 tgl Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/protocol.sgml,v 1.24 2002/03/22 19:20:21 petere Exp $ -->
<chapter id="protocol">
<title>Frontend/Backend Protocol</title>
@@ -67,7 +67,7 @@
<para>
Packets are sent as a data stream. The first byte determines what
should be expected in the rest of the packet. The exceptions are
- packets sent as part of the startup and authentication exchange,
+ packets sent as part of the start-up and authentication exchange,
which comprise a packet length followed by the packet itself. The
difference is historical.
</para>
diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml
index 3819bf8d964346f90c8b7f1216984149727cf391..d8461c4f4fbaaa8ccf5b8428c62c25a943b61d59 100644
--- a/doc/src/sgml/ref/alter_user.sgml
+++ b/doc/src/sgml/ref/alter_user.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.20 2002/03/01 22:45:07 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.21 2002/03/22 19:20:36 petere Exp $
PostgreSQL documentation
-->
@@ -189,7 +189,7 @@ ALTER USER <replaceable class="PARAMETER">username</replaceable> RESET <replacea
<para>
Use <xref linkend="SQL-CREATEUSER" endterm="SQL-CREATEUSER-title">
to add new users, and <xref linkend="SQL-DROPUSER"
- endterm="SQL-DROPUSER-title"> to remoe a user.
+ endterm="SQL-DROPUSER-title"> to remove a user.
</para>
<para>
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index b4a226876a9076f5f1adce09e4ec411b604fb72f..a2bbd1c0aaff8e9b5039229c256996fadf29906a 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.28 2002/02/12 21:25:34 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.29 2002/03/22 19:20:37 petere Exp $
PostgreSQL documentation
-->
@@ -279,7 +279,7 @@ ERROR: <replaceable>reason</replaceable>
</para>
<para>
- It is recommended that the filename used in <command>COPY</command>
+ It is recommended that the file name used in <command>COPY</command>
always be specified as an absolute path. This is enforced by the backend
in the case of <command>COPY TO</command>, but for <command>COPY
FROM</command> you do have the option of reading from a file specified
diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index 25c33c7b6c71c063f3a259957a863d01b49b2469..c6ee3e25efddf884e1f1171a6a165e2515d0e568 100644
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_function.sgml,v 1.33 2002/03/01 20:38:12 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_function.sgml,v 1.34 2002/03/22 19:20:37 petere Exp $
-->
<refentry id="SQL-CREATEFUNCTION">
@@ -332,7 +332,7 @@ CREATE TABLE product (
user-defined type complex, and the internal type point. The
function is implemented by a dynamically loaded object that was
compiled from C source (we illustrate the now-deprecated alternative
- of specifying the exact pathname to the shared object file).
+ of specifying the absolute file name to the shared object file).
For <productname>PostgreSQL</productname> to
find a type conversion function automatically, the SQL function has
to have the same name as the return type, and so overloading is
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index a3f11d8b0e0ecf2a5fba865149cee7ad8b1f6f05..ed4bb66aadc28c4026d53139ec3f1db22afd0a39 100644
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.26 2002/01/20 22:19:56 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.27 2002/03/22 19:20:38 petere Exp $
PostgreSQL documentation
-->
@@ -82,7 +82,7 @@ CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable>
<variablelist>
<varlistentry>
- <term>BTREE</term>
+ <term><literal>BTREE</></term>
<listitem>
<para>
an implementation of Lehman-Yao
@@ -92,7 +92,7 @@ CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable>
</varlistentry>
<varlistentry>
- <term>RTREE</term>
+ <term><literal>RTREE</></term>
<listitem>
<para>implements standard R-trees using Guttman's
quadratic split algorithm.
@@ -101,7 +101,7 @@ CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable>
</varlistentry>
<varlistentry>
- <term>HASH</term>
+ <term><literal>HASH</></term>
<listitem>
<para>
an implementation of Litwin's linear hashing.
@@ -110,7 +110,7 @@ CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable>
</varlistentry>
<varlistentry>
- <term>GIST</term>
+ <term><literal>GIST</></term>
<listitem>
<para>
Generalized Index Search Trees.
@@ -270,11 +270,11 @@ ERROR: Cannot create index: 'index_name' already exists.
<para>
All functions and operators used in an index definition must be
- <firstterm>cachable</>, that is, their results must depend only on
+ <firstterm>cacheable</>, that is, their results must depend only on
their input arguments and never on any outside influence (such as
the contents of another table or the current time). This restriction
ensures that the behavior of the index is well-defined. To use a
- user-defined function in an index, remember to mark the function cachable
+ user-defined function in an index, remember to mark the function cacheable
when you create it.
</para>
@@ -329,7 +329,7 @@ ERROR: Cannot create index: 'index_name' already exists.
</para>
<para>
- Currently, only the B-tree and gist access methods support multi-column
+ Currently, only the B-tree and gist access methods support multicolumn
indexes. Up to 16 keys may be specified by default (this limit
can be altered when building
<application>PostgreSQL</application>). Only B-tree currently supports
diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
index 7f33ca47fab278e61c4dfff977605cab5b724d25..e3b41ec5dac85a649cde42a1a5ce44147230caa6 100644
--- a/doc/src/sgml/ref/create_operator.sgml
+++ b/doc/src/sgml/ref/create_operator.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.24 2002/01/20 22:19:56 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.25 2002/03/22 19:20:39 petere Exp $
PostgreSQL documentation
-->
@@ -309,7 +309,7 @@ MYBOXES.description !== box '((0,0), (1,1))'
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 hashjoined.)
+ not be hash-joined.)
The HASHES flag indicates to the query optimizer that a hash join
may safely be used with this operator.</para>
<para>
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index ab1a8eeba15fc8a8c1d8fa765c39b08a5cccdf43..c9cc209843a35271a0987c1c76605cdc546520a9 100644
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.32 2002/03/10 06:00:13 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.33 2002/03/22 19:20:39 petere Exp $
PostgreSQL documentation
-->
@@ -78,7 +78,7 @@ NOTHING
<term><replaceable class="parameter">condition</replaceable></term>
<listitem>
<para>
- Any SQL boolean-condition expression. The condition expression may not
+ Any SQL conditional expression (returning <type>boolean</type>). The condition expression may not
refer to any tables except <literal>new</literal> and
<literal>old</literal>.
</para>
@@ -269,7 +269,7 @@ CREATE RULE "_RETtoyemp" AS
SELECT * FROM emp;
</programlisting>
- This attempt to select from EMP will cause
+ This attempt to select from <literal>EMP</literal> will cause
<productname>PostgreSQL</productname> to issue an error
because the queries cycled too many times:
diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index 115b833d494f6bff042087387656f5c67bec26bd..ae69bf5b2a3016604c7ad4be2bec49ab0d224683 100644
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.24 2002/01/20 22:19:56 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.25 2002/03/22 19:20:40 petere Exp $
PostgreSQL documentation
-->
@@ -268,7 +268,7 @@ SELECT * FROM <replaceable>seqname</replaceable>;
setting of 10, backend A might reserve values 1..10 and return <function>nextval</function>=1,
then
backend B might reserve values 11..20 and return <function>nextval</function>=11 before backend
- A has generated nextval=2.) Thus, with a <replaceable class="parameter">cache</replaceable> setting of one it is safe
+ A has generated <literal>nextval</literal>=2.) Thus, with a <replaceable class="parameter">cache</replaceable> setting of one it is safe
to assume that <function>nextval</> values are generated sequentially; with a <replaceable class="parameter">cache</replaceable>
setting greater than one you should only assume that the <function>nextval</> values
are all distinct, not that they are generated purely sequentially.
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 0ae9222d0f06e46c374a620662d943edb3333f49..671a49d7390a25d8b390ea3ff12b6657e578fa2c 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_table.sgml,v 1.52 2002/01/20 22:19:56 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_table.sgml,v 1.53 2002/03/22 19:20:40 petere Exp $
PostgreSQL documentation
-->
@@ -520,7 +520,7 @@ and <replaceable class="PARAMETER">table_constraint</replaceable> is:
accompanied by some descriptive text, such as:
<computeroutput>ERROR: Relation '<replaceable
class="parameter">table</replaceable>' already
- exists</computeroutput>, which occurs at runtime if the table
+ exists</computeroutput>, which occurs at run time if the table
specified already exists in the database.
</para>
</msgexplan>
diff --git a/doc/src/sgml/ref/explain.sgml b/doc/src/sgml/ref/explain.sgml
index d9ed871b2890c4f10058be2839e9323dfcf4bdc2..33c9add4531c3aec197cddf029631e4393300dbf 100644
--- a/doc/src/sgml/ref/explain.sgml
+++ b/doc/src/sgml/ref/explain.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/explain.sgml,v 1.15 2002/03/06 06:48:04 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/explain.sgml,v 1.16 2002/03/22 19:20:40 petere Exp $
PostgreSQL documentation
-->
@@ -41,7 +41,7 @@ EXPLAIN [ ANALYZE ] [ VERBOSE ] <replaceable class="PARAMETER">query</replaceabl
<term>ANALYZE</term>
<listitem>
<para>
- Flag to carry out the query and show actual runtimes.
+ Flag to carry out the query and show actual run times.
</para>
</listitem>
</varlistentry>
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index 63b57fc11d7c61fc22588b4c66204477e105a5d8..3ef1a1a7a275bc93ba8422a519396b3c5b38ab30 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.12 2001/12/08 03:24:37 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.13 2002/03/22 19:20:41 petere Exp $
PostgreSQL documentation
-->
@@ -76,7 +76,7 @@ PostgreSQL documentation
stopping, or restarting <xref linkend="app-postmaster">, the
<productname>PostgreSQL</productname> backend server, or displaying
the status of a running postmaster. Although the postmaster can be
- started manually, <application>pg_ctl</application> encapulates
+ started manually, <application>pg_ctl</application> encapsulates
tasks such as redirecting log output, properly detaching from the
terminal and process group, and it provides convenient options for
controlled shutdown.
@@ -190,7 +190,7 @@ PostgreSQL documentation
<para>
Specifies the location of the <filename>postmaster</filename>
executable. By default the postmaster is taken from the same
- directory as pg_ctl, or failing that, the hard-wired
+ directory as <command>pg_ctl</>, or failing that, the hard-wired
installation directory. It is not necessary to use this
option unless you are doing something unusual and get errors
that the postmaster was not found.
@@ -291,7 +291,7 @@ PostgreSQL documentation
<para>
This is almost equivalent to stopping the
<application>postmaster</application> and starting it again
- except that pg_ctl saves and reuses the command line options that
+ except that <command>pg_ctl</command> saves and reuses the command line options that
were passed to the previously running instance. To restart
the <application>postmaster</application> in the simplest form:
<screen>
@@ -308,7 +308,7 @@ PostgreSQL documentation
</para>
<para>
- To restart using port 5433 and disabling fsync after restarting:
+ To restart using port 5433 and disabling <function>fsync</> after restarting:
<screen>
<prompt>$</prompt> <userinput>pg_ctl -o "-F -p 5433" restart</userinput>
</screen>
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 0169043e96a5c3a02f1fe0876aa26dc6fb3eef7f..f58d3c39f41b7a9429b7e5286ddf5300df68b48e 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.42 2002/02/11 00:14:10 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.43 2002/03/22 19:20:42 petere Exp $
PostgreSQL documentation
-->
@@ -138,8 +138,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-a</term>
- <term>--data-only</term>
+ <term><option>-a</></term>
+ <term><option>--data-only</></term>
<listitem>
<para>
Dump only the data, not the schema (data definitions).
@@ -154,8 +154,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-b</term>
- <term>--blobs</term>
+ <term><option>-b</></term>
+ <term><option>--blobs</></term>
<listitem>
<para>
Include large objects in dump.
@@ -164,8 +164,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-c</term>
- <term>--clean</term>
+ <term><option>-c</option></term>
+ <term><option>--clean</option></term>
<listitem>
<para>
Output commands to clean (drop)
@@ -181,8 +181,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-C</term>
- <term>--create</term>
+ <term><option>-C</></term>
+ <term><option>--create</></term>
<listitem>
<para>
Begin the output with a command to create the
@@ -200,8 +200,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-d</term>
- <term>--inserts</term>
+ <term><option>-d</option></term>
+ <term><option>--inserts</option></term>
<listitem>
<para>
Dump data as <command>INSERT</command> commands (rather
@@ -213,9 +213,9 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-D</term>
- <term>--column-inserts</term>
- <term>--attribute-inserts</term>
+ <term><option>-D</option></term>
+ <term><option>--column-inserts</option></term>
+ <term><option>--attribute-inserts</option></term>
<listitem>
<para>
Dump data as <command>INSERT</command> commands with explicit
@@ -229,8 +229,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-f <replaceable class="parameter">file</replaceable></term>
- <term>--file=<replaceable class="parameter">file</replaceable></term>
+ <term><option>-f <replaceable class="parameter">file</replaceable></option></term>
+ <term><option>--file=<replaceable class="parameter">file</replaceable></option></term>
<listitem>
<para>
Send output to the specified file. If this is omitted, the
@@ -240,8 +240,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-F <replaceable class="parameter">format</replaceable></term>
- <term>--format=<replaceable class="parameter">format</replaceable></term>
+ <term><option>-F <replaceable class="parameter">format</replaceable></option></term>
+ <term><option>--format=<replaceable class="parameter">format</replaceable></option></term>
<listitem>
<para>
Selects the format of the output.
@@ -289,8 +289,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-i</term>
- <term>--ignore-version</term>
+ <term><option>-i</></term>
+ <term><option>--ignore-version</></term>
<listitem>
<para>
Ignore version mismatch between <command>pg_dump</command>
@@ -306,8 +306,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-n</term>
- <term>--no-quotes</term>
+ <term><option>-n</></term>
+ <term><option>--no-quotes</></term>
<listitem>
<para>
Suppress double quotes around identifiers unless absolutely necessary.
@@ -320,8 +320,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-N</term>
- <term>--quotes</term>
+ <term><option>-N</></term>
+ <term><option>--quotes</></term>
<listitem>
<para>
Include double quotes around identifiers.
@@ -331,8 +331,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-o</term>
- <term>--oids</term>
+ <term><option>-o</></term>
+ <term><option>--oids</></term>
<listitem>
<para>
Dump object identifiers (<acronym>OID</acronym>s) for every
@@ -344,8 +344,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-O</term>
- <term>--no-owner</term>
+ <term><option>-O</></term>
+ <term><option>--no-owner</option></term>
<listitem>
<para>
Do not output commands to set the
@@ -369,8 +369,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-R</term>
- <term>--no-reconnect</term>
+ <term><option>-R</option></term>
+ <term><option>--no-reconnect</option></term>
<listitem>
<para>
Prohibit <command>pg_dump</command>
@@ -399,8 +399,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-s</term>
- <term>--schema-only</term>
+ <term><option>-s</option></term>
+ <term><option>--schema-only</option></term>
<listitem>
<para>
Dump only the schema (data definitions), no data.
@@ -409,8 +409,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-S <replaceable class="parameter">username</replaceable></term>
- <term>--superuser=<replaceable class="parameter">username</replaceable></term>
+ <term><option>-S <replaceable class="parameter">username</replaceable></option></term>
+ <term><option>--superuser=<replaceable class="parameter">username</replaceable></option></term>
<listitem>
<para>
The scripts or archives created by <command>pg_dump</command>
@@ -422,8 +422,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></option></term>
+ <term><option>--table=<replaceable class="parameter">table</replaceable></option></term>
<listitem>
<para>
Dump data for <replaceable class="parameter">table</replaceable> only.
@@ -432,8 +432,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-v</term>
- <term>--verbose</term>
+ <term><option>-v</></term>
+ <term><option>--verbose</></term>
<listitem>
<para>
Specifies verbose mode.
@@ -442,9 +442,9 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-x</term>
- <term>--no-privileges</term>
- <term>--no-acl</term>
+ <term><option>-x</></term>
+ <term><option>--no-privileges</></term>
+ <term><option>--no-acl</></term>
<listitem>
<para>
Prevent dumping of access privileges (grant/revoke commands).
@@ -453,8 +453,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-X use-set-session-authorization</term>
- <term>--use-set-session-authorization</term>
+ <term><option>-X use-set-session-authorization</></term>
+ <term><option>--use-set-session-authorization</></term>
<listitem>
<para>
Normally, if a (plain-text mode) script generated by
@@ -488,8 +488,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-Z <replaceable class="parameter">0..9</replaceable></term>
- <term>--compress=<replaceable class="parameter">0..9</replaceable></term>
+ <term><option>-Z <replaceable class="parameter">0..9</replaceable></option></term>
+ <term><option>--compress=<replaceable class="parameter">0..9</replaceable></option></term>
<listitem>
<para>
Specify the compression level to use in archive formats that support
@@ -507,8 +507,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></option></term>
+ <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
<listitem>
<para>
Specifies the host name of the machine on which the
@@ -520,8 +520,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></option></term>
+ <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
<listitem>
<para>
Specifies the Internet TCP/IP port or local Unix domain socket file
@@ -534,7 +534,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-U <replaceable>username</replaceable></term>
+ <term><option>-U <replaceable>username</replaceable></option></term>
<listitem>
<para>
Connect as the given user.
@@ -543,7 +543,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-W</term>
+ <term><option>-W</option></term>
<listitem>
<para>
Force a password prompt. This should happen automatically if
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index b88bb4ae7484b2442f10fb77cf2475ae5f432c55..c8d0298acc4faa6872e74c271e07ec8fab28af94 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.22 2002/02/11 00:14:10 tgl Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.23 2002/03/22 19:20:42 petere Exp $ -->
<refentry id="APP-PGRESTORE">
<docinfo>
@@ -117,8 +117,8 @@
</varlistentry>
<varlistentry>
- <term>-a</term>
- <term>--data-only</term>
+ <term><option>-a</option></term>
+ <term><option>--data-only</option></term>
<listitem>
<para>
Restore only the data, no schema (definitions).
@@ -127,8 +127,8 @@
</varlistentry>
<varlistentry>
- <term>-c</term>
- <term>--clean</term>
+ <term><option>-c</option></term>
+ <term><option>--clean</option></term>
<listitem>
<para>
Clean (drop) database objects before recreating them.
@@ -137,8 +137,8 @@
</varlistentry>
<varlistentry>
- <term>-C</term>
- <term>--create</term>
+ <term><option>-C</option></term>
+ <term><option>--create</option></term>
<listitem>
<para>
Create the database before restoring into it.
@@ -151,8 +151,8 @@
</varlistentry>
<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>
Connect to database <replaceable class="parameter">dbname</replaceable> and restore
@@ -162,8 +162,8 @@
</varlistentry>
<varlistentry>
- <term>-f <replaceable>filename</replaceable></term>
- <term>--file=<replaceable>filename</replaceable></term>
+ <term><option>-f <replaceable>filename</replaceable></option></term>
+ <term><option>--file=<replaceable>filename</replaceable></option></term>
<listitem>
<para>
Specify output file for generated script, or for the listing
@@ -173,8 +173,8 @@
</varlistentry>
<varlistentry>
- <term>-F <replaceable class="parameter">format</replaceable></term>
- <term>--format=<replaceable class="parameter">format</replaceable></term>
+ <term><option>-F <replaceable class="parameter">format</replaceable></option></term>
+ <term><option>--format=<replaceable class="parameter">format</replaceable></option></term>
<listitem>
<para>
Specify format of the archive.
@@ -212,8 +212,8 @@
</varlistentry>
<varlistentry>
- <term>-i <replaceable class="parameter">index</replaceable></term>
- <term>--index=<replaceable class="parameter">index</replaceable></term>
+ <term><option>-i <replaceable class="parameter">index</replaceable></option></term>
+ <term><option>--index=<replaceable class="parameter">index</replaceable></option></term>
<listitem>
<para>
Restore definition for named <replaceable class="parameter">index</replaceable> only.
@@ -222,8 +222,8 @@
</varlistentry>
<varlistentry>
- <term>-l</term>
- <term>--list</term>
+ <term><option>-l</option></term>
+ <term><option>--list</option></term>
<listitem>
<para>
List the contents of the archive. The output of this command can be used with the <option>-L</option> option
@@ -233,8 +233,8 @@
</varlistentry>
<varlistentry>
- <term>-L <replaceable class="parameter">list-file</replaceable></term>
- <term>--use-list=<replaceable class="parameter">list-file</replaceable></term>
+ <term><option>-L <replaceable class="parameter">list-file</replaceable></option></term>
+ <term><option>--use-list=<replaceable class="parameter">list-file</replaceable></option></term>
<listitem>
<para>
Restore elements in <REPLACEABLE CLASS="PARAMETER">list-file</REPLACEABLE> only, and in the
@@ -245,8 +245,8 @@
</varlistentry>
<varlistentry>
- <term>-N</term>
- <term>--orig-order</term>
+ <term><option>-N</option></term>
+ <term><option>--orig-order</option></term>
<listitem>
<para>
Restore items in the original dump order. By default <command>pg_dump</command> will dump items in an order convenient
@@ -256,8 +256,8 @@
</varlistentry>
<varlistentry>
- <term>-o</term>
- <term>--oid-order</term>
+ <term><option>-o</option></term>
+ <term><option>--oid-order</option></term>
<listitem>
<para>
Restore items in the OID order. By default <command>pg_dump</command> will dump items in an order convenient
@@ -267,8 +267,8 @@
</varlistentry>
<varlistentry>
- <term>-O</term>
- <term>--no-owner</term>
+ <term><option>-O</option></term>
+ <term><option>--no-owner</option></term>
<listitem>
<para>
Prevent any attempt to restore original object ownership. Objects will be owned by the user name used
@@ -278,8 +278,8 @@
</varlistentry>
<varlistentry>
- <term>-P <replaceable class="parameter">function-name</replaceable></term>
- <term>--function=<replaceable class="parameter">function-name</replaceable></term>
+ <term><option>-P <replaceable class="parameter">function-name</replaceable></option></term>
+ <term><option>--function=<replaceable class="parameter">function-name</replaceable></option></term>
<listitem>
<para>
Specify a procedure or function to be restored.
@@ -288,8 +288,8 @@
</varlistentry>
<varlistentry>
- <term>-r</term>
- <term>--rearrange</term>
+ <term><option>-r</option></term>
+ <term><option>--rearrange</option></term>
<listitem>
<para>
Restore items in modified OID order. By default <command>pg_dump</command> will dump items in an order convenient
@@ -301,8 +301,8 @@
</varlistentry>
<varlistentry>
- <term>-R</term>
- <term>--no-reconnect</term>
+ <term><option>-R</option></term>
+ <term><option>--no-reconnect</option></term>
<listitem>
<para>
While restoring an archive, <command>pg_restore</command>
@@ -324,8 +324,8 @@
</varlistentry>
<varlistentry>
- <term>-s</term>
- <term>--schema-only</term>
+ <term><option>-s</option></term>
+ <term><option>--schema-only</option></term>
<listitem>
<para>
Restore the schema (definitions), no data. Sequence values will be reset.
@@ -334,8 +334,8 @@
</varlistentry>
<varlistentry>
- <term>-S <replaceable class="parameter">username</replaceable></term>
- <term>--superuser=<replaceable class="parameter">username</replaceable></term>
+ <term><option>-S <replaceable class="parameter">username</replaceable></option></term>
+ <term><option>--superuser=<replaceable class="parameter">username</replaceable></option></term>
<listitem>
<para>
Specify the superuser user name to use when disabling triggers and/or setting ownership of schema elements.
@@ -345,8 +345,8 @@
</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></option></term>
+ <term><option>--table=<replaceable class="parameter">table</replaceable></option></term>
<listitem>
<para>
Restore schema/data for <REPLACEABLE CLASS="PARAMETER">table</REPLACEABLE> only.
@@ -355,8 +355,8 @@
</varlistentry>
<varlistentry>
- <term>-T <replaceable class="parameter">trigger</replaceable></term>
- <term>--trigger=<replaceable class="parameter">trigger</replaceable></term>
+ <term><option>-T <replaceable class="parameter">trigger</replaceable></option></term>
+ <term><option>--trigger=<replaceable class="parameter">trigger</replaceable></option></term>
<listitem>
<para>
Restore definition of <REPLACEABLE CLASS="PARAMETER">trigger</REPLACEABLE> only.
@@ -365,8 +365,8 @@
</varlistentry>
<varlistentry>
- <term>-v</term>
- <term>--verbose</term>
+ <term><option>-v</option></term>
+ <term><option>--verbose</option></term>
<listitem>
<para>
Specifies verbose mode.
@@ -375,9 +375,9 @@
</varlistentry>
<varlistentry>
- <term>-x</term>
- <term>--no-privileges</term>
- <term>--no-acl</term>
+ <term><option>-x</option></term>
+ <term><option>--no-privileges</option></term>
+ <term><option>--no-acl</option></term>
<listitem>
<para>
Prevent restoration of access privileges (grant/revoke commands).
@@ -386,8 +386,8 @@
</varlistentry>
<varlistentry>
- <term>-X use-set-session-authorization</term>
- <term>--use-set-session-authorization</term>
+ <term><option>-X use-set-session-authorization</option></term>
+ <term><option>--use-set-session-authorization</option></term>
<listitem>
<para>
Normally, if restoring an archive requires altering the
@@ -413,8 +413,8 @@
<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></option></term>
+ <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
<listitem>
<para>
Specifies the host name of the machine on which the
@@ -426,8 +426,8 @@
</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></option></term>
+ <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
<listitem>
<para>
Specifies the Internet TCP/IP port or local Unix domain socket file
@@ -440,7 +440,7 @@
</varlistentry>
<varlistentry>
- <term>-U <replaceable>username</replaceable></term>
+ <term><option>-U <replaceable>username</replaceable></option></term>
<listitem>
<para>
Connect as the given user.
@@ -449,7 +449,7 @@
</varlistentry>
<varlistentry>
- <term>-W</term>
+ <term><option>-W</option></term>
<listitem>
<para>
Force a password prompt. This should happen automatically if
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index 93cf8de8bd1b208ed71b45a19e2f846a408a203a..cf6f785b86c190117a09f006011c487a5ca8d5fd 100644
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.24 2002/03/02 21:39:16 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.25 2002/03/22 19:20:43 petere Exp $
PostgreSQL documentation
-->
@@ -79,7 +79,7 @@ PostgreSQL documentation
The <filename>postgres</filename> executable is the actual
<productname>PostgreSQL</productname> server process that processes
queries. It is normally not called directly; instead a <xref
- linkend="app-postmaster"> multi-user server is started.
+ linkend="app-postmaster"> multiuser server is started.
</para>
<para>
@@ -130,7 +130,7 @@ PostgreSQL documentation
Guide</citetitle> for details. Some (safe) options can also be
set from the connecting client in an application-dependent way.
For example, if the environment variable <envar>PGOPTIONS</envar>
- is set, then libpq-based clients will pass that string to the
+ is set, then <application>libpq</>-based clients will pass that string to the
server, which will interpret it as
<application>postgres</application> command-line options.
</para>
@@ -144,12 +144,12 @@ PostgreSQL documentation
<option>-F</option>, and <option>--name</> have the same meanings
as the <xref linkend="app-postmaster"> except that
<option>-d</option> <literal>0</> prevents the debugging level of
- the postmaster from being propogated to the backend.
+ the postmaster from being propagated to the backend.
</para>
<variablelist>
<varlistentry>
- <term>-e</term>
+ <term><option>-e</option></term>
<listitem>
<para>
Sets the default date style to <quote>European</quote>, which
@@ -163,21 +163,21 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-o <replaceable class="parameter">filename</replaceable></term>
+ <term><option>-o</option> <replaceable class="parameter">filename</replaceable></term>
<listitem>
<para>
Sends all debugging and error output to
<replaceable class="parameter">filename</replaceable>.
If the backend is running under the
<application>postmaster</application>, this option is ignored,
- and the stderr inherited from the
+ and the <systemitem>stderr</> inherited from the
<application>postmaster</application> is used.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>-P</term>
+ <term><option>-P</option></term>
<listitem>
<para>
Ignore system indexes while scanning/updating system tuples. The
@@ -188,7 +188,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-s</term>
+ <term><option>-s</option></term>
<listitem>
<para>
Print time information and other statistics at the end of each query.
@@ -199,7 +199,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-S <replaceable class="parameter">sort-mem</replaceable></term>
+ <term><option>-S</option> <replaceable class="parameter">sort-mem</replaceable></term>
<listitem>
<para>
Specifies the amount of memory to be used by internal sorts and hashes
@@ -231,7 +231,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-E</term>
+ <term><option>-E</option></term>
<listitem>
<para>
Echo all queries.
@@ -240,7 +240,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-N</term>
+ <term><option>-N</option></term>
<listitem>
<para>
Disables use of newline as a query delimiter.
@@ -264,7 +264,7 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
- <term>-f { s | i | m | n | h }</term>
+ <term><option>-f</option> <literal>{ s | i | m | n | h }</literal></term>
<listitem>
<para>
Forbids the use of particular scan and join methods:
@@ -286,7 +286,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-i</term>
+ <term><option>-i</option></term>
<listitem>
<para>
Prevents query execution, but shows the plan tree.
@@ -295,7 +295,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-O</term>
+ <term><option>-O</option></term>
<listitem>
<para>
Allows the structure of system tables to be modified. This is
@@ -305,7 +305,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-p <replaceable class="parameter">database</replaceable></term>
+ <term><option>-p</option> <replaceable class="parameter">database</replaceable></term>
<listitem>
<para>
Indicates that this server has been started by a
@@ -317,7 +317,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-t pa[rser] | pl[anner] | e[xecutor]</term>
+ <term><option>-t</option> <literal>pa[rser] | pl[anner] | e[xecutor]</literal></term>
<listitem>
<para>
Print timing statistics for each query relating to each of the
@@ -328,7 +328,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-v <replaceable class="parameter">protocol</replaceable></term>
+ <term><option>-v</option> <replaceable class="parameter">protocol</replaceable></term>
<listitem>
<para>
Specifies the version number of the frontend/backend protocol
@@ -338,7 +338,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term>-W <replaceable class="parameter">seconds</replaceable></term>
+ <term><option>-W</option> <replaceable class="parameter">seconds</replaceable></term>
<listitem>
<para>
As soon as this option is encountered, the process sleeps for
@@ -377,16 +377,16 @@ PostgreSQL documentation
<para>
But if you use the <option>-N</> command line switch, then newline does
not terminate command entry. The backend will read the standard input
- until the end-of-file (EOF) marker, then
+ until the end-of-file (<acronym>EOF</>) marker, then
process the input as a single query string. Backslash-newline is not
treated specially in this case.
</para>
<para>
- To quit the session, type EOF
+ To quit the session, type <acronym>EOF</acronym>
(<keycombo action="simul"><keycap>Control</><keycap>D</></>, usually).
If you've
- used <option>-N</>, two consecutive EOFs are needed to exit.
+ used <option>-N</>, two consecutive <acronym>EOF</>s are needed to exit.
</para>
<para>
diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml
index 011144c1d5aa4ba49f055dd8255247bb800bb865..e5f7113f69c352d6bb956e22f11f86b7101f1fb8 100644
--- a/doc/src/sgml/ref/postmaster.sgml
+++ b/doc/src/sgml/ref/postmaster.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.27 2002/03/02 21:39:16 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.28 2002/03/22 19:20:43 petere Exp $
PostgreSQL documentation
-->
@@ -478,7 +478,7 @@ StreamServerPort: cannot bind to port
</para>
<para>
- Named runtime parameters can be set in either of these styles:
+ Named run-time parameters can be set in either of these styles:
<screen>
<prompt>$</prompt> <userinput>postmaster -c sort_mem=1234</userinput>
<prompt>$</prompt> <userinput>postmaster --sort-mem=1234</userinput>
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 40ba18716c222bd13fdc587f481fdb44c00d451d..2dede1c99cc6bb3b97fefc235b7f39f9436de44b 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.65 2002/03/20 19:43:30 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.66 2002/03/22 19:20:44 petere Exp $
PostgreSQL documentation
-->
@@ -66,7 +66,7 @@ PostgreSQL documentation
<para>
<application>psql</application> is a regular <productname>PostgreSQL</productname>
client application. In order to connect to a database you need to know the
- name of your target database, the hostname and port number of the server
+ name of your target database, the host name and port number of the server
and what user name you want to connect as. <application>psql</application> can be
told about those parameters via command line options, namely <option>-d</option>,
<option>-h</option>, <option>-p</option>, and <option>-U</option> respectively.
@@ -77,9 +77,9 @@ PostgreSQL documentation
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 Unix username, as is the default
+ cases. The default user name is your Unix user name, as is the default
database name.
- Note that you can't just connect to any database under any username. Your database
+ Note that you can't just connect to any database under any user name. Your database
administrator should have informed you about your access rights. To save you some typing
you can also set the environment variables <envar>PGDATABASE</envar>,
<envar>PGHOST</envar>, <envar>PGPORT</envar> and <envar>PGUSER</envar>
@@ -270,7 +270,7 @@ testdb=>
</para>
<para>
- If the connection attempt failed (wrong username, access denied, etc.), the
+ If the connection attempt failed (wrong user name, access denied, etc.), the
previous connection will be kept if and only if <application>psql</application> is
in interactive mode. When executing a non-interactive script, processing
will immediately stop with an error. This distinction was chosen as a user
@@ -1701,7 +1701,7 @@ bar
<application>psql</application>'s internal variable names can consist of
letters, numbers, and underscores in any order and any number of them.
A number of regular variables are treated specially by <application>psql</application>.
- They indicate certain option settings that can be changed at runtime
+ They indicate certain option settings that can be changed at run time
by altering the value of the variable or represent some state of the application.
Although you can use these
variables for any other purpose, this is not recommended, as the
@@ -2037,7 +2037,7 @@ testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\'
<term><literal>%M</literal></term>
<listitem>
<para>
- The full hostname (with domain name) of the database server,
+ The full host name (with domain name) of the database server,
or <literal>[local]</literal> if the connection is over a
Unix domain socket, or
<literal>[local:<replaceable>/dir/name</replaceable>]</literal>,
@@ -2051,7 +2051,7 @@ testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\'
<term><literal>%m</literal></term>
<listitem>
<para>
- The hostname of the database server, truncated after the
+ The host name of the database server, truncated after the
first dot, or <literal>[local]</literal> if the connection
is over a Unix domain socket.
</para>
@@ -2065,7 +2065,7 @@ testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\'
<varlistentry>
<term><literal>%n</literal></term>
- <listitem><para>The username you are connected as (not your local system
+ <listitem><para>The user name you are connected as (not your local system
user name).</para></listitem>
</varlistentry>
diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml
index bb443f8d465a4932a796702ffb7f4bcf6681a6fe..f39766a572f9d447be42765e255e1d5862a3b68f 100644
--- a/doc/src/sgml/ref/reindex.sgml
+++ b/doc/src/sgml/ref/reindex.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/reindex.sgml,v 1.8 2001/12/08 03:24:38 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/reindex.sgml,v 1.9 2002/03/22 19:20:45 petere Exp $
PostgreSQL documentation
-->
@@ -145,7 +145,7 @@ REINDEX
index on a system table. In this case it's important for the backend
doing the recovery to not have used any of the suspect indexes itself.
(Indeed, in this sort of scenario you may find that backends are
- crashing immediately at startup, due to reliance on the corrupted
+ crashing immediately at start-up, due to reliance on the corrupted
indexes.) To recover safely, the postmaster must be shut down and a
stand-alone <productname>PostgreSQL</productname> backend must be
started instead, giving it
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index ed080d35345a2c95c783bca410a2b34e28988b97..e1d419e811a9801a1789c8f7a6bfd28e1ddbbb3b 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.51 2001/12/08 03:24:39 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.52 2002/03/22 19:20:45 petere Exp $
PostgreSQL documentation
-->
@@ -91,7 +91,7 @@ where <replaceable class="PARAMETER">from_item</replaceable> can be:
<term><replaceable class="PARAMETER">condition</replaceable></term>
<listitem>
<para>
- A boolean expression giving a result of true or false.
+ A Boolean expression giving a result of true or false.
See the WHERE and HAVING clause descriptions below.
</para>
</listitem>
@@ -368,7 +368,7 @@ where <replaceable class="PARAMETER">from_item</replaceable> can be:
<Productname>PostgreSQL</Productname> 7.1,
this was the default result, and adding sub-tables was done
by appending <command>*</command> to the table name.
- This old behaviour is available via the command
+ This old behavior is available via the command
<command>SET SQL_Inheritance TO OFF;</command>
</para>
@@ -449,7 +449,7 @@ WHERE <replaceable class="PARAMETER">boolean_expr</replaceable>
</synopsis>
<replaceable class="PARAMETER">boolean_expr</replaceable>
- can consist of any expression which evaluates to a boolean value.
+ can consist of any expression which evaluates to a Boolean value.
In many cases, this expression will be:
<synopsis>
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 1692e522a4302e963dd2ae7aa7c59365f538d397..4900f1b7482be0edc65573fc4b0ea509327d227d 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.124 2002/03/19 18:53:01 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.125 2002/03/22 19:20:22 petere Exp $
-->
<appendix id="release">
@@ -127,11 +127,11 @@ Fix for array subscripts handling (Tom)
</varlistentry>
<varlistentry>
- <term>OID's</term>
+ <term>OIDs</term>
<listitem>
<para>
- OID's are now optional. Users can now create tables without
- OID's for cases where OID usage is excessive.
+ OIDs are now optional. Users can now create tables without
+ OIDs for cases where OID usage is excessive.
</para>
</listitem>
</varlistentry>
@@ -268,7 +268,7 @@ Enable SIGTERM, SIGQUIT to kill backends (Jan)
Removed compile-time limit on number of backends (Tom)
Better cleanup for semaphore resource failure (Tatsuo, Tom)
Allow safe transaction ID wraparound (Tom)
-Removed OID's from some system tables (Tom)
+Removed OIDs from some system tables (Tom)
Removed "triggered data change violation" error check (Tom)
SPI portal creation of prepared/saved plans (Jan)
Allow SPI column functions to work for system columns (Tom)
@@ -873,7 +873,7 @@ Subqueries in FROM are now supported.
<programlisting>
Bug Fixes
---------
-Many multi-byte/Unicode/locale fixes (Tatsuo and others)
+Many multibyte/Unicode/locale fixes (Tatsuo and others)
More reliable ALTER TABLE RENAME (Tom)
Kerberos V fixes (David Wragg)
Fix for INSERT INTO...SELECT where targetlist has subqueries (Tom)
@@ -1096,7 +1096,7 @@ Fix backwards-index-scan (Tom)
Fix SELECT ... FOR UPDATE so it checks for duplicate keys (Hiroshi)
Add --enable-syslog to configure (Marc)
Fix abort transaction at backend exit in rare cases (Tom)
-Fix for psql \l+ when multi-byte enabled (Tatsuo)
+Fix for psql \l+ when multibyte enabled (Tatsuo)
Allow PL/pgSQL to accept non ascii identifiers (Tatsuo)
Make vacuum always flush buffers (Tom)
Fix to allow cancel while waiting for a lock (Hiroshi)
@@ -1773,7 +1773,7 @@ Add SHLIB_LINK setting for solaris_i386 and solaris_sparc ports(Daren Sefcik)
Fixes for CASE in WHERE join clauses(Tom)
Fix BTScan abort(Tom)
Repair the check for redundant UNIQUE and PRIMARY KEY indexes(Thomas)
-Improve it so that it checks for multi-column constraints(Thomas)
+Improve it so that it checks for multicolumn constraints(Thomas)
Fix for Win32 making problem with MB enabled(Hiroki Kataoka)
Allow BSD yacc and bison to compile pl code(Bruce)
Fix SET NAMES working
@@ -1828,7 +1828,7 @@ Add NT README file
Portability fixes for linux_ppc, IRIX, linux_alpha, OpenBSD, alpha
Remove QUERY_LIMIT, use SELECT...LIMIT
Fix for EXPLAIN on inheritance(Tom)
-Patch to allow vacuum on multi-segment tables(Hiroshi)
+Patch to allow vacuum on multisegment tables(Hiroshi)
R-Tree optimizer selectivity fix(Tom)
ACL file descriptor leak fix(Atsushi Ogawa)
New expresssion subtree code(Tom)
@@ -1873,7 +1873,7 @@ Add Win1250 (Czech) support (Pavel Behal)
<variablelist>
<varlistentry>
<term>
- Multi-version concurrency control(MVCC)
+ Multiversion concurrency control(MVCC)
</term>
<listitem>
<para>
@@ -1881,7 +1881,7 @@ Add Win1250 (Czech) support (Pavel Behal)
table-level locking, and replaces it with a locking system that is
superior to most commercial database systems. In a traditional system,
each row that is modified is locked until committed, preventing reads by
- other users. MVCC uses the natural multi-version nature of PostgreSQL
+ other users. MVCC uses the natural multiversion nature of PostgreSQL
to allow readers to continue reading consistent data during writer
activity. Writers continue to use the compact pg_log transaction
system. This is all performed without having to allocate a lock for
@@ -2020,15 +2020,15 @@ Add Win1250 (Czech) support (Pavel Behal)
</para>
<para>
- The new Multi-Version Concurrency Control (MVCC) features can
- give somewhat different behaviors in multi-user
+ The new Multiversion Concurrency Control (MVCC) features can
+ give somewhat different behaviors in multiuser
environments. <emphasis>Read and understand the following section
to ensure that your existing applications will give you the
behavior you need.</emphasis>
</para>
<sect3>
- <title>Multi-Version Concurrency Control</title>
+ <title>Multiversion Concurrency Control</title>
<para>
Because readers in 6.5 don't lock data, regardless of transaction
@@ -2122,7 +2122,7 @@ Allow username containing a dash GRANT permissions
Cleanup of NULL in inet types
Clean up system table bugs(Tom)
Fix problems of PAGER and \? command(Masaaki Sakaida)
-Reduce default multi-segment file size limit to 1GB(Peter)
+Reduce default multisegment file size limit to 1GB(Peter)
Fix for dumping of CREATE OPERATOR(Tom)
Fix for backward scanning of cursors(Hiroshi Inoue)
Fix for COPY FROM STDIN when using \i(Tom)
@@ -2134,7 +2134,7 @@ Fix pg_dump so -t option can handle case-sensitive tablenames
Fixes for GROUP BY in special cases(Tom, Jan)
Fix for memory leak in failed queries(Tom)
DEFAULT now supports mixed-case identifiers(Tom)
-Fix for multi-segment uses of DROP/RENAME table, indexes(Ole Gjerde)
+Fix for multisegment uses of DROP/RENAME table, indexes(Ole Gjerde)
Disable use of pg_dump with both -o and -d options(Bruce)
Allow pg_dump to properly dump GROUP permissions(Bruce)
Fix GROUP BY in INSERT INTO table SELECT * FROM table2(Jan)
@@ -2159,7 +2159,7 @@ Update to pgaccess 0.96(Constantin)
Add routines for single-byte "char" type(Thomas)
Improved substr() function(Thomas)
Improved multibyte handling(Tatsuo)
-Multi-version concurrency control/MVCC(Vadim)
+Multiversion concurrency control/MVCC(Vadim)
New Serialized mode(Vadim)
Fix for tables over 2gigs(Peter)
New SET TRANSACTION ISOLATION LEVEL(Vadim)
@@ -2577,7 +2577,7 @@ New rewrite system fixes many problems with rules and views(Jan)
* handle subselects
* handle aggregates on views
* handle insert into select from view works
-System indexes are now multi-key(Bruce)
+System indexes are now multikey(Bruce)
Oidint2, oidint4, and oidname types are removed(Bruce)
Use system cache for more system table lookups(Bruce)
New backend programming language PL/pgSQL in backend/pl(Jan)
@@ -3471,7 +3471,7 @@ Bug Fixes
packet length checking in library routines
lock manager priority patch
check for under/over flow of float8(Bruce)
-multi-table join fix(Vadim)
+multitable join fix(Vadim)
SIGPIPE crash fix(Darren)
large object fixes(Sven)
allow btree indexes to handle NULLs(Vadim)
@@ -3503,7 +3503,7 @@ much faster new btree bulk load code(Paul)
BTREE UNIQUE added to bulk load code(Vadim)
new lock debug code(Massimo)
massive changes to libpg++(Leo)
-new GEQO optimizer speeds table multi-table optimization(Martin)
+new GEQO optimizer speeds table multitable optimization(Martin)
new WARN message for non-unique insert into unique key(Marc)
update x=-3, no spaces, now valid(Bruce)
remove case-sensitive identifier handling(Bruce,Thomas,Dan)
@@ -3514,7 +3514,7 @@ no such class or insufficient privilege changed to distinct messages(Dan)
new ANSI timestamp function(Dan)
new ANSI Time and Date types (Thomas)
move large chunks of data in backend(Martin)
-multi-column btree indexes(Vadim)
+multicolumn btree indexes(Vadim)
new SET var TO value command(Martin)
update transaction status on reads(Dan)
new locale settings for character types(Oleg)
@@ -3627,7 +3627,7 @@ Properly report errors when INSERT ... SELECT columns did not match
Properly report errors when insert column names were not correct
Psql \g filename now works(Bruce)
Psql fixed problem with multiple statements on one line with multiple outputs
-Removed duplicate system oid's
+Removed duplicate system OIDs
SELECT * INTO TABLE . GROUP/ORDER BY gives unlink error if table exists(Bruce)
Several fixes for queries that crashed the backend
Starting quote in insert string errors(Bruce)
@@ -3662,7 +3662,7 @@ Implement IN qualifier(Bruce)
Libpq has PQgetisnull()(Bruce)
Libpq++ improvements
New options to initdb(Bryan)
-Pg_dump allow dump of oid's(Bruce)
+Pg_dump allow dump of OIDs(Bruce)
Pg_dump create indexes after tables are loaded for speed(Bruce)
Pg_dumpall dumps all databases, and the user table
Pginterface additions for NULL values(Bruce)
diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml
index 34ee7473dbde770a8386fdf9068ab1c79d9598c7..5385a900222c88ab09cf4006f91743bc95e6b4e7 100644
--- a/doc/src/sgml/rules.sgml
+++ b/doc/src/sgml/rules.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/rules.sgml,v 1.21 2002/01/20 22:19:56 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/rules.sgml,v 1.22 2002/03/22 19:20:26 petere Exp $ -->
<Chapter Id="rules">
<Title>The Rule System</Title>
@@ -1140,7 +1140,7 @@ INSERT INTO shoelace_log VALUES(
INSERT ... VALUES ... FROM. The FROM clause here is just to indicate
that there are range-table entries in the parse tree for *NEW* and *OLD*.
These are needed so that they can be referenced by variables in the
- INSERT command's querytree.
+ INSERT command's query tree.
</Para>
<Para>
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index fc840a2ae6c58cd84d71c0999a6d3e2e45a616c8..ddeac7ce1da219f7e0407494440758633ed691d9 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,9 +1,9 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.108 2002/03/11 05:03:51 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.109 2002/03/22 19:20:28 petere Exp $
-->
<Chapter Id="runtime">
- <Title>Server Runtime Environment</Title>
+ <Title>Server Run-time Environment</Title>
<Para>
This chapter discusses how to set up and run the database server
@@ -467,7 +467,7 @@ psql: could not connect to server: Connection refused
<para>
All parameter names are case-insensitive. Every parameter takes a
- value of one of the four types: boolean, integer, floating point,
+ value of one of the four types: Boolean, integer, floating point,
and string. Boolean values are <literal>ON</literal>,
<literal>OFF</literal>, <literal>TRUE</literal>,
<literal>FALSE</literal>, <literal>YES</literal>,
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index 533a0f2979c964bcf05716fba4281c4248625bfe..ca6d62e1ae16eeb25698515575a52e04cf5688a9 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/spi.sgml,v 1.21 2002/03/06 06:44:33 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/spi.sgml,v 1.22 2002/03/22 19:20:30 petere Exp $
-->
<Chapter id="spi">
@@ -536,10 +536,10 @@ You may pass multiple queries in one string or query string may be
</Para>
<Para>
- vals is an array of pointers to tuples (the number of useful entries
- is given by SPI_processed). TupleDesc tupdesc is
+ <structfield>vals</> is an array of pointers to tuples (the number of useful entries
+ is given by SPI_processed). <structfield>tupdesc</> is
a tuple descriptor which you may pass to SPI functions dealing with
- tuples. tuptabcxt, alloced, and free are internal fields not intended
+ tuples. <structfield>tuptabcxt</>, <structfield>alloced</>, and <structfield>free</> are internal fields not intended
for use by SPI callers.
</Para>
@@ -686,7 +686,7 @@ Pointer to an execution plan (parser+planner+optimizer)
</para>
</note>
<PARA>
- If the query uses parameters, their number and datatypes must be
+ If the query uses parameters, their number and data types must be
specified in the call to <FUNCTION>SPI_prepare</FUNCTION>.
</para>
<Para>
@@ -2177,7 +2177,7 @@ Attribute numbers are 1 based.
</TITLE>
<PARA>
Does not allocate new space for the datum. In the case of a pass-by-
-reference datatype, the Datum will be a pointer into the given tuple.
+reference data type, the Datum will be a pointer into the given tuple.
</PARA>
</REFSECT1>
<!--
@@ -2576,7 +2576,7 @@ exit, avoiding memory leakage.
</Para>
<Para>
However, if your procedure needs to return an allocated memory object
-(such as a value of a pass-by-reference datatype), you can't allocate
+(such as a value of a pass-by-reference data type), you can't allocate
the return object using <Function>palloc</Function>, at least not while
you are connected to SPI. If you try, the object will be deallocated
during <Function>SPI_finish</Function>, and your procedure will not
diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
index 72fcc5da5f078773c6a9148844cca7625912b0d7..828c3e8ce738eebce64537ed226698cb8b7bc25c 100644
--- a/doc/src/sgml/syntax.sgml
+++ b/doc/src/sgml/syntax.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/syntax.sgml,v 1.58 2002/01/20 22:19:56 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/syntax.sgml,v 1.59 2002/03/22 19:20:31 petere Exp $
-->
<chapter id="sql-syntax">
@@ -391,7 +391,7 @@ CAST ( '<replaceable>string</replaceable>' AS <replaceable>type</replaceable> )
<para>
The <literal>::</literal>, <literal>CAST()</literal>, and
- function-call syntaxes can also be used to specify runtime type
+ function-call syntaxes can also be used to specify run-time type
conversions of arbitrary expressions, as discussed in <xref
linkend="sql-syntax-type-casts">. But the form
<replaceable>type</replaceable> '<replaceable>string</replaceable>'
diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml
index d2441ce08ba50d0565ee4f74e6d85fb4c3318122..34ab2840eecc8b5d900785b3ae6914ad3584b14a 100644
--- a/doc/src/sgml/trigger.sgml
+++ b/doc/src/sgml/trigger.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/trigger.sgml,v 1.20 2002/03/06 06:44:33 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/trigger.sgml,v 1.21 2002/03/22 19:20:32 petere Exp $
-->
<chapter id="triggers">
@@ -7,9 +7,9 @@ $Header: /cvsroot/pgsql/doc/src/sgml/trigger.sgml,v 1.20 2002/03/06 06:44:33 mom
<para>
<productname>PostgreSQL</productname> has various server-side function
- interfaces. Server-side functions can be written in SQL, PLPGSQL,
- TCL, or C. Trigger functions can be written in any of these
- languages except SQL. Note that STATEMENT-level trigger events are not
+ interfaces. Server-side functions can be written in SQL, PL/pgSQL,
+ Tcl, or C. Trigger functions can be written in any of these
+ languages except SQL. Note that statement-level trigger events are not
supported in the current version. You can currently specify BEFORE or
AFTER on INSERT, DELETE or UPDATE of a tuple as a trigger event.
</para>
@@ -216,9 +216,10 @@ CREATE TRIGGER <replaceable>trigger</replaceable> [ BEFORE | AFTER ] [ INSERT |
</para>
<para>
- struct TriggerData is defined in src/include/commands/trigger.h:
+ <structname>struct TriggerData</structname> is defined in
+ <filename>commands/trigger.h</filename>:
- <programlisting>
+<programlisting>
typedef struct TriggerData
{
NodeTag type;
@@ -228,7 +229,7 @@ typedef struct TriggerData
HeapTuple tg_newtuple;
Trigger *tg_trigger;
} TriggerData;
- </programlisting>
+</programlisting>
where the members are defined as follows:
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index 262c1e2e8c7b2b41a164018baec182f83f7e7515..9cc87965a47b9caa4189751758d1ff8bcbaa0181 100644
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.50 2002/03/21 16:00:28 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.51 2002/03/22 19:20:33 petere Exp $
-->
<chapter id="xfunc">
@@ -86,7 +86,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.50 2002/03/21 16:00:28 tgl E
<literal>SELECT</>.
In the simple (non-set)
case, the first row of the last query's result will be returned.
- (Bear in mind that <quote>the first row</quote> of a multi-row
+ (Bear in mind that <quote>the first row</quote> of a multirow
result is not well-defined unless you use <literal>ORDER BY</>.)
If the last query happens
to return no rows at all, NULL will be returned.
@@ -367,7 +367,6 @@ SELECT name(new_emp());
------
None
</screen>
- </para>
<programlisting>
--
@@ -622,7 +621,7 @@ CREATE FUNCTION square_root(double precision) RETURNS double precision
The user ID the <application>PostgreSQL</application> server runs
as must be able to traverse the path to the file you intend to
load. Making the file or a higher-level directory not readable
- and/or not executable by the <quote>postgres</quote> user is a
+ and/or not executable by the <systemitem>postgres</systemitem> user is a
common mistake.
</para>
</note>
@@ -1169,7 +1168,7 @@ PG_FUNCTION_INFO_V1(funcname);
<para>
In a version-1 function, each actual argument is fetched using a
<function>PG_GETARG_<replaceable>xxx</replaceable>()</function>
- macro that corresponds to the argument's datatype, and the result
+ macro that corresponds to the argument's data type, and the result
is returned using a
<function>PG_RETURN_<replaceable>xxx</replaceable>()</function>
macro for the return type.
diff --git a/doc/src/sgml/xoper.sgml b/doc/src/sgml/xoper.sgml
index 9a85d81b4dfcda7a787514dc5b9e5471dface823..5967ddbfb6da2f5823d3b966b9d339f2a21db772 100644
--- a/doc/src/sgml/xoper.sgml
+++ b/doc/src/sgml/xoper.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/xoper.sgml,v 1.17 2002/01/07 02:29:14 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/xoper.sgml,v 1.18 2002/03/22 19:20:34 petere Exp $
-->
<Chapter Id="xoper">
@@ -389,7 +389,7 @@ table1.column1 OP table2.column2
</para>
<para>
- Merge join is based on the idea of sorting the left and righthand tables
+ Merge join is based on the idea of sorting the left- and right-hand tables
into order and then scanning them in parallel. So, both data types must
be capable of being fully ordered, and the join operator must be one
that can only succeed for pairs of values that fall at the <quote>same place</>
diff --git a/doc/src/sgml/xtypes.sgml b/doc/src/sgml/xtypes.sgml
index 5d3146a96c8dbe334268d421d02fe1d771130821..9886e7a3c33ae7b5f9933e9037fcd98e6bef6fb9 100644
--- a/doc/src/sgml/xtypes.sgml
+++ b/doc/src/sgml/xtypes.sgml
@@ -175,7 +175,7 @@ CREATE TYPE complex (
<primary>TOAST</primary>
<secondary>and user-defined types</secondary>
</indexterm>
- If the values of your datatype might exceed a few hundred bytes in
+ If the values of your data type might exceed a few hundred bytes in
size (in internal form), you should be careful to mark them
TOAST-able. To do this, the internal representation must follow the
standard layout for variable-length data: the first four bytes must