Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6ef2448

Browse files
committed
Fix a whitespace issue with the man pages
There is what may actually be a mistake in our markup. The problem isin a situation like<para> <command>FOO</command> is ...there is strictly speaking a line break before "FOO". In the HTMLoutput, this does not appear to be a problem, but in the man pageoutput, 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, butthat 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 onlyfixed the problems that affect the man page output, not all theplaces.
1 parent05e8396 commit6ef2448

File tree

115 files changed

+194
-413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+194
-413
lines changed

‎doc/src/sgml/dblink.sgml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ dblink_connect(text connname, text connstr) returns text
7676
<varlistentry>
7777
<term><parameter>connstr</parameter></term>
7878
<listitem>
79-
<para>
80-
<application>libpq</>-style connection info string, for example
79+
<para><application>libpq</>-style connection info string, for example
8180
<literal>hostaddr=127.0.0.1 port=5432 dbname=mydb user=postgres
8281
password=mypasswd</>.
8382
For details see <function>PQconnectdb</> in
@@ -447,8 +446,7 @@ CREATE VIEW myremote_pg_proc AS
447446
AS t1(proname name, prosrc text);
448447

449448
SELECT * FROM myremote_pg_proc WHERE proname LIKE 'bytea%';
450-
</programlisting>
451-
</para>
449+
</programlisting></para>
452450
</refsect1>
453451

454452
<refsect1>

‎doc/src/sgml/ref/abort.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ ABORT [ WORK | TRANSACTION ]
7575
To abort all changes:
7676
<programlisting>
7777
ABORT;
78-
</programlisting>
79-
</para>
78+
</programlisting></para>
8079
</refsect1>
8180

8281
<refsect1>

‎doc/src/sgml/ref/alter_aggregate.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ ALTER AGGREGATE myavg(integer) OWNER TO joe;
125125
<type>integer</type> into schema <literal>myschema</literal>:
126126
<programlisting>
127127
ALTER AGGREGATE myavg(integer) SET SCHEMA myschema;
128-
</programlisting>
129-
</para>
128+
</programlisting></para>
130129
</refsect1>
131130

132131
<refsect1>

‎doc/src/sgml/ref/alter_collation.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ ALTER COLLATION "de_DE" RENAME TO german;
104104
<literal>joe</literal>:
105105
<programlisting>
106106
ALTER COLLATION "en_US" OWNER TO joe;
107-
</programlisting>
108-
</para>
107+
</programlisting></para>
109108
</refsect1>
110109

111110
<refsect1>

‎doc/src/sgml/ref/alter_conversion.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ ALTER CONVERSION iso_8859_1_to_utf8 RENAME TO latin1_to_unicode;
104104
<literal>joe</literal>:
105105
<programlisting>
106106
ALTER CONVERSION iso_8859_1_to_utf8 OWNER TO joe;
107-
</programlisting>
108-
</para>
107+
</programlisting></para>
109108
</refsect1>
110109

111110
<refsect1>

‎doc/src/sgml/ref/alter_database.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL
190190

191191
<programlisting>
192192
ALTER DATABASE test SET enable_indexscan TO off;
193-
</programlisting>
194-
</para>
193+
</programlisting></para>
195194
</refsect1>
196195

197196
<refsect1>

‎doc/src/sgml/ref/alter_default_privileges.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,7 @@ ALTER DEFAULT PRIVILEGES IN SCHEMA myschema REVOKE INSERT ON TABLES FROM webuser
187187

188188
<programlisting>
189189
ALTER DEFAULT PRIVILEGES FOR ROLE admin REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC;
190-
</programlisting>
191-
</para>
190+
</programlisting></para>
192191
</refsect1>
193192

194193
<refsect1>

‎doc/src/sgml/ref/alter_domain.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,7 @@ ALTER DOMAIN zipcode DROP CONSTRAINT zipchk;
270270
To move the domain into a different schema:
271271
<programlisting>
272272
ALTER DOMAIN zipcode SET SCHEMA customers;
273-
</programlisting>
274-
</para>
273+
</programlisting></para>
275274
</refsect1>
276275

277276
<refsect1 id="SQL-ALTERDOMAIN-compatibility">

