drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1662344 [5/8] - in /drill/site/trunk/content/drill: ./ blog/2014/12/11/apache-drill-qa-panelist-spotlight/ docs/ docs/2014-q1-drill-report/ docs/advanced-properties/ docs/analyzing-yelp-json-data-with-apache-drill/ docs/apache-drill-0-6-0-...
Date Thu, 26 Feb 2015 01:16:45 GMT
Modified: drill/site/trunk/content/drill/docs/install-drill/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/install-drill/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/install-drill/index.html (original)
+++ drill/site/trunk/content/drill/docs/install-drill/index.html Thu Feb 26 01:16:43 2015
@@ -74,16 +74,6 @@ clustered Hadoop environment, you can in
 Installing in distributed mode requires some configuration, however once you
 install you can connect Drill to your Hive, HBase, or distributed file system
 data sources and run queries on them.</p>
-
-<p>Click on any of the following links for more information about how to install
-Drill in embedded or distributed mode:</p>
-
-<ul>
-<li><a href="/confluence/display/DRILL/Apache+Drill+in+10+Minutes">Apache Drill in 10 Minutes</a></li>
-<li><a href="/confluence/display/DRILL/Deploying+Apache+Drill+in+a+Clustered+Environment">Deploying Apache Drill in a Clustered Environment</a></li>
-<li><a href="/confluence/display/DRILL/Installing+Drill+in+Embedded+Mode">Installing Drill in Embedded Mode</a></li>
-<li><a href="/confluence/display/DRILL/Installing+Drill+in+Distributed+Mode">Installing Drill in Distributed Mode</a></li>
-</ul>
 </div>
 
 

Modified: drill/site/trunk/content/drill/docs/installing-drill-in-distributed-mode/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/installing-drill-in-distributed-mode/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/installing-drill-in-distributed-mode/index.html (original)
+++ drill/site/trunk/content/drill/docs/installing-drill-in-distributed-mode/index.html Thu Feb 26 01:16:43 2015
@@ -106,11 +106,12 @@ tar xzf apache-drill-&lt;version&gt;.tar
 <li><p>If you are using external JAR files, edit <code>drill-env.sh,</code>located in <code>/opt/drill/conf/</code>, and define <code>HADOOP_HOME:</code></p>
 <div class="highlight"><pre><code class="language-text" data-lang="text">export HADOOP_HOME=&quot;~/hadoop/hadoop-0.20.2/&quot;
 </code></pre></div></li>
-<li><p>In <code>drill-override.conf,</code>create a unique Drill <code>cluster ID</code>, and provide Zookeeper host names and port numbers to configure a connection to your Zookeeper quorum.</p>
+<li><p>In <code>drill-override.conf,</code> create a unique Drill <code>cluster ID</code>, and provide Zookeeper host names and port numbers to configure a connection to your Zookeeper quorum.</p>
 
