Repository: drill Updated Branches: refs/heads/gh-pages b052f6f00 -> f7e1b4863
doc edits Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/f7e1b486 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/f7e1b486 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/f7e1b486 Branch: refs/heads/gh-pages Commit: f7e1b48638ec0a988cc018ca9279be328459af97 Parents: b052f6f Author: Bridget Bevens <bbev...@maprtech.com> Authored: Mon Oct 3 15:33:35 2016 -0700 Committer: Bridget Bevens <bbev...@maprtech.com> Committed: Mon Oct 3 15:33:35 2016 -0700 ---------------------------------------------------------------------- .../010-configuration-options-introduction.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/f7e1b486/_docs/configure-drill/configuration-options/010-configuration-options-introduction.md ---------------------------------------------------------------------- diff --git a/_docs/configure-drill/configuration-options/010-configuration-options-introduction.md b/_docs/configure-drill/configuration-options/010-configuration-options-introduction.md index 8a77c8c..a8fa8a4 100644 --- a/_docs/configure-drill/configuration-options/010-configuration-options-introduction.md +++ b/_docs/configure-drill/configuration-options/010-configuration-options-introduction.md @@ -1,12 +1,12 @@ --- title: "Configuration Options Introduction" -date: 2016-10-03 21:57:17 UTC +date: 2016-10-03 22:33:36 UTC parent: "Configuration Options" --- Drill provides many configuration options that you can enable, disable, or modify. Modifying certain configuration options can impact Drill performance. Many of the configuration options reside in the `drill-env.sh` script and the `drill-override.conf` configuration file located in the `$DRILL_HOME/conf` directory. Drill loads these files from `/etc/drill/conf`, if it exists. Otherwise, Drill loads the files from the `$DRILL_HOME/conf` directory. -{% include startnote.html %}As of Drill 1.8, most of the system options listed below are set in ``$DRILL_HOME/conf/drill-override.conf``. Settings controlled through environment variables reside in ``$DRILL_HOME/bin/drill-config.sh``. You can create an entry in ``$DRILL_HOME/conf/drill-env.sh`` to override many of the settings in `drill-config.sh`.{% include endnote.html %} +{% include startnote.html %}As of Drill 1.8, most of the system options listed below are set in `$DRILL_HOME/conf/drill-override.conf`. Settings controlled through environment variables reside in `$DRILL_HOME/bin/drill-config.sh`. You can create an entry in `$DRILL_HOME/conf/drill-env.sh` to override many of the settings in `drill-config.sh`.{% include endnote.html %} See [Configuration and Launch Script Changes]({{site.baseurl}}/docs/apache-drill-1-8-0-release-notes) in the Drill 1.8 release notes.
