Return-Path: 
 <commits-return-2582-apmail-drill-commits-archive=drill.apache.org@drill.apache.org>
X-Original-To: apmail-drill-commits-archive@www.apache.org
Delivered-To: apmail-drill-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3A2CA18FE5
	for <apmail-drill-commits-archive@www.apache.org>;
 Mon,  8 Jun 2015 23:12:08 +0000 (UTC)
Received: (qmail 63790 invoked by uid 500); 8 Jun 2015 23:12:08 -0000
Delivered-To: apmail-drill-commits-archive@drill.apache.org
Received: (qmail 63690 invoked by uid 500); 8 Jun 2015 23:12:08 -0000
Mailing-List: contact commits-help@drill.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@drill.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@drill.apache.org>
List-Post: <mailto:commits@drill.apache.org>
List-Id: <commits.drill.apache.org>
Reply-To: commits@drill.apache.org
Delivered-To: mailing list commits@drill.apache.org
Received: (qmail 63316 invoked by uid 99); 8 Jun 2015 23:12:07 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jun 2015 23:12:07 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id C05EBE005E; Mon,  8 Jun 2015 23:12:07 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bridgetb@apache.org
To: commits@drill.apache.org
Date: Mon, 08 Jun 2015 23:12:17 -0000
Message-Id: <a6bba913917e4f83a3778e8cf8dfc398@git.apache.org>
In-Reply-To: <26a12d1ab1b84b75a9443ac9bc2aae11@git.apache.org>
References: <26a12d1ab1b84b75a9443ac9bc2aae11@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [11/29] drill-site git commit: Doc updates and edits

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/query-directory-functions/index.html
----------------------------------------------------------------------
diff --git a/docs/query-directory-functions/index.html b/docs/query-directory-functions/index.html
index 77b955d..db90c44 100644
--- a/docs/query-directory-functions/index.html
+++ b/docs/query-directory-functions/index.html
@@ -63,8 +63,6 @@
       
         <li><a href="/docs/log-and-debug/">Log and Debug</a></li>
       
-        <li><a href="/docs/query-audit-logging/">Query Audit Logging</a></li>
-      
         <li><a href="/docs/sql-reference/">SQL Reference</a></li>
       
         <li><a href="/docs/data-sources-and-file-formats/">Data Sources and File Formats</a></li>
@@ -368,22 +366,27 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Linux and Mac OS X</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Installing the ODBC Driver</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-on-linux-and-mac-introduction/">ODBC on Linux and Mac Introduction</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-linux/">Installing the Driver on Linux</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-mac-os-x/">Installing the Driver on Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-linux-and-mac-os-x/">Configuring Connections on Linux and Mac OS X</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/driver-configuration-options/">Driver Configuration Options</a></li>
+            </ul>
+            
+          
+            
+              <li class="toctree-l2"><a href="javascript: void(0);">Configuring ODBC</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-configuration-reference/">ODBC Configuration Reference</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/using-a-connection-string/">Using a Connection String</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/advanced-properties/">Advanced Properties</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-windows/">Configuring ODBC on Windows</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a></li>
               
@@ -391,40 +394,33 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Windows</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill Explorer</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
-              
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-windows/">Configuring Connections on Windows</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows</a></li>
               
             </ul>
             
           
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/configuring-tibco-spotfire-server-with-drill/">Configuring Tibco Spotfire Server with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill with BI Tools</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-with-bi-tools-introduction/">Using Drill with BI Tools Introduction</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              
+            </ul>
             
           
           </ul>
@@ -579,15 +575,8 @@
               <li class="toctree-l2"><a class="reference internal" href="/docs/review-the-java-stack-trace/">Review the Java Stack Trace</a></li>
             
           
-          </ul>
-        
-      
-        
-          <li class="toctree-l1"><a href="javascript: void(0);">Query Audit Logging</a></li>
-          <ul style="display: none">
-          
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/getting-query-information/">Getting Query Information</a></li>
+              <li class="toctree-l2"><a class="reference internal" href="/docs/query-audit-logging/">Query Audit Logging</a></li>
             
           
           </ul>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/query-plans-and-tuning-introduction/index.html
