Merge remote-tracking branch 'remotes/tomer/gh-pages' into gh-pages Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/6fda4232 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/6fda4232 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/6fda4232 Branch: refs/heads/gh-pages Commit: 6fda42323b4eb3eae443371cf1f69cab485ee3d5 Parents: 4f72bc3 2e6a55f Author: Bridget Bevens Authored: Tue Jun 9 15:15:19 2015 -0700 Committer: Bridget Bevens Committed: Tue Jun 9 15:15:19 2015 -0700 ---------------------------------------------------------------------- _data/docs.json | 196 +++++++++++++------ _docs/getting-started/010-drill-introduction.md | 4 +- _docs/img/explorer-connect.png | Bin 0 -> 31369 bytes _docs/img/explorer-nation-data.png | Bin 0 -> 96528 bytes _docs/img/explorer-schemas.png | Bin 0 -> 15580 bytes .../010-odbc-configuration-reference.md | 2 +- .../030-configuring-odbc-on-windows.md | 4 +- .../040-testing-the-odbc-connection.md | 2 +- .../010-installing-the-driver-on-linux.md | 24 +-- .../020-installing-the-driver-on-mac-os-x.md | 27 +-- .../030-installing-the-driver-on-windows.md | 53 +++-- .../010-connecting-to-odbc-data-sources.md | 24 --- .../010-drill-explorer-introduction.md | 25 +++ .../020-connecting-drill-explorer-to-data.md | 34 ++++ .../020-using-drill-explorer-on-windows.md | 50 ----- .../030-browsing-data-and-creating-views.md | 43 ++++ .../060-querying-the-information-schema.md | 2 +- .../050-aggregate-and-aggregate-statistical.md | 2 +- 18 files changed, 309 insertions(+), 183 deletions(-) ----------------------------------------------------------------------