flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [19/52] [abbrv] flink-web git commit: Change website layout
Date Fri, 15 May 2015 14:10:18 GMT
Change website layout


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

Branch: refs/heads/asf-site
Commit: 7b3cf3a7e490a5dd7f2ef02365a1ce1c60810334
Parents: 556aec2
Author: Ufuk Celebi <uce@apache.org>
Authored: Mon May 4 11:09:40 2015 +0200
Committer: Ufuk Celebi <uce@apache.org>
Committed: Wed May 13 11:18:45 2015 +0200

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 .htaccess                                       |    2 +
 _config.yml                                     |   42 +-
 _includes/footer.html                           |  109 -
 _includes/footer.md                             |   14 -
 _includes/navbar.html                           |  193 +-
 _includes/sidebarbav.html                       |  103 -
 _layouts/base.html                              |   67 +
 _layouts/default.html                           |   47 -
 _layouts/docs.html                              |   39 -
 _layouts/feed.html                              |    1 +
 _layouts/none.html                              |    1 -
 _layouts/plain.html                             |   11 +
 _layouts/post.html                              |   41 +-
 _layouts/simple.html                            |    6 -
 _layouts/with_sidenav.html                      |   13 -
 _layouts/with_toc.html                          |    9 -
 _plugins/gh_link.rb                             |   31 -
 _plugins/github.rb                              |   26 +
 _plugins/highlightCode.rb                       |  100 +
 _plugins/markdown.rb                            |   19 -
 _plugins/toc.rb                                 |   19 +
 _plugins/tocify.rb                              |   10 -
 _posts/2013-10-21-cikm2013-paper.md             |    2 +-
 _posts/2014-01-12-0.4-migration-guide.md        |    4 +-
 _posts/2014-01-28-querying_mongodb.md           |    6 +-
 ...02-18-amazon-elastic-mapreduce-cloud-yarn.md |    9 +-
 _posts/2014-08-26-release-0.6.md                |    6 +-
 _posts/2014-11-04-release-0.7.0.md              |    4 +-
 _posts/2014-11-18-hadoop-compatibility.md       |   13 +-
 _posts/2015-01-06-december-in-flink.md          |   26 +-
 _posts/2015-02-02-february-2015-in-flink.md     |  112 -
 _posts/2015-02-04-january-in-flink.md           |   22 +-
 _posts/2015-02-09-streaming-example.md          |    1 -
 _posts/2015-03-02-february-2015-in-flink.md     |  112 +
 ...13-peeking-into-Apache-Flinks-Engine-Room.md |   25 +-
 _posts/2015-04-07-march-in-flink.md             |   21 +-
 _posts/2015-04-13-release-0.9.0-milestone1.md   |   18 +-
 archive.md                                      |   85 -
 asf.md                                          |   10 -
 blog/feed.xml                                   |    2 +-
 blog/index.html                                 |  122 +-
 coding-guidelines.md                            |   44 +
 coding_guidelines.md                            |   65 -
 community.md                                    |  482 +-
 content/coding-guidelines.html                  |  207 +
 content/css/flink.css                           |  150 +
 content/faq.html                                |  193 +
 content/features.html                           |  335 +
 content/img/flink-stack.png                     |  Bin 0 -> 44990 bytes
 content/img/logo.zip                            |  Bin 0 -> 7708436 bytes
 content/img/managed-state.png                   |  Bin 0 -> 22870 bytes
 content/img/navbar-brand-logo.jpg               |  Bin 0 -> 18470 bytes
 content/img/runtime.png                         |  Bin 0 -> 20205 bytes
 css/bootstrap-cosmo.css                         | 5905 -----------------
 css/bootstrap-lumen-custom.css                  | 6189 ------------------
 css/bootstrap-lumen.css                         | 6130 -----------------
 css/bootstrap-readable.css                      | 5899 -----------------
 css/bootstrap-theme.css                         |  347 -
 css/bootstrap-theme.css.map                     |    1 -
 css/bootstrap-theme.min.css                     |    7 -
 css/bootstrap-yeti.css                          | 6087 -----------------
 css/bootstrap.css                               | 5785 ----------------
 css/bootstrap.css.map                           |    1 -
 css/bootstrap.min.css                           |    7 -
 css/custom.css                                  |  171 -
 css/flink.css                                   |  150 +
 css/fonts/glyphicons-halflings-regular.eot      |  Bin 20335 -> 0 bytes
 css/fonts/glyphicons-halflings-regular.svg      |  229 -
 css/fonts/glyphicons-halflings-regular.ttf      |  Bin 41280 -> 0 bytes
 css/fonts/glyphicons-halflings-regular.woff     |  Bin 23320 -> 0 bytes
 css/main/bootstrap-theme.min.css                |   10 -
 css/main/bootstrap.min.css                      |   10 -
 css/main/index.html                             |    1 -
 css/main/main.css                               |  370 --
 css/simple-sidebar.css                          |  117 -
 doap_flink.rdf                                  |    6 +-
 downloads.md                                    |   81 +-
 faq.md                                          |   31 +
 favicon.ico                                     |  Bin 1150 -> 1150 bytes
 favicon.png                                     |  Bin 1288 -> 0 bytes
 features.md                                     |  153 +
 fonts/glyphicons-halflings-regular.eot          |  Bin 20335 -> 0 bytes
 fonts/glyphicons-halflings-regular.svg          |  229 -
 fonts/glyphicons-halflings-regular.ttf          |  Bin 41280 -> 0 bytes
 fonts/glyphicons-halflings-regular.woff         |  Bin 23320 -> 0 bytes
 how-to-contribute.md                            |   23 +-
 img/flink-stack.png                             |  Bin 0 -> 44990 bytes
 img/logo.zip                                    |  Bin 0 -> 7708436 bytes
 img/main/assets/index.html                      |    1 -
 img/main/index.html                             |    1 -
 img/managed-state.png                           |  Bin 0 -> 22870 bytes
 img/navbar-brand-logo.jpg                       |  Bin 0 -> 18470 bytes
 img/runtime.png                                 |  Bin 0 -> 20205 bytes
 index.html                                      |  551 --
 index.md                                        |   95 +
 js/bootstrap.js                                 | 1951 ------
 js/bootstrap.min.js                             |    6 -
 js/main/bootstrap.min.js                        |   12 -
 js/main/index.html                              |    1 -
 js/main/jquery.lazyload.min.js                  |    2 -
 js/main/jquery.mobile.events.min.js             |    3 -
 js/main/main.js                                 |   40 -
 material.md                                     |  192 +-
 privacy-policy.md                               |    1 -
 105 files changed, 2348 insertions(+), 41427 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index dbfa463..4ff0347 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 content/build.sh
+.DS_Store

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/.htaccess
----------------------------------------------------------------------
diff --git a/.htaccess b/.htaccess
index d239da5..b90d119 100644
--- a/.htaccess
+++ b/.htaccess
@@ -7,3 +7,5 @@ RewriteRule ^/?docs/0.8/(.*) http://ci.apache.org/projects/flink/flink-docs-rele
 RewriteRule ^/?docs/latest(/.*)? http://ci.apache.org/projects/flink/flink-docs-master$1  [R=301,L,NE]
 RewriteRule ^/?docs/stable(/.*)? http://ci.apache.org/projects/flink/flink-docs-release-0.8$1  [R=301,L,NE]
 RewriteRule ^/?docs/(.*) http://ci.apache.org/projects/flink/flink-docs-master/$1  [R=301,L,NE]
+
+Redirect 301 /coding_guidelines.html /coding-guidelines.html
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 6f29ace..ea72c5f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -13,16 +13,11 @@ FLINK_VERSION_STABLE: 0.8.1
 FLINK_VERSION_HADOOP_1_STABLE: 0.8.1-hadoop1
 FLINK_VERSION_HADOOP_2_STABLE: 0.8.1
 FLINK_VERSION_STABLE_SHORT: 0.8.1
-FLINK_GITHUB_TAG_STABLE: release-0.8.1
 
 FLINK_VERSION_LATEST: 0.9-SNAPSHOT
 FLINK_VERSION_HADOOP_1_LATEST: 0.9-SNAPSHOT-hadoop1
 FLINK_VERSION_HADOOP_2_LATEST: 0.9-SNAPSHOT
 FLINK_VERSION_LATEST_SHORT: 0.9
-FLINK_GITHUB_TAG_LATEST: master
-
-FLINK_LATEST_DOCS: http://ci.apache.org/projects/flink/flink-docs-master/
-FLINK_CURRENT_DOCS: http://ci.apache.org/projects/flink/flink-docs-release-0.8/
 
 FLINK_ISSUES_URL: https://issues.apache.org/jira/browse/FLINK
 FLINK_GITHUB_URL: https://github.com/apache/flink
@@ -37,6 +32,27 @@ FLINK_DOWNLOAD_URL_YARN_STABLE: http://www.apache.org/dyn/closer.cgi/flink/flink
 FLINK_DOWNLOAD_URL_HADOOP_1_LATEST: http://stratosphere-bin.s3-website-us-east-1.amazonaws.com/flink-0.9-SNAPSHOT-bin-hadoop1.tgz
 FLINK_DOWNLOAD_URL_HADOOP_2_LATEST: http://stratosphere-bin.s3-website-us-east-1.amazonaws.com/flink-0.9-SNAPSHOT-bin-hadoop2.tgz
 
+# 
+
+# Version numbers used in the text for stable and snapshot versions,
+# e.g. "Documentation for {{ site.stable }".
+stable: "0.8.1"
+snapshot: "0.9"
+
+
+
+docs-stable: "http://ci.apache.org/projects/flink/flink-docs-release-0.8"
+docs-snapshot: "http://ci.apache.org/projects/flink/flink-docs-master"
+
+
+# Used by the gh_link plugin
+jira: "https://issues.apache.org/jira/browse/FLINK"
+stackoverflow: "http://stackoverflow.com/search?q=flink"
+twitter: "https://twitter.com/apacheflink"
+github: "https://github.com/apache/flink"
+wiki: "https://cwiki.apache.org/confluence/display/FLINK/Apache+Flink+Home"
+
+
 #baseurl: /incubator-flink-website
 
 #------------------------------------------------------------------------------