----------------------------------------------------------------------
diff --git a/docs/query-plans-and-tuning-introduction/index.html b/docs/query-plans-and-tuning-introduction/index.html
index fb215cb..1decb33 100644
--- a/docs/query-plans-and-tuning-introduction/index.html
+++ b/docs/query-plans-and-tuning-introduction/index.html
@@ -63,8 +63,6 @@
       
         <li><a href="/docs/log-and-debug/">Log and Debug</a></li>
       
-        <li><a href="/docs/query-audit-logging/">Query Audit Logging</a></li>
-      
         <li><a href="/docs/sql-reference/">SQL Reference</a></li>
       
         <li><a href="/docs/data-sources-and-file-formats/">Data Sources and File Formats</a></li>
@@ -368,22 +366,27 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Linux and Mac OS X</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Installing the ODBC Driver</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-on-linux-and-mac-introduction/">ODBC on Linux and Mac Introduction</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-linux/">Installing the Driver on Linux</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-mac-os-x/">Installing the Driver on Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-linux-and-mac-os-x/">Configuring Connections on Linux and Mac OS X</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/driver-configuration-options/">Driver Configuration Options</a></li>
+            </ul>
+            
+          
+            
+              <li class="toctree-l2"><a href="javascript: void(0);">Configuring ODBC</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-configuration-reference/">ODBC Configuration Reference</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/using-a-connection-string/">Using a Connection String</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/advanced-properties/">Advanced Properties</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-windows/">Configuring ODBC on Windows</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a></li>
               
@@ -391,40 +394,33 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Windows</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill Explorer</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
-              
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-windows/">Configuring Connections on Windows</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows</a></li>
               
             </ul>
             
           
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/configuring-tibco-spotfire-server-with-drill/">Configuring Tibco Spotfire Server with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill with BI Tools</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-with-bi-tools-introduction/">Using Drill with BI Tools Introduction</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              
+            </ul>
             
           
           </ul>
@@ -579,15 +575,8 @@
               <li class="toctree-l2"><a class="reference internal" href="/docs/review-the-java-stack-trace/">Review the Java Stack Trace</a></li>
             
           
-          </ul>
-        
-      
-        
-          <li class="toctree-l1"><a href="javascript: void(0);">Query Audit Logging</a></li>
-          <ul style="display: none">
-          
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/getting-query-information/">Getting Query Information</a></li>
+              <li class="toctree-l2"><a class="reference internal" href="/docs/query-audit-logging/">Query Audit Logging</a></li>
             
           
           </ul>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/query-plans-and-tuning/index.html
----------------------------------------------------------------------
diff --git a/docs/query-plans-and-tuning/index.html b/docs/query-plans-and-tuning/index.html
index a144f4d..9f17ccd 100644
--- a/docs/query-plans-and-tuning/index.html
+++ b/docs/query-plans-and-tuning/index.html
@@ -63,8 +63,6 @@
       
         <li><a href="/docs/log-and-debug/">Log and Debug</a></li>
       
-        <li><a href="/docs/query-audit-logging/">Query Audit Logging</a></li>
-      
         <li><a href="/docs/sql-reference/">SQL Reference</a></li>
       
         <li><a href="/docs/data-sources-and-file-formats/">Data Sources and File Formats</a></li>
@@ -368,22 +366,27 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Linux and Mac OS X</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Installing the ODBC Driver</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-on-linux-and-mac-introduction/">ODBC on Linux and Mac Introduction</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-linux/">Installing the Driver on Linux</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-mac-os-x/">Installing the Driver on Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-linux-and-mac-os-x/">Configuring Connections on Linux and Mac OS X</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/driver-configuration-options/">Driver Configuration Options</a></li>
+            </ul>
+            
+          
+            
+              <li class="toctree-l2"><a href="javascript: void(0);">Configuring ODBC</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-configuration-reference/">ODBC Configuration Reference</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/using-a-connection-string/">Using a Connection String</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/advanced-properties/">Advanced Properties</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-windows/">Configuring ODBC on Windows</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a></li>
               
@@ -391,40 +394,33 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Windows</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill Explorer</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
-              
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-windows/">Configuring Connections on Windows</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows</a></li>
               
             </ul>
             
           
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/configuring-tibco-spotfire-server-with-drill/">Configuring Tibco Spotfire Server with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill with BI Tools</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-with-bi-tools-introduction/">Using Drill with BI Tools Introduction</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              
+            </ul>
             
           
           </ul>