‎doc/src/sgml/ref/alter_extension.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,7 @@ ALTER EXTENSION hstore SET SCHEMA utils;
288288
To add an existing function to the <literal>hstore</literal> extension:
289289
<programlisting>
290290
ALTER EXTENSION hstore ADD FUNCTION populate_record(anyelement, hstore);
291-
</programlisting>
292-
</para>
291+
</programlisting></para>
293292
</refsect1>
294293

295294
<refsect1 id="SQL-ALTEREXTENSION-see-also">

‎doc/src/sgml/ref/alter_foreign_data_wrapper.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ ALTER FOREIGN DATA WRAPPER dbi OPTIONS (ADD foo '1', DROP 'bar');
141141
to <literal>bob.myvalidator</>:
142142
<programlisting>
143143
ALTER FOREIGN DATA WRAPPER dbi VALIDATOR bob.myvalidator;
144-
</programlisting>
145-
</para>
144+
</programlisting></para>
146145
</refsect1>
147146

148147
<refsect1>

‎doc/src/sgml/ref/alter_foreign_table.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,7 @@ ALTER FOREIGN TABLE distributors ALTER COLUMN street SET NOT NULL;
288288
To change options of a foreign table:
289289
<programlisting>
290290
ALTER FOREIGN TABLE myschema.distributors OPTIONS (ADD opt1 'value', SET opt2, 'value2', DROP opt3 'value3');
291-
</programlisting>
292-
</para>
291+
</programlisting></para>
293292

294293
</refsect1>
295294

‎doc/src/sgml/ref/alter_function.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ ALTER FUNCTION <replaceable>name</replaceable> ( [ [ <replaceable class="paramet
153153
<term><literal>STRICT</literal></term>
154154

155155
<listitem>
156-
<para>
157-
<literal>CALLED ON NULL INPUT</literal> changes the function so
156+
<para><literal>CALLED ON NULL INPUT</literal> changes the function so
158157
that it will be invoked when some or all of its arguments are
159158
null. <literal>RETURNS NULL ON NULL INPUT</literal> or
160159
<literal>STRICT</literal> changes the function so that it is not

‎doc/src/sgml/ref/alter_group.sgml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ ALTER GROUP staff ADD USER karl, john;
103103

104104
<programlisting>
105105
ALTER GROUP workers DROP USER beth;
106-
</programlisting>
107-
108-
</para>
106+
</programlisting></para>
109107
</refsect1>
110108

111109
<refsect1>

‎doc/src/sgml/ref/alter_index.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,7 @@ ALTER INDEX distributors SET TABLESPACE fasttablespace;
190190
<programlisting>
191191
ALTER INDEX distributors SET (fillfactor = 75);
192192
REINDEX INDEX distributors;
193-
</programlisting>
194-
</para>
193+
</programlisting></para>
195194

196195
</refsect1>
197196

‎doc/src/sgml/ref/alter_operator.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>left_type</repla
105105
Change the owner of a custom operator <literal>a @@ b</literal> for type <type>text</type>:
106106
<programlisting>
107107
ALTER OPERATOR @@ (text, text) OWNER TO joe;
108-
</programlisting>
109-
</para>
108+
</programlisting></para>
110109
</refsect1>
111110

112111
<refsect1>

‎doc/src/sgml/ref/alter_role.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,7 @@ ALTER ROLE worker_bee SET maintenance_work_mem = 100000;
289289

290290
<programlisting>
291291
ALTER ROLE fred IN DATABASE devel SET client_min_messages = DEBUG;
292-
</programlisting>
293-
</para>
292+
</programlisting></para>
294293
</refsect1>
295294

296295
<refsect1>

‎doc/src/sgml/ref/alter_sequence.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,7 @@ ALTER SEQUENCE <replaceable class="parameter">name</replaceable> SET SCHEMA <rep
282282
Restart a sequence called <literal>serial</literal>, at 105:
283283
<programlisting>
284284
ALTER SEQUENCE serial RESTART WITH 105;
285-
</programlisting>
286-
</para>
285+
</programlisting></para>
287286
</refsect1>
288287

289288
<refsect1>

‎doc/src/sgml/ref/alter_server.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ ALTER SERVER foo OPTIONS (host 'foo', dbname 'foodb');
100100
change <literal>host</> option:
101101
<programlisting>
102102
ALTER SERVER foo VERSION '8.4' OPTIONS (SET host 'baz');
103-
</programlisting>
104-
</para>
103+
</programlisting></para>
105104
</refsect1>
106105

107106
<refsect1>

‎doc/src/sgml/ref/alter_table.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,8 +1041,7 @@ ALTER TABLE myschema.distributors SET SCHEMA yourschema;
10411041
CREATE UNIQUE INDEX CONCURRENTLY dist_id_temp_idx ON distributors (dist_id);
10421042
ALTER TABLE distributors DROP CONSTRAINT distributors_pkey,
10431043
ADD CONSTRAINT distributors_pkey PRIMARY KEY USING INDEX dist_id_temp_idx;
1044-
</programlisting>
1045-
</para>
1044+
</programlisting></para>
10461045

10471046
</refsect1>
10481047

‎doc/src/sgml/ref/alter_tablespace.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ ALTER TABLESPACE index_space RENAME TO fast_raid;
111111
Change the owner of tablespace <literal>index_space</literal>:
112112
<programlisting>
113113
ALTER TABLESPACE index_space OWNER TO mary;
114-
</programlisting>
115-
</para>
114+
</programlisting></para>
116115
</refsect1>
117116

118117
<refsect1>

‎doc/src/sgml/ref/alter_trigger.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable
9292
To rename an existing trigger:
9393
<programlisting>
9494
ALTER TRIGGER emp_stamp ON emp RENAME TO emp_track_chgs;
95-
</programlisting>
96-
</para>
95+
</programlisting></para>
9796
</refsect1>
9897

9998
<refsect1>

‎doc/src/sgml/ref/alter_type.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,7 @@ ALTER TYPE compfoo ADD ATTRIBUTE f3 int;
313313
To add a new value to an enum type in a particular sort position:
314314
<programlisting>
315315
ALTER TYPE colors ADD VALUE 'orange' AFTER 'red';
316-
</programlisting>
317-
</para>
316+
</programlisting></para>
318317
</refsect1>
319318

320319
<refsect1>

‎doc/src/sgml/ref/alter_user_mapping.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable>
9292
Change the password for user mapping <literal>bob</>, server<literal> foo</>:
9393
<programlisting>
9494
ALTER USER MAPPING FOR bob SERVER foo OPTIONS (user 'bob', password 'public');
95-
</programlisting>
96-
</para>
95+
</programlisting></para>
9796

9897
</refsect1>
9998

‎doc/src/sgml/ref/alter_view.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ ALTER VIEW <replaceable class="parameter">name</replaceable> SET SCHEMA <replace
123123
<literal>bar</literal>:
124124
<programlisting>
125125
ALTER VIEW foo RENAME TO bar;
126-
</programlisting>
127-
</para>
126+
</programlisting></para>
128127
</refsect1>
129128

130129
<refsect1>

‎doc/src/sgml/ref/begin.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
122122

123123
<programlisting>
124124
BEGIN;
125-
</programlisting>
126-
</para>
125+
</programlisting></para>
127126
</refsect1>
128127

129128
<refsect1>

‎doc/src/sgml/ref/close.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ CLOSE { <replaceable class="PARAMETER">name</replaceable> | ALL }
107107
Close the cursor <literal>liahona</literal>:
108108
<programlisting>
109109
CLOSE liahona;
110-
</programlisting>
111-
</para>
110+
</programlisting></para>
112111
</refsect1>
113112

114113
<refsect1>

‎doc/src/sgml/ref/cluster.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ CLUSTER employees;
197197
Cluster all tables in the database that have previously been clustered:
198198
<programlisting>
199199
CLUSTER;
200-
</programlisting>
201-
</para>
200+
</programlisting></para>
202201
</refsect1>
203202

204203
<refsect1>

‎doc/src/sgml/ref/clusterdb.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,7 @@ PostgreSQL documentation
293293
<literal>xyzzy</literal>:
294294
<screen>
295295
<prompt>$ </prompt><userinput>clusterdb --table foo xyzzy</userinput>
296-
</screen>
297-
</para>
296+
</screen></para>
298297

299298
</refsect1>
300299

‎doc/src/sgml/ref/comment.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,7 @@ COMMENT ON TEXT SEARCH TEMPLATE snowball IS 'Snowball stemmer';
296296
COMMENT ON TRIGGER my_trigger ON my_table IS 'Used for RI';
297297
COMMENT ON TYPE complex IS 'Complex number data type';
298298
COMMENT ON VIEW my_view IS 'View of departmental costs';
299-
</programlisting>
300-
</para>
299+
</programlisting></para>
301300
</refsect1>
302301

303302
<refsect1>

‎doc/src/sgml/ref/commit.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ COMMIT [ WORK | TRANSACTION ]
7272
To commit the current transaction and make all changes permanent:
7373
<programlisting>
7474
COMMIT;
75-
</programlisting>
76-
</para>
75+
</programlisting></para>
7776
</refsect1>
7877

7978
<refsect1>

‎doc/src/sgml/ref/commit_prepared.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ COMMIT PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
7979

8080
<programlisting>
8181
COMMIT PREPARED 'foobar';
82-
</programlisting>
83-
</para>
82+
</programlisting></para>
8483

8584
</refsect1>
8685

‎doc/src/sgml/ref/copy.sgml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,7 @@ only one flag bit is defined, and the rest must be zero:
703703
</para>
704704
</listitem>
705705
</varlistentry>
706-
</variablelist>
707-
</para>
706+
</variablelist></para>
708707
</listitem>
709708
</varlistentry>
710709

@@ -850,8 +849,7 @@ ZW ZIMBABWE
850849
0000140 \0 002 Z M \0 \0 \0 006 Z A M B I A 377 377
851850
0000160 377 377 \0 003 \0 \0 \0 002 Z W \0 \0 \0 \b Z I
852851
0000200 M B A B W E 377 377 377 377 377 377
853-
</programlisting>
854-
</para>
852+
</programlisting></para>
855853
</refsect1>
856854

857855
<refsect1>
@@ -910,7 +908,6 @@ COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable> [ WITH O
910908
TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT }
911909
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ]
912910
[ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ]
913-
</synopsis>
914-
</para>
911+
</synopsis></para>
915912
</refsect1>
916913
</refentry>

‎doc/src/sgml/ref/create_conversion.sgml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ conv_proc(
113113
internal, -- destination (fill with a null terminated C string)
114114
integer -- source string length
115115
) RETURNS void;
116-
</programlisting>
117-
</para>
116+
</programlisting></para>
118117
</listitem>
119118
</varlistentry>
120119
</variablelist>
@@ -141,8 +140,7 @@ conv_proc(
141140
<literal>LATIN1</literal> using <function>myfunc</>:
142141
<programlisting>
143142
CREATE CONVERSION myconv FOR 'UTF8' TO 'LATIN1' FROM myfunc;
144-
</programlisting>
145-
</para>
143+
</programlisting></para>
146144
</refsect1>
147145

148146

‎doc/src/sgml/ref/create_domain.sgml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
162162
<varlistentry>
163163
<term><literal>CHECK (<replaceable class="PARAMETER">expression</replaceable>)</literal></term>
164164
<listitem>
165-
<para>
166-
<literal>CHECK</> clauses specify integrity constraints or tests
165+
<para><literal>CHECK</> clauses specify integrity constraints or tests
167166
which values of the domain must satisfy.
168167
Each constraint must be an expression
169168
producing a Boolean result. It should use the key word <literal>VALUE</>
@@ -202,8 +201,7 @@ CREATE TABLE us_snail_addy (
202201
city TEXT NOT NULL,
203202
postal us_postal_code NOT NULL
204203
);
205-
</programlisting>
206-
</para>
204+
</programlisting></para>
207205
</refsect1>
208206

209207
<refsect1 id="SQL-CREATEDOMAIN-compatibility">

‎doc/src/sgml/ref/create_extension.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name
111111
<varlistentry>
112112
<term><replaceable class="parameter">old_version</replaceable></term>
113113
<listitem>
114-
<para>
115-
<literal>FROM</> <replaceable class="parameter">old_version</>
114+
<para><literal>FROM</> <replaceable class="parameter">old_version</>
116115
must be specified when, and only when, you are attempting to install
117116
an extension that replaces an <quote>old style</> module that is just
118117
a collection of objects not packaged into an extension. This option

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp