Commit 90a1d0aa authored by Peter Eisentraut's avatar Peter Eisentraut

doc: Whitespace and formatting fixes

parent a93545e1
...@@ -10912,7 +10912,7 @@ table2-mapping ...@@ -10912,7 +10912,7 @@ table2-mapping
<entry><literal>jsonb_pretty('[{"f1":1,"f2":null},2,null,3]')</literal></entry> <entry><literal>jsonb_pretty('[{"f1":1,"f2":null},2,null,3]')</literal></entry>
<entry> <entry>
<programlisting> <programlisting>
[ [
{ {
"f1": 1, "f1": 1,
"f2": null "f2": null
...@@ -10920,7 +10920,7 @@ table2-mapping ...@@ -10920,7 +10920,7 @@ table2-mapping
2, 2,
null, null,
3 3
] ]
</programlisting> </programlisting>
</entry> </entry>
</row> </row>
......
...@@ -1906,8 +1906,10 @@ const char *PQsslAttribute(const PGconn *conn, const char *attribute_name); ...@@ -1906,8 +1906,10 @@ const char *PQsslAttribute(const PGconn *conn, const char *attribute_name);
<term><literal>protocol</literal></term> <term><literal>protocol</literal></term>
<listitem> <listitem>
<para> <para>
SSL/TLS version in use. Common values are "SSLv2", "SSLv3", SSL/TLS version in use. Common values
"TLSv1", "TLSv1.1" and "TLSv1.2", but an implementation may 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. return other strings if some other protocol is used.
</para> </para>
</listitem> </listitem>
......
...@@ -382,7 +382,7 @@ test=# SELECT * FROM gin_page_opaque_info(get_raw_page('gin_index', 2)); ...@@ -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 <function>gin_leafpage_items</function> returns information about
the data stored in a <acronym>GIN</acronym> leaf page. For example: the data stored in a <acronym>GIN</acronym> leaf page. For example:
<screen> <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)); FROM gin_leafpage_items(get_raw_page('gin_test_idx', 2));
first_tid | nbytes | some_tids first_tid | nbytes | some_tids
-----------+--------+---------------------------------------------------------- -----------+--------+----------------------------------------------------------
......
...@@ -83,9 +83,9 @@ DROP POLICY [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ON < ...@@ -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 To drop the policy called <literal>p1</literal> on the table named
<literal>my_table</literal>: <literal>my_table</literal>:
<programlisting> <programlisting>
DROP POLICY p1 ON my_table; DROP POLICY p1 ON my_table;
</programlisting> </programlisting>
</para> </para>
</refsect1> </refsect1>
......
...@@ -621,7 +621,7 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd; ...@@ -621,7 +621,7 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd;
expression is used to reference values originally proposed for expression is used to reference values originally proposed for
insertion: insertion:
<programlisting> <programlisting>
INSERT INTO distributors (did, dname) INSERT INTO distributors (did, dname)
VALUES (5, 'Gizmo transglobal'), (6, 'Associated Computing, inc') VALUES (5, 'Gizmo transglobal'), (6, 'Associated Computing, inc')
ON CONFLICT (did) DO UPDATE SET dname = EXCLUDED.dname; ON CONFLICT (did) DO UPDATE SET dname = EXCLUDED.dname;
</programlisting> </programlisting>
...@@ -633,7 +633,7 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd; ...@@ -633,7 +633,7 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd;
Example assumes a unique index has been defined that constrains Example assumes a unique index has been defined that constrains
values appearing in the <literal>did</literal> column: values appearing in the <literal>did</literal> column:
<programlisting> <programlisting>
INSERT INTO distributors (did, dname) VALUES (7, 'Redline GmbH') INSERT INTO distributors (did, dname) VALUES (7, 'Redline GmbH')
ON CONFLICT (did) DO NOTHING; ON CONFLICT (did) DO NOTHING;
</programlisting> </programlisting>
</para> </para>
...@@ -644,15 +644,15 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd; ...@@ -644,15 +644,15 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd;
used to limit the rows actually updated (any existing row not used to limit the rows actually updated (any existing row not
updated will still be locked, though): updated will still be locked, though):
<programlisting> <programlisting>
-- Don't update existing distributors based in a certain ZIP code -- Don't update existing distributors based in a certain ZIP code
INSERT INTO distributors AS d (did, dname) VALUES (8, 'Anvil Distribution') INSERT INTO distributors AS d (did, dname) VALUES (8, 'Anvil Distribution')
ON CONFLICT (did) DO UPDATE ON CONFLICT (did) DO UPDATE
SET dname = EXCLUDED.dname || ' (formerly ' || d.dname || ')' SET dname = EXCLUDED.dname || ' (formerly ' || d.dname || ')'
WHERE d.zipcode != '21201'; WHERE d.zipcode &lt;&gt; '21201';
-- Name a constraint directly in the statement (uses associated -- Name a constraint directly in the statement (uses associated
-- index to arbitrate taking the DO NOTHING action) -- index to arbitrate taking the DO NOTHING action)
INSERT INTO distributors (did, dname) VALUES (9, 'Antwerp Design') INSERT INTO distributors (did, dname) VALUES (9, 'Antwerp Design')
ON CONFLICT ON CONSTRAINT distributors_pkey DO NOTHING; ON CONFLICT ON CONSTRAINT distributors_pkey DO NOTHING;
</programlisting> </programlisting>
</para> </para>
...@@ -664,10 +664,10 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd; ...@@ -664,10 +664,10 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd;
<literal>is_active</literal> boolean column evaluates to <literal>is_active</literal> boolean column evaluates to
<literal>true</literal>: <literal>true</literal>:
<programlisting> <programlisting>
-- This statement could infer a partial unique index on "did" -- This statement could infer a partial unique index on "did"
-- with a predicate of "WHERE is_active", but it could also -- with a predicate of "WHERE is_active", but it could also
-- just use a regular unique constraint on "did" -- just use a regular unique constraint on "did"
INSERT INTO distributors (did, dname) VALUES (10, 'Conrad International') INSERT INTO distributors (did, dname) VALUES (10, 'Conrad International')
ON CONFLICT (did) WHERE is_active DO NOTHING; ON CONFLICT (did) WHERE is_active DO NOTHING;
</programlisting> </programlisting>
</para> </para>
......
...@@ -487,7 +487,7 @@ pg_upgrade.exe ...@@ -487,7 +487,7 @@ pg_upgrade.exe
directories, run this for each slave: directories, run this for each slave:
<programlisting> <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> </programlisting>
where <option>old_pgdata</> and <option>new_pgdata</> are relative where <option>old_pgdata</> and <option>new_pgdata</> are relative
......
...@@ -2617,7 +2617,7 @@ SELECT concat_lower_or_upper(a =&gt; 'Hello', uppercase =&gt; true, b =&gt; 'Wor ...@@ -2617,7 +2617,7 @@ SELECT concat_lower_or_upper(a =&gt; 'Hello', uppercase =&gt; true, b =&gt; 'Wor
<para> <para>
An older syntax based on ":=" is supported for backward compatibility: An older syntax based on ":=" is supported for backward compatibility:
<screen> <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 concat_lower_or_upper
----------------------- -----------------------
HELLO WORLD HELLO WORLD
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment