drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bridg...@apache.org
Subject drill git commit: updates to odbc docs from cathy skrbina
Date Wed, 31 May 2017 23:18:13 GMT
Repository: drill
Updated Branches:
  refs/heads/gh-pages 92a2f3044 -> 824e44d85


updates to odbc docs from cathy skrbina


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

Branch: refs/heads/gh-pages
Commit: 824e44d8570fb8213db6468cc121a1a3cf3253c5
Parents: 92a2f30
Author: Bridget Bevens <bbevens@maprtech.com>
Authored: Wed May 31 16:17:27 2017 -0700
Committer: Bridget Bevens <bbevens@maprtech.com>
Committed: Wed May 31 16:17:27 2017 -0700

----------------------------------------------------------------------
 _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
 .../010-odbc-configuration-reference.md         |  74 +++++++------------
 .../020-configuring-odbc-on-linux.md            |  28 ++++---
 .../025-configuring-odbc-on-mac-os-x.md         |  26 ++++---
 .../030-configuring-odbc-on-windows.md          |  41 +++++-----
 .../040-testing-the-odbc-connection.md          |  17 +++--
 .../010-installing-the-driver-on-linux.md       |  34 +++++----
 .../020-installing-the-driver-on-mac-os-x.md    |  16 ++--
 .../030-installing-the-driver-on-windows.md     |  24 +++---
 12 files changed, 123 insertions(+), 137 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/824e44d8/_docs/img/odbc-configure2.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-configure2.png b/_docs/img/odbc-configure2.png
index e1774c6..dafbcd0 100755
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/blob/824e44d8/_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/blob/824e44d8/_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 100755
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/blob/824e44d8/_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/blob/824e44d8/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md
index ea4ad02..0a09b2f 100644
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md
@@ -1,11 +1,9 @@
 ---
 title: "ODBC Configuration Reference"
-date: 2017-05-31 00:23:14 UTC
+date: 2017-05-31 23:17:31 UTC
 parent: "Configuring ODBC"
 ---
-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
-`odbc.ini` configuration file for the Mac OS X version or the driver.
+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 `odbc.ini` configuration file for the Mac OS X version or the driver.
 
 {% include startnote.html %}If you use a connection string to connect to your data source, set these configuration properties in the connection string instead of the .odbc.ini file.{% include endnote.html %}
 
@@ -15,8 +13,8 @@ The following table provides a list of the configuration options and a brief des
 
 | Property                      | Default Values                                                                                                                                                   | Brief Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 |-------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| AdvancedProperties            | CastAnyToVarchar=true;  HandshakeTimeout=5; QueryTimeout=180;TimestampTZDisplayTimezone=local; ExcludedSchemas=sys,INFORMATION_SCHEMA; NumberOfPrefetchBuffers=5 | 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 |
