From fd109606dd387f734675d275c58e683fe7ddbac7 Mon Sep 17 00:00:00 2001
From: Sejun Ra <sejun@nflabs.com>
Date: Fri, 15 Jan 2016 17:33:03 +0900
Subject: [PATCH 1/7] Added Kerberos documentation

---
 .../themes/zeppelin/_navigation.html          |   1 +
 .../themes/zeppelin/img/kdc_zeppelin.png      | Bin 0 -> 7209 bytes
 docs/manual/conf_kerberos.md                  |  30 ++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 docs/assets/themes/zeppelin/img/kdc_zeppelin.png
 create mode 100644 docs/manual/conf_kerberos.md

diff --git a/docs/_includes/themes/zeppelin/_navigation.html b/docs/_includes/themes/zeppelin/_navigation.html
index 4633b09bb7d..68d98f05486 100644
--- a/docs/_includes/themes/zeppelin/_navigation.html
+++ b/docs/_includes/themes/zeppelin/_navigation.html
@@ -73,6 +73,7 @@
               <ul class="dropdown-menu">
                 <!-- li><span><b>Manual</b><span></li -->
                 <li><a href="{{BASE_PATH}}/manual/notebookashomepage.html">Notebook as Homepage</a></li>
+                <li><a href="{{BASE_PATH}}/manual/conf_kerberos.html">Setting up Zeppelin with Kerberos</a></li>
                 <li role="separator" class="divider"></li>
                 <!-- li><span><b>Notebook Storage</b><span></li -->
                 <li><a href="{{BASE_PATH}}/storage/storage.html#Git">Git Storage</a></li>
diff --git a/docs/assets/themes/zeppelin/img/kdc_zeppelin.png b/docs/assets/themes/zeppelin/img/kdc_zeppelin.png
new file mode 100644
index 0000000000000000000000000000000000000000..f845be41f74530ef73dc280efdd192dd8ce40d74
GIT binary patch
literal 7209
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
PWl8;>wsNJS<<tKH;heDe

literal 0
HcmV?d00001

