Re: Simplify COMMENT and SECURITY LABEL documentation

2021-06-05 Thread Peter Eisentraut

On 02.06.21 21:32, Alvaro Herrera wrote:

On 2021-Jun-02, Peter Eisentraut wrote:


On 01.06.21 17:56, Alvaro Herrera wrote:

+1 for the concept, but I feel that "live in" is a bit too informal
for this context.  I'm too caffeine-deprived to instantly come up
with le mot juste; but perhaps "exist within" would be an improvement?


The glossary uses "reside in".


I like that.


So I would adjust the glossary as in the attached patch.


done and done





some issues in logicaldecoding.sgml

2021-06-05 Thread Erik Rijkers


-- logicaldecoding.sgml:


1. A 'the the' typo fixed, and 'two phase commit' changed to 'two-phased 
commit' -- see attached, only for v14, I think.



2. Arrow-break:  Sometimes, in the .PDF,  words like 'ctx->out'  happen 
to break off inside the '->'  making it difficult to read.  Is there a 
way to keep that arrow intact in the pdf output?  I see it only one 
place (just below 'Functions for Producing Output') so it's not a big 
deal.  I don't think it happens in the html output.



3. Inside this same file it says  'may it be'  instead of  'be it'.
Perhaps 'may it be' is correct too but it struck me as strange.


Erik Rijkers

--- doc/src/sgml/logicaldecoding.sgml.orig	2021-06-05 10:55:23.371856767 +0200
+++ doc/src/sgml/logicaldecoding.sgml	2021-06-05 11:48:58.34628 +0200
@@ -1125,7 +1125,7 @@
 When streaming an in-progress transaction, the changes (and messages) are
 streamed in blocks demarcated by stream_start_cb
 and stream_stop_cb callbacks. Once all the decoded
-changes are transmitted, the transaction can be committed using the
+changes are transmitted, the transaction can be committed using
 the stream_commit_cb callback
 (or possibly aborted using the stream_abort_cb callback).
 If two-phase commits are supported, the transaction can be prepared using the
@@ -1222,7 +1222,7 @@

 

-When a prepared transaction is rolled back using the
+When a prepared transaction is rolled back using
 ROLLBACK PREPARED, then the
 rollback_prepared_cb callback is invoked and when the
 prepared transaction is committed using COMMIT PREPARED,
@@ -1251,7 +1251,7 @@
 
  
   
-   The logical replication solution that builds distributed two phase commit
+   The logical replication solution that builds distributed two-phase commit
using this feature can deadlock if the prepared transaction has locked
[user] catalog tables exclusively. They need to inform users to not have
locks on catalog tables (via explicit LOCK command) in