From c13dc6402b6e99af9a8b7794e44d62deecafc745 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 19 May 2011 01:14:45 +0300 Subject: [PATCH] Spell checking and markup refinement --- doc/src/sgml/backup.sgml | 4 +-- doc/src/sgml/btree-gist.sgml | 4 +-- doc/src/sgml/catalogs.sgml | 4 +-- doc/src/sgml/config.sgml | 6 ++-- doc/src/sgml/ecpg.sgml | 36 ++++++++++++------------ doc/src/sgml/extend.sgml | 2 +- doc/src/sgml/file-fdw.sgml | 2 +- doc/src/sgml/func.sgml | 18 ++++++------ doc/src/sgml/high-availability.sgml | 2 +- doc/src/sgml/installation.sgml | 4 +-- doc/src/sgml/libpq.sgml | 4 +-- doc/src/sgml/monitoring.sgml | 12 ++++---- doc/src/sgml/mvcc.sgml | 2 +- doc/src/sgml/perform.sgml | 4 +-- doc/src/sgml/pgtestfsync.sgml | 2 +- doc/src/sgml/plperl.sgml | 6 ++-- doc/src/sgml/plpgsql.sgml | 2 +- doc/src/sgml/plpython.sgml | 6 ++-- doc/src/sgml/queries.sgml | 2 +- doc/src/sgml/ref/alter_opfamily.sgml | 2 +- doc/src/sgml/ref/cluster.sgml | 6 ++-- doc/src/sgml/ref/create_opclass.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/ref/ecpg-ref.sgml | 6 ++-- doc/src/sgml/ref/pg_basebackup.sgml | 6 ++-- doc/src/sgml/ref/pg_dump.sgml | 2 +- doc/src/sgml/release-9.1.sgml | 14 ++++----- doc/src/sgml/runtime.sgml | 2 +- doc/src/sgml/sepgsql.sgml | 4 +-- doc/src/sgml/xml2.sgml | 2 +- src/backend/access/gist/gist.c | 4 +-- src/backend/access/gist/gistget.c | 2 +- src/backend/access/gist/gistxlog.c | 2 +- src/backend/catalog/sql_features.txt | 2 +- src/backend/commands/indexcmds.c | 2 +- src/test/regress/expected/opr_sanity.out | 6 ++-- src/test/regress/sql/opr_sanity.sql | 6 ++-- 37 files changed, 97 insertions(+), 97 deletions(-) diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml index 2a1c2939e2..03180cf108 100644 --- a/doc/src/sgml/backup.sgml +++ b/doc/src/sgml/backup.sgml @@ -818,8 +818,8 @@ SELECT pg_stop_backup(); the equivalent of pg_start_backup(), copy and pg_stop_backup() steps automatically, and transfers the backup over a regular PostgreSQL connection - using the replication protocol, instead of requiring filesystem level - access. pg_basebackup does not interfere with filesystem level backups + using the replication protocol, instead of requiring file system level + access. pg_basebackup does not interfere with file system level backups taken using pg_start_backup()/pg_stop_backup(). diff --git a/doc/src/sgml/btree-gist.sgml b/doc/src/sgml/btree-gist.sgml index e52971f3d9..2275a997ba 100644 --- a/doc/src/sgml/btree-gist.sgml +++ b/doc/src/sgml/btree-gist.sgml @@ -25,7 +25,7 @@ standard B-tree code: the ability to enforce uniqueness. However, they provide some other features that are not available with a B-tree index, as described below. Also, these operator classes are useful - when a multi-column GiST index is needed, wherein some of the columns + when a multicolumn GiST index is needed, wherein some of the columns are of data types that are only indexable with GiST but other columns are just simple data types. Lastly, these operator classes are useful for GiST testing and as a base for developing other GiST operator classes. @@ -55,7 +55,7 @@ Example Usage - Simple example using btree_gist instead of btree: + Simple example using btree_gist instead of btree: diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 7b62818ce4..8504555bac 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -1129,7 +1129,7 @@ pg_collation.oid The defined collation of the column, or zero if the column is - not of a collatable datatype. + not of a collatable data type. @@ -1294,7 +1294,7 @@ Password (possibly encrypted); null if none. If the password is encrypted, this column will begin with the string md5 followed by a 32-character hexadecimal MD5 hash. The MD5 hash - will be of the user's password concatenated to their username. + will be of the user's password concatenated to their user name. For example, if user joe has password xyzzy, PostgreSQL will store the md5 hash of xyzzyjoe. A password that does not follow that diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 5d37065626..e367c29bd5 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -3892,7 +3892,7 @@ FROM pg_stat_activity; This option emits log lines in comma-separated-values (CSV) format, with these columns: - timestamp with milliseconds, + time stamp with milliseconds, user name, database name, process ID, @@ -4936,7 +4936,7 @@ SET XML OPTION { DOCUMENT | CONTENT }; Sets the collection of time zone abbreviations that will be accepted by the server for datetime input. The default is 'Default', which is a collection that works in most of the world; there are - also 'Australia' and 'India', and other collections can be defined + also 'Australia' and 'India', and other collections can be defined for a particular installation. See for more information. @@ -6284,7 +6284,7 @@ LOG: CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1) be present in the table. It is useful for recovering data if corruption has occurred due to a hardware or software error. You should generally not set this on until you have given up hope of recovering - data from the damaged pages of a table. Zerod-out pages are not + data from the damaged pages of a table. Zeroed-out pages are not forced to disk so it is recommended to recreate the table or the index before turning this parameter off again. The default setting is off, and it can only be changed diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index 751de9a2ae..9c6ca4c519 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -407,7 +407,7 @@ EXEC SQL SELECT foo INTO :FooBar FROM table1 WHERE ascii = 'doodad'; - Also, a configuration parameter can be retreived with the + Also, a configuration parameter can be retrieved with the SHOW command: EXEC SQL SHOW search_path INTO :var; @@ -983,7 +983,7 @@ VARCHAR v2[128]; the pgtypes library. The pgtypes library, described in detail in 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 + the SQL server just for adding an interval to a time stamp for example. @@ -1038,9 +1038,9 @@ ts = 2010-06-27 18:03:56.949343 In addition, the DATE type can be handled in the same way. The - program has to include pg_types_date.h, declare a host variable + program has to include pg_types_date.h, declare a host variable as the date type and convert a DATE value into a text form using - PGTYPESdate_to_asc() function. For more details about the + PGTYPESdate_to_asc() function. For more details about the pgtypes library functions, see . @@ -1173,12 +1173,12 @@ EXEC SQL END DECLARE SECTION; is a way to store some text string in char[] or VARCHAR[], as explained . The second use case is to - retreive multiple rows from a query result without using a + retrieve multiple rows from a query result without using a cursor. Without an array, to process a query result consisting of multiple rows, it is required to use a cursor and the FETCH command. But with array host variables, multiple rows can be received at once. The length of - the array has to be defined to be able to accomodate all rows, + the array has to be defined to be able to accommodate all rows, otherwise a buffer overflow will likely occur. @@ -1239,7 +1239,7 @@ oid=0, dbname= The following example retrieves OIDs, names, and sizes of the - avilable databases from the pg_database + available databases from the pg_database system table and using the pg_database_size() function. In this example, a structure variable dbinfo_t with @@ -3006,7 +3006,7 @@ int PGTYPEStimestamp_fmt_asc(timestamp *ts, char *output, int str_len, char *fmt %p - is replaced by national representation of - either "ante meridiem" or "post meridiem" as appropriate. + either ante meridiem or post meridiem as appropriate. @@ -3852,7 +3852,7 @@ EXEC SQL DESCRIBE prepared_statement INTO mysqlda; - SQLDA Datac Structure + SQLDA Data Structure SQLDA uses three data structure @@ -4080,7 +4080,7 @@ struct sqlname - Retreiving a Result Set Using an SQLDA + Retrieving a Result Set Using an SQLDA @@ -4265,9 +4265,9 @@ free(sqlda2); This application joins two system tables, pg_database and - pg_stat_database on the database oid, and also fetches and shows - the database statistics which are retreived by two input - parameters (a database "postgres", and oid "1"). + pg_stat_database on the database OID, and also fetches and shows + the database statistics which are retrieved by two input + parameters (a database postgres, and OID 1). @@ -5832,7 +5832,7 @@ ECPG = ecpg Large object functions have to be called in a transaction block, so when autocommit is off, BEGIN commands have to - be isssued explicitly. + be issued explicitly. @@ -6616,7 +6616,7 @@ DECLARE cursor_name [ BINARY ] [ IN prepared_name - The name of a prepared query, either as an SQL identfier or a + The name of a prepared query, either as an SQL identifier or a host variable. @@ -7477,7 +7477,7 @@ SET DESCRIPTOR descriptor_name VALU descriptor_item - A token identifiying which item of information to set in the + A token identifying which item of information to set in the descriptor. See for a list of supported items. @@ -8461,7 +8461,7 @@ int dectoasc(decimal *np, char *cp, int len, int right) right to -1 indicates that all available decimal digits should be included in the output. If the length of the output buffer, which is indicated by len is not sufficient to hold the - textual representation including the trailing NUL character, only a + textual representation including the trailing zero byte, only a single * character is stored in the result and -1 is returned. @@ -8556,7 +8556,7 @@ int rdatestr(date d, char *str); The function receives two arguments, the first one is the date to convert (d and the second one is a pointer to the target string. The output format is always yyyy-mm-dd, so you need - to allocate at least 11 bytes (including the NUL-terminator) for the + to allocate at least 11 bytes (including the zero-byte terminator) for the string. diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml index 4ca17ef1a4..5ff6d16a41 100644 --- a/doc/src/sgml/extend.sgml +++ b/doc/src/sgml/extend.sgml @@ -288,7 +288,7 @@ A useful extension to PostgreSQL typically includes - multiple SQL objects; for example, a new datatype will require new + multiple SQL objects; for example, a new data type will require new functions, new operators, and probably new index operator classes. It is helpful to collect all these objects into a single package to simplify database management. PostgreSQL calls diff --git a/doc/src/sgml/file-fdw.sgml b/doc/src/sgml/file-fdw.sgml index e6ccdada2c..8497d9a45f 100644 --- a/doc/src/sgml/file-fdw.sgml +++ b/doc/src/sgml/file-fdw.sgml @@ -10,7 +10,7 @@ The file_fdw module provides the foreign-data wrapper file_fdw, which can be used to access data - files in the server's filesystem. Data files must be in a format + files in the server's file system. Data files must be in a format that can be read by COPY FROM; see for details. diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index c1a34fb169..8f223d6891 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -9103,7 +9103,7 @@ SELECT xmlagg(x) FROM (SELECT * FROM test ORDER BY y DESC) AS tab; - IS DOCUMENT + <literal>IS DOCUMENT</literal> IS DOCUMENT @@ -9123,7 +9123,7 @@ SELECT xmlagg(x) FROM (SELECT * FROM test ORDER BY y DESC) AS tab; - XMLEXISTS + <literal>XMLEXISTS</literal> XMLEXISTS @@ -9165,7 +9165,7 @@ SELECT xmlexists('//town[text() = ''Toronto'']' PASSING BY REF 'Tor - xml_is_well_formed + <literal>xml_is_well_formed</literal> xml_is_well_formed @@ -9187,7 +9187,7 @@ SELECT xmlexists('//town[text() = ''Toronto'']' PASSING BY REF 'Tor These functions check whether a text string is well-formed XML, - returning a boolean result. + returning a Boolean result. xml_is_well_formed_document checks for a well-formed document, while xml_is_well_formed_content checks for well-formed content. xml_is_well_formed does @@ -9324,7 +9324,7 @@ SELECT xpath('//mydefns:b/text()', 'testxpath_exists is a specialized form of the xpath function. Instead of returning the individual XML values that satisfy the XPath, this function returns a - boolean indicating whether the query was satisfied or not. This + Boolean indicating whether the query was satisfied or not. This function is equivalent to the standard XMLEXISTS predicate, except that it also offers support for a namespace mapping argument. @@ -13685,12 +13685,12 @@ SELECT typlen FROM pg_type WHERE oid = pg_typeof(33); txid_snapshot_xmax(txid_snapshot) bigint - get xmax of snapshot + get xmax of snapshot txid_snapshot_xmin(txid_snapshot) bigint - get xmin of snapshot + get xmin of snapshot txid_visible_in_snapshot(bigint, txid_snapshot) @@ -14218,7 +14218,7 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup()); pg_last_xact_replay_timestamp() timestamp with time zone - Get timestamp of last transaction replayed during recovery. + Get time stamp of last transaction replayed during recovery. This is the time at which the commit or abort WAL record for that transaction was generated on the primary. If no transactions have been replayed during recovery, this function @@ -14638,7 +14638,7 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup()); pg_read_binary_file is similar to - pg_read_file, except that the result is a bytea value; + pg_read_file, except that the result is a bytea value; accordingly, no encoding checks are performed. In combination with the convert_from function, this function can be used to read a file in a specified encoding: diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml index 0283a1c867..80665a5cb2 100644 --- a/doc/src/sgml/high-availability.sgml +++ b/doc/src/sgml/high-availability.sgml @@ -1144,7 +1144,7 @@ primary_conninfo = 'host=192.168.1.50 port=5432 user=foo password=foopass' To trigger failover of a log-shipping standby server, run pg_ctl promote or create a trigger - file with the filename and path specified by the trigger_file + file with the file name and path specified by the trigger_file setting in recovery.conf. If you're planning to use pg_ctl promote to fail over, trigger_file is not required. If you're setting up the reporting servers that are diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index 96387bd610..61e34126c0 100644 --- a/doc/src/sgml/installation.sgml +++ b/doc/src/sgml/installation.sgml @@ -1989,7 +1989,7 @@ kill `cat /usr/local/pgsql/data/postmaster.pid` PostgreSQL works on AIX, but getting it installed properly can be challenging. AIX versions from 4.3.3 to 6.1 are considered supported. - You can use GCC or the native IBM compiler xlc. In + You can use GCC or the native IBM compiler xlc. In general, using recent versions of AIX and PostgreSQL helps. Check the build farm for up to date information about which versions of AIX are known to work. @@ -2817,7 +2817,7 @@ MANPATH=/usr/lib/scohelp/%L/man:/usr/dt/man:/usr/man:/usr/share/man:scohelp:/usr You can build with either GCC or Sun's compiler suite. For better code optimization, Sun's compiler is strongly recommended on the SPARC architecture. We have heard reports of problems - when using GCC 2.95.1; gcc 2.95.3 or later is recommended. If + when using GCC 2.95.1; GCC 2.95.3 or later is recommended. If you are using Sun's compiler, be careful not to select /usr/ucb/cc; use /opt/SUNWspro/bin/cc. diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index ba0cfc99cd..8e19a6e525 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -556,7 +556,7 @@ PGconn *PQconnectdbParams(const char **keywords, const char **values, int expand parameter can be used to achieve the kind of server authentication that SSL certificates achieve on TCP/IP connections. (Note that if the Unix-domain socket is - in /tmp or another publically writable + in /tmp or another publicly writable location, any user could start a server there. Use this parameter to ensure that you are connected to a server run by a trusted user, @@ -5410,7 +5410,7 @@ int PQlibVersion(void); The result of this function can be used to determine, at - runtime, if specific functionality is available in the currently + run time, if specific functionality is available in the currently loaded version of libpq. The function can be used, for example, to determine which connection options are available for PQconnectdb or if the hex bytea diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index 7d8b77e27e..553c16873f 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -245,15 +245,15 @@ postgres: user database host pg_stat_activitypg_stat_activity One row per server process, showing database OID, database name, process ID, user OID, user name, application name, - client's address, hostname (if available), and port number, times at + client's address, host name (if available), and port number, times at which the server process, current transaction, and current query began execution, process's waiting status, and text of the current query. The columns that report data on the current query are available unless the parameter track_activities has been turned off. Furthermore, these columns are only visible if the user examining the view is a superuser or the same as the user owning the process - being reported on. The client's hostname will be available only if - is set or if the user's hostname + being reported on. The client's host name will be available only if + is set or if the user's host name needed to be looked up during pg_hba.conf processing. @@ -300,7 +300,7 @@ postgres: user database host pg_stat_replicationpg_stat_replication One row per WAL sender process, showing process ID, - user OID, user name, application name, client's address, hostname + user OID, user name, application name, client's address, host name (if available) and port number, time at which the server process began execution, and the current WAL sender state and transaction log location. In addition, the standby reports the last transaction log @@ -311,8 +311,8 @@ postgres: user database host is set or if the user's hostname + The client's host name will be available only if + is set or if the user's host name needed to be looked up during pg_hba.conf processing. diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml index 180d6e82e4..e688176acb 100644 --- a/doc/src/sgml/mvcc.sgml +++ b/doc/src/sgml/mvcc.sgml @@ -613,7 +613,7 @@ ERROR: could not serialize access due to read/write dependencies among transact with a SQLSTATE value of '40001'), because it will be very hard to predict exactly which transactions might contribute to the read/write dependencies and need to be rolled back to prevent serialization - anomalies. The monitoring of read/write dependences has a cost, as does + anomalies. The monitoring of read/write dependencies has a cost, as does the restart of transactions which are terminated with a serialization failure, but balanced against the cost and blocking involved in use of explicit locks and SELECT FOR UPDATE or SELECT FOR diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml index 9d5b709aec..2d115fa26e 100644 --- a/doc/src/sgml/perform.sgml +++ b/doc/src/sgml/perform.sgml @@ -440,14 +440,14 @@ WHERE t1.unique1 < 100 AND t1.unique2 = t2.unique2; the related Insert, Update, or Delete node, although time spent executing AFTER triggers is not. The time spent in each trigger (either BEFORE or AFTER) is also shown separately - and is included in total runtime. + and is included in total run time. Note, however, that deferred constraint triggers will not be executed until end of transaction and are thus not shown by EXPLAIN ANALYZE. - There are two significant ways in which runtimes measured by + There are two significant ways in which run times measured by EXPLAIN ANALYZE can deviate from normal execution of the same query. First, since no output rows are delivered to the client, network transmission costs and I/O formatting costs are not included. diff --git a/doc/src/sgml/pgtestfsync.sgml b/doc/src/sgml/pgtestfsync.sgml index 4015eb51d8..2889059c82 100644 --- a/doc/src/sgml/pgtestfsync.sgml +++ b/doc/src/sgml/pgtestfsync.sgml @@ -36,7 +36,7 @@ pg_test_fsync [options] - Specifies the filename to write test data in. + Specifies the file name to write test data in. This file should be in the same file system that the pg_xlog directory is or will be placed in. (pg_xlog contains the WAL files.) diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml index 0aab10bbd6..b957757da6 100644 --- a/doc/src/sgml/plperl.sgml +++ b/doc/src/sgml/plperl.sgml @@ -129,7 +129,7 @@ $$ LANGUAGE plperl; Arguments will be converted from the database's encoding to UTF-8 - for use inside plperl, and then converted from UTF-8 back to the + for use inside PL/Perl, and then converted from UTF-8 back to the database encoding upon return. @@ -786,7 +786,7 @@ SELECT release_hosts_query(); encode_typed_literal(value, typename) - Converts a Perl variable to the value of the datatype passed as a + Converts a Perl variable to the value of the data type passed as a second argument and returns a string representation of this value. Correctly handles nested arrays and values of composite types. @@ -1277,7 +1277,7 @@ DO 'elog(WARNING, join ", ", sort keys %INC)' language plperl; child processes. - This parameter can only be set in the postgresql.conf file or on the server command line. + This parameter can only be set in the postgresql.conf file or on the server command line. diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml index 1866e43e0e..eea6ec58e3 100644 --- a/doc/src/sgml/plpgsql.sgml +++ b/doc/src/sgml/plpgsql.sgml @@ -3586,7 +3586,7 @@ AFTER INSERT OR UPDATE OR DELETE ON emp This example uses a trigger on the view to make it updatable, and ensure that any insert, update or delete of a row in the view is - recorded (i.e., audited) in the emp_audit table. The current time + recorded (i.e., audited) in the emp_audit table. The current time and user name are recorded, together with the type of operation performed, and the view displays the last modified time of each row. diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml index 14f00d8236..ffc1d3ab3d 100644 --- a/doc/src/sgml/plpython.sgml +++ b/doc/src/sgml/plpython.sgml @@ -356,7 +356,7 @@ $$ LANGUAGE plpythonu; When the PostgreSQL return type is bytea, the return value will be converted to a string (Python 2) or bytes - (Python 3) using the respective Python builtins, with the + (Python 3) using the respective Python built-ins, with the result being converted bytea. @@ -365,7 +365,7 @@ $$ LANGUAGE plpythonu; For all other PostgreSQL return types, the returned Python value is converted to a string using the Python - builtin str, and the result is passed to the + built-in str, and the result is passed to the input function of the PostgreSQL data type. @@ -1101,7 +1101,7 @@ $$ LANGUAGE plpythonu; inserted into it. The subtransaction context manager does not trap errors, it only assures that all database operations executed inside its scope will be atomically committed or rolled back. A - rollback of the subtransaction block occurrs on any kind of + rollback of the subtransaction block occurs on any kind of exception exit, not only ones caused by errors originating from database access. A regular Python exception raised inside an explicit subtransaction block would also cause the subtransaction diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml index 99c4e4e698..b3cf39a39b 100644 --- a/doc/src/sgml/queries.sgml +++ b/doc/src/sgml/queries.sgml @@ -1586,7 +1586,7 @@ GROUP BY region, product; top_regions and the output of top_regions is used in the primary SELECT query. This example could have been written without WITH, - but we'd have needed two levels of nested sub-SELECTs. It's a bit + but we'd have needed two levels of nested sub-SELECTs. It's a bit easier to follow this way. diff --git a/doc/src/sgml/ref/alter_opfamily.sgml b/doc/src/sgml/ref/alter_opfamily.sgml index e22b4728d9..7d9c7560ac 100644 --- a/doc/src/sgml/ref/alter_opfamily.sgml +++ b/doc/src/sgml/ref/alter_opfamily.sgml @@ -159,7 +159,7 @@ ALTER OPERATOR FAMILY name USING sort_family_name - The name (optionally schema-qualified) of an existing btree operator + The name (optionally schema-qualified) of an existing btree operator family that describes the sort ordering associated with an ordering operator. diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml index adba267863..addf652065 100644 --- a/doc/src/sgml/ref/cluster.sgml +++ b/doc/src/sgml/ref/cluster.sgml @@ -128,7 +128,7 @@ CLUSTER [VERBOSE] - CLUSTER can re-sort the table using either an indexscan + CLUSTER can re-sort the table using either an index scan on the specified index, or (if the index is a b-tree) a sequential scan followed by sorting. It will attempt to choose the method that will be faster, based on planner cost parameters and available statistical @@ -136,7 +136,7 @@ CLUSTER [VERBOSE] - When an indexscan is used, a temporary copy of the table is created that + When an index scan is used, a temporary copy of the table is created that contains the table data in the index order. Temporary copies of each index on the table are created as well. Therefore, you need free space on disk at least equal to the sum of the table size and the index sizes. @@ -146,7 +146,7 @@ CLUSTER [VERBOSE] When a sequential scan and sort is used, a temporary sort file is also created, so that the peak temporary space requirement is as much as double the table size, plus the index sizes. This method is often - faster than the indexscan method, but if the disk space requirement is + faster than the index scan method, but if the disk space requirement is intolerable, you can disable this choice by temporarily setting to off. diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml index 158740b667..02ff2d7f9b 100644 --- a/doc/src/sgml/ref/create_opclass.sgml +++ b/doc/src/sgml/ref/create_opclass.sgml @@ -184,7 +184,7 @@ CREATE OPERATOR CLASS name [ DEFAUL sort_family_name - The name (optionally schema-qualified) of an existing btree operator + The name (optionally schema-qualified) of an existing btree operator family that describes the sort ordering associated with an ordering operator. diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 70b0325f0e..ea45fadae6 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -355,7 +355,7 @@ CREATE TYPE name - If the optional boolean + If the optional Boolean parameter collatable is true, column definitions and expressions of the type may carry collation information through use of diff --git a/doc/src/sgml/ref/ecpg-ref.sgml b/doc/src/sgml/ref/ecpg-ref.sgml index 20f8c9d0ad..2bbd476158 100644 --- a/doc/src/sgml/ref/ecpg-ref.sgml +++ b/doc/src/sgml/ref/ecpg-ref.sgml @@ -143,7 +143,7 @@ PostgreSQL documentation Do not use indicators but instead use special values to represent - NULLs. Historically there have been databases using this approach. + null values. Historically there have been databases using this approach. @@ -152,7 +152,7 @@ PostgreSQL documentation Prepare all statements before using them. Libecpg will keep a cache of - prepared statments and reuse a statement if it gets executed again. If the + prepared statements and reuse a statement if it gets executed again. If the cache runs full, libecpg will free the least used statement. @@ -161,7 +161,7 @@ PostgreSQL documentation - Allow questionmark as placeholder for compatibility reasons. + Allow question mark as placeholder for compatibility reasons. This used to be the default long ago. diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml index 29c885e93d..8a7b833f0f 100644 --- a/doc/src/sgml/ref/pg_basebackup.sgml +++ b/doc/src/sgml/ref/pg_basebackup.sgml @@ -59,7 +59,7 @@ PostgreSQL documentation - There can be multiple pg_basebackups running at the same time, but it is + There can be multiple pg_basebackups running at the same time, but it is better from a performance point of view to take only one backup, and copy the result. @@ -127,7 +127,7 @@ PostgreSQL documentation Write the output as tar files in the target directory. The main data directory will be written to a file named base.tar, and all other tablespaces will - be named after the tablespace oid. + be named after the tablespace OID. If the value - (dash) is specified as @@ -235,7 +235,7 @@ PostgreSQL documentation Enables verbose mode. Will output some extra steps during startup and - shutdown, as well as show the exact filename that is currently being + shutdown, as well as show the exact file name that is currently being processed if progress reporting is also enabled. diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml index 7f12460426..cb1773eeaa 100644 --- a/doc/src/sgml/ref/pg_dump.sgml +++ b/doc/src/sgml/ref/pg_dump.sgml @@ -142,7 +142,7 @@ PostgreSQL documentation Output commands to clean (drop) - database objects prior to outputing the commands for creating them. + database objects prior to outputting the commands for creating them. (Restore might generate some harmless errors.) diff --git a/doc/src/sgml/release-9.1.sgml b/doc/src/sgml/release-9.1.sgml index 713e89bee5..299cf9d721 100644 --- a/doc/src/sgml/release-9.1.sgml +++ b/doc/src/sgml/release-9.1.sgml @@ -491,7 +491,7 @@ - Add client_hostname field to client_hostname field to pg_stat_activity (Peter Eisentraut) @@ -1227,7 +1227,7 @@ Make EXPLAIN VERBOSE show the function call expression - in a FunctionScan node (Tom Lane) + in a FunctionScan node (Tom Lane) @@ -1428,7 +1428,7 @@ - These are used for xpath matching. + These are used for XPath matching. @@ -2046,7 +2046,7 @@ - Allow ecpg to accept dynamic cursor names even in + Allow ECPG to accept dynamic cursor names even in WHERE CURRENT OF clauses @@ -2139,7 +2139,7 @@ - Enable building with the Mingw64 compiler (Andrew Dunstan) + Enable building with the MinGW64 compiler (Andrew Dunstan) @@ -2175,7 +2175,7 @@ - Add missing get_{object}_oid() functions, for consistency + Add missing get_object_oid() functions, for consistency (Robert Haas) @@ -2316,7 +2316,7 @@ Allow contrib/fuzzystrmatch's - levenshtein() function handle multi-byte characters + levenshtein() function handle multibyte characters (Alexander Korotkov) diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml index d18ba79f40..ef83206bbc 100644 --- a/doc/src/sgml/runtime.sgml +++ b/doc/src/sgml/runtime.sgml @@ -1662,7 +1662,7 @@ $ kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`/etc/rc.d/init.d/postgresql stop See for details about starting and - stoping the server. + stopping the server. diff --git a/doc/src/sgml/sepgsql.sgml b/doc/src/sgml/sepgsql.sgml index f35ab97be1..db9b64cc88 100644 --- a/doc/src/sgml/sepgsql.sgml +++ b/doc/src/sgml/sepgsql.sgml @@ -26,7 +26,7 @@ This module integrates with SELinux to provide an - additional layer of security checking above and beyond what is normaly + additional layer of security checking above and beyond what is normally provided by PostgreSQL. From the perspective of SELinux, this module allows PostgreSQL to function as a user-space object @@ -97,7 +97,7 @@ Policy from config file: targeted The following instructions that assume your installation is under the /usr/local/pgsql directory. Adjust the paths shown below as - appropriate for your installaton. + appropriate for your installation. diff --git a/doc/src/sgml/xml2.sgml b/doc/src/sgml/xml2.sgml index 90b5ac0785..47bac31f0c 100644 --- a/doc/src/sgml/xml2.sgml +++ b/doc/src/sgml/xml2.sgml @@ -343,7 +343,7 @@ WHERE t.author_id = p.person_id; The xpath_table function assumes that the results of each XPath query - might be multi-valued, so the number of rows returned by the function + might be multivalued, so the number of rows returned by the function may not be the same as the number of input documents. The first row returned contains the first result from each query, the second row the second result from each query. If one of the queries has fewer values diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 4881a7dd48..0e779e09d7 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -227,7 +227,7 @@ gistbuildempty(PG_FUNCTION_ARGS) { ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("unlogged GIST indexes are not supported"))); + errmsg("unlogged GiST indexes are not supported"))); PG_RETURN_VOID(); } @@ -1405,7 +1405,7 @@ initGISTstate(GISTSTATE *giststate, Relation index) * functions don't care about collation, so we just do it * unconditionally. (We could alternatively call get_typcollation, * but that seems like expensive overkill --- there aren't going to be - * any cases where a GIST storage type has a nondefault collation.) + * any cases where a GiST storage type has a nondefault collation.) */ if (OidIsValid(index->rd_indcollation[i])) giststate->supportCollation[i] = index->rd_indcollation[i]; diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 4eb31318ff..1aba686844 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -71,7 +71,7 @@ gistindex_keytest(IndexScanDesc scan, int i; if (GistPageIsLeaf(page)) /* shouldn't happen */ - elog(ERROR, "invalid GIST tuple found on leaf page"); + elog(ERROR, "invalid GiST tuple found on leaf page"); for (i = 0; i < scan->numberOfOrderBys; i++) so->distances[i] = -get_float8_infinity(); return true; diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index 51354c1c18..02c4ec3a6f 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -306,7 +306,7 @@ gist_redo(XLogRecPtr lsn, XLogRecord *record) MemoryContext oldCxt; /* - * GIST indexes do not require any conflict processing. NB: If we ever + * GiST indexes do not require any conflict processing. NB: If we ever * implement a similar optimization we have in b-tree, and remove killed * tuples outside VACUUM, we'll need to handle that here. */ diff --git a/src/backend/catalog/sql_features.txt b/src/backend/catalog/sql_features.txt index 3a40c456e1..71597f90a3 100644 --- a/src/backend/catalog/sql_features.txt +++ b/src/backend/catalog/sql_features.txt @@ -397,7 +397,7 @@ T052 MAX and MIN for row types NO T053 Explicit aliases for all-fields reference NO T061 UCS support NO T071 BIGINT data type YES -T101 Enhanced nullability determiniation NO +T101 Enhanced nullability determination NO T111 Updatable joins, unions, and columns NO T121 WITH (excluding RECURSIVE) in query expression YES T122 WITH (excluding RECURSIVE) in subquery YES diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index b91e4a4bd2..479db2c3f1 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -287,7 +287,7 @@ DefineIndex(RangeVar *heapRelation, { /* * Hack to provide more-or-less-transparent updating of old RTREE - * indexes to GIST: if RTREE is requested and not found, use GIST. + * indexes to GiST: if RTREE is requested and not found, use GIST. */ if (strcmp(accessMethodName, "rtree") == 0) { diff --git a/src/test/regress/expected/opr_sanity.out b/src/test/regress/expected/opr_sanity.out index a83608ade5..a25f90cbfd 100644 --- a/src/test/regress/expected/opr_sanity.out +++ b/src/test/regress/expected/opr_sanity.out @@ -1177,7 +1177,7 @@ WHERE p1.amprocfamily = p3.oid AND p3.opfmethod = p2.oid AND -- Detect missing pg_amproc entries: should have as many support functions -- as AM expects for each datatype combination supported by the opfamily. --- GIST/GIN are special cases because each has an optional support function. +-- GiST/GIN are special cases because each has an optional support function. SELECT p1.amname, p2.opfname, p3.amproclefttype, p3.amprocrighttype FROM pg_am AS p1, pg_opfamily AS p2, pg_amproc AS p3 WHERE p2.opfmethod = p1.oid AND p3.amprocfamily = p2.oid AND @@ -1190,7 +1190,7 @@ WHERE p2.opfmethod = p1.oid AND p3.amprocfamily = p2.oid AND --------+---------+----------------+----------------- (0 rows) --- Similar check for GIST/GIN, allowing one optional proc +-- Similar check for GiST/GIN, allowing one optional proc SELECT p1.amname, p2.opfname, p3.amproclefttype, p3.amprocrighttype FROM pg_am AS p1, pg_opfamily AS p2, pg_amproc AS p3 WHERE p2.opfmethod = p1.oid AND p3.amprocfamily = p2.oid AND @@ -1205,7 +1205,7 @@ WHERE p2.opfmethod = p1.oid AND p3.amprocfamily = p2.oid AND (0 rows) -- Also, check if there are any pg_opclass entries that don't seem to have --- pg_amproc support. Again, GIST/GIN have to be checked specially. +-- pg_amproc support. Again, GiST/GIN have to be checked specially. SELECT amname, opcname, count(*) FROM pg_am am JOIN pg_opclass op ON opcmethod = am.oid LEFT JOIN pg_amproc p ON amprocfamily = opcfamily AND diff --git a/src/test/regress/sql/opr_sanity.sql b/src/test/regress/sql/opr_sanity.sql index 217192139c..65ae868d98 100644 --- a/src/test/regress/sql/opr_sanity.sql +++ b/src/test/regress/sql/opr_sanity.sql @@ -920,7 +920,7 @@ WHERE p1.amprocfamily = p3.oid AND p3.opfmethod = p2.oid AND -- Detect missing pg_amproc entries: should have as many support functions -- as AM expects for each datatype combination supported by the opfamily. --- GIST/GIN are special cases because each has an optional support function. +-- GiST/GIN are special cases because each has an optional support function. SELECT p1.amname, p2.opfname, p3.amproclefttype, p3.amprocrighttype FROM pg_am AS p1, pg_opfamily AS p2, pg_amproc AS p3 @@ -931,7 +931,7 @@ WHERE p2.opfmethod = p1.oid AND p3.amprocfamily = p2.oid AND p4.amproclefttype = p3.amproclefttype AND p4.amprocrighttype = p3.amprocrighttype); --- Similar check for GIST/GIN, allowing one optional proc +-- Similar check for GiST/GIN, allowing one optional proc SELECT p1.amname, p2.opfname, p3.amproclefttype, p3.amprocrighttype FROM pg_am AS p1, pg_opfamily AS p2, pg_amproc AS p3 @@ -944,7 +944,7 @@ WHERE p2.opfmethod = p1.oid AND p3.amprocfamily = p2.oid AND NOT IN (p1.amsupport, p1.amsupport - 1); -- Also, check if there are any pg_opclass entries that don't seem to have --- pg_amproc support. Again, GIST/GIN have to be checked specially. +-- pg_amproc support. Again, GiST/GIN have to be checked specially. SELECT amname, opcname, count(*) FROM pg_am am JOIN pg_opclass op ON opcmethod = am.oid