@@ -579,15 +575,8 @@
               <li class="toctree-l2"><a class="reference internal" href="/docs/review-the-java-stack-trace/">Review the Java Stack Trace</a></li>
             
           
-          </ul>
-        
-      
-        
-          <li class="toctree-l1"><a href="javascript: void(0);">Query Audit Logging</a></li>
-          <ul style="display: none">
-          
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/getting-query-information/">Getting Query Information</a></li>
+              <li class="toctree-l2"><a class="reference internal" href="/docs/query-audit-logging/">Query Audit Logging</a></li>
             
           
           </ul>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/query-plans/index.html
----------------------------------------------------------------------
diff --git a/docs/query-plans/index.html b/docs/query-plans/index.html
index 692941f..74ef7d2 100644
--- a/docs/query-plans/index.html
+++ b/docs/query-plans/index.html
@@ -63,8 +63,6 @@
       
         <li><a href="/docs/log-and-debug/">Log and Debug</a></li>
       
-        <li><a href="/docs/query-audit-logging/">Query Audit Logging</a></li>
-      
         <li><a href="/docs/sql-reference/">SQL Reference</a></li>
       
         <li><a href="/docs/data-sources-and-file-formats/">Data Sources and File Formats</a></li>
@@ -368,22 +366,27 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Linux and Mac OS X</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Installing the ODBC Driver</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-on-linux-and-mac-introduction/">ODBC on Linux and Mac Introduction</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-linux/">Installing the Driver on Linux</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-mac-os-x/">Installing the Driver on Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-linux-and-mac-os-x/">Configuring Connections on Linux and Mac OS X</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/driver-configuration-options/">Driver Configuration Options</a></li>
+            </ul>
+            
+          
+            
+              <li class="toctree-l2"><a href="javascript: void(0);">Configuring ODBC</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-configuration-reference/">ODBC Configuration Reference</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/using-a-connection-string/">Using a Connection String</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/advanced-properties/">Advanced Properties</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-windows/">Configuring ODBC on Windows</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a></li>
               
@@ -391,40 +394,33 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Windows</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill Explorer</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
-              
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-windows/">Configuring Connections on Windows</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows</a></li>
               
             </ul>
             
           
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/configuring-tibco-spotfire-server-with-drill/">Configuring Tibco Spotfire Server with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill with BI Tools</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-with-bi-tools-introduction/">Using Drill with BI Tools Introduction</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              
+            </ul>
             
           
           </ul>
@@ -579,15 +575,8 @@
               <li class="toctree-l2"><a class="reference internal" href="/docs/review-the-java-stack-trace/">Review the Java Stack Trace</a></li>
             
           
-          </ul>
-        
-      
-        
-          <li class="toctree-l1"><a href="javascript: void(0);">Query Audit Logging</a></li>
-          <ul style="display: none">
-          
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/getting-query-information/">Getting Query Information</a></li>
+              <li class="toctree-l2"><a class="reference internal" href="/docs/query-audit-logging/">Query Audit Logging</a></li>
             
           
           </ul>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/query-profile-column-descriptions/index.html
----------------------------------------------------------------------
diff --git a/docs/query-profile-column-descriptions/index.html b/docs/query-profile-column-descriptions/index.html
index 21b5fd1..1646e04 100644
--- a/docs/query-profile-column-descriptions/index.html
+++ b/docs/query-profile-column-descriptions/index.html
@@ -63,8 +63,6 @@
       
         <li><a href="/docs/log-and-debug/">Log and Debug</a></li>
       
-        <li><a href="/docs/query-audit-logging/">Query Audit Logging</a></li>
-      
         <li><a href="/docs/sql-reference/">SQL Reference</a></li>
       
         <li><a href="/docs/data-sources-and-file-formats/">Data Sources and File Formats</a></li>
@@ -368,22 +366,27 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Linux and Mac OS X</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Installing the ODBC Driver</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-on-linux-and-mac-introduction/">ODBC on Linux and Mac Introduction</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-linux/">Installing the Driver on Linux</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-mac-os-x/">Installing the Driver on Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-linux-and-mac-os-x/">Configuring Connections on Linux and Mac OS X</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/driver-configuration-options/">Driver Configuration Options</a></li>
+            </ul>
+            
+          
+            
+              <li class="toctree-l2"><a href="javascript: void(0);">Configuring ODBC</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-configuration-reference/">ODBC Configuration Reference</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/using-a-connection-string/">Using a Connection String</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/advanced-properties/">Advanced Properties</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-windows/">Configuring ODBC on Windows</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a></li>
               
