diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java
index e040337a4..068970f64 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java
@@ -222,15 +222,15 @@ public SubscriberStub getStub() {
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates a subscription to a given topic. See the [resource name rules]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). If the subscription already
-   * exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). If the subscription
+   * already exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
    * `NOT_FOUND`.
    *
    * <p>If the name is not provided in the request, the server will assign a random name for this
    * subscription on the same project as the topic, conforming to the [resource name format]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated name is populated in
-   * the returned Subscription object. Note that for REST API requests, you must specify a name in
-   * the request.
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The generated name is
+   * populated in the returned Subscription object. Note that for REST API requests, you must
+   * specify a name in the request.
    *
    * <p>Sample code:
    *
@@ -292,15 +292,15 @@ public final Subscription createSubscription(
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates a subscription to a given topic. See the [resource name rules]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). If the subscription already
-   * exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). If the subscription
+   * already exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
    * `NOT_FOUND`.
    *
    * <p>If the name is not provided in the request, the server will assign a random name for this
    * subscription on the same project as the topic, conforming to the [resource name format]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated name is populated in
-   * the returned Subscription object. Note that for REST API requests, you must specify a name in
-   * the request.
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The generated name is
+   * populated in the returned Subscription object. Note that for REST API requests, you must
+   * specify a name in the request.
    *
    * <p>Sample code:
    *
@@ -362,15 +362,15 @@ public final Subscription createSubscription(
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates a subscription to a given topic. See the [resource name rules]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). If the subscription already
-   * exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). If the subscription
+   * already exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
    * `NOT_FOUND`.
    *
    * <p>If the name is not provided in the request, the server will assign a random name for this
    * subscription on the same project as the topic, conforming to the [resource name format]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated name is populated in
-   * the returned Subscription object. Note that for REST API requests, you must specify a name in
-   * the request.
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The generated name is
+   * populated in the returned Subscription object. Note that for REST API requests, you must
+   * specify a name in the request.
    *
    * <p>Sample code:
    *
@@ -432,15 +432,15 @@ public final Subscription createSubscription(
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates a subscription to a given topic. See the [resource name rules]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). If the subscription already
-   * exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). If the subscription
+   * already exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
    * `NOT_FOUND`.
    *
    * <p>If the name is not provided in the request, the server will assign a random name for this
    * subscription on the same project as the topic, conforming to the [resource name format]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated name is populated in
-   * the returned Subscription object. Note that for REST API requests, you must specify a name in
-   * the request.
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The generated name is
+   * populated in the returned Subscription object. Note that for REST API requests, you must
+   * specify a name in the request.
    *
    * <p>Sample code:
    *
@@ -502,15 +502,15 @@ public final Subscription createSubscription(
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates a subscription to a given topic. See the [resource name rules]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). If the subscription already
-   * exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). If the subscription
+   * already exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
    * `NOT_FOUND`.
    *
    * <p>If the name is not provided in the request, the server will assign a random name for this
    * subscription on the same project as the topic, conforming to the [resource name format]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated name is populated in
-   * the returned Subscription object. Note that for REST API requests, you must specify a name in
-   * the request.
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The generated name is
+   * populated in the returned Subscription object. Note that for REST API requests, you must
+   * specify a name in the request.
    *
    * <p>Sample code:
    *
@@ -765,15 +765,15 @@ public final Subscription createSubscription(
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates a subscription to a given topic. See the [resource name rules]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). If the subscription already
-   * exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). If the subscription
+   * already exists, returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
    * `NOT_FOUND`.
    *
    * <p>If the name is not provided in the request, the server will assign a random name for this
    * subscription on the same project as the topic, conforming to the [resource name format]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated name is populated in
-   * the returned Subscription object. Note that for REST API requests, you must specify a name in
-   * the request.
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The generated name is
+   * populated in the returned Subscription object. Note that for REST API requests, you must
+   * specify a name in the request.
    *
    * <p>Sample code:
    *
@@ -2609,9 +2609,9 @@ public final UnaryCallable<ListSnapshotsRequest, ListSnapshotsResponse> listSnap
    * expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. See also the
    * `Snapshot.expire_time` field. If the name is not provided in the request, the server will
    * assign a random name for this snapshot on the same project as the subscription, conforming to
