drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bridg...@apache.org
Subject [2/2] drill-site git commit: updates to ODBC driver docs from catherine skrbina
Date Tue, 30 May 2017 23:20:55 GMT
updates to ODBC driver docs from catherine skrbina


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

Branch: refs/heads/asf-site
Commit: 6d3c0f51e04e4dfa7218067ef622fefb4320949e
Parents: bf331d5
Author: Bridget Bevens <bbevens@maprtech.com>
Authored: Tue May 30 16:20:17 2017 -0700
Committer: Bridget Bevens <bbevens@maprtech.com>
Committed: Tue May 30 16:20:17 2017 -0700

----------------------------------------------------------------------
 docs/configuring-odbc-on-linux/index.html       | 128 ++++++----
 docs/configuring-odbc-on-mac-os-x/index.html    |  83 ++++---
 docs/configuring-odbc-on-windows/index.html     |  36 ++-
 .../index.html                                  |  67 +++---
 docs/img/odbc-configure1.png                    | Bin 43220 -> 65848 bytes
 docs/img/odbc-configure2.png                    | Bin 56060 -> 93811 bytes
 docs/img/odbc-drivers.png                       | Bin 49123 -> 21466 bytes
 docs/img/odbc-explorer-connect.png              | Bin 10233 -> 4738 bytes
 docs/img/odbc-explorer-win.png                  | Bin 24127 -> 24696 bytes
 docs/img/odbc-user-dsn.png                      | Bin 36866 -> 19725 bytes
 docs/img/winsettings.png                        | Bin 0 -> 65849 bytes
 docs/img/winstart.png                           | Bin 0 -> 53392 bytes
 docs/installing-the-driver-on-linux/index.html  |  45 ++--
 .../index.html                                  |  16 +-
 .../installing-the-driver-on-windows/index.html |  36 +--
 docs/odbc-configuration-reference/index.html    | 238 ++++++++++++-------
 docs/testing-the-odbc-connection/index.html     | 201 ++++++++++++----
 feed.xml                                        |   4 +-
 18 files changed, 561 insertions(+), 293 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/configuring-odbc-on-linux/index.html
----------------------------------------------------------------------
diff --git a/docs/configuring-odbc-on-linux/index.html b/docs/configuring-odbc-on-linux/index.html
index c4d052e..bd27cec 100644
--- a/docs/configuring-odbc-on-linux/index.html
+++ b/docs/configuring-odbc-on-linux/index.html
@@ -1122,7 +1122,7 @@
 
     </div>
 
-     May 20, 2016
+     May 30, 2017
 
     <link href="/css/docpage.css" rel="stylesheet" type="text/css">
 
@@ -1142,7 +1142,7 @@ steps:</p>
 <h2 id="sample-configuration-files">Sample Configuration Files</h2>
 
 <p>Before you connect to Drill through an ODBC client tool
-on Linux, copy the following configuration files in <code>/opt/mapr/drillodbc/Setup</code> to your home directory unless the files already exist in your home directory:</p>
+on Linux, copy the following configuration files in <code>/opt/mapr/drill/Setup</code> to your home directory unless the files already exist in your home directory:</p>
 
 <ul>
 <li><code>mapr.drillodbc.ini</code></li>
@@ -1167,14 +1167,14 @@ on Linux, copy the following configuration files in <code>/opt/mapr/drillodbc/Se
 <code>export ODBCINI=~/.odbc.ini</code></li>
 <li>Set the MAPRDRILLINI environment variable to point to <code>.mapr.drillodbc.ini</code> in your home directory. For example:<br>
 <code>export MAPRDRILLINI=~/.mapr.drillodbc.ini</code></li>
-<li>Set the LD_LIBRARY_PATH environment variable  to point to your ODBC driver manager libraries and the MapR ODBC Driver for Apache Drill shared libraries. For example:<br>
-<code>export LD_LIBRARY_PATH=/usr/local/lib:/opt/mapr/drillodbc/lib/64</code></li>
+<li>Set the <code>LD_LIBRARY_PATH</code> environment variable  to point to your ODBC driver manager libraries. For example:<br>
+<code>export LD_LIBRARY_PATH=/usr/local/lib</code></li>
 </ol>
 
 <p>You can have both 32- and 64-bit versions of the driver installed at the same time on the same computer. 
 <div class="admonition important">
   <p class="first admonition-title">Important</p>
-  <p class="last">Do not include the paths to both 32- and 64-bit shared libraries in LD_LIBRARY PATH at the same time.  </p>
+  <p class="last">Do not include the paths to both 32- and 64-bit shared libraries in <code>LD_LIBRARY_PATH</code> at the same time.  </p>
 </div>
 Only include the path to the shared libraries corresponding to the driver matching the bitness of the client application you use to access Drill.</p>
 
@@ -1196,51 +1196,100 @@ PORT=
 ZKQuorum=&lt;host name&gt;:&lt;port&gt;,&lt;host name&gt;:&lt;port&gt; . . . &lt;host name&gt;:&lt;port&gt;
 ZKClusterID=&lt;cluster name in `drill-override.conf`&gt;
 </code></pre></div>
-<p>The following Linux sample shows a possible configuration for using Drill in distributed mode. The configuration assumes you started Drill using the <code>drill-conf</code> command. The example modifies the default Linux-installed <code>.odbc.ini</code> for a 64-bit system by commenting out 32-bit properties, adding 64-bit properties, and removes the extraneous [Sample MapR Drill DSN 64] from <code>.odbc.ini</code>.</p>
+<p>The following Linux sample shows a possible configuration for using Drill in distributed mode. The configuration assumes you started Drill using the <code>drill-conf</code> command. The example modifies the default Linux-installed <code>.odbc.ini</code> for a 64-bit system by commenting out 32-bit properties, adding 64-bit properties, and removes the extraneous MapR Drill 64-bit from <code>.odbc.ini</code>.</p>
 <div class="highlight"><pre><code class="language-text" data-lang="text">[ODBC]
 Trace=no
 
 [ODBC Data Sources]
-#Sample MapR Drill DSN 32=MapR Drill ODBC Driver 32-bit
-Sample MapR Drill DSN 64=MapR Drill ODBC Driver 64-bit
-
-[Sample MapR Drill DSN 64]
-#[Sample MapR Drill DSN 32]
+MapR Drill 32-bit=MapR Drill ODBC Driver 32-bit
+MapR Drill 64-bit=MapR Drill ODBC Driver 64-bit
+[MapR Drill 32-bit]
 # This key is not necessary and only describes the data source.
-#Description=MapR Drill ODBC Driver (32-bit) DSN
-Description=MapR Drill ODBC Driver (64-bit) DSN
 
+# Description=MapR Drill ODBC Driver (32-bit) DSN
+Description=MapR Drill ODBC Driver (32-bit) DSN
 
 # Driver: The location where the ODBC driver is installed to.
-#Driver=/opt/mapr/drillodbc/lib/32/libmaprdrillodbc32.so
-Driver=/opt/mapr/drillodbc/lib/64/libmaprdrillodbc64.so
+Driver=/opt/mapr/drill/lib/32/libdrillodbc_sb32.so
 
 # The DriverUnicodeEncoding setting is only used for SimbaDM
 # When set to 1, SimbaDM runs in UTF-16 mode.
 # When set to 2, SimbaDM runs in UTF-8 mode.
-#DriverUnicodeEncoding=2
+# DriverUnicodeEncoding=2
 
 # 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 on the connection string.
-# AuthenticationType: No authentication; Basic Authentication
-ConnectionType=ZooKeeper
+# AuthenticationType:No authentication;Plain;Kerberos
+ConnectionType=Direct
 HOST=
 PORT=
-ZKQuorum=centos23:5181,centos28:5181,centos29:5181
-ZKClusterID=docs41cluster-drillbits
+ZKQuorum=[Zookeeper Quorum]
+ZKClusterID=[Cluster ID]]
 AuthenticationType=No Authentication
 UID=[USERNAME]
 PWD=[PASSWORD]
+DelegationUID=
+KrbServiceHost=mapr
+KrbServiceName=
 AdvancedProperties=CastAnyToVarchar=true;HandshakeTimeout=5;QueryTimeout=180;TimestampTZDisplayTimezone=utc;ExcludedSchemas=sys,INFORMATION_SCHEMA;NumberOfPrefetchBuffers=5;
 Catalog=DRILL
 Schema=
 
+[MapR Drill 64-bit]
+# This key is not necessary and only describes the data source.
+Description=MapR Drill ODBC Driver (64-bit) DSN
+
+# Driver: The location where the ODBC driver is installed to.
+Driver=/opt/mapr/drill/lib/64/libdrillodbc_sb64.so
+
 # The DriverUnicodeEncoding setting is only used for SimbaDM
+# When set to 1, SimbaDM runs in UTF-16 mode.
+# When set to 2, SimbaDM runs in UTF-8 mode.
+# DriverUnicodeEncoding=2
+
+# 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 on the connection string.
+# AuthenticationType:No authentication;Plain;Kerberos;MapRSASL
+ConnectionType=Direct
+HOST=
+PORT=
+ZKQuorum=[Zookeeper Quorum]
+ZKClusterID=[Cluster ID]]
+AuthenticationType=No Authentication
+UID=[USERNAME]
+PWD=[PASSWORD]
+DelegationUID=
+KrbServiceHost=mapr
+KrbServiceName=
+AdvancedProperties=CastAnyToVarchar=true;HandshakeTimeout=5;QueryTimeout=180;TimestampTZDisplayTimezone=utc;ExcludedSchemas=sys,INFORMATION_SCHEMA;NumberOfPrefetchBuffers=5;
+Catalog=DRILL
+Schema=
 </code></pre></div>
 <h3 id="authentication-properties">Authentication Properties</h3>
 
-<p>To password protect the DSN, uncomment the AuthenticationType, select Basic Authentication for the AuthenticationType, and configure UID and PWD properties.</p>
+<p>If the Drillbit requires authentication, uncomment the AuthenticationType, add an AuthenticationType, and configure properties. If the Drillbit does not require authentication (or to configure no password protection), you can use the No Authentication option; you do not need to configure additional settings. </p>
+
+<ul>
+<li><p><strong>MapRSASL</strong> </p>
+
+<ul>
+<li>The MapR login utility must be used to obtain a MapR ticket for MapR SASL authentication. </li>
+<li>You must install and configure the MapR login utility before you can use the MapR SASL authentication mechanism. See <a href="http://maprdocs.mapr.com/home/SecurityGuide/SecurityArchitecture-AuthenticationArchitecture.html" title="MapR Login Utilty">Authentication Architecture: The maprlogin Utility</a> and <a href="http://maprdocs.mapr.com/home/SecurityGuide/Tickets.html/">Tickets</a>.</li>
+</ul>
+
+<p><strong>Kerberos</strong> 
+*  See the <a href="http://web.mit.edu/kerberos/" title="MIT Kerberos">MIT Kerberos</a> documentation for installing and configuring a Kerberos environment, which is beyond the scope of the information provided here.
+* To specify the Kerberos mechanism:
+    * Set the AuthenticationType to Kerberos.
+    * Set the KrbServiceHost property to the FQDN of the Drill server host.
+    * Set the KrbServiceName property to the Kerberos service principal name of the Drill server.</p>
+
+<p><strong>Plain (or Basic Authentication)</strong>
+* Configure the UID to an appropriate name for accessing the Drill server. 
+* Set the PWD property to the password corresponding to the UID. </p></li>
+</ul>
 
 <h3 id="direct-and-zookeeper-quorum-properties">Direct and ZooKeeper Quorum Properties</h3>
 
