beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhalp...@apache.org
Subject [07/15] incubator-beam-site git commit: Regenerated site after merge.
Date Tue, 02 Aug 2016 17:46:38 GMT
http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/8797d044/content/learn/runners/index.html
----------------------------------------------------------------------
diff --git a/content/learn/runners/index.html b/content/learn/runners/index.html
new file mode 100644
index 0000000..881abb0
--- /dev/null
+++ b/content/learn/runners/index.html
@@ -0,0 +1,153 @@
+<!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">
+
+  <title>Beam SDKs</title>
+  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow (a cloud service). Beam also brings DSL in different languages, allowing users to easily implement their data integration processes.
+">
+
+  <link rel="stylesheet" href="/styles/site.css">
+  <link rel="stylesheet" href="/css/theme.css">
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
+  <link rel="canonical" href="http://beam.incubator.apache.org/learn/runners/" data-proofer-ignore>
+  <link rel="alternate" type="application/rss+xml" title="Apache Beam (incubating)" href="http://beam.incubator.apache.org/feed.xml">
+  <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-73650088-1', 'auto');
+    ga('send', 'pageview');
+
+  </script>
+  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
+</head>
+
+
+  <body role="document">
+
+    <nav class="navbar navbar-default navbar-fixed-top">
+  <div class="container">
+    <div class="navbar-header">
+      <a href="/" class="navbar-brand" >
+        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
+      </a>
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+    </div>
+    <div id="navbar" class="navbar-collapse collapse">
+      <ul class="nav navbar-nav">
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Use <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/use">User Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">General</li>
+			  <li><a href="/use/beam-overview/">Beam Overview</a></li>
+			  <li><a href="/use/quickstart/">Quickstart</a></li>  
+			  <li><a href="/use/releases">Release Information</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Example Walkthroughs</li>
+			  <li><a href="/use/walkthroughs/">WordCount</a></li>
+			  <li><a href="/use/walkthroughs/">Mobile Gaming</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Support</li>
+			  <li><a href="/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
+			  <li><a href="http://stackoverflow.com/questions/tagged/apache-beam">Beam on StackOverflow</a></li>
+              <li><a href="http://apachebeam.slack.com">Beam Slack Channel</a></li>
+		  </ul>
+	    </li>
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Learn <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/learn">Learner Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Beam Concepts</li>
+			  <li><a href="/learn/programming-guide/">Programming Guide</a></li>
+			  <li><a href="/learn/presentation-materials/">Presentation Materials</a></li>
+			  <li><a href="/learn/resources/">Additional Resources</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">SDKs</li>
+			  <li><a href="/learn/sdks/java/">Java SDK</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Runners</li>
+			  <li><a href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
+			  <li><a href="/learn/runners/direct/">Direct Runner</a></li>
+			  <li><a href="/learn/runners/flink/">Apache Flink Runner</a></li>
+			  <li><a href="/learn/runners/spark/">Apache Spark Runner</a></li>
+			  <li><a href="/learn/runners/dataflow/">Cloud Dataflow Runner</a></li>
+		  </ul>
+	    </li>
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Contribute <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/contribute">Contributor Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Basics</li>
+			  <li><a href="/contribute/contribution-guide/">Contribution Guide</a></li>
+			  <li><a href="/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="/contribute/source-repository/">Source Repository</a></li>
+              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
+              <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Technical Resources</li>
+			  <li><a href="https://goo.gl/nk5OM0">Technical Vision</a></li>
+		  </ul>
+	    </li>
+        <li><a href="/blog">Blog</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project<span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="/project/logos/">Logos and design</a></li>
+            <li><a href="/project/public-meetings/">Public Meetings</a></li>
+			<li><a href="/project/team/">Team</a></li>
+            <li><a href="http://apache.org/licenses/LICENSE-2.0.html">License</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div><!--/.nav-collapse -->
+  </div>
+</nav>
+
+
+<link rel="stylesheet" href="">
+
+
+    <div class="container" role="main">
+
+      <div class="container">
+        <h1 id="apache-beam-sdks">Apache Beam SDKs</h1>
+
+<h4 id="java-sdklearnsdksjava"><a href="/learn/sdks/java/">Java SDK</a></h4>
+
+      </div>
+
+
+    <hr>
+  <div class="row">
+      <div class="col-xs-12">
+          <footer>
+              <p class="text-center">&copy; Copyright 2016
+                <a href="http://www.apache.org">The Apache Software Foundation.</a> All Rights Reserved.</p>
+                <p class="text-center"><a href="/privacy_policy">Privacy Policy</a> |
+                <a href="/feed.xml">RSS Feed</a></p>
+          </footer>
+      </div>
+  </div>
+  <!-- container div end -->
+</div>
+
+
+  </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/8797d044/content/learn/runners/spark/index.html
----------------------------------------------------------------------
diff --git a/content/learn/runners/spark/index.html b/content/learn/runners/spark/index.html
new file mode 100644
index 0000000..be11517
--- /dev/null
+++ b/content/learn/runners/spark/index.html
@@ -0,0 +1,153 @@
+<!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">
+
+  <title>Apache Spark Runner</title>
+  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow (a cloud service). Beam also brings DSL in different languages, allowing users to easily implement their data integration processes.
+">
+
+  <link rel="stylesheet" href="/styles/site.css">
+  <link rel="stylesheet" href="/css/theme.css">
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
+  <link rel="canonical" href="http://beam.incubator.apache.org/learn/runners/spark/" data-proofer-ignore>
+  <link rel="alternate" type="application/rss+xml" title="Apache Beam (incubating)" href="http://beam.incubator.apache.org/feed.xml">
+  <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-73650088-1', 'auto');
+    ga('send', 'pageview');
+
+  </script>
+  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
+</head>
+
+
+  <body role="document">
+
+    <nav class="navbar navbar-default navbar-fixed-top">
+  <div class="container">
+    <div class="navbar-header">
+      <a href="/" class="navbar-brand" >
+        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
+      </a>
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+    </div>
+    <div id="navbar" class="navbar-collapse collapse">
+      <ul class="nav navbar-nav">
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Use <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/use">User Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">General</li>
+			  <li><a href="/use/beam-overview/">Beam Overview</a></li>
+			  <li><a href="/use/quickstart/">Quickstart</a></li>  
+			  <li><a href="/use/releases">Release Information</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Example Walkthroughs</li>
+			  <li><a href="/use/walkthroughs/">WordCount</a></li>
+			  <li><a href="/use/walkthroughs/">Mobile Gaming</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Support</li>
+			  <li><a href="/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
+			  <li><a href="http://stackoverflow.com/questions/tagged/apache-beam">Beam on StackOverflow</a></li>
+              <li><a href="http://apachebeam.slack.com">Beam Slack Channel</a></li>
+		  </ul>
+	    </li>
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Learn <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/learn">Learner Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Beam Concepts</li>
+			  <li><a href="/learn/programming-guide/">Programming Guide</a></li>
+			  <li><a href="/learn/presentation-materials/">Presentation Materials</a></li>
+			  <li><a href="/learn/resources/">Additional Resources</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">SDKs</li>
+			  <li><a href="/learn/sdks/java/">Java SDK</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Runners</li>
+			  <li><a href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
+			  <li><a href="/learn/runners/direct/">Direct Runner</a></li>
+			  <li><a href="/learn/runners/flink/">Apache Flink Runner</a></li>
+			  <li><a href="/learn/runners/spark/">Apache Spark Runner</a></li>
+			  <li><a href="/learn/runners/dataflow/">Cloud Dataflow Runner</a></li>
+		  </ul>
+	    </li>
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Contribute <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/contribute">Contributor Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Basics</li>
+			  <li><a href="/contribute/contribution-guide/">Contribution Guide</a></li>
+			  <li><a href="/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="/contribute/source-repository/">Source Repository</a></li>
+              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
+              <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Technical Resources</li>
+			  <li><a href="https://goo.gl/nk5OM0">Technical Vision</a></li>
+		  </ul>
+	    </li>
+        <li><a href="/blog">Blog</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project<span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="/project/logos/">Logos and design</a></li>
+            <li><a href="/project/public-meetings/">Public Meetings</a></li>
+			<li><a href="/project/team/">Team</a></li>
+            <li><a href="http://apache.org/licenses/LICENSE-2.0.html">License</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div><!--/.nav-collapse -->
+  </div>
+</nav>
+
+
+<link rel="stylesheet" href="">
+
+
+    <div class="container" role="main">
+
+      <div class="container">
+        <h1 id="using-the-apache-spark-runner">Using the Apache Spark Runner</h1>
+
+<p>This page is under construction (<a href="https://issues.apache.org/jira/browse/BEAM-507">BEAM-507</a>).</p>
+
+      </div>
+
+
+    <hr>
+  <div class="row">
+      <div class="col-xs-12">
+          <footer>
+              <p class="text-center">&copy; Copyright 2016
+                <a href="http://www.apache.org">The Apache Software Foundation.</a> All Rights Reserved.</p>
+                <p class="text-center"><a href="/privacy_policy">Privacy Policy</a> |
+                <a href="/feed.xml">RSS Feed</a></p>
+          </footer>
+      </div>
+  </div>
+  <!-- container div end -->
+</div>
+
+
+  </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/8797d044/content/learn/sdks/index.html
----------------------------------------------------------------------
diff --git a/content/learn/sdks/index.html b/content/learn/sdks/index.html
new file mode 100644
index 0000000..2bfa487
--- /dev/null
+++ b/content/learn/sdks/index.html
@@ -0,0 +1,159 @@
+<!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">
+
+  <title>Beam Runners</title>
+  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow (a cloud service). Beam also brings DSL in different languages, allowing users to easily implement their data integration processes.
+">
+
+  <link rel="stylesheet" href="/styles/site.css">
+  <link rel="stylesheet" href="/css/theme.css">
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
+  <link rel="canonical" href="http://beam.incubator.apache.org/learn/sdks/" data-proofer-ignore>
+  <link rel="alternate" type="application/rss+xml" title="Apache Beam (incubating)" href="http://beam.incubator.apache.org/feed.xml">
+  <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-73650088-1', 'auto');
+    ga('send', 'pageview');
+
+  </script>
+  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
+</head>
+
+
+  <body role="document">
+
+    <nav class="navbar navbar-default navbar-fixed-top">
+  <div class="container">
+    <div class="navbar-header">
+      <a href="/" class="navbar-brand" >
+        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
+      </a>
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+    </div>
+    <div id="navbar" class="navbar-collapse collapse">
+      <ul class="nav navbar-nav">
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Use <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/use">User Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">General</li>
+			  <li><a href="/use/beam-overview/">Beam Overview</a></li>
+			  <li><a href="/use/quickstart/">Quickstart</a></li>  
+			  <li><a href="/use/releases">Release Information</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Example Walkthroughs</li>
+			  <li><a href="/use/walkthroughs/">WordCount</a></li>
+			  <li><a href="/use/walkthroughs/">Mobile Gaming</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Support</li>
+			  <li><a href="/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
+			  <li><a href="http://stackoverflow.com/questions/tagged/apache-beam">Beam on StackOverflow</a></li>
+              <li><a href="http://apachebeam.slack.com">Beam Slack Channel</a></li>
+		  </ul>
+	    </li>
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Learn <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/learn">Learner Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Beam Concepts</li>
+			  <li><a href="/learn/programming-guide/">Programming Guide</a></li>
+			  <li><a href="/learn/presentation-materials/">Presentation Materials</a></li>
+			  <li><a href="/learn/resources/">Additional Resources</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">SDKs</li>
+			  <li><a href="/learn/sdks/java/">Java SDK</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Runners</li>
+			  <li><a href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
+			  <li><a href="/learn/runners/direct/">Direct Runner</a></li>
+			  <li><a href="/learn/runners/flink/">Apache Flink Runner</a></li>
+			  <li><a href="/learn/runners/spark/">Apache Spark Runner</a></li>
+			  <li><a href="/learn/runners/dataflow/">Cloud Dataflow Runner</a></li>
+		  </ul>
+	    </li>
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Contribute <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/contribute">Contributor Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Basics</li>
+			  <li><a href="/contribute/contribution-guide/">Contribution Guide</a></li>
+			  <li><a href="/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="/contribute/source-repository/">Source Repository</a></li>
+              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
+              <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Technical Resources</li>
+			  <li><a href="https://goo.gl/nk5OM0">Technical Vision</a></li>
+		  </ul>
+	    </li>
+        <li><a href="/blog">Blog</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project<span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="/project/logos/">Logos and design</a></li>
+            <li><a href="/project/public-meetings/">Public Meetings</a></li>
+			<li><a href="/project/team/">Team</a></li>
+            <li><a href="http://apache.org/licenses/LICENSE-2.0.html">License</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div><!--/.nav-collapse -->
+  </div>
+</nav>
+
+
+<link rel="stylesheet" href="">
+
+
+    <div class="container" role="main">
+
+      <div class="container">
+        <h1 id="apache-beam-runners">Apache Beam Runners</h1>
+
+<h4 id="direct-runnerlearnrunnersdirect"><a href="/learn/runners/direct/">Direct Runner</a></h4>
+
+<h4 id="apache-flink-runnerlearnrunnersflink"><a href="/learn/runners/flink/">Apache Flink Runner</a></h4>
+
+<h4 id="apache-spark-runnerlearnrunnersspark"><a href="/learn/runners/spark/">Apache Spark Runner</a></h4>
+
+<h4 id="cloud-dataflow-runnerlearnrunnersdataflow"><a href="/learn/runners/dataflow/">Cloud Dataflow Runner</a></h4>
+
+      </div>
+
+
+    <hr>
+  <div class="row">
+      <div class="col-xs-12">
+          <footer>
+              <p class="text-center">&copy; Copyright 2016
+                <a href="http://www.apache.org">The Apache Software Foundation.</a> All Rights Reserved.</p>
+                <p class="text-center"><a href="/privacy_policy">Privacy Policy</a> |
+                <a href="/feed.xml">RSS Feed</a></p>
+          </footer>
+      </div>
+  </div>
+  <!-- container div end -->
+</div>
+
+
+  </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/8797d044/content/learn/sdks/java/index.html
----------------------------------------------------------------------
diff --git a/content/learn/sdks/java/index.html b/content/learn/sdks/java/index.html
new file mode 100644
index 0000000..20dd4d3
--- /dev/null
+++ b/content/learn/sdks/java/index.html
@@ -0,0 +1,153 @@
+<!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">
+
+  <title>Beam Java SDK</title>
+  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow (a cloud service). Beam also brings DSL in different languages, allowing users to easily implement their data integration processes.
+">
+
+  <link rel="stylesheet" href="/styles/site.css">
+  <link rel="stylesheet" href="/css/theme.css">
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
+  <link rel="canonical" href="http://beam.incubator.apache.org/learn/sdks/java/" data-proofer-ignore>
+  <link rel="alternate" type="application/rss+xml" title="Apache Beam (incubating)" href="http://beam.incubator.apache.org/feed.xml">
+  <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-73650088-1', 'auto');
+    ga('send', 'pageview');
+
+  </script>
+  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
+</head>
+
+
+  <body role="document">
+
+    <nav class="navbar navbar-default navbar-fixed-top">
+  <div class="container">
+    <div class="navbar-header">
+      <a href="/" class="navbar-brand" >
+        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
+      </a>
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+    </div>
+    <div id="navbar" class="navbar-collapse collapse">
+      <ul class="nav navbar-nav">
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Use <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/use">User Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">General</li>
+			  <li><a href="/use/beam-overview/">Beam Overview</a></li>
+			  <li><a href="/use/quickstart/">Quickstart</a></li>  
+			  <li><a href="/use/releases">Release Information</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Example Walkthroughs</li>
+			  <li><a href="/use/walkthroughs/">WordCount</a></li>
+			  <li><a href="/use/walkthroughs/">Mobile Gaming</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Support</li>
+			  <li><a href="/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
+			  <li><a href="http://stackoverflow.com/questions/tagged/apache-beam">Beam on StackOverflow</a></li>
+              <li><a href="http://apachebeam.slack.com">Beam Slack Channel</a></li>
+		  </ul>
+	    </li>
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Learn <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/learn">Learner Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Beam Concepts</li>
+			  <li><a href="/learn/programming-guide/">Programming Guide</a></li>
+			  <li><a href="/learn/presentation-materials/">Presentation Materials</a></li>
+			  <li><a href="/learn/resources/">Additional Resources</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">SDKs</li>
+			  <li><a href="/learn/sdks/java/">Java SDK</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Runners</li>
+			  <li><a href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
+			  <li><a href="/learn/runners/direct/">Direct Runner</a></li>
+			  <li><a href="/learn/runners/flink/">Apache Flink Runner</a></li>
+			  <li><a href="/learn/runners/spark/">Apache Spark Runner</a></li>
+			  <li><a href="/learn/runners/dataflow/">Cloud Dataflow Runner</a></li>
+		  </ul>
+	    </li>
+        <li class="dropdown">
+		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Contribute <span class="caret"></span></a>
+		  <ul class="dropdown-menu">
+			  <li><a href="/contribute">Contributor Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Basics</li>
+			  <li><a href="/contribute/contribution-guide/">Contribution Guide</a></li>
+			  <li><a href="/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="/contribute/source-repository/">Source Repository</a></li>
+              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
+              <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Technical Resources</li>
+			  <li><a href="https://goo.gl/nk5OM0">Technical Vision</a></li>
+		  </ul>
+	    </li>
+        <li><a href="/blog">Blog</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project<span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="/project/logos/">Logos and design</a></li>
+            <li><a href="/project/public-meetings/">Public Meetings</a></li>
+			<li><a href="/project/team/">Team</a></li>
+            <li><a href="http://apache.org/licenses/LICENSE-2.0.html">License</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div><!--/.nav-collapse -->
+  </div>
+</nav>
+
+
+<link rel="stylesheet" href="">
+
+
+    <div class="container" role="main">
+
+      <div class="container">
+        <h1 id="apache-beam-java-sdk">Apache Beam Java SDK</h1>
+
+<p>This page is under construction (<a href="https://issues.apache.org/jira/browse/BEAM-504">BEAM-504</a>).</p>
+
+      </div>
+
+
+    <hr>
+  <div class="row">
+      <div class="col-xs-12">
+          <footer>
+              <p class="text-center">&copy; Copyright 2016
+                <a href="http://www.apache.org">The Apache Software Foundation.</a> All Rights Reserved.</p>
+                <p class="text-center"><a href="/privacy_policy">Privacy Policy</a> |
+                <a href="/feed.xml">RSS Feed</a></p>
+          </footer>
+      </div>
+  </div>
+  <!-- container div end -->
+</div>
+
+
+  </body>
+
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/8797d044/content/mailing_lists/index.html
----------------------------------------------------------------------
diff --git a/content/mailing_lists/index.html b/content/mailing_lists/index.html
index c334a47..1d046b3 100644
--- a/content/mailing_lists/index.html
+++ b/content/mailing_lists/index.html
@@ -1,191 +1,10 @@
 <!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">
