From b80e98ab47ddb97e19e4829c943309926f5529c8 Mon Sep 17 00:00:00 2001 From: Chris Arcand Date: Tue, 7 Dec 2021 15:28:44 -0600 Subject: [PATCH] Misc doc edits referencing state/settings --- website/docs/language/settings/index.html.md | 16 ++++++++++++++-- website/docs/language/state/remote.html.md | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/website/docs/language/settings/index.html.md b/website/docs/language/settings/index.html.md index 5fa8949ac..fbeec6c4c 100644 --- a/website/docs/language/settings/index.html.md +++ b/website/docs/language/settings/index.html.md @@ -2,7 +2,7 @@ layout: "language" page_title: "Terraform Settings - Configuration Language" sidebar_current: "docs-config-terraform" -description: "The terraform block allows you to configure Terraform behavior, including the Terraform version, backend, and required providers." +description: "The terraform block allows you to configure Terraform behavior, including the Terraform version, backend, integration with Terraform Cloud, and required providers." --- # Terraform Settings @@ -29,9 +29,21 @@ etc, and may not use any of the Terraform language built-in functions. The various options supported within a `terraform` block are described in the following sections. +## Configuring Terraform Cloud + +The nested `cloud` block configures Terraform Cloud for enabling its +[CLI-driven run workflow](/docs/cloud/run/cli.html). + +- For a summary of the `cloud` block's syntax, see +[Terraform Cloud Configuration](/docs/language/settings/terraform-cloud.html). + +- For more complete details about configuring and using Terraform Cloud with Terraform CLI, +see [Configuring Terraform Cloud](/docs/cli/cloud/index.html) in the +Terraform CLI documentation. + ## Configuring a Terraform Backend -The nested `backend` block configures which backend Terraform should use. +The nested `backend` block configures which state backend Terraform should use. The syntax and behavior of the `backend` block is described in [Backend Configuration](/docs/language/settings/backends/configuration.html). diff --git a/website/docs/language/state/remote.html.md b/website/docs/language/state/remote.html.md index 998b47945..b9cf39d64 100644 --- a/website/docs/language/state/remote.html.md +++ b/website/docs/language/state/remote.html.md @@ -19,8 +19,8 @@ which can then be shared between all members of a team. Terraform supports storing state in [Terraform Cloud](https://www.hashicorp.com/products/terraform/), [HashiCorp Consul](https://www.consul.io/), Amazon S3, Azure Blob Storage, Google Cloud Storage, Alibaba Cloud OSS, and more. -Remote state is implemented by a [backend](/docs/language/settings/backends/index.html), -which you can configure in your configuration's root module. +Remote state is implemented by a [backend](/docs/language/settings/backends/index.html) or by +Terraform Cloud, both of which you can configure in your configuration's root module. ## Delegation and Teamwork