http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/enron-emails/index.html
----------------------------------------------------------------------
diff --git a/docs/enron-emails/index.html b/docs/enron-emails/index.html
index e9881f6..3810543 100644
--- a/docs/enron-emails/index.html
+++ b/docs/enron-emails/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/error-messages/index.html
----------------------------------------------------------------------
diff --git a/docs/error-messages/index.html b/docs/error-messages/index.html
index 8bda317..795234d 100644
--- a/docs/error-messages/index.html
+++ b/docs/error-messages/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/explain/index.html
----------------------------------------------------------------------
diff --git a/docs/explain/index.html b/docs/explain/index.html
index 0693af7..e84431e 100644
--- a/docs/explain/index.html
+++ b/docs/explain/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/file-system-storage-plugin/index.html
----------------------------------------------------------------------
diff --git a/docs/file-system-storage-plugin/index.html 
b/docs/file-system-storage-plugin/index.html
index 8c51d28..d85c6cd 100644
--- a/docs/file-system-storage-plugin/index.html
+++ b/docs/file-system-storage-plugin/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>
@@ -1025,10 +1014,10 @@ the following steps:</p>
   &quot;enabled&quot; : true,
   &quot;connection&quot; : &quot;hdfs://10.10.30.156:8020/&quot;,
   &quot;workspaces&quot; : {
-    &quot;root : {
+    &quot;root&quot; : {
       &quot;location&quot; : &quot;/user/root/drill&quot;,
       &quot;writable&quot; : true,
-      &quot;defaultinputformat&quot; : &quot;null&quot;
+      &quot;defaultinputformat&quot; : null
     }
   },
   &quot;formats&quot; : {

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/flatten/index.html
----------------------------------------------------------------------
diff --git a/docs/flatten/index.html b/docs/flatten/index.html
index cbfc546..6badf05 100644
--- a/docs/flatten/index.html
+++ b/docs/flatten/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/from-clause/index.html
----------------------------------------------------------------------
diff --git a/docs/from-clause/index.html b/docs/from-clause/index.html
index 7d713ff..ab5137c 100644
--- a/docs/from-clause/index.html
+++ b/docs/from-clause/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>
@@ -1012,7 +1001,17 @@ A temporary alternative name for a column in a table or 
view. You can use named
 
 <p>Because Drill works with schema-less data sources, you cannot use 
positional aliases (1, 2, etc.) to refer to SELECT list columns, except in the 
ORDER BY clause.</p></li>
 <li><p><em>subquery</em><br>
-A query expression that evaluates to a table. The table exists only for the 
duration of the query and is typically given a name or alias, though an alias 
is not required. You can also define column names for tables that derive from 
subqueries. Naming column aliases is important when you want to join the 
results of subqueries to other tables and when you want to select or constrain 
those columns elsewhere in the query. A subquery may contain an ORDER BY 
clause, but this clause may have no effect if a LIMIT or OFFSET clause is not 
also specified.</p></li>
+A query expression that evaluates to a table. The table exists only for the 
duration of the query and is typically given a name or alias, though an alias 
is not required. You can also define column names for tables that derive from 
subqueries. Naming column aliases is important when you want to join the 
results of subqueries to other tables and when you want to select or constrain 
those columns elsewhere in the query. A subquery may contain an ORDER BY 
clause, but this clause may have no effect if a LIMIT or OFFSET clause is not 
also specified. You can use the following subquery operators in Drill queries. 
These operators all return Boolean results.  </p>
+
+<ul>
+<li>ALL<br></li>
+<li>ANY<br></li>
+<li>EXISTS<br></li>
+<li>IN<br></li>
+<li>SOME<br></li>
+</ul>
+
+<p>In general, correlated subqueries are supported. EXISTS and NOT EXISTS 
subqueries that do not contain a correlation join are not yet 
supported.</p></li>
 <li><p><em>join_type</em><br>
 Specifies one of the following join types:<br>
    [INNER] JOIN<br>
@@ -1036,9 +1035,25 @@ Return all of the rows that the equivalent inner join 
would return plus non-matc
 
 <ul>
 <li>Joined columns must have comparable data types.</li>
-<li>A join with the ON syntax retains both joining columns in its intermediate 
result set.</li>
+<li>A join with the ON syntax retains both joining columns in its intermediate 
result set.<br></li>
 </ul>
 
+<h2 id="example">Example</h2>
+<div class="highlight"><pre><code class="language-text" data-lang="text">   0: 
jdbc:drill:zk=local&gt; SELECT tbl1.id, tbl1.type 
+   FROM dfs.`/Users/brumsby/drill/donuts.json` 
+   AS tbl1
+   JOIN
+   dfs.`/Users/brumsby/drill/moredonuts.json` as tbl2
+   ON tbl1.id=tbl2.id;
+
+   +------------+------------+
+   |     id     |    type    |
+   +------------+------------+
+   | 0001       | donut      |
+   +------------+------------+
+
+   1 row selected (0.395 seconds)
+</code></pre></div>
     
       
         <div class="doc-nav">

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/functions-for-handling-nulls/index.html
----------------------------------------------------------------------
diff --git a/docs/functions-for-handling-nulls/index.html 
b/docs/functions-for-handling-nulls/index.html
index 83a81d4..f2e7818 100644
--- a/docs/functions-for-handling-nulls/index.html
+++ b/docs/functions-for-handling-nulls/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/getting-started/index.html
----------------------------------------------------------------------
diff --git a/docs/getting-started/index.html b/docs/getting-started/index.html
index 2229edc..ad6ed5d 100644
--- a/docs/getting-started/index.html
+++ b/docs/getting-started/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/getting-to-know-the-drill-sandbox/index.html
----------------------------------------------------------------------
diff --git a/docs/getting-to-know-the-drill-sandbox/index.html 
b/docs/getting-to-know-the-drill-sandbox/index.html
index cf2716c..8cb38f0 100644
--- a/docs/getting-to-know-the-drill-sandbox/index.html
+++ b/docs/getting-to-know-the-drill-sandbox/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/group-by-clause/index.html
----------------------------------------------------------------------
diff --git a/docs/group-by-clause/index.html b/docs/group-by-clause/index.html
index 7d2d9e4..c9e0ea7 100644
--- a/docs/group-by-clause/index.html
+++ b/docs/group-by-clause/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/guidelines-for-optimizing-aggregation/index.html
----------------------------------------------------------------------
diff --git a/docs/guidelines-for-optimizing-aggregation/index.html 
b/docs/guidelines-for-optimizing-aggregation/index.html
index 745f08b..555a2c7 100644
--- a/docs/guidelines-for-optimizing-aggregation/index.html
+++ b/docs/guidelines-for-optimizing-aggregation/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