You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by br...@apache.org on 2017/05/31 23:23:54 UTC
drill-site git commit: odbc driver doc edits from catherine skrbina
Repository: drill-site
Updated Branches:
refs/heads/asf-site f5f78de1c -> d5caafc46
odbc driver doc edits 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/d5caafc4
Tree: http://git-wip-us.apache.org/repos/asf/drill-site/tree/d5caafc4
Diff: http://git-wip-us.apache.org/repos/asf/drill-site/diff/d5caafc4
Branch: refs/heads/asf-site
Commit: d5caafc4621d220c7d0e38023f0614067b2a451b
Parents: f5f78de
Author: Bridget Bevens <bb...@maprtech.com>
Authored: Wed May 31 16:23:48 2017 -0700
Committer: Bridget Bevens <bb...@maprtech.com>
Committed: Wed May 31 16:23:48 2017 -0700
----------------------------------------------------------------------
docs/configuring-odbc-on-linux/index.html | 36 ++++-----
docs/configuring-odbc-on-mac-os-x/index.html | 22 +++---
docs/configuring-odbc-on-windows/index.html | 40 +++++-----
docs/img/odbc-configure2.png | Bin 93811 -> 87626 bytes
docs/img/odbc-configuretest.png | Bin 0 -> 26634 bytes
docs/img/odbc-user-dsn.png | Bin 19725 -> 17281 bytes
docs/img/winstart.png | Bin 53392 -> 84587 bytes
docs/installing-the-driver-on-linux/index.html | 47 ++++++-----
.../index.html | 12 ++-
.../installing-the-driver-on-windows/index.html | 20 ++---
docs/odbc-configuration-reference/index.html | 77 +++++++------------
docs/testing-the-odbc-connection/index.html | 23 +++---
feed.xml | 4 +-
13 files changed, 126 insertions(+), 155 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill-site/blob/d5caafc4/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 beb6a9f..5411be2 100644
--- a/docs/configuring-odbc-on-linux/index.html
+++ b/docs/configuring-odbc-on-linux/index.html
@@ -1153,9 +1153,9 @@ on Linux, copy the following configuration files in <code>/opt/mapr/drill/Setup<
<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>
<hr>
@@ -1163,12 +1163,12 @@ on Linux, copy the following configuration files in <code>/opt/mapr/drill/Setup<
<h2 id="step-1:-set-environment-variables">Step 1: Set Environment Variables</h2>
<ol>
-<li>Set the ODBCINI environment variable to point to the <code>.odbc.ini</code> in your home directory. For example:<br>
-<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 <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>
+<li><p>Set the ODBCINI environment variable to point to the <code>.odbc.ini</code> in your home directory. For example:<br>
+<code>export ODBCINI=~/.odbc.ini</code></p></li>
+<li><p>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></p></li>
+<li><p>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></p></li>
</ol>
<p>You can have both 32- and 64-bit versions of the driver installed at the same time on the same computer.
@@ -1196,7 +1196,7 @@ PORT=
ZKQuorum=<host name>:<port>,<host name>:<port> . . . <host name>:<port>
ZKClusterID=<cluster name in `drill-override.conf`>
</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 MapR Drill 64-bit from <code>.odbc.ini</code>.</p>
+<p>The following Linux sample shows a possible configuration for using Drill in distributed mode. 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
@@ -1269,14 +1269,14 @@ Schema=
</code></pre></div>
<h3 id="authentication-properties">Authentication Properties</h3>
-<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>
+<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>
+<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></li>
<li><p><strong>Kerberos</strong> </p>
@@ -1300,8 +1300,9 @@ Schema=
<h3 id="direct-and-zookeeper-quorum-properties">Direct and ZooKeeper Quorum Properties</h3>
-<p>To use Drill in distributed mode, set ConnectionType to Zookeeper, get the ZKQuorum and ZKClusterID values from the <code>drill-override.conf</code> file, and define the ZKQuorum and ZKClusterID properties. The <code>drill-override.conf</code> is in the <code>/drill/drill-<version>/conf</code> directory. Format ZKQuorum as a comma separated list of ZooKeeper nodes in the following format:<br>
-<code><host name/ip address> : <port number>, <host name/ip address> : <port number>, . . .</code> </p>
+<p>To use Drill in distributed mode, set ConnectionType to Zookeeper, get the ZKQuorum and ZKClusterID values from the <code>drill-override.conf</code> file, and define the ZKQuorum and ZKClusterID properties. The <code>drill-override.conf</code> is in the <code>/drill/drill-<version>/conf</code> directory. Format ZKQuorum as a comma separated list of ZooKeeper nodes in the following format: </p>
+
+<p><code><host name/ip address> : <port number>, <host name/ip address> : <port number>, . . .</code> </p>
<p>For example:</p>
@@ -1367,16 +1368,15 @@ SwapFilePath=/tmp
<ol>
<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>
+<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>
+<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 depends on the driver manager used; it's typically UTF-16 or UTF-32. 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>
-<p>Refer to <a href="/docs/testing-the-odbc-connection">Testing the ODBC Connection</a>.</p>
+<p><a href="/docs/testing-the-odbc-connection/">Testing the ODBC Connection</a> </p>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/d5caafc4/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 eb949d1..f83e5c5 100644
--- a/docs/configuring-odbc-on-mac-os-x/index.html
+++ b/docs/configuring-odbc-on-mac-os-x/index.html
@@ -1205,14 +1205,14 @@ ZKClusterID=<cluster name in `drill-override.conf`>
</code></pre></div>
<h3 id="authentication-properties">Authentication Properties</h3>
-<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>
+<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>
+<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></li>
<li><p><strong>Kerberos</strong> </p>
@@ -1280,9 +1280,9 @@ 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 MapRDM
-# When set to 1, MapRDM runs in UTF-16 mode.
-# When set to 2, MapRDM runs in UTF-8 mode.
+# 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.
@@ -1327,14 +1327,14 @@ SwapFilePath=/tmp
</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.</li>
-<li>Save the <code>mapr.drillodbc.ini</code> configuration file.</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 depends on the driver manager used; it's typically UTF-16 or UTF-32. 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/d5caafc4/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 e5470ed..bddc35b 100644
--- a/docs/configuring-odbc-on-windows/index.html
+++ b/docs/configuring-odbc-on-windows/index.html
@@ -1138,28 +1138,28 @@ sources:</p>
<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
-version of the ODBC Administrator to create the DSN.</p>
+<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- or 64-bit application, you must use the 32- or 64-bit
+version of the ODBC Data Source Administrator to create the DSN.</p>
-<p>1. 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. </p>
+<p>1. From the Settings dialog in Windows 10, enter <strong>odbc</strong> and select <strong>Setup ODBC data sources <code><version></code></strong>. The ODBC Data Source Administrator <code><version></code> dialog appears. </p>
-<p><img src="/docs/img/odbc-user-dsn.png" alt="odbcuser"> </p>
+<p><img src="http://i.imgur.com/uK42pUe.png" alt=""></p>
-<p>2. On the <strong>System DSN</strong> tab in System Data Sources, select the sample MapR Drill. </p>
-
-<p><img src="/docs/img/odbc-configure1.png" alt="configure1"> </p>
+<p>2. On the <strong>System DSN</strong> tab in System Data Sources, select <strong>MapR Drill</strong>. </p>
<p>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>
<p>3. Click <strong>Configure</strong>. </p>
-<p>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. </p>
+<p>The <strong>MapR Drill ODBC Driver DSN Setup</strong> dialog appears with a preconfigured sample DSN. The following image shows a possible DSN configuration for using Drill in embedded mode. </p>
+
+<p><img src="http://i.imgur.com/f9Avhcz.png" alt=""> </p>
-<p><img src="/docs/img/odbc-configure2.png" alt="configure2"> </p>
+<p>To access <strong>Drill Explorer</strong>, click <strong>Drill Explorer...</strong>.</p>
<h3 id="authentication-options">Authentication Options</h3>
-<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>
+<p>To password protect the DSN, select the appropriate authentication type in the <strong>Authentication Type</strong> 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>
@@ -1178,7 +1178,7 @@ version of the ODBC Administrator to create the DSN.</p>
<h3 id="direct-to-drillbit-and-zookeeper-quorum-options">Direct to Drillbit and ZooKeeper Quorum Options</h3>
-<p>In the Connection Type section, Direct to Drillbit is selected for using Drill in embedded mode. To use Drill in embedded mode, set ConnectionType to Direct and define HOST and PORT properties. For example:</p>
+<p>In the <strong>Connection Type</strong> section, <strong>Direct to Drillbit</strong> is selected for using Drill in embedded mode. To use Drill in embedded mode, set the connection type to <strong>Direct</strong> and define HOST and PORT properties. For example:</p>
<ul>
<li><code>HOST=localhost</code><br></li>
@@ -1187,25 +1187,21 @@ version of the ODBC Administrator to create the DSN.</p>
<p>Check the <code>drill-override.conf</code> file for any port changes. </p>
-<p>To use Drill in distributed mode, select ZooKeeper Quorum. </p>
-
-<p>If you select ZooKeeper Quorum, provide values for the following properties:</p>
+<p>To use Drill in distributed mode, select <strong>ZooKeeper Quorum</strong>. If you select ZooKeeper Quorum, provide values for the following properties:</p>
<ul>
-<li>Quorum -
+<li><p><strong>Quorum</strong> -
A comma separated list of ZooKeeper nodes in the following format:
-<code><host name/ip address> : <port number>, <host name/ip address> : <port number>, . . .</code></li>
-<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>
+<code><host name/ip address> : <port number>, <host name/ip address> : <port number>, . . .</code></p></li>
+<li><p><strong>Cluster ID</strong> -
+Name of the drillbit cluster. Check the <code>drill-override.conf</code> file for ZooKeeper node information and for any cluster name changes.</p></li>
</ul>
<p>Check the <code>drill-override.conf</code> file for the cluster name. </p>
-<p><img src="/docs/img/odbc-configure3.png" alt=""> </p>
-
-<p>The <a href="/docs/odbc-configuration-reference/">Advanced Properties</a> section describes the advanced properties.</p>
+<p>The <a href="/docs/odbc-configuration-reference/">Advanced Properties</a> section describes the advanced configuration properties in detail.</p>
-<p>Select the Disable Async option to disable the asynchronous ODBC connection and enable a synchronous ODBC connection for performance reasons. By default the ODBC connection is asynchronous (Disable Asynch is not checked). A change in state occurs during driver initialization and is propagated to all driver DSNs.</p>
+<p>Select the <strong>Disable Async</strong> option to disable the asynchronous ODBC connection and enable a synchronous ODBC connection for performance reasons. By default the ODBC connection is asynchronous (Disable Asynch is not checked). A change in state occurs during driver initialization and is propagated to all driver DSNs.</p>
<p><a href="/docs/odbc-configuration-reference/#logging-options">Logging Options</a> and <a href="/docs/drill-explorer-introduction/">Drill Explorer</a> sections describe the options at the bottom of this dialog.</p>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/d5caafc4/docs/img/odbc-configure2.png
----------------------------------------------------------------------
diff --git a/docs/img/odbc-configure2.png b/docs/img/odbc-configure2.png
index e1774c6..dafbcd0 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/d5caafc4/docs/img/odbc-configuretest.png
----------------------------------------------------------------------
diff --git a/docs/img/odbc-configuretest.png b/docs/img/odbc-configuretest.png
new file mode 100644
index 0000000..230206f
Binary files /dev/null and b/docs/img/odbc-configuretest.png differ
http://git-wip-us.apache.org/repos/asf/drill-site/blob/d5caafc4/docs/img/odbc-user-dsn.png
----------------------------------------------------------------------
diff --git a/docs/img/odbc-user-dsn.png b/docs/img/odbc-user-dsn.png
index 1290a2d..572db69 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/d5caafc4/docs/img/winstart.png
----------------------------------------------------------------------
diff --git a/docs/img/winstart.png b/docs/img/winstart.png
index 14f9361..cca1a31 100644
Binary files a/docs/img/winstart.png and b/docs/img/winstart.png differ
http://git-wip-us.apache.org/repos/asf/drill-site/blob/d5caafc4/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 2c9a72b..dd3e48c 100644
--- a/docs/installing-the-driver-on-linux/index.html
+++ b/docs/installing-the-driver-on-linux/index.html
@@ -1122,7 +1122,7 @@
</div>
- May 30, 2017
+ May 31, 2017
<link href="/css/docpage.css" rel="stylesheet" type="text/css">
@@ -1147,27 +1147,26 @@ application that you use to access Drill. The 64-bit editions of Linux support
<h2 id="system-requirements">System Requirements</h2>
<ul>
-<li>One of the following distributions (32- and 64-bit editions are supported):
+<li><p>One of the following distributions (32- and 64-bit editions are supported):</p>
<ul>
<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>SUSE Linux Enterprise Server (SLES) 11 or 12<br></li>
<li>90 MB of available disk space.</li>
-<li>An installed ODBC driver manager:
-
-<ul>
+<li>An installed ODBC driver manager:</li>
<li>iODBC 3.52.7 or above<br>
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>
-<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>/etc/hosts</code> for each node in the following format: </p>
+On Linux, 3.52.7 is available as a tarball. After unpacking the tarball, see the README for instructions about building the driver manager.<br></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. If not, create an entry in <code>/etc/hosts</code> for each node in the following format: </p>
+
+<p><drill-machine-IP> <drill-machine-hostname> </p></li>
+</ul>
-<p><code><drill-machine-IP> <drill-machine-hostname></code><br>
-Example: <code>127.0.0.1 localhost</code></p></li>
+<p>Example: </p>
+<div class="highlight"><pre><code class="language-text" data-lang="text">127.0.0.1 localhost
+</code></pre></div></li>
</ul>
<p>To install the driver, you need Administrator privileges on the computer. </p>
@@ -1181,18 +1180,18 @@ Example: <code>127.0.0.1 localhost</code></p></li>
<p>To install the driver, complete the following steps:</p>
<ol>
-<li>Login as the root user.</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>
-<li>RedHat/CentOS<br>
-<code>yum localinstall --nogpgcheck <RPMFileName></code></li>
-<li>SUSE<br>
-<code>zypper install RPMFileName</code></li>
-</ul></li>
+<li><p>Login as the root user.</p></li>
+<li><p>Navigate to the directory that contains the driver RPM packages to install.</p></li>
+<li><p>Enter the following command (where <code><RPMFileName></code> is the file name of the RPM package containing the version of the driver that you want to install): </p></li>
</ol>
+<div class="highlight"><pre><code class="language-text" data-lang="text"> * RedHat/CentOS
+
+ `yum localinstall --nogpgcheck <RPMFileName>`
+
+ * SUSE
+ `zypper install RPMFileName`
+</code></pre></div>
<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>
@@ -1223,7 +1222,7 @@ locations and descriptions:</p>
</tr>
</tbody></table>
-<h2 id="step-3:-check-the-mapr-drill-odbc-driver-version">Step 3: Check the MapR Drill ODBC Driver version</h2>
+<h2 id="step-3:-check-the-mapr-drill-odbc-driver-version">Step 3: Check the MapR Drill ODBC Driver Version</h2>
<p>To check the version of the driver you installed, use the following case-sensitive command on the terminal command line:</p>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/d5caafc4/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 becf750..f6a6e00 100644
--- a/docs/installing-the-driver-on-mac-os-x/index.html
+++ b/docs/installing-the-driver-on-mac-os-x/index.html
@@ -1135,8 +1135,8 @@ the Drill service.</p>
<ul>
<li><a href="/docs/installing-the-driver-on-mac-os-x/#step-1-download-the-mapr-drill-odbc-driver">Step 1: Download the MapR Drill ODBC Driver</a><br></li>
-<li><a href="/docs/installing-the-driver-on-mac-os-x/#step-2-install-the-mapr-drill-odbc-driver">Step 2: Install the MapR Drill ODBC Driver</a> </li>
-<li><a href="/docs/installing-the-driver-on-mac-os-x/#step-3-check-the-mapr-drill-odbc-driver-version">Step 3: Check the MapR Drill ODBC Driver Version</a></li>
+<li><a href="/docs/installing-the-driver-on-mac-os-x/#step-2:-install-the-mapr-drill-odbc-driver">Step 2: Install the MapR Drill ODBC Driver</a> </li>
+<li><a href="/docs/installing-the-driver-on-mac-os-x/#step-3:-check-the-mapr-drill-odbc-driver-version">Step 3: Check the MapR Drill ODBC Driver Version</a></li>
</ul>
<h2 id="system-requirements">System Requirements</h2>
@@ -1148,11 +1148,9 @@ the Drill service.</p>
<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>
-<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>/etc/hosts</code> for each node in the following format: </p>
+<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. If not, create an entry in <code>/etc/hosts</code> for each node in the following format: <code><drill-machine-IP> <drill-machine-hostname></code>. </p>
-<p><code><drill-machine-IP> <drill-machine-hostname></code><br>
-Example: <code>127.0.0.1 localhost</code></p></li>
+<p>Example: <code>127.0.0.1 localhost</code></p></li>
</ul>
<hr>
@@ -1164,7 +1162,7 @@ Example: <code>127.0.0.1 localhost</code></p></li>
<p class="last">The most current (version 1.3.8) MapR Drill ODBC driver for Mac might not be available yet. </p>
</div>
-<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>Click the following link to download available drivers that support both 32- and 64-bit client applications: </p>
<p><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/">MapR Drill ODBC Driver for Mac</a></p>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/d5caafc4/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 9dc0d67..248d81c 100644
--- a/docs/installing-the-driver-on-windows/index.html
+++ b/docs/installing-the-driver-on-windows/index.html
@@ -1153,11 +1153,13 @@ requirements:</p>
<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><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>
+<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. If not, create an entry in <code>\Windows\system32\drivers\etc\hosts</code> for each node in the following format: </p>
-<p><code><drill-machine-IP> <drill-machine-hostname></code><br>
-Example: <code>127.0.0.1 localhost</code></p></li>
+<p><code><drill-machine-IP> <drill-machine-hostname></code></p>
+
+<p>Example: </p>
+
+<p><code>127.0.0.1 localhost</code></p></li>
</ul>
<p><div class="admonition note">
@@ -1171,7 +1173,7 @@ 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. Version 1.3.8 is the current version.</p>
+<p>Download the installer that corresponds to the bitness of the client application from which you want to create an ODBC connection. The current version is 1.3.8.</p>
<ul>
<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/">MapR Drill ODBC Driver (32-bit)</a><br></li>
@@ -1199,13 +1201,13 @@ Example: <code>127.0.0.1 localhost</code></p></li>
<p>1. Go to <strong>Settings</strong> and enter <strong>odbc</strong>. </p>
-<p>2. Select <strong>Setup ODBC data sources <version></strong>. The ODBC Data Source Administrator <version> dialog appears. Click the <strong>System DSN</strong> to view the MapR Drill data source. </p>
+<p>2. Select <strong>Set up ODBC data sources <code><version></code></strong>. The <strong>ODBC Data Source Administrator <code><version></code></strong> dialog appears. Click the <strong>System DSN</strong> to view the MapR Drill data source. </p>
-<p><img src="https://drill.apache.org/docs/img/odbc-user-dsn.png/" alt="odbcuser"></p>
+<p><img src="http://i.imgur.com/IEN5iek.png" alt=""> </p>
-<p>3. 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. </p>
+<p>3. Click the <strong>Drivers</strong> tab and verify that the <strong>MapR Drill ODBC Driver</strong> appears in the list of drivers that are installed on the computer. </p>
-<p><img src="/docs/img/odbc-drivers.png" alt="odbcuser"> </p>
+<p><img src="http://i.imgur.com/xM2QXcB.png" alt=""> </p>
<p>4.Configure and start Drill before <a href="/docs/testing-the-odbc-connection/">testing</a> the ODBC Data Source Administrator.</p>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/d5caafc4/docs/odbc-configuration-reference/index.html
----------------------------------------------------------------------
diff --git a/docs/odbc-configuration-reference/index.html b/docs/odbc-configuration-reference/index.html
index 1810ff6..c173887 100644
--- a/docs/odbc-configuration-reference/index.html
+++ b/docs/odbc-configuration-reference/index.html
@@ -1128,9 +1128,7 @@
<div class="int_text" align="left">
- <p>You can use various configuration options to control the behavior of the MapR
-Drill ODBC Driver. You can use these options in a connection string or in the
-<code>odbc.ini</code> configuration file for the Mac OS X version or the driver.</p>
+ <p>You can use various configuration options to control the behavior of the MapR Drill ODBC Driver. You can use these options in a connection string or in the <code>odbc.ini</code> configuration file for the Mac OS X version or the driver.</p>
<div class="admonition note">
<p class="first admonition-title">Note</p>
@@ -1150,13 +1148,13 @@ Drill ODBC Driver. You can use these options in a connection string or in the
</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>
+<td><code>CastAnyToVarchar=true; HandshakeTimeout=5; QueryTimeout=180;TimestampTZDisplayTimezone=local; ExcludedSchemas=sys,INFORMATION_SCHEMA; NumberOfPrefetchBuffers=5</code></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, <code>{<property>;<property>; . . .}</code> In addition, the following Advanced Properties string excludes the schemas named <code>test</code> and <code>abc</code>, sets the timeout to 30 seconds, and sets the time zone to Coordinated Universal Time:<code>HandshakeTimeout=30;QueryTimeout=30;TimestampTZDisplayTimezone=utc;ExcludedSchemas=test,abc</code>.</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>
+<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 a password. MapRSASL: The driver authenticates the connection using the MapR-SASL protocol.</td>
</tr>
<tr>
<td>Catalog</td>
@@ -1195,7 +1193,7 @@ Drill ODBC Driver. You can use these options in a connection string or in the
</tr>
<tr>
<td>KrbServiceName</td>
-<td>mapr (default)</td>
+<td><code>map</code> (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>
@@ -1206,7 +1204,7 @@ Drill ODBC Driver. You can use these options in a connection string or in the
<tr>
<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>
+<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 you specify 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>Port</td>
@@ -1241,7 +1239,7 @@ Drill ODBC Driver. You can use these options in a connection string or in the
<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>
+<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, <code><IP address></code>,<code><IP address></code>.</td>
</tr>
</tbody></table>
@@ -1284,26 +1282,15 @@ connection type based on your environment and Drillbit configuration as describe
<h3 id="connection-to-zookeeper-quorum">Connection to Zookeeper Quorum</h3>
-<p>When you choose to connect to a ZooKeeper Quorum, the ODBC driver connects to
-the ZooKeeper Quorum to get a list of available Drillbits in the specified
-cluster. Then, the ODBC driver submits a query after selecting a Drillbit. All
-Drillbits in the cluster process the query and the Drillbit that received the
-query returns the query results.</p>
+<p>When you choose to connect to a ZooKeeper Quorum, the ODBC driver connects to the ZooKeeper Quorum to get a list of available Drillbits in the specified cluster. Then, the ODBC driver submits a query after selecting a Drillbit. All Drillbits in the cluster process the query and the Drillbit that received the query returns the query results.</p>
<p><img src="/docs/img/ODBC_to_Quorum.png" alt="ODBC to Quorum"></p>
-<p>In a production environment, you should connect to a ZooKeeper Quorum for a
-more reliable connection. If one Drillbit is not available, another Drillbit
-that is registered with the ZooKeeper quorum can accept the query.</p>
+<p>In a production environment, you should connect to a ZooKeeper Quorum for a more reliable connection. If one Drillbit is not available, another Drillbit that is registered with the ZooKeeper quorum can accept the query.</p>
<h3 id="direct-connection-to-drillbit">Direct Connection to Drillbit</h3>
-<p>When you choose to connect directly to a Drillbit, the ODBC driver connects to
-the Drillbit and submits a query. If you connect directly to Drillbit that is
-not part of a cluster, the Drillbit that you connect to processes the query.
-If you connect directly to a Drillbit that is part of a cluster, all Drillbits
-in the cluster process the query. In either case, the Drillbit that the ODBC
-driver connected to returns the query results.</p>
+<p>When you choose to connect directly to a Drillbit, the ODBC driver connects to the Drillbit and submits a query. If you connect directly to Drillbit that is not part of a cluster, the Drillbit that you connect to processes the query. If you connect directly to a Drillbit that is part of a cluster, all Drillbits in the cluster process the query. In either case, the Drillbit that the ODBC driver connected to returns the query results.</p>
<p><img src="/docs/img/ODBC_to_Drillbit.png" alt=""></p>
@@ -1312,9 +1299,7 @@ driver connected to returns the query results.</p>
<p>The name of a schema, or <a href="%7B%20site.baseurl%20%7D%7D/docs/storage-plugin-registration/">storage plugin</a>, from the default schema list of the data sources that you have configured to
use with Drill. Queries on other schemas can still be issued by explicitly specifying the schema in the query.</p>
-<p>Views that you create using the Drill Explorer do not appear under the schema
-associated with the data source type. Instead, the views can be accessed from
-the file-based schema that you selected when saving the view.</p>
+<p>Views that you create using the Drill Explorer do not appear under the schema associated with the data source type. Instead, the views can be accessed from the file-based schema that you selected when saving the view.</p>
<p>The driver supports the following schema types:</p>
@@ -1333,18 +1318,14 @@ the file-based schema that you selected when saving the view.</p>
<h3 id="advanced-properties">Advanced Properties</h3>
-<p>The Advanced Properties field allows you to customize the DSN.<br>
-Separate advanced properties using a semi-colon (;).</p>
+<p>The Advanced Properties field allows you to customize the DSN. Separate advanced properties using a semi-colon (;).</p>
-<p>For example, the following Advanced Properties string excludes the schemas
-named <code>test</code> and <code>abc</code>; sets the timeout to 30 seconds; and sets the time zone
-to Coordinated Universal:</p>
+<p>For example, the following Advanced Properties string excludes the schemas named <code>test</code> and <code>abc</code>; sets the timeout to 30 seconds; and sets the time zone to Coordinated Universal:</p>
<p><code>Time:HandshakeTimeout=30;QueryTimeout=30;
TimestampTZDisplayTimezone=utc;ExcludedSchemas=test,abc</code></p>
-<p>The following table lists and describes the advanced properties that you can
-set when using the MapR Drill ODBC Driver.</p>
+<p>The following table lists and describes the advanced properties that you can set when using the MapR Drill ODBC Driver.</p>
<table><thead>
<tr>
@@ -1355,12 +1336,12 @@ set when using the MapR Drill ODBC Driver.</p>
</thead><tbody>
<tr>
<td>CastAnyToVarchar</td>
-<td>TRUE</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>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>
@@ -1375,8 +1356,8 @@ set when using the MapR Drill ODBC Driver.</p>
</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>
+<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>
@@ -1390,12 +1371,12 @@ set when using the MapR Drill ODBC Driver.</p>
</tr>
<tr>
<td>IncludedSchemas</td>
-<td>None</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>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>
@@ -1410,18 +1391,18 @@ set when using the MapR Drill ODBC Driver.</p>
</tr>
<tr>
<td>RemoveQryCatalog</td>
-<td>TRUE</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>SaslPluginDir</td>
-<td>None</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>StringColumnLength</td>
<td>1024</td>
-<td>Not required. The maximum column length that the driver reports for string columns.</td>
+<td>Not required. The maximum column length that the driver reports for string columns.</td>
</tr>
<tr>
<td>TimestampTZDisplayTimezone</td>
@@ -1436,18 +1417,14 @@ set when using the MapR Drill ODBC Driver.</p>
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
</code></pre></div>
-<p>The following is an example connection string for the Zookeeper connection
-type: </p>
+<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
</code></pre></div>
<h2 id="logging-options">Logging Options</h2>
-<p>Configure logging to troubleshoot issues. To configure logging, click the
-Logging Options button on the ODBC DSN Setup dialog and then set a log level
-and a log path.</p>
+<p>Configure logging to troubleshoot issues. To configure logging, click the <strong>Logging Options</strong> button on the ODBC DSN Setup dialog and then set a log leveland a log path.</p>
-<p>If logging is enabled, the MapR Drill ODBC driver logs events in following log
-files in the log path that you configure:</p>
+<p>If logging is enabled, the MapR Drill ODBC driver logs events in following log files in the log path that you configure:</p>
<ul>
<li><code>driver.log</code> provides a log of driver events.</li>
@@ -1473,7 +1450,7 @@ files in the log path that you configure:</p>
<p>To enable logging:</p>
<ol>
-<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>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.)</p></li>
<li><p>Set the LogLevel key to the desired level of information to include in log files.
For example:</p>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/d5caafc4/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 2ec7378..0bcc31d 100644
--- a/docs/testing-the-odbc-connection/index.html
+++ b/docs/testing-the-odbc-connection/index.html
@@ -1122,7 +1122,7 @@
</div>
- May 30, 2017
+ May 31, 2017
<link href="/css/docpage.css" rel="stylesheet" type="text/css">
@@ -1162,9 +1162,8 @@ The placeholders in the examples are defined as follows, in alphabetical order:<
<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>
-
+<div class="highlight"><pre><code class="language-text" data-lang="text">Driver=MapR Drill ODBC Driver;ConnectionType=Direct; Host=[*Server*];Port=[*PortNumber*]
+</code></pre></div>
<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>
@@ -1216,12 +1215,11 @@ AuthenticationType=MapRSASL
<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>
+<div class="highlight"><pre><code class="language-text" data-lang="text">Driver=MapR Drill ODBC Driver;ConnectionType=Direct;
+Host=[*Server*];Port=[*PortNumber*];
AuthenticationType=Plain;
-UID=[<em>YourUserName</em>];PWD=[<em>YourPassword</em>]</p>
-
+UID=[*YourUserName*];PWD=[*YourPassword*]
+</code></pre></div>
<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;
@@ -1333,9 +1331,10 @@ The Login for the MapR Drill dialog appears.<br>
<ol>
<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 <strong>Test</strong>. A Test Results popup will display that states you have successfully connected to the data source. </p></li>
+The <strong>MapR Drill ODBC Driver DSN Setup</strong> dialog is displayed.</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>
+
+<p><img src="http://i.imgur.com/Hxuutmq.png" alt=""></p></li>
</ol>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/d5caafc4/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index cce3be3..2b84b58 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
</description>
<link>/</link>
<atom:link href="/feed.xml" rel="self" type="application/rss+xml"/>
- <pubDate>Tue, 30 May 2017 17:41:49 -0700</pubDate>
- <lastBuildDate>Tue, 30 May 2017 17:41:49 -0700</lastBuildDate>
+ <pubDate>Wed, 31 May 2017 16:20:39 -0700</pubDate>
+ <lastBuildDate>Wed, 31 May 2017 16:20:39 -0700</lastBuildDate>
<generator>Jekyll v2.5.2</generator>
<item>