@@ -1257,7 +1306,7 @@ Schema=
 <p>To use Drill in embedded mode, do not define the ZKQuorum and ZKClusterID properties. Start Drill using the drill-localhost command, set ConnectionType to Direct, and define HOST and PORT properties. For example:</p>
 
 <ul>
-<li><code>HOST=centos32.lab:5181</code><br></li>
+<li><code>HOST=&lt;IP address of drillbit&gt;:5181</code><br></li>
 <li><code>PORT=31010</code></li>
 </ul>
 
@@ -1274,17 +1323,16 @@ directly in the<code>.odbc.ini</code> configuration file. The <code>.odbinst.ini
 
 <p><strong>Example</strong></p>
 <div class="highlight"><pre><code class="language-text" data-lang="text">[ODBC Drivers]
-[ODBC Drivers]
 MapR Drill ODBC Driver 32-bit=Installed
 MapR Drill ODBC Driver 64-bit=Installed
 
 [MapR Drill ODBC Driver 32-bit]
-Description=MapR Drill ODBC Driver(32-bit)
-Driver=/opt/mapr/drillodbc/lib/32/libmaprdrillodbc32.so
+Description=MapR Drill ODBC Driver (32-bit)
+Driver=/opt/mapr/lib/32/libdrillodbc_sb32.so
 
 [MapR Drill ODBC Driver 64-bit]
-Description=MapR Drill ODBC Driver(64-bit)
-Driver=/opt/mapr/drillodbc/lib/64/libmaprdrillodbc64.so 
+Description=MapR Drill ODBC Driver (64-bit)
+Driver=/opt/mapr/lib/64/libdrillodbc_sb64.so 
 </code></pre></div>
 <hr>
 
@@ -1297,36 +1345,26 @@ file. This configures the driver to work with your ODBC driver manager. The foll
 <div class="highlight"><pre><code class="language-text" data-lang="text">. . .
 [Driver]
 DisableAsync=0
-DriverManagerEncoding=UTF-32
-ErrorMessagesPath=/opt/mapr/drillodbc/ErrorMessages
+ErrorMessagesPath=/opt/mapr/drill/ErrorMessages
 LogLevel=0
 LogPath=[LogPath]
 SwapFilePath=/tmp
 
-## - Uncomment the ODBCInstLib corresponding to the Driver Manager being used.
 ## - Note that the path to your ODBC Driver Manager must be specified in LD_LIBRARY_PATH.
 
-# Generic ODBCInstLib
-#   iODBC
-ODBCInstLib=libiodbcinst.so
 . . .
 </code></pre></div>
 <h3 id="configuring-.mapr.drillodbc.ini">Configuring .mapr.drillodbc.ini</h3>
 
-<p>To configure the MapR Drill ODBC Driver in the <code>mapr.drillodbc.ini</code> configuration file, complete the following steps:</p>
+<p>To configure the MapR Drill ODBC Driver in the <code>.mapr.drillodbc.ini</code> configuration file, complete the following steps:</p>
 
 <ol>
-<li>Open the <code>mapr.drillodbc.ini</code> configuration file in a text editor.<br></li>
-<li>Edit the DisableAsync setting if you want to enable a synchronous ODBC connection for performance reasons. Change the default 0 to 1 to disable the asynchronous and enable the synchronous connection.<br>
- A change in state occurs during driver initialization and is propagated to all driver DSNs.<br></li>
-<li>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.<br></li>
-<li><p>Edit the <code>ODBCInstLib</code> setting. The value is the name of the <code>ODBCInst</code> shared library for the ODBC driver manager that you use. The configuration file defaults to the shared library for <code>iODBC</code>. In Linux, the shared library name for iODBC is <code>libiodbcinst.so</code>.  </p>
-
-<p>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. The library path environment variable is named
-<code>LD_LIBRARY_PATH</code>.  </p></li>
-<li><p>Save the <code>mapr.drillodbc.ini</code> configuration file.</p></li>
+<li><p>Open the <code>.mapr.drillodbc.ini</code> configuration file in a text editor.  </p></li>
+<li><p>Edit the DisableAsync setting if you want to enable a synchronous ODBC connection for performance reasons. Change the default 0 to 1 to disable the asynchronous and enable the synchronous connection.
+ A change in state occurs during driver initialization and is propagated to all driver DSNs.  </p>
+
+<p><strong>Note</strong>: As of version 1.3.8 of the driver, the DriverManagerEncoding setting is automatically detected and set 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. </p></li>
+<li><p>Save the <code>.mapr.drillodbc.ini</code> configuration file.</p></li>
 </ol>
 
 <h3 id="next-step">Next Step</h3>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/configuring-odbc-on-mac-os-x/index.html
----------------------------------------------------------------------
diff --git a/docs/configuring-odbc-on-mac-os-x/index.html b/docs/configuring-odbc-on-mac-os-x/index.html
index 9fad968..7f70c4a 100644
--- a/docs/configuring-odbc-on-mac-os-x/index.html
+++ b/docs/configuring-odbc-on-mac-os-x/index.html
@@ -1122,47 +1122,46 @@
 
     </div>
 
-     Jan 24, 2017
+     May 30, 2017
 
     <link href="/css/docpage.css" rel="stylesheet" type="text/css">
 
     <div class="int_text" align="left">
       
         <p>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:</p>
+sources and drivers. To configure an ODBC connection for Mac OS X, note the following
+procedure:</p>
 
 <ul>
-<li><a href="/docs/configuring-odbc-on-mac-os-x/#step-1:-copy-sample-configuration-files">Step 1: Copy Sample Configuration Files</a></li>
+<li><a href="/docs/configuring-odbc-on-mac-os-x/#step-1:-driver-installer-updates-sample-configuration-files">Step 1: Driver Installer Updates Sample Configuration Files</a></li>
 <li><a href="/docs/configuring-odbc-on-mac-os-x/#step-2:-set-environment-variables">Step 2: Set Environment Variables</a></li>
 <li><a href="/docs/configuring-odbc-on-mac-os-x/#step-3:-define-the-odbc-data-sources-in-.odbc.ini">Step 3: Define the ODBC Data Sources in odbc.ini</a></li>
 <li><a href="/docs/configuring-odbc-on-mac-os-x/#step-4:-configure-the-mapr-drill-odbc-driver">Step 4: Configure the MapR Drill ODBC Driver</a></li>
 </ul>
 
-<h2 id="step-1:-copy-sample-configuration-files">Step 1: Copy Sample Configuration Files</h2>
+<h2 id="step-1:-driver-installer-updates-sample-configuration-files">Step 1: Driver Installer Updates Sample Configuration Files</h2>
 
-<p>Before you connect to Drill through an ODBC client tool
-on Mac OS X, copy the following configuration files in <code>/opt/mapr/drill/Setup</code> to your home directory unless the files already exist in your home directory:</p>
+<p>Before you connect to Drill through an ODBC client tool on Mac OS X, the driver installer copies the following configuration files in <code>/Library/mapr/drill/Setup</code> to your home directory unless the files already exist in your home directory:</p>
 
 <ul>
 <li><code>mapr.drillodbc.ini</code></li>
-<li><code>.odbc.ini</code></li>
-<li><code>.odbcinst.ini</code></li>
+<li><code>odbc.ini</code></li>
+<li><code>odbcinst.ini</code></li>
 </ul>
 
 <p>In your home directory, rename the files as hidden files. Use sudo if necessary:</p>
 
 <ul>
-<li>.mapr.drillodbc.ini</li>
-<li>.odbc.ini</li>
-<li>.odbcinst.ini</li>
+<li><code>.mapr.drillodbc.ini</code></li>
+<li><code>.odbc.ini</code></li>
+<li><code>.odbcinst.ini</code></li>
 </ul>
 
-<p>The installer for Mac OS X creates a sample user DSN in odbc.ini in either of the following locations:</p>
+<p>The installer for Mac OS X creates a sample user DSN in <code>odbc.ini</code> in either of the following locations:</p>
 
 <ul>
-<li>~/Library/ODBC/odbc.ini</li>
-<li>~/.odbc.ini</li>
+<li><code>~/Library/ODBC/odbc.ini</code></li>
+<li><code>~/.odbc.ini</code></li>
 </ul>
 
 <p>Depending on the driver manager you use, the user DSN in one of these files will be effective.</p>
@@ -1176,9 +1175,9 @@ on Mac OS X, copy the following configuration files in <code>/opt/mapr/drill/Set
 
 <h2 id="step-2:-set-environment-variables">Step 2: Set Environment Variables</h2>
 
-<p>Create or modify the <code>/etc/launchd.conf</code> file to set environment variables. Set the MAPRDRILLINI variable to point to the <code>.mapr.drillodbc.ini</code> file. </p>
+<p>The driver installer installs the <code>.mapr.drillodbc.ini</code> file to your home directory and adds an entry to the <code>$HOME/.odbc.ini</code> file. </p>
 
-<p>If you installed the iODBC driver manager using the DMG, the dynamic linker (DYLD) libraries are installed in <code>/usr/local/iODBC/lib</code>. The launchd.conf file should look something like this:</p>
+<p>If you installed the iODBC driver manager using the DMG, the dynamic linker (DYLD) libraries are installed in <code>/usr/local/iODBC/lib</code>. The <code>launchd.conf</code> file contains contents such as the following:</p>
 <div class="highlight"><pre><code class="language-text" data-lang="text">setenv MAPRDRILLINI /Users/joeuser/.mapr.drillodbc.ini
 setenv ODBCINI /Users/joeuser/.odbc.ini
 </code></pre></div>
@@ -1206,7 +1205,29 @@ ZKClusterID=&lt;cluster name in `drill-override.conf`&gt;
 </code></pre></div>
 <h3 id="authentication-properties">Authentication Properties</h3>
 
-<p>If the Drillbit requires a username and password for authentication, uncomment the AuthenticationType, select Basic Authentication for the AuthenticationType, and configure UID and PWD properties.</p>
+<p>If the Drillbit requires authentication, uncomment the AuthenticationType, add an AuthenticationType, and configure properties. If the Drillbit does not require authentication (or to configure no password protection), you can use the No Authentication option; you do not need to configure additional settings.</p>
+
+<ul>
+<li><p><strong>MapRSASL</strong> </p>
+
+<ul>
+<li>The MapR login utility must be used to obtain a MapR ticket for MapR SASL authentication. </li>
+<li>You must install and configure the MapR login utility before you can use the MapR SASL authentication mechanism. See <a href="http://maprdocs.mapr.com/home/SecurityGuide/SecurityArchitecture-AuthenticationArchitecture.html" title="MapR Login Utilty">Authentication Architecture: The maprlogin Utility</a> and <a href="http://maprdocs.mapr.com/home/SecurityGuide/Tickets.html/">Tickets</a>.</li>
+</ul>
+
+<p><strong>Kerberos</strong> 
+*  See the <a href="http://web.mit.edu/kerberos/" title="MIT Kerberos">MIT Kerberos</a> documentation for installing and configuring a Kerberos environment, which is beyond the scope of the information provided here.
+* To specify the Kerberos mechanism:
+    * Set the AuthenticationType to Kerberos.
+    * Set the KrbServiceHost property to the FQDN of the Drill server host.
+    * Set the KrbServiceName property to the Kerberos service principal name of the Drill server.</p>
+
+<p><strong>Plain (or Basic Authentication)</strong>
+* Configure the UID to an appropriate name for accessing the Drill server. 
+* Set the PWD property to the password corresponding to the UID. </p></li>
+</ul>
+
+<p>To configure no password protection, select No Authentication.</p>
 
 <h3 id="direct-and-zookeeper-quorum-properties">Direct and ZooKeeper Quorum Properties</h3>
 
@@ -1223,7 +1244,7 @@ ZKClusterID=&lt;cluster name in `drill-override.conf`&gt;
 <p>To use Drill in local mode, do not define the ZKQuorum and ZKClusterID properties. Start Drill using the drill-localhost command, set ConnectionType to Direct, and define HOST and PORT properties. For example:</p>
 
 <ul>
-<li><code>HOST=centos32.lab:5181</code><br></li>
+<li><code>HOST=&lt;IP address of drillbit&gt;:5181</code><br></li>
 <li><code>PORT=31010</code></li>
 </ul>
 
@@ -1243,36 +1264,42 @@ behavior of DSNs using the MapR Drill ODBC Driver.</p>
 # Specify any global ODBC configuration here such as ODBC tracing.
 
 [ODBC Data Sources]
-Sample MapR Drill=MapR Drill ODBC Driver
+MapR Drill=MapR Drill ODBC Driver
 
-[Sample MapR Drill]
+[MapR Drill]
 # Description: DSN Description.
 # This key is not necessary and only describes the data source.
-Description=Sample MapR Drill ODBC Driver DSN
+Description=MapR Drill ODBC Driver
 # Driver: The location where the ODBC driver is installed.
 Driver=/Library/mapr/drill/lib/libdrillodbc_sbu.dylib
 
-# The DriverUnicodeEncoding setting is only used for SimbaDM
-# When set to 1, SimbaDM runs in UTF-16 mode.
-# When set to 2, SimbaDM runs in UTF-8 mode.
+# The DriverUnicodeEncoding setting is only used for MapRDM
+# When set to 1, MapRDM runs in UTF-16 mode.
+# When set to 2, MapRDM runs in UTF-8 mode.
 #DriverUnicodeEncoding=2
 
 # 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 on the connection string.
-# AuthenticationType: No authentication; Basic Authentication
+# AuthenticationType: No authentication; Plain; Kerberos; MapRSASL
 ConnectionType=Direct
 HOST=localhost
 PORT=31010
 ZKQuorum=[Zookeeper Quorum]
 ZKClusterID=[Cluster ID]
-AuthenticationType=No Authentication
+AuthenticationType=Plain
 UID=[USERNAME]
 PWD=[PASSWORD] 
-AdvancedProperties=CastAnyToVarchar=true;HandshakeTimeout=5;QueryTimeout=180;TimestampTZDisplayTimezone=utc;ExcludedSchemas=sys,INFORMATION_SCHEMA;NumberOfPrefetchBuffers=5;
+DelegationUID=
+KrbServiceHost=
+KrbServiceName=
+AdvancedProperties=CastAnyToVarchar=true;HandshakeTimeout=30;QueryTimeout=180;TimestampTZDisplayTimezone=utc;
+ExcludedSchemas=sys,INFORMATION_SCHEMA;NumberOfPrefetchBuffers=5;
 Catalog=DRILL
 Schema=  
+
+# The DriverUnicodeEncoding setting is only used for MapRDM
 </code></pre></div>
 <hr>
 

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/configuring-odbc-on-windows/index.html
----------------------------------------------------------------------
diff --git a/docs/configuring-odbc-on-windows/index.html b/docs/configuring-odbc-on-windows/index.html
index 82b8346..66424ac 100644
--- a/docs/configuring-odbc-on-windows/index.html
+++ b/docs/configuring-odbc-on-windows/index.html
@@ -1122,7 +1122,7 @@
 
     </div>
 
-     
+     May 30, 2017
 
     <link href="/css/docpage.css" rel="stylesheet" type="text/css">
 
@@ -1136,27 +1136,41 @@ sources:</p>
 <li>Create an ODBC Connection String</li>
 </ul>
 
-<h2 id="sample-odbc-configuration-(dsn)">Sample ODBC Configuration (DSN)</h2>
+<h2 id="sample-odbc-configuration">Sample ODBC Configuration</h2>
 
-<p>You can see how to create a DSN to connect to Drill data sources by taking a look at the preconfigured sample that the installer sets up. If
-you want to create a DSN for a 32-bit application, you must use the 32-bit
+<p>You can see how to create a DSN to connect to Drill data sources by taking a look at the preconfigured sample that the installer sets up. 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.</p>
 
 <ol>
-<li><p>Click <strong>Start</strong>, and locate the ODBC Administrator app that you installed, and click  ODBC Administrator to start the app.
+<li><p>Click <strong>Start</strong> and locate the ODBC Administrator app that you installed. Then click ODBC Administrator to start the app.
 The ODBC Data Source Administrator dialog appears.
 <img src="/docs/img/odbc-user-dsn.png" alt=""></p></li>
-<li><p>On the <strong>System DSN</strong> tab in System Data Sources, select the sample MapR ODBC Driver for Drill DSN.
+<li><p>On the <strong>System DSN</strong> tab in System Data Sources, select the sample MapR Drill.
 <img src="/docs/img/odbc-configure1.png" alt="">
-The system DSN is available for all users who log in to the machine. You can set up a user DSN is available only to the user who creates the DSN.  </p></li>
+The system DSN is available for all users who log in to the machine. You can set up a user DSN is available only to the user who creates the DSN on the <strong>User DSN</strong> tab.  </p></li>
 <li><p>Click <strong>Configure</strong>.<br>
-The MapR Drill ODBC Driver DSN Setup dialog appears with a preconfigured sample DSN. The following screenshot shows a possible DSN configuration for using Drill in embedded mode.
+The MapR Drill setup dialog appears with a preconfigured sample DSN. The following screenshot shows a possible DSN configuration for using Drill in embedded mode.
 <img src="/docs/img/odbc-configure2.png" alt=""></p></li>
 </ol>
 
 <h3 id="authentication-options">Authentication Options</h3>
 
-<p>To password protect the DSN, uncomment the AuthenticationType, select Basic Authentication in the Authentication Type dropdown, and configure UID and PWD properties. To configure no password protection, select No Authentication.</p>
+<p>To password protect the DSN, select the appropriate AuthenticationType in the dropdown.  If the Drillbit does not require authentication (or to configure no password protection), you can use the No Authentication option; you do not need to configure additional settings.</p>
+
+<ul>
+<li><strong>MapR-SASL</strong>
+
+<ul>
+<li>The maprlogin utility must be used to obtain a MapR ticket. To install and use the MapR login utility, see <a href="http://maprdocs.mapr.com/home/SecurityGuide/SecurityArchitecture-AuthenticationArchitecture.html" title="MapR Login Utilty">Authentication Architecture: The maprlogin Utility</a> and <a href="http://maprdocs.mapr.com/home/SecurityGuide/Tickets.html/">Tickets</a>.</li>
+</ul></li>
+<li><strong>Kerberos</strong> - configure Host FQDN and Service Name properties.
+
+<ul>
+<li>To specify the default Kerberos mechanism, select the Use Only SSPI checkbox.</li>
+<li>To use MIT Kerberos by default and only use the SSPI plugin if the GSSAPI library is not available, clear the Use Only SSPI checkbox.</li>
+</ul></li>
+<li><strong>Plain Authentication</strong> - configure UID and PWD properties. </li>
+</ul>
 
 <h3 id="direct-to-drillbit-and-zookeeper-quorum-options">Direct to Drillbit and ZooKeeper Quorum Options</h3>
 
@@ -1174,10 +1188,10 @@ The MapR Drill ODBC Driver DSN Setup dialog appears with a preconfigured sample
 <p>If you select ZooKeeper Quorum, provide values for the following properties:</p>
 
 <ul>
-<li>Quorum
+<li>Quorum - 
 A comma separated list of ZooKeeper nodes in the following format:
 <code>&lt;host name/ip address&gt; : &lt;port number&gt;, &lt;host name/ip address&gt; : &lt;port number&gt;, . . .</code></li>
-<li>Cluster ID
+<li>Cluster ID - 
 Name of the drillbit cluster. Check the drill-override.conf file for ZooKeeper node information and for any cluster name changes.</li>
 </ul>
 

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/connecting-drill-explorer-to-data/index.html
----------------------------------------------------------------------
diff --git a/docs/connecting-drill-explorer-to-data/index.html b/docs/connecting-drill-explorer-to-data/index.html
index 5985748..48a8d4b 100644
--- a/docs/connecting-drill-explorer-to-data/index.html
+++ b/docs/connecting-drill-explorer-to-data/index.html
@@ -1122,7 +1122,7 @@
 
     </div>
 
-     
+     May 30, 2017
 
     <link href="/css/docpage.css" rel="stylesheet" type="text/css">
 
@@ -1137,47 +1137,58 @@
 <h2 id="connecting-drill-explorer-to-data-on-mac-os-x">Connecting Drill Explorer to Data on Mac OS X</h2>
 
 <ol>
-<li>On a node that is running Drill, run Drill Explorer.  The Drill Explorer app is located in the <code>/Applications</code> directory.<br>
-The Drill Explorer console appears.<br></li>
-<li>Click <strong>Connect</strong> on the console.<br>
+<li><p>On a node that is running Drill, run Drill Explorer.  The Drill Explorer app is located in the <code>/Applications</code> directory.<br>
+The Drill Explorer console appears. </p></li>
+<li><p>Click <strong>Connect</strong> on the console.<br>
 The Drill Explorer dialog appears.<br>
-<img src="/docs/img/explorer-connect.png" alt="sample mapr drill dsn"></li>
-<li>If you connect through a DSN, on the ODBC DSN tab, select the name of the DSN you configured. For example, select Sample MapR Drill DSN.<br>
+<img src="/docs/img/explorer-connect.png" alt="sample mapr drill dsn"></p></li>
+<li><p>If you connect through a DSN, on the ODBC DSN tab, select the name of the DSN you configured. For example, select Sample MapR Drill DSN.<br>
 Alternatively, if you use a DSN-less connection, on the Advanced tab, type a connection string in the text box. For example, type the following connection string:<br>
-     DRIVER=MapR Drill ODBC Driver;AdvancedProperties={HandshakeTimeout=0;QueryTimeout=0;TimestampTZDisplayTimezone=utc;ExcludedSchemas=sys, INFORMATION_SCHEMA;};Catalog=DRILL;Schema=;ConnectionType=ZooKeeper;ZKQuorum=192.168.39.43:5181;ZKClusterID=drillbits1</li>
-<li>If you set the <a href="/docs/odbc-configuration-reference/#configuration-options">AuthenticationType property</a> to Basic Authentication, which enables impersonation, respond to the prompt for a user name and password.</li>
-<li>Click <strong>Connect</strong> in the dialog.<br>
+     DRIVER=MapR Drill ODBC Driver;AdvancedProperties={HandshakeTimeout=0;QueryTimeout=0;TimestampTZDisplayTimezone=utc;ExcludedSchemas=sys, INFORMATION_SCHEMA;};Catalog=DRILL;Schema=;ConnectionType=ZooKeeper;ZKQuorum=192.168.39.43:5181;ZKClusterID=drillbits1</p></li>
+<li><p>If you set the <a href="/docs/odbc-configuration-reference/#configuration-options">AuthenticationType property</a> to Plain or Basic Authentication, which enables impersonation, respond to the prompt for a user name and password.</p></li>
+<li><p>Click <strong>Connect</strong> in the dialog.<br>
 In the Schemas panel, the <a href="/docs/odbc-configuration-reference/#schema">schema</a> for the connected data source appear. For example, the default schema is <code>dfs</code>, which points to the local file system on your machine.<br>
