drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bridg...@apache.org
Subject [07/29] drill-site git commit: Doc updates and edits
Date Mon, 08 Jun 2015 23:12:13 GMT
http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/starting-drill-on-linux-and-mac-os-x/index.html
----------------------------------------------------------------------
diff --git a/docs/starting-drill-on-linux-and-mac-os-x/index.html b/docs/starting-drill-on-linux-and-mac-os-x/index.html
index fc25ce7..1953574 100644
--- a/docs/starting-drill-on-linux-and-mac-os-x/index.html
+++ b/docs/starting-drill-on-linux-and-mac-os-x/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/starting-drill-on-windows/index.html
----------------------------------------------------------------------
diff --git a/docs/starting-drill-on-windows/index.html b/docs/starting-drill-on-windows/index.html
index b54b465..4892afa 100644
--- a/docs/starting-drill-on-windows/index.html
+++ b/docs/starting-drill-on-windows/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/storage-plugin-configuration/index.html
----------------------------------------------------------------------
diff --git a/docs/storage-plugin-configuration/index.html b/docs/storage-plugin-configuration/index.html
index 6a437c7..382b341 100644
--- a/docs/storage-plugin-configuration/index.html
+++ b/docs/storage-plugin-configuration/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/storage-plugin-registration/index.html
----------------------------------------------------------------------
diff --git a/docs/storage-plugin-registration/index.html b/docs/storage-plugin-registration/index.html
index 083534c..75b1d52 100644
--- a/docs/storage-plugin-registration/index.html
+++ b/docs/storage-plugin-registration/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/string-manipulation/index.html
----------------------------------------------------------------------
diff --git a/docs/string-manipulation/index.html b/docs/string-manipulation/index.html
index a7632d7..07cf6a4 100644
--- a/docs/string-manipulation/index.html
+++ b/docs/string-manipulation/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/summary/index.html
----------------------------------------------------------------------
diff --git a/docs/summary/index.html b/docs/summary/index.html
index e6072c6..06fb8c4 100644
--- a/docs/summary/index.html
+++ b/docs/summary/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/supported-data-types/index.html
----------------------------------------------------------------------
diff --git a/docs/supported-data-types/index.html b/docs/supported-data-types/index.html
index 9e68515..51fa3bf 100644
--- a/docs/supported-data-types/index.html
+++ b/docs/supported-data-types/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/supported-sql-commands/index.html
----------------------------------------------------------------------
diff --git a/docs/supported-sql-commands/index.html b/docs/supported-sql-commands/index.html
index 9dbe1c3..544ee89 100644
--- a/docs/supported-sql-commands/index.html
+++ b/docs/supported-sql-commands/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/tableau-examples/index.html
----------------------------------------------------------------------
diff --git a/docs/tableau-examples/index.html b/docs/tableau-examples/index.html
index 60867a8..b0f400c 100644
--- a/docs/tableau-examples/index.html
+++ b/docs/tableau-examples/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>
+              
+            </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/driver-configuration-options/">Driver Configuration Options</a></li>
+                <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>
-              <ul style="">
-              
-                <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-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/connecting-to-odbc-data-sources/">Connecting to ODBC Data Sources</a></li>
               
-                <li class="toctree-l3 current"><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="">
+              
+                <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 current"><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>
@@ -954,7 +943,7 @@
   
     <li><a href="/docs/odbc-jdbc-interfaces/">ODBC/JDBC Interfaces</a></li>
   
-    <li><a href="/docs/using-odbc-on-windows/">Using ODBC on Windows</a></li>
+    <li><a href="/docs/using-drill-with-bi-tools/">Using Drill with BI Tools</a></li>
   
   <li>Tableau Examples</li>
 </nav>
@@ -963,7 +952,7 @@
   <div class="main-content">
 
     
-      <a class="edit-link" href="https://github.com/apache/drill/blob/gh-pages/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/040-tableau-examples.md" target="_blank"><i class="fa fa-pencil-square-o"></i></a>
+      <a class="edit-link" href="https://github.com/apache/drill/blob/gh-pages/_docs/odbc-jdbc-interfaces/using-drill-with-bi-tools/020-tableau-examples.md" target="_blank"><i class="fa fa-pencil-square-o"></i></a>
     
 
     <div class="int_title left">
