Re: Documentation: 21.5. Default Roles

[Bruce Momjian]

On Fri, Oct 23, 2020 at 05:40:37PM -0400, Stephen Frost wrote:
> Therefore, on the whole, the proposal that I would put out there is:
> 
> - Rename everything (code, docs, etc) to 'predefined roles' for v14+
> - Update the documentation (only) in back-branches to mention that the
>   feature was renamed in v14 to 'predefined roles'
> - Use the 'doc page alias' feature to make the documentation page for
>   'default roles' on the older versions link to 'predefined roles' in
>   the newer versions, and vice-versa

Sure, that works for me.  If it was only docs, backpatch makes more
sense, but once you showed the renaming in those other areas,
master-only makes more sense.  Thanks for working on this.

-- 
  Bruce Momjian  https://momjian.us
  EnterpriseDB https://enterprisedb.com

  The usefulness of a cup is in its emptiness, Bruce Lee

Re: Word fix

[Bruce Momjian]

On Wed, Oct 21, 2020 at 06:49:37AM -0700, David G. Johnston wrote:
> On Wed, Oct 21, 2020 at 1:14 AM PG Doc comments form 
> wrote:
> 
> The following documentation comment has been logged on the website:
> 
> Page: https://www.postgresql.org/docs/13/plpgsql-control-structures.html
> Description:
> 
> Search for the word indeed found here
> https://www.postgresql.org/docs/13/plpgsql-control-structures.html#
> PLPGSQL-STATEMENTS-RETURNING-PROCEDURE
> and replace with inside.
> 
> 
> Specifically:
> 
> "By default, any error occurring in a PL/pgSQL function aborts execution of 
> the
> function, and indeed of the surrounding transaction as well."
> 
> Replacing it with "inside" is not an improvement.  Removing "indeed of" is
> probably sufficient.

Fixed in all branches with the attached patch.

-- 
  Bruce Momjian  https://momjian.us
  EnterpriseDB https://enterprisedb.com

  The usefulness of a cup is in its emptiness, Bruce Lee

diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index 94a3b36458..9ec168b0c4 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -2670,8 +2670,8 @@ NOTICE:  row = {10,11,12}
 
 
  By default, any error occurring in a PL/pgSQL
- function aborts execution of the function, and indeed of the
- surrounding transaction as well.  You can trap errors and recover
+ function aborts execution of the function and the
+ surrounding transaction.  You can trap errors and recover
  from them by using a BEGIN block with an
  EXCEPTION clause.  The syntax is an extension of the
  normal syntax for a BEGIN block: