diff options
| -rwxr-xr-x | docs/_layouts/global.html | 4 | ||||
| -rw-r--r-- | docs/api.md | 2 | ||||
| -rw-r--r-- | docs/bagel-programming-guide.md | 2 | ||||
| -rw-r--r-- | docs/index.md | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/docs/_layouts/global.html b/docs/_layouts/global.html index 36eb49df14..4287e7141d 100755 --- a/docs/_layouts/global.html +++ b/docs/_layouts/global.html @@ -67,7 +67,7 @@ <li class="divider"></li> <li><a href="streaming-programming-guide.html">Spark Streaming</a></li> <li><a href="mllib-guide.html">MLlib (Machine Learning)</a></li> - <li><a href="bagel-programming-guide.html">Bagel (Pregel on Spark, superseded by GraphX)</a></li> + <li><a href="bagel-programming-guide.html">Bagel (Pregel on Spark)</a></li> <li><a href="graphx-programming-guide.html">GraphX (Graph-Parallel Spark)</a></li> </ul> </li> @@ -80,7 +80,7 @@ <li class="divider"></li> <li><a href="api/streaming/index.html#org.apache.spark.streaming.package">Spark Streaming</a></li> <li><a href="api/mllib/index.html#org.apache.spark.mllib.package">MLlib (Machine Learning)</a></li> - <li><a href="api/bagel/index.html#org.apache.spark.bagel.package">Bagel (Pregel on Spark, superseded by GraphX)</a></li> + <li><a href="api/bagel/index.html#org.apache.spark.bagel.package">Bagel (Pregel on Spark)</a></li> <li><a href="api/graphx/index.html#org.apache.spark.graphx.package">GraphX (Graph-Parallel Spark)</a></li> </ul> </li> diff --git a/docs/api.md b/docs/api.md index 7639e58053..91c8e51d26 100644 --- a/docs/api.md +++ b/docs/api.md @@ -8,6 +8,6 @@ Here you can find links to the Scaladoc generated for the Spark sbt subprojects. - [Spark](api/core/index.html) - [Spark Examples](api/examples/index.html) - [Spark Streaming](api/streaming/index.html) -- [Bagel](api/bagel/index.html) *(superseded by GraphX)* +- [Bagel](api/bagel/index.html) - [GraphX](api/graphx/index.html) - [PySpark](api/pyspark/index.html) diff --git a/docs/bagel-programming-guide.md b/docs/bagel-programming-guide.md index a1339ec735..cffa55ee95 100644 --- a/docs/bagel-programming-guide.md +++ b/docs/bagel-programming-guide.md @@ -3,7 +3,7 @@ layout: global title: Bagel Programming Guide --- -**Bagel has been superseded by [GraphX](graphx-programming-guide.html) for graph processing. New users should use GraphX instead.** +**Bagel will soon be superseded by [GraphX](graphx-programming-guide.html); we recommend that new users try GraphX instead.** Bagel is a Spark implementation of Google's [Pregel](http://portal.acm.org/citation.cfm?id=1807184) graph processing framework. Bagel currently supports basic graph computation, combiners, and aggregators. diff --git a/docs/index.md b/docs/index.md index c11dc38b0e..debdb33108 100644 --- a/docs/index.md +++ b/docs/index.md @@ -77,7 +77,7 @@ For this version of Spark (0.8.1) Hadoop 2.2.x (or newer) users will have to bui * [Python Programming Guide](python-programming-guide.html): using Spark from Python * [Spark Streaming](streaming-programming-guide.html): using the alpha release of Spark Streaming * [MLlib (Machine Learning)](mllib-guide.html): Spark's built-in machine learning library -* [Bagel (Pregel on Spark)](bagel-programming-guide.html): simple graph processing model *(superseded by GraphX)* +* [Bagel (Pregel on Spark)](bagel-programming-guide.html): simple graph processing model * [GraphX (Graphs on Spark)](graphx-programming-guide.html): Spark's new API for graphs **API Docs:** @@ -86,7 +86,7 @@ For this version of Spark (0.8.1) Hadoop 2.2.x (or newer) users will have to bui * [Spark for Python (Epydoc)](api/pyspark/index.html) * [Spark Streaming for Java/Scala (Scaladoc)](api/streaming/index.html) * [MLlib (Machine Learning) for Java/Scala (Scaladoc)](api/mllib/index.html) -* [Bagel (Pregel on Spark) for Scala (Scaladoc)](api/bagel/index.html) *(superseded by GraphX)* +* [Bagel (Pregel on Spark) for Scala (Scaladoc)](api/bagel/index.html) * [GraphX (Graphs on Spark) for Scala (Scaladoc)](api/graphx/index.html) |