drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bridg...@apache.org
Subject [15/15] drill git commit: reorg/merge configuring info, explorer
Date Mon, 08 Jun 2015 23:07:04 GMT
reorg/merge configuring info, explorer

add ills to mac config

add info from Krystal to install/config

reorg config/testing


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/3516a1f4
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/3516a1f4
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/3516a1f4

Branch: refs/heads/gh-pages
Commit: 3516a1f4abf0e5e5fedfd0ba0f760771edf54836
Parents: 606a393
Author: Kristine Hahn <khahn@maprtech.com>
Authored: Fri Jun 5 18:18:46 2015 -0700
Committer: Kristine Hahn <khahn@maprtech.com>
Committed: Fri Jun 5 18:29:30 2015 -0700

----------------------------------------------------------------------
 _data/docs.json                                 | 282 ++++++++-----------
 _docs/img/odbc-mac1.png                         | Bin 0 -> 46179 bytes
 _docs/img/odbc-mac2.png                         | Bin 0 -> 14598 bytes
 _docs/img/odbc-mac3.png                         | Bin 0 -> 17203 bytes
 .../010-interfaces-introduction.md              |  10 +-
 .../050-connecting-to-data-sources.md           |   6 -
 .../050-using-drill-explorer.md                 |   5 +
 .../060-using-drill-explorer.md                 |   5 -
 .../060-using-drill-with-bi-tools.md            |   4 +
 .../070-using-drill-with-bi-tools.md            |   4 -
 .../010-odbc-configuration-reference.md         |  33 ++-
 ...iguring-connections-on-linux-and-mac-os-x.md | 148 ----------
 .../020-configuring-odbc-on-linux-mac-os-x.md   | 179 ++++++++++++
 .../030-configuring-odbc-on-windows.md          |  49 ++++
 .../030-testing-the-odbc-connection.md          |  40 ---
 .../040-configuring-connections-on-windows.md   |  49 ----
 .../040-testing-the-odbc-connection.md          |  62 ++++
 .../010-installing-the-driver-on-linux.md       |  18 +-
 .../020-installing-the-driver-on-mac-os-x.md    |  36 ++-
 .../010-connecting-to-odbc-data-sources.md      |  24 +-
 20 files changed, 491 insertions(+), 463 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index 3b22ef6..2040589 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -1086,48 +1086,6 @@
             "title": "Configure Drill Introduction", 
             "url": "/docs/configure-drill-introduction/"
         }, 
-        "Configuring Connections on Linux and Mac OS X": {
-            "breadcrumbs": [
-                {
-                    "title": "Configuring ODBC", 
-                    "url": "/docs/configuring-odbc/"
-                }, 
-                {
-                    "title": "ODBC/JDBC Interfaces", 
-                    "url": "/docs/odbc-jdbc-interfaces/"
-                }
-            ], 
-            "children": [], 
-            "next_title": "Testing the ODBC Connection", 
-            "next_url": "/docs/testing-the-odbc-connection/", 
-            "parent": "Configuring ODBC", 
-            "previous_title": "ODBC Configuration Reference", 
-            "previous_url": "/docs/odbc-configuration-reference/", 
-            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-connections-on-linux-and-mac-os-x.md", 
-            "title": "Configuring Connections on Linux and Mac OS X", 
-            "url": "/docs/configuring-connections-on-linux-and-mac-os-x/"
-        }, 
-        "Configuring Connections on Windows": {
-            "breadcrumbs": [
-                {
-                    "title": "Configuring ODBC", 
-                    "url": "/docs/configuring-odbc/"
-                }, 
-                {
-                    "title": "ODBC/JDBC Interfaces", 
-                    "url": "/docs/odbc-jdbc-interfaces/"
-                }
-            ], 
-            "children": [], 
-            "next_title": "Connecting to ODBC Data Sources", 
-            "next_url": "/docs/connecting-to-odbc-data-sources/", 
-            "parent": "Configuring ODBC", 
-            "previous_title": "Testing the ODBC Connection", 
-            "previous_url": "/docs/testing-the-odbc-connection/", 
-            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/040-configuring-connections-on-windows.md", 
-            "title": "Configuring Connections on Windows", 
-            "url": "/docs/configuring-connections-on-windows/"
-        }, 
         "Configuring Drill Memory": {
             "breadcrumbs": [
                 {
@@ -1186,8 +1144,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring Connections on Linux and Mac OS X", 
-                    "next_url": "/docs/configuring-connections-on-linux-and-mac-os-x/", 
+                    "next_title": "Configuring ODBC on Linux/Mac OS X", 
+                    "next_url": "/docs/configuring-odbc-on-linux-mac-os-x/", 
                     "parent": "Configuring ODBC", 
                     "previous_title": "Configuring ODBC", 
                     "previous_url": "/docs/configuring-odbc/", 
@@ -1207,14 +1165,14 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Testing the ODBC Connection", 
-                    "next_url": "/docs/testing-the-odbc-connection/", 
+                    "next_title": "Configuring ODBC on Windows", 
+                    "next_url": "/docs/configuring-odbc-on-windows/", 
                     "parent": "Configuring ODBC", 
                     "previous_title": "ODBC Configuration Reference", 
                     "previous_url": "/docs/odbc-configuration-reference/", 
-                    "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-connections-on-linux-and-mac-os-x.md", 
-                    "title": "Configuring Connections on Linux and Mac OS X", 
-                    "url": "/docs/configuring-connections-on-linux-and-mac-os-x/"
+                    "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md", 
+                    "title": "Configuring ODBC on Linux/Mac OS X", 
+                    "url": "/docs/configuring-odbc-on-linux-mac-os-x/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -1228,14 +1186,14 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring Connections on Windows", 
-                    "next_url": "/docs/configuring-connections-on-windows/", 
+                    "next_title": "Testing the ODBC Connection", 
+                    "next_url": "/docs/testing-the-odbc-connection/", 
                     "parent": "Configuring ODBC", 
-                    "previous_title": "Configuring Connections on Linux and Mac OS X", 
-                    "previous_url": "/docs/configuring-connections-on-linux-and-mac-os-x/", 
-                    "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-testing-the-odbc-connection.md", 
-                    "title": "Testing the ODBC Connection", 
-                    "url": "/docs/testing-the-odbc-connection/"
+                    "previous_title": "Configuring ODBC on Linux/Mac OS X", 
+                    "previous_url": "/docs/configuring-odbc-on-linux-mac-os-x/", 
+                    "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md", 
+                    "title": "Configuring ODBC on Windows", 
+                    "url": "/docs/configuring-odbc-on-windows/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -1249,14 +1207,14 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Connecting to ODBC Data Sources", 
-                    "next_url": "/docs/connecting-to-odbc-data-sources/", 
+                    "next_title": "Using Drill Explorer", 
+                    "next_url": "/docs/using-drill-explorer/", 
                     "parent": "Configuring ODBC", 
-                    "previous_title": "Testing the ODBC Connection", 
-                    "previous_url": "/docs/testing-the-odbc-connection/", 
-                    "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/040-configuring-connections-on-windows.md", 
-                    "title": "Configuring Connections on Windows", 
-                    "url": "/docs/configuring-connections-on-windows/"
+                    "previous_title": "Configuring ODBC on Windows", 
+                    "previous_url": "/docs/configuring-odbc-on-windows/", 
+                    "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md", 
+                    "title": "Testing the ODBC Connection", 
+                    "url": "/docs/testing-the-odbc-connection/"
                 }
             ], 
             "next_title": "ODBC Configuration Reference", 
@@ -1268,6 +1226,48 @@
             "title": "Configuring ODBC", 
             "url": "/docs/configuring-odbc/"
         }, 