-<img src="/docs/img/explorer-schemas.png" alt="explorer schemas"> </li>
+<img src="/docs/img/explorer-schemas.png" alt="explorer schemas"> </p></li>
 </ol>
 
 <h2 id="starting-drill-explorer-on-windows">Starting Drill Explorer on Windows</h2>
 
-<p>You can start Drill Explorer from Apps or from the ODBC Administrator.</p>
+<p>In Windows 10, you can start Drill Explorer from the Start menu or from the ODBC Data Source Administrator.</p>
 
-<p>To start Drill Explorer from Apps:</p>
+<p>To start Drill Explorer from the Start menu:</p>
 
 <ol>
-<li><p>Click <strong>Start</strong>, and locate the MaprR Drill ODBC Driver 1.0 app group in Apps.
-The MapR Drill ODBC Driver 1.0 group includes Drill Explorer.
-<img src="/docs/img/odbc-user-dsn.png" alt=""></p></li>
-<li><p>Click <strong>Drill Explorer</strong>.
-The ODBC Connection dialog appears.</p></li>
-<li><p>Select the DSN that you want to explore. For example, select the sample MapR ODBC Driver for Drill DSN.
-<img src="/docs/img/odbc-explorer-connect.png" alt="">
-Drill Explorer appears.
-<img src="/docs/img/odbc-explorer-win.png" alt=""></p></li>
+<li>Click <strong>Start</strong>, and locate MaprR Drill ODBC Driver &lt;<em>version</em>&gt;. </li>
 </ol>
 
-<p>To start Drill Explorer from the ODBC Administrator:</p>
+<p><img src="/docs/img/winstart.png" alt=""></p>
+
+<ol>
+<li>Click <strong>Drill Explorer</strong>.</li>
+</ol>
+
+<p><img src="/docs/img/odbc-explorer-win.png" alt=""></p>
+
+<ol>
+<li>Select the DSN that you want to explore. For example, select MapR Drill and click Connect.</li>
+</ol>
+
+<p>To start Drill Explorer from the ODBC Administrator in Windows 10:</p>
+
+<ol>
+<li>In the Settings field, enter <strong>odbc</strong>. Select a version and the ODBC Data Source Administrator <version> appears. </li>
+</ol>
+
+<p><img src="/docs/img/odbc-configure1.png" alt=""></p>
+
+<ol>
+<li>Click <strong>System DSN</strong>. Select MapR Drill and click Connect. 
+The DSN Setup dialog appears showing the properties.<br></li>
+</ol>
+
+<p><img src="/docs/img/odbc-configure2.png" alt=""></p>
 
 <ol>
-<li>In ODBC Administrator, on the <strong>System DSN</strong> tab in System Data Sources, a DSN. For example, select the sample MapR ODBC Driver for Drill DSN.<br>
-<img src="/docs/img/odbc-configure1.png" alt="">
-Alternatively, if you set up a user DSN, select <strong>User DSN</strong>, and select a DSN.</li>
-<li>Click <strong>Configure</strong>.<br>
-The DSN Setup dialog appears showing the configured properties.<br>
-<img src="/docs/img/odbc-configure2.png" alt=""></li>
 <li>Click <strong>Drill Explorer</strong> at the bottom of the dialog.
 Drill Explorer appears.</li>
 </ol>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/img/odbc-configure1.png
----------------------------------------------------------------------
diff --git a/docs/img/odbc-configure1.png b/docs/img/odbc-configure1.png
index 28717bd..26e6d39 100644
Binary files a/docs/img/odbc-configure1.png and b/docs/img/odbc-configure1.png differ

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/img/odbc-configure2.png
----------------------------------------------------------------------
diff --git a/docs/img/odbc-configure2.png b/docs/img/odbc-configure2.png
index af79337..e1774c6 100644
Binary files a/docs/img/odbc-configure2.png and b/docs/img/odbc-configure2.png differ

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/img/odbc-drivers.png
----------------------------------------------------------------------
diff --git a/docs/img/odbc-drivers.png b/docs/img/odbc-drivers.png
index 23b9c39..1578c2b 100644
Binary files a/docs/img/odbc-drivers.png and b/docs/img/odbc-drivers.png differ

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/img/odbc-explorer-connect.png
----------------------------------------------------------------------
diff --git a/docs/img/odbc-explorer-connect.png b/docs/img/odbc-explorer-connect.png
index 960e963..d07bbd5 100644
Binary files a/docs/img/odbc-explorer-connect.png and b/docs/img/odbc-explorer-connect.png differ

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/img/odbc-explorer-win.png
----------------------------------------------------------------------
diff --git a/docs/img/odbc-explorer-win.png b/docs/img/odbc-explorer-win.png
index 04bda8a..ae2d06b 100644
Binary files a/docs/img/odbc-explorer-win.png and b/docs/img/odbc-explorer-win.png differ

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/img/odbc-user-dsn.png
----------------------------------------------------------------------
diff --git a/docs/img/odbc-user-dsn.png b/docs/img/odbc-user-dsn.png
index f957607..1290a2d 100644
Binary files a/docs/img/odbc-user-dsn.png and b/docs/img/odbc-user-dsn.png differ

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/img/winsettings.png
----------------------------------------------------------------------
diff --git a/docs/img/winsettings.png b/docs/img/winsettings.png
new file mode 100644
index 0000000..39be084
Binary files /dev/null and b/docs/img/winsettings.png differ

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/img/winstart.png
----------------------------------------------------------------------
diff --git a/docs/img/winstart.png b/docs/img/winstart.png
new file mode 100644
index 0000000..14f9361
Binary files /dev/null and b/docs/img/winstart.png differ

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/installing-the-driver-on-linux/index.html
----------------------------------------------------------------------
diff --git a/docs/installing-the-driver-on-linux/index.html b/docs/installing-the-driver-on-linux/index.html
index 22c9808..2c9a72b 100644
--- a/docs/installing-the-driver-on-linux/index.html
+++ b/docs/installing-the-driver-on-linux/index.html
@@ -1122,7 +1122,7 @@
 
     </div>
 
-     Dec 24, 2016
+     May 30, 2017
 
     <link href="/css/docpage.css" rel="stylesheet" type="text/css">
 
@@ -1150,16 +1150,16 @@ application that you use to access Drill. The 64-bit editions of Linux support
 <li>One of the following distributions (32- and 64-bit editions are supported):
 
 <ul>
-<li>Red Hat® Enterprise Linux® (RHEL) 5.0/6.0</li>
-<li>CentOS 5.0/6.0</li>
-<li>SUSE Linux Enterprise Server (SLES) 11</li>
+<li>Red Hat® Enterprise Linux® (RHEL) 5, 6, or 7</li>
+<li>CentOS 5, 6, or 7</li>
+<li>SUSE Linux Enterprise Server (SLES) 11 or 12</li>
 </ul></li>
 <li>90 MB of available disk space.</li>
 <li>An installed ODBC driver manager:
 
 <ul>
 <li>iODBC 3.52.7 or above<br>
-OR </li>
+or </li>
 <li>unixODBC 2.2.14 or above<br>
 On Linux, 3.52.7 is available as a tarball. After unpacking the tarball, see the README for instructions about building the driver manager.</li>
 </ul></li>
@@ -1170,16 +1170,11 @@ If not, create an entry in <code>/etc/hosts</code> for each node in the followin
 Example: <code>127.0.0.1 localhost</code></p></li>
 </ul>
 
-<p>To install the driver, you need Administrator privileges on the computer.</p>
+<p>To install the driver, you need Administrator privileges on the computer. </p>
 
 <h2 id="step-1:-download-the-mapr-drill-odbc-driver">Step 1: Download the MapR Drill ODBC Driver</h2>
 
-<p>Download either the 32 or 64-bit driver:</p>
-
-<ul>
-<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.3.0.1009/maprdrill-1.3.0.1009-1.i686.rpm">MapR Drill ODBC Driver (32-bit)</a></li>
-<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.3.0.1009/maprdrill-1.3.0.1009-1.x86_64.rpm">MapR Drill ODBC Driver (64-bit)</a></li>
-</ul>
+<p>Download the driver from the <a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/">download site</a>. The current version is 1.3.8.</p>
 
 <h2 id="step-2:-install-the-mapr-drill-odbc-driver">Step 2: Install the MapR Drill ODBC Driver</h2>
 
@@ -1187,7 +1182,7 @@ Example: <code>127.0.0.1 localhost</code></p></li>
 
 <ol>
 <li>Login as the root user.</li>
-<li>Navigate to the folder that contains the driver RPM packages to install.</li>
+<li>Navigate to the directory that contains the driver RPM packages to install.</li>
 <li>Enter the following command where <em>RPMFileName</em> is the file name of the RPM package containing the version of the driver that you want to install:<br>
 
 <ul>
@@ -1198,14 +1193,6 @@ Example: <code>127.0.0.1 localhost</code></p></li>
 </ul></li>
 </ol>
 
-<p>The MapR Drill ODBC Driver depends on the following resources:</p>
-
-<ul>
-<li><code>cyrus-sasl-2.1.22-7</code> or above</li>
-<li><code>cyrus-sasl-gssapi-2.1.22-7</code> or above</li>
-<li><code>cyrus-sasl-plain-2.1.22-7</code> or above</li>
-</ul>
-
 <p>The MapR Drill ODBC Driver typically resolves dependencies automatically. If not, error messages during the installation indicate that the package manager in your Linux distribution cannot resolve the
 dependencies automatically. In this case, manually install the packages.</p>
 
@@ -1219,20 +1206,20 @@ locations and descriptions:</p>
 </tr>
 </thead><tbody>
 <tr>
-<td><code>/opt/mapr/drillodbc/ErrorMessages</code></td>
+<td><code>/opt/mapr/drill/ErrorMessages</code></td>
 <td>Error messages files directory.</td>
 </tr>
 <tr>
-<td><code>/opt/mapr/drillodbc/Setup</code></td>
+<td><code>/opt/mapr/drill/Setup</code></td>
 <td>Sample configuration files directory.</td>
 </tr>
 <tr>
-<td><code>/opt/mapr/drillodbc/lib/32</code></td>
-<td>32-bit shared libraries directory.</td>
+<td><code>/opt/mapr/drill/lib/32</code></td>
+<td>32-bit shared libraries directory (will be created if you install the 32-bit driver).</td>
 </tr>
 <tr>
-<td><code>/opt/mapr/drillodbc/lib/64</code></td>
-<td>64-bit shared libraries directory.</td>
+<td><code>/opt/mapr/drill/lib/64</code></td>
+<td>64-bit shared libraries directory (will be created if you install the 64-bit driver)..</td>
 </tr>
 </tbody></table>
 
@@ -1240,11 +1227,11 @@ locations and descriptions:</p>
 
 <p>To check the version of the driver you installed, use the following case-sensitive command on the terminal command line:</p>
 