diff --git a/docs/manual/conf_kerberos.md b/docs/manual/conf_kerberos.md
new file mode 100644
index 00000000000..4c3ee8cd781
--- /dev/null
+++ b/docs/manual/conf_kerberos.md
@@ -0,0 +1,30 @@
+---
+layout: page
+title: "Conf Kerberos"
+description: ""
+---
+{% include JB/setup %}
+
+
+# Setting up Zeppelin with Kerberos
+
+Logical setup w/ Zeppelin, Kerberos Distribution Center (KDC), and Spark on YARN:
+
+<img src="/assets/themes/zeppelin/img/kdc_zeppelin.png">
+
+<b>Configuration Setup</b>
+
+1. On the server that Zeppelin is installed, install Kerberos client modules and configuration, krb5.conf. 
+This is to make the server communicate with KDC.
+
+2. Set SPARK_HOME in [ZEPPELIN_HOME]/conf/zeppelin-env.sh to use spark-submit
+(Additionally, you might have to set “export HADOOP_CONF_DIR=/etc/hadoop/conf”)
+
+3. Add the two properties below to spark configuration ([SPARK_HOME]/conf/spark-defaults.conf):
+
+	spark.yarn.principal<br>
+	spark.yarn.keytab
+
+	(If you do not have access to the above spark-defaults.conf file, optionally, you may add the lines to the Spark Interpreter through the Interpreter tab in the Zeppelin UI.
+
+4. That's it. Play with Zeppelin

From f95807d2aeed0314f760ec62f03a1cce609b4a15 Mon Sep 17 00:00:00 2001
From: Sejun Ra <sejun@nflabs.com>
Date: Sat, 16 Jan 2016 17:08:49 +0900
Subject: [PATCH 2/7] added license info on doc.

---
 docs/manual/conf_kerberos.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/manual/conf_kerberos.md b/docs/manual/conf_kerberos.md
index 4c3ee8cd781..a40f7eeb6c0 100644
--- a/docs/manual/conf_kerberos.md
+++ b/docs/manual/conf_kerberos.md
@@ -3,6 +3,19 @@ layout: page
 title: "Conf Kerberos"
 description: ""
 ---
+<!--
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 {% include JB/setup %}
 
 

From bafcead48daae4c1b3448aa3e9ff677bc2a6f62f Mon Sep 17 00:00:00 2001
From: Sejun Ra <sejun@nflabs.com>
Date: Thu, 21 Jan 2016 10:36:23 -0800
Subject: [PATCH 3/7] Added Kerberos doc to spark.md instead of having separate
 file.

---
 .../themes/zeppelin/_navigation.html          |  1 -
 docs/interpreter/spark.md                     | 26 +++++++++++
 docs/manual/conf_kerberos.md                  | 43 -------------------
 3 files changed, 26 insertions(+), 44 deletions(-)
 delete mode 100644 docs/manual/conf_kerberos.md

diff --git a/docs/_includes/themes/zeppelin/_navigation.html b/docs/_includes/themes/zeppelin/_navigation.html
index 68d98f05486..4633b09bb7d 100644
--- a/docs/_includes/themes/zeppelin/_navigation.html
+++ b/docs/_includes/themes/zeppelin/_navigation.html
@@ -73,7 +73,6 @@
               <ul class="dropdown-menu">
                 <!-- li><span><b>Manual</b><span></li -->
                 <li><a href="{{BASE_PATH}}/manual/notebookashomepage.html">Notebook as Homepage</a></li>
-                <li><a href="{{BASE_PATH}}/manual/conf_kerberos.html">Setting up Zeppelin with Kerberos</a></li>
                 <li role="separator" class="divider"></li>
                 <!-- li><span><b>Notebook Storage</b><span></li -->
                 <li><a href="{{BASE_PATH}}/storage/storage.html#Git">Git Storage</a></li>
diff --git a/docs/interpreter/spark.md b/docs/interpreter/spark.md
index 83eb3550ed1..421a8cc79ed 100644
--- a/docs/interpreter/spark.md
+++ b/docs/interpreter/spark.md
@@ -262,3 +262,29 @@ select * from ${table=defaultTableName} where text like '%${search}%'
 ```
 
 To learn more about dynamic form, checkout [Dynamic Form](../manual/dynamicform.html).
+
+<br />
+### Setting up Zeppelin with Kerberos
+<hr />
+Logical setup w/ Zeppelin, Kerberos Distribution Center (KDC), and Spark on YARN:
+
+<img src="/assets/themes/zeppelin/img/kdc_zeppelin.png">
+
+<b>Configuration Setup</b>
+
+1. On the server that Zeppelin is installed, install Kerberos client modules and configuration, krb5.conf.
+This is to make the server communicate with KDC.
+
+2. Set SPARK_HOME in [ZEPPELIN_HOME]/conf/zeppelin-env.sh to use spark-submit
+(Additionally, you might have to set “export HADOOP_CONF_DIR=/etc/hadoop/conf”)
+
+3. Add the two properties below to spark configuration ([SPARK_HOME]/conf/spark-defaults.conf):
+
+        spark.yarn.principal<br>
+        spark.yarn.keytab
+
+        (If you do not have access to the above spark-defaults.conf file, optionally, you may add the lines to the Spark Interpreter through the Interpreter tab in the Zeppelin UI.
+
+4. That's it. Play with Zeppelin
+
+
diff --git a/docs/manual/conf_kerberos.md b/docs/manual/conf_kerberos.md
deleted file mode 100644
index a40f7eeb6c0..00000000000
--- a/docs/manual/conf_kerberos.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-layout: page
-title: "Conf Kerberos"
-description: ""
----
-<!--
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-{% include JB/setup %}
-
-
-# Setting up Zeppelin with Kerberos
-
-Logical setup w/ Zeppelin, Kerberos Distribution Center (KDC), and Spark on YARN:
-
-<img src="/assets/themes/zeppelin/img/kdc_zeppelin.png">
-
-<b>Configuration Setup</b>
-
-1. On the server that Zeppelin is installed, install Kerberos client modules and configuration, krb5.conf. 
-This is to make the server communicate with KDC.
-
-2. Set SPARK_HOME in [ZEPPELIN_HOME]/conf/zeppelin-env.sh to use spark-submit
-(Additionally, you might have to set “export HADOOP_CONF_DIR=/etc/hadoop/conf”)
-
-3. Add the two properties below to spark configuration ([SPARK_HOME]/conf/spark-defaults.conf):
-
-	spark.yarn.principal<br>
-	spark.yarn.keytab
-
-	(If you do not have access to the above spark-defaults.conf file, optionally, you may add the lines to the Spark Interpreter through the Interpreter tab in the Zeppelin UI.
-
-4. That's it. Play with Zeppelin

From 00d25515e11bad2b470197817e8a7d53ce3e1b37 Mon Sep 17 00:00:00 2001
From: Sejun Ra <sejun@nflabs.com>
Date: Fri, 5 Feb 2016 12:18:08 +0900
Subject: [PATCH 4/7] Spelled out 'w/' and changed link as requested.

---
 .../zeppelin/img/{ => docs-img}/kdc_zeppelin.png    | Bin
 docs/interpreter/spark.md                           |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename docs/assets/themes/zeppelin/img/{ => docs-img}/kdc_zeppelin.png (100%)

diff --git a/docs/assets/themes/zeppelin/img/kdc_zeppelin.png b/docs/assets/themes/zeppelin/img/docs-img/kdc_zeppelin.png
similarity index 100%
rename from docs/assets/themes/zeppelin/img/kdc_zeppelin.png
rename to docs/assets/themes/zeppelin/img/docs-img/kdc_zeppelin.png
diff --git a/docs/interpreter/spark.md b/docs/interpreter/spark.md
index 421a8cc79ed..57dce73f39c 100644
--- a/docs/interpreter/spark.md
+++ b/docs/interpreter/spark.md
@@ -266,9 +266,9 @@ To learn more about dynamic form, checkout [Dynamic Form](../manual/dynamicform.
 <br />
 ### Setting up Zeppelin with Kerberos
 <hr />
-Logical setup w/ Zeppelin, Kerberos Distribution Center (KDC), and Spark on YARN:
+Logical setup with Zeppelin, Kerberos Distribution Center (KDC), and Spark on YARN:
 
-<img src="/assets/themes/zeppelin/img/kdc_zeppelin.png">
+<img src=".../assets/themes/zeppelin/img/docs-img/kdc_zeppelin.png">
 
 <b>Configuration Setup</b>
 

From 1ea2bb5ea7602a90dd4e3f7b5d1c996bd52e8832 Mon Sep 17 00:00:00 2001
From: Sejun Ra <sejun@nflabs.com>
Date: Fri, 5 Feb 2016 12:20:09 +0900
Subject: [PATCH 5/7] Changed three dots to two dots on link

---
 docs/interpreter/spark.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/interpreter/spark.md b/docs/interpreter/spark.md
index 57dce73f39c..e0c7121d1e5 100644
--- a/docs/interpreter/spark.md
+++ b/docs/interpreter/spark.md
@@ -268,7 +268,7 @@ To learn more about dynamic form, checkout [Dynamic Form](../manual/dynamicform.
 <hr />
 Logical setup with Zeppelin, Kerberos Distribution Center (KDC), and Spark on YARN:
 
-<img src=".../assets/themes/zeppelin/img/docs-img/kdc_zeppelin.png">
+<img src="../assets/themes/zeppelin/img/docs-img/kdc_zeppelin.png">
 
 <b>Configuration Setup</b>
 

From d1acb4b70de2fd4132be0ea1ead72539114bb36b Mon Sep 17 00:00:00 2001
From: Ryu Ah young <fbdkdud93@hanmail.net>
Date: Mon, 15 Feb 2016 11:03:38 +0900
Subject: [PATCH 6/7] Address the reviews

---
 docs/interpreter/spark.md | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/interpreter/spark.md b/docs/interpreter/spark.md
index e0c7121d1e5..3f13db7f05e 100644
--- a/docs/interpreter/spark.md
+++ b/docs/interpreter/spark.md
@@ -263,27 +263,25 @@ select * from ${table=defaultTableName} where text like '%${search}%'
 
 To learn more about dynamic form, checkout [Dynamic Form](../manual/dynamicform.html).
 
-<br />
-### Setting up Zeppelin with Kerberos
-<hr />
+## Setting up Zeppelin with Kerberos
 Logical setup with Zeppelin, Kerberos Distribution Center (KDC), and Spark on YARN:
 
 <img src="../assets/themes/zeppelin/img/docs-img/kdc_zeppelin.png">
 
-<b>Configuration Setup</b>
+####Configuration Setup
 
 1. On the server that Zeppelin is installed, install Kerberos client modules and configuration, krb5.conf.
 This is to make the server communicate with KDC.
 
-2. Set SPARK_HOME in [ZEPPELIN_HOME]/conf/zeppelin-env.sh to use spark-submit
-(Additionally, you might have to set “export HADOOP_CONF_DIR=/etc/hadoop/conf”)
+2. Set SPARK\_HOME in [ZEPPELIN\_HOME]/conf/zeppelin-env.sh to use spark-submit
+( Additionally, you might have to set “export HADOOP\_CONF\_DIR=/etc/hadoop/conf” )
 
 3. Add the two properties below to spark configuration ([SPARK_HOME]/conf/spark-defaults.conf):
 
-        spark.yarn.principal<br>
+        spark.yarn.principal
         spark.yarn.keytab
 
-        (If you do not have access to the above spark-defaults.conf file, optionally, you may add the lines to the Spark Interpreter through the Interpreter tab in the Zeppelin UI.
+  > **NOTE:** If you do not have access to the above spark-defaults.conf file, optionally, you may add the lines to the Spark Interpreter through the Interpreter tab in the Zeppelin UI.
 
 4. That's it. Play with Zeppelin
 

From 515d90830a34992bc226a1c155c55a774c6a6481 Mon Sep 17 00:00:00 2001
From: Ryu Ah young <fbdkdud93@hanmail.net>
Date: Mon, 15 Feb 2016 13:06:24 +0900
Subject: [PATCH 7/7] Add spaces between the bracket

---
 docs/interpreter/spark.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/interpreter/spark.md b/docs/interpreter/spark.md
index 3f13db7f05e..844cbce0636 100644
--- a/docs/interpreter/spark.md
+++ b/docs/interpreter/spark.md
@@ -276,13 +276,13 @@ This is to make the server communicate with KDC.
 2. Set SPARK\_HOME in [ZEPPELIN\_HOME]/conf/zeppelin-env.sh to use spark-submit
 ( Additionally, you might have to set “export HADOOP\_CONF\_DIR=/etc/hadoop/conf” )
 
-3. Add the two properties below to spark configuration ([SPARK_HOME]/conf/spark-defaults.conf):
+3. Add the two properties below to spark configuration ( [SPARK_HOME]/conf/spark-defaults.conf ):
 
         spark.yarn.principal
         spark.yarn.keytab
 
   > **NOTE:** If you do not have access to the above spark-defaults.conf file, optionally, you may add the lines to the Spark Interpreter through the Interpreter tab in the Zeppelin UI.
 
-4. That's it. Play with Zeppelin
+4. That's it. Play with Zeppelin !