From 2bcee81a7f7eeda8ab2274766cd4c2afc7ae4324 Mon Sep 17 00:00:00 2001
From: Chris Stephens <chrisst@google.com>
Date: Tue, 5 Nov 2019 23:20:39 +0000
Subject: [PATCH] Terraform provider docs update

Signed-off-by: Modular Magician <magic-modules@google.com>
---
 .../d/datasource_client_config.html.markdown  |  1 +
 ...urce_cloudfunctions_function.html.markdown |  1 +
 .../datasource_compute_address.html.markdown  |  3 ++-
 ...urce_compute_forwarding_rule.html.markdown |  1 +
 ...ource_compute_global_address.html.markdown |  3 ++-
 .../d/datasource_compute_image.html.markdown  |  1 +
 .../datasource_compute_instance.html.markdown |  3 ++-
 ...asource_compute_lb_ip_ranges.html.markdown |  1 +
 .../datasource_compute_network.html.markdown  |  1 +
 ...ompute_region_instance_group.html.markdown |  1 +
 .../d/datasource_compute_router.html.markdown |  5 +++--
 ...urce_compute_ssl_certificate.html.markdown |  1 +
 ...atasource_compute_ssl_policy.html.markdown |  3 ++-
 ...atasource_compute_subnetwork.html.markdown |  1 +
 ...tasource_compute_vpn_gateway.html.markdown |  1 +
 ...oogle_client_openid_userinfo.html.markdown |  1 +
 ...ogle_composer_image_versions.html.markdown |  3 ++-
 ...ogle_compute_backend_service.html.markdown |  1 +
 ...mpute_network_endpoint_group.html.markdown |  1 +
 ...e_folder_organization_policy.html.markdown |  1 +
 .../datasource_google_iam_role.html.markdown  |  1 +
 ...ce_google_netblock_ip_ranges.html.markdown |  1 +
 ..._project_organization_policy.html.markdown |  1 +
 ...ource_google_service_account.html.markdown |  1 +
 ...service_account_access_token.html.markdown |  1 +
 ...e_google_service_account_key.html.markdown |  1 +
 ...urce_tpu_tensorflow_versions.html.markdown |  1 +
 website/docs/d/dns_managed_zone.html.markdown |  1 +
 .../docs/d/google_active_folder.html.markdown |  1 +
 .../d/google_billing_account.html.markdown    |  1 +
 ...pute_default_service_account.html.markdown |  1 +
 ...oogle_compute_instance_group.html.markdown |  1 +
 .../d/google_compute_node_types.html.markdown |  1 +
 .../d/google_compute_regions.html.markdown    |  1 +
 ...ogle_compute_resource_policy.html.markdown |  1 +
 .../docs/d/google_compute_zones.html.markdown |  1 +
 .../d/google_container_cluster.html.markdown  |  1 +
 ...le_container_engine_versions.html.markdown |  1 +
 ...gle_container_registry_image.html.markdown |  1 +
 ...ontainer_registry_repository.html.markdown |  1 +
 website/docs/d/google_folder.html.markdown    |  1 +
 .../docs/d/google_iam_policy.html.markdown    |  1 +
 .../d/google_kms_crypto_key.html.markdown     |  1 +
 ...oogle_kms_crypto_key_version.html.markdown |  1 +
 .../docs/d/google_kms_key_ring.html.markdown  |  1 +
 .../docs/d/google_kms_secret.html.markdown    |  1 +
 ...google_kms_secret_ciphertext.html.markdown |  3 ++-
 .../docs/d/google_organization.html.markdown  |  1 +
 website/docs/d/google_project.html.markdown   |  7 ++++---
 .../d/google_project_services.html.markdown   |  1 +
 website/docs/d/google_projects.html.markdown  |  1 +
 ...rage_project_service_account.html.markdown |  1 +
 ...sfer_project_service_account.html.markdown |  1 +
 website/docs/d/signed_url.html.markdown       | 19 ++++++++++---------
 .../d/storage_bucket_object.html.markdown     |  1 +
 ...context_manager_access_level.html.markdown |  1 +
 ...ontext_manager_access_policy.html.markdown |  1 +
 ...xt_manager_service_perimeter.html.markdown |  1 +
 .../r/app_engine_application.html.markdown    |  1 +
 ...plication_url_dispatch_rules.html.markdown |  1 +
 .../r/app_engine_domain_mapping.html.markdown |  1 +
 .../r/app_engine_firewall_rule.html.markdown  |  1 +
 ..._engine_standard_app_version.html.markdown |  1 +
 ...igquery_data_transfer_config.html.markdown |  1 +
 website/docs/r/bigquery_dataset.html.markdown |  1 +
 website/docs/r/bigquery_table.html.markdown   |  1 +
 .../docs/r/bigtable_app_profile.html.markdown |  1 +
 .../docs/r/bigtable_gc_policy.html.markdown   |  1 +
 .../docs/r/bigtable_instance.html.markdown    |  1 +
 .../r/bigtable_instance_iam.html.markdown     |  1 +
 website/docs/r/bigtable_table.html.markdown   |  1 +
 ...inary_authorization_attestor.html.markdown |  1 +
 ...y_authorization_attestor_iam.html.markdown |  1 +
 .../binary_authorization_policy.html.markdown |  1 +
 .../docs/r/cloud_scheduler_job.html.markdown  |  1 +
 .../docs/r/cloudbuild_trigger.html.markdown   |  1 +
 ...functions_cloud_function_iam.html.markdown |  1 +
 .../r/cloudfunctions_function.html.markdown   |  1 +
 .../docs/r/cloudiot_registry.html.markdown    |  1 +
 .../docs/r/composer_environment.html.markdown |  1 +
 website/docs/r/compute_address.html.markdown  |  1 +
 .../r/compute_attached_disk.html.markdown     |  1 +
 .../docs/r/compute_autoscaler.html.markdown   |  1 +
 .../r/compute_backend_bucket.html.markdown    |  1 +
 ...ackend_bucket_signed_url_key.html.markdown |  1 +
 .../r/compute_backend_service.html.markdown   |  1 +
 ...ckend_service_signed_url_key.html.markdown |  1 +
 website/docs/r/compute_disk.html.markdown     |  1 +
 ...k_resource_policy_attachment.html.markdown |  1 +
 website/docs/r/compute_firewall.html.markdown |  1 +
 .../r/compute_forwarding_rule.html.markdown   |  1 +
 .../r/compute_global_address.html.markdown    |  1 +
 ...mpute_global_forwarding_rule.html.markdown |  1 +
 .../docs/r/compute_health_check.html.markdown |  1 +
 .../r/compute_http_health_check.html.markdown |  1 +
 .../compute_https_health_check.html.markdown  |  1 +
 website/docs/r/compute_image.html.markdown    |  1 +
 website/docs/r/compute_instance.html.markdown |  1 +
 ...mpute_instance_from_template.html.markdown |  1 +
 .../r/compute_instance_group.html.markdown    |  1 +
 ...mpute_instance_group_manager.html.markdown |  1 +
 .../docs/r/compute_instance_iam.html.markdown |  1 +
 .../r/compute_instance_template.html.markdown |  1 +
 ...pute_interconnect_attachment.html.markdown |  1 +
 website/docs/r/compute_network.html.markdown  |  1 +
 .../r/compute_network_endpoint.html.markdown  |  1 +
 ...mpute_network_endpoint_group.html.markdown |  1 +
 .../r/compute_network_peering.html.markdown   |  1 +
 .../docs/r/compute_node_group.html.markdown   |  1 +
 .../r/compute_node_template.html.markdown     |  1 +
 ...project_default_network_tier.html.markdown |  1 +
 .../r/compute_project_metadata.html.markdown  |  1 +
 ...ompute_project_metadata_item.html.markdown |  3 ++-
 .../r/compute_region_autoscaler.html.markdown |  1 +
 ...mpute_region_backend_service.html.markdown |  1 +
 .../docs/r/compute_region_disk.html.markdown  |  1 +
 ...egion_instance_group_manager.html.markdown |  1 +
 .../docs/r/compute_reservation.html.markdown  |  1 +
 .../r/compute_resource_policy.html.markdown   |  1 +
 website/docs/r/compute_route.html.markdown    |  1 +
 website/docs/r/compute_router.html.markdown   |  1 +
 .../r/compute_router_interface.html.markdown  |  1 +
 .../docs/r/compute_router_nat.html.markdown   |  1 +
 .../docs/r/compute_router_peer.html.markdown  |  1 +
 .../r/compute_security_policy.html.markdown   |  1 +
 ...pute_shared_vpc_host_project.html.markdown |  1 +
 ...e_shared_vpc_service_project.html.markdown |  1 +
 website/docs/r/compute_snapshot.html.markdown |  1 +
 .../r/compute_ssl_certificate.html.markdown   |  1 +
 .../docs/r/compute_ssl_policy.html.markdown   |  1 +
 .../docs/r/compute_subnetwork.html.markdown   |  1 +
 .../r/compute_subnetwork_iam.html.markdown    |  1 +
 .../r/compute_target_http_proxy.html.markdown |  1 +
 .../compute_target_https_proxy.html.markdown  |  1 +
 .../r/compute_target_instance.html.markdown   |  1 +
 .../docs/r/compute_target_pool.html.markdown  |  1 +
 .../r/compute_target_ssl_proxy.html.markdown  |  1 +
 .../r/compute_target_tcp_proxy.html.markdown  |  1 +
 website/docs/r/compute_url_map.html.markdown  |  1 +
 .../docs/r/compute_vpn_gateway.html.markdown  |  1 +
 .../docs/r/compute_vpn_tunnel.html.markdown   |  1 +
 .../r/container_analysis_note.html.markdown   |  1 +
 .../docs/r/container_cluster.html.markdown    |  1 +
 .../docs/r/container_node_pool.html.markdown  |  1 +
 website/docs/r/dataflow_job.html.markdown     |  1 +
 website/docs/r/dataproc_cluster.html.markdown |  1 +
 .../docs/r/dataproc_cluster_iam.html.markdown |  3 ++-
 website/docs/r/dataproc_job.html.markdown     |  1 +
 website/docs/r/dataproc_job_iam.html.markdown |  3 ++-
 website/docs/r/dns_managed_zone.html.markdown |  1 +
 website/docs/r/dns_record_set.markdown        |  1 +
 .../docs/r/endpoints_service.html.markdown    |  1 +
 .../docs/r/filestore_instance.html.markdown   |  1 +
 website/docs/r/firestore_index.html.markdown  |  1 +
 .../r/google_billing_account_iam_binding.md   |  1 +
 .../r/google_billing_account_iam_member.md    |  1 +
 .../r/google_billing_account_iam_policy.md    |  1 +
 website/docs/r/google_folder.html.markdown    |  1 +
 .../r/google_folder_iam_binding.html.markdown |  1 +
 .../r/google_folder_iam_member.html.markdown  |  1 +
 .../r/google_folder_iam_policy.html.markdown  |  1 +
 ...e_folder_organization_policy.html.markdown |  1 +
 ...e_kms_crypto_key_iam_binding.html.markdown |  1 +
 ...le_kms_crypto_key_iam_member.html.markdown |  1 +
 .../r/google_kms_key_ring_iam.html.markdown   |  1 +
 .../docs/r/google_organization_iam_binding.md |  1 +
 ...organization_iam_custom_role.html.markdown |  1 +
 .../docs/r/google_organization_iam_member.md  |  1 +
 .../docs/r/google_organization_iam_policy.md  |  1 +
 .../google_organization_policy.html.markdown  |  1 +
 website/docs/r/google_project.html.markdown   |  1 +
 .../docs/r/google_project_iam.html.markdown   |  3 ++-
 ...ogle_project_iam_custom_role.html.markdown |  1 +
 ..._project_organization_policy.html.markdown |  1 +
 .../r/google_project_service.html.markdown    |  1 +
 .../r/google_project_services.html.markdown   |  1 +
 .../r/google_service_account.html.markdown    |  1 +
 .../google_service_account_iam.html.markdown  |  2 ++
 .../google_service_account_key.html.markdown  |  1 +
 .../iap_app_engine_service_iam.html.markdown  |  1 +
 .../iap_app_engine_version_iam.html.markdown  |  1 +
 .../iap_web_backend_service_iam.html.markdown |  1 +
 website/docs/r/iap_web_iam.html.markdown      |  1 +
 .../iap_web_type_app_engine_iam.html.markdown |  1 +
 .../r/iap_web_type_compute_iam.html.markdown  |  1 +
 website/docs/r/kms_crypto_key.html.markdown   |  1 +
 website/docs/r/kms_key_ring.html.markdown     |  1 +
 ...ng_billing_account_exclusion.html.markdown |  1 +
 ...logging_billing_account_sink.html.markdown |  1 +
 .../r/logging_folder_exclusion.html.markdown  |  1 +
 .../docs/r/logging_folder_sink.html.markdown  |  1 +
 website/docs/r/logging_metric.html.markdown   |  1 +
 ...gging_organization_exclusion.html.markdown |  1 +
 .../r/logging_organization_sink.html.markdown |  1 +
 .../r/logging_project_exclusion.html.markdown |  1 +
 .../docs/r/logging_project_sink.html.markdown |  1 +
 website/docs/r/ml_engine_model.html.markdown  |  1 +
 .../r/monitoring_alert_policy.html.markdown   |  1 +
 website/docs/r/monitoring_group.html.markdown |  1 +
 ...itoring_notification_channel.html.markdown |  1 +
 ...nitoring_uptime_check_config.html.markdown |  1 +
 .../docs/r/pubsub_subscription.html.markdown  |  1 +
 .../r/pubsub_subscription_iam.html.markdown   |  3 ++-
 website/docs/r/pubsub_topic.html.markdown     |  1 +
 website/docs/r/pubsub_topic_iam.html.markdown |  1 +
 website/docs/r/redis_instance.html.markdown   |  1 +
 .../r/resource_manager_lien.html.markdown     |  1 +
 .../docs/r/runtimeconfig_config.html.markdown |  1 +
 .../r/runtimeconfig_config_iam.html.markdown  |  1 +
 .../r/runtimeconfig_variable.html.markdown    |  1 +
 website/docs/r/scc_source.html.markdown       |  1 +
 ...ervice_networking_connection.html.markdown |  1 +
 .../r/sourcerepo_repository.html.markdown     |  1 +
 .../r/sourcerepo_repository_iam.html.markdown |  1 +
 website/docs/r/spanner_database.html.markdown |  1 +
 .../docs/r/spanner_database_iam.html.markdown |  1 +
 website/docs/r/spanner_instance.html.markdown |  1 +
 .../docs/r/spanner_instance_iam.html.markdown |  1 +
 website/docs/r/sql_database.html.markdown     |  1 +
 .../r/sql_database_instance.html.markdown     |  1 +
 website/docs/r/sql_ssl_cert.html.markdown     |  1 +
 website/docs/r/sql_user.html.markdown         |  1 +
 website/docs/r/storage_bucket.html.markdown   |  1 +
 ...torage_bucket_access_control.html.markdown |  1 +
 .../docs/r/storage_bucket_acl.html.markdown   |  1 +
 .../docs/r/storage_bucket_iam.html.markdown   |  1 +
 .../r/storage_bucket_object.html.markdown     |  1 +
 ...efault_object_access_control.html.markdown |  1 +
 .../storage_default_object_acl.html.markdown  |  1 +
 .../docs/r/storage_notification.html.markdown |  1 +
 ...torage_object_access_control.html.markdown |  1 +
 .../docs/r/storage_object_acl.html.markdown   |  1 +
 .../docs/r/storage_transfer_job.html.markdown |  1 +
 website/docs/r/tpu_node.html.markdown         |  1 +
 .../docs/r/usage_export_bucket.html.markdown  |  1 +
 235 files changed, 261 insertions(+), 25 deletions(-)