-<p><code>yum list | grep MapRDrillODBC</code></p>
+<p><code>yum list | grep MapRDrill</code></p>
 
 <p>or</p>
 
-<p><code>rpm -qa | grep MapRDrillodbc</code></p>
+<p><code>rpm -qa | grep MapRDrill</code></p>
 
 <h3 id="next-step">Next Step</h3>
 

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/installing-the-driver-on-mac-os-x/index.html
----------------------------------------------------------------------
diff --git a/docs/installing-the-driver-on-mac-os-x/index.html b/docs/installing-the-driver-on-mac-os-x/index.html
index 70d2d54..7389dfb 100644
--- a/docs/installing-the-driver-on-mac-os-x/index.html
+++ b/docs/installing-the-driver-on-mac-os-x/index.html
@@ -1122,7 +1122,7 @@
 
     </div>
 
-     May 23, 2017
+     May 30, 2017
 
     <link href="/css/docpage.css" rel="stylesheet" type="text/css">
 
@@ -1144,7 +1144,7 @@ the Drill service.</p>
 <p>To install the driver, you need Administrator privileges on the computer.</p>
 
 <ul>
-<li>Mac OS X version 10.8.0 or later<br></li>
+<li>Mac OS X version 10.9, 10.10, or 10.11<br></li>
 <li>100 MB of available disk space<br></li>
 <li>iODBC 3.52.7 or later<br>
 The iodbc-config file in the <code>/usr/local/iODBC/bin</code> includes the version of the driver.<br></li>
@@ -1159,9 +1159,13 @@ Example: <code>127.0.0.1 localhost</code></p></li>
 
 <h2 id="step-1:-download-the-mapr-drill-odbc-driver">Step 1: Download the MapR Drill ODBC Driver</h2>
 
-<p>Click the following link to download the driver:  </p>
+<hr>
+
+<h2 id="note:-the-most-current-(version-1.3.8)-mapr-drill-odbc-driver-for-mac-might-not-be-available-yet.-">Note: The most current (version 1.3.8)  MapR Drill ODBC driver for Mac might not be available yet. </h2>
+
+<p>Click the following link to download the latest version (1.3.8) of the driver, which supports both 32- and 64-bit client applications:  </p>
 
-<p><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.3.0.1009/MapR_Drill_1.3.dmg">MapR Drill ODBC Driver for Mac</a></p>
+<p><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/">MapR Drill ODBC Driver for Mac</a></p>
 
 <hr>
 
@@ -1170,7 +1174,7 @@ Example: <code>127.0.0.1 localhost</code></p></li>
 <p>To install the driver, complete the following steps:</p>
 
 <ol>
-<li>Double-click <code>MapR_Drill_1.3.dmg</code> to mount the disk image.</li>
+<li>Double-click <code>MapR Drill 1.3.dmg</code> to mount the disk image.</li>
 <li>Double-click <code>MapRDrillODBC.pkg</code> to run the Installer.</li>
 <li>Follow the instructions in the Installer to complete the installation process.</li>
 <li>When the installation completes, click <strong>Close.</strong></li>
@@ -1193,7 +1197,7 @@ Example: <code>127.0.0.1 localhost</code></p></li>
 <div class="highlight"><pre><code class="language-text" data-lang="text">$ pkgutil --pkg-info mapr.drillodbc  
 
 package-id: mapr.drillodbc
-version: 1.3.0 (You may see 3.52.12.)
+version: 1.3.8 (You may see 3.52.12.)
 volume: /
 location: 
 install-time: 1433465518  

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/installing-the-driver-on-windows/index.html
----------------------------------------------------------------------
diff --git a/docs/installing-the-driver-on-windows/index.html b/docs/installing-the-driver-on-windows/index.html
index e240119..6005a92 100644
--- a/docs/installing-the-driver-on-windows/index.html
+++ b/docs/installing-the-driver-on-windows/index.html
@@ -1122,15 +1122,19 @@
 
     </div>
 
-     Feb 24, 2017
+     May 30, 2017
 
     <link href="/css/docpage.css" rel="stylesheet" type="text/css">
 
     <div class="int_text" align="left">
       
         <p>The MapR Drill ODBC Driver installer is available for 32- and 64-bit
-applications on Windows. Both versions of the driver can be installed on a 64-bit
-machine. </p>
+applications on Windows®. On 64-bit Windows operating systems, you can execute both 32- and 64-bit applications. However, 64-bit applications must use 64-bit drivers, and 32-bit applications must use 32-bit drivers. Make sure that you use the driver version that matches the bitness of the client application machine. </p>
+
+<ul>
+<li>MapR Drill 1.3 32-bit.msi for 32-bit applications</li>
+<li>MapR Drill 1.3 64-bit.msi for 64-bit applications</li>
+</ul>
 
 <p>Install the MapR Drill ODBC Driver on a system that meets the system requirements. </p>
 
@@ -1140,15 +1144,15 @@ machine. </p>
 requirements:</p>
 
 <ul>
-<li>The 64-bit editions of the following operating systems are supported:
+<li>One of the following operating systems are supported:
 
 <ul>
-<li>Windows® 8 and 8.1</li>
-<li>Windows® 7 Professional</li>
-<li>Windows® Server 2008, 2013 R2</li>
+<li>Windows Vista, 7, 8, or 10</li>
+<li>Windows Server 2008 or later</li>
 </ul></li>
+<li>75 MB of available disk space</li>
 <li>.NET Framework 4.5, installed and enabled by default on Windows 8 and later</li>
-<li>60 MB of available disk space</li>
+<li><p>Visual C++ Redistributable for Visual Studio 2013 installed (with the same bitness as the driver that you are installing)</p></li>
 <li><p>The client must be able to resolve the actual host name of the Drill node or nodes from the IP address. Verify that a DNS entry was created on the client machine for the Drill node or nodes.<br>
 If not, create an entry in <code>\Windows\system32\drivers\etc\hosts</code> for each node in the following format:  </p>
 
@@ -1167,11 +1171,11 @@ Example: <code>127.0.0.1 localhost</code></p></li>
 
 <h2 id="step-1:-download-the-mapr-drill-odbc-driver">Step 1: Download the MapR Drill ODBC Driver</h2>
 
-<p>Download the installer that corresponds to the bitness of the client application from which you want to create an ODBC connection:</p>
+<p>Download the installer that corresponds to the bitness of the client application from which you want to create an ODBC connection. Version 1.3.8 is the current version.</p>
 
 <ul>
-<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.3.0.1009/MapR_Drill_1.3_32-bit.msi">MapR Drill ODBC Driver (32-bit)</a><br></li>
-<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.3.0.1009/MapR_Drill_1.3_64-bit.msi">MapR Drill ODBC Driver (64-bit)</a></li>
+<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/">MapR Drill ODBC Driver (32-bit)</a><br></li>
+<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/">MapR Drill ODBC Driver (64-bit)</a></li>
 </ul>
 
 <hr>
@@ -1191,14 +1195,12 @@ Example: <code>127.0.0.1 localhost</code></p></li>
 
 <h2 id="step-3:-verify-the-installation">Step 3: Verify the installation</h2>
 
-<p>To verify the installation, perform the following steps:</p>
+<p>To verify the installation on Windows 10, perform the following steps:</p>
 
 <ol>
-<li><p>Click <strong>Start</strong>, and locate the ODBC Administrator app that you just installed.<br>
-Installing the ODBC Administrator installs Drill Explorer and the Tableau TDC file. For example, on Windows 8.1 in Apps, several apps appear under MaprDrill ODBC Driver 1.0:
-<img src="/docs/img/odbc-mapr-drill-apps.png" alt=""></p></li>
-<li><p>Click the ODBC Administrator app icon.
-The ODBC Data Source Administrator dialog appears.
+<li><p>Go to <strong>Settings</strong> and enter <strong>odbc</strong>. Select <strong><em>Setup ODBC data sources <version></em></strong>.</p></li>
+<li><p>The ODBC Data Source Administrator <version> dialog appears. Click the <strong>System DSN</strong> to view 
+the MapR Drill data source. 
 <img src="/docs/img/odbc-user-dsn.png" alt=""></p></li>
 <li><p>Click the <strong>Drivers</strong> tab and verify that the MapR Drill ODBC Driver appears in the list of drivers that are installed on the computer.
 <img src="/docs/img/odbc-drivers.png" alt=""></p></li>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/docs/odbc-configuration-reference/index.html
----------------------------------------------------------------------
diff --git a/docs/odbc-configuration-reference/index.html b/docs/odbc-configuration-reference/index.html
index 4d2b327..bdee6fe 100644
--- a/docs/odbc-configuration-reference/index.html
+++ b/docs/odbc-configuration-reference/index.html
@@ -1122,7 +1122,7 @@
 
     </div>
 
-     Dec 24, 2016
+     May 30, 2017
 
     <link href="/css/docpage.css" rel="stylesheet" type="text/css">
 
@@ -1143,86 +1143,111 @@ Drill ODBC Driver. You can use these options in a connection string or in the
 
 <table><thead>
 <tr>
-<th>Property</th>
-<th>Valid Values</th>
+<th>Property</th>
+<th>Default Values</th>
 <th>Brief Description</th>
 </tr>
 </thead><tbody>
 <tr>
+<td>AdvancedProperties</td>
+<td>CastAnyToVarchar=true;  HandshakeTimeout=5; QueryTimeout=180;TimestampTZDisplayTimezone=local; ExcludedSchemas=sys,INFORMATION_SCHEMA; NumberOfPrefetchBuffers=5</td>
+<td>Not required. Advanced properties for configuring the driver. You can set custom connection properties by specifying them as advanced properties. If you specify a property that the driver does not explicitly support, the driver still accepts the property, and passes it to the server for processing.  Separate advanced properties using a semi-colon (;) and then surround all advanced properties in a connection string using braces { and }. For example,  {<property>;<property>; . . .}  In addition, the following Advanced Properties string excludes the schemas named test and abc, sets the timeout to 30 seconds, and sets the time zone to Coordinated Universal Time: HandshakeTimeout=30;QueryTimeout=30;TimestampTZDisplayTimezone=utc;ExcludedSchemas=test,abc</td>
+</tr>
+<tr>
+<td>AuthenticationType</td>
+<td>No Authentication</td>
+<td>Not required.  This option specifies how the driver authenticates the connection to Drill. No Authentication: The driver does not authenticate the connection to Drill. Kerberos: The driver authenticates the connection using the Kerberos protocol. Plain: The driver authenticates the connection using a user name and apassword. MapRSASL: The driver authenticates the connection using the MapR-SASL protocol.</td>
+</tr>
+<tr>
 <td>Catalog</td>
-<td>DRILL</td>
-<td>The   name of the synthetic catalog under which all of the schemas/databases are   organized.</td>
+<td>The default catalog name specified in the driver&#39;s .did file (typically, DRILL).</td>
+<td>Not required. The name of the synthetic catalog under which all of the schemas/databases are organized. This catalog name is used as the value for SQL_DATABASE_NAME or CURRENT CATALOG.</td>
 </tr>
 <tr>
 <td>ConnectionType</td>