-<p>a. Edit <code>drill-override.conf</code>located in <code>~/drill/drill-&lt;version&gt;/conf/</code>.</p>
-
-<p>b. Provide a unique <code>cluster-id</code> and the Zookeeper host names and port numbers in <code>zk.connect</code>. If you install Drill on multiple nodes, assign the same <code>cluster ID</code> to each Drill node so that all Drill nodes share the same ID. The default Zookeeper port is 2181.</p>
+<ol>
+<li>Edit <code>drill-override.conf</code>located in <code>~/drill/drill-&lt;version&gt;/conf/</code>.</li>
+<li>Provide a unique <code>cluster-id</code> and the Zookeeper host names and port numbers in <code>zk.connect</code>. If you install Drill on multiple nodes, assign the same <code>cluster ID</code> to each Drill node so that all Drill nodes share the same ID. The default Zookeeper port is 2181.</li>
+</ol>
 
 <p><strong>Example</strong></p>
 <div class="highlight"><pre><code class="language-text" data-lang="text"> drill.exec:{
@@ -123,7 +124,7 @@ tar xzf apache-drill-&lt;version&gt;.tar
 </code></pre></div></li>
 </ol>
 
-<p>You can connect Drill to various types of data sources. Refer to <a href="https://cwiki.apache.org/confluence/display/DRIL%0AL/Connecting+to+Data+Sources">Connect
+<p>You can connect Drill to various types of data sources. Refer to <a href="/drill/docs/connect-to-data-sources">Connect
 Apache Drill to Data Sources</a> to get configuration instructions for the
 particular type of data source that you want to connect to Drill.</p>
 </div>

Modified: drill/site/trunk/content/drill/docs/installing-drill-in-embedded-mode/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/installing-drill-in-embedded-mode/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/installing-drill-in-embedded-mode/index.html (original)
+++ drill/site/trunk/content/drill/docs/installing-drill-in-embedded-mode/index.html Thu Feb 26 01:16:43 2015
@@ -78,22 +78,14 @@ running Linux, Mac OS X, or Windows.</p>
 
 <p>You must have the following software installed on your machine to run Drill:</p>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td class="confluenceTd"><p><strong>Software</strong></p></td><td class="confluenceTd"><p><strong>Description</strong></p></td></tr><tr><td class="confluenceTd"><p><a class="external-link" href="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html" rel="nofollow">Oracle JDK version 7</a></p></td><td class="confluenceTd"><p>A set of programming tools for developing Java applications.</p></td></tr></tbody></table></div>
-
-<p>A set of programming tools for developing Java applications.  </p>
+<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>
 
 <p>You can run the following command to verify that the system meets the software
 prerequisite:</p>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><td class="confluenceTd"><p><strong>Command</strong></p></td><td class="confluenceTd"><p><strong>Example Output</strong></p></td></tr><tr><td class="confluenceTd"><p><code>java –version</code></p></td><td class="confluenceTd"><p><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></p></td></tr></tbody></table></div>
-
-<p>Click on the installation link appropriate for your operating system:</p>
+<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>
 
-<ul>
-<li><a href="/confluence/display/DRILL/Installing+Drill+on+Linux">Installing Drill on Linux</a></li>
-<li><a href="/confluence/display/DRILL/Installing+Drill+on+Mac+OS+X">Installing Drill on Mac OS X</a></li>
-<li><a href="/confluence/display/DRILL/Installing+Drill+on+Windows">Installing Drill on Windows</a></li>
-</ul>
+<p>Follow installation instructions in this documentation for your particular operating system.</p>
 </div>
 
 

Modified: drill/site/trunk/content/drill/docs/installing-drill-on-linux/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/installing-drill-on-linux/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/installing-drill-on-linux/index.html (original)
+++ drill/site/trunk/content/drill/docs/installing-drill-on-linux/index.html Thu Feb 26 01:16:43 2015
@@ -77,17 +77,16 @@ Linux:</p>
 <li><p>Issue the following command to create a new directory to which you can extract the contents of the Drill <code>tar.gz</code> file:</p>
 <div class="highlight"><pre><code class="language-text" data-lang="text">sudo mkdir -p /opt/drill
 </code></pre></div></li>
-<li><p>Navigate to the directory where you downloaded the Drill <code>tar.gz</code> file.  </p></li>
+<li><p>Navigate to the directory where you downloaded the Drill <code>tar.gz</code> file.</p></li>
 <li><p>Issue the following command to extract the contents of the Drill <code>tar.gz</code> file to the directory you created:</p>
 <div class="highlight"><pre><code class="language-text" data-lang="text">sudo tar -xvzf apache-drill-&lt;version&gt;.tar.gz -C /opt/drill
 </code></pre></div></li>
 <li><p>Issue the following command to navigate to the Drill installation directory:</p>
 <div class="highlight"><pre><code class="language-text" data-lang="text">cd /opt/drill/apache-drill-&lt;version&gt;
-</code></pre></div></li>
+</code></pre></div>
+<p>At this point, you can <a href="/drill/docs/starting-stopping-drill">invoke
+SQLLine</a> to run Drill.</p></li>
 </ol>
-
-<p>At this point, you can <a href="/confluence/pages/viewpage.action?pageId=44994063#Starting%0A/StoppingDrill-invokeSQLLine">invoke
-SQLLine</a> to run Drill.</p>
 </div>
 
 

Modified: drill/site/trunk/content/drill/docs/installing-drill-on-mac-os-x/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/installing-drill-on-mac-os-x/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/installing-drill-on-mac-os-x/index.html (original)
+++ drill/site/trunk/content/drill/docs/installing-drill-on-mac-os-x/index.html Thu Feb 26 01:16:43 2015
@@ -81,9 +81,8 @@ $ cd drill
 $ pwd
 /Users/max/drill
 </code></pre></div></li>
-<li><p>Click the following link to download the latest, stable version of Apache Drill:</p>
-
-<p><a href="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</a></p></li>
+<li><p>Click the following link to download the latest, stable version of Apache Drill:<br>
+ <a href="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</a></p></li>
 <li><p>Open the downloaded <code>TAR</code> file with the Mac Archive utility or a similar tool for unzipping files.</p></li>
 <li><p>Move the resulting <code>apache-drill-&lt;version&gt;</code> folder into the <code>drill</code> directory that you created.</p></li>
 <li><p>Issue the following command to navigate to the <code>apache-drill-&lt;version&gt;</code> directory:</p>
@@ -91,8 +90,10 @@ $ pwd
 </code></pre></div></li>
 </ol>
 
-<p>At this point, you can <a href="https://cwiki.apache.org/confluence/pa%0Ages/viewpage.action?pageId=44994063#Starting/StoppingDrill-invokeSQLLine">invoke SQLLine</a> to
+<p>At this point, you can <a href="/drill/docs/starting-stopping-drill">invoke SQLLine</a> to
 run Drill.</p>
+
+<!--The title is too complicated for me to figure out how to create a link to it.-->
 </div>
 
 

Modified: drill/site/trunk/content/drill/docs/installing-drill-on-windows/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/installing-drill-on-windows/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/installing-drill-on-windows/index.html (original)
+++ drill/site/trunk/content/drill/docs/installing-drill-on-windows/index.html Thu Feb 26 01:16:43 2015
@@ -97,7 +97,8 @@ installed to extract the Drill archive f
 <li><p>Create a <code>drill</code> directory on your <code>C:\</code> drive, (or in some other location if you prefer).</p>
 
 <p><strong>Example</strong></p>
-
+<div class="highlight"><pre><code class="language-text" data-lang="text">C:\Drill
+</code></pre></div>
 <p>Do not include spaces in your directory path. If you include spaces in the
 directory path, Drill fails to run.</p></li>
 <li><p>Click the following link to download the latest, stable version of Apache Drill:</p>
@@ -106,17 +107,22 @@ directory path, Drill fails to run.</p><
 <li><p>Move the <code>apache-drill-&lt;version&gt;.tar.gz</code> file to the <code>drill</code> directory that you created on your <code>C:\</code> drive.</p></li>
 <li><p>Unzip the <code>TAR.GZ</code> file and the resulting <code>TAR</code> file.  </p>
 
-<p>a. Right-click <code>apache-drill-&lt;version&gt;.tar.gz,</code> and select<code>7-Zip&gt;Extract Here</code>. The utility extracts the <code>apache-drill-&lt;version&gt;.tar</code> file.
-b. Right-click <code>apache-drill-&lt;version&gt;.tar,</code>and select`<code>7-Zip&gt;Extract Here</code>. <code>The utility extracts the</code> apache-drill-<version> `folder.</p></li>
-<li><p>Open the <code>apache-drill-&lt;version&gt;</code>folder.</p></li>
+<ol>
+<li>Right-click <code>apache-drill-&lt;version&gt;.tar.gz,</code> and select <code>7-Zip&gt;Extract Here</code>. The utility extracts the <code>apache-drill-&lt;version&gt;.tar</code> file.<br></li>
+<li>Right-click <code>apache-drill-&lt;version&gt;.tar,</code> and select <code>7-Zip&gt;Extract Here</code>. The utility extracts the <code>apache-drill-&lt;version&gt;</code> folder.</li>
+</ol></li>
+<li><p>Open the <code>apache-drill-&lt;version&gt;</code> folder.</p></li>
 <li><p>Open the <code>bin</code> folder, and double-click on the <code>sqlline.bat</code> file. The Windows command prompt opens.</p></li>
 <li><p>At the <code>sqlline&gt;</code> prompt, type <code>!connect jdbc:drill:zk=local</code> and then press <code>Enter</code>.</p></li>
-<li><p>Enter the username and password.
-a. When prompted, enter the user name <code>admin</code> and then press Enter. 
-b. When prompted, enter the password <code>admin</code> and then press Enter. The cursor blinks for a few seconds and then <code>0: jdbc:drill:zk=local&gt;</code>displays in the prompt.</p></li>
+<li><p>Enter the username and password. </p>
+
+<ol>
+<li>When prompted, enter the user name <code>admin</code> and then press Enter. </li>
+<li>When prompted, enter the password <code>admin</code> and then press Enter. The cursor blinks for a few seconds and then <code>0: jdbc:drill:zk=local&gt;</code> displays in the prompt.</li>
+</ol></li>
 </ol>
 
-<p>At this point, you can submit queries to Drill. Refer to the <a href="https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+in+10+Minute%0As#ApacheDrillin10Minutes-QuerySampleData">Query Sample Dat
+<p>At this point, you can submit queries to Drill. Refer to the <a href="/drill/docs/apache-drill-in-10-minutes#query-sampledata">Query Sample Dat
 a</a> section of this document.</p>
 </div>
 

Modified: drill/site/trunk/content/drill/docs/installing-the-apache-drill-sandbox/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/installing-the-apache-drill-sandbox/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/installing-the-apache-drill-sandbox/index.html (original)
+++ drill/site/trunk/content/drill/docs/installing-the-apache-drill-sandbox/index.html Thu Feb 26 01:16:43 2015
@@ -67,56 +67,40 @@
 
 </div>
 
-<div class="int_text" align="left"><p>This tutorial uses the MapR Sandbox, which is a Hadoop environment pre-configured with Apache Drill.</p>
+<div class="int_text" align="left"><h2 id="prerequisites">Prerequisites</h2>
 
-<p>To complete the tutorial on the MapR Sandbox with Apache Drill, work through
-the following pages in order:</p>
+<p>The MapR Sandbox with Apache Drill runs on VMware Player and VirtualBox, free
+desktop applications that you can use to run a virtual machine on a Windows,
+Mac, or Linux PC. Before you install the MapR Sandbox with Apache Drill,
+verify that the host system meets the following prerequisites:</p>
 
 <ul>
-<li><a href="/confluence/display/DRILL/Installing+the+Apache+Drill+Sandbox">Installing the Apache Drill Sandbox</a></li>
-<li><a href="/confluence/display/DRILL/Getting+to+Know+the+Drill+Setup">Getting to Know the Drill Setup</a></li>
-<li><a href="/confluence/display/DRILL/Lesson+1%3A+Learn+About+the+Data+Set">Lesson 1: Learn About the Data Set</a></li>
-<li><a href="/confluence/display/DRILL/Lesson+2%3A+Run+Queries+with+ANSI+SQL">Lesson 2: Run Queries with ANSI SQL</a></li>
-<li><a href="/confluence/display/DRILL/Lesson+3%3A+Run+Queries+on+Complex+Data+Types">Lesson 3: Run Queries on Complex Data Types</a></li>
-<li><a href="/confluence/display/DRILL/Summary">Summary</a></li>
+<li>VMware Player or VirtualBox is installed.</li>
+<li>At least 20 GB free hard disk space, at least 4 physical cores, and 8 GB of RAM is available. Performance increases with more RAM and free hard disk space.</li>
+<li>Uses one of the following 64-bit x86 architectures:
+
+<ul>
+<li>A 1.3 GHz or faster AMD CPU with segment-limit support in long mode</li>
+<li>A 1.3 GHz or faster Intel CPU with VT-x support</li>
+</ul></li>
+<li>If you have an Intel CPU with VT-x support, verify that VT-x support is enabled in the host system BIOS. The BIOS settings that must be enabled for VT-x support vary depending on the system vendor. See the VMware knowledge base article at <a href="http://kb.vmware.com/kb/1003944">http://kb.vmware.com/kb/1003944</a> for information about how to determine if VT-x support is enabled.</li>
 </ul>
 
-<h1 id="about-apache-drill">About Apache Drill</h1>
+<h3 id="vm-player-downloads">VM Player Downloads</h3>
 
-<p>Drill is an Apache open-source SQL query engine for Big Data exploration.
-Drill is designed from the ground up to support high-performance analysis on
-the semi-structured and rapidly evolving data coming from modern Big Data
-applications, while still providing the familiarity and ecosystem of ANSI SQL,
-the industry-standard query language. Drill provides plug-and-play integration
-with existing Apache Hive and Apache HBase deployments.Apache Drill 0.5 offers
-the following key features:</p>
+<p>For Linux, Mac, or Windows, download the free <a href="https://my.vmwar%0Ae.com/web/vmware/free#desktop_end_user_computing/vmware_player/6_0">VMware Player</a> or
+<a href="https://www.virtualbox.org/wiki/Downloads">VirtualBox</a>. Optionally, you can
+purchase <a href="http://www.vmware.com/products/fusion/">VMware Fusion</a> for Mac.</p>
 
-<ul>
-<li><p>Low-latency SQL queries</p></li>
-<li><p>Dynamic queries on self-describing data in files (such as JSON, Parquet, text) and MapR-DB/HBase tables, without requiring metadata definitions in the Hive metastore.</p></li>
-<li><p>ANSI SQL</p></li>
-<li><p>Nested data support</p></li>
-<li><p>Integration with Apache Hive (queries on Hive tables and views, support for all Hive file formats and Hive UDFs)</p></li>
-<li><p>BI/SQL tool integration using standard JDBC/ODBC drivers</p></li>
-</ul>
+<h3 id="vm-player-installation">VM Player Installation</h3>
 
-<h1 id="mapr-sandbox-with-apache-drill">MapR Sandbox with Apache Drill</h1>
+<p>The following list provides links to the virtual machine installation
+instructions:</p>
 
-<p>MapR includes Apache Drill as part of the Hadoop distribution. The MapR
-Sandbox with Apache Drill is a fully functional single-node cluster that can
-be used to get an overview on Apache Drill in a Hadoop environment. Business
-and technical analysts, product managers, and developers can use the sandbox
-environment to get a feel for the power and capabilities of Apache Drill by
-performing various types of queries. Once you get a flavor for the technology,
-refer to the <a href="http://incubator.apache.org/drill/">Apache Drill web site</a> and
-<a href="https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+Wiki">Apache Drill documentation
-</a>for more
-details.</p>
-
-<p>Note that Hadoop is not a prerequisite for Drill and users can start ramping
-up with Drill by running SQL queries directly on the local file system. Refer
-to <a href="https://cwiki.apache.org/confluence/display/DR%0AILL/Apache+Drill+in+10+Minutes">Apache Drill in 10 minutes</a> for an introduction to using Drill in local
-(embedded) mode.</p>
+<ul>
+<li>To install the VMware Player, see the <a href="http://www.vmware.com/support/pubs/player_pubs.html">VMware documentation</a>. Use of VMware Player is subject to the VMware Player end user license terms. VMware does not provide support for VMware Player. For self-help resources, see the <a href="http://www.vmware.com/products/player/faqs.html">VMware Player FAQ</a>.</li>
+<li>To install VirtualBox, see the <a href="http://dlc.sun.com.edgesuite.net/virtualbox/4.3.4/UserManual.pdf">Oracle VM VirtualBox User Manual</a>. By downloading VirtualBox, you agree to the terms and conditions of the respective license.</li>
+</ul>
 </div>
 
 

Added: drill/site/trunk/content/drill/docs/installing-the-mapr-drill-odbc-driver-on-linux/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/installing-the-mapr-drill-odbc-driver-on-linux/index.html?rev=1662344&view=auto
==============================================================================
--- drill/site/trunk/content/drill/docs/installing-the-mapr-drill-odbc-driver-on-linux/index.html (added)
+++ drill/site/trunk/content/drill/docs/installing-the-mapr-drill-odbc-driver-on-linux/index.html Thu Feb 26 01:16:43 2015
@@ -0,0 +1,226 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+
+<meta charset="UTF-8">
+
+
+<title>Installing the MapR Drill ODBC Driver on Linux - Apache Drill</title>
+
+<link href="/css/syntax.css" rel="stylesheet" type="text/css">
+<link href="/css/style.css" rel="stylesheet" type="text/css">
+<link href="/css/arrows.css" rel="stylesheet" type="text/css">
+<link href="/css/button.css" rel="stylesheet" type="text/css">
+
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<link rel="icon" href="/favicon.ico" type="image/x-icon">
+
+<script language="javascript" type="text/javascript" src="/js/lib/jquery-1.11.1.min.js"></script>
+<script language="javascript" type="text/javascript" src="/js/lib/jquery.easing.1.3.js"></script>
+<script language="javascript" type="text/javascript" src="/js/modernizr.custom.js"></script>
+<script language="javascript" type="text/javascript" src="/js/script.js"></script>
+
+</head>
+
+<body onResize="resized();">
+
+<div class="bui"></div>
+
+<div id="search">
+<input type="text" placeholder="Enter search term here">
+</div>
+
+<div id="menu" class="mw">
+<ul>
+  <li class="logo"><a href="/"></a></li>
+  <li>
+    <a href="/overview/">Documentation</a>
+    <ul>
+      <li><a href="/overview/">Overview&nbsp;&nbsp;&nbsp;&nbsp;</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+in+10+Minutes" target="_blank">Drill in 10 Minutes</a></li>
+      <li><a href="/why/">Why Drill? &nbsp;&nbsp;&nbsp;&nbsp;</a></li>
+      <li><a href="/architecture/">Architecture</a></li>
+    </ul>
+  </li>
+  <li>
+    <a href="/community/">Community</a>
+    <ul>
+      <li><a href="/team/">Team</a></li>
+      <li><a href="/community/#events">Events and Meetups</a></li>
+      <li><a href="/community/#mailinglists">Mailing Lists</a></li>
+      <li><a href="/community/#getinvolved">Get Involved</a></li>
+      <li><a href="https://issues.apache.org/jira/browse/DRILL/" target="_blank">Issue Tracker</a></li>
+      <li><a href="https://github.com/apache/drill" target="_blank">GitHub</a></li>
+    </ul>
+  </li>
+  <li><a href="/faq/">FAQ</a></li>
+  <li><a href="/blog/">Blog</a></li>
+  <li style="width:30px; padding-left: 2px; padding-right:10px"><a href="https://twitter.com/apachedrill" target="_blank"><img src="/images/twitterbw.png" alt="" align="center" width="22" style="padding: 0px 10px 1px 0px;"></a> </li>
+  <li class="l"><span>&nbsp;</span></li>
+  <li class="d"><a href="/download/">Download</a></li>
+</ul>
+</div>
+
+<div class="int_title">
+<h1>Installing the MapR Drill ODBC Driver on Linux</h1>
+
+</div>
+
+<div class="int_text" align="left"><p>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.</p>
+
+<p>To install the MapR Drill ODBC Driver, complete the following steps:</p>
+
+<ul>
+<li>Step 1: Downloading the MapR Drill ODBC Driver </li>
+<li>Step 2: Installing the MapR Drill ODBC Driver</li>
+<li>Step 3: Setting the LD_LIBRARY_PATH Environment Variable</li>
+</ul>
+
+<p>After you complete the installation steps, complete the steps listed in
+<a href="/drill/docs/configuring-odbc-connections-for-linux-and-mac-os-x">Configuring ODBC Connections for Linux and Mac OS X</a>.</p>
+
+<p>Verify that your system meets the system requirements before you start.</p>
+
+<p><strong>System Requirements</strong></p>
+
+<ul>
+<li>One of the following distributions (32- and 64-bit editions are supported):
+
+<ul>
+<li>Red Hat® Enterprise Linux® (RHEL) 5.0/6.0</li>
+<li>CentOS 5.0/6.0</li>
+<li>SUSE Linux Enterprise Server (SLES) 11</li>
+</ul></li>
+<li>90 MB of available disk space.</li>
+<li>An installed ODBC driver manager:
+
+<ul>
+<li>iODBC 3.52.7 or above<br>
+OR </li>
+<li>unixODBC 2.2.12 or above</li>
+</ul></li>
+<li><p>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).<br>
+If not, create the following entry in <code>/etc/hosts</code> for the Drill node(s):  </p>
+
+<p><code>&lt;drill-machine-IP&gt; &lt;drill-machine-hostname&gt;</code><br>
+Example: <code>127.0.1.1 apachedemo</code></p></li>
+</ul>
+
+<p>To install the driver, you need Administrator privileges on the computer.</p>
+
+<h2 id="step-1:-downloading-the-mapr-drill-odbc-driver">Step 1: Downloading the MapR Drill ODBC Driver</h2>
+
+<p>Click on a link below to download the driver:</p>
+
+<ul>
+<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC-32bit-0.07.0.i686.rpm">MapRDrillODBC-32bit-0.07.0.i686.rpm</a> (32-bit)</li>
+<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC-0.07.0.x86_64.rpm">MapRDrillODBC-0.07.0.x86_64.rpm</a> (64-bit)</li>
+</ul>
+
+<h2 id="step-2:-installing-the-mapr-drill-odbc-driver">Step 2: Installing the MapR Drill ODBC Driver</h2>
+
+<p>To install the driver, complete the following steps:</p>
+
+<ol>
+<li>Login as the root user.</li>
+<li>Navigate to the folder that contains the driver RPM packages to install.</li>
+<li><p>Enter the following command where <em>RPMFileName</em> is the file name of the RPM package containing the version of the driver that you want to install: </p>
+
+<p><strong>RedHat/CentOS</strong></p>
+
+<p><code>yum localinstall --nogpgcheck RPMFileName</code></p>
+
+<p><strong>SUSE</strong></p>
+
+<p><code>zypper install RPMFileName</code></p></li>
+</ol>
+
+<p><strong>Note:</strong> The MapR Drill ODBC Driver depends on the following resources:</p>
+
+<ul>
+<li><code>cyrus-sasl-2.1.22-7</code> or above</li>
+<li><code>cyrus-sasl-gssapi-2.1.22-7</code> or above</li>
+<li><code>cyrus-sasl-plain-2.1.22-7</code> or above</li>
+</ul>
+
+<p>If the package manager in your Linux distribution cannot resolve the
+dependencies automatically when installing the driver, download and manually
+install the packages.</p>
+
+<p>The following table provides a list of the MapR Drill ODBC Driver file
+locations and descriptions:</p>
+
+<table><thead>
+<tr>
+<th>File</th>
+<th>Description</th>
+</tr>
+</thead><tbody>
+<tr>
+<td><code>/opt/mapr/drillodbc/ErrorMessages</code></td>
+<td>Error messages files directory.</td>
+</tr>
+<tr>
+<td><code>/opt/mapr/drillodbc/Setup</code></td>
+<td>Sample configuration files directory.</td>
+</tr>
+<tr>
+<td><code>/opt/mapr/drillodbc/lib/32</code></td>
+<td>32-bit shared libraries directory.</td>
+</tr>
+<tr>
+<td><code>/opt/mapr/drillodbc/lib/64</code></td>
+<td>64-bit shared libraries directory.</td>
+</tr>
+</tbody></table>
+
+<h2 id="step-3:-setting-the-ld_library_path-environment-variable">Step 3: Setting the LD_LIBRARY_PATH Environment Variable</h2>
+
+<p>The <code>LD_LIBRARY_PATH</code> environment variable must include the paths to the
+following:</p>
+
+<ul>
+<li>Installed ODBC driver manager libraries</li>
+<li>Installed MapR ODBC Driver for Apache Drill shared libraries</li>
+</ul>
+
+<p><strong>Important:</strong> 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 <code>LD_LIBRARY PATH</code> at the same time. Only include the path to the shared libraries corresponding to the driver matching the bitness of the client application used.</p>
+
+<p>For example, if you are using a 64-bit client application and ODBC driver
+manager libraries are installed in<code>/usr/local/lib</code>, then set
+<code>LD_LIBRARY_PATH</code> as follows:<br>
+<code>export LD_LIBRARY_PATH=/usr/local/lib:/opt/simba/drillodbc/lib/64</code><br>
+Refer to your Linux shell documentation for details on how to set environment
+variables permanently.</p>
+
+<h4 id="next-step">Next Step</h4>
+
+<p>Complete the steps listed in <a href="/drill/docs/configuring-odbc-connections-for-linux-and-mac-os-x">Configuring ODBC Connections for Linux and Mac
+OS X</a>.</p>
+</div>
+
+
+<div id="footer" class="mw">
+<div class="wrapper">
+Copyright © 2012-2014 The Apache Software Foundation, licensed under the Apache License, Version 2.0.<br>
+Apache and the Apache feather logo are trademarks of The Apache Software Foundation. Other names appearing on the site may be trademarks of their respective owners.<br/><br/>
+</div>
+</div>
+
+<script>
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-53379651-1', 'auto');
+ga('send', 'pageview');
+</script>
+
+</body>
+</html>