@@ -976,7 +965,7 @@
     <div class="int_text" align="left">
       
         <p>You can generate reports in Tableau using ODBC connections to Drill data
-sources. Each example in this section takes you through the steps to create a
+sources on Windows. Each example in this section takes you through the steps to create a
 DSN to a Drill data source and then access the data in Tableau 8.1.</p>
 
 <p>This section includes the following examples:</p>
@@ -1008,7 +997,7 @@ and then visualize the data in Tableau.<br>
 
 <ol>
 <li>To launch the ODBC Administrator, click <strong>Start &gt; All Programs &gt; MapR Drill ODBC Driver 1.0 (32|64-bit) &gt; (32|64-bit) ODBC Administrator.</strong>
- The _ODBC Data Source Administrator _window appears.</li>
+ The <em>ODBC Data Source Administrator</em> window appears.</li>
 <li>On the <strong>System DSN</strong> tab, click <strong>Add</strong>.</li>
 <li>Select <strong>MapR Drill ODBC Driver</strong> and click <strong>Finish</strong>.<br>
  The <em>MapR Drill ODBC Driver DSN Setup</em> window appears.</li>
@@ -1253,7 +1242,7 @@ visualize the data, drag fields from the Data window to the workspace view.</p>
       
         <div class="doc-nav">
   
-  <span class="previous-toc"><a href="/docs/connecting-to-odbc-data-sources/">← Connecting to ODBC Data Sources</a></span><span class="next-toc"><a href="/docs/using-drill-explorer-on-windows/">Using Drill Explorer on Windows →</a></span>
+  <span class="previous-toc"><a href="/docs/using-drill-with-bi-tools-introduction/">← Using Drill with BI Tools Introduction</a></span><span class="next-toc"><a href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill →</a></span>
 </div>
 
     

http://git-wip-us.apache.org/repos/asf/drill-site/blob/e3ff0460/docs/testing-the-odbc-connection/index.html
----------------------------------------------------------------------
diff --git a/docs/testing-the-odbc-connection/index.html b/docs/testing-the-odbc-connection/index.html
index 281d5f0..3090522 100644
--- a/docs/testing-the-odbc-connection/index.html
+++ b/docs/testing-the-odbc-connection/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>
-              <ul style="">
-              
-                <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-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/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="">
               
-                <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/odbc-configuration-reference/">ODBC Configuration Reference</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-linux-mac-os-x/">Configuring ODBC on Linux/Mac OS X</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 current"><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>
@@ -954,7 +943,7 @@
   
     <li><a href="/docs/odbc-jdbc-interfaces/">ODBC/JDBC Interfaces</a></li>
   
-    <li><a href="/docs/using-odbc-on-linux-and-mac-os-x/">Using ODBC on Linux and Mac OS X</a></li>
+    <li><a href="/docs/configuring-odbc/">Configuring ODBC</a></li>
   
   <li>Testing the ODBC Connection</li>
 </nav>
@@ -963,7 +952,7 @@
   <div class="main-content">
 
     
-      <a class="edit-link" href="https://github.com/apache/drill/blob/gh-pages/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/070-testing-the-odbc-connection.md" target="_blank"><i class="fa fa-pencil-square-o"></i></a>
+      <a class="edit-link" href="https://github.com/apache/drill/blob/gh-pages/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md" target="_blank"><i class="fa fa-pencil-square-o"></i></a>
     
 
     <div class="int_title left">
@@ -975,27 +964,48 @@
 
     <div class="int_text" align="left">
       
-        <p>To test the ODBC connection on Linux and Mac OS X, you can use an ODBC-enabled client application. For a
-basic connection test, you can also use the test utilities that are packaged
-with your driver manager installation.</p>
+        <p>The procedure for testing the ODBC connection differs depending on your platform, as described in the following sections:</p>
 