+        "Configuring ODBC on Linux/Mac OS X": {
+            "breadcrumbs": [
+                {
+                    "title": "Configuring ODBC", 
+                    "url": "/docs/configuring-odbc/"
+                }, 
+                {
+                    "title": "ODBC/JDBC Interfaces", 
+                    "url": "/docs/odbc-jdbc-interfaces/"
+                }
+            ], 
+            "children": [], 
+            "next_title": "Configuring ODBC on Windows", 
+            "next_url": "/docs/configuring-odbc-on-windows/", 
+            "parent": "Configuring ODBC", 
+            "previous_title": "ODBC Configuration Reference", 
+            "previous_url": "/docs/odbc-configuration-reference/", 
+            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md", 
+            "title": "Configuring ODBC on Linux/Mac OS X", 
+            "url": "/docs/configuring-odbc-on-linux-mac-os-x/"
+        }, 
+        "Configuring ODBC on Windows": {
+            "breadcrumbs": [
+                {
+                    "title": "Configuring ODBC", 
+                    "url": "/docs/configuring-odbc/"
+                }, 
+                {
+                    "title": "ODBC/JDBC Interfaces", 
+                    "url": "/docs/odbc-jdbc-interfaces/"
+                }
+            ], 
+            "children": [], 
+            "next_title": "Testing the ODBC Connection", 
+            "next_url": "/docs/testing-the-odbc-connection/", 
+            "parent": "Configuring ODBC", 
+            "previous_title": "Configuring ODBC on Linux/Mac OS X", 
+            "previous_url": "/docs/configuring-odbc-on-linux-mac-os-x/", 
+            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md", 
+            "title": "Configuring ODBC on Windows", 
+            "url": "/docs/configuring-odbc-on-windows/"
+        }, 
         "Configuring Resources for a Shared Drillbit": {
             "breadcrumbs": [
                 {
@@ -4753,8 +4753,8 @@
                 }
             ], 
             "children": [], 
-            "next_title": "Configuring Connections on Linux and Mac OS X", 
-            "next_url": "/docs/configuring-connections-on-linux-and-mac-os-x/", 
+            "next_title": "Configuring ODBC on Linux/Mac OS X", 
+            "next_url": "/docs/configuring-odbc-on-linux-mac-os-x/", 
             "parent": "Configuring ODBC", 
             "previous_title": "Configuring ODBC", 
             "previous_url": "/docs/configuring-odbc/", 
@@ -4900,8 +4900,8 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring Connections on Linux and Mac OS X", 
-                            "next_url": "/docs/configuring-connections-on-linux-and-mac-os-x/", 
+                            "next_title": "Configuring ODBC on Linux/Mac OS X", 
+                            "next_url": "/docs/configuring-odbc-on-linux-mac-os-x/", 
                             "parent": "Configuring ODBC", 
                             "previous_title": "Configuring ODBC", 
                             "previous_url": "/docs/configuring-odbc/", 
@@ -4921,14 +4921,14 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Testing the ODBC Connection", 
-                            "next_url": "/docs/testing-the-odbc-connection/", 
+                            "next_title": "Configuring ODBC on Windows", 
+                            "next_url": "/docs/configuring-odbc-on-windows/", 
                             "parent": "Configuring ODBC", 
                             "previous_title": "ODBC Configuration Reference", 
                             "previous_url": "/docs/odbc-configuration-reference/", 
-                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-connections-on-linux-and-mac-os-x.md", 
-                            "title": "Configuring Connections on Linux and Mac OS X", 
-                            "url": "/docs/configuring-connections-on-linux-and-mac-os-x/"
+                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md", 
+                            "title": "Configuring ODBC on Linux/Mac OS X", 
+                            "url": "/docs/configuring-odbc-on-linux-mac-os-x/"
                         }, 
                         {
                             "breadcrumbs": [
@@ -4942,14 +4942,14 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring Connections on Windows", 
-                            "next_url": "/docs/configuring-connections-on-windows/", 
+                            "next_title": "Testing the ODBC Connection", 
+                            "next_url": "/docs/testing-the-odbc-connection/", 
                             "parent": "Configuring ODBC", 
-                            "previous_title": "Configuring Connections on Linux and Mac OS X", 
-                            "previous_url": "/docs/configuring-connections-on-linux-and-mac-os-x/", 
-                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-testing-the-odbc-connection.md", 
-                            "title": "Testing the ODBC Connection", 
-                            "url": "/docs/testing-the-odbc-connection/"
+                            "previous_title": "Configuring ODBC on Linux/Mac OS X", 
+                            "previous_url": "/docs/configuring-odbc-on-linux-mac-os-x/", 
+                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md", 
+                            "title": "Configuring ODBC on Windows", 
+                            "url": "/docs/configuring-odbc-on-windows/"
                         }, 
                         {
                             "breadcrumbs": [
@@ -4963,14 +4963,14 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Connecting to ODBC Data Sources", 
-                            "next_url": "/docs/connecting-to-odbc-data-sources/", 
+                            "next_title": "Using Drill Explorer", 
+                            "next_url": "/docs/using-drill-explorer/", 
                             "parent": "Configuring ODBC", 
-                            "previous_title": "Testing the ODBC Connection", 
-                            "previous_url": "/docs/testing-the-odbc-connection/", 
-                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/040-configuring-connections-on-windows.md", 
-                            "title": "Configuring Connections on Windows", 
-                            "url": "/docs/configuring-connections-on-windows/"
+                            "previous_title": "Configuring ODBC on Windows", 
+                            "previous_url": "/docs/configuring-odbc-on-windows/", 
+                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md", 
+                            "title": "Testing the ODBC Connection", 
+                            "url": "/docs/testing-the-odbc-connection/"
                         }
                     ], 
                     "next_title": "ODBC Configuration Reference", 
@@ -4989,23 +4989,6 @@
                             "url": "/docs/odbc-jdbc-interfaces/"
                         }
                     ], 
-                    "children": [], 
-                    "next_title": "Using Drill Explorer", 
-                    "next_url": "/docs/using-drill-explorer/", 
-                    "parent": "ODBC/JDBC Interfaces", 
-                    "previous_title": "Configuring Connections on Windows", 
-                    "previous_url": "/docs/configuring-connections-on-windows/", 
-                    "relative_path": "_docs/odbc-jdbc-interfaces/050-connecting-to-data-sources.md", 
-                    "title": "Connecting to ODBC Data Sources", 
-                    "url": "/docs/connecting-to-odbc-data-sources/"
-                }, 
-                {
-                    "breadcrumbs": [
-                        {
-                            "title": "ODBC/JDBC Interfaces", 
-                            "url": "/docs/odbc-jdbc-interfaces/"
-                        }
-                    ], 
                     "children": [
                         {
                             "breadcrumbs": [
@@ -5053,9 +5036,9 @@
                     "next_title": "Connecting to ODBC Data Sources", 
                     "next_url": "/docs/connecting-to-odbc-data-sources/", 
                     "parent": "ODBC/JDBC Interfaces", 
-                    "previous_title": "Connecting to ODBC Data Sources", 
-                    "previous_url": "/docs/connecting-to-odbc-data-sources/", 
-                    "relative_path": "_docs/odbc-jdbc-interfaces/060-using-drill-explorer.md", 
+                    "previous_title": "Testing the ODBC Connection", 
+                    "previous_url": "/docs/testing-the-odbc-connection/", 
+                    "relative_path": "_docs/odbc-jdbc-interfaces/050-using-drill-explorer.md", 
                     "title": "Using Drill Explorer", 
                     "url": "/docs/using-drill-explorer/"
                 }, 
@@ -5199,7 +5182,7 @@
                     "parent": "ODBC/JDBC Interfaces", 
                     "previous_title": "Using Drill Explorer on Windows", 
                     "previous_url": "/docs/using-drill-explorer-on-windows/", 
-                    "relative_path": "_docs/odbc-jdbc-interfaces/070-using-drill-with-bi-tools.md", 
+                    "relative_path": "_docs/odbc-jdbc-interfaces/060-using-drill-with-bi-tools.md", 
                     "title": "Using Drill with BI Tools", 
                     "url": "/docs/using-drill-with-bi-tools/"
                 }
@@ -9718,12 +9701,12 @@
                 }
             ], 
             "children": [], 
-            "next_title": "Configuring Connections on Windows", 
-            "next_url": "/docs/configuring-connections-on-windows/", 
+            "next_title": "Using Drill Explorer", 
+            "next_url": "/docs/using-drill-explorer/", 
             "parent": "Configuring ODBC", 
-            "previous_title": "Configuring Connections on Linux and Mac OS X", 
-            "previous_url": "/docs/configuring-connections-on-linux-and-mac-os-x/", 
-            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-testing-the-odbc-connection.md", 
+            "previous_title": "Configuring ODBC on Windows", 
+            "previous_url": "/docs/configuring-odbc-on-windows/", 
+            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md", 
             "title": "Testing the ODBC Connection", 
             "url": "/docs/testing-the-odbc-connection/"
         }, 