-
-  <title>Project Mailing Lists</title>
-  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow (a cloud service). Beam also brings DSL in different languages, allowing users to easily implement their data integration processes.
-">
-
-  <link rel="stylesheet" href="/styles/site.css">
-  <link rel="stylesheet" href="/css/theme.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <link rel="canonical" href="http://beam.incubator.apache.org/mailing_lists/">
-  <link rel="alternate" type="application/rss+xml" title="Apache Beam (incubating)" href="http://beam.incubator.apache.org/feed.xml">
-  <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-73650088-1', 'auto');
-    ga('send', 'pageview');
-
-  </script>
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-</head>
-
-
-  <body role="document">
-
-    <nav class="navbar navbar-default navbar-fixed-top">
-  <div class="container">
-    <div class="navbar-header">
-      <a href="/" class="navbar-brand" >
-        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
-      </a>
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-    </div>
-    <div id="navbar" class="navbar-collapse collapse">
-      <ul class="nav navbar-nav">
-        <li class="dropdown">
-		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Use <span class="caret"></span></a>
-		  <ul class="dropdown-menu">
-			  <li><a href="/docs/use/">User Hub</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/docs/use/beam-overview">Beam Overview</a></li>
-			  <li><a href="/getting_started/">Quickstart</a></li>
-			  <li class="dropdown-header">Example Walkthroughs</li>
-			  <li><a href="/docs/use/walkthroughs">WordCount</a></li>
-			  <li><a href="/docs/use/walkthroughs">Mobile Gaming</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="">Release Information</a></li>
-			  <li class="dropdown-header">Support Resources</li>
-			  <li><a href="/mailing_lists/">Mailing Lists</a></li>
-              <li><a href="/issue_tracking/">Issue Tracking</a></li>
-			  <li><a href="http://stackoverflow.com/questions/tagged/apache-beam">Beam on StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com">Beam Slack Channel</a></li>
-		  </ul>
-	    </li>
-        <li class="dropdown">
-		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Learn <span class="caret"></span></a>
-		  <ul class="dropdown-menu">
-			  <li><a href="/docs/learn/">Learner Hub</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/docs/learn/programming-guide/">Beam Programming Guide</a></li>
-			  <li><a href="/capability-matrix/">Capability Matrix</a></li>
-			  <li><a href="https://goo.gl/ps8twC">Additional Technical Docs</a></li>
-		  </ul>
-	    </li>
-        <li class="dropdown">
-		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Contribute <span class="caret"></span></a>
-		  <ul class="dropdown-menu">
-			  <li><a href="/docs/contribute/">Contributor Hub</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/contribution-guide/">Contribution Guide</a></li>
-			  <li><a href="https://goo.gl/nk5OM0">Technical Vision</a></li>
-			  <li class="dropdown-header">Resources</li>
-			  <li><a href="/mailing_lists/">Mailing Lists</a></li>
-              <li><a href="/source_repository/">Source Repository</a></li>
-              <li><a href="/issue_tracking/">Issue Tracking</a></li>
-			  <li class="dropdown-header">Project Materials</li>
-			  <li><a href="/presentation-materials/">Presentation Materials</a></li>
-			  <li><a href="/public-meetings/">Public Meetings</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/team/">Apache Beam Team</a></li>
-		  </ul>
-	    </li>
-        <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project <span class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/presentation-materials/">Presentation Materials</a></li>
-            <li><a href="/material/">Logos and design</a></li>
-            <li><a href="http://apache.org/licenses/LICENSE-2.0.html">License</a></li>
-          </ul>
-        </li>
-      </ul>
-    </div><!--/.nav-collapse -->
-  </div>
-</nav>
-
-
-<link rel="stylesheet" href="">
-
-
-    <div class="container" role="main">
-
-      <div class="container">
-        <article class="post">
-
-  <header class="post-header">
-    <h1 class="post-title">Project Mailing Lists</h1>
-  </header>
-
-  <div class="post-content">
-    <p>These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.</p>
-
-<p>Name	Subscribe	Unsubscribe	Post	Archive
-	Subscribe	Unsubscribe	Post	<a href="http://mail-archives.apache.org/mod_mbox/incubator-beam-dev/">mail-archives.apache.org</a>
-	Subscribe	Unsubscribe	Post	mail-archives.apache.org
-beam-user	Subscribe	Unsubscribe	Post	mail-archives.apache.org</p>
-
-<table class="table table-hover">
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>Subscribe</th>
-      <th>Unsubscribe</th>
-      <th>Post</th>
-      <th>Archive</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <th scope="row">beam-dev</th>
-      <td><a href="mailto:dev-subscribe@beam.incubator.apache.org">Subscribe</a></td>
-      <td><a href="mailto:dev-unsubscribe@beam.incubator.apache.org">Unsubscribe</a></td>
-      <td><a href="mailto:dev@beam.incubator.apache.org">Post</a></td>
-      <td><a href="http://mail-archives.apache.org/mod_mbox/incubator-beam-dev/">mail-archives.apache.org</a></td>
-    </tr>
-    <tr>
-      <th scope="row">beam-commits</th>
-      <td><a href="mailto:commits-subscribe@beam.incubator.apache.org">Subscribe</a></td>
-      <td><a href="mailto:commits-unsubscribe@beam.incubator.apache.org">Unsubscribe</a></td>
-      <td><a href="mailto:commits@beam.incubator.apache.org">Post</a></td>
-      <td><a href="http://mail-archives.apache.org/mod_mbox/incubator-beam-commits/">mail-archives.apache.org</a></td>
-    </tr>
-    <tr>
-      <th scope="row">beam-user</th>
-      <td><a href="mailto:user-subscribe@beam.incubator.apache.org">Subscribe</a></td>
-      <td><a href="mailto:user-unsubscribe@beam.incubator.apache.org">Unsubscribe</a></td>
-      <td><a href="mailto:user@beam.incubator.apache.org">Post</a></td>
-      <td><a href="http://mail-archives.apache.org/mod_mbox/incubator-beam-user/">mail-archives.apache.org</a></td>
-    </tr>
-</tbody>
-</table>
-
-  </div>
-
-</article>
-
-      </div>
-
-
-    <hr>
-  <div class="row">
-      <div class="col-xs-12">
-          <footer>
-              <p class="text-center">&copy; Copyright 2016
-                <a href="http://www.apache.org">The Apache Software Foundation.</a> All Rights Reserved.</p>
-                <p class="text-center"><a href="/privacy_policy">Privacy Policy</a> |
-                <a href="/feed.xml">RSS Feed</a></p>
-          </footer>
-      </div>
-  </div>
-  <!-- container div end -->
-</div>
-
-
-  </body>
-
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://beam.incubator.apache.org/use/mailing-lists/">
+<meta http-equiv="refresh" content="0; url=http://beam.incubator.apache.org/use/mailing-lists/">
+<h1>Redirecting…</h1>
+<a href="http://beam.incubator.apache.org/use/mailing-lists/">Click here if you are not redirected.</a>
+<script>location="http://beam.incubator.apache.org/use/mailing-lists/"</script>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/8797d044/content/material/index.html
----------------------------------------------------------------------
diff --git a/content/material/index.html b/content/material/index.html
index a3c2c69..32515bf 100644
--- a/content/material/index.html
+++ b/content/material/index.html
@@ -1,452 +1,10 @@
 <!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">
