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

Commitb7375e0

Browse files
committed
Merge branch 'REL9_6_STABLE' into PGPRO9_6
Conflicts:src/Makefile
2 parents32887ab +fc37e2a commitb7375e0

File tree

25 files changed

+733
-93
lines changed

25 files changed

+733
-93
lines changed

‎doc/src/sgml/catalogs.sgml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7604,6 +7604,11 @@
76047604
application.
76057605
</para>
76067606

7607+
<para>
7608+
By default, the <structname>pg_config</structname> view can be read
7609+
only by superusers.
7610+
</para>
7611+
76077612
<table>
76087613
<title><structname>pg_config</> Columns</title>
76097614
<tgroup cols="3">
@@ -7779,8 +7784,8 @@
77797784
</para>
77807785

77817786
<para>
7782-
The<structname>pg_file_settings</structname> view can be read only by
7783-
superusers.
7787+
By default, the<structname>pg_file_settings</structname> view can be read
7788+
only bysuperusers.
77847789
</para>
77857790

77867791
<table>

‎doc/src/sgml/config.sgml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2027,6 +2027,11 @@ include_dir 'conf.d'
20272027
as much CPU time, memory, I/O bandwidth, and so forth as a query which
20282028
uses no workers at all.
20292029
</para>
2030+
2031+
<para>
2032+
For more information on parallel query, see
2033+
<xref linkend="parallel-query">.
2034+
</para>
20302035
</listitem>
20312036
</varlistentry>
20322037

‎doc/src/sgml/filelist.sgml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<!ENTITY indices SYSTEM "indices.sgml">
2525
<!ENTITY json SYSTEM "json.sgml">
2626
<!ENTITY mvcc SYSTEM "mvcc.sgml">
27+
<!ENTITY parallel SYSTEM "parallel.sgml">
2728
<!ENTITY perform SYSTEM "perform.sgml">
2829
<!ENTITY queries SYSTEM "queries.sgml">
2930
<!ENTITY rangetypes SYSTEM "rangetypes.sgml">

‎doc/src/sgml/func.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8302,12 +8302,12 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
83028302
<row>
83038303
<entry> <literal>#</literal> </entry>
83048304
<entry>Point or box of intersection</entry>
8305-
<entry><literal>'((1,-1),(-1,1))' # '((1,1),(-1,-1))'</literal></entry>
8305+
<entry><literal>box'((1,-1),(-1,1))' #box'((1,1),(-2,-2))'</literal></entry>
83068306
</row>
83078307
<row>
83088308
<entry> <literal>#</literal> </entry>
83098309
<entry>Number of points in path or polygon</entry>
8310-
<entry><literal># '((1,0),(0,1),(-1,0))'</literal></entry>
8310+
<entry><literal>#path'((1,0),(0,1),(-1,0))'</literal></entry>
83118311
</row>
83128312
<row>
83138313
<entry> <literal>@-@</literal> </entry>

‎doc/src/sgml/installation.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,7 @@ su - postgres
15031503
will take a few minutes depending on your
15041504
hardware. The last line displayed should be:
15051505
<screen>
1506-
All of PostgreSQLissuccessfully made. Ready to install.
1506+
All of PostgreSQL successfully made. Ready to install.
15071507
</screen>
15081508
</para>
15091509

@@ -1516,7 +1516,7 @@ All of PostgreSQL is successfully made. Ready to install.
15161516
</screen>
15171517
The last line displayed should be:
15181518
<screen>
1519-
PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
1519+
PostgreSQL, contrib, and documentation successfully made. Ready to install.
15201520
</screen>
15211521
</para>
15221522
</step>

0 commit comments

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