From 5f904924bc270fd2d8dcc29f8267515e79a07baf Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 2 Oct 2015 21:22:44 -0400
Subject: [PATCH] doc: Make some index terms and terminology more consistent

---
 doc/src/sgml/ddl.sgml               | 13 ++-----------
 doc/src/sgml/ref/create_policy.sgml |  2 +-
 doc/src/sgml/ref/create_role.sgml   |  2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index e9499d3a42..a796f6c906 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1512,20 +1512,11 @@ REVOKE ALL ON accounts FROM PUBLIC;
   <title>Row Security Policies</title>
 
   <indexterm zone="ddl-rowsecurity">
-   <primary>rowsecurity</primary>
+   <primary>row security</primary>
   </indexterm>
 
   <indexterm zone="ddl-rowsecurity">
-   <primary>rls</primary>
-  </indexterm>
-
-  <indexterm>
-   <primary>policies</primary>
-   <see>policy</see>
-  </indexterm>
-
-  <indexterm zone="ddl-rowsecurity">
-   <primary>POLICY</primary>
+   <primary>policy</primary>
   </indexterm>
 
   <para>
diff --git a/doc/src/sgml/ref/create_policy.sgml b/doc/src/sgml/ref/create_policy.sgml
index 7b4f9438cd..a4043f629d 100644
--- a/doc/src/sgml/ref/create_policy.sgml
+++ b/doc/src/sgml/ref/create_policy.sgml
@@ -112,7 +112,7 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
    the user running the overall query.  Therefore, users who are using a given
    policy must be able to access any tables or functions referenced in the
    expression or they will simply receive a permission denied error when
-   attempting to query the RLS-enabled table.  This does not change how views
+   attempting to query the table that has row-level security enabled.  This does not change how views
    work, however.  As with normal queries and views, permission checks and
    policies for the tables which are referenced by a view will use the view
    owner's rights and any policies which apply to the view owner.
diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml
index ea26027511..f4a176bff3 100644
--- a/doc/src/sgml/ref/create_role.sgml
+++ b/doc/src/sgml/ref/create_role.sgml
@@ -196,7 +196,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
       <term><literal>NOBYPASSRLS</literal></term>
       <listitem>
        <para>
-        These clauses determine whether a role is allowed to bypass row-security
+        These clauses determine whether a role is allowed to bypass row-level security (RLS)
         policies.  A role having the <literal>BYPASSRLS</literal> attribute will
         be allowed to bypass row-security policies by setting
         <literal>row_security</literal> to