Added: drill/site/trunk/content/drill/docs/installing-the-mapr-drill-odbc-driver-on-mac-os-x/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/installing-the-mapr-drill-odbc-driver-on-mac-os-x/index.html?rev=1662344&view=auto
==============================================================================
--- drill/site/trunk/content/drill/docs/installing-the-mapr-drill-odbc-driver-on-mac-os-x/index.html (added)
+++ drill/site/trunk/content/drill/docs/installing-the-mapr-drill-odbc-driver-on-mac-os-x/index.html Thu Feb 26 01:16:43 2015
@@ -0,0 +1,169 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+
+<meta charset="UTF-8">
+
+
+<title>Installing the MapR Drill ODBC Driver on Mac OS X - Apache Drill</title>
+
+<link href="/css/syntax.css" rel="stylesheet" type="text/css">
+<link href="/css/style.css" rel="stylesheet" type="text/css">
+<link href="/css/arrows.css" rel="stylesheet" type="text/css">
+<link href="/css/button.css" rel="stylesheet" type="text/css">
+
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<link rel="icon" href="/favicon.ico" type="image/x-icon">
+
+<script language="javascript" type="text/javascript" src="/js/lib/jquery-1.11.1.min.js"></script>
+<script language="javascript" type="text/javascript" src="/js/lib/jquery.easing.1.3.js"></script>
+<script language="javascript" type="text/javascript" src="/js/modernizr.custom.js"></script>
+<script language="javascript" type="text/javascript" src="/js/script.js"></script>
+
+</head>
+
+<body onResize="resized();">
+
+<div class="bui"></div>
+
+<div id="search">
+<input type="text" placeholder="Enter search term here">
+</div>
+
+<div id="menu" class="mw">
+<ul>
+  <li class="logo"><a href="/"></a></li>
+  <li>
+    <a href="/overview/">Documentation</a>
+    <ul>
+      <li><a href="/overview/">Overview&nbsp;&nbsp;&nbsp;&nbsp;</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+in+10+Minutes" target="_blank">Drill in 10 Minutes</a></li>
+      <li><a href="/why/">Why Drill? &nbsp;&nbsp;&nbsp;&nbsp;</a></li>
+      <li><a href="/architecture/">Architecture</a></li>
+    </ul>
+  </li>
+  <li>
+    <a href="/community/">Community</a>
+    <ul>
+      <li><a href="/team/">Team</a></li>
+      <li><a href="/community/#events">Events and Meetups</a></li>
+      <li><a href="/community/#mailinglists">Mailing Lists</a></li>
+      <li><a href="/community/#getinvolved">Get Involved</a></li>
+      <li><a href="https://issues.apache.org/jira/browse/DRILL/" target="_blank">Issue Tracker</a></li>
+      <li><a href="https://github.com/apache/drill" target="_blank">GitHub</a></li>
+    </ul>
+  </li>
+  <li><a href="/faq/">FAQ</a></li>
+  <li><a href="/blog/">Blog</a></li>
+  <li style="width:30px; padding-left: 2px; padding-right:10px"><a href="https://twitter.com/apachedrill" target="_blank"><img src="/images/twitterbw.png" alt="" align="center" width="22" style="padding: 0px 10px 1px 0px;"></a> </li>
+  <li class="l"><span>&nbsp;</span></li>
+  <li class="d"><a href="/download/">Download</a></li>
+</ul>
+</div>
+
+<div class="int_title">
+<h1>Installing the MapR Drill ODBC Driver on Mac OS X</h1>
+
+</div>
+
+<div class="int_text" align="left"><p>Install the MapR Drill ODBC Driver on the machine from which you connect to
+the Drill service.</p>
+
+<p>To install the MapR Drill ODBC Driver, complete the following steps:</p>
+
+<ul>
+<li>Step 1: Downloading the MapR Drill ODBC Driver </li>
+<li>Step 2: Installing the MapR Drill ODBC Driver </li>
+<li>Step 3: Updating the DYLD_LIBRARY_PATH Environment Variable</li>
+</ul>
+
+<p>After you complete the installation steps, complete the steps listed in
+<a href="/drill/docs/configuring-odbc-connections-for-linux-and-mac-os-x">Configuring ODBC Connections for Linux and Mac OS X</a>
+.</p>
+
+<p>Verify that your system meets the following prerequisites before you start.</p>
+
+<p><strong>System Requirements</strong></p>
+
+<ul>
+<li>Mac OS X version 10.6.8 or later</li>
+<li>100 MB of available disk space</li>
+<li>iODBC 3.52.7 or above</li>
+<li>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).<br>
+If not, create the following entry in <code>/etc/hosts</code> for the Drill node(s):<br>
+<code>&lt;drill-machine-IP&gt; &lt;drill-machine-hostname&gt;</code><br>
+Example: <code>127.0.1.1 apachedemo</code></li>
+</ul>
+
+<p>To install the driver, you need Administrator privileges on the computer.</p>
+
+<h2 id="step-1:-downloading-the-mapr-drill-odbc-driver">Step 1: Downloading the MapR Drill ODBC Driver</h2>
+
+<p>Click the following link to download the driver:</p>
+
+<ul>
+<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC.dmg">MapRDrillODBC.dmg</a></li>
+</ul>
+
+<h2 id="step-2:-installing-the-mapr-drill-odbc-driver">Step 2: Installing the MapR Drill ODBC Driver</h2>
+
+<p>To install the driver, complete the following steps:</p>
+
+<ol>
+<li>Double-click <code>MapRDrillODBC.dmg</code> to mount the disk image.</li>
+<li>Double-click <code>MapRDrillODBC.pkg</code> to run the Installer.</li>
+<li>Follow the instructions in the Installer to complete the installation process.</li>
+<li>When the installation completes, click <strong>Close.</strong></li>
+</ol>
+
+<p><strong>Note:</strong> MapR Drill ODBC Driver files install in the following locations:</p>
+
+<ul>
+<li><code>/opt/mapr/drillodbc/ErrorMessages</code> – Error messages files directory</li>
+<li><code>/opt/mapr/drillodbc/Setup</code> – Sample configuration files directory</li>
+<li><code>/opt/mapr/drillodbc/lib/universal</code> – Binaries directory</li>
+</ul>
+
+<h2 id="step-3:-updating-the-dyld_library_path-environment-variable">Step 3: Updating the DYLD_LIBRARY_PATH Environment Variable</h2>
+
+<p>The DYLD_LIBRARY_PATH environment variable must include paths to the following
+libraries:</p>
+
+<ul>
+<li>Installed ODBC driver manager libraries</li>
+<li>Installed MapR Drill ODBC Driver for Drill shared libraries</li>
+</ul>
+
+<p>For example, if the ODBC driver manager libraries are installed in
+<code>/usr/local/lib</code>, then set <code>DYLD_LIBRARY_PATH</code> to the following:</p>
+
+<p><code>export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/lib:/opt/mapr/drillodb
+c/lib/universal</code></p>
+
+<h4 id="next-step">Next Step</h4>
+
+<p>Complete the steps listed in <a href="/drill/docs/configuring-odbc-connections-for-linux-and-mac-os-x">Configuring ODBC Connections for Linux and Mac
+OS X</a>.</p>
+</div>
+
+
+<div id="footer" class="mw">
+<div class="wrapper">
+Copyright © 2012-2014 The Apache Software Foundation, licensed under the Apache License, Version 2.0.<br>
+Apache and the Apache feather logo are trademarks of The Apache Software Foundation. Other names appearing on the site may be trademarks of their respective owners.<br/><br/>
+</div>
+</div>
+
+<script>
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-53379651-1', 'auto');
+ga('send', 'pageview');
+</script>
+
+</body>
+</html>