@@ -391,40 +394,33 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Windows</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill Explorer</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
-              
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-windows/">Configuring Connections on Windows</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows</a></li>
               
             </ul>
             
           
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/configuring-tibco-spotfire-server-with-drill/">Configuring Tibco Spotfire Server with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill with BI Tools</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-with-bi-tools-introduction/">Using Drill with BI Tools Introduction</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              
+            </ul>
             
           
           </ul>
@@ -579,15 +575,8 @@
               <li class="toctree-l2"><a class="reference internal" href="/docs/review-the-java-stack-trace/">Review the Java Stack Trace</a></li>
             
           
-          </ul>
-        
-      
-        
-          <li class="toctree-l1"><a href="javascript: void(0);">Query Audit Logging</a></li>
-          <ul style="display: none">
-          
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/getting-query-information/">Getting Query Information</a></li>
+              <li class="toctree-l2"><a class="reference internal" href="/docs/query-audit-logging/">Query Audit Logging</a></li>
             
           
           </ul>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/query-profiles/index.html
----------------------------------------------------------------------
diff --git a/docs/query-profiles/index.html b/docs/query-profiles/index.html
index b8e1e62..bee402c 100644
--- a/docs/query-profiles/index.html
+++ b/docs/query-profiles/index.html
@@ -63,8 +63,6 @@
       
         <li><a href="/docs/log-and-debug/">Log and Debug</a></li>
       
-        <li><a href="/docs/query-audit-logging/">Query Audit Logging</a></li>
-      
         <li><a href="/docs/sql-reference/">SQL Reference</a></li>
       
         <li><a href="/docs/data-sources-and-file-formats/">Data Sources and File Formats</a></li>
@@ -368,22 +366,27 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Linux and Mac OS X</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Installing the ODBC Driver</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-on-linux-and-mac-introduction/">ODBC on Linux and Mac Introduction</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-linux/">Installing the Driver on Linux</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-mac-os-x/">Installing the Driver on Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-linux-and-mac-os-x/">Configuring Connections on Linux and Mac OS X</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/driver-configuration-options/">Driver Configuration Options</a></li>
+            </ul>
+            
+          
+            
+              <li class="toctree-l2"><a href="javascript: void(0);">Configuring ODBC</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-configuration-reference/">ODBC Configuration Reference</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/using-a-connection-string/">Using a Connection String</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/advanced-properties/">Advanced Properties</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-windows/">Configuring ODBC on Windows</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a></li>
               
@@ -391,40 +394,33 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Windows</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill Explorer</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
-              
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-windows/">Configuring Connections on Windows</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows</a></li>
               
             </ul>
             
           
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/configuring-tibco-spotfire-server-with-drill/">Configuring Tibco Spotfire Server with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill with BI Tools</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-with-bi-tools-introduction/">Using Drill with BI Tools Introduction</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              
+            </ul>
             
           
           </ul>
@@ -579,15 +575,8 @@
               <li class="toctree-l2"><a class="reference internal" href="/docs/review-the-java-stack-trace/">Review the Java Stack Trace</a></li>
             
           
-          </ul>
-        
-      
-        
-          <li class="toctree-l1"><a href="javascript: void(0);">Query Audit Logging</a></li>
-          <ul style="display: none">
-          
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/getting-query-information/">Getting Query Information</a></li>
+              <li class="toctree-l2"><a class="reference internal" href="/docs/query-audit-logging/">Query Audit Logging</a></li>
             
           
           </ul>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/query-stages/index.html
----------------------------------------------------------------------
diff --git a/docs/query-stages/index.html b/docs/query-stages/index.html
index 283ae40..b85220f 100644
--- a/docs/query-stages/index.html
+++ b/docs/query-stages/index.html
@@ -63,8 +63,6 @@
       
         <li><a href="/docs/log-and-debug/">Log and Debug</a></li>
       
