http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/alter-system/index.html
----------------------------------------------------------------------
diff --git a/docs/alter-system/index.html b/docs/alter-system/index.html
index cb323d7..5bd7d15 100644
--- a/docs/alter-system/index.html
+++ b/docs/alter-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/analyzing-highly-dynamic-datasets/index.html
----------------------------------------------------------------------
diff --git a/docs/analyzing-highly-dynamic-datasets/index.html 
b/docs/analyzing-highly-dynamic-datasets/index.html
index fa58b5f..f0dbde6 100644
--- a/docs/analyzing-highly-dynamic-datasets/index.html
+++ b/docs/analyzing-highly-dynamic-datasets/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/analyzing-social-media/index.html
----------------------------------------------------------------------
diff --git a/docs/analyzing-social-media/index.html 
b/docs/analyzing-social-media/index.html
index f42920f..5338b80 100644
--- a/docs/analyzing-social-media/index.html
+++ b/docs/analyzing-social-media/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/analyzing-the-yelp-academic-dataset/index.html
----------------------------------------------------------------------
diff --git a/docs/analyzing-the-yelp-academic-dataset/index.html 
b/docs/analyzing-the-yelp-academic-dataset/index.html
index 3f5931d..64960f0 100644
--- a/docs/analyzing-the-yelp-academic-dataset/index.html
+++ b/docs/analyzing-the-yelp-academic-dataset/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/aol-search/index.html
----------------------------------------------------------------------
diff --git a/docs/aol-search/index.html b/docs/aol-search/index.html
index c3a7a1c..039c208 100644
--- a/docs/aol-search/index.html
+++ b/docs/aol-search/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/apache-drill-0-4-0-release-notes/index.html
----------------------------------------------------------------------
diff --git a/docs/apache-drill-0-4-0-release-notes/index.html 
b/docs/apache-drill-0-4-0-release-notes/index.html
index 078b595..5c38e8c 100644
--- a/docs/apache-drill-0-4-0-release-notes/index.html
+++ b/docs/apache-drill-0-4-0-release-notes/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/apache-drill-0-5-0-release-notes/index.html
----------------------------------------------------------------------
diff --git a/docs/apache-drill-0-5-0-release-notes/index.html 
b/docs/apache-drill-0-5-0-release-notes/index.html
index 22ccf02..d0b3c53 100644
--- a/docs/apache-drill-0-5-0-release-notes/index.html
+++ b/docs/apache-drill-0-5-0-release-notes/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/apache-drill-0-6-0-release-notes/index.html
----------------------------------------------------------------------
diff --git a/docs/apache-drill-0-6-0-release-notes/index.html 
b/docs/apache-drill-0-6-0-release-notes/index.html
index 34646f9..24eb084 100644
--- a/docs/apache-drill-0-6-0-release-notes/index.html
+++ b/docs/apache-drill-0-6-0-release-notes/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/apache-drill-0-7-0-release-notes/index.html
----------------------------------------------------------------------
diff --git a/docs/apache-drill-0-7-0-release-notes/index.html 
b/docs/apache-drill-0-7-0-release-notes/index.html
index ef4fe84..31fc726 100644
--- a/docs/apache-drill-0-7-0-release-notes/index.html
+++ b/docs/apache-drill-0-7-0-release-notes/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/apache-drill-0-8-0-release-notes/index.html
----------------------------------------------------------------------
diff --git a/docs/apache-drill-0-8-0-release-notes/index.html 
b/docs/apache-drill-0-8-0-release-notes/index.html
index 8c91555..8f9d4a9 100644
--- a/docs/apache-drill-0-8-0-release-notes/index.html
+++ b/docs/apache-drill-0-8-0-release-notes/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/apache-drill-0-9-0-release-notes/index.html
----------------------------------------------------------------------
diff --git a/docs/apache-drill-0-9-0-release-notes/index.html 
b/docs/apache-drill-0-9-0-release-notes/index.html
index e4a5ee7..50392e6 100644
--- a/docs/apache-drill-0-9-0-release-notes/index.html
+++ b/docs/apache-drill-0-9-0-release-notes/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>

Reply via email to