-<p>For example, the iODBC driver manager includes simple utilities called
-<code>iodbctest</code> and <code>iodbctestw</code>. You can use either one of these utilities to
-establish a test connection with your driver and your DSN. Use <code>iodbctest</code> to
+<ul>
+<li><a href="/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-mac-os-x">Testing the ODBC Connection on Mac OS X</a></li>
+<li><a href="/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-linux">Testing the ODBC Connection on Linux</a></li>
+<li><a href="/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-windows">Testing the ODBC Connection on Windows</a></li>
+</ul>
+
+<h2 id="testing-the-odbc-connection-on-mac-os-x">Testing the ODBC Connection on Mac OS X</h2>
+
+<p>To test the ODBC connection Mac OS X, follow these steps.</p>
+
+<ol>
+<li><a href="/docs/starting-drill-on-linux-and-mac-os-x/">Start Drill</a>.<br></li>
+<li>Start the iODBC Administrator.app in <code>/Applications</code>.<br>
+The iODBC Data Source Administrator dialog appears.<br></li>
+<li>On the User DSN tab, select the MapR Drill DSN.<br>
+<img src="/docs/img/odbc-mac1.png" alt=""><br></li>
+<li>Click <strong>Test</strong>.<br>
+The Login for Sample MapR Drill DSN dialog appears.<br>
+<img src="/docs/img/odbc-mac2.png" alt=""><br></li>
+<li>If you configured Basic Authentication in the .odbc.ini, enter the user name and password you also configured; otherwise, click OK.<br>
+The success message appears.<br>
+<img src="/docs/img/odbc-mac3.png" alt=""><br></li>
+</ol>
+
+<h2 id="testing-the-odbc-connection-on-linux">Testing the ODBC Connection on Linux</h2>
+
+<p>To test the ODBC connection on Linux use the test utilities that are packaged
+with your driver manager installation: <code>iodbctest</code> and <code>iodbctestw</code>. Use <code>iodbctest</code> to
 test how your driver works with an ANSI application. Use <code>iodbctestw</code> to test
 how your driver works with a Unicode application.</p>
 
-<p><strong>Note:</strong> There are 32-bit and 64-bit installations of the iODBC driver manager available. If you have only one or the other installed, then the appropriate version of iodbctest (or iodbctestw) is available. However, if you have both 32- and 64-bit versions installed, then you need to be careful that you are running the version from the correct installation directory.</p>
+<p>There are 32-bit and 64-bit installations of the iODBC driver manager available. If you have only one or the other installed, then the appropriate version of iodbctest (or iodbctestw) is available. However, if you have both 32- and 64-bit versions installed, then you need to be careful that you are running the version from the correct installation directory.</p>
 
 <p>Visit <a href="http://www.iodbc.org/">http://www.iodbc.org</a> for further details on
 using the iODBC driver manager.</p>
 
-<h2 id="testing-the-odbc-connection">Testing the ODBC Connection</h2>
-
-<p>Complete the following steps to test your connection using the iODBC driver
-manager:</p>
+<p>To test the ODBC connection on Linux, follow these steps:</p>
 
 <ol>
+<li><a href="/docs/starting-drill-on-linux-and-mac-os-x/">Start Drill</a>.</li>
 <li>Run <code>iodbctest</code> or <code>iodbctestw</code>. The program prompts you for an ODBC connection string.</li>
 <li>If you do not remember the DSN name, type a question mark (?) to see a list of DSNs.</li>
 <li><p>If you are connecting directly to a Drillbit, type an ODBC connection string using the following format:</p>
@@ -1013,11 +1023,19 @@ using the following format:</p>
 <p>If the connection is successful, the <code>SQL&gt;</code> prompt appears.</p></li>
 </ol>
 
+<h2 id="testing-the-odbc-connection-on-windows">Testing the ODBC Connection on Windows</h2>
+
+<p>To test the ODBC connection on Windows, follow these steps:</p>
+
+<ol>
+<li><a href="/docs/starting-drill-on-linux-and-mac-os-x/">Start Drill</a>.</li>
+</ol>
+
     
       
         <div class="doc-nav">
   
-  <span class="previous-toc"><a href="/docs/advanced-properties/">← Advanced Properties</a></span><span class="next-toc"><a href="/docs/using-odbc-on-windows/">Using ODBC on Windows →</a></span>
+  <span class="previous-toc"><a href="/docs/configuring-odbc-on-windows/">← Configuring ODBC on Windows</a></span><span class="next-toc"><a href="/docs/using-drill-explorer/">Using Drill Explorer →</a></span>
 </div>
 
     


Mime
View raw message