You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by uc...@apache.org on 2015/05/15 16:10:04 UTC
[05/52] [abbrv] flink-web git commit: Change website layout
http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/css/main/main.css
----------------------------------------------------------------------
diff --git a/css/main/main.css b/css/main/main.css
deleted file mode 100755
index 9fa63af..0000000
--- a/css/main/main.css
+++ /dev/null
@@ -1,370 +0,0 @@
-/*----------------------------------------------------------------------
- General
-----------------------------------------------------------------------*/
-
-/* Override Bootstrap Style */
-body {
- font-family: Helvetica, Arial, sans-serif;
-}
-
-html {
- font-size: 100%;
-}
-
-body {
- font-size: 100%;
-}
-
-.af-main-nav ul {
- list-style-type: none;
-}
-
-.af-privacy-policy {
- display: inline-block;
- font-style: normal;
- font-size: 0.9em;
- margin: 30px auto 0 auto;
- font-style: normal;
-}
-
-.af-separator {
- color: #ccc;
-}
-
-.divider {
- border-bottom: 1px solid #ccc;
- height: 4px;
- margin: 8px 0 12px 0 !important;
- overflow: hidden;
- padding: 0;
-}
-
-/* Headings */
-.af-heading3 {
- font-weight: bold;
- margin-bottom: 20px;
-}
-
-/* Buttons */
-.af-btn {
- color: #fff;
- display: block;
- padding: 0.4em 0.9em;
- text-align: center;
- text-decoration: none !important;
-}
-
-.af-btn:hover {
- color: #fff;
-}
-
-.af-btn-large {
- font-size: 1.4em;
-}
-
-.af-btn-orange {
- background: #FA5F00;
- border: 1px solid #7c5a2f;
-}
-
-.af-btn-blue {
- background: #3795c6;
- border: 1px solid #2c6e92;
-}
-
-/* Sections */
-.af-section {
- font-size: 1.2em;
- padding-top : 35px;
- padding-bottom: 35px;
- padding-top: 35px;
-}
-
-.af-colored {
- background: #2c3e50;
- color: #fff;
-}
-
-/* General */
-
-.af-inner-pages-navigation {
- padding-bottom:20px;
-}
-
-/*----------------------------------------------------------------------
- Layout
-----------------------------------------------------------------------*/
-
-/* Header */
-.af-header-container {
- background: #08131F;
- /* #2c3e50 / #08131F my proposal*/
- padding-top: 20px;
-}
-
-/* Navigation */
-.af-main-nav ul {
- float: right;
- margin-top: 20px;
-}
-
-.af-main-nav li {
- float: left;
- margin-right: 55px;
- position: relative;
-}
-
-.af-main-nav li a {
- color: #fff;
- font-size: 1.15em;
-}
-
-.af-main-nav ul.af-dropdown-menu {
- display:none;
-}
-
-.caret {
- display: inline-block;
- width: 0;
- height: 0;
- margin-left: 2px;
- vertical-align: middle;
- border-top: 4px solid;
- border-right: 4px solid rgba(0, 0, 0, 0);
- border-left: 4px solid rgba(0, 0, 0, 0);
-}
-
-/* Front Top Area */
-.af-front-top {
- text-align: center;
- margin: 30px auto;
-}
-
-.af-front-top-logo {
- margin: 30px auto 30px auto;
- width: 200px;
-}
-
-.af-front-top-headline1 {
- color: #fff;
- font-size: 2em;
- font-weight: bold;
-}
-
-.af-front-top-headline2 {
- color: #fff;
- font-size: 1.6em;
- font-weight: normal;
-}
-
-/* Front Top Buttons */
-.af-front-top-buttons {
- background: #1b2e3d;
- padding-top: 18px;
- padding-bottom: 18px;
-}
-
-/* Front Page Icons */
-#af-assets {
- padding-top: 65px;
- padding-bottom: 65px;
-}
-
-.af-asset {
- text-align: center;
-}
-
-.af-asset-img {
- background: #08131F;
- border-radius: 100%;
- height: 100px;
- margin: 0px auto 15px auto;
- width: 100px;
-}
-
-.af-asset-img:hover {
- background: #3795c6;
-}
-
-.af-asset-img img {
- padding: 30px;
-}
-
-.af-asset-heading {
- color: #2c3e50;
- font-weight: bold;
-}
-
-.af-section-row {
- margin-top: 25px;
-}
-
-/* Up Footer */
-#af-upfooter {
- background: #e6e6e6;
- font-style: italic;
-}
-
-#af-upfooter img {
- margin: 20px auto 0 auto;
-}
-
-/* Footer */
-#af-footer {
- background: #101416;
- color: #fff;
- padding: 20px 0 0 0;
-}
-
-#af-footer h3 {
- font-size: 1.2em;
- color: #fff !important;
-}
-
-.af-footer-menu {
- margin: 35px 0 35px 0;
- padding: 0;
-}
-
-.af-footer-menu li {
- padding: 0 0 15px 0;
-}
-
-.af-footer-menu li a {
- color: #fff;
-}
-
-.af-footer-bar {
- background: #0d100e;
- color: #fff;
- font-size: 0.9em;
- padding: 17px 0;
-}
-
-.af-footer-bar a {
- color: #F7931E;
-}
-
-.af-footer-img {
- display: inline-block;
- margin-right: 2%;
- width: 30px;
-}
-
-.af-footer-menu span {
- font-size: 0.8em;
-}
-
-/*----------------------------------------------------------------------
- Responsive CSS 768px / 992px / 1200px
-----------------------------------------------------------------------*/
-
-@media all and (min-width: 768px) {
-
- /* Navigation */
- .af-main-nav > ul {
- display:block !important;
- }
-
- .af-main-nav ul.af-dropdown-menu {
- background: #1B2E3D;
- border-bottom-left-radius: 5px;
- border-bottom-right-radius: 5px;
- display: none;
- margin: 5px 0 0 0;
- padding: 10px 0;
- position: absolute;
- z-index: 10;
- }
-
- .af-dropdown-menu li {
- display: block;
- float: none;
- margin: 0;
- padding: 3px 20px;
- }
-
- .af-dropdown-menu li a {
- font-size: 1em;
- white-space: nowrap;
- }
-}
-
-/* Medium Devices */
-@media all and (max-width: 1190px) {
-
- /* Navigation */
- .af-main-nav li {
- margin-right: 25px;
- }
-
- .af-main-nav li a {
- color: #fff;
- font-size: 1em;
- }
-}
-
-/* Small Devices */
-@media all and (max-width: 991px) {
-
- /* Navigation */
- .af-main-nav ul {
- float: none;
- }
-
- /* Sections */
- .af-section-img {
- margin: 35px auto;
- }
-
-}
-
-/* XSmall Devices */
-@media all and (max-width: 767px) {
-
- .af-header-container {
- padding-top: 0;
- }
-
- .af-mobile-nav-bar {
- color: #fff;
- padding-top: 20px;
- padding-bottom: 20px;
- }
-
- .af-mobile-nav-bar .glyphicon {
- font-size: 1.5em;
- }
-
- .af-mobile-btn {
- background: #FA5F00;
- margin-right: -15px;
- padding: 10px;
- }
-
- /* Navigation */
- .af-main-nav ul {
- margin: 0;
- padding: 0;
- display:none;
- }
-
- .af-main-nav ul li {
- float: none;
- border-bottom:1px solid #fff;
- padding: 0;
- margin: 0;
- }
-
- .af-main-nav ul li a {
- background: #1B2E3D;
- display: block;
- font-size: 0.9em;
- font-weight:bold;
- padding: 15px 10px;
- }
-
- .af-main-nav ul li.active a {
- background: #FA5F00;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/css/simple-sidebar.css
----------------------------------------------------------------------
diff --git a/css/simple-sidebar.css b/css/simple-sidebar.css
deleted file mode 100644
index dac40e5..0000000
--- a/css/simple-sidebar.css
+++ /dev/null
@@ -1,117 +0,0 @@
-#wrapper {
- padding-left: 250px;
- transition: all 0.4s ease 0s;
-}
-
-#sidebar-wrapper {
- margin-left: -250px;
- left: 250px;
- width: 250px;
- background: #000;
- position: fixed;
- height: 100%;
- overflow-y: auto;
- z-index: 1000;
- transition: all 0.4s ease 0s;
-}
-
-#page-content-wrapper {
- width: 100%;
-}
-
-.sidebar-nav {
- position: absolute;
- top: 0;
- width: 250px;
- list-style: none;
- margin: 0;
- padding: 0;
-}
-
-.sidebar-nav li {
- line-height: 40px;
- text-indent: 20px;
-}
-
-.sidebar-nav li a {
- color: #999999;
- display: block;
- text-decoration: none;
-}
-
-.sidebar-nav li a:hover {
- color: #fff;
- background: rgba(255,255,255,0.2);
- text-decoration: none;
-}
-
-.sidebar-nav li a:active,
-.sidebar-nav li a:focus {
- text-decoration: none;
-}
-
-.sidebar-nav > .sidebar-brand {
- height: 65px;
- line-height: 60px;
- font-size: 18px;
-}
-
-.sidebar-nav > .sidebar-brand a {
- color: #999999;
-}
-
-.sidebar-nav > .sidebar-brand a:hover {
- color: #fff;
- background: none;
-}
-
-.content-header {
- height: 65px;
- line-height: 65px;
-}
-
-.content-header h1 {
- margin: 0;
- margin-left: 20px;
- line-height: 65px;
- display: inline-block;
-}
-
-#menu-toggle {
- display: none;
-}
-
-.inset {
- padding: 20px;
-}
-
-@media (max-width:767px) {
-
-#wrapper {
- padding-left: 0;
-}
-
-#sidebar-wrapper {
- left: 0;
-}
-
-#wrapper.active {
- position: relative;
- left: 250px;
-}
-
-#wrapper.active #sidebar-wrapper {
- left: 250px;
- width: 250px;
- transition: all 0.4s ease 0s;
-}
-
-#menu-toggle {
- display: inline-block;
-}
-
-.inset {
- padding: 15px;
-}
-
-}
http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/doap_flink.rdf
----------------------------------------------------------------------
diff --git a/doap_flink.rdf b/doap_flink.rdf
index 4b84431..15418a2 100644
--- a/doap_flink.rdf
+++ b/doap_flink.rdf
@@ -27,10 +27,10 @@
<name>Apache Flink</name>
<homepage rdf:resource="http://flink.apache.org" />
<asfext:pmc rdf:resource="http://flink.apache.org" />
- <shortdesc>Fast and reliable large-scale data processing</shortdesc>
- <description>Flink is an open source system for expressive, declarative, fast, and efficient data analysis. It combines the scalability and programming flexibility of distributed MapReduce-like platforms with the efficiency, out-of-core execution, and query optimization capabilities found in parallel databases.</description>
+ <shortdesc>Real-time data analysis</shortdesc>
+ <description>**Apache Flink** is an [open source platform]() for real-time data analysis.</description>
<bug-database rdf:resource="https://issues.apache.org/jira/browse/FLINK" />
- <mailing-list rdf:resource="http://flink.apache.org/community.html#mailing-lists" />
+ <mailing-list rdf:resource="http://flink.apache.org/community.html" />
<download-page rdf:resource="http://flink.apache.org/downloads.html" />
<programming-language>Java</programming-language>
<programming-language>Scala</programming-language>
http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/downloads.md
----------------------------------------------------------------------
diff --git a/downloads.md b/downloads.md
index 8f07942..a1998ae 100644
--- a/downloads.md
+++ b/downloads.md
@@ -1,6 +1,5 @@
---
title: "Downloads"
-layout: simple
---
<script type="text/javascript">
@@ -14,36 +13,43 @@ $( document ).ready(function() {
});
</script>
+{% toc %}
-<p class="lead">Pick the <strong>Apache Flink</strong> package matching your Hadoop version.</p>
+## Latest stable release (v{{ site.stable }})
-## Stable
+Apache Flink {{ site.stable }} is our latest stable release.
-Apache Flink {{ site.FLINK_VERSION_STABLE }} is our latest stable release.
+You [don't have to install Hadoop](faq.html#do-i-have-to-install-apache-hadoop-to-use-flink) to use Flink, but if you plan to use Flink with data stored in Hadoop, pick the version matching your installed Hadoop version. If you don't want to do this, pick the Hadoop 1 version.
<div class="list-group">
+ <!-- Hadoop 1 -->
<a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_1_STABLE }}" id="download-hadoop1" class="list-group-item ga-track">
- <h4 class="list-group-item-heading">
- <i class="fa fa-download"></i> <strong>Flink {{ site.FLINK_VERSION_STABLE }}</strong> for Hadoop 1</h4>
+ <h4><span class="glyphicon glyphicon-download" aria-hidden="true"></span> <strong>Flink {{ site.stable }}</strong> for Hadoop 1</h4>
+
<p>Pick this package if you plan to use Flink with data stored in Hadoop 1.x.</p>
<p>Also pick this version if you don't plan to use Flink with Hadoop at all.</p>
</a>
+
+ <!-- Hadoop 2 -->
<a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_2_STABLE }}" id="download-hadoop2" class="list-group-item ga-track">
- <h4 class="list-group-item-heading"><i class="fa fa-download"></i> <strong>Flink {{ site.FLINK_VERSION_STABLE }}</strong> for Hadoop 2</h4>
- <p>Pick this package if you plan to install Flink use Flink with data stored in Hadoop 2.x.</p>
+ <h4><span class="glyphicon glyphicon-download" aria-hidden="true"></span> <strong>Flink {{ site.stable }}</strong> for Hadoop 2</h4>
+ <p>Pick this package if you plan to install Flink use Flink with data stored in Hadoop 2.x.</p>
</a>
+
+ <!-- YARN -->
<a href="{{ site.FLINK_DOWNLOAD_URL_YARN_STABLE }}" class="list-group-item ga-track" id="download-hadoop2-yarn">
- <h4 class="list-group-item-heading"><i class="fa fa-download"></i> <strong>Flink {{ site.FLINK_VERSION_STABLE }}</strong> for YARN</h4>
- <p>Pick this package if you plan to use Flink with Hadoop YARN.</p>
+ <h4><span class="glyphicon glyphicon-download" aria-hidden="true"></span> <strong>Flink {{ site.stable }}</strong> for YARN</h4>
+ <p>Pick this package if you plan to use Flink with Hadoop YARN.</p>
</a>
+
+ <!-- Source -->
<a href="{{ site.FLINK_DOWNLOAD_URL_SOURCE }}" class="list-group-item ga-track" id="download-source">
- <h4 class="list-group-item-heading"><i class="fa fa-download"></i> <strong>Flink {{ site.FLINK_VERSION_STABLE }}</strong> Source Release</h4>
+ <h4><span class="glyphicon glyphicon-download" aria-hidden="true"></span> <strong>Flink {{ site.FLINK_VERSION_STABLE }}</strong> Source Release</h4>
<p>Review the source code or build Flink on your own, using this package</p>
</a>
</div>
-
-### Maven Dependencies
+## Maven Dependencies
You can add the following dependencies to your `pom.xml` to include Apache Flink in your project.
@@ -65,23 +71,13 @@ These dependencies include a local execution environment and thus support local
- **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`.
-## Preview
+## Preview release
-This **milestone release** is a preview of the upcoming {{site.FLINK_VERSION_LATEST_SHORT}} release. Check out the announcement for all the details.
+This **milestone release** is a preview of the upcoming {{site.FLINK_VERSION_LATEST_SHORT}} release. Check out the [announcement]({{ site.baseurl }}/news/2015/04/13/release-0.9.0-milestone1.html) for all the details.
-<div class="list-group">
- <a href="http://www.apache.org/dyn/closer.cgi/flink/flink-0.9.0-milestone-1/flink-0.9.0-milestone-1-bin-hadoop1.tgz" id="download-hadoop1" class="list-group-item ga-track">
- <h4 class="list-group-item-heading"><i class="fa fa-download"></i> <strong>Flink 0.9.0-milestone-1</strong> for Hadoop 1</h4>
- </a>
- <a href="http://www.apache.org/dyn/closer.cgi/flink/flink-0.9.0-milestone-1/flink-0.9.0-milestone-1-bin-hadoop2.tgz" id="download-hadoop2" class="list-group-item ga-track">
- <h4 class="list-group-item-heading"><i class="fa fa-download"></i> <strong>Flink 0.9.0-milestone-1</strong> for Hadoop 2 and YARN</h4>
- </a>
- <a href="http://www.apache.org/dyn/closer.cgi/flink/flink-0.9.0-milestone-1/flink-0.9.0-milestone-1-src.tgz" class="list-group-item ga-track" id="download-source">
- <h4 class="list-group-item-heading"><i class="fa fa-download"></i> <strong>Flink 0.9.0-milestone-1</strong> Source Release</h4>
- </a>
-</div>
-
-### Maven Dependencies
+- **Hadoop 1**: <a href="http://www.apache.org/dyn/closer.cgi/flink/flink-0.9.0-milestone-1/flink-0.9.0-milestone-1-bin-hadoop1.tgz" id="download-hadoop1-preview" class="ga-track">flink-0.9.0-milestone-1-bin-hadoop1.tgz</a>
+- **Hadoop 2 and YARN**: <a href="http://www.apache.org/dyn/closer.cgi/flink/flink-0.9.0-milestone-1/flink-0.9.0-milestone-1-bin-hadoop2.tgz" id="download-hadoop2-preview" class="ga-track">flink-0.9.0-milestone-1-bin-hadoop2.tgz</a>
+- **Source**. <a href="http://www.apache.org/dyn/closer.cgi/flink/flink-0.9.0-milestone-1/flink-0.9.0-milestone-1-src.tgz" class="ga-track" id="download-source-preview">flink-0.9.0-milestone-1-src.tgz</a>
You can add the following dependencies to your `pom.xml` to include Apache Flink in your project.
@@ -98,12 +94,10 @@ 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 `0.9.0-milestone-1-hadoop1` as the version.
- **Scala API**: To use the Scala API, replace the `flink-java` artifact id with `flink-scala`.
-## Latest
+## Snapshot
Apache Flink `{{ site.FLINK_VERSION_LATEST }}` is our latest development version.
@@ -111,15 +105,8 @@ You can download a packaged version of our nightly builds, which include
the most recent development code. You can use them if you need a feature
before its release. Only builds that pass all tests are published here.
-<div class="list-group">
- <a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_1_LATEST }}" class="list-group-item ga-track" id="download-hadoop1-nightly">
- <h4 class="list-group-item-heading">
- <i class="fa fa-download"></i> <strong>Flink {{ site.FLINK_VERSION_LATEST }}</strong> for Hadoop 1</h4>
- </a>
- <a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_2_LATEST }}" class="list-group-item ga-track" id="download-hadoop2-nightly">
- <h4 class="list-group-item-heading"><i class="fa fa-download"></i> <strong>Flink {{ site.FLINK_VERSION_LATEST }}</strong> for Hadoop 2 and YARN</h4>
- </a>
-</div>
+- **Hadoop 1**: <a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_1_LATEST }}" class="ga-track" id="download-hadoop1-nightly">{{ site.FLINK_DOWNLOAD_URL_HADOOP_1_LATEST | split:'/' | last }}</a>
+- **Hadoop 2 and YARN**: <a href="{{ site.FLINK_DOWNLOAD_URL_HADOOP_2_LATEST }}" class="ga-track" id="download-hadoop2-nightly">{{ site.FLINK_DOWNLOAD_URL_HADOOP_2_LATEST | split:'/' | last }}</a>
Add the **Apache Snapshot repository** to your Maven `pom.xml`:
@@ -135,9 +122,9 @@ Add the **Apache Snapshot repository** to your Maven `pom.xml`:
</repositories>
```
-You can now include Apache Flink as a Maven dependency (see above) with version `{{ site.FLINK_VERSION_LATEST }}` (or `{{ site.FLINK_VERSION_HADOOP_1_LATEST}}` for compatibility with old Hadoop versions (1.x).
+You can now include Apache Flink as a Maven dependency (see above) with version `{{ site.FLINK_VERSION_LATEST }}` (or `{{ site.FLINK_VERSION_HADOOP_1_LATEST}}` for compatibility with old Hadoop versions (1.x)).
-## Checkout from Source
+## Build from Source
You can checkout Apache Flink {{ site.FLINK_VERSION_LATEST }} and build it on your own machine.
@@ -150,3 +137,13 @@ mvn clean package -DskipTests
Note: Flink does not build with Oracle JDK 6. It runs with Oracle JDK 6.
If you want to build for Hadoop 1, activate the build profile via `mvn clean package -DskipTests -Dhadoop.profile=1`.
+
+## All releases
+
+- Flink 0.8.0 ([Jars](http://archive.apache.org/dist/flink/flink-0.8.0/), [Docs]({{site.DOCS_BASE_URL}}flink-docs-release-0.8.0/), [Javadocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.8.0/api/java), [ScalaDocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.8.0/api/scala/index.html))
+- Flink 0.7.0-incubating ([Jars](http://archive.apache.org/dist/incubator/flink/flink-0.7.0-incubating/), [Docs]({{site.DOCS_BASE_URL}}flink-docs-release-0.7/), [Javadocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.7/api/java), [ScalaDocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.7/api/scala/index.html))
+- Flink 0.6.1-incubating ([Jars](http://archive.apache.org/dist/incubator/flink/flink-0.6.1-incubating/), [Docs]({{site.DOCS_BASE_URL}}flink-docs-release-0.6.1/), [Javadocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.6.1/api/java), [ScalaDocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.6.1/api/scala/index.html))
+- Flink 0.6-incubating ([Jars](http://archive.apache.org/dist/incubator/flink/), [Docs]({{site.DOCS_BASE_URL}}flink-docs-release-0.6/), [Javadocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.6/api/java), [ScalaDocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.6/api/scala/index.html))
+- Stratosphere 0.5.1 ([Javadocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.5.1/api/java), [ScalaDocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.5.1/api/scala/index.html))
+- Stratosphere 0.5 ([Javadocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.5/api/java), [ScalaDocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.5/api/scala/index.html))
+- Stratosphere 0.4 ([Javadocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.4/api/java), [ScalaDocs]({{site.DOCS_BASE_URL}}flink-docs-release-0.4/api/scala/index.html))
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/faq.md
----------------------------------------------------------------------
diff --git a/faq.md b/faq.md
new file mode 100644
index 0000000..3111814
--- /dev/null
+++ b/faq.md
@@ -0,0 +1,31 @@
+---
+title: "F.A.Q."
+---
+
+The following questions are frequently asked with regard to the Flink project **in general**. If you have further questions, make sure to consult the [documentation]() or [ask the community]().
+
+{% toc %}
+
+## 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
+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
+manager (YARN) to provision cluster resources. Since most Flink users are
+using Hadoop HDFS to store their data, Flink already ships the required libraries to
+access HDFS.
+
+## Do I have to install Apache Hadoop to use Flink?
+
+**No**. Flink can run **without** a Hadoop installation. However, a *very common*
+setup is to use Flink to analyze data stored in the Hadoop Distributed
+File System (HDFS). To make these setups work out of the box, Flink bundles the
+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
+different execution engines next to each other on a cluster.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/favicon.ico
----------------------------------------------------------------------
diff --git a/favicon.ico b/favicon.ico
old mode 100755
new mode 100644
index 41f40ed..34a467a
Binary files a/favicon.ico and b/favicon.ico differ
http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/favicon.png
----------------------------------------------------------------------
diff --git a/favicon.png b/favicon.png
deleted file mode 100644
index 54bbfd5..0000000
Binary files a/favicon.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/features.md
----------------------------------------------------------------------
diff --git a/features.md b/features.md
new file mode 100644
index 0000000..0df4d7e
--- /dev/null
+++ b/features.md
@@ -0,0 +1,153 @@
+---
+title: "Features"
+---
+
+<p class="lead" markdown="span">Get an overview of **how you can use Flink** and its **design**.</p>
+
+{% toc %}
+
+## Unified Stream & Batch Processing
+
+<p class="lead" markdown="span">Flink's core is a *distributed streaming dataflow engine*, which efficiently supports both *batch* and *stream processing applications*.</p>
+
+<div class="row">
+ <div class="col-sm-4">
+ <img src="{{ site.baseurl }}/img/runtime.png" alt="Apache Flink Stack" title="Apache Flink Stack" width="100%" />
+ </div>
+ <div class="col-sm-8" markdown="1">
+
+Programs written with the [fluent programming APIs]() or using the [domain-specific APIs and libraries]() are translated to dataflows for the Flink engine. Flink takes care of data distribution, communication, and fault tolerance.
+
+Batch programs are as a special case of streaming programs as data inside the system is streamed all the way, including **pipelined shuffles**.
+ </div>
+</div>
+
+<hr>
+
+# Programming Flink
+
+## Fluent Programming APIs
+
+<p class="lead">
+Write beautiful, type-safe, and maintainable code in Java or Scala. You can use native Java and Scala data types without packing them into key-value pairs, logical field addressing, and a wealth of operators.
+</p>
+
+<div class="row">
+ <!-- DataSet API -->
+ <div class="col-sm-4" markdown="1">
+### DataSet API
+
+**Batch Processing**. Use the DataSet API to process static inputs. The following example takes an input text and counts all distinct words in it (the infamous [WordCount]() example).
+
+{% highlight java %}
+DataSet<Tuple2<String, Integer>> counts =
+ text.flatMap(new Tokenizer())
+ .groupBy(0)
+ .sum(1);
+{% endhighlight %}
+
+Check out the [full example code]() and read the [programming guide]() for all features of the DataSet API.
+ </div>
+
+ <!-- DataStream API -->
+ <div class="col-sm-4" markdown="1">
+### DataStream API
+
+**Stream Processing**. Use the DataStream API to process continuous streams of data. The following example counts all distinct words in a sliding window over the input stream.
+
+{% highlight java %}
+DataStream<Tuple2<String, Integer>> counts =
+ text.flatMap(new Tokenizer())
+ .window(Count.of(windowSize))
+ .every(Count.of(slideSize))
+ .groupBy(0).sum(1);
+{% endhighlight %}
+
+Check out the [full example code]() and read the [streaming guide]() for all features of the DataStream API.
+ </div>
+
+ <!-- Table API -->
+ <div class="col-sm-4" markdown="1">
+### Table API
+
+**Language integrated queries**. Specify operations using SQL-like expressions. These operations work both with static inputs as well as continuous streams.
+
+{% highlight java %}
+Table table = tableEnv.toTable(text);
+Table filtered = table
+ .groupBy("word")
+ .select("word.count as count, word")
+ .filter("count = 2");
+{% endhighlight %}
+
+Check out the [full example code]() and read the [Table API guide]() for all features of the Table API.
+ </div>
+</div>
+
+<br>
+<hr>
+<br>
+
+## Domain-specific APIs & Libraries
+
+<p class="lead" markdown="1">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod</p>
+
+<div class="row">
+ <div class="col-sm-6" markdown="1">
+### Graph API & Library: Gelly
+ </div>
+
+ <div class="col-sm-6" markdown="1">
+### Machine Learning Library
+
+ </div>
+</div>
+
+<br>
+
+## Deployment and Integration
+
+<p class="lead" markdown="1">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod</p>
+
+<br>
+
+# System Design
+
+## Stateful Operators
+
+Applications that go beyond simple filters or line-by-line transformations of the input need stateful operators. There are three kinds of state that are offered by Flink:
+
+- **User-defined state**: As Flink is a streaming dataflow system, operators are continuously running, and can contain user-defined state in the form of Java/Scala objects. This is the most elementary (but most flexible) operator state, but is not backed up or restored by the system in cases of failures.
+
+- **Managed state**: User-defined operations will be able to use a special interface to put their state into an object that is backed up and restored in case of failures. Flink contains managed state internally, and the community is working on exposing this to the user-facing APIs shortly.
+
+- **Windowed streams**: Flink offers the ability to create a finite stream from an infinite stream using (sliding) windows over the stream. The contents of those windows is special form of state that is managed by the system.
+
+Flink uses a variation of the [Chandy-Lamport algorithm]() for consistent asynchronous distributed snapshots. The state backup works hand-in-hand with checkpoint barriers for stream replay. This allows Flink to give **exactly-once processing guarantees** by replaying parts of a stream, reproducing the results of a user program.
+
+## Memory Management
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+
+## Iterative Dataflows
+
+<div class="row">
+ <div class="col-sm-4">
+ <img src="{{ site.baseurl }}/img/main/section/pagerank.png" alt="Apache Flink Stack" title="Apache Flink Stack" width="100%" />
+ </div>
+ <div class="col-sm-8" markdown="1">
+
+Flink exploits in-memory data streaming and integrates iterative processing deeply into the system runtime.
+
+This makes the system extremely fast for data-intensive and iterative jobs.
+ </div>
+</div>
+
+
+## Program Optimizer
http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/fonts/glyphicons-halflings-regular.eot
----------------------------------------------------------------------
diff --git a/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index 4a4ca86..0000000
Binary files a/fonts/glyphicons-halflings-regular.eot and /dev/null differ