aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration.md
diff options
context:
space:
mode:
authorRyan Williams <ryan.blake.williams@gmail.com>2014-12-15 14:52:17 -0800
committerPatrick Wendell <pwendell@gmail.com>2014-12-15 14:52:17 -0800
commit8176b7a02e6b62bbce194c3ce9802d58b7472101 (patch)
tree030a8c3c865df112667dbf329f7552f866a482be /docs/configuration.md
parent38703bbca86003995f32b2e948ad7c7c358aa99a (diff)
downloadspark-8176b7a02e6b62bbce194c3ce9802d58b7472101.tar.gz
spark-8176b7a02e6b62bbce194c3ce9802d58b7472101.tar.bz2
spark-8176b7a02e6b62bbce194c3ce9802d58b7472101.zip
[SPARK-4668] Fix some documentation typos.
Author: Ryan Williams <ryan.blake.williams@gmail.com> Closes #3523 from ryan-williams/tweaks and squashes the following commits: d2eddaa [Ryan Williams] code review feedback ce27fc1 [Ryan Williams] CoGroupedRDD comment nit c6cfad9 [Ryan Williams] remove unnecessary if statement b74ea35 [Ryan Williams] comment fix b0221f0 [Ryan Williams] fix a gendered pronoun c71ffed [Ryan Williams] use names on a few boolean parameters 89954aa [Ryan Williams] clarify some comments in {Security,Shuffle}Manager e465dac [Ryan Williams] Saved building-spark.md with Dillinger.io 83e8358 [Ryan Williams] fix pom.xml typo dc4662b [Ryan Williams] typo fixes in tuning.md, configuration.md
Diffstat (limited to 'docs/configuration.md')
-rw-r--r--docs/configuration.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index acee267883..64aa94f622 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -75,8 +75,8 @@ in the `spark-defaults.conf` file.
The application web UI at `http://<driver>:4040` lists Spark properties in the "Environment" tab.
This is a useful place to check to make sure that your properties have been set correctly. Note
-that only values explicitly specified through either `spark-defaults.conf` or SparkConf will
-appear. For all other configuration properties, you can assume the default value is used.
+that only values explicitly specified through `spark-defaults.conf`, `SparkConf`, or the command
+line will appear. For all other configuration properties, you can assume the default value is used.
## Available Properties
@@ -310,7 +310,7 @@ Apart from these, the following properties are also available, and may be useful
<td>(none)</td>
<td>
Add the environment variable specified by <code>EnvironmentVariableName</code> to the Executor
- process. The user can specify multiple of these and to set multiple environment variables.
+ process. The user can specify multiple of these to set multiple environment variables.
</td>
</tr>
<tr>