You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by gi...@apache.org on 2018/10/31 00:10:25 UTC

[beam] branch asf-site updated: Publishing website 2018/10/31 00:10:21 at commit 3030f79

This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 4814448  Publishing website 2018/10/31 00:10:21 at commit 3030f79
4814448 is described below

commit 4814448e788577f93df288e413d594779a9202ed
Author: jenkins <bu...@apache.org>
AuthorDate: Wed Oct 31 00:10:21 2018 +0000

    Publishing website 2018/10/31 00:10:21 at commit 3030f79
---
 .../community/contact-us/index.html                |  13 +-
 .../contribute/become-a-committer/index.html       |  10 +-
 .../contribute/committer-guide/index.html          |  10 +-
 .../contribute/dependencies/index.html             |  10 +-
 .../contribute/design-documents/index.html         |  10 +-
 .../contribute/docker-images/index.html            |  10 +-
 .../contribute/feature-branches/index.html         | 392 ++++++++++++++++++-
 website/generated-content/contribute/index.html    | 429 ++++++++-------------
 .../contribute/postcommits-guides/index.html       |  10 +-
 .../postcommits-policies-details/index.html        |  10 +-
 .../contribute/postcommits-policies/index.html     |  10 +-
 .../contribute/precommit-policies/index.html       |  10 +-
 .../contribute/precommit-triage-guide/index.html   |  10 +-
 .../contribute/ptransform-style-guide/index.html   |  10 +-
 .../contribute/release-guide/index.html            |  10 +-
 .../contribute/runner-guide/index.html             |  10 +-
 .../contribute/testing/index.html                  |  10 +-
 .../contribute/work-in-progress/index.html         |  10 -
 .../get-started/quickstart-go/index.html           |   2 +
 .../get-started/quickstart-java/index.html         |   2 +
 .../get-started/quickstart-py/index.html           |   2 +
 21 files changed, 639 insertions(+), 351 deletions(-)

diff --git a/website/generated-content/community/contact-us/index.html b/website/generated-content/community/contact-us/index.html
index c0e0e5f..006a833 100644
--- a/website/generated-content/community/contact-us/index.html
+++ b/website/generated-content/community/contact-us/index.html
@@ -215,15 +215,15 @@ whichever one seems best!</p>
   <tbody>
     <tr>
       <td><a href="https://lists.apache.org/list.html?user@beam.apache.org">user@</a> mailing list</td>
-      <td>User support and questions (<a href="mailto:user-subscribe@beam.apache.org">Subscribe</a>, <a href="mailto:user-unsubscribe@beam.apache.org">Unsubscribe</a>)</td>
+      <td>User support and questions (<a href="mailto:user-subscribe@beam.apache.org">Subscribe</a><sup id="fnref:1"><a href="#fn:1" class="footnote">1</a></sup>, <a href="mailto:user-unsubscribe@beam.apache.org">Unsubscribe</a><sup id="fnref:1:1"><a href="#fn:1" class="footnote">1</a></sup>, <a href="https://lists.apache.org/list.html?user@beam.apache.org">Archives</a>)</td>
     </tr>
     <tr>
       <td><a href="https://lists.apache.org/list.html?dev@beam.apache.org">dev@</a> mailing list</td>
-      <td>Development discussions (<a href="mailto:dev-subscribe@beam.apache.org">Subscribe</a>, <a href="mailto:dev-unsubscribe@beam.apache.org">Unsubscribe</a>)</td>
+      <td>Development discussions (<a href="mailto:dev-subscribe@beam.apache.org">Subscribe</a><sup id="fnref:1:2"><a href="#fn:1" class="footnote">1</a></sup>, <a href="mailto:dev-unsubscribe@beam.apache.org">Unsubscribe</a><sup id="fnref:1:3"><a href="#fn:1" class="footnote">1</a></sup>, <a href="https://lists.apache.org/list.html?dev@beam.apache.org">Archives</a>)</td>
     </tr>
     <tr>
       <td><a href="https://lists.apache.org/list.html?commits@beam.apache.org">commits@</a> mailing list</td>
-      <td>Firehose of commits, bugs, pull requests, etc. (<a href="mailto:commits-subscribe@beam.apache.org">Subscribe</a>, <a href="mailto:commits-unsubscribe@beam.apache.org">Unsubscribe</a>)</td>
+      <td>Firehose of commits, bugs, pull requests, etc. (<a href="mailto:commits-subscribe@beam.apache.org">Subscribe</a><sup id="fnref:1:4"><a href="#fn:1" class="footnote">1</a></sup>, <a href="mailto:commits-unsubscribe@beam.apache.org">Unsubscribe</a><sup id="fnref:1:5"><a href="#fn:1" class="footnote">1</a></sup>, <a href="https://lists.apache.org/list.html?commits@beam.apache.org">Archives</a>)</td>
     </tr>
     <tr>
       <td><a href="https://issues.apache.org/jira/browse/BEAM">JIRA bug tracker</a></td>
@@ -241,6 +241,13 @@ whichever one seems best!</p>
 </table>
 
 <p>If you wish to report a security vulnerability, please contact <a href="mailto:security@apache.org">security@apache.org</a>. Apache Beam follows the typical <a href="https://apache.org/security/committers.html#vulnerability-handling">Apache vulnerability handling process</a>.</p>
+<div class="footnotes">
+  <ol>
+    <li id="fn:1">
+      <p>To subscribe or unsubscribe, a blank email is fine. <a href="#fnref:1" class="reversefootnote">&#8617;</a> <a href="#fnref:1:1" class="reversefootnote">&#8617;<sup>2</sup></a> <a href="#fnref:1:2" class="reversefootnote">&#8617;<sup>3</sup></a> <a href="#fnref:1:3" class="reversefootnote">&#8617;<sup>4</sup></a> <a href="#fnref:1:4" class="reversefootnote">&#8617;<sup>5</sup></a> <a href="#fnref:1:5" class="reversefootnote">&#8617;<sup>6</sup></a></p>
+    </li>
+  </ol>
+</div>
 
       </div>
     </div>
