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

vbwagner · vbwagner · commit 31eef57e0e0b · 2017-02-01T14:35:18.000+03:00
diff --git a/doc/src/sgml/atx.sgml b/doc/src/sgml/atx.sgml
@@ -53,7 +53,7 @@ BEGIN; -- start ordinary tx T0
 |
 INSERT INTO t VALUES (1);
 :\
-: BEGIN AUTONOMOUS SUBTRANSACTION; -- start AST tx T1, pushes T0 into stack
+: BEGIN AUTONOMOUS TRANSACTION; -- start AST tx T1, pushes T0 into stack
 : |
 : INSERT INTO t VALUES (2);
 : |

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ BEGIN; -- start ordinary tx T0`
`53`	`53`	`\|`
`54`	`54`	`INSERT INTO t VALUES (1);`
`55`	`55`	`:\`
`56`		`-: BEGIN AUTONOMOUS SUBTRANSACTION; -- start AST tx T1, pushes T0 into stack`
	`56`	`+: BEGIN AUTONOMOUS TRANSACTION; -- start AST tx T1, pushes T0 into stack`
`57`	`57`	`: \|`
`58`	`58`	`: INSERT INTO t VALUES (2);`
`59`	`59`	`: \|`