diff --git a/website/docs/d/datasource_client_config.html.markdown b/website/docs/d/datasource_client_config.html.markdown
index 4b888c8ce03..2627a0f8680 100644
--- a/website/docs/d/datasource_client_config.html.markdown
+++ b/website/docs/d/datasource_client_config.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_client_config"
 sidebar_current: "docs-google-datasource-client-config"
diff --git a/website/docs/d/datasource_cloudfunctions_function.html.markdown b/website/docs/d/datasource_cloudfunctions_function.html.markdown
index a7f8767c105..2de510d61b3 100644
--- a/website/docs/d/datasource_cloudfunctions_function.html.markdown
+++ b/website/docs/d/datasource_cloudfunctions_function.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Functions"
 layout: "google"
 page_title: "Google: google_cloudfunctions_function"
 sidebar_current: "docs-google-datasource-cloudfunctions-function"
diff --git a/website/docs/d/datasource_compute_address.html.markdown b/website/docs/d/datasource_compute_address.html.markdown
index 62e2cdf5d9c..91eec27df68 100644
--- a/website/docs/d/datasource_compute_address.html.markdown
+++ b/website/docs/d/datasource_compute_address.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_address"
 sidebar_current: "docs-google-datasource-compute-address"
@@ -55,4 +56,4 @@ exported:
 
 * `self_link` - The URI of the created resource.
 * `address` - The IP of the created resource.
-* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
\ No newline at end of file
+* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
diff --git a/website/docs/d/datasource_compute_forwarding_rule.html.markdown b/website/docs/d/datasource_compute_forwarding_rule.html.markdown
index f532ed364d3..d73b2ed026a 100644
--- a/website/docs/d/datasource_compute_forwarding_rule.html.markdown
+++ b/website/docs/d/datasource_compute_forwarding_rule.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_forwarding_rule"
 sidebar_current: "docs-google-datasource-compute-forwarding-rule"
diff --git a/website/docs/d/datasource_compute_global_address.html.markdown b/website/docs/d/datasource_compute_global_address.html.markdown
index 236048bbbf6..d985e2fe9cb 100644
--- a/website/docs/d/datasource_compute_global_address.html.markdown
+++ b/website/docs/d/datasource_compute_global_address.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_global_address"
 sidebar_current: "docs-google-datasource-compute-global-address"
@@ -52,4 +53,4 @@ exported:
 
 * `self_link` - The URI of the created resource.
 * `address` - The IP of the created resource.
-* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
\ No newline at end of file
+* `status` - Indicates if the address is used. Possible values are: RESERVED or IN_USE.
diff --git a/website/docs/d/datasource_compute_image.html.markdown b/website/docs/d/datasource_compute_image.html.markdown
index 0a3a5056d6a..53597c27c49 100644
--- a/website/docs/d/datasource_compute_image.html.markdown
+++ b/website/docs/d/datasource_compute_image.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_image"
 sidebar_current: "docs-google-datasource-compute-image"
diff --git a/website/docs/d/datasource_compute_instance.html.markdown b/website/docs/d/datasource_compute_instance.html.markdown
index 6fad0aedd94..40ae8bd983f 100644
--- a/website/docs/d/datasource_compute_instance.html.markdown
+++ b/website/docs/d/datasource_compute_instance.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance"
 sidebar_current: "docs-google-datasource-compute-instance-x"
@@ -203,4 +204,4 @@ The `shielded_instance_config` block supports:
 
 * `enable_vtpm` -- Whether the instance uses vTPM.
 
-* `enable_integrity_monitoring` -- Whether integrity monitoring is enabled for the instance.
\ No newline at end of file
+* `enable_integrity_monitoring` -- Whether integrity monitoring is enabled for the instance.
diff --git a/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown b/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown
index 94f1b481c84..cce7318e020 100644
--- a/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown
+++ b/website/docs/d/datasource_compute_lb_ip_ranges.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_compute_lb_ip_ranges"
 sidebar_current: "docs-google-datasource-compute-lb-ip-ranges"
diff --git a/website/docs/d/datasource_compute_network.html.markdown b/website/docs/d/datasource_compute_network.html.markdown
index 0d975e8f510..0a134ed4f38 100644
--- a/website/docs/d/datasource_compute_network.html.markdown
+++ b/website/docs/d/datasource_compute_network.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_network"
 sidebar_current: "docs-google-datasource-compute-network"
diff --git a/website/docs/d/datasource_compute_region_instance_group.html.markdown b/website/docs/d/datasource_compute_region_instance_group.html.markdown
index 0d4f54a4087..592c220da5c 100644
--- a/website/docs/d/datasource_compute_region_instance_group.html.markdown
+++ b/website/docs/d/datasource_compute_region_instance_group.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_region_instance_group"
 sidebar_current: "docs-google-datasource-compute-region-instance-group"
diff --git a/website/docs/d/datasource_compute_router.html.markdown b/website/docs/d/datasource_compute_router.html.markdown
index 8c197a095e5..5ec2208b2b7 100644
--- a/website/docs/d/datasource_compute_router.html.markdown
+++ b/website/docs/d/datasource_compute_router.html.markdown
@@ -1,5 +1,6 @@
 ---
 layout: "google"
+subcategory: "Compute Engine"
 page_title: "Google: google_compute_router"
 sidebar_current: "docs-google-datasource-compute-router"
 description: |-
@@ -27,7 +28,7 @@ The following arguments are supported:
 
 * `network` - (Required) The VPC network on which this router lives.
 
-* `project` - (Optional) The ID of the project in which the resource 
+* `project` - (Optional) The ID of the project in which the resource
     belongs. If it is not provided, the provider project is used.
 
 * `region` - (Optional) The region this router has been created in. If
@@ -36,4 +37,4 @@ The following arguments are supported:
 
 ## Attributes Reference
 
