From 90a1d0aa76a7a95ff36f72cadd0d7aa0c3cb9b31 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 20 Aug 2015 22:34:35 -0400 Subject: [PATCH] doc: Whitespace and formatting fixes --- doc/src/sgml/brin.sgml | 4 ++-- doc/src/sgml/config.sgml | 2 +- doc/src/sgml/func.sgml | 20 ++++++++-------- doc/src/sgml/libpq.sgml | 10 ++++---- doc/src/sgml/pageinspect.sgml | 2 +- doc/src/sgml/ref/drop_policy.sgml | 6 ++--- doc/src/sgml/ref/insert.sgml | 38 +++++++++++++++---------------- doc/src/sgml/ref/pgupgrade.sgml | 2 +- doc/src/sgml/syntax.sgml | 2 +- 9 files changed, 44 insertions(+), 42 deletions(-) diff --git a/doc/src/sgml/brin.sgml b/doc/src/sgml/brin.sgml index c8c3de72e3..5748038009 100644 --- a/doc/src/sgml/brin.sgml +++ b/doc/src/sgml/brin.sgml @@ -48,7 +48,7 @@ geometrical types might store the bounding box for all the objects in the block range. - + The size of the block range is determined at index creation time by the pages_per_range storage parameter. The number of index @@ -65,7 +65,7 @@ The core PostgreSQL distribution - includes the BRIN operator classes shown in + includes the BRIN operator classes shown in . diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index e900dccb11..e3dc23bf13 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -2518,7 +2518,7 @@ include_dir 'conf.d' mode. In always mode, all files restored from the archive or streamed with streaming replication will be archived (again). See for details. - + archive_mode and archive_command are separate variables so that archive_command can be diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 249741e992..617d0b31bf 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -10911,16 +10911,16 @@ table2-mapping jsonb_pretty('[{"f1":1,"f2":null},2,null,3]') - - [ - { - "f1": 1, - "f2": null - }, - 2, - null, - 3 - ] + +[ + { + "f1": 1, + "f2": null + }, + 2, + null, + 3 +] diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index fe0a7920cc..7940ef2713 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1906,8 +1906,10 @@ const char *PQsslAttribute(const PGconn *conn, const char *attribute_name); protocol - SSL/TLS version in use. Common values are "SSLv2", "SSLv3", - "TLSv1", "TLSv1.1" and "TLSv1.2", but an implementation may + SSL/TLS version in use. Common values + are "SSLv2", "SSLv3", + "TLSv1", "TLSv1.1" + and "TLSv1.2", but an implementation may return other strings if some other protocol is used. @@ -1924,7 +1926,7 @@ const char *PQsslAttribute(const PGconn *conn, const char *attribute_name); cipher - A short name of the ciphersuite used, e.g. + A short name of the ciphersuite used, e.g. "DHE-RSA-DES-CBC3-SHA". The names are specific to each SSL implementation. @@ -5149,7 +5151,7 @@ int PQputCopyEnd(PGconn *conn, connections.) - + The result is 1 if the termination message was sent; or in nonblocking mode, this may only indicate that the termination message was successfully queued. (In nonblocking mode, to be diff --git a/doc/src/sgml/pageinspect.sgml b/doc/src/sgml/pageinspect.sgml index 313cbaea30..b95cc81a09 100644 --- a/doc/src/sgml/pageinspect.sgml +++ b/doc/src/sgml/pageinspect.sgml @@ -382,7 +382,7 @@ test=# SELECT * FROM gin_page_opaque_info(get_raw_page('gin_index', 2)); gin_leafpage_items returns information about the data stored in a GIN leaf page. For example: - test=# SELECT first_tid, nbytes, tids[0:5] as some_tids +test=# SELECT first_tid, nbytes, tids[0:5] as some_tids FROM gin_leafpage_items(get_raw_page('gin_test_idx', 2)); first_tid | nbytes | some_tids -----------+--------+---------------------------------------------------------- diff --git a/doc/src/sgml/ref/drop_policy.sgml b/doc/src/sgml/ref/drop_policy.sgml index bd4ef5cf7c..c25bc61d9e 100644 --- a/doc/src/sgml/ref/drop_policy.sgml +++ b/doc/src/sgml/ref/drop_policy.sgml @@ -83,9 +83,9 @@ DROP POLICY [ IF EXISTS ] name ON < To drop the policy called p1 on the table named my_table: - - DROP POLICY p1 ON my_table; - + +DROP POLICY p1 ON my_table; + diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml index 7cd4577f1e..233a48f480 100644 --- a/doc/src/sgml/ref/insert.sgml +++ b/doc/src/sgml/ref/insert.sgml @@ -621,9 +621,9 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd; expression is used to reference values originally proposed for insertion: - INSERT INTO distributors (did, dname) - VALUES (5, 'Gizmo transglobal'), (6, 'Associated Computing, inc') - ON CONFLICT (did) DO UPDATE SET dname = EXCLUDED.dname; +INSERT INTO distributors (did, dname) + VALUES (5, 'Gizmo transglobal'), (6, 'Associated Computing, inc') + ON CONFLICT (did) DO UPDATE SET dname = EXCLUDED.dname; @@ -633,8 +633,8 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd; Example assumes a unique index has been defined that constrains values appearing in the did column: - INSERT INTO distributors (did, dname) VALUES (7, 'Redline GmbH') - ON CONFLICT (did) DO NOTHING; +INSERT INTO distributors (did, dname) VALUES (7, 'Redline GmbH') + ON CONFLICT (did) DO NOTHING; @@ -644,16 +644,16 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd; used to limit the rows actually updated (any existing row not updated will still be locked, though): - -- Don't update existing distributors based in a certain ZIP code - INSERT INTO distributors AS d (did, dname) VALUES (8, 'Anvil Distribution') - ON CONFLICT (did) DO UPDATE - SET dname = EXCLUDED.dname || ' (formerly ' || d.dname || ')' - WHERE d.zipcode != '21201'; +-- Don't update existing distributors based in a certain ZIP code +INSERT INTO distributors AS d (did, dname) VALUES (8, 'Anvil Distribution') + ON CONFLICT (did) DO UPDATE + SET dname = EXCLUDED.dname || ' (formerly ' || d.dname || ')' + WHERE d.zipcode <> '21201'; - -- Name a constraint directly in the statement (uses associated - -- index to arbitrate taking the DO NOTHING action) - INSERT INTO distributors (did, dname) VALUES (9, 'Antwerp Design') - ON CONFLICT ON CONSTRAINT distributors_pkey DO NOTHING; +-- Name a constraint directly in the statement (uses associated +-- index to arbitrate taking the DO NOTHING action) +INSERT INTO distributors (did, dname) VALUES (9, 'Antwerp Design') + ON CONFLICT ON CONSTRAINT distributors_pkey DO NOTHING; @@ -664,11 +664,11 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd; is_active boolean column evaluates to true: - -- This statement could infer a partial unique index on "did" - -- with a predicate of "WHERE is_active", but it could also - -- just use a regular unique constraint on "did" - INSERT INTO distributors (did, dname) VALUES (10, 'Conrad International') - ON CONFLICT (did) WHERE is_active DO NOTHING; +-- This statement could infer a partial unique index on "did" +-- with a predicate of "WHERE is_active", but it could also +-- just use a regular unique constraint on "did" +INSERT INTO distributors (did, dname) VALUES (10, 'Conrad International') + ON CONFLICT (did) WHERE is_active DO NOTHING; diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml index e97fb480f3..072d5f46eb 100644 --- a/doc/src/sgml/ref/pgupgrade.sgml +++ b/doc/src/sgml/ref/pgupgrade.sgml @@ -487,7 +487,7 @@ pg_upgrade.exe directories, run this for each slave: - rsync --archive --delete --hard-links --size-only old_pgdata new_pgdata remote_dir +rsync --archive --delete --hard-links --size-only old_pgdata new_pgdata remote_dir where