diff --git a/website/www/site/content/en/blog/review-input-streaming-connectors.md b/website/www/site/content/en/blog/review-input-streaming-connectors.md
index 9ab7419bd801..89c039e5b1db 100644
--- a/website/www/site/content/en/blog/review-input-streaming-connectors.md
+++ b/website/www/site/content/en/blog/review-input-streaming-connectors.md
@@ -168,7 +168,7 @@ and }}/apache_beam.io.gcp.gcsio.html">io.gcp.gcsio
-
textFileStream
+ | textFileStream
|
diff --git a/website/www/site/content/en/contribute/postcommits-policies.md b/website/www/site/content/en/contribute/postcommits-policies.md
index e3b9dbaf750d..5d60d5a89ea0 100644
--- a/website/www/site/content/en/contribute/postcommits-policies.md
+++ b/website/www/site/content/en/contribute/postcommits-policies.md
@@ -46,7 +46,7 @@ When a post-commit test fails, follow the provided steps for your situation.
### I found a test failure {#found-failing-test}
-1. Create a [GitHub issue](https://github.com/apache/tag-beam-it/issues/new/choose) and assign it to yourself.
+1. Create a [GitHub issue](https://github.com/apache/beam/issues/new/choose) and assign it to yourself.
- Components: testing, anything else relevant
- Label: precommit
- Reference this page in the description.
diff --git a/website/www/site/content/en/contribute/precommit-triage-guide.md b/website/www/site/content/en/contribute/precommit-triage-guide.md
index 10578467bde9..7cc2e62eb356 100644
--- a/website/www/site/content/en/contribute/precommit-triage-guide.md
+++ b/website/www/site/content/en/contribute/precommit-triage-guide.md
@@ -55,8 +55,8 @@ down to a specific test suite by clicking on it.
## Triage Process
1. [Search for existing
- issues](https://github.com/apache/tag-beam-it/issues)
-1. Create a new issue if needed: [GitHub Issues](https://github.com/apache/tag-beam-it/issues/new/choose)
+ issues](https://github.com/apache/beam/issues)
+1. Create a new issue if needed: [GitHub Issues](https://github.com/apache/beam/issues/new/choose)
- Components: testing, anything else relevant
- Label: precommit
- Reference this page in the description.
diff --git a/website/www/site/content/en/contribute/runner-guide.md b/website/www/site/content/en/contribute/runner-guide.md
index 6bc65ecd6eb5..d64ebd2164cc 100644
--- a/website/www/site/content/en/contribute/runner-guide.md
+++ b/website/www/site/content/en/contribute/runner-guide.md
@@ -630,7 +630,7 @@ depend on the particulars of the Java SDK.
## The Runner API protos
The [Runner
-API](https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto)
+API](https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/org/apache/beam/model/pipeline/v1/beam_runner_api.proto)
refers to a specific manifestation of the concepts in the Beam model, as a
protocol buffers schema. Even though you should not manipulate these messages
directly, it can be helpful to know the canonical data that makes up a
diff --git a/website/www/site/content/en/documentation/programming-guide.md b/website/www/site/content/en/documentation/programming-guide.md
index f460619b0d1c..f6585127a8a5 100644
--- a/website/www/site/content/en/documentation/programming-guide.md
+++ b/website/www/site/content/en/documentation/programming-guide.md
@@ -7421,7 +7421,7 @@ To create an SDK wrapper for use in a Python pipeline, do the following:
1. Create a Python module for your cross-language transform(s).
2. In the module, use one of the [`PayloadBuilder`](https://beam.apache.org/releases/pydoc/current/apache_beam.transforms.external.html#apache_beam.transforms.external.PayloadBuilder) classes to build the payload for the initial cross-language transform expansion request.
- The parameter names and types of the payload should map to parameter names and types of the configuration POJO provided to the Java `ExternalTransformBuilder`. Parameter types are mapped across SDKs using a [Beam schema](https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/schema.proto). Parameter names are mapped by simply converting Python underscore-separated variable names to camel-case (Java standard).
+ The parameter names and types of the payload should map to parameter names and types of the configuration POJO provided to the Java `ExternalTransformBuilder`. Parameter types are mapped across SDKs using a [Beam schema](https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/org/apache/beam/model/pipeline/v1/schema.proto). Parameter names are mapped by simply converting Python underscore-separated variable names to camel-case (Java standard).
In the following example, [kafka.py](https://github.com/apache/beam/blob/master/sdks/python/apache_beam/io/kafka.py) uses `NamedTupleBasedPayloadBuilder` to build the payload. The parameters map to the Java [KafkaIO.External.Configuration](https://github.com/apache/beam/blob/master/sdks/java/io/kafka/src/main/java/org/apache/beam/sdk/io/kafka/KafkaIO.java) config object defined in the previous section.