-
-  <title>Apache Beam Material</title>
-  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow (a cloud service). Beam also brings DSL in different languages, allowing users to easily implement their data integration processes.
-">
-
-  <link rel="stylesheet" href="/styles/site.css">
-  <link rel="stylesheet" href="/css/theme.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <link rel="canonical" href="http://beam.incubator.apache.org/material/">
-  <link rel="alternate" type="application/rss+xml" title="Apache Beam (incubating)" href="http://beam.incubator.apache.org/feed.xml">
-  <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-73650088-1', 'auto');
-    ga('send', 'pageview');
-
-  </script>
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-</head>
-
-
-  <body role="document">
-
-    <nav class="navbar navbar-default navbar-fixed-top">
-  <div class="container">
-    <div class="navbar-header">
-      <a href="/" class="navbar-brand" >
-        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
-      </a>
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-    </div>
-    <div id="navbar" class="navbar-collapse collapse">
-      <ul class="nav navbar-nav">
-        <li class="dropdown">
-		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Use <span class="caret"></span></a>
-		  <ul class="dropdown-menu">
-			  <li><a href="/docs/use/">User Hub</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/docs/use/beam-overview">Beam Overview</a></li>
-			  <li><a href="/getting_started/">Quickstart</a></li>
-			  <li class="dropdown-header">Example Walkthroughs</li>
-			  <li><a href="/docs/use/walkthroughs">WordCount</a></li>
-			  <li><a href="/docs/use/walkthroughs">Mobile Gaming</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="">Release Information</a></li>
-			  <li class="dropdown-header">Support Resources</li>
-			  <li><a href="/mailing_lists/">Mailing Lists</a></li>
-              <li><a href="/issue_tracking/">Issue Tracking</a></li>
-			  <li><a href="http://stackoverflow.com/questions/tagged/apache-beam">Beam on StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com">Beam Slack Channel</a></li>
-		  </ul>
-	    </li>
-        <li class="dropdown">
-		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Learn <span class="caret"></span></a>
-		  <ul class="dropdown-menu">
-			  <li><a href="/docs/learn/">Learner Hub</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/docs/learn/programming-guide/">Beam Programming Guide</a></li>
-			  <li><a href="/capability-matrix/">Capability Matrix</a></li>
-			  <li><a href="https://goo.gl/ps8twC">Additional Technical Docs</a></li>
-		  </ul>
-	    </li>
-        <li class="dropdown">
-		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Contribute <span class="caret"></span></a>
-		  <ul class="dropdown-menu">
-			  <li><a href="/docs/contribute/">Contributor Hub</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/contribution-guide/">Contribution Guide</a></li>
-			  <li><a href="https://goo.gl/nk5OM0">Technical Vision</a></li>
-			  <li class="dropdown-header">Resources</li>
-			  <li><a href="/mailing_lists/">Mailing Lists</a></li>
-              <li><a href="/source_repository/">Source Repository</a></li>
-              <li><a href="/issue_tracking/">Issue Tracking</a></li>
-			  <li class="dropdown-header">Project Materials</li>
-			  <li><a href="/presentation-materials/">Presentation Materials</a></li>
-			  <li><a href="/public-meetings/">Public Meetings</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/team/">Apache Beam Team</a></li>
-		  </ul>
-	    </li>
-        <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project <span class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/presentation-materials/">Presentation Materials</a></li>
-            <li><a href="/material/">Logos and design</a></li>
-            <li><a href="http://apache.org/licenses/LICENSE-2.0.html">License</a></li>
-          </ul>
-        </li>
-      </ul>
-    </div><!--/.nav-collapse -->
-  </div>
-</nav>
-
-
-<link rel="stylesheet" href="">
-
-
-    <div class="container" role="main">
-
-      <div class="container">
-        <article class="post">
-
-  <header class="post-header">
-    <h1 class="post-title">Apache Beam Material</h1>
-  </header>
-
-  <div class="post-content">
-    <p>This page contains project material for the Apache Beam project.</p>
-
-<h2 id="project-logos">Project logos</h2>
-<p>You can download <a href="/downloads/logos.zip">this archive</a>
-containing all of the logos or download the logos individually.</p>
-
-<h3 id="scalable-vector-graphics-svg">Scalable Vector Graphics (SVG)</h3>
-<p>These <a href="https://en.wikipedia.org/wiki/Scalable_Vector_Graphics">SVG files</a> can
-be resized easily and are suitable for print or web use. Click on the logo to
-download it.</p>
-
-<h4 id="full-color">Full color</h4>
-<div class="row">
-<div class="col-md-2">
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<a href="/images/logos/full-color/nameless/beam-logo-full-color-nameless.svg" role="button"><img style="height: 60px" src="/images/logos/full-color/nameless/beam-logo-full-color-nameless.svg" alt="beam-logo-full-color-nameless.svg" /></a>
-</div><br />
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<a href="/images/logos/full-color/name-bottom/beam-logo-full-color-name-bottom.svg" role="button"><img style="height: 60px" src="/images/logos/full-color/name-bottom/beam-logo-full-color-name-bottom.svg" alt="beam-logo-full-color-name-bottom.svg" /></a>
-</div><br />
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<a href="/images/logos/full-color/name-right/beam-logo-full-color-name-right.svg" role="button"><img style="height: 60px" src="/images/logos/full-color/name-right/beam-logo-full-color-name-right.svg" alt="beam-logo-full-color-name-right.svg" /></a>
-</div><br />
-</div>
-
-</div>
-
-<h4 id="three-color">Three color</h4>
-<div class="row">
-<div class="col-md-2">
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<a href="/images/logos/3-color/nameless/beam-logo-3-color-nameless.svg" role="button"><img style="height: 60px" src="/images/logos/3-color/nameless/beam-logo-3-color-nameless.svg" alt="beam-logo-3-color-nameless.svg" /></a>
-</div><br />
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<a href="/images/logos/3-color/name-bottom/beam-logo-3-color-name-bottom.svg" role="button"><img style="height: 60px" src="/images/logos/3-color/name-bottom/beam-logo-3-color-name-bottom.svg" alt="beam-logo-3-color-name-bottom.svg" /></a>
-</div><br />
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<a href="/images/logos/3-color/name-right/beam-logo-3-color-name-right.svg" role="button"><img style="height: 60px" src="/images/logos/3-color/name-right/beam-logo-3-color-name-right.svg" alt="beam-logo-3-color-name-right.svg" /></a>
-</div><br />
-</div>
-
-</div>
-
-<h4 id="black-and-white">Black and white</h4>
-<div class="row">
-<div class="col-md-2">
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<a href="/images/logos/bw/nameless/beam-logo-bw-nameless.svg" role="button"><img style="height: 60px" src="/images/logos/bw/nameless/beam-logo-bw-nameless.svg" alt="beam-logo-bw-nameless.svg" /></a>
-</div><br />
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<a href="/images/logos/bw/name-bottom/beam-logo-bw-name-bottom.svg" role="button"><img style="height: 60px" src="/images/logos/bw/name-bottom/beam-logo-bw-name-bottom.svg" alt="beam-logo-bw-name-bottom.svg" /></a>
-</div><br />
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<a href="/images/logos/bw/name-right/beam-logo-bw-name-right.svg" role="button"><img style="height: 60px" src="/images/logos/bw/name-right/beam-logo-bw-name-right.svg" alt="beam-logo-bw-name-right.svg" /></a>
-</div><br />
-</div>
-
-</div>
-
-<h3 id="portable-network-graphics-png">Portable Network Graphics (PNG)</h3>
-<p>These <a href="https://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG files</a> are
-available in a number of fixed sizes and are optimized for web use.</p>
-
-<h4 id="full-color-1">Full color</h4>
-<div class="row">
-<div class="col-md-2">
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<img style="height: 60px" src="/images/logos/full-color/nameless/beam-logo-full-color-nameless.svg" alt="beam-logo-full-color-nameless" />
-</div><br />
-<div class="row">
-
-<a href="/images/logos/full-color/nameless/beam-logo-full-color-nameless-100.png">100x100</a>
-,
-
-<a href="/images/logos/full-color/nameless/beam-logo-full-color-nameless-200.png">200x200</a>
-,
-
-<a href="/images/logos/full-color/nameless/beam-logo-full-color-nameless-500.png">500x500</a>
-,
-
-<a href="/images/logos/full-color/nameless/beam-logo-full-color-nameless-1000.png">1000x1000</a>
-
-
-</div>
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<img style="height: 60px" src="/images/logos/full-color/name-bottom/beam-logo-full-color-name-bottom.svg" alt="beam-logo-full-color-name-bottom" />
-</div><br />
-<div class="row">
-
-<a href="/images/logos/full-color/name-bottom/beam-logo-full-color-name-bottom-100.png">100x100</a>
-,
-
-<a href="/images/logos/full-color/name-bottom/beam-logo-full-color-name-bottom-200.png">200x200</a>
-,
-
-<a href="/images/logos/full-color/name-bottom/beam-logo-full-color-name-bottom-500.png">500x500</a>
-,
-
-<a href="/images/logos/full-color/name-bottom/beam-logo-full-color-name-bottom-1000.png">1000x1000</a>
-
-
-</div>
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<img style="height: 60px" src="/images/logos/full-color/name-right/beam-logo-full-color-name-right.svg" alt="beam-logo-full-color-name-right" />
-</div><br />
-<div class="row">
-
-<a href="/images/logos/full-color/name-right/beam-logo-full-color-name-right-100.png">100x100</a>
-,
-
-<a href="/images/logos/full-color/name-right/beam-logo-full-color-name-right-200.png">200x200</a>
-,
-
-<a href="/images/logos/full-color/name-right/beam-logo-full-color-name-right-500.png">500x500</a>
-,
-
-<a href="/images/logos/full-color/name-right/beam-logo-full-color-name-right-1000.png">1000x1000</a>
-
-
-</div>
-</div>
-
-</div>
-
-<h4 id="three-color-1">Three color</h4>
-<div class="row">
-<div class="col-md-2">
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<img style="height: 60px" src="/images/logos/3-color/nameless/beam-logo-3-color-nameless.svg" alt="beam-logo-3-color-nameless" />
-</div><br />
-<div class="row">
-
-<a href="/images/logos/3-color/nameless/beam-logo-3-color-nameless-100.png">100x100</a>
-,
-
-<a href="/images/logos/3-color/nameless/beam-logo-3-color-nameless-200.png">200x200</a>
-,
-
-<a href="/images/logos/3-color/nameless/beam-logo-3-color-nameless-500.png">500x500</a>
-,
-
-<a href="/images/logos/3-color/nameless/beam-logo-3-color-nameless-1000.png">1000x1000</a>
-
-
-</div>
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<img style="height: 60px" src="/images/logos/3-color/name-bottom/beam-logo-3-color-name-bottom.svg" alt="beam-logo-3-color-name-bottom" />
-</div><br />
-<div class="row">
-
-<a href="/images/logos/3-color/name-bottom/beam-logo-3-color-name-bottom-100.png">100x100</a>
-,
-
-<a href="/images/logos/3-color/name-bottom/beam-logo-3-color-name-bottom-200.png">200x200</a>
-,
-
-<a href="/images/logos/3-color/name-bottom/beam-logo-3-color-name-bottom-500.png">500x500</a>
-,
-
-<a href="/images/logos/3-color/name-bottom/beam-logo-3-color-name-bottom-1000.png">1000x1000</a>
-
-
-</div>
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<img style="height: 60px" src="/images/logos/3-color/name-right/beam-logo-3-color-name-right.svg" alt="beam-logo-3-color-name-right" />
-</div><br />
-<div class="row">
-
-<a href="/images/logos/3-color/name-right/beam-logo-3-color-name-right-100.png">100x100</a>
-,
-
-<a href="/images/logos/3-color/name-right/beam-logo-3-color-name-right-200.png">200x200</a>
-,
-
-<a href="/images/logos/3-color/name-right/beam-logo-3-color-name-right-500.png">500x500</a>
-,
-
-<a href="/images/logos/3-color/name-right/beam-logo-3-color-name-right-1000.png">1000x1000</a>
-
-
-</div>
-</div>
-
-</div>
-
-<h4 id="black-and-white-1">Black and white</h4>
-<div class="row">
-<div class="col-md-2">
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<img style="height: 60px" src="/images/logos/bw/nameless/beam-logo-bw-nameless.svg" alt="beam-logo-bw-nameless" />
-</div><br />
-<div class="row">
-
-<a href="/images/logos/bw/nameless/beam-logo-bw-nameless-100.png">100x100</a>
-,
-
-<a href="/images/logos/bw/nameless/beam-logo-bw-nameless-200.png">200x200</a>
-,
-
-<a href="/images/logos/bw/nameless/beam-logo-bw-nameless-500.png">500x500</a>
-,
-
-<a href="/images/logos/bw/nameless/beam-logo-bw-nameless-1000.png">1000x1000</a>
-
-
-</div>
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<img style="height: 60px" src="/images/logos/bw/name-bottom/beam-logo-bw-name-bottom.svg" alt="beam-logo-bw-name-bottom" />
-</div><br />
-<div class="row">
-
-<a href="/images/logos/bw/name-bottom/beam-logo-bw-name-bottom-100.png">100x100</a>
-,
-
-<a href="/images/logos/bw/name-bottom/beam-logo-bw-name-bottom-200.png">200x200</a>
-,
-
-<a href="/images/logos/bw/name-bottom/beam-logo-bw-name-bottom-500.png">500x500</a>
-,
-
-<a href="/images/logos/bw/name-bottom/beam-logo-bw-name-bottom-1000.png">1000x1000</a>
-
-
-</div>
-</div>
-
-<div class="col-md-2">
-<div class="row">
-<img style="height: 60px" src="/images/logos/bw/name-right/beam-logo-bw-name-right.svg" alt="beam-logo-bw-name-right" />
-</div><br />
-<div class="row">
-
-<a href="/images/logos/bw/name-right/beam-logo-bw-name-right-100.png">100x100</a>
-,
-
-<a href="/images/logos/bw/name-right/beam-logo-bw-name-right-200.png">200x200</a>
-,
-
-<a href="/images/logos/bw/name-right/beam-logo-bw-name-right-500.png">500x500</a>
-,
-
-<a href="/images/logos/bw/name-right/beam-logo-bw-name-right-1000.png">1000x1000</a>
-
-
-</div>
-</div>
-
-</div>
-
-<h2 id="colors-and-fonts">Colors and fonts</h2>
-<p>The Apache Beam project uses predefined colors and fonts. <a href="/downloads/palette.pdf">This document</a> has more information.</p>
-
-  </div>
-
-</article>
-
-      </div>
-
-
-    <hr>
-  <div class="row">
-      <div class="col-xs-12">
-          <footer>
-              <p class="text-center">&copy; Copyright 2016
-                <a href="http://www.apache.org">The Apache Software Foundation.</a> All Rights Reserved.</p>
-                <p class="text-center"><a href="/privacy_policy">Privacy Policy</a> |
-                <a href="/feed.xml">RSS Feed</a></p>
-          </footer>
-      </div>
-  </div>
-  <!-- container div end -->
-</div>
-
-
-  </body>
-
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://beam.incubator.apache.org/project/logos/">
+<meta http-equiv="refresh" content="0; url=http://beam.incubator.apache.org/project/logos/">
+<h1>Redirecting…</h1>
+<a href="http://beam.incubator.apache.org/project/logos/">Click here if you are not redirected.</a>
+<script>location="http://beam.incubator.apache.org/project/logos/"</script>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/8797d044/content/presentation-materials/index.html
----------------------------------------------------------------------
diff --git a/content/presentation-materials/index.html b/content/presentation-materials/index.html
index ceec972..c2ef200 100644
--- a/content/presentation-materials/index.html
+++ b/content/presentation-materials/index.html
@@ -1,172 +1,10 @@
 <!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">
-
-  <title>Apache Beam Presentation Materials</title>
-  <meta name="description" content="Apache Beam is an open source, unified model and set of language-specific SDKs for defining and executing data processing workflows, and also data ingestion and integration flows, supporting Enterprise Integration Patterns (EIPs) and Domain Specific Languages (DSLs). Dataflow pipelines simplify the mechanics of large-scale batch and streaming data processing and can run on a number of runtimes like Apache Flink, Apache Spark, and Google Cloud Dataflow (a cloud service). Beam also brings DSL in different languages, allowing users to easily implement their data integration processes.
-">
-
-  <link rel="stylesheet" href="/styles/site.css">
-  <link rel="stylesheet" href="/css/theme.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-  <script src="/js/bootstrap.min.js"></script>
-  <link rel="canonical" href="http://beam.incubator.apache.org/presentation-materials/">
-  <link rel="alternate" type="application/rss+xml" title="Apache Beam (incubating)" href="http://beam.incubator.apache.org/feed.xml">
-  <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-73650088-1', 'auto');
-    ga('send', 'pageview');
-
-  </script>
-  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
-</head>
-
-
-  <body role="document">
-
-    <nav class="navbar navbar-default navbar-fixed-top">
-  <div class="container">
-    <div class="navbar-header">
-      <a href="/" class="navbar-brand" >
-        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
-      </a>
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-    </div>
-    <div id="navbar" class="navbar-collapse collapse">
-      <ul class="nav navbar-nav">
-        <li class="dropdown">
-		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Use <span class="caret"></span></a>
-		  <ul class="dropdown-menu">
-			  <li><a href="/docs/use/">User Hub</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/docs/use/beam-overview">Beam Overview</a></li>
-			  <li><a href="/getting_started/">Quickstart</a></li>
-			  <li class="dropdown-header">Example Walkthroughs</li>
-			  <li><a href="/docs/use/walkthroughs">WordCount</a></li>
-			  <li><a href="/docs/use/walkthroughs">Mobile Gaming</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="">Release Information</a></li>
-			  <li class="dropdown-header">Support Resources</li>
-			  <li><a href="/mailing_lists/">Mailing Lists</a></li>
-              <li><a href="/issue_tracking/">Issue Tracking</a></li>
-			  <li><a href="http://stackoverflow.com/questions/tagged/apache-beam">Beam on StackOverflow</a></li>
-              <li><a href="http://apachebeam.slack.com">Beam Slack Channel</a></li>
-		  </ul>
-	    </li>
-        <li class="dropdown">
-		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Learn <span class="caret"></span></a>
-		  <ul class="dropdown-menu">
-			  <li><a href="/docs/learn/">Learner Hub</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/docs/learn/programming-guide/">Beam Programming Guide</a></li>
-			  <li><a href="/capability-matrix/">Capability Matrix</a></li>
-			  <li><a href="https://goo.gl/ps8twC">Additional Technical Docs</a></li>
-		  </ul>
-	    </li>
-        <li class="dropdown">
-		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Contribute <span class="caret"></span></a>
-		  <ul class="dropdown-menu">
-			  <li><a href="/docs/contribute/">Contributor Hub</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/contribution-guide/">Contribution Guide</a></li>
-			  <li><a href="https://goo.gl/nk5OM0">Technical Vision</a></li>
-			  <li class="dropdown-header">Resources</li>
-			  <li><a href="/mailing_lists/">Mailing Lists</a></li>
-              <li><a href="/source_repository/">Source Repository</a></li>
-              <li><a href="/issue_tracking/">Issue Tracking</a></li>
-			  <li class="dropdown-header">Project Materials</li>
-			  <li><a href="/presentation-materials/">Presentation Materials</a></li>
-			  <li><a href="/public-meetings/">Public Meetings</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/team/">Apache Beam Team</a></li>
-		  </ul>
-	    </li>
-        <li><a href="/blog">Blog</a></li>
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project <span class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li><a href="/presentation-materials/">Presentation Materials</a></li>
-            <li><a href="/material/">Logos and design</a></li>
-            <li><a href="http://apache.org/licenses/LICENSE-2.0.html">License</a></li>
-          </ul>
-        </li>
-      </ul>
-    </div><!--/.nav-collapse -->
-  </div>
-</nav>
-
-
-<link rel="stylesheet" href="">
-
-
-    <div class="container" role="main">
-
-      <div class="container">
-        <article class="post">
-
-  <header class="post-header">
-    <h1 class="post-title">Apache Beam Presentation Materials</h1>
-  </header>
-
-  <div class="post-content">
-    <p>Are you interested in learning more about Apache Beam or giving a talk about Apache Beam? Excellent! The Apache Beam community has created this collection of materials to help you get started. The community periodically reviews these materials to ensure they are accurate and up-to-date.</p>
-
-<div class="panel panel-default">
-  <div class="panel-body">
-    <iframe src="https://drive.google.com/embeddedfolderview?id=0B-IhJZh9Ab52a3JLVXFWMDltcHM#list" width="700" height="300" frameborder="0"></iframe>
-  </div>
-</div>
-
-<h2 id="using-these-materials">Using these materials</h2>
-<p>These materials can be used by anyone. If you do use these materials, please remember to give credit to the authors cited in each presentation. These materials include speaker notes and you can view them by clicking <strong><code class="highlighter-rouge">View</code></strong> and selecting <strong><code class="highlighter-rouge">Show speaker notes</code></strong>. Some presentations have <code class="highlighter-rouge">[Long]</code> or <code class="highlighter-rouge">[Short]</code> in their name, such as the <em>Apache Beam Model</em>, which means there are two different presentations (a long and short version) depending on your needs and time constraints.</p>
-
-<p>If you have any questions about the these materials, please ask on the <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#064;&#098;&#101;&#097;&#109;&#046;&#105;&#110;&#099;&#117;&#098;&#097;&#116;&#111;&#114;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><code class="highlighter-rouge">user@beam.incubator.apache.org</code></a> mailing list.</p>
-
-<p>The Apache Beam community is looking for feedback on these materials to improve them over time. If you deliver a presentation based on these materials, we’d love to hear from you on the <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#064;&#098;&#101;&#097;&#109;&#046;&#105;&#110;&#099;&#117;&#098;&#097;&#116;&#111;&#114;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><code class="highlighter-rouge">user@beam.incubator.apache.org</code></a> mailing list. Please share your thoughts, questions you were asked, and (if available and appropriate) a link to the recording of your talk so the rest of the Apache Beam community can benefit from it.</p>
-
-<h2 id="contributing-new-content">Contributing new content</h2>
-<p>The Apache Beam community is always looking for new core content and contributions!</p>
-
-<p>If you are interested in contributing new content, we recommend you first search the <a href="https://issues.apache.org/jira/browse/BEAM">Apache Beam JIRA</a> to see if your idea currently has an open JIRA item. If it does not, send an email to the <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#064;&#098;&#101;&#097;&#109;&#046;&#105;&#110;&#099;&#117;&#098;&#097;&#116;&#111;&#114;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><code class="highlighter-rouge">user@beam.incubator.apache.org</code></a> mailing list or open a new issue in the <a href="https://issues.apache.org/jira/browse/BEAM">Apache Beam JIRA</a> using the <a href="https://issues.apache.org/jira/browse/BEAM/component/12328906/?selectedTab=com.atlassian.jira.jira-projects-plugin:component-summary-panel">website</a> component. Based on community submissions or contributions, the Beam community collaboratively reviews or creates new content and then adds it to this shared 
 space for everyone to use.</p>
