A bit of documentation-hacking later, here is the complete proposed patch
including docs updates.
As a reminder, I'm proposing to apply this to the back branches as well.
There's some further cleanup that should only happen in HEAD, but I think
we are going to be hearing about it if released branches fail to cope
nicely with the upcoming Russian zone changes.
regards, tom lane