Modified: drill/site/trunk/content/drill/docs/installing-the-mapr-sandbox-with-apache-drill-on-virtualbox/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/installing-the-mapr-sandbox-with-apache-drill-on-virtualbox/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/installing-the-mapr-sandbox-with-apache-drill-on-virtualbox/index.html (original)
+++ drill/site/trunk/content/drill/docs/installing-the-mapr-sandbox-with-apache-drill-on-virtualbox/index.html Thu Feb 26 01:16:43 2015
@@ -74,23 +74,20 @@ enabled, which allows you to access the
 VirtualBox:</p>
 
 <ol>
-<li><p>Download the MapR Sandbox with Apache Drill file to a directory on your machine:<br>
-<a href="https://www.mapr.com/products/mapr-sandbox-hadoop/download-sandbox-drill">https://www.mapr.com/products/mapr-sandbox-hadoop/download-sandbox-drill</a></p></li>
-<li><p>Open the virtual machine player.</p></li>
+<li>Download the MapR Sandbox with Apache Drill file to a directory on your machine:<br>
+<a href="https://www.mapr.com/products/mapr-sandbox-hadoop/download-sandbox-drill">https://www.mapr.com/products/mapr-sandbox-hadoop/download-sandbox-drill</a></li>
+<li>Open the virtual machine player.</li>
 <li><p>Select <strong>File &gt; Import Appliance</strong>. The Import Virtual Appliance dialog appears.</p>
 
-<p><img src="../../../img/vbImport.png" alt=""></p></li>
+<p><img src="/docs/img/vbImport.png" alt="drill query flow"></p></li>
 <li><p>Navigate to the directory where you downloaded the MapR Sandbox with Apache Drill and click <strong>Next</strong>. The Appliance Settings window appears.</p>
 
-<p><img src="../../../img/vbapplSettings.png" alt=""></p></li>
+<p><img src="/docs/img/vbApplSettings.png" alt="drill query flow"></p></li>
 <li><p>Select the check box at the bottom of the screen: <strong>Reinitialize the MAC address of all network cards</strong>, then click <strong>Import</strong>. The Import Appliance imports the sandbox.</p></li>
 <li><p>When the import completes, select <strong>File &gt; Preferences</strong>. The VirtualBox - Settings dialog appears.</p>
 
-<p><img src="../../../img/vbNetwork.png" alt=""></p>
-
-<ol>
-<li>Select <strong>Network</strong>. </li>
-</ol>
+<p><img src="/docs/img/vbNetwork.png" alt="drill query flow"></p></li>
+<li><p>Select <strong>Network</strong>.  </p>
 
 <p>The correct setting depends on your network connectivity when you run the
 Sandbox. In general, if you are going to use a wired Ethernet connection,
@@ -99,37 +96,41 @@ network, select <strong>Host-only Networ
 Adapter</strong>. If no adapters appear, click the green** +** button to add the
 VirtualBox adapter.</p>
 
-<p><img src="../../../img/vbMaprSetting.png" alt="">
-8. Click **OK **to continue.
-9. Click <img src="https://lh5.googleusercontent.com/6TjVEW28MJhPud2Nc2ButYB_GDqKTnadaluSulg0Zb259MgN1IRCgIlo-kMAEJ7lGWHf2aqc-nIjUsUFlaXP-LceAIKE5owNqXUWxXS0WXcBLWzUqg5X1VIXXswajb6oWA" alt="">. The MapR-Sandbox-For-Apache-Drill-0.6.0-r2-4.0.1 - Settings dialog appears.</p>
-
-<p><img src="../../../img/vbGenSettings.png" alt=""><br>
-10. Click <strong>OK</strong> to continue.
-11. Click <strong>Start</strong>. It takes a few minutes for the MapR services to start. After the MapR services start and installation completes, the following screen appears:</p>
-
-<p><img src="../../../img/vbloginSandbox.png" alt="">
-12. 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).<br>
-If a DNS entry does not exist, create the entry for the Drill node(s).</p></li>
-</ol>
-<div class="highlight"><pre><code class="language-text" data-lang="text">* For Windows, create the entry in the %WINDIR%\system32\drivers\etc\hosts file.
+<p><img src="/docs/img/vbMaprSetting.png" alt="drill query flow"></p></li>
+<li><p>Click **OK **to continue.</p></li>
+<li><p>Click Settings.</p>
 
-* For Linux and Mac, create the entry in /etc/hosts.  
-</code></pre></div>
-<p><drill-machine-IP> <drill-machine-hostname><br>
-Example: <code>127.0.1.1 maprdemo</code></p>
+<p><img src="/docs/img/settings.png" alt="settings icon"><br>
+The MapR-Sandbox-For-Apache-Drill-0.6.0-r2-4.0.1 - Settings dialog appears.</p>
 
-<ol>
-<li><p>You can navigate to the URL provided or to <a href="http://localhost:8047">localhost:8047</a> to experience the Drill Web UI, or you can log into the sandbox through the command line.</p>
+<p><img src="/docs/img/vbGenSettings.png" alt="drill query flow">    </p></li>
+<li><p>Click <strong>OK</strong> to continue.</p></li>
+<li><p>Click <strong>Start</strong>. It takes a few minutes for the MapR services to start.   </p>
+
+<p>After the MapR services start and installation completes, the following screen appears:</p>
+
+<p><img src="/docs/img/vbloginSandBox.png" alt="drill query flow"></p></li>
+<li><p>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).  </p>
+
+<p>If a DNS entry does not exist, create the entry for the Drill node(s).</p>
+
+<ul>
+<li>For Windows, create the entry in the %WINDIR%\system32\drivers\etc\hosts file.</li>
+<li>For Linux and Mac, create the entry in /etc/hosts.<br>
+<drill-machine-IP> <drill-machine-hostname><br></li>
+</ul>
 
-<p>a. To navigate to the MapR Sandbox with Apache Drill, enter the provided URL in your browser&#39;s address bar.</p>
+<p>Example: <code>127.0.1.1 maprdemo</code></p></li>
+<li><p>You can navigate to the URL provided or to <a href="http://localhost:8047">localhost:8047</a> to experience the Drill Web UI, or you can log into the sandbox through the command line.  </p>
 
-<p>b. To log into the virtual machine and access the command line, enter Alt+F2 on Windows or Option+F5 on Mac. When prompted, enter <code>mapr</code> as the login and password.</p></li>
+<p>a. To navigate to the MapR Sandbox with Apache Drill, enter the provided URL in your browser&#39;s address bar.<br>
+b. To log into the virtual machine and access the command line, enter Alt+F2 on Windows or Option+F5 on Mac. When prompted, enter <code>mapr</code> as the login and password.</p></li>
 </ol>
 
 <h1 id="what&#39;s-next">What&#39;s Next</h1>
 
 <p>After downloading and installing the sandbox, continue with the tutorial by
-<a href="/confluence/display/DRILL/Getting+to+Know+the+Drill+Setup">Getting to Know the Drill
+<a href="/drill/docs/getting-to-know-the-drill-sandbox">Getting to Know the Drill
 Setup</a>.</p>
 </div>
 

Modified: drill/site/trunk/content/drill/docs/installing-the-mapr-sandbox-with-apache-drill-on-vmware-player-vmware-fusion/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/installing-the-mapr-sandbox-with-apache-drill-on-vmware-player-vmware-fusion/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/installing-the-mapr-sandbox-with-apache-drill-on-vmware-player-vmware-fusion/index.html (original)
+++ drill/site/trunk/content/drill/docs/installing-the-mapr-sandbox-with-apache-drill-on-vmware-player-vmware-fusion/index.html Thu Feb 26 01:16:43 2015
@@ -71,63 +71,50 @@
 VMware Player or VMware Fusion:</p>
 
 <ol>
-<li><p>Download the MapR Sandbox with Drill file to a directory on your machine:<br>
-<a href="https://www.mapr.com/products/mapr-sandbox-hadoop/download-sandbox-drill">https://www.mapr.com/products/mapr-sandbox-hadoop/download-sandbox-drill</a></p></li>
-<li><p>Open the virtual machine player, and select the *<em>Open a Virtual Machine *</em>option.</p></li>
-</ol>
-
-<p>Tip for VMware Fusion</p>
+<li>Download the MapR Sandbox with Drill file to a directory on your machine:<br>
+<a href="https://www.mapr.com/products/mapr-sandbox-hadoop/download-sandbox-drill">https://www.mapr.com/products/mapr-sandbox-hadoop/download-sandbox-drill</a></li>
+<li><p>Open the virtual machine player, and select the *<em>Open a Virtual Machine *</em>option.  </p>
 
-<p>If you are running VMware Fusion, select** Import**.</p>
+<p><strong>Tip for VMware Fusion</strong>  </p>
 
-<p><img src="../../../img/vmWelcome.png" alt=""></p>
+<p>If you are running VMware Fusion, select** Import**.  </p>
 
-<ol>
-<li>Navigate to the directory where you downloaded the MapR Sandbox with Apache Drill file, and select <code>MapR-Sandbox-For-Apache-Drill-4.0.1_VM.ova</code>.</li>
-</ol>
+<p><img src="/docs/img/vmWelcome.png" alt="drill query flow"></p></li>
+<li><p>Navigate to the directory where you downloaded the MapR Sandbox with Apache Drill file, and select <code>MapR-Sandbox-For-Apache-Drill-4.0.1_VM.ova</code>.</p>
 
-<p><img src="../../../img/vmShare.png" alt=""></p>
+<p><img src="/docs/img/vmShare.png" alt="drill query flow"></p>
 
-<p>The Import Virtual Machine dialog appears.</p>
-
-<ol>
-<li>Click <strong>Import</strong>. The virtual machine player imports the sandbox.</li>
-</ol>
+<p>The Import Virtual Machine dialog appears.</p></li>
+<li><p>Click <strong>Import</strong>. The virtual machine player imports the sandbox.</p>
 
-<p><img src="../../../img/vmLibrary.png" alt=""></p>
+<p><img src="/docs/img/vmLibrary.png" alt="drill query flow"></p></li>
+<li><p>Select <code>MapR-Sandbox-For-Apache-Drill-4.0.1_VM</code>, and click <strong>Play virtual machine</strong>. It takes a few minutes for the MapR services to start.  </p>
 
-<ol>
-<li>Select <code>MapR-Sandbox-For-Apache-Drill-4.0.1_VM</code>, and click <strong>Play virtual machine</strong>. It takes a few minutes for the MapR services to start.<br>
-After the MapR services start and installation completes, the following screen
-appears:</li>
-</ol>
+<p>After the MapR services start and installation completes, the following screen
+appears:</p>
 
-<p><img src="../../../img/loginSandbox.png" alt=""></p>
+<p><img src="/docs/img/loginSandBox.png" alt="drill query flow"></p>
 
 <p>Note the URL provided in the screen, which corresponds to the Web UI in Apache
-Drill.</p>
+Drill.</p></li>
+<li><p>Verify that a DNS entry was created on the host machine for the virtual machine. If not, create the entry.</p>
 
-<ol>
-<li>Verify that a DNS entry was created on the host machine for the virtual machine. If not, create the entry.</li>
-</ol>
-<div class="highlight"><pre><code class="language-text" data-lang="text">* For Linux and Mac, create the entry in `/etc/hosts`.  
-
-* For WIndows, create the entry in the `%WINDIR%\system32\drivers\etc\hosts` file.  
-</code></pre></div>
-<p>Example: <code>127.0.1.1 &lt;vm_hostname&gt;</code></p>
-
-<ol>
-<li><p>You can navigate to the URL provided to experience Drill Web UI or you can login to the sandbox through the command line.</p>
+<ul>
+<li>For Linux and Mac, create the entry in <code>/etc/hosts</code>.<br></li>
+<li>For Windows, create the entry in the <code>%WINDIR%\system32\drivers\etc\hosts</code> file.<br></li>
+</ul>
 
-<p>a. To navigate to the MapR Sandbox with Apache Drill, enter the provided URL in your browser&#39;s address bar.  </p>
+<p>For example: <code>127.0.1.1 &lt;vm_hostname&gt;</code></p></li>
+<li><p>You can navigate to the URL provided to experience Drill Web UI or you can login to the sandbox through the command line.  </p>
 
-<p>b. To login to the virtual machine and access the command line, press Alt+F2 on Windows or Option+F5 on Mac. When prompted, enter <code>mapr</code> as the login and password.</p></li>
+<p>a. To navigate to the MapR Sandbox with Apache Drill, enter the provided URL in your browser&#39;s address bar.<br>
+b. To login to the virtual machine and access the command line, press Alt+F2 on Windows or Option+F5 on Mac. When prompted, enter <code>mapr</code> as the login and password.</p></li>
 </ol>
 
-<h1 id="what&#39;s-next">What&#39;s Next</h1>
+<h2 id="what&#39;s-next">What&#39;s Next</h2>
 
 <p>After downloading and installing the sandbox, continue with the tutorial by
-<a href="/confluence/display/DRILL/Getting+to+Know+the+Drill+Setup">Getting to Know the Drill
+<a href="/drill/docs/getting-to-know-the-drill-sandbox">Getting to Know the Drill
 Setup</a>.</p>
 </div>
 

Modified: drill/site/trunk/content/drill/docs/kvgen-function/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/kvgen-function/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/kvgen-function/index.html (original)
+++ drill/site/trunk/content/drill/docs/kvgen-function/index.html Thu Feb 26 01:16:43 2015
@@ -75,7 +75,7 @@ a map with a wide set of columns into an
 
 <p>In turn, you can write analytic queries that return a subset of the generated
 keys or constrain the keys in some way. For example, you can use the
-<a href="/confluence/display/DRILL/FLATTEN+Function">FLATTEN</a> function to break the
+<a href="/drill/docs/flatten-function">FLATTEN</a> function to break the
 array down into multiple distinct rows and further query those rows.</p>
 
 <p>For example, assume that a JSON file contains this data:  </p>
@@ -86,7 +86,7 @@ array down into multiple distinct rows a
 <div class="highlight"><pre><code class="language-text" data-lang="text">[{&quot;key&quot;: &quot;a&quot;, &quot;value&quot;: &quot;valA&quot;}, {&quot;key&quot;: &quot;b&quot;, &quot;value&quot;: &quot;valB&quot;}]
 [{&quot;key&quot;: &quot;c&quot;, &quot;value&quot;: &quot;valC&quot;}, {&quot;key&quot;: &quot;d&quot;, &quot;value&quot;: &quot;valD&quot;}]
 </code></pre></div>
-<p>Applying the <a href="/confluence/display/DRILL/FLATTEN+Function">FLATTEN</a> function to
+<p>Applying the <a href="/drill/docs/flatten-function">FLATTEN</a> function to
 this data would return:</p>
 <div class="highlight"><pre><code class="language-text" data-lang="text">{&quot;key&quot;: &quot;a&quot;, &quot;value&quot;: &quot;valA&quot;}
 {&quot;key&quot;: &quot;b&quot;, &quot;value&quot;: &quot;valB&quot;}
@@ -200,7 +200,7 @@ distinct rows:</p>
 +------------+
 9 rows selected (0.151 seconds)
 </code></pre></div>
-<p>See the description of <a href="/confluence/display/DRILL/FLATTEN+Function">FLATTEN</a>
+<p>See the description of <a href="/drill/docs/flatten-function">FLATTEN</a>
 for an example of a query against the flattened data.</p>
 </div>
 

Modified: drill/site/trunk/content/drill/docs/lession-1-learn-about-the-data-set/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/lession-1-learn-about-the-data-set/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/lession-1-learn-about-the-data-set/index.html (original)
+++ drill/site/trunk/content/drill/docs/lession-1-learn-about-the-data-set/index.html Thu Feb 26 01:16:43 2015
@@ -78,9 +78,9 @@ format.</p>
 <p>The data set for the tutorial consists of:</p>
 
 <ul>
-<li><p>Transactional data: stored as a Hive table</p></li>
-<li><p>Product catalog and master customer data: stored as MapR-DB tables</p></li>
-<li><p>Clickstream and logs data: stored in the MapR file system as JSON files</p></li>
+<li>Transactional data: stored as a Hive table</li>
+<li>Product catalog and master customer data: stored as MapR-DB tables</li>
+<li>Clickstream and logs data: stored in the MapR file system as JSON files</li>
 </ul>
 
 <h2 id="queries-in-this-lesson">Queries in This Lesson</h2>
@@ -217,31 +217,7 @@ duplicate schemas for it in Hive!</p>
 
 <p>The products table has two column families.</p>
 
-<p>Column Family|Columns  </p>
-
-<p>---|---  </p>
-
-<p>details</p>
-
-<table><thead>
-<tr>
-</tr>
-</thead><tbody>
-</tbody></table>
-
-<p>name</p>
-
-<p>category  </p>
-
-<p>pricing</p>
-
-<table><thead>
-<tr>
-</tr>
-</thead><tbody>
-</tbody></table>
-
-<p>price  </p>
+<table ><colgroup><col /><col /></colgroup><tbody><tr><td ><span style="color: rgb(0,0,0);">Column Family</span></td><td ><span style="color: rgb(0,0,0);">Columns</span></td></tr><tr><td ><span style="color: rgb(0,0,0);">details</span></td><td ><span style="color: rgb(0,0,0);">name</br></span><span style="color: rgb(0,0,0);">category</span></td></tr><tr><td ><span style="color: rgb(0,0,0);">pricing</span></td><td ><span style="color: rgb(0,0,0);">price</span></td></tr></tbody></table>  
 
 <p>The products table contains 965 rows.</p>
 
@@ -249,33 +225,8 @@ duplicate schemas for it in Hive!</p>
 
 <p>The Customers table has three column families.</p>
 
