mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Peter Eisentraut 2011-08-07 10:49:45 +03:00
parent 05e8396892
commit 6ef2448796
115 changed files with 194 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/sgml/dblink.sgml
View File

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

3
doc/src/sgml/ref/abort.sgml
View File

@ -75,8 +75,7 @@ ABORT [ WORK | TRANSACTION ]
To abort all changes:
<programlisting>
ABORT;
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/alter_aggregate.sgml
View File

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

3
doc/src/sgml/ref/alter_collation.sgml
View File

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

3
doc/src/sgml/ref/alter_conversion.sgml
View File

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

3
doc/src/sgml/ref/alter_database.sgml
View File

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

3
doc/src/sgml/ref/alter_default_privileges.sgml
View File

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

3
doc/src/sgml/ref/alter_domain.sgml
View File

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

3
doc/src/sgml/ref/alter_extension.sgml
View File

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

3
doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
View File

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

3
doc/src/sgml/ref/alter_foreign_table.sgml
View File

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

3
doc/src/sgml/ref/alter_function.sgml
View File

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

4
doc/src/sgml/ref/alter_group.sgml
View File

@ -103,9 +103,7 @@ ALTER GROUP staff ADD USER karl, john;
<programlisting>
ALTER GROUP workers DROP USER beth;
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/alter_index.sgml
View File

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

3
doc/src/sgml/ref/alter_operator.sgml
View File

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

3
doc/src/sgml/ref/alter_role.sgml
View File

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

3
doc/src/sgml/ref/alter_sequence.sgml
View File

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

3
doc/src/sgml/ref/alter_server.sgml
View File

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

3
doc/src/sgml/ref/alter_table.sgml
View File

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

3
doc/src/sgml/ref/alter_tablespace.sgml
View File

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

3
doc/src/sgml/ref/alter_trigger.sgml
View File

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

3
doc/src/sgml/ref/alter_type.sgml
View File

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

3
doc/src/sgml/ref/alter_user_mapping.sgml
View File

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

3
doc/src/sgml/ref/alter_view.sgml
View File

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

3
doc/src/sgml/ref/begin.sgml
View File

@ -122,8 +122,7 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
<programlisting>
BEGIN;
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/close.sgml
View File

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

3
doc/src/sgml/ref/cluster.sgml
View File

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

3
doc/src/sgml/ref/clusterdb.sgml
View File

@ -293,8 +293,7 @@ PostgreSQL documentation
<literal>xyzzy</literal>:
<screen>
<prompt>$ </prompt><userinput>clusterdb --table foo xyzzy</userinput>
</screen>
</para>
</screen></para>
</refsect1>

3
doc/src/sgml/ref/comment.sgml
View File

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

3
doc/src/sgml/ref/commit.sgml
View File

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

3
doc/src/sgml/ref/commit_prepared.sgml
View File

@ -79,8 +79,7 @@ COMMIT PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
<programlisting>
COMMIT PREPARED 'foobar';
</programlisting>
</para>
</programlisting></para>
</refsect1>

9
doc/src/sgml/ref/copy.sgml
View File

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

6
doc/src/sgml/ref/create_conversion.sgml
View File

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

6
doc/src/sgml/ref/create_domain.sgml
View File

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

3
doc/src/sgml/ref/create_extension.sgml
View File

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

9
doc/src/sgml/ref/create_foreign_data_wrapper.sgml
View File

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

3
doc/src/sgml/ref/create_foreign_table.sgml
View File

@ -169,8 +169,7 @@ CREATE FOREIGN TABLE films (
len interval hour to minute
)
SERVER film_server;
</programlisting>
</para>
</programlisting></para>
</refsect1>

24
doc/src/sgml/ref/create_function.sgml
View File

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

3
doc/src/sgml/ref/create_index.sgml
View File

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

15
doc/src/sgml/ref/create_language.sgml
View File

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

9
doc/src/sgml/ref/create_operator.sgml
View File

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

6
doc/src/sgml/ref/create_role.sgml
View File

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

6
doc/src/sgml/ref/create_rule.sgml
View File

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

3
doc/src/sgml/ref/create_schema.sgml
View File

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

6
doc/src/sgml/ref/create_sequence.sgml
View File

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

3
doc/src/sgml/ref/create_server.sgml
View File

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

19
doc/src/sgml/ref/create_table.sgml
View File

@ -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 &lt;&gt; '')
@ -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">

12
doc/src/sgml/ref/create_table_as.sgml
View File

@ -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 &gt; $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>

3
doc/src/sgml/ref/create_tablespace.sgml
View File

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

9
doc/src/sgml/ref/create_trigger.sgml
View File

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

3
doc/src/sgml/ref/create_user_mapping.sgml
View File

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

3
doc/src/sgml/ref/createdb.sgml
View File

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

6
doc/src/sgml/ref/declare.sgml
View File

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

3
doc/src/sgml/ref/delete.sgml
View File

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

3
doc/src/sgml/ref/discard.sgml
View File