-<td>Direct   or ZooKeeper</td>
-<td>Direct   connects to a Drill server using Host and Port properties. ZooKeeper connects   to a ZooKeeper cluster using ZKQuorum and ZKClusterID properties.</td>
+<td>Direct to Drillbit (Direct)</td>
+<td>Required. This option specifies whether the driver connects to a single server or a ZooKeeper cluster. Direct to Drillbit (Direct): The driver connects to a single Drill server. ZooKeeper Quorum (ZooKeeper): The driver connects to a ZooKeeper cluster.</td>
+</tr>
+<tr>
+<td>DelegationUID</td>
+<td>none</td>
+<td>Not required. If a value is specified for this setting, the driver delegates all operations against Drill to the specified user, rather than to the authenticated user for the connection. This option is applicable only when Plain authentication is enabled.</td>
+</tr>
+<tr>
+<td>DisableAsync</td>
+<td>Clear (0)</td>
+<td>Not required. This option specifies whether the driver supports asynchronous queries. Enabled (1): The driver does not support asynchronous queries. Disabled (0): The driver supports asynchronous queries. This option is not supported in connection strings or DSNs. Instead, it must be set as a driver-wide property in the mapr.drillodbc.ini file. Settings in that file apply to all connections that use the driver.</td>
 </tr>
 <tr>
 <td>Driver</td>
-<td>MapR   Drill ODBC Driver</td>
-<td>The   name of the installed driver.</td>
+<td>MapR Drill ODBC Driver on Windows machines or the absolute path of the driver shared object file when installed on a non-Windows machine</td>
+<td>On Windows, the name of the installed driver (MapR Drill ODBC Driver). On other platforms, the name of the installed driver as specified in odbcinst.ini, or the absolute path of the driver shared object file.</td>
 </tr>
 <tr>
 <td>Host</td>
-<td><code>&lt;host   name&gt;</code></td>
-<td>If   the ConnectionType property is set to Direct, set the host name of the Drill   server using the Host property.</td>
+<td>localhost</td>
+<td>Required if the ConnectionType property is set to Direct to Drillbit. The IP address or host name of the Drill server.</td>
 </tr>
 <tr>
-<td>Port</td>
-<td>31010</td>
-<td>If   the ConnectionType property is set to Direct, set the e TCP port on which the   Drill server is listening.</td>
+<td>KrbServiceHost</td>
+<td>none</td>
+<td>Required for Kerberos authentication. The fully qualified domain name of the Drill server host.</td>
 </tr>
 <tr>
-<td>Schema</td>
-<td><code>&lt;schema   name&gt;</code></td>
-<td>The   name of the database schema or storage plugin name to use when the query does   not explicitly specify the schema or storage plugin.</td>
+<td>KrbServiceName</td>
+<td>mapr (default)</td>
+<td>Required for Kerberos authentication. The Kerberos service principal name of the Drill server. mapr is the default for the MapR Drill ODBC driver.</td>
 </tr>
 <tr>
-<td>ZKClusterID</td>
-<td>drillbits1</td>
-<td>If   the ConnectionType property is set to ZooKeeper, then set ZKClusterID to the   name of the Drillbit cluster to use.</td>
+<td>LogLevel</td>
+<td>OFF (0)</td>
+<td>Not required. Use this property to enable or disable logging in the driver and to specify the amount of detail included in log files. Only enable logging long enough to capture an issue. Logging decreases performance and can consume a large quantity of disk space. This option is not supported in connection strings. To configure logging for the Windows driver, you must use the Logging Options dialog box. To configure logging for a non-Windows driver, you must use the mapr.drillodbc.ini file.</td>
 </tr>
 <tr>
-<td>ZKQuorum</td>
-<td><code>&lt;IP   address&gt;</code>,<code>&lt;IP address&gt;</code> . . .</td>
-<td>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 (,).</td>
+<td>LogPath</td>
+<td>none</td>
+<td>Required if logging is enabled. The full path to the folder where the driver saves log files when logging is enabled. When logging is enabled, the driver produces two log files at the location that youspecify in the LogPath property:  driver.log provides a log of driver activities, and  drillclient.log provides a log of Drill client activities.  This option is not supported in connection strings. To configure logging for the Windows driver, you must use the Logging Options dialog box. To configure logging for a non-Windows driver, you must use the mapr.drillodbc.ini file.</td>
 </tr>
 <tr>
-<td>AuthenticationType</td>
-<td>No   Authentication or Basic Authentication</td>
-<td>Basic Authentication   <a href="https://drill.apache.org/docs/configuring-user-impersonation/">enables impersonation</a>.</td>
+<td>Port</td>
+<td>31010</td>
+<td>Required if the ConnectionType property is set to Direct to Drillbit. The TCP port that the Drill server uses to listen for client connections. Set the TCP port on which the Drill server is listening.</td>
 </tr>
 <tr>
-<td>UID</td>
-<td><code>&lt;user   name&gt;</code></td>
-<td>If   AuthenticationType is Basic Authentication, set the UID to a user name.</td>
+<td>PWD</td>
+<td>none</td>
+<td>Required if AuthenticationType is Plain (also known as Basic Authentication). The password corresponding to the user name that you provided in the User field (the UID key).</td>
 </tr>
 <tr>
-<td>PWD</td>
-<td><code>&lt;password&gt;</code></td>
-<td>If   AuthenticationType is Basic Authentication, set the PWD to a password.</td>
+<td>Schema</td>
+<td>none</td>
+<td>Not required. The name of the database schema to use when a schema is not explicitly specified in a query. You can still issue queries on other schemas by explicitly specifying the schema in the query.</td>
 </tr>
 <tr>
-<td>DelegationUID</td>
-<td><code>&lt;impersonation_target&gt;</code></td>
-<td>The impersonation target for the   authorized proxy user. See <a href="https://drill.apache.org/docs/configuring-inbound-impersonation/">Configuring Inbound Impersonation</a>.</td>
+<td>UID</td>
+<td>none</td>
+<td>Required if AuthenticationType is Plain (also known as Basic authentication). Set UID to a user name.</td>
 </tr>
 <tr>
-<td>AdvancedProperties</td>
-<td>{<code>&lt;property&gt;</code>;<code>&lt;property&gt;</code>;   . . .}</td>
-<td>Separate   advanced properties using a semi-colon (;) and then surround all advanced   properties in a connection string using braces { and }.</td>
+<td>UseOnlySSPI (on Windows only)</td>
+<td>Clear (0)</td>
+<td>Not required. This option is available only in the Windows driver. This option specifies how the driver handles Kerberos authentication: either with theSSPI plugin or with MIT Kerberos.  Enabled (1): The driver handles Kerberos authentication by using the SSPI plugin instead of MIT Kerberos by default. Disabled (0): The driver uses MIT Kerberos to handle Kerberos authentication, and only uses the SSPI plugin if the GSSAPI library is not available.</td>
 </tr>
 <tr>
-<td>DisableAsync</td>
-<td>0   or 1</td>
-<td>Disables   asynchronous ODBC connection and enables a synchronous connection. A change   in state occurs during driver initialization and is propagated to all driver   DSNs.</td>
+<td>ZKClusterID</td>
+<td>drillbits1</td>
+<td>Required if the ConnectionType property is set to ZooKeeper Quorum. Set ZKClusterID to the name of the Drillbit cluster to use.</td>
+</tr>
+<tr>
+<td>ZKQuorum</td>
+<td>none</td>
+<td>Required if the ConnectionType property is set to ZooKeeper. Set  ZKQuorum to indicate the server(s) in your ZooKeeper cluster. Separate multiple servers using a comma (,). For example, <IP address>,<IP address>.</td>
 </tr>
 </tbody></table>
 
 <h3 id="catalog">Catalog</h3>
 
-<p>This value defaults to DRILL and cannot be changed. The driver adds a synthetic catalog named DRILL under which all of the schemas and databases are organized. The driver maps the ODBC schema to the DRILL catalog.</p>
+<p>This value defaults to DRILL and should not be changed. The driver adds a synthetic catalog named DRILL under which all of the schemas and databases are organized. The driver maps the ODBC schema to the DRILL catalog.</p>
 
 <h3 id="connection-type">Connection Type</h3>
 
@@ -1323,40 +1348,85 @@ set when using the MapR Drill ODBC Driver.</p>
 
 <table><thead>
 <tr>
-<th>Property Name</th>
-<th>Default Value</th>
-<th>Description</th>
+<th>Property</th>
+<th>Default Values</th>
+<th>Brief Description</th>
 </tr>
 </thead><tbody>
 <tr>
+<td>CastAnyToVarchar</td>
+<td>TRUE</td>
+<td>Not required. When this property is set to true, if SQLColumns returns columns of type ANY, then the driver casts the columns to VARCHAR. When this property is set to false, the driver does not change the returned columns.</td>
+</tr>
+<tr>
+<td>ConvertToCast</td>
+<td>FALSE</td>
+<td>Not required. When activated this enables the Cast Query Translation function. This function helps optimize your queries for Power BI.</td>
+</tr>
+<tr>
+<td>DefaultDecimalScale</td>
+<td>10</td>
+<td>The default scale for DECIMAL columns that are returned through SQLColumns. The driver uses this value only if SQLColumns does not return a scale value or a numeric precision value that the driver can use to determine the scale.</td>
+</tr>
+<tr>
+<td>ExcludedSchemas</td>
+<td>sys,INFORMATION_SCHEMA</td>
+<td>Not required. 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 (,).This property should not be used at the same time as IncludedSchemas. If both IncludedSchemas and ExcludedSchemas are specified, IncludedSchemas takes precedence and ExcludedSchemas is ignored.</td>
+</tr>
+<tr>
+<td>GetMetadataWithQueries</td>
+<td>None</td>
+<td>Not required. This property specifies whether the driver uses queries or native API calls when retrieving metadata, preparing statements, or executing statements. The driver can only use native API calls if it detects that the server is running a version of Drill that supports those calls. If this property is set to True, the driver uses queries to retrieve metadata,prepare statements, and execute statements. l If this property is set to False, the driver instead uses native API calls when it is connected to a server that supports native API calls.</td>
+</tr>
+<tr>
 <td>HandshakeTimeout</td>
 <td>5</td>
-<td>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.</td>
+<td>Not required. An integer value representing the number of seconds that the driver waits before stopping an attempt to connect to a data source. If this property is set to 0, the driver does not stop connection attempts.</td>
+</tr>
+<tr>
+<td>HeartBeatFreqSec</td>
+<td>15</td>
+<td>Not required. The number of seconds of inactivity before the Drill client sends a heartbeat to the server in order to check the status of the connection. If this property is set to 0, the Drill client does not send any heartbeats.</td>
+</tr>
+<tr>
+<td>IncludedSchemas</td>
+<td>None</td>
+<td>Not required. A list of schemas that appear in client applications such as Drill Explorer, Tableau, and Excel. Separate schemas in the list using a comma (,). If this option is set, then schemas that are not in this list are not queried by the driver.</td>
+</tr>
+<tr>
+<td>NonZeroNameMaxLen</td>
+<td>FALSE</td>
+<td>Not required. The MapR Drill ODBC Driver does not enforce a maximum length for schema, catalog, table, and column names. By default, the driver reports these lengths as 0, which typically indicates that there is no maximum length. However, some BI tools interpret a length of 0 literally. To make sure that the names are displayed correctly in your BI tool,set the NonZeroNameMaxLen property. When this property is set to true, the driver reports an appropriate non-zero value for the maximum length of schema, catalog, table, and column names. When this property is set to false, the driver reports 0 as the maximum length of schema, catalog, table, and column names.</td>
+</tr>
+<tr>
+<td>NumberOfPrefetchBuffers</td>
+<td>5</td>
+<td>Not required. The size of the record batch queue in the driver. When set to a value below 1, the value defaults to 1.</td>
 </tr>
 <tr>
 <td>QueryTimeout</td>
 <td>180</td>
