diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 9f449833ac..c856c792b8 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -1,6 +1,6 @@ @@ -1841,7 +1841,7 @@ Possible values are: - 'c' = CHAR alignment, ie no alignment needed. + 'c' = CHAR alignment, i.e., no alignment needed. 's' = SHORT alignment (2 bytes on most machines). diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml index e4e38f6b44..2687a4295f 100644 --- a/doc/src/sgml/datatype.sgml +++ b/doc/src/sgml/datatype.sgml @@ -1,5 +1,5 @@ @@ -397,7 +397,7 @@ CREATE TABLE tablename ( Deprecated - The money is now deprecated. Use + The money type is deprecated. Use numeric or decimal instead, in combination with the to_char function. The money type may become a locale-aware layer over the diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml index 35ed28875f..77e1c77d8f 100644 --- a/doc/src/sgml/perform.sgml +++ b/doc/src/sgml/perform.sgml @@ -1,5 +1,5 @@ @@ -40,7 +40,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.2 2001/02/19 00:24:30 tgl Estimated start-up cost (time expended before output scan can start, - eg, time to do the sorting in a SORT node). + e.g., time to do the sorting in a SORT node). diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index 5a813ed339..e83cf8cbe8 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -396,7 +396,7 @@ The possible response messages from the backend are: A warning message has been issued in relation to the query. - Notices are in addition to other responses, ie. the backend + Notices are in addition to other responses, i.e., the backend will continue processing the command. @@ -489,7 +489,7 @@ The possible response messages from the backend are: A warning message has been issued in relation to the function call. - Notices are in addition to other responses, ie. the backend + Notices are in addition to other responses, i.e., the backend will continue processing the command. diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml index 28b356da4d..28aeccf96f 100644 --- a/doc/src/sgml/queries.sgml +++ b/doc/src/sgml/queries.sgml @@ -1,4 +1,4 @@ - + Queries @@ -146,7 +146,7 @@ FROM table_reference , table_r -T1 { INNER | { LEFT | RIGHT | FULL } OUTER } JOIN T2 ON boolean expression +T1 { INNER | { LEFT | RIGHT | FULL } OUTER } JOIN T2 ON boolean_expression T1 { INNER | { LEFT | RIGHT | FULL } OUTER } JOIN T2 USING ( join column list ) T1 NATURAL { INNER | { LEFT | RIGHT | FULL } OUTER } JOIN T2 @@ -403,9 +403,9 @@ FROM (SELECT * FROM T1) DT1, T2, T3 The syntax of the WHERE clause is -WHERE search condition +WHERE search_condition - where search condition is any value + where search_condition is any value expression as defined in that returns a value of type boolean. @@ -579,10 +579,11 @@ SELECT pid AS "Products", Select Lists - The table expression in the SELECT command + As shown in the previous section, + the table expression in the SELECT command constructs an intermediate virtual table by possibly combining tables, views, eliminating rows, grouping, etc. This table is - finally passed on to processing by the select list. The select + finally passed on to processing by the select list. The select list determines which columns of the intermediate table are actually output. The simplest kind of select list is * which emits all columns that the table diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 0aa9ca4735..85efbf5642 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1,5 +1,5 @@ @@ -1923,7 +1923,7 @@ testdb=> \set content `sed -e "s/'/\\\\\\'/g" < my_file.txt`psql has parsed this line, it passes sed -e "s/'/\\\'/g" < my_file.txt to the shell. The shell - will do it's own thing inside the double quotes and execute sed + will do its own thing inside the double quotes and execute sed with the arguments -e and s/'/\\'/g. When sed parses this it will replace the two backslashes with a single one and then do the substitution. Perhaps at diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index f971359d8b..d9311c95a0 100644 --- a/doc/src/sgml/ref/select.sgml +++ b/doc/src/sgml/ref/select.sgml @@ -1,5 +1,5 @@ @@ -397,7 +397,7 @@ where from_item can be: LEFT OUTER JOIN returns all rows in the qualified Cartesian product - (ie, all combined rows that pass its ON condition), plus one copy of each + (i.e., all combined rows that pass its ON condition), plus one copy of each row in the left-hand table for which there was no right-hand row that passed the ON condition. This left-hand row is extended to the full width of the joined table by inserting NULLs for the right-hand columns. diff --git a/doc/src/sgml/sql.sgml b/doc/src/sgml/sql.sgml index 7b21d34b8d..3b57195c87 100644 --- a/doc/src/sgml/sql.sgml +++ b/doc/src/sgml/sql.sgml @@ -1,5 +1,5 @@ @@ -1410,7 +1410,7 @@ SELECT S.SNO, S.SNAME, COUNT(SE.PNO) Also observe that it makes no sense to ask for an aggregate of an - aggregate, eg, AVG(MAX(sno)), because a SELECT only does one pass + aggregate, e.g., AVG(MAX(sno)), because a SELECT only does one pass of grouping and aggregation. You can get a result of this kind by using a temporary table or a sub-SELECT in the FROM clause to do the first level of aggregation. diff --git a/doc/src/sgml/xaggr.sgml b/doc/src/sgml/xaggr.sgml index 693cb6defe..cd9cea2fc5 100644 --- a/doc/src/sgml/xaggr.sgml +++ b/doc/src/sgml/xaggr.sgml @@ -1,5 +1,5 @@ @@ -74,7 +74,7 @@ SELECT complex_sum(a) FROM test_complex; the state variable and then start applying the transition function at the second non-null input value. Postgres will do that automatically if the initial condition is NULL and - the transition function is marked "strict" (ie, not to be called + the transition function is marked "strict" (i.e., not to be called for NULL inputs). diff --git a/doc/src/sgml/xindex.sgml b/doc/src/sgml/xindex.sgml index f2df6b5624..dc062710e0 100644 --- a/doc/src/sgml/xindex.sgml +++ b/doc/src/sgml/xindex.sgml @@ -1,5 +1,5 @@ @@ -107,7 +107,7 @@ SELECT oid FROM pg_am WHERE amname = 'btree'; impose a strict ordering on keys, lesser to greater. Since Postgres allows the user to define operators, Postgres cannot look at the name of an operator - (eg, ">" or "<") and tell what kind of comparison it is. In fact, + (e.g., ">" or "<") and tell what kind of comparison it is. In fact, some access methods don't impose any ordering at all. For example, R-trees express a rectangle-containment relationship, whereas a hashed data structure expresses only bitwise similarity based diff --git a/doc/src/sgml/y2k.sgml b/doc/src/sgml/y2k.sgml index 9d9b7b4a63..330d67abbe 100644 --- a/doc/src/sgml/y2k.sgml +++ b/doc/src/sgml/y2k.sgml @@ -1,5 +1,5 @@ @@ -18,7 +18,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/y2k.sgml,v 1.9 2001/02/03 19:03:27 pe The PostgreSQL Global Development Group provides the PostgreSQL software code tree as a public service, - without warranty and without liability for it's behavior or performance. + without warranty and without liability for its behavior or performance. However, at the time of writing: