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

Commit7e175c5

Browse files
committed
Misc documentation fixes.
- Misc grammar and punctuation fixes.- Stylistic cleanup: use spaces between function arguments and JSON fields in examples. For example "foo(a,b)" -> "foo(a, b)". Add semicolon after last END in a few PL/pgSQL examples that were missing them.- Make sentence that talked about "..." and ".." operators more clear, by avoiding to end the sentence with "..". That makes it look the same as "..."- Fix syntax description for HAVING: HAVING conditions cannot be repeatedPatch by Justin Pryzby, per Yaroslav Schekin's report. Backpatch to allsupported versions, to the extent that the patch applies easily.Discussion:https://www.postgresql.org/message-id/20201005191922.GE17626%40telsasoft.com
1 parentc092b2e commit7e175c5

17 files changed

+43
-43
lines changed

‎doc/src/sgml/catalogs.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1370,7 +1370,7 @@
13701370
<entry><type>bool</type></entry>
13711371
<entry>
13721372
Role can log in. That is, this role can be given as the initial
1373-
session authorization identifier
1373+
session authorization identifier.
13741374
</entry>
13751375
</row>
13761376

‎doc/src/sgml/config.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9705,8 +9705,8 @@ LOG: CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
97059705
</term>
97069706
<listitem>
97079707
<para>
9708-
If set, do not trace locks for tables below this OID. (use to avoid
9709-
output on system tables)
9708+
If set, do not trace locks for tables below this OID (used to avoid
9709+
output on system tables).
97109710
</para>
97119711
<para>
97129712
This parameter is only available if the <symbol>LOCK_DEBUG</symbol>

‎doc/src/sgml/dblink.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ SELECT dblink_connect('myconn', 'fdtest');
167167
OK
168168
(1 row)
169169

170-
SELECT * FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]);
170+
SELECT * FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]);
171171
a | b | c
172172
----+---+---------------
173173
0 | a | {a0,b0,c0}
@@ -616,7 +616,7 @@ dblink_exec(text sql [, bool fail_on_error]) returns text
616616
<para>
617617
The SQL command that you wish to execute in the remote database,
618618
for example
619-
<literal>insert into foo values(0,'a','{"a0","b0","c0"}')</literal>.
619+
<literal>insert into foo values(0,'a','{"a0","b0","c0"}')</literal>.
620620
</para>
621621
</listitem>
622622
</varlistentry>
@@ -653,7 +653,7 @@ SELECT dblink_connect('dbname=dblink_test_standby');
653653
OK
654654
(1 row)
655655

656-
SELECT dblink_exec('insert into foo values(21,''z'',''{"a0","b0","c0"}'');');
656+
SELECT dblink_exec('insert into foo values(21,''z'',''{"a0","b0","c0"}'');');
657657
dblink_exec
658658
-----------------
659659
INSERT 943366 1
@@ -665,7 +665,7 @@ SELECT dblink_connect('myconn', 'dbname=regression');
665665
OK
666666
(1 row)
667667

668-
SELECT dblink_exec('myconn', 'insert into foo values(21,''z'',''{"a0","b0","c0"}'');');
668+
SELECT dblink_exec('myconn', 'insert into foo values(21,''z'',''{"a0","b0","c0"}'');');
669669
dblink_exec
670670
------------------
671671
INSERT 6432584 1

‎doc/src/sgml/func.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22565,7 +22565,7 @@ BEGIN
2256522565
obj.object_name,
2256622566
obj.object_identity;
2256722567
END LOOP;
22568-
END
22568+
END;
2256922569
$$;
2257022570
CREATE EVENT TRIGGER test_event_trigger_for_drops
2257122571
ON sql_drop

‎doc/src/sgml/gin.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@
579579
</para>
580580
<para>
581581
<varname>gin_pending_list_limit</varname> can be overridden for individual
582-
GIN indexes by changing storage parameters,andwhich allows each
582+
GIN indexes by changing storage parameters, which allows each
583583
GIN index to have its own cleanup threshold.
584584
For example, it's possible to increase the threshold only for the GIN
585585
index which can be updated heavily, and decrease it otherwise.

‎doc/src/sgml/high-availability.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
14941494
Note that in this mode, the server will apply WAL one file at a
14951495
time, so if you use the standby server for queries (see Hot Standby),
14961496
there is a delay between an action in the master and when the
1497-
action becomes visible in the standby, corresponding the time it takes
1497+
action becomes visible in the standby, correspondingtothe time it takes
14981498
to fill up the WAL file. <varname>archive_timeout</varname> can be used to make that delay
14991499
shorter. Also note that you can't combine streaming replication with
15001500
this method.

‎doc/src/sgml/indexam.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ amgettuple (IndexScanDesc scan,
564564
will pass the caller's snapshot test. On success, <function>amgettuple</function>
565565
must also set <literal>scan-&gt;xs_recheck</literal> to true or false.
566566
False means it is certain that the index entry matches the scan keys.
567-
true means this is not certain, and the conditions represented by the
567+
True means this is not certain, and the conditions represented by the
568568
scan keys must be rechecked against the heap tuple after fetching it.
569569
This provision supports <quote>lossy</quote> index operators.
570570
Note that rechecking will extend only to the scan conditions; a partial

‎doc/src/sgml/isn.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
hard-coded list of prefixes; this list of prefixes is also used to hyphenate
1515
numbers on output. Since new prefixes are assigned from time to time, the
1616
list of prefixes may be out of date. It is hoped that a future version of
17-
this module willobtained the prefix list from one or more tables that
17+
this module willobtain the prefix list from one or more tables that
1818
can be easily updated by users as needed; however, at present, the
1919
list can only be updated by modifying the source code and recompiling.
2020
Alternatively, prefix validation and hyphenation support may be

‎doc/src/sgml/mvcc.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ ERROR: could not serialize access due to read/write dependencies among transact
12391239
<para>
12401240
The <literal>FOR UPDATE</literal> lock mode
12411241
is also acquired by any <command>DELETE</command> on a row, and also by an
1242-
<command>UPDATE</command> that modifies the valueson certain columns. Currently,
1242+
<command>UPDATE</command> that modifies the valuesof certain columns. Currently,
12431243
the set of columns considered for the <command>UPDATE</command> case are those that
12441244
have a unique index on them that can be used in a foreign key (so partial
12451245
indexes and expressional indexes are not considered), but this may change

‎doc/src/sgml/parallel.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
471471
</para>
472472

473473
<para>
474-
The following operations are always parallel restricted.
474+
The following operations are always parallel restricted:
475475
</para>
476476

477477
<itemizedlist>

‎doc/src/sgml/plpgsql.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ BEGIN
11211121
SELECT users.userid INTO STRICT userid
11221122
FROM users WHERE users.username = get_userid.username;
11231123
RETURN userid;
1124-
END
1124+
END;
11251125
$$ LANGUAGE plpgsql;
11261126
</programlisting>
11271127
On failure, this function might produce an error message such as
@@ -1791,7 +1791,7 @@ BEGIN
17911791
RETURN NEXT r; -- return current row of SELECT
17921792
END LOOP;
17931793
RETURN;
1794-
END
1794+
END;
17951795
$BODY$
17961796
LANGUAGE plpgsql;
17971797

@@ -1819,7 +1819,7 @@ BEGIN
18191819
END IF;
18201820

18211821
RETURN;
1822-
END
1822+
END;
18231823
$BODY$
18241824
LANGUAGE plpgsql;
18251825

@@ -1893,7 +1893,7 @@ DECLARE myvar int := 5;
18931893
BEGIN
18941894
CALL triple(myvar);
18951895
RAISE NOTICE 'myvar = %', myvar; -- prints 15
1896-
END
1896+
END;
18971897
$$;
18981898
</programlisting>
18991899
</para>
@@ -3493,7 +3493,7 @@ BEGIN
34933493
ROLLBACK;
34943494
END IF;
34953495
END LOOP;
3496-
END
3496+
END;
34973497
$$;
34983498

34993499
CALL transaction_test1();
@@ -5147,7 +5147,7 @@ DECLARE
51475147
f1 int;
51485148
BEGIN
51495149
RETURN f1;
5150-
END
5150+
END;
51515151
$$ LANGUAGE plpgsql;
51525152
WARNING: variable "f1" shadows a previously defined variable
51535153
LINE 3: f1 int;

‎doc/src/sgml/protocol.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2799,7 +2799,7 @@ The commands accepted in replication mode are:
27992799
<para>
28002800
Every sent transaction contains zero or more DML messages (Insert,
28012801
Update, Delete). In case of a cascaded setup it can also contain Origin
2802-
messages. The origin messageindicated that the transaction originated on
2802+
messages. The origin messageindicates that the transaction originated on
28032803
different replication node. Since a replication node in the scope of logical
28042804
replication protocol can be pretty much anything, the only identifier
28052805
is the origin name. It's downstream's responsibility to handle this as

‎doc/src/sgml/ref/select.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
3838
[ FROM <replaceable class="parameter">from_item</replaceable> [, ...] ]
3939
[ WHERE <replaceable class="parameter">condition</replaceable> ]
4040
[ GROUP BY <replaceable class="parameter">grouping_element</replaceable> [, ...] ]
41-
[ HAVING <replaceable class="parameter">condition</replaceable>[, ...]]
41+
[ HAVING <replaceable class="parameter">condition</replaceable> ]
4242
[ WINDOW <replaceable class="parameter">window_name</replaceable> AS ( <replaceable class="parameter">window_definition</replaceable> ) [, ...] ]
4343
[ { UNION | INTERSECT | EXCEPT } [ ALL | DISTINCT ] <replaceable class="parameter">select</replaceable> ]
4444
[ ORDER BY <replaceable class="parameter">expression</replaceable> [ ASC | DESC | USING <replaceable class="parameter">operator</replaceable> ] [ NULLS { FIRST | LAST } ] [, ...] ]

‎doc/src/sgml/ref/select_into.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
2828
[ FROM <replaceable class="parameter">from_item</replaceable> [, ...] ]
2929
[ WHERE <replaceable class="parameter">condition</replaceable> ]
3030
[ GROUP BY <replaceable class="parameter">expression</replaceable> [, ...] ]
31-
[ HAVING <replaceable class="parameter">condition</replaceable>[, ...]]
31+
[ HAVING <replaceable class="parameter">condition</replaceable> ]
3232
[ WINDOW <replaceable class="parameter">window_name</replaceable> AS ( <replaceable class="parameter">window_definition</replaceable> ) [, ...] ]
3333
[ { UNION | INTERSECT | EXCEPT } [ ALL | DISTINCT ] <replaceable class="parameter">select</replaceable> ]
3434
[ ORDER BY <replaceable class="parameter">expression</replaceable> [ ASC | DESC | USING <replaceable class="parameter">operator</replaceable> ] [ NULLS { FIRST | LAST } ] [, ...] ]

‎doc/src/sgml/rules.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
769769
</para>
770770

771771
<para>
772-
The benefit of implementing views with the rule system is,
772+
The benefit of implementing views with the rule system is
773773
that the planner has all
774774
the information about which tables have to be scanned plus the
775775
relationships between these tables plus the restrictive
@@ -781,7 +781,7 @@ SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
781781
the best path to execute the query, and the more information
782782
the planner has, the better this decision can be. And
783783
the rule system as implemented in <productname>PostgreSQL</productname>
784-
ensures, that this is all information available about the query
784+
ensures that this is all information available about the query
785785
up to that point.
786786
</para>
787787
</sect2>
@@ -2086,7 +2086,7 @@ CREATE FUNCTION tricky(text, text) RETURNS bool AS $$
20862086
BEGIN
20872087
RAISE NOTICE '% =&gt; %', $1, $2;
20882088
RETURN true;
2089-
END
2089+
END;
20902090
$$ LANGUAGE plpgsql COST 0.0000000000000000000001;
20912091

20922092
SELECT * FROM phone_number WHERE tricky(person, phone);

‎doc/src/sgml/seg.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ test=&gt; select '6.25 .. 6.50'::seg as "pH";
197197
</table>
198198

199199
<para>
200-
Because <literal>...</literal> is widely used in data sources, it is allowed
201-
as an alternative spelling of <literal>..</literal>. Unfortunately, this
200+
Becausethe<literal>...</literal> operator is widely used in data sources, it is allowed
201+
as an alternative spelling ofthe<literal>..</literal> operator. Unfortunately, this
202202
creates a parsing ambiguity: it is not clear whether the upper bound
203203
in <literal>0...23</literal> is meant to be <literal>23</literal> or <literal>0.23</literal>.
204204
This is resolved by requiring at least one digit before the decimal

‎doc/src/sgml/textsearch.sgml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2403,7 +2403,7 @@ ALTER TEXT SEARCH CONFIGURATION astro_en
24032403
positions in <type>tsvector</type>, which in turn affect ranking:
24042404

24052405
<screen>
2406-
SELECT to_tsvector('english','in the list of stop words');
2406+
SELECT to_tsvector('english','in the list of stop words');
24072407
to_tsvector
24082408
----------------------------
24092409
'list':3 'stop':5 'word':6
@@ -2413,12 +2413,12 @@ SELECT to_tsvector('english','in the list of stop words');
24132413
calculated for documents with and without stop words are quite different:
24142414

24152415
<screen>
2416-
SELECT ts_rank_cd (to_tsvector('english','in the list of stop words'), to_tsquery('list &amp; stop'));
2416+
SELECT ts_rank_cd (to_tsvector('english','in the list of stop words'), to_tsquery('list &amp; stop'));
24172417
ts_rank_cd
24182418
------------
24192419
0.05
24202420

2421-
SELECT ts_rank_cd (to_tsvector('english','list stop words'), to_tsquery('list &amp; stop'));
2421+
SELECT ts_rank_cd (to_tsvector('english','list stop words'), to_tsquery('list &amp; stop'));
24222422
ts_rank_cd
24232423
------------
24242424
0.1
@@ -2477,12 +2477,12 @@ CREATE TEXT SEARCH DICTIONARY public.simple_dict (
24772477
Now we can test our dictionary:
24782478

24792479
<screen>
2480-
SELECT ts_lexize('public.simple_dict','YeS');
2480+
SELECT ts_lexize('public.simple_dict','YeS');
24812481
ts_lexize
24822482
-----------
24832483
{yes}
24842484

2485-
SELECT ts_lexize('public.simple_dict','The');
2485+
SELECT ts_lexize('public.simple_dict','The');
24862486
ts_lexize
24872487
-----------
24882488
{}
@@ -2498,12 +2498,12 @@ SELECT ts_lexize('public.simple_dict','The');
24982498
<screen>
24992499
ALTER TEXT SEARCH DICTIONARY public.simple_dict ( Accept = false );
25002500

2501-
SELECT ts_lexize('public.simple_dict','YeS');
2501+
SELECT ts_lexize('public.simple_dict','YeS');
25022502
ts_lexize
25032503
-----------
25042504

25052505

2506-
SELECT ts_lexize('public.simple_dict','The');
2506+
SELECT ts_lexize('public.simple_dict','The');
25072507
ts_lexize
25082508
-----------
25092509
{}
@@ -2617,21 +2617,21 @@ indices index*
26172617
Then we will get these results:
26182618
<screen>
26192619
mydb=# CREATE TEXT SEARCH DICTIONARY syn (template=synonym, synonyms='synonym_sample');
2620-
mydb=# SELECT ts_lexize('syn','indices');
2620+
mydb=# SELECT ts_lexize('syn','indices');
26212621
ts_lexize
26222622
-----------
26232623
{index}
26242624
(1 row)
26252625

26262626
mydb=# CREATE TEXT SEARCH CONFIGURATION tst (copy=simple);
26272627
mydb=# ALTER TEXT SEARCH CONFIGURATION tst ALTER MAPPING FOR asciiword WITH syn;
2628-
mydb=# SELECT to_tsvector('tst','indices');
2628+
mydb=# SELECT to_tsvector('tst','indices');
26292629
to_tsvector
26302630
-------------
26312631
'index':1
26322632
(1 row)
26332633

2634-
mydb=# SELECT to_tsquery('tst','indices');
2634+
mydb=# SELECT to_tsquery('tst','indices');
26352635
to_tsquery
26362636
------------
26372637
'index':*
@@ -2643,7 +2643,7 @@ mydb=# SELECT 'indexes are very useful'::tsvector;
26432643
'are' 'indexes' 'useful' 'very'
26442644
(1 row)
26452645

2646-
mydb=# SELECT 'indexes are very useful'::tsvector @@ to_tsquery('tst','indices');
2646+
mydb=# SELECT 'indexes are very useful'::tsvector @@ to_tsquery('tst','indices');
26472647
?column?
26482648
----------
26492649
t
@@ -3338,7 +3338,7 @@ ts_debug(<optional> <replaceable class="parameter">config</replaceable> <type>re
33383338
Here is a simple example:
33393339

33403340
<screen>
3341-
SELECT * FROM ts_debug('english','a fat cat sat on a mat - it ate a fat rats');
3341+
SELECT * FROM ts_debug('english','a fat cat sat on a mat - it ate a fat rats');
33423342
alias | description | token | dictionaries | dictionary | lexemes
33433343
-----------+-----------------+-------+----------------+--------------+---------
33443344
asciiword | Word, all ASCII | a | {english_stem} | english_stem | {}
@@ -3389,7 +3389,7 @@ ALTER TEXT SEARCH CONFIGURATION public.english
33893389
</programlisting>
33903390

33913391
<screen>
3392-
SELECT * FROM ts_debug('public.english','The Brightest supernovaes');
3392+
SELECT * FROM ts_debug('public.english','The Brightest supernovaes');
33933393
alias | description | token | dictionaries | dictionary | lexemes
33943394
-----------+-----------------+-------------+-------------------------------+----------------+-------------
33953395
asciiword | Word, all ASCII | The | {english_ispell,english_stem} | english_ispell | {}
@@ -3428,7 +3428,7 @@ SELECT * FROM ts_debug('public.english','The Brightest supernovaes');
34283428

34293429
<screen>
34303430
SELECT alias, token, dictionary, lexemes
3431-
FROM ts_debug('public.english','The Brightest supernovaes');
3431+
FROM ts_debug('public.english','The Brightest supernovaes');
34323432
alias | token | dictionary | lexemes
34333433
-----------+-------------+----------------+-------------
34343434
asciiword | The | english_ispell | {}
@@ -3576,7 +3576,7 @@ SELECT ts_lexize('english_stem', 'a');
35763576
where this can be confusing:
35773577

35783578
<screen>
3579-
SELECT ts_lexize('thesaurus_astro','supernovae stars') is null;
3579+
SELECT ts_lexize('thesaurus_astro','supernovae stars') is null;
35803580
?column?
35813581
----------
35823582
t

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp