diff --git a/README.md b/README.md
index 900577641..c14a3fef4 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Show off your Terraform knowledge by passing a certification exam. Visit the [ce
 Developing Terraform
 --------------------
 
-This repository contains only Terraform core, which includes the command line interface and the main graph engine. Providers are implemented as plugins that each have their own repository in [the `terraform-providers` organization](https://github.com/terraform-providers) on GitHub. Instructions for developing each provider are in the associated README file. For more information, see [the provider development overview](https://www.terraform.io/docs/plugins/provider.html).
+This repository contains only Terraform core, which includes the command line interface and the main graph engine. Providers are implemented as plugins, and Terraform can automatically download providers that are published on [the Terraform Registry](https://registry.terraform.io). HashiCorp develops some providers, and others are developed by other organizations. For more information, see [Extending Terraform](https://www.terraform.io/docs/extend/index.html).
 
 To learn more about compiling Terraform and contributing suggested changes, please refer to [the contributing guide](.github/CONTRIBUTING.md).
 
diff --git a/command/import.go b/command/import.go
index 5623141f4..d58960d0b 100644
--- a/command/import.go
+++ b/command/import.go
@@ -343,7 +343,7 @@ func (c *ImportCommand) Synopsis() string {
 }
 
 const importCommandInvalidAddressReference = `For information on valid syntax, see:
-https://www.terraform.io/docs/internals/resource-addressing.html`
+https://www.terraform.io/docs/cli/state/resource-addressing.html`
 
 const importCommandMissingResourceFmt = `[reset][bold][red]Error:[reset][bold] resource address %q does not exist in the configuration.[reset]
 
diff --git a/command/init.go b/command/init.go
index 9b6f7dd0a..14a86dc1b 100644
--- a/command/init.go
+++ b/command/init.go
@@ -714,7 +714,7 @@ func (c *InitCommand) getProviders(config *configs.Config, state *states.State,
 			if thirdPartySigned {
 				c.Ui.Info(fmt.Sprintf("\nPartner and community providers are signed by their developers.\n" +
 					"If you'd like to know more about provider signing, you can read about it here:\n" +
-					"https://www.terraform.io/docs/plugins/signing.html"))
+					"https://www.terraform.io/docs/cli/plugins/signing.html"))
 			}
 		},
 		HashPackageFailure: func(provider addrs.Provider, version getproviders.Version, err error) {
@@ -968,7 +968,7 @@ Options:
   -no-color            If specified, output won't contain any color.
 
   -plugin-dir          Directory containing plugin binaries. This overrides all
-                       default search paths for plugins, and prevents the 
+                       default search paths for plugins, and prevents the
                        automatic installation of plugins. This flag can be used
                        multiple times.
 
diff --git a/commands.go b/commands.go
index 569c3e8ed..7c692bd65 100644
--- a/commands.go
+++ b/commands.go
@@ -103,7 +103,7 @@ func initCommands(
 
 	// The command list is included in the terraform -help
 	// output, which is in turn included in the docs at
-	// website/docs/commands/index.html.markdown; if you
+	// website/docs/cli/commands/index.html.markdown; if you
 	// add, remove or reclassify commands then consider updating
 	// that to match.
 
diff --git a/docs/README.md b/docs/README.md
index 76e365990..2ed0af4b4 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -4,7 +4,7 @@ This directory contains some documentation about the Terraform Core codebase,
 aimed at readers who are interested in making code contributions.
 
 If you're looking for information on _using_ Terraform, please instead refer
-to [the main Terraform CLI documentation](https://www.terraform.io/docs/cli-index.html).
+to [the main Terraform CLI documentation](https://www.terraform.io/docs/cli/index.html).
 
 ## Terraform Core Architecture Documents
 
diff --git a/help.go b/help.go
index 64eb03273..16bc32095 100644
--- a/help.go
+++ b/help.go
@@ -41,7 +41,7 @@ func helpFunc(commands map[string]cli.CommandFactory) string {
 	sort.Strings(otherCommands)
 
 	// The output produced by this is included in the docs at
-	// website/source/docs/commands/index.html.markdown; if you
+	// website/source/docs/cli/commands/index.html.markdown; if you
 	// change this then consider updating that to match.
 	helpText := fmt.Sprintf(`
 Usage: terraform [global options] <subcommand> [args]
diff --git a/internal/legacy/terraform/resource_address.go b/internal/legacy/terraform/resource_address.go
index 4acf122b3..39dc7c30c 100644
--- a/internal/legacy/terraform/resource_address.go
+++ b/internal/legacy/terraform/resource_address.go
@@ -92,7 +92,7 @@ func (r *ResourceAddress) String() string {
 
 // HasResourceSpec returns true if the address has a resource spec, as
 // defined in the documentation:
-//    https://www.terraform.io/docs/internals/resource-addressing.html
+//    https://www.terraform.io/docs/cli/state/resource-addressing.html
 // In particular, this returns false if the address contains only
 // a module path, thus addressing the entire module.
 func (r *ResourceAddress) HasResourceSpec() bool {