From 0f763503ff3ccdc1255b5dd3add0eff1f6d32162 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 23 Oct 2006 18:10:32 +0000 Subject: [PATCH] Spellchecking and such --- doc/src/sgml/backup.sgml | 8 +- doc/src/sgml/catalogs.sgml | 28 +++---- doc/src/sgml/client-auth.sgml | 6 +- doc/src/sgml/config.sgml | 20 ++--- doc/src/sgml/cvs.sgml | 18 ++--- doc/src/sgml/datatype.sgml | 8 +- doc/src/sgml/ddl.sgml | 10 +-- doc/src/sgml/docguide.sgml | 4 +- doc/src/sgml/ecpg.sgml | 108 +++++++++++++-------------- doc/src/sgml/func.sgml | 60 +++++++-------- doc/src/sgml/gist.sgml | 4 +- doc/src/sgml/history.sgml | 6 +- doc/src/sgml/indices.sgml | 6 +- doc/src/sgml/information_schema.sgml | 4 +- doc/src/sgml/libpq.sgml | 13 ++-- doc/src/sgml/lobj.sgml | 14 ++-- doc/src/sgml/maintenance.sgml | 7 +- doc/src/sgml/plperl.sgml | 6 +- doc/src/sgml/plpgsql.sgml | 10 +-- doc/src/sgml/plpython.sgml | 4 +- doc/src/sgml/queries.sgml | 4 +- doc/src/sgml/ref/alter_table.sgml | 4 +- doc/src/sgml/ref/comment.sgml | 4 +- doc/src/sgml/ref/create_trigger.sgml | 4 +- doc/src/sgml/ref/drop_type.sgml | 4 +- doc/src/sgml/ref/insert.sgml | 4 +- doc/src/sgml/ref/pg_config-ref.sgml | 16 ++-- doc/src/sgml/ref/pg_dump.sgml | 4 +- doc/src/sgml/ref/psql-ref.sgml | 4 +- doc/src/sgml/ref/values.sgml | 6 +- doc/src/sgml/release.sgml | 43 +++++------ doc/src/sgml/sources.sgml | 4 +- doc/src/sgml/spi.sgml | 4 +- doc/src/sgml/wal.sgml | 6 +- doc/src/sgml/xindex.sgml | 4 +- 35 files changed, 231 insertions(+), 228 deletions(-) diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml index 9996cb286c..fdfcfb7fef 100644 --- a/doc/src/sgml/backup.sgml +++ b/doc/src/sgml/backup.sgml @@ -1,4 +1,4 @@ - + Backup and Restore @@ -977,7 +977,7 @@ restore_command = 'cp /mnt/server/archivedir/%f %p' If recovery fails for an external reason, such as a system crash or the WAL archive has become inaccessible, then the recovery can be simply restarted and it will restart almost from where it failed. - Restartable recovery works by writing a restartpoint record to the control + Restartable recovery works by writing a restart-point record to the control file at the first safely usable checkpoint record found after checkpoint_timeout seconds. @@ -1188,7 +1188,7 @@ restore_command = 'copy /mnt/server/archivedir/%f "%p"' # Windows If we take a backup of the server files whilst a recovery is in progress, - we will be able to restart the recovery from the last restartpoint. + we will be able to restart the recovery from the last restart point. That backup now has many of the changes from previous WAL archive files, so this version is now an updated version of the original base backup. If we need to recover, it will be faster to recover from the @@ -1595,7 +1595,7 @@ if (!triggered) An external program can call pg_xlogfile_name_offset() - to find out the filename and the exact byte offset within it of + to find out the file name and the exact byte offset within it of the latest WAL pointer. If the external program regularly polls the server it can find out how far forward the pointer has moved. It can then access the WAL file directly and copy those diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index ff4fb64bca..af28a26b1a 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -1,4 +1,4 @@ - + @@ -405,7 +405,7 @@ amclusterable bool - Can an index of this type be CLUSTERed on? + Can an index of this type be clustered on? @@ -496,7 +496,7 @@ amoptions regproc pg_proc.oid - Function to parse and validate reloptions for an index + Function to parse and validate reloptions for an index @@ -1209,7 +1209,7 @@ vac_scale_factor float4 - Multiplier for reltuples to add to + Multiplier for reltuples to add to vac_base_thresh @@ -1224,7 +1224,7 @@ anl_scale_factor float4 - Multiplier for reltuples to add to + Multiplier for reltuples to add to anl_base_thresh @@ -2043,7 +2043,7 @@ operation. All rows inserted or deleted by transaction IDs before this one have been marked as known good or deleted. This is used to determine when commit-log space can be recycled. - If InvalidTransactionId, then the minimum is unknown and can be + If InvalidTransactionId, then the minimum is unknown and can be determined by scanning pg_class.relvacuumxid. @@ -2058,7 +2058,7 @@ relabeled with a permanent (frozen) transaction ID in this database. This is useful to check whether a database must be vacuumed soon to avoid transaction ID wrap-around problems. - If InvalidTransactionId, then the minimum is unknown and can be + If InvalidTransactionId, then the minimum is unknown and can be determined by scanning pg_class.relminxid. @@ -3353,7 +3353,7 @@ pg_type.oid An array with the data types of the function arguments. This includes - only input arguments (including INOUT arguments), and thus represents + only input arguments (including INOUT arguments), and thus represents the call signature of the function. @@ -3364,7 +3364,7 @@ pg_type.oid An array with the data types of the function arguments. This includes - all arguments (including OUT and INOUT arguments); however, if all the + all arguments (including OUT and INOUT arguments); however, if all the arguments are IN arguments, this field will be null. Note that subscripting is 1-based, whereas for historical reasons proargtypes is subscripted from 0. @@ -3377,10 +3377,10 @@ An array with the modes of the function arguments, encoded as - i for IN arguments, - o for OUT arguments, - b for INOUT arguments. - If all the arguments are IN arguments, this field will be null. + i for IN arguments, + o for OUT arguments, + b for INOUT arguments. + If all the arguments are IN arguments, this field will be null. Note that subscripts correspond to positions of proallargtypes not proargtypes. @@ -5031,7 +5031,7 @@ Advisory locks can be acquired on keys consisting of either a single - bigint value or two integer values. A bigint key is displayed with its + bigint value or two integer values. A bigint key is displayed with its high-order half in the classid column, its low-order half in the objid column, and objsubid equal to 1. Integer keys are displayed with the first key in the diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml index 67e3164fbb..a77d89db0e 100644 --- a/doc/src/sgml/client-auth.sgml +++ b/doc/src/sgml/client-auth.sgml @@ -1,4 +1,4 @@ - + Client Authentication @@ -947,9 +947,9 @@ ldap://ldap.example.net/dc=example,dc=net;EXAMPLE\ The server will bind to the distinguished name specified as - base dn using the username supplied by the client. + base dn using the user name supplied by the client. If prefix and suffix is - specified, it will be prepended and appended to the username + specified, it will be prepended and appended to the user name before the bind. Typically, the prefix parameter is used to specify cn=, or DOMAIN\ in an Active Directory environment. diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index ea6c4efb2a..37e50a9b92 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -1,4 +1,4 @@ - + Server Configuration @@ -75,7 +75,7 @@ shared_buffers = 128MB include 'filename' - If the filename is not an absolute path, it is taken as relative to + If the file name is not an absolute path, it is taken as relative to the directory containing the referencing configuration file. Inclusions can be nested. @@ -206,7 +206,7 @@ SET ENABLE_SEQSCAN TO OFF; Specifies the main server configuration file (customarily called postgresql.conf). - This parameter can only be set on the postgres command line. + This parameter can only be set on the postgres command line. @@ -265,7 +265,7 @@ SET ENABLE_SEQSCAN TO OFF; If you wish to keep the configuration files elsewhere than the - data directory, the postgres + data directory, the postgres command-line option or PGDATA environment variable must point to the directory containing the configuration files, and the data_directory parameter must be set in @@ -1422,8 +1422,8 @@ SET ENABLE_SEQSCAN TO OFF; or power failure. The risks are similar to turning off fsync, though smaller. It may be safe to turn off this parameter if you have hardware (such as a battery-backed disk - controller) or filesystem software (e.g., Reiser4) that reduces - the risk of partial page writes to an acceptably low level. + controller) or file-system software that reduces + the risk of partial page writes to an acceptably low level (e.g., ReiserFS 4). @@ -3901,10 +3901,10 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir' This controls whether the array input parser recognizes - unquoted NULL as specifying a NULL array element. + unquoted NULL as specifying a null array element. By default, this is on, allowing array values containing - NULLs to be entered. However, PostgreSQL versions - before 8.2 did not support NULLs in arrays, and therefore would + null values to be entered. However, PostgreSQL versions + before 8.2 did not support null values in arrays, and therefore would treat NULL as specifying a normal array element with the string value NULL. For backwards compatibility with applications that require the old behavior, this variable can be @@ -3912,7 +3912,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir' - Note that it is possible to create array values containing NULLs + Note that it is possible to create array values containing null values even when this variable is off. diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml index fd6c083cfb..32f4c27c3e 100644 --- a/doc/src/sgml/cvs.sgml +++ b/doc/src/sgml/cvs.sgml @@ -1,4 +1,4 @@ - + @@ -91,7 +91,7 @@ cvs -z3 -d :pserver:anoncvs@anoncvs.postgresql.org:/projects/cvsroot co -P pgsql If you have a fast link to the Internet, you may not need , which instructs - CVS to use gzip compression for transferred data. But + CVS to use gzip compression for transferred data. But on a modem-speed link, it's a very substantial win. @@ -131,8 +131,8 @@ cvs -z3 update -d -P - This supplies the option to all cvs commands, and the - and options to cvs update. Then you just have + This supplies the option to all cvs commands, and the + and options to cvs update. Then you just have to say cvs update @@ -206,7 +206,7 @@ cvs checkout -r REL6_4 tc When you tag more than one file with the same tag you can think - about the tag as a curve drawn through a matrix of filename vs. + about the tag as a curve drawn through a matrix of file name vs. revision number. Say we have 5 files with the following revisions: @@ -304,7 +304,7 @@ cvs commit A major advantage to using CVSup is that it can reliably replicate the entire CVS repository on your local system, - allowing fast local access to cvs operations such as + allowing fast local access to cvs operations such as and . Other advantages include fast synchronization to the PostgreSQL server due to an efficient streaming transfer protocol which only sends the changes since the last update. @@ -445,7 +445,7 @@ CVSROOT/loginfo* - The following is a suggested CVSup config file from + The following is a suggested CVSup configuration file from the PostgreSQL ftp site @@ -570,7 +570,7 @@ mv cvsup.1 ../doc/man/man1/ If there is a directory structure in the tar file, then unpack - the tar file within /usr/local/src and move the binaries into + the tar file within /usr/local/src and move the binaries into the appropriate location as above. @@ -645,7 +645,7 @@ $ which cvsup - Install the Modula-3 rpms: + Install the Modula-3 RPMs: # rpm -Uvh pm3*.rpm diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml index 4b3c1bca19..a066bb742e 100644 --- a/doc/src/sgml/datatype.sgml +++ b/doc/src/sgml/datatype.sgml @@ -1,4 +1,4 @@ - + Data Types @@ -3362,7 +3362,7 @@ SELECT * FROM pg_attribute - XML (eXtensible Markup Language) support is not one + XML (Extensible Markup Language) support is not one capability, but a variety of features supported by a database system. These capabilities include storage, import/export, validation, indexing, efficiency of modification, searching, @@ -3429,7 +3429,7 @@ SELECT * FROM pg_attribute indexes to index specific XML fields. To index the full contents of XML documents, the full-text indexing tool /contrib/tsearch2 can be used. Of course, - tsearch2 indexes have no XML awareness so additional + Tsearch2 indexes have no XML awareness so additional /contrib/xml2 checks should be added to queries. @@ -3466,7 +3466,7 @@ SELECT * FROM pg_attribute - /contrib/xml2 supports XSLT (XML + /contrib/xml2 supports XSLT (Extensible Stylesheet Language Transformation). diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml index b253cf98ed..fbf4fda64b 100644 --- a/doc/src/sgml/ddl.sgml +++ b/doc/src/sgml/ddl.sgml @@ -1,4 +1,4 @@ - + Data Definition @@ -2586,7 +2586,7 @@ UNION ALL SELECT * FROM measurement_y2006m01; However, the need to recreate the view adds an extra step to adding and dropping - individual partitions of the dataset. + individual partitions of the data set. @@ -2778,7 +2778,7 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate >= DATE '2006-01-01'; Constraint exclusion only works when the query's WHERE clause contains constants. A parameterized query will not be optimized, since the planner cannot know what partitions the - parameter value might select at runtime. For the same reason, + parameter value might select at run time. For the same reason, stable functions such as CURRENT_DATE must be avoided. @@ -2786,7 +2786,7 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate >= DATE '2006-01-01'; - Avoid cross-datatype comparisons in the CHECK + Avoid cross-data type comparisons in the CHECK constraints, as the planner will currently fail to prove such conditions false. For example, the following constraint will work if x is an integer @@ -2802,7 +2802,7 @@ CHECK ( x = 1::bigint ) The problem is not limited to the bigint data type — it can occur whenever the default data type of the constant does not match the data type of the column to which it - is being compared. Cross-datatype comparisons in the supplied + is being compared. Cross-data type comparisons in the supplied queries are usually OK, just not in the CHECK conditions. diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml index eaac915367..2a58b56a2b 100644 --- a/doc/src/sgml/docguide.sgml +++ b/doc/src/sgml/docguide.sgml @@ -1,4 +1,4 @@ - + Documentation @@ -290,7 +290,7 @@ make install SGML_CATALOG_FILES to point to the file whenever you use jade later on. (This method is also an option if OpenJade is already - installed and you want to install the rest of the toolchain + installed and you want to install the rest of the tool chain locally.) diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index 28480d8982..b63f45ee20 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -1,4 +1,4 @@ - + <application>ECPG</application> - Embedded <acronym>SQL</acronym> in C @@ -472,7 +472,7 @@ EXEC SQL int i = 4; As a host variable you can also use arrays, typedefs, structs and pointers. Moreover there are special types of host variables that exist - only in ecpg. + only in ECPG. @@ -539,9 +539,9 @@ EXEC SQL END DECLARE SECTION; Special types of variables - ecpg contains some special types that help you to interact easily with + ECPG contains some special types that help you to interact easily with data from the SQL server. For example it has implemented support for - the varchar, numeric, date, timestamp and interval types. + the varchar, numeric, date, timestamp, and interval types. contains basic functions to deal with those types, such that you do not need to send a query to the SQL server just for adding an interval to a timestamp for example. @@ -835,7 +835,7 @@ numeric *PGTYPESnumeric_from_asc(char *str, char **endptr); PGTYPESnumeric_to_asc - Returns a pointer to a malloced string that contains the string + Returns a pointer to a string allocated by malloc that contains the string representation of the numeric type num. char *PGTYPESnumeric_to_asc(numeric *num, int dscale); @@ -1012,7 +1012,7 @@ int PGTYPESnumeric_to_double(numeric *nv, double *dp) The function converts the numeric value from the variable that nv points to into the double variable that dp points - to. It retuns 0 on success and -1 if an error occurs, including + to. It returns 0 on success and -1 if an error occurs, including overflow. On overflow, the global variable errno will be set to PGTYPES_NUM_OVERFLOW additionally. @@ -1029,7 +1029,7 @@ int PGTYPESnumeric_to_int(numeric *nv, int *ip); The function converts the numeric value from the variable that nv points to into the integer variable that ip - points to. It retuns 0 on success and -1 if an error occurs, including + points to. It returns 0 on success and -1 if an error occurs, including overflow. On overflow, the global variable errno will be set to PGTYPES_NUM_OVERFLOW additionally. @@ -1046,7 +1046,7 @@ int PGTYPESnumeric_to_long(numeric *nv, long *lp); The function converts the numeric value from the variable that nv points to into the long integer variable that - lp points to. It retuns 0 on success and -1 if an error + lp points to. It returns 0 on success and -1 if an error occurs, including overflow. On overflow, the global variable errno will be set to PGTYPES_NUM_OVERFLOW additionally. @@ -1064,7 +1064,7 @@ int PGTYPESnumeric_to_decimal(numeric *src, decimal *dst); The function converts the numeric value from the variable that src points to into the decimal variable that - dst points to. It retuns 0 on success and -1 if an error + dst points to. It returns 0 on success and -1 if an error occurs, including overflow. On overflow, the global variable errno will be set to PGTYPES_NUM_OVERFLOW additionally. @@ -1082,7 +1082,7 @@ int PGTYPESnumeric_from_decimal(decimal *src, numeric *dst); The function converts the decimal value from the variable that src points to into the numeric variable that - dst points to. It retuns 0 on success and -1 if an error + dst points to. It returns 0 on success and -1 if an error occurs. Since the decimal type is implemented as a limited version of the numeric type, overflow can not occur with this conversion. @@ -1607,7 +1607,7 @@ timestamp PGTYPEStimestamp_from_asc(char *str, char **endptr); specification. Note that timezones are not supported by ecpg. It can parse them but does not apply any calculation as the PostgreSQL server does for example. Timezone - specificiers are silently discarded. + specifiers are silently discarded. The following table contains a few examples for input strings: @@ -2194,7 +2194,7 @@ int PGTYPESinterval_copy(interval *intvlsrc, interval *intvldest); type which can be created on the heap only, the decimal type can be created either on the stack or on the heap (by means of the functions PGTYPESdecimal_new() and PGTYPESdecimal_free(). There are a lot of other - functions that deal with the decimal type in the Informix compatibility + functions that deal with the decimal type in the Informix compatibility mode described in . @@ -2375,11 +2375,11 @@ void PGTYPESdecimal_free(decimal *var); - Informix compatibility mode + <productname>Informix</productname> compatibility mode ecpg can be run in a so-called Informix compatibility mode. If - this mode is active, it tries to behave as if it were the Informix - precompiler for Informix E/SQL. Generally spoken this will allow you to use + this mode is active, it tries to behave as if it were the Informix + precompiler for Informix E/SQL. Generally spoken this will allow you to use the dollar sign instead of the EXEC SQL primitive to introduce embedded SQL commands. @@ -2398,19 +2398,19 @@ void PGTYPESdecimal_free(decimal *var); against libcompat that is shipped with ecpg. - Besides the previously explained syntactic sugar, the Informix compatibility + Besides the previously explained syntactic sugar, the Informix compatibility mode ports some functions for input, output and transformation of data as well as embedded SQL statements known from E/SQL to ecpg. - Informix compatibility mode is closely connected to the pgtypeslib library + Informix compatibility mode is closely connected to the pgtypeslib library of ecpg. pgtypeslib maps SQL data types to data types within the C host - program and most of the additional functions of the Informix compatibility + program and most of the additional functions of the Informix compatibility mode allow you to operate on those C host program types. Note however that - the extent of the compatibility is limited. It does not try to copy Informix + the extent of the compatibility is limited. It does not try to copy Informix behaviour; it allows you to do more or less the same operations and gives you functions that have the same name and the same basic behavior but it is - no drop-in replacement if you are using Informix at the moment. Moreover, + no drop-in replacement if you are using Informix at the moment. Moreover, some of the data types are different. For example, PostgreSQL's datetime and interval types do not know about ranges like for example YEAR TO MINUTE so you won't @@ -2540,7 +2540,7 @@ int deccvasc(char *cp, int len, decimal *np); ECPG_INFORMIX_NUM_UNDERFLOW is returned. If the ASCII representation could not be parsed, ECPG_INFORMIX_BAD_NUMERIC is returned or - ECPG_INFORMIX_BAD_EXPONENT if this problem ocurred while + ECPG_INFORMIX_BAD_EXPONENT if this problem occurred while parsing the exponent. @@ -2741,8 +2741,8 @@ int dectoint(decimal *np, int *ip); is returned. - Note that the ecpg implementation differs from the Informix - implementation. Informix limits an integer to the range from -32767 to + Note that the ecpg implementation differs from the Informix + implementation. Informix limits an integer to the range from -32767 to 32767, while the limits in the ecpg implementation depend on the architecture (-INT_MAX .. INT_MAX). @@ -2767,8 +2767,8 @@ int dectolong(decimal *np, long *lngp); is returned. - Note that the ecpg implementation differs from the Informix - implementation. Informix limits a long integer to the range from + Note that the ecpg implementation differs from the Informix + implementation. Informix limits a long integer to the range from -2,147,483,647 to 2,147,483,647, while the limits in the ecpg implementation depend on the architecture (-LONG_MAX .. LONG_MAX). @@ -2795,8 +2795,8 @@ int rdatestr(date d, char *str); error. - Note that ecpg's implementation differs from the Informix - implementation. In Informix the format can be influenced by setting + Note that ecpg's implementation differs from the Informix + implementation. In Informix the format can be influenced by setting environment variables. In ecpg however, you cannot change the output format. @@ -2814,7 +2814,7 @@ int rstrdate(char *str, date *d); The function receives the textual representation of the date to convert (str) and a pointer to a variable of type date (d). This function does not allow you to specify a format - mask. It uses the default format mask of Informix which is + mask. It uses the default format mask of Informix which is mm/dd/yyyy. Internally, this function is implemented by means of rdefmtdate. Therefore, rstrdate is not faster and if you have the choice you should opt for @@ -3167,9 +3167,9 @@ int dttofmtasc(timestamp *ts, char *output, int str_len, char *fmtstr); error occurred. - Internally this function uses the function. See the reference there for - informations on what format mask specifiers can be used. + information on what format mask specifiers can be used. @@ -3396,52 +3396,52 @@ int rsetnull(int t, char *ptr); - CCHARTYPE - For a variable of type char or char* + CCHARTYPE - For a variable of type char or char* - CSHORTTYPE - For a variable of type short int + CSHORTTYPE - For a variable of type short int - CINTTYPE - For a variable of type int + CINTTYPE - For a variable of type int - CBOOLTYPE - For a variable of type boolean + CBOOLTYPE - For a variable of type boolean - CFLOATTYPE - For a variable of type float + CFLOATTYPE - For a variable of type float - CLONGTYPE - For a variable of type long + CLONGTYPE - For a variable of type long - CDOUBLETYPE - For a variable of type double + CDOUBLETYPE - For a variable of type double - CDECIMALTYPE - For a variable of type decimal + CDECIMALTYPE - For a variable of type decimal - CDATETYPE - For a variable of type date + CDATETYPE - For a variable of type date - CDTIMETYPE - For a variable of type timestamp + CDTIMETYPE - For a variable of type timestamp @@ -3508,7 +3508,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if an overflow occurred in a - calculation. Internally it is defined to -1200 (the Informix + calculation. Internally it is defined to -1200 (the Informix definition). @@ -3519,7 +3519,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if an underflow occurred in a calculation. - Internally it is defined to -1201 (the Informix definition). + Internally it is defined to -1201 (the Informix definition). @@ -3529,7 +3529,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if an attempt to divide by zero is - observed. Internally it is defined to -1202 (the Informix definition). + observed. Internally it is defined to -1202 (the Informix definition). @@ -3539,7 +3539,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if a bad value for a year was found while - parsing a date. Internally it is defined to -1204 (the Informix + parsing a date. Internally it is defined to -1204 (the Informix definition). @@ -3550,7 +3550,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if a bad value for a month was found while - parsing a date. Internally it is defined to -1205 (the Informix + parsing a date. Internally it is defined to -1205 (the Informix definition). @@ -3561,7 +3561,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if a bad value for a day was found while - parsing a date. Internally it is defined to -1206 (the Informix + parsing a date. Internally it is defined to -1206 (the Informix definition). @@ -3573,7 +3573,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if a parsing routine needs a short date representation but did not get the date string in the right length. - Internally it is defined to -1209 (the Informix definition). + Internally it is defined to -1209 (the Informix definition). @@ -3583,7 +3583,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if Internally it is defined to -1210 (the - Informix definition). + Informix definition). @@ -3593,7 +3593,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if Internally it is defined to -1211 (the - Informix definition). + Informix definition). @@ -3604,7 +3604,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if a parsing routine was supposed to get a format mask (like mmddyy) but not all fields were listed - correctly. Internally it is defined to -1212 (the Informix definition). + correctly. Internally it is defined to -1212 (the Informix definition). @@ -3617,7 +3617,7 @@ risnull(CINTTYPE, (char *) &i); the textual representation for a numeric value because it contains errors or if a routine cannot complete a calculation involving numeric variables because at least one of the numeric variables is invalid. - Internally it is defined to -1213 (the Informix definition). + Internally it is defined to -1213 (the Informix definition). @@ -3627,7 +3627,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if Internally it is defined to -1216 (the - Informix definition). + Informix definition). @@ -3637,7 +3637,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if Internally it is defined to -1218 (the - Informix definition). + Informix definition). @@ -3647,7 +3647,7 @@ risnull(CINTTYPE, (char *) &i); Functions return this value if Internally it is defined to -1264 (the - Informix definition). + Informix definition). diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index ee913ce40d..c134e7169b 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -1,4 +1,4 @@ - + Functions and Operators @@ -7686,7 +7686,7 @@ SELECT NULLIF(value, '(none)') ... Array comparisons compare the array contents element-by-element, - using the default btree comparison function for the element data type. + using the default B-Tree comparison function for the element data type. In multidimensional arrays the elements are visited in row-major order (last subscript varies most rapidly). If the contents of two arrays are equal but the dimensionality is @@ -9003,8 +9003,8 @@ AND > or >=, or has semantics similar to one of these. (To be specific, an operator - can be a row comparison operator if it is a member of a btree operator - class, or is the negator of the = member of a btree operator + can be a row comparison operator if it is a member of a B-Tree operator + class, or is the negator of the = member of a B-Tree operator class.) @@ -10251,35 +10251,35 @@ SELECT set_config('log_statement_stats', 'off', false); pg_switch_xlog() text - Force switch to a new xlog file + Force switch to a new transaction log file pg_current_xlog_location() text - Get current xlog write location + Get current transaction log write location pg_current_xlog_insert_location() text - Get current xlog insert location + Get current transaction log insert location pg_xlogfile_name_offset(location text) text, integer - Convert xlog location string to filename and decimal byte offset within file + Convert transaction log location string to file name and decimal byte offset within file pg_xlogfile_name(location text) text - Convert xlog location string to filename + Convert transaction log location string to file name @@ -10290,7 +10290,7 @@ SELECT set_config('log_statement_stats', 'off', false); arbitrary user-defined label for the backup. (Typically this would be the name under which the backup dump file will be stored.) The function writes a backup label file into the database cluster's data directory, - and then returns the backup's starting xlog location as text. The user + and then returns the backup's starting transaction log location as text. The user need not pay any attention to this result value, but it is provided in case it is of use. @@ -10305,33 +10305,33 @@ postgres=# select pg_start_backup('label_goes_here'); pg_stop_backup removes the label file created by pg_start_backup, and instead creates a backup history file in - the xlog archive area. The history file includes the label given to - pg_start_backup, the starting and ending xlog locations for + the transaction log archive area. The history file includes the label given to + pg_start_backup, the starting and ending transaction log locations for the backup, and the starting and ending times of the backup. The return - value is the backup's ending xlog location (which again may be of little - interest). After noting the ending location, the current xlog insertion - point is automatically advanced to the next xlog file, so that the - ending xlog file can be archived immediately to complete the backup. + value is the backup's ending transaction log location (which again may be of little + interest). After noting the ending location, the current transaction log insertion + point is automatically advanced to the next transaction log file, so that the + ending transaction log file can be archived immediately to complete the backup. - pg_switch_xlog moves to the next xlog file, allowing the + pg_switch_xlog moves to the next transaction log file, allowing the current file to be archived (assuming you are using continuous archiving). - The result is the ending xlog location within the just-completed xlog file. - If there has been no xlog activity since the last xlog switch, + The result is the ending transaction log location within the just-completed transaction log file. + If there has been no transaction log activity since the last transaction log switch, pg_switch_xlog does nothing and returns the end location - of the previous xlog file. + of the previous transaction log file. - pg_current_xlog_location displays the current xlog write + pg_current_xlog_location displays the current transaction log write location in the same format used by the above functions. Similarly - pg_current_xlog_insert_location displays the current xlog - insertion point. The insertion point is the logical end of xlog + pg_current_xlog_insert_location displays the current transaction log + insertion point. The insertion point is the logical end of transaction log at any instant, while the write location is the end of what has actually been written out from the server's internal buffers. The write location is the end of what can be examined from outside the server, and is usually - what you want if you are interested in archiving partially-complete xlog + what you want if you are interested in archiving partially-complete transaction log files. The insertion point is made available primarily for server debugging purposes. These are both read-only operations and do not require superuser permissions. @@ -10339,7 +10339,7 @@ postgres=# select pg_start_backup('label_goes_here'); You can use pg_xlogfile_name_offset to extract the - corresponding xlog filename and byte offset from the results of any of the + corresponding transaction log file name and byte offset from the results of any of the above functions. For example: postgres=# select * from pg_xlogfile_name_offset(pg_stop_backup()); @@ -10348,10 +10348,10 @@ postgres=# select * from pg_xlogfile_name_offset(pg_stop_backup()); 00000001000000000000000D | 4039624 (1 row) - Similarly, pg_xlogfile_name extracts just the xlog filename. - When the given xlog location is exactly at an xlog file boundary, both - these functions return the name of the preceding xlog file. - This is usually the desired behavior for managing xlog archiving + Similarly, pg_xlogfile_name extracts just the transaction log file name. + When the given transction log location is exactly at an transaction log file boundary, both + these functions return the name of the preceding transaction log file. + This is usually the desired behavior for managing transaction log archiving behavior, since the preceding file is the last one that currently needs to be archived. @@ -10574,7 +10574,7 @@ postgres=# select * from pg_xlogfile_name_offset(pg_stop_backup()); pg_stat_file returns a record containing the file size, last accessed time stamp, last modified time stamp, last file status change time stamp (Unix platforms only), - file creation timestamp (Windows only), and a boolean + file creation time stamp (Windows only), and a boolean indicating if it is a directory. Typical usages include: SELECT * FROM pg_stat_file('filename'); diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml index 1f12de6df7..2418c72aa2 100644 --- a/doc/src/sgml/gist.sgml +++ b/doc/src/sgml/gist.sgml @@ -1,4 +1,4 @@ - + GiST Indexes @@ -199,7 +199,7 @@ cube - Indexing for multi-dimensional cubes + Indexing for multidimensional cubes diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml index 8532e1373a..802d94358d 100644 --- a/doc/src/sgml/history.sgml +++ b/doc/src/sgml/history.sgml @@ -1,4 +1,4 @@ - + A Brief History of <productname>PostgreSQL</productname> @@ -31,7 +31,7 @@ Office (ARO), the National Science Foundation (NSF), and ESL, Inc. The implementation of POSTGRES began in 1986. The initial - concepts for the system were presented in + concepts for the system were presented in , and the definition of the initial data model appeared in . The design of the rule system at that time was described in . The rationale and @@ -47,7 +47,7 @@ , was released to a few external users in June 1989. In response to a critique of the first rule system (), the rule system was redesigned () and Version 2 was released in June 1990 with + linkend="STON90b">), and Version 2 was released in June 1990 with the new rule system. Version 3 appeared in 1991 and added support for multiple storage managers, an improved query executor, and a rewritten rule system. For the most part, subsequent releases diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml index 59ca5525ca..fd8bb7251e 100644 --- a/doc/src/sgml/indices.sgml +++ b/doc/src/sgml/indices.sgml @@ -1,4 +1,4 @@ - + Indexes @@ -254,7 +254,7 @@ CREATE INDEX name ON table indexing strategy. As an example, the standard distribution of PostgreSQL includes GIN operator classes - for one-dimentional arrays, which support indexed + for one-dimensional arrays, which support indexed queries using these operators: @@ -267,7 +267,7 @@ CREATE INDEX name ON table (See for the meaning of these operators.) Other GIN operator classes are available in the contrib - tsearch2 and intarray modules. For more information see . + tsearch2 and intarray modules. For more information see . diff --git a/doc/src/sgml/information_schema.sgml b/doc/src/sgml/information_schema.sgml index 61293b63d2..58cde10f06 100644 --- a/doc/src/sgml/information_schema.sgml +++ b/doc/src/sgml/information_schema.sgml @@ -1,4 +1,4 @@ - + The Information Schema @@ -2313,7 +2313,7 @@ ORDER BY c.ordinal_position; IN for input parameter, OUT for output parameter, - and INOUT for input/ouput parameter. + and INOUT for input/output parameter. diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index bebac27af5..f648843689 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1,4 +1,4 @@ - + <application>libpq</application> - C Library @@ -3805,8 +3805,9 @@ It is good practice not to send the original cleartext password in such a command, because it might be exposed in command logs, activity displays, and so on. Instead, use this function to convert the password to encrypted form before it is sent. The arguments are the cleartext password, and the SQL -name of the user it is for. The return value is a malloc'd string, or NULL if -out-of-memory. The caller may assume the string doesn't contain any special +name of the user it is for. The return value is a string allocated by +malloc, or NULL if out of memory. +The caller may assume the string doesn't contain any special characters that would require escaping. Use PQfreemem to free the result when done with it. @@ -4232,7 +4233,7 @@ current connection parameters will be used. (Therefore, put more-specific entries first when you are using wildcards.) If an entry needs to contain : or \, escape this character with \. -A hostname of localhost matches both TCP (hostname +A host name of localhost matches both TCP (hostname localhost) and Unix domain socket (pghost empty or the default socket directory) connections coming from the local machine. @@ -4380,7 +4381,7 @@ ldap://ldap.mycompany.com/dc=mycompany,dc=com?uniqueMember?one?(cn=mydatabase) fail if the server does not present a certificate; therefore, to use this feature the server must also have a root.crt file. Certificate Revocation List (CRL) entries are also checked if the file - ~/.postgresql/root.crl exists (%APPDATA%\postgresql\root.crl + ~/.postgresql/root.crl exists (%APPDATA%\postgresql\root.crl on Microsoft Windows). @@ -4430,7 +4431,7 @@ int PQisthreadsafe(); - Returns 1 if the libpq is thead-safe and + Returns 1 if the libpq is thread-safe and 0 if it is not. diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml index 52aae72d1e..47801bb733 100644 --- a/doc/src/sgml/lobj.sgml +++ b/doc/src/sgml/lobj.sgml @@ -1,4 +1,4 @@ - + Large Objects @@ -95,7 +95,7 @@ Oid lo_creat(PGconn *conn, int mode); lo_creat creates a new large object. The return value is the OID that was assigned to the new large object, - or InvalidOid (zero) on failure. + or InvalidOid (zero) on failure. mode is unused and ignored as of PostgreSQL 8.1; however, for @@ -123,16 +123,16 @@ Oid lo_create(PGconn *conn, Oid lobjId); specified by lobjId; if so, failure occurs if that OID is already in use for some large object. If lobjId - is InvalidOid (zero) then lo_create assigns an unused + is InvalidOid (zero) then lo_create assigns an unused OID (this is the same behavior as lo_creat). The return value is the OID that was assigned to the new large object, - or InvalidOid (zero) on failure. + or InvalidOid (zero) on failure. lo_create is new as of PostgreSQL 8.1; if this function is run against an older server version, it will - fail and return InvalidOid. + fail and return InvalidOid. @@ -156,9 +156,9 @@ Oid lo_import(PGconn *conn, const char *filename); specifies the operating system name of the file to be imported as a large object. The return value is the OID that was assigned to the new large object, - or InvalidOid (zero) on failure. + or InvalidOid (zero) on failure. Note that the file is read by the client interface library, not by - the server; so it must exist in the client filesystem and be readable + the server; so it must exist in the client file system and be readable by the client application. diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml index e4d399efbe..6033cf2c5e 100644 --- a/doc/src/sgml/maintenance.sgml +++ b/doc/src/sgml/maintenance.sgml @@ -1,4 +1,4 @@ - + Routine Database Maintenance Tasks @@ -90,9 +90,10 @@ The standard form of VACUUM can run in parallel with production - database operations. Commands such as SELECTs, INSERTs, UPDATEs and DELETEs + database operations. Commands such as SELECT, + INSERT, UPDATE, and DELETE will continue to function as normal, though you will not be able to modify the - definition of a table with commands such as ALTER TABLE ADD COLUMN + definition of a table with commands such as ALTER TABLE ADD COLUMN while it is being vacuumed. Beginning in PostgreSQL 8.0, there are configuration parameters that can be adjusted to further reduce the diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml index 42a5a578c6..b9668103ec 100644 --- a/doc/src/sgml/plperl.sgml +++ b/doc/src/sgml/plperl.sgml @@ -1,4 +1,4 @@ - + PL/Perl - Perl Procedural Language @@ -21,7 +21,7 @@ within stored functions, of the manyfold string munging operators and functions available for Perl. Parsing complex strings may be be easier using Perl than it is with the - string functions and control structures provided in PL/pgsql. + string functions and control structures provided in PL/pgSQL. To install PL/Perl in a particular database, use @@ -188,7 +188,7 @@ SELECT * FROM perl_row(); Any columns in the declared result data type that are not present in the - hash will be returned as NULLs. + hash will be returned as null values. diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml index 3fc8245cb7..57e6672fc0 100644 --- a/doc/src/sgml/plpgsql.sgml +++ b/doc/src/sgml/plpgsql.sgml @@ -1,4 +1,4 @@ - + <application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language @@ -176,7 +176,7 @@ $$ LANGUAGE plpgsql; client and server Intermediate results that the client does not - need do not need to be marshalled or transferred between server + need do not need to be marshaled or transferred between server and client There is no need for additional rounds of query @@ -1066,7 +1066,7 @@ tax := subtotal * 0.06; Any PL/pgSQL variable name appearing in the query text is replaced by a parameter symbol, and then the current value of the variable is provided as the parameter value - at runtime. This allows the same textual query to do different + at run time. This allows the same textual query to do different things in different calls of the function. @@ -1182,7 +1182,7 @@ DELETE ... RETURNING expressions INTO STRIC substituted into the rest of the query as usual. This works for SELECT, INSERT/UPDATE/DELETE with - RETURNING, and utility commands that return rowset + RETURNING, and utility commands that return row-set results (such as EXPLAIN). Except for the INTO clause, the SQL command is the same as it would be written outside PL/pgSQL. @@ -2738,7 +2738,7 @@ RAISE EXCEPTION 'Nonexistent ID --> %', user_id; RAISE EXCEPTION presently always generates - the same SQLSTATE code, P0001, no matter what message + the same SQLSTATE code, P0001, no matter what message it is invoked with. It is possible to trap this exception with EXCEPTION ... WHEN RAISE_EXCEPTION THEN ... but there is no way to tell one RAISE from another. diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml index 23e2dfeba9..d6f5aa3d96 100644 --- a/doc/src/sgml/plpython.sgml +++ b/doc/src/sgml/plpython.sgml @@ -1,4 +1,4 @@ - + PL/Python - Python Procedural Language @@ -65,7 +65,7 @@ $$ LANGUAGE plpythonu; args[]; named arguments are also passed as ordinary variables to the Python script. The result is returned from the Python code in the usual way, with return or - yield (in case of a resultset statement). + yield (in case of a result-set statement). diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml index 2eedbca3d1..15ee5009f8 100644 --- a/doc/src/sgml/queries.sgml +++ b/doc/src/sgml/queries.sgml @@ -1,4 +1,4 @@ - + Queries @@ -1367,7 +1367,7 @@ VALUES ( expression [, ...] ) [, .. Each parenthesized list of expressions generates a row in the table. The lists must all have the same number of elements (i.e., the number of columns in the table), and corresponding entries in each list must - have compatible datatypes. The actual datatype assigned to each column + have compatible data types. The actual data type assigned to each column of the result is determined using the same rules as for UNION (see ). diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index 29eca1b674..d26f41e8f1 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -1,5 +1,5 @@ @@ -740,7 +740,7 @@ ALTER TABLE foo The same, when the column has a default expression that won't automatically - cast to the new datatype: + cast to the new data type: ALTER TABLE foo ALTER COLUMN foo_timestamp DROP DEFAULT, diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml index 789541b35a..d2cf39a20c 100644 --- a/doc/src/sgml/ref/comment.sgml +++ b/doc/src/sgml/ref/comment.sgml @@ -1,5 +1,5 @@ @@ -206,7 +206,7 @@ COMMENT ON connected to a database can see all the comments for objects in that database (although only superusers can change comments for objects that they don't own). For shared objects such as - databases, roles, and tablespaces comments are stored gloablly + databases, roles, and tablespaces comments are stored globally and any user connected to any database can see all the comments for shared objects. Therefore, don't put security-critical information in comments. diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml index 4b076dfcf4..fcbe444574 100644 --- a/doc/src/sgml/ref/create_trigger.sgml +++ b/doc/src/sgml/ref/create_trigger.sgml @@ -1,5 +1,5 @@ @@ -258,7 +258,7 @@ CREATE TRIGGER name { BEFORE | AFTE DELETE to always fire before the delete action, even a cascading one. This is considered more consistent. There is also unpredictable behavior when BEFORE triggers modify rows that are later - to be modified by referential actions. This can lead to contraint violations + to be modified by referential actions. This can lead to constraint violations or stored data that does not honor the referential constraint. diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml index f98b2a099a..139690879f 100644 --- a/doc/src/sgml/ref/drop_type.sgml +++ b/doc/src/sgml/ref/drop_type.sgml @@ -1,5 +1,5 @@ @@ -94,7 +94,7 @@ DROP TYPE box; This command is similar to the corresponding command in the SQL - standard, aapart from the IF EXISTS + standard, apart from the IF EXISTS option, which is a PostgreSQL extension. But note that the CREATE TYPE command and the data type extension mechanisms in diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml index 140ec7745f..a48b335366 100644 --- a/doc/src/sgml/ref/insert.sgml +++ b/doc/src/sgml/ref/insert.sgml @@ -1,5 +1,5 @@ @@ -234,7 +234,7 @@ INSERT INTO films DEFAULT VALUES; - To insert multiple rows using the multi-row VALUES syntax: + To insert multiple rows using the multirow VALUES syntax: INSERT INTO films (code, title, did, date_prod, kind) VALUES diff --git a/doc/src/sgml/ref/pg_config-ref.sgml b/doc/src/sgml/ref/pg_config-ref.sgml index 06d2ab65cc..95aa733fce 100644 --- a/doc/src/sgml/ref/pg_config-ref.sgml +++ b/doc/src/sgml/ref/pg_config-ref.sgml @@ -1,4 +1,4 @@ - + @@ -177,7 +177,7 @@ - Print the value of the CC macro that was used for building + Print the value of the CC variable that was used for building PostgreSQL. This shows the C compiler used. @@ -187,7 +187,7 @@ - Print the value of the CPPFLAGS macro that was used for building + Print the value of the CPPFLAGS variable that was used for building PostgreSQL. This shows C compiler switches needed at preprocessing time (typically, -I switches). @@ -198,7 +198,7 @@ - Print the value of the CFLAGS macro that was used for building + Print the value of the CFLAGS variable that was used for building PostgreSQL. This shows C compiler switches. @@ -208,7 +208,7 @@ - Print the value of the CFLAGS_SL macro that was used for building + Print the value of the CFLAGS_SL variable that was used for building PostgreSQL. This shows extra C compiler switches used for building shared libraries. @@ -219,7 +219,7 @@ - Print the value of the LDFLAGS macro that was used for building + Print the value of the LDFLAGS variable that was used for building PostgreSQL. This shows linker switches. @@ -229,7 +229,7 @@ - Print the value of the LDFLAGS_SL macro that was used for building + Print the value of the LDFLAGS_SL variable that was used for building PostgreSQL. This shows linker switches used for building shared libraries. @@ -240,7 +240,7 @@ - Print the value of the LIBS macro that was used for building + Print the value of the LIBS variable that was used for building PostgreSQL. This normally contains -l switches for external libraries linked into PostgreSQL. diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml index 9aa4baf84e..13fde9d2fa 100644 --- a/doc/src/sgml/ref/pg_dump.sgml +++ b/doc/src/sgml/ref/pg_dump.sgml @@ -1,5 +1,5 @@ @@ -748,7 +748,7 @@ CREATE DATABASE foo WITH TEMPLATE template0; - Because pg_dump is used to tranfer data + Because pg_dump is used to transfer data to newer versions of PostgreSQL, the output of pg_dump can be loaded into newer PostgreSQL databases. It also can read older diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index fae6984f26..d80249c7da 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1,5 +1,5 @@ @@ -2772,7 +2772,7 @@ Field separator is "oo". - Set the console font to Lucida Console, because the + Set the console font to Lucida Console, because the raster font does not work with the ANSI code page. diff --git a/doc/src/sgml/ref/values.sgml b/doc/src/sgml/ref/values.sgml index 9af66c387d..eedf431ebf 100644 --- a/doc/src/sgml/ref/values.sgml +++ b/doc/src/sgml/ref/values.sgml @@ -1,5 +1,5 @@ @@ -202,9 +202,9 @@ UPDATE employees SET salary = salary * v.increase When VALUES is used in INSERT, the values are all - automatically coerced to the datatype of the corresponding destination + automatically coerced to the data type of the corresponding destination column. When it's used in other contexts, it may be necessary to specify - the correct datatype. If the entries are all quoted literal constants, + the correct data type. If the entries are all quoted literal constants, coercing the first is sufficient to determine the assumed type for all: diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml index dc88d2a726..2e9a09350a 100644 --- a/doc/src/sgml/release.sgml +++ b/doc/src/sgml/release.sgml @@ -1,4 +1,4 @@ - + + PostgreSQL Coding Conventions @@ -219,7 +219,7 @@ elog(level, "format string", ...); ereport(level, (errmsg_internal("format string", ...))); - Notice that the SQLSTATE errcode is always defaulted, and the message + Notice that the SQLSTATE error code is always defaulted, and the message string is not included in the internationalization message dictionary. Therefore, elog should be used only for internal errors and low-level debug logging. Any message that is likely to be of interest to diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml index b8c8855572..c6bf079141 100644 --- a/doc/src/sgml/spi.sgml +++ b/doc/src/sgml/spi.sgml @@ -1,4 +1,4 @@ - + Server Programming Interface @@ -369,7 +369,7 @@ SPI_execute("INSERT INTO foo SELECT * FROM bar", false, 5); then you may use the global pointer SPITupleTable *SPI_tuptable to access the result rows. Some utility commands (such as - EXPLAIN) also return rowsets, and SPI_tuptable + EXPLAIN) also return row sets, and SPI_tuptable will contain the result in these cases too. diff --git a/doc/src/sgml/wal.sgml b/doc/src/sgml/wal.sgml index 75b14d13f5..d720e81e16 100644 --- a/doc/src/sgml/wal.sgml +++ b/doc/src/sgml/wal.sgml @@ -1,4 +1,4 @@ - + Reliability and the Write-Ahead Log @@ -85,8 +85,8 @@ permanent storage before modifying the actual page on disk. By doing this, during crash recovery PostgreSQL can restore partially-written pages. If you have a battery-backed disk - controller or file-system software (e.g., Reiser4) that prevents partial - page writes, you can turn off this page imaging by using the + controller or file-system software that prevents partial page writes + (e.g., ReiserFS 4), you can turn off this page imaging by using the parameter. diff --git a/doc/src/sgml/xindex.sgml b/doc/src/sgml/xindex.sgml index 3a5a7cb78c..444839399e 100644 --- a/doc/src/sgml/xindex.sgml +++ b/doc/src/sgml/xindex.sgml @@ -1,4 +1,4 @@ - + Interfacing Extensions To Indexes @@ -387,7 +387,7 @@ - consistent - determine whether key satifies the + consistent - determine whether key satisfies the query qualifier 1