Use latest stack image and small textual fixes

This closes #40


Project: http://git-wip-us.apache.org/repos/asf/flink-web/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink-web/commit/d72e9338
Tree: http://git-wip-us.apache.org/repos/asf/flink-web/tree/d72e9338
Diff: http://git-wip-us.apache.org/repos/asf/flink-web/diff/d72e9338

Branch: refs/heads/asf-site
Commit: d72e93383826ee36732c5205f46c19af0503d6a3
Parents: dc91e9f
Author: Greg Hogan <g...@apache.org>
Authored: Fri Oct 14 14:43:21 2016 -0400
Committer: Greg Hogan <g...@apache.org>
Committed: Wed Nov 2 09:29:06 2016 -0400

----------------------------------------------------------------------
 .gitignore             |   2 +
 community.md.orig      | 474 --------------------------------------------
 downloads.md           |  10 +-
 faq.md                 |  14 +-
 features.md            |   4 +-
 img/features/stack.png | Bin 87387 -> 0 bytes
 6 files changed, 15 insertions(+), 489 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink-web/blob/d72e9338/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 60f9b4b..1702d90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 .DS_Store
 /.bundle
 /.rubydeps
+.idea
+*.iml

http://git-wip-us.apache.org/repos/asf/flink-web/blob/d72e9338/community.md.orig
----------------------------------------------------------------------
diff --git a/community.md.orig b/community.md.orig
deleted file mode 100644
index d3ec5f8..0000000
--- a/community.md.orig
+++ /dev/null
@@ -1,474 +0,0 @@
----
-title: "Community"
----
-
-There are many ways to get help from the Apache Flink community. The [mailing 
lists](#mailing-lists) are the primary place where all Flink committers are 
present. If you want to talk with the Flink committers and users in a chat, 
there is a [IRC channel](#irc). Some committers are also monitoring [Stack 
Overflow](http://stackoverflow.com/questions/tagged/flink). Please remember to 
tag your questions with the 
*[flink](http://stackoverflow.com/questions/tagged/flink)* tag. Bugs and 
feature requests can either be discussed on *dev mailing list* or on [JIRA]({{ 
site.jire }}). Those interested in contributing to Flink should check out the 
[contribution guide](how-to-contribute.html).
-
-{% toc %}
-
-## Mailing Lists
-
-<table class="table table-striped">
-  <thead>
-    <th class="text-center">Name</th>
-    <th class="text-center">Subscribe</th>
-    <th class="text-center">Digest</th>
-    <th class="text-center">Unsubscribe</th>
-    <th class="text-center">Post</th>
-    <th class="text-center">Archive</th>
-  </thead>
-  <tr>
-    <td>
-      <strong>news</strong>@flink.apache.org<br>
-      <small>News and announcements from the Flink community.</small>
-    </td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:news-subscr...@flink.apache.org";>Subscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:news-digest-subscr...@flink.apache.org";>Subscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:news-unsubscr...@flink.apache.org";>Unsubscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <i>Read only 
list</i></td>
-    <td class="text-center">
-      <a 
href="http://mail-archives.apache.org/mod_mbox/flink-news/";>Archives</a> <br>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <strong>user</strong>@flink.apache.org<br>
-      <small>User support and questions mailing list</small>
-    </td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:user-subscr...@flink.apache.org";>Subscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:user-digest-subscr...@flink.apache.org";>Subscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:user-unsubscr...@flink.apache.org";>Unsubscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:u...@flink.apache.org";>Post</a></td>
-    <td class="text-center">
-      <a 
href="http://mail-archives.apache.org/mod_mbox/flink-user/";>Archives</a> <br>
-      <a 
href="http://apache-flink-user-mailing-list-archive.2336050.n4.nabble.com/";>Nabble
 Archive</a>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <strong>dev</strong>@flink.apache.org<br>
-      <small>Development related discussions</small>
-    </td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:dev-subscr...@flink.apache.org";>Subscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:dev-digest-subscr...@flink.apache.org";>Subscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:dev-unsubscr...@flink.apache.org";>Unsubscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:d...@flink.apache.org";>Post</a></td>
-    <td class="text-center">
-      <a 
href="http://mail-archives.apache.org/mod_mbox/flink-dev/";>Archives</a> <br>
-      <a 
href="http://apache-flink-mailing-list-archive.1008284.n3.nabble.com/";>Nabble 
Archive</a>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <strong>issues</strong>@flink.apache.org
-      <br>
-      <small>Mirror of all JIRA activity</small>
-    </td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:issues-subscr...@flink.apache.org";>Subscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:issues-digest-subscr...@flink.apache.org";>Subscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:issues-unsubscr...@flink.apache.org";>Unsubscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i><i>Read only 
list</i></td>
-    <td class="text-center"><a 
href="http://mail-archives.apache.org/mod_mbox/flink-issues/";>Archives</a></td>
-  </tr>
-  <tr>
-    <td>
-      <strong>commits</strong>@flink.apache.org
-      <br>
-      <small>All commits to our repositories</small>
-    </td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:commits-subscr...@flink.apache.org";>Subscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:commits-digest-subscr...@flink.apache.org";>Subscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <a 
href="mailto:commits-unsubscr...@flink.apache.org";>Unsubscribe</a></td>
-    <td class="text-center"><i class="fa fa-pencil-square-o"></i> <i>Read only 
list</i></td>
-    <td class="text-center"><a 
href="http://mail-archives.apache.org/mod_mbox/flink-commits/";>Archives</a></td>
-  </tr>
-</table>
-
-## IRC
-
-There is an IRC channel called #flink dedicated to Apache Flink at 
irc.freenode.org. There is also a [web-based IRC 
client](http://webchat.freenode.net/?channels=flink) available.
-
-The IRC channel can be used for online discussions about Apache Flink as 
community, but developers should be careful to move or duplicate all the 
official or useful discussions to the issue tracking system or dev mailing list.
-
-## Stack Overflow
-
-Committers are watching [Stack 
Overflow](http://stackoverflow.com/questions/tagged/flink) for the 
[flink](http://stackoverflow.com/questions/tagged/flink) tag.
-
-Make sure to tag your questions there accordingly to get answers from the 
Flink community.
-
-## Issue Tracker
-
-We use JIRA to track all code related issues: [{{ site.jira }}]({{ site.jira 
}}).
-
-All issue activity is also mirrored to the issues mailing list.
-
-## Source Code
-
-### Main source repositories
-
-- **ASF writable**: 
[https://git-wip-us.apache.org/repos/asf/flink.git](https://git-wip-us.apache.org/repos/asf/flink.git)
-- **ASF read-only**: git://git.apache.org/repos/asf/flink.git
-- **GitHub mirror**: 
[https://github.com/apache/flink.git](https://github.com/apache/flink.git)
-
-Note: Flink does not build with Oracle JDK 6. It runs with Oracle JDK 6.
-
-### Website repositories
-
-- **ASF writable**: 
[https://git-wip-us.apache.org/repos/asf/flink-web.git](https://git-wip-us.apache.org/repos/asf/flink-web.git)
-- **ASF read-only**: git://git.apache.org/repos/asf/flink-web.git
-- **GitHub mirror**:  
[https://github.com/apache/flink-web.git](https://github.com/apache/flink-web.git)
-
-
-# Third party packages
-
-This is a list of third party packages (ie, libraries, system extensions, or 
examples) built on Flink.
-The Flink community only collects links to those packages but does not 
maintain them.
-Thus, they do not belong to the Apache Flink project and the community cannot 
give any support for them.
-**Your project is missing?**
-Let us know per [user/dev mailing list](#mailing-lists).
-
-<table class="flink-packages" width="100%">
-  <style>
-  table.flink-packages {
-    table-layout: fixed;
-    border-color: transparent;
-    border-spacing: 5px;
-    border-collapse: separate;
-  }
-  td.flink-package-empty{
-    height: 12em;
-    vertical-align: bottom;
-    border-color: transparent;
-    background-color: transparent;
-  }
-  td.flink-package {
-    height: 12em;
-    vertical-align: bottom;
-    border-color: transparent;
-    background-color: #B9BFC7;
-    color: #E5EAFA;
-  }
-  td.flink-package-external {
-    height: 12em;
-    vertical-align: bottom;
-    border-color: transparent;
-    background-color: #F5A030;
-  }
-  td.flink-package > div {
-    transform: rotate(-90deg);
-    font-size: 12pt;
-    white-space: nowrap;
-  }
-  td.flink-package-external > div {
-    transform: rotate(-90deg);
-    font-size: 16pt;
-    white-space: nowrap;
-  }
-  td.flink-component {
-    font-size: 16pt;
-    text-align: center;
-    border-color: transparent;
-    color: #E5EAFA;
-  }
-  </style>
-  <tr>
-   <td class="flink-package"><div><span>&nbsp;Flink ML</span></div></td>
-   <td class="flink-package"><div><span>&nbsp;Table API</span></div></td>
-   <td class="flink-package"><div><span>&nbsp;Gelly (Graph)</span></div></td>
-   <td class="flink-package"><div><span>&nbsp;MapReduce</span></div></td>
-   <td class="flink-package"><div><span>&nbsp;Python</span></div></td>
-   <td class="flink-package-external"><div><span>&nbsp;<a 
href="#apache-zeppelin">Apache Zeppelin</a></span></div></td>
-   <td class="flink-package-external"><div><span>&nbsp;<a 
href="#apache-mahout">Apache Mahout</a></span></div></td>
-   <td class="flink-package-external"><div><span>&nbsp;<a 
href="#cascading">Cascading</a></span></div></td>
-   <td class="flink-package-external"><div><span>&nbsp;<a 
href="#dataflow">Dataflow</a></span></div></td>
-   <td class="flink-package-external"><div><span>&nbsp;<a 
href="#gradoop">Gradoop</a></span></div></td>
-   <td class="flink-package-external"><div><span>&nbsp;<a 
href="#bigpetstore">BigPetStore</a></span></div></td>
-   <td class="flink-package-external"><div><span>&nbsp;<a 
href="#fastr">FastR</a></span></div></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package"><div><span>&nbsp;Table API</span></div></td>
-   <td class="flink-package"><div><span>&nbsp;Storm</span></div></td>
-   <td class="flink-package-external"><div><span>&nbsp;<a 
href="#apache-samoa">Apache SAMOA</a></span></div></td>
-   <td class="flink-package-external"><div><span>&nbsp;<a 
href="#dataflow">Dataflow</a></span></div></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-   <td class="flink-package-empty"></td>
-  </tr>
-
-  <tr bgcolor="#B9BFC7">
-   <td class="flink-component" colspan="15">DataSet API</td>
-   <td class="flink-component" colspan="15">DataStream API</td>
-  </tr>
-
-  <tr bgcolor="#B9BFC7">
-   <td class="flink-component" colspan="30">Flink Runtime</td>
-  </tr>
-
-  <tr bgcolor="#B9BFC7">
-   <td class="flink-component" colspan="6" width="20%">Local</td>
-   <td class="flink-component" colspan="6" width="20%">Remote</td>
-   <td class="flink-component" colspan="6" width="20%">Embedded</td>
-   <td class="flink-component" colspan="6" width="20%">YARN</td>
-   <td class="flink-component" colspan="6" width="20%">Tez</td>
-  </tr>
-</table>
-
-## Apache Zeppelin
-
-[Apache Zeppelin (incubator)](https://zeppelin.incubator.apache.org/) is a 
web-based notebook that enables interactive data analytics and can be used with 
-[Flink as an execution 
engine](https://zeppelin.incubator.apache.org/docs/interpreter/flink.html) 
(next to others engines).
-See also Jim Dowling's [Flink Forward 
talk](http://www.slideshare.net/FlinkForward/jim-dowling-interactive-flink-analytics-with-hopsworks-and-zeppelin)
 about Zeppelin on Flink.
-
-## Apache Mahout 
-
-[Apache Mahout](https://mahout.apache.org/) in a machine learning library that 
will feature Flink as an execution engine soon.
-Check out Sebastian Schelter's [Flink Forward 
talk](http://www.slideshare.net/FlinkForward/sebastian-schelter-distributed-machine-learing-with-the-samsara-dsl)
 about Mahout-Samsara DSL.
-
-## Cascading 
-
-[Cascading](http://www.cascading.org/cascading-flink/) enables an user to 
build complex workflows easily on Flink and other execution engines.
-[Cascading on Flink](https://github.com/dataArtisans/cascading-flink) is build 
by [dataArtisans](http://data-artisans.com/) and [Driven, 
Inc](http://www.driven.io/).
-See Fabian Hueske's [Flink Forward 
talk](http://www.slideshare.net/FlinkForward/fabian-hueske-training-cascading-on-flink)
 for more details.
-
-## Google Dataflow
-
-Currently, Google Dataflow programs can be executed in batch mode on top of 
Flink via [FlinkPipelineRunner](https://github.com/dataArtisans/flink-dataflow).
-Executing streaming programs is WIP by 
[dataArtisans](http://data-artisans.com/).
-Maximilian Michels' [Flink Forward 
talk](http://www.slideshare.net/FlinkForward/maximilian-michels-google-cloud-dataflow-on-top-of-apache-flink)
 gives a good introduction.
-
-## GRADOOP
-
-[GRADOOP](http://dbs.uni-leipzig.de/en/research/projects/gradoop) enables 
scalable graph analytics on top of Flink and is developed at Leipzig 
University. Check out [Martin Junghanns’ Flink Forward 
talk](http://www.slideshare.net/FlinkForward/martin-junghans-gradoop-scalable-graph-analytics-with-apache-flink).
-
-## BigPetStore
-
-[BigPetStore](https://github.com/apache/bigtop/tree/master/bigtop-bigpetstore) 
is a benchmarking suite including a data generator and will be available for 
Flin k soon.
-See Suneel Marthi's [Flink Forward 
talk](http://www.slideshare.net/FlinkForward/suneel-marthi-bigpetstore-flink-a-comprehensive-blueprint-for-apache-flink?ref=http://flink-forward.org/?session=tbd-3)
 as preview.
-
-## FastR
-
-[FastR](https://bitbucket.org/allr/fastr-flink) in an implemenation of the R 
language in Java. [FastR 
Flink](https://bitbucket.org/allr/fastr-flink/src/3535a9b7c7f208508d6afbcdaf1de7d04fa2bf79/README_FASTR_FLINK.md?at=default&fileviewer=file-view-default)
 exeutes R workload on top of Flink.
-
-## Apache SAMOA
-
-[Apache SAMOA (incubating)](https://samoa.incubator.apache.org/) a streaming 
ML library featuring Flink an execution engine soon. Albert Bifet introduced 
SAMOA on Flink at his [Flink Forward 
talk](http://www.slideshare.net/FlinkForward/albert-bifet-apache-samoa-mining-big-data-streams-with-apache-flink?ref=http://flink-forward.org/?session=apache-samoa-mining-big-data-streams-with-apache-flink).
-
-## Python Examples on Flink
-
-A [collection of examples](https://github.com/wdm0006/flink-python-examples) 
using Apache Flink's Python API.
-
-## WordCount Example in Clojure
-
-Small [WordCount 
example](https://github.com/mjsax/flink-external/tree/master/flink-clojure) on 
how to write a Flink program in Clojure.
-
-## Anomaly Detection and Prediction in Flink
-
-[flink-htm](https://github.com/nupic-community/flink-htm) is a library for 
anomaly detection and prediction in Apache Flink. The algorithms are based on 
Hierarchical Temporal Memory (HTM) as implemented by the Numenta Platform for 
Intelligent Computing (NuPIC).
-
-# People
-
-<table class="table table-striped">
-  <thead>
-    <th class="text-center"></th>
-    <th class="text-center">Name</th>
-    <th class="text-center">Role</th>
-    <th class="text-center">Apache ID</th>
-  </thead>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars2.githubusercontent.com/u/5990983?s=50";></td>
-    <td class="text-center">Márton Balassi</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">mbalassi</td>
-  </tr>
-    <tr>
-        <td class="text-center"><img 
src="https://avatars2.githubusercontent.com/u/858078?v=3&s=50";></td>
-        <td class="text-center">Paris Carbone</td>
-        <td class="text-center">Committer</td>
-        <td class="text-center">senorcarbone</td>
-    </tr>
-  <tr>
-    <td class="text-center" width="10%"><img 
src="https://avatars3.githubusercontent.com/u/1756620?s=50";></a></td>
-    <td class="text-center">Ufuk Celebi</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">uce</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars2.githubusercontent.com/u/1727146?s=50";></td>
-    <td class="text-center">Stephan Ewen</td>
-    <td class="text-center">PMC, Committer, VP</td>
-    <td class="text-center">sewen</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars1.githubusercontent.com/u/5880972?s=50";></td>
-    <td class="text-center">Gyula Fóra</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">gyfora</td>
-  </tr>
-  <tr>
-    <td class="text-center"></td>
-    <td class="text-center">Alan Gates</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">gates</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars0.githubusercontent.com/u/2388347?s=50";></td>
-    <td class="text-center">Fabian Hueske</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">fhueske</td>
-  </tr>
-    <tr>
-    <td class="text-center"><img 
src="https://avatars3.githubusercontent.com/u/498957?v=3&s=50";></td>
-    <td class="text-center">Vasia Kalavri</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">vasia</td>
-  </tr>
-  </tr>
-    <tr>
-    <td class="text-center"><img 
src="https://avatars0.githubusercontent.com/u/68551?s=50";></td>
-    <td class="text-center">Aljoscha Krettek</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">aljoscha</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars2.githubusercontent.com/u/2550549?s=50";></td>
-    <td class="text-center">Andra Lungu</td>
-    <td class="text-center">Committer</td>
-    <td class="text-center">andra</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars0.githubusercontent.com/u/89049?s=50";></td>
-    <td class="text-center">Robert Metzger</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">rmetzger</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars2.githubusercontent.com/u/837221?s=50";></td>
-    <td class="text-center">Maximilian Michels</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">mxm</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars2.githubusercontent.com/u/1941681?s=50";></td>
-    <td class="text-center">Chiwan Park</td>
-    <td class="text-center">Committer</td>
-    <td class="text-center">chiwanpark</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars1.githubusercontent.com/u/5756858?s=50";></td>
-    <td class="text-center">Till Rohrmann</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">trohrmann</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars0.githubusercontent.com/u/105434?s=50";></td>
-    <td class="text-center">Henry Saputra</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">hsaputra</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars0.githubusercontent.com/u/8959638?s=50";></td>
-    <td class="text-center">Matthias J. Sax</td>
-    <td class="text-center">Committer</td>
-    <td class="text-center">mjsax</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars1.githubusercontent.com/u/409707?s=50";></td>
-    <td class="text-center">Sebastian Schelter</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">ssc</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars2.githubusercontent.com/u/1925554?s=50";></td>
-    <td class="text-center">Kostas Tzoumas</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">ktzoumas</td>
-  </tr>
-  <tr>
-    <td class="text-center"></td>
-    <td class="text-center">Timo Walther</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">twalthr</td>
-  </tr> 
-  <tr>
-    <td class="text-center"><img 
src="https://avatars1.githubusercontent.com/u/1826769?s=50";></td>
-    <td class="text-center">Daniel Warneke</td>
-    <td class="text-center">PMC, Committer</td>
-    <td class="text-center">warneke</td>
-  </tr>
-  <tr>
-    <td class="text-center"><img 
src="https://avatars1.githubusercontent.com/u/4425616?s=50";></td>
-    <td class="text-center">ChengXiang Li</td>
-    <td class="text-center">Committer</td>
-    <td class="text-center">chengxiang</td>
-  </tr>
-<<<<<<< 1bfef19c46ea9fb303a717d6893499c4a1afafb5
-  <tr>
-    <td class="text-center"><img 
src="https://avatars1.githubusercontent.com/u/569655?s=50";></td>
-    <td class="text-center">Greg Hogan</td>
-    <td class="text-center">Committer</td>
-    <td class="text-center">greg</td>
-  </tr>
-=======
->>>>>>> Add chengxiang to the People list.
-</table>
-
-You can reach committers directly at `<apache-id>@apache.org`. A list of all 
contributors can be found [here]({{ site.FLINK_CONTRIBUTORS_URL }}).
-
-## Former mentors
-
-The following people were very kind to mentor the project while in incubation.
-
-<table class="table table-striped">
-  <thead>
-    <th class="text-center"></th>
-    <th class="text-center">Name</th>
-    <th class="text-center">Role</th>
-    <th class="text-center">Apache ID</th>
-  </thead>
-  <tr>
-    <td class="text-center"></td>
-    <td class="text-center">Ashutosh Chauhan</td>
-    <td class="text-center">Former PPMC, Mentor</td>
-    <td class="text-center">hashutosh</td>
-  </tr>
-  <tr>
-    <td class="text-center"></td>
-    <td class="text-center">Ted Dunning</td>
-    <td class="text-center">Former PPMC, Mentor</td>
-    <td class="text-center">tdunning</td>
-  </tr>
-  <tr>
-    <td class="text-center"></td>
-    <td class="text-center">Alan Gates</td>
-    <td class="text-center">Former PPMC, Mentor</td>
-    <td class="text-center">gates</td>
-  </tr>
-  </tr>
-    <tr>
-    <td class="text-center"></td>
-    <td class="text-center">Owen O'Malley</td>
-    <td class="text-center">Former PPMC, Mentor</td>
-    <td class="text-center">omalley</td>
-  </tr>
-  <tr>
-    <td class="text-center"></td>
-    <td class="text-center">Sean Owen</td>
-    <td class="text-center">Former PPMC, Mentor</td>
-    <td class="text-center">srowen</td>
-  </tr>
-  <tr>
-    <td class="text-center"></td>
-    <td class="text-center">Henry Saputra</td>
-    <td class="text-center">Former PPMC, Mentor</td>
-    <td class="text-center">hsaputra</td>
-  </tr>
-</table>

http://git-wip-us.apache.org/repos/asf/flink-web/blob/d72e9338/downloads.md
----------------------------------------------------------------------
diff --git a/downloads.md b/downloads.md
index ed2452c..aa56821 100644
--- a/downloads.md
+++ b/downloads.md
@@ -81,7 +81,10 @@ pick the Hadoop 1 version.
 
 ## Maven Dependencies
 
-You can add the following dependencies to your `pom.xml` to include Apache 
Flink in your project.
+You can add the following dependencies to your `pom.xml` to include Apache 
Flink in your project. These dependencies include a local execution environment 
and thus support local testing.
+
+- **Hadoop 1**: If you want to interact with Hadoop 1, use `{{ 
site.FLINK_VERSION_HADOOP_1_STABLE }}` as the version.
+- **Scala API**: To use the Scala API, replace the `flink-java` artifact id 
with `flink-scala_2.10` and `flink-streaming-java_2.10` with 
`flink-streaming-scala_2.10`. For Scala 2.11 dependencies, use the suffix 
`_2.11` instead of `_2.10`.
 
 ```xml
 <dependency>
@@ -101,11 +104,6 @@ You can add the following dependencies to your `pom.xml` 
to include Apache Flink
 </dependency>
 ```
 
-These dependencies include a local execution environment and thus support 
local testing.
-
-- **Hadoop 1**: If you want to interact with Hadoop 1, use `{{ 
site.FLINK_VERSION_HADOOP_1_STABLE }}` as the version.
-- **Scala API**: To use the Scala API, replace the `flink-java` artifact id 
with `flink-scala_2.10` and `flink-streaming-java_2.10` with 
`flink-streaming-scala_2.10`. For Scala 2.11 dependencies, use the suffix 
`_2.11` instead of `_2.10`.
-
 ## All releases
 
 - Flink 1.0.0 ([Binaries](http://archive.apache.org/dist/flink/flink-1.0.0/), 
[Docs]({{site.DOCS_BASE_URL}}flink-docs-release-1.0/), 
[Javadocs]({{site.DOCS_BASE_URL}}flink-docs-release-1.0/api/java), 
[ScalaDocs]({{site.DOCS_BASE_URL}}flink-docs-release-1.0/api/scala/index.html))

http://git-wip-us.apache.org/repos/asf/flink-web/blob/d72e9338/faq.md
----------------------------------------------------------------------
diff --git a/faq.md b/faq.md
index ec39254..75eaeb9 100644
--- a/faq.md
+++ b/faq.md
@@ -33,7 +33,7 @@ The following questions are frequently asked with regard to 
the Flink project **
 ### Is Flink a Hadoop Project?
 
 Flink is a data processing system and an **alternative to Hadoop's
-MapReduce component**. It comes with its *own runtime*, rather than building 
on top
+MapReduce component**. It comes with its *own runtime* rather than building on 
top
 of MapReduce. As such, it can work completely independently of the Hadoop
 ecosystem. However, Flink can also access Hadoop's distributed file
 system (HDFS) to read and write data, and Hadoop's next-generation resource
@@ -51,7 +51,7 @@ Hadoop client libraries by default.
 Additionally, we provide a special YARN Enabled download of Flink for
 users with an existing Hadoop YARN cluster. [Apache Hadoop
 
YARN](http://hadoop.apache.org/docs/r2.2.0/hadoop-yarn/hadoop-yarn-site/YARN.html)
-is Hadoop's cluster resource manager that allows to use
+is Hadoop's cluster resource manager that allows use of
 different execution engines next to each other on a cluster.
 
 ## Usage
@@ -286,9 +286,9 @@ available heap space.
 
 ### Why do the TaskManager log files become so huge?
 
-Check the logging behavior of your jobs. Emitting logging per or tuple may be
-helpful to debug jobs in small setups with tiny data sets, it becomes very
-inefficient and disk space consuming if used for large input data.
+Check the logging behavior of your jobs. Emitting logging per object or tuple 
may be
+helpful to debug jobs in small setups with tiny data sets but can limit 
performance
+and consume substantial disk space if used for large input data.
 
 ### The slot allocated for my task manager has been released. What should I do?
 
@@ -434,10 +434,10 @@ code is blocked.
 
 ### What kind of fault-tolerance does Flink provide?
 
-For streaming programs, Flink has a novel approach to draw periodic snapshots 
of the streaming dataflow state and use those for recovery.
+For streaming programs Flink has a novel approach to draw periodic snapshots 
of the streaming dataflow state and use those for recovery.
 This mechanism is both efficient and flexible. See the documentation on 
[streaming fault tolerance]({{ site.docs-snapshot 
}}/internals/stream_checkpointing.html) for details.
 
-For batch processing programs, Flink remembers the programs sequence of 
transformations and can restart failed jobs.
+For batch processing programs Flink remembers the program's sequence of 
transformations and can restart failed jobs.
 
 
 ### Are Hadoop-like utilities, such as Counters and the DistributedCache 
supported?

http://git-wip-us.apache.org/repos/asf/flink-web/blob/d72e9338/features.md
----------------------------------------------------------------------
diff --git a/features.md b/features.md
index e4b2516..a3bb5d2 100644
--- a/features.md
+++ b/features.md
@@ -299,11 +299,11 @@ val result = initialRanks.iterate(30) { pages =>
 </div>
 <div class="row">
   <div class="col-sm-6">
-    <p class="lead">Flink's stack offers libraries with high-level APIs for 
different use cases: Machine Learning, Graph Analytics, and Relational Data 
Processing.</p>
+    <p class="lead">Flink's stack offers libraries with high-level APIs for 
different use cases: Complex Event Processing, Machine Learning, and Graph 
Analytics.</p>
     <p class="lead">The libraries are currently in <i>beta</i> status and are 
heavily developed.</p>
   </div>
   <div class="col-sm-6 img-column">
-    <img src="{{ site.baseurl }}/img/features/stack.png" alt="Flink Stack with 
Libraries" style="width:60%" />
+    <img src="{{ site.baseurl }}/img/flink-stack-frontpage.png" alt="Flink 
Stack with Libraries" style="width:100%" />
   </div>
 </div>
 

http://git-wip-us.apache.org/repos/asf/flink-web/blob/d72e9338/img/features/stack.png
----------------------------------------------------------------------
diff --git a/img/features/stack.png b/img/features/stack.png
deleted file mode 100644
index 2c34722..0000000
Binary files a/img/features/stack.png and /dev/null differ

Reply via email to