From 12c58b1b6b90afeac6aa46d8a66a50805f4fe6f7 Mon Sep 17 00:00:00 2001
From: David Yozie <yozie@apache.org>
Date: Tue, 4 Apr 2017 15:41:22 -0700
Subject: [PATCH] un-nesting, renaming authorization topics

---
 .../source/subnavs/apache-hawq-nav.erb        | 25 +++++++------------
 .../hawq-access-checks.html.md.erb            |  2 +-
 markdown/clientaccess/roles_privs.html.md.erb |  2 +-
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/book/master_middleman/source/subnavs/apache-hawq-nav.erb b/book/master_middleman/source/subnavs/apache-hawq-nav.erb
index c5795b6..054cc01 100644
--- a/book/master_middleman/source/subnavs/apache-hawq-nav.erb
+++ b/book/master_middleman/source/subnavs/apache-hawq-nav.erb
@@ -137,20 +137,15 @@
           <li>
             <a href="/docs/userguide/2.2.0.0-incubating/clientaccess/disable-kerberos.html">Disabling Kerberos Security</a>
           </li>
+          <li>
+              <a href="/docs/userguide/2.2.0.0-incubating/clientaccess/hawq-access-checks.html">Overview of HAWQ Authorization</a>
+          </li>
+          <li>
+              <a href="/docs/userguide/2.2.0.0-incubating/clientaccess/roles_privs.html">Using HAWQ Native Authorization</a>
+          </li>
           <li class="has_submenu">
-            <span>
-              Authorizing Access to HAWQ Resources
-            </span>
-            <ul>
-            <li>
-              <a href="/docs/userguide/2.2.0.0-incubating/clientaccess/hawq-access-checks.html">Introducing HAWQ Authorization</a>
-            </li>
-            <li>
-              <a href="/docs/userguide/2.2.0.0-incubating/clientaccess/roles_privs.html">Using HAWQ to Manage Roles and Privileges</a>
-            </li>
-               <li class="has_submenu">
                      <span>
-                        Using Ranger to Manage Access to HAWQ Resources
+                        Using Ranger for Authorization
                      </span>
                <ul>
                   <li>
@@ -177,10 +172,8 @@
                      <a href="/docs/userguide/2.2.0.0-incubating/ranger/ranger-auditing.html">Auditing Authorization Events</a>
                   </li>
                </ul>
-            </li>
-         </ul>
-         </li>
-         <li>
+          </li>
+          <li>
             <a href="/docs/userguide/2.2.0.0-incubating/clientaccess/g-establishing-a-database-session.html">Establishing a Database Session</a>
           </li>
           <li>
diff --git a/markdown/clientaccess/hawq-access-checks.html.md.erb b/markdown/clientaccess/hawq-access-checks.html.md.erb
index d90614b..ee7a961 100644
--- a/markdown/clientaccess/hawq-access-checks.html.md.erb
+++ b/markdown/clientaccess/hawq-access-checks.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title: Introducing HAWQ Authorization
+title: Overview of HAWQ Authorization
 ---
 
 <!--
diff --git a/markdown/clientaccess/roles_privs.html.md.erb b/markdown/clientaccess/roles_privs.html.md.erb
index 6c496b3..2675c75 100644
--- a/markdown/clientaccess/roles_privs.html.md.erb
+++ b/markdown/clientaccess/roles_privs.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title: Managing Roles and Privileges
+title: Using HAWQ Native Authorization
 ---
 
 <!--