-<table><thead>
-<tr>
-<th>Column Family</th>
-<th>Columns</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>address</td>
-<td>state</td>
-</tr>
-<tr>
-<td>loyalty</td>
-<td>agg_rev</td>
-</tr>
-<tr>
-<td></td>
-<td>membership</td>
-</tr>
-<tr>
-<td>personal</td>
-<td>age</td>
-</tr>
-<tr>
-<td></td>
-<td>gender</td>
-</tr>
-</tbody></table>
+<table ><colgroup><col /><col /></colgroup><tbody><tr><td ><span style="color: rgb(0,0,0);">Column Family</span></td><td ><span style="color: rgb(0,0,0);">Columns</span></td></tr><tr><td ><span style="color: rgb(0,0,0);">address</span></td><td ><span style="color: rgb(0,0,0);">state</span></td></tr><tr><td ><span style="color: rgb(0,0,0);">loyalty</span></td><td ><span style="color: rgb(0,0,0);">agg_rev</br></span><span style="color: rgb(0,0,0);">membership</span></td></tr><tr><td ><span style="color: rgb(0,0,0);">personal</span></td><td ><span style="color: rgb(0,0,0);">age</br></span><span style="color: rgb(0,0,0);">gender</span></td></tr></tbody></table>  
+  
 
 <p>The customers table contains 993 rows.</p>
 
@@ -437,9 +388,9 @@ one file, logs data is stored as partiti
 The logs directory has three subdirectories:</p>
 
 <ul>
-<li><p>2012</p></li>
-<li><p>2013</p></li>
-<li><p>2014</p></li>
+<li>2012</li>
+<li>2013</li>
+<li>2014</li>
 </ul>
 
 <p>Each of these year directories fans out to a set of numbered month
@@ -489,7 +440,7 @@ subdirectories to return the total numbe
 
 <h1 id="what&#39;s-next">What&#39;s Next</h1>
 
-<p>Go to <a href="/confluence/display/DRILL/Lesson+2%3A+Run+Queries+with+ANSI+SQL">Lesson 2: Run Queries with ANSI
+<p>Go to <a href="/drill/docs/lession-2-run-queries-with-ansi-sql">Lesson 2: Run Queries with ANSI
 SQL</a>.</p>
 </div>
 

Modified: drill/site/trunk/content/drill/docs/lession-2-run-queries-with-ansi-sql/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/lession-2-run-queries-with-ansi-sql/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/lession-2-run-queries-with-ansi-sql/index.html (original)
+++ drill/site/trunk/content/drill/docs/lession-2-run-queries-with-ansi-sql/index.html Thu Feb 26 01:16:43 2015
@@ -83,10 +83,10 @@ also how you can combine data from diffe
 statement.</p>
 
 <ul>
-<li><p>Show an aggregate query on a single file or table. Use GROUP BY, WHERE, HAVING, and ORDER BY clauses.</p></li>
-<li><p>Perform joins between Hive, MapR-DB, and file system data sources.</p></li>
-<li><p>Use table and column aliases.</p></li>
-<li><p>Create a Drill view.</p></li>
+<li>Show an aggregate query on a single file or table. Use GROUP BY, WHERE, HAVING, and ORDER BY clauses.</li>
+<li>Perform joins between Hive, MapR-DB, and file system data sources.</li>
+<li>Use table and column aliases.</li>
+<li>Create a Drill view.</li>
 </ul>
 
 <h2 id="aggregation">Aggregation</h2>
@@ -374,7 +374,7 @@ selectable “columns” in it.</p
 
 <h2 id="query-across-data-sources">Query Across Data Sources</h2>
 
-<p>Continue using dfs.views for this query.</p>
+<p>Continue using <code>dfs.views</code> for this query.</p>
 
 <h3 id="join-the-customers-view-and-the-orders-table:">Join the customers view and the orders table:</h3>
 <div class="highlight"><pre><code class="language-text" data-lang="text">0: jdbc:drill:&gt; select membership, sum(order_total) as sales from hive.orders, custview
@@ -432,9 +432,9 @@ hive.orders table is also visible to the
 workspace, so the query specifies the full path to the file:</p>
 <div class="highlight"><pre><code class="language-text" data-lang="text">dfs.`/mapr/demo.mapr.com/data/nested/clicks/clicks.json`
 </code></pre></div>
-<h1 id="what&#39;s-next">What&#39;s Next</h1>
+<h2 id="what&#39;s-next">What&#39;s Next</h2>
 
-<p>Go to <a href="/confluence/display/DRILL/%0ALesson+3%3A+Run+Queries+on+Complex+Data+Types">Lesson 3: Run Queries on Complex Data Types</a>. </p>
+<p>Go to <a href="/drill/docs/lession-3-run-queries-on-complex-data-types">Lesson 3: Run Queries on Complex Data Types</a>. </p>
 </div>
 
 

Modified: drill/site/trunk/content/drill/docs/lession-3-run-queries-on-complex-data-types/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/lession-3-run-queries-on-complex-data-types/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/lession-3-run-queries-on-complex-data-types/index.html (original)
+++ drill/site/trunk/content/drill/docs/lession-3-run-queries-on-complex-data-types/index.html Thu Feb 26 01:16:43 2015
@@ -100,7 +100,7 @@ workspace path:</p>
 of the file system. No up-front definitions are required on what partitions
 exist. Here is a visual example of how this works:</p>
 
-<p><img src="../../img/example_query.png" alt="example_query.png"></p>
+<p><img src="/docs/img/example_query.png" alt="drill query flow"></p>
 
 <h3 id="set-workspace-to-dfs.logs:">Set workspace to dfs.logs:</h3>
 <div class="highlight"><pre><code class="language-text" data-lang="text">0: jdbc:drill:&gt; use dfs.logs;
@@ -248,7 +248,7 @@ shows how you to access this kind of dat
 
 <h2 id="query-arrays">Query Arrays</h2>
 
-<p>Now use the [ n ] notation, where n is the position of the value in an array,
+<p>Now use the [n] notation, where n is the position of the value in an array,
 starting from position 0 (not 1) for the first value. You can use this
 notation to write interesting queries against nested array data.</p>
 
@@ -331,7 +331,7 @@ where t.trans_info.purch_flag = &#39;tru
 | 17192 | 2014-04-22 | 2501 | AOS4.2 | 26 | true |
 ...
 </code></pre></div>
-<p>This query uses a Drill SQL extension, the repeated_count function, to get an
+<p>This query uses an SQL extension, the repeated_count function, to get an
 aggregated count of the array values. The query returns the number of products
 searched for each session that converted into a purchase and ranks the counts
 in descending order. Only clicks that have resulted in a purchase are counted.</p>
@@ -413,13 +413,13 @@ drwxr-xr-x. 4 root root      2 Sep 15 13
 </code></pre></div>
 <p>Note that the table is stored in a file called <code>0_0_0.parquet</code>. This file is
 stored in the location defined by the dfs.clicks workspace:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">&quot;location&quot;: &quot;http://demo.mapr.com/data/nested)&quot;
+<div class="highlight"><pre><code class="language-text" data-lang="text">&quot;location&quot;: &quot;http://demo.mapr.com/data/nested&quot;
 </code></pre></div>
 <p>with a subdirectory that has the same name as the table you created.</p>
 
 <h2 id="what&#39;s-next">What&#39;s Next</h2>
 
-<p>Complete the tutorial with the <a href="/confluence/display/DRILL/Summary">Summary</a>.</p>
+<p>Complete the tutorial with the <a href="/drill/docs/summary">Summary</a>.</p>
 </div>
 
 

Modified: drill/site/trunk/content/drill/docs/manage-drill/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/manage-drill/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/manage-drill/index.html (original)
+++ drill/site/trunk/content/drill/docs/manage-drill/index.html Thu Feb 26 01:16:43 2015
@@ -75,17 +75,6 @@ is stored in CSV or JSON format.</p>
 <p>You can use certain SQL commands to manage Drill from within the Drill shell
 (SQLLine). You can also modify Drill configuration options, such as memory
 allocation, in Drill&#39;s configuration files.</p>
-
-<p>Refer to the following documentation for information about managing Drill in
-your cluster:</p>
-
-<ul>
-<li><a href="/confluence/display/DRILL/Configuration+Options">Configuration Options</a></li>
-<li><a href="/confluence/pages/viewpage.action?pageId=44994063">Starting/Stopping Drill</a></li>
-<li><a href="/confluence/display/DRILL/Ports+Used+by+Drill">Ports Used by Drill</a></li>
-<li><a href="/confluence/display/DRILL/Partition+Pruning">Partition Pruning</a></li>
-<li><a href="/confluence/display/DRILL/Monitoring+and+Canceling+Queries+in+the+Drill+Web+UI">Monitoring and Canceling Queries in the Drill Web UI</a></li>
-</ul>
 </div>
 
 

Modified: drill/site/trunk/content/drill/docs/mapr-db-plugin-for-apache-drill/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/mapr-db-plugin-for-apache-drill/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/mapr-db-plugin-for-apache-drill/index.html (original)
+++ drill/site/trunk/content/drill/docs/mapr-db-plugin-for-apache-drill/index.html Thu Feb 26 01:16:43 2015
@@ -68,8 +68,7 @@
 </div>
 
 <div class="int_text" align="left"><p>Drill includes a <code>maprdb</code> format plugin for MapR-DB that is defined within the
-default <code>dfs</code> storage plugin instance when you install Drill from the <code>mapr-
-drill</code> package on a MapR node. The <code>maprdb</code> format plugin improves the
+default <code>dfs</code> storage plugin instance when you install Drill from the <code>mapr-drill</code> package on a MapR node. The <code>maprdb</code> format plugin improves the
 estimated number of rows that Drill uses to plan a query. It also enables you
 to query tables like you would query files in a file system because MapR-DB
 and MapR-FS share the same namespace.</p>
@@ -91,9 +90,9 @@ which you can view in the Drill Web UI.
 in the Web UI to view the configuration for the <code>dfs</code> instance.</p>
 
 <p>The following image shows a portion of the configuration with the <code>maprdb</code>
-format plugin for the<code>dfs</code> instance:</p>
+format plugin for the <code>dfs</code> instance:</p>
 
-<p><img src="../../img/18.png" alt=""></p>
+<p><img src="/docs/img/18.png" alt="drill query flow"></p>
 </div>
 
 

Modified: drill/site/trunk/content/drill/docs/memory-allocation/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/memory-allocation/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/memory-allocation/index.html (original)
+++ drill/site/trunk/content/drill/docs/memory-allocation/index.html Thu Feb 26 01:16:43 2015
@@ -81,7 +81,7 @@ is written to disk during each phase of
 a Drillbit. The on-heap memory for Drill is only about 4-8G, which should
 suffice because Drill avoids having data sit in heap memory.</p>
 
