From a978565ffcec3ea31c0827fe1dcc524163bdbdfa Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 27 Oct 2023 17:23:09 -0400 Subject: [PATCH] doc: wording improvements Discussion: https://postgr.es/m/a5180360-ec04-ac58-25ce-3d795d3d1f6c@postgrespro.ru Author: Ekaterina Kiryanova Backpatch-through: master --- doc/src/sgml/charset.sgml | 8 ++++---- doc/src/sgml/config.sgml | 2 +- doc/src/sgml/high-availability.sgml | 13 +++++++------ doc/src/sgml/indices.sgml | 2 +- doc/src/sgml/logicaldecoding.sgml | 2 +- doc/src/sgml/monitoring.sgml | 2 +- doc/src/sgml/ref/merge.sgml | 4 ++-- doc/src/sgml/ref/pg_basebackup.sgml | 7 ++++--- doc/src/sgml/ref/pg_receivewal.sgml | 3 ++- doc/src/sgml/ref/pg_recvlogical.sgml | 2 +- doc/src/sgml/ref/pg_restore.sgml | 2 +- doc/src/sgml/ref/pg_waldump.sgml | 9 +++++---- doc/src/sgml/ref/pgbench.sgml | 8 +++++--- 13 files changed, 35 insertions(+), 29 deletions(-) diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index 975b9dc952..74783d148f 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -293,10 +293,10 @@ initdb --locale=sv_SE As explained above, the environment of the operating system provides the defaults for the locales of a newly initialized database cluster. In - many cases, this is enough: If the operating system is configured for - the desired language/territory, then - PostgreSQL will by default also behave - according to that locale. + many cases, this is enough: if the operating system is configured for + the desired language/territory, by default + PostgreSQL will also behave according + to that locale. diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index bd138236ac..4047eefc64 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -9041,7 +9041,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv; The timeout is measured from the time a command arrives at the server until it is completed by the server. If multiple SQL - statements appear in a single simple-Query message, the timeout + statements appear in a single simple-query message, the timeout is applied to each statement separately. (PostgreSQL versions before 13 usually treated the timeout as applying to the whole query string.) diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml index 5f9257313a..eb81260bbf 100644 --- a/doc/src/sgml/high-availability.sgml +++ b/doc/src/sgml/high-availability.sgml @@ -1359,8 +1359,8 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)' If you need to re-create a standby server while transactions are - waiting, make sure that the commands pg_backup_start() and - pg_backup_stop() are run in a session with + waiting, make sure that the functions pg_backup_start() + and pg_backup_stop() are run in a session with synchronous_commit = off, otherwise those requests will wait forever for the standby to appear. @@ -2219,10 +2219,11 @@ HINT: You can then restart the server after making the necessary configuration The cumulative statistics system is active during recovery. All scans, reads, blocks, index usage, etc., will be recorded normally on the standby. However, WAL replay will not increment relation and database - specific counters. I.e. replay will not increment pg_stat_all_tables - columns (like n_tup_ins), nor will reads or writes performed by the - startup process be tracked in the pg_statio views, nor will associated - pg_stat_database columns be incremented. + specific counters. I.e. replay will not increment + pg_stat_all_tables columns (like n_tup_ins), + nor will reads or writes performed by the startup process be tracked in the + pg_statio_ views, nor will associated + pg_stat_database columns be incremented. diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml index 55122129d5..992408ddc3 100644 --- a/doc/src/sgml/indices.sgml +++ b/doc/src/sgml/indices.sgml @@ -754,7 +754,7 @@ CREATE INDEX people_names ON people ((first_name || ' ' || last_name)); Index expressions are relatively expensive to maintain, because the derived expression(s) must be computed for each row insertion - and non-HOT update. However, the index expressions are + and non-HOT update. However, the index expressions are not recomputed during an indexed search, since they are already stored in the index. In both examples above, the system sees the query as just WHERE indexedcolumn = 'constant' diff --git a/doc/src/sgml/logicaldecoding.sgml b/doc/src/sgml/logicaldecoding.sgml index 8067946a25..cd152d4ced 100644 --- a/doc/src/sgml/logicaldecoding.sgml +++ b/doc/src/sgml/logicaldecoding.sgml @@ -144,7 +144,7 @@ postgres=# SELECT pg_drop_replication_slot('regression_slot'); - The following examples shows how logical decoding is controlled over the + The following examples show how logical decoding is controlled over the streaming replication protocol, using the program included in the PostgreSQL distribution. This requires that client authentication is set up to allow diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index 9fea60b5b2..faf7a5ed9d 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -261,7 +261,7 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser unnecessary and can be avoided by setting stats_fetch_consistency to none. - You can invoke pg_stat_clear_snapshot() to discard the + You can invoke pg_stat_clear_snapshot() to discard the current transaction's statistics snapshot or cached values (if any). The next use of statistical information will (when in snapshot mode) cause a new snapshot to be built or (when in cache mode) accessed statistics to be diff --git a/doc/src/sgml/ref/merge.sgml b/doc/src/sgml/ref/merge.sgml index 0995fe0c04..0f61d472cd 100644 --- a/doc/src/sgml/ref/merge.sgml +++ b/doc/src/sgml/ref/merge.sgml @@ -381,9 +381,9 @@ DELETE An expression to assign to the column. If used in a WHEN MATCHED clause, the expression can use values from the original row in the target table, and values from the - data_source row. + data_source row. If used in a WHEN NOT MATCHED clause, the - expression can use values from the data_source. + expression can use values from the data_source. diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml index 712568a62d..0b87fd2d4d 100644 --- a/doc/src/sgml/ref/pg_basebackup.sgml +++ b/doc/src/sgml/ref/pg_basebackup.sgml @@ -422,8 +422,9 @@ PostgreSQL documentation A compression detail string can optionally be specified. If the detail string is an integer, it specifies the compression level. Otherwise, it should be a comma-separated list of items, - each of the form keyword or - keyword=value. + each of the form + keyword or + keyword=value. Currently, the supported keywords are level, long, and workers. The detail string cannot be used when the compression method @@ -1019,7 +1020,7 @@ PostgreSQL documentation - To create a backup of a local server with one tar file for each tablespace + To create a backup of the local server with one tar file for each tablespace compressed with gzip at level 9, stored in the directory backup: diff --git a/doc/src/sgml/ref/pg_receivewal.sgml b/doc/src/sgml/ref/pg_receivewal.sgml index 798b972d3c..8944eee2a3 100644 --- a/doc/src/sgml/ref/pg_receivewal.sgml +++ b/doc/src/sgml/ref/pg_receivewal.sgml @@ -281,7 +281,8 @@ PostgreSQL documentation A compression detail string can optionally be specified. If the detail string is an integer, it specifies the compression level. Otherwise, it should be a comma-separated list of items, each of the - form keyword or keyword=value. + form keyword or + keyword=value. Currently, the only supported keyword is level. diff --git a/doc/src/sgml/ref/pg_recvlogical.sgml b/doc/src/sgml/ref/pg_recvlogical.sgml index 648d3f0f62..95eb14b635 100644 --- a/doc/src/sgml/ref/pg_recvlogical.sgml +++ b/doc/src/sgml/ref/pg_recvlogical.sgml @@ -274,7 +274,7 @@ PostgreSQL documentation Enables decoding of prepared transactions. This option may only be specified with - + . diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml index a81583191c..374d8d8715 100644 --- a/doc/src/sgml/ref/pg_restore.sgml +++ b/doc/src/sgml/ref/pg_restore.sgml @@ -659,7 +659,7 @@ PostgreSQL documentation Do not output commands to select table access methods. With this option, all objects will be created with whichever - access method is the default during restore. + table access method is the default during restore. diff --git a/doc/src/sgml/ref/pg_waldump.sgml b/doc/src/sgml/ref/pg_waldump.sgml index 4592d6016a..a9371e037b 100644 --- a/doc/src/sgml/ref/pg_waldump.sgml +++ b/doc/src/sgml/ref/pg_waldump.sgml @@ -117,7 +117,7 @@ PostgreSQL documentation - If provided, only display records that modify blocks in the given fork. + Only display records that modify blocks in the given fork. The valid values are main for the main fork, fsm for the free space map, vm for the visibility map, @@ -174,12 +174,13 @@ PostgreSQL documentation names, and exit. - Extensions may define custom resource managers, but pg_waldump does + Extensions may define custom resource managers, but + pg_waldump does not load the extension module and therefore does not recognize custom resource managers by name. Instead, you can specify the custom resource managers as custom### where - "###" is the three-digit resource manager ID. Names - of this form will always be considered valid. + ### is the three-digit resource manager ID. + Names of this form will always be considered valid. diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml index d3d6e3ef07..05d3f81619 100644 --- a/doc/src/sgml/ref/pgbench.sgml +++ b/doc/src/sgml/ref/pgbench.sgml @@ -229,7 +229,8 @@ pgbench options d data is generated in pgbench client and then sent to the server. This uses the client/server bandwidth extensively through a COPY. - pgbench uses the FREEZE option with version 14 or later + pgbench uses the option + with version 14 or later of PostgreSQL to speed up subsequent VACUUM, except on the pgbench_accounts table if partitions are @@ -1118,7 +1119,8 @@ pgbench options d each SQL command on a single line ending with a semicolon. - It is assumed that pgbench scripts do not contain incomplete blocks of SQL + It is assumed that pgbench scripts do not contain + incomplete blocks of SQL transactions. If at runtime the client reaches the end of the script without completing the last transaction block, it will be aborted. @@ -2636,7 +2638,7 @@ END; - Here is some example output generated with these options: + Here is some example output generated with this option: pgbench --aggregate-interval=10 --time=20 --client=10 --log --rate=1000 --latency-limit=10 --failures-detailed --max-tries=10 test -- 2.39.5