doc: Whitespace and formatting fixes

This commit is contained in:
Peter Eisentraut 2015-08-20 22:34:35 -04:00
parent a93545e13f
commit 90a1d0aa76
9 changed files with 44 additions and 42 deletions

View File

@ -48,7 +48,7 @@
geometrical types might store the bounding box for all the objects geometrical types might store the bounding box for all the objects
in the block range. in the block range.
</para> </para>
<para> <para>
The size of the block range is determined at index creation time by The size of the block range is determined at index creation time by
the <literal>pages_per_range</> storage parameter. The number of index the <literal>pages_per_range</> storage parameter. The number of index
@ -65,7 +65,7 @@
<para> <para>
The core <productname>PostgreSQL</productname> distribution 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">. <xref linkend="brin-builtin-opclasses-table">.
</para> </para>

View File

@ -2518,7 +2518,7 @@ include_dir 'conf.d'
mode. In <literal>always</> mode, all files restored from the archive mode. In <literal>always</> mode, all files restored from the archive
or streamed with streaming replication will be archived (again). See or streamed with streaming replication will be archived (again). See
<xref linkend="continuous-archiving-in-standby"> for details. <xref linkend="continuous-archiving-in-standby"> for details.
</para> </para>
<para> <para>
<varname>archive_mode</> and <varname>archive_command</> are <varname>archive_mode</> and <varname>archive_command</> are
separate variables so that <varname>archive_command</> can be separate variables so that <varname>archive_command</> can be

View File

@ -10911,16 +10911,16 @@ table2-mapping
</entry> </entry>
<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
}, },
2, 2,
null, null,
3 3
] ]
</programlisting> </programlisting>
</entry> </entry>
</row> </row>

View File

@ -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>
@ -1924,7 +1926,7 @@ const char *PQsslAttribute(const PGconn *conn, const char *attribute_name);
<term><literal>cipher</literal></term> <term><literal>cipher</literal></term>
<listitem> <listitem>
<para> <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 <literal>"DHE-RSA-DES-CBC3-SHA"</literal>. The names are specific
to each SSL implementation. to each SSL implementation.
</para> </para>
@ -5149,7 +5151,7 @@ int PQputCopyEnd(PGconn *conn,
connections.) connections.)
</para> </para>
<para> <para>
The result is 1 if the termination message was sent; or in The result is 1 if the termination message was sent; or in
nonblocking mode, this may only indicate that the termination nonblocking mode, this may only indicate that the termination
message was successfully queued. (In nonblocking mode, to be message was successfully queued. (In nonblocking mode, to be

View File

@ -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
-----------+--------+---------------------------------------------------------- -----------+--------+----------------------------------------------------------

View File

@ -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>

View File

@ -621,9 +621,9 @@ 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>
</para> </para>
<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 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>
<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 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>
<para> <para>
@ -664,11 +664,11 @@ 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>
</refsect1> </refsect1>

View File

@ -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

View File

@ -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