diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2011-08-07 10:49:45 +0300 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2011-08-07 10:55:32 +0300 |
| commit | 6ef24487967692604b07a4a54e71821a60fb729a (patch) | |
| tree | 2db96029565f3e89d53159de388035ee8977fb56 /doc/src | |
| parent | 05e83968929f4ec1eba058fcae755fd2df98864e (diff) | |
| download | postgresql-6ef24487967692604b07a4a54e71821a60fb729a.tar.gz postgresql-6ef24487967692604b07a4a54e71821a60fb729a.zip | |
Fix a whitespace issue with the man pages
There is what may actually be a mistake in our markup. The problem is
in a situation like
<para>
<command>FOO</command> is ...
there is strictly speaking a line break before "FOO". In the HTML
output, this does not appear to be a problem, but in the man page
output, this shows up, so you get double blank lines at odd places.
So far, we have attempted to work around this with an XSL hack, but
that causes other problems, such as creating run-ins in places like
<acronym>SQL</acronym> <command>COPY</command>
So fix the problem properly by removing the extra whitespace. I only
fixed the problems that affect the man page output, not all the
places.
Diffstat (limited to 'doc/src')
115 files changed, 194 insertions, 413 deletions
diff --git a/doc/src/sgml/dblink.sgml b/doc/src/sgml/dblink.sgml index 22551402e3d..9f4445b2c4c 100644 --- a/doc/src/sgml/dblink.sgml +++ b/doc/src/sgml/dblink.sgml @@ -76,8 +76,7 @@ dblink_connect(text connname, text connstr) returns text <varlistentry> <term><parameter>connstr</parameter></term> <listitem> - <para> - <application>libpq</>-style connection info string, for example + <para><application>libpq</>-style connection info string, for example <literal>hostaddr=127.0.0.1 port=5432 dbname=mydb user=postgres password=mypasswd</>. For details see <function>PQconnectdb</> in @@ -447,8 +446,7 @@ CREATE VIEW myremote_pg_proc AS AS t1(proname name, prosrc text); SELECT * FROM myremote_pg_proc WHERE proname LIKE 'bytea%'; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/abort.sgml b/doc/src/sgml/ref/abort.sgml index 2bfc724be50..246e8f81268 100644 --- a/doc/src/sgml/ref/abort.sgml +++ b/doc/src/sgml/ref/abort.sgml @@ -75,8 +75,7 @@ ABORT [ WORK | TRANSACTION ] To abort all changes: <programlisting> ABORT; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_aggregate.sgml b/doc/src/sgml/ref/alter_aggregate.sgml index 618c432a794..26c5dc01756 100644 --- a/doc/src/sgml/ref/alter_aggregate.sgml +++ b/doc/src/sgml/ref/alter_aggregate.sgml @@ -125,8 +125,7 @@ ALTER AGGREGATE myavg(integer) OWNER TO joe; <type>integer</type> into schema <literal>myschema</literal>: <programlisting> ALTER AGGREGATE myavg(integer) SET SCHEMA myschema; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_collation.sgml b/doc/src/sgml/ref/alter_collation.sgml index 3aef656a0e9..ebb30b88607 100644 --- a/doc/src/sgml/ref/alter_collation.sgml +++ b/doc/src/sgml/ref/alter_collation.sgml @@ -104,8 +104,7 @@ ALTER COLLATION "de_DE" RENAME TO german; <literal>joe</literal>: <programlisting> ALTER COLLATION "en_US" OWNER TO joe; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_conversion.sgml b/doc/src/sgml/ref/alter_conversion.sgml index 4f2269b8499..4cc335b18e0 100644 --- a/doc/src/sgml/ref/alter_conversion.sgml +++ b/doc/src/sgml/ref/alter_conversion.sgml @@ -104,8 +104,7 @@ ALTER CONVERSION iso_8859_1_to_utf8 RENAME TO latin1_to_unicode; <literal>joe</literal>: <programlisting> ALTER CONVERSION iso_8859_1_to_utf8 OWNER TO joe; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml index 5a975adf5c1..360732fd358 100644 --- a/doc/src/sgml/ref/alter_database.sgml +++ b/doc/src/sgml/ref/alter_database.sgml @@ -190,8 +190,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL <programlisting> ALTER DATABASE test SET enable_indexscan TO off; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_default_privileges.sgml b/doc/src/sgml/ref/alter_default_privileges.sgml index cc4f3636a25..f7b52ef9d1a 100644 --- a/doc/src/sgml/ref/alter_default_privileges.sgml +++ b/doc/src/sgml/ref/alter_default_privileges.sgml @@ -187,8 +187,7 @@ ALTER DEFAULT PRIVILEGES IN SCHEMA myschema REVOKE INSERT ON TABLES FROM webuser <programlisting> ALTER DEFAULT PRIVILEGES FOR ROLE admin REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_domain.sgml b/doc/src/sgml/ref/alter_domain.sgml index cf504c3bcc9..4f60fe334c0 100644 --- a/doc/src/sgml/ref/alter_domain.sgml +++ b/doc/src/sgml/ref/alter_domain.sgml @@ -270,8 +270,7 @@ ALTER DOMAIN zipcode DROP CONSTRAINT zipchk; To move the domain into a different schema: <programlisting> ALTER DOMAIN zipcode SET SCHEMA customers; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="SQL-ALTERDOMAIN-compatibility"> diff --git a/doc/src/sgml/ref/alter_extension.sgml b/doc/src/sgml/ref/alter_extension.sgml index 67e2c3be497..5341f53d06f 100644 --- a/doc/src/sgml/ref/alter_extension.sgml +++ b/doc/src/sgml/ref/alter_extension.sgml @@ -288,8 +288,7 @@ ALTER EXTENSION hstore SET SCHEMA utils; To add an existing function to the <literal>hstore</literal> extension: <programlisting> ALTER EXTENSION hstore ADD FUNCTION populate_record(anyelement, hstore); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="SQL-ALTEREXTENSION-see-also"> diff --git a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml index af56ed7561d..59cf9c65e77 100644 --- a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml +++ b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml @@ -141,8 +141,7 @@ ALTER FOREIGN DATA WRAPPER dbi OPTIONS (ADD foo '1', DROP 'bar'); to <literal>bob.myvalidator</>: <programlisting> ALTER FOREIGN DATA WRAPPER dbi VALIDATOR bob.myvalidator; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_foreign_table.sgml b/doc/src/sgml/ref/alter_foreign_table.sgml index a422c88a4f6..5c7a86fe87f 100644 --- a/doc/src/sgml/ref/alter_foreign_table.sgml +++ b/doc/src/sgml/ref/alter_foreign_table.sgml @@ -288,8 +288,7 @@ ALTER FOREIGN TABLE distributors ALTER COLUMN street SET NOT NULL; To change options of a foreign table: <programlisting> ALTER FOREIGN TABLE myschema.distributors OPTIONS (ADD opt1 'value', SET opt2, 'value2', DROP opt3 'value3'); -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/alter_function.sgml b/doc/src/sgml/ref/alter_function.sgml index 22233af4aad..acb3e4fb93f 100644 --- a/doc/src/sgml/ref/alter_function.sgml +++ b/doc/src/sgml/ref/alter_function.sgml @@ -153,8 +153,7 @@ ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="paramet <term><literal>STRICT</literal></term> <listitem> - <para> - <literal>CALLED ON NULL INPUT</literal> changes the function so + <para><literal>CALLED ON NULL INPUT</literal> changes the function so that it will be invoked when some or all of its arguments are null. <literal>RETURNS NULL ON NULL INPUT</literal> or <literal>STRICT</literal> changes the function so that it is not diff --git a/doc/src/sgml/ref/alter_group.sgml b/doc/src/sgml/ref/alter_group.sgml index 63d42e1e161..177b11d28dd 100644 --- a/doc/src/sgml/ref/alter_group.sgml +++ b/doc/src/sgml/ref/alter_group.sgml @@ -103,9 +103,7 @@ ALTER GROUP staff ADD USER karl, john; <programlisting> ALTER GROUP workers DROP USER beth; -</programlisting> - - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_index.sgml b/doc/src/sgml/ref/alter_index.sgml index 69b8e5d3f8c..c701d165b83 100644 --- a/doc/src/sgml/ref/alter_index.sgml +++ b/doc/src/sgml/ref/alter_index.sgml @@ -190,8 +190,7 @@ ALTER INDEX distributors SET TABLESPACE fasttablespace; <programlisting> ALTER INDEX distributors SET (fillfactor = 75); REINDEX INDEX distributors; -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/alter_operator.sgml b/doc/src/sgml/ref/alter_operator.sgml index a52f9f9cb46..32bde5af7cf 100644 --- a/doc/src/sgml/ref/alter_operator.sgml +++ b/doc/src/sgml/ref/alter_operator.sgml @@ -105,8 +105,7 @@ ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>left_type</repla Change the owner of a custom operator <literal>a @@ b</literal> for type <type>text</type>: <programlisting> ALTER OPERATOR @@ (text, text) OWNER TO joe; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml index adc0273b835..2fbba53d25f 100644 --- a/doc/src/sgml/ref/alter_role.sgml +++ b/doc/src/sgml/ref/alter_role.sgml @@ -289,8 +289,7 @@ ALTER ROLE worker_bee SET maintenance_work_mem = 100000; <programlisting> ALTER ROLE fred IN DATABASE devel SET client_min_messages = DEBUG; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml index 37644d83b10..79795d9db09 100644 --- a/doc/src/sgml/ref/alter_sequence.sgml +++ b/doc/src/sgml/ref/alter_sequence.sgml @@ -282,8 +282,7 @@ ALTER SEQUENCE <replaceable class="parameter">name</replaceable> SET SCHEMA <rep Restart a sequence called <literal>serial</literal>, at 105: <programlisting> ALTER SEQUENCE serial RESTART WITH 105; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_server.sgml b/doc/src/sgml/ref/alter_server.sgml index ab4731a4349..c27b4c06a1c 100644 --- a/doc/src/sgml/ref/alter_server.sgml +++ b/doc/src/sgml/ref/alter_server.sgml @@ -100,8 +100,7 @@ ALTER SERVER foo OPTIONS (host 'foo', dbname 'foodb'); change <literal>host</> option: <programlisting> ALTER SERVER foo VERSION '8.4' OPTIONS (SET host 'baz'); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index 4c2a4cd22ec..0b1e0440d10 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -1041,8 +1041,7 @@ ALTER TABLE myschema.distributors SET SCHEMA yourschema; CREATE UNIQUE INDEX CONCURRENTLY dist_id_temp_idx ON distributors (dist_id); ALTER TABLE distributors DROP CONSTRAINT distributors_pkey, ADD CONSTRAINT distributors_pkey PRIMARY KEY USING INDEX dist_id_temp_idx; -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/alter_tablespace.sgml b/doc/src/sgml/ref/alter_tablespace.sgml index 0cfc26437de..ed04d8437fb 100644 --- a/doc/src/sgml/ref/alter_tablespace.sgml +++ b/doc/src/sgml/ref/alter_tablespace.sgml @@ -111,8 +111,7 @@ ALTER TABLESPACE index_space RENAME TO fast_raid; Change the owner of tablespace <literal>index_space</literal>: <programlisting> ALTER TABLESPACE index_space OWNER TO mary; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml index 2f943ee9c2a..90c2e3d141f 100644 --- a/doc/src/sgml/ref/alter_trigger.sgml +++ b/doc/src/sgml/ref/alter_trigger.sgml @@ -92,8 +92,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable To rename an existing trigger: <programlisting> ALTER TRIGGER emp_stamp ON emp RENAME TO emp_track_chgs; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_type.sgml b/doc/src/sgml/ref/alter_type.sgml index a417c0d01b3..a81fe6c340c 100644 --- a/doc/src/sgml/ref/alter_type.sgml +++ b/doc/src/sgml/ref/alter_type.sgml @@ -313,8 +313,7 @@ ALTER TYPE compfoo ADD ATTRIBUTE f3 int; To add a new value to an enum type in a particular sort position: <programlisting> ALTER TYPE colors ADD VALUE 'orange' AFTER 'red'; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/alter_user_mapping.sgml b/doc/src/sgml/ref/alter_user_mapping.sgml index d18fe361999..3245f83e08d 100644 --- a/doc/src/sgml/ref/alter_user_mapping.sgml +++ b/doc/src/sgml/ref/alter_user_mapping.sgml @@ -92,8 +92,7 @@ ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable> Change the password for user mapping <literal>bob</>, server<literal> foo</>: <programlisting> ALTER USER MAPPING FOR bob SERVER foo OPTIONS (user 'bob', password 'public'); -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgml index 0d509319a36..c3839057c07 100644 --- a/doc/src/sgml/ref/alter_view.sgml +++ b/doc/src/sgml/ref/alter_view.sgml @@ -123,8 +123,7 @@ ALTER VIEW <replaceable class="parameter">name</replaceable> SET SCHEMA <replace <literal>bar</literal>: <programlisting> ALTER VIEW foo RENAME TO bar; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml index 4c6a2b4a2ce..acd823206a4 100644 --- a/doc/src/sgml/ref/begin.sgml +++ b/doc/src/sgml/ref/begin.sgml @@ -122,8 +122,7 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</ <programlisting> BEGIN; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml index 25e3c817ebb..4af6af74922 100644 --- a/doc/src/sgml/ref/close.sgml +++ b/doc/src/sgml/ref/close.sgml @@ -107,8 +107,7 @@ CLOSE { <replaceable class="PARAMETER">name</replaceable> | ALL } Close the cursor <literal>liahona</literal>: <programlisting> CLOSE liahona; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml index addf6520652..339990fa4d6 100644 --- a/doc/src/sgml/ref/cluster.sgml +++ b/doc/src/sgml/ref/cluster.sgml @@ -197,8 +197,7 @@ CLUSTER employees; Cluster all tables in the database that have previously been clustered: <programlisting> CLUSTER; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml index 081f398706d..c80cbac5173 100644 --- a/doc/src/sgml/ref/clusterdb.sgml +++ b/doc/src/sgml/ref/clusterdb.sgml @@ -293,8 +293,7 @@ PostgreSQL documentation <literal>xyzzy</literal>: <screen> <prompt>$ </prompt><userinput>clusterdb --table foo xyzzy</userinput> -</screen> - </para> +</screen></para> </refsect1> diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml index deda01281b1..1c8b37c8328 100644 --- a/doc/src/sgml/ref/comment.sgml +++ b/doc/src/sgml/ref/comment.sgml @@ -296,8 +296,7 @@ COMMENT ON TEXT SEARCH TEMPLATE snowball IS 'Snowball stemmer'; COMMENT ON TRIGGER my_trigger ON my_table IS 'Used for RI'; COMMENT ON TYPE complex IS 'Complex number data type'; COMMENT ON VIEW my_view IS 'View of departmental costs'; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/commit.sgml b/doc/src/sgml/ref/commit.sgml index 1a039c2e3ee..40147a54769 100644 --- a/doc/src/sgml/ref/commit.sgml +++ b/doc/src/sgml/ref/commit.sgml @@ -72,8 +72,7 @@ COMMIT [ WORK | TRANSACTION ] To commit the current transaction and make all changes permanent: <programlisting> COMMIT; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/commit_prepared.sgml b/doc/src/sgml/ref/commit_prepared.sgml index 930435d81a0..2af677fcb06 100644 --- a/doc/src/sgml/ref/commit_prepared.sgml +++ b/doc/src/sgml/ref/commit_prepared.sgml @@ -79,8 +79,7 @@ COMMIT PREPARED <replaceable class="PARAMETER">transaction_id</replaceable> <programlisting> COMMIT PREPARED 'foobar'; -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml index 6429a4ef0d7..a73b02276cb 100644 --- a/doc/src/sgml/ref/copy.sgml +++ b/doc/src/sgml/ref/copy.sgml @@ -703,8 +703,7 @@ only one flag bit is defined, and the rest must be zero: </para> </listitem> </varlistentry> - </variablelist> - </para> + </variablelist></para> </listitem> </varlistentry> @@ -850,8 +849,7 @@ ZW ZIMBABWE 0000140 \0 002 Z M \0 \0 \0 006 Z A M B I A 377 377 0000160 377 377 \0 003 \0 \0 \0 002 Z W \0 \0 \0 \b Z I 0000200 M B A B W E 377 377 377 377 377 377 -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> @@ -910,7 +908,6 @@ COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable> [ WITH O TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT } [ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ] [ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ] -</synopsis> - </para> +</synopsis></para> </refsect1> </refentry> diff --git a/doc/src/sgml/ref/create_conversion.sgml b/doc/src/sgml/ref/create_conversion.sgml index 4a371912226..084b60c4c16 100644 --- a/doc/src/sgml/ref/create_conversion.sgml +++ b/doc/src/sgml/ref/create_conversion.sgml @@ -113,8 +113,7 @@ conv_proc( internal, -- destination (fill with a null terminated C string) integer -- source string length ) RETURNS void; -</programlisting> - </para> +</programlisting></para> </listitem> </varlistentry> </variablelist> @@ -141,8 +140,7 @@ conv_proc( <literal>LATIN1</literal> using <function>myfunc</>: <programlisting> CREATE CONVERSION myconv FOR 'UTF8' TO 'LATIN1' FROM myfunc; -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/create_domain.sgml b/doc/src/sgml/ref/create_domain.sgml index 8db90f911f6..2c8b1f4e748 100644 --- a/doc/src/sgml/ref/create_domain.sgml +++ b/doc/src/sgml/ref/create_domain.sgml @@ -162,8 +162,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea <varlistentry> <term><literal>CHECK (<replaceable class="PARAMETER">expression</replaceable>)</literal></term> <listitem> - <para> - <literal>CHECK</> clauses specify integrity constraints or tests + <para><literal>CHECK</> clauses specify integrity constraints or tests which values of the domain must satisfy. Each constraint must be an expression producing a Boolean result. It should use the key word <literal>VALUE</> @@ -202,8 +201,7 @@ CREATE TABLE us_snail_addy ( city TEXT NOT NULL, postal us_postal_code NOT NULL ); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="SQL-CREATEDOMAIN-compatibility"> diff --git a/doc/src/sgml/ref/create_extension.sgml b/doc/src/sgml/ref/create_extension.sgml index 7670d76f894..9ec0fa2fe16 100644 --- a/doc/src/sgml/ref/create_extension.sgml +++ b/doc/src/sgml/ref/create_extension.sgml @@ -111,8 +111,7 @@ CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name <varlistentry> <term><replaceable class="parameter">old_version</replaceable></term> <listitem> - <para> - <literal>FROM</> <replaceable class="parameter">old_version</> + <para><literal>FROM</> <replaceable class="parameter">old_version</> must be specified when, and only when, you are attempting to install an extension that replaces an <quote>old style</> module that is just a collection of objects not packaged into an extension. This option diff --git a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml index 3093ebcb4ac..804fb47c68f 100644 --- a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml +++ b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml @@ -62,8 +62,7 @@ CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> <varlistentry> <term><literal>HANDLER <replaceable class="parameter">handler_function</replaceable></literal></term> <listitem> - <para> - <replaceable class="parameter">handler_function</replaceable> is the + <para><replaceable class="parameter">handler_function</replaceable> is the name of a previously registered function that will be called to retrieve the execution functions for foreign tables. The handler function must take no arguments, and @@ -81,8 +80,7 @@ CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> <varlistentry> <term><literal>VALIDATOR <replaceable class="parameter">validator_function</replaceable></literal></term> <listitem> - <para> - <replaceable class="parameter">validator_function</replaceable> is the + <para><replaceable class="parameter">validator_function</replaceable> is the name of a previously registered function that will be called to check the generic options given to the foreign-data wrapper, as well as options for foreign servers and user mappings using the @@ -157,8 +155,7 @@ CREATE FOREIGN DATA WRAPPER file HANDLER file_fdw_handler; <programlisting> CREATE FOREIGN DATA WRAPPER mywrapper OPTIONS (debug 'true'); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/create_foreign_table.sgml b/doc/src/sgml/ref/create_foreign_table.sgml index 5e58fb8c5eb..7f1cc4264db 100644 --- a/doc/src/sgml/ref/create_foreign_table.sgml +++ b/doc/src/sgml/ref/create_foreign_table.sgml @@ -169,8 +169,7 @@ CREATE FOREIGN TABLE films ( len interval hour to minute ) SERVER film_server; -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml index cd6ac69eb63..a617f965427 100644 --- a/doc/src/sgml/ref/create_function.sgml +++ b/doc/src/sgml/ref/create_function.sgml @@ -259,8 +259,7 @@ CREATE [ OR REPLACE ] FUNCTION <term><literal>WINDOW</literal></term> <listitem> - <para> - <literal>WINDOW</literal> indicates that the function is a + <para><literal>WINDOW</literal> indicates that the function is a <firstterm>window function</> rather than a plain function. This is currently only useful for functions written in C. The <literal>WINDOW</> attribute cannot be changed when @@ -282,8 +281,7 @@ CREATE [ OR REPLACE ] FUNCTION <literal>VOLATILE</literal> is the default assumption. </para> - <para> - <literal>IMMUTABLE</literal> indicates that the function + <para><literal>IMMUTABLE</literal> indicates that the function cannot modify the database and always returns the same result when given the same argument values; that is, it does not do database lookups or otherwise use information not @@ -292,8 +290,7 @@ CREATE [ OR REPLACE ] FUNCTION immediately replaced with the function value. </para> - <para> - <literal>STABLE</literal> indicates that the function + <para><literal>STABLE</literal> indicates that the function cannot modify the database, and that within a single table scan it will consistently return the same result for the same argument values, but that its @@ -306,8 +303,7 @@ CREATE [ OR REPLACE ] FUNCTION as stable, since their values do not change within a transaction. </para> - <para> - <literal>VOLATILE</literal> indicates that the function value can + <para><literal>VOLATILE</literal> indicates that the function value can change even within a single table scan, so no optimizations can be made. Relatively few database functions are volatile in this sense; some examples are <literal>random()</>, <literal>currval()</>, @@ -329,16 +325,14 @@ CREATE [ OR REPLACE ] FUNCTION <term><literal>STRICT</literal></term> <listitem> - <para> - <literal>CALLED ON NULL INPUT</literal> (the default) indicates + <para><literal>CALLED ON NULL INPUT</literal> (the default) indicates that the function will be called normally when some of its arguments are null. It is then the function author's responsibility to check for null values if necessary and respond appropriately. </para> - <para> - <literal>RETURNS NULL ON NULL INPUT</literal> or + <para><literal>RETURNS NULL ON NULL INPUT</literal> or <literal>STRICT</literal> indicates that the function always returns null whenever any of its arguments are null. If this parameter is specified, the function is not executed when there @@ -353,8 +347,7 @@ CREATE [ OR REPLACE ] FUNCTION <term><literal><optional>EXTERNAL</optional> SECURITY DEFINER</literal></term> <listitem> - <para> - <literal>SECURITY INVOKER</literal> indicates that the function + <para><literal>SECURITY INVOKER</literal> indicates that the function is to be executed with the privileges of the user that calls it. That is the default. <literal>SECURITY DEFINER</literal> specifies that the function is to be executed with the @@ -499,8 +492,7 @@ CREATE [ OR REPLACE ] FUNCTION <varlistentry> <term><literal>isCachable</></term> <listitem> - <para> - <literal>isCachable</literal> is an obsolete equivalent of + <para><literal>isCachable</literal> is an obsolete equivalent of <literal>IMMUTABLE</literal>; it's still accepted for backwards-compatibility reasons. </para> diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml index f7f360875c2..1a1e8d60d75 100644 --- a/doc/src/sgml/ref/create_index.sgml +++ b/doc/src/sgml/ref/create_index.sgml @@ -598,8 +598,7 @@ SELECT * FROM points To create an index without locking out writes to the table: <programlisting> CREATE INDEX CONCURRENTLY sales_quantity_index ON sales_table (quantity); -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml index 13c3baf993c..6e72892375b 100644 --- a/doc/src/sgml/ref/create_language.sgml +++ b/doc/src/sgml/ref/create_language.sgml @@ -118,8 +118,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa <term><literal>TRUSTED</literal></term> <listitem> - <para> - <literal>TRUSTED</literal> specifies that the language does + <para><literal>TRUSTED</literal> specifies that the language does not grant access to data that the user would not otherwise have. If this key word is omitted when registering the language, only users with the @@ -160,8 +159,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa <term><literal>HANDLER</literal> <replaceable class="parameter">call_handler</replaceable></term> <listitem> - <para> - <replaceable class="parameter">call_handler</replaceable> is + <para><replaceable class="parameter">call_handler</replaceable> is the name of a previously registered function that will be called to execute the procedural language's functions. The call handler for a procedural language must be written in a compiled @@ -178,8 +176,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa <term><literal>INLINE</literal> <replaceable class="parameter">inline_handler</replaceable></term> <listitem> - <para> - <replaceable class="parameter">inline_handler</replaceable> is the + <para><replaceable class="parameter">inline_handler</replaceable> is the name of a previously registered function that will be called to execute an anonymous code block (<xref linkend="sql-do"> command) @@ -199,8 +196,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa <term><literal>VALIDATOR</literal> <replaceable class="parameter">valfunction</replaceable></term> <listitem> - <para> - <replaceable class="parameter">valfunction</replaceable> is the + <para><replaceable class="parameter">valfunction</replaceable> is the name of a previously registered function that will be called when a new function in the language is created, to validate the new function. @@ -309,8 +305,7 @@ CREATE FUNCTION plsample_call_handler() RETURNS language_handler LANGUAGE C; CREATE LANGUAGE plsample HANDLER plsample_call_handler; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="sql-createlanguage-compat"> diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml index 90da092450f..28b5e7e0da2 100644 --- a/doc/src/sgml/ref/create_operator.sgml +++ b/doc/src/sgml/ref/create_operator.sgml @@ -52,8 +52,7 @@ CREATE OPERATOR <replaceable>name</replaceable> ( There are a few restrictions on your choice of name: <itemizedlist> <listitem> - <para> - <literal>--</literal> and <literal>/*</literal> cannot appear anywhere in an operator name, + <para><literal>--</literal> and <literal>/*</literal> cannot appear anywhere in an operator name, since they will be taken as the start of a comment. </para> </listitem> @@ -215,8 +214,7 @@ CREATE OPERATOR <replaceable>name</replaceable> ( arguments, use the <literal>OPERATOR()</> syntax, for example: <programlisting> COMMUTATOR = OPERATOR(myschema.===) , -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> @@ -266,8 +264,7 @@ CREATE OPERATOR === ( JOIN = area_join_procedure, HASHES, MERGES ); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml index 43bec5d8e13..5a939346e7a 100644 --- a/doc/src/sgml/ref/create_role.sgml +++ b/doc/src/sgml/ref/create_role.sgml @@ -268,8 +268,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac <varlistentry> <term><literal>IN GROUP</> <replaceable class="parameter">role_name</replaceable></term> <listitem> - <para> - <literal>IN GROUP</literal> is an obsolete spelling of + <para><literal>IN GROUP</literal> is an obsolete spelling of <literal>IN ROLE</>. </para> </listitem> @@ -438,8 +437,7 @@ CREATE ROLE miriam WITH LOGIN PASSWORD 'jw8s0F4' VALID UNTIL '2005-01-01'; Create a role that can create databases and manage roles: <programlisting> CREATE ROLE admin WITH CREATEDB CREATEROLE; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml index e7c88497d60..8bccf7f1f12 100644 --- a/doc/src/sgml/ref/create_rule.sgml +++ b/doc/src/sgml/ref/create_rule.sgml @@ -149,8 +149,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <varlistentry> <term><option>INSTEAD</option></term> <listitem> - <para> - <literal>INSTEAD</literal> indicates that the commands should be + <para><literal>INSTEAD</literal> indicates that the commands should be executed <emphasis>instead of</> the original command. </para> </listitem> @@ -159,8 +158,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS <varlistentry> <term><option>ALSO</option></term> <listitem> - <para> - <literal>ALSO</literal> indicates that the commands should be + <para><literal>ALSO</literal> indicates that the commands should be executed <emphasis>in addition to</emphasis> the original command. </para> diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml index 89a624eda26..930d876814d 100644 --- a/doc/src/sgml/ref/create_schema.sgml +++ b/doc/src/sgml/ref/create_schema.sgml @@ -147,8 +147,7 @@ CREATE SCHEMA hollywood; CREATE TABLE hollywood.films (title text, release date, awards text[]); CREATE VIEW hollywood.winners AS SELECT title, release FROM hollywood.films WHERE awards IS NOT NULL; -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml index f36b616db0e..367f440b6cb 100644 --- a/doc/src/sgml/ref/create_sequence.sgml +++ b/doc/src/sgml/ref/create_sequence.sgml @@ -318,8 +318,7 @@ BEGIN; COPY distributors FROM 'input_file'; SELECT setval('serial', max(id)) FROM distributors; END; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> @@ -348,8 +347,7 @@ END; extension. </para> </listitem> - </itemizedlist> - </para> + </itemizedlist></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/create_server.sgml b/doc/src/sgml/ref/create_server.sgml index f923dc84c89..be9be50b69c 100644 --- a/doc/src/sgml/ref/create_server.sgml +++ b/doc/src/sgml/ref/create_server.sgml @@ -136,8 +136,7 @@ CREATE SERVER foo FOREIGN DATA WRAPPER "default"; foreign-data wrapper <literal>pgsql</>: <programlisting> CREATE SERVER myserver FOREIGN DATA WRAPPER pgsql OPTIONS (host 'foo', dbname 'foodb', port '5432'); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index 0fbe1160972..faff45900c4 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -288,8 +288,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI error will be reported. </para> - <para> - <literal>CHECK</> constraints are merged in essentially the same way as + <para><literal>CHECK</> constraints are merged in essentially the same way as columns: if multiple parent tables and/or the new table definition contain identically-named <literal>CHECK</> constraints, these constraints must all have the same check expression, or an error will be @@ -340,8 +339,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI table, unless the <literal>INCLUDING INDEXES</literal> clause is specified. </para> - <para> - <literal>STORAGE</> settings for the copied column definitions will only + <para><literal>STORAGE</> settings for the copied column definitions will only be copied if <literal>INCLUDING STORAGE</literal> is specified. The default behavior is to exclude <literal>STORAGE</> settings, resulting in the copied columns in the new table having type-specific default @@ -354,8 +352,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI is specified. The default behavior is to exclude comments, resulting in the copied columns and constraints in the new table having no comments. </para> - <para> - <literal>INCLUDING ALL</literal> is an abbreviated form of + <para><literal>INCLUDING ALL</literal> is an abbreviated form of <literal>INCLUDING DEFAULTS INCLUDING CONSTRAINTS INCLUDING INDEXES INCLUDING STORAGE INCLUDING COMMENTS</literal>. </para> <para> @@ -798,8 +795,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI </para> </listitem> </varlistentry> - </variablelist> - </para> + </variablelist></para> </listitem> </varlistentry> @@ -1061,9 +1057,7 @@ CREATE TABLE films ( kind varchar(10), len interval hour to minute ); -</programlisting> -<programlisting> CREATE TABLE distributors ( did integer PRIMARY KEY DEFAULT nextval('serial'), name varchar(40) NOT NULL CHECK (name <> '') @@ -1151,9 +1145,7 @@ CREATE TABLE distributors ( name varchar(40), PRIMARY KEY(did) ); -</programlisting> -<programlisting> CREATE TABLE distributors ( did integer PRIMARY KEY, name varchar(40) @@ -1259,8 +1251,7 @@ CREATE TABLE employees OF employee_type ( PRIMARY KEY (name), salary WITH OPTIONS DEFAULT 1000 ); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="SQL-CREATETABLE-compatibility"> diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml index ff71078d1e2..e4797b65473 100644 --- a/doc/src/sgml/ref/create_table_as.sgml +++ b/doc/src/sgml/ref/create_table_as.sgml @@ -183,8 +183,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE <replaceable </para> </listitem> </varlistentry> - </variablelist> - </para> + </variablelist></para> </listitem> </varlistentry> @@ -291,8 +290,7 @@ PREPARE recentfilms(date) AS SELECT * FROM films WHERE date_prod > $1; CREATE TEMP TABLE films_recent WITH (OIDS) ON COMMIT DROP AS EXECUTE recentfilms('2002-01-01'); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> @@ -319,8 +317,7 @@ CREATE TEMP TABLE films_recent WITH (OIDS) ON COMMIT DROP AS </listitem> <listitem> - <para> - <productname>PostgreSQL</> handles temporary tables in a way + <para><productname>PostgreSQL</> handles temporary tables in a way rather different from the standard; see <xref linkend="sql-createtable"> for details. @@ -341,8 +338,7 @@ CREATE TEMP TABLE films_recent WITH (OIDS) ON COMMIT DROP AS is an extension. </para> </listitem> - </itemizedlist> - </para> + </itemizedlist></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/create_tablespace.sgml b/doc/src/sgml/ref/create_tablespace.sgml index beda4540c81..89c89072aed 100644 --- a/doc/src/sgml/ref/create_tablespace.sgml +++ b/doc/src/sgml/ref/create_tablespace.sgml @@ -118,8 +118,7 @@ CREATE TABLESPACE dbspace LOCATION '/data/dbs'; owned by user <literal>genevieve</>: <programlisting> CREATE TABLESPACE indexspace OWNER genevieve LOCATION '/data/indexes'; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml index 8e502d94e48..a7915cf09f4 100644 --- a/doc/src/sgml/ref/create_trigger.sgml +++ b/doc/src/sgml/ref/create_trigger.sgml @@ -235,8 +235,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</ is mentioned as a target of the <command>UPDATE</> command. </para> - <para> - <literal>INSTEAD OF UPDATE</> events do not support lists of columns. + <para><literal>INSTEAD OF UPDATE</> events do not support lists of columns. </para> </listitem> </varlistentry> @@ -311,8 +310,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</ and <literal>DELETE</> triggers cannot refer to <literal>NEW</>. </para> - <para> - <literal>INSTEAD OF</> triggers do not support <literal>WHEN</> + <para><literal>INSTEAD OF</> triggers do not support <literal>WHEN</> conditions. </para> @@ -502,8 +500,7 @@ CREATE TRIGGER view_insert </listitem> <listitem> - <para> - <productname>PostgreSQL</productname> only allows the execution + <para><productname>PostgreSQL</productname> only allows the execution of a user-defined function for the triggered action. The standard allows the execution of a number of other SQL commands, such as <command>CREATE TABLE</command>, as the triggered action. This diff --git a/doc/src/sgml/ref/create_user_mapping.sgml b/doc/src/sgml/ref/create_user_mapping.sgml index c9606280fb8..c7cc4ce5746 100644 --- a/doc/src/sgml/ref/create_user_mapping.sgml +++ b/doc/src/sgml/ref/create_user_mapping.sgml @@ -94,8 +94,7 @@ CREATE USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable> Create a user mapping for user <literal>bob</>, server <literal>foo</>: <programlisting> CREATE USER MAPPING FOR bob SERVER foo OPTIONS (user 'bob', password 'secret'); -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml index 9c8171d0499..3e50173e22a 100644 --- a/doc/src/sgml/ref/createdb.sgml +++ b/doc/src/sgml/ref/createdb.sgml @@ -352,8 +352,7 @@ PostgreSQL documentation <screen> <prompt>$ </prompt><userinput>createdb -p 5000 -h eden -E LATIN1 -e demo</userinput> <computeroutput>CREATE DATABASE demo ENCODING 'LATIN1';</computeroutput> -</screen> - </para> +</screen></para> </refsect1> diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml index f2b75b7aca5..d500faaa743 100644 --- a/doc/src/sgml/ref/declare.sgml +++ b/doc/src/sgml/ref/declare.sgml @@ -91,8 +91,7 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI <term><literal>SCROLL</literal></term> <term><literal>NO SCROLL</literal></term> <listitem> - <para> - <literal>SCROLL</literal> specifies that the cursor can be used + <para><literal>SCROLL</literal> specifies that the cursor can be used to retrieve rows in a nonsequential fashion (e.g., backward). Depending upon the complexity of the query's execution plan, specifying <literal>SCROLL</literal> might impose @@ -110,8 +109,7 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI <term><literal>WITH HOLD</literal></term> <term><literal>WITHOUT HOLD</literal></term> <listitem> - <para> - <literal>WITH HOLD</literal> specifies that the cursor can + <para><literal>WITH HOLD</literal> specifies that the cursor can continue to be used after the transaction that created it successfully commits. <literal>WITHOUT HOLD</literal> specifies that the cursor cannot be used outside of the transaction that diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml index 9406f4e3af0..71ebeda880a 100644 --- a/doc/src/sgml/ref/delete.sgml +++ b/doc/src/sgml/ref/delete.sgml @@ -275,8 +275,7 @@ DELETE FROM tasks WHERE status = 'DONE' RETURNING *; <literal>c_tasks</> is currently positioned: <programlisting> DELETE FROM tasks WHERE CURRENT OF c_tasks; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/discard.sgml b/doc/src/sgml/ref/discard.sgml index 74a2ce3b4ee..65ebbae1385 100644 --- a/doc/src/sgml/ref/discard.sgml +++ b/doc/src/sgml/ref/discard.sgml @@ -83,8 +83,7 @@ UNLISTEN *; SELECT pg_advisory_unlock_all(); DISCARD PLANS; DISCARD TEMP; -</programlisting> - </para> +</programlisting></para> </listitem> </varlistentry> diff --git a/doc/src/sgml/ref/do.sgml b/doc/src/sgml/ref/do.sgml index 47f144f7954..5f43d1cf52c 100644 --- a/doc/src/sgml/ref/do.sgml +++ b/doc/src/sgml/ref/do.sgml @@ -107,9 +107,9 @@ BEGIN EXECUTE 'GRANT ALL ON ' || quote_ident(r.table_schema) || '.' || quote_ident(r.table_name) || ' TO webuser'; END LOOP; END$$; -</programlisting> - </para> +</programlisting></para> </refsect1> + <refsect1> <title>Compatibility</title> diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml index 400b4d70eb3..dd8aafa74db 100644 --- a/doc/src/sgml/ref/drop_aggregate.sgml +++ b/doc/src/sgml/ref/drop_aggregate.sgml @@ -99,8 +99,7 @@ DROP AGGREGATE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ( <type>integer</type>: <programlisting> DROP AGGREGATE myavg(integer); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_cast.sgml b/doc/src/sgml/ref/drop_cast.sgml index 139e89dacaf..589c6ac39b3 100644 --- a/doc/src/sgml/ref/drop_cast.sgml +++ b/doc/src/sgml/ref/drop_cast.sgml @@ -92,8 +92,7 @@ DROP CAST [ IF EXISTS ] (<replaceable>source_type</replaceable> AS <replaceable> To drop the cast from type <type>text</type> to type <type>int</type>: <programlisting> DROP CAST (text AS int); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="sql-dropcast-compat"> diff --git a/doc/src/sgml/ref/drop_collation.sgml b/doc/src/sgml/ref/drop_collation.sgml index 0afcaaf2dee..64a48eec2b0 100644 --- a/doc/src/sgml/ref/drop_collation.sgml +++ b/doc/src/sgml/ref/drop_collation.sgml @@ -84,8 +84,7 @@ DROP COLLATION [ IF EXISTS ] <replaceable>name</replaceable> [ CASCADE | RESTRIC To drop the collation named <literal>german</>: <programlisting> DROP COLLATION german; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="sql-dropcollation-compat"> diff --git a/doc/src/sgml/ref/drop_conversion.sgml b/doc/src/sgml/ref/drop_conversion.sgml index 79e159dcbd1..6f866438fbb 100644 --- a/doc/src/sgml/ref/drop_conversion.sgml +++ b/doc/src/sgml/ref/drop_conversion.sgml @@ -77,8 +77,7 @@ DROP CONVERSION [ IF EXISTS ] <replaceable>name</replaceable> [ CASCADE | RESTRI To drop the conversion named <literal>myname</>: <programlisting> DROP CONVERSION myname; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="sql-dropconversion-compat"> diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml index 689633f6dd6..b7b9a167c11 100644 --- a/doc/src/sgml/ref/drop_domain.sgml +++ b/doc/src/sgml/ref/drop_domain.sgml @@ -87,8 +87,7 @@ DROP DOMAIN [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, . <programlisting> DROP DOMAIN box; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="SQL-DROPDOMAIN-compatibility"> diff --git a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml index 0ac0722f3d5..18fa4fe4a57 100644 --- a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml +++ b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml @@ -87,8 +87,7 @@ DROP FOREIGN DATA WRAPPER [ IF EXISTS ] <replaceable class="parameter">name</rep Drop the foreign-data wrapper <literal>dbi</>: <programlisting> DROP FOREIGN DATA WRAPPER dbi; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_foreign_table.sgml b/doc/src/sgml/ref/drop_foreign_table.sgml index 71f26465bb6..9a9624b1873 100644 --- a/doc/src/sgml/ref/drop_foreign_table.sgml +++ b/doc/src/sgml/ref/drop_foreign_table.sgml @@ -85,8 +85,7 @@ DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceabl <programlisting> DROP FOREIGN TABLE films, distributors; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml index a26b4ff66cf..2d0048be288 100644 --- a/doc/src/sgml/ref/drop_function.sgml +++ b/doc/src/sgml/ref/drop_function.sgml @@ -132,8 +132,7 @@ DROP FUNCTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ( <programlisting> DROP FUNCTION sqrt(integer); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="SQL-DROPFUNCTION-compatibility"> diff --git a/doc/src/sgml/ref/drop_index.sgml b/doc/src/sgml/ref/drop_index.sgml index fb4ce2bf9cd..7177ef2d81b 100644 --- a/doc/src/sgml/ref/drop_index.sgml +++ b/doc/src/sgml/ref/drop_index.sgml @@ -87,8 +87,7 @@ DROP INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .. <programlisting> DROP INDEX title_idx; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml index 21c9e5aced6..c2cb7045ded 100644 --- a/doc/src/sgml/ref/drop_language.sgml +++ b/doc/src/sgml/ref/drop_language.sgml @@ -100,8 +100,7 @@ DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</ <programlisting> DROP LANGUAGE plsample; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml index aa227ab8d87..3091454fdc5 100644 --- a/doc/src/sgml/ref/drop_operator.sgml +++ b/doc/src/sgml/ref/drop_operator.sgml @@ -123,8 +123,7 @@ DROP OPERATOR ~ (none, bit); for type <type>bigint</type>: <programlisting> DROP OPERATOR ! (bigint, none); -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_role.sgml b/doc/src/sgml/ref/drop_role.sgml index a3a999437c2..92c0fb863dd 100644 --- a/doc/src/sgml/ref/drop_role.sgml +++ b/doc/src/sgml/ref/drop_role.sgml @@ -96,8 +96,7 @@ DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ... To drop a role: <programlisting> DROP ROLE jonathan; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml index fd24c701272..b7ff6e6078e 100644 --- a/doc/src/sgml/ref/drop_rule.sgml +++ b/doc/src/sgml/ref/drop_rule.sgml @@ -96,8 +96,7 @@ DROP RULE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <re <programlisting> DROP RULE newrule ON mytable; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_schema.sgml b/doc/src/sgml/ref/drop_schema.sgml index 50fb09b965d..15dbc40817a 100644 --- a/doc/src/sgml/ref/drop_schema.sgml +++ b/doc/src/sgml/ref/drop_schema.sgml @@ -93,8 +93,7 @@ DROP SCHEMA [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, . <programlisting> DROP SCHEMA mystuff CASCADE; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml index 84a8ca188b3..f810b5976c1 100644 --- a/doc/src/sgml/ref/drop_sequence.sgml +++ b/doc/src/sgml/ref/drop_sequence.sgml @@ -86,8 +86,7 @@ DROP SEQUENCE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, <programlisting> DROP SEQUENCE serial; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_server.sgml b/doc/src/sgml/ref/drop_server.sgml index af08655a1d7..6a64e83ebe6 100644 --- a/doc/src/sgml/ref/drop_server.sgml +++ b/doc/src/sgml/ref/drop_server.sgml @@ -87,8 +87,7 @@ DROP SERVER [ IF EXISTS ] <replaceable class="parameter">server_name</replaceabl Drop a server <literal>foo</> if it exists: <programlisting> DROP SERVER IF EXISTS foo; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_table.sgml b/doc/src/sgml/ref/drop_table.sgml index 7fa7e32ee07..26fe76e1f8d 100644 --- a/doc/src/sgml/ref/drop_table.sgml +++ b/doc/src/sgml/ref/drop_table.sgml @@ -100,8 +100,7 @@ DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .. <programlisting> DROP TABLE films, distributors; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_tablespace.sgml b/doc/src/sgml/ref/drop_tablespace.sgml index aa80be3c6f5..107e049c8c6 100644 --- a/doc/src/sgml/ref/drop_tablespace.sgml +++ b/doc/src/sgml/ref/drop_tablespace.sgml @@ -86,8 +86,7 @@ DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">tablespace_name</re To remove tablespace <literal>mystuff</literal> from the system: <programlisting> DROP TABLESPACE mystuff; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_trigger.sgml b/doc/src/sgml/ref/drop_trigger.sgml index 444c928d1ec..2fcc690db73 100644 --- a/doc/src/sgml/ref/drop_trigger.sgml +++ b/doc/src/sgml/ref/drop_trigger.sgml @@ -99,8 +99,7 @@ DROP TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <programlisting> DROP TRIGGER if_dist_exists ON films; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="SQL-DROPTRIGGER-compatibility"> diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml index 9de13068a7e..c3ddfa5f425 100644 --- a/doc/src/sgml/ref/drop_type.sgml +++ b/doc/src/sgml/ref/drop_type.sgml @@ -86,8 +86,7 @@ DROP TYPE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ... To remove the data type <type>box</type>: <programlisting> DROP TYPE box; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="SQL-DROPTYPE-compatibility"> diff --git a/doc/src/sgml/ref/drop_user_mapping.sgml b/doc/src/sgml/ref/drop_user_mapping.sgml index 747d7cbd2e7..de21bfe5d7a 100644 --- a/doc/src/sgml/ref/drop_user_mapping.sgml +++ b/doc/src/sgml/ref/drop_user_mapping.sgml @@ -85,8 +85,7 @@ DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">user_name</ Drop a user mapping <literal>bob</>, server <literal>foo</> if it exists: <programlisting> DROP USER MAPPING IF EXISTS FOR bob SERVER foo; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml index 5d7e413c0b7..51b82664cb3 100644 --- a/doc/src/sgml/ref/drop_view.sgml +++ b/doc/src/sgml/ref/drop_view.sgml @@ -86,8 +86,7 @@ DROP VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ... This command will remove the view called <literal>kinds</literal>: <programlisting> DROP VIEW kinds; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml index 1aa76cdb57b..e20bcdb53f4 100644 --- a/doc/src/sgml/ref/dropdb.sgml +++ b/doc/src/sgml/ref/dropdb.sgml @@ -253,8 +253,7 @@ PostgreSQL documentation <computeroutput>Database "demo" will be permanently deleted. Are you sure? (y/n) </computeroutput><userinput>y</userinput> <computeroutput>DROP DATABASE demo;</computeroutput> -</screen> - </para> +</screen></para> </refsect1> diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml index 0ad640b0b47..04c3a609e5d 100644 --- a/doc/src/sgml/ref/droplang.sgml +++ b/doc/src/sgml/ref/droplang.sgml @@ -271,8 +271,7 @@ PostgreSQL documentation To remove the language <literal>pltcl</literal>: <screen> <prompt>$ </prompt><userinput>droplang pltcl dbname</userinput> -</screen> - </para> +</screen></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml index 3089a219543..c158103913c 100644 --- a/doc/src/sgml/ref/dropuser.sgml +++ b/doc/src/sgml/ref/dropuser.sgml @@ -254,8 +254,7 @@ PostgreSQL documentation <computeroutput>Role "joe" will be permanently removed. Are you sure? (y/n) </computeroutput><userinput>y</userinput> <computeroutput>DROP ROLE joe;</computeroutput> -</screen> - </para> +</screen></para> </refsect1> diff --git a/doc/src/sgml/ref/ecpg-ref.sgml b/doc/src/sgml/ref/ecpg-ref.sgml index 2bbd4761585..9c13e93a271 100644 --- a/doc/src/sgml/ref/ecpg-ref.sgml +++ b/doc/src/sgml/ref/ecpg-ref.sgml @@ -166,8 +166,7 @@ PostgreSQL documentation </para> </listitem> </varlistentry> - </variablelist> - </para> + </variablelist></para> </listitem> </varlistentry> @@ -253,8 +252,7 @@ PostgreSQL documentation ecpg prog1.pgc cc -I/usr/local/pgsql/include -c prog1.c cc -o prog1 prog1.o -L/usr/local/pgsql/lib -lecpg -</programlisting> - </para> +</programlisting></para> </refsect1> </refentry> diff --git a/doc/src/sgml/ref/end.sgml b/doc/src/sgml/ref/end.sgml index 85248b4c2f5..b60cb2c48bd 100644 --- a/doc/src/sgml/ref/end.sgml +++ b/doc/src/sgml/ref/end.sgml @@ -74,8 +74,7 @@ END [ WORK | TRANSACTION ] To commit the current transaction and make all changes permanent: <programlisting> END; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml index b78fed267b9..cc49b6f0ce6 100644 --- a/doc/src/sgml/ref/fetch.sgml +++ b/doc/src/sgml/ref/fetch.sgml @@ -111,8 +111,7 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] < <varlistentry> <term><replaceable class="PARAMETER">direction</replaceable></term> <listitem> - <para> - <replaceable class="PARAMETER">direction</replaceable> defines + <para><replaceable class="PARAMETER">direction</replaceable> defines the fetch direction and number of rows to fetch. It can be one of the following: @@ -266,16 +265,14 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] < </para> </listitem> </varlistentry> - </variablelist> - </para> + </variablelist></para> </listitem> </varlistentry> <varlistentry> <term><replaceable class="PARAMETER">count</replaceable></term> <listitem> - <para> - <replaceable class="PARAMETER">count</replaceable> is a + <para><replaceable class="PARAMETER">count</replaceable> is a possibly-signed integer constant, determining the location or number of rows to fetch. For <literal>FORWARD</> and <literal>BACKWARD</> cases, specifying a negative <replaceable @@ -378,8 +375,7 @@ FETCH PRIOR FROM liahona; -- Close the cursor and end the transaction: CLOSE liahona; COMMIT WORK; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index 1f5fe1f41fd..1437861441e 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -587,8 +587,7 @@ GRANT ALL PRIVILEGES ON kinds TO manuel; <programlisting> GRANT admins TO joe; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="sql-grant-compatibility"> diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml index a5c0d5a0a68..6aae3396d29 100644 --- a/doc/src/sgml/ref/insert.sgml +++ b/doc/src/sgml/ref/insert.sgml @@ -312,8 +312,7 @@ WITH upd AS ( RETURNING * ) INSERT INTO employees_log SELECT *, current_timestamp FROM upd; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/listen.sgml b/doc/src/sgml/ref/listen.sgml index 98091c2856a..7287d3fc296 100644 --- a/doc/src/sgml/ref/listen.sgml +++ b/doc/src/sgml/ref/listen.sgml @@ -113,8 +113,7 @@ LISTEN <replaceable class="PARAMETER">channel</replaceable> LISTEN virtual; NOTIFY virtual; Asynchronous notification "virtual" received from server process with PID 8448. -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml index 9b464580aae..53014ed34f5 100644 --- a/doc/src/sgml/ref/lock.sgml +++ b/doc/src/sgml/ref/lock.sgml @@ -222,8 +222,7 @@ DELETE FROM films_user_comments WHERE id IN (SELECT id FROM films WHERE rating < 5); DELETE FROM films WHERE rating < 5; COMMIT WORK; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/notify.sgml b/doc/src/sgml/ref/notify.sgml index 330b2cd56d2..44807062930 100644 --- a/doc/src/sgml/ref/notify.sgml +++ b/doc/src/sgml/ref/notify.sgml @@ -204,8 +204,7 @@ Asynchronous notification "virtual" with payload "This is the payload" received LISTEN foo; SELECT pg_notify('fo' || 'o', 'pay' || 'load'); Asynchronous notification "foo" with payload "payload" received from server process with PID 14728. -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml index 47dce43b194..4150f2a4088 100644 --- a/doc/src/sgml/ref/pg_basebackup.sgml +++ b/doc/src/sgml/ref/pg_basebackup.sgml @@ -138,8 +138,7 @@ PostgreSQL documentation </para> </listitem> </varlistentry> - </variablelist> - </para> + </variablelist></para> </listitem> </varlistentry> diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml index 10105e25241..07836e718f7 100644 --- a/doc/src/sgml/ref/pg_ctl-ref.sgml +++ b/doc/src/sgml/ref/pg_ctl-ref.sgml @@ -519,8 +519,7 @@ PostgreSQL documentation running without <function>fsync</function>, use: <screen> <prompt>$</prompt> <userinput>pg_ctl -o "-F -p 5433" start</userinput> -</screen> - </para> +</screen></para> </refsect2> <refsect2 id="R2-APP-PGCTL-4"> @@ -534,8 +533,7 @@ PostgreSQL documentation <emphasis>how</emphasis> the server shuts down: <screen> <prompt>$</prompt> <userinput>pg_ctl stop -m fast</userinput> -</screen> - </para> +</screen></para> </refsect2> <refsect2 id="R2-APP-PGCTL-5"> @@ -564,8 +562,7 @@ PostgreSQL documentation To restart using port 5433, disabling <function>fsync</> upon restart: <screen> <prompt>$</prompt> <userinput>pg_ctl -o "-F -p 5433" restart</userinput> -</screen> - </para> +</screen></para> </refsect2> <refsect2 id="R2-APP-PGCTL-6"> diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml index c24cc394d66..f6f33de7e7e 100644 --- a/doc/src/sgml/ref/pg_dump.sgml +++ b/doc/src/sgml/ref/pg_dump.sgml @@ -268,10 +268,7 @@ PostgreSQL documentation </para> </listitem> </varlistentry> - - </variablelist> - </para> - + </variablelist></para> </listitem> </varlistentry> @@ -1075,8 +1072,7 @@ CREATE DATABASE foo WITH TEMPLATE template0; <screen> <prompt>$</prompt> <userinput>pg_dump -t '"MixedCaseName"' mydb > mytab.sql</userinput> -</screen> - </para> +</screen></para> </refsect1> diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml index be4851b6570..be11d176cd4 100644 --- a/doc/src/sgml/ref/pg_restore.sgml +++ b/doc/src/sgml/ref/pg_restore.sgml @@ -197,8 +197,7 @@ </para> </listitem> </varlistentry> - </variablelist> - </para> + </variablelist></para> </listitem> </varlistentry> @@ -286,8 +285,7 @@ if filtering switches such as <option>-n</> or <option>-t</> are used with <option>-L</>, they will further restrict the items restored. </para> - <para> - <replaceable class="PARAMETER">list-file</> is normally created by + <para><replaceable class="PARAMETER">list-file</> is normally created by editing the output of a previous <option>-l</> operation. Lines can be moved or removed, and can also be commented out by placing a semicolon (<literal>;</literal>) at the @@ -707,8 +705,7 @@ CREATE DATABASE foo WITH TEMPLATE template0; </listitem> <listitem> - <para> - <application>pg_restore</application> cannot restore large objects + <para><application>pg_restore</application> cannot restore large objects selectively; for instance, only those for a specific table. If an archive contains large objects, then all large objects will be restored, or none of them if they are excluded via <option>-L</option>, @@ -821,8 +818,7 @@ CREATE DATABASE foo WITH TEMPLATE template0; items 10 and 6, in that order: <screen> <prompt>$</prompt> <userinput>pg_restore -L db.list db.dump</userinput> -</screen> - </para> +</screen></para> </refsect1> diff --git a/doc/src/sgml/ref/prepare_transaction.sgml b/doc/src/sgml/ref/prepare_transaction.sgml index 261cedc8d9c..a10aa35d386 100644 --- a/doc/src/sgml/ref/prepare_transaction.sgml +++ b/doc/src/sgml/ref/prepare_transaction.sgml @@ -153,8 +153,7 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable> <programlisting> PREPARE TRANSACTION 'foobar'; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 98cb6bd24fb..e2e2abe4d39 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -83,8 +83,7 @@ PostgreSQL documentation (<filename>psqlrc</filename> and <filename>~/.psqlrc</filename>) are ignored with this option. </para> - <para> - <replaceable class="parameter">command</replaceable> must be either + <para><replaceable class="parameter">command</replaceable> must be either a command string that is completely parsable by the server (i.e., it contains no <application>psql</application>-specific features), or a single backslash command. Thus you cannot mix @@ -839,8 +838,7 @@ testdb=> backslash escapes do not apply. </para> - <para> - <literal>\copy ... from stdin | to stdout</literal> + <para><literal>\copy ... from stdin | to stdout</literal> reads/writes based on the command input and output respectively. All rows are read from the same source that issued the command, continuing until <literal>\.</literal> is read or the stream @@ -1759,8 +1757,7 @@ lo_import 152801 specified, the query output will be reset to the standard output. </para> - <para> - <quote>Query results</quote> includes all tables, command + <para><quote>Query results</quote> includes all tables, command responses, and notices obtained from the database server, as well as output of various backslash commands that query the database (such as <command>\d</command>), but not error @@ -1928,21 +1925,18 @@ lo_import 152801 is enough.) </para> - <para> - <literal>unaligned</> format writes all columns of a row on one + <para><literal>unaligned</> format writes all columns of a row on one line, separated by the currently active field separator. This is useful for creating output that might be intended to be read in by other programs (for example, tab-separated or comma-separated format). </para> - <para> - <literal>aligned</literal> format is the standard, human-readable, + <para><literal>aligned</literal> format is the standard, human-readable, nicely formatted text output; this is the default. </para> - <para> - <literal>wrapped</> format is like <literal>aligned</> but wraps + <para><literal>wrapped</> format is like <literal>aligned</> but wraps wide data values across lines to make the output fit in the target column width. The target width is determined as described under the <literal>columns</> option. Note that <application>psql</> will @@ -1976,8 +1970,7 @@ lo_import 152801 <literal>wrapped</> output formats. </para> - <para> - <literal>ascii</literal> style uses plain <acronym>ASCII</acronym> + <para><literal>ascii</literal> style uses plain <acronym>ASCII</acronym> characters. Newlines in data are shown using a <literal>+</literal> symbol in the right-hand margin. When the <literal>wrapped</literal> format wraps data from @@ -1986,8 +1979,7 @@ lo_import 152801 and again in the left-hand margin of the following line. </para> - <para> - <literal>old-ascii</literal> style uses plain <acronym>ASCII</> + <para><literal>old-ascii</literal> style uses plain <acronym>ASCII</> characters, using the formatting style used in <productname>PostgreSQL</productname> 8.4 and earlier. Newlines in data are shown using a <literal>:</literal> @@ -1997,8 +1989,7 @@ lo_import 152801 symbol is used in place of the left-hand column separator. </para> - <para> - <literal>unicode</literal> style uses Unicode box-drawing characters. + <para><literal>unicode</literal> style uses Unicode box-drawing characters. Newlines in data are shown using a carriage return symbol in the right-hand margin. When the data is wrapped from one line to the next without a newline character, an ellipsis symbol @@ -2480,8 +2471,7 @@ testdb=> <userinput>\set foo bar</userinput> <programlisting> testdb=> <userinput>\echo :foo</userinput> bar -</programlisting> - </para> +</programlisting></para> <note> <para> @@ -3332,8 +3322,7 @@ PSQL_EDITOR_LINENUMBER_ARG='--line ' </listitem> <listitem> - <para> - <application>psql</application> is only guaranteed to work smoothly + <para><application>psql</application> is only guaranteed to work smoothly with servers of the same version. That does not mean other combinations will fail outright, but subtle and not-so-subtle problems might come up. Backslash commands are particularly likely to fail if the @@ -3376,8 +3365,7 @@ PSQL_EDITOR_LINENUMBER_ARG='--line ' raster font does not work with the ANSI code page. </para> </listitem> - </itemizedlist> - </para> + </itemizedlist></para> </refsect1> @@ -3483,8 +3471,7 @@ second | three -[ RECORD 4 ]- first | 4 second | four -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml index c9514f95aee..722266563eb 100644 --- a/doc/src/sgml/ref/reindex.sgml +++ b/doc/src/sgml/ref/reindex.sgml @@ -74,8 +74,7 @@ REINDEX { INDEX | TABLE | DATABASE | SYSTEM } <replaceable class="PARAMETER">nam </para> </listitem> - </itemizedlist> - </para> + </itemizedlist></para> </refsect1> <refsect1> @@ -263,8 +262,7 @@ $ <userinput>psql broken_db</userinput> ... broken_db=> REINDEX DATABASE broken_db; broken_db=> \q -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml index 026bdcc7185..7b0263c5a1c 100644 --- a/doc/src/sgml/ref/reindexdb.sgml +++ b/doc/src/sgml/ref/reindexdb.sgml @@ -319,8 +319,7 @@ PostgreSQL documentation <literal>bar</literal> in a database named <literal>abcd</literal>: <screen> <prompt>$ </prompt><userinput>reindexdb --table foo --index bar abcd</userinput> -</screen> - </para> +</screen></para> </refsect1> diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml index 3e31a6c1869..d1ce7fb1246 100644 --- a/doc/src/sgml/ref/reset.sgml +++ b/doc/src/sgml/ref/reset.sgml @@ -91,8 +91,7 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA Set the <varname>timezone</> configuration variable to its default value: <screen> RESET timezone; -</screen> - </para> +</screen></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml index 204c986ecec..3229e4bcc71 100644 --- a/doc/src/sgml/ref/revoke.sgml +++ b/doc/src/sgml/ref/revoke.sgml @@ -261,8 +261,7 @@ REVOKE ALL PRIVILEGES ON kinds FROM manuel; <programlisting> REVOKE admins FROM joe; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1 id="SQL-REVOKE-compatibility"> diff --git a/doc/src/sgml/ref/rollback.sgml b/doc/src/sgml/ref/rollback.sgml index 49989c01bff..b26554567db 100644 --- a/doc/src/sgml/ref/rollback.sgml +++ b/doc/src/sgml/ref/rollback.sgml @@ -71,8 +71,7 @@ ROLLBACK [ WORK | TRANSACTION ] To abort all changes: <programlisting> ROLLBACK; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/rollback_prepared.sgml b/doc/src/sgml/ref/rollback_prepared.sgml index 9dfe1416e0d..9592b92f321 100644 --- a/doc/src/sgml/ref/rollback_prepared.sgml +++ b/doc/src/sgml/ref/rollback_prepared.sgml @@ -79,8 +79,7 @@ ROLLBACK PREPARED <replaceable class="PARAMETER">transaction_id</replaceable> <programlisting> ROLLBACK PREPARED 'foobar'; -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/rollback_to.sgml b/doc/src/sgml/ref/rollback_to.sgml index bf838223783..1b59af64436 100644 --- a/doc/src/sgml/ref/rollback_to.sgml +++ b/doc/src/sgml/ref/rollback_to.sgml @@ -124,8 +124,7 @@ FETCH 1 FROM foo; 2 COMMIT; -</programlisting> - </para> +</programlisting></para> </refsect1> diff --git a/doc/src/sgml/ref/security_label.sgml b/doc/src/sgml/ref/security_label.sgml index a9eda21b72a..8f52664afc0 100644 --- a/doc/src/sgml/ref/security_label.sgml +++ b/doc/src/sgml/ref/security_label.sgml @@ -196,8 +196,7 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON <programlisting> SECURITY LABEL FOR selinux ON TABLE mytable IS 'system_u:object_r:sepgsql_table_t:s0'; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index 5ff1ee834e6..7fb52833e8a 100644 --- a/doc/src/sgml/ref/select.sgml +++ b/doc/src/sgml/ref/select.sgml @@ -125,8 +125,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] </listitem> <listitem> - <para> - <literal>SELECT DISTINCT</literal> eliminates duplicate rows from the + <para><literal>SELECT DISTINCT</literal> eliminates duplicate rows from the result. <literal>SELECT DISTINCT ON</literal> eliminates rows that match on all the specified expressions. <literal>SELECT ALL</literal> (the default) will return all candidate rows, including @@ -423,8 +422,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] separating <literal>FROM</> items. </para> - <para> - <literal>CROSS JOIN</> and <literal>INNER JOIN</literal> + <para><literal>CROSS JOIN</> and <literal>INNER JOIN</literal> produce a simple Cartesian product, the same result as you get from listing the two items at the top level of <literal>FROM</>, but restricted by the join condition (if any). @@ -435,8 +433,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] <literal>WHERE</>. </para> - <para> - <literal>LEFT OUTER JOIN</> returns all rows in the qualified + <para><literal>LEFT OUTER JOIN</> returns all rows in the qualified Cartesian product (i.e., all combined rows that pass its join condition), plus one copy of each row in the left-hand table for which there was no right-hand row that passed the join @@ -455,8 +452,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] OUTER JOIN</> by switching the left and right inputs. </para> - <para> - <literal>FULL OUTER JOIN</> returns all the joined rows, plus + <para><literal>FULL OUTER JOIN</> returns all the joined rows, plus one row for each unmatched left-hand row (extended with nulls on the right), plus one row for each unmatched right-hand row (extended with nulls on the left). @@ -467,8 +463,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] <varlistentry> <term><literal>ON <replaceable class="parameter">join_condition</replaceable></literal></term> <listitem> - <para> - <replaceable class="parameter">join_condition</replaceable> is + <para><replaceable class="parameter">join_condition</replaceable> is an expression resulting in a value of type <type>boolean</type> (similar to a <literal>WHERE</literal> clause) that specifies which rows in a join are considered to @@ -494,8 +489,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] <varlistentry> <term><literal>NATURAL</literal></term> <listitem> - <para> - <literal>NATURAL</literal> is shorthand for a + <para><literal>NATURAL</literal> is shorthand for a <literal>USING</> list that mentions all columns in the two tables that have the same names. </para> @@ -832,8 +826,7 @@ SELECT DISTINCT ON (location) location, time, report The <literal>UNION</literal> clause has this general form: <synopsis> <replaceable class="parameter">select_statement</replaceable> UNION [ ALL | DISTINCT ] <replaceable class="parameter">select_statement</replaceable> -</synopsis> - <replaceable class="parameter">select_statement</replaceable> is +</synopsis><replaceable class="parameter">select_statement</replaceable> is any <command>SELECT</command> statement without an <literal>ORDER BY</>, <literal>LIMIT</>, <literal>FOR UPDATE</literal>, or <literal>FOR SHARE</literal> clause. @@ -885,8 +878,7 @@ SELECT DISTINCT ON (location) location, time, report The <literal>INTERSECT</literal> clause has this general form: <synopsis> <replaceable class="parameter">select_statement</replaceable> INTERSECT [ ALL | DISTINCT ] <replaceable class="parameter">select_statement</replaceable> -</synopsis> - <replaceable class="parameter">select_statement</replaceable> is +</synopsis><replaceable class="parameter">select_statement</replaceable> is any <command>SELECT</command> statement without an <literal>ORDER BY</>, <literal>LIMIT</>, <literal>FOR UPDATE</literal>, or <literal>FOR SHARE</literal> clause. @@ -933,8 +925,7 @@ SELECT DISTINCT ON (location) location, time, report The <literal>EXCEPT</literal> clause has this general form: <synopsis> <replaceable class="parameter">select_statement</replaceable> EXCEPT [ ALL | DISTINCT ] <replaceable class="parameter">select_statement</replaceable> -</synopsis> - <replaceable class="parameter">select_statement</replaceable> is +</synopsis><replaceable class="parameter">select_statement</replaceable> is any <command>SELECT</command> statement without an <literal>ORDER BY</>, <literal>LIMIT</>, <literal>FOR UPDATE</literal>, or <literal>FOR SHARE</literal> clause. @@ -1072,8 +1063,7 @@ SELECT name FROM distributors ORDER BY code; <synopsis> LIMIT { <replaceable class="parameter">count</replaceable> | ALL } OFFSET <replaceable class="parameter">start</replaceable> -</synopsis> - <replaceable class="parameter">count</replaceable> specifies the +</synopsis><replaceable class="parameter">count</replaceable> specifies the maximum number of rows to return, while <replaceable class="parameter">start</replaceable> specifies the number of rows to skip before starting to return rows. When both are specified, @@ -1561,8 +1551,7 @@ SELECT 2+2; following query is invalid: <programlisting> SELECT distributors.* WHERE distributors.name = 'Westward'; -</programlisting> - <productname>PostgreSQL</productname> releases prior to +</programlisting><productname>PostgreSQL</productname> releases prior to 8.1 would accept queries of this form, and add an implicit entry to the query's <literal>FROM</literal> clause for each table referenced by the query. This is no longer allowed. diff --git a/doc/src/sgml/ref/select_into.sgml b/doc/src/sgml/ref/select_into.sgml index 02266083d4e..48b789b5805 100644 --- a/doc/src/sgml/ref/select_into.sgml +++ b/doc/src/sgml/ref/select_into.sgml @@ -125,8 +125,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac <programlisting> SELECT * INTO films_recent FROM films WHERE date_prod >= '2002-01-01'; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml index 3ef700b60db..40e1bd4e607 100644 --- a/doc/src/sgml/ref/set.sgml +++ b/doc/src/sgml/ref/set.sgml @@ -154,8 +154,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep <varlistentry> <term><literal>SCHEMA</literal></term> <listitem> - <para> - <literal>SET SCHEMA '<replaceable>value</>'</> is an alias for + <para><literal>SET SCHEMA '<replaceable>value</>'</> is an alias for <literal>SET search_path TO <replaceable>value</></>. Only one schema can be specified using this syntax. </para> @@ -165,8 +164,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep <varlistentry> <term><literal>NAMES</literal></term> <listitem> - <para> - <literal>SET NAMES <replaceable>value</></> is an alias for + <para><literal>SET NAMES <replaceable>value</></> is an alias for <literal>SET client_encoding TO <replaceable>value</></>. </para> </listitem> @@ -187,16 +185,14 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep <function>setseed</function>: <programlisting> SELECT setseed(<replaceable>value</replaceable>); -</programlisting> - </para> +</programlisting></para> </listitem> </varlistentry> <varlistentry> <term><literal>TIME ZONE</literal></term> <listitem> - <para> - <literal>SET TIME ZONE <replaceable>value</></> is an alias + <para><literal>SET TIME ZONE <replaceable>value</></> is an alias for <literal>SET timezone TO <replaceable>value</></>. The syntax <literal>SET TIME ZONE</literal> allows special syntax for the time zone specification. Here are examples of valid @@ -302,8 +298,7 @@ SET TIME ZONE 'PST8PDT'; Set the time zone for Italy: <screen> SET TIME ZONE 'Europe/Rome'; -</screen> - </para> +</screen></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml index ca26bb2687c..4a6a3fc7fe9 100644 --- a/doc/src/sgml/ref/show.sgml +++ b/doc/src/sgml/ref/show.sgml @@ -109,8 +109,7 @@ SHOW ALL </para> </listitem> </varlistentry> - </variablelist> - </para> + </variablelist></para> </listitem> </varlistentry> @@ -177,8 +176,7 @@ SHOW ALL; xmloption | content | Sets whether XML data in implicit parsing ... zero_damaged_pages | off | Continues processing past damaged page headers. (196 rows) -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/truncate.sgml b/doc/src/sgml/ref/truncate.sgml index 9f12ca4b3b3..2fe47ca8162 100644 --- a/doc/src/sgml/ref/truncate.sgml +++ b/doc/src/sgml/ref/truncate.sgml @@ -206,8 +206,7 @@ TRUNCATE bigtable, fattable RESTART IDENTITY; <programlisting> TRUNCATE othertable CASCADE; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/unlisten.sgml b/doc/src/sgml/ref/unlisten.sgml index ad3b9a12afa..c6436829d60 100644 --- a/doc/src/sgml/ref/unlisten.sgml +++ b/doc/src/sgml/ref/unlisten.sgml @@ -111,8 +111,7 @@ Asynchronous notification "virtual" received from server process with PID 8448. UNLISTEN virtual; NOTIFY virtual; -- no NOTIFY event is received -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml index 5968db1f6fe..ba5af8e884b 100644 --- a/doc/src/sgml/ref/update.sgml +++ b/doc/src/sgml/ref/update.sgml @@ -348,8 +348,7 @@ COMMIT; <literal>c_films</> is currently positioned: <programlisting> UPDATE films SET kind = 'Dramatic' WHERE CURRENT OF c_films; -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml index 87283bca50d..f05babc76a5 100644 --- a/doc/src/sgml/ref/vacuum.sgml +++ b/doc/src/sgml/ref/vacuum.sgml @@ -254,8 +254,7 @@ CPU 0.07s/0.39u sec elapsed 1.56 sec. INFO: analyzing "public.onek" INFO: "onek": 36 pages, 1000 rows sampled, 1000 estimated total rows VACUUM -</programlisting> - </para> +</programlisting></para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml index e9022fe9479..4effa4188a6 100644 --- a/doc/src/sgml/ref/vacuumdb.sgml +++ b/doc/src/sgml/ref/vacuumdb.sgml @@ -369,8 +369,7 @@ PostgreSQL documentation <literal>bar</literal> of the table for the optimizer: <screen> <prompt>$ </prompt><userinput>vacuumdb --analyze --verbose --table 'foo(bar)' xyzzy</userinput> -</screen> - </para> +</screen></para> </refsect1> diff --git a/doc/src/sgml/ref/values.sgml b/doc/src/sgml/ref/values.sgml index 552c80cf06a..1f0e9a8ba11 100644 --- a/doc/src/sgml/ref/values.sgml +++ b/doc/src/sgml/ref/values.sgml @@ -214,8 +214,7 @@ UPDATE employees SET salary = salary * v.increase <programlisting> SELECT * FROM machines WHERE ip_address IN (VALUES('192.168.0.1'::inet), ('192.168.0.10'), ('192.168.1.43')); -</programlisting> - </para> +</programlisting></para> <tip> <para> @@ -230,8 +229,7 @@ WHERE ip_address IN (VALUES('192.168.0.1'::inet), ('192.168.0.10'), ('192.168.1. <refsect1> <title>Compatibility</title> - <para> - <command>VALUES</command> conforms to the SQL standard. + <para><command>VALUES</command> conforms to the SQL standard. <literal>LIMIT</literal> and <literal>OFFSET</literal> are <productname>PostgreSQL</productname> extensions; see also under <xref linkend="sql-select">. diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml index 0d65c78b08b..1b41cb40b3c 100644 --- a/doc/src/sgml/spi.sgml +++ b/doc/src/sgml/spi.sgml @@ -392,8 +392,7 @@ typedef struct TupleDesc tupdesc; /* row descriptor */ HeapTuple *vals; /* rows */ } SPITupleTable; -</programlisting> - <structfield>vals</> is an array of pointers to rows. (The number +</programlisting><structfield>vals</> is an array of pointers to rows. (The number of valid entries is given by <varname>SPI_processed</varname>.) <structfield>tupdesc</> is a row descriptor which you can pass to SPI functions dealing with rows. <structfield>tuptabcxt</>, @@ -425,9 +424,7 @@ typedef struct <varlistentry> <term><literal>bool <parameter>read_only</parameter></literal></term> <listitem> - <para> - <literal>true</> for read-only execution - </para> + <para><literal>true</> for read-only execution</para> </listitem> </varlistentry> @@ -803,9 +800,7 @@ int SPI_execute_with_args(const char *<parameter>command</parameter>, <varlistentry> <term><literal>bool <parameter>read_only</parameter></literal></term> <listitem> - <para> - <literal>true</> for read-only execution - </para> + <para><literal>true</> for read-only execution</para> </listitem> </varlistentry> @@ -1421,9 +1416,7 @@ int SPI_execute_plan(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter> <varlistentry> <term><literal>bool <parameter>read_only</parameter></literal></term> <listitem> - <para> - <literal>true</> for read-only execution - </para> + <para><literal>true</> for read-only execution</para> </listitem> </varlistentry> @@ -1540,9 +1533,7 @@ int SPI_execute_plan_with_paramlist(SPIPlanPtr <parameter>plan</parameter>, <varlistentry> <term><literal>bool <parameter>read_only</parameter></literal></term> <listitem> - <para> - <literal>true</> for read-only execution - </para> + <para><literal>true</> for read-only execution</para> </listitem> </varlistentry> @@ -1777,9 +1768,7 @@ Portal SPI_cursor_open(const char * <parameter>name</parameter>, SPIPlanPtr <par <varlistentry> <term><literal>bool <parameter>read_only</parameter></literal></term> <listitem> - <para> - <literal>true</> for read-only execution - </para> + <para><literal>true</> for read-only execution</para> </listitem> </varlistentry> </variablelist> @@ -1915,9 +1904,7 @@ Portal SPI_cursor_open_with_args(const char *<parameter>name</parameter>, <varlistentry> <term><literal>bool <parameter>read_only</parameter></literal></term> <listitem> - <para> - <literal>true</> for read-only execution - </para> + <para><literal>true</> for read-only execution</para> </listitem> </varlistentry> @@ -2022,9 +2009,7 @@ Portal SPI_cursor_open_with_paramlist(const char *<parameter>name</parameter>, <varlistentry> <term><literal>bool <parameter>read_only</parameter></literal></term> <listitem> - <para> - <literal>true</> for read-only execution - </para> + <para><literal>true</> for read-only execution</para> </listitem> </varlistentry> </variablelist> diff --git a/doc/src/sgml/stylesheet-man.xsl b/doc/src/sgml/stylesheet-man.xsl index 8c614ca754d..822b082522b 100644 --- a/doc/src/sgml/stylesheet-man.xsl +++ b/doc/src/sgml/stylesheet-man.xsl @@ -8,19 +8,6 @@ <xsl:import href="stylesheet-common.xsl" /> -<!-- The following is a workaround for what may actually be a mistake - in our markup. The problem is in a situation like - -<para> - <command>FOO</command> is ... - - there is strictly speaking a line break before "FOO". In the - HTML output, this does not appear to be a problem, but in the man - page output, this shows up. Using this setting, pure whitespace - text nodes are removed, so the problem is solved. --> -<xsl:strip-space elements="para"/> - - <!-- Parameters --> <xsl:param name="man.authors.section.enabled">0</xsl:param> |