diff --git a/website/generated-content/contribute/become-a-committer/index.html b/website/generated-content/contribute/become-a-committer/index.html
index 01ce77b..f0f76ca 100644
--- a/website/generated-content/contribute/become-a-committer/index.html
+++ b/website/generated-content/contribute/become-a-committer/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/committer-guide/index.html b/website/generated-content/contribute/committer-guide/index.html
index 4e2050b..25a601f 100644
--- a/website/generated-content/contribute/committer-guide/index.html
+++ b/website/generated-content/contribute/committer-guide/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/dependencies/index.html b/website/generated-content/contribute/dependencies/index.html
index 9439642..b12785e 100644
--- a/website/generated-content/contribute/dependencies/index.html
+++ b/website/generated-content/contribute/dependencies/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/design-documents/index.html b/website/generated-content/contribute/design-documents/index.html
index 3132467..1345584 100644
--- a/website/generated-content/contribute/design-documents/index.html
+++ b/website/generated-content/contribute/design-documents/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/docker-images/index.html b/website/generated-content/contribute/docker-images/index.html
index 9638ea3..bef0076 100644
--- a/website/generated-content/contribute/docker-images/index.html
+++ b/website/generated-content/contribute/docker-images/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/feature-branches/index.html b/website/generated-content/contribute/feature-branches/index.html
index c0fa7ea..903dfdd 100644
--- a/website/generated-content/contribute/feature-branches/index.html
+++ b/website/generated-content/contribute/feature-branches/index.html
@@ -1,10 +1,386 @@
 <!DOCTYPE html>
-<html lang="en-US">
-<meta charset="utf-8">
-<title>Redirecting…</title>
-<link rel="canonical" href="https://beam.apache.org/contribute/">
-<meta http-equiv="refresh" content="0; url=https://beam.apache.org/contribute/">
-<h1>Redirecting…</h1>
-<a href="https://beam.apache.org/contribute/">Click here if you are not redirected.</a>
-<script>location="https://beam.apache.org/contribute/"</script>
+<!--
+ Licensed 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. See accompanying LICENSE file.
+-->
+
+<html lang="en">
+  <!--
+ Licensed 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. See accompanying LICENSE file.
+-->
+
+<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 Feature Branches</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  [...]
+">
+  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
+  <link rel="stylesheet" href="/css/site.css">
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
+  <script src="/js/language-switch.js"></script>
+  <script src="/js/fix-menu.js"></script>
+  <script src="/js/section-nav.js"></script>
+  <script src="/js/page-nav.js"></script>
+  <link rel="canonical" href="https://beam.apache.org/contribute/feature-branches/" data-proofer-ignore>
+  <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
+  <link rel="alternate" type="application/rss+xml" title="Apache Beam" href="https://beam.apache.org/feed.xml">
+  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
+  <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>
+</head>
+
+  <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
+    <!--
+ Licensed 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. See accompanying LICENSE file.
+-->
+
+<nav class="header navbar navbar-fixed-top">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" 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>
+
+      <a href="/" class="navbar-brand" >
+        <img alt="Brand" style="height: 25px" src="/images/beam_logo_navbar.png">
+      </a>
+    </div>
+
+    <div class="navbar-mask closed"></div>
+
+    <div id="navbar" class="navbar-container closed">
+      <ul class="nav navbar-nav">
+        <li>
+          <a href="/get-started/beam-overview/">Get Started</a>
+        </li>
+        <li>
+          <a href="/documentation/">Documentation</a>
+        </li>
+        <li>
+          <a href="/documentation/sdks/java/">Languages</a>
+        </li>
+        <li>
+          <a href="/documentation/runners/capability-matrix/">RUNNERS</a>
+        </li>
+        <li>
+          <a href="/roadmap/">Roadmap</a>
+        </li>
+        <li>
+          <a href="/contribute/">Contribute</a>
+        </li>
+        <li>
+          <a href="/community/contact-us/">Community</a>
+        </li>
+        <li><a href="/blog">Blog</a></li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img src="https://www.apache.org/foundation/press/kit/feather_small.png" alt="Apache Logo" style="height:20px;"><span class="caret"></span></a>
+          <ul class="dropdown-menu dropdown-menu-right">
+            <li><a href="http://www.apache.org/">ASF Homepage</a></li>
+            <li><a href="http://www.apache.org/licenses/">License</a></li>
+            <li><a href="http://www.apache.org/security/">Security</a></li>
+            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+            <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct</a></li>
+          </ul>
+        </li>
+        <li>
+          <a href="https://github.com/apache/beam/edit/master/website/src/contribute/feature-branches.md">
+            <i class="far fa-edit fa-lg" alt="Edit on GitHub" title="Edit on GitHub"></i>
+          </a>
+        </li>
+      </ul>
+    </div>
+</nav>
+
+    <div class="clearfix container-main-content">
+      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
+        <span class="section-nav-back glyphicon glyphicon-menu-left"></span>
+        <nav>
+          <ul class="section-nav-list" data-section-nav>
+            <!--
+ Licensed 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. See accompanying LICENSE file.
+-->
+
+<li><span class="section-nav-list-main-title">Contribute</span></li>
+<li><a href="/contribute/">Get started contributing</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
+<li>
+  <span class="section-nav-list-title">Technical Docs</span>
+
+  <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
+    <li><a href="/contribute/testing/">Testing guide</a></li>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
+    <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
+    <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
+    <li><a href="/contribute/docker-images/">Docker images</a></li>
+    <li><a href="/contribute/design-documents/">Design documents</a></li>
+    <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
+  </ul>
+</li>
+<li>
+  <span class="section-nav-list-title">Policies</span>
+  <ul class="section-nav-list">
+    <li><a href="/contribute/precommit-policies/">Pre-commit test policies</a></li>
+    <li><a href="/contribute/postcommits-policies/">Post-commit test policies</a></li>
+  </ul>
+</li>
+<li>
+  <span class="section-nav-list-title">Committers</span>
+  <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
+    <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
+    <li><a href="/contribute/committer-guide/">Committer guide</a></li>
+    <li><a href="/contribute/release-guide/">Release guide</a></li>
+  </ul>
+</li>
+<li><a href="/community/contact-us/">Contact Us</a></li>
+
+          </ul>
+        </nav>
+      </div>
+
+      <nav class="page-nav clearfix" data-offset-top="90" data-offset-bottom="500">
+        <!--
+ Licensed 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. See accompanying LICENSE file.
+-->
+
+
+
+<ul class="nav">
+  <li><a href="#establishing-a-feature-branch">Establishing a feature branch</a></li>
+  <li><a href="#developing-on-a-feature-branch">Developing on a feature branch</a></li>
+  <li><a href="#merging-into-master">Merging into <code class="highlighter-rouge">master</code></a>
+    <ul>
+      <li><a href="#merging-a-new-runner-into-master">Merging a new runner into <code class="highlighter-rouge">master</code></a></li>
+      <li><a href="#merging-a-new-sdk-into-master">Merging a new SDK into <code class="highlighter-rouge">master</code></a></li>
+    </ul>
+  </li>
+</ul>
+
+
+      </nav>
+
+      <div class="body__contained body__section-nav">
+        <!--
+Licensed 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.
+-->
+
+<h1 id="feature-branches">Feature Branches</h1>
+
+<p>Some larger features are developed on a feature branch before being merged into
+<code class="highlighter-rouge">master</code>. In particular, this is often used for initial development of new
+components like SDKs or runners.</p>
+
+<p>We expect the work on a feature branch to be <em>incomplete</em>, but it must not
+be lower quality. Code reviews for feature branches must have the same
+standards as code reviews for <code class="highlighter-rouge">master</code>. Once a feature branch is ready for
+merge to <code class="highlighter-rouge">master</code>, the set of changes will be too large to review in its
+entirety. Because of this, the code reviews during development must be
+thorough and trustworthy.</p>
+
+<h2 id="establishing-a-feature-branch">Establishing a feature branch</h2>
+
+<p>If your project is large enough to need a feature branch, there should
+be a discussion on the mailing list. The first step is to <a href="/contribute/contribution-guide/#engage">engage</a> there to raise awareness
+that you want to start a large project. Almost any project should be accepted
+– there is no real cost to letting a feature branch exist – but you may find
+other interested contributors or gain other advice from the community.</p>
+
+<p>After the community discussion, a committer must create your feature branch.
+Any committer can do create the branch through the GitHub UIs or by pushing
+directly to GitHub or ASF’s gitbox.</p>
+
+<h2 id="developing-on-a-feature-branch">Developing on a feature branch</h2>
+
+<p>To contribute code on a feature branch, use the same process as in the
+<a href="/contribute/contribution-guide/">Contribution Guide</a>, but
+replace <code class="highlighter-rouge">master</code> with the name of the feature branch.</p>
+
+<p>Since feature branches are often used for new components, you may find that
+there is no committer familiar with all the details of the new language or
+runner. In that case, consider asking someone else familiar with the technology
+to do an initial review before looping in a committer for a final review and
+merge.</p>
+
+<p>If you are working on a feature branch, you’ll also want to frequently merge in
+changes from <code class="highlighter-rouge">master</code>. This prevents the feature branch from
+deviating too far from the current state of <code class="highlighter-rouge">master</code>. Like all changes, this
+should be done via pull request. A committer may self-merge such a pull request
+if there are no conflicts or test failures. If there are any conflicts or tests
+that need fixing, then those should get a full review from another committer.</p>
+
+<h2 id="merging-into-master">Merging into <code class="highlighter-rouge">master</code></h2>
+
+<p>To merge a feature branch into <code class="highlighter-rouge">master</code>, new components and major features
+should meet the following guidelines.</p>
+
+<ol>
+  <li>Have at least 2 contributors interested in maintaining it, and 1 committer
+interested in supporting it</li>
+  <li>Provide both end-user and developer-facing documentation</li>
+  <li>Have at least a basic level of unit test coverage</li>
+  <li>Run all existing applicable integration tests with other Beam components and
+create additional tests as appropriate</li>
+</ol>
+
+<h3 id="merging-a-new-runner-into-master">Merging a new runner into <code class="highlighter-rouge">master</code></h3>
+
+<p>A new runner should:</p>
+
+<ol>
+  <li>Be able to handle a subset of the model that addresses a significant set of
+use cases, such as ‘traditional batch’ or ‘processing time streaming’.</li>
+  <li>Update the capability matrix with the current status</li>
+  <li>Add a webpage under <code class="highlighter-rouge">documentation/runners</code></li>
+</ol>
+
+<h3 id="merging-a-new-sdk-into-master">Merging a new SDK into <code class="highlighter-rouge">master</code></h3>
+
+<p>A new SDK should:</p>
+
+<ol>
+  <li>Provide the ability to construct graphs with all the basic building blocks
+of the model (ParDo, GroupByKey, Window, Trigger, etc)</li>
+  <li>Begin fleshing out the common composite transforms (Count, Join, etc) and I/O
+connectors (Text, Kafka, etc)</li>
+  <li>Have at least one runner that can execute the complete model (may be a
+direct runner)</li>
+  <li>Provide integration tests for executing against current and future runners</li>
+  <li>Add a webpage under <code class="highlighter-rouge">documentation/sdks</code></li>
+</ol>
+
+
+      </div>
+    </div>
+    <!--
+ Licensed 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. See accompanying LICENSE file.
+-->
+
+<footer class="footer">
+  <div class="footer__contained">
+    <div class="footer__cols">
+      <div class="footer__cols__col">
+        <div class="footer__cols__col__logo">
+          <img src="/images/beam_logo_circle.svg" class="footer__logo" alt="Beam logo">
+        </div>
+        <div class="footer__cols__col__logo">
+          <img src="/images/apache_logo_circle.svg" class="footer__logo" alt="Apache logo">
+        </div>
+      </div>
+      <div class="footer__cols__col footer__cols__col--md">
+        <div class="footer__cols__col__title">Start</div>
+        <div class="footer__cols__col__link"><a href="/get-started/beam-overview/">Overview</a></div>
+        <div class="footer__cols__col__link"><a href="/get-started/quickstart-java/">Quickstart (Java)</a></div>
+        <div class="footer__cols__col__link"><a href="/get-started/quickstart-py/">Quickstart (Python)</a></div>
+        <div class="footer__cols__col__link"><a href="/get-started/quickstart-go/">Quickstart (Go)</a></div>
+        <div class="footer__cols__col__link"><a href="/get-started/downloads/">Downloads</a></div>
+      </div>
+      <div class="footer__cols__col footer__cols__col--md">
+        <div class="footer__cols__col__title">Docs</div>
+        <div class="footer__cols__col__link"><a href="/documentation/programming-guide/">Concepts</a></div>
+        <div class="footer__cols__col__link"><a href="/documentation/pipelines/design-your-pipeline/">Pipelines</a></div>
+        <div class="footer__cols__col__link"><a href="/documentation/runners/capability-matrix/">Runners</a></div>
+      </div>
+      <div class="footer__cols__col footer__cols__col--md">
+        <div class="footer__cols__col__title">Community</div>
+        <div class="footer__cols__col__link"><a href="/contribute/">Contribute</a></div>
+        <div class="footer__cols__col__link"><a href="https://projects.apache.org/committee.html?beam" target="_blank">Team<img src="/images/external-link-icon.png"
+                                                                                                                                width="14" height="14"
+                                                                                                                                alt="External link."></a></div>
+        <div class="footer__cols__col__link"><a href="/contribute/presentation-materials/">Media</a></div>
+      </div>
+      <div class="footer__cols__col footer__cols__col--md">
+        <div class="footer__cols__col__title">Resources</div>
+        <div class="footer__cols__col__link"><a href="/blog/">Blog</a></div>
+        <div class="footer__cols__col__link"><a href="/get-started/support/">Support</a></div>
+        <div class="footer__cols__col__link"><a href="https://github.com/apache/beam">GitHub</a></div>
+      </div>
+    </div>
+  </div>
+  <div class="footer__bottom">
+    &copy;
+    <a href="http://www.apache.org">The Apache Software Foundation</a>
+    | <a href="/privacy_policy">Privacy Policy</a>
+    | <a href="/feed.xml">RSS Feed</a>
+    <br><br>
+    Apache Beam, Apache, Beam, the Beam logo, and the Apache feather logo are
+    either registered trademarks or trademarks of The Apache Software
+    Foundation. All other products or name brands are trademarks of their
+    respective holders, including The Apache Software Foundation.
+  </div>
+</footer>
+
+  </body>
 </html>
