Update FAQ entry on Fault Tolerance
Fix various links
diff --git a/content/community.html b/content/community.html
index ec76633..ce85100 100644
--- a/content/community.html
+++ b/content/community.html
@@ -343,7 +343,7 @@
<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"><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>
@@ -361,7 +361,7 @@
<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"><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>
diff --git a/content/faq.html b/content/faq.html
index b1e7c3d..78dd9b1 100644
--- a/content/faq.html
+++ b/content/faq.html
@@ -581,15 +581,17 @@
<h3 id="what-kind-of-fault-tolerance-does-flink-provide">What kind of fault-tolerance does Flink provide?</h3>
-<p>Flink can restart failed jobs. Mid-query fault tolerance will go into the
-open source project in the next versions.</p>
+<p>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 <a href="http://ci.apache.org/projects/flink/flink-docs-master/internals/stream_checkpointing.html">streaming fault tolerance</a> for details.</p>
+
+<p>For batch processing programs, Flink remembers the programs sequence of transformations and can restart failed jobs.</p>
<h3 id="are-hadoop-like-utilities-such-as-counters-and-the-distributedcache-supported">Are Hadoop-like utilities, such as Counters and the DistributedCache supported?</h3>
<p><a href="http://ci.apache.org/projects/flink/flink-docs-master/apis/programming_guide.html#accumulators--counters">Flink’s Accumulators</a> work very similar like
-[Hadoop’s counters, but are more powerful.</p>
+Hadoop’s counters, but are more powerful.</p>
-<p>Flink has a https://github.com/apache/flink/tree/master//flink-core/src/main/java/org/apache/flink/api/common/cache/DistributedCache.java that is deeply integrated with the APIs. Please refer to the https://github.com/apache/flink/tree/master//flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java#L561 for details on how to use it.</p>
+<p>Flink has a <a href="https://github.com/apache/flink/tree/master/flink-core/src/main/java/org/apache/flink/api/common/cache/DistributedCache.java">Distributed Cache</a> that is deeply integrated with the APIs. Please refer to the <a href="https://github.com/apache/flink/tree/master/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java#L561">JavaDocs</a> for details on how to use it.</p>
<p>In order to make data sets available on all tasks, we encourage you to use <a href="http://ci.apache.org/projects/flink/flink-docs-master/apis/programming_guide.html#broadcast-variables">Broadcast Variables</a> instead. They are more efficient and easier to use than the distributed cache.</p>
diff --git a/faq.md b/faq.md
index 85299e8..5e44742 100644
--- a/faq.md
+++ b/faq.md
@@ -384,14 +384,17 @@
### What kind of fault-tolerance does Flink provide?
-Flink can restart failed jobs. Mid-query fault tolerance will go into the
-open source project in the next versions.
+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.
+
### Are Hadoop-like utilities, such as Counters and the DistributedCache supported?
[Flink's Accumulators]({{ site.docs-snapshot }}/apis/programming_guide.html#accumulators--counters) work very similar like
-[Hadoop's counters, but are more powerful.
+Hadoop's counters, but are more powerful.
-Flink has a {% github /flink-core/src/main/java/org/apache/flink/api/common/cache/DistributedCache.java "Distributed Cache" %} that is deeply integrated with the APIs. Please refer to the {% github /flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java#L561 "JavaDocs" %} for details on how to use it.
+Flink has a [Distributed Cache](https://github.com/apache/flink/tree/master/flink-core/src/main/java/org/apache/flink/api/common/cache/DistributedCache.java) that is deeply integrated with the APIs. Please refer to the [JavaDocs](https://github.com/apache/flink/tree/master/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java#L831) for details on how to use it.
In order to make data sets available on all tasks, we encourage you to use [Broadcast Variables]({{ site.docs-snapshot }}/apis/programming_guide.html#broadcast-variables) instead. They are more efficient and easier to use than the distributed cache.
