You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/12/28 00:41:54 UTC

[2/6] beam-site git commit: Remove incubating references

Remove incubating references


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

Branch: refs/heads/asf-site
Commit: 50e379319c2620be3ff68e006314b8ae13a2ba9c
Parents: 40c8199
Author: Davor Bonaci <da...@google.com>
Authored: Tue Dec 27 14:01:36 2016 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Tue Dec 27 16:41:11 2016 -0800

----------------------------------------------------------------------
 README.md                                       |  6 +--
 _config.yml                                     |  4 +-
 src/_posts/2016-03-17-capability-matrix.md      |  2 +-
 src/_posts/2016-04-03-presentation-materials.md |  2 +-
 src/_posts/2016-05-18-splitAtFraction-method.md |  2 +-
 .../2016-10-12-strata-hadoop-world-and-beam.md  |  4 +-
 src/_posts/2016-10-20-test-stream.md            |  6 +--
 src/contribute/contribution-guide.md            | 34 ++++++-------
 src/contribute/maturity-model.md                | 14 +++---
 src/contribute/presentation-materials.md        |  8 +--
 src/contribute/release-guide.md                 | 10 ++--
 src/contribute/source-repository.md             |  6 +--
 src/contribute/testing.md                       | 52 ++++++++++----------
 src/contribute/work-in-progress.md              |  6 +--
 .../pipelines/test-your-pipeline.md             |  8 +--
 src/documentation/programming-guide.md          | 10 ++--
 src/documentation/runners/capability-matrix.md  |  2 +-
 src/documentation/runners/dataflow.md           |  2 +-
 src/documentation/runners/direct.md             |  4 +-
 src/documentation/runners/flink.md              |  2 +-
 src/get-started/mobile-gaming-example.md        | 12 ++---
 src/get-started/support.md                      | 18 +++----
 src/get-started/wordcount-example.md            |  8 +--
 src/index.md                                    | 10 +---
 tools/common_job_properties.groovy              |  4 +-
 tools/job_seed.groovy                           |  2 +-
 26 files changed, 115 insertions(+), 123 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 13bc8f1..ba70ef5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Apache Beam (incubating) website
+# Apache Beam website
 