diff --git a/website/generated-content/contribute/index.html b/website/generated-content/contribute/index.html
index 8231b3b..3912b42 100644
--- a/website/generated-content/contribute/index.html
+++ b/website/generated-content/contribute/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
@@ -201,24 +201,14 @@
 
 
 <ul class="nav">
-  <li><a href="#finding-help">Finding Help</a></li>
-  <li><a href="#permissions">Permissions</a></li>
-  <li><a href="#contributing-code">Contributing code</a>
-    <ul>
-      <li><a href="#building--testing">Building &amp; Testing</a></li>
-      <li><a href="#pull-requests">Pull requests</a></li>
-      <li><a href="#developing-with-the-python-sdk">Developing with the Python SDK</a></li>
-    </ul>
-  </li>
-  <li><a href="#reviews">Reviews</a>
-    <ul>
-      <li><a href="#finding-reviewers">Finding reviewers</a></li>
-      <li><a href="#adding-yourself-as-a-reviewer">Adding yourself as a reviewer</a></li>
-    </ul>
-  </li>
-  <li><a href="#contributing-to-the-website">Contributing to the website</a></li>
-  <li><a href="#works-in-progress">Works in progress</a></li>
+  <li><a href="#prerequisites-for-contributing-code">Prerequisites for contributing code</a></li>
+  <li><a href="#submitting-your-first-code-change">Submitting your first code change</a></li>
+  <li><a href="#when-will-my-change-show-up-in-an-apache-beam-release">When will my change show up in an Apache Beam release?</a></li>
   <li><a href="#stale-pull-requests">Stale pull requests</a></li>
+  <li><a href="#accounts-and-permissions">Accounts and Permissions</a></li>
+  <li><a href="#communication">Communication</a></li>
+  <li><a href="#additional-resources">Additional resources</a></li>
+  <li><a href="#troubleshooting">Troubleshooting</a></li>
 </ul>
 
 
@@ -243,8 +233,15 @@ limitations under the License.
 
 <p>The Apache Beam community welcomes contributions from anyone!</p>
 
-<p>There are lots of opportunities:</p>
+<p>If you have questions, consult the <a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">contribution FAQ</a>, and if that doesn’t
+help please <a href="/community/contact-us">reach out to the Beam community</a>.</p>
+
+<p>The Apache Beam SDK is a unified programming model for both batch and streaming data processing pipelines.
+Pipelines can be described in Java, Python, Go, or SQL, or in a DSL and be executed on
+different runners including Google Cloud Dataflow, Apache Flink, Apache Spark, Apache Apex,
+Apache Gearpump, Apache Hadoop MapReduce, JStorm, IBM Streams, or Apache Samza.</p>
 
+<p>There are lots of opportunities to contribute:</p>
 <ul>
   <li>ask or answer questions on <a href="/community/contact-us/">user@beam.apache.org</a> or
 <a href="https://stackoverflow.com/questions/tagged/apache-beam">stackoverflow</a></li>
@@ -257,303 +254,215 @@ etc)</li>
   <li>improve your favorite language SDK (Java, Python, Go, etc)</li>
   <li>improve specific runners (Apache Apex, Apache Flink, Apache Spark, Google
 Cloud Dataflow, etc)</li>
+  <li>improve or add IO connectors</li>
   <li>work on the core programming model (what is a Beam pipeline and how does it
 run?)</li>
   <li>improve the developer experience on Windows</li>
+  <li>adding answers to the <a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">contribution FAQ</a></li>
+  <li>organize local meetups of users or contributors to the Apache Beam SDK</li>
 </ul>
 
 <p>Most importantly, if you have an idea of how to contribute, then do it!</p>
 
-<p>For a list of open starter tasks, check
-<a href="https://s.apache.org/beam-starter-tasks">https://s.apache.org/beam-starter-tasks</a>.</p>
-
-<h2 id="finding-help">Finding Help</h2>
-
-<p>If you find any issues with this guide or have questions that aren’t answered, please
-<a href="/community/contact-us">reach out to the Beam community</a>.</p>
-
-<h2 id="permissions">Permissions</h2>
-
-<p>For the <a href="https://issues.apache.org/jira/projects/BEAM/issues">Beam issue tracker (JIRA)</a>, 
-anyone can access it and browse issues. Anyone can register an account and login 
-to create issues or add comments. Only contributors can be assigned issues. If 
-you want to be assigned issues, a PMC member can add you to the project contributor
-group.  Email the <a href="/community/contact-us">dev@ mailing list</a>
-to ask to be added as a contributor in the Beam issue tracker.</p>
-
-<p>Anyone can browse the <a href="https://cwiki.apache.org/confluence/display/BEAM/Apache+Beam">Beam Wiki Space</a>.
-If you wish to contribute changes, please request edit access on the <a href="/community/contact-us">dev@ mailing list</a>.</p>
-
-<h2 id="contributing-code">Contributing code</h2>
-
-<p>Discussons about contributing code to beam  happens on the <a href="/community/contact-us/">dev@ mailing list</a>. Introduce yourself!</p>
-
-<p>Questions can be asked on the <a href="/community/contact-us/">#beam channel of the ASF slack</a>. Introduce yourself!</p>
-
-<p>Coding happens at
-<a href="https://github.com/apache/beam">https://github.com/apache/beam</a>. To
-contribute, follow the usual GitHub process: fork the repo, make your changes,
-and open a pull request and @mention a reviewer. If you have more than one commit
-in your change, you may be asked to rebase and squash the commits.
-If you are unfamiliar with this workflow, GitHub maintains these helpful guides:</p>
+<h2 id="prerequisites-for-contributing-code">Prerequisites for contributing code</h2>
 
+<p>To contribute code, you need</p>
 <ul>