@@ -10195,9 +10178,9 @@
             "next_title": "Connecting to ODBC Data Sources", 
             "next_url": "/docs/connecting-to-odbc-data-sources/", 
             "parent": "ODBC/JDBC Interfaces", 
-            "previous_title": "Connecting to ODBC Data Sources", 
-            "previous_url": "/docs/connecting-to-odbc-data-sources/", 
-            "relative_path": "_docs/odbc-jdbc-interfaces/060-using-drill-explorer.md", 
+            "previous_title": "Testing the ODBC Connection", 
+            "previous_url": "/docs/testing-the-odbc-connection/", 
+            "relative_path": "_docs/odbc-jdbc-interfaces/050-using-drill-explorer.md", 
             "title": "Using Drill Explorer", 
             "url": "/docs/using-drill-explorer/"
         }, 
@@ -10362,7 +10345,7 @@
             "parent": "ODBC/JDBC Interfaces", 
             "previous_title": "Using Drill Explorer on Windows", 
             "previous_url": "/docs/using-drill-explorer-on-windows/", 
-            "relative_path": "_docs/odbc-jdbc-interfaces/070-using-drill-with-bi-tools.md", 
+            "relative_path": "_docs/odbc-jdbc-interfaces/060-using-drill-with-bi-tools.md", 
             "title": "Using Drill with BI Tools", 
             "url": "/docs/using-drill-with-bi-tools/"
         }, 
@@ -11890,8 +11873,8 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring Connections on Linux and Mac OS X", 
-                            "next_url": "/docs/configuring-connections-on-linux-and-mac-os-x/", 
+                            "next_title": "Configuring ODBC on Linux/Mac OS X", 
+                            "next_url": "/docs/configuring-odbc-on-linux-mac-os-x/", 
                             "parent": "Configuring ODBC", 
                             "previous_title": "Configuring ODBC", 
                             "previous_url": "/docs/configuring-odbc/", 
@@ -11911,14 +11894,14 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Testing the ODBC Connection", 
-                            "next_url": "/docs/testing-the-odbc-connection/", 
+                            "next_title": "Configuring ODBC on Windows", 
+                            "next_url": "/docs/configuring-odbc-on-windows/", 
                             "parent": "Configuring ODBC", 
                             "previous_title": "ODBC Configuration Reference", 
                             "previous_url": "/docs/odbc-configuration-reference/", 
-                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-connections-on-linux-and-mac-os-x.md", 
-                            "title": "Configuring Connections on Linux and Mac OS X", 
-                            "url": "/docs/configuring-connections-on-linux-and-mac-os-x/"
+                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md", 
+                            "title": "Configuring ODBC on Linux/Mac OS X", 
+                            "url": "/docs/configuring-odbc-on-linux-mac-os-x/"
                         }, 
                         {
                             "breadcrumbs": [
@@ -11932,14 +11915,14 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring Connections on Windows", 
-                            "next_url": "/docs/configuring-connections-on-windows/", 
+                            "next_title": "Testing the ODBC Connection", 
+                            "next_url": "/docs/testing-the-odbc-connection/", 
                             "parent": "Configuring ODBC", 
-                            "previous_title": "Configuring Connections on Linux and Mac OS X", 
-                            "previous_url": "/docs/configuring-connections-on-linux-and-mac-os-x/", 
-                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-testing-the-odbc-connection.md", 
-                            "title": "Testing the ODBC Connection", 
-                            "url": "/docs/testing-the-odbc-connection/"
+                            "previous_title": "Configuring ODBC on Linux/Mac OS X", 
+                            "previous_url": "/docs/configuring-odbc-on-linux-mac-os-x/", 
+                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md", 
+                            "title": "Configuring ODBC on Windows", 
+                            "url": "/docs/configuring-odbc-on-windows/"
                         }, 
                         {
                             "breadcrumbs": [
@@ -11953,14 +11936,14 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Connecting to ODBC Data Sources", 
-                            "next_url": "/docs/connecting-to-odbc-data-sources/", 
+                            "next_title": "Using Drill Explorer", 
+                            "next_url": "/docs/using-drill-explorer/", 
                             "parent": "Configuring ODBC", 
-                            "previous_title": "Testing the ODBC Connection", 
-                            "previous_url": "/docs/testing-the-odbc-connection/", 
-                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/040-configuring-connections-on-windows.md", 
-                            "title": "Configuring Connections on Windows", 
-                            "url": "/docs/configuring-connections-on-windows/"
+                            "previous_title": "Configuring ODBC on Windows", 
+                            "previous_url": "/docs/configuring-odbc-on-windows/", 
+                            "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md", 
+                            "title": "Testing the ODBC Connection", 
+                            "url": "/docs/testing-the-odbc-connection/"
                         }
                     ], 
                     "next_title": "ODBC Configuration Reference", 
@@ -11979,23 +11962,6 @@
                             "url": "/docs/odbc-jdbc-interfaces/"
                         }
                     ], 