-| AuthenticationType            | No Authentication                                                                                                                                                | 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.                                                                                                                                                                                                                                                                                                                                                                 |
+| AdvancedProperties            | `CastAnyToVarchar=true;  HandshakeTimeout=5; QueryTimeout=180;TimestampTZDisplayTimezone=local; ExcludedSchemas=sys,INFORMATION_SCHEMA; NumberOfPrefetchBuffers=5` | 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`. |
+| AuthenticationType            | No Authentication                                                                                                                                                | 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.                                                                                                                                                                                                                                                                                                                                                                 |
 | Catalog                       | The default catalog name specified in the driver's .did file (typically, DRILL).                                                                                 | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | ConnectionType                | Direct to Drillbit (Direct)                                                                                                                                      | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | DelegationUID                 | none                                                                                                                                                             | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
@@ -24,16 +22,16 @@ The following table provides a list of the configuration options and a brief des
 | Driver                        | MapR Drill ODBC Driver on Windows machines or the absolute path of the driver shared object file when installed on a non-Windows machine                         | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | Host                          | localhost                                                                                                                                                        | Required if the ConnectionType property is set to Direct to Drillbit. The IP address or host name of the Drill server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | KrbServiceHost                | none                                                                                                                                                             | Required for Kerberos authentication. The fully qualified domain name of the Drill server host.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| KrbServiceName                | mapr (default)                                                                                                                                                   | Required for Kerberos authentication. The Kerberos service principal name of the Drill server. mapr is the default for the MapR Drill ODBC driver.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| KrbServiceName                | `map` (default)                                                                                                                                                   | Required for Kerberos authentication. The Kerberos service principal name of the Drill server. mapr is the default for the MapR Drill ODBC driver.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | LogLevel                      | OFF (0)                                                                                                                                                          | 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.                                                                                                                                                                                                                                                                        |
-| LogPath                       | none                                                                                                                                                             | 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.                                                                                                                                                                                     |
+| LogPath                       | none                                                                                                                                                             | 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.                                                                                                                                                                                     |
 | Port                          | 31010                                                                                                                                                            | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | PWD                           | none                                                                                                                                                             | 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).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
 | Schema                        | none                                                                                                                                                             | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | UID                           | none                                                                                                                                                             | Required if AuthenticationType is Plain (also known as Basic authentication). Set UID to a user name.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | UseOnlySSPI (on Windows only) | Clear (0)                                                                                                                                                        | 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.                                                                                                                                                                                                                                                                                                                    |
 | ZKClusterID                   | drillbits1                                                                                                                                                       | Required if the ConnectionType property is set to ZooKeeper Quorum. Set ZKClusterID to the name of the Drillbit cluster to use.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| ZKQuorum                      | none                                                                                                                                                             | 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>.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |                                        
                                                                                                   |
+| ZKQuorum                      | none                                                                                                                                                             | 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>`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |                                    
                                                                                                       |
 
 
 ### Catalog
@@ -59,26 +57,15 @@ The default cluster ID is drillbits1. Check the `drill-override.conf` in the Dri
 
 ### Connection to Zookeeper Quorum
 
-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.
+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.
 
 ![ODBC to Quorum]({{ site.baseurl }}/docs/img/ODBC_to_Quorum.png)
 
-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.
+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.
 
 ### Direct Connection to Drillbit
 
-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.
+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.
 
 ![]({{ site.baseurl }}/docs/img/ODBC_to_Drillbit.png)
 
@@ -87,9 +74,7 @@ driver connected to returns the query results.
 The name of a schema, or [storage plugin]({ site.baseurl }}/docs/storage-plugin-registration/), 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.
 
-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.
+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.
 
 The driver supports the following schema types:
 
@@ -103,35 +88,31 @@ The driver supports the following schema types:
 
 ### Advanced Properties
 
-The Advanced Properties field allows you to customize the DSN.  
-Separate advanced properties using a semi-colon (;).
+The Advanced Properties field allows you to customize the DSN. Separate advanced properties using a semi-colon (;).
 