-
-<h2 id="corrections-and-updates">Corrections and updates</h2>
-<p>If you encounter missing, incorrect, or out of date material, please make a comment in the presentation or send an email to the <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#064;&#098;&#101;&#097;&#109;&#046;&#105;&#110;&#099;&#117;&#098;&#097;&#116;&#111;&#114;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><code class="highlighter-rouge">user@beam.incubator.apache.org</code></a> mailing list.</p>
-
-  </div>
-
-</article>
-
-      </div>
-
-
-    <hr>
-  <div class="row">
-      <div class="col-xs-12">
-          <footer>
-              <p class="text-center">&copy; Copyright 2016
-                <a href="http://www.apache.org">The Apache Software Foundation.</a> All Rights Reserved.</p>
-                <p class="text-center"><a href="/privacy_policy">Privacy Policy</a> |
-                <a href="/feed.xml">RSS Feed</a></p>
-          </footer>
-      </div>
-  </div>
-  <!-- container div end -->
-</div>
-
-
-  </body>
-
+<html lang="en-US">
+<meta charset="utf-8">
+<title>Redirecting…</title>
+<link rel="canonical" href="http://beam.incubator.apache.org/learn/presentation-materials/">
+<meta http-equiv="refresh" content="0; url=http://beam.incubator.apache.org/learn/presentation-materials/">
+<h1>Redirecting…</h1>
+<a href="http://beam.incubator.apache.org/learn/presentation-materials/">Click here if you are not redirected.</a>
+<script>location="http://beam.incubator.apache.org/learn/presentation-materials/"</script>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/8797d044/content/privacy_policy/index.html
----------------------------------------------------------------------
diff --git a/content/privacy_policy/index.html b/content/privacy_policy/index.html
index f774cbf..80f3e65 100644
--- a/content/privacy_policy/index.html
+++ b/content/privacy_policy/index.html
@@ -14,7 +14,7 @@
   <link rel="stylesheet" href="/css/theme.css">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