-This is the website for [Apache Beam](http://beam.incubator.apache.org) (incubating).
+This is the website for [Apache Beam](http://beam.apache.org/).
 
 ## About this site
 
@@ -10,7 +10,7 @@ for additional formatting capabilities, this website uses
 
 This website is hosted at:
 
-    http://beam.incubator.apache.org
+    http://beam.apache.org
 
 
 ### Repository Structure

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index 3dcc970..3766b1c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,7 +6,7 @@
 # 'jekyll serve'. If you change this file, please restart the server process.
 
 # Site settings
-title: Apache Beam (incubating)
+title: Apache Beam
 description: > # this means to ignore newlines until "baseurl:"
   Apache Beam is an open source, unified model and set of language-specific
   SDKs for defining and executing data processing workflows, and also data
@@ -25,7 +25,7 @@ source: src
 destination: content
 
 # the base hostname & protocol for your site
-url: "http://beam.incubator.apache.org"
+url: "http://beam.apache.org"
 
 twitter_username: apachebeam
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/_posts/2016-03-17-capability-matrix.md
----------------------------------------------------------------------
diff --git a/src/_posts/2016-03-17-capability-matrix.md b/src/_posts/2016-03-17-capability-matrix.md
index 939f704..a125103 100644
--- a/src/_posts/2016-03-17-capability-matrix.md
+++ b/src/_posts/2016-03-17-capability-matrix.md
@@ -573,7 +573,7 @@ capability-matrix-snapshot:
 
 ---
 
-With initial code drops complete ([Dataflow SDK and Runner](https://github.com/apache/incubator-beam/pull/1), [Flink Runner](https://github.com/apache/incubator-beam/pull/12), [Spark Runner](https://github.com/apache/incubator-beam/pull/42)) and expressed interest in runner implementations for [Storm](https://issues.apache.org/jira/browse/BEAM-9), [Hadoop](https://issues.apache.org/jira/browse/BEAM-19), and [Gearpump](https://issues.apache.org/jira/browse/BEAM-79) (amongst others), we wanted to start addressing a big question in the Apache Beam (incubating) community: what capabilities will each runner be able to support?
+With initial code drops complete ([Dataflow SDK and Runner](https://github.com/apache/beam/pull/1), [Flink Runner](https://github.com/apache/beam/pull/12), [Spark Runner](https://github.com/apache/beam/pull/42)) and expressed interest in runner implementations for [Storm](https://issues.apache.org/jira/browse/BEAM-9), [Hadoop](https://issues.apache.org/jira/browse/BEAM-19), and [Gearpump](https://issues.apache.org/jira/browse/BEAM-79) (amongst others), we wanted to start addressing a big question in the Apache Beam (incubating) community: what capabilities will each runner be able to support?
 
 <!--more-->
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/_posts/2016-04-03-presentation-materials.md
----------------------------------------------------------------------
diff --git a/src/_posts/2016-04-03-presentation-materials.md b/src/_posts/2016-04-03-presentation-materials.md
index 3bc05cb..2a535e6 100644
--- a/src/_posts/2016-04-03-presentation-materials.md
+++ b/src/_posts/2016-04-03-presentation-materials.md
@@ -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 }}/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.
+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.apache.org`](mailto:user@beam.apache.org) mailing list with your ideas or questions.

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/_posts/2016-05-18-splitAtFraction-method.md
----------------------------------------------------------------------
diff --git a/src/_posts/2016-05-18-splitAtFraction-method.md b/src/_posts/2016-05-18-splitAtFraction-method.md
index 649af74..331bf89 100644
--- a/src/_posts/2016-05-18-splitAtFraction-method.md
+++ b/src/_posts/2016-05-18-splitAtFraction-method.md
@@ -14,4 +14,4 @@ This morning, Eugene and Malo from the Google Cloud Dataflow team posted [*No sh
 
 In a large batch processing job with many tasks executing in parallel, some of the tasks -- the stragglers -- can take a much longer time to complete than others, perhaps due to imperfect splitting of the work into parallel chunks when issuing the job. Typically, waiting for stragglers means that the overall job completes later than it should, and may also reserve too many machines that may be underutilized at the end. Cloud Dataflow\u2019s dynamic work rebalancing can mitigate stragglers in most cases.
 
-What I\u2019d like to highlight for the Apache Beam (incubating) community is that Cloud Dataflow\u2019s dynamic work rebalancing is implemented using *runner-specific* control logic on top of Beam\u2019s *runner-independent* [`BoundedSource API`](https://github.com/apache/incubator-beam/blob/9fa97fb2491bc784df53fb0f044409dbbc2af3d7/sdks/java/core/src/main/java/org/apache/beam/sdk/io/BoundedSource.java). Specifically, to steal work from a straggler, a runner need only call the reader\u2019s [`splitAtFraction method`](https://github.com/apache/incubator-beam/blob/3edae9b8b4d7afefb5c803c19bb0a1c21ebba89d/sdks/java/core/src/main/java/org/apache/beam/sdk/io/BoundedSource.java#L266). This will generate a new source containing leftover work, and then the runner can pass that source off to another idle worker. As Beam matures, I hope that other runners are interested in figuring out whether these APIs can help them improve performance, implementing dynamic work rebalancing, and collaborating on API ch
 anges that will help solve other pain points.
+What I\u2019d like to highlight for the Apache Beam (incubating) community is that Cloud Dataflow\u2019s dynamic work rebalancing is implemented using *runner-specific* control logic on top of Beam\u2019s *runner-independent* [`BoundedSource API`](https://github.com/apache/beam/blob/9fa97fb2491bc784df53fb0f044409dbbc2af3d7/sdks/java/core/src/main/java/org/apache/beam/sdk/io/BoundedSource.java). Specifically, to steal work from a straggler, a runner need only call the reader\u2019s [`splitAtFraction method`](https://github.com/apache/beam/blob/3edae9b8b4d7afefb5c803c19bb0a1c21ebba89d/sdks/java/core/src/main/java/org/apache/beam/sdk/io/BoundedSource.java#L266). This will generate a new source containing leftover work, and then the runner can pass that source off to another idle worker. As Beam matures, I hope that other runners are interested in figuring out whether these APIs can help them improve performance, implementing dynamic work rebalancing, and collaborating on API changes that will help
  solve other pain points.

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/_posts/2016-10-12-strata-hadoop-world-and-beam.md
----------------------------------------------------------------------
diff --git a/src/_posts/2016-10-12-strata-hadoop-world-and-beam.md b/src/_posts/2016-10-12-strata-hadoop-world-and-beam.md
index f190762..b78fa4a 100644
--- a/src/_posts/2016-10-12-strata-hadoop-world-and-beam.md
+++ b/src/_posts/2016-10-12-strata-hadoop-world-and-beam.md
@@ -12,13 +12,13 @@ Tyler Akidau and I gave a [three-hour tutorial](http://conferences.oreilly.com/s
 
 <img src="{{ "/images/blog/IMG_20160927_170956.jpg" | prepend: site.baseurl }}" alt="Exercise time">
 
-If you want to take a look at the tutorial materials, we\u2019ve put them up [on GitHub](https://github.com/eljefe6a/beamexample). This includes the [actual slides](https://github.com/eljefe6a/beamexample/blob/master/BeamTutorial/slides.pdf) as well as the [exercises](https://github.com/eljefe6a/beamexample/tree/master/BeamTutorial/src/main/java/org/apache/beam/examples/tutorial/game) that we covered. If you\u2019re looking to learn a little about Beam, this is a good way to start. The exercises are based on an imaginary mobile game where data needs processing and are based on code in the [Beam examples directory](https://github.com/apache/incubator-beam/tree/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game). The code has TODOs for where you need to fill in code or there are full sample solutions to look over our code. You can run these examples on your own machine or on a cluster using a runner that Beam supports.
+If you want to take a look at the tutorial materials, we\u2019ve put them up [on GitHub](https://github.com/eljefe6a/beamexample). This includes the [actual slides](https://github.com/eljefe6a/beamexample/blob/master/BeamTutorial/slides.pdf) as well as the [exercises](https://github.com/eljefe6a/beamexample/tree/master/BeamTutorial/src/main/java/org/apache/beam/examples/tutorial/game) that we covered. If you\u2019re looking to learn a little about Beam, this is a good way to start. The exercises are based on an imaginary mobile game where data needs processing and are based on code in the [Beam examples directory](https://github.com/apache/beam/tree/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game). The code has TODOs for where you need to fill in code or there are full sample solutions to look over our code. You can run these examples on your own machine or on a cluster using a runner that Beam supports.
 
 I want to share some of takeaways I had about Beam during the conference.
 
 The Data Engineers are looking to Beam as a way to [future-proof](https://www.oreilly.com/ideas/future-proof-and-scale-proof-your-code), meaning that code is portable between the various Big Data frameworks. In fact, many of the attendees were still on Hadoop MapReduce and looking to transition to a new framework. They\u2019re realizing that continually rewriting code isn\u2019t the most productive approach.
 
-Data Scientists are really interested in using Beam. They interested in having a single API for doing analysis instead of several different APIs. We talked about Beam\u2019s progress on the Python API. If you want to take a peek, it\u2019s being actively developed on a [feature branch](https://github.com/apache/incubator-beam/tree/python-sdk). As Beam matures, we\u2019re looking to add other supported languages.
+Data Scientists are really interested in using Beam. They interested in having a single API for doing analysis instead of several different APIs. We talked about Beam\u2019s progress on the Python API. If you want to take a peek, it\u2019s being actively developed on a [feature branch](https://github.com/apache/beam/tree/python-sdk). As Beam matures, we\u2019re looking to add other supported languages.
 
 We heard [loud and clear](https://twitter.com/jessetanderson/status/781124173108305920) from Beam users that great runner support is crucial to adoption. We have great Apache Flink support. During the conference we had some more volunteers offer their help on the Spark runner.
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/_posts/2016-10-20-test-stream.md
----------------------------------------------------------------------
diff --git a/src/_posts/2016-10-20-test-stream.md b/src/_posts/2016-10-20-test-stream.md
index 418f556..a013582 100644
--- a/src/_posts/2016-10-20-test-stream.md
+++ b/src/_posts/2016-10-20-test-stream.md
@@ -45,8 +45,8 @@ from the Mobile Gaming example series.
 
 ## LeaderBoard and the Mobile Gaming Example
 
-[LeaderBoard](https://github.com/apache/incubator-beam/blob/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java#L177)
-is part of the [Beam mobile gaming examples](https://github.com/apache/incubator-beam/tree/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game)
+[LeaderBoard](https://github.com/apache/beam/blob/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java#L177)
+is part of the [Beam mobile gaming examples](https://github.com/apache/beam/tree/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game)
 (and [walkthroughs]({{ site.baseurl }}/get-started/mobile-gaming-example/))
 which produces a continuous accounting of user and team scores. User scores are
 calculated over the lifetime of the program, while team scores are calculated
@@ -63,7 +63,7 @@ The Beam testing infrastructure provides the
 [PAssert]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/org/apache/beam/sdk/testing/PAssert.html)
 methods, which assert properties about the contents of a PCollection from within
 a pipeline. We have expanded this infrastructure to include
-[TestStream](https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/TestStream.java),
+[TestStream](https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/TestStream.java),
 which is a PTransform that performs a series of events, consisting of adding
 additional elements to a pipeline, advancing the watermark of the TestStream,
 and advancing the pipeline processing time clock. TestStream permits tests which

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/contribute/contribution-guide.md
----------------------------------------------------------------------
diff --git a/src/contribute/contribution-guide.md b/src/contribute/contribution-guide.md
index 6be6bf3..ba3f5e1 100644
--- a/src/contribute/contribution-guide.md
+++ b/src/contribute/contribution-guide.md
@@ -24,15 +24,15 @@ We use a review-then-commit workflow in Beam for all contributions.
 **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).
+1. **Review:** Submit a pull request with your contribution to our [GitHub mirror](https://github.com/apache/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/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](https://lists.apache.org/list.html?dev@beam.apache.org). Join by emailing [`dev-subscribe@beam.incubator.apache.org`](mailto:dev-subscribe@beam.incubator.apache.org).
+We discuss design and implementation issues on dev@beam.apache.org mailing list, which is archived [here](https://lists.apache.org/list.html?dev@beam.apache.org). Join by emailing [`dev-subscribe@beam.apache.org`](mailto:dev-subscribe@beam.apache.org).
 
 If interested, you can also join the other [mailing lists]({{ site.baseurl }}/use/mailing-lists/) too.
 
@@ -71,7 +71,7 @@ We use GitHub\u2019s 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.
+Go to the [Beam GitHub mirror](https://github.com/apache/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.
 
@@ -82,12 +82,12 @@ We assume you are using SSH-based authentication with GitHub. If necessary, exch
 
 Clone Beam\u2019s read-only GitHub mirror.
 
-    $ git clone https://github.com/apache/incubator-beam.git
+    $ git clone https://github.com/apache/beam.git
     $ cd incubator-beam
 
 Add your forked repository as an additional Git remote, where you\u2019ll push your changes.
 
-	$ git remote add <GitHub_user> git@github.com:<GitHub_user>/incubator-beam.git
+	$ git remote add <GitHub_user> git@github.com:<GitHub_user>/beam.git
 
 You are now ready to start developing!
 
@@ -203,7 +203,7 @@ Organize your commits to make your reviewer\u2019s job easier. Use the following co
 
     $ 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:
+Navigate to the [Beam GitHub mirror](https://github.com/apache/beam) to create a pull request. The title of the pull request should be strictly in the following format:
 
 	[BEAM-<JIRA-issue-#>] <Title of the pull request>
 
@@ -237,7 +237,7 @@ From another local branch, run:
 	$ git push <GitHub_user> --delete <my-branch>
 
 ## 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!)
+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/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\u2019s discretion for situations such as build breakages.
 
@@ -248,7 +248,7 @@ Committing is currently a manual process, but we are investigating tools to auto
 ### 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
+    $ git remote add apache https://git-wip-us.apache.org/repos/asf/beam.git
 
 We recommend renaming the `origin` remote to `github`, to avoid confusion when dealing with this many remotes.
 
@@ -262,10 +262,10 @@ For the `github` remote, add an additional fetch reference, which will cause eve
 You can confirm your configuration by running the following command.
 
 	$ 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)
+	apache	https://git-wip-us.apache.org/repos/asf/beam.git (fetch)
+	apache	https://git-wip-us.apache.org/repos/asf/beam.git (push)
+	github	https://github.com/apache/beam.git (fetch)
+	github	https://github.com/apache/beam.git (push)
 	<username>	git@github.com:<username>/beam.git (fetch)
 	<username>	git@github.com:<username>/beam.git (push)
 
@@ -380,17 +380,17 @@ A new SDK should:
 
 ### Website
 
-The Beam website is in the [Beam Site GitHub mirror](https://github.com/apache/incubator-beam-site) repository in the `asf-site` branch (_not_ `master`). 
+The Beam website is in the [Beam Site GitHub mirror](https://github.com/apache/beam-site) repository in the `asf-site` branch (_not_ `master`). 
 
 Issues are tracked in the [website](https://issues.apache.org/jira/browse/BEAM/component/12328906) component in JIRA.
 
 #### One-time Setup
 
-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 set up the required dependencies for your development environment.
+The [README file](https://github.com/apache/beam-site/blob/asf-site/README.md) in the website repository has more information on how to set up the required dependencies for your development environment.
 
 The general guidelines for cloning a repository can be adjusted to use the `asf-site` branch of `incubator-beam-site`:
 
-	$ git clone -b asf-site https://github.com/apache/incubator-beam-site.git
+	$ git clone -b asf-site https://github.com/apache/beam-site.git
 	$ cd incubator-beam-site
 	$ git remote add <GitHub_user> git@github.com:<GitHub_user>/incubator-beam-site.git
 	$ git fetch --all
@@ -412,7 +412,7 @@ Both of these commands will cause the `content/` directory to be generated. Merg
 
 	$ git checkout -- content
 
-When you are ready, submit a pull request using the [Beam Site GitHub mirror](https://github.com/apache/incubator-beam-site), including the JIRA issue as usual.
+When you are ready, submit a pull request using the [Beam Site GitHub mirror](https://github.com/apache/beam-site), including the JIRA issue as usual.
 
 During review, committers will patch in your PR, generate the static `content/`, and review the changes.
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/contribute/maturity-model.md
----------------------------------------------------------------------
diff --git a/src/contribute/maturity-model.md b/src/contribute/maturity-model.md
index 57c5662..9123c15 100644
--- a/src/contribute/maturity-model.md
+++ b/src/contribute/maturity-model.md
@@ -29,27 +29,27 @@ The following table summarizes project's self-assessment against the Apache Matu
     <tr>
       <td><p>CD10</p></td>
       <td><p>The project produces Open Source software, for distribution to the public at no charge. [1]</p></td>
-      <td><p><b>YES.</b> The project source code is <a href="https://github.com/apache/incubator-beam/blob/master/LICENSE">licensed</a> under the Apache License, version 2.0.</p></td>
+      <td><p><b>YES.</b> The project source code is <a href="https://github.com/apache/beam/blob/master/LICENSE">licensed</a> under the Apache License, version 2.0.</p></td>
     </tr>
     <tr>
       <td><p>CD20</p></td>
       <td><p>The project&#39;s code is easily discoverable and publicly accessible.</p></td>
-      <td><p><b>YES.</b> Linked from the <a href="{{ site.baseurl }}/contribute/source-repository/">website</a>, available via <a href="https://git-wip-us.apache.org/repos/asf?p%3Dincubator-beam.git">git.apache.org</a> and <a href="https://github.com/apache/incubator-beam">GitHub</a>.</p></td>
+      <td><p><b>YES.</b> Linked from the <a href="{{ site.baseurl }}/contribute/source-repository/">website</a>, available via <a href="https://git-wip-us.apache.org/repos/asf?p%3Dbeam.git">git.apache.org</a> and <a href="https://github.com/apache/beam">GitHub</a>.</p></td>
     </tr>
     <tr>
       <td><p>CD30</p></td>
       <td><p>The code can be built in a reproducible way using widely available standard tools.</p></td>
-      <td><p><b>YES.</b> The project uses Apache Maven and can be built via <a href="https://github.com/apache/incubator-beam/blob/master/README.md">the standard &ldquo;mvn install&rdquo; on any platform</a>.</p></td>
+      <td><p><b>YES.</b> The project uses Apache Maven and can be built via <a href="https://github.com/apache/beam/blob/master/README.md">the standard &ldquo;mvn install&rdquo; on any platform</a>.</p></td>
     </tr>
     <tr>
       <td><p>CD40</p></td>
       <td><p>The full history of the project&#39;s code is available via a source code control system, in a way that allows any released version to be recreated.</p></td>
-      <td><p><b>YES.</b> The project uses a <a href="https://github.com/apache/incubator-beam">git repository</a> and releases are <a href="https://github.com/apache/incubator-beam/releases">tagged</a>.</p><p><b>Even further</b>, all release candidates are <a href="https://github.com/apache/incubator-beam/releases">tagged</a> as well.</p></td>
+      <td><p><b>YES.</b> The project uses a <a href="https://github.com/apache/beam">git repository</a> and releases are <a href="https://github.com/apache/beam/releases">tagged</a>.</p><p><b>Even further</b>, all release candidates are <a href="https://github.com/apache/beam/releases">tagged</a> as well.</p></td>
     </tr>
     <tr>
       <td><p>CD50</p></td>
       <td><p>The provenance of each line of code is established via the source code control system, in a reliable way based on strong authentication of the committer. When third-party contributions are committed, commit messages provide reliable information about the code provenance. [2]</p></td>
-      <td><p><b>YES.</b> The project uses a <a href="https://github.com/apache/incubator-beam">git repository</a>, managed by Apache Infra, ensuring provenance of each line of code to a committer. Third party contributions are accepted in accordance with the <a href="{{ site.baseurl }}/contribute/contribution-guide/">Contribution Guide</a> only.</p></td>
+      <td><p><b>YES.</b> The project uses a <a href="https://github.com/apache/beam">git repository</a>, managed by Apache Infra, ensuring provenance of each line of code to a committer. Third party contributions are accepted in accordance with the <a href="{{ site.baseurl }}/contribute/contribution-guide/">Contribution Guide</a> only.</p></td>
     </tr>
 
     <tr>
@@ -58,7 +58,7 @@ The following table summarizes project's self-assessment against the Apache Matu
     <tr>
       <td><p>LC10</p></td>
       <td><p>The code is released under the Apache License, version 2.0.</p></td>
-      <td><p><b>YES.</b> Source distributions clearly state <a href="https://github.com/apache/incubator-beam/blob/master/LICENSE">license</a>. Convenience binaries clearly state <a href="https://github.com/apache/incubator-beam/blob/master/pom.xml#L41">license</a>.</p></td>
+      <td><p><b>YES.</b> Source distributions clearly state <a href="https://github.com/apache/beam/blob/master/LICENSE">license</a>. Convenience binaries clearly state <a href="https://github.com/apache/beam/blob/master/pom.xml#L41">license</a>.</p></td>
     </tr>
     <tr>
       <td><p>LC20</p></td>
@@ -116,7 +116,7 @@ The following table summarizes project's self-assessment against the Apache Matu
     <tr>
       <td><p>QU10</p></td>
       <td><p>The project is open and honest about the quality of its code. Various levels of quality and maturity for various modules are natural and acceptable as long as they are clearly communicated.</p></td>
-      <td><p><b>YES.</b> The project records all bugs in the <a href="https://issues.apache.org/jira/browse/BEAM">Apache&rsquo;s JIRA issue tracker</a>.</p><p><b>Even further</b>, the project <a href="{{ site.baseurl }}/get-started/downloads/">clearly documents</a> that APIs are subject to change before the first stable release, and which APIs are <a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/annotations/Experimental.java#L47">@Experimental</a>.</p></td>
+      <td><p><b>YES.</b> The project records all bugs in the <a href="https://issues.apache.org/jira/browse/BEAM">Apache&rsquo;s JIRA issue tracker</a>.</p><p><b>Even further</b>, the project <a href="{{ site.baseurl }}/get-started/downloads/">clearly documents</a> that APIs are subject to change before the first stable release, and which APIs are <a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/annotations/Experimental.java#L47">@Experimental</a>.</p></td>
     </tr>
     <tr>
       <td><p>QU20</p></td>

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/contribute/presentation-materials.md
----------------------------------------------------------------------
diff --git a/src/contribute/presentation-materials.md b/src/contribute/presentation-materials.md
index aa86391..4295b58 100644
--- a/src/contribute/presentation-materials.md
+++ b/src/contribute/presentation-materials.md
@@ -18,14 +18,14 @@ Are you interested in learning more about Apache Beam or giving a talk about Apa
 ## 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.
+If you have any questions about the these materials, please ask on the [`user@beam.apache.org`](mailto:user@beam.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.
+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.apache.org`](mailto:user@beam.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.
+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.apache.org`](mailto:user@beam.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.
+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.apache.org`](mailto:user@beam.apache.org) mailing list.

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/contribute/release-guide.md
----------------------------------------------------------------------
diff --git a/src/contribute/release-guide.md b/src/contribute/release-guide.md
index 68b47b5..0848e78 100644
--- a/src/contribute/release-guide.md
+++ b/src/contribute/release-guide.md
@@ -271,7 +271,7 @@ Use Maven Javadoc plugin to generate the new Java reference manual, as follows:
         -Dmaven.javadoc.failOnError=false \
         -DexcludePackageNames="org.apache.beam.examples,org.apache.beam.runners.dataflow.internal,org.apache.beam.runners.flink.examples,org.apache.beam.runners.flink.translation,org.apache.beam.runners.spark.examples,org.apache.beam.runners.spark.translation,org.apache.beam.sdk.microbenchmarks.coders.generated,org.apache.beam.sdk.microbenchmarks.transforms.generated,org.openjdk.jmh.infra.generated"
 
-By default, the Javadoc will be generated in `target/site/apidocs/`. Let `${JAVADOC_ROOT}` be the absolute path to `apidocs`. ([Pull request #1015](https://github.com/apache/incubator-beam/pull/1015) will hopefully simplify this process.)
+By default, the Javadoc will be generated in `target/site/apidocs/`. Let `${JAVADOC_ROOT}` be the absolute path to `apidocs`. ([Pull request #1015](https://github.com/apache/beam/pull/1015) will hopefully simplify this process.)
 
 Please carefully review the generated Javadoc. Check for completeness and presence of all relevant packages and `package-info.java`; consider adding less relevant packages to the `excludePackageNames` configuration. The index page is generated at `${JAVADOC_ROOT}/index.html`.
 
@@ -306,7 +306,7 @@ Once you have built and individually reviewed the release candidate, please shar
 Start the review-and-vote thread on the dev@ mailing list. Here\u2019s an email template; please adjust as you see fit.
 
     From: Release Manager
-    To: dev@beam.incubator.apache.org
+    To: dev@beam.apache.org
     Subject: [VOTE] Release 1.2.3, release candidate #3
 
     Hi everyone,
@@ -338,7 +338,7 @@ If there are any issues found in the release candidate, reply on the vote thread
 If there are no issues, reply on the vote thread to close the voting. Then, tally the votes in a separate email. Here\u2019s an email template; please adjust as you see fit.
 
     From: Release Manager
-    To: dev@beam.incubator.apache.org
+    To: dev@beam.apache.org
     Subject: [RESULT] [VOTE] Release 1.2.3, release candidate #3
 
     I'm happy to announce that we have unanimously approved this release.
@@ -357,7 +357,7 @@ While in incubation, the Apache Incubator PMC must also vote on each release, us
 
     From: Release Manager
     To: general@incubator.apache.org
-    Cc: dev@beam.incubator.apache.org
+    Cc: dev@beam.apache.org
     Subject: [VOTE] Apache Beam release 1.2.3-incubating
 
     Hi everyone,
@@ -392,7 +392,7 @@ If passed, close the voting and summarize the results.
 
     From: Release Manager
     To: general@incubator.apache.org
-    Cc: dev@beam.incubator.apache.org
+    Cc: dev@beam.apache.org
     Subject: [RESULT] [VOTE] Apache Beam release 1.2.3-incubating
 
     There are XXX approving votes, all of which are binding:

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/contribute/source-repository.md
----------------------------------------------------------------------
diff --git a/src/contribute/source-repository.md b/src/contribute/source-repository.md
index 2670a4e..6901054 100644
--- a/src/contribute/source-repository.md
+++ b/src/contribute/source-repository.md
@@ -12,17 +12,17 @@ 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
+    https://git-wip-us.apache.org/repos/asf/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
+    $ git clone https://git-wip-us.apache.org/repos/asf/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
+    $ git clone https://git-wip-us.apache.org/repos/asf/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/beam-site/blob/50e37931/src/contribute/testing.md
----------------------------------------------------------------------
diff --git a/src/contribute/testing.md b/src/contribute/testing.md
index 3743df3..6d43337 100644
--- a/src/contribute/testing.md
+++ b/src/contribute/testing.md
@@ -11,7 +11,7 @@ permalink: /contribute/testing/
 
 ## Overview
 
-Apache Beam (incubating) is a rapidly-maturing software project with a strong
+Apache Beam is a rapidly-maturing software project with a strong
 commitment to testing. Consequently, it has many testing-related needs. It
 requires precommit tests to ensure code going into the repository meets a
 certain quality bar and it requires ongoing postcommit tests to make sure that
@@ -50,7 +50,7 @@ details on those testing types.
    </td>
    <td>DoFnTester
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java#L1325">BigQueryIOTest</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java#L1325">BigQueryIOTest</a>
    </td>
    <td>Unit
    </td>
@@ -62,9 +62,9 @@ details on those testing types.
    </td>
    <td>Correctly Reads Input
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/SourceTestUtils.java#L128">SourceTestUtils.readFromSource</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/SourceTestUtils.java#L128">SourceTestUtils.readFromSource</a>
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/84a0dd1714028370befa80dea16f720edce05252/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOTest.java#L972">TextIOTest</a>
+   <td><a href="https://github.com/apache/beam/blob/84a0dd1714028370befa80dea16f720edce05252/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOTest.java#L972">TextIOTest</a>
    </td>
    <td>Unit
    </td>
@@ -76,9 +76,9 @@ details on those testing types.
    </td>
    <td>Correct Initial Splitting
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/SourceTestUtils.java#L201">SourceTestUtils.assertSourcesEqualReferenceSource</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/SourceTestUtils.java#L201">SourceTestUtils.assertSourcesEqualReferenceSource</a>
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/8b1e64a668489297e11926124c4eee6c8f69a3a7/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java#L339">BigtableTest</a>
+   <td><a href="https://github.com/apache/beam/blob/8b1e64a668489297e11926124c4eee6c8f69a3a7/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java#L339">BigtableTest</a>
    </td>
    <td>Unit
    </td>
@@ -90,9 +90,9 @@ details on those testing types.
    </td>
    <td>Correct Dynamic Splitting
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/SourceTestUtils.java#L541">SourceTestUtils. assertSplitAtFractionExhaustive</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/SourceTestUtils.java#L541">SourceTestUtils. assertSplitAtFractionExhaustive</a>
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/84a0dd1714028370befa80dea16f720edce05252/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOTest.java#L1021">TextIOTest</a>
+   <td><a href="https://github.com/apache/beam/blob/84a0dd1714028370befa80dea16f720edce05252/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOTest.java#L1021">TextIOTest</a>
    </td>
    <td>Unit
    </td>
@@ -106,7 +106,7 @@ details on those testing types.
    </td>
    <td>@NeedsRunner Test
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java#L1199">ParDoTest</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java#L1199">ParDoTest</a>
    </td>
    <td>@NeedsRunner
    </td>
@@ -120,7 +120,7 @@ details on those testing types.
    </td>
    <td>E2E Test
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java#L76">WordCountIT</a>
+   <td><a href="https://github.com/apache/beam/blob/master/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java#L76">WordCountIT</a>
    </td>
    <td>E2E
    </td>
@@ -134,7 +134,7 @@ details on those testing types.
    </td>
    <td>Unit / @NeedsRunner Test
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/84a0dd1714028370befa80dea16f720edce05252/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java#L646">FakeBigtableService in BigtableTest</a>
+   <td><a href="https://github.com/apache/beam/blob/84a0dd1714028370befa80dea16f720edce05252/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableIOTest.java#L646">FakeBigtableService in BigtableTest</a>
    </td>
    <td>Unit / @NeedsRunner
    </td>
@@ -148,7 +148,7 @@ details on those testing types.
    </td>
    <td>E2E Test
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/84a0dd1714028370befa80dea16f720edce05252/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableReadIT.java#L40">BigtableReadIT</a>
+   <td><a href="https://github.com/apache/beam/blob/84a0dd1714028370befa80dea16f720edce05252/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigtable/BigtableReadIT.java#L40">BigtableReadIT</a>
    </td>
    <td>E2E
    </td>
@@ -160,9 +160,9 @@ details on those testing types.
    </td>
    <td>Correctness
    </td>
-   <td>E2E Test, <a href="https://github.com/apache/incubator-beam/blob/master/runners/pom.xml#L47">@RunnableonService</a>
+   <td>E2E Test, <a href="https://github.com/apache/beam/blob/master/runners/pom.xml#L47">@RunnableonService</a>
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java#L78">WordCountIT</a>, <a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java">ParDoTest</a>
+   <td><a href="https://github.com/apache/beam/blob/master/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java#L78">WordCountIT</a>, <a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java">ParDoTest</a>
    </td>
    <td>E2E, @RunnableonService
    </td>
@@ -174,9 +174,9 @@ details on those testing types.
    </td>
    <td>Encoding/decoding elements
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java">CoderProperties</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java">CoderProperties</a>
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java">NullableCoderTest</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java">NullableCoderTest</a>
    </td>
    <td>Unit
    </td>
@@ -188,9 +188,9 @@ details on those testing types.
    </td>
    <td>Serialization/deserialization of Coder
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java">CoderProperties</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java">CoderProperties</a>
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java">NullableCoderTest</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java">NullableCoderTest</a>
    </td>
    <td>Unit
    </td>
@@ -202,9 +202,9 @@ details on those testing types.
    </td>
    <td>Sizing of elements
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java">CoderProperties</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java">CoderProperties</a>
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java">NullableCoderTest</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java">NullableCoderTest</a>
    </td>
    <td>Unit
    </td>
@@ -216,9 +216,9 @@ details on those testing types.
    </td>
    <td>Deterministic
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java">CoderProperties</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java">CoderProperties</a>
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java">NullableCoderTest</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java">NullableCoderTest</a>
    </td>
    <td>Unit
    </td>
@@ -230,9 +230,9 @@ details on those testing types.
    </td>
    <td>Structural value equality
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java">CoderProperties</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/CoderProperties.java">CoderProperties</a>
    </td>
-   <td><a href="https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java">NullableCoderTest</a>
+   <td><a href="https://github.com/apache/beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/NullableCoderTest.java">NullableCoderTest</a>
    </td>
    <td>Unit
    </td>
@@ -259,7 +259,7 @@ For precommit testing, Beam uses
 [Jenkins](https://builds.apache.org/view/Beam/),
 [Travis](http://travis-ci.org/apache/incubator-beam), and a code coverage tool
 called [Coveralls](https://coveralls.io/github/apache/incubator-beam), hooked up
-to [Github](https://github.com/apache/incubator-beam), to ensure that pull
+to [Github](https://github.com/apache/beam), to ensure that pull
 requests meet a certain quality bar. These precommits verify correctness via two
 of the below testing tools: unit tests (with coverage monitored by Coveralls)
 and E2E tests. We run the full slate of unit tests in precommit, ensuring
@@ -290,7 +290,7 @@ tests run periodically, with timing defined in their Jenkins configurations.
 Adding new postcommit E2E tests is generally as easy as adding a \*IT.java file
 to the repository - Failsafe will notice it and run it - but if you want to do
 more interesting things, take a look at
-[WordCountIT.java](https://github.com/apache/incubator-beam/blob/master/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java).
+[WordCountIT.java](https://github.com/apache/beam/blob/master/examples/java/src/test/java/org/apache/beam/examples/WordCountIT.java).
 
 Postcommit test results can be found in
 [Jenkins](https://builds.apache.org/view/Beam/).

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/contribute/work-in-progress.md
----------------------------------------------------------------------
diff --git a/src/contribute/work-in-progress.md b/src/contribute/work-in-progress.md
index 634821a..258f87c 100644
--- a/src/contribute/work-in-progress.md
+++ b/src/contribute/work-in-progress.md
@@ -24,8 +24,8 @@ Current branches include:
 
 | Feature | Branch | JIRA Component | More Info |
 | ---- | ---- | ---- | ---- |
-| Apache Gearpump Runner | [gearpump-runner](https://github.com/apache/incubator-beam/tree/gearpump-runner) | [runner-gearpump](https://issues.apache.org/jira/browse/BEAM/component/12330829) | [README](https://github.com/apache/incubator-beam/blob/gearpump-runner/runners/gearpump/README.md) |
-| Python SDK | [python-sdk](https://github.com/apache/incubator-beam/tree/python-sdk) | [sdk-py](https://issues.apache.org/jira/browse/BEAM/component/12328910) | [README](https://github.com/apache/incubator-beam/blob/python-sdk/sdks/python/README.md) |
-| Apache Spark 2.0 Runner | [runners-spark2](https://github.com/apache/incubator-beam/tree/runners-spark2) | - | [thread](https://lists.apache.org/thread.html/e38ac4e4914a6cb1b865b1f32a6ca06c2be28ea4aa0f6b18393de66f@%3Cdev.beam.apache.org%3E) |
+| Apache Gearpump Runner | [gearpump-runner](https://github.com/apache/beam/tree/gearpump-runner) | [runner-gearpump](https://issues.apache.org/jira/browse/BEAM/component/12330829) | [README](https://github.com/apache/beam/blob/gearpump-runner/runners/gearpump/README.md) |
+| Python SDK | [python-sdk](https://github.com/apache/beam/tree/python-sdk) | [sdk-py](https://issues.apache.org/jira/browse/BEAM/component/12328910) | [README](https://github.com/apache/beam/blob/python-sdk/sdks/python/README.md) |
+| Apache Spark 2.0 Runner | [runners-spark2](https://github.com/apache/beam/tree/runners-spark2) | - | [thread](https://lists.apache.org/thread.html/e38ac4e4914a6cb1b865b1f32a6ca06c2be28ea4aa0f6b18393de66f@%3Cdev.beam.apache.org%3E) |
 {:.table}
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/documentation/pipelines/test-your-pipeline.md
----------------------------------------------------------------------
diff --git a/src/documentation/pipelines/test-your-pipeline.md b/src/documentation/pipelines/test-your-pipeline.md
index 247c52c..0145d4d 100644
--- a/src/documentation/pipelines/test-your-pipeline.md
+++ b/src/documentation/pipelines/test-your-pipeline.md
@@ -27,13 +27,13 @@ The Beam SDKs provide a number of ways to unit test your pipeline code, from the
 *   You can test an entire [Composite Transform]({{ site.baseurl }}/documentation/programming-guide/#transforms-composite) as a unit.
 *   You can perform an end-to-end test for an entire pipeline.
 
-To support unit testing, the Beam SDK for Java provides a number of test classes in the [testing package](https://github.com/apache/incubator-beam/tree/master/sdks/java/core/src/test/java/org/apache/beam/sdk). You can use these tests as references and guides.
+To support unit testing, the Beam SDK for Java provides a number of test classes in the [testing package](https://github.com/apache/beam/tree/master/sdks/java/core/src/test/java/org/apache/beam/sdk). You can use these tests as references and guides.
 
 ## Testing Individual DoFn Objects
 
 The code in your pipeline's `DoFn` functions runs often, and often across multiple Compute Engine instances. Unit-testing your `DoFn` objects before running them using a runner service can save a great deal of debugging time and energy.
 
-The Beam SDK for Java provides a convenient way to test an individual `DoFn` called [DoFnTester](https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTesterTest.java), which is included in the SDK `Transforms` package.
+The Beam SDK for Java provides a convenient way to test an individual `DoFn` called [DoFnTester](https://github.com/apache/beam/blob/master/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/DoFnTesterTest.java), which is included in the SDK `Transforms` package.
 
 `DoFnTester`uses the [JUnit](http://junit.org) framework. To use `DoFnTester`, you'll need to do the following:
 
@@ -136,7 +136,7 @@ To test a composite transform you've created, you can use the following pattern:
 
 ### TestPipeline
 
-[TestPipeline](https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/TestPipeline.java) is a class included in the Beam Java SDK specifically for testing transforms. For tests, use `TestPipeline` in place of `Pipeline` when you create the pipeline object. Unlike `Pipeline.create`, `TestPipeline.create` handles setting `PipelineOptions` interally.
+[TestPipeline](https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/TestPipeline.java) is a class included in the Beam Java SDK specifically for testing transforms. For tests, use `TestPipeline` in place of `Pipeline` when you create the pipeline object. Unlike `Pipeline.create`, `TestPipeline.create` handles setting `PipelineOptions` interally.
 
 You create a `TestPipeline` as follows:
 
@@ -178,7 +178,7 @@ Any code that uses `PAssert` must link in `JUnit` and `Hamcrest`. If you're usin
 </dependency>
 ```
 
-For more information on how these classes work, see the [org.apache.beam.sdk.testing](http://beam.incubator.apache.org/documentation/sdks/javadoc/0.3.0-incubating/org/apache/beam/sdk/testing/package-summary.html) package documentation.
+For more information on how these classes work, see the [org.apache.beam.sdk.testing](http://beam.apache.org/documentation/sdks/javadoc/0.3.0-incubating/org/apache/beam/sdk/testing/package-summary.html) package documentation.
 
 ### An Example Test for a Composite Transform
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/documentation/programming-guide.md
----------------------------------------------------------------------
diff --git a/src/documentation/programming-guide.md b/src/documentation/programming-guide.md
index 18e7800..7eb5f39 100644
--- a/src/documentation/programming-guide.md
+++ b/src/documentation/programming-guide.md
@@ -62,13 +62,13 @@ When you run your Beam driver program, the Pipeline Runner that you designate co
 
 ## <a name="pipeline"></a>Creating the Pipeline
 
-The `Pipeline` abstraction encapsulates all the data and steps in your data processing task. Your Beam driver program typically starts by constructing a [Pipeline](https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java) object, and then using that object as the basis for creating the pipeline's data sets as `PCollection`s and its operations as `Transform`s.
+The `Pipeline` abstraction encapsulates all the data and steps in your data processing task. Your Beam driver program typically starts by constructing a [Pipeline](https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java) object, and then using that object as the basis for creating the pipeline's data sets as `PCollection`s and its operations as `Transform`s.
 
 To use Beam, your driver program must first create an instance of the Beam SDK class `Pipeline` (typically in the `main()` function). When you create your `Pipeline`, you'll also need to set some **configuration options**. You can set your pipeline's configuration options programatically, but it's often easier to set the options ahead of time (or read them from the command line) and pass them to the `Pipeline` object when you create the object.
 
 The pipeline configuration options determine, among other things, the `PipelineRunner` that determines where the pipeline gets executed: locally, or using a distributed back-end of your choice. Depending on where your pipeline gets executed and what your specifed Runner requires, the options can also help you specify other aspects of execution.
 
-To set your pipeline's configuration options and create the pipeline, create an object of type [PipelineOptions](https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptions.java) and pass it to `Pipeline.Create()`. The most common way to do this is by parsing arguments from the command-line:
+To set your pipeline's configuration options and create the pipeline, create an object of type [PipelineOptions](https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptions.java) and pass it to `Pipeline.Create()`. The most common way to do this is by parsing arguments from the command-line:
 
 ```java
 public static void main(String[] args) {
@@ -85,7 +85,7 @@ The Beam SDKs contain various subclasses of `PipelineOptions` that correspond to
 
 ## <a name="pcollection"></a>Working with PCollections
 
-The [PCollection](https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollection.java) abstraction represents a potentially distributed, multi-element data set. You can think of a `PCollection` as "pipeline" data; Beam transforms use `PCollection` objects as inputs and outputs. As such, if you want to work with data in your pipeline, it must be in the form of a `PCollection`.
+The [PCollection](https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollection.java) abstraction represents a potentially distributed, multi-element data set. You can think of a `PCollection` as "pipeline" data; Beam transforms use `PCollection` objects as inputs and outputs. As such, if you want to work with data in your pipeline, it must be in the form of a `PCollection`.
 
 After you've created your `Pipeline`, you'll need to begin by creating at least one `PCollection` in some form. The `PCollection` you create serves as the input for the first operation in your pipeline.
 
@@ -379,7 +379,7 @@ Thus, `GroupByKey` represents a transform from a multimap (multiple keys to indi
 
 #### <a name="transforms-combine"></a>Using Combine
 
-<span class="language-java">[`Combine`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/sdk/transforms/Combine.html)</span><span class="language-python">[`Combine`](https://github.com/apache/incubator-beam/blob/python-sdk/sdks/python/apache_beam/transforms/core.py)</span> is a Beam transform for combining collections of elements or values in your data. `Combine` has variants that work on entire `PCollection`s, and some that combine the values for each key in `PCollection`s of key/value pairs.
+<span class="language-java">[`Combine`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/sdk/transforms/Combine.html)</span><span class="language-python">[`Combine`](https://github.com/apache/beam/blob/python-sdk/sdks/python/apache_beam/transforms/core.py)</span> is a Beam transform for combining collections of elements or values in your data. `Combine` has variants that work on entire `PCollection`s, and some that combine the values for each key in `PCollection`s of key/value pairs.
 
 When you apply a `Combine` transform, you must provide the function that contains the logic for combining the elements or values. The combining function should be commutative and associative, as the function is not necessarily invoked exactly once on all values with a given key. Because the input data (including the value collection) may be distributed across multiple workers, the combining function might be called multiple times to perform partial combining on subsets of the value collection. The Beam SDK also provides some pre-built combine functions for common numeric combination operations such as sum, min, and max.
 
@@ -564,7 +564,7 @@ avg_accuracy_per_player = (player_accuracies
 
 #### <a name="transforms-flatten-partition"></a>Using Flatten and Partition
 
-<span class="language-java">[`Flatten`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/sdk/transforms/Flatten.html)</span><span class="language-python">[`Flatten`](https://github.com/apache/incubator-beam/blob/python-sdk/sdks/python/apache_beam/transforms/core.py)</span> and <span class="language-java">[`Partition`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/sdk/transforms/Partition.html)</span><span class="language-python">[`Partition`](https://github.com/apache/incubator-beam/blob/python-sdk/sdks/python/apache_beam/transforms/core.py)</span> are Beam transforms for `PCollection` objects that store the same data type. `Flatten` merges multiple `PCollection` objects into a single logical `PCollection`, and `Partition` splits a single `PCollection` into a fixed number of smaller collections.
+<span class="language-java">[`Flatten`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/sdk/transforms/Flatten.html)</span><span class="language-python">[`Flatten`](https://github.com/apache/beam/blob/python-sdk/sdks/python/apache_beam/transforms/core.py)</span> and <span class="language-java">[`Partition`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/sdk/transforms/Partition.html)</span><span class="language-python">[`Partition`](https://github.com/apache/beam/blob/python-sdk/sdks/python/apache_beam/transforms/core.py)</span> are Beam transforms for `PCollection` objects that store the same data type. `Flatten` merges multiple `PCollection` objects into a single logical `PCollection`, and `Partition` splits a single `PCollection` into a fixed number of smaller collections.
 
 ##### **Flatten**
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/documentation/runners/capability-matrix.md
----------------------------------------------------------------------
diff --git a/src/documentation/runners/capability-matrix.md b/src/documentation/runners/capability-matrix.md
index bfb8cc1..c5d91a8 100644
--- a/src/documentation/runners/capability-matrix.md
+++ b/src/documentation/runners/capability-matrix.md
@@ -8,7 +8,7 @@ redirect_from:
 ---
 
 # Beam Capability Matrix
-Apache Beam (incubating) provides a portable API layer for building sophisticated data-parallel processing pipelines that may be executed across a diversity of execution 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.
+Apache Beam provides a portable API layer for building sophisticated data-parallel processing pipelines that may be executed across a diversity of execution 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:
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/documentation/runners/dataflow.md
----------------------------------------------------------------------
diff --git a/src/documentation/runners/dataflow.md b/src/documentation/runners/dataflow.md
index 57dec4c..14a133c 100644
--- a/src/documentation/runners/dataflow.md
+++ b/src/documentation/runners/dataflow.md
@@ -101,7 +101,7 @@ When executing your pipeline with the Cloud Dataflow Runner, set these pipeline
 </tr>
 </table>
 
-See the reference documentation for the  <span class="language-java">[DataflowPipelineOptions]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/runners/dataflow/options/DataflowPipelineOptions.html)</span><span class="language-python">[PipelineOptions](https://github.com/apache/incubator-beam/blob/python-sdk/sdks/python/apache_beam/utils/options.py)</span> interface (and its subinterfaces) for the complete list of pipeline configuration options.
+See the reference documentation for the  <span class="language-java">[DataflowPipelineOptions]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/runners/dataflow/options/DataflowPipelineOptions.html)</span><span class="language-python">[PipelineOptions](https://github.com/apache/beam/blob/python-sdk/sdks/python/apache_beam/utils/options.py)</span> interface (and its subinterfaces) for the complete list of pipeline configuration options.
 
 ## Additional information and caveats
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/documentation/runners/direct.md
----------------------------------------------------------------------
diff --git a/src/documentation/runners/direct.md b/src/documentation/runners/direct.md
index d01608e..b72b933 100644
--- a/src/documentation/runners/direct.md
+++ b/src/documentation/runners/direct.md
@@ -37,9 +37,9 @@ You must specify your dependency on the Direct Runner.
 
 When executing your pipeline from the command-line, set `runner` to `direct`. The default values for the other pipeline options are generally sufficient.
 
-See the reference documentation for the  <span class="language-java">[`DirectOptions`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/runners/direct/DirectOptions.html)</span><span class="language-python">[`PipelineOptions`](https://github.com/apache/incubator-beam/blob/python-sdk/sdks/python/apache_beam/utils/options.py)</span> interface (and its subinterfaces) for defaults and the complete list of pipeline configuration options.
+See the reference documentation for the  <span class="language-java">[`DirectOptions`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/runners/direct/DirectOptions.html)</span><span class="language-python">[`PipelineOptions`](https://github.com/apache/beam/blob/python-sdk/sdks/python/apache_beam/utils/options.py)</span> interface (and its subinterfaces) for defaults and the complete list of pipeline configuration options.
 
 ## Additional information and caveats
 
-Local execution is limited by the memory available in your local environment. It is highly recommended that you run your pipeline with data sets small enough to fit in local memory. You can create a small in-memory data set using a <span class="language-java">[`Create`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/sdk/transforms/Create.html)</span><span class="language-python">[`Create`](https://github.com/apache/incubator-beam/blob/python-sdk/sdks/python/apache_beam/transforms/core.py)</span> transform, or you can use a <span class="language-java">[`Read`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/sdk/io/Read.html)</span><span class="language-python">[`Read`](https://github.com/apache/incubator-beam/blob/python-sdk/sdks/python/apache_beam/io/iobase.py)</span> transform to work with small local or remote files.
+Local execution is limited by the memory available in your local environment. It is highly recommended that you run your pipeline with data sets small enough to fit in local memory. You can create a small in-memory data set using a <span class="language-java">[`Create`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/sdk/transforms/Create.html)</span><span class="language-python">[`Create`](https://github.com/apache/beam/blob/python-sdk/sdks/python/apache_beam/transforms/core.py)</span> transform, or you can use a <span class="language-java">[`Read`]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/sdk/io/Read.html)</span><span class="language-python">[`Read`](https://github.com/apache/beam/blob/python-sdk/sdks/python/apache_beam/io/iobase.py)</span> transform to work with small local or remote files.
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/documentation/runners/flink.md
----------------------------------------------------------------------
diff --git a/src/documentation/runners/flink.md b/src/documentation/runners/flink.md
index a984bb4..3fcbf46 100644
--- a/src/documentation/runners/flink.md
+++ b/src/documentation/runners/flink.md
@@ -129,7 +129,7 @@ When executing your pipeline with the Flink Runner, you can set these pipeline o
 </tr>
 </table>
 
-See the reference documentation for the  <span class="language-java">[FlinkPipelineOptions]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/runners/flink/FlinkPipelineOptions.html)</span><span class="language-python">[PipelineOptions](https://github.com/apache/incubator-beam/blob/python-sdk/sdks/python/apache_beam/utils/options.py)</span> interface (and its subinterfaces) for the complete list of pipeline configuration options.
+See the reference documentation for the  <span class="language-java">[FlinkPipelineOptions]({{ site.baseurl }}/documentation/sdks/javadoc/{{ site.release_latest }}/index.html?org/apache/beam/runners/flink/FlinkPipelineOptions.html)</span><span class="language-python">[PipelineOptions](https://github.com/apache/beam/blob/python-sdk/sdks/python/apache_beam/utils/options.py)</span> interface (and its subinterfaces) for the complete list of pipeline configuration options.
 
 ## Additional information and caveats
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/get-started/mobile-gaming-example.md
----------------------------------------------------------------------
diff --git a/src/get-started/mobile-gaming-example.md b/src/get-started/mobile-gaming-example.md
index 3aee213..eb1ebea 100644
--- a/src/get-started/mobile-gaming-example.md
+++ b/src/get-started/mobile-gaming-example.md
@@ -35,7 +35,7 @@ The Mobile Game example pipelines vary in complexity, from simple batch analysis
 
 The `UserScore` pipeline is the simplest example for processing mobile game data. `UserScore` determines the total score per user over a finite data set (for example, one day's worth of scores stored on the game server). Pipelines like `UserScore` are best run periodically after all relevant data has been gathered. For example, `UserScore` could run as a nightly job over data gathered during that day.
 
-> **Note:** See [UserScore on GitHub](https://github.com/apache/incubator-beam/blob/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java) for the complete example pipeline program.
+> **Note:** See [UserScore on GitHub](https://github.com/apache/beam/blob/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game/UserScore.java) for the complete example pipeline program.
 
 ### What Does UserScore Do?
 
@@ -144,7 +144,7 @@ The `HourlyTeamScore` pipeline expands on the basic batch analysis principles us
 
 Like `UserScore`, `HourlyTeamScore` is best thought of as a job to be run periodically after all the relevant data has been gathered (such as once per day). The pipeline reads a fixed data set from a file, and writes the results to a Google Cloud BigQuery table, just like `UserScore`.
 
-> **Note:** See [HourlyTeamScore on GitHub](https://github.com/apache/incubator-beam/blob/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java) for the complete example pipeline program.
+> **Note:** See [HourlyTeamScore on GitHub](https://github.com/apache/beam/blob/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game/HourlyTeamScore.java) for the complete example pipeline program.
 
 ### What Does HourlyTeamScore Do?
 
@@ -175,7 +175,7 @@ Notice that as processing time advances, the sums are now _per window_; each win
 
 Beam's windowing feature uses the [intrinsic timestamp information]({{ site.baseurl }}/documentation/programming-guide/#pctimestamps) attached to each element of a `PCollection`. Because we want our pipeline to window based on _event time_, we **must first extract the timestamp** that's embedded in each data record apply it to the corresponding element in the `PCollection` of score data. Then, the pipeline can **apply the windowing function** to divide the `PCollection` into logical windows.
 
-Here's the code, which shows how `HourlyTeamScore` uses the [WithTimestamps](https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithTimestamps.java) and [Window](https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java) transforms to perform these operations:
+Here's the code, which shows how `HourlyTeamScore` uses the [WithTimestamps](https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/WithTimestamps.java) and [Window](https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java) transforms to perform these operations:
 
 ```java
 // Add an element timestamp based on the event log, and apply fixed windowing.
@@ -272,7 +272,7 @@ The `LeaderBoard` pipeline also demonstrates how to process game score data with
 
 Because the `LeaderBoard` pipeline reads the game data from an unbounded source as that data is generated, you can think of the pipeline as an ongoing job running concurrently with the game process. `LeaderBoard` can thus provide low-latency insights into how users are playing the game at any given moment\u2014useful if, for example, we want to provide a live web-based scoreboard so that users can track their progress against other users as they play.
 
-> **Note:** See [LeaderBoard on GitHub](https://github.com/apache/incubator-beam/blob/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java) for the complete example pipeline program.
+> **Note:** See [LeaderBoard on GitHub](https://github.com/apache/beam/blob/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game/LeaderBoard.java) for the complete example pipeline program.
 
 ### What Does LeaderBoard Do?
 
@@ -400,7 +400,7 @@ While `LeaderBoard` demonstrates how to use basic windowing and triggers to perf
 
 Like `LeaderBoard`, `GameStats` reads data from an unbounded source. It is best thought of as an ongoing job that provides insight into the game as users play.
 
-> **Note:** See [GameStats on GitHub](https://github.com/apache/incubator-beam/blob/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java) for the complete example pipeline program.
+> **Note:** See [GameStats on GitHub](https://github.com/apache/beam/blob/master/examples/java8/src/main/java/org/apache/beam/examples/complete/game/GameStats.java) for the complete example pipeline program.
 
 ### What Does GameStats Do?
 
@@ -491,7 +491,7 @@ rawEvents
 
 #### Analyzing Usage Patterns
 
-We can gain some insight on when users are playing our game, and for how long, by examining the event times for each game score and grouping scores with similar event times into _sessions_. `GameStats` uses Beam's built-in [session windowing](https://github.com/apache/incubator-beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Sessions.java) function to group user scores into sessions based on the time they occurred.
+We can gain some insight on when users are playing our game, and for how long, by examining the event times for each game score and grouping scores with similar event times into _sessions_. `GameStats` uses Beam's built-in [session windowing](https://github.com/apache/beam/blob/master/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Sessions.java) function to group user scores into sessions based on the time they occurred.
 
 When you set session windowing, you specify a _minimum gap duration_ between events. All events whose arrival times are closer together than the minimum gap duration are grouped into the same window. Events where the difference in arrival time is greater than the gap are grouped into separate windows. Depending on how we set our minimum gap duration, we can safely assume that scores in the same session window are part of the same (relatively) uninterrupted stretch of play. Scores in a different window indicate that the user stopped playing the game for at least the minimum gap time before returning to it later.
 

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/get-started/support.md
----------------------------------------------------------------------
diff --git a/src/get-started/support.md b/src/get-started/support.md
index cfb5212..b3c7316 100644
--- a/src/get-started/support.md
+++ b/src/get-started/support.md
@@ -30,25 +30,25 @@ The following are the mailing lists that have been established for the Apache Be
     <tr>
       <th scope="row">user@</th>
       <td>User support and questions</td>
-      <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="mailto:user-subscribe@beam.apache.org">Subscribe</a></td>
+      <td><a href="mailto:user-unsubscribe@beam.apache.org">Unsubscribe</a></td>
+      <td><a href="mailto:user@beam.apache.org">Post</a></td>
       <td><a href="https://lists.apache.org/list.html?user@beam.apache.org">Archives</a></td>
     </tr>
     <tr>
       <th scope="row">dev@</th>
       <td>Development-related discussions</td>
-      <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="mailto:dev-subscribe@beam.apache.org">Subscribe</a></td>
+      <td><a href="mailto:dev-unsubscribe@beam.apache.org">Unsubscribe</a></td>
+      <td><a href="mailto:dev@beam.apache.org">Post</a></td>
       <td><a href="https://lists.apache.org/list.html?dev@beam.apache.org">Archives</a></td>
     </tr>
     <tr>
       <th scope="row">commits@</th>
       <td>JIRA updates, pull requests, etc.</td>
-      <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="mailto:commits-subscribe@beam.apache.org">Subscribe</a></td>
+      <td><a href="mailto:commits-unsubscribe@beam.apache.org">Unsubscribe</a></td>
+      <td><a href="mailto:commits@beam.apache.org">Post</a></td>
       <td><a href="https://lists.apache.org/list.html?commits@beam.apache.org">Archives</a></td>
     </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/beam-site/blob/50e37931/src/get-started/wordcount-example.md
----------------------------------------------------------------------
diff --git a/src/get-started/wordcount-example.md b/src/get-started/wordcount-example.md
index 7c98a99..8182124 100644
--- a/src/get-started/wordcount-example.md
+++ b/src/get-started/wordcount-example.md
@@ -25,7 +25,7 @@ Each WordCount example introduces different concepts in the Beam programming mod
 
 Minimal WordCount demonstrates a simple pipeline that can read from a text file, apply transforms to tokenize and count the words, and write the data to an output text file. This example hard-codes the locations for its input and output files and doesn't perform any error checking; it is intended to only show you the "bare bones" of creating a Beam pipeline. This lack of parameterization makes this particular pipeline less portable across different runners than standard Beam pipelines. In later examples, we will parameterize the pipeline's input and output sources and show other best practices.
 
-To run this example, follow the instructions in the [Beam Examples README](https://github.com/apache/incubator-beam/blob/master/examples/java/README.md#building-and-running). To view the full code, see **[MinimalWordCount](https://github.com/apache/incubator-beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java).**
+To run this example, follow the instructions in the [Beam Examples README](https://github.com/apache/beam/blob/master/examples/java/README.md#building-and-running). To view the full code, see **[MinimalWordCount](https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java).**
 
 **Key Concepts:**
 
@@ -143,7 +143,7 @@ This WordCount example introduces a few recommended programming practices that c
 
 This section assumes that you have a good understanding of the basic concepts in building a pipeline. If you feel that you aren't at that point yet, read the above section, [Minimal WordCount](#minimalwordcount).
 
-To run this example, follow the instructions in the [Beam Examples README](https://github.com/apache/incubator-beam/blob/master/examples/java/README.md#building-and-running). To view the full code, see **[WordCount](https://github.com/apache/incubator-beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/WordCount.java).**
+To run this example, follow the instructions in the [Beam Examples README](https://github.com/apache/beam/blob/master/examples/java/README.md#building-and-running). To view the full code, see **[WordCount](https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/WordCount.java).**
 
 **New Concepts:**
 
@@ -238,7 +238,7 @@ public static void main(String[] args) {
 
 The Debugging WordCount example demonstrates some best practices for instrumenting your pipeline code.
 
-To run this example, follow the instructions in the [Beam Examples README](https://github.com/apache/incubator-beam/blob/master/examples/java/README.md#building-and-running). To view the full code, see **[DebuggingWordCount](https://github.com/apache/incubator-beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java).**
+To run this example, follow the instructions in the [Beam Examples README](https://github.com/apache/beam/blob/master/examples/java/README.md#building-and-running). To view the full code, see **[DebuggingWordCount](https://github.com/apache/beam/blob/master/examples/java/src/main/java/org/apache/beam/examples/DebuggingWordCount.java).**
 
 **New Concepts:**
 
@@ -297,7 +297,7 @@ The default Dataflow worker logging configuration can be overridden by specifyin
 
 `PAssert` is a set of convenient `PTransform`s in the style of Hamcrest's collection matchers that can be used when writing Pipeline level tests to validate the contents of PCollections. `PAssert` is best used in unit tests with small data sets, but is demonstrated here as a teaching tool.
 
-Below, we verify that the set of filtered words matches our expected counts. Note that `PAssert` does not provide any output, and that successful completion of the pipeline implies that the expectations were met. See [DebuggingWordCountTest](https://github.com/apache/incubator-beam/blob/master/examples/java/src/test/java/org/apache/beam/examples/DebuggingWordCountTest.java) for an example unit test.
+Below, we verify that the set of filtered words matches our expected counts. Note that `PAssert` does not provide any output, and that successful completion of the pipeline implies that the expectations were met. See [DebuggingWordCountTest](https://github.com/apache/beam/blob/master/examples/java/src/test/java/org/apache/beam/examples/DebuggingWordCountTest.java) for an example unit test.
 
 ```java
 public static void main(String[] args) {