Skip to content

Commit 3cac199

Browse files
rxinmarmbrus
authored andcommitted
[SPARK-5310][Doc] Update SQL Programming Guide to include DataFrames.
Author: Reynold Xin <[email protected]> Closes apache#4954 from rxin/df-docs and squashes the following commits: c592c70 [Reynold Xin] [SPARK-5310][Doc] Update SQL Programming Guide to include DataFrames.
1 parent 70f8814 commit 3cac199

File tree

3 files changed

+286
-122
lines changed

3 files changed

+286
-122
lines changed

docs/_layouts/global.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<li><a href="programming-guide.html">Spark Programming Guide</a></li>
7272
<li class="divider"></li>
7373
<li><a href="streaming-programming-guide.html">Spark Streaming</a></li>
74-
<li><a href="sql-programming-guide.html">Spark SQL</a></li>
74+
<li><a href="sql-programming-guide.html">DataFrames and SQL</a></li>
7575
<li><a href="mllib-guide.html">MLlib (Machine Learning)</a></li>
7676
<li><a href="graphx-programming-guide.html">GraphX (Graph Processing)</a></li>
7777
<li><a href="bagel-programming-guide.html">Bagel (Pregel on Spark)</a></li>

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ options for deployment:
7474
in all supported languages (Scala, Java, Python)
7575
* Modules built on Spark:
7676
* [Spark Streaming](streaming-programming-guide.html): processing real-time data streams
77-
* [Spark SQL](sql-programming-guide.html): support for structured data and relational queries
77+
* [Spark SQL and DataFrames](sql-programming-guide.html): support for structured data and relational queries
7878
* [MLlib](mllib-guide.html): built-in machine learning library
7979
* [GraphX](graphx-programming-guide.html): Spark's new API for graph processing
8080
* [Bagel (Pregel on Spark)](bagel-programming-guide.html): older, simple graph processing model

0 commit comments

Comments
 (0)