@@ -51,16 +67,16 @@ defaults:
     scope:
       path: ""
     values:
-      layout: default
-
-  -
-    scope:
-      path: "docs"
-    values:
-      layout: docs
+      layout: plain
 
+markdown: KramdownPygments
 highlighter: pygments
-markdown: redcarpet
+
+kramdown:
+    toc_levels: 1..3
+    input: GFM
+    hard_wrap: false
+
 redcarpet:
   # https://help.github.com/articles/github-flavored-markdown
   extensions: ["no_intra_emphasis", "fenced_code_blocks", "autolink",

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_includes/footer.html
----------------------------------------------------------------------
diff --git a/_includes/footer.html b/_includes/footer.html
deleted file mode 100644
index 3dce9e5..0000000
--- a/_includes/footer.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!--<section id="af-upfooter" class="af-section">
-	<div class="container">
-		<p>Apache Flink is an effort undergoing incubation at The Apache
-			Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-			Incubation is required of all newly accepted projects until a further
-			review indicates that the infrastructure, communications, and
-			decision making process have stabilized in a manner consistent with
-			other successful ASF projects. While incubation status is not
-			necessarily a reflection of the completeness or stability of the
-			code, it does indicate that the project has yet to be fully endorsed
-			by the ASF.</p>
-		<a href="http://incubator.apache.org"> <img class="img-responsive"
-			src="{{ site.baseurl }}/img/main/apache-incubator-logo.png" alt="Apache Flink" />
-		</a>
-		<p class="text-center">
-			<a href="{{ site.baseurl }}/privacy-policy.html" title="Privacy Policy"
-				class="af-privacy-policy">Privacy Policy</a>
-		</p>
-	</div>
-</section>-->
-
-<footer id="af-footer">
-	<div class="container">
-		<div class="row">
-			<div class="col-md-3">
-				<h3>Documentation</h3>
-				<ul class="af-footer-menu">
-
-					<li><a href="{{site.FLINK_CURRENT_DOCS}}">{{ site.FLINK_VERSION_STABLE_SHORT }}</a></li>
-					<li><a href="{{site.FLINK_CURRENT_DOCS}}api/java/">{{ site.FLINK_VERSION_STABLE_SHORT }} Javadocs</a></li>
-					<li><a href="{{site.FLINK_CURRENT_DOCS}}api/scala/index.html#org.apache.flink.api.scala.package">{{ site.FLINK_VERSION_STABLE_SHORT }} Scaladocs</a></li>
-				</ul>
-			</div>
-			<div class="col-md-3">
-				<h3>Community</h3>
-				<ul class="af-footer-menu">
-					<li><a href="{{ site.baseurl }}/community.html#mailing-lists">Mailing Lists</a></li>
-					<li><a href="https://issues.apache.org/jira/browse/FLINK"
-						target="blank">Issues <span
-							class="glyphicon glyphicon-new-window"></span></a></li>
-					<li><a href="{{ site.baseurl }}/community.html#team">Team</a></li>
-					<li><a href="{{ site.baseurl }}/how-to-contribute.html">How to contribute</a></li>
-					<li><a href="{{ site.baseurl }}/coding_guidelines.html">Coding Guidelines</a></li>
-				</ul>
-			</div>
-			<div class="col-md-3">
-				<h3>ASF</h3>
-				<ul class="af-footer-menu">
-					<li><a href="http://www.apache.org/" target="blank">Apache
-							Software foundation <span class="glyphicon glyphicon-new-window"></span>
-					</a></li>
-					<li><a
-						href="http://www.apache.org/foundation/how-it-works.html"
-						target="blank">How it works <span
-							class="glyphicon glyphicon-new-window"></span></a></li>
-					<li><a href="http://www.apache.org/foundation/thanks.html"
-						target="blank">Thanks <span
-							class="glyphicon glyphicon-new-window"></span></a></li>
-					<li><a
-						href="http://www.apache.org/foundation/sponsorship.html"
-						target="blank">Become a sponsor <span
-							class="glyphicon glyphicon-new-window"></span></a></li>
-					<li><a href="http://incubator.apache.org/projects/flink.html"
-						target="blank">Incubation status page <span
-							class="glyphicon glyphicon-new-window"></span></a></li>
-				</ul>
-			</div>
-			<div class="col-md-3">
-				<h3>Project</h3>
-				<ul class="af-footer-menu">
-					<li><a href="{{ site.baseurl }}/material.html" target="blank">Material <span
-							class="glyphicon glyphicon-new-window"></span></a></li>
-					<li><a
-						href="https://cwiki.apache.org/confluence/display/FLINK"
-						target="blank">Wiki <span
-							class="glyphicon glyphicon-new-window"></span></a></li>
-					<li><a
-						href="https://wiki.apache.org/incubator/StratosphereProposal"
-						target="blank">Incubator proposal <span
-							class="glyphicon glyphicon-new-window"></span></a></li>
-					<li><a href="http://www.apache.org/licenses/LICENSE-2.0"
-						target="blank">License <span
-							class="glyphicon glyphicon-new-window"></span></a></li>
-					<li><a href="https://github.com/apache/incubator-flink"
-						target="blank">Source code <span
-							class="glyphicon glyphicon-new-window"></span></a></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-	<div class="af-footer-bar">
-		<div class="container">
-		  <p>Copyright &copy 2014-2015, <a href="http://www.apache.org">The Apache Software Foundation</a>. All Rights Reserved. Apache and the Apache feather logo are trademarks of the Apache Software Foundation.
-                  </p>
-                  <div>
-                    <div style="float:left">
-                      <p>
-                        <a href="{{ site.baseurl }}/privacy-policy.html" title="Privacy Policy" class="af-privacy-policy">Privacy Policy</a>
-                    </p>
-                    </div>
-                    <div style="float:right">
-                    <p>
-                      <a href="{{ site.baseurl }}/blog/feed.xml" class="af-privacy-policy">RSS Feed</a>
-                    </p>
-                    </div>
-                   </div>
-    		</div>
-	</div>
-</footer>

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_includes/footer.md
----------------------------------------------------------------------
diff --git a/_includes/footer.md b/_includes/footer.md
deleted file mode 100644
index b96adde..0000000
--- a/_includes/footer.md
+++ /dev/null
@@ -1,14 +0,0 @@
-<hr class="divider">
-
-<small>Apache Flink is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have
-stabilized in a manner consistent with other successful ASF projects. While
-incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.</small>
-
-<a href="http://incubator.apache.org/">![Incubator Logo]({{ site.baseurl }}/img/apache-incubator-logo.png)</a>
-
-<p class="text-center"><a href="{{ site.baseurl }}/privacy-policy.html">Privacy Policy<a></p>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_includes/navbar.html
----------------------------------------------------------------------
diff --git a/_includes/navbar.html b/_includes/navbar.html
index 4b59793..cd90cd0 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -1,105 +1,88 @@
-<div class="af-header-container af-inner-pages-navigation">
-	<header>
-		<div class="container">
-			<div class="row">
-				<div class="col-md-1 af-mobile-nav-bar">
-					<a href="/" title="Home">
-					<img class="hidden-xs hidden-sm img-responsive"
-						src="/img/main/logo.png" alt="Apache Flink Logo">
-					</a>
-					<div class="row visible-xs">
-						<div class="col-xs-3">
-						    <a href="/" title="Home">
-							<img class="hidden-x hidden-sm img-responsive"
-								src="/img/main/logo.png" alt="Apache Flink Logo">
-							</a>
-						</div>
-						<div class="col-xs-5"></div>
-						<div class="col-xs-4">
-							<div class="af-mobile-btn">
-								<span class="glyphicon glyphicon-plus"></span>
-							</div>
-						</div>
-					</div>
-				</div>
-				<!-- Navigation -->
-				<div class="col-md-11">
-					<nav class="af-main-nav" role="navigation">
-						<ul>
-							<li><a href="#" class="af-nav-links">Quickstart
-									<b class="caret"></b>
-							</a>
-								<ul class="af-dropdown-menu">
-									<li><a href="{{site.FLINK_CURRENT_DOCS}}setup_quickstart.html">Setup
-											Flink</a></li>
-									<li><a
-										href="{{site.FLINK_CURRENT_DOCS}}java_api_quickstart.html">Java
-											API</a></li>
-									<li><a
-										href="{{site.FLINK_CURRENT_DOCS}}scala_api_quickstart.html">Scala
-											API</a></li>
-								</ul></li>
-							<li><a href="/downloads.html">Download</a></li>
-							<li><a href="{{site.FLINK_CURRENT_DOCS}}faq.html">FAQ</a></li>
-							<li><a href="#" class="af-nav-links">Documentation <b
-									class="caret"></b></a>
-							  <ul class="af-dropdown-menu">
-                                                            		<li class="af-separator">Current Snapshot:</li>
-									<li></li>
-									<li><a href="{{ site.FLINK_LATEST_DOCS }}">{{ site.FLINK_VERSION_LATEST_SHORT}}</a></li>
-									<li><a href="{{ site.FLINK_LATEST_DOCS }}api/java">{{ site.FLINK_VERSION_LATEST_SHORT }} Javadocs</a></li>
-									<li><a href="{{ site.FLINK_LATEST_DOCS }}api/scala/index.html#org.apache.flink.api.scala.package">{{ site.FLINK_VERSION_LATEST_SHORT }} Scaladocs</a></li>
-									<li class="divider"></li>
-									<li class="af-separator">Current Stable:</li>
-									<li></li>
-									<li><a href="{{site.FLINK_CURRENT_DOCS}}">{{ site.FLINK_VERSION_STABLE_SHORT }}</a></li>
-									<li><a href="{{site.FLINK_CURRENT_DOCS}}api/java">{{ site.FLINK_VERSION_STABLE_SHORT }} Javadocs</a></li>
-									<li><a href="{{site.FLINK_CURRENT_DOCS}}api/scala/index.html#org.apache.flink.api.scala.package">{{ site.FLINK_VERSION_STABLE_SHORT }} Scaladocs</a></li>
-									<li class="divider"></li>
-									<li></li>
-									<li><a href="/archive.html">Archive</a></li>
-									<li></li>
-								</ul></li>
-							<li><a href="#" class="af-nav-links">Community <b
-									class="caret"></b></a>
-								<ul class="af-dropdown-menu">
-									<li><a href="/community.html#getting-help">Getting Help</a></li>
-									<li><a href="/community.html#mailing-lists">Mailing Lists</a></li>
-									<li><a href="/community.html#issues">Issues</a></li>
-									<li><a href="/community.html#team">Team</a></li>
-									<li class="divider"></li>
-									<li><a href="/how-to-contribute.html">How To
-											Contribute</a></li>
-									<li><a href="/coding_guidelines.html">Coding
-											Guidelines</a></li>
-								</ul></li>
-							<li><a href="#" class="af-nav-links">Project <b
-									class="caret"></b></a>
-								<ul class="af-dropdown-menu">
-									<li><a href="/material.html">Material</a></li>
-									<li><a href="http://www.apache.org/">Apache Software
-											Foundation <span class="glyphicon glyphicon-new-window"></span>
-									</a></li>
-									<li><a
-										href="https://cwiki.apache.org/confluence/display/FLINK">Wiki
-											<span class="glyphicon glyphicon-new-window"></span>
-									</a></li>
-									<li><a
-										href="https://wiki.apache.org/incubator/StratosphereProposal">Incubator
-											Proposal <span class="glyphicon glyphicon-new-window"></span>
-									</a></li>
-									<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License
-											<span class="glyphicon glyphicon-new-window"></span>
-									</a></li>
-									<li><a href="https://github.com/apache/incubator-flink">Source
-											Code <span class="glyphicon glyphicon-new-window"></span>
-									</a></li>
-								</ul></li>
-							<li><a href="/blog/index.html" class="">Blog</a></li>
-						</ul>
-					</nav>
-				</div>
-			</div>
-		</div>
-	</header>
-</div>
+  <!-- Top navbar. -->
+    <nav class="navbar navbar-default navbar-fixed-top">
+      <div class="container">
+        <!-- The logo. -->
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <div class="navbar-logo">
+            <a href="{{ site.baseurl }}/"><img alt="Apache Flink" src="{{ site.baseurl }}/img/navbar-brand-logo.jpg"></a>
+          </div>
+        </div><!-- /.navbar-header -->
+
+        <!-- The navigation links. -->
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+          <ul class="nav navbar-nav">
+            <!-- Overview -->
+            <li{% if page.url == '/index.html' %} class="active"{% endif %}><a href="{{ site.baseurl }}/index.html">Overview</span></a></li>
+
+            <!-- Features -->
+            <li{% if page.url == '/features.html' %} class="hidden-sm active"{% endif %}><a href="{{ site.baseurl }}/features.html">Features</span></a></li>
+
+            <!-- Downloads -->
+            <li{% if page.url == '/downloads.html' %} class="active"{% endif %}><a href="{{ site.baseurl }}/downloads.html">Downloads</span></a></li>
+
+            <!-- Documentation -->
+            <li class="dropdown">
+              <a href="{{ setup }}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation <span class="caret"></span></a>
+              <ul class="dropdown-menu" role="menu">
+                <!-- Latest stable release -->
+                <li role="presentation" class="dropdown-header"><strong>Latest Release</strong> (Stable)</li>
+                <li><a href="{{ site.docs-stable }}">{{ site.stable }} Documentation</a></li>
+                <li><a href="{{ site.docs-stable }}/api/java" class="active">{{ site.stable }} Javadocs</a></li>
+                <li><a href="{{ site.docs-stable }}/api/scala/index.html" class="active">{{ site.stable }} ScalaDocs</a></li>
+
+                <!-- Snapshot docs -->
+                <li class="divider"></li>
+                <li role="presentation" class="dropdown-header"><strong>Snapshot</strong> (Development)</li>
+                <li><a href="{{ site.docs-snapshot }}">{{ site.snapshot }} Documentation</a></li>
+                <li><a href="{{ site.docs-snapshot }}/api/java" class="active">{{ site.snapshot }} Javadocs</a></li>
+                <li><a href="{{ site.docs-snapshot }}/api/scala/index.html" class="active">{{ site.snapshot }} ScalaDocs</a></li>
+
+                <!-- Wiki -->
+                <li class="divider"></li>
+                <li><a href="{{ site.wiki }}"><small><span class="glyphicon glyphicon-new-window"></span></small> Wiki</a></li>
+              </ul>
+            </li>
+
+            <!-- FAQ -->
+            <li{% if page.url == '/faq.html' %} class="hidden-sm active"{% endif %}><a href="{{ site.baseurl }}/faq.html">FAQ</span></a></li>
+          </ul>
+
+          <ul class="nav navbar-nav navbar-right hidden-sm">
+            <!-- Blog -->
+            <li{% if page.url contains '/blog/' or page.url contains '/news/' %} class="active"{% endif %}><a href="{{ site.baseurl }}/blog/">Blog</a></li>
+
+            <li class="dropdown{% if page.url == '/material.html' or page.url == '/community.html' or page.url == '/how-to-contribute.html' or page.url == '/coding-guidelines.html'%} active{% endif %}">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Project <span class="caret"></span></a>
+              <ul class="dropdown-menu" role="menu">
+                <!-- Project -->
+                <li role="presentation" class="dropdown-header"><strong>Project</strong></li>
+                <li><a href="{{ site.baseurl }}/material.html">Material</a></li>
+                <li><a href="{{ site.twitter }}"><small><span class="glyphicon glyphicon-new-window"></span></small> Twitter</a></li>
+                <li><a href="{{ site.github }}"><small><span class="glyphicon glyphicon-new-window"></span></small> GitHub</a></li>
+                <li><a href="{{ site.wiki }}"><small><span class="glyphicon glyphicon-new-window"></span></small> Wiki</a></li>
+                
+                <!-- Community -->
+                <li class="divider"></li>
+                <li role="presentation" class="dropdown-header"><strong>Community</strong></li>
+                <li><a href="{{ site.baseurl }}/community.html#mailing-lists">Mailing Lists</a></li>
+                <li><a href="{{ site.baseurl }}/community.html#irc">IRC</a></li>
+                <li><a href="{{ site.baseurl }}/community.html#stack-overflow">Stack Overflow</a></li>
+                <li><a href="{{ site.baseurl }}/community.html#issue-tracker">Issue Tracker</a></li>
+                <li><a href="{{ site.baseurl }}/community.html#people">People</a></li>
+
+                <!-- Contribute -->
+                <li class="divider"></li>
+                <li role="presentation" class="dropdown-header"><strong>Contribute</strong></li>
+                <li><a href="{{ site.baseurl }}/how-to-contribute.html">How to Contribute</a></li>
+                <li><a href="{{ site.baseurl }}/coding-guidelines.html">Coding Guidelines</a></li>
+              </ul>
+            </li>
+          </ul>
+        </div><!-- /.navbar-collapse -->
+      </div><!-- /.container -->
+    </nav>

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_includes/sidebarbav.html
----------------------------------------------------------------------
diff --git a/_includes/sidebarbav.html b/_includes/sidebarbav.html
deleted file mode 100644
index f892b35..0000000
--- a/_includes/sidebarbav.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<ul>
-	<li class="fa-sidebar-item{% if page.url contains 'faq.html' %} active{% endif %}">
-	   <a href="faq.html">FAQ</a>
-    </li>
-	<li><span class="af-label">Quickstart</span>
-		<ul>
-			<li class="fa-sidebar-item{% if page.url contains 'setup_quickstart.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/setup_quickstart.html">Setup</a>
-		    </li>
-			<li class="fa-sidebar-item{% if page.url contains 'run_example_quickstart.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/run_example_quickstart.html">Run Example</a>
-			</li>
-			<li class="fa-sidebar-item{% if page.url contains 'java_api_quickstart.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/java_api_quickstart.html">Java API</a>
-			</li>
-			<li class="fa-sidebar-item{% if page.url contains 'scala_api_quickstart.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/scala_api_quickstart.html">Scala API</a>
-		    </li>
-		</ul>
-	</li>
-
-	<li><span class="af-label">Setup &amp; Configuration</span>
-		<ul>
-			<li class="fa-sidebar-item{% if page.url contains '/local_setup.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/local_setup.html">Local Setup</a>
-		    </li>
-			<li class="fa-sidebar-item{% if page.url contains 'building.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/building.html">Build Flink</a>
-			</li>
-			<li class="fa-sidebar-item{% if page.url contains 'cluster_setup.htm' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/cluster_setup.html">Cluster Setup</a>
-			</li>
-			<li class="fa-sidebar-item{% if page.url contains 'yarn_setup.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/yarn_setup.html">YARN Setup</a>
-		    </li>
-			<li class="fa-sidebar-item{% if page.url contains 'config.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/config.html">Configuration</a>
-		    </li>
-		</ul>
-	</li>
-
-	<li><span class="af-label">Programming Guides</span>
-		<ul>
-			<li class="fa-sidebar-item{% if page.url contains 'programming_guide.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/programming_guide.html">Programming Guide</a>
-		    </li>
-			<li class="fa-sidebar-item{% if page.url contains 'dataset_transformations.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/dataset_transformations.html">DataSet Transformations</a>
-		    </li>
-			<li class="fa-sidebar-item{% if page.url contains 'java8_programming_guide.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/java8_programming_guide.html">Java 8 Programming Guide</a>
-		     </li>
-			<li class="fa-sidebar-item{% if page.url contains 'streaming_guide.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/streaming_guide.html">Streaming Guide</a>
-	        </li>
-			<li class="fa-sidebar-item{% if page.url contains 'iterations.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/iterations.html">Iterations</a>
-	        </li>
-			<li class="fa-sidebar-item{% if page.url contains 'spargel_guide.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/spargel_guide.html">Spargel Graph API</a>
-			</li>
-			<li class="fa-sidebar-item{% if page.url contains 'hadoop_compatibility.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/hadoop_compatibility.html">Hadoop Compatibility</a>
-			</li>
-		</ul>
-	</li>
-
-	<li><span class="af-label">Examples</span>
-		<ul>
-			<li class="fa-sidebar-item{% if page.url contains 'examples.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/examples.html">Bundled Examples</a>
-		    </li>
-			<li class="fa-sidebar-item{% if page.url contains 'example_connectors.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/example_connectors.html">Connecting to other systems</a>
-	       </li>
-		</ul>
-	</li>
-
-	<li><span class="af-label">Execution</span>
-		<ul>
-			<li class="fa-sidebar-item{% if page.url contains 'local_execution.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/local_execution.html">Local/Debugging</a>
-			</li>
-			<li class="fa-sidebar-item{% if page.url contains 'cluster_execution.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/cluster_execution.html">Cluster</a>
-	        </li>
-			<li class="fa-sidebar-item{% if page.url contains 'cli.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/cli.html">Command-Line Interface</a>
-	        </li>
-			<li class="fa-sidebar-item{% if page.url contains 'web_client.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/web_client.html">Web Interface</a>
-		    </li>
-		</ul>
-	</li>
-
-	<li><span class="af-label">Internals</span>
-		<ul>
-			<li class="fa-sidebar-item{% if page.url contains 'internal_overview.html' %} active{% endif %}">
-			     <a href="{{ site.baseurl }}/internal_overview.html">Overview</a>
-	       </li>
-		</ul>
-	</li>
-</ul>

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_layouts/base.html
----------------------------------------------------------------------
diff --git a/_layouts/base.html b/_layouts/base.html
new file mode 100644
index 0000000..2c1b390
--- /dev/null
+++ b/_layouts/base.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <title>Apache Flink: {{ page.title }}</title>
+    <link rel="shortcut icon" href="{{ site.baseurl }}/favicon.ico" type="image/x-icon">
+    <link rel="icon" href="{{ site.baseurl }}/favicon.ico" type="image/x-icon">
+
+    <!-- Bootstrap -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
+    <link rel="stylesheet" href="{{ site.baseurl }}/css/flink.css">
+    <link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css">
+
+    <!-- Blog RSS feed -->
+    <link href="{{ site.baseurl }}/blog/feed.xml" rel="alternate" type="application/rss+xml" title="Apache Flink Blog: RSS feed" />
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+  </head>
+  <body>  
+    {% comment %} Includes are found in the _includes directory. {% endcomment %}
+
+{% include navbar.html %}
+
+    <!-- Main content. -->
+    <div class="container">
+      {% comment %}
+      This is the base for all content. The content from the layouts found in
+      the _layouts directory goes here.
+      {% endcomment %}
+
+{{ content }}
+
+      <hr />
+      <div class="footer text-center">
+        <p>Copyright © 2014-2015 <a href="http://apache.org">The Apache Software Foundation</a>. All Rights Reserved.</p>
+        <p>Apache Flink, Apache, and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+        <p><a href="{{ site.baseurl }}/privacy-policy.html">Privacy Policy</a> &middot; <a href="{{ site.baseurl }}/blog/feed.xml">RSS feed</a></p>
+      </div>
+
+    </div><!-- /.container -->
+
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+    <script src="{{ site.baseurl }}/js/codetabs.js"></script>
+
+    <!-- Google Analytics -->
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+      ga('create', 'UA-52545728-1', 'auto');
+      ga('send', 'pageview');
+    </script>
+  </body>
+</html>

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_layouts/default.html
----------------------------------------------------------------------
diff --git a/_layouts/default.html b/_layouts/default.html
deleted file mode 100644
index 032fc9c..0000000
--- a/_layouts/default.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-	    <meta charset="utf-8">
-	    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-	    <meta name="viewport" content="width=device-width, initial-scale=1">
-{% if page.redirect %}
-      <meta http-equiv="refresh" content="0; url={{ site.baseurl}}/{{ page.redirect }}" />
-      <script type="text/javascript">
-        window.location.href = "{{ site.baseurl}}/{{ page.redirect }}"
-      </script>
-{% endif %}
-	    <title>Apache Flink: {{ page.title }}</title>
-	    <link rel="shortcut icon" href="{{ site.baseurl }}favicon.ico" type="image/x-icon">
-	    <link rel="icon" href="{{ site.baseurl }}favicon.ico" type="image/x-icon">
-	    <link rel="stylesheet" href="{{ site.baseurl }}/css/bootstrap.css">
-	    <link rel="stylesheet" href="{{ site.baseurl }}/css/bootstrap-lumen-custom.css">
-	    <link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css">
-	    <link rel="stylesheet" href="{{ site.baseurl }}/css/custom.css">
-	    <link href="{{ site.baseurl }}/css/main/main.css" rel="stylesheet">
-            <link href="{{ site.baseurl }}/blog/feed.xml" rel="alternate" type="application/rss+xml" title="Flink Blog RSS feed" />
-	    <!-- <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet"> -->
-	    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-	    <script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
-	    <script src="{{ site.baseurl }}/js/codetabs.js"></script>
-    </head>
-    <body>
-    {% include navbar.html %}
-
-    <div style="padding-top:50px" class="container">
-        {{ content }}
-    </div>
-    {% include footer.html %}
-    <!-- Google Analytics -->
-    <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-      ga('create', 'UA-52545728-1', 'auto');
-      ga('send', 'pageview');
-    </script>
-    <script src="{{ site.baseurl }}/js/main/jquery.mobile.events.min.js"></script>
-    <script src="{{ site.baseurl }}/js/main/main.js"></script>
-  </body>
-</html>

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_layouts/docs.html
----------------------------------------------------------------------
diff --git a/_layouts/docs.html b/_layouts/docs.html
deleted file mode 100644
index 1f9b489..0000000
--- a/_layouts/docs.html
+++ /dev/null
@@ -1,39 +0,0 @@
----
-layout: default
----
-
-<div class="row">
-	<div class="col-md-3 af-sidebar">{% include sidebarbav.html %}</div>
-	<div class="col-md-9">
-		<h1>{{ page.title }}</h1>
-		
-		{{ page.content | tocify }} 
-		
-		{{ content }}
-
-        <!-- Disqus Area -->
-		<div style="padding-top: 30px" id="disqus_thread"></div>
-		<script type="text/javascript">
-			/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-			var disqus_shortname = 'stratosphere-eu'; // required: replace example with your forum shortname
-
-			/* * * DON'T EDIT BELOW THIS LINE * * */
-			(function() {
-				var dsq = document.createElement('script');
-				dsq.type = 'text/javascript';
-				dsq.async = true;
-				dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-				(document.getElementsByTagName('head')[0] || document
-						.getElementsByTagName('body')[0]).appendChild(dsq);
-			})();
-		</script>
-		<noscript>
-			Please enable JavaScript to view the <a
-				href="http://disqus.com/?ref_noscript">comments powered by
-				Disqus.</a>
-		</noscript>
-		<a href="http://disqus.com" class="dsq-brlink">comments powered by
-			<span class="logo-disqus">Disqus</span>
-		</a>
-	</div>
-</div>

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_layouts/feed.html
----------------------------------------------------------------------
diff --git a/_layouts/feed.html b/_layouts/feed.html
new file mode 100644
index 0000000..e02a27c
--- /dev/null
+++ b/_layouts/feed.html
@@ -0,0 +1 @@
+{{ content }}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_layouts/none.html
----------------------------------------------------------------------
diff --git a/_layouts/none.html b/_layouts/none.html
deleted file mode 100644
index b92f652..0000000
--- a/_layouts/none.html
+++ /dev/null
@@ -1 +0,0 @@
-{{content}}

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_layouts/plain.html
----------------------------------------------------------------------
diff --git a/_layouts/plain.html b/_layouts/plain.html
new file mode 100644
index 0000000..15ab458
--- /dev/null
+++ b/_layouts/plain.html
@@ -0,0 +1,11 @@
+---
+layout: base
+---
+<div class="row">
+  <div class="col-sm-12">
+      <h1>{{ page.title }}</h1>
+
+{{ content }}
+
+  </div>
+</div>

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_layouts/post.html
----------------------------------------------------------------------
diff --git a/_layouts/post.html b/_layouts/post.html
index e0ec777..895221c 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -1,39 +1,8 @@
 ---
-layout: default
+layout: plain
 ---
+<article>
+  <p>{{ page.date | date_to_string }}{% if page.author %} by {{ page.author }}{% if page.author-twitter %} (<a href="https://twitter.com/{{ page.author-twitter }}">@{{ page.author-twitter }}</a>){% endif %}{% endif %}</p>
 
-<div class="container">
-    <div class="row">
-		<div class="col-md-2"></div>
-		<div class="col-md-8">
-			<article>
-				<h2>{{ page.title }}</h2>
-				    <p class="meta">{{ page.date | date_to_string }}</p>
-				<div>
-				    {{ content }}
-				</div>
-			</article>
-		</div>
-		<div class="col-md-2"></div>
-	</div>
-	<div class="row" style="padding-top:30px">
-		<div class="col-md-2"></div>
-		<div class="col-md-8">
-		    <div id="disqus_thread"></div>
-		    <script type="text/javascript">
-		        /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-		        var disqus_shortname = 'stratosphere-eu'; // required: replace example with your forum shortname
-
-		        /* * * DON'T EDIT BELOW THIS LINE * * */
-		        (function() {
-		            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-		            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-		            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-		        })();
-		    </script>
-		    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-		    <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>			    
-		</div>
-		<div class="col-md-2"></div>
-	</div>
-</div>
+{{ content }}
+</article>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_layouts/simple.html
----------------------------------------------------------------------
diff --git a/_layouts/simple.html b/_layouts/simple.html
deleted file mode 100644
index 5d7e4f2..0000000
--- a/_layouts/simple.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
----
-<h1>{{ page.title }}</h1>
-
-{{ content }}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_layouts/with_sidenav.html
----------------------------------------------------------------------
diff --git a/_layouts/with_sidenav.html b/_layouts/with_sidenav.html
deleted file mode 100644
index 0f31025..0000000
--- a/_layouts/with_sidenav.html
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: default
----
-<div class="row">
-  <div class="col-md-3">
-{{ page.content | tocify }}
-    </ul>
-  </div>
-  <div class="col-md-9">
-<h1>{{ page.title }}</h1>
-{{ content }}
-  </div>
-</div>

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_layouts/with_toc.html
----------------------------------------------------------------------
diff --git a/_layouts/with_toc.html b/_layouts/with_toc.html
deleted file mode 100644
index 40523d7..0000000
--- a/_layouts/with_toc.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: default
----
-
-<h1>{{ page.title }}</h1>
-
-{{ page.content | tocify }}
-
-{{ content }}

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_plugins/gh_link.rb
----------------------------------------------------------------------
diff --git a/_plugins/gh_link.rb b/_plugins/gh_link.rb
deleted file mode 100644
index 3b51eb2..0000000
--- a/_plugins/gh_link.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-module Jekyll
-  class GitHubLinkTag < Liquid::Tag
-
-    def initialize(tag_name, input, tokens)
-      super
-      @input = input
-    end
-
-    def render(context)
-      input = @input.sub(/".*"/, "").split
-      name = @input.match(/".*"/).to_s.gsub(/"/, "")#@input.split.drop(2).join(" ")
-      config = context.registers[:site].config
-
-      path = input[0]
-      file = path.split('/').last
-
-      page_gh_tag = context["page"]["gh_link_tag"]
-      # tag precendence:
-      # 1. input[1],
-      # 2. 'gh_link_tag' of page frontmatter
-      # 3. "master" (default)
-      gh_tag = input[1].nil? ? (page_gh_tag.nil? ? "master" : page_gh_tag) : input[1]
-      name = name.to_s == '' ? file : name
-      #refname = input[2].nil? ? file : input[2]
-
-      "<a href=#{config["FLINK_GITHUB_URL"]}/blob/#{gh_tag}/#{path}>#{name}</a>"
-    end
-  end
-end
-
-Liquid::Template.register_tag('gh_link', Jekyll::GitHubLinkTag)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_plugins/github.rb
----------------------------------------------------------------------
diff --git a/_plugins/github.rb b/_plugins/github.rb
new file mode 100644
index 0000000..6d700be
--- /dev/null
+++ b/_plugins/github.rb
@@ -0,0 +1,26 @@
+module Jekyll
+  class GitHubLink < Liquid::Tag
+
+    def initialize(tag_name, input, tokens)
+      super
+      @input = input
+    end
+# Usage: github $PATH [$TAG: master]
+    
+    def render(context)
+      input = @input.sub(/".*"/, "").split
+      config = context.registers[:site].config
+
+      path = input[0]
+
+      # tag precendence:
+      # 1. input[1],
+      # 2. "master" (default)
+      gh_tag = input[1].nil? ? "master" : input[1]
+
+      "#{config["github"]}/tree/#{gh_tag}/#{path}"
+    end
+  end
+end
+
+Liquid::Template.register_tag('github', Jekyll::GitHubLink)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_plugins/highlightCode.rb
----------------------------------------------------------------------
diff --git a/_plugins/highlightCode.rb b/_plugins/highlightCode.rb
new file mode 100644
index 0000000..74f6d6f
--- /dev/null
+++ b/_plugins/highlightCode.rb
@@ -0,0 +1,100 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This file was derived from https://github.com/navarroj/krampygs 
+#   written by Juan Navarro and released under the Unlicense (http://unlicense.org).
+
+require 'kramdown'
+require 'pygments'
+
+module Kramdown
+  module Converter
+
+    class Pygs < Html
+    
+      def convert_codeblock(el, indent)
+        attr = el.attr.dup
+        lang = extract_code_language!(attr) || @options[:kramdown_default_lang]
+        code = pygmentize(el.value, lang)
+        code_attr = {}
+        code_attr['class'] = "language-#{lang}" if lang
+        "#{' '*indent}<div class=\"highlight\"><pre#{html_attributes(attr)}><code#{html_attributes(code_attr)}>#{code}</code></pre></div>\n"
+      end
+
+      def convert_codespan(el, indent)
+        attr = el.attr.dup
+        lang = extract_code_language!(attr) || @options[:kramdown_default_lang]
+        code = pygmentize(el.value, lang)
+        if lang
+          attr['class'] = "highlight"
+          if attr.has_key?('class')
+            attr['class'] += " language-#{lang}"
+          else
+            attr['class'] = "language-#{lang}"
+          end
+        end
+        "<code#{html_attributes(attr)}>#{code}</code>"
+      end
+      
+      def pygmentize(code, lang)
+        if lang
+          Pygments.highlight(code,
+            :lexer => lang,
+            :options => { :encoding => 'utf-8', :nowrap => true })
+        else
+          escape_html(code)
+        end
+      end
+
+    end
+  end
+end
+
+class Jekyll::Converters::Markdown::KramdownPygments
+
+  def initialize(config)
+    require 'kramdown'
+    @config = config
+  rescue LoadError
+    STDERR.puts 'You are missing a library required for Markdown. Please run:'
+    STDERR.puts '  $ [sudo] gem install kramdown'
+    raise FatalException.new("Missing dependency: kramdown")
+  end
+  
+  def matches(ext)
+    ext =~ /^\.md$/i
+  end
+
+  def output_ext(ext)
+    ".html"
+  end
+
+  def convert(content)
+    html = Kramdown::Document.new(content, {
+        :auto_ids             => @config['kramdown']['auto_ids'],
+        :footnote_nr          => @config['kramdown']['footnote_nr'],
+        :entity_output        => @config['kramdown']['entity_output'],
+        :toc_levels           => @config['kramdown']['toc_levels'],
+        :smart_quotes         => @config['kramdown']['smart_quotes'],
+        :coderay_default_lang => @config['kramdown']['default_lang'],
+        :input                => @config['kramdown']['input'],
+        :hard_wrap            => @config['kramdown']['hard_wrap']
+    }).to_pygs
+    return html
+  end
+
+end
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_plugins/markdown.rb
----------------------------------------------------------------------
diff --git a/_plugins/markdown.rb b/_plugins/markdown.rb
deleted file mode 100644
index f7a81ba..0000000
--- a/_plugins/markdown.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module Jekyll
-  module Tags
-    class MarkdownTag < Liquid::Block
-
-      def initialize(tag_name, markup, tokens)
-        super
-      end
-
-      def render(context)
-        site = context.registers[:site]
-        converter = site.getConverterImpl(::Jekyll::Converters::Markdown)
-        output = converter.convert(super(context))
-        "#{output}"
-      end
-    end
-  end
-end
-
-Liquid::Template.register_tag('markdown', Jekyll::Tags::MarkdownTag)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_plugins/toc.rb
----------------------------------------------------------------------
diff --git a/_plugins/toc.rb b/_plugins/toc.rb
new file mode 100644
index 0000000..b37a98c
--- /dev/null
+++ b/_plugins/toc.rb
@@ -0,0 +1,19 @@
+module Jekyll
+  class PageToc < Liquid::Tag
+
+    def initialize(tag_name, input, tokens)
+      super
+      @input = input
+    end
+# Usage: github $PATH [$TAG: master]
+    
+    def render(context)
+'<div class="page-toc" markdown="1">
+* toc
+{:toc}
+</div>'
+    end
+  end
+end
+
+Liquid::Template.register_tag('toc', Jekyll::PageToc)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_plugins/tocify.rb
----------------------------------------------------------------------
diff --git a/_plugins/tocify.rb b/_plugins/tocify.rb
deleted file mode 100644
index 9eb6293..0000000
--- a/_plugins/tocify.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Jekyll
-  module Tocify
-    def tocify(input)
-      converter = Redcarpet::Markdown.new(Redcarpet::Render::HTML_TOC.new(nesting_level: 2))
-      converter.render(input)
-    end
-  end
-end
-
-Liquid::Template.register_filter(Jekyll::Tocify)

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2013-10-21-cikm2013-paper.md
----------------------------------------------------------------------
diff --git a/_posts/2013-10-21-cikm2013-paper.md b/_posts/2013-10-21-cikm2013-paper.md
index 2687650..0fd506f 100644
--- a/_posts/2013-10-21-cikm2013-paper.md
+++ b/_posts/2013-10-21-cikm2013-paper.md
@@ -1,6 +1,6 @@
 ---
 layout: post
-title:  'Paper "“All Roads Lead to Rome:” Optimistic Recovery for Distributed
+title:  'Paper "All Roads Lead to Rome: Optimistic Recovery for Distributed
 Iterative Data Processing" accepted at CIKM 2013'
 date:   2013-10-21 9:57:18
 categories: news

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2014-01-12-0.4-migration-guide.md
----------------------------------------------------------------------
diff --git a/_posts/2014-01-12-0.4-migration-guide.md b/_posts/2014-01-12-0.4-migration-guide.md
index 0c3137e..995fd5b 100644
--- a/_posts/2014-01-12-0.4-migration-guide.md
+++ b/_posts/2014-01-12-0.4-migration-guide.md
@@ -5,9 +5,7 @@ date:   2014-01-12 19:57:18
 categories: news
 ---
 
-
-**This guide is intended to help users of previous Stratosphere versions to migrate their programs to the new API of v0.4.**
-
+This guide is intended to help users of previous Stratosphere versions to migrate their programs to the new API of v0.4.
 
 Version `0.4-rc1`, `0.4` and all newer versions have the new API. If you want to have the most recent version before the code change, please set the version to `0.4-alpha.3-SNAPSHOT`. (Note that the `0.4-alpha` versions are only available in the snapshot repository).
 

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2014-01-28-querying_mongodb.md
----------------------------------------------------------------------
diff --git a/_posts/2014-01-28-querying_mongodb.md b/_posts/2014-01-28-querying_mongodb.md
index 610be15..868abe4 100644
--- a/_posts/2014-01-28-querying_mongodb.md
+++ b/_posts/2014-01-28-querying_mongodb.md
@@ -2,6 +2,8 @@
 layout: post
 title:  "Accessing Data Stored in MongoDB with Stratosphere"
 date:   2014-01-28 9:00:00
+author: "Robert Metzger"
+author-twitter: "rmetzger_"
 categories: news
 ---
 
@@ -105,6 +107,4 @@ public void map(Record record, Collector<Record> out) throws Exception {
 }
 ```
 
-Please use the comments if you have questions or if you want to showcase your own MongoDB-Stratosphere integration.
-<br><br>
-<small>Written by Robert Metzger ([@rmetzger_](https://twitter.com/rmetzger_)).</small>
+Please use the comments if you have questions or if you want to showcase your own MongoDB-Stratosphere integration.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2014-02-18-amazon-elastic-mapreduce-cloud-yarn.md
----------------------------------------------------------------------
diff --git a/_posts/2014-02-18-amazon-elastic-mapreduce-cloud-yarn.md b/_posts/2014-02-18-amazon-elastic-mapreduce-cloud-yarn.md
index 5464c9d..2b71c59 100644
--- a/_posts/2014-02-18-amazon-elastic-mapreduce-cloud-yarn.md
+++ b/_posts/2014-02-18-amazon-elastic-mapreduce-cloud-yarn.md
@@ -2,6 +2,8 @@
 layout: post
 title:  'Use Stratosphere with Amazon Elastic MapReduce'
 date:   2014-02-18 19:57:18
+author: "Robert Metzger"
+author-twitter: "rmetzger_"
 categories: news
 ---
 
@@ -189,9 +191,4 @@ Inspect the result in HDFS using:
 hadoop fs -tail /output
 {% endhighlight %}
 
-If you want to shut down the whole cluster in the cloud, use Amazon's webinterface and click on "Terminate cluster". If you just want to stop the YARN session, press CTRL+C in the terminal. The Stratosphere instances will be killed by YARN.
-
-
-<br><br>
-<small>Written by Robert Metzger ([@rmetzger_](https://twitter.com/rmetzger_)).</small>
-
+If you want to shut down the whole cluster in the cloud, use Amazon's webinterface and click on "Terminate cluster". If you just want to stop the YARN session, press CTRL+C in the terminal. The Stratosphere instances will be killed by YARN.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2014-08-26-release-0.6.md
----------------------------------------------------------------------
diff --git a/_posts/2014-08-26-release-0.6.md b/_posts/2014-08-26-release-0.6.md
index 0fd4331..1d97b3b 100644
--- a/_posts/2014-08-26-release-0.6.md
+++ b/_posts/2014-08-26-release-0.6.md
@@ -10,7 +10,7 @@ first release of the system inside the Apache Incubator and under the
 name Flink. Releases up to 0.5 were under the name Stratosphere, the
 academic and open source project that Flink originates from.
 
-##What is Flink?
+## What is Flink?
 
 Apache Flink is a general-purpose data processing engine for
 clusters. It runs on YARN clusters on top of data stored in Hadoop, as
@@ -45,7 +45,7 @@ features:
   order to start processing data. This results to very efficient
   handling of large data sets.
 
-##Release 0.6
+## Release 0.6
 
 Flink 0.6 builds on the latest Stratosphere 0.5 release. It includes
 many bug fixes and improvements that make the system more stable and
@@ -55,7 +55,7 @@ The full release notes are available [here](https://issues.apache.org/jira/secur
 
 Download the release [here](http://flink.incubator.apache.org/downloads.html).
 
-##Contributors
+## Contributors
 
 * Wilson Cao
 * Ufuk Celebi

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2014-11-04-release-0.7.0.md
----------------------------------------------------------------------
diff --git a/_posts/2014-11-04-release-0.7.0.md b/_posts/2014-11-04-release-0.7.0.md
index 623694d..3783eba 100644
--- a/_posts/2014-11-04-release-0.7.0.md
+++ b/_posts/2014-11-04-release-0.7.0.md
@@ -11,7 +11,7 @@ Download Flink 0.7.0 [here](http://flink.incubator.apache.org/downloads.html)
 
 See the release changelog [here](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315522&version=12327648)
 
-##Overview of major new features
+## Overview of major new features
 
 **Flink Streaming:** The gem of the 0.7.0 release is undoubtedly Flink Streaming. Available currently in alpha, Flink Streaming provides a Java API on top of Apache Flink that can consume streaming data sources (e.g., from Apache Kafka, Apache Flume, and others) and process them in real time. A dedicated blog post on Flink Streaming and its performance is coming up here soon. You can check out the Streaming programming guide [here](http://flink.incubator.apache.org/docs/0.7-incubating/streaming_guide.html).
 
@@ -31,7 +31,7 @@ See the release changelog [here](https://issues.apache.org/jira/secure/ReleaseNo
 
 **Note:** Currently, there is limited support for Java 8 lambdas when compiling and running from an IDE. The problem is due to type erasure and whether Java compilers retain type information. We are currently working with the Eclipse and OpenJDK communities to resolve this.
 
-##Contributors
+## Contributors
 
 * Tamas Ambrus
 * Mariem Ayadi

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2014-11-18-hadoop-compatibility.md
----------------------------------------------------------------------
diff --git a/_posts/2014-11-18-hadoop-compatibility.md b/_posts/2014-11-18-hadoop-compatibility.md
index 93a68b0..214049c 100644
--- a/_posts/2014-11-18-hadoop-compatibility.md
+++ b/_posts/2014-11-18-hadoop-compatibility.md
@@ -2,12 +2,14 @@
 layout: post
 title:  'Hadoop Compatibility in Flink'
 date:   2014-11-18 10:00:00
+author: "Fabian Hüske"
+author-twitter: "fhueske"
 categories: news
 ---
 
 [Apache Hadoop](http://hadoop.apache.org) is an industry standard for scalable analytical data processing. Many data analysis applications have been implemented as Hadoop MapReduce jobs and run in clusters around the world. Apache Flink can be an alternative to MapReduce and improves it in many dimensions. Among other features, Flink provides much better performance and offers APIs in Java and Scala, which are very easy to use. Similar to Hadoop, Flink’s APIs provide interfaces for Mapper and Reducer functions, as well as Input- and OutputFormats along with many more operators. While being conceptually equivalent, Hadoop’s MapReduce and Flink’s interfaces for these functions are unfortunately not source compatible.
 
-##Flink’s Hadoop Compatibility Package
+## Flink’s Hadoop Compatibility Package
 
 <center>
 <img src="{{ site.baseurl }}/img/blog/hcompat-logos.png" style="width:30%;margin:15px">
@@ -77,15 +79,12 @@ Hadoop functions can be used at any position within a Flink program and of cours
 <img src="{{ site.baseurl }}/img/blog/hcompat-flow.png" style="width:100%;margin:15px">
 </center>
 
-##What comes next?
+## What comes next?
 
 While the Hadoop compatibility package is already very useful, we are currently working on a dedicated Hadoop Job operation to embed and execute Hadoop jobs as a whole in Flink programs, including their custom partitioning, sorting, and grouping code. With this feature, you will be able to chain multiple Hadoop jobs, mix them with Flink functions, and other operations such as [Spargel]({{ site.baseurl }}/docs/0.7-incubating/spargel_guide.html) operations (Pregel/Giraph-style jobs).
 
-##Summary
+## Summary
 
 Flink lets you reuse a lot of the code you wrote for Hadoop MapReduce, including all data types, all Input- and OutputFormats, and Mapper and Reducers of the mapred-API. Hadoop functions can be used within Flink programs and mixed with all other Flink functions. Due to Flink’s pipelined execution, Hadoop functions can arbitrarily be assembled without data exchange via HDFS. Moreover, the Flink community is currently working on a dedicated Hadoop Job operation to supporting the execution of Hadoop jobs as a whole.
 
-If you want to use Flink’s Hadoop compatibility package checkout our [documentation]({{ site.baseurl }}/docs/0.7-incubating/hadoop_compatibility.html).
-
-<br>
-<small>Written by Fabian Hueske ([@fhueske](https://twitter.com/fhueske)).</small>
\ No newline at end of file
+If you want to use Flink’s Hadoop compatibility package checkout our [documentation]({{ site.baseurl }}/docs/0.7-incubating/hadoop_compatibility.html).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2015-01-06-december-in-flink.md
----------------------------------------------------------------------
diff --git a/_posts/2015-01-06-december-in-flink.md b/_posts/2015-01-06-december-in-flink.md
index 0093fdd..32d652c 100644
--- a/_posts/2015-01-06-december-in-flink.md
+++ b/_posts/2015-01-06-december-in-flink.md
@@ -8,55 +8,55 @@ categories: news
 This is the first blog post of a “newsletter” like series where we give a summary of the monthly activity in the Flink community. As the Flink project grows, this can serve as a "tl;dr" for people that are not following the Flink dev and user mailing lists, or those that are simply overwhelmed by the traffic.
 
 
-###Flink graduation
+### Flink graduation
 
 The biggest news is that the Apache board approved Flink as a top-level Apache project! The Flink team is working closely with the Apache press team for an official announcement, so stay tuned for details!
 
-###New Flink website
+### New Flink website
 
 The [Flink website](http://flink.apache.org) got a total make-over, both in terms of appearance and content.
 
-###Flink IRC channel
+### Flink IRC channel
 
 A new IRC channel called #flink was created at irc.freenode.org. An easy way to access the IRC channel is through the [web client](http://webchat.freenode.net/).  Feel free to stop by to ask anything or share your ideas about Apache Flink!
 
-###Meetups and Talks
+### Meetups and Talks
 
 Apache Flink was presented in the [Amsterdam Hadoop User Group](http://www.meetup.com/Netherlands-Hadoop-User-Group/events/218635152)
 
-##Notable code contributions
+## Notable code contributions
 
 **Note:** Code contributions listed here may not be part of a release or even the current snapshot yet.
 
-###[Streaming Scala API](https://github.com/apache/incubator-flink/pull/275)
+### [Streaming Scala API](https://github.com/apache/incubator-flink/pull/275)
 
 The Flink Streaming Java API recently got its Scala counterpart. Once merged, Flink Streaming users can use both Scala and Java for their development. The Flink Streaming Scala API is built as a thin layer on top of the Java API, making sure that the APIs are kept easily in sync.
 
-###[Intermediate datasets](https://github.com/apache/incubator-flink/pull/254)
+### [Intermediate datasets](https://github.com/apache/incubator-flink/pull/254)
 
 This pull request introduces a major change in the Flink runtime. Currently, the Flink runtime is based on the notion of operators that exchange data through channels. With the PR, intermediate data sets that are produced by operators become first-class citizens in the runtime. While this does not have any user-facing impact yet, it lays the groundwork for a slew of future features such as blocking execution, fine-grained fault-tolerance, and more efficient data sharing between cluster and client.
 
-###[Configurable execution mode](https://github.com/apache/incubator-flink/pull/259)
+### [Configurable execution mode](https://github.com/apache/incubator-flink/pull/259)
 
 This pull request allows the user to change the object-reuse behaviour. Before this pull request, some operations would reuse objects passed to the user function while others would always create new objects. This introduces a system wide switch and changes all operators to either reuse objects or don’t reuse objects.
 
-###[Distributed Coordination via Akka](https://github.com/apache/incubator-flink/pull/149)
+### [Distributed Coordination via Akka](https://github.com/apache/incubator-flink/pull/149)
 
 Another major change is a complete rewrite of the JobManager / TaskManager components in Scala. In addition to that, the old RPC service was replaced by Actors, using the Akka framework.
 
-###[Sorting of very large records](https://github.com/apache/incubator-flink/pull/249 )
+### [Sorting of very large records](https://github.com/apache/incubator-flink/pull/249 )
 
 Flink's internal sort-algorithms were improved to better handle large records (multiple 100s of megabytes or larger). Previously, the system did in some cases hold instances of multiple large records, resulting in high memory consumption and JVM heap thrashing. Through this fix, large records are streamed through the operators, reducing the memory consumption and GC pressure. The system now requires much less memory to support algorithms that work on such large records.
 
-###[Kryo Serialization as the new default fallback](https://github.com/apache/incubator-flink/pull/271)
+### [Kryo Serialization as the new default fallback](https://github.com/apache/incubator-flink/pull/271)
 
 Flink’s build-in type serialization framework is handles all common types very efficiently. Prior versions uses Avro to serialize types that the built-in framework could not handle.
 Flink serialization system improved a lot over time and by now surpasses the capabilities of Avro in many cases. Kryo now serves as the default fallback serialization framework, supporting a much broader range of types.
 
-###[Hadoop FileSystem support](https://github.com/apache/incubator-flink/pull/268)
+### [Hadoop FileSystem support](https://github.com/apache/incubator-flink/pull/268)
 
 This change permits users to use all file systems supported by Hadoop with Flink. In practice this means that users can use Flink with Tachyon, Google Cloud Storage (also out of the box Flink YARN support on Google Compute Cloud), FTP and all the other file system implementations for Hadoop.
 
-##Heading to the 0.8.0 release
+## Heading to the 0.8.0 release
 
 The community is working hard together with the Apache infra team to migrate the Flink infrastructure to a top-level project. At the same time, the Flink community is working on the Flink 0.8.0 release which should be out very soon.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2015-02-02-february-2015-in-flink.md
----------------------------------------------------------------------
diff --git a/_posts/2015-02-02-february-2015-in-flink.md b/_posts/2015-02-02-february-2015-in-flink.md
deleted file mode 100644
index b81d61e..0000000
--- a/_posts/2015-02-02-february-2015-in-flink.md
+++ /dev/null
@@ -1,112 +0,0 @@
----
-layout: post
-title:  'February 2015 in the Flink community'
-date:   2015-03-02 10:00:00
-categories: news
----
-
-February might be the shortest month of the year, but this does not
-mean that the Flink community has not been busy adding features to the
-system and fixing bugs. Here’s a rundown of the activity in the Flink
-community last month.
-
-###0.8.1 release
-
-Flink 0.8.1 was released. This bugfixing release resolves a total of 22 issues.
-
-###New committer
-
-[Max Michels](https://github.com/mxm) has been voted a committer by the Flink PMC.
-
-###Flink adapter for Apache SAMOA
-
-[Apache SAMOA (incubating)](http://samoa.incubator.apache.org) is a
-distributed streaming machine learning (ML) framework with a
-programming abstraction for distributed streaming ML algorithms. SAMOA
-runs on a variety of backend engines, currently Apache Storm and
-Apache S4.  A [pull
-request](https://github.com/apache/incubator-samoa/pull/11) is
-available at the SAMOA repository that adds a Flink adapter for SAMOA.
-
-###Easy Flink deployment on Google Compute Cloud
-
-Flink is now integrated in bdutil, Google’s open source tool for
-creating and configuring (Hadoop) clusters in Google Compute
-Engine. Deployment of Flink clusters in now supported starting with
-[bdutil
-1.2.0](https://groups.google.com/forum/#!topic/gcp-hadoop-announce/uVJ_6y9cGKM).
-
-###Flink on the Web
-
-A new blog post on [Flink
-Streaming](http://flink.apache.org/news/2015/02/09/streaming-example.html)
-was published at the blog. Flink was mentioned in several articles on
-the web. Here are some examples:
-
-- [How Flink became an Apache Top-Level Project](http://dataconomy.com/how-flink-became-an-apache-top-level-project/)
-
-- [Stale Synchronous Parallelism: The new frontier for Apache Flink?](https://www.linkedin.com/pulse/stale-synchronous-parallelism-new-frontier-apache-flink-nam-luc-tran?utm_content=buffer461af&utm_medium=social&utm_source=linkedin.com&utm_campaign=buffer)
-
-- [Distributed data processing with Apache Flink](http://www.hadoopsphere.com/2015/02/distributed-data-processing-with-apache.html)
-
-- [Ciao latency, hello speed](http://www.hadoopsphere.com/2015/02/ciao-latency-hallo-speed.html)
-
-##In the Flink master
-
-The following features have been now merged in Flink’s master repository.
-
-###Gelly
-
-Gelly, Flink’s Graph API allows users to manipulate graph-shaped data
-directly. Here’s for example a calculation of shortest paths in a
-graph:
-
-{% highlight java %}
-Graph<Long, Double, Double> graph = Graph.fromDataSet(vertices, edges, env);
-
-DataSet<Vertex<Long, Double>> singleSourceShortestPaths = graph
-     .run(new SingleSourceShortestPaths<Long>(srcVertexId,
-           maxIterations)).getVertices();
-{% endhighlight %}	   
-
-See more Gelly examples
-[here](https://github.com/apache/flink/tree/master/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/example).
-
-###Flink Expressions
-
-The newly merged
-[flink-expressions](https://github.com/apache/flink/tree/master/flink-staging/flink-expressions)
-module is the first step in Flink’s roadmap towards logical queries
-and SQL support. Here’s a preview on how you can read two CSV file,
-assign a logical schema to, and apply transformations like filters and
-joins using logical attributes rather than physical data types.
-
-{% highlight scala %}
-val customers = getCustomerDataSet(env)
- .as('id, 'mktSegment)
- .filter( 'mktSegment === "AUTOMOBILE" )
-
-val orders = getOrdersDataSet(env)
- .filter( o => dateFormat.parse(o.orderDate).before(date) )
- .as('orderId, 'custId, 'orderDate, 'shipPrio)
-
-val items =
- orders.join(customers)
-   .where('custId === 'id)
-   .select('orderId, 'orderDate, 'shipPrio)
-{% endhighlight %}   
-
-###Access to HCatalog tables
-
-With the [flink-hcatalog
-module](https://github.com/apache/flink/tree/master/flink-staging/flink-hcatalog),
-you can now conveniently access HCatalog/Hive tables. The module
-supports projection (selection and order of fields) and partition
-filters.
-
-###Access to secured YARN clusters/HDFS.
-
-With this change users can access Kerberos secured YARN (and HDFS)
-Hadoop clusters.  Also, basic support for accessing secured HDFS with
-a standalone Flink setup is now available.
-

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2015-02-04-january-in-flink.md
----------------------------------------------------------------------
diff --git a/_posts/2015-02-04-january-in-flink.md b/_posts/2015-02-04-january-in-flink.md
index f0268db..6a5315a 100644
--- a/_posts/2015-02-04-january-in-flink.md
+++ b/_posts/2015-02-04-january-in-flink.md
@@ -7,46 +7,46 @@ categories: news
 
 Happy 2015! Here is a (hopefully digestible) summary of what happened last month in the Flink community.
 
-###0.8.0 release
+### 0.8.0 release
 
 Flink 0.8.0 was released. See [here](http://flink.apache.org/news/2015/01/21/release-0.8.html) for the release notes.
 
-###Flink roadmap
+### Flink roadmap
 
 The community has published a [roadmap for 2015](https://cwiki.apache.org/confluence/display/FLINK/Flink+Roadmap) on the Flink wiki. Check it out to see what is coming up in Flink, and pick up an issue to contribute!
 
-###Scaling ALS
+### Scaling ALS
 
 Flink committers employed at [data Artisans](http://data-artisans.com) published a [blog post](http://data-artisans.com/computing-recommendations-with-flink.html) on how they scaled matrix factorization with Flink and Google Compute Engine to matrices with 28 billion elements.
 
-###Articles in the press
+### Articles in the press
 
 The Apache Software Foundation [announced](https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces69) Flink as a Top-Level Project. The announcement was picked up by the media, e.g., [here](http://sdtimes.com/inside-apache-software-foundations-newest-top-level-project-apache-flink/?utm_content=11232092&utm_medium=social&utm_source=twitter), [here](http://www.datanami.com/2015/01/12/apache-flink-takes-route-distributed-data-processing/), and [here](http://i-programmer.info/news/197-data-mining/8176-flink-reaches-top-level-status.html).
 
-###Hadoop Summit
+### Hadoop Summit
 
 A submitted abstract on Flink Streaming [won the community](http://2015.hadoopsummit.org/amsterdam-blog/announcing-the-community-vote-session-winners-for-the-2015-hadoop-summit-europe/) vote at “The Future of Hadoop” track.
 
-###Meetups and talks
+### Meetups and talks
 
 Flink was presented at the [Paris Hadoop User Group](http://www.meetup.com/Hadoop-User-Group-France/events/219778022/), the [Bay Area Hadoop User Group](http://www.meetup.com/hadoop/events/167785202/), the [Apache Tez User Group](http://www.meetup.com/Apache-Tez-User-Group/events/219302692/), and [FOSDEM 2015](https://fosdem.org/2015/schedule/track/graph_processing/). The January [Flink meetup in Berlin](http://www.meetup.com/Apache-Flink-Meetup/events/219639984/) had talks on recent community updates and new features.
 
-##Notable code contributions
+## Notable code contributions
 
 **Note:** Code contributions listed here may not be part of a release or even the Flink master repository yet.
 
-###[Using off-heap memory](https://github.com/apache/flink/pull/290)
+### [Using off-heap memory](https://github.com/apache/flink/pull/290)
 
 This pull request enables Flink to use off-heap memory for its internal memory uses (sort, hash, caching of intermediate data sets). 
 
-###[Gelly, Flink’s Graph API](https://github.com/apache/flink/pull/335)
+### [Gelly, Flink’s Graph API](https://github.com/apache/flink/pull/335)
 
 This pull request introduces Gelly, Flink’s brand new Graph API. Gelly offers a native graph programming abstraction with functionality for vertex-centric programming, as well as available graph algorithms. See [this slide set](http://www.slideshare.net/vkalavri/largescale-graph-processing-with-apache-flink-graphdevroom-fosdem15) for an overview of Gelly.
 
-###[Semantic annotations](https://github.com/apache/flink/pull/311)
+### [Semantic annotations](https://github.com/apache/flink/pull/311)
 
 Semantic annotations are a powerful mechanism to expose information about the behavior of Flink functions to Flink’s optimizer. The optimizer can leverage this information to generate more efficient execution plans. For example the output of a Reduce operator that groups on the second field of a tuple is still partitioned on that field if the Reduce function does not modify the value of the second field. By exposing this information to the optimizer, the optimizer can generate plans that avoid expensive data shuffling and reuse the partitioned output of Reduce. Semantic annotations can be defined for most data types, including (nested) tuples and POJOs. See the snapshot documentation for details (not online yet).
 
-###[New YARN client](https://github.com/apache/flink/pull/292)
+### [New YARN client](https://github.com/apache/flink/pull/292)
 
 The improved YARN client of Flink now allows users to deploy Flink on YARN for executing a single job. Older versions only supported a long-running YARN session. The code of the YARN client has been refactored to provide an (internal) Java API for controlling YARN clusters more easily.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2015-02-09-streaming-example.md
----------------------------------------------------------------------
diff --git a/_posts/2015-02-09-streaming-example.md b/_posts/2015-02-09-streaming-example.md
index cf442de..5fcba01 100644
--- a/_posts/2015-02-09-streaming-example.md
+++ b/_posts/2015-02-09-streaming-example.md
@@ -5,7 +5,6 @@ date:   2015-02-09 12:00:00
 categories: news
 ---
 
-
 This post is the first of a series of blog posts on Flink Streaming,
 the recent addition to Apache Flink that makes it possible to analyze
 continuous data sources in addition to static files. Flink Streaming

http://git-wip-us.apache.org/repos/asf/flink-web/blob/7b3cf3a7/_posts/2015-03-02-february-2015-in-flink.md
----------------------------------------------------------------------
diff --git a/_posts/2015-03-02-february-2015-in-flink.md b/_posts/2015-03-02-february-2015-in-flink.md
new file mode 100644
index 0000000..980d8ee
--- /dev/null
+++ b/_posts/2015-03-02-february-2015-in-flink.md
@@ -0,0 +1,112 @@
+---
+layout: post
+title:  'February 2015 in the Flink community'
+date:   2015-03-02 10:00:00
+categories: news
+---
+
+February might be the shortest month of the year, but this does not
+mean that the Flink community has not been busy adding features to the
+system and fixing bugs. Here’s a rundown of the activity in the Flink
+community last month.
+
+### 0.8.1 release
+
+Flink 0.8.1 was released. This bugfixing release resolves a total of 22 issues.
+
+### New committer
+
+[Max Michels](https://github.com/mxm) has been voted a committer by the Flink PMC.
+
+### Flink adapter for Apache SAMOA
+
+[Apache SAMOA (incubating)](http://samoa.incubator.apache.org) is a
+distributed streaming machine learning (ML) framework with a
+programming abstraction for distributed streaming ML algorithms. SAMOA
+runs on a variety of backend engines, currently Apache Storm and
+Apache S4.  A [pull
+request](https://github.com/apache/incubator-samoa/pull/11) is
+available at the SAMOA repository that adds a Flink adapter for SAMOA.
+
+### Easy Flink deployment on Google Compute Cloud
+
+Flink is now integrated in bdutil, Google’s open source tool for
+creating and configuring (Hadoop) clusters in Google Compute
+Engine. Deployment of Flink clusters in now supported starting with
+[bdutil
+1.2.0](https://groups.google.com/forum/#!topic/gcp-hadoop-announce/uVJ_6y9cGKM).
+
+### Flink on the Web
+
+A new blog post on [Flink
+Streaming](http://flink.apache.org/news/2015/02/09/streaming-example.html)
+was published at the blog. Flink was mentioned in several articles on
+the web. Here are some examples:
+
+- [How Flink became an Apache Top-Level Project](http://dataconomy.com/how-flink-became-an-apache-top-level-project/)
+
+- [Stale Synchronous Parallelism: The new frontier for Apache Flink?](https://www.linkedin.com/pulse/stale-synchronous-parallelism-new-frontier-apache-flink-nam-luc-tran?utm_content=buffer461af&utm_medium=social&utm_source=linkedin.com&utm_campaign=buffer)
+
+- [Distributed data processing with Apache Flink](http://www.hadoopsphere.com/2015/02/distributed-data-processing-with-apache.html)
+
+- [Ciao latency, hello speed](http://www.hadoopsphere.com/2015/02/ciao-latency-hallo-speed.html)
+
+## In the Flink master
+
+The following features have been now merged in Flink’s master repository.
+
+### Gelly
+
+Gelly, Flink’s Graph API allows users to manipulate graph-shaped data
+directly. Here’s for example a calculation of shortest paths in a
+graph:
+
+{% highlight java %}
+Graph<Long, Double, Double> graph = Graph.fromDataSet(vertices, edges, env);
+
+DataSet<Vertex<Long, Double>> singleSourceShortestPaths = graph
+     .run(new SingleSourceShortestPaths<Long>(srcVertexId,
+           maxIterations)).getVertices();
+{% endhighlight %}	   
+
+See more Gelly examples
+[here](https://github.com/apache/flink/tree/master/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/example).
+
+### Flink Expressions
+
+The newly merged
+[flink-expressions](https://github.com/apache/flink/tree/master/flink-staging/flink-expressions)
+module is the first step in Flink’s roadmap towards logical queries
+and SQL support. Here’s a preview on how you can read two CSV file,
+assign a logical schema to, and apply transformations like filters and
+joins using logical attributes rather than physical data types.
+
+{% highlight scala %}
+val customers = getCustomerDataSet(env)
+ .as('id, 'mktSegment)
+ .filter( 'mktSegment === "AUTOMOBILE" )
+
+val orders = getOrdersDataSet(env)
+ .filter( o => dateFormat.parse(o.orderDate).before(date) )
+ .as('orderId, 'custId, 'orderDate, 'shipPrio)
+
+val items =
+ orders.join(customers)
+   .where('custId === 'id)
+   .select('orderId, 'orderDate, 'shipPrio)
+{% endhighlight %}   
+
+### Access to HCatalog tables
+
+With the [flink-hcatalog
+module](https://github.com/apache/flink/tree/master/flink-staging/flink-hcatalog),
+you can now conveniently access HCatalog/Hive tables. The module
+supports projection (selection and order of fields) and partition
+filters.
+
+### Access to secured YARN clusters/HDFS.
+
+With this change users can access Kerberos secured YARN (and HDFS)
+Hadoop clusters.  Also, basic support for accessing secured HDFS with
+a standalone Flink setup is now available.
+


Mime
View raw message