-        <li><a href="/docs/query-audit-logging/">Query Audit Logging</a></li>
-      
         <li><a href="/docs/sql-reference/">SQL Reference</a></li>
       
         <li><a href="/docs/data-sources-and-file-formats/">Data Sources and File Formats</a></li>
@@ -368,22 +366,27 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Linux and Mac OS X</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Installing the ODBC Driver</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-on-linux-and-mac-introduction/">ODBC on Linux and Mac Introduction</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-linux/">Installing the Driver on Linux</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-mac-os-x/">Installing the Driver on Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-linux-and-mac-os-x/">Configuring Connections on Linux and Mac OS X</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/driver-configuration-options/">Driver Configuration Options</a></li>
+            </ul>
+            
+          
+            
+              <li class="toctree-l2"><a href="javascript: void(0);">Configuring ODBC</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-configuration-reference/">ODBC Configuration Reference</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/using-a-connection-string/">Using a Connection String</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/advanced-properties/">Advanced Properties</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-windows/">Configuring ODBC on Windows</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a></li>
               
@@ -391,40 +394,33 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Windows</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill Explorer</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
-              
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-windows/">Configuring Connections on Windows</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows</a></li>
               
             </ul>
             
           
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/configuring-tibco-spotfire-server-with-drill/">Configuring Tibco Spotfire Server with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill with BI Tools</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-with-bi-tools-introduction/">Using Drill with BI Tools Introduction</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              
+            </ul>
             
           
           </ul>
@@ -579,15 +575,8 @@
               <li class="toctree-l2"><a class="reference internal" href="/docs/review-the-java-stack-trace/">Review the Java Stack Trace</a></li>
             
           
-          </ul>
-        
-      
-        
-          <li class="toctree-l1"><a href="javascript: void(0);">Query Audit Logging</a></li>
-          <ul style="display: none">
-          
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/getting-query-information/">Getting Query Information</a></li>
+              <li class="toctree-l2"><a class="reference internal" href="/docs/query-audit-logging/">Query Audit Logging</a></li>
             
           
           </ul>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/querying-a-file-system-introduction/index.html
----------------------------------------------------------------------
diff --git a/docs/querying-a-file-system-introduction/index.html b/docs/querying-a-file-system-introduction/index.html
index 30db692..bea1386 100644
--- a/docs/querying-a-file-system-introduction/index.html
+++ b/docs/querying-a-file-system-introduction/index.html
@@ -63,8 +63,6 @@
       
         <li><a href="/docs/log-and-debug/">Log and Debug</a></li>
       
-        <li><a href="/docs/query-audit-logging/">Query Audit Logging</a></li>
-      
         <li><a href="/docs/sql-reference/">SQL Reference</a></li>
       
         <li><a href="/docs/data-sources-and-file-formats/">Data Sources and File Formats</a></li>
@@ -368,22 +366,27 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Linux and Mac OS X</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Installing the ODBC Driver</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-on-linux-and-mac-introduction/">ODBC on Linux and Mac Introduction</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-linux/">Installing the Driver on Linux</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-mac-os-x/">Installing the Driver on Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-linux-and-mac-os-x/">Configuring Connections on Linux and Mac OS X</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/driver-configuration-options/">Driver Configuration Options</a></li>
+            </ul>
+            
+          
+            
+              <li class="toctree-l2"><a href="javascript: void(0);">Configuring ODBC</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-configuration-reference/">ODBC Configuration Reference</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/using-a-connection-string/">Using a Connection String</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/advanced-properties/">Advanced Properties</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-windows/">Configuring ODBC on Windows</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a></li>
               
@@ -391,40 +394,33 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Windows</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill Explorer</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
-              
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-windows/">Configuring Connections on Windows</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows</a></li>
               
             </ul>
             
           
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/configuring-tibco-spotfire-server-with-drill/">Configuring Tibco Spotfire Server with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill with BI Tools</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-with-bi-tools-introduction/">Using Drill with BI Tools Introduction</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              
+            </ul>
             
           
           </ul>
@@ -579,15 +575,8 @@
               <li class="toctree-l2"><a class="reference internal" href="/docs/review-the-java-stack-trace/">Review the Java Stack Trace</a></li>
             
           
