Commit392623e

committed

Merge branch 'PGPRO9_6' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO9_6

2 parents5cd21bd +1303c7c commit392623eCopy full SHA for 392623e

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1037,7 +1037,7 @@ ERROR: could not serialize access due to read/write dependencies among transact`
`1037`	`1037`	`<para>`
`1038`	`1038`	`Besides, there are two additional lock modes designed to support`
`1039`	`1039`	`<application>1C Enterprise</application>. These modes do not conflict`
`1040`		`- with any other lock modes described above.They use is possible, but not`
	`1040`	`+ with any other lock modes described above.Their use is possible, but not`
`1041`	`1041`	`encouraged, as <link linkend="advisory-locks">advisory locks</link> provide`
`1042`	`1042`	`the same functionality.`
`1043`	`1043`	`</para>`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1149,7 +1149,9 @@ pg_probackup restore -j 4`
`1149`	`1149`	`<listitem>`
`1150`	`1150`	`<para>`
`1151`	`1151`	`Only full backups are supported when using`
`1152`		`- <ulink url="https://postgrespro.com/docs/postgresproee/current/cfs.html">compressed tablespaces</link>`
	`1152`	`+ <ulink`
	`1153`	`+ url="https://postgrespro.com/docs/postgresproee/current/cfs.html">compressed`
	`1154`	`+ tablespaces</ulink>`
`1153`	`1155`	`(<productname>Postgres Pro Enterprise</productname> feature).`
`1154`	`1156`	`</para>`
`1155`	`1157`	`</listitem>`

Comments

(0)