-  <li><a href="https://guides.github.com/introduction/git-handbook/">Git Handbook</a></li>
-  <li><a href="https://guides.github.com/activities/forking/">Forking a repository</a></li>
+  <li>a GitHub account</li>
+  <li>a Linux, macOS, or Microsoft Windows development environment with Java JDK 8 installed</li>
+  <li><a href="https://www.docker.com/">Docker</a> installed for some tasks including building worker containers and testing website
+changes locally</li>
+  <li><a href="https://golang.org">Go</a> 1.10 or later installed for Go SDK development</li>
+  <li>Python, virtualenv, and tox installed for Python SDK development</li>
+  <li>for large contributions, a signed <a href="https://www.apache.org/licenses/icla.pdf">Individual Contributor License
+Agreement</a> (ICLA) to the Apache
+Software Foundation (ASF).</li>
 </ul>
 
-<p>If your change is large or it is your first change, it is a good idea to
-<a href="/community/contact-us/">discuss it on the dev@ mailing list</a></p>
-
-<p>For large changes (you may be asked to create a design doc
+<h2 id="submitting-your-first-code-change">Submitting your first code change</h2>
+
+<ol>
+  <li>Consider subscribing to the <a href="/community/contact-us/">dev@ mailing list</a>, especially
+if you plan to make more than one change or the change will be large. All decisions happen on the
+public dev list.</li>
+  <li>Create an account on <a href="https://issues.apache.org/jira/projects/BEAM/issues">Beam issue tracker (JIRA)</a>.</li>
+  <li>(Optionally) Join the <a href="/community/contact-us/">#beam channel of the ASF slack</a>.</li>
+  <li>Find or create an issue in the <a href="https://issues.apache.org/jira/projects/BEAM/issues">Beam issue tracker (JIRA)</a>.
+All changes should be tracked in an issue and referenced by the pull request. For a list of open starter tasks, check
+<a href="https://s.apache.org/beam-starter-tasks">https://s.apache.org/beam-starter-tasks</a>.</li>
+  <li>Assign the issue to yourself. To get the permission to do so, email
+the <a href="/community/contact-us">dev@ mailing list</a>
+to introduce yourself and to be added as a contributor in the Beam issue tracker including your
+ASF Jira Username. For example <a href="https://lists.apache.org/thread.html/e6018c2aaf7dc7895091434295e5b0fafe192b975e3e3761fcf0cda7@%3Cdev.beam.apache.org%3E">this welcome email</a></li>
+  <li>If your change is large or it is your first change, it is a good idea to
+<a href="/community/contact-us/">discuss it on the dev@ mailing list</a></li>
+  <li>For large changes create a design doc
 (<a href="https://s.apache.org/beam-design-doc-template">template</a>,
-<a href="https://s.apache.org/beam-design-docs">examples</a>)).</p>
-
-<p>Documentation happens at
-<a href="https://github.com/apache/beam/tree/master/website">https://github.com/apache/beam/tree/master/website</a>
-and contributions are welcome.</p>
-
-<p>Large contributions require a signed <a href="https://www.apache.org/licenses/icla.pdf">Individual Contributor License
+<a href="https://s.apache.org/beam-design-docs">examples</a>) and email it to the dev@ mailing list.
+Large contributions also require a signed <a href="https://www.apache.org/licenses/icla.pdf">Individual Contributor License
 Agreement</a> (ICLA) to the Apache
-Software Foundation (ASF).</p>
-
-<p>If you are contributing a <code class="highlighter-rouge">PTransform</code> to Beam, we have an extensive
-<a href="/contribute/ptransform-style-guide">PTransform Style Guide</a>.</p>
-
-<h3 id="building--testing">Building &amp; Testing</h3>
+Software Foundation (ASF).</li>
+  <li>If you need help with git forking, cloning, branching, committing, pull requests, and squashing commits, see
+<a href="https://cwiki.apache.org/confluence/display/BEAM/Git+Tips">Git workflow tips</a></li>
+  <li>
+    <p>Familiarize yourself with gradle and the project structure. At the root of the git repository, run:</p>
 
-<p>We use the <a href="https://gradle.org/">Gradle Build Tool</a>.</p>
-
-<p>You do not need to install Gradle, but you do need a Java SDK installed. You can develop on Linux, macOS, or Microsoft Windows. There have been issues noted when developing using Windows; feel free to contribute fixes to make it easier.</p>
-
-<p>Familiarize yourself with the project structure. At the root of the git repository, run:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew projects
+    <div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew projects
 </code></pre>
-</div>
+    </div>
 
-<p>Run the entire set of tests with:</p>
+    <p>Examine the available tasks in a project. For the default set of tasks, use:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew check
+    <div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew tasks
 </code></pre>
-</div>
-
-<p>You can limit testing to a particular module. Gradle will build just the necessary things to run those tests. For example:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew -p sdks/go check
-$ ./gradlew -p sdks/java/io/cassandra check
-$ ./gradlew -p runners/flink check
-</code></pre>
-</div>
+    </div>
 
-<p>Examine the available tasks in a project. For the default set of tasks, use:</p>
+    <p>For a given module, use:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew tasks
+    <div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew sdks/java/io/cassandra tasks
 </code></pre>
-</div>
+    </div>
 
-<p>For a given module, use:</p>
+    <p>For an exhaustive list of tasks, use:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew sdks/java/io/cassandra tasks
+    <div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew tasks --all
 </code></pre>
-</div>
+    </div>
+  </li>
+  <li>
+    <p>Make sure you can build and run tests</p>
 
-<p>For an exhaustive list of tasks, use:</p>
+    <p>Run the entire set of tests with:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew tasks --all
+    <div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew check
 </code></pre>
-</div>
-
-<p>We run <strong>integration and performance test</strong> using <a href="https://jenkins.io/">Jenkins</a>. The job definitions are available in the <a href="https://github.com/apache/beam/tree/master/.test-infra/jenkins">Beam GitHub repository</a>.</p>
-
-<h4 id="troubleshooting">Troubleshooting</h4>
+    </div>
 
-<p>You might get an OutOfMemoryException during the Gradle build. If you have more memory
-available, you can try to increase the memory allocation of the Gradle JVM. Otherwise,
-disabling parallel test execution reduces memory consumption. In the root of the Beam
-source, edit the <code class="highlighter-rouge">gradle.properties</code> file and add/modify the following lines:</p>
+    <p>You can limit testing to a particular module. Gradle will build just the necessary things to run those tests. For example:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>org.gradle.parallel=false
-org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m
+    <div class="highlighter-rouge"><pre class="highlight"><code>$ ./gradlew -p sdks/go check
+$ ./gradlew -p sdks/java/io/cassandra check
+$ ./gradlew -p runners/flink check
 </code></pre>
