@@ -25,5 +25,5 @@ Terraform Cloud user account.
 
 For details, see:
 
-- [The `terraform login` command](/docs/commands/login.html)
-- [The `terraform logout` command](/docs/commands/logout.html)
+- [The `terraform login` command](/docs/cli/commands/login.html)
+- [The `terraform logout` command](/docs/cli/commands/logout.html)
@@ -13,27 +13,27 @@ Terraform CLI includes several commands to make Terraform code more convenient
 to work with. Integrating these commands into your editing workflow can
 potentially save you time and effort.
 
-- [The `terraform console` command](/docs/commands/console.html) starts an
+- [The `terraform console` command](/docs/cli/commands/console.html) starts an
   interactive shell for evaluating Terraform
   [expressions](/docs/language/expressions/index.html), which can be a faster way
   to verify that a particular resource argument results in the value you expect.
 
 
-- [The `terraform fmt` command](/docs/commands/fmt.html) rewrites Terraform
+- [The `terraform fmt` command](/docs/cli/commands/fmt.html) rewrites Terraform
   configuration files to a canonical format and style, so you don't have to
   waste time making minor adjustments for readability and consistency. It works
   well as a pre-commit hook in your version control system.
 
-- [The `terraform validate` command](/docs/commands/validate.html) validates the
+- [The `terraform validate` command](/docs/cli/commands/validate.html) validates the
   syntax and arguments of the Terraform configuration files in a directory,
   including argument and attribute names and types for resources and modules.
   The `plan` and `apply` commands automatically validate a configuration before
   performing any other work, so `validate` isn't a crucial part of the core
   workflow, but it can be very useful as a pre-commit hook or as part of a
   continuous integration pipeline.
 
-- [The `0.13upgrade` command](/docs/commands/0.13upgrade.html) and
-  [the `0.12upgrade` command](/docs/commands/0.12upgrade.html) can automatically
+- [The `0.13upgrade` command](/docs/cli/commands/0.13upgrade.html) and
+  [the `0.12upgrade` command](/docs/cli/commands/0.12upgrade.html) can automatically
   modify the configuration files in a Terraform module to help deal with major
   syntax changes that occurred in the 0.13 and 0.12 releases of Terraform. Both
   of these commands are only available in the Terraform version they are
 
@@ -66,9 +66,9 @@ The command-line flags are all optional. The list of available flags are:
   [remote state](/docs/language/state/remote.html) is used.
 
 * `-target=resource` - A [Resource
-  Address](/docs/internals/resource-addressing.html) to target. For more
+  Address](/docs/cli/state/resource-addressing.html) to target. For more
   information, see
-  [the targeting docs from `terraform plan`](/docs/commands/plan.html#resource-targeting).
+  [the targeting docs from `terraform plan`](/docs/cli/commands/plan.html#resource-targeting).
 
 * `-var 'foo=bar'` - Set a variable in the Terraform configuration. This flag
   can be set multiple times. Variable values are interpreted as
@@ -100,6 +100,6 @@ current working directory.
 If your previous use of this legacy pattern was also relying on Terraform
 writing the `.terraform` subdirectory into the current working directory even
 though the root module directory was overridden, use
-[the `TF_DATA_DIR` environment variable](environment-variables.html#tf_data_dir)
+[the `TF_DATA_DIR` environment variable](/docs/cli/config/environment-variables.html#tf_data_dir)
 to direct Terraform to write the `.terraform` directory to a location other
 than the current working directory.
@@ -19,13 +19,13 @@ Infrastructure managed by Terraform will be destroyed. This will ask for
 confirmation before destroying.
 
 This command accepts all the arguments and options that the [apply
-command](/docs/commands/apply.html) accepts, with the exception of a plan file
+command](/docs/cli/commands/apply.html) accepts, with the exception of a plan file
 argument.
 
 If `-auto-approve` is set, then the destroy confirmation will not be shown.
 
 The `-target` flag, instead of affecting "dependencies" will instead also
-destroy any resources that _depend on_ the target(s) specified. For more information, see [the targeting docs from `terraform plan`](/docs/commands/plan.html#resource-targeting).
+destroy any resources that _depend on_ the target(s) specified. For more information, see [the targeting docs from `terraform plan`](/docs/cli/commands/plan.html#resource-targeting).
 
 The behavior of any `terraform destroy` command can be previewed at any time
 with an equivalent `terraform plan -destroy` command.
@@ -9,5 +9,5 @@ description: |-
 # Command: env
 
 The `terraform env` command is deprecated.
-[The `terraform workspace` command](/docs/commands/workspace/)
+[The `terraform workspace` command](/docs/cli/commands/workspace/index.html)
 should be used instead.
@@ -11,7 +11,7 @@ description: |-
 > **Hands-on:** Try the [Import Terraform Configuration](https://learn.hashicorp.com/tutorials/terraform/state-import?in=terraform/state&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) tutorial on HashiCorp Learn.
 
 The `terraform import` command is used to
-[import existing resources](/docs/import/index.html)
+[import existing resources](/docs/cli/import/index.html)
 into Terraform.
 
 ## Usage
@@ -21,7 +21,7 @@ Usage: `terraform import [options] ADDRESS ID`
 Import will find the existing resource from ID and import it into your Terraform
 state at the given ADDRESS.
 
-ADDRESS must be a valid [resource address](/docs/internals/resource-addressing.html).
+ADDRESS must be a valid [resource address](/docs/cli/state/resource-addressing.html).
 Because any resource address is valid, the import command can import resources
 into modules as well as directly into the root of your state.
 
 
@@ -101,7 +101,7 @@ will be read or written in the given directory instead.
 There are two exceptions where Terraform will use the original working directory
 even when you specify `-chdir=...`:
 
-* Settings in the [CLI Configuration](cli-config.html) are not for a specific
+* Settings in the [CLI Configuration](/docs/cli/config/config-file.html) are not for a specific
   subcommand and Terraform processes them before acting on the `-chdir`
   option.
 
@@ -154,7 +154,7 @@ Checkpoint itself can be entirely disabled for all HashiCorp products by
 setting the environment variable `CHECKPOINT_DISABLE` to any non-empty value.
 
 Alternatively, settings in
-[the CLI configuration file](/docs/commands/cli-config.html) can be used to
+[the CLI configuration file](/docs/cli/config/config-file.html) can be used to
 disable checkpoint features. The following checkpoint-related settings are
 supported in this file:
 
 
@@ -123,7 +123,7 @@ third-party provider registry, `terraform init` will automatically find,
 download, and install the necessary provider plugins. If you cannot or do not
 wish to install providers from their origin registries, you can customize how
 Terraform installs providers using
-[the provider installation settings in the CLI configuration](./cli-config.html#provider-installation).
+[the provider installation settings in the CLI configuration](/docs/cli/config/config-file.html#provider-installation).
 
 For more information about specifying which providers are required for each
 of your modules, see [Provider Requirements](/docs/language/providers/requirements.html).
@@ -145,15 +145,15 @@ You can modify `terraform init`'s plugin behavior with the following options:
 - `-get-plugins=false` — Skip plugin installation.
 
     -> Note: Since Terraform 0.13, this option has been superseded by the
-    [`provider_installation`](./cli-config.html#provider-installation) and
-    [`plugin_cache_dir`](./cli-config.html#plugin_cache_dir) settings.
+    [`provider_installation`](/docs/cli/config/config-file.html#provider-installation) and
+    [`plugin_cache_dir`](/docs/cli/config/config-file.html#plugin_cache_dir) settings.
     It should not be used in Terraform versions 0.13+, and this option
     was removed in Terraform 0.15.
 - `-plugin-dir=PATH` — Force plugin installation to read plugins _only_ from
   the specified directory, as if it had been configured as a `filesystem_mirror`
   in the CLI configuration. If you intend to routinely use a particular
   filesystem mirror then we recommend
-  [configuring Terraform's installation methods globally](./cli-config.html#provider-installation).
+  [configuring Terraform's installation methods globally](/docs/cli/config/config-file.html#provider-installation).
   You can use `-plugin-dir` as a one-time override for exceptional situations,
   such as if you are testing a local build of a provider plugin you are
   currently developing.
@@ -187,6 +187,6 @@ current working directory.
 If your previous use of this legacy pattern was also relying on Terraform
 writing the `.terraform` subdirectory into the current working directory even
 though the root module directory was overridden, use
-[the `TF_DATA_DIR` environment variable](environment-variables.html#tf_data_dir)
+[the `TF_DATA_DIR` environment variable](/docs/cli/config/environment-variables.html#tf_data_dir)
 to direct Terraform to write the `.terraform` directory to a location other
 than the current working directory.
@@ -15,7 +15,7 @@ API token for Terraform Cloud, Terraform Enterprise, or any other host that offe
 where it is possible to launch a web browser on the same host where Terraform
 is running. If you are running Terraform in an unattended automation scenario,
 you can
-[configure credentials manually in the CLI configuration](https://www.terraform.io/docs/commands/cli-config.html#credentials).
+[configure credentials manually in the CLI configuration](https://www.terraform.io/docs/cli/config/config-file.html#credentials).
 
 ## Usage
 
@@ -34,7 +34,7 @@ not as desired.
 
 If you don't wish to store your API token in the default location, you can
 optionally configure a
-[credentials helper program](cli-config.html#credentials-helpers) which knows
+[credentials helper program](/docs/cli/config/config-file.html#credentials-helpers) which knows
 how to store and later retrieve credentials in some other system, such as
 your organization's existing secrets management system.
 
 
@@ -26,5 +26,5 @@ the remote server, so it will remain valid until manually revoked.
 
 By default, Terraform will remove the token stored in plain text in a local CLI
 configuration file called `credentials.tfrc.json`. If you have configured a
-[credentials helper program](cli-config.html#credentials-helpers), Terraform
+[credentials helper program](/docs/cli/config/config-file.html#credentials-helpers), Terraform
 will use the helper's `forget` command to remove it.