-  <link rel="canonical" href="http://beam.incubator.apache.org/privacy_policy/">
+  <link rel="canonical" href="http://beam.incubator.apache.org/privacy_policy/" data-proofer-ignore>
   <link rel="alternate" type="application/rss+xml" title="Apache Beam (incubating)" href="http://beam.incubator.apache.org/feed.xml">
   <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -50,18 +50,20 @@
         <li class="dropdown">
 		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Use <span class="caret"></span></a>
 		  <ul class="dropdown-menu">
-			  <li><a href="/docs/use/">User Hub</a></li>
+			  <li><a href="/use">User Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">General</li>
+			  <li><a href="/use/beam-overview/">Beam Overview</a></li>
+			  <li><a href="/use/quickstart/">Quickstart</a></li>  
+			  <li><a href="/use/releases">Release Information</a></li>
 			  <li role="separator" class="divider"></li>
-			  <li><a href="/docs/use/beam-overview">Beam Overview</a></li>
-			  <li><a href="/getting_started/">Quickstart</a></li>
 			  <li class="dropdown-header">Example Walkthroughs</li>
-			  <li><a href="/docs/use/walkthroughs">WordCount</a></li>
-			  <li><a href="/docs/use/walkthroughs">Mobile Gaming</a></li>
+			  <li><a href="/use/walkthroughs/">WordCount</a></li>
+			  <li><a href="/use/walkthroughs/">Mobile Gaming</a></li>
 			  <li role="separator" class="divider"></li>
