You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2016/05/06 17:00:11 UTC
incubator-zeppelin git commit: Minor Doc update - add SparkR to spark
interpreter docs
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 2cbb79885 -> be0871490
Minor Doc update - add SparkR to spark interpreter docs
### What is this PR for?
Minor documentation update that mentions the SparkR interpreter.
Minor grammar updates.
### What type of PR is it?
Documentation
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Jeff Steinmetz <je...@gmail.com>
Closes #840 from jeffsteinmetz/minor-spark-doc-update and squashes the following commits:
a00d6a7 [Jeff Steinmetz] fix merge conflicts
5969a73 [Jeff Steinmetz] add SparkR to spark interpreter docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/be087149
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/be087149
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/be087149
Branch: refs/heads/master
Commit: be0871490231109e3a3553862a61cfdf537f0ed1
Parents: 2cbb798
Author: Jeff Steinmetz <je...@gmail.com>
Authored: Thu May 5 07:04:58 2016 -0700
Committer: Lee moon soo <mo...@apache.org>
Committed: Fri May 6 10:00:38 2016 -0700
----------------------------------------------------------------------
docs/interpreter/spark.md | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/be087149/docs/interpreter/spark.md
----------------------------------------------------------------------
diff --git a/docs/interpreter/spark.md b/docs/interpreter/spark.md
index 73590e1..6810707 100644
--- a/docs/interpreter/spark.md
+++ b/docs/interpreter/spark.md
@@ -20,17 +20,22 @@ Spark Interpreter group, which consisted of 4 interpreters.
<tr>
<td>%spark</td>
<td>SparkInterpreter</td>
- <td>Creates SparkContext and provides scala environment</td>
+ <td>Creates a SparkContext and provides a scala environment</td>
</tr>
<tr>
<td>%pyspark</td>
<td>PySparkInterpreter</td>
- <td>Provides python environment</td>
+ <td>Provides a python environment</td>
+ </tr>
+ <tr>
+ <td>%r</td>
+ <td>SparkRInterpreter</td>
+ <td>Provides an R environment with SparkR support</td>
</tr>
<tr>
<td>%sql</td>
<td>SparkSQLInterpreter</td>
- <td>Provides SQL environment</td>
+ <td>Provides a SQL environment</td>
</tr>
<tr>
<td>%dep</td>
@@ -40,8 +45,8 @@ Spark Interpreter group, which consisted of 4 interpreters.
</table>
## Configuration
-Zeppelin provides the below properties for Spark interpreter.
-You can also set other Spark properties which are not listed in the table. If so, please refer to [Spark Available Properties](http://spark.apache.org/docs/latest/configuration.html#available-properties).
+The Spark interpreter can be configured with properties provided by Zeppelin.
+You can also set other Spark properties which are not listed in the table. For a list of additional properties, refer to [Spark Available Properties](http://spark.apache.org/docs/latest/configuration.html#available-properties).
<table class="table-configuration">
<tr>
<th>Property</th>