-          </ul>
-        
-      
-        
-          <li class="toctree-l1"><a href="javascript: void(0);">Query Audit Logging</a></li>
-          <ul style="display: none">
-          
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/getting-query-information/">Getting Query Information</a></li>
+              <li class="toctree-l2"><a class="reference internal" href="/docs/query-audit-logging/">Query Audit Logging</a></li>
             
           
           </ul>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/querying-a-file-system/index.html
----------------------------------------------------------------------
diff --git a/docs/querying-a-file-system/index.html b/docs/querying-a-file-system/index.html
index 3e0c2c7..356de7f 100644
--- a/docs/querying-a-file-system/index.html
+++ b/docs/querying-a-file-system/index.html
@@ -63,8 +63,6 @@
       
         <li><a href="/docs/log-and-debug/">Log and Debug</a></li>
       
-        <li><a href="/docs/query-audit-logging/">Query Audit Logging</a></li>
-      
         <li><a href="/docs/sql-reference/">SQL Reference</a></li>
       
         <li><a href="/docs/data-sources-and-file-formats/">Data Sources and File Formats</a></li>
@@ -368,22 +366,27 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Linux and Mac OS X</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Installing the ODBC Driver</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-on-linux-and-mac-introduction/">ODBC on Linux and Mac Introduction</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-linux/">Installing the Driver on Linux</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-mac-os-x/">Installing the Driver on Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-linux-and-mac-os-x/">Configuring Connections on Linux and Mac OS X</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/driver-configuration-options/">Driver Configuration Options</a></li>
+            </ul>
+            
+          
+            
+              <li class="toctree-l2"><a href="javascript: void(0);">Configuring ODBC</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-configuration-reference/">ODBC Configuration Reference</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/using-a-connection-string/">Using a Connection String</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/advanced-properties/">Advanced Properties</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-windows/">Configuring ODBC on Windows</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a></li>
               
@@ -391,40 +394,33 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Windows</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill Explorer</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
-              
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-windows/">Configuring Connections on Windows</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows</a></li>
               
             </ul>
             
           
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/configuring-tibco-spotfire-server-with-drill/">Configuring Tibco Spotfire Server with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill with BI Tools</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-with-bi-tools-introduction/">Using Drill with BI Tools Introduction</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              
+            </ul>
             
           
           </ul>
@@ -579,15 +575,8 @@
               <li class="toctree-l2"><a class="reference internal" href="/docs/review-the-java-stack-trace/">Review the Java Stack Trace</a></li>
             
           
-          </ul>
-        
-      
-        
-          <li class="toctree-l1"><a href="javascript: void(0);">Query Audit Logging</a></li>
-          <ul style="display: none">
-          
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/getting-query-information/">Getting Query Information</a></li>
+              <li class="toctree-l2"><a class="reference internal" href="/docs/query-audit-logging/">Query Audit Logging</a></li>
             
           
           </ul>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/querying-complex-data-introduction/index.html
----------------------------------------------------------------------
diff --git a/docs/querying-complex-data-introduction/index.html b/docs/querying-complex-data-introduction/index.html
index b86ebae..c51d5ec 100644
--- a/docs/querying-complex-data-introduction/index.html
+++ b/docs/querying-complex-data-introduction/index.html
@@ -63,8 +63,6 @@
       
         <li><a href="/docs/log-and-debug/">Log and Debug</a></li>
       
-        <li><a href="/docs/query-audit-logging/">Query Audit Logging</a></li>
-      
         <li><a href="/docs/sql-reference/">SQL Reference</a></li>
       
         <li><a href="/docs/data-sources-and-file-formats/">Data Sources and File Formats</a></li>
@@ -368,22 +366,27 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Linux and Mac OS X</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Installing the ODBC Driver</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-on-linux-and-mac-introduction/">ODBC on Linux and Mac Introduction</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-linux/">Installing the Driver on Linux</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-mac-os-x/">Installing the Driver on Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-linux-and-mac-os-x/">Configuring Connections on Linux and Mac OS X</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/driver-configuration-options/">Driver Configuration Options</a></li>
+            </ul>
+            
+          
+            
+              <li class="toctree-l2"><a href="javascript: void(0);">Configuring ODBC</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-configuration-reference/">ODBC Configuration Reference</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/using-a-connection-string/">Using a Connection String</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/advanced-properties/">Advanced Properties</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-windows/">Configuring ODBC on Windows</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a></li>
               
