Repository: zeppelin Updated Branches: refs/heads/branch-0.8 ca87f7d4c -> b4eccf4cb
Update configuration.md Corrected spelling "ba" -> "be" ### What is this PR for? Minor spelling correction ### What type of PR is it? Documentation ### Todos - ### What is the Jira issue - ### How should this be tested? - ### Screenshots (if appropriate) ### Questions: - Author: skymon <simonmuel...@live.com> Closes #2754 from skymon/patch-1 and squashes the following commits: c4a7be75e [skymon] Update configuration.md (cherry picked from commit 6f4f0ff96c800a7f78df2b4401e04147400378f9) Signed-off-by: Lee moon soo <m...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b4eccf4c Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b4eccf4c Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b4eccf4c Branch: refs/heads/branch-0.8 Commit: b4eccf4cb74a5c50e9e264b799262c3387954b77 Parents: ca87f7d Author: skymon <simonmuel...@live.com> Authored: Wed Jan 31 11:54:53 2018 +0100 Committer: Lee moon soo <m...@apache.org> Committed: Fri Feb 2 08:46:32 2018 -0800 ---------------------------------------------------------------------- docs/setup/operation/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b4eccf4c/docs/setup/operation/configuration.md ---------------------------------------------------------------------- diff --git a/docs/setup/operation/configuration.md b/docs/setup/operation/configuration.md index 458affc..1f4c6a2 100644 --- a/docs/setup/operation/configuration.md +++ b/docs/setup/operation/configuration.md @@ -27,7 +27,7 @@ limitations under the License. There are two locations you can configure Apache Zeppelin. * **Environment variables** can be defined `conf/zeppelin-env.sh`(`conf\zeppelin-env.cmd` for Windows). -* **Java properties** can ba defined in `conf/zeppelin-site.xml`. +* **Java properties** can be defined in `conf/zeppelin-site.xml`. If both are defined, then the **environment variables** will take priority. > Mouse hover on each property and click <i class="fa fa-link > fa-flip-horizontal"></i> then you can get a link for that.