-			  <li><a href="">Release Information</a></li>
-			  <li class="dropdown-header">Support Resources</li>
-			  <li><a href="/mailing_lists/">Mailing Lists</a></li>
-              <li><a href="/issue_tracking/">Issue Tracking</a></li>
+			  <li class="dropdown-header">Support</li>
+			  <li><a href="/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
 			  <li><a href="http://stackoverflow.com/questions/tagged/apache-beam">Beam on StackOverflow</a></li>
               <li><a href="http://apachebeam.slack.com">Beam Slack Channel</a></li>
 		  </ul>
@@ -69,37 +71,46 @@
         <li class="dropdown">
 		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Learn <span class="caret"></span></a>
 		  <ul class="dropdown-menu">
-			  <li><a href="/docs/learn/">Learner Hub</a></li>
+			  <li><a href="/learn">Learner Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Beam Concepts</li>
+			  <li><a href="/learn/programming-guide/">Programming Guide</a></li>
+			  <li><a href="/learn/presentation-materials/">Presentation Materials</a></li>
+			  <li><a href="/learn/resources/">Additional Resources</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">SDKs</li>
+			  <li><a href="/learn/sdks/java/">Java SDK</a></li>
 			  <li role="separator" class="divider"></li>
-			  <li><a href="/docs/learn/programming-guide/">Beam Programming Guide</a></li>
-			  <li><a href="/capability-matrix/">Capability Matrix</a></li>
-			  <li><a href="https://goo.gl/ps8twC">Additional Technical Docs</a></li>
+			  <li class="dropdown-header">Runners</li>
+			  <li><a href="/learn/runners/capability-matrix/">Capability Matrix</a></li>
+			  <li><a href="/learn/runners/direct/">Direct Runner</a></li>
+			  <li><a href="/learn/runners/flink/">Apache Flink Runner</a></li>
+			  <li><a href="/learn/runners/spark/">Apache Spark Runner</a></li>
+			  <li><a href="/learn/runners/dataflow/">Cloud Dataflow Runner</a></li>
 		  </ul>
 	    </li>
         <li class="dropdown">
 		  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Contribute <span class="caret"></span></a>
 		  <ul class="dropdown-menu">
