From b2142b4bcc2c0f174f6c23a5ad09dba9e46e5399 Mon Sep 17 00:00:00 2001 From: The Magician Date: Thu, 17 Jan 2019 09:13:02 -0800 Subject: [PATCH] Clarify that the website is shared between both provider versions (#2881) /cc @rileykarson --- website/docs/index.html.markdown | 3 ++- website/docs/provider_reference.html.markdown | 3 ++- website/docs/provider_versions.html.markdown | 10 +++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index 5b49f289..b87e20eb 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -9,7 +9,8 @@ description: |- # Google Cloud Platform Provider -> We recently introduced the `google-beta` provider. See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) -for more details on how to use `google-beta`. +for more details on how to use `google-beta`. The documentation in this site is shared between both `google` and `google-beta`; fields or +resources only present in `google-beta` will be marked as such. The Google provider is used to configure your [Google Cloud Platform](https://cloud.google.com/) infrastructure. See the [Getting Started](/docs/providers/google/getting_started.html) page for an introduction to using the provider. diff --git a/website/docs/provider_reference.html.markdown b/website/docs/provider_reference.html.markdown index fca6603f..8e629bdf 100644 --- a/website/docs/provider_reference.html.markdown +++ b/website/docs/provider_reference.html.markdown @@ -9,7 +9,8 @@ description: |- # `google` provider reference -> We recently introduced the `google-beta` provider. See [Provider Versions](https://terraform.io/docs/providers/google/provider_versions.html) -for more details on how to use `google-beta`. +for more details on how to use `google-beta`. The documentation in this site is shared between both `google` and `google-beta`; fields or +resources only present in `google-beta` will be marked as such. The `google` and `google-beta` provider blocks are used to configure default values for your GCP project and location (`zone` and `region`), and add your credentials. diff --git a/website/docs/provider_versions.html.markdown b/website/docs/provider_versions.html.markdown index aff45d4b..21bce8f6 100644 --- a/website/docs/provider_versions.html.markdown +++ b/website/docs/provider_versions.html.markdown @@ -13,10 +13,14 @@ Starting with version `1.19.0`, there are two versions of the Google provider: * `google` * `google-beta` -All GA (generally available) products and features are available in both -versions of the provider. +This documentation (https://www.terraform.io/docs/providers/google/) is shared +between both providers. Fields and resources that are only present in +`google-beta` will be marked as such. + +All GA (generally available) products and features are available in both +versions of the provider, and from the `2.0.0` release onwards beta GCP features +are only available in the `google-beta` provider. -From version `2.0.0` onwards, beta GCP features are only available in the `google-beta` provider. Beta GCP features have no deprecation policy and no SLA, but are otherwise considered to be feature-complete with only minor outstanding issues after their Alpha period. Beta is when GCP features are publicly announced, and is when they generally become publicly