-See [google_compute_router](https://www.terraform.io/docs/providers/google/r/compute_router.html) resource for details of the available attributes.
\ No newline at end of file
+See [google_compute_router](https://www.terraform.io/docs/providers/google/r/compute_router.html) resource for details of the available attributes.
diff --git a/website/docs/d/datasource_compute_ssl_certificate.html.markdown b/website/docs/d/datasource_compute_ssl_certificate.html.markdown
index 6e3872fa41b..deddd521f72 100644
--- a/website/docs/d/datasource_compute_ssl_certificate.html.markdown
+++ b/website/docs/d/datasource_compute_ssl_certificate.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_ssl_certificate"
 sidebar_current: "docs-google-datasource-compute-ssl-certificate"
diff --git a/website/docs/d/datasource_compute_ssl_policy.html.markdown b/website/docs/d/datasource_compute_ssl_policy.html.markdown
index d7c7e5a2467..8b4f6a0855c 100644
--- a/website/docs/d/datasource_compute_ssl_policy.html.markdown
+++ b/website/docs/d/datasource_compute_ssl_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_ssl_policy"
 sidebar_current: "docs-google-datasource-compute-ssl-policy"
@@ -48,4 +49,4 @@ In addition to the arguments listed above, the following attributes are exported
 
 * `fingerprint` - Fingerprint of this resource.
 
-* `self_link` - The URI of the created resource.
\ No newline at end of file
+* `self_link` - The URI of the created resource.
diff --git a/website/docs/d/datasource_compute_subnetwork.html.markdown b/website/docs/d/datasource_compute_subnetwork.html.markdown
index 19493e348ac..f39649411b3 100644
--- a/website/docs/d/datasource_compute_subnetwork.html.markdown
+++ b/website/docs/d/datasource_compute_subnetwork.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_subnetwork"
 sidebar_current: "docs-google-datasource-compute-subnetwork"
diff --git a/website/docs/d/datasource_compute_vpn_gateway.html.markdown b/website/docs/d/datasource_compute_vpn_gateway.html.markdown
index a8a2ffd5a09..f90e29c3383 100644
--- a/website/docs/d/datasource_compute_vpn_gateway.html.markdown
+++ b/website/docs/d/datasource_compute_vpn_gateway.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_vpn_gateway"
 sidebar_current: "docs-google-datasource-compute-vpn-gateway"
diff --git a/website/docs/d/datasource_google_client_openid_userinfo.html.markdown b/website/docs/d/datasource_google_client_openid_userinfo.html.markdown
index 6b2d9d0d1b1..ad33f675d40 100644
--- a/website/docs/d/datasource_google_client_openid_userinfo.html.markdown
+++ b/website/docs/d/datasource_google_client_openid_userinfo.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_client_openid_userinfo"
 sidebar_current: "docs-google-datasource-client-openid-userinfo"
diff --git a/website/docs/d/datasource_google_composer_image_versions.html.markdown b/website/docs/d/datasource_google_composer_image_versions.html.markdown
index fc3efb17b42..a1bfec475b0 100644
--- a/website/docs/d/datasource_google_composer_image_versions.html.markdown
+++ b/website/docs/d/datasource_google_composer_image_versions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Composer"
 layout: "google"
 page_title: "Google: google_composer_image_versions"
 sidebar_current: "docs-google-datasource-composer-image-versions"
@@ -43,4 +44,4 @@ The following attributes are exported:
 
 * `image_versions` - A list of composer image versions available in the given project and location. Each `image_version` contains:
   * `image_version_id` - The string identifier of the image version, in the form: "composer-x.y.z-airflow-a.b(.c)"
-  * `supported_python_versions` - Supported python versions for this image version
\ No newline at end of file
+  * `supported_python_versions` - Supported python versions for this image version
diff --git a/website/docs/d/datasource_google_compute_backend_service.html.markdown b/website/docs/d/datasource_google_compute_backend_service.html.markdown
index 91f4d75cedd..1bb0f3d8d58 100644
--- a/website/docs/d/datasource_google_compute_backend_service.html.markdown
+++ b/website/docs/d/datasource_google_compute_backend_service.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_backend_service"
 sidebar_current: "docs-google-datasource-compute-backend-service"
diff --git a/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown b/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown
index 4622ee702ff..f9e89e12691 100644
--- a/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown
+++ b/website/docs/d/datasource_google_compute_network_endpoint_group.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_network_endpoint_group"
 sidebar_current: "docs-google-datasource-compute-network-endpoint-group"
diff --git a/website/docs/d/datasource_google_folder_organization_policy.html.markdown b/website/docs/d/datasource_google_folder_organization_policy.html.markdown
index b01253b1201..e1e18b801b4 100644
--- a/website/docs/d/datasource_google_folder_organization_policy.html.markdown
+++ b/website/docs/d/datasource_google_folder_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder_organization_policy"
 sidebar_current: "docs-google-datasource-folder-organization-policy"
diff --git a/website/docs/d/datasource_google_iam_role.html.markdown b/website/docs/d/datasource_google_iam_role.html.markdown
index 77aebf4b89e..a438b8eef36 100644
--- a/website/docs/d/datasource_google_iam_role.html.markdown
+++ b/website/docs/d/datasource_google_iam_role.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_iam_role"
 sidebar_current: "docs-google-datasource-iam-role"
diff --git a/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown b/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown
index f6e97ca9a2e..95d0b187407 100644
--- a/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown
+++ b/website/docs/d/datasource_google_netblock_ip_ranges.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_netblock_ip_ranges"
 sidebar_current: "docs-google-datasource-netblock-ip-ranges"
diff --git a/website/docs/d/datasource_google_project_organization_policy.html.markdown b/website/docs/d/datasource_google_project_organization_policy.html.markdown
index cf1024bc5a1..0e4a697c0fe 100644
--- a/website/docs/d/datasource_google_project_organization_policy.html.markdown
+++ b/website/docs/d/datasource_google_project_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_organization_policy"
 sidebar_current: "docs-google-datasource-project-organization-policy"
diff --git a/website/docs/d/datasource_google_service_account.html.markdown b/website/docs/d/datasource_google_service_account.html.markdown
index ec60f87cb27..cc38459c2a3 100644
--- a/website/docs/d/datasource_google_service_account.html.markdown
+++ b/website/docs/d/datasource_google_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account"
 sidebar_current: "docs-google-datasource-service-account"
diff --git a/website/docs/d/datasource_google_service_account_access_token.html.markdown b/website/docs/d/datasource_google_service_account_access_token.html.markdown
index 25027cf255f..476c14ffc26 100644
--- a/website/docs/d/datasource_google_service_account_access_token.html.markdown
+++ b/website/docs/d/datasource_google_service_account_access_token.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account_access_token"
 sidebar_current: "docs-google-service-account-access-token"
diff --git a/website/docs/d/datasource_google_service_account_key.html.markdown b/website/docs/d/datasource_google_service_account_key.html.markdown
index c5fa0060334..69c194152d6 100644
--- a/website/docs/d/datasource_google_service_account_key.html.markdown
+++ b/website/docs/d/datasource_google_service_account_key.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account_key"
 sidebar_current: "docs-google-datasource-service-account-key"
diff --git a/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown b/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown
index 1ba803ebf15..7d809c68ada 100644
--- a/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown
+++ b/website/docs/d/datasource_tpu_tensorflow_versions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_tpu_tensorflow_versions"
 sidebar_current: "docs-google-datasource-tpu-tensorflow-versions"
diff --git a/website/docs/d/dns_managed_zone.html.markdown b/website/docs/d/dns_managed_zone.html.markdown
index 73cb8c7aa24..8cef82a1f6b 100644
--- a/website/docs/d/dns_managed_zone.html.markdown
+++ b/website/docs/d/dns_managed_zone.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud DNS"
 layout: "google"
 page_title: "Google: google_dns_managed_zone"
 sidebar_current: "docs-google-datasource-dns-managed-zone"
diff --git a/website/docs/d/google_active_folder.html.markdown b/website/docs/d/google_active_folder.html.markdown
index 8211c26ea56..1caca3e4257 100644
--- a/website/docs/d/google_active_folder.html.markdown
+++ b/website/docs/d/google_active_folder.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_active_folder"
 sidebar_current: "docs-google-datasource-active-folder"
diff --git a/website/docs/d/google_billing_account.html.markdown b/website/docs/d/google_billing_account.html.markdown
index edb41c5ff45..a03e0df8ed9 100644
--- a/website/docs/d/google_billing_account.html.markdown
+++ b/website/docs/d/google_billing_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_billing_account"
 sidebar_current: "docs-google-datasource-billing-account"
diff --git a/website/docs/d/google_compute_default_service_account.html.markdown b/website/docs/d/google_compute_default_service_account.html.markdown
index 7c84e7413d3..7e50711381d 100644
--- a/website/docs/d/google_compute_default_service_account.html.markdown
+++ b/website/docs/d/google_compute_default_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_compute_default_service_account"
 sidebar_current: "docs-google-datasource-compute-default-service-account"
diff --git a/website/docs/d/google_compute_instance_group.html.markdown b/website/docs/d/google_compute_instance_group.html.markdown
index 5cb34a714a1..303df971666 100644
--- a/website/docs/d/google_compute_instance_group.html.markdown
+++ b/website/docs/d/google_compute_instance_group.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_group"
 sidebar_current: "docs-google-datasource-compute-instance-group"
diff --git a/website/docs/d/google_compute_node_types.html.markdown b/website/docs/d/google_compute_node_types.html.markdown
index f8ab883f668..0ddde645734 100644
--- a/website/docs/d/google_compute_node_types.html.markdown
+++ b/website/docs/d/google_compute_node_types.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_node_types"
 sidebar_current: "docs-google-datasource-compute-node-types"
diff --git a/website/docs/d/google_compute_regions.html.markdown b/website/docs/d/google_compute_regions.html.markdown
index 85d7b9155ed..1df2c2bd8c6 100644
--- a/website/docs/d/google_compute_regions.html.markdown
+++ b/website/docs/d/google_compute_regions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_regions"
 sidebar_current: "docs-google-datasource-compute-regions"
diff --git a/website/docs/d/google_compute_resource_policy.html.markdown b/website/docs/d/google_compute_resource_policy.html.markdown
index 8789f81aab9..efaf9716041 100644
--- a/website/docs/d/google_compute_resource_policy.html.markdown
+++ b/website/docs/d/google_compute_resource_policy.html.markdown
@@ -1,5 +1,6 @@
 ---
 layout: "google"
+subcategory: "Cloud Platform"
 page_title: "Google: google_compute_resource_policy"
 sidebar_current: "docs-google-datasource-compute-resource-policy"
 description: |-
diff --git a/website/docs/d/google_compute_zones.html.markdown b/website/docs/d/google_compute_zones.html.markdown
index df1c139697d..604377b6aca 100644
--- a/website/docs/d/google_compute_zones.html.markdown
+++ b/website/docs/d/google_compute_zones.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_zones"
 sidebar_current: "docs-google-datasource-compute-zones"
diff --git a/website/docs/d/google_container_cluster.html.markdown b/website/docs/d/google_container_cluster.html.markdown
index 44a3a433d36..67aba024ce4 100644
--- a/website/docs/d/google_container_cluster.html.markdown
+++ b/website/docs/d/google_container_cluster.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Kubernetes (Container) Engine"
 layout: "google"
 page_title: "Google: google_container_cluster"
 sidebar_current: "docs-google-datasource-container-cluster"
diff --git a/website/docs/d/google_container_engine_versions.html.markdown b/website/docs/d/google_container_engine_versions.html.markdown
index a7eae609ac0..49ff7cf47c4 100644
--- a/website/docs/d/google_container_engine_versions.html.markdown
+++ b/website/docs/d/google_container_engine_versions.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Kubernetes (Container) Engine"
 layout: "google"
 page_title: "Google: google_container_engine_versions"
 sidebar_current: "docs-google-datasource-container-versions"
diff --git a/website/docs/d/google_container_registry_image.html.markdown b/website/docs/d/google_container_registry_image.html.markdown
index 6bac718dbeb..8d7ae054a82 100644
--- a/website/docs/d/google_container_registry_image.html.markdown
+++ b/website/docs/d/google_container_registry_image.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Container Registry"
 layout: "google"
 page_title: "Google: google_container_registry_image"
 sidebar_current: "docs-google-datasource-container-image"
diff --git a/website/docs/d/google_container_registry_repository.html.markdown b/website/docs/d/google_container_registry_repository.html.markdown
index e0344ea6efe..9880cc4b1b9 100644
--- a/website/docs/d/google_container_registry_repository.html.markdown
+++ b/website/docs/d/google_container_registry_repository.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Container Registry"
 layout: "google"
 page_title: "Google: google_container_registry_repository"
 sidebar_current: "docs-google-datasource-container-repo"
diff --git a/website/docs/d/google_folder.html.markdown b/website/docs/d/google_folder.html.markdown
index 869d674dbda..c35afb99a24 100644
--- a/website/docs/d/google_folder.html.markdown
+++ b/website/docs/d/google_folder.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder"
 sidebar_current: "docs-google-datasource-folder"
diff --git a/website/docs/d/google_iam_policy.html.markdown b/website/docs/d/google_iam_policy.html.markdown
index b795d20fa34..9c42472a613 100644
--- a/website/docs/d/google_iam_policy.html.markdown
+++ b/website/docs/d/google_iam_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_iam_policy"
 sidebar_current: "docs-google-datasource-iam-policy"
diff --git a/website/docs/d/google_kms_crypto_key.html.markdown b/website/docs/d/google_kms_crypto_key.html.markdown
index fbe1061907c..0613836fe0a 100644
--- a/website/docs/d/google_kms_crypto_key.html.markdown
+++ b/website/docs/d/google_kms_crypto_key.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Key Management Service"
 layout: "google"
 page_title: "Google: google_kms_crypto_key"
 sidebar_current: "docs-google-datasource-kms-crypto-key"
diff --git a/website/docs/d/google_kms_crypto_key_version.html.markdown b/website/docs/d/google_kms_crypto_key_version.html.markdown
index 5108aa8c0de..e246ed198da 100644
--- a/website/docs/d/google_kms_crypto_key_version.html.markdown
+++ b/website/docs/d/google_kms_crypto_key_version.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Key Management Service"
 layout: "google"
 page_title: "Google: google_kms_crypto_key_version"
 sidebar_current: "docs-google-datasource-kms-crypto-key-version"
diff --git a/website/docs/d/google_kms_key_ring.html.markdown b/website/docs/d/google_kms_key_ring.html.markdown
index 62818cb26bc..694ad200c49 100644
--- a/website/docs/d/google_kms_key_ring.html.markdown
+++ b/website/docs/d/google_kms_key_ring.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Key Management Service"
 layout: "google"
 page_title: "Google: google_kms_key_ring"
 sidebar_current: "docs-google-datasource-kms-key-ring"
diff --git a/website/docs/d/google_kms_secret.html.markdown b/website/docs/d/google_kms_secret.html.markdown
index 24ab5a3ca1a..feaa3244ae8 100644
--- a/website/docs/d/google_kms_secret.html.markdown
+++ b/website/docs/d/google_kms_secret.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Key Management Service"
 layout: "google"
 page_title: "Google: google_kms_secret"
 sidebar_current: "docs-google-kms-secret"
diff --git a/website/docs/d/google_kms_secret_ciphertext.html.markdown b/website/docs/d/google_kms_secret_ciphertext.html.markdown
index 6e91f12b9b4..82fba45e0cc 100644
--- a/website/docs/d/google_kms_secret_ciphertext.html.markdown
+++ b/website/docs/d/google_kms_secret_ciphertext.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Key Management Service"
 layout: "google"
 page_title: "Google: google_kms_secret_ciphertext"
 sidebar_current: "docs-google-kms-secret-ciphertext"
@@ -61,7 +62,7 @@ resource "google_compute_instance" "instance" {
     access_config {
     }
   }
-  
+
   metadata = {
     password = "${data.google_kms_secret_ciphertext.my_password.ciphertext}"
   }
diff --git a/website/docs/d/google_organization.html.markdown b/website/docs/d/google_organization.html.markdown
index 3f9d63721b7..4168109714e 100644
--- a/website/docs/d/google_organization.html.markdown
+++ b/website/docs/d/google_organization.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization"
 sidebar_current: "docs-google-datasource-organization"
diff --git a/website/docs/d/google_project.html.markdown b/website/docs/d/google_project.html.markdown
index b654a12f6f6..069939a89aa 100644
--- a/website/docs/d/google_project.html.markdown
+++ b/website/docs/d/google_project.html.markdown
@@ -1,15 +1,16 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project"
 sidebar_current: "docs-google-datasource-project"
 description: |-
-  Retrieve project details   
+  Retrieve project details
 ---
 
 # google\_project
 
 Use this data source to get project details.
-For more information see 
+For more information see
 [API](https://cloud.google.com/resource-manager/reference/rest/v1/projects#Project)
 
 ## Example Usage
@@ -19,7 +20,7 @@ data "google_project" "project" {}
 
 output "project_number" {
   value = "${data.google_project.project.number}"
-} 
+}
 ```
 
 ## Argument Reference
diff --git a/website/docs/d/google_project_services.html.markdown b/website/docs/d/google_project_services.html.markdown
index 654db29a6e4..6b0e1765c23 100644
--- a/website/docs/d/google_project_services.html.markdown
+++ b/website/docs/d/google_project_services.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_services"
 sidebar_current: "docs-google-datasource-project-services"
diff --git a/website/docs/d/google_projects.html.markdown b/website/docs/d/google_projects.html.markdown
index 00515567d21..f71a4cf4c69 100644
--- a/website/docs/d/google_projects.html.markdown
+++ b/website/docs/d/google_projects.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_projects"
 sidebar_current: "docs-google-datasource-projects"
diff --git a/website/docs/d/google_storage_project_service_account.html.markdown b/website/docs/d/google_storage_project_service_account.html.markdown
index 6c9bf86d20f..8ab1e5a98af 100644
--- a/website/docs/d/google_storage_project_service_account.html.markdown
+++ b/website/docs/d/google_storage_project_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_storage_project_service_account"
 sidebar_current: "docs-google-datasource-storage-project-service-account"
diff --git a/website/docs/d/google_storage_transfer_project_service_account.html.markdown b/website/docs/d/google_storage_transfer_project_service_account.html.markdown
index 124c9935dde..06daf3ae011 100644
--- a/website/docs/d/google_storage_transfer_project_service_account.html.markdown
+++ b/website/docs/d/google_storage_transfer_project_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_storage_transfer_project_service_account"
 sidebar_current: "docs-google-datasource-storage-transfer-project-service-account"
diff --git a/website/docs/d/signed_url.html.markdown b/website/docs/d/signed_url.html.markdown
index e5a43d37b2c..fee03ac2b55 100644
--- a/website/docs/d/signed_url.html.markdown
+++ b/website/docs/d/signed_url.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_object_signed_url"
 sidebar_current: "docs-google-datasource-signed_url"
@@ -22,7 +23,7 @@ data "google_storage_object_signed_url" "artifact" {
 
 resource "google_compute_instance" "vm" {
     name = "vm"
-    
+
     provisioner "remote-exec" {
         inline = [
                 "wget '${data.google_storage_object_signed_url.artifact.signed_url}' -O install_file.bin",
@@ -43,7 +44,7 @@ data "google_storage_object_signed_url" "get_url" {
   content_type = "text/plain"
   duration     = "2d"
   credentials  = "${file("path/to/credentials.json")}"
-  
+
   extension_headers = {
     x-goog-if-generation-match = 1
   }
@@ -57,20 +58,20 @@ The following arguments are supported:
 * `bucket` - (Required) The name of the bucket to read the object from
 * `path` - (Required) The full path to the object inside the bucket
 * `http_method` - (Optional) What HTTP Method will the signed URL allow (defaults to `GET`)
-* `duration` - (Optional) For how long shall the signed URL be valid (defaults to 1 hour - i.e. `1h`). 
+* `duration` - (Optional) For how long shall the signed URL be valid (defaults to 1 hour - i.e. `1h`).
      See [here](https://golang.org/pkg/time/#ParseDuration) for info on valid duration formats.
-* `credentials` - (Optional) What Google service account credentials json should be used to sign the URL. 
+* `credentials` - (Optional) What Google service account credentials json should be used to sign the URL.
      This data source checks the following locations for credentials, in order of preference: data source `credentials` attribute, provider `credentials` attribute and finally the GOOGLE_APPLICATION_CREDENTIALS environment variable.
-     
-    > **NOTE** the default google credentials configured by `gcloud` sdk or the service account associated with a compute instance cannot be used, because these do not include the private key required to sign the URL. A valid `json` service account credentials key file must be used, as generated via Google cloud console. 
-     
+
+    > **NOTE** the default google credentials configured by `gcloud` sdk or the service account associated with a compute instance cannot be used, because these do not include the private key required to sign the URL. A valid `json` service account credentials key file must be used, as generated via Google cloud console.
+
 * `content_type` - (Optional) If you specify this in the datasource, the client must provide the `Content-Type` HTTP header with the same value in its request.
 * `content_md5` - (Optional) The [MD5 digest](https://cloud.google.com/storage/docs/hashes-etags#_MD5) value in Base64.
      Typically retrieved from `google_storage_bucket_object.object.md5hash` attribute.
      If you provide this in the datasource, the client (e.g. browser, curl) must provide the `Content-MD5` HTTP header with this same value in its request.
-* `extension_headers` - (Optional) As needed. The server checks to make sure that the client provides matching values in requests using the signed URL. 
+* `extension_headers` - (Optional) As needed. The server checks to make sure that the client provides matching values in requests using the signed URL.
      Any header starting with `x-goog-` is accepted but see the [Google Docs](https://cloud.google.com/storage/docs/xml-api/reference-headers) for list of headers that are supported by Google.
-    
+
 
 ## Attributes Reference
 
diff --git a/website/docs/d/storage_bucket_object.html.markdown b/website/docs/d/storage_bucket_object.html.markdown
index b18a74e1893..c948b127dfa 100644
--- a/website/docs/d/storage_bucket_object.html.markdown
+++ b/website/docs/d/storage_bucket_object.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_bucket_object"
 sidebar_current: "docs-google-datasource-storage-bucket-object"
diff --git a/website/docs/r/access_context_manager_access_level.html.markdown b/website/docs/r/access_context_manager_access_level.html.markdown
index 544ef4f61ad..8709975e92b 100644
--- a/website/docs/r/access_context_manager_access_level.html.markdown
+++ b/website/docs/r/access_context_manager_access_level.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Access Context Manager"
 layout: "google"
 page_title: "Google: google_access_context_manager_access_level"
 sidebar_current: "docs-google-access-context-manager-access-level"
diff --git a/website/docs/r/access_context_manager_access_policy.html.markdown b/website/docs/r/access_context_manager_access_policy.html.markdown
index 1d6e8c1bd04..791768ff6f8 100644
--- a/website/docs/r/access_context_manager_access_policy.html.markdown
+++ b/website/docs/r/access_context_manager_access_policy.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Access Context Manager"
 layout: "google"
 page_title: "Google: google_access_context_manager_access_policy"
 sidebar_current: "docs-google-access-context-manager-access-policy"
diff --git a/website/docs/r/access_context_manager_service_perimeter.html.markdown b/website/docs/r/access_context_manager_service_perimeter.html.markdown
index a1f7bd0a29e..388c84dfa01 100644
--- a/website/docs/r/access_context_manager_service_perimeter.html.markdown
+++ b/website/docs/r/access_context_manager_service_perimeter.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Access Context Manager"
 layout: "google"
 page_title: "Google: google_access_context_manager_service_perimeter"
 sidebar_current: "docs-google-access-context-manager-service-perimeter"
diff --git a/website/docs/r/app_engine_application.html.markdown b/website/docs/r/app_engine_application.html.markdown
index 43a84342273..99a4773d6da 100755
--- a/website/docs/r/app_engine_application.html.markdown
+++ b/website/docs/r/app_engine_application.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "App Engine"
 layout: "google"
 page_title: "Google: google_app_engine_application"
 sidebar_current: "docs-google-app-engine-application"
diff --git a/website/docs/r/app_engine_application_url_dispatch_rules.html.markdown b/website/docs/r/app_engine_application_url_dispatch_rules.html.markdown
index 2fe69e580da..e694440c4e1 100644
--- a/website/docs/r/app_engine_application_url_dispatch_rules.html.markdown
+++ b/website/docs/r/app_engine_application_url_dispatch_rules.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "App Engine"
 layout: "google"
 page_title: "Google: google_app_engine_application_url_dispatch_rules"
 sidebar_current: "docs-google-app-engine-application-url-dispatch-rules"
diff --git a/website/docs/r/app_engine_domain_mapping.html.markdown b/website/docs/r/app_engine_domain_mapping.html.markdown
index bf89919b4b9..d02278e0e3f 100644
--- a/website/docs/r/app_engine_domain_mapping.html.markdown
+++ b/website/docs/r/app_engine_domain_mapping.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "App Engine"
 layout: "google"
 page_title: "Google: google_app_engine_domain_mapping"
 sidebar_current: "docs-google-app-engine-domain-mapping"
diff --git a/website/docs/r/app_engine_firewall_rule.html.markdown b/website/docs/r/app_engine_firewall_rule.html.markdown
index 4072f37c2ea..a086ce3a942 100644
--- a/website/docs/r/app_engine_firewall_rule.html.markdown
+++ b/website/docs/r/app_engine_firewall_rule.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "App Engine"
 layout: "google"
 page_title: "Google: google_app_engine_firewall_rule"
 sidebar_current: "docs-google-app-engine-firewall-rule"
diff --git a/website/docs/r/app_engine_standard_app_version.html.markdown b/website/docs/r/app_engine_standard_app_version.html.markdown
index 16fdf21628f..65044afc124 100644
--- a/website/docs/r/app_engine_standard_app_version.html.markdown
+++ b/website/docs/r/app_engine_standard_app_version.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "App Engine"
 layout: "google"
 page_title: "Google: google_app_engine_standard_app_version"
 sidebar_current: "docs-google-app-engine-standard-app-version"
diff --git a/website/docs/r/bigquery_data_transfer_config.html.markdown b/website/docs/r/bigquery_data_transfer_config.html.markdown
index 491789a81a4..7cd5ec79455 100644
--- a/website/docs/r/bigquery_data_transfer_config.html.markdown
+++ b/website/docs/r/bigquery_data_transfer_config.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "BigQueryDataTransfer"
 layout: "google"
 page_title: "Google: google_bigquery_data_transfer_config"
 sidebar_current: "docs-google-bigquery-data-transfer-config"
diff --git a/website/docs/r/bigquery_dataset.html.markdown b/website/docs/r/bigquery_dataset.html.markdown
index 45413d2df46..5af1c66452b 100644
--- a/website/docs/r/bigquery_dataset.html.markdown
+++ b/website/docs/r/bigquery_dataset.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "BigQuery"
 layout: "google"
 page_title: "Google: google_bigquery_dataset"
 sidebar_current: "docs-google-bigquery-dataset"
diff --git a/website/docs/r/bigquery_table.html.markdown b/website/docs/r/bigquery_table.html.markdown
index 9fdc39e476a..abfe5f9c6a9 100644
--- a/website/docs/r/bigquery_table.html.markdown
+++ b/website/docs/r/bigquery_table.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "BigQuery"
 layout: "google"
 page_title: "Google: google_bigquery_table"
 sidebar_current: "docs-google-bigquery-table"
diff --git a/website/docs/r/bigtable_app_profile.html.markdown b/website/docs/r/bigtable_app_profile.html.markdown
index f0421497d92..7c83287777a 100644
--- a/website/docs/r/bigtable_app_profile.html.markdown
+++ b/website/docs/r/bigtable_app_profile.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "BigTable"
 layout: "google"
 page_title: "Google: google_bigtable_app_profile"
 sidebar_current: "docs-google-bigtable-app-profile"
diff --git a/website/docs/r/bigtable_gc_policy.html.markdown b/website/docs/r/bigtable_gc_policy.html.markdown
index 342cef57124..0e4f4edf92d 100644
--- a/website/docs/r/bigtable_gc_policy.html.markdown
+++ b/website/docs/r/bigtable_gc_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Bigtable"
 layout: "google"
 page_title: "Google: google_bigtable_gc_policy"
 sidebar_current: "docs-google-bigtable-gc-policy"
diff --git a/website/docs/r/bigtable_instance.html.markdown b/website/docs/r/bigtable_instance.html.markdown
index ceeff0f1b18..e54ab9d79e5 100644
--- a/website/docs/r/bigtable_instance.html.markdown
+++ b/website/docs/r/bigtable_instance.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Bigtable"
 layout: "google"
 page_title: "Google: google_bigtable_instance"
 sidebar_current: "docs-google-bigtable-instance"
diff --git a/website/docs/r/bigtable_instance_iam.html.markdown b/website/docs/r/bigtable_instance_iam.html.markdown
index 5babedad710..c05293c5283 100644
--- a/website/docs/r/bigtable_instance_iam.html.markdown
+++ b/website/docs/r/bigtable_instance_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Bigtable"
 layout: "google"
 page_title: "Google: google_bigtable_instance_iam"
 sidebar_current: "docs-google-bigtable-instance-iam"
diff --git a/website/docs/r/bigtable_table.html.markdown b/website/docs/r/bigtable_table.html.markdown
index 176d715d3ce..ad391a59c37 100644
--- a/website/docs/r/bigtable_table.html.markdown
+++ b/website/docs/r/bigtable_table.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Bigtable"
 layout: "google"
 page_title: "Google: google_bigtable_table"
 sidebar_current: "docs-google-bigtable-table"
diff --git a/website/docs/r/binary_authorization_attestor.html.markdown b/website/docs/r/binary_authorization_attestor.html.markdown
index 816f07f2a30..a0ce708bf2f 100644
--- a/website/docs/r/binary_authorization_attestor.html.markdown
+++ b/website/docs/r/binary_authorization_attestor.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Binary Authorization"
 layout: "google"
 page_title: "Google: google_binary_authorization_attestor"
 sidebar_current: "docs-google-binary-authorization-attestor"
diff --git a/website/docs/r/binary_authorization_attestor_iam.html.markdown b/website/docs/r/binary_authorization_attestor_iam.html.markdown
index 991f9591a8c..eff8a52ff18 100644
--- a/website/docs/r/binary_authorization_attestor_iam.html.markdown
+++ b/website/docs/r/binary_authorization_attestor_iam.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Binary Authorization"
 layout: "google"
 page_title: "Google: google_binary_authorization_attestor_iam"
 sidebar_current: "docs-google-binary-authorization-attestor-iam"
diff --git a/website/docs/r/binary_authorization_policy.html.markdown b/website/docs/r/binary_authorization_policy.html.markdown
index 1570a673b31..71014d65c59 100644
--- a/website/docs/r/binary_authorization_policy.html.markdown
+++ b/website/docs/r/binary_authorization_policy.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Binary Authorization"
 layout: "google"
 page_title: "Google: google_binary_authorization_policy"
 sidebar_current: "docs-google-binary-authorization-policy"
diff --git a/website/docs/r/cloud_scheduler_job.html.markdown b/website/docs/r/cloud_scheduler_job.html.markdown
index a4a18907256..d3f61e4664d 100644
--- a/website/docs/r/cloud_scheduler_job.html.markdown
+++ b/website/docs/r/cloud_scheduler_job.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Scheduler"
 layout: "google"
 page_title: "Google: google_cloud_scheduler_job"
 sidebar_current: "docs-google-cloud-scheduler-job"
diff --git a/website/docs/r/cloudbuild_trigger.html.markdown b/website/docs/r/cloudbuild_trigger.html.markdown
index 891d606ea9a..925c312820f 100644
--- a/website/docs/r/cloudbuild_trigger.html.markdown
+++ b/website/docs/r/cloudbuild_trigger.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Build"
 layout: "google"
 page_title: "Google: google_cloudbuild_trigger"
 sidebar_current: "docs-google-cloudbuild-trigger"
diff --git a/website/docs/r/cloudfunctions_cloud_function_iam.html.markdown b/website/docs/r/cloudfunctions_cloud_function_iam.html.markdown
index aa3a8d48314..f7aa6084988 100644
--- a/website/docs/r/cloudfunctions_cloud_function_iam.html.markdown
+++ b/website/docs/r/cloudfunctions_cloud_function_iam.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Functions"
 layout: "google"
 page_title: "Google: google_cloudfunctions_function_iam"
 sidebar_current: "docs-google-cloudfunctions-function-iam"
diff --git a/website/docs/r/cloudfunctions_function.html.markdown b/website/docs/r/cloudfunctions_function.html.markdown
index 4a87b69f6b9..ffec17d642b 100644
--- a/website/docs/r/cloudfunctions_function.html.markdown
+++ b/website/docs/r/cloudfunctions_function.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Functions"
 layout: "google"
 page_title: "Google: google_cloudfunctions_function"
 sidebar_current: "docs-google-cloudfunctions-function"
diff --git a/website/docs/r/cloudiot_registry.html.markdown b/website/docs/r/cloudiot_registry.html.markdown
index 624ac64a19e..ec2188850d4 100644
--- a/website/docs/r/cloudiot_registry.html.markdown
+++ b/website/docs/r/cloudiot_registry.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud IoT Core"
 layout: "google"
 page_title: "Google: google_cloudiot_registry"
 sidebar_current: "docs-google-cloudiot-registry-x"
diff --git a/website/docs/r/composer_environment.html.markdown b/website/docs/r/composer_environment.html.markdown
index cd1f46624e5..77a9feacefe 100644
--- a/website/docs/r/composer_environment.html.markdown
+++ b/website/docs/r/composer_environment.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Composer"
 layout: "google"
 page_title: "Google: google_composer_environment"
 sidebar_current: "docs-google-composer-environment"
diff --git a/website/docs/r/compute_address.html.markdown b/website/docs/r/compute_address.html.markdown
index ac4e37209a7..a7a9a09c57e 100644
--- a/website/docs/r/compute_address.html.markdown
+++ b/website/docs/r/compute_address.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_address"
 sidebar_current: "docs-google-compute-address"
diff --git a/website/docs/r/compute_attached_disk.html.markdown b/website/docs/r/compute_attached_disk.html.markdown
index e8ea40375c4..cf274793930 100644
--- a/website/docs/r/compute_attached_disk.html.markdown
+++ b/website/docs/r/compute_attached_disk.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_attached_disk"
 sidebar_current: "docs-google-compute-attached-disk"
diff --git a/website/docs/r/compute_autoscaler.html.markdown b/website/docs/r/compute_autoscaler.html.markdown
index 0b254c68fc8..26c8e66d5b9 100644
--- a/website/docs/r/compute_autoscaler.html.markdown
+++ b/website/docs/r/compute_autoscaler.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_autoscaler"
 sidebar_current: "docs-google-compute-autoscaler"
diff --git a/website/docs/r/compute_backend_bucket.html.markdown b/website/docs/r/compute_backend_bucket.html.markdown
index 77443f05d3e..fd7e3a0c345 100644
--- a/website/docs/r/compute_backend_bucket.html.markdown
+++ b/website/docs/r/compute_backend_bucket.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_backend_bucket"
 sidebar_current: "docs-google-compute-backend-bucket"
diff --git a/website/docs/r/compute_backend_bucket_signed_url_key.html.markdown b/website/docs/r/compute_backend_bucket_signed_url_key.html.markdown
index c5f5bca6d10..17c9d106fb8 100644
--- a/website/docs/r/compute_backend_bucket_signed_url_key.html.markdown
+++ b/website/docs/r/compute_backend_bucket_signed_url_key.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_backend_bucket_signed_url_key"
 sidebar_current: "docs-google-compute-backend-bucket-signed-url-key"
diff --git a/website/docs/r/compute_backend_service.html.markdown b/website/docs/r/compute_backend_service.html.markdown
index 42577088942..bf7b577c551 100644
--- a/website/docs/r/compute_backend_service.html.markdown
+++ b/website/docs/r/compute_backend_service.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_backend_service"
 sidebar_current: "docs-google-compute-backend-service"
diff --git a/website/docs/r/compute_backend_service_signed_url_key.html.markdown b/website/docs/r/compute_backend_service_signed_url_key.html.markdown
index fdd0bb3ddd3..16689eaf07c 100644
--- a/website/docs/r/compute_backend_service_signed_url_key.html.markdown
+++ b/website/docs/r/compute_backend_service_signed_url_key.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_backend_service_signed_url_key"
 sidebar_current: "docs-google-compute-backend-service-signed-url-key"
diff --git a/website/docs/r/compute_disk.html.markdown b/website/docs/r/compute_disk.html.markdown
index 8e2aecec142..5c88dd704df 100644
--- a/website/docs/r/compute_disk.html.markdown
+++ b/website/docs/r/compute_disk.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_disk"
 sidebar_current: "docs-google-compute-disk"
diff --git a/website/docs/r/compute_disk_resource_policy_attachment.html.markdown b/website/docs/r/compute_disk_resource_policy_attachment.html.markdown
index 4991e2214b8..ea29b68a9fd 100644
--- a/website/docs/r/compute_disk_resource_policy_attachment.html.markdown
+++ b/website/docs/r/compute_disk_resource_policy_attachment.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_disk_resource_policy_attachment"
 sidebar_current: "docs-google-compute-disk-resource-policy-attachment"
diff --git a/website/docs/r/compute_firewall.html.markdown b/website/docs/r/compute_firewall.html.markdown
index b9c0ab574b9..020a9d0dda1 100644
--- a/website/docs/r/compute_firewall.html.markdown
+++ b/website/docs/r/compute_firewall.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_firewall"
 sidebar_current: "docs-google-compute-firewall"
diff --git a/website/docs/r/compute_forwarding_rule.html.markdown b/website/docs/r/compute_forwarding_rule.html.markdown
index 28388ae1be6..a1d7d8c0d15 100644
--- a/website/docs/r/compute_forwarding_rule.html.markdown
+++ b/website/docs/r/compute_forwarding_rule.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_forwarding_rule"
 sidebar_current: "docs-google-compute-forwarding-rule"
diff --git a/website/docs/r/compute_global_address.html.markdown b/website/docs/r/compute_global_address.html.markdown
index b0bffce9933..b610896dccb 100644
--- a/website/docs/r/compute_global_address.html.markdown
+++ b/website/docs/r/compute_global_address.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_global_address"
 sidebar_current: "docs-google-compute-global-address"
diff --git a/website/docs/r/compute_global_forwarding_rule.html.markdown b/website/docs/r/compute_global_forwarding_rule.html.markdown
index c27b79f466d..d22604ab52d 100644
--- a/website/docs/r/compute_global_forwarding_rule.html.markdown
+++ b/website/docs/r/compute_global_forwarding_rule.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_global_forwarding_rule"
 sidebar_current: "docs-google-compute-global-forwarding-rule"
diff --git a/website/docs/r/compute_health_check.html.markdown b/website/docs/r/compute_health_check.html.markdown
index 4cba30a5eaf..27d6a629c9f 100644
--- a/website/docs/r/compute_health_check.html.markdown
+++ b/website/docs/r/compute_health_check.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_health_check"
 sidebar_current: "docs-google-compute-health-check"
diff --git a/website/docs/r/compute_http_health_check.html.markdown b/website/docs/r/compute_http_health_check.html.markdown
index 65881e3dc82..b7dcde723d3 100644
--- a/website/docs/r/compute_http_health_check.html.markdown
+++ b/website/docs/r/compute_http_health_check.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_http_health_check"
 sidebar_current: "docs-google-compute-http-health-check"
diff --git a/website/docs/r/compute_https_health_check.html.markdown b/website/docs/r/compute_https_health_check.html.markdown
index 781d2087acf..d8f87c48fb3 100644
--- a/website/docs/r/compute_https_health_check.html.markdown
+++ b/website/docs/r/compute_https_health_check.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_https_health_check"
 sidebar_current: "docs-google-compute-https-health-check"
diff --git a/website/docs/r/compute_image.html.markdown b/website/docs/r/compute_image.html.markdown
index 1c1259bb52e..41c36aa00c0 100644
--- a/website/docs/r/compute_image.html.markdown
+++ b/website/docs/r/compute_image.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_image"
 sidebar_current: "docs-google-compute-image"
diff --git a/website/docs/r/compute_instance.html.markdown b/website/docs/r/compute_instance.html.markdown
index 9ab8a516ff2..ae70bdff002 100644
--- a/website/docs/r/compute_instance.html.markdown
+++ b/website/docs/r/compute_instance.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance"
 sidebar_current: "docs-google-compute-instance-x"
diff --git a/website/docs/r/compute_instance_from_template.html.markdown b/website/docs/r/compute_instance_from_template.html.markdown
index 4c11b090b32..99491ad5458 100644
--- a/website/docs/r/compute_instance_from_template.html.markdown
+++ b/website/docs/r/compute_instance_from_template.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_from_template"
 sidebar_current: "docs-google-compute-instance-from-template"
diff --git a/website/docs/r/compute_instance_group.html.markdown b/website/docs/r/compute_instance_group.html.markdown
index 96627ba56df..5009ac062ad 100644
--- a/website/docs/r/compute_instance_group.html.markdown
+++ b/website/docs/r/compute_instance_group.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_group"
 sidebar_current: "docs-google-compute-instance-group-x"
diff --git a/website/docs/r/compute_instance_group_manager.html.markdown b/website/docs/r/compute_instance_group_manager.html.markdown
index 6d4dcb1b3b0..5ae5e2b5183 100644
--- a/website/docs/r/compute_instance_group_manager.html.markdown
+++ b/website/docs/r/compute_instance_group_manager.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_group_manager"
 sidebar_current: "docs-google-compute-instance-group-manager"
diff --git a/website/docs/r/compute_instance_iam.html.markdown b/website/docs/r/compute_instance_iam.html.markdown
index eaef8b2a69b..9e30d21f785 100644
--- a/website/docs/r/compute_instance_iam.html.markdown
+++ b/website/docs/r/compute_instance_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_iam"
 sidebar_current: "docs-google-compute-instance-iam"
diff --git a/website/docs/r/compute_instance_template.html.markdown b/website/docs/r/compute_instance_template.html.markdown
index 8bf69fd7971..c4376272688 100644
--- a/website/docs/r/compute_instance_template.html.markdown
+++ b/website/docs/r/compute_instance_template.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_instance_template"
 sidebar_current: "docs-google-compute-instance-template"
diff --git a/website/docs/r/compute_interconnect_attachment.html.markdown b/website/docs/r/compute_interconnect_attachment.html.markdown
index f6ea88f3be4..00b8982da42 100644
--- a/website/docs/r/compute_interconnect_attachment.html.markdown
+++ b/website/docs/r/compute_interconnect_attachment.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_interconnect_attachment"
 sidebar_current: "docs-google-compute-interconnect-attachment"
diff --git a/website/docs/r/compute_network.html.markdown b/website/docs/r/compute_network.html.markdown
index cb2f549359b..93deae77520 100644
--- a/website/docs/r/compute_network.html.markdown
+++ b/website/docs/r/compute_network.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_network"
 sidebar_current: "docs-google-compute-network"
diff --git a/website/docs/r/compute_network_endpoint.html.markdown b/website/docs/r/compute_network_endpoint.html.markdown
index 8b615d82bf2..2850d8c237f 100644
--- a/website/docs/r/compute_network_endpoint.html.markdown
+++ b/website/docs/r/compute_network_endpoint.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_network_endpoint"
 sidebar_current: "docs-google-compute-network-endpoint"
diff --git a/website/docs/r/compute_network_endpoint_group.html.markdown b/website/docs/r/compute_network_endpoint_group.html.markdown
index d68c8e14ec0..24cf98ba00e 100644
--- a/website/docs/r/compute_network_endpoint_group.html.markdown
+++ b/website/docs/r/compute_network_endpoint_group.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_network_endpoint_group"
 sidebar_current: "docs-google-compute-network-endpoint-group"
diff --git a/website/docs/r/compute_network_peering.html.markdown b/website/docs/r/compute_network_peering.html.markdown
index e649c0ee2ac..c8d0fdb20a3 100644
--- a/website/docs/r/compute_network_peering.html.markdown
+++ b/website/docs/r/compute_network_peering.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_network_peering"
 sidebar_current: "docs-google-compute-network-peering"
diff --git a/website/docs/r/compute_node_group.html.markdown b/website/docs/r/compute_node_group.html.markdown
index afc06714482..594419e8fc2 100644
--- a/website/docs/r/compute_node_group.html.markdown
+++ b/website/docs/r/compute_node_group.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_node_group"
 sidebar_current: "docs-google-compute-node-group"
diff --git a/website/docs/r/compute_node_template.html.markdown b/website/docs/r/compute_node_template.html.markdown
index d5a4d3c8a05..4af59d372b9 100644
--- a/website/docs/r/compute_node_template.html.markdown
+++ b/website/docs/r/compute_node_template.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_node_template"
 sidebar_current: "docs-google-compute-node-template"
diff --git a/website/docs/r/compute_project_default_network_tier.html.markdown b/website/docs/r/compute_project_default_network_tier.html.markdown
index 20dd54ad837..ce67afa6ea9 100644
--- a/website/docs/r/compute_project_default_network_tier.html.markdown
+++ b/website/docs/r/compute_project_default_network_tier.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_project_default_network_tier"
 sidebar_current: "docs-google-compute-project-default-network-tier"
diff --git a/website/docs/r/compute_project_metadata.html.markdown b/website/docs/r/compute_project_metadata.html.markdown
index 77b74b131df..e975ec2a5ef 100644
--- a/website/docs/r/compute_project_metadata.html.markdown
+++ b/website/docs/r/compute_project_metadata.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_project_metadata"
 sidebar_current: "docs-google-compute-project-metadata"
diff --git a/website/docs/r/compute_project_metadata_item.html.markdown b/website/docs/r/compute_project_metadata_item.html.markdown
index 83c20704546..d3f92a6a997 100644
--- a/website/docs/r/compute_project_metadata_item.html.markdown
+++ b/website/docs/r/compute_project_metadata_item.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_project_metadata_item"
 sidebar_current: "docs-google-compute-project-metadata-item"
@@ -54,4 +55,4 @@ This resource provides the following
 
 - `create` - Default is 5 minutes.
 - `update` - Default is 5 minutes.
-- `delete` - Default is 5 minutes.
\ No newline at end of file
+- `delete` - Default is 5 minutes.
diff --git a/website/docs/r/compute_region_autoscaler.html.markdown b/website/docs/r/compute_region_autoscaler.html.markdown
index 4a3ae7daa28..4b03215fb8e 100644
--- a/website/docs/r/compute_region_autoscaler.html.markdown
+++ b/website/docs/r/compute_region_autoscaler.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_region_autoscaler"
 sidebar_current: "docs-google-compute-region-autoscaler"
diff --git a/website/docs/r/compute_region_backend_service.html.markdown b/website/docs/r/compute_region_backend_service.html.markdown
index ae939423819..85dd587312c 100644
--- a/website/docs/r/compute_region_backend_service.html.markdown
+++ b/website/docs/r/compute_region_backend_service.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_region_backend_service"
 sidebar_current: "docs-google-compute-region-backend-service"
diff --git a/website/docs/r/compute_region_disk.html.markdown b/website/docs/r/compute_region_disk.html.markdown
index 0212b82bcd9..2cddbdac726 100644
--- a/website/docs/r/compute_region_disk.html.markdown
+++ b/website/docs/r/compute_region_disk.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_region_disk"
 sidebar_current: "docs-google-compute-region-disk"
diff --git a/website/docs/r/compute_region_instance_group_manager.html.markdown b/website/docs/r/compute_region_instance_group_manager.html.markdown
index 0b54c0c3dfe..16e1d4ecdab 100644
--- a/website/docs/r/compute_region_instance_group_manager.html.markdown
+++ b/website/docs/r/compute_region_instance_group_manager.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_region_instance_group_manager"
 sidebar_current: "docs-google-compute-region_instance-group-manager"
diff --git a/website/docs/r/compute_reservation.html.markdown b/website/docs/r/compute_reservation.html.markdown
index 52afd2ebd85..98da578395b 100644
--- a/website/docs/r/compute_reservation.html.markdown
+++ b/website/docs/r/compute_reservation.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_reservation"
 sidebar_current: "docs-google-compute-reservation"
diff --git a/website/docs/r/compute_resource_policy.html.markdown b/website/docs/r/compute_resource_policy.html.markdown
index 390b60c1ec2..d41aae970be 100644
--- a/website/docs/r/compute_resource_policy.html.markdown
+++ b/website/docs/r/compute_resource_policy.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_resource_policy"
 sidebar_current: "docs-google-compute-resource-policy"
diff --git a/website/docs/r/compute_route.html.markdown b/website/docs/r/compute_route.html.markdown
index 22999ab9508..ad70668c5be 100644
--- a/website/docs/r/compute_route.html.markdown
+++ b/website/docs/r/compute_route.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_route"
 sidebar_current: "docs-google-compute-route"
diff --git a/website/docs/r/compute_router.html.markdown b/website/docs/r/compute_router.html.markdown
index 0da41d9a3fc..6c3f17e7219 100644
--- a/website/docs/r/compute_router.html.markdown
+++ b/website/docs/r/compute_router.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_router"
 sidebar_current: "docs-google-compute-router"
diff --git a/website/docs/r/compute_router_interface.html.markdown b/website/docs/r/compute_router_interface.html.markdown
index 01f1df92507..8fe20838d4b 100644
--- a/website/docs/r/compute_router_interface.html.markdown
+++ b/website/docs/r/compute_router_interface.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_router_interface"
 sidebar_current: "docs-google-compute-router-interface"
diff --git a/website/docs/r/compute_router_nat.html.markdown b/website/docs/r/compute_router_nat.html.markdown
index 6be9b5974a9..99eff32775b 100644
--- a/website/docs/r/compute_router_nat.html.markdown
+++ b/website/docs/r/compute_router_nat.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_router_nat"
 sidebar_current: "docs-google-compute-router-nat"
diff --git a/website/docs/r/compute_router_peer.html.markdown b/website/docs/r/compute_router_peer.html.markdown
index 7ffb4117873..3964503d2eb 100644
--- a/website/docs/r/compute_router_peer.html.markdown
+++ b/website/docs/r/compute_router_peer.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_router_peer"
 sidebar_current: "docs-google-compute-router-peer"
diff --git a/website/docs/r/compute_security_policy.html.markdown b/website/docs/r/compute_security_policy.html.markdown
index 1f921b80cf3..778bd199eda 100644
--- a/website/docs/r/compute_security_policy.html.markdown
+++ b/website/docs/r/compute_security_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_security_policy"
 sidebar_current: "docs-google-compute-security-policy"
diff --git a/website/docs/r/compute_shared_vpc_host_project.html.markdown b/website/docs/r/compute_shared_vpc_host_project.html.markdown
index cdec57c2cb5..cbefbe3e9b8 100644
--- a/website/docs/r/compute_shared_vpc_host_project.html.markdown
+++ b/website/docs/r/compute_shared_vpc_host_project.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_shared_vpc_host_project"
 sidebar_current: "docs-google-compute-shared-vpc-host-project"
diff --git a/website/docs/r/compute_shared_vpc_service_project.html.markdown b/website/docs/r/compute_shared_vpc_service_project.html.markdown
index 6744f3dd9b0..7db964db403 100644
--- a/website/docs/r/compute_shared_vpc_service_project.html.markdown
+++ b/website/docs/r/compute_shared_vpc_service_project.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_shared_vpc_service_project"
 sidebar_current: "docs-google-compute-shared-vpc-service-project"
diff --git a/website/docs/r/compute_snapshot.html.markdown b/website/docs/r/compute_snapshot.html.markdown
index 028ab3059df..43b825f92bd 100644
--- a/website/docs/r/compute_snapshot.html.markdown
+++ b/website/docs/r/compute_snapshot.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_snapshot"
 sidebar_current: "docs-google-compute-snapshot"
diff --git a/website/docs/r/compute_ssl_certificate.html.markdown b/website/docs/r/compute_ssl_certificate.html.markdown
index 013d1bd5429..11e06628be9 100644
--- a/website/docs/r/compute_ssl_certificate.html.markdown
+++ b/website/docs/r/compute_ssl_certificate.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_ssl_certificate"
 sidebar_current: "docs-google-compute-ssl-certificate"
diff --git a/website/docs/r/compute_ssl_policy.html.markdown b/website/docs/r/compute_ssl_policy.html.markdown
index 8ac40c9bdfd..e572d3dbb46 100644
--- a/website/docs/r/compute_ssl_policy.html.markdown
+++ b/website/docs/r/compute_ssl_policy.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_ssl_policy"
 sidebar_current: "docs-google-compute-ssl-policy"
diff --git a/website/docs/r/compute_subnetwork.html.markdown b/website/docs/r/compute_subnetwork.html.markdown
index 3b2bbc416cb..57ae263774b 100644
--- a/website/docs/r/compute_subnetwork.html.markdown
+++ b/website/docs/r/compute_subnetwork.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_subnetwork"
 sidebar_current: "docs-google-compute-subnetwork"
diff --git a/website/docs/r/compute_subnetwork_iam.html.markdown b/website/docs/r/compute_subnetwork_iam.html.markdown
index 313a757823c..0964035c6c5 100644
--- a/website/docs/r/compute_subnetwork_iam.html.markdown
+++ b/website/docs/r/compute_subnetwork_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_subnetwork_iam"
 sidebar_current: "docs-google-compute-subnetwork-iam"
diff --git a/website/docs/r/compute_target_http_proxy.html.markdown b/website/docs/r/compute_target_http_proxy.html.markdown
index cb161aa396b..2998e439313 100644
--- a/website/docs/r/compute_target_http_proxy.html.markdown
+++ b/website/docs/r/compute_target_http_proxy.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_target_http_proxy"
 sidebar_current: "docs-google-compute-target-http-proxy"
diff --git a/website/docs/r/compute_target_https_proxy.html.markdown b/website/docs/r/compute_target_https_proxy.html.markdown
index d2a9f278c96..9c38b4976f6 100644
--- a/website/docs/r/compute_target_https_proxy.html.markdown
+++ b/website/docs/r/compute_target_https_proxy.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_target_https_proxy"
 sidebar_current: "docs-google-compute-target-https-proxy"
diff --git a/website/docs/r/compute_target_instance.html.markdown b/website/docs/r/compute_target_instance.html.markdown
index 7ad960bf558..b832ff3c6bb 100644
--- a/website/docs/r/compute_target_instance.html.markdown
+++ b/website/docs/r/compute_target_instance.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_target_instance"
 sidebar_current: "docs-google-compute-target-instance"
diff --git a/website/docs/r/compute_target_pool.html.markdown b/website/docs/r/compute_target_pool.html.markdown
index 6b41f0029f9..4d7a7453385 100644
--- a/website/docs/r/compute_target_pool.html.markdown
+++ b/website/docs/r/compute_target_pool.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_target_pool"
 sidebar_current: "docs-google-compute-target-pool"
diff --git a/website/docs/r/compute_target_ssl_proxy.html.markdown b/website/docs/r/compute_target_ssl_proxy.html.markdown
index 118f2100907..2bafca006e8 100644
--- a/website/docs/r/compute_target_ssl_proxy.html.markdown
+++ b/website/docs/r/compute_target_ssl_proxy.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_target_ssl_proxy"
 sidebar_current: "docs-google-compute-target-ssl-proxy"
diff --git a/website/docs/r/compute_target_tcp_proxy.html.markdown b/website/docs/r/compute_target_tcp_proxy.html.markdown
index 57797363da3..34d55abe099 100644
--- a/website/docs/r/compute_target_tcp_proxy.html.markdown
+++ b/website/docs/r/compute_target_tcp_proxy.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_target_tcp_proxy"
 sidebar_current: "docs-google-compute-target-tcp-proxy"
diff --git a/website/docs/r/compute_url_map.html.markdown b/website/docs/r/compute_url_map.html.markdown
index e03f0870adc..6429659fc70 100644
--- a/website/docs/r/compute_url_map.html.markdown
+++ b/website/docs/r/compute_url_map.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_url_map"
 sidebar_current: "docs-google-compute-url-map"
diff --git a/website/docs/r/compute_vpn_gateway.html.markdown b/website/docs/r/compute_vpn_gateway.html.markdown
index ffd8cb2da5d..a8475220c0d 100644
--- a/website/docs/r/compute_vpn_gateway.html.markdown
+++ b/website/docs/r/compute_vpn_gateway.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_vpn_gateway"
 sidebar_current: "docs-google-compute-vpn-gateway"
diff --git a/website/docs/r/compute_vpn_tunnel.html.markdown b/website/docs/r/compute_vpn_tunnel.html.markdown
index 9a1d64be406..202ab664f72 100644
--- a/website/docs/r/compute_vpn_tunnel.html.markdown
+++ b/website/docs/r/compute_vpn_tunnel.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Compute Engine"
 layout: "google"
 page_title: "Google: google_compute_vpn_tunnel"
 sidebar_current: "docs-google-compute-vpn-tunnel"
diff --git a/website/docs/r/container_analysis_note.html.markdown b/website/docs/r/container_analysis_note.html.markdown
index 61c53f8a8a1..bfe3d7f2e2c 100644
--- a/website/docs/r/container_analysis_note.html.markdown
+++ b/website/docs/r/container_analysis_note.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Container Registry"
 layout: "google"
 page_title: "Google: google_container_analysis_note"
 sidebar_current: "docs-google-container-analysis-note"
diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
index 8104fe06532..6caf0d7b66e 100644
--- a/website/docs/r/container_cluster.html.markdown
+++ b/website/docs/r/container_cluster.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Kubernetes (Container) Engine"
 layout: "google"
 page_title: "Google: google_container_cluster"
 sidebar_current: "docs-google-container-cluster"
diff --git a/website/docs/r/container_node_pool.html.markdown b/website/docs/r/container_node_pool.html.markdown
index c2411f0f9ee..cce77db73f7 100644
--- a/website/docs/r/container_node_pool.html.markdown
+++ b/website/docs/r/container_node_pool.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Kubernetes (Container) Engine"
 layout: "google"
 page_title: "Google: google_container_node_pool"
 sidebar_current: "docs-google-container-node-pool"
diff --git a/website/docs/r/dataflow_job.html.markdown b/website/docs/r/dataflow_job.html.markdown
index 8b3901b4cf8..a93ab643ef8 100644
--- a/website/docs/r/dataflow_job.html.markdown
+++ b/website/docs/r/dataflow_job.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Dataflow"
 layout: "google"
 page_title: "Google: google_dataflow_job"
 sidebar_current: "docs-google-dataflow-job"
diff --git a/website/docs/r/dataproc_cluster.html.markdown b/website/docs/r/dataproc_cluster.html.markdown
index f53814e7be7..66f52c3ffa5 100644
--- a/website/docs/r/dataproc_cluster.html.markdown
+++ b/website/docs/r/dataproc_cluster.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Dataproc"
 layout: "google"
 page_title: "Google: google_dataproc_cluster"
 sidebar_current: "docs-google-dataproc-cluster"
diff --git a/website/docs/r/dataproc_cluster_iam.html.markdown b/website/docs/r/dataproc_cluster_iam.html.markdown
index e88bd67e1fc..4aa78282d53 100644
--- a/website/docs/r/dataproc_cluster_iam.html.markdown
+++ b/website/docs/r/dataproc_cluster_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Dataproc"
 layout: "google"
 page_title: "Google: google_dataproc_cluster_iam"
 sidebar_current: "docs-google-dataproc-cluster-iam"
@@ -109,4 +110,4 @@ $ terraform import google_dataproc_cluster_iam_policy.editor "projects/{project}
 $ terraform import google_dataproc_cluster_iam_binding.editor "projects/{project}/regions/{region}/clusters/{cluster} roles/editor"
 
 $ terraform import google_dataproc_cluster_iam_member.editor "projects/{project}/regions/{region}/clusters/{cluster} roles/editor user:jane@example.com"
-```
\ No newline at end of file
+```
diff --git a/website/docs/r/dataproc_job.html.markdown b/website/docs/r/dataproc_job.html.markdown
index 5768d63bda1..2d1b27435c4 100644
--- a/website/docs/r/dataproc_job.html.markdown
+++ b/website/docs/r/dataproc_job.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Dataproc"
 layout: "google"
 page_title: "Google: google_dataproc_job"
 sidebar_current: "docs-google-dataproc-job"
diff --git a/website/docs/r/dataproc_job_iam.html.markdown b/website/docs/r/dataproc_job_iam.html.markdown
index 0f91d61b8f5..bfe7c4bec0d 100644
--- a/website/docs/r/dataproc_job_iam.html.markdown
+++ b/website/docs/r/dataproc_job_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Dataproc"
 layout: "google"
 page_title: "Google: google_dataproc_job_iam"
 sidebar_current: "docs-google-dataproc-job-iam"
@@ -109,4 +110,4 @@ $ terraform import google_dataproc_job_iam_policy.editor "projects/{project}/reg
 $ terraform import google_dataproc_job_iam_binding.editor "projects/{project}/regions/{region}/jobs/{job_id} roles/editor"
 
 $ terraform import google_dataproc_job_iam_member.editor "projects/{project}/regions/{region}/jobs/{job_id} roles/editor user:jane@example.com"
-```
\ No newline at end of file
+```
diff --git a/website/docs/r/dns_managed_zone.html.markdown b/website/docs/r/dns_managed_zone.html.markdown
index 73c10f24705..371ee44b5c8 100644
--- a/website/docs/r/dns_managed_zone.html.markdown
+++ b/website/docs/r/dns_managed_zone.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud DNS"
 layout: "google"
 page_title: "Google: google_dns_managed_zone"
 sidebar_current: "docs-google-dns-managed-zone"
diff --git a/website/docs/r/dns_record_set.markdown b/website/docs/r/dns_record_set.markdown
index 38a85a9e7cd..1c48f640a0a 100644
--- a/website/docs/r/dns_record_set.markdown
+++ b/website/docs/r/dns_record_set.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud DNS"
 layout: "google"
 page_title: "Google: google_dns_record_set"
 sidebar_current: "docs-google-dns-record-set"
diff --git a/website/docs/r/endpoints_service.html.markdown b/website/docs/r/endpoints_service.html.markdown
index f3e9c1cdfc9..000f98a91b0 100644
--- a/website/docs/r/endpoints_service.html.markdown
+++ b/website/docs/r/endpoints_service.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Endpoints"
 layout: "google"
 page_title: "Google: google_endpoints_service"
 sidebar_current: "docs-google-endpoints-service"
diff --git a/website/docs/r/filestore_instance.html.markdown b/website/docs/r/filestore_instance.html.markdown
index 9ce01548316..5ba80b18c1b 100644
--- a/website/docs/r/filestore_instance.html.markdown
+++ b/website/docs/r/filestore_instance.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Filestore"
 layout: "google"
 page_title: "Google: google_filestore_instance"
 sidebar_current: "docs-google-filestore-instance"
diff --git a/website/docs/r/firestore_index.html.markdown b/website/docs/r/firestore_index.html.markdown
index 7224fc654bb..afd862ff136 100644
--- a/website/docs/r/firestore_index.html.markdown
+++ b/website/docs/r/firestore_index.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Firestore"
 layout: "google"
 page_title: "Google: google_firestore_index"
 sidebar_current: "docs-google-firestore-index"
diff --git a/website/docs/r/google_billing_account_iam_binding.md b/website/docs/r/google_billing_account_iam_binding.md
index eac0bd93663..7eff97c289d 100644
--- a/website/docs/r/google_billing_account_iam_binding.md
+++ b/website/docs/r/google_billing_account_iam_binding.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_billing_account_iam_binding"
 sidebar_current: "docs-google-billing-account-iam-binding"
diff --git a/website/docs/r/google_billing_account_iam_member.md b/website/docs/r/google_billing_account_iam_member.md
index d4cc499d9a4..68e27a0e81d 100644
--- a/website/docs/r/google_billing_account_iam_member.md
+++ b/website/docs/r/google_billing_account_iam_member.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_billing_account_iam_member"
 sidebar_current: "docs-google-billing-account-iam-member"
diff --git a/website/docs/r/google_billing_account_iam_policy.md b/website/docs/r/google_billing_account_iam_policy.md
index 5b0f26e64dc..5f571bab400 100644
--- a/website/docs/r/google_billing_account_iam_policy.md
+++ b/website/docs/r/google_billing_account_iam_policy.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_billing_account_iam_policy"
 sidebar_current: "docs-google-billing-account-iam-policy"
diff --git a/website/docs/r/google_folder.html.markdown b/website/docs/r/google_folder.html.markdown
index 8f595f25f97..fb476f3b3a4 100644
--- a/website/docs/r/google_folder.html.markdown
+++ b/website/docs/r/google_folder.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder"
 sidebar_current: "docs-google-folder-x"
diff --git a/website/docs/r/google_folder_iam_binding.html.markdown b/website/docs/r/google_folder_iam_binding.html.markdown
index dfa6d37013e..a5201dde457 100644
--- a/website/docs/r/google_folder_iam_binding.html.markdown
+++ b/website/docs/r/google_folder_iam_binding.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder_iam_binding"
 sidebar_current: "docs-google-folder-iam-binding"
diff --git a/website/docs/r/google_folder_iam_member.html.markdown b/website/docs/r/google_folder_iam_member.html.markdown
index c3f09742803..e8e4b963495 100644
--- a/website/docs/r/google_folder_iam_member.html.markdown
+++ b/website/docs/r/google_folder_iam_member.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder_iam_member"
 sidebar_current: "docs-google-folder-iam-member"
diff --git a/website/docs/r/google_folder_iam_policy.html.markdown b/website/docs/r/google_folder_iam_policy.html.markdown
index 5268e3e1337..f709a2aa80d 100644
--- a/website/docs/r/google_folder_iam_policy.html.markdown
+++ b/website/docs/r/google_folder_iam_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder_iam_policy"
 sidebar_current: "docs-google-folders-iam-policy"
diff --git a/website/docs/r/google_folder_organization_policy.html.markdown b/website/docs/r/google_folder_organization_policy.html.markdown
index feefc19f445..d6687932a4a 100644
--- a/website/docs/r/google_folder_organization_policy.html.markdown
+++ b/website/docs/r/google_folder_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_folder_organization_policy"
 sidebar_current: "docs-google-folder-organization-policy"
diff --git a/website/docs/r/google_kms_crypto_key_iam_binding.html.markdown b/website/docs/r/google_kms_crypto_key_iam_binding.html.markdown
index f0782cceb23..11a02dfad4e 100644
--- a/website/docs/r/google_kms_crypto_key_iam_binding.html.markdown
+++ b/website/docs/r/google_kms_crypto_key_iam_binding.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Key Management Service"
 layout: "google"
 page_title: "Google: google_kms_crypto_key_iam_binding"
 sidebar_current: "docs-google-kms-crypto-key-iam-binding"
diff --git a/website/docs/r/google_kms_crypto_key_iam_member.html.markdown b/website/docs/r/google_kms_crypto_key_iam_member.html.markdown
index fa3111df38a..9c2c16deee8 100644
--- a/website/docs/r/google_kms_crypto_key_iam_member.html.markdown
+++ b/website/docs/r/google_kms_crypto_key_iam_member.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Key Management Service"
 layout: "google"
 page_title: "Google: google_kms_crypto_key_iam_member"
 sidebar_current: "docs-google-kms-crypto-key-iam-member"
diff --git a/website/docs/r/google_kms_key_ring_iam.html.markdown b/website/docs/r/google_kms_key_ring_iam.html.markdown
index 654f9e98a97..f0ff71d0bac 100644
--- a/website/docs/r/google_kms_key_ring_iam.html.markdown
+++ b/website/docs/r/google_kms_key_ring_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Key Management Service"
 layout: "google"
 page_title: "Google: google_kms_key_ring_iam"
 sidebar_current: "docs-google-kms-key-ring-iam"
diff --git a/website/docs/r/google_organization_iam_binding.md b/website/docs/r/google_organization_iam_binding.md
index be14a12ab80..b387c18c231 100644
--- a/website/docs/r/google_organization_iam_binding.md
+++ b/website/docs/r/google_organization_iam_binding.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization_iam_binding"
 sidebar_current: "docs-google-organization-iam-binding"
diff --git a/website/docs/r/google_organization_iam_custom_role.html.markdown b/website/docs/r/google_organization_iam_custom_role.html.markdown
index 2593e0481f7..69a007ad5f6 100644
--- a/website/docs/r/google_organization_iam_custom_role.html.markdown
+++ b/website/docs/r/google_organization_iam_custom_role.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization_iam_custom_role"
 sidebar_current: "docs-google-organization-iam-custom-role"
diff --git a/website/docs/r/google_organization_iam_member.md b/website/docs/r/google_organization_iam_member.md
index a16d2cfbcd7..ca03fe63628 100644
--- a/website/docs/r/google_organization_iam_member.md
+++ b/website/docs/r/google_organization_iam_member.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization_iam_member"
 sidebar_current: "docs-google-organization-iam-member"
diff --git a/website/docs/r/google_organization_iam_policy.md b/website/docs/r/google_organization_iam_policy.md
index d4859dd1192..84962b74c2a 100644
--- a/website/docs/r/google_organization_iam_policy.md
+++ b/website/docs/r/google_organization_iam_policy.md
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization_iam_policy"
 sidebar_current: "docs-google-organization-iam-policy"
diff --git a/website/docs/r/google_organization_policy.html.markdown b/website/docs/r/google_organization_policy.html.markdown
index c582040d3f7..cafeb8dd6d7 100644
--- a/website/docs/r/google_organization_policy.html.markdown
+++ b/website/docs/r/google_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_organization_policy"
 sidebar_current: "docs-google-organization-policy"
diff --git a/website/docs/r/google_project.html.markdown b/website/docs/r/google_project.html.markdown
index 09bc903e035..33b93e0827b 100755
--- a/website/docs/r/google_project.html.markdown
+++ b/website/docs/r/google_project.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project"
 sidebar_current: "docs-google-project-x"
diff --git a/website/docs/r/google_project_iam.html.markdown b/website/docs/r/google_project_iam.html.markdown
index 0a12b1e1987..b224fd4e445 100644
--- a/website/docs/r/google_project_iam.html.markdown
+++ b/website/docs/r/google_project_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_iam"
 sidebar_current: "docs-google-project-iam-x"
@@ -158,4 +159,4 @@ IAM audit config imports use the identifier of the resource in question and the
 
 ```
 terraform import google_project_iam_audit_config.my_project "your-project-id foo.googleapis.com"
-```
\ No newline at end of file
+```
diff --git a/website/docs/r/google_project_iam_custom_role.html.markdown b/website/docs/r/google_project_iam_custom_role.html.markdown
index 8dbf60cd605..8bd0db91e45 100644
--- a/website/docs/r/google_project_iam_custom_role.html.markdown
+++ b/website/docs/r/google_project_iam_custom_role.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_iam_custom_role"
 sidebar_current: "docs-google-project-iam-custom-role"
diff --git a/website/docs/r/google_project_organization_policy.html.markdown b/website/docs/r/google_project_organization_policy.html.markdown
index 370c6e57133..503fdb382d4 100644
--- a/website/docs/r/google_project_organization_policy.html.markdown
+++ b/website/docs/r/google_project_organization_policy.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_organization_policy"
 sidebar_current: "docs-google-project-organization-policy"
diff --git a/website/docs/r/google_project_service.html.markdown b/website/docs/r/google_project_service.html.markdown
index 5a18f9bbe3d..c4f22cc4fa3 100644
--- a/website/docs/r/google_project_service.html.markdown
+++ b/website/docs/r/google_project_service.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_service"
 sidebar_current: "docs-google-project-service-x"
diff --git a/website/docs/r/google_project_services.html.markdown b/website/docs/r/google_project_services.html.markdown
index 0347006221e..f685b10dfcc 100644
--- a/website/docs/r/google_project_services.html.markdown
+++ b/website/docs/r/google_project_services.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_services"
 sidebar_current: "docs-google-project-services"
diff --git a/website/docs/r/google_service_account.html.markdown b/website/docs/r/google_service_account.html.markdown
index 0a35288b907..ef96e34dbab 100644
--- a/website/docs/r/google_service_account.html.markdown
+++ b/website/docs/r/google_service_account.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account"
 sidebar_current: "docs-google-service-account-x"
diff --git a/website/docs/r/google_service_account_iam.html.markdown b/website/docs/r/google_service_account_iam.html.markdown
index 5b40c2e3792..1b2ff1a490f 100644
--- a/website/docs/r/google_service_account_iam.html.markdown
+++ b/website/docs/r/google_service_account_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account_iam"
 sidebar_current: "docs-google-service-account-iam"
@@ -193,3 +194,4 @@ With conditions:
 $ terraform import -provider=google-beta google_service_account_iam_binding.admin-account-iam "projects/{your-project-id}/serviceAccounts/{your-service-account-email} iam.serviceAccountUser expires_after_2019_12_31"
 
 $ terraform import -provider=google-beta google_service_account_iam_member.admin-account-iam "projects/{your-project-id}/serviceAccounts/{your-service-account-email} iam.serviceAccountUser user:foo@example.com expires_after_2019_12_31"
+```
diff --git a/website/docs/r/google_service_account_key.html.markdown b/website/docs/r/google_service_account_key.html.markdown
index ad0e2d6e07b..87f80b2e9cc 100644
--- a/website/docs/r/google_service_account_key.html.markdown
+++ b/website/docs/r/google_service_account_key.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_service_account_key"
 sidebar_current: "docs-google-service-account-key"
diff --git a/website/docs/r/iap_app_engine_service_iam.html.markdown b/website/docs/r/iap_app_engine_service_iam.html.markdown
index 47fcc2aa6ba..493e40d26f7 100644
--- a/website/docs/r/iap_app_engine_service_iam.html.markdown
+++ b/website/docs/r/iap_app_engine_service_iam.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Identity-Aware Proxy"
 layout: "google"
 page_title: "Google: google_iap_app_engine_service_iam"
 sidebar_current: "docs-google-iap-app-engine-service-iam"
diff --git a/website/docs/r/iap_app_engine_version_iam.html.markdown b/website/docs/r/iap_app_engine_version_iam.html.markdown
index 36d936c7d2e..5c35fd96f83 100644
--- a/website/docs/r/iap_app_engine_version_iam.html.markdown
+++ b/website/docs/r/iap_app_engine_version_iam.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Identity-Aware Proxy"
 layout: "google"
 page_title: "Google: google_iap_app_engine_version_iam"
 sidebar_current: "docs-google-iap-app-engine-version-iam"
diff --git a/website/docs/r/iap_web_backend_service_iam.html.markdown b/website/docs/r/iap_web_backend_service_iam.html.markdown
index ebac8038307..d2a16640acb 100644
--- a/website/docs/r/iap_web_backend_service_iam.html.markdown
+++ b/website/docs/r/iap_web_backend_service_iam.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Identity-Aware Proxy"
 layout: "google"
 page_title: "Google: google_iap_web_backend_service_iam"
 sidebar_current: "docs-google-iap-web-backend-service-iam"
diff --git a/website/docs/r/iap_web_iam.html.markdown b/website/docs/r/iap_web_iam.html.markdown
index e538610c577..a79f0216d9f 100644
--- a/website/docs/r/iap_web_iam.html.markdown
+++ b/website/docs/r/iap_web_iam.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Identity-Aware Proxy"
 layout: "google"
 page_title: "Google: google_iap_web_iam"
 sidebar_current: "docs-google-iap-web-iam"
diff --git a/website/docs/r/iap_web_type_app_engine_iam.html.markdown b/website/docs/r/iap_web_type_app_engine_iam.html.markdown
index bede66318f9..26e09f6466e 100644
--- a/website/docs/r/iap_web_type_app_engine_iam.html.markdown
+++ b/website/docs/r/iap_web_type_app_engine_iam.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Identity-Aware Proxy"
 layout: "google"
 page_title: "Google: google_iap_web_type_app_engine_iam"
 sidebar_current: "docs-google-iap-web-type-app-engine-iam"
diff --git a/website/docs/r/iap_web_type_compute_iam.html.markdown b/website/docs/r/iap_web_type_compute_iam.html.markdown
index 002e7c0451a..e93bbab907b 100644
--- a/website/docs/r/iap_web_type_compute_iam.html.markdown
+++ b/website/docs/r/iap_web_type_compute_iam.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Identity-Aware Proxy"
 layout: "google"
 page_title: "Google: google_iap_web_type_compute_iam"
 sidebar_current: "docs-google-iap-web-type-compute-iam"
diff --git a/website/docs/r/kms_crypto_key.html.markdown b/website/docs/r/kms_crypto_key.html.markdown
index 8495dc970ac..e8d4ef60c7a 100644
--- a/website/docs/r/kms_crypto_key.html.markdown
+++ b/website/docs/r/kms_crypto_key.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_crypto_key"
 sidebar_current: "docs-google-kms-crypto-key"
diff --git a/website/docs/r/kms_key_ring.html.markdown b/website/docs/r/kms_key_ring.html.markdown
index 48397dde1ae..a83526f064d 100644
--- a/website/docs/r/kms_key_ring.html.markdown
+++ b/website/docs/r/kms_key_ring.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud KMS"
 layout: "google"
 page_title: "Google: google_kms_key_ring"
 sidebar_current: "docs-google-kms-key-ring"
diff --git a/website/docs/r/logging_billing_account_exclusion.html.markdown b/website/docs/r/logging_billing_account_exclusion.html.markdown
index f33337609a4..0bf10714819 100644
--- a/website/docs/r/logging_billing_account_exclusion.html.markdown
+++ b/website/docs/r/logging_billing_account_exclusion.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_billing_account_exclusion"
 sidebar_current: "docs-google-logging-billing_account-exclusion"
diff --git a/website/docs/r/logging_billing_account_sink.html.markdown b/website/docs/r/logging_billing_account_sink.html.markdown
index 9247e44194f..b4b005c56d9 100644
--- a/website/docs/r/logging_billing_account_sink.html.markdown
+++ b/website/docs/r/logging_billing_account_sink.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_billing_account_sink"
 sidebar_current: "docs-google-logging-billing-account-sink"
diff --git a/website/docs/r/logging_folder_exclusion.html.markdown b/website/docs/r/logging_folder_exclusion.html.markdown
index 7f4784bd0f6..107dc42c6c8 100644
--- a/website/docs/r/logging_folder_exclusion.html.markdown
+++ b/website/docs/r/logging_folder_exclusion.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_folder_exclusion"
 sidebar_current: "docs-google-logging-folder-exclusion"
diff --git a/website/docs/r/logging_folder_sink.html.markdown b/website/docs/r/logging_folder_sink.html.markdown
index 5a7bdfeea3b..ab076376838 100644
--- a/website/docs/r/logging_folder_sink.html.markdown
+++ b/website/docs/r/logging_folder_sink.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_folder_sink"
 sidebar_current: "docs-google-logging-folder-sink"
diff --git a/website/docs/r/logging_metric.html.markdown b/website/docs/r/logging_metric.html.markdown
index 743ec4990a0..54b2d8f1374 100644
--- a/website/docs/r/logging_metric.html.markdown
+++ b/website/docs/r/logging_metric.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_metric"
 sidebar_current: "docs-google-logging-metric"
diff --git a/website/docs/r/logging_organization_exclusion.html.markdown b/website/docs/r/logging_organization_exclusion.html.markdown
index 252f44e2127..e0bca87533e 100644
--- a/website/docs/r/logging_organization_exclusion.html.markdown
+++ b/website/docs/r/logging_organization_exclusion.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_organization_exclusion"
 sidebar_current: "docs-google-logging-organization-exclusion"
diff --git a/website/docs/r/logging_organization_sink.html.markdown b/website/docs/r/logging_organization_sink.html.markdown
index 92a22446046..74b9326ea0f 100644
--- a/website/docs/r/logging_organization_sink.html.markdown
+++ b/website/docs/r/logging_organization_sink.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_organization_sink"
 sidebar_current: "docs-google-logging-organization-sink"
diff --git a/website/docs/r/logging_project_exclusion.html.markdown b/website/docs/r/logging_project_exclusion.html.markdown
index 0fc71866484..74d4ea2ab94 100644
--- a/website/docs/r/logging_project_exclusion.html.markdown
+++ b/website/docs/r/logging_project_exclusion.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_project_exclusion"
 sidebar_current: "docs-google-logging-project-exclusion"
diff --git a/website/docs/r/logging_project_sink.html.markdown b/website/docs/r/logging_project_sink.html.markdown
index 4319128a463..e0eacea8d50 100644
--- a/website/docs/r/logging_project_sink.html.markdown
+++ b/website/docs/r/logging_project_sink.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Stackdriver Logging"
 layout: "google"
 page_title: "Google: google_logging_project_sink"
 sidebar_current: "docs-google-logging-project-sink"
diff --git a/website/docs/r/ml_engine_model.html.markdown b/website/docs/r/ml_engine_model.html.markdown
index 89e33b36acf..bea6e4f56f1 100644
--- a/website/docs/r/ml_engine_model.html.markdown
+++ b/website/docs/r/ml_engine_model.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "ML Engine"
 layout: "google"
 page_title: "Google: google_ml_engine_model"
 sidebar_current: "docs-google-ml-engine-model"
diff --git a/website/docs/r/monitoring_alert_policy.html.markdown b/website/docs/r/monitoring_alert_policy.html.markdown
index 3fbd7cf655b..ef8067e9f9c 100644
--- a/website/docs/r/monitoring_alert_policy.html.markdown
+++ b/website/docs/r/monitoring_alert_policy.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Stackdriver Monitoring"
 layout: "google"
 page_title: "Google: google_monitoring_alert_policy"
 sidebar_current: "docs-google-monitoring-alert-policy"
diff --git a/website/docs/r/monitoring_group.html.markdown b/website/docs/r/monitoring_group.html.markdown
index fdcba6c0ef9..bf89093fdfb 100644
--- a/website/docs/r/monitoring_group.html.markdown
+++ b/website/docs/r/monitoring_group.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Stackdriver Monitoring"
 layout: "google"
 page_title: "Google: google_monitoring_group"
 sidebar_current: "docs-google-monitoring-group"
diff --git a/website/docs/r/monitoring_notification_channel.html.markdown b/website/docs/r/monitoring_notification_channel.html.markdown
index eca2794838a..072bcfee708 100644
--- a/website/docs/r/monitoring_notification_channel.html.markdown
+++ b/website/docs/r/monitoring_notification_channel.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Stackdriver Monitoring"
 layout: "google"
 page_title: "Google: google_monitoring_notification_channel"
 sidebar_current: "docs-google-monitoring-notification-channel"
diff --git a/website/docs/r/monitoring_uptime_check_config.html.markdown b/website/docs/r/monitoring_uptime_check_config.html.markdown
index 48846505553..c10fae78e12 100644
--- a/website/docs/r/monitoring_uptime_check_config.html.markdown
+++ b/website/docs/r/monitoring_uptime_check_config.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Stackdriver Monitoring"
 layout: "google"
 page_title: "Google: google_monitoring_uptime_check_config"
 sidebar_current: "docs-google-monitoring-uptime-check-config"
diff --git a/website/docs/r/pubsub_subscription.html.markdown b/website/docs/r/pubsub_subscription.html.markdown
index 8327f6a9c97..4b4887d35ef 100644
--- a/website/docs/r/pubsub_subscription.html.markdown
+++ b/website/docs/r/pubsub_subscription.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Pub/Sub"
 layout: "google"
 page_title: "Google: google_pubsub_subscription"
 sidebar_current: "docs-google-pubsub-subscription"
diff --git a/website/docs/r/pubsub_subscription_iam.html.markdown b/website/docs/r/pubsub_subscription_iam.html.markdown
index 4555ecc8cd2..72edceefd98 100644
--- a/website/docs/r/pubsub_subscription_iam.html.markdown
+++ b/website/docs/r/pubsub_subscription_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "PubSub"
 layout: "google"
 page_title: "Google: google_pubsub_subscription_iam"
 sidebar_current: "docs-google-pubsub-subscription-iam"
@@ -102,4 +103,4 @@ $ terraform import google_pubsub_subscription_iam_policy.editor projects/{your-p
 $ terraform import google_pubsub_subscription_iam_binding.editor "projects/{your-project-id}/subscriptions/{your-subscription-name} roles/editor"
 
 $ terraform import google_pubsub_subscription_iam_member.editor "projects/{your-project-id}/subscriptions/{your-subscription-name} roles/editor jane@example.com"
-```
\ No newline at end of file
+```
diff --git a/website/docs/r/pubsub_topic.html.markdown b/website/docs/r/pubsub_topic.html.markdown
index 6dde6cc5e53..a16292c15cb 100644
--- a/website/docs/r/pubsub_topic.html.markdown
+++ b/website/docs/r/pubsub_topic.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Pub/Sub"
 layout: "google"
 page_title: "Google: google_pubsub_topic"
 sidebar_current: "docs-google-pubsub-topic"
diff --git a/website/docs/r/pubsub_topic_iam.html.markdown b/website/docs/r/pubsub_topic_iam.html.markdown
index 299ff73121d..754c9608c1e 100644
--- a/website/docs/r/pubsub_topic_iam.html.markdown
+++ b/website/docs/r/pubsub_topic_iam.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Pub/Sub"
 layout: "google"
 page_title: "Google: google_pubsub_topic_iam"
 sidebar_current: "docs-google-pubsub-topic-iam"
diff --git a/website/docs/r/redis_instance.html.markdown b/website/docs/r/redis_instance.html.markdown
index 895dfdafe60..c64db938554 100644
--- a/website/docs/r/redis_instance.html.markdown
+++ b/website/docs/r/redis_instance.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Memorystore"
 layout: "google"
 page_title: "Google: google_redis_instance"
 sidebar_current: "docs-google-redis-instance"
diff --git a/website/docs/r/resource_manager_lien.html.markdown b/website/docs/r/resource_manager_lien.html.markdown
index d388cb01d16..b9ec3443fd8 100644
--- a/website/docs/r/resource_manager_lien.html.markdown
+++ b/website/docs/r/resource_manager_lien.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Resource Manager"
 layout: "google"
 page_title: "Google: google_resource_manager_lien"
 sidebar_current: "docs-google-resource-manager-lien"
diff --git a/website/docs/r/runtimeconfig_config.html.markdown b/website/docs/r/runtimeconfig_config.html.markdown
index df7db89b596..a67b6de1960 100644
--- a/website/docs/r/runtimeconfig_config.html.markdown
+++ b/website/docs/r/runtimeconfig_config.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "RuntimeConfig"
 layout: "google"
 page_title: "Google: google_runtimeconfig_config"
 sidebar_current: "docs-google-runtimeconfig-config"
diff --git a/website/docs/r/runtimeconfig_config_iam.html.markdown b/website/docs/r/runtimeconfig_config_iam.html.markdown
index 229d744ecd9..7de64252d30 100644
--- a/website/docs/r/runtimeconfig_config_iam.html.markdown
+++ b/website/docs/r/runtimeconfig_config_iam.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Runtime Configuration"
 layout: "google"
 page_title: "Google: google_runtimeconfig_config_iam"
 sidebar_current: "docs-google-runtimeconfig-config-iam"
diff --git a/website/docs/r/runtimeconfig_variable.html.markdown b/website/docs/r/runtimeconfig_variable.html.markdown
index 3de5392a6f3..35d76d5f393 100644
--- a/website/docs/r/runtimeconfig_variable.html.markdown
+++ b/website/docs/r/runtimeconfig_variable.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "RuntimeConfig"
 layout: "google"
 page_title: "Google: google_runtimeconfig_variable"
 sidebar_current: "docs-google-runtimeconfig-variable"
diff --git a/website/docs/r/scc_source.html.markdown b/website/docs/r/scc_source.html.markdown
index c25d6d91c98..2d823f31d67 100644
--- a/website/docs/r/scc_source.html.markdown
+++ b/website/docs/r/scc_source.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Security Command Center"
 layout: "google"
 page_title: "Google: google_scc_source"
 sidebar_current: "docs-google-scc-source"
diff --git a/website/docs/r/service_networking_connection.html.markdown b/website/docs/r/service_networking_connection.html.markdown
index 9e433886bbd..1e377834bd7 100644
--- a/website/docs/r/service_networking_connection.html.markdown
+++ b/website/docs/r/service_networking_connection.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Service Networking"
 layout: "google"
 page_title: "Google: google_service_networking_connection"
 sidebar_current: "docs-google-service-networking-connection"
diff --git a/website/docs/r/sourcerepo_repository.html.markdown b/website/docs/r/sourcerepo_repository.html.markdown
index fdc683a44e2..f2ba47536a7 100644
--- a/website/docs/r/sourcerepo_repository.html.markdown
+++ b/website/docs/r/sourcerepo_repository.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Source Repositories"
 layout: "google"
 page_title: "Google: google_sourcerepo_repository"
 sidebar_current: "docs-google-sourcerepo-repository"
diff --git a/website/docs/r/sourcerepo_repository_iam.html.markdown b/website/docs/r/sourcerepo_repository_iam.html.markdown
index c894e268811..8f0467714ac 100644
--- a/website/docs/r/sourcerepo_repository_iam.html.markdown
+++ b/website/docs/r/sourcerepo_repository_iam.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Source Repositories"
 layout: "google"
 page_title: "Google: google_sourcerepo_repository_iam"
 sidebar_current: "docs-google-sourcerepo-repository-iam"
diff --git a/website/docs/r/spanner_database.html.markdown b/website/docs/r/spanner_database.html.markdown
index 4304369fa57..5fca1639c31 100644
--- a/website/docs/r/spanner_database.html.markdown
+++ b/website/docs/r/spanner_database.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Spanner"
 layout: "google"
 page_title: "Google: google_spanner_database"
 sidebar_current: "docs-google-spanner-database"
diff --git a/website/docs/r/spanner_database_iam.html.markdown b/website/docs/r/spanner_database_iam.html.markdown
index f9f528b517a..6bf5760912a 100644
--- a/website/docs/r/spanner_database_iam.html.markdown
+++ b/website/docs/r/spanner_database_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Spanner"
 layout: "google"
 page_title: "Google: google_spanner_database_iam"
 sidebar_current: "docs-google-spanner-database-iam"
diff --git a/website/docs/r/spanner_instance.html.markdown b/website/docs/r/spanner_instance.html.markdown
index 8a0dd2fb2c8..685fff0f69f 100644
--- a/website/docs/r/spanner_instance.html.markdown
+++ b/website/docs/r/spanner_instance.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Spanner"
 layout: "google"
 page_title: "Google: google_spanner_instance"
 sidebar_current: "docs-google-spanner-instance"
diff --git a/website/docs/r/spanner_instance_iam.html.markdown b/website/docs/r/spanner_instance_iam.html.markdown
index cda901cd733..13a964ad78e 100644
--- a/website/docs/r/spanner_instance_iam.html.markdown
+++ b/website/docs/r/spanner_instance_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Spanner"
 layout: "google"
 page_title: "Google: google_spanner_instance_iam"
 sidebar_current: "docs-google-spanner-instance-iam"
diff --git a/website/docs/r/sql_database.html.markdown b/website/docs/r/sql_database.html.markdown
index ab959885292..953c5e94617 100644
--- a/website/docs/r/sql_database.html.markdown
+++ b/website/docs/r/sql_database.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud SQL"
 layout: "google"
 page_title: "Google: google_sql_database"
 sidebar_current: "docs-google-sql-database"
diff --git a/website/docs/r/sql_database_instance.html.markdown b/website/docs/r/sql_database_instance.html.markdown
index 07fa3f30688..88fb98ec2bd 100644
--- a/website/docs/r/sql_database_instance.html.markdown
+++ b/website/docs/r/sql_database_instance.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "SQL"
 layout: "google"
 page_title: "Google: google_sql_database_instance"
 sidebar_current: "docs-google-sql-database-instance"
diff --git a/website/docs/r/sql_ssl_cert.html.markdown b/website/docs/r/sql_ssl_cert.html.markdown
index 547507fc99d..b3e6f9d7936 100644
--- a/website/docs/r/sql_ssl_cert.html.markdown
+++ b/website/docs/r/sql_ssl_cert.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "SQL"
 layout: "google"
 page_title: "Google: google_sql_ssl_cert"
 sidebar_current: "docs-google-sql-ssl-cert"
diff --git a/website/docs/r/sql_user.html.markdown b/website/docs/r/sql_user.html.markdown
index 8ed3d280a56..70f409d1b24 100644
--- a/website/docs/r/sql_user.html.markdown
+++ b/website/docs/r/sql_user.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "SQL"
 layout: "google"
 page_title: "Google: google_sql_user"
 sidebar_current: "docs-google-sql-user"
diff --git a/website/docs/r/storage_bucket.html.markdown b/website/docs/r/storage_bucket.html.markdown
index 955e7926583..b96fd891bc8 100644
--- a/website/docs/r/storage_bucket.html.markdown
+++ b/website/docs/r/storage_bucket.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_bucket"
 sidebar_current: "docs-google-storage-bucket-x"
diff --git a/website/docs/r/storage_bucket_access_control.html.markdown b/website/docs/r/storage_bucket_access_control.html.markdown
index f3e134bda48..6b3d27905ad 100644
--- a/website/docs/r/storage_bucket_access_control.html.markdown
+++ b/website/docs/r/storage_bucket_access_control.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_bucket_access_control"
 sidebar_current: "docs-google-storage-bucket-access-control"
diff --git a/website/docs/r/storage_bucket_acl.html.markdown b/website/docs/r/storage_bucket_acl.html.markdown
index 93b51a1f92c..13422ab5226 100644
--- a/website/docs/r/storage_bucket_acl.html.markdown
+++ b/website/docs/r/storage_bucket_acl.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_bucket_acl"
 sidebar_current: "docs-google-storage-bucket-acl"
diff --git a/website/docs/r/storage_bucket_iam.html.markdown b/website/docs/r/storage_bucket_iam.html.markdown
index 85920247e0e..feb2c22b9e6 100644
--- a/website/docs/r/storage_bucket_iam.html.markdown
+++ b/website/docs/r/storage_bucket_iam.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_bucket_iam"
 sidebar_current: "docs-google-storage-bucket-iam"
diff --git a/website/docs/r/storage_bucket_object.html.markdown b/website/docs/r/storage_bucket_object.html.markdown
index 0d8b80d17f8..679d4409116 100644
--- a/website/docs/r/storage_bucket_object.html.markdown
+++ b/website/docs/r/storage_bucket_object.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_bucket_object"
 sidebar_current: "docs-google-storage-bucket-object"
diff --git a/website/docs/r/storage_default_object_access_control.html.markdown b/website/docs/r/storage_default_object_access_control.html.markdown
index 934142ad526..752ed9a49d5 100644
--- a/website/docs/r/storage_default_object_access_control.html.markdown
+++ b/website/docs/r/storage_default_object_access_control.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_default_object_access_control"
 sidebar_current: "docs-google-storage-default-object-access-control"
diff --git a/website/docs/r/storage_default_object_acl.html.markdown b/website/docs/r/storage_default_object_acl.html.markdown
index 413715d3730..596832b3cfd 100644
--- a/website/docs/r/storage_default_object_acl.html.markdown
+++ b/website/docs/r/storage_default_object_acl.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_default_object_acl"
 sidebar_current: "docs-google-storage-default-object-acl"
diff --git a/website/docs/r/storage_notification.html.markdown b/website/docs/r/storage_notification.html.markdown
index aa6debba9cd..f78dc51af6b 100644
--- a/website/docs/r/storage_notification.html.markdown
+++ b/website/docs/r/storage_notification.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_notification"
 sidebar_current: "docs-google-storage-notification"
diff --git a/website/docs/r/storage_object_access_control.html.markdown b/website/docs/r/storage_object_access_control.html.markdown
index c2432a8e9cc..2bfc3e96a7a 100644
--- a/website/docs/r/storage_object_access_control.html.markdown
+++ b/website/docs/r/storage_object_access_control.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_object_access_control"
 sidebar_current: "docs-google-storage-object-access-control"
diff --git a/website/docs/r/storage_object_acl.html.markdown b/website/docs/r/storage_object_acl.html.markdown
index ce729ae43ac..e8eb1d67473 100644
--- a/website/docs/r/storage_object_acl.html.markdown
+++ b/website/docs/r/storage_object_acl.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage"
 layout: "google"
 page_title: "Google: google_storage_object_acl"
 sidebar_current: "docs-google-storage-object-acl"
diff --git a/website/docs/r/storage_transfer_job.html.markdown b/website/docs/r/storage_transfer_job.html.markdown
index 0b64ccd080a..5be0f63cfd8 100644
--- a/website/docs/r/storage_transfer_job.html.markdown
+++ b/website/docs/r/storage_transfer_job.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Storage Transfer"
 layout: "google"
 page_title: "Google: google_storage_transfer_job"
 sidebar_current: "docs-google-storage-transfer-job-x"
diff --git a/website/docs/r/tpu_node.html.markdown b/website/docs/r/tpu_node.html.markdown
index c91114e97aa..d902fee1ab2 100644
--- a/website/docs/r/tpu_node.html.markdown
+++ b/website/docs/r/tpu_node.html.markdown
@@ -12,6 +12,7 @@
 #     .github/CONTRIBUTING.md.
 #
 # ----------------------------------------------------------------------------
+subcategory: "Google Cloud TPU"
 layout: "google"
 page_title: "Google: google_tpu_node"
 sidebar_current: "docs-google-tpu-node"
diff --git a/website/docs/r/usage_export_bucket.html.markdown b/website/docs/r/usage_export_bucket.html.markdown
index 8f187ef61c4..d7bb95c66d4 100644
--- a/website/docs/r/usage_export_bucket.html.markdown
+++ b/website/docs/r/usage_export_bucket.html.markdown
@@ -1,4 +1,5 @@
 ---
+subcategory: "Cloud Platform"
 layout: "google"
 page_title: "Google: google_project_usage_export_bucket"
 sidebar_current: "docs-google-project-usage-export-bucket"