-			  <li><a href="/docs/contribute/">Contributor Hub</a></li>
+			  <li><a href="/contribute">Contributor Hub</a></li>
 			  <li role="separator" class="divider"></li>
-			  <li><a href="/contribution-guide/">Contribution Guide</a></li>
+			  <li class="dropdown-header">Basics</li>
+			  <li><a href="/contribute/contribution-guide/">Contribution Guide</a></li>
+			  <li><a href="/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="/contribute/source-repository/">Source Repository</a></li>
+              <li><a href="/use/issue-tracking/">Issue Tracking</a></li>
+              <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Technical Resources</li>
 			  <li><a href="https://goo.gl/nk5OM0">Technical Vision</a></li>
-			  <li class="dropdown-header">Resources</li>
-			  <li><a href="/mailing_lists/">Mailing Lists</a></li>
-              <li><a href="/source_repository/">Source Repository</a></li>
-              <li><a href="/issue_tracking/">Issue Tracking</a></li>
-			  <li class="dropdown-header">Project Materials</li>
-			  <li><a href="/presentation-materials/">Presentation Materials</a></li>
-			  <li><a href="/public-meetings/">Public Meetings</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="/team/">Apache Beam Team</a></li>
 		  </ul>
 	    </li>
         <li><a href="/blog">Blog</a></li>
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project <span class="caret"></span></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Project<span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="/presentation-materials/">Presentation Materials</a></li>
-            <li><a href="/material/">Logos and design</a></li>
+            <li><a href="/project/logos/">Logos and design</a></li>
+            <li><a href="/project/public-meetings/">Public Meetings</a></li>
+			<li><a href="/project/team/">Team</a></li>
             <li><a href="http://apache.org/licenses/LICENSE-2.0.html">License</a></li>
           </ul>
         </li>
@@ -115,14 +126,7 @@
     <div class="container" role="main">
 
       <div class="container">
-        <article class="post">
-
-  <header class="post-header">
-    <h1 class="post-title">Privacy Policy</h1>
-  </header>
-
-  <div class="post-content">
-    <p>Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:</p>
+        <p>Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:</p>
 
 <ol>
   <li>The IP address from which you access the website;</li>
@@ -138,10 +142,6 @@
 
 <p>By using this website, you consent to the collection of this data in the manner and for the purpose described above.</p>
 
-  </div>
-
-</article>
-
       </div>
 
 


Mime
View raw message