diff options
-rw-r--r-- | doc/src/sgml/brin.sgml | 4 | ||||
-rw-r--r-- | doc/src/sgml/config.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/func.sgml | 20 | ||||
-rw-r--r-- | doc/src/sgml/libpq.sgml | 10 | ||||
-rw-r--r-- | doc/src/sgml/pageinspect.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/ref/drop_policy.sgml | 6 | ||||
-rw-r--r-- | doc/src/sgml/ref/insert.sgml | 40 | ||||
-rw-r--r-- | doc/src/sgml/ref/pgupgrade.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/syntax.sgml | 2 |
9 files changed, 45 insertions, 43 deletions
diff --git a/doc/src/sgml/brin.sgml b/doc/src/sgml/brin.sgml index c8c3de72e33..57480380096 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. </para> - + <para> The size of the block range is determined at index creation time by the <literal>pages_per_range</> storage parameter. The number of index @@ -65,7 +65,7 @@ <para> The core <productname>PostgreSQL</productname> distribution - includes the <acronym>BRIN</acronym> operator classes shown in + includes the <acronym>BRIN</acronym> operator classes shown in <xref linkend="brin-builtin-opclasses-table">. </para> diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index e900dccb11c..e3dc23bf130 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -2518,7 +2518,7 @@ include_dir 'conf.d' mode. In <literal>always</> mode, all files restored from the archive or streamed with streaming replication will be archived (again). See <xref linkend="continuous-archiving-in-standby"> for details. - </para> + </para> <para> <varname>archive_mode</> and <varname>archive_command</> are separate variables so that <varname>archive_command</> can be diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 1bd72485ac6..452ea6d832d 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -10911,16 +10911,16 @@ table2-mapping </entry> <entry><literal>jsonb_pretty('[{"f1":1,"f2":null},2,null,3]')</literal></entry> <entry> -<programlisting> - [ - { - "f1": 1, - "f2": null - }, - 2, - null, - 3 - ] +<programlisting> +[ + { + "f1": 1, + "f2": null + }, + 2, + null, + 3 +] </programlisting> </entry> </row> diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index fe0a7920cce..7940ef2713a 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); <term><literal>protocol</literal></term> <listitem> <para> - 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 <literal>"SSLv2"</literal>, <literal>"SSLv3"</literal>, + <literal>"TLSv1"</literal>, <literal>"TLSv1.1"</literal> + and <literal>"TLSv1.2"</literal>, but an implementation may return other strings if some other protocol is used. </para> </listitem> @@ -1924,7 +1926,7 @@ const char *PQsslAttribute(const PGconn *conn, const char *attribute_name); <term><literal>cipher</literal></term> <listitem> <para> - A short name of the ciphersuite used, e.g. + A short name of the ciphersuite used, e.g. <literal>"DHE-RSA-DES-CBC3-SHA"</literal>. The names are specific to each SSL implementation. </para> @@ -5149,7 +5151,7 @@ int PQputCopyEnd(PGconn *conn, connections.) </para> - <para> + <para> 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 313cbaea308..b95cc81a09c 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)); <function>gin_leafpage_items</function> returns information about the data stored in a <acronym>GIN</acronym> leaf page. For example: <screen> - 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 bd4ef5cf7ce..c25bc61d9e1 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 ] <replaceable class="parameter">name</replaceable> ON < To drop the policy called <literal>p1</literal> on the table named <literal>my_table</literal>: - <programlisting> - DROP POLICY p1 ON my_table; - </programlisting> +<programlisting> +DROP POLICY p1 ON my_table; +</programlisting> </para> </refsect1> diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml index 7cd4577f1ea..233a48f4804 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: <programlisting> - 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; </programlisting> </para> <para> @@ -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 <literal>did</literal> column: <programlisting> - 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; </programlisting> </para> <para> @@ -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): <programlisting> - -- 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; +-- 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; </programlisting> </para> <para> @@ -664,11 +664,11 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd; <literal>is_active</literal> boolean column evaluates to <literal>true</literal>: <programlisting> - -- 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; </programlisting> </para> </refsect1> diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml index e97fb480f35..072d5f46eb2 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: <programlisting> - 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 </programlisting> where <option>old_pgdata</> and <option>new_pgdata</> are relative diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml index 47512f73dfd..a9267125dbd 100644 --- a/doc/src/sgml/syntax.sgml +++ b/doc/src/sgml/syntax.sgml @@ -2617,7 +2617,7 @@ SELECT concat_lower_or_upper(a => 'Hello', uppercase => true, b => 'World'); <para> An older syntax based on ":=" is supported for backward compatibility: <screen> - SELECT concat_lower_or_upper(a := 'Hello', uppercase := true, b := 'World'); +SELECT concat_lower_or_upper(a := 'Hello', uppercase := true, b := 'World'); concat_lower_or_upper ----------------------- HELLO WORLD |