-<td>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.</td>
+<td>Not required. The number of seconds that the driver waits before stopping a query. If this property is set to 0, the driver does not stop queries.</td>
 </tr>
 <tr>
-<td>TimestampTZDisplayTimezone</td>
-<td>local</td>
-<td>Two values are possible: local—Timestamps are dependent on the time zone of the user. utc—Timestamps appear in Coordinated Universal Time (UTC).</td>
+<td>RemoveQryCatalog</td>
+<td>TRUE</td>
+<td>Not required. When this property is set to true, the driver removes catalog names from queries. Enable this option if you are working with a server that does not accept queries containing catalog names. When this property is set to false, the driver does not remove catalog names before executing queries.</td>
 </tr>
 <tr>
-<td>ExcludedSchemas</td>
-<td>sys, INFORMATION_SCHEMA</td>
-<td>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 (,).</td>
+<td>SaslPluginDir</td>
+<td>None</td>
+<td>Not required. Allows you to override the default SASL plugin directory with a custom directory path.</td>
 </tr>
 <tr>
-<td>CastAnyToVarchar</td>
-<td>true</td>
-<td>Casts the ANY data type returned from SQL column calls into type “VARCHAR”.</td>
+<td>StringColumnLength</td>
+<td>1024</td>
+<td>Not required.  The maximum column length that the driver reports for string columns.</td>
 </tr>
 <tr>
-<td>NumberOfPrefetchBuffers</td>
-<td>5</td>
-<td>The size of the record batch queue in the driver. When set to a value below 1, the value defaults to 1.</td>
+<td>TimestampTZDisplayTimezone</td>
+<td>local</td>
+<td>Not required. Two values are possible: local and utc. When set to local, timestamps use the time zone of the user. When set to utc, timestamps appear in Coordinated Universal Time (UTC).</td>
 </tr>
 </tbody></table>
 
@@ -1364,11 +1434,11 @@ set when using the MapR Drill ODBC Driver.</p>
 
 <p>If you want to connect to a Drill data source from an application that does
 not require a DSN, you can use an ODBC connection string. The following is an example connection string for the Direct connection type:  </p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">    DRIVER=MapR Drill ODBC Driver;AdvancedProperties={HandshakeTimeout=0;QueryTimeout=0;TimestampTZDisplayTimezone=utc;ExcludedSchemas=sys,INFORMATION_SCHEMA;};Catalog=DRILL;Schema=hivestg;ConnectionType=Direct;Host=192.168.202.147;Port=31010
+<div class="highlight"><pre><code class="language-text" data-lang="text">DRIVER=MapR Drill ODBC Driver;AdvancedProperties={HandshakeTimeout=0;QueryTimeout=0;TimestampTZDisplayTimezone=utc;ExcludedSchemas=sys,INFORMATION_SCHEMA;};Catalog=DRILL;Schema=hivestg;ConnectionType=Direct;Host=192.168.202.147;Port=31010
 </code></pre></div>
 <p>The following is an example connection string for the Zookeeper connection
 type:  </p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">    DRIVER=MapR Drill ODBC Driver;AdvancedProperties={HandshakeTimeout=0;QueryTimeout=0;TimestampTZDisplayTimezone=utc;ExcludedSchemas=sys, INFORMATION_SCHEMA;};Catalog=DRILL;Schema=;ConnectionType=ZooKeeper;ZKQuorum=192.168.39.43:5181;ZKClusterID=drillbits1
+<div class="highlight"><pre><code class="language-text" data-lang="text">DRIVER=MapR Drill ODBC Driver;AdvancedProperties={HandshakeTimeout=0;QueryTimeout=0;TimestampTZDisplayTimezone=utc;ExcludedSchemas=sys, INFORMATION_SCHEMA;};Catalog=DRILL;Schema=;ConnectionType=ZooKeeper;ZKQuorum=192.168.39.43:5181;ZKClusterID=drillbits1
 </code></pre></div>
 <h2 id="logging-options">Logging Options</h2>
 
@@ -1380,8 +1450,8 @@ and a log path.</p>
 files in the log path that you configure:</p>
 
 <ul>
-<li>driver.log: A log of driver events</li>
-<li>drillclient.log: A log of the Drill client events.</li>
+<li><code>driver.log</code> provides a log of driver events.</li>
+<li><code>drillclient.log</code> provides a log of the Drill client events.</li>
 </ul>
 
 <h3 id="logging-levels">Logging Levels</h3>
@@ -1389,13 +1459,13 @@ files in the log path that you configure:</p>
 <p>The following log levels are available:</p>
 
 <ul>
-<li>OFF: Disables logging.</li>
-<li>FATAL: Logs severe error events that may cause the driver to stop running.</li>
-<li>ERROR: Logs error events that may allow the driver to continue running.</li>
-<li>WARNING: Logs events about potentially harmful situations.</li>
-<li>INFO: Logs high-level events about driver processes.</li>
-<li>DEBUG: Logs detailed events that may help to debug issues.</li>
-<li>TRACE: Logs finer-grained events than the DEBUG level.</li>
+<li>(0) OFF: Disables logging.</li>
+<li>(1) FATAL: Logs severe error events that may cause the driver to stop running.</li>
+<li>(2) ERROR: Logs error events that may allow the driver to continue running.</li>
+<li>(3) WARNING: Logs events about potentially harmful situations.</li>
+<li>(4) INFO: Logs high-level events about driver processes.</li>
+<li>(5) DEBUG: Logs detailed events that may help to debug issues.</li>
+<li>(6) TRACE: Logs finer-grained events than the DEBUG level.</li>
 </ul>
 
 <h3 id="enabling-logging">Enabling Logging</h3>
@@ -1403,18 +1473,20 @@ files in the log path that you configure:</p>
 <p>To enable logging:</p>
 
 <ol>
-<li>Open the mapr.drillodbc.ini configuration file in a text editor.<br></li>
-<li>Set the LogLevel key to the desired level of information to include in log files. For
-example:<br>
-<code>LogLevel=2</code></li>
-<li>Set the LogPath key to the full path to the folder where you want to save log files. For example:<br>
-<code>LogPath=/localhome/employee/Documents</code></li>
-<li>Save the mapr.drillodbc.ini configuration file.<br>
-The Simba ODBC Driver for Apache Drill produces two log files at the location you specify using the Log Path field:<br>
+<li>Open the <code>.mapr.drillodbc.ini</code> configuration file in a text editor. (On Mac OS X, the default installation will install a .mapr.drillodbc.ini to $HOME.)</li>
+<li><p>Set the LogLevel key to the desired level of information to include in log files. 
+For example:</p>
+
+<p><code>LogLevel=2</code></p></li>
+<li><p>Set the LogPath key to the full path to the folder where you want to save log files. 
+For example:  </p>
+
+<p><code>LogPath=/localhome/employee/Documents</code></p></li>
+<li><p>Save the <code>.mapr.drillodbc.ini</code> configuration file. The MapR Drill ODBC Driver produces two log files at the location you specify using the Log Path field:  </p>
 
 <ul>
-<li>driver.log provides a log of driver activities</li>
-<li>drillclient.log provides a log of Drill client activities</li>
+<li><code>driver.log</code> provides a log of driver activities.</li>
+<li><code>drillclient.log</code> provides a log of Drill client activities.</li>
 </ul></li>
 </ol>
 
@@ -1423,9 +1495,9 @@ The Simba ODBC Driver for Apache Drill produces two log files at the location yo
 <p>To disable logging:</p>
 
 <ol>
-<li>Open the mapr.drillodbc.ini configuration file in a text editor.</li>
-<li>Set the LogLevel key to 0</li>
-<li>Save the mapr.drillodbc.ini configuration file.</li>
+<li>Open the <code>.mapr.drillodbc.ini</code> configuration file in a text editor.</li>
+<li>Set the LogLevel key to zero (<code>0</code>).</li>
+<li>Save the <code>.mapr.drillodbc.ini</code> configuration file.</li>
 </ol>
 
 <h4 id="what&#39;s-next?-go-to-connecting-to-odbc-data-sources.">What&#39;s Next? Go to <a href="/docs/connecting-to-odbc-data-sources">Connecting to ODBC Data Sources</a>.</h4>

http://git-wip-us.apache.org/repos/asf/drill-site/blob/6d3c0f51/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 1330b3e..2ec7378 100644
--- a/docs/testing-the-odbc-connection/index.html
+++ b/docs/testing-the-odbc-connection/index.html
@@ -1122,13 +1122,115 @@
 
     </div>
 
-     Jan 24, 2017
+     May 30, 2017
 
     <link href="/css/docpage.css" rel="stylesheet" type="text/css">
 
     <div class="int_text" align="left">
       