-For example, 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:
+For example, 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`
 
-The following table lists and describes the advanced properties that you can
-set when using the MapR Drill ODBC Driver.
+The following table lists and describes the advanced properties that you can set when using the MapR Drill ODBC Driver.
 
 | Property                   | Default Values         | Brief Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 |----------------------------|------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| CastAnyToVarchar           | TRUE                   | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| ConvertToCast              | FALSE                  | Not required. When activated this enables the Cast Query Translation function. This function helps optimize your queries for Power BI.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| CastAnyToVarchar           | True                   | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| ConvertToCast              | False                  | Not required. When activated this enables the Cast Query Translation function. This function helps optimize your queries for Power BI.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | DefaultDecimalScale        | 10                     | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | ExcludedSchemas            | sys,INFORMATION_SCHEMA | 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.                                                                                                                                                                                                                                                                                                                       |
-| GetMetadataWithQueries     | None                   | 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.                                                                                                                   |
+| GetMetadataWithQueries     | none                   | 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.                                                                                                                   |
 | HandshakeTimeout           | 5                      | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
 | HeartBeatFreqSec           | 15                     | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| IncludedSchemas            | None                   | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| NonZeroNameMaxLen          | FALSE                  | 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. |
+| IncludedSchemas            | none                   | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+| NonZeroNameMaxLen          | False                  | 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. |
 | NumberOfPrefetchBuffers    | 5                      | Not required. The size of the record batch queue in the driver. When set to a value below 1, the value defaults to 1.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | QueryTimeout               | 180                    | 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.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| RemoveQryCatalog           | TRUE                   | 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.                                                                                                                                                                                                                                                                                                                                                                            |
-| SaslPluginDir              | None                   | Not required. Allows you to override the default SASL plugin directory with a custom directory path.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-| StringColumnLength         | 1024                   | Not required.  The maximum column length that the driver reports for string columns.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| RemoveQryCatalog           | True                   | 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.                                                                                                                                                                                                                                                                                                                                                                            |
+| SaslPluginDir              | none                   | Not required. Allows you to override the default SASL plugin directory with a custom directory path.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| StringColumnLength         | 1024                   | Not required. The maximum column length that the driver reports for string columns.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | TimestampTZDisplayTimezone | local                  | 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).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 
 ### Connection String Examples
@@ -141,19 +122,15 @@ not require a DSN, you can use an ODBC connection string. The following is an ex
 
     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
 
-The following is an example connection string for the Zookeeper connection
-type:  
+The following is an example connection string for the Zookeeper connection type:  
 
     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
 
 ## Logging Options
 
-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.
+Configure logging to troubleshoot issues. To configure logging, click the **Logging Options** button on the ODBC DSN Setup dialog and then set a log leveland a log path.
 
-If logging is enabled, the MapR Drill ODBC driver logs events in following log
-files in the log path that you configure:
+If logging is enabled, the MapR Drill ODBC driver logs events in following log files in the log path that you configure:
 
 * `driver.log` provides a log of driver events.
 * `drillclient.log` provides a log of the Drill client events.
@@ -176,6 +153,7 @@ The following log levels are available:
 To enable logging:
 
 1. Open the `.mapr.drillodbc.ini` configuration file in a text editor. (On Mac OS X, the default installation will install a .mapr.drillodbc.ini to $HOME.)
+
 2. Set the LogLevel key to the desired level of information to include in log files. 
 For example:
 

http://git-wip-us.apache.org/repos/asf/drill/blob/824e44d8/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md
index c5ad206..7b78d59 100644
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuring ODBC on Linux"
-date: 2017-05-31 00:03:40 UTC
+date: 2017-05-31 23:17:32 UTC
 parent: "Configuring ODBC"
 ---
 
@@ -24,9 +24,9 @@ on Linux, copy the following configuration files in `/opt/mapr/drill/Setup` to y
 
 In your home directory, rename the files as hidden files. Use sudo if necessary:
 
-* .mapr.drillodbc.ini
-* .odbc.ini
-* .odbcinst.ini
+* `.mapr.drillodbc.ini`
+* `.odbc.ini`
+* `.odbcinst.ini`
 
 ----------
 
@@ -34,8 +34,10 @@ In your home directory, rename the files as hidden files. Use sudo if necessary:
 
 1. Set the ODBCINI environment variable to point to the `.odbc.ini` in your home directory. For example:  
    `export ODBCINI=~/.odbc.ini`
+
 2. Set the MAPRDRILLINI environment variable to point to `.mapr.drillodbc.ini` in your home directory. For example:  
    `export MAPRDRILLINI=~/.mapr.drillodbc.ini`
+
 3. Set the `LD_LIBRARY_PATH` environment variable  to point to your ODBC driver manager libraries. For example:  
    `export LD_LIBRARY_PATH=/usr/local/lib`
 
@@ -63,7 +65,7 @@ To use Drill in distributed mode, set the following properties, described in det
     ZKQuorum=<host name>:<port>,<host name>:<port> . . . <host name>:<port>
     ZKClusterID=<cluster name in `drill-override.conf`>
 
-The following Linux sample shows a possible configuration for using Drill in distributed mode. The configuration assumes you started Drill using the `drill-conf` command. The example modifies the default Linux-installed `.odbc.ini` for a 64-bit system by commenting out 32-bit properties, adding 64-bit properties, and removes the extraneous MapR Drill 64-bit from `.odbc.ini`.
+The following Linux sample shows a possible configuration for using Drill in distributed mode. The example modifies the default Linux-installed `.odbc.ini` for a 64-bit system by commenting out 32-bit properties, adding 64-bit properties, and removes the extraneous MapR Drill 64-bit from `.odbc.ini`.
 
     [ODBC]
     Trace=no
@@ -136,12 +138,12 @@ The following Linux sample shows a possible configuration for using Drill in dis
     Schema=
 
 ### Authentication Properties
-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. 
+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. 
 
 
 * **MapRSASL** 
 	* The MapR login utility must be used to obtain a MapR ticket for MapR SASL authentication. 
-	* 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>.
+	* 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>.
 
 * **Kerberos** 
 	*  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.  
@@ -157,6 +159,7 @@ If the Drillbit requires authentication, uncomment the AuthenticationType, add a
 
 ### Direct and ZooKeeper Quorum Properties
 To use Drill in distributed mode, set ConnectionType to Zookeeper, get the ZKQuorum and ZKClusterID values from the `drill-override.conf` file, and define the ZKQuorum and ZKClusterID properties. The `drill-override.conf` is in the `/drill/drill-<version>/conf` directory. Format ZKQuorum as a comma separated list of ZooKeeper nodes in the following format:  
+
 `<host name/ip address> : <port number>, <host name/ip address> : <port number>, . . .` 
 
 For example:
@@ -221,17 +224,18 @@ To configure the MapR Drill ODBC Driver in the `.mapr.drillodbc.ini` configurati
 
   1. Open the `.mapr.drillodbc.ini` configuration file in a text editor.  
  
-  2. 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.  
+  2. 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.  
   
-     **Note**: 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. 
+     **Note**: 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. 
     
-  4. Save the `.mapr.drillodbc.ini` configuration file.
+  3. Save the `.mapr.drillodbc.ini` configuration file.
 
 
 ### Next Step
 
-Refer to [Testing the ODBC Connection]({{ site.baseurl }}/docs/testing-the-odbc-connection).
+[Testing the ODBC Connection]({{ site.baseurl }}/docs/testing-the-odbc-connection/) 
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/drill/blob/824e44d8/_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md
index 956afa1..530a2a8 100644
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuring ODBC on Mac OS X"
-date: 2017-05-31 00:03:40 UTC
+date: 2017-05-31 23:17:32 UTC
 parent: "Configuring ODBC"
 ---
 ODBC driver managers use configuration files to define and configure ODBC data
@@ -71,12 +71,12 @@ You set the following properties for using Drill in distributed mode:
     ZKClusterID=<cluster name in `drill-override.conf`>
 
 ### Authentication Properties
-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.
+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.
 
 
 * **MapRSASL** 
 	* The MapR login utility must be used to obtain a MapR ticket for MapR SASL authentication. 
-	* 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>.
+	* 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>.
 
 * **Kerberos** 
 	*  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.
@@ -127,9 +127,9 @@ The following sample shows a possible configuration for using Drill in embedded
     # 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.
@@ -177,13 +177,15 @@ file. This configures the driver to work with your ODBC driver manager. The foll
 
 ### Configuring .mapr.drillodbc.ini
 
-To configure the MapR Drill ODBC Driver in the `mapr.drillodbc.ini` configuration file, complete the following steps:
+To configure the MapR Drill ODBC Driver in the `.mapr.drillodbc.ini` configuration file, complete the following steps:
+
+  1. Open the `.mapr.drillodbc.ini` configuration file in a text editor. 
+ 
+  2. Edit the 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.  
+  
+	**Note**: 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.
 
-  1. Open the `mapr.drillodbc.ini` configuration file in a text editor.  
-  2. 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.  
-  3. 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.
-  4. Save the `mapr.drillodbc.ini` configuration file.
+  3. Save the `.mapr.drillodbc.ini` configuration file.
 
 
 ### Next Step

http://git-wip-us.apache.org/repos/asf/drill/blob/824e44d8/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md
index 773ee18..be91ec7 100644
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuring ODBC on Windows"
-date: 2017-05-31 00:23:14 UTC
+date: 2017-05-31 23:17:33 UTC
 parent: "Configuring ODBC"
 ---
 Complete one of the following steps to create an ODBC connection on Windows to Drill data
@@ -11,32 +11,30 @@ sources:
 
 ## Sample ODBC Configuration
 
-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.
+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.
 
-1\. Click **Start** and locate the ODBC Administrator app that you installed. Then click ODBC Administrator to start the app. The ODBC Data Source Administrator dialog appears.  
+1\. From the Settings dialog in Windows 10, enter **odbc** and select **Setup ODBC data sources `<version>`**. The ODBC Data Source Administrator `<version>` dialog appears.   
 
-![odbcuser]({{ site.baseurl }}/docs/img/odbc-user-dsn.png)  
+![](http://i.imgur.com/uK42pUe.png)
 
 
 
-2\. On the **System DSN** tab in System Data Sources, select the sample MapR Drill.  
-
-![configure1]({{ site.baseurl }}/docs/img/odbc-configure1.png)  
-
+2\. On the **System DSN** tab in System Data Sources, select **MapR Drill**.  
 
    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 **User DSN** tab. 
  
 3\. Click **Configure**.  
   
-   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.  
+   The **MapR Drill ODBC Driver DSN Setup** dialog appears with a preconfigured sample DSN. The following image shows a possible DSN configuration for using Drill in embedded mode.  
 
-![configure2]({{ site.baseurl }}/docs/img/odbc-configure2.png)  
 
+![](http://i.imgur.com/f9Avhcz.png) 
 
+   To access **Drill Explorer**, click **Drill Explorer...**.
    
 ### Authentication Options
-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.
+To password protect the DSN, select the appropriate authentication type in the **Authentication Type** 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.
 
 * **MapR-SASL**
 	* 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>.
@@ -47,31 +45,28 @@ To password protect the DSN, select the appropriate AuthenticationType in the dr
 
 
 ### Direct to Drillbit and ZooKeeper Quorum Options
-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:
+In the **Connection Type** section, **Direct to Drillbit** is selected for using Drill in embedded mode. To use Drill in embedded mode, set the connection type to **Direct** and define HOST and PORT properties. For example:
 
 * `HOST=localhost`  
 * `PORT=31010`
 
 Check the `drill-override.conf` file for any port changes. 
 
-To use Drill in distributed mode, select ZooKeeper Quorum. 
-
-If you select ZooKeeper Quorum, provide values for the following properties:
+To use Drill in distributed mode, select **ZooKeeper Quorum**. If you select ZooKeeper Quorum, provide values for the following properties:
 
-* Quorum - 
+* **Quorum** - 
   A comma separated list of ZooKeeper nodes in the following format:
   `<host name/ip address> : <port number>, <host name/ip address> : <port number>, . . .`
-* Cluster ID - 
-  Name of the drillbit cluster. Check the drill-override.conf file for ZooKeeper node information and for any cluster name changes.
 
- Check the `drill-override.conf` file for the cluster name.  
+* **Cluster ID** - 
+  Name of the drillbit cluster. Check the `drill-override.conf` file for ZooKeeper node information and for any cluster name changes.
 
-![]({{ site.baseurl }}/docs/img/odbc-configure3.png)  
+ Check the `drill-override.conf` file for the cluster name.  
 
 
-The [Advanced Properties]({{site.baseurl}}/docs/odbc-configuration-reference/) section describes the advanced properties.
+The [Advanced Properties]({{site.baseurl}}/docs/odbc-configuration-reference/) section describes the advanced  configuration properties in detail.
 
-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.
+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.
 
 
 [Logging Options]({{site.baseurl}}/docs/odbc-configuration-reference/#logging-options) and [Drill Explorer]({{site.baseurl}}/docs/drill-explorer-introduction/) sections describe the options at the bottom of this dialog.

http://git-wip-us.apache.org/repos/asf/drill/blob/824e44d8/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md
index 710c7dd..31dc3f2 100644
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md
@@ -1,6 +1,6 @@
 ---
 title: "Testing the ODBC Connection"
-date: 2017-05-30 23:11:53 UTC
+date: 2017-05-31 23:17:33 UTC
 parent: "Configuring ODBC"
 ---
 You can use DSN connection strings and DSN-less connection strings for your connections.
@@ -35,7 +35,7 @@ The placeholders in the examples are defined as follows, in alphabetical order:
 ###Drillbit Connections
 The following is the format of a DSN-less connection string for a Drillbit that does not require authentication:
 
-Driver=MapR Drill ODBC Driver;ConnectionType=Direct; Host=[*Server*];Port=[*PortNumbe*r]
+	Driver=MapR Drill ODBC Driver;ConnectionType=Direct; Host=[*Server*];Port=[*PortNumber*]
 
 For example:
 
@@ -92,10 +92,10 @@ For example:
 
 The following is the format of a DSN-less connection string for a Drillbit that requires Plain authentication:
 
-Driver=MapR Drill ODBC Driver;ConnectionType=Direct; 
-Host=[*Server*];Port=[*PortNumber*];	
-AuthenticationType=Plain;
-UID=[*YourUserName*];PWD=[*YourPassword*]
+	Driver=MapR Drill ODBC Driver;ConnectionType=Direct; 
+	Host=[*Server*];Port=[*PortNumber*];	
+	AuthenticationType=Plain;
+	UID=[*YourUserName*];PWD=[*YourPassword*]
 
 For example:
 
@@ -213,8 +213,9 @@ To test the ODBC connection on Mac OS X, follow these steps.
 To test the ODBC connection on Windows, follow these steps:
 
 1. Follow instructions to configure the ODBC connection on Windows. 
-   The MapR Drill ODBC Driver DSN Setup dialog is displayed.
-   ![]({{ site.baseurl }}/docs/img/odbc-configure2.png)
+   The **MapR Drill ODBC Driver DSN Setup** dialog is displayed.
 
 2. Click **Test**. A Test Results popup will display that states you have successfully connected to the data source. 
 
+	![](http://i.imgur.com/Hxuutmq.png)
+

http://git-wip-us.apache.org/repos/asf/drill/blob/824e44d8/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
index 0771466..c664400 100644
--- a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
+++ b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
@@ -1,6 +1,6 @@
 ---
 title: "Installing the Driver on Linux"
-date: 2017-05-30 23:11:54 UTC
+date: 2017-05-31 23:17:34 UTC
 parent: "Installing the ODBC Driver"
 ---
 Install the MapR Drill ODBC Driver on the machine from which you connect to
@@ -22,18 +22,20 @@ Verify that your system meets the system requirements before you start.
   * One of the following distributions (32- and 64-bit editions are supported):
     * Red Hat® Enterprise Linux® (RHEL) 5, 6, or 7
     * CentOS 5, 6, or 7
-    * SUSE Linux Enterprise Server (SLES) 11 or 12
-  * 90 MB of available disk space.
-  * An installed ODBC driver manager:
+    * SUSE Linux Enterprise Server (SLES) 11 or 12     
+ * 90 MB of available disk space.
+ * An installed ODBC driver manager:
     * iODBC 3.52.7 or above  
       or 
     * unixODBC 2.2.14 or above  
-    On Linux, 3.52.7 is available as a tarball. After unpacking the tarball, see the README for instructions about building the driver manager.
-  * 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 `/etc/hosts` for each node in the following format:  
+    On Linux, 3.52.7 is available as a tarball. After unpacking the tarball, see the README for instructions about building the driver manager.  
+ * 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 `/etc/hosts` for each node in the following format:  
 
-    `<drill-machine-IP> <drill-machine-hostname>`  
-    Example: `127.0.0.1 localhost`
+    	<drill-machine-IP> <drill-machine-hostname>  
+    	
+	Example: 
+
+		127.0.0.1 localhost
 
 To install the driver, you need Administrator privileges on the computer. 
 
@@ -45,12 +47,18 @@ Download the driver from the [download site](http://package.mapr.com/tools/MapR-
 To install the driver, complete the following steps:
 
   1. Login as the root user.
+  
   2. Navigate to the directory that contains the driver RPM packages to install.
-  3. Enter the following command where _RPMFileName_ is the file name of the RPM package containing the version of the driver that you want to install:  
+  
+  3. Enter the following command (where `<RPMFileName>` is the file name of the RPM package containing the version of the driver that you want to install):  
+  
      * RedHat/CentOS  
-     `yum localinstall --nogpgcheck <RPMFileName>`
+     
+		 `yum localinstall --nogpgcheck <RPMFileName>`
+
      * SUSE  
-     `zypper install RPMFileName`
+     
+      	`zypper install RPMFileName`
 
 
 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
@@ -66,7 +74,7 @@ File| Description
 `/opt/mapr/drill/lib/32 `| 32-bit shared libraries directory (will be created if you install the 32-bit driver).  
 `/opt/mapr/drill/lib/64`| 64-bit shared libraries directory (will be created if you install the 64-bit driver)..  
   
-## Step 3: Check the MapR Drill ODBC Driver version
+## Step 3: Check the MapR Drill ODBC Driver Version
 
 To check the version of the driver you installed, use the following case-sensitive command on the terminal command line:
 

http://git-wip-us.apache.org/repos/asf/drill/blob/824e44d8/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
index 5a179b3..e0180fd 100644
--- a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
+++ b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
@@ -1,6 +1,6 @@
 ---
 title: "Installing the Driver on Mac OS X"
-date: 2017-05-31 00:03:41 UTC
+date: 2017-05-31 23:17:34 UTC
 parent: "Installing the ODBC Driver"
 ---
 Install the MapR Drill ODBC Driver on the machine from which you connect to
@@ -9,8 +9,8 @@ the Drill service.
 Install the MapR Drill ODBC Driver on a system that meets the [system requirements]({{site.baseurl}}/docs/installing-the-driver-on-mac-os-x/#system-requirements). Complete the following steps, described in detail in this document:
 
   * [Step 1: Download the MapR Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-mac-os-x/#step-1-download-the-mapr-drill-odbc-driver)  
-  * [Step 2: Install the MapR Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-mac-os-x/#step-2-install-the-mapr-drill-odbc-driver) 
-  * [Step 3: Check the MapR Drill ODBC Driver Version]({{site.baseurl}}/docs/installing-the-driver-on-mac-os-x/#step-3-check-the-mapr-drill-odbc-driver-version)
+  * [Step 2: Install the MapR Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-mac-os-x/#step-2:-install-the-mapr-drill-odbc-driver) 
+  * [Step 3: Check the MapR Drill ODBC Driver Version]({{site.baseurl}}/docs/installing-the-driver-on-mac-os-x/#step-3:-check-the-mapr-drill-odbc-driver-version)
 
 ## System Requirements  
 To install the driver, you need Administrator privileges on the computer.
@@ -19,11 +19,9 @@ To install the driver, you need Administrator privileges on the computer.
   * 100 MB of available disk space  
   * iODBC 3.52.7 or later  
     The iodbc-config file in the `/usr/local/iODBC/bin` includes the version of the driver.  
-  * 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 `/etc/hosts` for each node in the following format:  
-
-    `<drill-machine-IP> <drill-machine-hostname>`  
-    Example: `127.0.0.1 localhost`
+  * 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 `/etc/hosts` for each node in the following format:  `<drill-machine-IP> <drill-machine-hostname>`. 
+    
+	Example: `127.0.0.1 localhost`
 
 ----------
 
@@ -32,7 +30,7 @@ If not, create an entry in `/etc/hosts` for each node in the following format:
 
 {% include startnote.html %}The most current (version 1.3.8)  MapR Drill ODBC driver for Mac might not be available yet.{% include endnote.html %}  
 
-Click the following link to download the latest version (1.3.8) of the driver, which supports both 32- and 64-bit client applications:  
+Click the following link to download available drivers that support both 32- and 64-bit client applications:  
 
 [MapR Drill ODBC Driver for Mac](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/)
 

http://git-wip-us.apache.org/repos/asf/drill/blob/824e44d8/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md
index 7cd8791..792f163 100644
--- a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md
+++ b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md
@@ -1,6 +1,6 @@
 ---
 title: "Installing the Driver on Windows"
-date: 2017-05-31 00:40:02 UTC
+date: 2017-05-31 23:17:35 UTC
 parent: "Installing the ODBC Driver"
 ---
 The MapR Drill ODBC Driver installer is available for 32- and 64-bit
@@ -24,11 +24,13 @@ requirements:
   * .NET Framework 4.5, installed and enabled by default on Windows 8 and later
   * Visual C++ Redistributable for Visual Studio 2013 installed (with the same bitness as the driver that you are installing)
  
-  * 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 `\Windows\system32\drivers\etc\hosts` for each node in the following format:  
+  * 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 `\Windows\system32\drivers\etc\hosts` for each node in the following format:  
 
-    `<drill-machine-IP> <drill-machine-hostname>`  
-    Example: `127.0.0.1 localhost`
+    `<drill-machine-IP> <drill-machine-hostname>`
+
+	Example: 
+
+	`127.0.0.1 localhost`
 
  {% include startnote.html %}Currently Drill does not support a 32-bit Windows machine; however, the 32- or 64-bit MapR Drill ODBC Driver is supported on a 64-bit machine.{% include endnote.html %}
 
@@ -38,7 +40,7 @@ To install the driver, you need Administrator privileges on the computer.
 
 ## Step 1: Download the MapR Drill ODBC Driver
 
-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.
+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.
 
 * [MapR Drill ODBC Driver (32-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/)  
 * [MapR Drill ODBC Driver (64-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/)
@@ -62,16 +64,14 @@ To verify the installation on Windows 10, perform the following steps:
 
 1\. Go to **Settings** and enter **odbc**.  
 
-2\. Select **Setup ODBC data sources <version>**.  The ODBC Data Source Administrator <version> dialog appears. Click the **System DSN** to view the MapR Drill data source.  
 
-![odbcuser](https://drill.apache.org/docs/img/odbc-user-dsn.png/)
+2\. Select **Set up ODBC data sources `<version>`**.  The **ODBC Data Source Administrator `<version>`** dialog appears. Click the **System DSN** to view the MapR Drill data source. 
 
+![](http://i.imgur.com/IEN5iek.png) 
 
-3\. Click the **Drivers** tab and verify that the MapR Drill ODBC Driver appears in the list of drivers that are installed on the computer.  
+3\. Click the **Drivers** tab and verify that the **MapR Drill ODBC Driver** appears in the list of drivers that are installed on the computer.  
 
-  
- 
-![odbcuser]({{ site.baseurl }}/docs/img/odbc-drivers.png)  
+![](http://i.imgur.com/xM2QXcB.png)  
 
 4\.Configure and start Drill before [testing]({{site.baseurl}}/docs/testing-the-odbc-connection/) the ODBC Data Source Administrator.
 


Mime
View raw message