Skip to content

Commit 9bc553c

Browse files
committed
Merge branch 'PGPROEE9_6' of https://gitlab.postgrespro.ru/pgpro-dev/postgrespro into PGPROEE9_6
2 parents b76ac6c + e4bb915 commit 9bc553c

19 files changed

+1552
-670
lines changed

doc/src/sgml/catalogs.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@
13141314
<literal>md5</> followed by a 32-character hexadecimal MD5 hash.
13151315
The MD5 hash will be of the user's password concatenated to their
13161316
user name. For example, if user <literal>joe</> has password
1317-
<literal>xyzzy</>, <productname>PostgreSQL</> will store the md5
1317+
<literal>xyzzy</>, <productname>&productname;</> will store the md5
13181318
hash of <literal>xyzzyjoe</>. If the password is encrypted with
13191319
SCRAM-SHA-256, it is built with 4 fields separated by a colon. The
13201320
first field is a salt encoded in base-64. The second field is the

doc/src/sgml/client-auth.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -905,8 +905,8 @@ omicron bryanh guest1
905905
</indexterm>
906906

907907
<para>
908-
The password-based authentication methods are <literal>md5</>
909-
<literal>scram</> and <literal>password</>. These methods operate
908+
The password-based authentication methods are <literal>md5</>,
909+
<literal>scram</>, and <literal>password</>. These methods operate
910910
similarly except for the way that the password is sent across the
911911
connection, namely MD5-hashed, SCRAM-SHA-256 and clear-text respectively.
912912
</para>

doc/src/sgml/contrib.sgml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ CREATE EXTENSION <replaceable>module_name</> FROM unpackaged;
133133
&online-analyze;
134134
&pageinspect;
135135
&passwordcheck;
136-
&pgarman;
137136
&pgbuffercache;
138137
&pgcrypto;
139138
&pgfreespacemap;
@@ -144,6 +143,7 @@ CREATE EXTENSION <replaceable>module_name</> FROM unpackaged;
144143
&pgrowlocks;
145144
&pgstatstatements;
146145
&pgstattuple;
146+
&pgtransfer;
147147
&pgtrgm;
148148
&pgvariables;
149149
&pgvisibility;
@@ -207,6 +207,7 @@ pages.
207207
</para>
208208

209209
&oid2name;
210+
&pgprobackup;
210211
&vacuumlo;
211212
</sect1>
212213

doc/src/sgml/filelist.sgml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<!ENTITY online-analyze SYSTEM "online-analyze.sgml">
139139
<!ENTITY pageinspect SYSTEM "pageinspect.sgml">
140140
<!ENTITY passwordcheck SYSTEM "passwordcheck.sgml">
141-
<!ENTITY pgarman SYSTEM "pgarman.sgml">
141+
<!ENTITY pgprobackup SYSTEM "pgprobackup.sgml">
142142
<!ENTITY pgbuffercache SYSTEM "pgbuffercache.sgml">
143143
<!ENTITY pgcrypto SYSTEM "pgcrypto.sgml">
144144
<!ENTITY pgfreespacemap SYSTEM "pgfreespacemap.sgml">
@@ -150,6 +150,7 @@
150150
<!ENTITY pgstandby SYSTEM "pgstandby.sgml">
151151
<!ENTITY pgstatstatements SYSTEM "pgstatstatements.sgml">
152152
<!ENTITY pgstattuple SYSTEM "pgstattuple.sgml">
153+
<!ENTITY pgtransfer SYSTEM "pgtransfer.sgml">
153154
<!ENTITY pgtrgm SYSTEM "pgtrgm.sgml">
154155
<!ENTITY pgvariables SYSTEM "pg_variables.sgml">
155156
<!ENTITY pgvisibility SYSTEM "pgvisibility.sgml">

doc/src/sgml/func.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@
13741374
</indexterm>
13751375
</entry>
13761376
<entry><literal>'Post' || 'greSQL'</literal></entry>
1377-
<entry><literal>&productname;</literal></entry>
1377+
<entry><literal>PostgreSQL</literal></entry>
13781378
</row>
13791379

13801380
<row>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy