http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/img/ngram_plugin2.png
----------------------------------------------------------------------
diff --git a/_docs/img/ngram_plugin2.png b/_docs/img/ngram_plugin2.png
new file mode 100644
index 0000000..60d432d
Binary files /dev/null and b/_docs/img/ngram_plugin2.png differ

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

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/img/student_hive.png
----------------------------------------------------------------------
diff --git a/_docs/img/student_hive.png b/_docs/img/student_hive.png
new file mode 100644
index 0000000..7e22b88
Binary files /dev/null and b/_docs/img/student_hive.png differ

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/install/001-drill-in-10.md
----------------------------------------------------------------------
diff --git a/_docs/install/001-drill-in-10.md b/_docs/install/001-drill-in-10.md
new file mode 100644
index 0000000..13d2410
--- /dev/null
+++ b/_docs/install/001-drill-in-10.md
@@ -0,0 +1,365 @@
+---
+title: "Apache Drill in 10 Minutes"
+parent: "Install Drill"
+---
+* Objective
+* A Few Bits About Apache Drill
+* Process Overview
+* Install Drill
+  * Installing Drill on Linux
+  * Installing Drill on Mac OS X
+  * Installing Drill on Windows 
+* Start Drill 
+* Query Sample Data 
+* Summary 
+* Next Steps
+* More Information
+
+## Objective
+
+Use Apache Drill to query sample data in 10 minutes. For simplicity, you’ll
+run Drill in _embedded_ mode rather than _distributed_ mode to try out Drill
+without having to perform any setup tasks.
+
+## A Few Bits About Apache Drill
+
+Drill is a clustered, powerful MPP (Massively Parallel Processing) query
+engine for Hadoop that can process petabytes of data, fast. Drill is useful
+for short, interactive ad-hoc queries on large-scale data sets. Drill is
+capable of querying nested data in formats like JSON and Parquet and
+performing dynamic schema discovery. Drill does not require a centralized
+metadata repository.
+
+### **_Dynamic schema discovery_**
+
+Drill does not require schema or type specification for data in order to start
+the query execution process. Drill starts data processing in record-batches
+and discovers the schema during processing. Self-describing data formats such
+as Parquet, JSON, AVRO, and NoSQL databases have schema specified as part of
+the data itself, which Drill leverages dynamically at query time. Because
+schema can change over the course of a Drill query, all Drill operators are
+designed to reconfigure themselves when schemas change.
+
+### **_Flexible data model_**
+
+Drill allows access to nested data attributes, just like SQL columns, and
+provides intuitive extensions to easily operate on them. From an architectural
+point of view, Drill provides a flexible hierarchical columnar data model that
+can represent complex, highly dynamic and evolving data models. Drill allows
+for efficient processing of these models without the need to flatten or
+materialize them at design time or at execution time. Relational data in Drill
+is treated as a special or simplified case of complex/multi-structured data.
+
+### **_De-centralized metadata_**
+
+Drill does not have a centralized metadata requirement. You do not need to
+create and manage tables and views in a metadata repository, or rely on a
+database administrator group for such a function. Drill metadata is derived
+from the storage plugins that correspond to data sources. Storage plugins
+provide a spectrum of metadata ranging from full metadata (Hive), partial
+metadata (HBase), or no central metadata (files). De-centralized metadata
+means that Drill is NOT tied to a single Hive repository. You can query
+multiple Hive repositories at once and then combine the data with information
+from HBase tables or with a file in a distributed file system. You can also
+use SQL DDL syntax to create metadata within Drill, which gets organized just
+like a traditional database. Drill metadata is accessible through the ANSI
+standard INFORMATION_SCHEMA database.
+
+### **_Extensibility_**
+
+Drill provides an extensible architecture at all layers, including the storage
+plugin, query, query optimization/execution, and client API layers. You can
+customize any layer for the specific needs of an organization or you can
+extend the layer to a broader array of use cases. Drill provides a built in
+classpath scanning and plugin concept to add additional storage plugins,
+functions, and operators with minimal configuration.
+
+## Process Overview
+
+Download the Apache Drill archive and extract the contents to a directory on
+your machine. The Apache Drill archive contains sample JSON and Parquet files
+that you can query immediately.
+
+Query the sample JSON and parquet files using SQLLine. SQLLine is a pure-Java
+console-based utility for connecting to relational databases and executing SQL
+commands. SQLLine is used as the shell for Drill. Drill follows the ANSI SQL:
+2011 standard with a few extensions for nested data formats.
+
+### Prerequisite
+
+You must have the following software installed on your machine to run Drill:
+
+<table ><tbody><tr><td ><strong>Software</strong></td><td 
><strong>Description</strong></td></tr><tr><td ><a 
href="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html";
 class="external-link" rel="nofollow">Oracle JDK version 7</a></td><td >A set 