-        <p>The procedure for testing the ODBC connection differs depending on your platform, as described in the following sections:</p>
+        <p>You can use DSN connection strings and DSN-less connection strings for your connections.</p>
+
+<ul>
+<li><a href="/docs/testing-the-odbc-connection/#example-connection-string-with-DSN">Example Connection String with DSN</a></li>
+<li><a href="/docs/testing-the-odbc-connection/#example-connection-strings-without-DSN">Example Connection Strings without DSN</a></li>
+</ul>
+
+<h2 id="example-connection-string-with-dsn">Example Connection String with DSN</h2>
+
+<p>The following is an example of a connection string for a connection that uses a DSN:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">DSN=[DataSourceName]    
+</code></pre></div>
+<p>[<em>DataSourceName</em>] is the DSN that you are using for the connection.</p>
+
+<p>You can set additional configuration options by appending key-value pairs to the connection string. Configuration options that are passed in using a connection string take precedence over configuration options that are set in the DSN.</p>
+
+<h2 id="example-connection-strings-without-dsn">Example Connection Strings without DSN</h2>
+
+<p>Some applications provide support for connecting to a data source using a driver without a DSN. To connect to a data source without using a DSN, use a connection string instead.
+The placeholders in the examples are defined as follows, in alphabetical order:</p>
+
+<ul>
+<li>[<em>ClusterName</em>] is the name of the ZooKeeper cluster to which you are connecting.</li>
+<li>[<em>DomainName</em>] is the fully qualified domain name of the Drill server host.</li>
+<li>[<em>PortNumber</em>] is the number of the TCP port that the Drill server uses to listen for client connections.</li>
+<li>[<em>Server</em>] is the IP address or host name of the Drill server to which you are connecting.</li>
+<li>[<em>ServiceName</em>] is the Kerberos service principal name of the Drill server.</li>
+<li>[<em>YourPassword</em>] is the password corresponding to your user name.</li>
+<li>[<em>YourUserName</em>] is the user name that you use to access the Drill server.</li>
+</ul>
+
+<h3 id="drillbit-connections">Drillbit Connections</h3>
+
+<p>The following is the format of a DSN-less connection string for a Drillbit that does not require authentication:</p>
+
+<p>Driver=MapR Drill ODBC Driver;ConnectionType=Direct; Host=[<em>Server</em>];Port=[<em>PortNumbe</em>r]</p>
+
+<p>For example:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">Driver=MapR Drill ODBC Driver;ConnectionType=Direct; Host=192.168.222.160;Port=31010
+</code></pre></div>
+<h3 id="zookeeper-connections">ZooKeeper Connections</h3>
+
+<p>The following is the format of a DSN-less connection string for a ZooKeeper cluster that does not require authentication:</p>
+
+<p>Driver=MapR Drill ODBC Driver;
+ConnectionType=ZooKeeper; 
+ZKQuorum=[<em>Server1</em>]:[<em>PortNumber*1], [*Server2</em>]:[<em>PortNumber2</em>], [<em>Server3</em>]:[<em>PortNumber3</em>];
+ZKClusterID=[<em>ClusterName</em>]</p>
+
+<p>For example:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">Driver=MapR Drill ODBC Driver;
+ConnectionType=ZooKeeper; 
+ZKQuorum=192.168.222.160:31010, 192.168.222.165:31010, 192.168.222.231:31010;
+ZKClusterID=drill;
+</code></pre></div>
+<h3 id="kerberos-authentication-connections">Kerberos Authentication Connections</h3>
+
+<p>The following is the format of a DSN-less connection string for a Drillbit that requires Kerberos authentication:</p>
+
+<p>Driver=MapR Drill ODBC Driver;
+ConnectionType=Direct; 
+Host=[<em>Server</em>];Port=[<em>PortNumber</em>];
+AuthenticationType=Kerberos; 
+KrbServiceHost=[<em>DomainName</em>];KrbServiceName=[<em>ServiceName</em>]</p>
+
+<p>For example:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">Driver=MapR Drill ODBC Driver;
+ConnectionType=Direct; 
+Host=192.168.222.160;Port=31010;
+AuthenticationType=Kerberos; 
+KrbServiceHost=maprdriverdemo.example.com;  KrbServiceName=drill
+</code></pre></div>
+<h3 id="mapr-sasl-authentication-connections">MapR-SASL Authentication Connections</h3>
+
+<p>The following is the format of a DSN-less connection string for a Drillbit that requires MapR-SASL authentication:</p>
+
+<p>Driver=MapR Drill ODBC Driver;ConnectionType=Direct; Host=[<em>Server</em>];Port=[<em>PortNumber</em>];AuthenticationType=MapRSASL</p>
+
+<p>For example:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">Driver=MapR Drill ODBC Driver;
+ConnectionType=Direct; 
+Host=192.168.227.169;
+Port=31010;
+AuthenticationType=MapRSASL
+</code></pre></div>
+<h3 id="plain-authentication-connections">Plain Authentication Connections</h3>
+
+<p>The following is the format of a DSN-less connection string for a Drillbit that requires Plain authentication:</p>
+
+<p>Driver=MapR Drill ODBC Driver;ConnectionType=Direct; 
+Host=[<em>Server</em>];Port=[<em>PortNumber</em>];<br>
+AuthenticationType=Plain;
+UID=[<em>YourUserName</em>];PWD=[<em>YourPassword</em>]</p>
+
+<p>For example:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">Driver=MapR Drill ODBC Driver;ConnectionType=Direct; 
+Host=192.168.227.169;Port=31010;
+AuthenticationType=Plain;
+UID=username;PWD=mapr999
+</code></pre></div>
+<h2 id="testing-the-odbc-connection">Testing the ODBC Connection</h2>
+
+<p>The procedure for testing the ODBC connection differs depending on your platform, as described in the following sections:</p>
 
 <ul>
 <li><a href="/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-linux">Testing the ODBC Connection on Linux</a></li>
@@ -1138,23 +1240,20 @@
 
 <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 in the <code>samples</code> directory of the 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>To test the ODBC connection on Linux use the test utilities in the <code>samples</code> directory of the 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>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>
+<p>See <a href="http://www.iodbc.org/">http://www.iodbc.org</a> for further details on using the iODBC driver manager.</p>
 
 <h3 id="example-of-a-test-on-linux">Example of a Test on Linux</h3>
 
 <p>To test the ODBC connection on a Linux cluster, follow these steps:</p>
 
 <ol>
-<li><p><a href="/docs/starting-drill-on-linux-and-mac-os-x/">Start Drill</a>. For example, to start Drill in local mode on a linux cluster:  </p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">[root@centos23 drill-1.2.0]# bin/drill-localhost
-apache drill 1.2.0 
+<li><p><a href="/docs/starting-drill-on-linux-and-mac-os-x/">Start Drill</a>. For example, to start Drill in local mode on a Linux cluster:  </p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">[root@centos23 drill-1.10.0]# bin/drill-localhost
+apache drill 1.10.0 
 &quot;the only truly happy people are children, the creative minority and drill users&quot;
 </code></pre></div></li>
 <li><p>In the <code>samples</code> directory of the driver manager installation, run <code>iodbctest</code> or <code>iodbctestw</code>.  </p>
@@ -1162,55 +1261,70 @@ apache drill 1.2.0
   iODBC Demonstration program
 This program shows an interactive SQL processor
 Driver Manager: 03.52.0709.0909
-</code></pre></div>
-<p>The prompt for an ODBC connection string appears.  </p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">Enter ODBC connect string (? shows list): ?
 </code></pre></div></li>
-<li><p>Type ? to see the DSN name.<br>
-Output is:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">DSN                              | Driver                                  
+</ol>
+
+<p>The prompt for an ODBC connection string appears.  </p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">    Enter ODBC connect string (? shows list): ?
+</code></pre></div>
+<ol>
+<li><p>Type <code>?</code> to see the DSN name.  The output is:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">DSN                                          | Driver                                  
 ------------------------------------------------------------------------------
-Sample MapR Drill DSN 64         | MapR Drill ODBC Driver 64-bit           
+Sample MapR Drill (64-bit)                   | MapR Drill ODBC Driver 64-bit           
 Enter ODBC connect string (? shows list):
 </code></pre></div></li>
-<li><p>If you are connecting directly to a Drillbit, type an ODBC connection string using the following format:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">DSN=&lt;DSN name&gt;;ConnectionType=Direct;Host=&lt;Host Name&gt;;Port=&lt;Port Number&gt;
+<li><p>To test the connection if the DSN was previously configured in the <code>.odbc.ini</code>, type the following connection string:  </p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">DSN=&lt;DSN name&gt;
+</code></pre></div>
+<p>However, if you are connecting directly to a Drillbit and the DSN was not previously configured in the .odbc.ini, type an ODBC connection string using the following format:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">DSN=&lt;DSN name&gt;;
+ConnectionType=Direct;
+Host=&lt;Host Name&gt;;Port=&lt;Port Number&gt;
 </code></pre></div>
 <p>OR</p>
 
 <p>If you are connecting to a ZooKeeper cluster, type an ODBC connection string using the following format:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">DSN=&lt;DSN Name&gt;;ConnectionType=ZooKeeper;ZKQuorum=&lt;Server1:Port1&gt;,&lt;Server2:Port2&gt;;ZKClusterID=&lt;Cluster Name&gt;`
+<div class="highlight"><pre><code class="language-text" data-lang="text">DSN=&lt;DSN Name&gt;;
+ConnectionType=ZooKeeper;
+ZKQuorum=&lt;Server1:Port1&gt;,&lt;Server2:Port2&gt;;
+ZKClusterID=&lt;Cluster Name&gt;
 </code></pre></div>
-<p>The output of a successful test is:<br>
- <code>Driver: 1.2.0.1001 (MapR Drill ODBC Driver)  
- SQL&gt;</code><br>
- After the <code>SQL&gt;</code> prompt appears, type <code>quit;</code>, and go to the Drill shell to run commands. Do not attempt to run SQL commands from this prompt.</p></li>
-</ol>
+<p>The output of a successful test is:  </p>
 
-<h3 id="example-connection-strings">Example Connection Strings</h3>
+<p><code>Driver: 1.3.8.&lt;version&gt; (MapR Drill ODBC Driver)  
+ SQL&gt;</code>  </p>
+
+<p>After the <code>SQL&gt;</code> prompt appears, type <code>quit;</code>.
+ Go to the Drill shell to run commands. Do not attempt to run SQL commands from this prompt.</p></li>
+</ol>
 
-<p>The following example shows a connection string for a direct connection:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">    DSN=Sample MapR Drill DSN 64;ConnectionType=Direct;Host=localhost;Port=31010
+<p>This example shows a connection string for a direct connection:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">    DSN=Sample MapR Drill 64-bit;
+    ConnectionType=Direct;
+    Host=localhost;Port=31010
 </code></pre></div>
-<p>The following example shows a connection string for a ZooKeeper cluster connection:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">    DSN=Sample MapR Drill DSN 64;ConnectionType=ZooKeeper;ZKQuorum=centos23.lab:5181;ZKClusterID=docs41cluster-drillbits
+<p>This example shows a connection string for a ZooKeeper cluster connection:</p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">    DSN=Sample MapR Drill 64-bit 64;
+    ConnectionType=ZooKeeper;
+    ZKQuorum=centos23.lab:5181;
+    ZKClusterID=docs60cluster-drillbits
 </code></pre></div>
 <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 on 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. </li>
-<li>On the User DSN tab, select the MapR Drill.<br>
-<img src="/docs/img/odbc_data_source_names.png" alt=""><br></li>
-<li>Click <strong>Test</strong>.<br>
-The Login for Sample MapR Drill dialog appears.<br>
-<img src="/docs/img/odbc_login.png" alt=""><br></li>
-<li>If you configured Basic Authentication in the <code>.odbc.ini</code>, enter the user name and password you also configured; otherwise, click <strong>OK</strong>.<br>
-The success message appears.<br>
-<img src="/docs/img/success.png" alt=""><br></li>
+<li><p><a href="/docs/starting-drill-on-linux-and-mac-os-x/">Start Drill</a>. </p></li>
+<li><p>Start the iODBC Administrator.app in <code>/Applications</code>.<br>
+The iODBC Data Source Administrator dialog appears. </p></li>
+<li><p>On the User DSN tab, select <strong>MapR Drill</strong>.<br>
+<img src="/docs/img/odbc_data_source_names.png" alt=""> </p></li>
+<li><p>Click <strong>Test</strong>.<br>
+The Login for the MapR Drill dialog appears.<br>
+<img src="/docs/img/odbc_login.png" alt="">  </p></li>
+<li><p>If you configured Plain (or Basic) authentication in the <code>.odbc.ini</code>, enter the user name and password you also configured; otherwise, click <strong>OK</strong>.  The success message displays.<br>
+<img src="/docs/img/success.png" alt=""></p></li>
 </ol>
 
 <h2 id="testing-the-odbc-connection-on-windows">Testing the ODBC Connection on Windows</h2>
@@ -1218,11 +1332,10 @@ The success message appears.<br>
 <p>To test the ODBC connection on Windows, follow these steps:</p>
 
 <ol>
-<li><p>Follow instructions to configure the ODBC connection on Windows.<br>
+<li><p>Follow instructions to configure the ODBC connection on Windows. 
 The MapR Drill ODBC Driver DSN Setup dialog is displayed.
 <img src="/docs/img/odbc-configure2.png" alt=""></p></li>
-<li><p>Click the Test Button.
-<img src="/docs/img/odbc-test.png" alt=""></p></li>
+<li><p>Click <strong>Test</strong>. A Test Results popup will display that states you have successfully connected to the data source. </p></li>
 </ol>
 
     


Mime
View raw message