-   * the [resource name format] (https://cloud.google.com/pubsub/docs/admin#resource_names). The
-   * generated name is populated in the returned Snapshot object. Note that for REST API requests,
-   * you must specify a name in the request.
+   * the [resource name format] (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+   * The generated name is populated in the returned Snapshot object. Note that for REST API
+   * requests, you must specify a name in the request.
    *
    * <p>Sample code:
    *
@@ -2631,7 +2631,7 @@ public final UnaryCallable<ListSnapshotsRequest, ListSnapshotsResponse> listSnap
    * @param name Required. User-provided name for this snapshot. If the name is not provided in the
    *     request, the server will assign a random name for this snapshot on the same project as the
    *     subscription. Note that for REST API requests, you must specify a name. See the [resource
-   *     name rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format is
+   *     name rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). Format is
    *     `projects/{project}/snapshots/{snap}`.
    * @param subscription Required. The subscription whose backlog the snapshot retains.
    *     Specifically, the created snapshot is guaranteed to retain: (a) The existing backlog on the
@@ -2662,9 +2662,9 @@ public final Snapshot createSnapshot(SnapshotName name, SubscriptionName subscri
    * expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. See also the
    * `Snapshot.expire_time` field. If the name is not provided in the request, the server will
    * assign a random name for this snapshot on the same project as the subscription, conforming to
-   * the [resource name format] (https://cloud.google.com/pubsub/docs/admin#resource_names). The
-   * generated name is populated in the returned Snapshot object. Note that for REST API requests,
-   * you must specify a name in the request.
+   * the [resource name format] (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+   * The generated name is populated in the returned Snapshot object. Note that for REST API
+   * requests, you must specify a name in the request.
    *
    * <p>Sample code:
    *
@@ -2684,7 +2684,7 @@ public final Snapshot createSnapshot(SnapshotName name, SubscriptionName subscri
    * @param name Required. User-provided name for this snapshot. If the name is not provided in the
    *     request, the server will assign a random name for this snapshot on the same project as the
    *     subscription. Note that for REST API requests, you must specify a name. See the [resource
-   *     name rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format is
+   *     name rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). Format is
    *     `projects/{project}/snapshots/{snap}`.
    * @param subscription Required. The subscription whose backlog the snapshot retains.
    *     Specifically, the created snapshot is guaranteed to retain: (a) The existing backlog on the
@@ -2715,9 +2715,9 @@ public final Snapshot createSnapshot(SnapshotName name, String subscription) {
    * expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. See also the
    * `Snapshot.expire_time` field. If the name is not provided in the request, the server will
    * assign a random name for this snapshot on the same project as the subscription, conforming to
-   * the [resource name format] (https://cloud.google.com/pubsub/docs/admin#resource_names). The
-   * generated name is populated in the returned Snapshot object. Note that for REST API requests,
-   * you must specify a name in the request.
+   * the [resource name format] (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+   * The generated name is populated in the returned Snapshot object. Note that for REST API
+   * requests, you must specify a name in the request.
    *
    * <p>Sample code:
    *
@@ -2737,7 +2737,7 @@ public final Snapshot createSnapshot(SnapshotName name, String subscription) {
    * @param name Required. User-provided name for this snapshot. If the name is not provided in the
    *     request, the server will assign a random name for this snapshot on the same project as the
    *     subscription. Note that for REST API requests, you must specify a name. See the [resource
-   *     name rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format is
+   *     name rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). Format is
    *     `projects/{project}/snapshots/{snap}`.
    * @param subscription Required. The subscription whose backlog the snapshot retains.
    *     Specifically, the created snapshot is guaranteed to retain: (a) The existing backlog on the
@@ -2768,9 +2768,9 @@ public final Snapshot createSnapshot(String name, SubscriptionName subscription)
    * expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. See also the
    * `Snapshot.expire_time` field. If the name is not provided in the request, the server will
    * assign a random name for this snapshot on the same project as the subscription, conforming to
-   * the [resource name format] (https://cloud.google.com/pubsub/docs/admin#resource_names). The
-   * generated name is populated in the returned Snapshot object. Note that for REST API requests,
-   * you must specify a name in the request.
+   * the [resource name format] (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+   * The generated name is populated in the returned Snapshot object. Note that for REST API
+   * requests, you must specify a name in the request.
    *
    * <p>Sample code:
    *
@@ -2790,7 +2790,7 @@ public final Snapshot createSnapshot(String name, SubscriptionName subscription)
    * @param name Required. User-provided name for this snapshot. If the name is not provided in the
    *     request, the server will assign a random name for this snapshot on the same project as the
    *     subscription. Note that for REST API requests, you must specify a name. See the [resource
-   *     name rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format is
+   *     name rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). Format is
    *     `projects/{project}/snapshots/{snap}`.
    * @param subscription Required. The subscription whose backlog the snapshot retains.
    *     Specifically, the created snapshot is guaranteed to retain: (a) The existing backlog on the
@@ -2818,9 +2818,9 @@ public final Snapshot createSnapshot(String name, String subscription) {
    * expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. See also the
    * `Snapshot.expire_time` field. If the name is not provided in the request, the server will
    * assign a random name for this snapshot on the same project as the subscription, conforming to
-   * the [resource name format] (https://cloud.google.com/pubsub/docs/admin#resource_names). The
-   * generated name is populated in the returned Snapshot object. Note that for REST API requests,
-   * you must specify a name in the request.
+   * the [resource name format] (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+   * The generated name is populated in the returned Snapshot object. Note that for REST API
+   * requests, you must specify a name in the request.
    *
    * <p>Sample code:
    *
@@ -3010,9 +3010,9 @@ public final Snapshot createSnapshot(ProjectSnapshotName name, String subscripti
    * expire in less than 1 hour -- then `FAILED_PRECONDITION` is returned. See also the
    * `Snapshot.expire_time` field. If the name is not provided in the request, the server will
    * assign a random name for this snapshot on the same project as the subscription, conforming to
-   * the [resource name format] (https://cloud.google.com/pubsub/docs/admin#resource_names). The
-   * generated name is populated in the returned Snapshot object. Note that for REST API requests,
-   * you must specify a name in the request.
+   * the [resource name format] (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+   * The generated name is populated in the returned Snapshot object. Note that for REST API
+   * requests, you must specify a name in the request.
    *
    * <p>Sample code:
    *
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java
index 80a3b3fa4..b1f0dc35f 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java
@@ -197,7 +197,7 @@ public PublisherStub getStub() {
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates the given topic with the given name. See the [resource name rules]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
    *
    * <p>Sample code:
    *
@@ -228,7 +228,7 @@ public final Topic createTopic(TopicName name) {
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates the given topic with the given name. See the [resource name rules]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
    *
    * <p>Sample code:
    *
@@ -288,7 +288,7 @@ public final Topic createTopic(ProjectTopicName name) {
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates the given topic with the given name. See the [resource name rules]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
    *
    * <p>Sample code:
    *
@@ -323,7 +323,7 @@ public final Topic createTopic(Topic request) {
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Creates the given topic with the given name. See the [resource name rules]
-   * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+   * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
    *
    * <p>Sample code:
    *
diff --git a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java
index 004e591c3..020bf6f9d 100644
--- a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java
+++ b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublisherGrpc.java
@@ -465,7 +465,7 @@ public interface AsyncService {
      *
      * <pre>
      * Creates the given topic with the given name. See the [resource name rules]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
      * </pre>
      */
     default void createTopic(
@@ -640,7 +640,7 @@ protected PublisherStub build(io.grpc.Channel channel, io.grpc.CallOptions callO
      *
      * <pre>
      * Creates the given topic with the given name. See the [resource name rules]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
      * </pre>
      */
     public void createTopic(
@@ -816,7 +816,7 @@ protected PublisherBlockingStub build(
      *
      * <pre>
      * Creates the given topic with the given name. See the [resource name rules]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
      * </pre>
      */
     public com.google.pubsub.v1.Topic createTopic(com.google.pubsub.v1.Topic request) {
@@ -963,7 +963,7 @@ protected PublisherFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions
      *
      * <pre>
      * Creates the given topic with the given name. See the [resource name rules]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Topic>
diff --git a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java
index 7007b4f21..c90e438e8 100644
--- a/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java
+++ b/grpc-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SubscriberGrpc.java
@@ -742,15 +742,15 @@ public interface AsyncService {
      *
      * <pre>
      * Creates a subscription to a given topic. See the [resource name rules]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
      * If the subscription already exists, returns `ALREADY_EXISTS`.
      * If the corresponding topic doesn't exist, returns `NOT_FOUND`.
      * If the name is not provided in the request, the server will assign a random
      * name for this subscription on the same project as the topic, conforming
      * to the [resource name format]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated
-     * name is populated in the returned Subscription object. Note that for REST
-     * API requests, you must specify a name in the request.
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
+     * generated name is populated in the returned Subscription object. Note that
+     * for REST API requests, you must specify a name in the request.
      * </pre>
      */
     default void createSubscription(
@@ -962,7 +962,7 @@ default void listSnapshots(
      * the request, the server will assign a random
      * name for this snapshot on the same project as the subscription, conforming
      * to the [resource name format]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names). The
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
      * generated name is populated in the returned Snapshot object. Note that for
      * REST API requests, you must specify a name in the request.
      * </pre>
@@ -1075,15 +1075,15 @@ protected SubscriberStub build(io.grpc.Channel channel, io.grpc.CallOptions call
      *
      * <pre>
      * Creates a subscription to a given topic. See the [resource name rules]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
      * If the subscription already exists, returns `ALREADY_EXISTS`.
      * If the corresponding topic doesn't exist, returns `NOT_FOUND`.
      * If the name is not provided in the request, the server will assign a random
      * name for this subscription on the same project as the topic, conforming
      * to the [resource name format]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated
-     * name is populated in the returned Subscription object. Note that for REST
-     * API requests, you must specify a name in the request.
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
+     * generated name is populated in the returned Subscription object. Note that
+     * for REST API requests, you must specify a name in the request.
      * </pre>
      */
     public void createSubscription(
@@ -1316,7 +1316,7 @@ public void listSnapshots(
      * the request, the server will assign a random
      * name for this snapshot on the same project as the subscription, conforming
      * to the [resource name format]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names). The
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
      * generated name is populated in the returned Snapshot object. Note that for
      * REST API requests, you must specify a name in the request.
      * </pre>
@@ -1421,15 +1421,15 @@ protected SubscriberBlockingStub build(
      *
      * <pre>
      * Creates a subscription to a given topic. See the [resource name rules]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
      * If the subscription already exists, returns `ALREADY_EXISTS`.
      * If the corresponding topic doesn't exist, returns `NOT_FOUND`.
      * If the name is not provided in the request, the server will assign a random
      * name for this subscription on the same project as the topic, conforming
      * to the [resource name format]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated
-     * name is populated in the returned Subscription object. Note that for REST
-     * API requests, you must specify a name in the request.
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
+     * generated name is populated in the returned Subscription object. Note that
+     * for REST API requests, you must specify a name in the request.
      * </pre>
      */
     public com.google.pubsub.v1.Subscription createSubscription(
@@ -1609,7 +1609,7 @@ public com.google.pubsub.v1.ListSnapshotsResponse listSnapshots(
      * the request, the server will assign a random
      * name for this snapshot on the same project as the subscription, conforming
      * to the [resource name format]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names). The
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
      * generated name is populated in the returned Snapshot object. Note that for
      * REST API requests, you must specify a name in the request.
      * </pre>
@@ -1702,15 +1702,15 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      *
      * <pre>
      * Creates a subscription to a given topic. See the [resource name rules]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names).
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
      * If the subscription already exists, returns `ALREADY_EXISTS`.
      * If the corresponding topic doesn't exist, returns `NOT_FOUND`.
      * If the name is not provided in the request, the server will assign a random
      * name for this subscription on the same project as the topic, conforming
      * to the [resource name format]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated
-     * name is populated in the returned Subscription object. Note that for REST
-     * API requests, you must specify a name in the request.
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
+     * generated name is populated in the returned Subscription object. Note that
+     * for REST API requests, you must specify a name in the request.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.pubsub.v1.Subscription>
@@ -1894,7 +1894,7 @@ protected SubscriberFutureStub build(io.grpc.Channel channel, io.grpc.CallOption
      * the request, the server will assign a random
      * name for this snapshot on the same project as the subscription, conforming
      * to the [resource name format]
-     * (https://cloud.google.com/pubsub/docs/admin#resource_names). The
+     * (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
      * generated name is populated in the returned Snapshot object. Note that for
      * REST API requests, you must specify a name in the request.
      * </pre>
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java
index 58c4a1896..3918f5ca6 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java
@@ -86,8 +86,8 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
    * in the request, the server will assign a random name for this snapshot on
    * the same project as the subscription. Note that for REST API requests, you
    * must specify a name.  See the [resource name
-   * rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format
-   * is `projects/{project}/snapshots/{snap}`.
+   * rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+   * Format is `projects/{project}/snapshots/{snap}`.
    * </pre>
    *
    * <code>
@@ -116,8 +116,8 @@ public java.lang.String getName() {
    * in the request, the server will assign a random name for this snapshot on
    * the same project as the subscription. Note that for REST API requests, you
    * must specify a name.  See the [resource name
-   * rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format
-   * is `projects/{project}/snapshots/{snap}`.
+   * rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+   * Format is `projects/{project}/snapshots/{snap}`.
    * </pre>
    *
    * <code>
@@ -746,8 +746,8 @@ public Builder mergeFrom(
      * in the request, the server will assign a random name for this snapshot on
      * the same project as the subscription. Note that for REST API requests, you
      * must specify a name.  See the [resource name
-     * rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format
-     * is `projects/{project}/snapshots/{snap}`.
+     * rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+     * Format is `projects/{project}/snapshots/{snap}`.
      * </pre>
      *
      * <code>
@@ -775,8 +775,8 @@ public java.lang.String getName() {
      * in the request, the server will assign a random name for this snapshot on
      * the same project as the subscription. Note that for REST API requests, you
      * must specify a name.  See the [resource name
-     * rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format
-     * is `projects/{project}/snapshots/{snap}`.
+     * rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+     * Format is `projects/{project}/snapshots/{snap}`.
      * </pre>
      *
      * <code>
@@ -804,8 +804,8 @@ public com.google.protobuf.ByteString getNameBytes() {
      * in the request, the server will assign a random name for this snapshot on
      * the same project as the subscription. Note that for REST API requests, you
      * must specify a name.  See the [resource name
-     * rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format
-     * is `projects/{project}/snapshots/{snap}`.
+     * rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+     * Format is `projects/{project}/snapshots/{snap}`.
      * </pre>
      *
      * <code>
@@ -832,8 +832,8 @@ public Builder setName(java.lang.String value) {
      * in the request, the server will assign a random name for this snapshot on
      * the same project as the subscription. Note that for REST API requests, you
      * must specify a name.  See the [resource name
-     * rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format
-     * is `projects/{project}/snapshots/{snap}`.
+     * rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+     * Format is `projects/{project}/snapshots/{snap}`.
      * </pre>
      *
      * <code>
@@ -856,8 +856,8 @@ public Builder clearName() {
      * in the request, the server will assign a random name for this snapshot on
      * the same project as the subscription. Note that for REST API requests, you
      * must specify a name.  See the [resource name
-     * rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format
-     * is `projects/{project}/snapshots/{snap}`.
+     * rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+     * Format is `projects/{project}/snapshots/{snap}`.
      * </pre>
      *
      * <code>
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequestOrBuilder.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequestOrBuilder.java
index 2f24bc123..ee4a6d68f 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequestOrBuilder.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequestOrBuilder.java
@@ -31,8 +31,8 @@ public interface CreateSnapshotRequestOrBuilder
    * in the request, the server will assign a random name for this snapshot on
    * the same project as the subscription. Note that for REST API requests, you
    * must specify a name.  See the [resource name
-   * rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format
-   * is `projects/{project}/snapshots/{snap}`.
+   * rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+   * Format is `projects/{project}/snapshots/{snap}`.
    * </pre>
    *
    * <code>
@@ -50,8 +50,8 @@ public interface CreateSnapshotRequestOrBuilder
    * in the request, the server will assign a random name for this snapshot on
    * the same project as the subscription. Note that for REST API requests, you
    * must specify a name.  See the [resource name
-   * rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format
-   * is `projects/{project}/snapshots/{snap}`.
+   * rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+   * Format is `projects/{project}/snapshots/{snap}`.
    * </pre>
    *
    * <code>
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java
index afec846d7..06c6e9aba 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java
@@ -71,11 +71,12 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * <pre>
-   * A list of IDs of GCP regions where messages that are published to the topic
-   * may be persisted in storage. Messages published by publishers running in
-   * non-allowed GCP regions (or running outside of GCP altogether) will be
-   * routed for storage in one of the allowed regions. An empty list means that
-   * no regions are allowed, and is not a valid configuration.
+   * A list of IDs of Google Cloud regions where messages that are published
+   * to the topic may be persisted in storage. Messages published by publishers
+   * running in non-allowed Google Cloud regions (or running outside of Google
+   * Cloud altogether) are routed for storage in one of the allowed regions.
+   * An empty list means that no regions are allowed, and is not a valid
+   * configuration.
    * </pre>
    *
    * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -89,11 +90,12 @@ public com.google.protobuf.ProtocolStringList getAllowedPersistenceRegionsList()
    *
    *
    * <pre>
-   * A list of IDs of GCP regions where messages that are published to the topic
-   * may be persisted in storage. Messages published by publishers running in
-   * non-allowed GCP regions (or running outside of GCP altogether) will be
-   * routed for storage in one of the allowed regions. An empty list means that
-   * no regions are allowed, and is not a valid configuration.
+   * A list of IDs of Google Cloud regions where messages that are published
+   * to the topic may be persisted in storage. Messages published by publishers
+   * running in non-allowed Google Cloud regions (or running outside of Google
+   * Cloud altogether) are routed for storage in one of the allowed regions.
+   * An empty list means that no regions are allowed, and is not a valid
+   * configuration.
    * </pre>
    *
    * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -107,11 +109,12 @@ public int getAllowedPersistenceRegionsCount() {
    *
    *
    * <pre>
-   * A list of IDs of GCP regions where messages that are published to the topic
-   * may be persisted in storage. Messages published by publishers running in
-   * non-allowed GCP regions (or running outside of GCP altogether) will be
-   * routed for storage in one of the allowed regions. An empty list means that
-   * no regions are allowed, and is not a valid configuration.
+   * A list of IDs of Google Cloud regions where messages that are published
+   * to the topic may be persisted in storage. Messages published by publishers
+   * running in non-allowed Google Cloud regions (or running outside of Google
+   * Cloud altogether) are routed for storage in one of the allowed regions.
+   * An empty list means that no regions are allowed, and is not a valid
+   * configuration.
    * </pre>
    *
    * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -126,11 +129,12 @@ public java.lang.String getAllowedPersistenceRegions(int index) {
    *
    *
    * <pre>
-   * A list of IDs of GCP regions where messages that are published to the topic
-   * may be persisted in storage. Messages published by publishers running in
-   * non-allowed GCP regions (or running outside of GCP altogether) will be
-   * routed for storage in one of the allowed regions. An empty list means that
-   * no regions are allowed, and is not a valid configuration.
+   * A list of IDs of Google Cloud regions where messages that are published
+   * to the topic may be persisted in storage. Messages published by publishers
+   * running in non-allowed Google Cloud regions (or running outside of Google
+   * Cloud altogether) are routed for storage in one of the allowed regions.
+   * An empty list means that no regions are allowed, and is not a valid
+   * configuration.
    * </pre>
    *
    * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -513,11 +517,12 @@ private void ensureAllowedPersistenceRegionsIsMutable() {
      *
      *
      * <pre>
-     * A list of IDs of GCP regions where messages that are published to the topic
-     * may be persisted in storage. Messages published by publishers running in
-     * non-allowed GCP regions (or running outside of GCP altogether) will be
-     * routed for storage in one of the allowed regions. An empty list means that
-     * no regions are allowed, and is not a valid configuration.
+     * A list of IDs of Google Cloud regions where messages that are published
+     * to the topic may be persisted in storage. Messages published by publishers
+     * running in non-allowed Google Cloud regions (or running outside of Google
+     * Cloud altogether) are routed for storage in one of the allowed regions.
+     * An empty list means that no regions are allowed, and is not a valid
+     * configuration.
      * </pre>
      *
      * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -532,11 +537,12 @@ public com.google.protobuf.ProtocolStringList getAllowedPersistenceRegionsList()
      *
      *
      * <pre>
-     * A list of IDs of GCP regions where messages that are published to the topic
-     * may be persisted in storage. Messages published by publishers running in
-     * non-allowed GCP regions (or running outside of GCP altogether) will be
-     * routed for storage in one of the allowed regions. An empty list means that
-     * no regions are allowed, and is not a valid configuration.
+     * A list of IDs of Google Cloud regions where messages that are published
+     * to the topic may be persisted in storage. Messages published by publishers
+     * running in non-allowed Google Cloud regions (or running outside of Google
+     * Cloud altogether) are routed for storage in one of the allowed regions.
+     * An empty list means that no regions are allowed, and is not a valid
+     * configuration.
      * </pre>
      *
      * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -550,11 +556,12 @@ public int getAllowedPersistenceRegionsCount() {
      *
      *
      * <pre>
-     * A list of IDs of GCP regions where messages that are published to the topic
-     * may be persisted in storage. Messages published by publishers running in
-     * non-allowed GCP regions (or running outside of GCP altogether) will be
-     * routed for storage in one of the allowed regions. An empty list means that
-     * no regions are allowed, and is not a valid configuration.
+     * A list of IDs of Google Cloud regions where messages that are published
+     * to the topic may be persisted in storage. Messages published by publishers
+     * running in non-allowed Google Cloud regions (or running outside of Google
+     * Cloud altogether) are routed for storage in one of the allowed regions.
+     * An empty list means that no regions are allowed, and is not a valid
+     * configuration.
      * </pre>
      *
      * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -569,11 +576,12 @@ public java.lang.String getAllowedPersistenceRegions(int index) {
      *
      *
      * <pre>
-     * A list of IDs of GCP regions where messages that are published to the topic
-     * may be persisted in storage. Messages published by publishers running in
-     * non-allowed GCP regions (or running outside of GCP altogether) will be
-     * routed for storage in one of the allowed regions. An empty list means that
-     * no regions are allowed, and is not a valid configuration.
+     * A list of IDs of Google Cloud regions where messages that are published
+     * to the topic may be persisted in storage. Messages published by publishers
+     * running in non-allowed Google Cloud regions (or running outside of Google
+     * Cloud altogether) are routed for storage in one of the allowed regions.
+     * An empty list means that no regions are allowed, and is not a valid
+     * configuration.
      * </pre>
      *
      * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -588,11 +596,12 @@ public com.google.protobuf.ByteString getAllowedPersistenceRegionsBytes(int inde
      *
      *
      * <pre>
-     * A list of IDs of GCP regions where messages that are published to the topic
-     * may be persisted in storage. Messages published by publishers running in
-     * non-allowed GCP regions (or running outside of GCP altogether) will be
-     * routed for storage in one of the allowed regions. An empty list means that
-     * no regions are allowed, and is not a valid configuration.
+     * A list of IDs of Google Cloud regions where messages that are published
+     * to the topic may be persisted in storage. Messages published by publishers
+     * running in non-allowed Google Cloud regions (or running outside of Google
+     * Cloud altogether) are routed for storage in one of the allowed regions.
+     * An empty list means that no regions are allowed, and is not a valid
+     * configuration.
      * </pre>
      *
      * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -615,11 +624,12 @@ public Builder setAllowedPersistenceRegions(int index, java.lang.String value) {
      *
      *
      * <pre>
-     * A list of IDs of GCP regions where messages that are published to the topic
-     * may be persisted in storage. Messages published by publishers running in
-     * non-allowed GCP regions (or running outside of GCP altogether) will be
-     * routed for storage in one of the allowed regions. An empty list means that
-     * no regions are allowed, and is not a valid configuration.
+     * A list of IDs of Google Cloud regions where messages that are published
+     * to the topic may be persisted in storage. Messages published by publishers
+     * running in non-allowed Google Cloud regions (or running outside of Google
+     * Cloud altogether) are routed for storage in one of the allowed regions.
+     * An empty list means that no regions are allowed, and is not a valid
+     * configuration.
      * </pre>
      *
      * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -641,11 +651,12 @@ public Builder addAllowedPersistenceRegions(java.lang.String value) {
      *
      *
      * <pre>
-     * A list of IDs of GCP regions where messages that are published to the topic
-     * may be persisted in storage. Messages published by publishers running in
-     * non-allowed GCP regions (or running outside of GCP altogether) will be
-     * routed for storage in one of the allowed regions. An empty list means that
-     * no regions are allowed, and is not a valid configuration.
+     * A list of IDs of Google Cloud regions where messages that are published
+     * to the topic may be persisted in storage. Messages published by publishers
+     * running in non-allowed Google Cloud regions (or running outside of Google
+     * Cloud altogether) are routed for storage in one of the allowed regions.
+     * An empty list means that no regions are allowed, and is not a valid
+     * configuration.
      * </pre>
      *
      * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -664,11 +675,12 @@ public Builder addAllAllowedPersistenceRegions(java.lang.Iterable<java.lang.Stri
      *
      *
      * <pre>
-     * A list of IDs of GCP regions where messages that are published to the topic
-     * may be persisted in storage. Messages published by publishers running in
-     * non-allowed GCP regions (or running outside of GCP altogether) will be
-     * routed for storage in one of the allowed regions. An empty list means that
-     * no regions are allowed, and is not a valid configuration.
+     * A list of IDs of Google Cloud regions where messages that are published
+     * to the topic may be persisted in storage. Messages published by publishers
+     * running in non-allowed Google Cloud regions (or running outside of Google
+     * Cloud altogether) are routed for storage in one of the allowed regions.
+     * An empty list means that no regions are allowed, and is not a valid
+     * configuration.
      * </pre>
      *
      * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -686,11 +698,12 @@ public Builder clearAllowedPersistenceRegions() {
      *
      *
      * <pre>
-     * A list of IDs of GCP regions where messages that are published to the topic
-     * may be persisted in storage. Messages published by publishers running in
-     * non-allowed GCP regions (or running outside of GCP altogether) will be
-     * routed for storage in one of the allowed regions. An empty list means that
-     * no regions are allowed, and is not a valid configuration.
+     * A list of IDs of Google Cloud regions where messages that are published
+     * to the topic may be persisted in storage. Messages published by publishers
+     * running in non-allowed Google Cloud regions (or running outside of Google
+     * Cloud altogether) are routed for storage in one of the allowed regions.
+     * An empty list means that no regions are allowed, and is not a valid
+     * configuration.
      * </pre>
      *
      * <code>repeated string allowed_persistence_regions = 1;</code>
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicyOrBuilder.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicyOrBuilder.java
index 8edf41faa..5f075aca0 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicyOrBuilder.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicyOrBuilder.java
@@ -27,11 +27,12 @@ public interface MessageStoragePolicyOrBuilder
    *
    *
    * <pre>
-   * A list of IDs of GCP regions where messages that are published to the topic
-   * may be persisted in storage. Messages published by publishers running in
-   * non-allowed GCP regions (or running outside of GCP altogether) will be
-   * routed for storage in one of the allowed regions. An empty list means that
-   * no regions are allowed, and is not a valid configuration.
+   * A list of IDs of Google Cloud regions where messages that are published
+   * to the topic may be persisted in storage. Messages published by publishers
+   * running in non-allowed Google Cloud regions (or running outside of Google
+   * Cloud altogether) are routed for storage in one of the allowed regions.
+   * An empty list means that no regions are allowed, and is not a valid
+   * configuration.
    * </pre>
    *
    * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -43,11 +44,12 @@ public interface MessageStoragePolicyOrBuilder
    *
    *
    * <pre>
-   * A list of IDs of GCP regions where messages that are published to the topic
-   * may be persisted in storage. Messages published by publishers running in
-   * non-allowed GCP regions (or running outside of GCP altogether) will be
-   * routed for storage in one of the allowed regions. An empty list means that
-   * no regions are allowed, and is not a valid configuration.
+   * A list of IDs of Google Cloud regions where messages that are published
+   * to the topic may be persisted in storage. Messages published by publishers
+   * running in non-allowed Google Cloud regions (or running outside of Google
+   * Cloud altogether) are routed for storage in one of the allowed regions.
+   * An empty list means that no regions are allowed, and is not a valid
+   * configuration.
    * </pre>
    *
    * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -59,11 +61,12 @@ public interface MessageStoragePolicyOrBuilder
    *
    *
    * <pre>
-   * A list of IDs of GCP regions where messages that are published to the topic
-   * may be persisted in storage. Messages published by publishers running in
-   * non-allowed GCP regions (or running outside of GCP altogether) will be
-   * routed for storage in one of the allowed regions. An empty list means that
-   * no regions are allowed, and is not a valid configuration.
+   * A list of IDs of Google Cloud regions where messages that are published
+   * to the topic may be persisted in storage. Messages published by publishers
+   * running in non-allowed Google Cloud regions (or running outside of Google
+   * Cloud altogether) are routed for storage in one of the allowed regions.
+   * An empty list means that no regions are allowed, and is not a valid
+   * configuration.
    * </pre>
    *
    * <code>repeated string allowed_persistence_regions = 1;</code>
@@ -76,11 +79,12 @@ public interface MessageStoragePolicyOrBuilder
    *
    *
    * <pre>
-   * A list of IDs of GCP regions where messages that are published to the topic
-   * may be persisted in storage. Messages published by publishers running in
-   * non-allowed GCP regions (or running outside of GCP altogether) will be
-   * routed for storage in one of the allowed regions. An empty list means that
-   * no regions are allowed, and is not a valid configuration.
+   * A list of IDs of Google Cloud regions where messages that are published
+   * to the topic may be persisted in storage. Messages published by publishers
+   * running in non-allowed Google Cloud regions (or running outside of Google
+   * Cloud altogether) are routed for storage in one of the allowed regions.
+   * An empty list means that no regions are allowed, and is not a valid
+   * configuration.
    * </pre>
    *
    * <code>repeated string allowed_persistence_regions = 1;</code>
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
index 8dd269745..476d5384d 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
@@ -136,7 +136,7 @@ public com.google.protobuf.ByteString getSubscriptionBytes() {
    * </code>
    *
    * @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See
-   *     google/pubsub/v1/pubsub.proto;l=1226
+   *     google/pubsub/v1/pubsub.proto;l=1227
    * @return The returnImmediately.
    */
   @java.lang.Override
@@ -687,7 +687,7 @@ public Builder setSubscriptionBytes(com.google.protobuf.ByteString value) {
      * </code>
      *
      * @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See
-     *     google/pubsub/v1/pubsub.proto;l=1226
+     *     google/pubsub/v1/pubsub.proto;l=1227
      * @return The returnImmediately.
      */
     @java.lang.Override
@@ -713,7 +713,7 @@ public boolean getReturnImmediately() {
      * </code>
      *
      * @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See
-     *     google/pubsub/v1/pubsub.proto;l=1226
+     *     google/pubsub/v1/pubsub.proto;l=1227
      * @param value The returnImmediately to set.
      * @return This builder for chaining.
      */
@@ -743,7 +743,7 @@ public Builder setReturnImmediately(boolean value) {
      * </code>
      *
      * @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See
-     *     google/pubsub/v1/pubsub.proto;l=1226
+     *     google/pubsub/v1/pubsub.proto;l=1227
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java
index 963c7f799..740269f4a 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java
@@ -71,7 +71,7 @@ public interface PullRequestOrBuilder
    * </code>
    *
    * @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See
-   *     google/pubsub/v1/pubsub.proto;l=1226
+   *     google/pubsub/v1/pubsub.proto;l=1227
    * @return The returnImmediately.
    */
   @java.lang.Deprecated
diff --git a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto
index 4468de178..700324dc7 100644
--- a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto
+++ b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto
@@ -44,7 +44,7 @@ service Publisher {
       "https://www.googleapis.com/auth/pubsub";
 
   // Creates the given topic with the given name. See the [resource name rules]
-  // (https://cloud.google.com/pubsub/docs/admin#resource_names).
+  // (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
   rpc CreateTopic(Topic) returns (Topic) {
     option (google.api.http) = {
       put: "/v1/{name=projects/*/topics/*}"
@@ -137,11 +137,12 @@ service Publisher {
 
 // A policy constraining the storage of messages published to the topic.
 message MessageStoragePolicy {
-  // A list of IDs of GCP regions where messages that are published to the topic
-  // may be persisted in storage. Messages published by publishers running in
-  // non-allowed GCP regions (or running outside of GCP altogether) will be
-  // routed for storage in one of the allowed regions. An empty list means that
-  // no regions are allowed, and is not a valid configuration.
+  // A list of IDs of Google Cloud regions where messages that are published
+  // to the topic may be persisted in storage. Messages published by publishers
+  // running in non-allowed Google Cloud regions (or running outside of Google
+  // Cloud altogether) are routed for storage in one of the allowed regions.
+  // An empty list means that no regions are allowed, and is not a valid
+  // configuration.
   repeated string allowed_persistence_regions = 1;
 }
 
@@ -430,16 +431,16 @@ service Subscriber {
       "https://www.googleapis.com/auth/pubsub";
 
   // Creates a subscription to a given topic. See the [resource name rules]
-  // (https://cloud.google.com/pubsub/docs/admin#resource_names).
+  // (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
   // If the subscription already exists, returns `ALREADY_EXISTS`.
   // If the corresponding topic doesn't exist, returns `NOT_FOUND`.
   //
   // If the name is not provided in the request, the server will assign a random
   // name for this subscription on the same project as the topic, conforming
   // to the [resource name format]
-  // (https://cloud.google.com/pubsub/docs/admin#resource_names). The generated
-  // name is populated in the returned Subscription object. Note that for REST
-  // API requests, you must specify a name in the request.
+  // (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
+  // generated name is populated in the returned Subscription object. Note that
+  // for REST API requests, you must specify a name in the request.
   rpc CreateSubscription(Subscription) returns (Subscription) {
     option (google.api.http) = {
       put: "/v1/{name=projects/*/subscriptions/*}"
@@ -592,7 +593,7 @@ service Subscriber {
   // the request, the server will assign a random
   // name for this snapshot on the same project as the subscription, conforming
   // to the [resource name format]
-  // (https://cloud.google.com/pubsub/docs/admin#resource_names). The
+  // (https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names). The
   // generated name is populated in the returned Snapshot object. Note that for
   // REST API requests, you must specify a name in the request.
   rpc CreateSnapshot(CreateSnapshotRequest) returns (Snapshot) {
@@ -1429,8 +1430,8 @@ message CreateSnapshotRequest {
   // in the request, the server will assign a random name for this snapshot on
   // the same project as the subscription. Note that for REST API requests, you
   // must specify a name.  See the [resource name
-  // rules](https://cloud.google.com/pubsub/docs/admin#resource_names). Format
-  // is `projects/{project}/snapshots/{snap}`.
+  // rules](https://cloud.google.com/pubsub/docs/pubsub-basics#resource_names).
+  // Format is `projects/{project}/snapshots/{snap}`.
   string name = 1 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = { type: "pubsub.googleapis.com/Snapshot" }