-</div>
-
-<h3 id="pull-requests">Pull requests</h3>
-
-<p>When your change is ready to be reviewed and merged, create a pull request.
+    </div>
+  </li>
+  <li>Depending on the area you are updating, review tips for
+    <ul>
+      <li><a href="https://cwiki.apache.org/confluence/display/BEAM/Java+Tips">Java</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/BEAM/Python+Tips">Python</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/BEAM/Go+Tips">Go</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/BEAM/Website+Tips">Website</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/BEAM/Gradle+Tips">Gradle</a></li>
+      <li><a href="https://cwiki.apache.org/confluence/display/BEAM/Jenkins+Tips">Jenkins</a></li>
+    </ul>
+  </li>
+  <li>Make your code change. Every source file needs to include the Apache license header. Every new dependency needs to
+have an open source license <a href="https://www.apache.org/legal/resolved.html#criteria">compatible</a> with Apache.</li>
+  <li>Add unit tests for your change</li>
+  <li>Ensure tests pass locally</li>
+  <li>When your change is ready to be reviewed and merged, create a pull request.
 Format the pull request title like <code class="highlighter-rouge">[BEAM-XXX] Fixes bug in ApproximateQuantiles</code>,
 where you replace BEAM-XXX with the appropriate JIRA issue.
-This will automatically link the pull request to the issue.</p>
-
-<p>Pull requests can only be merged by a
-<a href="https://people.apache.org/phonebook.html?unix=beam">beam committer</a>.
-To find a committer for your area, look for similar code merges or ask on
-<a href="/community/contact-us/">dev@beam.apache.org</a></p>
-
-<p>Use @mention in the pull request to notify the reviewer.</p>
-
-<p>The pull request and any changes pushed to it will trigger <a href="/contribute/testing/">pre-commit
+This will automatically link the pull request to the issue.</li>
+  <li>
+    <p>The pull request and any changes pushed to it will trigger <a href="/contribute/testing/">pre-commit
 jobs</a>. If a test fails and appears unrelated to your
 change, you can cause tests to be re-run by adding a single line comment on your
 PR</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code> retest this please
+    <div class="highlighter-rouge"><pre class="highlight"><code> retest this please
 </code></pre>
-</div>
+    </div>
 
-<p>There are other trigger phrases for post-commit tests found in
+    <p>There are other trigger phrases for post-commit tests found in
 .testinfra/jenkins, but use these sparingly because post-commit
 tests consume shared development resources.</p>
+  </li>
+  <li>Pull requests can only be merged by a
+<a href="/contribute/team/">beam committer</a>.
+To find a committer for your area, either:
+    <ul>
+      <li>look in the OWNERS file of the directory where you changed files, or</li>
+      <li>look for similar code merges, or</li>
+      <li>ask on <a href="/community/contact-us/">dev@beam.apache.org</a></li>
+    </ul>
 
-<h3 id="developing-with-the-python-sdk">Developing with the Python SDK</h3>
-
-<p>Gradle can build and test python, and is used by the Jenkins jobs, so needs to
-be maintained.</p>
-
-<p>You can directly use the Python toolchain instead of having Gradle orchestrate
-it, which may be faster for you, but it is your preference.
-If you do want to use Python tools directly, we recommend setting up a virtual
-environment before testing your code.</p>
-
-<p>If you update any of the <a href="http://cython.org">cythonized</a> files in Python SDK,
-you must install the <code class="highlighter-rouge">cython</code> package before running following command to
-properly test your code.</p>
-
-<p>The following commands should be run in the <code class="highlighter-rouge">sdks/python</code> directory.
-This installs Python from source and includes the test and gcp dependencies.</p>
-
-<p>On macOS/Linux:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>$ virtualenv env
-$ . ./env/bin/activate
-(env) $ pip install -e .[gcp,test]
-</code></pre>
-</div>
-
-<p>On Windows:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>&gt; c:\Python27\python.exe -m virtualenv
-&gt; env\Scripts\activate
-(env) &gt; pip install -e .[gcp,test]
-</code></pre>
-</div>
-
-<p>This command runs all Python tests. The nose dependency is installed by [test] in pip install.</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>(env) $ python setup.py nosetests
-</code></pre>
-</div>
-
-<p>You can use following command to run a single test method.</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>(env) $ python setup.py nosetests --tests &lt;module&gt;:&lt;test class&gt;.&lt;test method&gt;
-
-For example:
-(env) $ python setup.py nosetests --tests apache_beam.io.textio_test:TextSourceTest.test_progress
-</code></pre>
-</div>
-
-<p>You can deactivate the virtualenv when done.</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>(env) $ deactivate
-$
-</code></pre>
-</div>
-
-<p>To check just for Python lint errors, run the following command.</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>$ ../../gradlew lint
-</code></pre>
-</div>
-
-<p>Or use <code class="highlighter-rouge">tox</code> commands to run the lint tasks:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>$ tox -e py27-lint    # For python 2.7
-$ tox -e py3-lint     # For python 3
-$ tox -e py27-lint3   # For python 2-3 compatibility
-</code></pre>
-</div>
-
-<h4 id="remote-testing">Remote testing</h4>
-
-<p>This step is only required for testing SDK code changes remotely (not using
-directrunner). In order to do this you must build the Beam tarball. From the
-root of the git repository, run:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>$ cd sdks/python/
-$ python setup.py sdist
-</code></pre>
-</div>
-
-<p>Pass the <code class="highlighter-rouge">--sdk_location</code> flag to use the newly built version. For example:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>$ python setup.py sdist &gt; /dev/null &amp;&amp; \
-    python -m apache_beam.examples.wordcount ... \
-        --sdk_location dist/apache-beam-2.5.0.dev0.tar.gz
-</code></pre>
-</div>
+    <p>Use <code class="highlighter-rouge">R: @username</code> in the pull request to notify a reviewer.</p>
+  </li>
+  <li>If you don’t get any response in 3 business days, email the dev@ list to ask for someone to look at your pull
+request.</li>
+</ol>
 
-<h2 id="reviews">Reviews</h2>
+<h2 id="when-will-my-change-show-up-in-an-apache-beam-release">When will my change show up in an Apache Beam release?</h2>
 
-<p>Reviewers for <a href="https://github.com/apache/beam">apache/beam</a> are listed in
-Prow-style OWNERS files. A description of these files can be found
-<a href="https://go.k8s.io/owners">here</a>.</p>
+<p>Apache Beam makes minor releases every 6 weeks. Apache Beam has a
+<a href="https://calendar.google.com/calendar/embed?src=0p73sl034k80oob7seouanigd0%40group.calendar.google.com">calendar</a> for
+cutting the next release branch. Your change needs to be checked into master before the release branch is cut
+to make the next release.</p>
 
-<h3 id="finding-reviewers">Finding reviewers</h3>
+<h2 id="stale-pull-requests">Stale pull requests</h2>
 