-<h4 id="modifying-drillbit-memory">Modifying Drillbit Memory</h4>
+<h2 id="modifying-drillbit-memory">Modifying Drillbit Memory</h2>
 
 <p>You can modify memory for each Drillbit node in your cluster. To modify the
 memory for a Drillbit, edit the <code>XX:MaxDirectMemorySize</code> parameter in the
@@ -90,7 +90,7 @@ env.sh</code>.</p>
 
 <p><strong>Note:</strong> If this parameter is not set, the limit depends on the amount of available system memory.</p>
 
-<p>After you edit <code>&lt;drill_installation_directory&gt;/conf/drill-env.sh</code>, <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=44994063">restart
+<p>After you edit <code>&lt;drill_installation_directory&gt;/conf/drill-env.sh</code>, <a href="/drill/docs/starting-stopping-drill#starting-a-drillbit">restart
 the Drillbit
 </a>on
 the node.</p>

Modified: drill/site/trunk/content/drill/docs/mongodb-plugin-for-apache-drill/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/mongodb-plugin-for-apache-drill/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/mongodb-plugin-for-apache-drill/index.html (original)
+++ drill/site/trunk/content/drill/docs/mongodb-plugin-for-apache-drill/index.html Thu Feb 26 01:16:43 2015
@@ -67,7 +67,7 @@
 
 </div>
 
-<div class="int_text" align="left"><h1 id="overview">Overview</h1>
+<div class="int_text" align="left"><h2 id="overview">Overview</h2>
 
 <p>You can leverage the power of Apache Drill to query data without any upfront
 schema definitions. Drill enables you to create an architecture that works
@@ -80,7 +80,7 @@ on the data using ANSI SQL.</p>
 
 <p>This tutorial assumes that you have Drill installed locally (embedded mode),
 as well as MongoDB. Examples in this tutorial use zip code aggregation data
-provided by MongDB. Before You Begin provides links to download tools and data
+provided by MongoDB. Before You Begin provides links to download tools and data
 used throughout the tutorial.</p>
 
 <p><strong>Note:</strong> A local instance of Drill is used in this tutorial for simplicity. You can also run Drill and MongoDB together in distributed mode.</p>
@@ -92,9 +92,9 @@ installed on your machine. You may also
 data to run the example queries on your machine.</p>
 
 <ol>
-<li><a href="https://cwiki.apache.org/confluence/display/DRILL/Installing+Drill+in+Embedded+Mode">Install Drill</a>, if you do not already have it installed on your machine.</li>
-<li><a href="http://docs.mongodb.org/manual/installation/">Install MongoDB</a>, if you do not already have it installed on your machine.</li>
-<li><a href="http://docs.mongodb.org/manual/tutorial/aggregation-zip-code-data-set/">Import the MongoDB zip code sample data set</a>. You can use Mongo Import to get the data. </li>
+<li><a href="/drill/docs/installing-drill-in-embedded-mode">Install Drill</a>, if you do not already have it installed on your machine.</li>
+<li><a href="http://docs.mongodb.org/manual/installation">Install MongoDB</a>, if you do not already have it installed on your machine.</li>
+<li><a href="http://docs.mongodb.org/manual/tutorial/aggregation-zip-code-data-set">Import the MongoDB zip code sample data set</a>. You can use Mongo Import to get the data. </li>
 </ol>
 
 <h2 id="configuring-mongodb">Configuring MongoDB</h2>
@@ -108,9 +108,9 @@ UI to connect to Drill. Drill must be ru
 <li><p>Navigate to <code>&lt;drill_installation_directory&gt;/drill-&lt;version&gt;,</code> and enter the following command to invoke SQLLine and start Drill:</p>
 <div class="highlight"><pre><code class="language-text" data-lang="text">bin/sqlline -u jdbc:drill:zk=local -n admin -p admin
 </code></pre></div>
-<p>When Drill starts, the following prompt appears:<br>
-<code>0: jdbc:drill:zk=local&gt;  
-</code>Do not enter any commands. You will return to the command prompt after
+<p>When Drill starts, the following prompt appears: <code>0: jdbc:drill:zk=local&gt;</code></p>
+
+<p>Do not enter any commands. You will return to the command prompt after
 completing the configuration in the Drill Web UI.</p></li>
 <li><p>Open a browser window, and navigate to the Drill Web UI at <code>http://localhost:8047</code>.</p></li>
 <li><p>In the navigation bar, click <strong>Storage</strong>.</p></li>
@@ -125,7 +125,7 @@ completing the configuration in the Dril
 }
 </code></pre></div>
 <p><strong>Note:</strong> 27017 is the default port for <code>mongodb</code> instances. </p></li>
-<li><p>Click <strong>Enable **to enable the instance, and save the</strong> **configuration.</p></li>
+<li><p>Click <strong>Enable</strong> to enable the instance, and save the configuration.</p></li>
 <li><p>Navigate back to the Drill command line so you can query MongoDB.</p></li>
 </ol>
 
@@ -154,7 +154,7 @@ the <code>USE</code> command to change s
 
 <p>The following example queries are included for reference. However, you can use
 the SQL power of Apache Drill directly on MongoDB. For more information about,
-refer to the <a href="https://cwiki.apache.org/confluence/display/DRILL/SQL+Reference">Apache Drill SQL
+refer to the <a href="/drill/docs/sql-reference">SQL
 Reference</a>.</p>
 
 <p><strong>Example 1: View mongo.zipdb Dataset</strong></p>
@@ -174,7 +174,8 @@ Reference</a>.</p>
 | { &quot;city&quot; : &quot;CHICOPEE&quot; , &quot;loc&quot; : [ -72.576142 , 42.176443] , &quot;pop&quot; : 31495 , &quot;state&quot; : &quot;MA&quot;} |
 </code></pre></div>
 <p><strong>Example 2: Aggregation</strong></p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">0: jdbc:drill:zk=local&gt; select state,city,avg(pop)     +------------+------------+------------+
+<div class="highlight"><pre><code class="language-text" data-lang="text">0: jdbc:drill:zk=local&gt; select state,city,avg(pop)
++------------+------------+------------+
 |   state    |    city    |   EXPR$2   |
 +------------+------------+------------+
 | MA         | AGAWAM     | 15338.0    |
@@ -227,7 +228,7 @@ Reference</a>.</p>
 <p>You can leverage the power of Apache Drill to query MongoDB through standard
 BI tools, such as Tableau and SQuirreL.</p>
 
-<p>For information about Drill ODBC and JDBC drivers, refer to <a href="https://cwiki.apache.org/confluence/display/DRILL/Drill+Interfaces">Drill Interfaces</a>.</p>
+<p>For information about Drill ODBC and JDBC drivers, refer to <a href="/drill/docs/odbc-jdbc-interfaces">Drill Interfaces</a>.</p>
 </div>
 
 

Modified: drill/site/trunk/content/drill/docs/monitoring-and-canceling-queries-in-the-drill-web-ui/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/monitoring-and-canceling-queries-in-the-drill-web-ui/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/monitoring-and-canceling-queries-in-the-drill-web-ui/index.html (original)
+++ drill/site/trunk/content/drill/docs/monitoring-and-canceling-queries-in-the-drill-web-ui/index.html Thu Feb 26 01:16:43 2015
@@ -80,14 +80,14 @@ When you access the Drill Web UI, you se
 running in your cluster, such as the nodes running the Drillbit process, the
 various ports Drill is using, and the amount of direct memory assigned to
 Drill.<br>
-<img src="../../img/7.png" alt=""></p></li>
-<li><p>Select <strong>Profiles</strong> in the toolbar. A list of running and completed queries appears. Drill assigns a query ID to each query and lists the Foreman node. The Foreman is the Drillbit node that receives the query from the client or application. The Foreman drives the entire query.<br>
-<img src="../../img/51.png" alt=""></p></li>
+<img src="/docs/img/7.png" alt="drill query flow"></p></li>
+<li><p>Select <strong>Profiles</strong> in the toolbar. A list of running and completed queries appears. Drill assigns a query ID to each query and lists the Foreman node. The Foreman is the Drillbit node that receives the query from the client or application. The Foreman drives the entire query.
+<img src="/docs/img/51.png" alt="drill query flow">  </p></li>
 <li><p>Click the <strong>Query ID</strong> for the query that you want to monitor or cancel. The Query and Planning window appears.<br>
-<img src="../../img/4.png" alt=""></p></li>
+<img src="/docs/img/4.png" alt="drill query flow"></p></li>
 <li><p>Select <strong>Edit Query</strong>.</p></li>
-<li><p>Click <strong>Cancel query **to cancel the</strong> **query. The following message appears:<br>
-<img src="../../img/46.png" alt=""></p></li>
+<li><p>Click <strong>Cancel query **to cancel the</strong> query. The following message appears:
+<img src="/docs/img/46.png" alt="drill query flow">  </p></li>
 <li><p>Optionally, you can re-run the query to see a query summary in this window.</p></li>
 </ol>
 </div>

Modified: drill/site/trunk/content/drill/docs/nested-data-functions/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/nested-data-functions/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/nested-data-functions/index.html (original)
+++ drill/site/trunk/content/drill/docs/nested-data-functions/index.html Thu Feb 26 01:16:43 2015
@@ -71,9 +71,9 @@
 analyze nested data:</p>
 
 <ul>
-<li><a href="/confluence/display/DRILL/FLATTEN+Function">FLATTEN Function</a></li>
-<li><a href="/confluence/display/DRILL/KVGEN+Function">KVGEN Function</a></li>
-<li><a href="/confluence/display/DRILL/REPEATED_COUNT+Function">REPEATED_COUNT Function</a></li>
+<li><a href="/drill/docs/flatten-function">FLATTEN Function</a></li>
+<li><a href="/drill/docs/kvgen-function">KVGEN Function</a></li>
+<li><a href="/drill/docs/repeated-count-function">REPEATED_COUNT Function</a></li>
 </ul>
 </div>
 