-                    "children": [], 
-                    "next_title": "Using Drill Explorer", 
-                    "next_url": "/docs/using-drill-explorer/", 
-                    "parent": "ODBC/JDBC Interfaces", 
-                    "previous_title": "Configuring Connections on Windows", 
-                    "previous_url": "/docs/configuring-connections-on-windows/", 
-                    "relative_path": "_docs/odbc-jdbc-interfaces/050-connecting-to-data-sources.md", 
-                    "title": "Connecting to ODBC Data Sources", 
-                    "url": "/docs/connecting-to-odbc-data-sources/"
-                }, 
-                {
-                    "breadcrumbs": [
-                        {
-                            "title": "ODBC/JDBC Interfaces", 
-                            "url": "/docs/odbc-jdbc-interfaces/"
-                        }
-                    ], 
                     "children": [
                         {
                             "breadcrumbs": [
@@ -12043,9 +12009,9 @@
                     "next_title": "Connecting to ODBC Data Sources", 
                     "next_url": "/docs/connecting-to-odbc-data-sources/", 
                     "parent": "ODBC/JDBC Interfaces", 
-                    "previous_title": "Connecting to ODBC Data Sources", 
-                    "previous_url": "/docs/connecting-to-odbc-data-sources/", 
-                    "relative_path": "_docs/odbc-jdbc-interfaces/060-using-drill-explorer.md", 
+                    "previous_title": "Testing the ODBC Connection", 
+                    "previous_url": "/docs/testing-the-odbc-connection/", 
+                    "relative_path": "_docs/odbc-jdbc-interfaces/050-using-drill-explorer.md", 
                     "title": "Using Drill Explorer", 
                     "url": "/docs/using-drill-explorer/"
                 }, 
@@ -12189,7 +12155,7 @@
                     "parent": "ODBC/JDBC Interfaces", 
                     "previous_title": "Using Drill Explorer on Windows", 
                     "previous_url": "/docs/using-drill-explorer-on-windows/", 
-                    "relative_path": "_docs/odbc-jdbc-interfaces/070-using-drill-with-bi-tools.md", 
+                    "relative_path": "_docs/odbc-jdbc-interfaces/060-using-drill-with-bi-tools.md", 
                     "title": "Using Drill with BI Tools", 
                     "url": "/docs/using-drill-with-bi-tools/"
                 }

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/img/odbc-mac1.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-mac1.png b/_docs/img/odbc-mac1.png
new file mode 100644
index 0000000..27ed3ad
Binary files /dev/null and b/_docs/img/odbc-mac1.png differ

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/img/odbc-mac2.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-mac2.png b/_docs/img/odbc-mac2.png
new file mode 100644
index 0000000..8efaeed
Binary files /dev/null and b/_docs/img/odbc-mac2.png differ

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/img/odbc-mac3.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-mac3.png b/_docs/img/odbc-mac3.png
new file mode 100644
index 0000000..a3cbb74
Binary files /dev/null and b/_docs/img/odbc-mac3.png differ

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md b/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
index 705e2d6..4fa1ffa 100644
--- a/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
+++ b/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
@@ -16,15 +16,15 @@ You can connect to Apache Drill through the following interfaces:
 
 MapR provides ODBC drivers for Windows, Mac OS X, and Linux. It is recommended
 that you install the latest version of Apache Drill with the latest version of
-the Drill ODBC driver.
+the MapR Drill ODBC driver.
 
-For example, if you have Apache Drill 0.8 and a Drill ODBC driver installed on
+For example, if you have Apache Drill 0.8 and a MapR Drill ODBC driver installed on
 your machine, and then you upgrade to Apache Drill 1.0, do not assume that the
-Drill ODBC driver installed on your machine will work with the new version of
-Apache Drill. Install the latest available Drill ODBC driver to ensure that
+MapR Drill ODBC driver installed on your machine will work with the new version of
+Apache Drill. Install the latest available MapR Drill ODBC driver to ensure that
 the two components work together.
 
-You can access the latest Drill ODBC drivers in the following location:
+You can access the latest MapR Drill ODBC drivers in the following location:
 
 <http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc>
 

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/050-connecting-to-data-sources.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/050-connecting-to-data-sources.md b/_docs/odbc-jdbc-interfaces/050-connecting-to-data-sources.md
deleted file mode 100644
index aace0ec..0000000
--- a/_docs/odbc-jdbc-interfaces/050-connecting-to-data-sources.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: "Connecting to ODBC Data Sources"
-parent: "ODBC/JDBC Interfaces"
----
-
-

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/050-using-drill-explorer.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/050-using-drill-explorer.md b/_docs/odbc-jdbc-interfaces/050-using-drill-explorer.md
new file mode 100644
index 0000000..a765846
--- /dev/null
+++ b/_docs/odbc-jdbc-interfaces/050-using-drill-explorer.md
@@ -0,0 +1,5 @@
+---
+title: "Using Drill Explorer"
+parent: "ODBC/JDBC Interfaces"
+---
+

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/060-using-drill-explorer.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/060-using-drill-explorer.md b/_docs/odbc-jdbc-interfaces/060-using-drill-explorer.md
deleted file mode 100644
index a765846..0000000
--- a/_docs/odbc-jdbc-interfaces/060-using-drill-explorer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Using Drill Explorer"
-parent: "ODBC/JDBC Interfaces"
----
-

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/060-using-drill-with-bi-tools.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/060-using-drill-with-bi-tools.md b/_docs/odbc-jdbc-interfaces/060-using-drill-with-bi-tools.md
new file mode 100644
index 0000000..a1707ab
--- /dev/null
+++ b/_docs/odbc-jdbc-interfaces/060-using-drill-with-bi-tools.md
@@ -0,0 +1,4 @@
+---
+title: "Using Drill with BI Tools"
+parent: "ODBC/JDBC Interfaces"
+---

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/070-using-drill-with-bi-tools.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/070-using-drill-with-bi-tools.md b/_docs/odbc-jdbc-interfaces/070-using-drill-with-bi-tools.md
deleted file mode 100644
index a1707ab..0000000
--- a/_docs/odbc-jdbc-interfaces/070-using-drill-with-bi-tools.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: "Using Drill with BI Tools"
-parent: "ODBC/JDBC Interfaces"
----

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md
index aadca74..f2c2afa 100644
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md
@@ -18,8 +18,8 @@ The following table provides a list of the configuration options and a brief des
 | Catalog            | DRILL                                     | The name of the synthetic catalog under which all of the schemas/databases are organized.                                                                               |
 | ConnectionType     | Direct or ZooKeeper                       | Direct connects to a Drill server using Host and Port properties. ZooKeeper connects to a ZooKeeper cluster using ZKQuorum and ZKClusterID properties.                  |
 | Driver             | MapR Drill ODBC Driver                    | The name of the installed driver.                                                                                                                                       |
-| Host               | \<host name\>                             | If the ConnectionType property is set to Direct, then set the host name of the Drill server using the Host property.                                                    |
-| Port               | 31010                                     | If the ConnectionType property is set to Direct, then set the port on which the Drill server listen port.                                                               |
+| Host               | \<host name\>                             | If the ConnectionType property is set to Direct, set the host name of the Drill server using the Host property.                                                         |
+| Port               | 31010                                     | If the ConnectionType property is set to Direct, set the e TCP port on which the Drill server is listening.                                                             |
 | Schema             | \<schema name\>                           | The name of the database schema or storage plugin name to use when the query does not explicitly specify the schema or storage plugin.                                  |
 | ZKClusterID        | drillbits1                                | If the ConnectionType property is set to ZooKeeper, then set ZKClusterID to the name of the Drillbit cluster to use.                                                    |
 | ZKQuorum           | \<IP address\>,\<IP address\> . . .       | If the ConnectionType property is set to ZooKeeper, then use ZKQuorum to indicate the server(s) in your ZooKeeper cluster. Separate multiple servers using a comma (,). |
@@ -102,10 +102,10 @@ set when using the MapR Drill ODBC Driver.
 |----------------------------|-------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | HandshakeTimeout           | 5                       | An integer value representing the number of seconds that the driver waits before aborting an attempt to connect to a data source. When set to a value of 0, the driver does not abort connection attempts. |
 | QueryTimeout               | 180                     | An integer value representing the number of seconds for the driver to wait before automatically stopping a query. When set to a value of 0, the driver does not stop queries automatically.                |
-| TimestampTZDisplayTimezone | local                   | Two values are possible:local—Timestamps are dependent on the time zone of the user.utc—Timestamps appear in Coordinated Universal Time (UTC).                                                             |
+| TimestampTZDisplayTimezone | local                   | Two values are possible: local—Timestamps are dependent on the time zone of the user. utc—Timestamps appear in Coordinated Universal Time (UTC).                                                           |
 | ExcludedSchemas            | sys, INFORMATION_SCHEMA | The value of ExcludedSchemas is a list of schemas that do not appear in client applications such as Drill Explorer, Tableau, and Excel. Separate schemas in the list using a comma (,).                    |
 | CastAnyToVarchar           | true                    | Casts the ANY data type returned from SQL column calls into type “VARCHAR”.                                                                                                                                |
-| NumberOfPrefetchBuffers    | 5                       | The number of data buffers Drill uses when accessing memory.                                                                                                                                               |
+| NumberOfPrefetchBuffers    | 5                       | The size of the record batch queue in the driver. When set to a value below 1, the value defaults to 1.                                                                                                    |
 
 ### Connection String Examples
 
@@ -144,5 +144,28 @@ The following log levels are available:
 * DEBUG: Logs detailed events that may help to debug issues.
 * TRACE: Logs finer-grained events than the DEBUG level.
 
-#### What's Next? Go to [Step 3. Connect to Drill Data Sources from a BI Tool]({{ site.baseurl }}/docs/connecting-to-odbc-data-sources).
+### Enabling Logging
+
+To enable logging:
+
+1. Open the mapr.drillodbc.ini configuration file in a text editor.  
+2. Set the LogLevel key to the desired level of information to include in log files. For
+example:  
+`LogLevel=2`
+3. Set the LogPath key to the full path to the folder where you want to save log files. For example:  
+`LogPath=/localhome/employee/Documents`
+4. Save the mapr.drillodbc.ini configuration file.  
+The Simba ODBC Driver for Apache Drill produces two log files at the location you specify using the Log Path field:  
+   * driver.log provides a log of driver activities
+   * drillclient.log provides a log of Drill client activities
+
+### Disabling Logging
+
+To disable logging:
+
+1. Open the mapr.drillodbc.ini configuration file in a text editor.
+2. Set the LogLevel key to 0
+3. Save the mapr.drillodbc.ini configuration file.
+
+#### What's Next? Go to [Connecting to Drill Data Sources from a BI Tool]({{ site.baseurl }}/docs/connecting-to-odbc-data-sources).
 

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-connections-on-linux-and-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-connections-on-linux-and-mac-os-x.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-connections-on-linux-and-mac-os-x.md
deleted file mode 100644
index 3d7d351..0000000
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-connections-on-linux-and-mac-os-x.md
+++ /dev/null
@@ -1,148 +0,0 @@
----
-title: "Configuring Connections on Linux and Mac OS X"
-parent: "Configuring ODBC"
----
-ODBC driver managers use configuration files to define and configure ODBC data
-sources and drivers. To configure an ODBC connection for Linux or Mac OS X, complete the following
-steps:
-
-* Step 1: Set Environment Variables (Linux only)
-* Step 2: Define the ODBC Data Sources in odbc.ini
-* Step 3: (Optional) Define the ODBC Driver in odbcinst.ini
-* Step 4: Configure the MapR Drill ODBC Driver
-
-## Sample Configuration Files
-
-Before you connect to Drill through an ODBC client tool
-on Linux or Mac OS X, copy the following configuration files in `/opt/mapr/drillobdc/Setup` to your home directory unless the files already exist in your home directory:
-
-* `mapr.drillodbc.ini`
-* `odbc.ini`
-* `odbcinst.ini`
-
-In your home directory, use sudo to rename the files as hidden files:
-
-* .mapr.drillodbc.ini
-* .odbc.ini
-* .odbcinst.ini
-
-If the configuration files already exist in your home directory, you can use the sample configuration files as a guide for modifying the existing configuration files as described in Steps 2-4.
-
-----------
-
-## Step 1: Set Environment Variables (Linux only)
-
-Set the following environment variables to point to the `.odbc.ini`
-and `.mapr.drillodbc.ini` configuration files, respectively:
-
-  * `ODBCINI` (point to `.odbc.ini`)
-  * `MAPRDRILLINI` (point to `.mapr.drillodbc.ini`)
-
-{% include startnote.html %}You do not need to set these variables for the Mac OS X version of the driver.{% include endnote.html %}
-
-----------
-
-## Step 2: Define the ODBC Data Sources in .odbc.ini
-
-Define the ODBC data sources in the `~/.odbc.ini` configuration file for your environment. The following sample shows a possible configuration for using Drill in embedded mode. 
-
-**Example**
-          
-    [ODBC]
-    # Specify any global ODBC configuration here such as ODBC tracing.
-  
-    [ODBC Data Sources]
-    My MapR Drill DSN=MapR Drill ODBC Driver
-  
-    [Sample MapR Drill DSN]
-    # Description: DSN Description.
-    # This key is not necessary and is only to give a description of the data source.
-    Description=My MapR Drill ODBC Driver DSN
-    # Driver: The location where the ODBC driver is installed to.
-    Driver=/opt/mapr/drillodbc/lib/universal/libmaprdrillodbc.dylib
-  
-    # Values for ConnectionType, AdvancedProperties, Catalog, Schema should be set here.
-    # If ConnectionType is Direct, include Host and Port. If ConnectionType is ZooKeeper, include ZKQuorum and ZKClusterID
-    # They can also be specified in the connection string.
-    ConnectionType=Direct
-    HOST=
-    PORT=
-    ZKQuorum=localhost:2181
-    ZKClusterID=drillbits1
-    AdvancedProperties={HandshakeTimeout=5;QueryTimeout=180;TimestampTZDisplayTimeout=utc;ExcludedSchemas=sys,INFORMATION_SCHEMA}
-    Catalog=DRILL
-    Schema=
-
-If ConnectionType=Zookeeper, get the ZKQuorum and ZKClusterID values from the `drill-override.conf` file, and define the ZKQuorum and ZKClusterID properties. For example:
-
-* `ZKQuorum=localhost:2181`  
-* `ZKClusterID=drillbits1`
-
-If ConnectionType=Direct, define HOST and PORT properties. For example:
-
-* `HOST=localhost`  
-* `PORT=31010`
-
-[Driver
-Configuration
-Options]({{ site.baseurl }}/docs/odbc-configuration-reference/#configuration-options) describes configuration options available for controlling the
-behavior of DSNs using the MapR Drill ODBC Driver.
-
-----------
-
-## Step 3: (Optional) Define the ODBC Driver in .odbcinst.ini
-
-The `.odbcinst.ini` is an optional configuration file that defines the ODBC
-Drivers. This configuration file is optional because you can specify drivers
-directly in the` .odbc.ini` configuration file. The following sample shows a possible configuration.
-  
-**Example**
-
-    [ODBC Drivers]
-    MapR Drill ODBC Driver=Installed
-   
-    [MapR Drill ODBC Driver]
-    Description=MapR Drill ODBC Driver
-    Driver=/opt/mapr/drillodbc/lib/universal/libmaprdrillodbc.dylib
-
-----------
-
-## Step 4: Configure the MapR Drill ODBC Driver
-
-Configure the MapR Drill ODBC Driver for your environment by modifying the `.mapr.drillodbc.ini` configuration
-file. This configures the driver to work with your ODBC driver manager. The following sample shows a possible configuration, which you can use as is if you installed the default iODBC driver manager.
-
-**Example**
-
-    [Driver]
-    ## - Note that this default DriverManagerEncoding of UTF-32 is for iODBC.
-    DriverManagerEncoding=UTF-32
-    ErrorMessagesPath=/opt/mapr/drillodbc/ErrorMessages
-
-    LogLevel=0
-    LogPath=
-    SwapFilePath=/tmp
-
-    # iODBC
-    ODBCInstLib=libiodbcinst.dylib
-
-### Configuring .mapr.drillodbc.ini
-
-To configure the MapR Drill ODBC Driver in the `mapr.drillodbc.ini` configuration file, complete the following steps:
-
-  1. Open the `mapr.drillodbc.ini` configuration file in a text editor.
-  2. Edit the DriverManagerEncoding setting if necessary. The value is typically UTF-16 or UTF-32, but depends on the driver manager used. iODBC uses UTF-32 and unixODBC uses UTF-16. Review your ODBC Driver Manager documentation for the correct setting.
-  3. Edit the `ODBCInstLib` setting. The value is the name of the `ODBCInst` shared library for the ODBC driver manager that you use. The configuration file defaults to the shared library for `iODBC`. In Linux, the shared library name for iODBC is `libiodbcinst.so`. In Mac OS X, the shared library name for `iODBC` is `libiodbcinst.dylib`.
-     {% include startnote.html %}Review your ODBC Driver Manager documentation for the correct
-setting.{% include endnote.html %} 
-     Specify an absolute or relative filename for the library. If you use
-the relative file name, include the path to the library in the library path
-environment variable. In Linux, the library path environment variable is named
-`LD_LIBRARY_PATH`. In Mac OS X, the library path environment variable is
-named `DYLD_LIBRARY_PATH`.
-  4. Save the `mapr.drillodbc.ini` configuration file.
-
-### Next Step
-
-Refer to [Testing the ODBC Connection on Linux and Mac OS X]({{ site.baseurl }}/docs/testing-the-odbc-connection).
-

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md
new file mode 100644
index 0000000..fb38ae2
--- /dev/null
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md
@@ -0,0 +1,179 @@
+---
+title: "Configuring ODBC on Linux/Mac OS X"
+parent: "Configuring ODBC"
+---
+ODBC driver managers use configuration files to define and configure ODBC data
+sources and drivers. To configure an ODBC connection for Linux or Mac OS X, complete the following
+steps:
+
+* Step 1: Set Environment Variables (Linux only)
+* Step 2: Define the ODBC Data Sources in odbc.ini
+* Step 3: (Optional) Define the ODBC Driver in odbcinst.ini
+* Step 4: Configure the MapR Drill ODBC Driver
+
+## Sample Configuration Files
+
+Before you connect to Drill through an ODBC client tool
+on Linux or Mac OS X, copy the following configuration files in `/opt/mapr/drillobdc/Setup` to your home directory unless the files already exist in your home directory:
+
+* `mapr.drillodbc.ini`
+* `odbc.ini`
+* `odbcinst.ini`
+
+In your home directory, use sudo to rename the files as hidden files:
+
+* .mapr.drillodbc.ini
+* .odbc.ini
+* .odbcinst.ini
+
+The installer for Mac OS X creates a sample user DSN in odbc.ini in either of the following locations:
+
+* ~/Library/ODBC/odbc.ini
+* ~/.odbc.ini
+
+Depending on the driver manager you use, the user DSN in one of these files will be effective.
+
+----------
+
+## Step 1: Set Environment Variables 
+
+### Linux
+
+Set the following environment variables to point to the `.odbc.ini`
+and `.mapr.drillodbc.ini` configuration files, respectively:
+
+  * `ODBCINI` (point to `.odbc.ini`)
+  * `MAPRDRILLINI` (point to `.mapr.drillodbc.ini`)
+
+The `LD_LIBRARY_PATH` environment variable must include the paths to the
+following:
+
+  * Installed ODBC driver manager libraries
+  * Installed MapR ODBC Driver for Apache Drill shared libraries
+
+You can have both 32- and 64-bit versions of the driver installed at the same time on the same computer. 
+{% include startimportant.html %}Do not include the paths to both 32- and 64-bit shared libraries in LD_LIBRARY PATH at the same time.{% include endimportant.html %}
+Only include the path to the shared libraries corresponding to the driver matching the bitness of the client application used.
+
+For example, if you are using a 64-bit client application and ODBC driver
+manager libraries are installed in `/usr/local/lib`, then set
+`LD_LIBRARY_PATH` as follows:  
+
+`export LD_LIBRARY_PATH=/usr/local/lib:/opt/simba/drillodbc/lib/64`  
+
+### Mac OS X
+
+Create or modify the `/etc/launchd.conf` file to set environment variables. Set the SIMBAINI variable to point to the `.mapr.drillodbc.ini` file, the ODBCSYSINI varialbe to the `.odbcinst.ini` file, the ODBCINI variable to the `.odbc.ini` file, and the DYLD_LIBRARY_PATH to the location of the dynamic linker (DYLD) libraries and to the MapR Drill ODBC Driver. If you installed the iODBC driver manager using the DMG, the DYLD libraries are installed in `/usr/local/iODBC/lib`. The launchd.conf file should look something like this:
+
+    setenv SIMBAINI /Users/joeuser/.mapr.drillodbc.ini
+    setenv ODBCSYSINI /Users/joeuser/.odbcinst.ini
+    setenv ODBCINI /Users/joeuser/.odbc.ini
+    launchctl setenv DYLD_LIBRARY_PATH /usr/local/iODBC/lib:/opt/mapr/drillodbc/lib/universal
+
+Restart the Mac OS X or run `launchctl load /etc/launchd.conf`.
+----------
+
+## Step 2: Define the ODBC Data Sources in .odbc.ini
+
+Define the ODBC data sources in the `~/.odbc.ini` configuration file for your environment. The following sample shows a possible configuration for using Drill in embedded mode. 
+
+**Example**
+          
+    [ODBC]
+    # Specify any global ODBC configuration here such as ODBC tracing.
+  
+    [ODBC Data Sources]
+    Sample MapR Drill DSN=MapR Drill ODBC Driver
+  
+    [Sample MapR Drill DSN]
+    # Description: DSN Description.
+    # This key is not necessary and is only to give a description of the data source.
+    Description=Sample MapR Drill ODBC Driver DSN
+    # Driver: The location where the ODBC driver is installed to.
+    Driver=/opt/mapr/drillodbc/lib/universal/libmaprdrillodbc.dylib
+  
+    # Values for ConnectionType, AdvancedProperties, Catalog, Schema should be set here.
+    # If ConnectionType is Direct, include Host and Port. If ConnectionType is ZooKeeper, include ZKQuorum and ZKClusterID
+    # They can also be specified in the connection string.
+    ConnectionType=Direct
+    HOST=localhost
+    PORT=31010
+    ZKQuorum=
+    ZKClusterID=
+    AdvancedProperties={HandshakeTimeout=5;QueryTimeout=180;TimestampTZDisplayTimeout=utc;ExcludedSchemas=sys,INFORMATION_SCHEMA}
+    Catalog=DRILL
+    Schema=
+
+If ConnectionType=Zookeeper, get the ZKQuorum and ZKClusterID values from the `drill-override.conf` file, and define the ZKQuorum and ZKClusterID properties. For example:
+
+* `ZKQuorum=localhost:2181`  
+* `ZKClusterID=drillbits1`
+
+If ConnectionType=Direct, define HOST and PORT properties. For example:
+
+* `HOST=localhost`  
+* `PORT=31010`
+
+[Driver
+Configuration
+Options]({{ site.baseurl }}/docs/odbc-configuration-reference/#configuration-options) describes configuration options available for controlling the
+behavior of DSNs using the MapR Drill ODBC Driver.
+
+----------
+
+## Step 3: (Optional) Define the ODBC Driver in .odbcinst.ini
+
+The `.odbcinst.ini` is an optional configuration file that defines the ODBC
+Drivers. This configuration file is optional because you can specify drivers
+directly in the` .odbc.ini` configuration file. The following sample shows a possible configuration.
+  
+**Example**
+
+    [ODBC Drivers]
+    MapR Drill ODBC Driver=Installed
+   
+    [MapR Drill ODBC Driver]
+    Description=MapR Drill ODBC Driver
+    Driver=/opt/mapr/drillodbc/lib/universal/libmaprdrillodbc.dylib
+
+----------
+
+## Step 4: Configure the MapR Drill ODBC Driver
+
+Configure the MapR Drill ODBC Driver for your environment by modifying the `.mapr.drillodbc.ini` configuration
+file. This configures the driver to work with your ODBC driver manager. The following sample shows a possible configuration, which you can use as is if you installed the default iODBC driver manager.
+
+**Example**
+
+    [Driver]
+    ## - Note that this default DriverManagerEncoding of UTF-32 is for iODBC.
+    DriverManagerEncoding=UTF-32
+    ErrorMessagesPath=/opt/mapr/drillodbc/ErrorMessages
+
+    LogLevel=0
+    LogPath=
+    SwapFilePath=/tmp
+
+    # iODBC
+    ODBCInstLib=libiodbcinst.dylib
+
+### Configuring .mapr.drillodbc.ini
+
+To configure the MapR Drill ODBC Driver in the `mapr.drillodbc.ini` configuration file, complete the following steps:
+
+  1. Open the `mapr.drillodbc.ini` configuration file in a text editor.
+  2. Edit the DriverManagerEncoding setting if necessary. The value is typically UTF-16 or UTF-32, but depends on the driver manager used. iODBC uses UTF-32 and unixODBC uses UTF-16. Review your ODBC Driver Manager documentation for the correct setting.
+  3. Edit the `ODBCInstLib` setting. The value is the name of the `ODBCInst` shared library for the ODBC driver manager that you use. The configuration file defaults to the shared library for `iODBC`. In Linux, the shared library name for iODBC is `libiodbcinst.so`. In Mac OS X, the shared library name for `iODBC` is `libiodbcinst.dylib`.
+     {% include startnote.html %}Review your ODBC Driver Manager documentation for the correct
+setting.{% include endnote.html %} 
+     Specify an absolute or relative filename for the library. If you use
+the relative file name, include the path to the library in the library path
+environment variable. In Linux, the library path environment variable is named
+`LD_LIBRARY_PATH`. In Mac OS X, the library path environment variable is
+named `DYLD_LIBRARY_PATH`.
+  4. Save the `mapr.drillodbc.ini` configuration file.
+
+### Next Step
+
+Refer to [Testing the ODBC Connection on Linux and Mac OS X]({{ site.baseurl }}/docs/testing-the-odbc-connection).
+

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md
new file mode 100644
index 0000000..cf5c3d2
--- /dev/null
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md
@@ -0,0 +1,49 @@
+---
+title: "Configuring ODBC on Windows"
+parent: "Configuring ODBC"
+---
+
+Complete one of the following steps to create an ODBC connection on Windows to Drill data
+sources:
+
+  * Create a Data Source Name
+  * Create an ODBC Connection String
+
+**Prerequisite:** An Apache Drill installation must be [configured]({{ site.baseurl }}/docs/connect-a-data-source-introduction/) to access the data sources that you want to connect to.  For information about how to install Apache Drill, see [Install Drill]({{ site.baseurl }}/docs/install-drill).
+
+## Create a Data Source Name (DSN)
+
+Create a DSN that an application can use to connect to Drill data sources. If
+you want to create a DSN for a 32-bit application, you must use the 32-bit
+version of the ODBC Administrator to create the DSN.
+
+1. To launch the ODBC Administrator, click **Start > All Programs > MapR Drill ODBC Driver 1.0 (32|64-bit) > (32|64-bit) ODBC Administrator**.  
+   
+    To launch the 32-bit version of the ODBC driver on a 64-bit machine, run:
+`C:\WINDOWS\SysWOW64\odbcad32.exe`.  
+    The ODBC Data Source Administrator window appears.  
+2. Create a system or user DSN on the **System DSN** or **User DSN** tab, respectively. A system DSN is available for all users who log in to the machine. A user DSN is available to the user who creates the DSN.  
+3. Click **Add**.  
+4. Select **MapR Drill ODBC Driver** and click **Finish**.  
+   The _MapR Drill ODBC Driver DSN Setup_ window appears.
+5. In the **Data Source Name** field, enter a name for the DSN.  
+6. Optionally, enter a description of the DSN in the Description field.
+7. In the Connection Type section, select one of the following connection types:  
+   * ZooKeeper Quorum  
+   * Direct to Drillbit  
+8. If you select **ZooKeeper Quorum**, provide values for the following properties:  
+   * Quorum  
+     A comma separated list of ZooKeeper nodes in the following format:  
+     `<host name/ip address> : <port number>, <host name/ip address> : <port number>, . . .`  
+   * Cluster ID  
+     Name of the drillbit cluster, drillbits1 by default. Check the `drill-override.conf` file for any cluster name changes.  
+
+    If you select Direct to Drillbit, provide the IP address or host name of the Drill server and the Drill listen port number, 31010 by default. Check the `drill-override.conf` file for any port changes.  
+9. In **Default Schema**, select the [default schema]({{site.baseurl}}/docs/configuring-connections-on-windows/#schema) to connect to.  
+10. Optionally, perform the following operations:  
+    * Update the [advanced properties]({{site.baseurl}}/docs/configuring-connections-on-windows/#advanced-properties) configuration.  
+    * Configure [logging options]({{site.baseurl}}/docs/configuring-connections-on-windows/#logging-options) to log types of events.  
+11. Click **OK** to save the DSN.
+
+#### What's Next? Go to [Step 3. Connect to Drill Data Sources from a BI Tool]({{ site.baseurl }}/docs/connecting-to-odbc-data-sources).
+

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/configuring-odbc/030-testing-the-odbc-connection.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/030-testing-the-odbc-connection.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/030-testing-the-odbc-connection.md
deleted file mode 100644
index a90c286..0000000
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/030-testing-the-odbc-connection.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-title: "Testing the ODBC Connection"
-parent: "Configuring ODBC"
----
-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.
-
-For example, the iODBC driver manager includes simple utilities called
-`iodbctest` and `iodbctestw`. You can use either one of these utilities to
-establish a test connection with your driver and your DSN. Use `iodbctest` to
-test how your driver works with an ANSI application. Use `iodbctestw` to test
-how your driver works with a Unicode application.
-
-**Note:** 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.
-
-Visit [http://www.iodbc.org](http://www.iodbc.org/) for further details on
-using the iODBC driver manager.
-
-## Testing the ODBC Connection
-
-Complete the following steps to test your connection using the iODBC driver
-manager:
-
-  1. Run `iodbctest` or `iodbctestw`. The program prompts you for an ODBC connection string.
-  2. If you do not remember the DSN name, type a question mark (?) to see a list of DSNs.
-  3. If you are connecting directly to a Drillbit, type an ODBC connection string using the following format:
-
-     `DRIVER=MapR Drill ODBC Driver;ConnectionType=Direct;Host=HostName;Port=PortNumber`
-     
-     OR
-     
-     If you are connecting to a ZooKeeper cluster, type an ODBC connection string
-using the following format:
-
-     `DRIVER=MapR Drill ODBC Driver;ConnectionType=ZooKeeper;ZKQuorum=Server1:Port1
-,Server2:Port2;ZKClusterID=DrillbitName`
-
-     If the connection is successful, the `SQL>` prompt appears.
-

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/configuring-odbc/040-configuring-connections-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/040-configuring-connections-on-windows.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/040-configuring-connections-on-windows.md
deleted file mode 100644
index abe2315..0000000
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/040-configuring-connections-on-windows.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-title: "Configuring Connections on Windows"
-parent: "Configuring ODBC"
----
-
-Complete one of the following steps to create an ODBC connection on Windows to Drill data
-sources:
-
-  * Create a Data Source Name
-  * Create an ODBC Connection String
-
-**Prerequisite:** An Apache Drill installation must be [configured]({{ site.baseurl }}/docs/connect-a-data-source-introduction/) to access the data sources that you want to connect to.  For information about how to install Apache Drill, see [Install Drill]({{ site.baseurl }}/docs/install-drill).
-
-## Create a Data Source Name (DSN)
-
-Create a DSN that an application can use to connect to Drill data sources. If
-you want to create a DSN for a 32-bit application, you must use the 32-bit
-version of the ODBC Administrator to create the DSN.
-
-1. To launch the ODBC Administrator, click **Start > All Programs > MapR Drill ODBC Driver 1.0 (32|64-bit) > (32|64-bit) ODBC Administrator**.  
-   
-    To launch the 32-bit version of the ODBC driver on a 64-bit machine, run:
-`C:\WINDOWS\SysWOW64\odbcad32.exe`.  
-    The ODBC Data Source Administrator window appears.  
-2. Create a system or user DSN on the **System DSN** or **User DSN** tab, respectively. A system DSN is available for all users who log in to the machine. A user DSN is available to the user who creates the DSN.  
-3. Click **Add**.  
-4. Select **MapR Drill ODBC Driver** and click **Finish**.  
-   The _MapR Drill ODBC Driver DSN Setup_ window appears.
-5. In the **Data Source Name** field, enter a name for the DSN.  
-6. Optionally, enter a description of the DSN in the Description field.
-7. In the Connection Type section, select one of the following connection types:  
-   * ZooKeeper Quorum  
-   * Direct to Drillbit  
-8. If you select **ZooKeeper Quorum**, provide values for the following properties:  
-   * Quorum  
-     A comma separated list of ZooKeeper nodes in the following format:  
-     `<host name/ip address> : <port number>, <host name/ip address> : <port number>, . . .`  
-   * Cluster ID  
-     Name of the drillbit cluster, drillbits1 by default. Check the `drill-override.conf` file for any cluster name changes.  
-
-    If you select Direct to Drillbit, provide the IP address or host name of the Drill server and the Drill listen port number, 31010 by default. Check the `drill-override.conf` file for any port changes.  
-9. In **Default Schema**, select the [default schema]({{site.baseurl}}/docs/configuring-connections-on-windows/#schema) to connect to.  
-10. Optionally, perform the following operations:  
-    * Update the [advanced properties]({{site.baseurl}}/docs/configuring-connections-on-windows/#advanced-properties) configuration.  
-    * Configure [logging options]({{site.baseurl}}/docs/configuring-connections-on-windows/#logging-options) to log types of events.  
-11. Click **OK** to save the DSN.
-
-#### What's Next? Go to [Step 3. Connect to Drill Data Sources from a BI Tool]({{ site.baseurl }}/docs/connecting-to-odbc-data-sources).
-

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md
new file mode 100644
index 0000000..fdea622
--- /dev/null
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md
@@ -0,0 +1,62 @@
+---
+title: "Testing the ODBC Connection"
+parent: "Configuring ODBC"
+---
+The procedure for testing the ODBC connection differs depending on your platform, as described in the following sections:
+
+* [Testing the ODBC Connection on Mac OS X](/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-mac-os-x)
+* [Testing the ODBC Connection on Linux](/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-linux)
+* [Testing the ODBC Connection on Windows](/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-windows)
+
+## Testing the ODBC Connection on Mac OS X
+
+To test the ODBC connection Mac OS X, follow these steps.
+
+1. [Start Drill]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/).  
+2. Start the iODBC Administrator.app in `/Applications`.  
+   The iODBC Data Source Administrator dialog appears.  
+2. On the User DSN tab, select the MapR Drill DSN.  
+   ![]({{ site.baseurl }}/docs/img/odbc-mac1.png)  
+3. Click **Test**.  
+   The Login for Sample MapR Drill DSN dialog appears.  
+   ![]({{ site.baseurl }}/docs/img/odbc-mac2.png)  
+4. If you configured Basic Authentication in the .odbc.ini, enter the user name and password you also configured; otherwise, click OK.  
+   The success message appears.  
+   ![]({{ site.baseurl }}/docs/img/odbc-mac3.png)  
+
+## Testing the ODBC Connection on Linux
+
+To test the ODBC connection on Linux use the test utilities that are packaged
+with your driver manager installation: `iodbctest` and `iodbctestw`. Use `iodbctest` to
+test how your driver works with an ANSI application. Use `iodbctestw` to test
+how your driver works with a Unicode application.
+
+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.
+
+Visit [http://www.iodbc.org](http://www.iodbc.org/) for further details on
+using the iODBC driver manager.
+
+To test the ODBC connection on Linux, follow these steps:
+
+1. [Start Drill]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/).
+2. Run `iodbctest` or `iodbctestw`. The program prompts you for an ODBC connection string.
+2. If you do not remember the DSN name, type a question mark (?) to see a list of DSNs.
+3. If you are connecting directly to a Drillbit, type an ODBC connection string using the following format:
+
+     `DRIVER=MapR Drill ODBC Driver;ConnectionType=Direct;Host=HostName;Port=PortNumber`
+     
+     OR
+     
+     If you are connecting to a ZooKeeper cluster, type an ODBC connection string
+using the following format:
+
+     `DRIVER=MapR Drill ODBC Driver;ConnectionType=ZooKeeper;ZKQuorum=Server1:Port1
+,Server2:Port2;ZKClusterID=DrillbitName`
+
+     If the connection is successful, the `SQL>` prompt appears.
+
+## Testing the ODBC Connection on Windows
+
+To test the ODBC connection on Windows, follow these steps:
+
+1. [Start Drill]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
index 8d24c98..67a79fb 100755
--- a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
+++ b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
@@ -83,23 +83,15 @@ File| Description
 `/opt/mapr/drillodbc/lib/32 `| 32-bit shared libraries directory.  
 `/opt/mapr/drillodbc/lib/64`| 64-bit shared libraries directory.  
   
-## Step 3: Setting the LD_LIBRARY_PATH Environment Variable
+## Step 3: Checking the MapR Drill ODBC Driver version
 
-The `LD_LIBRARY_PATH` environment variable must include the paths to the
-following:
+To check the version of the driver you installed, use the following command on the terminal command line:
 
-  * Installed ODBC driver manager libraries
-  * Installed MapR ODBC Driver for Apache Drill shared libraries
+`yum list | grep maprdrillodbc`
 
-You can have both 32- and 64-bit versions of the driver installed at the same time on the same computer. 
-{% include startimportant.html %}Do not include the paths to both 32- and 64-bit shared libraries in LD_LIBRARY PATH at the same time.{% include endimportant.html %}
-Only include the path to the shared libraries corresponding to the driver matching the bitness of the client application used.
+or
 
-For example, if you are using a 64-bit client application and ODBC driver
-manager libraries are installed in `/usr/local/lib`, then set
-`LD_LIBRARY_PATH` as follows:  
-
-`export LD_LIBRARY_PATH=/usr/local/lib:/opt/simba/drillodbc/lib/64`  
+`rpm -qa | grep maprdrillodbc`
 
 
 #### Next Step

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
index 440bf17..41dfaf0 100755
--- a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
+++ b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
@@ -7,9 +7,9 @@ the Drill service.
 
 To install the MapR Drill ODBC Driver, complete the following steps:
 
-  * Step 1: Downloading the MapR Drill ODBC Driver 
-  * Step 2: Installing the MapR Drill ODBC Driver 
-  * Step 3: Updating the DYLD_LIBRARY_PATH Environment Variable
+  * [Step 1: Downloading the MapR Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-mac-os-x/#step-1:-downloading-the-mapr-drill-odbc-driver) 
+  * [Step 2: Installing the MapR Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-mac-os-x/#step-2:-installing-the-mapr-drill-odbc-driver) 
+  * [Step 3: Checking the MapR Drill ODBC Driver Version]({{site.baseurl}}/docs/installing-the-driver-on-mac-os-x/#step-3:-check-the-mapr-drill-odbc-driver-version)
 
 After you complete the installation steps, complete the steps listed in
 [Configuring ODBC Connections on Linux and Mac OS X]({{ site.baseurl }}/docs/configuring-connections-on-linux-and-mac-os-x)
@@ -19,11 +19,11 @@ Verify that your system meets the following prerequisites before you start.
 
 **System Requirements**
 
-  * Mac OS X version 10.6.8 or later
-  * 100 MB of available disk space
-  * iODBC 3.52.7 or later
-  * The client must be able to resolve the actual hostname of the Drill node(s) with the IP(s). Verify that a DNS entry was created on the client machine for the Drill node(s).   
-If not, create the following entry in `/etc/hosts` for the Drill node(s):  
+  * Mac OS X version 10.6.8 or later  
+  * 100 MB of available disk space  
+  * iODBC 3.52.7 or later  
+    The iodbc-config file in the `/usr/local/iODBC/bin` includes the version.  
+  * The client must be able to resolve the actual hostname of the Drill node(s) with the IP(s). Verify that a DNS entry was created on the client machine for the Drill node(s).  If necessary, create the following entry in `/etc/hosts` for the Drill node(s):  
 `<drill-machine-IP> <drill-machine-hostname>`  
 Example: `127.0.0.1 localhost`
 
@@ -54,20 +54,16 @@ To install the driver, complete the following steps:
   * `/opt/mapr/drillodbc/Setup` – Sample configuration files directory
   * `/opt/mapr/drillodbc/lib/universal` – Binaries directory
 
-----------
-
-## Step 3: Updating the DYLD_LIBRARY_PATH Environment Variable
-
-The Dynamic Link editor library path environment variable DYLD_LIBRARY_PATH must include paths to the following
-libraries:
-
-  * Installed iODBC driver manager libraries: libiodbc.dylib and libiodbcinst.dylib
-  * Installed MapR Drill ODBC Driver for Drill shared libraries
+## Step 3: Checking the MapR Drill ODBC Driver version
 
-If you installed the iODBC driver manager using the DMG, libraries are installed in
-`/usr/local/iODBC/lib`, set the `DYLD_LIBRARY_PATH` to include that path and the path to the MapR Drill ODBC Driver. For example, use the following command to set the environment variable to both paths:
+To check the version of the driver you installed, use the following command on the terminal command line:
 
-`export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/iODBC/lib:/opt/mapr/drillodbc/lib/universal`
+    $ pkgutil --info mapr.drillodbc
+    package-id: mapr.drillodbc
+    version: 1.0.0
+    volume: /
+    location: 
+    install-time: 1433465518
 
 #### Next Step
 

http://git-wip-us.apache.org/repos/asf/drill/blob/3516a1f4/_docs/odbc-jdbc-interfaces/using-drill-explorer/010-connecting-to-odbc-data-sources.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-drill-explorer/010-connecting-to-odbc-data-sources.md b/_docs/odbc-jdbc-interfaces/using-drill-explorer/010-connecting-to-odbc-data-sources.md
index a2b8146..abb5f40 100644
--- a/_docs/odbc-jdbc-interfaces/using-drill-explorer/010-connecting-to-odbc-data-sources.md
+++ b/_docs/odbc-jdbc-interfaces/using-drill-explorer/010-connecting-to-odbc-data-sources.md
@@ -3,18 +3,22 @@ title: "Connecting to ODBC Data Sources"
 parent: "Using Drill Explorer"
 ---
 
-In some cases, you may want to use Drill Explorer to explore that data or to
-create a view before you connect to the data from a BI tool. For more
-information about [Drill Explorer]({{ site.baseurl }}/docs/using-drill-explorer-on-windows) to browse data and create views.
+Typically, you use Drill Explorer to explore data or to
+create a view before you connect to the data from a BI tool. In an ODBC-compliant BI tool, use the ODBC DSN to create an ODBC connection
+with one of the methods applicable to the data source type. 
 
-In an ODBC-compliant BI tool, use the ODBC DSN to create an ODBC connection
-with one of the methods applicable to the data source type:
+To connect Drill to a Hive data source, follow these steps:
 
-| Data Source Type               | ODBC Connection Method                                                                                                                                      |
-|--------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Hive                           | Connect to a table. Connect to the table using custom SQL. Use Drill Explorer to create a view. Then use ODBC to connect to the view as if it were a table. |
-| HBase, Parquet, JSON, CSV, TSV | Use Drill Explorer to create a view. Then use ODBC to connect to the view as if it were a table. Connect to the data using custom SQL.                      |
-  
+1. Connect to a Hive table.
+2. Use Drill Explorer to create a view.
+3. Connect to the view as if it were a table.
+
+To connect Drill to an HBase, Parquet, JSON, CSV, or TSV, follow these steps:
+
+1. Use Drill Explorer to create a view.
+2. Use ODBC to connect to the view as if it were a table.
+3. Use Drill Explorer to query the table.
+ 
 {% include startnote.html %}The default schema that you configure in the DSN may or may not carry over to an application’s data source connections. You may need to re-select the schema.{% include endnote.html %}
 
 


Mime
View raw message