of programming tools for developing Java applications.</td></tr></tbody></table>
+
+  
+### Prerequisite Validation
+
+Run the following command to verify that the system meets the software
+prerequisite:
+<table ><tbody><tr><td ><strong>Command </strong></td><td ><strong>Example 
Output</strong></td></tr><tr><td ><code>java –version</code></td><td 
><code>java version &quot;1.7.0_65&quot;</code><br /><code>Java(TM) SE Runtime 
Environment (build 1.7.0_65-b19)</code><br /><code>Java HotSpot(TM) 64-Bit 
Server VM (build 24.65-b04, mixed mode)</code></td></tr></tbody></table>
+  
+## Install Drill
+
+You can install Drill on a machine running Linux, Mac OS X, or Windows.  
+
+### Installing Drill on Linux
+
+Complete the following steps to install Drill:
+
+  1. Issue the following command to download the latest, stable version of 
Apache Drill to a directory on your machine:
+        
+        wget 
http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz
+  2. Issue the following command to create a new directory to which you can 
extract the contents of the Drill `tar.gz` file:
+  
+        sudo mkdir -p /opt/drill
+  3. Navigate to the directory where you downloaded the Drill `tar.gz` file.
+  4. Issue the following command to extract the contents of the Drill `tar.gz` 
file:
+  
+        sudo tar -xvzf apache-drill-<version>.tar.gz -C /opt/drill
+  5. Issue the following command to navigate to the Drill installation 
directory:
+  
+        cd /opt/drill/apache-drill-<version>
+
+At this point, you can [start 
Drill](/drill/docs/apache-drill-in-10-minutes#start-drill).
+
+### Installing Drill on Mac OS X
+
+Complete the following steps to install Drill:
+
+  1. Open a Terminal window, and create a `drill` directory inside your home 
directory (or in some other location if you prefer).
+  
+     **Example**
+
+        $ pwd
+        /Users/max
+        $ mkdir drill
+        $ cd drill
+        $ pwd
+        /Users/max/drill
+  2. Click the following link to download the latest, stable version of Apache 
Drill:  
+      
[http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz](http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz)
+  3. Open the downloaded `TAR` file with the Mac Archive utility or a similar 
tool for unzipping files.
+  4. Move the resulting `apache-drill-<version>` folder into the `drill` 
directory that you created.
+  5. Issue the following command to navigate to the `apache-drill-<version>` 
directory:
+  
+        cd /Users/max/drill/apache-drill-<version>
+
+At this point, you can [start 
Drill](/drill/docs/apache-drill-in-10-minutes/#start-drill).
+
+### Installing Drill on Windows
+
+You can install Drill on Windows 7 or 8. To install Drill on Windows, you must
+have JDK 7, and you must set the `JAVA_HOME` path in the Windows Environment
+Variables. You must also have a utility, such as
+[7-zip](http://www.7-zip.org/), installed on your machine. These instructions
+assume that the [7-zip](http://www.7-zip.org/) decompression utility is
+installed to extract a Drill archive file that you download.
+
+#### Setting JAVA_HOME
+
+Complete the following steps to set `JAVA_HOME`:
+
+  1. Navigate to `Control Panel\All Control Panel Items\System`, and select 
**Advanced System Settings**. The System Properties window appears.
+  2. On the Advanced tab, click **Environment Variables**. The Environment 
Variables window appears.
+  3. Add/Edit `JAVA_HOME` to point to the location where the JDK software is 
located.
+  
+       **Example**
+       
+        C:\Program Files\Java\jdk1.7.0_65
+  4. Click **OK** to exit the windows.
+
+#### Installing Drill
+
+Complete the following steps to install Drill:
+
+  1. Create a `drill` directory on your `C:\` drive, (or in some other 
location if you prefer).
+  
+       **Example**
+       
+         C:\drill
+     Do not include spaces in your directory path. If you include spaces in the
+directory path, Drill fails to run.
+  2. Click the following link to download the latest, stable version of Apache 
Drill: 
+      
[http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz](http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz)
+  3. Move the `apache-drill-<version>.tar.gz` file to the `drill` directory 
that you created on your `C:\` drive.
+  4. Unzip the `TAR.GZ` file and the resulting `TAR` file.
+     1. Right-click `apache-drill-<version>.tar.gz,` and select `7-Zip>Extract 
Here`. The utility extracts the `apache-drill-<version>.tar` file.
+     2. Right-click `apache-drill-<version>.tar`, and select ` 7-Zip>Extract 
Here`. The utility extracts the `apache-drill-<version> `folder.
+  5. Open the `apache-drill-<version>` folder.
+  6. Open the `bin` folder, and double-click on the `sqlline.bat` file. The 
Windows command prompt opens.
+  7. At the `sqlline>` prompt, type `!connect jdbc:drill:zk=local` and then 
press `Enter`.
+  8. Enter the username and password.
+     1. When prompted, enter the user name `admin` and then press Enter.
+     2. When prompted, enter the password `admin` and then press Enter. The 
cursor blinks for a few seconds and then `0: jdbc:drill:zk=local>` displays in 
the prompt.
+
+At this point, you can submit queries to Drill. Refer to the [Query Sample Dat
+a](/drill/docs/apache-drill-in-10-minutes#query-sample-data) section of this 
document.
+
+## Start Drill
+
+Launch SQLLine, the Drill shell, to start and run Drill in embedded mode.
+Launching SQLLine automatically starts a new Drillbit within the shell. In a
+production environment, Drillbits are the daemon processes that run on each
+node in a Drill cluster.
+
+Complete the following steps to launch SQLLine and start Drill:
+
+  1. Verify that you are in the Drill installation directory.  
+Example: `~/apache-drill-<version>`
+
+  2. Issue the following command to launch SQLLine:
+
+        bin/sqlline -u jdbc:drill:zk=local
+
+     `-u` is a JDBC connection string that directs SQLLine to connect to 
Drill. It
+also starts a local Drillbit. If you are connecting to an Apache Drill
+cluster, the value of `zk=` would be a list of Zookeeper quorum nodes. For
+more information about how to run Drill in clustered mode, go to [Deploying
+Apache Drill in a Clustered 
Environment](/drill/docs/deploying-apache-drill-in-a-clustered-environment).
+
+When SQLLine starts, the system displays the following prompt:  
+`0: jdbc:drill:zk=local>`
+
+Issue the following command when you want to exit SQLLine:
+
+    !quit
+
+
+## Query Sample Data
+
+Your Drill installation includes a `sample-date` directory with JSON and
+Parquet files that you can query. The local file system on your machine is
+configured as the `dfs` storage plugin instance by default when you install
+Drill in embedded mode. For more information about storage plugin
+configuration, refer to [Storage Plugin 
Registration](/drill/docs/connect-to-data-sources).
+
+Use SQL syntax to query the sample `JSON` and `Parquet` files in the `sample-
+data` directory on your local file system.
+
+### Querying a JSON File
+
+A sample JSON file, `employee.json`, contains fictitious employee data.
+
+To view the data in the `employee.json` file, submit the following SQL query
+to Drill:
+    
+    0: jdbc:drill:zk=local> SELECT * FROM cp.`employee.json`;
+
+The query returns the following results:
+
+**Example of partial output**
+
+    
+-------------+------------+------------+------------+-------------+-----------+
+    | employee_id | full_name  | first_name | last_name  | position_id | 
position_ |
+    
+-------------+------------+------------+------------+-------------+-----------+
+    | 1101        | Steve Eurich | Steve      | Eurich         | 16          | 
Store T |
+    | 1102        | Mary Pierson | Mary       | Pierson    | 16          | 
Store T |
+    | 1103        | Leo Jones  | Leo        | Jones      | 16          | Store 
Tem |
+    | 1104        | Nancy Beatty | Nancy      | Beatty     | 16          | 
Store T |
+    | 1105        | Clara McNight | Clara      | McNight    | 16          | 
Store  |
+    | 1106        | Marcella Isaacs | Marcella   | Isaacs     | 17          | 
Stor |
+    | 1107        | Charlotte Yonce | Charlotte  | Yonce      | 17          | 
Stor |
+    | 1108        | Benjamin Foster | Benjamin   | Foster     | 17          | 
Stor |
+    | 1109        | John Reed  | John       | Reed       | 17          | Store 
Per |
+    | 1110        | Lynn Kwiatkowski | Lynn       | Kwiatkowski | 17          
| St |
+    | 1111        | Donald Vann | Donald     | Vann       | 17          | 
Store Pe |
+    | 1112        | William Smith | William    | Smith      | 17          | 
Store  |
+    | 1113        | Amy Hensley | Amy        | Hensley    | 17          | 
Store Pe |
+    | 1114        | Judy Owens | Judy       | Owens      | 17          | Store 
Per |
+    | 1115        | Frederick Castillo | Frederick  | Castillo   | 17          
| S |
+    | 1116        | Phil Munoz | Phil       | Munoz      | 17          | Store 
Per |
+    | 1117        | Lori Lightfoot | Lori       | Lightfoot  | 17          | 
Store |
+    
+-------------+------------+------------+------------+-------------+-----------+
+    1,155 rows selected (0.762 seconds)
+    0: jdbc:drill:zk=local>
+
+### Querying a Parquet File
+
+Query the `region.parquet` and `nation.parquet` files in the `sample-data`
+directory on your local file system.
+
+#### Region File
+
+If you followed the Apache Drill in 10 Minutes instructions to install Drill
+in embedded mode, the path to the parquet file varies between operating
+systems.
+
+**Note:** When you enter the query, include the version of Drill that you are 
currently running. 
+
+To view the data in the `region.parquet` file, issue the query appropriate for
+your operating system:
+
+* Linux  
+
+        SELECT * FROM 
dfs.`/opt/drill/apache-drill-<version>/sample-data/region.parquet`;
+* Mac OS X
+  
+        SELECT * FROM 
dfs.`/Users/max/drill/apache-drill-<version>/sample-data/region.parquet`;
+* Windows  
+        
+        SELECT * FROM 
dfs.`C:\drill\apache-drill-<version>\sample-data\region.parquet`;
+
+The query returns the following results:
+
+    +------------+------------+
+    |   EXPR$0   |   EXPR$1   |
+    +------------+------------+
+    | AFRICA     | lar deposits. blithely final packages cajole. regular 
waters ar |
+    | AMERICA    | hs use ironic, even requests. s |
+    | ASIA       | ges. thinly even pinto beans ca |
+    | EUROPE     | ly final courts cajole furiously final excuse |
+    | MIDDLE EAST | uickly special accounts cajole carefully blithely close 
reques |
+    +------------+------------+
+    5 rows selected (0.165 seconds)
+    0: jdbc:drill:zk=local>
+
+#### Nation File
+
+If you followed the Apache Drill in 10 Minutes instructions to install Drill
+in embedded mode, the path to the parquet file varies between operating
+systems.
+
+**Note:** When you enter the query, include the version of Drill that you are 
currently running. 
+
+To view the data in the `nation.parquet` file, issue the query appropriate for
+your operating system:
+
+* Linux  
+
+          SELECT * FROM 
dfs.`/opt/drill/apache-drill-<version>/sample-data/nation.parquet`;
+* Mac OS X
+  
+          SELECT * FROM 
dfs.`/Users/max/drill/apache-drill-<version>/sample-data/nation.parquet`;
+
+* Windows 
+ 
+          SELECT * FROM 
dfs.`C:\drill\apache-drill-<version>\sample-data\nation.parquet`;
+
+The query returns the following results:
+
+## Summary
+
+Now you know a bit about Apache Drill. To summarize, you have completed the
+following tasks:
+
+  * Learned that Apache Drill supports nested data, schema-less execution, and 
decentralized metadata.
+  * Downloaded and installed Apache Drill.
+  * Invoked SQLLine with Drill in embedded mode.
+  * Queried the sample JSON file, `employee.json`, to view its data.
+  * Queried the sample `region.parquet` file to view its data.
+  * Queried the sample `nation.parquet` file to view its data.
+
+## Next Steps
+
+Now that you have an idea about what Drill can do, you might want to:
+
+  * [Deploy Drill in a clustered 
environment.](/drill/docs/deploying-apache-drill-in-a-clustered-environment)
+  * [Configure storage plugins to connect Drill to your data 
sources](/drill/docs/connect-to-data-sources).
+  * Query [Hive](/drill/docs/querying-hive) and 
[HBase](/drill/docs/registering-hbase) data.
+  * [Query Complex Data](/drill/docs/querying-complex-data)
+  * [Query Plain Text Files](/drill/docs/querying-plain-text-files)
+
+## More Information
+
+For more information about Apache Drill, explore the  [Apache Drill
+web site](http://drill.apache.org).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/install/002-deploy.md
----------------------------------------------------------------------
diff --git a/_docs/install/002-deploy.md b/_docs/install/002-deploy.md
new file mode 100644
index 0000000..eecd3bc
--- /dev/null
+++ b/_docs/install/002-deploy.md
@@ -0,0 +1,89 @@
+---
+title: "Deploying Apache Drill in a Clustered Environment"
+parent: "Install Drill"
+---
+## Overview
+
+To run Drill in a clustered environment, complete the following steps:
+
+  1. Install Drill on each designated node in the cluster.
+  2. Configure a cluster ID and add Zookeeper information.
+  3. Connect Drill to your data sources. 
+  4. Start Drill.
+
+### Prerequisites
+
+Before you install Apache Drill on nodes in your cluster, you must have the
+following software and services installed:
+
+  * [Oracle JDK version 
7](http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html)
+  * Configured and running ZooKeeper quorum
+  * Configured and running Hadoop cluster (Recommended)
+  * DNS (Recommended)
+
+### Installing Drill
+
+Complete the following steps to install Drill on designated nodes:
+
+  1. Download the Drill tarball.
+  
+        curl 
http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz
+  2. Issue the following command to create a Drill installation directory and 
then explode the tarball to the directory:
+  
+        mkdir /opt/drill
+        tar xzf apache-drill-<version>.tar.gz --strip=1 -C /opt/drill
+  3. If you are using external JAR files, edit `drill-env.sh, `located in 
`/opt/drill/conf/`, and define `HADOOP_HOME:`
+  
+        export HADOOP_HOME="~/hadoop/hadoop-0.20.2/"
+  4. In `drill-override.conf,`create a unique Drill `cluster ID`, and provide 
Zookeeper host names and port numbers to configure a connection to your 
Zookeeper quorum.
+     1. Edit `drill-override.conf `located in `~/drill/drill-<version>/conf/`.
+     2. Provide a unique `cluster-id` and the Zookeeper host names and port 
numbers in `zk.connect`. If you install Drill on multiple nodes, assign the 
same `cluster ID` to each Drill node so that all Drill nodes share the same ID. 
The default Zookeeper port is 2181.
+
+**Example**
+
+    drill.exec: {
+      cluster-id: "<mydrillcluster>",
+      zk.connect: 
"<zkhostname1>:<port>,<zkhostname2>:<port>,<zkhostname3>:<port>",
+      debug.error_on_leak: false,
+      buffer.size: 6,
+      functions: ["org.apache.drill.expr.fn.impl", "org.apache.drill.udfs"]
+    }
+
+### Connecting Drill to Data Sources
+
+You can connect Drill to various types of data sources. Refer to [Connect
+Apache Drill to Data Sources](/drill/docs/connect-to-data-sources) to get 
configuration instructions for the
+particular type of data source that you want to connect to Drill.
+
+### Starting Drill
+
+Complete the following steps to start Drill:
+
+  1. Navigate to the Drill installation directory, and issue the following 
command to start a Drillbit:
+  
+        bin/drillbit.sh restart
+  2. Issue the following command to invoke SQLLine and start Drill:
+  
+        bin/sqlline -u jdbc:drill:
+     When connected, the Drill prompt appears.  
+     Example: `0: jdbc:drill:zk=<zk1host>:<port>`
+     
+     If you cannot connect to Drill, invoke SQLLine with the ZooKeeper quorum:
+
+         bin/sqlline -u 
jdbc:drill:zk=<zk1host>:<port>,<zk2host>:<port>,<zk3host>:<port>
+  3. Issue the following query to Drill to verify that all Drillbits have 
joined the cluster:
+  
+        0: jdbc:drill:zk=<zk1host>:<port> select * from sys.drillbits;
+
+Drill provides a list of Drillbits that have joined.
+
+    +------------+------------+--------------+--------------------+
+    |    host        | user_port    | control_port | data_port    |
+    +------------+------------+--------------+--------------------+
+    | <host address> | <port number>| <port number>| <port number>|
+    +------------+------------+--------------+--------------------+
+
+**Example**
+
+Now you can query data with Drill. The Drill installation includes sample data
+that you can query. Refer to [Query Sample Data](/drill/docs/sample-datasets).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/install/003-install-embedded.md
----------------------------------------------------------------------
diff --git a/_docs/install/003-install-embedded.md 
b/_docs/install/003-install-embedded.md
new file mode 100644
index 0000000..645755a
--- /dev/null
+++ b/_docs/install/003-install-embedded.md
@@ -0,0 +1,23 @@
+---
+title: "Installing Drill in Embedded Mode"
+parent: "Install Drill"
+---
+Installing Drill in embedded mode installs Drill locally on your machine.
+Embedded mode is a quick, easy way to install and try Drill without having to
+perform any configuration tasks. When you install Drill in embedded mode, the
+Drillbit service is installed locally and starts automatically when you invoke
+SQLLine, the Drill shell. You can install Drill in embedded mode on a machine
+running Linux, Mac OS X, or Windows.
+
+**Prerequisite:**
+
+You must have the following software installed on your machine to run Drill:
+
+<table ><tbody><tr><td ><strong>Software</strong></td><td 
><strong>Description</strong></td></tr><tr><td ><a class="external-link" 
href="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html";
 rel="nofollow">Oracle JDK version 7</a></td><td >A set of programming tools 
for developing Java applications.</td></tr></tbody></table>
+
+You can run the following command to verify that the system meets the software
+prerequisite:
+
+<table ><tbody><tr><td ><strong>Command</strong></td><td ><strong>Example 
Output</strong></td></tr><tr><td ><code>java –version</code></td><td 
><code>java version &quot;1.7.0_65&quot;</code><br /><code>Java(TM) SE Runtime 
Environment (build 1.7.0_65-b19)</code><br /><code>Java HotSpot(TM) 64-Bit 
Server VM (build 24.65-b04, mixed mode)</code></td></tr></tbody></table>
+
+Follow installation instructions in this documentation for your particular 
operating system.

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/install/004-install-distributed.md
----------------------------------------------------------------------
diff --git a/_docs/install/004-install-distributed.md 
b/_docs/install/004-install-distributed.md
new file mode 100644
index 0000000..d0f07aa
--- /dev/null
+++ b/_docs/install/004-install-distributed.md
@@ -0,0 +1,55 @@
+---
+title: "Installing Drill in Distributed Mode"
+parent: "Install Drill"
+---
+You can install Apache Drill in distributed mode on one or multiple nodes to
+run it in a clustered environment.
+
+To install Apache Drill in distributed mode, complete the following steps:
+
+  1. Install Drill on each designated node in the cluster.
+  2. Configure a cluster ID and add Zookeeper information.
+  3. Connect Drill to your data sources. 
+  4. Start Drill.
+
+**Prerequisites**
+
+Before you install Apache Drill on nodes in your cluster, you must have the
+following software and services installed:
+
+  * [Oracle JDK version 
7](http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html)
+  * Configured and running ZooKeeper quorum
+  * Configured and running Hadoop cluster (Recommended)
+  * DNS (Recommended)
+
+## Installing Drill
+
+Complete the following steps to install Drill on designated nodes:
+
+  1. Download the Drill tarball.
+  
+        curl 
http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz
+  2. Issue the following command to create a Drill installation directory and 
then explode the tarball to the directory:
+  
+        mkdir /opt/drill
+        tar xzf apache-drill-<version>.tar.gz --strip=1 -C /opt/drill
+  3. If you are using external JAR files, edit `drill-env.sh, `located in 
`/opt/drill/conf/`, and define `HADOOP_HOME:`
+  
+        export HADOOP_HOME="~/hadoop/hadoop-0.20.2/"
+  4. In `drill-override.conf,` create a unique Drill `cluster ID`, and provide 
Zookeeper host names and port numbers to configure a connection to your 
Zookeeper quorum.
+     1. Edit `drill-override.conf `located in `~/drill/drill-<version>/conf/`.
+     2. Provide a unique `cluster-id` and the Zookeeper host names and port 
numbers in `zk.connect`. If you install Drill on multiple nodes, assign the 
same `cluster ID` to each Drill node so that all Drill nodes share the same ID. 
The default Zookeeper port is 2181.
+
+       **Example**
+       
+         drill.exec:{
+          cluster-id: "<mydrillcluster>",
+          zk.connect: 
"<zkhostname1>:<port>,<zkhostname2>:<port>,<zkhostname3>:<port>",
+          debug.error_on_leak: false,
+          buffer.size: 6,
+         functions: ["org.apache.drill.expr.fn.impl", "org.apache.drill.udfs"]
+         }
+
+You can connect Drill to various types of data sources. Refer to [Connect
+Apache Drill to Data Sources](/drill/docs/connect-to-data-sources) to get 
configuration instructions for the
+particular type of data source that you want to connect to Drill.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/install/install-embedded/001-install-linux.md
----------------------------------------------------------------------
diff --git a/_docs/install/install-embedded/001-install-linux.md 
b/_docs/install/install-embedded/001-install-linux.md
new file mode 100644
index 0000000..b7a0c85
--- /dev/null
+++ b/_docs/install/install-embedded/001-install-linux.md
@@ -0,0 +1,22 @@
+---
+title: "Installing Drill on Linux"
+parent: "Installing Drill in Embedded Mode"
+---
+Complete the following steps to install Apache Drill on a machine running
+Linux:
+
+  1. Issue the following command to download the latest, stable version of 
Apache Drill to a directory on your machine:
+    
+        wget 
http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz
+  2. Issue the following command to create a new directory to which you can 
extract the contents of the Drill `tar.gz` file:
+  
+        sudo mkdir -p /opt/drill
+  3. Navigate to the directory where you downloaded the Drill `tar.gz` file.
+  4. Issue the following command to extract the contents of the Drill `tar.gz` 
file to the directory you created:
+  
+        sudo tar -xvzf apache-drill-<version>.tar.gz -C /opt/drill
+  5. Issue the following command to navigate to the Drill installation 
directory:
+
+        cd /opt/drill/apache-drill-<version>
+At this point, you can [invoke
+SQLLine](/drill/docs/starting-stopping-drill) to run Drill.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/install/install-embedded/002-install-mac.md
----------------------------------------------------------------------
diff --git a/_docs/install/install-embedded/002-install-mac.md 
b/_docs/install/install-embedded/002-install-mac.md
new file mode 100644
index 0000000..a288b94
--- /dev/null
+++ b/_docs/install/install-embedded/002-install-mac.md
@@ -0,0 +1,29 @@
+---
+title: "Installing Drill on Mac OS X"
+parent: "Installing Drill in Embedded Mode"
+---
+Complete the following steps to install Apache Drill on a machine running Mac
+OS X:
+
+  1. Open a Terminal window, and create a `drill` directory inside your home 
directory (or in some other location if you prefer).
+
+     **Example**
+
+        $ pwd
+        /Users/max
+        $ mkdir drill
+        $ cd drill
+        $ pwd
+        /Users/max/drill
+  2. Click the following link to download the latest, stable version of Apache 
Drill:  
+     
[http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz](http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz)
+  3. Open the downloaded `TAR` file with the Mac Archive utility or a similar 
tool for unzipping files.
+  4. Move the resulting `apache-drill-<version>` folder into the `drill` 
directory that you created.
+  5. Issue the following command to navigate to the `apache-drill-<version>` 
directory:
+  
+        cd /Users/max/drill/apache-drill-<version>
+
+At this point, you can [invoke SQLLine](/drill/docs/starting-stopping-drill) to
+run Drill.
+
+<!--The title is too complicated for me to figure out how to create a link to 
it.-->
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/install/install-embedded/003-install-win.md
----------------------------------------------------------------------
diff --git a/_docs/install/install-embedded/003-install-win.md 
b/_docs/install/install-embedded/003-install-win.md
new file mode 100644
index 0000000..6680019
--- /dev/null
+++ b/_docs/install/install-embedded/003-install-win.md
@@ -0,0 +1,51 @@
+---
+title: "Installing Drill on Windows"
+parent: "Installing Drill in Embedded Mode"
+---
+You can install Drill on Windows 7 or 8. To install Drill on Windows, you must
+have JDK 7, and you must set the `JAVA_HOME` path in the Windows Environment
+Variables. You must also have a utility, such as
+[7-zip](http://www.7-zip.org/), installed on your machine. These instructions
+assume that the [7-zip](http://www.7-zip.org/) decompression utility is
+installed to extract the Drill archive file that you download.
+
+#### Setting JAVA_HOME
+
+Complete the following steps to set `JAVA_HOME`:
+
+  1. Navigate to `Control Panel\All Control Panel Items\System`, and select 
**Advanced System Settings**. The System Properties window appears.
+  2. On the Advanced tab, click **Environment Variables**. The Environment 
Variables window appears.
+  3. Add/Edit `JAVA_HOME` to point to the location where the JDK software is 
located.
+
+     **Example**
+     
+        C:\Program Files\Java\jdk1.7.0_65
+  4. Click **OK** to exit the windows.
+
+#### Installing Drill
+
+Complete the following steps to install Drill:
+
+  1. Create a `drill` directory on your `C:\` drive, (or in some other 
location if you prefer).
+
+     **Example**
+     
+        C:\Drill
+     Do not include spaces in your directory path. If you include spaces in the
+directory path, Drill fails to run.
+  2. Click the following link to download the latest, stable version of Apache 
Drill:
+  
+     
[http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz](http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0/apache-drill-0.7.0.tar.gz)
+  3. Move the `apache-drill-<version>.tar.gz` file to the `drill` directory 
that you created on your `C:\` drive.
+  4. Unzip the `TAR.GZ` file and the resulting `TAR` file.  
+     1. Right-click `apache-drill-<version>.tar.gz,` and select `7-Zip>Extract 
Here`. The utility extracts the `apache-drill-<version>.tar` file.  
+     2. Right-click `apache-drill-<version>.tar,` and select `7-Zip>Extract 
Here`. The utility extracts the `apache-drill-<version>` folder.
+  5. Open the `apache-drill-<version>` folder.
+  6. Open the `bin` folder, and double-click on the `sqlline.bat` file. The 
Windows command prompt opens.
+  7. At the `sqlline>` prompt, type `!connect jdbc:drill:zk=local` and then 
press `Enter`.
+  8. Enter the username and password. 
+     1. When prompted, enter the user name `admin` and then press Enter. 
+     2. When prompted, enter the password `admin` and then press Enter. The 
cursor blinks for a few seconds and then `0: jdbc:drill:zk=local>` displays in 
the prompt.
+
+At this point, you can submit queries to Drill. Refer to the [Query Sample Dat
+a](/drill/docs/apache-drill-in-10-minutes#query-sampledata) section of this 
document.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/interfaces/001-odbc-win.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/001-odbc-win.md b/_docs/interfaces/001-odbc-win.md
new file mode 100644
index 0000000..2f08af2
--- /dev/null
+++ b/_docs/interfaces/001-odbc-win.md
@@ -0,0 +1,37 @@
+---
+title: "Using the MapR ODBC Driver on Windows"
+parent: "ODBC/JDBC Interfaces"
+---
+The MapR Drill ODBC driver provides BI tools access to Drill’s flexible query
+capabilities so that users can quickly explore various data sources. The MapR
+Drill ODBC driver includes Drill Explorer, which is a simple user interface
+that enables users to examine the content of data sources and create views
+before visualizing the data in a BI tool.
+
+Once you install the MapR Drill ODBC Driver, you can create ODBC DSNs to Drill
+data sources using the ODBC Administrator tool and then use the DSNs to access
+the data from BI tools that work with ODBC. Drill can connect to data with
+well-defined schemas, such as Hive. Drill can also connect directly to data
+that is self-describing, such as HBase, Parquet, JSON, CSV, and TSV.
+
+Complete the following steps to connect to a Drill data source from a BI tool
+using ODBC:
+
+  * [Step 1. Install the MapR Drill ODBC 
Driver](/drill/docs/step-1-install-the-mapr-drill-odbc-driver-on-windows)
+  * [Step 2. Configure ODBC Connections to Drill Data 
Sources](/drill/docs/step-2-configure-odbc-connections-to-drill-data-sources)
+  * [Step 3. Connect to Drill Data Sources from a BI 
Tool](/drill/docs/step-3-connect-to-drill-data-sources-from-a-bi-tool)
+
+For examples of how you can use the MapR Drill ODBC Driver to connect to Drill
+Data Sources from BI tools, see [Step 3. Connect to Drill Data Sources from a
+BI Tool](/drill/docs/step-3-connect-to-drill-data-sources-from-a-bi-tool). 
While the documentation includes examples for Tableau, you can use
+this driver with any BI tool that works with ODBC, such as Excel,
+MicroStrategy, and Toad.
+
+The following figure shows how a BI tool on Windows uses an ODBC connection to
+access data from a Hive table:
+
+![BI to Drill Interface]({{ site.baseurl }}/docs/img/BI_to_Drill_2.png)
+
+The following components provide applications access to Drill data sources:
+
+<table ><tbody><tr><th >Component</th><th >Role</th></tr><tr><td 
valign="top">Drillbit</td><td valign="top">Accepts queries from clients, 
executes queries against Drill data sources, and returns the query results. 
</td></tr><tr><td valign="top">ODBC Data Source Administrator</td><td 
valign="top">The ODBC Data Source Administrator enables the creation of DSNs to 
Apache Drill data sources.<br /> In the figure above, the ODBC Data Source 
Administrator was used to create 
<code>Hive-DrillDataSources</code>.</td></tr><tr><td valign="top">ODBC 
DSN</td><td valign="top"><p>Provides applications information about how to 
connect to the Drill Source.</p>In the figure above, the 
<code>Hive-DrillDataSources</code> is a DSN that provides connection 
information to the Hive tables.</td></tr><tr><td colspan="1" valign="top">BI 
Tool</td><td colspan="1" valign="top"><p>Accesses Drill data sources using the 
connection information from the ODBC DSN.</p>In the figure above, the BI tool 
uses <code>Hive-Dri
 llDataSources</code> to access the <code>hive_student</code> 
table.</td></tr></tbody></table></div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/interfaces/002-odbc-linux.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/002-odbc-linux.md 
b/_docs/interfaces/002-odbc-linux.md
new file mode 100644
index 0000000..0ed1070
--- /dev/null
+++ b/_docs/interfaces/002-odbc-linux.md
@@ -0,0 +1,13 @@
+---
+title: "Using the MapR ODBC Driver on Linux and Mac OS X"
+parent: "ODBC/JDBC Interfaces"
+---
+The MapR Drill ODBC driver provides BI tools access to Drill’s flexible query
+capabilities so you can quickly explore various data sources. Once you install
+the MapR Drill ODBC Driver, you can configure ODBC connections to access Drill
+from BI tools through the connections. Drill can connect to data with well-
+defined schemas, such as Hive. Drill can also connect directly to data that is
+self-describing, such as HBase, Parquet, JSON, CSV, and TSV.
+
+
+

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/interfaces/003-jdbc-squirrel.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/003-jdbc-squirrel.md 
b/_docs/interfaces/003-jdbc-squirrel.md
new file mode 100644
index 0000000..99eba80
--- /dev/null
+++ b/_docs/interfaces/003-jdbc-squirrel.md
@@ -0,0 +1,151 @@
+---
+title: "Using the JDBC Driver"
+parent: "ODBC/JDBC Interfaces"
+---
+To use the JDBC Driver to access Drill through Squirrel, ensure that you meet 
the prerequisites and follow the steps in this section.
+### Prerequisites
+
+  * SQuirreL requires JRE 7
+  * Drill installed in distributed mode on one or multiple nodes in a cluster. 
Refer to the [Install Drill](/drill/docs/install-drill/) documentation for more 
information.
+  * The client must be able to resolve the actual hostname of the Drill 
node(s) with the IP(s). Verify that a DNS entry was created on the client 
machine for the Drill node(s).
+     
+If a DNS entry does not exist, create the entry for the Drill node(s).
+
+    * For Windows, create the entry in the %WINDIR%\system32\drivers\etc\hosts 
file.
+    * For Linux and Mac, create the entry in /etc/hosts.  
+<drill-machine-IP> <drill-machine-hostname>
+    Example: `127.0.1.1 maprdemo`
+
+### Step 1: Getting the Drill JDBC Driver
+
+The Drill JDBC Driver `JAR` file must exist in a directory on your Windows
+machine in order to configure the driver in the SQuirreL client.
+
+You can copy the Drill JDBC `JAR` file from the following Drill installation
+directory on the node with Drill installed, to a directory on your Windows
+machine:
+
+    
<drill_installation_directory>/jars/jdbc-driver/drill-jdbc-all-0.7.0-SNAPSHOT.jar
+
+Or, you can download the [apache-
+drill-0.7.0.tar.gz](http://www.apache.org/dyn/closer.cgi/drill/drill-0.7.0
+/apache-drill-0.7.0.tar.gz) file to a location on your Windows machine, and
+extract the contents of the file. You may need to use a decompression utility,
+such as [7-zip](http://www.7-zip.org/) to extract the archive. Once extracted,
+you can locate the driver in the following directory:
+
+    
<windows_directory>\apache-drill-<version>\jars\jdbc-driver\drill-jdbc-all-0.7.0-SNAPSHOT.jar
+
+### Step 2: Installing and Starting SQuirreL
+
+To install and start SQuirreL, complete the following steps:
+
+  1. Download the SQuirreL JAR file for Windows from the following location:  
+<http://www.squirrelsql.org/#installation>
+  2. Double-click the SQuirreL `JAR` file. The SQuirreL installation wizard 
walks you through the installation process.
+  3. When installation completes, navigate to the SQuirreL installation folder 
and then double-click `squirrel-sql.bat` to start SQuirreL.
+
+### Step 3: Adding the Drill JDBC Driver to SQuirreL
+
+To add the Drill JDBC Driver to SQuirreL, define the driver and create a
+database alias. The alias is a specific instance of the driver configuration.
+SQuirreL uses the driver definition and alias to connect to Drill so you can
+access data sources that you have registered with Drill.
+
+#### A. Define the Driver
+
+To define the Drill JDBC Driver, complete the following steps:
+
+1. In the SQuirreL toolbar, select **Drivers > New Driver**. The Add Driver 
dialog box appears.
+  
+    ![drill query flow]({{ site.baseurl }}/docs/img/40.png)
+
+2. Enter the following information:
+
+    <table style='table-layout:fixed;width:100%'><tbody><tr><td valign="top" 
width="13%"><strong>Option</strong></td><td valign="top" style='width: 
460px;'><strong>Description</strong></td></tr><tr><td valign="top">Name</td><td 
valign="top">Name for the Drill JDBC Driver</td></tr><tr><td 
valign="top">Example URL</td><td 
valign="top"><code>jdbc:drill:zk=&lt;<em>zookeeper_quorum</em>&gt;[;schema=&lt;<em>schema_to_use_as_default</em>&gt;]</code><strong>Example:</strong><code>
 jdbc:drill:zk=maprdemo:5181</code><strong>Note:</strong> The default ZooKeeper 
port is 2181. In a MapR cluster, the ZooKeeper port is 5181.</td></tr><tr><td 
valign="top">Website URL</td><td 
valign="top"><code>jdbc:drill:zk=&lt;<em>zookeeper_quorum</em>&gt;[;schema=&lt;<em>schema_to_use_as_default</em>&gt;]</code><strong>Example:</strong><code><code>
 jdbc:drill:zk=maprdemo:5181</code></code><strong>Note:</strong><span> The 
default ZooKeeper port is 2181. In a MapR cluster, the ZooKeeper port is 
5181.</span></td></t
 r><tr><td valign="top">Extra Class Path</td><td valign="top">Click 
<strong>Add</strong> and navigate to the JDBC <code>JAR</code> file location in 
the Windows directory:<br 
/><code>&lt;windows_directory&gt;/jars/jdbc-driver/<span style="color: 
rgb(34,34,34);">drill-jdbc-all-0.6.0-</span><span style="color: 
rgb(34,34,34);">incubating.jar</span></code>Select the <code>JAR</code> file, 
click <strong>Open</strong>, and then click <strong>List 
Drivers</strong>.</td></tr><tr><td valign="top">Class Name</td><td 
valign="top">Select <code>org.apache.drill.jdbc.Driver</code> from the 
drop-down menu.</td></tr></tbody></table>  
+  
+3. Click **OK**. The SQuirreL client displays a message stating that the 
driver registration is successful, and you can see the driver in the Drivers 
panel.  
+
+   ![drill query flow]({{ site.baseurl }}/docs/img/52.png)
+
+#### B. Create an Alias
+
+To create an alias, complete the following steps:
+
+1. Select the **Aliases** tab.
+2. In the SQuirreL toolbar, select **Aliases >****New Alias**. The Add Alias 
dialog box appears.
+    
+    ![drill query flow]({{ site.baseurl }}/docs/img/19.png)
+    
+3. Enter the following information:
+  
+     <table style='table-layout:fixed;width:100%'><tbody><tr>
+     <td valign="top" width="10%"><strong>Option</strong></td>
+     <td valign="top" style='width: 500px;'><strong>Description</strong></td>
+     </tr>
+     <tr>
+     <td valign="top">Alias Name</td>
+     <td valign="top">A unique name for the Drill JDBC Driver alias.</td>
+     </tr>
+     <tr>
+     <td valign="top">Driver</td>
+     <td valign="top">Select the Drill JDBC Driver.</td>
+     </tr>
+     <tr>
+     <td valign="top">URL</td>
+     <td valign="top">Enter the connection URL with the name of the Drill 
directory stored in ZooKeeper and the cluster ID:
+       
<code>jdbc:drill:zk=&lt;<em>zookeeper_quorum</em>&gt;/&lt;drill_directory_in_zookeeper&gt;/&lt;cluster_ID&gt;;schema=&lt;<em>schema_to_use_as_default</em>&gt;</code>
+       <em>The following examples show URLs for Drill installed on a single 
node:</em><br />
+       <span style="font-family: monospace;font-size: 14.0px;line-height: 
1.4285715;background-color: 
transparent;">jdbc:drill:zk=10.10.100.56:5181/drill/demo_mapr_com-drillbits;schema=hive<br
 /></span>
+       <span style="font-family: monospace;font-size: 14.0px;line-height: 
1.4285715;background-color: 
transparent;">jdbc:drill:zk=10.10.100.24:2181/drill/drillbits1;schema=hive<br 
/> </span>
+       <em>The following example shows a URL for Drill installed in 
distributed mode with a connection to a ZooKeeper quorum:</em>
+       <span style="font-family: monospace;font-size: 14.0px;line-height: 
1.4285715;background-color: 
transparent;">jdbc:drill:zk=10.10.100.30:5181,10.10.100.31:5181,10.10.100.32:5181/drill/drillbits1;schema=hive</span>
+          <ul>
+          <li>Including a default schema is optional.</li>
+          <li>The ZooKeeper port is 2181. In a MapR cluster, the ZooKeeper 
port is 5181.</li>
+          <li>The Drill directory stored in ZooKeeper is 
<code>/drill</code>.</li>
+          <li>The Drill default cluster ID is<code> drillbits1</code>.</li>
+          </ul>
+     </td></tr><tr>
+     <td valign="top">User Name</td>
+     <td valign="top">admin</td>
+     </tr>
+     <tr>
+     <td valign="top">Password</td>
+     <td valign="top">admin</td>
+     </tr></tbody></table>
+4. Click **Ok**. The Connect to: dialog box appears.  
+
+    ![drill query flow]({{ site.baseurl }}/docs/img/30.png)
+   
+5. Click **Connect**. SQuirreL displays a message stating that the connection 
is successful.
+  
+    ![drill query flow]({{ site.baseurl }}/docs/img/53.png)
+     
+6. Click **OK**. SQuirreL displays a series of tabs.
+
+### Step 4: Running a Drill Query from SQuirreL
+
+Once you have SQuirreL successfully connected to your cluster through the
+Drill JDBC Driver, you can issue queries from the SQuirreL client. You can run
+a test query on some sample data included in the Drill installation to try out
+SQuirreL with Drill.
+
+To query sample data with Squirrel, complete the following steps:
+
+1. Click the SQL tab.
+2. Enter the following query in the query box:   
+   
+        SELECT * FROM cp.`employee.json`;
+          
+     Example:  
+     ![drill query flow]({{ site.baseurl }}/docs/img/11.png)
+
+3. Press **Ctrl+Enter** to run the query. The following query results display: 
+  
+     ![drill query flow]({{ site.baseurl }}/docs/img/42.png) 
+
+You have successfully run a Drill query from the SQuirreL client.
+
+
+

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/interfaces/odbc-linux/001-install-odbc-linux.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/odbc-linux/001-install-odbc-linux.md 
b/_docs/interfaces/odbc-linux/001-install-odbc-linux.md
new file mode 100644
index 0000000..3ae1930
--- /dev/null
+++ b/_docs/interfaces/odbc-linux/001-install-odbc-linux.md
@@ -0,0 +1,105 @@
+---
+title: "Installing the MapR Drill ODBC Driver on Linux"
+parent: "Using the MapR ODBC Driver on Linux and Mac OS X"
+---
+Install the MapR Drill ODBC Driver on the machine from which you connect to
+the Drill service. You can install the 32- or 64-bit driver on Linux. Install
+the version of the driver that matches the architecture of the client
+application that you use to access Drill. The 64-bit editions of Linux support
+32- and 64-bit applications.
+
+To install the MapR Drill ODBC Driver, complete the following steps:
+
+  * Step 1: Downloading the MapR Drill ODBC Driver 
+  * Step 2: Installing the MapR Drill ODBC Driver
+  * Step 3: Setting the LD_LIBRARY_PATH Environment Variable
+
+After you complete the installation steps, complete the steps listed in
+[Configuring ODBC Connections for Linux and Mac OS 
X](/drill/docs/configuring-odbc-connections-for-linux-and-mac-os-x).
+
+Verify that your system meets the system requirements before you start.
+
+**System Requirements**
+
+  * One of the following distributions (32- and 64-bit editions are supported):
+    * Red Hat® Enterprise Linux® (RHEL) 5.0/6.0
+    * CentOS 5.0/6.0
+    * SUSE Linux Enterprise Server (SLES) 11
+  * 90 MB of available disk space.
+  * An installed ODBC driver manager:
+    * iODBC 3.52.7 or above  
+      OR 
+    * unixODBC 2.2.12 or above
+  * The client must be able to resolve the actual hostname of the Drill 
node(s) with the IP(s). Verify that a DNS entry was created on the client 
machine for the Drill node(s).   
+If not, create the following entry in `/etc/hosts` for the Drill node(s):  
+
+    `<drill-machine-IP> <drill-machine-hostname>`  
+    Example: `127.0.1.1 apachedemo`
+
+To install the driver, you need Administrator privileges on the computer.
+
+## Step 1: Downloading the MapR Drill ODBC Driver
+
+Click on a link below to download the driver:
+
+  * 
[MapRDrillODBC-32bit-0.07.0.i686.rpm](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC-32bit-0.07.0.i686.rpm)
 (32-bit)
+  * 
[MapRDrillODBC-0.07.0.x86_64.rpm](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC-0.07.0.x86_64.rpm)
 (64-bit)
+
+## Step 2: Installing the MapR Drill ODBC Driver
+
+To install the driver, complete the following steps:
+
+  1. Login as the root user.
+  2. Navigate to the folder 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: 
+
+     **RedHat/CentOS**
+     
+     `yum localinstall --nogpgcheck RPMFileName`
+
+     **SUSE**
+     
+     `zypper install RPMFileName`
+
+**Note:** The MapR Drill ODBC Driver depends on the following resources:
+
+  * `cyrus-sasl-2.1.22-7` or above
+  * `cyrus-sasl-gssapi-2.1.22-7` or above
+  * `cyrus-sasl-plain-2.1.22-7` or above
+
+If the package manager in your Linux distribution cannot resolve the
+dependencies automatically when installing the driver, download and manually
+install the packages.
+
+The following table provides a list of the MapR Drill ODBC Driver file
+locations and descriptions:
+
+File| Description  
+---|---  
+`/opt/mapr/drillodbc/ErrorMessages `| Error messages files directory.  
+`/opt/mapr/drillodbc/Setup`| Sample configuration files directory.  
+`/opt/mapr/drillodbc/lib/32 `| 32-bit shared libraries directory.  
+`/opt/mapr/drillodbc/lib/64`| 64-bit shared libraries directory.  
+  
+## Step 3: Setting the LD_LIBRARY_PATH Environment Variable
+
+The `LD_LIBRARY_PATH` environment variable must include the paths to the
+following:
+
+  * Installed ODBC driver manager libraries
+  * Installed MapR ODBC Driver for Apache Drill shared libraries
+
+**Important:** You can have both 32- and 64-bit versions of the driver 
installed at the same time on the same computer, however do not include the 
paths to both 32- and 64-bit shared libraries in `LD_LIBRARY PATH` at the same 
time. Only include the path to the shared libraries corresponding to the driver 
matching the bitness of the client application used.
+
+For example, if you are using a 64-bit client application and ODBC driver
+manager libraries are installed in` /usr/local/lib`, then set
+`LD_LIBRARY_PATH` as follows:  
+`export LD_LIBRARY_PATH=/usr/local/lib:/opt/simba/drillodbc/lib/64`  
+Refer to your Linux shell documentation for details on how to set environment
+variables permanently.
+
+#### Next Step
+
+Complete the steps listed in [Configuring ODBC Connections for Linux and Mac
+OS X](/drill/docs/configuring-odbc-connections-for-linux-and-mac-os-x).
+

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/interfaces/odbc-linux/002-install-odbc-mac.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/odbc-linux/002-install-odbc-mac.md 
b/_docs/interfaces/odbc-linux/002-install-odbc-mac.md
new file mode 100644
index 0000000..65a35f3
--- /dev/null
+++ b/_docs/interfaces/odbc-linux/002-install-odbc-mac.md
@@ -0,0 +1,70 @@
+---
+title: "Installing the MapR Drill ODBC Driver on Mac OS X"
+parent: "Using the MapR ODBC Driver on Linux and Mac OS X"
+---
+Install the MapR Drill ODBC Driver on the machine from which you connect to
+the Drill service.
+
+To install the MapR Drill ODBC Driver, complete the following steps:
+
+  * Step 1: Downloading the MapR Drill ODBC Driver 
+  * Step 2: Installing the MapR Drill ODBC Driver 
+  * Step 3: Updating the DYLD_LIBRARY_PATH Environment Variable
+
+After you complete the installation steps, complete the steps listed in
+[Configuring ODBC Connections for Linux and Mac OS 
X](/drill/docs/configuring-odbc-connections-for-linux-and-mac-os-x)
+.
+
+Verify that your system meets the following prerequisites before you start.
+
+**System Requirements**
+
+  * Mac OS X version 10.6.8 or later
+  * 100 MB of available disk space
+  * iODBC 3.52.7 or above
+  * The client must be able to resolve the actual hostname of the Drill 
node(s) with the IP(s). Verify that a DNS entry was created on the client 
machine for the Drill node(s).   
+If not, create the following entry in `/etc/hosts` for the Drill node(s):  
+`<drill-machine-IP> <drill-machine-hostname>`  
+Example: `127.0.1.1 apachedemo`
+
+To install the driver, you need Administrator privileges on the computer.
+
+## Step 1: Downloading the MapR Drill ODBC Driver
+
+Click the following link to download the driver:
+
+  * 
[MapRDrillODBC.dmg](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC.dmg)
+
+## Step 2: Installing the MapR Drill ODBC Driver
+
+To install the driver, complete the following steps:
+
+  1. Double-click `MapRDrillODBC.dmg` to mount the disk image.
+  2. Double-click `MapRDrillODBC.pkg` to run the Installer.
+  3. Follow the instructions in the Installer to complete the installation 
process.
+  4. When the installation completes, click **Close.**
+
+**Note:** MapR Drill ODBC Driver files install in the following locations:
+
+  * `/opt/mapr/drillodbc/ErrorMessages` – Error messages files directory
+  * `/opt/mapr/drillodbc/Setup` – Sample configuration files directory
+  * `/opt/mapr/drillodbc/lib/universal` – Binaries directory
+
+## Step 3: Updating the DYLD_LIBRARY_PATH Environment Variable
+
+The DYLD_LIBRARY_PATH environment variable must include paths to the following
+libraries:
+
+  * Installed ODBC driver manager libraries
+  * Installed MapR Drill ODBC Driver for Drill shared libraries
+
+For example, if the ODBC driver manager libraries are installed in
+`/usr/local/lib`, then set `DYLD_LIBRARY_PATH` to the following:
+
+`export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/lib:/opt/mapr/drillodb
+c/lib/universal`
+
+#### Next Step
+
+Complete the steps listed in [Configuring ODBC Connections for Linux and Mac
+OS X](/drill/docs/configuring-odbc-connections-for-linux-and-mac-os-x).

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/interfaces/odbc-linux/003-odbc-connections-linux.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/odbc-linux/003-odbc-connections-linux.md 
b/_docs/interfaces/odbc-linux/003-odbc-connections-linux.md
new file mode 100644
index 0000000..11b660d
--- /dev/null
+++ b/_docs/interfaces/odbc-linux/003-odbc-connections-linux.md
@@ -0,0 +1,178 @@
+---
+title: "Configuring ODBC Connections for Linux and Mac OS X"
+parent: "Using the MapR ODBC Driver on Linux and Mac OS X"
+---
+ODBC driver managers use configuration files to define and configure ODBC data
+sources and drivers. Before you connect to Drill through an ODBC client tool
+on Linux or Mac OS X, you must update the following configuration files:
+
+  * `odbc.ini`
+  * `odbcinst.ini`
+  * `mapr.drillodbc.ini`
+
+You can locate the configuration files in your home directory, or in`
+/opt/mapr/drillobdc/Setup`.
+
+**Note:** The installer for the Mac OS X version of the driver creates a 
sample User DSN, that some driver managers use, in the following files:
+
+  * `~/Library/ODBC/odbc.ini`
+  * `~/.odbc.ini`
+
+To configure an ODBC connection for Linux or Mac OS X, complete the following
+steps:
+
+  * Step 1: Set Evironment Variables (Linux only)
+  * Step 2: Define the ODBC Data Sources in odbc.ini
+  * Step 3: (Optional) Define the ODBC Driver in odbcinst.ini
+  * Step 4: Configure the MapR Drill ODBC Driver
+
+Once you have completed the required steps, refer to [Testing the ODBC
+Connection on Linux and Mac OS 
X](/drill/docs/testing-the-odbc-connection-on-linux-and-mac-os-x).
+
+#### Sample Configuration Files
+
+The driver installation contains sample configuration files in the ~/`Setup`
+directory that you can use as a reference.
+
+The sample files appear in the directory listings by default because the
+filenames do not begin with a (.) Filenames that begin with a (.) are hidden.
+If the default location is used for `odbc.ini` and `odbcinst.ini`, file names
+must begin with a period (.). For `mapr.drillodbc.ini`, the file name must
+begin with a (.) and must reside in your home directory.
+
+If the configuration files do not already exist in your home directory, copy
+the sample configuration files to that directory and rename them. If the
+configuration files already exist in your home directory, you can use the
+sample configuration files as a guide for modifying the existing configuration
+files.
+
+## Step 1: Set Evironment Variables (Linux only)
+
+You must set the following environment variables to point to the` odbc.ini`
+and `mapr.drillodbc.ini `configuration files, respectively:
+
+  * `ODBCINI` (point to `odbc.ini`)
+  * `MAPRDRILLINI` (point to `mapr.drillodbc.ini`)
+
+For example, if you are using the 32-bit driver and the files are in the
+default install directory, set the environment variables as follows:
+
+**Note:** You do not need to set these variables for the Mac OS X version of 
the driver.
+
+## Step 2: Define the ODBC Data Sources in `odbc.ini`
+
+Define the ODBC data sources in the `odbc.ini` configuration file. This file
+is divided into sections.
+
+The following table provides information about each of the sections:
+
+Section| Description  
+---|---  
+[ODBC]| (Optional) Controls the global ODBC configuration.  
+[ODBC Data Sources]| (Required) Lists DSNs and associates them with a driver.  
+User Defined|(Required) A section that you create. It must have the same name 
as the data source specified in the `[ODBC Data Sources]` section.  This is 
required to configure the data source.  
+  
+You can see the required sections in the following example `odbc.ini` file:
+
+**Example**
+          
+    [ODBC]
+    # Specify any global ODBC configuration here such as ODBC tracing.
+  
+    [ODBC Data Sources]
+    Sample MapR Drill DSN=MapR Drill ODBC Driver
+  
+    [Sample MapR Drill DSN]
+    # Description: DSN Description.
+    # This key is not necessary and is only to give a description of the data 
source.
+    Description=MapR Drill ODBC Driver DSN
+    # Driver: The location where the ODBC driver is installed to.
+    Driver=/opt/mapr/drillodbc/lib/universal/libmaprdrillodbc.dylib
+  
+    # Values for ConnectionType, AdvancedProperties, Catalog, Schema should be 
set here.
+    # If ConnectionType is Direct, include Host and Port. If ConnectionType is 
ZooKeeper, include ZKQuorum and ZKClusterID
+    # They can also be specified in the connection string.
+    ConnectionType=Zookeeper
+    HOST=[HOST]
+    PORT=[PORT]
+    ZKQuorum=
+    ZKClusterID=
+    
AdvancedProperties={HandshakeTimeout=5;QueryTimeout=180;TimestampTZDisplayTimeout=utc;ExcludedSchemas=sys,INFORMATION_SCHEMA}
+    Catalog=DRILL
+    Schema=
+
+### Configuring odbc.ini
+
+To create a data source in the `odbc.ini` configuration file, complete the
+following steps:
+
+  1. Open the `.odbc.ini` configuration file in a text editor.
+  2. Add a new entry to the `[ODBC Data Sources]` section, and type the data 
source name (DSN) and the driver name.
+  3. To set configuration options, add a new section with a name that matches 
the data source name (DSN) that you specified in step 2. Specify configuration 
options as key-value pairs.
+  4. Save the `.odbc.ini` configuration file.
+
+For details on the configuration options available for controlling the
+behavior of DSNs using Simba ODBC Driver for Apache Drill, see [Driver
+Configuration
+Options](/drill/docs/driver-configuration-options).
+
+## Step 3: (Optional) Define the ODBC Driver in `odbcinst.ini`
+
+The `odbcinst.ini` is an optional configuration file that defines the ODBC
+Drivers. This configuration file is optional because you can specify drivers
+directly in the` odbc.ini` configuration file.
+
+The `odbcinst.ini` file is divided into sections.
+
+The following table provides information about each of the sections:
+
+Section| Description  
+---|---  
+[ODBC Drivers]| This section lists the names of all the installed ODBC 
drivers.  
+User Defined|  A section having the same name as the driver name specified in 
the [ODBC Drivers] section lists driver attributes and values.
+  
+You can see the sections in the following example `odbcinst.ini` file:
+
+**Example**
+
+    [ODBC Drivers]
+    MapR Drill ODBC Driver=Installed
+   
+    [MapR Drill ODBC Driver]
+    Description=MapR Drill ODBC Driver
+    Driver=/opt/mapr/drillodbc/lib/universal/libmaprdrillodbc.dylib
+
+### **Configuring odbcinst.ini**
+
+To define a driver in the `odbcinst.ini` configuration file, complete the
+following steps:
+
+  1. Open the `odbcinst.ini` configuration file in a text editor.
+  2. Add a new entry to the [ODBC Drivers] section. Type the driver name, and 
then type `=Installed`. Assign the driver name as the value of the Driver 
attribute in the data source definition instead of the driver shared library 
name.
+  3. In `odbcinst.ini,` add a new section with a name that matches the driver 
name you typed in step 2, and add configuration options to the section based on 
the sample `odbcinst.ini` file provided with MapR Drill ODBC Driver in the 
Setup directory. Specify configuration options as key-value pairs.
+  4. Save the `.odbcinst.ini` configuration file.
+
+## Step 4: Configure the MapR Drill ODBC Driver
+
+Configure the MapR Drill ODBC Driver in the `mapr.drillodbc.ini` configuration
+file. This configures the driver so it works with your ODBC driver manager.
+
+### Configuring mapr.drillodbc.ini
+
+To configure the MapR Drill ODBC Driver in the `mapr.drillodbc.ini` 
configuration file, complete the following steps:
+
+  1. Open the `mapr.drillodbc.ini` configuration file in a text editor.
+  2. Edit the DriverManagerEncoding setting. The value is typically UTF-16 or 
UTF-32, but depends on the driver manger used. iODBC uses UTF-32 and unixODBC 
uses UTF-16. Review your ODBC Driver Manager documentation for the correct 
setting.
+  3. Edit the `ODBCInstLib` setting. The value is the name of the `ODBCInst` 
shared library for the ODBC driver manager that you use. The configuration file 
defaults to the shared library for`iODBC`. In Linux, the shared library name 
for iODBC is `libiodbcinst.so`. In Mac OS X, the shared library name for 
`iODBC` is `libiodbcinst.dylib`.
+     **Note:**Review your ODBC Driver Manager documentation for the correct
+setting. Specify an absolute or relative filename for the library. If you use
+the relative file name, include the path to the library in the library path
+environment variable. In Linux, the library path environment variable is named
+`LD_LIBRARY_PATH`. In Mac OS X, the library path environment variable is
+named `DYLD_LIBRARY_PATH`.
+  4. Save the `mapr.drillodbc.ini` configuration file.
+
+### Next Step
+
+Refer to [Testing the ODBC Connection on Linux and Mac OS 
X](/drill/docs/testing-the-odbc-connection-on-linux-and-mac-os-x).
+

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/interfaces/odbc-linux/004-odbc-driver-conf.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/odbc-linux/004-odbc-driver-conf.md 
b/_docs/interfaces/odbc-linux/004-odbc-driver-conf.md
new file mode 100644
index 0000000..2717910
--- /dev/null
+++ b/_docs/interfaces/odbc-linux/004-odbc-driver-conf.md
@@ -0,0 +1,15 @@
+---
+title: "Driver Configuration Options"
+parent: "Using the MapR ODBC Driver on Linux and Mac OS X"
+---
+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.
+
+**Note:** If you use a connection string to connect to your data source, then 
you can set these configuration properties in the connection string instead of 
the` odbc.ini` file.
+
+The following table provides a list of the configuration options with their
+descriptions:
+
+<table ><tbody><tr><td valign="top"><strong>Property Name</strong></td><td 
valign="top"><strong>Description</strong></td></tr><tr><td 
valign="top">AdvancedProperties</td><td valign="top">Separate advanced 
properties using a semi-colon (;) and then surround all advanced properties in 
a connection string using braces { and }. <br />For details on supported 
advanced properties, see Appendix C: Advanced Properties.</td></tr><tr><td 
valign="top">Catalog</td><td valign="top">The name of the synthetic catalog 
under which all of the schemas/databases are organized: DRILL</td></tr><tr><td 
valign="top">ConnectionType</td><td valign="top">The following values are 
possible:<ul><li>Direct - Connect to a Drill server using Host and Port 
properties in the connection string.</li><li>ZooKeeper - Connect to a ZooKeeper 
cluster using ZKQuorum and ZKClusterID properties in the connection 
string.</li></ul></td></tr><tr><td valign="top">DRIVER</td><td 
valign="top">(Required) The name of the installed dri
 ver: MapR Drill ODBC Driver </td></tr><tr><td valign="top">Host</td><td 
valign="top">If the ConnectionType property is set to Direct, then indicate the 
IP address or hostname of the Drill server using the Host 
property.</td></tr><tr><td valign="top">Port</td><td valign="top">If the 
ConnectionType property is set to Direct, then indicate the port on which the 
Drill server is listening using the Port property.</td></tr><tr><td 
valign="top">Schema</td><td valign="top">The name of the database schema to use 
when a schema is not explicitly specified in a query.Note: Queries on other 
schemas can still be issued by explicitly specifying the schema in the 
query.</td></tr><tr><td valign="top">ZKClusterID</td><td valign="top">If the 
ConnectionType property is set to ZooKeeper, then use ZKClusterID to indicate 
the name of the Drillbit cluster to use.</td></tr><tr><td 
valign="top">ZKQuorum</td><td valign="top">If the ConnectionType property is 
set to ZooKeeper, then use ZKQuorum to indicate the
  server(s) in your ZooKeeper cluster. Separate multiple servers using a comma 
(,).</td></tr></tbody></table>
+

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/interfaces/odbc-linux/005-odbc-connect-str.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/odbc-linux/005-odbc-connect-str.md 
b/_docs/interfaces/odbc-linux/005-odbc-connect-str.md
new file mode 100644
index 0000000..595432b
--- /dev/null
+++ b/_docs/interfaces/odbc-linux/005-odbc-connect-str.md
@@ -0,0 +1,23 @@
+---
+title: "Configuring ODBC Connections for Linux and Mac OS X"
+parent: "Using the MapR ODBC Driver on Linux and Mac OS X"
+---
+You can use a connection string to connect to your data source. For a list of
+all the properties that you can use in connection strings, see [Driver
+Configuration
+Options](/drill/docs/driver-configuration-options).
+
+The following example shows a connection string for connecting directly to a
+Drillbit:
+
+**Example**
+
+    DRIVER=MapR Drill ODBC Driver;AdvancedProperties= 
{HandshakeTimeout=0;QueryTimeout=0; 
TimestampTZDisplayTimezone=utc;ExcludedSchemas=sys, INFORMATION_SCHEMA;[OS1] 
};Catalog=DRILL;Schema=hivestg; 
ConnectionType=Direct;Host=192.168.202.147;Port=31010
+
+The following example shows a connection string for connecting to a ZooKeeper
+cluster:
+
+**Example**
+
+    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
+

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/interfaces/odbc-linux/006-odbc-adv-prop.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/odbc-linux/006-odbc-adv-prop.md 
b/_docs/interfaces/odbc-linux/006-odbc-adv-prop.md
new file mode 100644
index 0000000..1528746
--- /dev/null
+++ b/_docs/interfaces/odbc-linux/006-odbc-adv-prop.md
@@ -0,0 +1,19 @@
+---
+title: "Advanced Properties"
+parent: "Using the MapR ODBC Driver on Linux and Mac OS X"
+---
+When you use advanced properties, you must separate them 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:
+
+`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.
+
+<table ><tbody><tr><td valign="top"><strong>Property Name</strong></td><td 
valign="top"><strong>Default Value</strong></td><td 
valign="top"><strong>Description</strong></td></tr><tr><td 
valign="top">HandshakeTimeout</td><td valign="top">5</td><td valign="top">An 
integer value representing the number of seconds that the driver waits before 
aborting an attempt to connect to a data source. When set to a value of 0, the 
driver does not abort connection attempts.</td></tr><tr><td 
valign="top">QueryTimeout</td><td valign="top">180</td><td valign="top">An 
integer value representing the number of seconds for the driver to wait before 
automatically stopping a query. When set to a value of 0, the driver does not 
stop queries automatically.</td></tr><tr><td 
valign="top">TimestampTZDisplayTimezone</td><td valign="top">local</td><td 
valign="top">Two values are possible:local—Timestamps are dependent on the 
time zone of the user.utc—Timestamps appear in Coordinated Universal Time 
(UTC).</td><
 /tr><tr><td valign="top">ExcludedSchemas</td><td valign="top">sys, 
INFORMATION_SCHEMA</td><td valign="top">The value of ExcludedSchemas is a list 
of schemas that do not appear in client applications such as Drill Explorer, 
Tableau, and Excel. Separate schemas in the list using a comma 
(,).</td></tr><tr><td colspan="1" valign="top"><span style="color: 
rgb(0,0,0);">CastAnyToVarchar</span></td><td colspan="1" 
valign="top">true</td><td colspan="1" valign="top"><span style="color: 
rgb(0,0,0);">Casts the “ANY” and “(VARCHAR(1), ANY) MAP” data types 
returned from SQL column calls into type 
“VARCHAR”.</span></td></tr></tbody></table>
+

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/interfaces/odbc-linux/007-odbc-connections-test.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/odbc-linux/007-odbc-connections-test.md 
b/_docs/interfaces/odbc-linux/007-odbc-connections-test.md
new file mode 100644
index 0000000..bc7749a
--- /dev/null
+++ b/_docs/interfaces/odbc-linux/007-odbc-connections-test.md
@@ -0,0 +1,40 @@
+---
+title: "Testing the ODBC Connection on Linux and Mac OS X"
+parent: "Using the MapR ODBC Driver on Linux and Mac OS X"
+---
+To test the connection, you can use an ODBC-enabled client application. For a
+basic connection test, you can also use the test utilities that are packaged
+with your driver manager installation.
+
+For example, the iODBC driver manager includes simple utilities called
+`iodbctest` and `iodbctestw`. You can use either one of these utilities to
+establish a test connection with your driver and your DSN. Use `iodbctest` to
+test how your driver works with an ANSI application. Use `iodbctestw` to test
+how your driver works with a Unicode application.
+
+**Note:** There are 32-bit and 64-bit installations of the iODBC driver 
manager available. If you have only one or the other installed, then the 
appropriate version of iodbctest (or iodbctestw) is available. However, if you 
have both 32- and 64-bit versions installed, then you need to be careful that 
you are running the version from the correct installation directory.
+
+Visit [http://www.iodbc.org](http://www.iodbc.org/) for further details on
+using the iODBC driver manager.
+
+## Testing the ODBC Connection
+
+Complete the following steps to test your connection using the iODBC driver
+manager:
+
+  1. Run `iodbctest` or `iodbctestw`. The program prompts you for an ODBC 
connection string.
+  2. If you do not remember the DSN name, type a question mark (?) to see a 
list of DSNs.
+  3. If you are connecting directly to a Drillbit, type an ODBC connection 
string using the following format:
+
+     `DRIVER=MapR Drill ODBC 
Driver;ConnectionType=Direct;Host=HostName;Port=PortNumber`
+     
+     OR
+     
+     If you are connecting to a ZooKeeper cluster, type an ODBC connection 
string
+using the following format:
+
+     `DRIVER=MapR Drill ODBC 
Driver;ConnectionType=ZooKeeper;ZKQuorum=Server1:Port1
+,Server2:Port2;ZKClusterID=DrillbitName`
+
+     If the connection is successful, the `SQL>` prompt appears.
+

http://git-wip-us.apache.org/repos/asf/drill/blob/d959a210/_docs/interfaces/odbc-win/001-install-odbc-win.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/odbc-win/001-install-odbc-win.md 
b/_docs/interfaces/odbc-win/001-install-odbc-win.md
new file mode 100644
index 0000000..5bb6c8d
--- /dev/null
+++ b/_docs/interfaces/odbc-win/001-install-odbc-win.md
@@ -0,0 +1,58 @@
+---
+title: "Step 1. Install the MapR Drill ODBC Driver on Windows"
+parent: "Using the MapR ODBC Driver on Windows"
+---
+The MapR Drill ODBC Driver installer is available for 32-bit and 64-bit
+applications. Both versions of the driver can be installed on a 64-bit
+machine.
+
+##  System Requirements
+
+Each computer where you install the driver must meet the following system
+requirements:
+
+  * One of the following operating systems (32- and 64-bit editions are 
supported):
+    * Windows® Vista
+    * Windows® 7 Professional
+    * Windows® Server 2008 R2
+  * .NET Framework 2.0 is required to run the Drill Explorer application.
+  * 60 MB of available disk space
+  * The client must be able to resolve the actual hostname of the Drill 
node(s) with the IP(s). Verify that a DNS entry was created on the client 
machine for the Drill node(s). If not, create the following entry for the Drill 
node(s) in the `%WINDIR%\system32\drivers\etc\hosts` file:
+    
+    `<drill-machine-IP> <drill-machine-hostname>`  
+    Example: `127.0.1.1 apachedemo`
+
+To install the driver, you need Administrator privileges on the computer.
+
+## Installing the Driver
+
+  1. Download the installer that corresponds to the bitness of the client 
application from which you want to create an ODBC connection:
+     * 
[MapRDrillODBC32.msi](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC32.msi)
 (32-bit)
+     * 
[MapRDrillODBC64.msi](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC64.msi)
 (64-bit)
+  2. Double-click the installer from the location where you downloaded it.
+  3. Click **Next.**
+  4. Select the check box to accept the terms of the License Agreement and 
click **Next**.
+  5. Verify or change the install location. Then, click **Next**.
+  6. Click **Install**.
+  7. When the installation completes, click **Finish**.
+  8. To verify the installation, click **Start > All Programs > MapR Drill 
ODBC Driver 1.0 (32|64-bit) > (32|64-bit) ODBC Administrator**. Then, click the 
**Drivers** tab and verify that the MapR Drill ODBC Driver appears in the list 
of drivers that are installed on the computer.
+
+## The Tableau Data-connection Customization (TDC) File
+
+The MapR Drill ODBC Driver includes a file named `MapRDrillODBC.TDC`. The TDC
+file includes customizations that improve ODBC configuration and performance
+when using Tableau.
+
+If you install Tableau after you install the MapR Drill ODBC driver, you must
+install the Tableau TDC FIle. When Tableau is already installed on the
+machine, the TDC file is installed automatically with the MapR Drill ODBC
+driver.
+
+**To install the MapRDrillODBC.TDC file manually:**
+
+  1. Click **Start > All Programs > MapR Drill ODBC Driver <version> 
(32|64-bit) > Install Tableau TDC File**. 
+  2. When the installation completes, press any key to continue.   
+For example, you can press the SPACEBAR key.
+
+#### What's Next? Go to [Step 2. Configure ODBC Connections to Drill Data 
Sources](/drill/docs/step-2-configure-odbc-connections-to-drill-data-sources).
+

Reply via email to