From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 9 Feb 2020 19:22:08 +0000 (-0500)
Subject: Revert "docs: change "default role" wording to "predefined role""
X-Git-Tag: REL9_6_17~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=608006c1b9c328ccb4ccd730cc2161a77eb6c3d7;p=thirdparty%2Fpostgresql.git

Revert "docs: change "default role" wording to "predefined role""

This reverts commit 90d553dd96106ab278550e85d95a5663d77d7db7.

Per discussion, we can't change the section title without some
web-site work, so revert this change temporarily.

Discussion: https://postgr.es/m/157742545062.1149.11052653770497832538@wrigleys.postgresql.org
---

diff --git a/doc/src/sgml/release-9.6.sgml b/doc/src/sgml/release-9.6.sgml
index 7e2f6b7f314..54d1cf7a380 100644
--- a/doc/src/sgml/release-9.6.sgml
+++ b/doc/src/sgml/release-9.6.sgml
@@ -13819,7 +13819,7 @@ XXX this is pending backpatch, may need to remove
 2016-04-08 [7a542700d] Create default roles
 -->
        <para>
-        Create some <link linkend="predefined-roles">built-in roles</link>
+        Create some <link linkend="default-roles">built-in roles</link>
         that can be used to grant access to what were previously
         superuser-only functions (Stephen Frost)
        </para>
diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml
index 7ee8fbdcabb..2918c188281 100644
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -483,30 +483,30 @@ DROP ROLE doomed_role;
   </para>
  </sect1>
 
- <sect1 id="predefined-roles">
-  <title>Predefined Roles</title>
+ <sect1 id="default-roles">
+  <title>Default Roles</title>
 
-  <indexterm zone="predefined-roles">
+  <indexterm zone="default-roles">
    <primary>role</>
   </indexterm>
 
   <para>
-   <productname>PostgreSQL</productname> provides a set of predefined
-   roles which allow access to privileged capabilities and information.
-   Administrators can GRANT these roles to login and non-login roles,
-   providing those roles with access to the specified capabilities and
-   information.
+   <productname>PostgreSQL</productname> provides a set of default roles
+   which provide access to certain, commonly needed, privileged capabilities
+   and information.  Administrators can GRANT these roles to users and/or
+   other roles in their environment, providing those users with access to
+   the specified capabilities and information.
   </para>
 
   <para>
-   The predefined roles are described in <xref linkend="predefined-roles-table">.
-   Note that the specific permissions for each of the predefined roles may
+   The default roles are described in <xref linkend="default-roles-table">.
+   Note that the specific permissions for each of the default roles may
    change in the future as additional capabilities are added.  Administrators
    should monitor the release notes for changes.
   </para>
 
-   <table tocentry="1" id="predefined-roles-table">
-    <title>Predefined Roles</title>
+   <table tocentry="1" id="default-roles-table">
+    <title>Default Roles</title>
     <tgroup cols="2">
      <thead>
       <row>