diff --git a/website/docs/r/compute_global_forwarding_rule.html.markdown b/website/docs/r/compute_global_forwarding_rule.html.markdown index 8b2e9ed6..6d3d2e8a 100644 --- a/website/docs/r/compute_global_forwarding_rule.html.markdown +++ b/website/docs/r/compute_global_forwarding_rule.html.markdown @@ -75,9 +75,6 @@ The following arguments are supported: * `target` - (Required) URL of target HTTP or HTTPS proxy. -* `region` - (Optional) The region this resource has been created in. If - unspecified, this defaults to the region configured in the provider. - - - - * `description` - (Optional) Textual description field. diff --git a/website/docs/r/compute_instance.html.markdown b/website/docs/r/compute_instance.html.markdown index f79ec5ff..5cf6bbfc 100644 --- a/website/docs/r/compute_instance.html.markdown +++ b/website/docs/r/compute_instance.html.markdown @@ -116,10 +116,6 @@ The following arguments are supported: * `disk` - (DEPRECATED) Disks to attach to the instance. This can be specified multiple times for multiple disks. Structure is documented below. -* `network` - (DEPRECATED) Networks to attach to the instance. This - can be specified multiple times for multiple networks. Structure is - documented below. - --- The `boot_disk` block supports: diff --git a/website/docs/r/compute_network.html.markdown b/website/docs/r/compute_network.html.markdown index fd3ef90a..39792cf5 100644 --- a/website/docs/r/compute_network.html.markdown +++ b/website/docs/r/compute_network.html.markdown @@ -33,19 +33,11 @@ The following arguments are supported: * `auto_create_subnetworks` - (Optional) If set to true, this network will be created in auto subnet mode, and Google will create a subnet for each region - automatically. If set to false, and `ipv4_range` is not set, a custom - subnetted network will be created that can support - `google_compute_subnetwork` resources. This attribute may not be used if - `ipv4_range` is specified. + automatically. If set to false, a custom subnetted network will be created that + can support `google_compute_subnetwork` resources. * `description` - (Optional) A brief description of this resource. -* `ipv4_range` - (DEPRECATED, Optional) The IPv4 address range that machines in this network - are assigned to, represented as a CIDR block. If not set, an auto or custom - subnetted network will be created, depending on the value of - `auto_create_subnetworks` attribute. This attribute may not be used if - `auto_create_subnetworks` is specified. This attribute is deprecated. - * `project` - (Optional) The project in which the resource belongs. If it is not provided, the provider project is used. diff --git a/website/docs/r/google_project_iam_policy.html.markdown b/website/docs/r/google_project_iam_policy.html.markdown index b7c3e654..24772115 100644 --- a/website/docs/r/google_project_iam_policy.html.markdown +++ b/website/docs/r/google_project_iam_policy.html.markdown @@ -50,16 +50,18 @@ The following arguments are supported: intact. If there are overlapping `binding` entries between the original project policy and the data source policy, they will be removed. -* `authoritative` - (Optional) A boolean value indicating if this policy +* `authoritative` - (DEPRECATED) (Optional) A boolean value indicating if this policy should overwrite any existing IAM policy on the project. When set to true, **any policies not in your config file will be removed**. This can **lock you out** of your project until an Organization Administrator grants you access again, so please exercise caution. If this argument is `true` and you want to delete the resource, you must set the `disable_project` argument to `true`, acknowledging that the project will be inaccessible to anyone but the - Organization Admins, as it will no longer have an IAM policy. + Organization Admins, as it will no longer have an IAM policy. Rather than using + this, you should use `google_project_iam_policy_binding` and + `google_project_iam_policy_member`. -* `disable_project` - (Optional) A boolean value that must be set to `true` +* `disable_project` - (DEPRECATED) (Optional) A boolean value that must be set to `true` if you want to delete a `google_project_iam_policy` that is authoritative. ## Attributes Reference @@ -69,5 +71,5 @@ exported: * `etag` - (Computed) The etag of the project's IAM policy. -* `restore_policy` - (Computed) The IAM policy that will be restored when a +* `restore_policy` - (DEPRECATED) (Computed) The IAM policy that will be restored when a non-authoritative policy resource is deleted. diff --git a/website/docs/r/storage_bucket.html.markdown b/website/docs/r/storage_bucket.html.markdown index fe9b7301..3db93ba2 100644 --- a/website/docs/r/storage_bucket.html.markdown +++ b/website/docs/r/storage_bucket.html.markdown @@ -48,9 +48,6 @@ The following arguments are supported: * `location` - (Optional, Default: 'US') The [GCS location](https://cloud.google.com/storage/docs/bucket-locations) -* `predefined_acl` - (Optional, Deprecated) The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) to apply. Please switch -to `google_storage_bucket_acl.predefined_acl`. - * `project` - (Optional) The project in which the resource belongs. If it is not provided, the provider project is used. diff --git a/website/docs/r/storage_bucket_object.html.markdown b/website/docs/r/storage_bucket_object.html.markdown index d2cfe1ed..ceadcb68 100644 --- a/website/docs/r/storage_bucket_object.html.markdown +++ b/website/docs/r/storage_bucket_object.html.markdown @@ -57,9 +57,6 @@ One of the following is required: * `content_type` - (Optional) [Content-Type](https://tools.ietf.org/html/rfc7231#section-3.1.1.5) of the object data. Defaults to "application/octet-stream" or "text/plain; charset=utf-8". -* `predefined_acl` - (Optional, Deprecated) The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) apply. Please switch -to `google_storage_object_acl.predefined_acl`. - * `storage_class` - (Optional) The [StorageClass](https://cloud.google.com/storage/docs/storage-classes) of the new bucket object. Supported values include: `MULTI_REGIONAL`, `REGIONAL`, `NEARLINE`, `COLDLINE`. If not provided, this defaults to the bucket's default storage class or to a [standard](https://cloud.google.com/storage/docs/storage-classes#standard) class.