@@ -391,40 +394,33 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Windows</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill Explorer</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
-              
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-windows/">Configuring Connections on Windows</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows</a></li>
               
             </ul>
             
           
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/configuring-tibco-spotfire-server-with-drill/">Configuring Tibco Spotfire Server with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill with BI Tools</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-with-bi-tools-introduction/">Using Drill with BI Tools Introduction</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              
+            </ul>
             
           
           </ul>
@@ -579,15 +575,8 @@
               <li class="toctree-l2"><a class="reference internal" href="/docs/review-the-java-stack-trace/">Review the Java Stack Trace</a></li>
             
           
-          </ul>
-        
-      
-        
-          <li class="toctree-l1"><a href="javascript: void(0);">Query Audit Logging</a></li>
-          <ul style="display: none">
-          
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/getting-query-information/">Getting Query Information</a></li>
+              <li class="toctree-l2"><a class="reference internal" href="/docs/query-audit-logging/">Query Audit Logging</a></li>
             
           
           </ul>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/querying-complex-data/index.html
----------------------------------------------------------------------
diff --git a/docs/querying-complex-data/index.html b/docs/querying-complex-data/index.html
index f29cbe1..83b9183 100644
--- a/docs/querying-complex-data/index.html
+++ b/docs/querying-complex-data/index.html
@@ -63,8 +63,6 @@
       
         <li><a href="/docs/log-and-debug/">Log and Debug</a></li>
       
-        <li><a href="/docs/query-audit-logging/">Query Audit Logging</a></li>
-      
         <li><a href="/docs/sql-reference/">SQL Reference</a></li>
       
         <li><a href="/docs/data-sources-and-file-formats/">Data Sources and File Formats</a></li>
@@ -368,22 +366,27 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Linux and Mac OS X</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Installing the ODBC Driver</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-on-linux-and-mac-introduction/">ODBC on Linux and Mac Introduction</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-linux/">Installing the Driver on Linux</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-mac-os-x/">Installing the Driver on Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-linux-and-mac-os-x/">Configuring Connections on Linux and Mac OS X</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/driver-configuration-options/">Driver Configuration Options</a></li>
+            </ul>
+            
+          
+            
+              <li class="toctree-l2"><a href="javascript: void(0);">Configuring ODBC</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/odbc-configuration-reference/">ODBC Configuration Reference</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/using-a-connection-string/">Using a Connection String</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/advanced-properties/">Advanced Properties</a></li>
+                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-odbc-on-windows/">Configuring ODBC on Windows</a></li>
               
                 <li class="toctree-l3"><a class="reference internal" href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a></li>
               
@@ -391,40 +394,33 @@
             
           
             
-              <li class="toctree-l2"><a href="javascript: void(0);">Using ODBC on Windows</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill Explorer</a></li>
               <ul style="display: none">
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/installing-the-driver-on-windows/">Installing the Driver on Windows</a></li>
-              
-                <li class="toctree-l3"><a class="reference internal" href="/docs/configuring-connections-on-windows/">Configuring Connections on Windows</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
-              
                 <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows</a></li>
               
             </ul>
             
           
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/configuring-tibco-spotfire-server-with-drill/">Configuring Tibco Spotfire Server with Drill</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
-            
-          
-            
-              <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              <li class="toctree-l2"><a href="javascript: void(0);">Using Drill with BI Tools</a></li>
+              <ul style="display: none">
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-drill-with-bi-tools-introduction/">Using Drill with BI Tools Introduction</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/tableau-examples/">Tableau Examples</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+              
+                <li class="toctree-l3"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
+              
+            </ul>
             
           
           </ul>
@@ -579,15 +575,8 @@
               <li class="toctree-l2"><a class="reference internal" href="/docs/review-the-java-stack-trace/">Review the Java Stack Trace</a></li>
             
           
-          </ul>
-        
-      
-        
-          <li class="toctree-l1"><a href="javascript: void(0);">Query Audit Logging</a></li>
-          <ul style="display: none">
-          
             
-              <li class="toctree-l2"><a class="reference internal" href="/docs/getting-query-information/">Getting Query Information</a></li>
+              <li class="toctree-l2"><a class="reference internal" href="/docs/query-audit-logging/">Query Audit Logging</a></li>
             
           
           </ul>