beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhalp...@apache.org
Subject [03/15] incubator-beam-site git commit: [BEAM-500] Finished skeleton of new website layout
Date Tue, 02 Aug 2016 17:46:34 GMT
[BEAM-500] Finished skeleton of new website layout

* got 'rake test' passing again (modulo struggles with external links for files that have changed) and added instructions to README.md
* merged two conflicting organization strategies ('_pages' and 'docs/{use, learn, contribute}' into '{use, learn, contribute, blog, project}'
* created placeholder pages for the remaining things in https://goo.gl/cgFUHf and filed jira issues to fill them in
* standardized multi-word urls/files to use - not _
* added jekyll-redirect-from and redirects for modified links (don't work locally though, since they try to redirect to the live site)
* removed the disclaimer/alert, since it made tests mad and has been replaced by jira links for unwritten content anyway
* temporarily removed the nanthrax link, since it's down (causing test issues)
* Standardized on 'Beam' in webpage title and an 'Apache Beam' #title
* Added 'Apache' to Flink/Spark runner pages
* Fix head template to avoid link checking canonical urls. (Still breaks on redirects though.)
* Fixed title for consistency.
* made anchor tag consistent with the others
* standardized on 'default' layout for now (allows longer titles on the page than in the URL nav bar)


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/commit/a4ebd228
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/tree/a4ebd228
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam-site/diff/a4ebd228

Branch: refs/heads/asf-site
Commit: a4ebd2282053b223c3c4eff094f77b6e8240fcc9
Parents: a64faf2
Author: Frances Perry <fjp@google.com>
Authored: Mon Aug 1 23:55:04 2016 -0700
Committer: Dan Halperin <dhalperi@google.com>
Committed: Tue Aug 2 10:40:50 2016 -0700

----------------------------------------------------------------------
 Gemfile                                     |   1 +
 README.md                                   |   6 +
 _config.yml                                 |   6 +-
 _includes/head.html                         |   2 +-
 _includes/header.html                       |  65 ++--
 _pages/blog.md                              |  34 --
 _pages/capability-matrix.md                 |  46 ---
 _pages/contribution-guide.md                | 263 --------------
 _pages/issue_tracking.md                    |  13 -
 _pages/mailing_lists.md                     |  47 ---
 _pages/material.md                          |  60 ----
 _pages/presentation_materials.md            |  28 --
 _pages/public-meetings.md                   |  55 ---
 _pages/releases.md                          |  37 --
 _pages/source_repository.md                 |  25 --
 _pages/team.md                              |  38 --
 _posts/2016-03-17-capability-matrix.md      |   4 +-
 _posts/2016-04-03-presentation-materials.md |   4 +-
 _posts/2016-06-15-first-release.md          |   4 +-
 blog/index.md                               |  36 ++
 coming-soon.md                              |   5 -
 contribute/contribution-guide.md            | 264 ++++++++++++++
 contribute/index.md                         |  23 ++
 contribute/source-repository.md             |  28 ++
 docs/contribute/index.md                    |  41 ---
 docs/index.md                               |  26 --
 docs/learn/index.md                         |  51 ---
 docs/learn/programming-guide.md             | 416 ----------------------
 docs/use/beam-overview.md                   |  60 ----
 docs/use/index.md                           |  36 --
 docs/use/walkthroughs.md                    |  13 -
 getting_started/index.md                    |  30 --
 index.md                                    |   7 +-
 learn/index.md                              |  28 ++
 learn/presentation-materials.md             |  31 ++
 learn/programming-guide.md                  | 420 +++++++++++++++++++++++
 learn/resources.md                          |  15 +
 learn/runners/capability-materix.md         |  46 +++
 learn/runners/dataflow.md                   |   8 +
 learn/runners/direct.md                     |   8 +
 learn/runners/flink.md                      |   8 +
 learn/runners/index.md                      |  14 +
 learn/runners/spark.md                      |   8 +
 learn/sdks/index.md                         |   8 +
 learn/sdks/java.md                          |   8 +
 privacy_policy/index.md                     |   2 +-
 project/logos.md                            |  63 ++++
 project/public-meetings.md                  |  59 ++++
 project/team.md                             |  41 +++
 use/beam-overview.md                        |  63 ++++
 use/index.md                                |  32 ++
 use/issue-tracking.md                       |  16 +
 use/mailing-lists.md                        |  50 +++
 use/quickstart.md                           |  32 ++
 use/releases.md                             |  38 ++
 use/walkthroughs.md                         |  16 +
 56 files changed, 1423 insertions(+), 1365 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/Gemfile
----------------------------------------------------------------------
diff --git a/Gemfile b/Gemfile
index bb67505..29b3b7a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 gem 'jekyll'
+gem 'jekyll-redirect-from'
 gem 'html-proofer'

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 4aa43a1..a1c4254 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,8 @@ Beam website.
 Before working with the Jekyll code, you will need to install Jekyll:
 
     $ gem install jekyll
+    $ gem install jekyll-redirect-from
+    $ gem install html-proofer
 
 *If you are on a Mac, you may need to install
 [Ruby Gems](https://rubygems.org/pages/download).*
@@ -39,6 +41,10 @@ Jekyll will start a webserver on port `4000`. As you make changes to the
 content, Jekyll will rebuild it automatically. This is helpful if you want to see
 how your changes will render in realtime.
 
+In addition, you can run the tests via:
+
+    $ rake test
+
 ### Generating the static website
 Once you are done with your changes, you need to compile the static
 content for the website. This is what is actually hosted 

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 697a7f8..39fdbcd 100644
--- a/_config.yml
+++ b/_config.yml
@@ -31,8 +31,6 @@ twitter_username: apachebeam
 # Build settings
 markdown: kramdown
 
-# Includes
-include: ['_pages']
 
 collections:
 - beam_team
@@ -42,3 +40,7 @@ exclude: ['README.md', 'Gemfile.lock', 'Gemfile', 'Rakefile']
 
 # Downloads directory
 downloads: downloads
+
+gems:
+  - jekyll-redirect-from
+  
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_includes/head.html
----------------------------------------------------------------------
diff --git a/_includes/head.html b/_includes/head.html
index 5cd50c1..03a47cc 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -10,7 +10,7 @@
   <link rel="stylesheet" href="{{ "/css/theme.css" | prepend: site.baseurl }}">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
   <script src="{{ "/js/bootstrap.min.js" | prepend: site.baseurl }}"></script>
-  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}" data-proofer-ignore>
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
   <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_includes/header.html
----------------------------------------------------------------------
diff --git a/_includes/header.html b/_includes/header.html
index 9c98db9..21d8771 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -16,18 +16,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="{{ site.baseurl }}/docs/use/">User Hub</a></li>
+			  <li><a href="{{ site.baseurl }}/use">User Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">General</li>
+			  <li><a href="{{ site.baseurl }}/use/beam-overview/">Beam Overview</a></li>
+			  <li><a href="{{ site.baseurl }}/use/quickstart/">Quickstart</a></li>  
+			  <li><a href="{{ site.baseurl }}/use/releases">Release Information</a></li>
 			  <li role="separator" class="divider"></li>
-			  <li><a href="{{ site.baseurl }}/docs/use/beam-overview">Beam Overview</a></li>
-			  <li><a href="{{ site.baseurl }}/getting_started/">Quickstart</a></li>
 			  <li class="dropdown-header">Example Walkthroughs</li>
-			  <li><a href="{{ site.baseurl }}/docs/use/walkthroughs">WordCount</a></li>
-			  <li><a href="{{ site.baseurl }}/docs/use/walkthroughs">Mobile Gaming</a></li>
+			  <li><a href="{{ site.baseurl }}/use/walkthroughs/">WordCount</a></li>
+			  <li><a href="{{ site.baseurl }}/use/walkthroughs/">Mobile Gaming</a></li>
 			  <li role="separator" class="divider"></li>
-			  <li><a href="{{ site.baseurl }}">Release Information</a></li>
-			  <li class="dropdown-header">Support Resources</li>
-			  <li><a href="{{ site.baseurl }}/mailing_lists/">Mailing Lists</a></li>
-              <li><a href="{{ site.baseurl }}/issue_tracking/">Issue Tracking</a></li>
+			  <li class="dropdown-header">Support</li>
+			  <li><a href="{{ site.baseurl }}/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="{{ site.baseurl }}/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>
@@ -35,37 +37,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="{{ site.baseurl }}/docs/learn/">Learner Hub</a></li>
+			  <li><a href="{{ site.baseurl }}/learn">Learner Hub</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Beam Concepts</li>
+			  <li><a href="{{ site.baseurl }}/learn/programming-guide/">Programming Guide</a></li>
+			  <li><a href="{{ site.baseurl }}/learn/presentation-materials/">Presentation Materials</a></li>
+			  <li><a href="{{ site.baseurl }}/learn/resources/">Additional Resources</a></li>
 			  <li role="separator" class="divider"></li>
-			  <li><a href="{{ site.baseurl }}/docs/learn/programming-guide/">Beam Programming Guide</a></li>
-			  <li><a href="{{ site.baseurl }}/capability-matrix/">Capability Matrix</a></li>
-			  <li><a href="https://goo.gl/ps8twC">Additional Technical Docs</a></li>
+			  <li class="dropdown-header">SDKs</li>
+			  <li><a href="{{ site.baseurl }}/learn/sdks/java/">Java SDK</a></li>
+			  <li role="separator" class="divider"></li>
+			  <li class="dropdown-header">Runners</li>
+			  <li><a href="{{ site.baseurl }}/learn/runners/capability-matrix/">Capability Matrix</a></li>
+			  <li><a href="{{ site.baseurl }}/learn/runners/direct/">Direct Runner</a></li>
+			  <li><a href="{{ site.baseurl }}/learn/runners/flink/">Apache Flink Runner</a></li>
+			  <li><a href="{{ site.baseurl }}/learn/runners/spark/">Apache Spark Runner</a></li>
+			  <li><a href="{{ site.baseurl }}/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="{{ site.baseurl }}/docs/contribute/">Contributor Hub</a></li>
+			  <li><a href="{{ site.baseurl }}/contribute">Contributor Hub</a></li>
 			  <li role="separator" class="divider"></li>
-			  <li><a href="{{ site.baseurl }}/contribution-guide/">Contribution Guide</a></li>
+			  <li class="dropdown-header">Basics</li>
+			  <li><a href="{{ site.baseurl }}/contribute/contribution-guide/">Contribution Guide</a></li>
+			  <li><a href="{{ site.baseurl }}/use/mailing-lists/">Mailing Lists</a></li>
+              <li><a href="{{ site.baseurl }}/contribute/source-repository/">Source Repository</a></li>
+              <li><a href="{{ site.baseurl }}/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="{{ site.baseurl }}/mailing_lists/">Mailing Lists</a></li>
-              <li><a href="{{ site.baseurl }}/source_repository/">Source Repository</a></li>
-              <li><a href="{{ site.baseurl }}/issue_tracking/">Issue Tracking</a></li>
-			  <li class="dropdown-header">Project Materials</li>
-			  <li><a href="{{ site.baseurl }}/presentation-materials/">Presentation Materials</a></li>
-			  <li><a href="{{ site.baseurl }}/public-meetings/">Public Meetings</a></li>
-			  <li role="separator" class="divider"></li>
-			  <li><a href="{{ site.baseurl }}/team/">Apache Beam Team</a></li>
 		  </ul>
 	    </li>
         <li><a href="{{ site.baseurl }}/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="{{ site.baseurl }}/presentation-materials/">Presentation Materials</a></li>
-            <li><a href="{{ site.baseurl }}/material/">Logos and design</a></li>
+            <li><a href="{{ site.baseurl }}/project/logos/">Logos and design</a></li>
+            <li><a href="{{ site.baseurl }}/project/public-meetings/">Public Meetings</a></li>
+			<li><a href="{{ site.baseurl }}/project/team/">Team</a></li>
             <li><a href="http://apache.org/licenses/LICENSE-2.0.html">License</a></li>
           </ul>
         </li>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_pages/blog.md
----------------------------------------------------------------------
diff --git a/_pages/blog.md b/_pages/blog.md
deleted file mode 100644
index 36ada4a..0000000
--- a/_pages/blog.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-layout: page
-title: "Apache Beam Blog"
-permalink: /blog/
----
-
-This is the blog for the Apache Beam project. This blog contains news and updates
-for the project.
-
-{% for post in site.posts %}
-{% assign authors = post.authors %}
-
-### <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
-<i>{{ post.date | date: "%b %-d, %Y" }}{% if authors %} • {% include authors-list.md %}{% endif %}</i>
-
-{{ post.excerpt }}
-
-<!-- Render a "read more" button if the post is longer than the excerpt -->
-{% capture content_words %}
-  {{ post.content | number_of_words }}
-{% endcapture %}
-{% capture excerpt_words %}
-  {{ post.excerpt | number_of_words }}
-{% endcapture %}
-{% if excerpt_words != content_words %}
-<p>
-<a class="btn btn-default btn-sm" href="{{ post.url }}" role="button">
-Read more&nbsp;<span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span>
-</a>
-</p>
-{% endif %}
-
-<hr>
-{% endfor %}

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_pages/capability-matrix.md
----------------------------------------------------------------------
diff --git a/_pages/capability-matrix.md b/_pages/capability-matrix.md
deleted file mode 100644
index 359164d..0000000
--- a/_pages/capability-matrix.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-layout: default
-title: "Apache Beam Capability Matrix"
-permalink: /capability-matrix/
----
-
-
-# Apache Beam Capability Matrix
-<span style='font-size:11px;float:none'>Last updated: {{ site.time | date: '%Y-%m-%d %H:%M %Z' }}</span>
-
-Apache Beam (incubating) provides a portable API layer for building sophisticated data-parallel processing engines that may be executed across a diversity of exeuction engines, or <i>runners</i>. The core concepts of this layer are based upon the Beam Model (formerly referred to as the [Dataflow Model](http://www.vldb.org/pvldb/vol8/p1792-Akidau.pdf)), and implemented to varying degrees in each Beam runner. To help clarify the capabilities of individual runners, we've created the capability matrix below.
-
-Individual capabilities have been grouped by their corresponding <span class="wwwh-what-dark">What</span> / <span class="wwwh-where-dark">Where</span> / <span class="wwwh-when-dark">When</span> / <span class="wwwh-how-dark">How</span> question:
-
-- <span class="wwwh-what-dark">What</span> results are being calculated?
-- <span class="wwwh-where-dark">Where</span> in event time?
-- <span class="wwwh-when-dark">When</span> in processing time?
-- <span class="wwwh-how-dark">How</span> do refinements of results relate?
-
-For more details on the <span class="wwwh-what-dark">What</span> / <span class="wwwh-where-dark">Where</span> / <span class="wwwh-when-dark">When</span> / <span class="wwwh-how-dark">How</span> breakdown of concepts, we recommend reading through the <a href="http://oreilly.com/ideas/the-world-beyond-batch-streaming-102">Streaming 102</a> post on O'Reilly Radar.
-
-Note that in the future, we intend to add additional tables beyond the current set, for things like runtime characterstics (e.g. at-least-once vs exactly-once), performance, etc.
-
-{% include capability-matrix-common.md %}
-{% assign cap-data=site.data.capability-matrix %}
-
-<center>
-
-<!-- Summary table -->
-{% assign cap-style='cap-summary' %}
-{% assign cap-view='summary' %}
-{% assign cap-other-view='full' %}
-{% assign cap-toggle-details=1 %}
-{% assign cap-display='block' %}
-
-{% include capability-matrix.md %}
-
-<!-- Full details table -->
-{% assign cap-style='cap' %}
-{% assign cap-view='full' %}
-{% assign cap-other-view='summary' %}
-{% assign cap-toggle-details=0 %}
-{% assign cap-display='none' %}
-
-{% include capability-matrix.md %}
-</center>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_pages/contribution-guide.md
----------------------------------------------------------------------
diff --git a/_pages/contribution-guide.md b/_pages/contribution-guide.md
deleted file mode 100644
index abcbb1b..0000000
--- a/_pages/contribution-guide.md
+++ /dev/null
@@ -1,263 +0,0 @@
----
-layout: default
-title: "Apache Beam Contribution Guide"
-permalink: /contribution-guide/
----
-
-# How to Contribute
-
-* TOC
-{:toc}
-
-The Apache Beam community welcomes contributions from anyone with a passion for data processing! Beam has many different opportunities for contributions -- write new examples, add new user-facing libraries (new statistical libraries, new IO connectors, etc), work on the core programming model, build specific runners (Apache Flink, Apache Spark, Google Cloud Dataflow, etc), or participate on the documentation effort.
-
-We use a review-then-commit workflow in Beam for all contributions.
-
-![Alt text]({{ "/images/contribution-guide-1.png" | prepend: site.baseurl }} "Workflow image")
-
-**For larger contributions or those that affect multiple components:**
-
-1. **Engage**: We encourage you to work with the Beam community on the [Apache JIRA issue tracker](https://issues.apache.org/jira/browse/BEAM) and [developer’s mailing list](http://beam.incubator.apache.org/mailing_lists/) to identify good areas for contribution.
-1. **Design:** More complicated contributions will likely benefit from some early discussion in order to scope and design them well.
-
-**For all contributions:**
-
-1. **Code:** The best part ;-)
-1. **Review:** Submit a pull request with your contribution to our [GitHub mirror](https://github.com/apache/incubator-beam/). Work with a committer to review and iterate on the code, if needed.
-1. **Commit:** A Beam committer merges the pull request into our [Apache repository](https://git-wip-us.apache.org/repos/asf/incubator-beam.git).
-
-We look forward to working with you!
-
-## Engage
-
-### Mailing list(s)
-We discuss design and implementation issues on dev@beam.incubator.apache.org mailing list, which is archived [here](http://mail-archives.apache.org/mod_mbox/incubator-beam-dev/). Join by emailing [`dev-subscribe@beam.incubator.apache.org`](mailto:dev-subscribe@beam.incubator.apache.org).
-
-If interested, you can also join [`user@beam.incubator.apache.org`](http://mail-archives.apache.org/mod_mbox/incubator-beam-user/) and [`commits@beam.incubator.apache.org`](http://mail-archives.apache.org/mod_mbox/incubator-beam-commits/) too.
-
-### Apache JIRA
-We use [Apache JIRA](https://issues.apache.org/jira/browse/BEAM) as an issue tracking and project management tool, as well as a way to communicate among a very diverse and distributed set of contributors. To be able to gather feedback, avoid frustration, and avoid duplicated efforts all Beam-related work should be tracked there.
-
-If you do not already have an Apache JIRA account, sign up [here](https://issues.apache.org/jira/).
-
-If a quick [search](https://issues.apache.org/jira/issues/?jql=project%3DBEAM%20AND%20text%20~%20%22the%20thing%20I%20want%20to%20contribute%22) doesn’t turn up an existing JIRA issue for the work you want to contribute, create it. Please discuss your proposal with a committer or the [component lead](https://issues.apache.org/jira/browse/BEAM/?selectedTab=com.atlassian.jira.jira-projects-plugin:components-panel) in JIRA or, alternatively, on the developer mailing list.
-
-If there’s an existing JIRA issue for your intended contribution, please comment about your intended work. Once the work is understood, a committer will assign the issue to you. (If you don’t have a JIRA role yet, you’ll be added to the “contributor” role.) If an issue is currently assigned, please check with the current assignee before reassigning.
-
-For moderate or large contributions, you should not start coding or writing a design doc unless there is a corresponding JIRA issue assigned to you for that work. Simple changes, like fixing typos, do not require an associated issue.
-
-## Design
-To avoid potential frustration during the code review cycle, we encourage you to clearly scope and design non-trivial contributions with the Beam community before you start coding.
-
-Generally, the JIRA issue is the best place to gather relevant design docs, comments, or references. It’s great to explicitly include relevant stakeholders early in the conversation. For designs that may be generally interesting, we also encourage conversations on the developer’s mailing list.
-
-We suggest using [Google Docs](https://docs.google.com/) for sharing designs that may benefit from diagrams or comments. Please remember to make the document world-commentable and add a link to it from the relevant JIRA issue. We also track Beam-related documents in [this shared folder](https://drive.google.com/folderview?id=0B-IhJZh9Ab52OFBVZHpsNjc4eXc&usp=sharing).
-
-## Code
-To contribute code to Apache Beam, you’ll have to do a few administrative steps once, and then follow a few guidelines for each contribution.
-
-### One-time Setup
-
-#### [Potentially] Submit Contributor License Agreement
-Apache Software Foundation (ASF) desires that all contributors of ideas, code, or documentation to the Apache projects complete, sign, and submit an [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.txt) (ICLA). The purpose of this agreement is to clearly define the terms under which intellectual property has been contributed to the ASF and thereby allow us to defend the project should there be a legal dispute regarding the software at some future time.
-
-We require you to have an ICLA on file with the Apache Secretary for larger contributions only. For smaller ones, however, we rely on  [clause five](http://www.apache.org/licenses/LICENSE-2.0#contributions) of the Apache License, Version 2.0, describing licensing of intentionally submitted contributions and do not require an ICLA in that case.
-
-#### Obtain a GitHub account
-We use GitHub’s pull request functionality to review proposed code changes.
-
-If you do not already have a personal GitHub account, sign up [here](https://github.com/join).
-
-#### Fork the repository on GitHub
-Go to the [Beam GitHub mirror](https://github.com/apache/incubator-beam/) and fork the repository to your own private account. This will be your private workspace for staging changes.
-
-We recommend enabling Travis-CI continuous integration coverage on your private fork in order to easily test your changes before proposing a pull request. Go to [Travis-CI](https://travis-ci.org), log in with your GitHub account, and enable coverage for your repository.
-
-#### Clone the repository locally
-You are now ready to create the development environment on your local machine. Feel free to repeat these steps on all machines that you want to use for development.
-
-We assume you are using SSH-based authentication with GitHub. If necessary, exchange SSH keys with GitHub by following [their instructions](https://help.github.com/articles/generating-an-ssh-key/).
-
-Clone Beam’s read-only GitHub mirror.
-
-    $ git clone https://github.com/apache/incubator-beam.git
-    $ cd incubator-beam
-
-Add your forked repository as an additional Git remote, where you’ll push your changes.
-
-<pre><code>$ git remote add <b>&lt;GitHub_user&gt;</b> git@github.com:<b>&lt;GitHub_user&gt;</b>/incubator-beam.git</code></pre>
-
-You are now ready to start developing!
-
-### Create a branch in your fork
-You’ll work on your contribution in a branch in your own (forked) repository. Create a local branch, initialized with the state of the branch you expect your changes to be merged into. Keep in mind that we use several branches, including `master`, feature-specific, and release-specific branches. If you are unsure, initialize with the state of the `master` branch.
-
-<pre><code>$ git fetch --all
-$ git checkout -b <b>&lt;my-branch&gt;</b> origin/master</code></pre>
-
-At this point, you can start making and committing changes to this branch in a standard way.
-
-### Syncing and pushing your branch
-Periodically while you work, and certainly before submitting a pull request, you should update your branch with the most recent changes to the target branch.
-
-    $ git pull --rebase
-
-Remember to always use `--rebase` parameter to avoid extraneous merge commits.
-
-To push your local, committed changes to your (forked) repository on GitHub, run:
-
-<pre><code>$ git push <b>&lt;GitHub_user&gt; &lt;my-branch&gt;</b></code></pre>
-
-### Testing
-All code should have appropriate unit testing coverage. New code should have new tests in the same contribution. Bug fixes should include a regression test to prevent the issue from reoccurring.
-
-For contributions to the Java code, run unit tests locally via Maven. Alternatively, you can use Travis-CI.
-
-    $ mvn clean verify
-
-## Review
-Once the initial code is complete and the tests pass, it’s time to start the code review process. We review and discuss all code, no matter who authors it. It’s a great way to build community, since you can learn from other developers, and they become familiar with your contribution. It also builds a strong project by encouraging a high quality bar and keeping code consistent throughout the project.
-
-### Create a pull request
-Organize your commits to make your reviewer’s job easier. Use the following command to re-order, squash, edit, or change description of individual commits.
-
-    $ git rebase -i origin/master
-
-Navigate to the [Beam GitHub mirror](https://github.com/apache/incubator-beam) to create a pull request. The title of the pull request should be strictly in the following format:
-
-<pre><code>[BEAM-<b>&lt;JIRA-issue-#&gt;</b>] Title of the pull request</code></pre>
-
-Please include a descriptive pull request message to help make the reviewer’s job easier. It’s fine to refer to existing design docs or the contents of the associated JIRA as appropriate.
-
-If you know a good committer to review your pull request, please make a comment like the following. If not, don’t worry -- a committer will pick it up.
-
-<pre><code>Hi @<b>&lt;GitHub-reviewer-username&gt;</b>, can you please take a look?</code></pre>
-
-When choosing a reviewer, think about who is the expert on the relevant code, who the stakeholders are for this change, and who else would benefit from becoming familiar with the code. If you’d appreciate comments from additional folks but already have a main reviewer, you can explicitly cc them using <code>@<b>&lt;GitHub-reviewer-username&gt;</b></code>.
-
-### Code Review and Revision
-During the code review process, don’t rebase your branch or otherwise modify published commits, since this can remove existing comment history and be confusing to the reviewer. When you make a revision, always push it in a new commit.
-
-Our GitHub mirror automatically provides pre-commit testing coverage using Jenkins and Travis-CI. Please make sure those tests pass; the contribution cannot be merged otherwise.
-
-### LGTM
-Once the reviewer is happy with the change, they’ll respond with an LGTM (“*looks good to me!*”). At this point, the committer will take over, possibly make some additional touch ups, and merge your changes into the codebase.
-
-In the case both the author and the reviewer are committers, either can merge the pull request. Just be sure to communicate clearly whose responsibility it is in this particular case.
-
-Thank you for your contribution to Beam!
-
-### Deleting your branch
-Once the pull request is merged into the Beam repository, you can safely delete the branch locally and purge it from your forked repository.
-
-From another local branch, run:
-
-<pre><code>$ git fetch --all
-$ git branch -d <b>&lt;my-branch&gt;</b>
-$ git push <b>&lt;GitHub_user&gt;</b> --delete <b>&lt;my-branch&gt;</b></code></pre>
-
-## Commit (committers only)
-Once the code has been peer reviewed by a committer, the next step is for the committer to merge it into the [authoritative Apache repository](https://git-wip-us.apache.org/repos/asf/incubator-beam.git), not the read-only GitHub mirror. (In the case that the author is also a committer, it is acceptable for either the author or reviewer to do the merge. Just be explicit about whose job it is!)
-
-Pull requests should not be merged before the review has received an explicit LGTM from another committer. Exceptions to this rule may be made rarely, on a case-by-case basis only, in the committer’s discretion for situations such as build breakages.
-
-Committers should never commit anything without going through a pull request, since that would bypass test coverage and potentially cause the build to fail due to checkstyle, etc. In addition, pull requests ensure that changes are communicated properly and potential flaws or improvements can be spotted. **Always go through the pull request, even if you won’t wait for the code review.** Even then, comments can be provided in the pull requests after it has been merged to work on follow-ups.
-
-Committing is currently a manual process, but we are investigating tools to automate pieces of this process.
-
-### One-time Setup
-Add the Apache Git remote in your local clone, by running:
-
-    $ git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-beam.git
-
-We recommend renaming the `origin` remote to `github`, to avoid confusion when dealing with this many remotes.
-
-    $ git remote rename origin github
-
-For the `github` remote, add an additional fetch reference, which will cause every pull request to be made available as a remote branch in your workspace.
-
-    $ git config --local --add remote.github.fetch \
-        '+refs/pull/*/head:refs/remotes/github/pr/*'
-
-You can confirm your configuration by running the following command.
-
-<pre><code>$ git remote -v
-apache	https://git-wip-us.apache.org/repos/asf/incubator-beam.git (fetch)
-apache	https://git-wip-us.apache.org/repos/asf/incubator-beam.git (push)
-github	https://github.com/apache/incubator-beam.git (fetch)
-github	https://github.com/apache/incubator-beam.git (push)
-<b>&lt;username&gt;</b>	git@github.com:<b>&lt;username&gt;</b>/beam.git (fetch)
-<b>&lt;username&gt;</b>	git@github.com:<b>&lt;username&gt;</b>/beam.git (push)</code></pre>
-
-### Contributor License Agreement
-If you are merging a larger contribution, please make sure that the contributor has an ICLA on file with the Apache Secretary. You can view the list of committers [here](http://home.apache.org/phonebook.html?unix=committers), as well as [ICLA-signers who aren’t yet committers](http://home.apache.org/unlistedclas.html).
-
-For smaller contributions, however, this is not required. In this case, we rely on [clause five](http://www.apache.org/licenses/LICENSE-2.0#contributions) of the Apache License, Version 2.0, describing licensing of intentionally submitted contributions.
-
-### Tests
-Before merging, please make sure both Travis-CI and Jenkins tests pass, as visible in the GitHub pull request. Do not merge the pull request otherwise.
-
-### Finishing touches
-At some point in the review process, you should take the pull request over and complete any outstanding work that is either minor, stylistic, or otherwise outside the expertise of the contributor.
-
-Fetch references from all remote repositories, and checkout the specific pull request branch.
-
-<pre>
-</code>$ git fetch --all
-$ git checkout -b finish-pr-<b>&lt;pull-request-#&gt;</b> github/pr/<b>&lt;pull-request-#&gt;</b></code></pre>
-
-At this point, you can commit any final touches to the pull request. For example, you should:
-
-* Rebase on current state of the target branch.
-* Fix typos.
-* Reorganize commits that are part of the pull request, such as squash them into fewer commits that make sense for a historical perspective.
-
-You will often need the following command, assuming you’ll be merging changes into the `master` branch:
-
-    $ git rebase -i apache/master
-
-Please make sure to retain authorship of original commits to give proper credit to the contributor. You are welcome to change their commits slightly (e.g., fix a typo) and squash them, but more substantive changes should be a separate commit and review.
-
-### Merge process
-Once you are ready to merge, fetch all remotes, checkout the destination branch and merge the changes.
-
-<pre><code>$ git fetch --all
-$ git checkout apache/master
-$ git merge --no-ff \
-&nbsp;&nbsp;&nbsp;&nbsp;-m $'[BEAM-<b>&lt;JIRA-issue-#&gt;</b>] <b>&lt;Title&gt;</b>\n\nThis closes #<b>&lt;pull-request-#&gt;</b>' \
-&nbsp;&nbsp;&nbsp;&nbsp;finish-pr-<b>&lt;pull-request-#&gt;</b></code></pre>
-
-Always use `--no-ff` option and the specific commit message "This closes #<b>&lt;pull request #&gt;</b>"" -- it ensures proper marking in the tooling. It would be nice to include additional information in the merge commit message, such as the title and summary of the pull request.
-
-At this point, you want to ensure everything is right. Test it with `mvn verify`. Run `gitk` or `git log --graph,` etc. When you are happy with how it looks, push it. This is the point of no return -- proceed with caution.
-
-    $ git push apache HEAD:master
-
-Done. You can delete the local <code>finish-pr-<b>&lt;pull-request-#&gt;</b></code> branch if you like.
-
-## Additional Projects
-
-### Website
-We use the same general review-then-commit process for changes to the Beam website, which uses [this GitHub Mirror](https://github.com/apache/incubator-beam-site). The website uses the [Jekyll](http://jekyllrb.com) framework to make website development easier. The [README file](https://github.com/apache/incubator-beam-site/blob/asf-site/README.md) in the website repository has more information on how to:
-
-* Install Jekyll
-* Make changes to the website
-* Test your changes
-
-#### Editing the website
-You can checkout the website repository with the following commands. This will allow you to edit the website in a local environment provided you have installed [Jekyll](http://jekyllrb.com) and understand how to use it.
-
-<pre><code>git clone -b asf-site https://github.com/apache/incubator-beam-site.git
-cd incubator-beam-site
-git remote add <b>&lt;GitHub_user&gt;</b> git@github.com:<b>&lt;GitHub_user&gt;</b>/incubator-beam-site.git
-git fetch --all
-git checkout -b <b>&lt;my-branch&gt;</b> origin/asf-site</code></pre>
-
-#### Committing website changes
-
-Committers can commit website changes with the following commands. **Changes to the website must follow the same process outlined above** for changes to the Apache Beam code base.
-
-<pre><code>git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-beam-site.git
-git remote rename origin github
-git config --local --add remote.github.fetch \
-&nbsp;&nbsp;&nbsp;&nbsp;'+refs/pull/*/head:refs/remotes/github/pr/*'</code></pre>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_pages/issue_tracking.md
----------------------------------------------------------------------
diff --git a/_pages/issue_tracking.md b/_pages/issue_tracking.md
deleted file mode 100644
index d030acd..0000000
--- a/_pages/issue_tracking.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: page
-title: "Issue Tracking"
-permalink: /issue_tracking/
----
-
-This project uses [JIRA](http://www.atlassian.com/software/jira) for issue tracking.
-
-Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.
-
-<code>
-<a href="https://issues.apache.org/jira/browse/BEAM">https://issues.apache.org/jira/browse/BEAM</a>
-</code>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_pages/mailing_lists.md
----------------------------------------------------------------------
diff --git a/_pages/mailing_lists.md b/_pages/mailing_lists.md
deleted file mode 100644
index d47e08b..0000000
--- a/_pages/mailing_lists.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-layout: page
-title: "Project Mailing Lists"
-permalink: /mailing_lists/
----
-
-These are the mailing lists that have been established for this project. For each list, there is a subscribe, unsubscribe, and an archive link.
-
-Name	Subscribe	Unsubscribe	Post	Archive
-	Subscribe	Unsubscribe	Post	[mail-archives.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-beam-dev/)
-	Subscribe	Unsubscribe	Post	mail-archives.apache.org
-beam-user	Subscribe	Unsubscribe	Post	mail-archives.apache.org
-
-<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>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_pages/material.md
----------------------------------------------------------------------
diff --git a/_pages/material.md b/_pages/material.md
deleted file mode 100644
index a372ce5..0000000
--- a/_pages/material.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-layout: page
-title: "Apache Beam Material"
-permalink: /material/
----
-
-This page contains project material for the Apache Beam project.
-
-## Project logos
-You can download [this archive]({{ site.baseurl }}/{{ site.downloads }}/{{ site.data.logos.archive-file }})
-containing all of the logos or download the logos individually.
-
-### Scalable Vector Graphics (SVG)
-These [SVG files](https://en.wikipedia.org/wiki/Scalable_Vector_Graphics) can
-be resized easily and are suitable for print or web use. Click on the logo to
-download it.
-
-{% for color in site.data.logos.colors %}
-#### {{ color[1] }}
-<div class="row">
-<div class="col-md-2">
-</div>
-{% for type in site.data.logos.types %}
-<div class="col-md-2">
-<div class="row">
-<a href="{{ site.baseurl }}{{ site.data.logos.logo-location }}/{{ color[0] }}/{{ type }}/beam-logo-{{ color[0] }}-{{ type }}.svg" role="button"><img style="height: 60px" src="{{ site.baseurl }}{{ site.data.logos.logo-location }}/{{ color[0] }}/{{ type }}/beam-logo-{{ color[0] }}-{{ type }}.svg" alt="beam-logo-{{ color[0] }}-{{ type }}.svg"></a>
-</div><br>
-</div>
-{% endfor %}
-</div>
-{% endfor %}
-
-
-### Portable Network Graphics (PNG)
-These [PNG files](https://en.wikipedia.org/wiki/Portable_Network_Graphics) are
-available in a number of fixed sizes and are optimized for web use.
-
-{% for color in site.data.logos.colors %}
-#### {{ color[1] }}
-<div class="row">
-<div class="col-md-2">
-</div>
-{% for type in site.data.logos.types %}
-<div class="col-md-2">
-<div class="row">
-<img style="height: 60px" src="{{ site.data.logos.logo-location }}/{{ color[0] }}/{{ type }}/beam-logo-{{ color[0] }}-{{ type }}.svg" alt="beam-logo-{{ color[0] }}-{{ type }}">
-</div><br>
-<div class="row">
-{% for size in site.data.logos.sizes %}
-<a href="{{ site.data.logos.logo-location }}/{{ color[0] }}/{{ type }}/beam-logo-{{ color[0] }}-{{ type }}-{{ size }}.png">{{ size }}x{{ size }}</a>
-{% unless forloop.last %},{% endunless %}
-{% endfor %}
-</div>
-</div>
-{% endfor %}
-</div>
-{% endfor %}
-
-## Colors and fonts
-The Apache Beam project uses predefined colors and fonts. [This document]({{ site.baseurl }}/{{ site.downloads }}/palette.pdf) has more information.

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_pages/presentation_materials.md
----------------------------------------------------------------------
diff --git a/_pages/presentation_materials.md b/_pages/presentation_materials.md
deleted file mode 100644
index 4ccb384..0000000
--- a/_pages/presentation_materials.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-layout: page
-title: "Apache Beam Presentation Materials"
-permalink: /presentation-materials/
----
-
-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.
-
-<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>
-
-## Using these materials
-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 **`View`** and selecting **`Show speaker notes`**. Some presentations have `[Long]` or `[Short]` in their name, such as the *Apache Beam Model*, which means there are two different presentations (a long and short version) depending on your needs and time constraints.
-
-If you have any questions about the these materials, please ask on the [`user@beam.incubator.apache.org`](mailto:user@beam.incubator.apache.org) mailing list.
-
-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 [`user@beam.incubator.apache.org`](mailto:user@beam.incubator.apache.org) 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.
-
-## Contributing new content
-The Apache Beam community is always looking for new core content and contributions!
-
-If you are interested in contributing new content, we recommend you first search the [Apache Beam JIRA](https://issues.apache.org/jira/browse/BEAM) to see if your idea currently has an open JIRA item. If it does not, send an email to the [`user@beam.incubator.apache.org`](mailto:user@beam.incubator.apache.org) mailing list or open a new issue in the [Apache Beam JIRA](https://issues.apache.org/jira/browse/BEAM) using the [website](https://issues.apache.org/jira/browse/BEAM/component/12328906/?selectedTab=com.atlassian.jira.jira-projects-plugin:component-summary-panel) 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.
-
-## Corrections and updates
-If you encounter missing, incorrect, or out of date material, please make a comment in the presentation or send an email to the [`user@beam.incubator.apache.org`](mailto:user@beam.incubator.apache.org) mailing list.

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_pages/public-meetings.md
----------------------------------------------------------------------
diff --git a/_pages/public-meetings.md b/_pages/public-meetings.md
deleted file mode 100644
index 2b2a1dd..0000000
--- a/_pages/public-meetings.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-layout: page
-title: "Apache Beam Public Meetings"
-permalink: /public-meetings/
----
-Apache Beam is a shared effort within the open source community. To grow and develop that effort, it helps to schedule and hold public meetings, including:
-
-* Formal meetings for the Apache Beam community for project planning and discussion
-* Informal "Meetup" events to discuss, share the vision and usefulness of Apache Beam
-
-The goal of these meetings will vary, though they will typically focus on technical discussions, community matters, and decision-making. These meetings have been held or are scheduled by the Apache Beam community.
-
-<table class="table">
-  <tr>
-      <th>Date & Time</th>
-      <th>Location</th>
-      <th>Type</th>
-      <th>Meeting materials</th>
-      <th>Notes</th>
-  </tr>
-  {% for meeting in site.data.meetings.events %}
-    <tr>
-      <td>{{ meeting.date }}<br>{{ meeting.time }}</td>
-      <td>{{ meeting.location }}</td>
-      <td>{{ meeting.type }}</td>
-      <td>
-        {% for material in meeting.materials %}
-        <div><a href="{{ material.link }}">{{ material.title }}</a></div>
-        {% endfor %}
-      </td>
-      <td>{{ meeting.notes }}</td>
-    </tr>
-  {% endfor %}
-</table>
-*This list was last updated on {{ site.data.meetings.last_updated }}.*
-
-All Apache Beam meetings are open to the public and we encourage anyone to attend. From time to time space in our event location may be limited, so preference will be given to PPMC members and others on a first-come, first-serve basis.
-
-## I want to give a public talk about Apache Beam
-To get started, we recommend you review the Apache Beam [presentation materials]({{ site.baseurl }}/presentation-materials/) page to review the content the Apache Beam community has already created. These materials will possibly save you time and energy as you create content for your event.
-
-Once you have scheduled your event, we welcome you to announce it on the [user@beam.incubator.apache.org](mailto:user@beam.incubator.apache.org) mailing list. Additionally, please open a [JIRA item](https://issues.apache.org/jira/browse/BEAM) using the `website` component with details so we can update this page.
-
-If you have any questions as you prepare for your event, we recommend you reach out to the Apache Beam community through the [dev@beam.incubator.apache.org](mailto:dev@beam.incubator.apache.org) mailing list. The Beam community can help provide feedback on your materials and promote your event.
-
-## Frequently asked questions about public meetings
-
-### How can I remotely attend these meetings?
-We are investigating methods, such as video conferencing and IRC chat, to allow anyone to attend remotely. At present we do not have an estimated date. If you are interested in this option, please send an email to the [user@beam.incubator.apache.org](mailto:user@beam.incubator.apache.org) with your ideas and recommendations.
-
-### What is a public meeting?
-Public meetings include scheduled Apache Beam Dev/PPMC meetings, Meetup events, conference talks, and other events where the public meets to discuss Beam.
-
-### How do I learn about new meetings?
-The Apache Beam community announces upcoming public meetings on the  [dev@beam.incubator.apache.org](mailto:dev@beam.incubator.apache.org) mailing list. If you want to learn about new events, we recommend you [subscribe](mailto:dev-subscribe@beam.incubator.apache.org) to that list.  If you are holding a public event, please send an email to the dev@ list.

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_pages/releases.md
----------------------------------------------------------------------
diff --git a/_pages/releases.md b/_pages/releases.md
deleted file mode 100644
index 29630f3..0000000
--- a/_pages/releases.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: default
-title: "Apache Beam Releases"
-permalink: /releases/
----
-
-# Apache Beam releases
-
-The easiest way to use Apache Beam is via one of the released versions in the
-[Maven Central Repository](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.beam%22).
-
-For example, if you are developing using Maven and want to use the SDK for
-Java with the `DirectRunner`, add the following dependencies to your
-`pom.xml` file:
-
-    <dependency>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>beam-sdks-java-core</artifactId>
-      <version>0.1.0-incubating</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>beam-runners-direct-java</artifactId>
-      <version>0.1.0-incubating</version>
-      <scope>runtime</scope>
-    </dependency>
-
-Additionally, you may want to depend on additional SDK modules, such as IO
-connectors or other extensions, and additional runners to execute your pipeline
-at scale.
-
-## Release Notes
-
-### 0.1.0-incubating
-[Source code download](https://dist.apache.org/repos/dist/release/incubator/beam/0.1.0-incubating/apache-beam-0.1.0-incubating-source-release.zip)
-
-* The first incubating release of Apache Beam.

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_pages/source_repository.md
----------------------------------------------------------------------
diff --git a/_pages/source_repository.md b/_pages/source_repository.md
deleted file mode 100644
index ac74ca2..0000000
--- a/_pages/source_repository.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: page
-title: "Apache Beam Source Repository"
-permalink: /source_repository/
----
-
-This project uses [Git](http://git-scm.com) to manage its source code.
-
-## Web Browser Access
-The following is a link to a browsable version of the source repository:
-
-    https://git-wip-us.apache.org/repos/asf/incubator-beam.git
-
-## Anonymous Access
-The source can be checked out anonymously from Git with this command (See http://git-scm.com/docs/git-clone):
-
-    $ git clone https://git-wip-us.apache.org/repos/asf/incubator-beam.git
-
-## Developer Access
-Only project developers can access the Git tree via this method (See http://git-scm.com/docs/git-clone).
-
-    $ git clone https://git-wip-us.apache.org/repos/asf/incubator-beam.git
-
-## Access from Behind a Firewall
-Refer to the documentation of the SCM used for more information about access behind a firewall.

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_pages/team.md
----------------------------------------------------------------------
diff --git a/_pages/team.md b/_pages/team.md
deleted file mode 100644
index 5cb106a..0000000
--- a/_pages/team.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-layout: page
-title: "Apache Beam Team"
-permalink: /team/
----
-
-A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.
-
-The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.
-
-{% for team in site.beam_team %}
-  <h2>{{ team.group }}</h2>
-  <p>{{ team.description }}</p>
-  <table class="table table-hover">
-    <thead>
-      <tr>
-        <th>Name</th>
-        <th>Apache ID</th>
-        <th>Email</th>
-        <th>Organization</th>
-        <th>Roles</th>
-        <th>Time Zone</th>
-      </tr>
-    </thead>
-    <tbody>
-      {% for member in team.members %}
-        <tr>
-          <th scope="row">{{ member.name }}</th>
-          <td scope="row">{{ member.apache_id }}</td>
-          <td scope="row">{{ member.email }}</td>
-          <td scope="row">{{ member.organization }}</td>
-          <td scope="row">{{ member.roles }}</td>
-          <td scope="row">{{ member.time_zone }}</td>
-        </tr>
-      {% endfor %}
-    </tbody>
-  </table>
-{% endfor %}

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_posts/2016-03-17-capability-matrix.md
----------------------------------------------------------------------
diff --git a/_posts/2016-03-17-capability-matrix.md b/_posts/2016-03-17-capability-matrix.md
index 5d3b216..939f704 100644
--- a/_posts/2016-03-17-capability-matrix.md
+++ b/_posts/2016-03-17-capability-matrix.md
@@ -579,9 +579,9 @@ With initial code drops complete ([Dataflow SDK and Runner](https://github.com/a
 
 While we’d love to have a world where all runners support the full suite of semantics included in the Beam Model (formerly referred to as the [Dataflow Model](http://www.vldb.org/pvldb/vol8/p1792-Akidau.pdf)), practically speaking, there will always be certain features that some runners can’t provide. For example, a Hadoop-based runner would be inherently batch-based and may be unable to (easily) implement support for unbounded collections. However, that doesn’t prevent it from being extremely useful for a large set of uses. In other cases, the implementations provided by one runner may have slightly different semantics that those provided by another (e.g. even though the current suite of runners all support exactly-once delivery guarantees, an [Apache Samza](http://samza.apache.org/) runner, which would be a welcome addition, would currently only support at-least-once).
 
-To help clarify things, we’ve been working on enumerating the key features of the Beam model in a [capability matrix]({{ site.baseurl }}/capability-matrix/) for all existing runners, categorized around the four key questions addressed by the model: <span class="wwwh-what-dark">What</span> / <span class="wwwh-where-dark">Where</span> / <span class="wwwh-when-dark">When</span> / <span class="wwwh-how-dark">How</span> (if you’re not familiar with those questions, you might want to read through [Streaming 102](http://oreilly.com/ideas/the-world-beyond-batch-streaming-102) for an overview). This table will be maintained over time as the model evolves, our understanding grows, and runners are created or features added.
+To help clarify things, we’ve been working on enumerating the key features of the Beam model in a [capability matrix]({{ site.baseurl }}/learn/runners/capability-matrix/) for all existing runners, categorized around the four key questions addressed by the model: <span class="wwwh-what-dark">What</span> / <span class="wwwh-where-dark">Where</span> / <span class="wwwh-when-dark">When</span> / <span class="wwwh-how-dark">How</span> (if you’re not familiar with those questions, you might want to read through [Streaming 102](http://oreilly.com/ideas/the-world-beyond-batch-streaming-102) for an overview). This table will be maintained over time as the model evolves, our understanding grows, and runners are created or features added.
 
-Included below is a summary snapshot of our current understanding of the capabilities of the existing runners (see the [live version]({{ site.baseurl }}/capability-matrix/) for full details, descriptions, and Jira links); since integration is still under way, the system as whole isn’t yet in a completely stable, usable state. But that should be changing in the near future, and we’ll be updating loud and clear on this blog when the first supported Beam 1.0 release happens.
+Included below is a summary snapshot of our current understanding of the capabilities of the existing runners (see the [live version]({{ site.baseurl }}/learn/runners/capability-matrix/) for full details, descriptions, and Jira links); since integration is still under way, the system as whole isn’t yet in a completely stable, usable state. But that should be changing in the near future, and we’ll be updating loud and clear on this blog when the first supported Beam 1.0 release happens.
 
 In the meantime, these tables should help clarify where we expect to be in the very near term, and help guide expectations about what existing runners are capable of, and what features runner implementers will be tackling next.
 

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_posts/2016-04-03-presentation-materials.md
----------------------------------------------------------------------
diff --git a/_posts/2016-04-03-presentation-materials.md b/_posts/2016-04-03-presentation-materials.md
index 448830d..3bc05cb 100644
--- a/_posts/2016-04-03-presentation-materials.md
+++ b/_posts/2016-04-03-presentation-materials.md
@@ -9,7 +9,7 @@ authors:
   - takidau
 ---
 
-Are you interested in giving a presentation about Apache Beam? Perhaps you want to talk about Apache Beam at a local Meetup or a convention. Excellent!  The Apache Beam community is excited to expand and grow the community. To help kickstart this process, we are excited to announce an initial set of [Apache Beam presentation materials]({{ site.baseurl }}/presentation-materials/) which anyone can use to give a presentation about Apache Beam.
+Are you interested in giving a presentation about Apache Beam? Perhaps you want to talk about Apache Beam at a local Meetup or a convention. Excellent!  The Apache Beam community is excited to expand and grow the community. To help kickstart this process, we are excited to announce an initial set of [Apache Beam presentation materials]({{ site.baseurl }}/learn/presentation-materials/) which anyone can use to give a presentation about Apache Beam.
 
 <!--more-->
 
@@ -21,4 +21,4 @@ As a community, we want to build a shared collection of high quality presentatio
 * Using Apache Beam with runners
     * [Google Cloud Dataflow](https://goo.gl/2ay8mi)
 
-As Apache Beam grows, so will this repository of presentation materials. We are excited to add new materials as the Apache Beam ecosystem grows with new runners, SDKs, and so on. If you are interested in contributing content or have a request, please see the [Apache Beam presentation materials]({{ site.baseurl }}/presentation-materials/) page or email the [`user@beam.incubator.apache.org`](mailto:user@beam.incubator.apache.org) mailing list with your ideas or questions.
+As Apache Beam grows, so will this repository of presentation materials. We are excited to add new materials as the Apache Beam ecosystem grows with new runners, SDKs, and so on. If you are interested in contributing content or have a request, please see the [Apache Beam presentation materials]({{ site.baseurl }}/learn/presentation-materials/) page or email the [`user@beam.incubator.apache.org`](mailto:user@beam.incubator.apache.org) mailing list with your ideas or questions.

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/_posts/2016-06-15-first-release.md
----------------------------------------------------------------------
diff --git a/_posts/2016-06-15-first-release.md b/_posts/2016-06-15-first-release.md
index 0ebe8dc..fe11cae 100644
--- a/_posts/2016-06-15-first-release.md
+++ b/_posts/2016-06-15-first-release.md
@@ -20,7 +20,7 @@ making them readily available for our users. The initial release includes the
 SDK for Java, along with three runners: Apache Flink, Apache Spark and Google
 Cloud Dataflow, a fully-managed cloud service. The release is available both
 in the [Maven Central Repository](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.beam%22),
-as well as a download from the [project’s website]({{ site.baseurl }}/releases/).
+as well as a download from the [project’s website]({{ site.baseurl }}/use/releases/).
 
 The goal of this release was process-oriented. In particular, the Beam
 community wanted to release existing functionality to our users, build and
@@ -35,5 +35,5 @@ anticipated, perhaps one every 1-2 months.
 As always, the Beam community welcomes feedback. Stabilization, usability and
 the developer experience will be our focus for the next several months. If you
 have any comments or discover any issues, I’d like to invite you to reach out
-to us via [user’s mailing list]({{ site.baseurl }}/mailing_lists/) or the
+to us via [user’s mailing list]({{ site.baseurl }}/use/mailing-lists/) or the
 [Apache JIRA issue tracker](https://issues.apache.org/jira/browse/BEAM/).

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/blog/index.md
----------------------------------------------------------------------
diff --git a/blog/index.md b/blog/index.md
new file mode 100644
index 0000000..0334a17
--- /dev/null
+++ b/blog/index.md
@@ -0,0 +1,36 @@
+---
+layout: default
+title: "Beam Blog"
+permalink: /blog/
+---
+
+# Apache Beam Blog
+
+This is the blog for the Apache Beam project. This blog contains news and updates
+for the project.
+
+{% for post in site.posts %}
+{% assign authors = post.authors %}
+
+### <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+<i>{{ post.date | date: "%b %-d, %Y" }}{% if authors %} • {% include authors-list.md %}{% endif %}</i>
+
+{{ post.excerpt }}
+
+<!-- Render a "read more" button if the post is longer than the excerpt -->
+{% capture content_words %}
+  {{ post.content | number_of_words }}
+{% endcapture %}
+{% capture excerpt_words %}
+  {{ post.excerpt | number_of_words }}
+{% endcapture %}
+{% if excerpt_words != content_words %}
+<p>
+<a class="btn btn-default btn-sm" href="{{ post.url }}" role="button">
+Read more&nbsp;<span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span>
+</a>
+</p>
+{% endif %}
+
+<hr>
+{% endfor %}

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/coming-soon.md
----------------------------------------------------------------------
diff --git a/coming-soon.md b/coming-soon.md
index 9c81b0b..6054d3a 100644
--- a/coming-soon.md
+++ b/coming-soon.md
@@ -1,11 +1,6 @@
 ---
 layout: default
 ---
-<div class="alert alert-info alert-dismissible" role="alert">
-<span class="glyphicon glyphicon-flag" aria-hidden="true"></span>
-<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-The Apache Beam project is in the process of bootstrapping. This includes the creation of project resources, the refactoring of the initial code submission, and the formulation of project documentation, planning, and design documents. For more information about Beam see the <a href="/getting_started/">getting started page</a>.
-</div>
 
 # Documentation Coming Soon
 

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/contribute/contribution-guide.md
----------------------------------------------------------------------
diff --git a/contribute/contribution-guide.md b/contribute/contribution-guide.md
new file mode 100644
index 0000000..a0dcb50
--- /dev/null
+++ b/contribute/contribution-guide.md
@@ -0,0 +1,264 @@
+---
+layout: default
+title: "Beam Contribution Guide"
+permalink: /contribute/contribution-guide/
+redirect_from: /contribution-guide/
+---
+
+# Apache Beam Contribution Guide
+
+* TOC
+{:toc}
+
+The Apache Beam community welcomes contributions from anyone with a passion for data processing! Beam has many different opportunities for contributions -- write new examples, add new user-facing libraries (new statistical libraries, new IO connectors, etc), work on the core programming model, build specific runners (Apache Flink, Apache Spark, Google Cloud Dataflow, etc), or participate on the documentation effort.
+
+We use a review-then-commit workflow in Beam for all contributions.
+
+![Alt text]({{ "/images/contribution-guide-1.png" | prepend: site.baseurl }} "Workflow image")
+
+**For larger contributions or those that affect multiple components:**
+
+1. **Engage**: We encourage you to work with the Beam community on the [Apache JIRA issue tracker](https://issues.apache.org/jira/browse/BEAM) and [developer’s mailing list](http://beam.incubator.apache.org/mailing_lists/) to identify good areas for contribution.
+1. **Design:** More complicated contributions will likely benefit from some early discussion in order to scope and design them well.
+
+**For all contributions:**
+
+1. **Code:** The best part ;-)
+1. **Review:** Submit a pull request with your contribution to our [GitHub mirror](https://github.com/apache/incubator-beam/). Work with a committer to review and iterate on the code, if needed.
+1. **Commit:** A Beam committer merges the pull request into our [Apache repository](https://git-wip-us.apache.org/repos/asf/incubator-beam.git).
+
+We look forward to working with you!
+
+## Engage
+
+### Mailing list(s)
+We discuss design and implementation issues on dev@beam.incubator.apache.org mailing list, which is archived [here](http://mail-archives.apache.org/mod_mbox/incubator-beam-dev/). Join by emailing [`dev-subscribe@beam.incubator.apache.org`](mailto:dev-subscribe@beam.incubator.apache.org).
+
+If interested, you can also join [`user@beam.incubator.apache.org`](http://mail-archives.apache.org/mod_mbox/incubator-beam-user/) and [`commits@beam.incubator.apache.org`](http://mail-archives.apache.org/mod_mbox/incubator-beam-commits/) too.
+
+### Apache JIRA
+We use [Apache JIRA](https://issues.apache.org/jira/browse/BEAM) as an issue tracking and project management tool, as well as a way to communicate among a very diverse and distributed set of contributors. To be able to gather feedback, avoid frustration, and avoid duplicated efforts all Beam-related work should be tracked there.
+
+If you do not already have an Apache JIRA account, sign up [here](https://issues.apache.org/jira/).
+
+If a quick [search](https://issues.apache.org/jira/issues/?jql=project%3DBEAM%20AND%20text%20~%20%22the%20thing%20I%20want%20to%20contribute%22) doesn’t turn up an existing JIRA issue for the work you want to contribute, create it. Please discuss your proposal with a committer or the [component lead](https://issues.apache.org/jira/browse/BEAM/?selectedTab=com.atlassian.jira.jira-projects-plugin:components-panel) in JIRA or, alternatively, on the developer mailing list.
+
+If there’s an existing JIRA issue for your intended contribution, please comment about your intended work. Once the work is understood, a committer will assign the issue to you. (If you don’t have a JIRA role yet, you’ll be added to the “contributor” role.) If an issue is currently assigned, please check with the current assignee before reassigning.
+
+For moderate or large contributions, you should not start coding or writing a design doc unless there is a corresponding JIRA issue assigned to you for that work. Simple changes, like fixing typos, do not require an associated issue.
+
+## Design
+To avoid potential frustration during the code review cycle, we encourage you to clearly scope and design non-trivial contributions with the Beam community before you start coding.
+
+Generally, the JIRA issue is the best place to gather relevant design docs, comments, or references. It’s great to explicitly include relevant stakeholders early in the conversation. For designs that may be generally interesting, we also encourage conversations on the developer’s mailing list.
+
+We suggest using [Google Docs](https://docs.google.com/) for sharing designs that may benefit from diagrams or comments. Please remember to make the document world-commentable and add a link to it from the relevant JIRA issue. We also track Beam-related documents in [this shared folder](https://drive.google.com/folderview?id=0B-IhJZh9Ab52OFBVZHpsNjc4eXc&usp=sharing).
+
+## Code
+To contribute code to Apache Beam, you’ll have to do a few administrative steps once, and then follow a few guidelines for each contribution.
+
+### One-time Setup
+
+#### [Potentially] Submit Contributor License Agreement
+Apache Software Foundation (ASF) desires that all contributors of ideas, code, or documentation to the Apache projects complete, sign, and submit an [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.txt) (ICLA). The purpose of this agreement is to clearly define the terms under which intellectual property has been contributed to the ASF and thereby allow us to defend the project should there be a legal dispute regarding the software at some future time.
+
+We require you to have an ICLA on file with the Apache Secretary for larger contributions only. For smaller ones, however, we rely on  [clause five](http://www.apache.org/licenses/LICENSE-2.0#contributions) of the Apache License, Version 2.0, describing licensing of intentionally submitted contributions and do not require an ICLA in that case.
+
+#### Obtain a GitHub account
+We use GitHub’s pull request functionality to review proposed code changes.
+
+If you do not already have a personal GitHub account, sign up [here](https://github.com/join).
+
+#### Fork the repository on GitHub
+Go to the [Beam GitHub mirror](https://github.com/apache/incubator-beam/) and fork the repository to your own private account. This will be your private workspace for staging changes.
+
+We recommend enabling Travis-CI continuous integration coverage on your private fork in order to easily test your changes before proposing a pull request. Go to [Travis-CI](https://travis-ci.org), log in with your GitHub account, and enable coverage for your repository.
+
+#### Clone the repository locally
+You are now ready to create the development environment on your local machine. Feel free to repeat these steps on all machines that you want to use for development.
+
+We assume you are using SSH-based authentication with GitHub. If necessary, exchange SSH keys with GitHub by following [their instructions](https://help.github.com/articles/generating-an-ssh-key/).
+
+Clone Beam’s read-only GitHub mirror.
+
+    $ git clone https://github.com/apache/incubator-beam.git
+    $ cd incubator-beam
+
+Add your forked repository as an additional Git remote, where you’ll push your changes.
+
+<pre><code>$ git remote add <b>&lt;GitHub_user&gt;</b> git@github.com:<b>&lt;GitHub_user&gt;</b>/incubator-beam.git</code></pre>
+
+You are now ready to start developing!
+
+### Create a branch in your fork
+You’ll work on your contribution in a branch in your own (forked) repository. Create a local branch, initialized with the state of the branch you expect your changes to be merged into. Keep in mind that we use several branches, including `master`, feature-specific, and release-specific branches. If you are unsure, initialize with the state of the `master` branch.
+
+<pre><code>$ git fetch --all
+$ git checkout -b <b>&lt;my-branch&gt;</b> origin/master</code></pre>
+
+At this point, you can start making and committing changes to this branch in a standard way.
+
+### Syncing and pushing your branch
+Periodically while you work, and certainly before submitting a pull request, you should update your branch with the most recent changes to the target branch.
+
+    $ git pull --rebase
+
+Remember to always use `--rebase` parameter to avoid extraneous merge commits.
+
+To push your local, committed changes to your (forked) repository on GitHub, run:
+
+<pre><code>$ git push <b>&lt;GitHub_user&gt; &lt;my-branch&gt;</b></code></pre>
+
+### Testing
+All code should have appropriate unit testing coverage. New code should have new tests in the same contribution. Bug fixes should include a regression test to prevent the issue from reoccurring.
+
+For contributions to the Java code, run unit tests locally via Maven. Alternatively, you can use Travis-CI.
+
+    $ mvn clean verify
+
+## Review
+Once the initial code is complete and the tests pass, it’s time to start the code review process. We review and discuss all code, no matter who authors it. It’s a great way to build community, since you can learn from other developers, and they become familiar with your contribution. It also builds a strong project by encouraging a high quality bar and keeping code consistent throughout the project.
+
+### Create a pull request
+Organize your commits to make your reviewer’s job easier. Use the following command to re-order, squash, edit, or change description of individual commits.
+
+    $ git rebase -i origin/master
+
+Navigate to the [Beam GitHub mirror](https://github.com/apache/incubator-beam) to create a pull request. The title of the pull request should be strictly in the following format:
+
+<pre><code>[BEAM-<b>&lt;JIRA-issue-#&gt;</b>] Title of the pull request</code></pre>
+
+Please include a descriptive pull request message to help make the reviewer’s job easier. It’s fine to refer to existing design docs or the contents of the associated JIRA as appropriate.
+
+If you know a good committer to review your pull request, please make a comment like the following. If not, don’t worry -- a committer will pick it up.
+
+<pre><code>Hi @<b>&lt;GitHub-reviewer-username&gt;</b>, can you please take a look?</code></pre>
+
+When choosing a reviewer, think about who is the expert on the relevant code, who the stakeholders are for this change, and who else would benefit from becoming familiar with the code. If you’d appreciate comments from additional folks but already have a main reviewer, you can explicitly cc them using <code>@<b>&lt;GitHub-reviewer-username&gt;</b></code>.
+
+### Code Review and Revision
+During the code review process, don’t rebase your branch or otherwise modify published commits, since this can remove existing comment history and be confusing to the reviewer. When you make a revision, always push it in a new commit.
+
+Our GitHub mirror automatically provides pre-commit testing coverage using Jenkins and Travis-CI. Please make sure those tests pass; the contribution cannot be merged otherwise.
+
+### LGTM
+Once the reviewer is happy with the change, they’ll respond with an LGTM (“*looks good to me!*”). At this point, the committer will take over, possibly make some additional touch ups, and merge your changes into the codebase.
+
+In the case both the author and the reviewer are committers, either can merge the pull request. Just be sure to communicate clearly whose responsibility it is in this particular case.
+
+Thank you for your contribution to Beam!
+
+### Deleting your branch
+Once the pull request is merged into the Beam repository, you can safely delete the branch locally and purge it from your forked repository.
+
+From another local branch, run:
+
+<pre><code>$ git fetch --all
+$ git branch -d <b>&lt;my-branch&gt;</b>
+$ git push <b>&lt;GitHub_user&gt;</b> --delete <b>&lt;my-branch&gt;</b></code></pre>
+
+## Commit (committers only)
+Once the code has been peer reviewed by a committer, the next step is for the committer to merge it into the [authoritative Apache repository](https://git-wip-us.apache.org/repos/asf/incubator-beam.git), not the read-only GitHub mirror. (In the case that the author is also a committer, it is acceptable for either the author or reviewer to do the merge. Just be explicit about whose job it is!)
+
+Pull requests should not be merged before the review has received an explicit LGTM from another committer. Exceptions to this rule may be made rarely, on a case-by-case basis only, in the committer’s discretion for situations such as build breakages.
+
+Committers should never commit anything without going through a pull request, since that would bypass test coverage and potentially cause the build to fail due to checkstyle, etc. In addition, pull requests ensure that changes are communicated properly and potential flaws or improvements can be spotted. **Always go through the pull request, even if you won’t wait for the code review.** Even then, comments can be provided in the pull requests after it has been merged to work on follow-ups.
+
+Committing is currently a manual process, but we are investigating tools to automate pieces of this process.
+
+### One-time Setup
+Add the Apache Git remote in your local clone, by running:
+
+    $ git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-beam.git
+
+We recommend renaming the `origin` remote to `github`, to avoid confusion when dealing with this many remotes.
+
+    $ git remote rename origin github
+
+For the `github` remote, add an additional fetch reference, which will cause every pull request to be made available as a remote branch in your workspace.
+
+    $ git config --local --add remote.github.fetch \
+        '+refs/pull/*/head:refs/remotes/github/pr/*'
+
+You can confirm your configuration by running the following command.
+
+<pre><code>$ git remote -v
+apache	https://git-wip-us.apache.org/repos/asf/incubator-beam.git (fetch)
+apache	https://git-wip-us.apache.org/repos/asf/incubator-beam.git (push)
+github	https://github.com/apache/incubator-beam.git (fetch)
+github	https://github.com/apache/incubator-beam.git (push)
+<b>&lt;username&gt;</b>	git@github.com:<b>&lt;username&gt;</b>/beam.git (fetch)
+<b>&lt;username&gt;</b>	git@github.com:<b>&lt;username&gt;</b>/beam.git (push)</code></pre>
+
+### Contributor License Agreement
+If you are merging a larger contribution, please make sure that the contributor has an ICLA on file with the Apache Secretary. You can view the list of committers [here](http://home.apache.org/phonebook.html?unix=committers), as well as [ICLA-signers who aren’t yet committers](http://home.apache.org/unlistedclas.html).
+
+For smaller contributions, however, this is not required. In this case, we rely on [clause five](http://www.apache.org/licenses/LICENSE-2.0#contributions) of the Apache License, Version 2.0, describing licensing of intentionally submitted contributions.
+
+### Tests
+Before merging, please make sure both Travis-CI and Jenkins tests pass, as visible in the GitHub pull request. Do not merge the pull request otherwise.
+
+### Finishing touches
+At some point in the review process, you should take the pull request over and complete any outstanding work that is either minor, stylistic, or otherwise outside the expertise of the contributor.
+
+Fetch references from all remote repositories, and checkout the specific pull request branch.
+
+<pre>
+</code>$ git fetch --all
+$ git checkout -b finish-pr-<b>&lt;pull-request-#&gt;</b> github/pr/<b>&lt;pull-request-#&gt;</b></code></pre>
+
+At this point, you can commit any final touches to the pull request. For example, you should:
+
+* Rebase on current state of the target branch.
+* Fix typos.
+* Reorganize commits that are part of the pull request, such as squash them into fewer commits that make sense for a historical perspective.
+
+You will often need the following command, assuming you’ll be merging changes into the `master` branch:
+
+    $ git rebase -i apache/master
+
+Please make sure to retain authorship of original commits to give proper credit to the contributor. You are welcome to change their commits slightly (e.g., fix a typo) and squash them, but more substantive changes should be a separate commit and review.
+
+### Merge process
+Once you are ready to merge, fetch all remotes, checkout the destination branch and merge the changes.
+
+<pre><code>$ git fetch --all
+$ git checkout apache/master
+$ git merge --no-ff \
+&nbsp;&nbsp;&nbsp;&nbsp;-m $'[BEAM-<b>&lt;JIRA-issue-#&gt;</b>] <b>&lt;Title&gt;</b>\n\nThis closes #<b>&lt;pull-request-#&gt;</b>' \
+&nbsp;&nbsp;&nbsp;&nbsp;finish-pr-<b>&lt;pull-request-#&gt;</b></code></pre>
+
+Always use `--no-ff` option and the specific commit message "This closes #<b>&lt;pull request #&gt;</b>"" -- it ensures proper marking in the tooling. It would be nice to include additional information in the merge commit message, such as the title and summary of the pull request.
+
+At this point, you want to ensure everything is right. Test it with `mvn verify`. Run `gitk` or `git log --graph,` etc. When you are happy with how it looks, push it. This is the point of no return -- proceed with caution.
+
+    $ git push apache HEAD:master
+
+Done. You can delete the local <code>finish-pr-<b>&lt;pull-request-#&gt;</b></code> branch if you like.
+
+## Additional Projects
+
+### Website
+We use the same general review-then-commit process for changes to the Beam website, which uses [this GitHub Mirror](https://github.com/apache/incubator-beam-site). The website uses the [Jekyll](http://jekyllrb.com) framework to make website development easier. The [README file](https://github.com/apache/incubator-beam-site/blob/asf-site/README.md) in the website repository has more information on how to:
+
+* Install Jekyll
+* Make changes to the website
+* Test your changes
+
+#### Editing the website
+You can checkout the website repository with the following commands. This will allow you to edit the website in a local environment provided you have installed [Jekyll](http://jekyllrb.com) and understand how to use it.
+
+<pre><code>git clone -b asf-site https://github.com/apache/incubator-beam-site.git
+cd incubator-beam-site
+git remote add <b>&lt;GitHub_user&gt;</b> git@github.com:<b>&lt;GitHub_user&gt;</b>/incubator-beam-site.git
+git fetch --all
+git checkout -b <b>&lt;my-branch&gt;</b> origin/asf-site</code></pre>
+
+#### Committing website changes
+
+Committers can commit website changes with the following commands. **Changes to the website must follow the same process outlined above** for changes to the Apache Beam code base.
+
+<pre><code>git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-beam-site.git
+git remote rename origin github
+git config --local --add remote.github.fetch \
+&nbsp;&nbsp;&nbsp;&nbsp;'+refs/pull/*/head:refs/remotes/github/pr/*'</code></pre>

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/contribute/index.md
----------------------------------------------------------------------
diff --git a/contribute/index.md b/contribute/index.md
new file mode 100644
index 0000000..6d8f99c
--- /dev/null
+++ b/contribute/index.md
@@ -0,0 +1,23 @@
+---
+layout: default
+title: 'Contribute to Beam'
+redirect_from: '/docs/contribute'
+---
+
+# Contribute to the Apache Beam Project
+
+Learn how you can contribute to Beam:
+
+#### [Contribution Guide]({{ site.baseurl }}/contribute/contribution-guide/)
+Learn how to contribute to the Beam project.
+
+#### [Technical Vision](https://goo.gl/nk5OM0)
+Learn about the technical vision for Beam, including the designs for SDKs and runners, and the development process.
+
+
+#### Resources
+Resources for contributing to Beam, including mailing lists, the main GitHub repo, and the issues tracker.
+
+* [Mailing Lists]({{ site.baseurl }}/use/mailing-lists/)
+* [Source Repository]({{ site.baseurl }}/contribute/source-repository)
+* [Issue Tracking]({{ site.baseurl }}/use/issue-tracking/)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/contribute/source-repository.md
----------------------------------------------------------------------
diff --git a/contribute/source-repository.md b/contribute/source-repository.md
new file mode 100644
index 0000000..2670a4e
--- /dev/null
+++ b/contribute/source-repository.md
@@ -0,0 +1,28 @@
+---
+layout: default
+title: "Beam Source Repository"
+permalink: /contribute/source-repository/
+redirect_from: /source_repository/
+---
+
+# Apache Beam Source Repository
+
+This project uses [Git](http://git-scm.com) to manage its source code.
+
+## Web Browser Access
+The following is a link to a browsable version of the source repository:
+
+    https://git-wip-us.apache.org/repos/asf/incubator-beam.git
+
+## Anonymous Access
+The source can be checked out anonymously from Git with this command (See http://git-scm.com/docs/git-clone):
+
+    $ git clone https://git-wip-us.apache.org/repos/asf/incubator-beam.git
+
+## Developer Access
+Only project developers can access the Git tree via this method (See http://git-scm.com/docs/git-clone).
+
+    $ git clone https://git-wip-us.apache.org/repos/asf/incubator-beam.git
+
+## Access from Behind a Firewall
+Refer to the documentation of the SCM used for more information about access behind a firewall.

http://git-wip-us.apache.org/repos/asf/incubator-beam-site/blob/a4ebd228/docs/contribute/index.md
----------------------------------------------------------------------
diff --git a/docs/contribute/index.md b/docs/contribute/index.md
deleted file mode 100644
index d804809..0000000
--- a/docs/contribute/index.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-layout: default
----
-<p>
-  <div class="alert alert-info alert-dismissible" role="alert">
-  <span class="glyphicon glyphicon-flag" aria-hidden="true"></span>
-  <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-  The Apache Beam project is in the process of bootstrapping. This includes the creation of project resources, the refactoring of the initial code submission, and the formulation of project documentation, planning, and design documents. For more information about Beam see the <a href="/getting_started/">getting started page</a>.
-  </div>
-</p>
-
-# Contribute to the Beam Project
-
-Learn how you can contribute to Beam:
-
-#### [Contribution Guide]({{ site.baseurl }}/contribution-guide/)
-Learn how to contribute to the Beam source.
-
-#### [Technical Vision](https://goo.gl/nk5OM0)
-Learn about the technical vision for Beam, including the designs for SDKs and runners, and the development process.
-
-* Model Design
-* SDK Development
-* Runner Development
-
-#### Resources
-Resources for contributing to Beam, including mailing lists, the main GitHub repo, and the issues tracker.
-
-* [Mailing Lists]({{ site.baseurl }}/mailing_lists/)
-* [Source Repository]({{ site.baseurl }}/source_repository)
-* [Issue Tracking]({{ site.baseurl }}/issue_tracking/)
-
-#### Project Materials
-Beam project materials and media resources.
-
-* Logos
-* [Presentation Materials]({{ site.baseurl }}/presentation-materials/)
-* [Public Meetings]({{ site.baseurl }}/public-meetings/)
-
-#### [Team]({{ site.baseurl }}/team/)
-Meet the Apache Beam community and the Beam committers.
\ No newline at end of file



Mime
View raw message