diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-10-05 19:48:34 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-10-05 19:48:34 +0000 |
| commit | b32685a999a3d60dbf1f5443ceb2d39d7464d1df (patch) | |
| tree | 4f088ae0917d6b431f1b44b52cdc48c921214e74 /doc/src | |
| parent | 05e3d0ee8666b74f11ffad16f46e372459d6e53e (diff) | |
| download | postgresql-b32685a999a3d60dbf1f5443ceb2d39d7464d1df.tar.gz postgresql-b32685a999a3d60dbf1f5443ceb2d39d7464d1df.zip | |
Add proofreader's changes to docs.
Fix misspelling of disbursion to dispersion.
Diffstat (limited to 'doc/src')
42 files changed, 172 insertions, 172 deletions
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index 9ee2eb847cf..3b93cb96c69 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -8,7 +8,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.21 2000/10/05 16:57:23 petere Exp $ +# $Header: /cvsroot/pgsql/doc/src/sgml/Makefile,v 1.22 2000/10/05 19:48:16 momjian Exp $ # #---------------------------------------------------------------------------- @@ -79,7 +79,7 @@ APPLICATIONS= createdb.sgml createlang.sgml createuser.sgml \ pgaccess-ref.sgml \ pgadmin-ref.sgml \ pg-config-ref.sgml \ - pgctl-ref.sgml \ + pg_ctl-ref.sgml \ pgtclsh.sgml \ pgtksh.sgml \ postgres-ref.sgml \ diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index 1bb3a0769d1..b13993f7af0 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.21 2000/08/26 13:08:15 petere Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.22 2000/10/05 19:48:17 momjian Exp $ Postgres documentation Complete list of usable sgml source files in this directory. --> @@ -121,7 +121,7 @@ Complete list of usable sgml source files in this directory. <!entity pgAccess system "pgaccess-ref.sgml"> <!entity pgAdmin system "pgadmin-ref.sgml"> <!entity pgConfig system "pg-config-ref.sgml"> -<!entity pgCtl system "pgctl-ref.sgml"> +<!entity pgCtl system "pg_ctl-ref.sgml"> <!entity pgDump system "pg_dump.sgml"> <!entity pgDumpall system "pg_dumpall.sgml"> <!entity pgPasswd system "pg_passwd.sgml"> diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index aa133b493bb..72ae3201022 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.14 2000/07/22 02:39:10 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.15 2000/10/05 19:48:17 momjian Exp $ Postgres documentation --> @@ -273,7 +273,7 @@ ALTER TABLE <replaceable class="PARAMETER">table</replaceable> DROP CONSTRAINT < <para> Removes a table constraint (such as a check constraint, unique constraint, or foreign key constraint). To - remove a unique constraint, drop a unique index, + remove a unique constraint, drop a unique index. To remove other kinds of constraints you need to recreate and reload the table, using other parameters to the <xref linkend="SQL-CREATETABLE" endterm="SQL-CREATETABLE-title"> diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml index 4772ad0530a..07d46eb56aa 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.17 2000/07/22 02:39:10 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.18 2000/10/05 19:48:17 momjian Exp $ Postgres documentation --> @@ -210,7 +210,7 @@ ERROR: <replaceable>reason</replaceable> You must have <firstterm>select access</firstterm> on any table whose values are read by <command>COPY</command>, and either - <firstterm>insert or update access</firstterm> to a + <firstterm>insert</firstterm> or <firstterm>update access</firstterm> to a table into which values are being inserted by <command>COPY</command>. The backend also needs appropriate Unix permissions for any file read or written by <command>COPY</command>. @@ -293,7 +293,7 @@ ERROR: <replaceable>reason</replaceable> <para> The actual format for each instance is <programlisting> -<attr1><<replaceable class=parameter>separator</replaceable>><attr2><<replaceable class=parameter>separator</replaceable>>...<<replaceable class=parameter>separator</replaceable>><attr<replaceable class="parameter">n</replaceable>><newline> +<attr1><<replaceable class=parameter>separator</replaceable>><attr2><<replaceable class=parameter>separator</replaceable>>...<<replaceable class=parameter>separator</replaceable>><attr<replaceable class="parameter">n</replaceable>><newline>. </programlisting> The oid is placed on the beginning of the line if WITH OIDS is specified. @@ -331,7 +331,7 @@ ERROR: <replaceable>reason</replaceable> In the case of <command>COPY BINARY</command>, the first four bytes in the file will be the number of instances in the file. If this number is zero, the <command>COPY BINARY</command> command - will read until end of file is encountered. Otherwise, it will + will read until end-of-file is encountered. Otherwise, it will stop reading when this number of instances has been read. Remaining data in the file will be ignored. </para> @@ -414,7 +414,7 @@ The following example copies a table to standard output, COPY country TO <filename>stdout</filename> USING DELIMITERS '|'; </programlisting> <para> - To copy data from a Unix file into a table "country": + To copy data from a Unix file into a table country: </para> <programlisting> COPY country FROM '/usr1/proj/bray/sql/country_data'; @@ -434,7 +434,7 @@ has the termination sequence on the last line): \. </programlisting> <para> - The same data, output in binary format on a Linux/i586 machine. + The following is the same data, output in binary format on a Linux/i586 machine. The data is shown after filtering through the Unix utility <command>od -c</command>. The table has three fields; the first is <classname>char(2)</classname> diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml index 2571a027b3e..16d2e5b8248 100644 --- a/doc/src/sgml/ref/create_aggregate.sgml +++ b/doc/src/sgml/ref/create_aggregate.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.11 2000/09/12 20:52:07 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.12 2000/10/05 19:48:17 momjian Exp $ Postgres documentation --> @@ -162,7 +162,7 @@ CREATE for base types such as <function>min(int4)</function> and <function>avg(float8)</function> are already provided in the base distribution. If one defines new types or needs an aggregate function not - already provided then <command>CREATE AGGREGATE</command> + already provided, then <command>CREATE AGGREGATE</command> can be used to provide the desired features. </para> <para> diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml index 1c5daa62631..d9e371b1be8 100644 --- a/doc/src/sgml/ref/create_database.sgml +++ b/doc/src/sgml/ref/create_database.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.14 2000/05/02 20:02:03 thomas Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.15 2000/10/05 19:48:17 momjian Exp $ Postgres documentation --> @@ -115,7 +115,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> [ WITH LOCATIO <listitem> <para> The expansion of the specified <replaceable class="parameter">dbpath</replaceable> - (see below how) failed. Check the path you entered or make sure that the + (see below) failed. Check the path you entered or make sure that the environment variable you are referencing does exist. </para> </listitem> @@ -138,7 +138,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> [ WITH LOCATIO <para> These are most likely related to insufficient permissions on the data directory, a full disk, or other file system problems. The user under - which the database server is running, must have access to the location. + which the database server is running must have access to the location. </para> </listitem> </varlistentry> @@ -177,7 +177,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable> [ WITH LOCATIO If the server is compiled with <literal>ALLOW_ABSOLUTE_DBPATHS</literal> (not so by default), absolute path names, as identified by a leading slash - (e.g. '<filename>/usr/local/pgsql/data</filename>'), + (e.g., '<filename>/usr/local/pgsql/data</filename>'), are allowed as well. </para> diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml index cb484a41a44..81982c11b70 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.17 2000/08/25 15:17:50 thomas Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_function.sgml,v 1.18 2000/10/05 19:48:17 momjian Exp $ Postgres documentation --> @@ -60,7 +60,7 @@ CREATE FUNCTION <replaceable class="parameter">name</replaceable> ( [ <replaceab The data type(s) of the function's arguments, if any. The input types may be base or complex types, or <firstterm>opaque</firstterm>. - <literal>opaque</literal> indicates that the function + <literal>Opaque</literal> indicates that the function accepts arguments of a non-SQL type such as <type>char *</type>. </para> </listitem> @@ -71,7 +71,7 @@ CREATE FUNCTION <replaceable class="parameter">name</replaceable> ( [ <replaceab <para> The return data type. The output type may be specified as a base type, complex type, - <option>setof <replaceable class="parameter">type</replaceable></option>, + <option>setof type</option>, or <option>opaque</option>. The <option>setof</option> modifier indicates that the function will return a set of items, @@ -103,7 +103,7 @@ CREATE FUNCTION <replaceable class="parameter">name</replaceable> ( [ <replaceab <listitem> <para> This form of the <command>AS</command> clause is used for - dynamically-linked, C language functions when the function name in + dynamically linked, C language functions when the function name in the C language source code is not the same as the name of the SQL function. The string <replaceable class="parameter">obj_file</replaceable> is the name of the file @@ -118,7 +118,7 @@ CREATE FUNCTION <replaceable class="parameter">name</replaceable> ( [ <replaceab <term><replaceable class="parameter">langname</replaceable></term> <listitem> <para> - may be '<literal>sql</literal>', + May be '<literal>sql</literal>', '<literal>C</literal>', '<literal>newC</literal>', '<literal>internal</literal>', '<literal>newinternal</literal>', or '<replaceable class="parameter">plname</replaceable>', @@ -189,7 +189,7 @@ CREATE <term>iscachable</term> <listitem> <para> - <option>iscachable</option> indicates that the function always + <option>Iscachable</option> indicates that the function always returns the same result when given the same argument values (i.e., it does not do database lookups or otherwise use information not directly present in its parameter list). The optimizer uses @@ -243,7 +243,7 @@ CREATE <para> The full <acronym>SQL92</acronym> type syntax is allowed for input arguments and return value. However, some details of the - type specification (e.g. the precision field for + type specification (e.g., the precision field for <type>numeric</type> types) are the responsibility of the underlying function implementation and are silently swallowed (i.e., not recognized or @@ -263,7 +263,7 @@ CREATE errors at link time. To get around that, give them different C names (for example, use the argument types as part of the C names), then specify those names in the AS clause of <command>CREATE FUNCTION</command>. - If the AS clause is left empty then <command>CREATE FUNCTION</command> + If the AS clause is left empty, then <command>CREATE FUNCTION</command> assumes the C name of the function is the same as the SQL name. </para> @@ -322,7 +322,7 @@ CREATE TABLE product ( <para> This example creates a function that does type conversion between the - user defined type complex, and the internal type point. The + user-defined type complex, and the internal type point. The function is implemented by a dynamically loaded object that was compiled from C source. For <productname>Postgres</productname> to find a type conversion function automatically, the sql function has diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml index 44956f78bd5..550187ef462 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.15 2000/09/12 20:52:08 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.16 2000/10/05 19:48:17 momjian Exp $ Postgres documentation --> @@ -305,7 +305,7 @@ ERROR: Cannot create index: 'index_name' already exists. <literal>bigbox_ops</literal> both support rtree indices on the <literal>box</literal> data type. The difference between them is that <literal>bigbox_ops</literal> - scales box coordinates down, to avoid floating point exceptions from + scales box coordinates down, to avoid floating-point exceptions from doing multiplication, addition, and subtraction on very large floating-point coordinates. If the field on which your rectangles lie is about 20,000 units square or larger, you should use diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml index 7e95f4310b8..bab3aa4797e 100644 --- a/doc/src/sgml/ref/create_language.sgml +++ b/doc/src/sgml/ref/create_language.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_language.sgml,v 1.11 2000/08/24 23:36:29 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_language.sgml,v 1.12 2000/10/05 19:48:17 momjian Exp $ Postgres documentation --> @@ -169,7 +169,7 @@ ERROR: PL handler function <replaceable class="parameter">funcname</replaceable <para> The call handler for a procedural language must be written - in a compiled language such as 'C' and registered with + in a compiled language such as C and registered with <productname>Postgres</productname> as a function taking no arguments and returning the <type>opaque</type> type, a placeholder for unspecified or undefined types. @@ -206,7 +206,7 @@ ERROR: PL handler function <replaceable class="parameter">funcname</replaceable <filename>pg_proc</filename> table entry. This may be the source text in the procedural language itself (like for PL/Tcl), a pathname to a - file or anything else that tells the call handler what to + file, or anything else that tells the call handler what to do in detail. </para> @@ -295,7 +295,7 @@ ERROR: PL handler function <replaceable class="parameter">funcname</replaceable Usage </title> <para> - This is a template for a PL handler written in 'C': + This is a template for a PL handler written in C: <programlisting> #include "executor/spi.h" #include "commands/trigger.h" diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml index 12be4c87e40..2717037aa89 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.18 2000/07/22 02:39:10 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.19 2000/10/05 19:48:17 momjian Exp $ Postgres documentation --> @@ -71,7 +71,7 @@ CREATE RULE <replaceable class="parameter">name</replaceable> AS ON <replaceable <listitem> <para> Any SQL WHERE clause, <literal>new</literal> or - <literal>old</literal> can appear instead of an instance + <literal>old</literal>, can appear instead of an instance variable whenever an instance variable is permissible in SQL. </para> </listitem> @@ -81,7 +81,7 @@ CREATE RULE <replaceable class="parameter">name</replaceable> AS ON <replaceable <listitem> <para> Any SQL statement, <literal>new</literal> or - <literal>old</literal> can appear instead of an instance + <literal>old</literal>, can appear instead of an instance variable whenever an instance variable is permissible in SQL. </para> </listitem> @@ -133,7 +133,7 @@ CREATE <para> The semantics of a rule is that at the time an individual instance is - accessed, inserted, updated, or deleted, there is a old instance (for + accessed, inserted, updated, or deleted, there is an old instance (for selects, updates and deletes) and a new instance (for inserts and updates). If the <replaceable class="parameter">event</replaceable> @@ -190,7 +190,7 @@ ON UPDATE TO emp-1.salary WHERE emp-2.name = "Joe" <replaceable class="parameter">condition</replaceable> part of the rule occurs. Alternately, the <replaceable class="parameter">action</replaceable> part will be done - instead of the user command. In this later case, the + instead of the user command. In this latter case, the <replaceable class="parameter">action</replaceable> can be the keyword <literal>NOTHING</literal>. </para> diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml index 00e90009488..4916b8b649b 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.13 2000/07/21 04:25:05 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.14 2000/10/05 19:48:17 momjian Exp $ Postgres documentation --> @@ -109,7 +109,7 @@ CREATE SEQUENCE <replaceable class="parameter">seqname</replaceable> [ INCREMENT The <option>CACHE <replaceable class="parameter">cache</replaceable></option> option enables sequence numbers to be preallocated and stored in memory for faster access. The minimum - value is 1 (only one value can be generated at a time, i.e. no cache) + value is 1 (only one value can be generated at a time, i.e., no cache) and this is also the default. </para> </listitem> diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index 8a56bae48b7..2610d04c466 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.34 2000/08/24 23:36:29 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_table.sgml,v 1.35 2000/10/05 19:48:17 momjian Exp $ Postgres documentation --> @@ -123,7 +123,7 @@ CREATE [ TEMPORARY | TEMP ] TABLE <replaceable class="PARAMETER">table</replacea PRIMARY KEY clause may be specified for a table; PRIMARY KEY <replaceable>column</replaceable> (a table constraint) and PRIMARY KEY (a column constraint) - are mutually exclusive.. See the table constraint clause for + are mutually exclusive. See the table constraint clause for more information. </para> </listitem> @@ -177,7 +177,7 @@ ERROR <computeroutput> ERROR: Relation '<replaceable class="parameter">table</replaceable>' already exists </computeroutput> - which occurs at runtime, if the table specified already exists + , which occurs at runtime if the table specified already exists in the database. </para> </listitem> @@ -696,7 +696,7 @@ ERROR: Cannot insert a duplicate key into a unique index. NOT NULL constraint, does not violate a UNIQUE constraint. (This deviates from the <acronym>SQL92</acronym> definition, but is a more sensible convention. See the section on compatibility for more - details.). + details.) </para> <para> Each UNIQUE column constraint must name a column that is @@ -853,7 +853,7 @@ ERROR: Cannot insert a duplicate key into a unique index. </computeroutput></term> <listitem> <para> - This occurs at run-time if one tries to insert a duplicate value into + This occurs at runtime if one tries to insert a duplicate value into a column subject to a PRIMARY KEY constraint. </para> </listitem> @@ -882,7 +882,7 @@ ERROR: Cannot insert a duplicate key into a unique index. <para> <productname>Postgres</productname> automatically creates a unique index to assure - data integrity. (See CREATE INDEX statement) + data integrity (see CREATE INDEX statement). </para> <para> The PRIMARY KEY constraint should name a set of columns that is @@ -1157,7 +1157,7 @@ ERROR: <replaceable class="parameter">name</replaceable> referential integrity values in a referenced column of a referenced table. </para> <para> - A value added to this column are matched against the values of the + A value added to this column is matched against the values of the referenced table and referenced column using the given match type. In addition, when the referenced column data is changed, actions are run upon this column's matching data. @@ -1420,8 +1420,8 @@ CREATE TABLE distributors ( <title>Description</title> <para> The PRIMARY KEY constraint specifies a rule that a group of one - or more distinct columns of a table may contain only unique, - (non duplicate), non-null values. The column definitions of + or more distinct columns of a table may contain only unique + (nonduplicate), non-null values. The column definitions of the specified columns do not have to include a NOT NULL constraint to be included in a PRIMARY KEY constraint. </para> @@ -1505,7 +1505,7 @@ CREATE TABLE distributors ( default match type if none is specified. MATCH FULL will not allow one column of a multi-column foreign key to be NULL unless all foreign key columns are NULL. The default MATCH type - allows a some foreign key columns to be NULL while other parts + allows some foreign key columns to be NULL while other parts of the foreign key are not NULL. MATCH PARTIAL is currently not supported. </para> @@ -1696,7 +1696,7 @@ ERROR: <replaceable class="parameter">name</replaceable> referential integrity <title>Description</title> <para> The FOREIGN KEY constraint specifies a rule that a group of one - or more distinct columns of a table are related to a group + or more distinct columns of a table is related to a group of distinct columns in the referenced table. </para> @@ -1853,7 +1853,7 @@ CREATE TABLE distributors ( SQL92 </title> <para> - In addition to the locally-visible temporary table, SQL92 also defines a + In addition to the locally visible temporary table, SQL92 also defines a CREATE GLOBAL TEMPORARY TABLE statement, and optionally an ON COMMIT clause: <synopsis> @@ -1981,7 +1981,7 @@ DEFAULT niladic_user_function | niladic_datetime_function | NULL </note> </para> <para> - An assertion is a special type of integrity constraint and share + An assertion is a special type of integrity constraint and shares the same namespace as other constraints. However, an assertion is not necessarily dependent on one particular base table as constraints are, so SQL-92 provides the CREATE ASSERTION statement @@ -2052,10 +2052,10 @@ CREATE ASSERTION <replaceable>name</replaceable> CHECK ( <replaceable>condition< </listitem> </varlistentry> </variablelist> - </para> - <para> - SET CONSTRAINT changes the foreign key constraint mode only for - the current transaction. + <para> + <term>SET CONSTRAINT</term> changes the foreign key constraint mode + only for the current transaction. + </para> <variablelist> <varlistentry> <term>INITIALLY IMMEDIATE</term> diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml index c1b6e380298..c4fbe0203bf 100644 --- a/doc/src/sgml/ref/create_trigger.sgml +++ b/doc/src/sgml/ref/create_trigger.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.11 2000/09/12 05:30:06 thomas Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.12 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -119,7 +119,7 @@ CREATE operation is attempted on a tuple (before constraints are checked and the <command>INSERT</command>, <command>UPDATE</command> or <command>DELETE</command> is attempted) or - AFTER the operation has been attempted (e.g. after constraints + AFTER the operation has been attempted (e.g., after constraints are checked and the <command>INSERT</command>, <command>UPDATE</command> or <command>DELETE</command> has completed). If the diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index c921c78d567..095a630a73d 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.14 2000/09/12 20:52:08 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.15 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -237,7 +237,7 @@ CREATE in which case Postgres assumes that the new type has the same format as the Postgres-supplied data type, "<literal>text</literal>". - To indicate that a type is variable-length, set + To indicate that a type is variable length, set <replaceable class="parameter">internallength</replaceable> to <option>VARIABLE</option>. The external representation is similarly specified using the @@ -249,7 +249,7 @@ CREATE To indicate that a type is an array and to indicate that a type has array elements, indicate the type of the array element using the element keyword. For example, to define - an array of 4 byte integers ("int4"), specify + an array of 4-byte integers ("int4"), specify <programlisting>ELEMENT = int4</programlisting> </para> diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml index 803949a1eaa..0e0f41ecaaa 100644 --- a/doc/src/sgml/ref/declare.sgml +++ b/doc/src/sgml/ref/declare.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/declare.sgml,v 1.9 2000/06/28 03:30:54 tgl Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/declare.sgml,v 1.10 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -40,7 +40,7 @@ DECLARE <replaceable class="parameter">cursorname</replaceable> [ BINARY ] [ INS <term><replaceable class="parameter">cursorname</replaceable></term> <listitem> <para> - The name of the cursor to be used in subsequent FETCH operations.. + The name of the cursor to be used in subsequent FETCH operations. </para> </listitem> </varlistentry> @@ -96,7 +96,7 @@ DECLARE <replaceable class="parameter">cursorname</replaceable> [ BINARY ] [ INS <listitem> <para> <acronym>SQL92</acronym> keyword indicating that the cursor will be used - in a readonly mode. Since this is the only cursor access mode + in a read only mode. Since this is the only cursor access mode available in <productname>Postgres</productname> this keyword has no effect. </para> </listitem> @@ -227,7 +227,7 @@ ERROR: Named portals may only be used in begin/end transaction blocks and <emphasis><productname>Postgres</productname> does not resolve byte ordering or representation issues for binary cursors</emphasis>. Therefore, if your client machine and server machine use different - representations (e.g. "big-endian" versus "little-endian"), + representations (e.g., "big-endian" versus "little-endian"), you will probably not want your data returned in binary format. However, binary cursors may be a @@ -306,7 +306,7 @@ DECLARE liahona CURSOR interactively. <acronym>SQL92</acronym> allows embedded or modular cursors to update database information. - All <productname>Postgres</productname> cursors are readonly. + All <productname>Postgres</productname> cursors are read only. The BINARY keyword is a <productname>Postgres</productname> extension. </para> </refsect2> diff --git a/doc/src/sgml/ref/drop_database.sgml b/doc/src/sgml/ref/drop_database.sgml index 363a4ab5cc7..13007e9cb91 100644 --- a/doc/src/sgml/ref/drop_database.sgml +++ b/doc/src/sgml/ref/drop_database.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_database.sgml,v 1.9 1999/12/12 05:15:09 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_database.sgml,v 1.10 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -91,7 +91,7 @@ DROP DATABASE <replaceable class="PARAMETER">name</replaceable> <term><computeroutput>ERROR: dropdb: cannot be executed on an open database</computeroutput></term> <listitem> <para> - You cannot be connected to the the database your are about to remove. + You cannot be connected to the database your are about to remove. Instead, you could connect to <literal>template1</literal> or any other database and run this command again. </para> diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml index e97c74fe476..6c707960b56 100644 --- a/doc/src/sgml/ref/drop_operator.sgml +++ b/doc/src/sgml/ref/drop_operator.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.6 1999/07/22 15:09:10 thomas Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.7 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -92,7 +92,7 @@ ERROR: RemoveOperator: left unary operator '<replaceable class="PARAMETER">oper </computeroutput></term> <listitem> <para> - This message occurs if the specified left unary operator + This message occurs if the left unary operator specified does not exist. </para> </listitem> @@ -103,7 +103,7 @@ ERROR: RemoveOperator: right unary operator '<replaceable class="PARAMETER">ope </computeroutput></term> <listitem> <para> - This message occurs if the specified right unary operator + This message occurs if the right unary operator specified does not exist. </para> </listitem> diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml index cb14be418c9..597f7462af3 100644 --- a/doc/src/sgml/ref/drop_rule.sgml +++ b/doc/src/sgml/ref/drop_rule.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.6 1999/07/22 15:09:10 thomas Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_rule.sgml,v 1.7 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -62,7 +62,7 @@ DROP </computeroutput></term> <listitem> <para> - Message returned if successfully. + Message returned if successful. </para> </listitem> </varlistentry> diff --git a/doc/src/sgml/ref/ecpg-ref.sgml b/doc/src/sgml/ref/ecpg-ref.sgml index 474462638c7..a5e98e8cfdd 100644 --- a/doc/src/sgml/ref/ecpg-ref.sgml +++ b/doc/src/sgml/ref/ecpg-ref.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/ecpg-ref.sgml,v 1.4 2000/09/12 20:58:14 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/ecpg-ref.sgml,v 1.5 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -248,7 +248,7 @@ EXEC SQL INCLUDE sqlca; from C statements, sqlca (which includes the sqlca.h header file) MUST be lowercase. This is because the EXEC SQL prefix indicates that this INCLUDE will be parsed by ecpg. - ecpg observes case sensitivity (SQLCA.h will not be found.) + ecpg observes case sensitivity (SQLCA.h will not be found). <command>EXEC SQL INCLUDE</command> can be used to include other header files as long as case sensitivity is observed. diff --git a/doc/src/sgml/ref/explain.sgml b/doc/src/sgml/ref/explain.sgml index c31935b3237..1786cd9a2e7 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.10 2000/08/29 20:02:09 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/explain.sgml,v 1.11 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -104,8 +104,8 @@ EXPLAIN <para> This command displays the execution plan that the Postgres planner generates for the supplied query. The execution plan shows how - the table(s) referenced by the query will be scanned --- by plain - sequential scan, index scan etc --- and if multiple tables are + the table(s) referenced by the query will be scanned---by plain + sequential scan, index scan, etc.---and if multiple tables are referenced, what join algorithms will be used to bring together the required tuples from each input table. </para> diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml index cb5c33fdcb7..eb6f3ddd549 100644 --- a/doc/src/sgml/ref/fetch.sgml +++ b/doc/src/sgml/ref/fetch.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/fetch.sgml,v 1.12 2000/07/22 04:30:27 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/fetch.sgml,v 1.13 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -42,7 +42,7 @@ FETCH [ FORWARD | BACKWARD | RELATIVE ] [ <replaceable class="PARAMETER">#</repl <listitem> <para> <replaceable class="PARAMETER">selector</replaceable> - defines the fetch direction. It can be one + defines the fetch direction. It can be one of the following: <variablelist> @@ -88,7 +88,7 @@ FETCH [ FORWARD | BACKWARD | RELATIVE ] [ <replaceable class="PARAMETER">#</repl <term><replaceable class="PARAMETER">#</replaceable></term> <listitem> <para> - A signed integer that specify how many rows to fetch. + A signed integer that specifies how many rows to fetch. Note that a negative integer is equivalent to changing the sense of FORWARD and BACKWARD. </para> @@ -190,7 +190,7 @@ ERROR: FETCH/RELATIVE at current position is not supported <acronym>SQL92</acronym> allows one to repetitively retrieve the cursor at its "current position" using the syntax <synopsis> -FETCH RELATIVE 0 FROM <replaceable class="PARAMETER">cursor</replaceable> +FETCH RELATIVE 0 FROM <replaceable class="PARAMETER">cursor</replaceable>. </synopsis> </para> @@ -198,7 +198,7 @@ FETCH RELATIVE 0 FROM <replaceable class="PARAMETER">cursor</replaceable> <productname>Postgres</productname> does not currently support this notion; in fact the value zero is reserved to indicate that all rows should be retrieved and is equivalent to specifying the ALL keyword. - If the RELATIVE keyword has been used, the <productname>Postgres</productname> + If the RELATIVE keyword has been used, <productname>Postgres</productname> assumes that the user intended <acronym>SQL92</acronym> behavior and returns this error message. </para> @@ -295,7 +295,7 @@ FETCH RELATIVE 0 FROM <replaceable class="PARAMETER">cursor</replaceable> The following examples traverses a table using a cursor. <programlisting> --- set up and use a cursor: +-- Set up and use a cursor: BEGIN WORK; DECLARE liahona CURSOR FOR SELECT * FROM films; diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index de406f798ba..9770c3dd542 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/grant.sgml,v 1.8 2000/04/09 12:14:25 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/grant.sgml,v 1.9 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -161,7 +161,7 @@ GRANT <replaceable class="PARAMETER">privilege</replaceable> [, ...] ON <replace </term> <listitem> <para> - The name of a user to whom grant privileges. PUBLIC is a short form + The name of a user to whom to grant privileges. PUBLIC is a short form representing all users. </para> </listitem> @@ -242,7 +242,7 @@ ERROR: ChangeAcl: class "<replaceable class="PARAMETER">object</replaceable>" n <para> Currently, to grant privileges in <productname>Postgres</productname> - to only few columns, you must + to only a few columns, you must create a view having desired columns and then grant privileges to that view. </para> @@ -325,7 +325,7 @@ GRANT <replaceable class="PARAMETER">privilege</replaceable> [, ...] </para> <para> - Fields are compatible with the those in the <acronym>Postgres</acronym> + Fields are compatible with those in the <acronym>Postgres</acronym> implementation, with the following additions: <variablelist> diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml index 2ee434511b9..0c2204157d8 100644 --- a/doc/src/sgml/ref/initdb.sgml +++ b/doc/src/sgml/ref/initdb.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/initdb.sgml,v 1.11 2000/05/02 20:02:03 thomas Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/initdb.sgml,v 1.12 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -148,7 +148,7 @@ initdb [ --pgdata|-D <replaceable class="parameter">dbdir</replaceable> ] <listitem> <para> By default, when <application>initdb</application> - determines that error prevent it from completely creating the database + determines that an error prevented it from completely creating the database system, it removes any files it may have created before determining that it can't finish the job. This option inhibits any tidying-up and is thus useful for debugging. @@ -212,7 +212,7 @@ initdb [ --pgdata|-D <replaceable class="parameter">dbdir</replaceable> ] database. When you create a new database, everything in the <literal>template1</literal> database is copied. It contains catalog tables filled in for things like the - builtin types. + built-in types. </para> <para> @@ -220,7 +220,8 @@ initdb [ --pgdata|-D <replaceable class="parameter">dbdir</replaceable> ] because you cannot run the database server as root either, but the server needs to have access to the files <application>initdb</application> creates. Furthermore, during the initialization phase, when there are no - users and no access controls installed, postgres will only connect with + users and no access controls installed, <productname>Postgres</productname> + will only connect with the name of the current Unix user, so you must log in under the account that will own the server process. </para> diff --git a/doc/src/sgml/ref/initlocation.sgml b/doc/src/sgml/ref/initlocation.sgml index 3f0bbad5793..c4c2d182ae9 100644 --- a/doc/src/sgml/ref/initlocation.sgml +++ b/doc/src/sgml/ref/initlocation.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/initlocation.sgml,v 1.9 2000/05/26 15:47:17 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/initlocation.sgml,v 1.10 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -80,7 +80,7 @@ initlocation <replaceable class="parameter">directory</replaceable> </para> <para> In order to use this command you must be logged in (using 'su', for example) - the database superuser. + as the database superuser. </para> </refsect1> diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml index 3fad81efdd6..a265ebaba43 100644 --- a/doc/src/sgml/ref/insert.sgml +++ b/doc/src/sgml/ref/insert.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/insert.sgml,v 1.9 2000/08/25 15:17:50 thomas Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/insert.sgml,v 1.10 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -130,7 +130,7 @@ INSERT 0 <replaceable>#</replaceable> <para> <command>INSERT</command> allows one to insert new rows into a class or table. One can insert - a single row at time or several rows as a result of a query. + a single row at a time or several rows as a result of a query. The columns in the target list may be listed in any order. </para> diff --git a/doc/src/sgml/ref/ipcclean.sgml b/doc/src/sgml/ref/ipcclean.sgml index 6063c332937..22e94a85de2 100644 --- a/doc/src/sgml/ref/ipcclean.sgml +++ b/doc/src/sgml/ref/ipcclean.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/ipcclean.sgml,v 1.1 1999/07/22 15:09:12 thomas Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/ipcclean.sgml,v 1.2 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -80,7 +80,7 @@ semget: No space left on device is running, the shared memory and semaphores allocated by the <application>postmaster</application> will be deleted. This will result in a general failure of the - backends servers started by that + backend servers started by that <application>postmaster</application>. </para> diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml index 07d415f8fb2..32a8e2d0c95 100644 --- a/doc/src/sgml/ref/lock.sgml +++ b/doc/src/sgml/ref/lock.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.21 2000/07/22 04:30:27 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.22 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -74,7 +74,7 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX <note> <para> Automatically acquired by <command>SELECT...FOR UPDATE</command>. - While it is a shared lock, may be upgrade later to a ROW EXCLUSIVE lock. + While it is a shared lock, may be upgraded later to a ROW EXCLUSIVE lock. </para> </note> @@ -170,7 +170,7 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX <note> <para> This lock mode is also acquired by an unqualified - <command>LOCK TABLE</command> (i.e. the command without an explicit + <command>LOCK TABLE</command> (i.e., the command without an explicit lock mode option). </para> </note> @@ -230,7 +230,7 @@ ERROR <replaceable class="PARAMETER">name</replaceable>: Table does not exist. for the duration of a transaction. <productname>Postgres</productname> always uses the least restrictive lock mode whenever possible. <command>LOCK TABLE</command> - provided for cases when you might need more restrictive locking. + provides for cases when you might need more restrictive locking. </para> <para> @@ -298,7 +298,7 @@ ERROR <replaceable class="PARAMETER">name</replaceable>: Table does not exist. <para> To read data in their real current state when running a transaction at the SERIALIZABLE isolation level you have to execute a LOCK TABLE - statement before execution any DML statement, when the transaction defines + statement before executing any DML statement, when the transaction defines what concurrent changes will be visible to itself. </para> </note> @@ -306,15 +306,15 @@ ERROR <replaceable class="PARAMETER">name</replaceable>: Table does not exist. <para> In addition to the requirements above, if a transaction is going to - change data in a table then SHARE ROW EXCLUSIVE lock mode should + change data in a table, then SHARE ROW EXCLUSIVE lock mode should be acquired to prevent deadlock conditions when two concurrent transactions attempt to lock the table in SHARE mode and then try to change data in this table, both (implicitly) acquiring - ROW EXCLUSIVE lock mode that conflicts with concurrent SHARE lock. + ROW EXCLUSIVE lock mode that conflicts with a concurrent SHARE lock. </para> <para> - To continue with the deadlock (when two transaction wait one another) + To continue with the deadlock (when two transaction wait for one another) issue raised above, you should follow two general rules to prevent deadlock conditions: </para> @@ -337,7 +337,7 @@ ERROR <replaceable class="PARAMETER">name</replaceable>: Table does not exist. <listitem> <para> Transactions should acquire two conflicting lock modes only if - one of them is self-conflicting (i.e. may be held by one + one of them is self-conflicting (i.e., may be held by one transaction at time only). If multiple lock modes are involved, then transactions should always acquire the most restrictive mode first. </para> diff --git a/doc/src/sgml/ref/notify.sgml b/doc/src/sgml/ref/notify.sgml index ca22f29e606..0e5748a736f 100644 --- a/doc/src/sgml/ref/notify.sgml +++ b/doc/src/sgml/ref/notify.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/notify.sgml,v 1.12 2000/07/21 04:42:28 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/notify.sgml,v 1.13 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -136,7 +136,7 @@ NOTIFY the notify event will not be delivered to its connected frontend until just after the transaction is completed (either committed or aborted). Again, the reasoning is that if a notify were delivered within a transaction that was - later aborted, one would want the notification to be undone somehow --- but + later aborted, one would want the notification to be undone somehow---but the backend cannot "take back" a notify once it has sent it to the frontend. So notify events are only delivered between transactions. The upshot of this is that applications using <command>NOTIFY</command> for real-time signaling @@ -156,7 +156,7 @@ NOTIFY It is common for a frontend that sends <command>NOTIFY</command> to be listening on the same notify name itself. In that case it will get back a notify event, just like all the other listening frontends. Depending on the - application logic, this could result in useless work --- for example, + application logic, this could result in useless work---for example, re-reading a database table to find the same updates that that frontend just wrote out. In <productname>Postgres</productname> 6.4 and later, it is possible to avoid such extra work by noticing whether the notifying backend diff --git a/doc/src/sgml/ref/pgctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml index 4b0e81b4489..0e367e4ccc4 100644 --- a/doc/src/sgml/ref/pgctl-ref.sgml +++ b/doc/src/sgml/ref/pg_ctl-ref.sgml @@ -1,11 +1,11 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pgctl-ref.sgml,v 1.7 2000/08/29 20:02:09 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.1 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> -<refentry id="app-pgctl"> +<refentry id="app-pg_ctl"> <refmeta> - <refentrytitle id="app-pgctl-title"> + <refentrytitle id="app-pg_ctl-title"> <application>pg_ctl</application> </refentrytitle> <refmiscinfo>Application</refmiscinfo> @@ -44,7 +44,7 @@ pg_ctl [-D <replaceable class="parameter">datadir</replaceable>] status <term>-w</term> <listitem> <para> - Wait for the database server comes up, by + Wait for the database server to come up, by watching for creation of the pid file (PGDATA/postmaster.pid). Times out after 60 seconds. </para> @@ -77,7 +77,7 @@ pg_ctl [-D <replaceable class="parameter">datadir</replaceable>] status <application>postmaster</application>. </para> <para> - The parameters are usually surrounded by single- or double + The parameters are usually surrounded by single or double quotes to ensure that they are passed through as a group. </para> </listitem> @@ -106,7 +106,7 @@ pg_ctl [-D <replaceable class="parameter">datadir</replaceable>] status <term>f</term> <listitem> <para> - Fast mode sends SIGTERM to the backends, that means + Fast mode sends SIGTERM to the backends; that means active transactions get rolled back. </para> </listitem> @@ -221,7 +221,7 @@ $ pg_ctl start </para> <para> - If -w is supplied, pg_ctl waits for the database server comes up, by + If -w is supplied, pg_ctl waits for the database server to come up, by watching for creation of the pid file (PGDATA/postmaster.pid), for up to 60 seconds. </para> @@ -333,7 +333,7 @@ $ pg_ctl stop <option>-w</option>, <option>-D</option>, <option>-m</option>, <option>-fast</option>, <option>-immediate</option> and <option>-o</option> - can also be used in the restarting mode and they have same meanings as + can also be used in the restarting mode and they have the same meanings as described above. </para> diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml index ac853761c2b..f0d1facfca2 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.19 2000/07/22 04:45:09 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.20 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -69,7 +69,7 @@ pg_dump [ -h <replaceable class="parameter">host</replaceable> ] [ -p <replaceab <term>-c</term> <listitem> <para> - Clean(drop) schema prior to create. + Clean (drop) schema prior to create. </para> </listitem> </varlistentry> @@ -171,7 +171,7 @@ pg_dump [ -h <replaceable class="parameter">host</replaceable> ] [ -p <replaceab <term>-v</term> <listitem> <para> - Specifies verbose mode + Specifies verbose mode. </para> </listitem> </varlistentry> @@ -199,7 +199,7 @@ pg_dump [ -h <replaceable class="parameter">host</replaceable> ] [ -p <replaceab Specifies the hostname of the machine on which the <application>postmaster</application> is running. Defaults to using a local Unix domain socket - rather than an IP connection.. + rather than an IP connection. </para> </listitem> </varlistentry> diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml index 33d64e9e655..02bf45e4050 100644 --- a/doc/src/sgml/ref/pg_dumpall.sgml +++ b/doc/src/sgml/ref/pg_dumpall.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.9 2000/07/21 18:51:24 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.10 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -106,7 +106,7 @@ pg_dumpall [ -h <replaceable class="parameter">host</replaceable> ] [ -p <replac <term>-v</term> <listitem> <para> - Specifies verbose mode + Specifies verbose mode. </para> </listitem> </varlistentry> diff --git a/doc/src/sgml/ref/pgaccess-ref.sgml b/doc/src/sgml/ref/pgaccess-ref.sgml index 7fc553fea70..04a9e116eb8 100644 --- a/doc/src/sgml/ref/pgaccess-ref.sgml +++ b/doc/src/sgml/ref/pgaccess-ref.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pgaccess-ref.sgml,v 1.4 1999/08/06 13:50:30 thomas Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pgaccess-ref.sgml,v 1.5 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -80,7 +80,7 @@ pgaccess [ <replaceable class="parameter">dbname</replaceable> ] <itemizedlist mark="bullet" spacing="compact"> <listitem> <para> - Opens any database on a specified host at the specified port, + Open any database on a specified host at the specified port, username and password. </para> </listitem> @@ -93,7 +93,7 @@ pgaccess [ <replaceable class="parameter">dbname</replaceable> ] <listitem> <para> - Saves preferences in <filename>~/.pgaccessrc</filename> file. + Save preferences in <filename>~/.pgaccessrc</filename> file. </para> </listitem> </itemizedlist> @@ -213,10 +213,10 @@ pgaccess [ <replaceable class="parameter">dbname</replaceable> ] <listitem> <para> - Execute with optional user input parameters; e.g. + Execute with optional user input parameters; e.g., <programlisting> select * from invoices where year=[parameter "Year of selection"] - </programlisting> + </programlisting>. </para> </listitem> diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml index 7650ddd9457..4f795665390 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.13 2000/07/22 04:45:09 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.14 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -325,7 +325,7 @@ postgres [ -B <replaceable class="parameter">nBuffers</replaceable> ] [ -C ] [ - <para> Indicates to the backend server that it has been started by a <application>postmaster</application> - and make different assumptions about buffer pool management, file + and makes different assumptions about buffer pool management, file descriptors, etc. Switches following -p are restricted to those considered "secure". </para> diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml index dda77314c80..eba01b30d4d 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.11 2000/07/21 14:51:00 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.12 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -173,7 +173,7 @@ postmaster [ -B <replaceable class="parameter">nBuffers</replaceable> ] [ -D <re environment variable, or if <envar>PGPORT</envar> is not set, then defaults to the value established when Postgres was compiled (normally 5432). If you specify a port other than the - default port then all frontend applications (including + default port, then all frontend applications (including <application>psql</application>) must specify the same port using either command-line options or <envar>PGPORT</envar>. diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 14eea7324df..c91420342e0 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.37 2000/09/27 11:56:16 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.38 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -72,7 +72,7 @@ Postgres documentation If an argument is found that does not belong to any option it will be interpreted as the database name (or the user name, if the database name is also given). Not all these options are required, defaults do apply. - If you omit the host name psql will connect via a UNIX domain socket + If you omit the host name psql will connect via a Unix domain socket to a server on the local host. The default port number is compile-time determined. Since the database server uses the same default, you will not have to specify the port in most @@ -153,8 +153,8 @@ testdb=> <para> The format of a <application>psql</application> command is the backslash, followed immediately by a command verb, then any arguments. The arguments - are separated from the command verb and each other by any number of white - space characters. + are separated from the command verb and each other by any number of + whitespace characters. </para> <para> @@ -252,7 +252,7 @@ testdb=> </para> <para> - If the connection attempt failed (wrong username, access denied, etc.) the + If the connection attempt failed (wrong username, 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 @@ -405,7 +405,7 @@ testdb=> If <replaceable class="parameter">pattern</replaceable> (a regular expression) is specified, only matching functions are shown. If the form <literal>\df+</literal> is used, additional information about - each function, including language and description is shown. + each function, including language and description, is shown. </para> </listitem> </varlistentry> @@ -424,7 +424,7 @@ testdb=> <para> If <replaceable class="parameter">pattern</replaceable> is specified, - it is a regular expression restricts the listing to those objects + it is a regular expression that restricts the listing to those objects whose name matches. If one appends a <quote>+</quote> to the command name, each object is listed with its associated description, if any. </para> @@ -741,7 +741,7 @@ lo_import 152801 <listitem> <para> Saves future query results to the file - <replaceable class="parameter">filename</replaceable> or pipe future + <replaceable class="parameter">filename</replaceable> or pipes future results into a separate Unix shell to execute <replaceable class="parameter">command</replaceable>. If no arguments are specified, the query output will be reset to @@ -1174,7 +1174,7 @@ Access permissions for database "test" <term><literal>\?</literal></term> <listitem> <para> - Get help information about the slash (<quote>\</quote>) commands. + Get help information about the backslash (<quote>\</quote>) commands. </para> </listitem> </varlistentry> @@ -1288,7 +1288,7 @@ Access permissions for database "test" Use the file <replaceable class="parameter">filename</replaceable> as the source of queries instead of reading queries interactively. After the file is processed, <application>psql</application> terminates. - This in many ways equivalent to the internal command <command>\i</command>. + This is in many ways equivalent to the internal command <command>\i</command>. </para> <para> Using this option is subtly different from writing @@ -1772,8 +1772,8 @@ bar documentation of the large object interface for more information.) Since <application>psql</application> has no way to tell if you already have a transaction in progress when you call one of its internal - commands <command>\lo_export</command>, <command>\lo_import</command>, - <command>\lo_unlink</command> it must take some arbitrary action. This + commands (<command>\lo_export</command>, <command>\lo_import</command>, + <command>\lo_unlink</command>) it must take some arbitrary action. This action could either be to roll back any transaction that might already be in progress, or to commit any such transaction, or to do nothing at all. In the last case you must provide your own @@ -1900,7 +1900,7 @@ testdb=> <userinput>SELECT * FROM :foo;</userinput> <para> A popular application of this facility is to refer to the last inserted - <acronym>OID</acronym> in subsequent statement to build a foreign key + <acronym>OID</acronym> in subsequent statements to build a foreign key scenario. Another possible use of this mechanism is to copy the contents of a file into a field. First load the file into a variable and then proceed as above. @@ -2021,7 +2021,7 @@ testdb=> <userinput>\set content `sed -e "s/'/\\\\\\'/g" < my_file.txt`</userinp <term><literal>%</literal><replaceable class="parameter">digits</replaceable></term> <listitem><para> If <replaceable class="parameter">digits</replaceable> starts with - <literal>0x</literal> the rest of the characters are interpreted at a + <literal>0x</literal> the rest of the characters are interpreted as a hexadecimal digit and the character with the corresponding code is substituted. If the first digit is <literal>0</literal> the characters are interpreted as on octal number and the corresponding character is @@ -2184,7 +2184,6 @@ peter@localhost testdb=> SELECT * FROM my_table; (4 rows) </programlisting> - Notice how the int4 columns in right aligned while the text column in left aligned. You can make this table look differently by using the <command>\pset</command> command: <programlisting> @@ -2271,9 +2270,9 @@ second | four if you get strange messages, keep this in mind. For example <programlisting> testdb=> <userinput>\foo</userinput> -Field separator is "oo". +Field separator is "oo", </programlisting> - is perhaps not what one would expect. + which is perhaps not what one would expect. </para> </listitem> diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml index 51c4e77c1e9..6e5722ae85f 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.2 2000/07/22 04:45:10 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/reindex.sgml,v 1.3 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -115,9 +115,9 @@ REINDEX </title> <para> <command>REINDEX</command> is used to recover corrupted system indexes. - In order to run REINDEX command,Postmaster must be shutdown and + In order to run REINDEX command, postmaster must be shut down and stand-alone Postgres should be started instead with options -O and - -P(an option to ignore system indexes). Note that we couldn't rely + -P (an option to ignore system indexes). Note that we couldn't rely on system indexes for the recovery of system indexes. </para> </refsect1> diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml index 23d1da2ae12..88ef05aeb03 100644 --- a/doc/src/sgml/ref/revoke.sgml +++ b/doc/src/sgml/ref/revoke.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/revoke.sgml,v 1.10 2000/04/10 01:35:44 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/revoke.sgml,v 1.11 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -375,8 +375,8 @@ REVOKE GRANT OPTION FOR <replaceable class="parameter">privilege</replaceable> [ <para> If user1 gives a privilege WITH GRANT OPTION to user2, - and user2 gives it to user3 then if user1 try revoke - this privilege it fails if he/she specify the RESTRICT + and user2 gives it to user3, then if user1 tries revoke + this privilege it fails if he specify the RESTRICT keyword. </para> </refsect2> diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index 5ca738796ed..6977d10164e 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.32 2000/07/22 04:30:27 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.33 2000/10/05 19:48:18 momjian Exp $ Postgres documentation --> @@ -321,7 +321,7 @@ WHERE <replaceable class="PARAMETER">boolean_expr</replaceable> where <replaceable class="PARAMETER">cond_op</replaceable> can be one of: =, <, <=, >, >= or <>, a conditional operator like ALL, ANY, IN, LIKE, or a - locally-defined operator, + locally defined operator, and <replaceable class="PARAMETER">log_op</replaceable> can be one of: AND, OR, NOT. SELECT will ignore all rows for which the WHERE condition does not return @@ -584,7 +584,7 @@ SELECT name FROM distributors ORDER BY code; <para> When using LIMIT, it is a good idea to use an ORDER BY clause that constrains the result rows into a unique order. Otherwise you will get - an unpredictable subset of the query's rows --- you may be asking for + an unpredictable subset of the query's rows---you may be asking for the tenth through twentieth rows, but tenth through twentieth in what ordering? You don't know what ordering, unless you specified ORDER BY. </para> diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml index 605fbebcaad..a614143a42c 100644 --- a/doc/src/sgml/ref/set.sgml +++ b/doc/src/sgml/ref/set.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.49 2000/09/12 21:12:45 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.50 2000/10/05 19:48:19 momjian Exp $ Postgres documentation --> @@ -236,13 +236,13 @@ SELECT setseed(<replaceable>value</replaceable>); <term>TIMEZONE</term> <listitem> <para> - The possible values for timezone depends on your operating + The possible values for time zone depends on your operating system. For example, on Linux <filename>/usr/share/zoneinfo</filename> contains the database of time zones. </para> <para> - Here are some valid values for timezone: + Here are some valid values for time zone: <variablelist> <varlistentry> @@ -362,7 +362,7 @@ SELECT setseed(<replaceable>value</replaceable>); SET DATESTYLE TO Postgres,European; </screen> - Set the timezone for Berkeley, California, using double quotes to + Set the time zone for Berkeley, California, using double quotes to preserve the uppercase attributes of the time zone specifier (note that the date/time format is ISO here): @@ -375,7 +375,7 @@ SELECT CURRENT_TIMESTAMP AS today; 1998-03-31 07:41:21-08 </screen> - Set the timezone for Italy (note the required single or double quotes to handle + Set the time zone for Italy (note the required single or double quotes to handle the special characters): <screen> diff --git a/doc/src/sgml/ref/unlisten.sgml b/doc/src/sgml/ref/unlisten.sgml index 7cbba21120d..74305cba60c 100644 --- a/doc/src/sgml/ref/unlisten.sgml +++ b/doc/src/sgml/ref/unlisten.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/unlisten.sgml,v 1.11 2000/07/21 04:49:23 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/unlisten.sgml,v 1.12 2000/10/05 19:48:19 momjian Exp $ Postgres documentation --> @@ -72,7 +72,7 @@ UNLISTEN { <replaceable class="PARAMETER">notifyname</replaceable> | * } </computeroutput></term> <listitem> <para> - Acknowledgement that statement has executed. + Acknowledgment that statement has executed. </para> </listitem> </varlistentry> @@ -115,7 +115,7 @@ UNLISTEN { <replaceable class="PARAMETER">notifyname</replaceable> | * } </title> <para> <replaceable class="PARAMETER">classname</replaceable> - needs not to be a valid class name but can be any string valid + need not be a valid class name but can be any string valid as a name up to 32 characters long. </para> <para> diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml index a61f48ca797..3928408a4a3 100644 --- a/doc/src/sgml/ref/vacuum.sgml +++ b/doc/src/sgml/ref/vacuum.sgml @@ -1,5 +1,5 @@ <!-- -$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.10 2000/09/12 21:12:45 momjian Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.11 2000/10/05 19:48:19 momjian Exp $ Postgres documentation --> @@ -159,7 +159,7 @@ NOTICE: Index <replaceable class="PARAMETER">index</replaceable>: Pages 28; <para> <command>VACUUM ANALYZE</command> collects statistics representing the - disbursion of the data in each column. + dispersion of the data in each column. This information is valuable when several query execution paths are possible. </para> diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml index 9a7bc3e5880..8383fa1bdc6 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.60 2000/09/29 20:21:34 petere Exp $ +$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.61 2000/10/05 19:48:16 momjian Exp $ --> <chapter id="release"> @@ -2388,7 +2388,7 @@ enclose unused functions in #ifdef NOT_USED(Bruce) Remove call to difftime() in timestamp support to fix SunOS(Bruce & Thomas) Changes for Digital Unix Portability fix for pg_dumpall(Bruce) -Rename pg_attribute.attnvals to attdisbursion(Bruce) +Rename pg_attribute.attnvals to attdispersion(Bruce) "intro/unix" manual page now "pgintro"(Bruce) "built-in" manual page now "pgbuiltin"(Bruce) "drop" manual page now "drop_table"(Bruce) |