Added: drill/site/trunk/content/drill/docs/odbc-jdbc-interfaces/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/odbc-jdbc-interfaces/index.html?rev=1662344&view=auto
==============================================================================
--- drill/site/trunk/content/drill/docs/odbc-jdbc-interfaces/index.html (added)
+++ drill/site/trunk/content/drill/docs/odbc-jdbc-interfaces/index.html Thu Feb 26 01:16:43 2015
@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+
+<meta charset="UTF-8">
+
+
+<title>ODBC/JDBC Interfaces - Apache Drill</title>
+
+<link href="/css/syntax.css" rel="stylesheet" type="text/css">
+<link href="/css/style.css" rel="stylesheet" type="text/css">
+<link href="/css/arrows.css" rel="stylesheet" type="text/css">
+<link href="/css/button.css" rel="stylesheet" type="text/css">
+
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<link rel="icon" href="/favicon.ico" type="image/x-icon">
+
+<script language="javascript" type="text/javascript" src="/js/lib/jquery-1.11.1.min.js"></script>
+<script language="javascript" type="text/javascript" src="/js/lib/jquery.easing.1.3.js"></script>
+<script language="javascript" type="text/javascript" src="/js/modernizr.custom.js"></script>
+<script language="javascript" type="text/javascript" src="/js/script.js"></script>
+
+</head>
+
+<body onResize="resized();">
+
+<div class="bui"></div>
+
+<div id="search">
+<input type="text" placeholder="Enter search term here">
+</div>
+
+<div id="menu" class="mw">
+<ul>
+  <li class="logo"><a href="/"></a></li>
+  <li>
+    <a href="/overview/">Documentation</a>
+    <ul>
+      <li><a href="/overview/">Overview&nbsp;&nbsp;&nbsp;&nbsp;</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+in+10+Minutes" target="_blank">Drill in 10 Minutes</a></li>
+      <li><a href="/why/">Why Drill? &nbsp;&nbsp;&nbsp;&nbsp;</a></li>
+      <li><a href="/architecture/">Architecture</a></li>
+    </ul>
+  </li>
+  <li>
+    <a href="/community/">Community</a>
+    <ul>
+      <li><a href="/team/">Team</a></li>
+      <li><a href="/community/#events">Events and Meetups</a></li>
+      <li><a href="/community/#mailinglists">Mailing Lists</a></li>
+      <li><a href="/community/#getinvolved">Get Involved</a></li>
+      <li><a href="https://issues.apache.org/jira/browse/DRILL/" target="_blank">Issue Tracker</a></li>
+      <li><a href="https://github.com/apache/drill" target="_blank">GitHub</a></li>
+    </ul>
+  </li>
+  <li><a href="/faq/">FAQ</a></li>
+  <li><a href="/blog/">Blog</a></li>
+  <li style="width:30px; padding-left: 2px; padding-right:10px"><a href="https://twitter.com/apachedrill" target="_blank"><img src="/images/twitterbw.png" alt="" align="center" width="22" style="padding: 0px 10px 1px 0px;"></a> </li>
+  <li class="l"><span>&nbsp;</span></li>
+  <li class="d"><a href="/download/">Download</a></li>
+</ul>
+</div>
+
+<div class="int_title">
+<h1>ODBC/JDBC Interfaces</h1>
+
+</div>
+
+<div class="int_text" align="left"><p>You can connect to Apache Drill through the following interfaces:</p>
+
+<ul>
+<li>Drill shell (SQLLine)</li>
+<li>Drill Web UI</li>
+<li><a href="/drill/docs/odbc-jdbc-interfaces#using-odbc-to-access-apache-drill-from-bi-tools">ODBC</a>*</li>
+<li><a href="/drill/docs/odbc-jdbc-interfaces#using-jdbc-to-access-apache-drill-from-squirrel">JDBC</a></li>
+<li>C++ API</li>
+</ul>
+
+<p>*Apache Drill does not have an open source ODBC driver. However, MapR provides an ODBC driver that you can use to connect to Apache Drill from BI tools. </p>
+
+<h2 id="using-odbc-to-access-apache-drill-from-bi-tools">Using ODBC to Access Apache Drill from BI Tools</h2>
+
+<p>MapR provides ODBC drivers for Windows, Mac OS X, and Linux. It is recommended
+that you install the latest version of Apache Drill with the latest version of
+the Drill ODBC driver.</p>
+
+<p>For example, if you have Apache Drill 0.5 and a Drill ODBC driver installed on
+your machine, and then you upgrade to Apache Drill 0.6, do not assume that the
+Drill ODBC driver installed on your machine will work with the new version of
+Apache Drill. Install the latest available Drill ODBC driver to ensure that
+the two components work together.</p>
+
+<p>You can access the latest Drill ODBC drivers in the following location:</p>
+
+<p><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc">http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc</a></p>
+
+<h2 id="using-jdbc-to-access-apache-drill-from-squirrel">Using JDBC to Access Apache Drill from SQuirrel</h2>
+
+<p>You can connect to Drill through a JDBC client tool, such as SQuirreL, on
+Windows, Linux, and Mac OS X systems, to access all of your data sources
+registered with Drill. An embedded JDBC driver is included with Drill.
+Configure the JDBC driver in the SQuirreL client to connect to Drill from
+SQuirreL. This document provides instruction for connecting to Drill from
+SQuirreL on Windows.</p>
+
+<p>To use the Drill JDBC driver with SQuirreL on Windows, complete the following
+steps:</p>
+
+<ul>
+<li><a href="/drill/docs/using-the-jdbc-driver#step-1-getting-the-drill-jdbc-driver">Step 1: Getting the Drill JDBC Driver</a> </li>
+<li><a href="/drill/docs/using-the-jdbc-driver#step-2-installing-and-starting-squirrel">Step 2: Installing and Starting SQuirreL</a></li>
+<li><a href="/drill/docs/using-the-jdbc-driver#step-3-adding-the-drill-jdbc-driver-to-squirrel">Step 3: Adding the Drill JDBC Driver to SQuirreL</a></li>
+<li><a href="/drill/docs/using-the-jdbc-driver#step-4-running-a-drill-query-from-squirrel">Step 4: Running a Drill Query from SQuirreL</a></li>
+</ul>
+
+<p>For information about how to use SQuirreL, refer to the <a href="http://squirrel-sql.sourceforge.net/user-manual/quick_start.html">SQuirreL Quick
+Start</a>
+guide.</p>
+</div>
+
+
+<div id="footer" class="mw">
+<div class="wrapper">
+Copyright © 2012-2014 The Apache Software Foundation, licensed under the Apache License, Version 2.0.<br>
+Apache and the Apache feather logo are trademarks of The Apache Software Foundation. Other names appearing on the site may be trademarks of their respective owners.<br/><br/>
+</div>
+</div>
+
+<script>
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-53379651-1', 'auto');
+ga('send', 'pageview');
+</script>
+
+</body>
+</html>

Modified: drill/site/trunk/content/drill/docs/operators/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/operators/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/operators/index.html (original)
+++ drill/site/trunk/content/drill/docs/operators/index.html Thu Feb 26 01:16:43 2015
@@ -150,7 +150,7 @@ operations on your data.</p>
 <li>IN</li>
 </ul>
 
-<p>See <a href="https://cwiki.apache.org/confluence/display/DRILL/SELE%0ACT+Statements">SELECT Statements</a>.</p>
+<p>See <a href="/drill/docs/select-statements">SELECT Statements</a>.</p>
 
 <h2 id="string-operators">String Operators</h2>
 

Modified: drill/site/trunk/content/drill/docs/partition-pruning/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/partition-pruning/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/partition-pruning/index.html (original)
+++ drill/site/trunk/content/drill/docs/partition-pruning/index.html Thu Feb 26 01:16:43 2015
@@ -104,7 +104,7 @@ that span a few years.</p>
 <p>The following image shows the hierarchical structure of the <code>…/logs</code> directory
 and (sub) directories:</p>
 
-<p><img src="../../img/54.png" alt=""></p>
+<p><img src="/docs/img/54.png" alt="drill query flow"></p>
 
 <p>The following query requests log file data for 2013 from the <code>…/logs</code>
 directory in the file system:</p>
@@ -117,7 +117,7 @@ directory in the file system:</p>
 <p>The following image shows a portion of the physical plan when partition
 pruning is applied:</p>
 
-<p><img src="../../img/21.png" alt=""></p>
+<p><img src="/docs/img/21.png" alt="drill query flow"></p>
 
 <h2 id="filter-examples">Filter Examples</h2>
 

Modified: drill/site/trunk/content/drill/docs/performance/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/performance/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/performance/index.html (original)
+++ drill/site/trunk/content/drill/docs/performance/index.html Thu Feb 26 01:16:43 2015
@@ -97,7 +97,7 @@ Record Batches. Record Batches are array
 records. The technical basis for efficiency of vectorized processing is modern
 chip technology with deep-pipelined CPU designs. Keeping all pipelines full to
 achieve efficiency near peak performance is something impossible to achieve in
-traditional database engines, primarily due to code complexity*<em>.</em>*</p>
+traditional database engines, primarily due to code complexity.</p>
 
 <p><strong><em>Runtime compilation</em></strong></p>
 
@@ -106,7 +106,7 @@ generates highly efficient custom code f
 operator. Here is a quick overview of the Drill compilation/code generation
 process at a glance.</p>
 
-<p><img src="/confluence/download/attachments/40512736/image2014-8-4%2010%3A8%3A58.png?%0Aversion=1&amp;modificationDate=1407172137000&amp;api=v2" alt=""></p>
+<p><img src="/docs/img/58.png" alt="drill compiler"></p>
 
 <p><strong>Optimistic and pipelined query execution</strong></p>
 

Modified: drill/site/trunk/content/drill/docs/persistent-configuration-storage/index.html
URL: http://svn.apache.org/viewvc/drill/site/trunk/content/drill/docs/persistent-configuration-storage/index.html?rev=1662344&r1=1662343&r2=1662344&view=diff
==============================================================================
--- drill/site/trunk/content/drill/docs/persistent-configuration-storage/index.html (original)
+++ drill/site/trunk/content/drill/docs/persistent-configuration-storage/index.html Thu Feb 26 01:16:43 2015
@@ -77,7 +77,7 @@ depends on the Drill installation mode.<
 <p>The following table provides the persistent storage mode for each of the Drill
 modes:</p>
 
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th class="confluenceTh">Mode</th><th class="confluenceTh">Description</th></tr><tr><td valign="top" class="confluenceTd">Embedded</td><td valign="top" class="confluenceTd">Drill stores persistent data in the local file system. <br />You cannot modify the PStore location for Drill in embedded mode.</td></tr><tr><td valign="top" class="confluenceTd">Distributed</td><td valign="top" class="confluenceTd">Drill stores persistent data in ZooKeeper, by default. <br />You can modify where ZooKeeper offloads data, <br />or you can change the persistent storage mode to HBase or MapR-DB.</td></tr></tbody></table></div>
+<table ><tbody><tr><th >Mode</th><th >Description</th></tr><tr><td valign="top" >Embedded</td><td valign="top" >Drill stores persistent data in the local file system. <br />You cannot modify the PStore location for Drill in embedded mode.</td></tr><tr><td valign="top" >Distributed</td><td valign="top" >Drill stores persistent data in ZooKeeper, by default. <br />You can modify where ZooKeeper offloads data, <br />or you can change the persistent storage mode to HBase or MapR-DB.</td></tr></tbody></table>
   
 
 <p><strong>Note:</strong> Switching between storage modes does not migrate configuration data.</p>
@@ -129,7 +129,7 @@ override.conf.</code></p>
 </code></pre></div>
 <h2 id="mapr-db-for-persistent-configuration-storage">MapR-DB for Persistent Configuration Storage</h2>
 
-<p>The MapR-DB plugin will be released soon. You can <a href="/confluence/display/DRILL/Compiling+Drill+from+Source">compile Drill from
+<p>The MapR-DB plugin will be released soon. You can <a href="/drill/docs/compiling-drill-from-source">compile Drill from
 source</a> to try out this
 new feature.</p>
 



Mime
View raw message