@ -83,8 +83,7 @@ UNLISTEN *;
SELECT pg_advisory_unlock_all();
DISCARD PLANS;
DISCARD TEMP;
</programlisting>
</para>
</programlisting></para>
</listitem>
</varlistentry>

4
doc/src/sgml/ref/do.sgml
View File

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

3
doc/src/sgml/ref/drop_aggregate.sgml
View File

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

3
doc/src/sgml/ref/drop_cast.sgml
View File

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

3
doc/src/sgml/ref/drop_collation.sgml
View File

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

3
doc/src/sgml/ref/drop_conversion.sgml
View File

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

3
doc/src/sgml/ref/drop_domain.sgml
View File

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

3
doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
View File

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

3
doc/src/sgml/ref/drop_foreign_table.sgml
View File

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

3
doc/src/sgml/ref/drop_function.sgml
View File

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

3
doc/src/sgml/ref/drop_index.sgml
View File

@ -87,8 +87,7 @@ DROP INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
<programlisting>
DROP INDEX title_idx;
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/drop_language.sgml
View File

@ -100,8 +100,7 @@ DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</
<programlisting>
DROP LANGUAGE plsample;
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/drop_operator.sgml
View File

@ -123,8 +123,7 @@ DROP OPERATOR ~ (none, bit);
for type <type>bigint</type>:
<programlisting>
DROP OPERATOR ! (bigint, none);
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/drop_role.sgml
View File

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

3
doc/src/sgml/ref/drop_rule.sgml
View File

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

3
doc/src/sgml/ref/drop_schema.sgml
View File

@ -93,8 +93,7 @@ DROP SCHEMA [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .
<programlisting>
DROP SCHEMA mystuff CASCADE;
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/drop_sequence.sgml
View File

@ -86,8 +86,7 @@ DROP SEQUENCE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [,
<programlisting>
DROP SEQUENCE serial;
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/drop_server.sgml
View File

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

3
doc/src/sgml/ref/drop_table.sgml
View File

@ -100,8 +100,7 @@ DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
<programlisting>
DROP TABLE films, distributors;
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/drop_tablespace.sgml
View File

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

3
doc/src/sgml/ref/drop_trigger.sgml
View File

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

3
doc/src/sgml/ref/drop_type.sgml
View File

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

3
doc/src/sgml/ref/drop_user_mapping.sgml
View File

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

3
doc/src/sgml/ref/drop_view.sgml
View File

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

3
doc/src/sgml/ref/dropdb.sgml
View File

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

3
doc/src/sgml/ref/droplang.sgml
View File

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

3
doc/src/sgml/ref/dropuser.sgml
View File

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

6
doc/src/sgml/ref/ecpg-ref.sgml
View File

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

3
doc/src/sgml/ref/end.sgml
View File

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

12
doc/src/sgml/ref/fetch.sgml
View File

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

3
doc/src/sgml/ref/grant.sgml
View File

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

3
doc/src/sgml/ref/insert.sgml
View File

@ -312,8 +312,7 @@ WITH upd AS (
RETURNING *
)
INSERT INTO employees_log SELECT *, current_timestamp FROM upd;
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/listen.sgml
View File

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

3
doc/src/sgml/ref/lock.sgml
View File

@ -222,8 +222,7 @@ DELETE FROM films_user_comments WHERE id IN
(SELECT id FROM films WHERE rating &lt; 5);
DELETE FROM films WHERE rating &lt; 5;
COMMIT WORK;
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/notify.sgml
View File

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

3
doc/src/sgml/ref/pg_basebackup.sgml
View File

@ -138,8 +138,7 @@ PostgreSQL documentation
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
</variablelist></para>
</listitem>
</varlistentry>

9
doc/src/sgml/ref/pg_ctl-ref.sgml
View File

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

8
doc/src/sgml/ref/pg_dump.sgml
View File

@ -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 &gt; mytab.sql</userinput>
</screen>
</para>
</screen></para>
</refsect1>

12
doc/src/sgml/ref/pg_restore.sgml
View File

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

3
doc/src/sgml/ref/prepare_transaction.sgml
View File

@ -153,8 +153,7 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
<programlisting>
PREPARE TRANSACTION 'foobar';
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

39
doc/src/sgml/ref/psql-ref.sgml
View File

@ -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=&gt;
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=&gt; <userinput>\set foo bar</userinput>
<programlisting>
testdb=&gt; <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>

6
doc/src/sgml/ref/reindex.sgml
View File

@ -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=&gt; REINDEX DATABASE broken_db;
broken_db=&gt; \q
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

3
doc/src/sgml/ref/reindexdb.sgml
View File

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

3
doc/src/sgml/ref/reset.sgml
View File

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

3
doc/src/sgml/ref/revoke.sgml
View File

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

3
doc/src/sgml/ref/rollback.sgml
View File

@ -71,8 +71,7 @@ ROLLBACK [ WORK | TRANSACTION ]
To abort all changes:
<programlisting>
ROLLBACK;
</programlisting>
</para>
</programlisting></para>
</refsect1>
<refsect1>

Some files were not shown because too many files have changed in this diff Show More