-<p>Currently this is a manual process. Tracking bug for automating this:
-<a href="https://issues.apache.org/jira/browse/BEAM-4790">BEAM-4790</a>.</p>
+<p>The community will close stale pull requests in order to keep the project
+healthy. A pull request becomes stale after its author fails to respond to
+actionable comments for 60 days.  Author of a closed pull request is welcome to
+reopen the same pull request again in the future. The associated JIRAs will be
+unassigned from the author but will stay open.</p>
 
-<p>For each file to be reviewed, look for an OWNERS file in its directory. Pick a
-single reviewer from that file. If the directory doesn’t contain an OWNERS file,
-go up a directory. Keep going until you find one. Try to limit the number of
-reviewers to 2 per PR if possible, to minimize reviewer load. Comment on your PR
-tagging the reviewer as follows:</p>
+<h2 id="accounts-and-permissions">Accounts and Permissions</h2>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>R: @reviewer
-</code></pre>
-</div>
+<ul>
+  <li>
+    <p><a href="https://issues.apache.org/jira/projects/BEAM/issues">Beam issue tracker (JIRA)</a>
+anyone can access it and browse issues. Anyone can register an account and login
+to create issues or add comments. Only contributors can be assigned issues. If
+you want to be assigned issues, a PMC member can add you to the project contributor
+group.  Email the <a href="/community/contact-us">dev@ mailing list</a>
+to ask to be added as a contributor in the Beam issue tracker, and include your ASF Jira username.</p>
+  </li>
+  <li>
+    <p><a href="https://cwiki.apache.org/confluence/display/BEAM/Apache+Beam">Beam Wiki Space</a>.
+If you wish to contribute changes, please request edit access on the
+<a href="/community/contact-us">dev@ mailing list</a>.</p>
+  </li>
+  <li>
+    <p>Pull requests can only be merged by a
+<a href="/contribute/team/">beam committer</a>.</p>
+  </li>
+  <li>
+    <p><a href="https://www.apache.org/foundation/voting.html">Voting on a release</a>. Everyone can vote. Only
+<a href="/contribute/team/">Beam PMC</a> members should mark their votes as binding.</p>
+  </li>
+</ul>
 
-<h3 id="adding-yourself-as-a-reviewer">Adding yourself as a reviewer</h3>
+<h2 id="communication">Communication</h2>
 
-<p>Find the deepest sub-directory that contains the files you want to be a reviewer
-for and add your Github username under <code class="highlighter-rouge">reviewers</code> in the OWNERS file (create a
-new OWNERS file if necessary).</p>
+<p>All communication is expected to align with the <a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct</a>.</p>
 
-<p>The Beam project currently only uses the <code class="highlighter-rouge">reviewers</code> key in OWNERS and no other
-features, as reviewer selection is still a manual process.</p>
+<p>Discussions about contributing code to beam  happens on the <a href="/community/contact-us/">dev@ mailing list</a>. Introduce yourself!</p>
 
-<!-- TODO(BEAM-4790): If Prow write access gets approved
-(https://issues.apache.org/jira/browse/INFRA-16869), document that if you are
-not a committer you can still be listed as a reviewer. Just ask to get added as
-a read-only collaborator to apache/beam by opening an INFRA ticket. -->
+<p>Questions can be asked on the <a href="/community/contact-us/">#beam channel of the ASF slack</a>. Introduce yourself!</p>
 
-<h2 id="contributing-to-the-website">Contributing to the website</h2>
+<h2 id="additional-resources">Additional resources</h2>
 
-<p>The Beam website is in the <code class="highlighter-rouge">/website</code> directory of the repo. The
-<a href="https://github.com/apache/beam/blob/master/website">README</a> there explains how
-to modify different parts of the site. The GitHub workflow is the same - make
-your change and open a pull request.</p>
+<p>If you are contributing a <code class="highlighter-rouge">PTransform</code> to Beam, we have an extensive
+<a href="/contribute/ptransform-style-guide">PTransform Style Guide</a>.</p>
 
-<p>Issues are tracked in the
-<a href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20BEAM%20AND%20component%20%3D%20website">website</a>
-component in JIRA.</p>
+<p>If you are contributing a Runner to Beam, refer to the
+<a href="/contribute/runner-guide/">Runner authoring guide</a></p>
 
-<h2 id="works-in-progress">Works in progress</h2>
+<p>Review <a href="https://s.apache.org/beam-design-docs">design documents</a>.</p>
 
 <p>A great way to contribute is to join an existing effort. For the most
-intensive efforts, check out the <a href="/roadmap/">roadmap</a>.
-You can also find a more exhaustive list on the <a href="https://cwiki.apache.org/confluence/display/BEAM/Apache+Beam">Beam developers’ wiki</a></p>
+intensive efforts, check out the <a href="/roadmap/">roadmap</a>.</p>
 
-<h2 id="stale-pull-requests">Stale pull requests</h2>
+<p>You can also find a more exhaustive list on the <a href="https://cwiki.apache.org/confluence/display/BEAM/Apache+Beam">Beam developers’ wiki</a></p>
 
-<p>The community will close stale pull requests in order to keep the project
-healthy. A pull request becomes stale after its author fails to respond to
-actionable comments for 60 days.  Author of a closed pull request is welcome to
-reopen the same pull request again in the future. The associated JIRAs will be
-unassigned from the author but will stay open.</p>
+<h2 id="troubleshooting">Troubleshooting</h2>
 
-<hr />
+<p>If you run into any issues, check out the <a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">contribution FAQ</a> or ask on
+on the <a href="/community/contact-us/">dev@ mailing list</a> or
+<a href="/community/contact-us/">#beam channel of the ASF slack</a>.
+—-</p>
 
 <p>If you didn’t find the information you were looking for in this guide, please
 <a href="/community/contact-us">reach out to the Beam community</a>.</p>
diff --git a/website/generated-content/contribute/postcommits-guides/index.html b/website/generated-content/contribute/postcommits-guides/index.html
index 558aecd..787e73c 100644
--- a/website/generated-content/contribute/postcommits-guides/index.html
+++ b/website/generated-content/contribute/postcommits-guides/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/postcommits-policies-details/index.html b/website/generated-content/contribute/postcommits-policies-details/index.html
index ebebd74..a164847 100644
--- a/website/generated-content/contribute/postcommits-policies-details/index.html
+++ b/website/generated-content/contribute/postcommits-policies-details/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/postcommits-policies/index.html b/website/generated-content/contribute/postcommits-policies/index.html
index 62d4460..190d7eb 100644
--- a/website/generated-content/contribute/postcommits-policies/index.html
+++ b/website/generated-content/contribute/postcommits-policies/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/precommit-policies/index.html b/website/generated-content/contribute/precommit-policies/index.html
index 089993f..7040441 100644
--- a/website/generated-content/contribute/precommit-policies/index.html
+++ b/website/generated-content/contribute/precommit-policies/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/precommit-triage-guide/index.html b/website/generated-content/contribute/precommit-triage-guide/index.html
index a998ef3..04758be 100644
--- a/website/generated-content/contribute/precommit-triage-guide/index.html
+++ b/website/generated-content/contribute/precommit-triage-guide/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/ptransform-style-guide/index.html b/website/generated-content/contribute/ptransform-style-guide/index.html
index 50e8306..0582928 100644
--- a/website/generated-content/contribute/ptransform-style-guide/index.html
+++ b/website/generated-content/contribute/ptransform-style-guide/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/release-guide/index.html b/website/generated-content/contribute/release-guide/index.html
index 1eb44be..87fe5f9 100644
--- a/website/generated-content/contribute/release-guide/index.html
+++ b/website/generated-content/contribute/release-guide/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/runner-guide/index.html b/website/generated-content/contribute/runner-guide/index.html
index 96e1ce1..259304d 100644
--- a/website/generated-content/contribute/runner-guide/index.html
+++ b/website/generated-content/contribute/runner-guide/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/testing/index.html b/website/generated-content/contribute/testing/index.html
index 68e1ca4..a153c13 100644
--- a/website/generated-content/contribute/testing/index.html
+++ b/website/generated-content/contribute/testing/index.html
@@ -147,20 +147,20 @@
 
 <li><span class="section-nav-list-main-title">Contribute</span></li>
 <li><a href="/contribute/">Get started contributing</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Using+IntelliJ+IDE">Using IntelliJ IDE</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/BEAM/Development+Environment+FAQ">FAQ</a></li>
 <li>
   <span class="section-nav-list-title">Technical Docs</span>
 
   <ul class="section-nav-list">
+    <li><a href="/roadmap/">Roadmap</a></li>
     <li><a href="/contribute/testing/">Testing guide</a></li>
-    <ul>
-      <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage Guide</a></li>
-    </ul>
+    <li><a href="/contribute/precommit-triage-guide/">Pre-commit Slowness Triage</a></li>
     <li><a href="/contribute/ptransform-style-guide/">PTransform style guide</a></li>
     <li><a href="/contribute/runner-guide/">Runner authoring guide</a></li>
     <li><a href="/contribute/docker-images/">Docker images</a></li>
     <li><a href="/contribute/design-documents/">Design documents</a></li>
     <li><a href="/contribute/dependencies/">Dependencies guide</a></li>
+    <li><a href="/contribute/feature-branches/">Feature branches</a></li>
   </ul>
 </li>
 <li>
@@ -172,8 +172,8 @@
 </li>
 <li>
   <span class="section-nav-list-title">Committers</span>
-
   <ul class="section-nav-list">
+    <li><a href="/contribute/team/">PMC and committers</a></li>
     <li><a href="/contribute/become-a-committer/">Become a committer</a></li>
     <li><a href="/contribute/committer-guide/">Committer guide</a></li>
     <li><a href="/contribute/release-guide/">Release guide</a></li>
diff --git a/website/generated-content/contribute/work-in-progress/index.html b/website/generated-content/contribute/work-in-progress/index.html
deleted file mode 100644
index c0fa7ea..0000000
--- a/website/generated-content/contribute/work-in-progress/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-US">
-<meta charset="utf-8">
-<title>Redirecting…</title>
-<link rel="canonical" href="https://beam.apache.org/contribute/">
-<meta http-equiv="refresh" content="0; url=https://beam.apache.org/contribute/">
-<h1>Redirecting…</h1>
-<a href="https://beam.apache.org/contribute/">Click here if you are not redirected.</a>
-<script>location="https://beam.apache.org/contribute/"</script>
-</html>
diff --git a/website/generated-content/get-started/quickstart-go/index.html b/website/generated-content/get-started/quickstart-go/index.html
index 52c010b..114ce14 100644
--- a/website/generated-content/get-started/quickstart-go/index.html
+++ b/website/generated-content/get-started/quickstart-go/index.html
@@ -214,6 +214,8 @@ limitations under the License.
 
 <p>This Quickstart will walk you through executing your first Beam pipeline to run <a href="/get-started/wordcount-example">WordCount</a>, written using Beam’s <a href="/documentation/sdks/go">Go SDK</a>, on a <a href="/documentation#runners">runner</a> of your choice.</p>
 
+<p>If you’re interested in contributing to the Apache Beam Go codebase, see the <a href="/contribute">Contribution Guide</a>.</p>
+
 <ul id="markdown-toc">
   <li><a href="#set-up-your-environment" id="markdown-toc-set-up-your-environment">Set up your environment</a></li>
   <li><a href="#get-the-sdk-and-the-examples" id="markdown-toc-get-the-sdk-and-the-examples">Get the SDK and the examples</a></li>
diff --git a/website/generated-content/get-started/quickstart-java/index.html b/website/generated-content/get-started/quickstart-java/index.html
index 785e88a..8e293c8 100644
--- a/website/generated-content/get-started/quickstart-java/index.html
+++ b/website/generated-content/get-started/quickstart-java/index.html
@@ -215,6 +215,8 @@ limitations under the License.
 
 <p>This Quickstart will walk you through executing your first Beam pipeline to run <a href="/get-started/wordcount-example">WordCount</a>, written using Beam’s <a href="/documentation/sdks/java">Java SDK</a>, on a <a href="/documentation#runners">runner</a> of your choice.</p>
 
+<p>If you’re interested in contributing to the Apache Beam Java codebase, see the <a href="/contribute">Contribution Guide</a>.</p>
+
 <ul id="markdown-toc">
   <li><a href="#set-up-your-development-environment" id="markdown-toc-set-up-your-development-environment">Set up your Development Environment</a></li>
   <li><a href="#get-the-wordcount-code" id="markdown-toc-get-the-wordcount-code">Get the WordCount Code</a></li>
diff --git a/website/generated-content/get-started/quickstart-py/index.html b/website/generated-content/get-started/quickstart-py/index.html
index ff15e0c..70d00d7 100644
--- a/website/generated-content/get-started/quickstart-py/index.html
+++ b/website/generated-content/get-started/quickstart-py/index.html
@@ -225,6 +225,8 @@ limitations under the License.
 
 <p>This guide shows you how to set up your Python development environment, get the Apache Beam SDK for Python, and run an example pipeline.</p>
 
+<p>If you’re interested in contributing to the Apache Beam Python codebase, see the <a href="/contribute">Contribution Guide</a>.</p>
+
 <ul id="markdown-toc">
   <li><a href="#set-up-your-environment" id="markdown-toc-set-up-your-environment">Set up your environment</a>    <ul>
       <li><a href="#check-your-python-version" id="markdown-toc-check-your-python-version">Check your Python version</a></li>