Merge branch 'main' into atru/add-tfe-docs-release-instructions

Author: trujillo-adam

content/terraform-docs-common/docs/cloud-docs/registry/using.mdx

@@ -184,13 +184,13 @@ provider "my-random" "main" {
 }
 ```
 
-To learn more about specific syntax for providers in components, refer to [`provider` block](/terraform/language/block/stack/component_configuration/provider). To learn more about defining providers in Stacks, refer to [Declare providers](/terraform/language/stacks/component/declare-providers).
+To learn more about specific syntax for providers in components, refer to [`provider` block](/terraform/language/block/stack/tfcomponent/provider). To learn more about defining providers in Stacks, refer to [Declare providers](/terraform/language/stacks/component/declare-providers).
 
 ### Modules
 
 Each `component` block specifies the Terraform module to use as the source for that component.
 
-To source a module from a Remote Git address, use the following syntax: 
+To source a module from a Remote Git address, use the following syntax:
 `git::<protocol>://<hostname>/<resource-path>.git//path/to/dir?ref=<git reference>`.
 
 Additional Details:
@@ -245,7 +245,7 @@ component "demo" {
 }
 ```
 
-To learn more about components syntax, refer to the [`component` block reference](/terraform/language/block/stack/component_configuration/component).
+To learn more about components syntax, refer to the [`component` block reference](/terraform/language/block/stack/tfcomponent/component).
 
 <!-- END: TFC:only name:stacks-tfe -->
 

content/terraform-docs-common/docs/cloud-docs/stacks/create.mdx

@@ -66,13 +66,13 @@ Stacks live alongside workspaces in an HCP Terraform project. To create a new St
 1. After running the command, you can view your new Stack in the HCP Terraform UI, or by running the `terraform stacks list` command:
 
     ```shell-session
-    $ terraform stacks list -organization <ORGANIZATION_NAME> -project <PROJECT_NAME>
+    $ terraform stacks list -organization-name <ORGANIZATION_NAME> -project-name <PROJECT_NAME>
     ```
 
 1. After creating your Stack, you can push up your Stack component and deployment configuration files to create a new configuration version. Use the `terraform stacks configuration upload` command to manually upload your configuration files:
 
     ```shell-session
-    $ terraform stacks configuration upload -organization <ORGANIZATION_NAME> -project <PROJECT_NAME> -stack-name <STACK_NAME>
+    $ terraform stacks configuration upload -organization-name <ORGANIZATION_NAME> -project-name <PROJECT_NAME> -stack-name <STACK_NAME>
     ```
 
     The Terraform CLI uploads the configuration files, and returns a new configuration version ID and sequence number:
@@ -92,7 +92,7 @@ Stacks live alongside workspaces in an HCP Terraform project. To create a new St
     After uploading your configuration, you can watch your Stack's configuration roll out using `terraform stacks configuration watch` to review a list of the deployment groups in your configuration:
 
     ```shell-session
-    $ terraform stacks configuration watch -organization <ORGANIZATION_NAME> -project <PROJECT_NAME>
+    $ terraform stacks configuration watch -organization-name <ORGANIZATION_NAME> -project-name <PROJECT_NAME>
     ```
 
     The Terraform CLI then displays the status of each deployment group in your Stack:

content/terraform-docs-common/docs/docs/partnerships.mdx

@@ -25,7 +25,7 @@ The Terraform ecosystem enables users to apply Terraform across different use ca
 
 Run tasks allow HCP Terraform to execute tasks in external systems at specific points in the HCP Terraform run lifecycle. Workflow partners create run tasks that let them integrate their services directly into the Terraform workflow. Most workflow partners integrate with the Terraform workflow itself. This integration offers much more extensibility to HCP Terraform and Terraform Enterprise customers, enabling them to integrate your services into the HCP Terraform workflow. This feature allows users to add and execute these tasks during the pre-plan, post-plan, pre-apply, and post-apply stages. Refer to the [HCP Terraform Integrations](#hcp-terraform-integrations) or [Terraform Enterprise Integrations](#terraform-enterprise-integrations) documentation for more details.
 
-![Integration program diagram](/img/docs/terraform-integration-program-diagram.png)
+![Integration program diagram](/img/docs/terraform-integration-program-diagram-updated.png)
 
 ## Terraform Provider Integrations
 
@@ -41,6 +41,7 @@ Our Terraform Provider partners typically have the following use cases, as liste
 - **Database:** These partners offer capabilities to provision and configure your database resources.
 - **Data Management:** These partners focus on data center storage, backup, and recovery solutions.
 - **IaaS (Infrastructure-as-a-Service):** These are infrastructure and IaaS providers that offer solutions such as storage, networking, and virtualization.
+- **Infrastructure Management:** These providers enable Terraform to provision, configure, and manage resources on specific managed platforms and other services such as virtual networks and databases
 - **Logging & Monitoring:** These partners offer the capability to configure and manage services such as loggers, metric tools, and monitoring services.
 - **Networking:** These partners integrate with network-specific hardware and virtualized products such as routing, switching, firewalls, and SD-WAN solutions.
 - **PaaS (Platform-as-a-Service):** These are platform and PaaS providers that offer a range of hardware, software, and application development tools. This category includes smaller-scale providers and those with more specialized offerings.
@@ -197,12 +198,29 @@ The external system can then use this run information and respond back to Terraf
 
 Beyond run tasks, HCP Terraform and Terraform Enterprise offer powerful API-driven workflows for direct integrations. These direct integrations are ideal for creating custom automation, building integrations with third-party systems such as service catalogs or customer portals, or integrating with CI/CD pipelines to control the entire infrastructure provisioning lifecycle. The API-first design ensures comprehensive control and flexibility, enabling a wide range of integration use cases.
 
+Partners who successfully complete an integration with either HCP Terraform or Terraform Enterprise obtain an HCP Terraform or Terraform Enterprise badge. This badge signifies HashiCorp validated the integration under ideal conditions, and that the partner is a member of the HashiCorp Technology Partner Program.
+
+<span style={{display:'block', textAlign:'center'}}>
+<ImageConfig inline height={192} width={192}>
+
+![HCP Terraform](/img/docs/tfc-badge.png)
+
+</ImageConfig>
+<ImageConfig inline height={192} width={192}>
+
+![Terraform Enterprise](/img/docs/tfe-badge.png)
+
+</ImageConfig>
+</span>
+
+The Terraform Enterprise and Terraform Cloud badges can help drive visibility and differentiate joint partners and customers. These badges are available for partners to use on their digital properties, as per the outlined guidelines in the technology partner guide you receive when becoming a partner. 
+
+
 HCP Terraform and Terraform Enterprise integrations development have the following five steps:
 
 ![RunTask Program Process](/img/docs/runtask-program-steps.png)
 
-1. **Engage**: Sign up for the Technology Partner
-   Program
+1. **Engage**: Sign up for the Technology Partner Program
 1. **Develop & Test**: Understand and build using the API integration for Run Tasks
 1. **Review**: Review integration with HashiCorp Alliances team
 1. **Release**: Provide documentation for your Integration

content/terraform-docs-common/img/docs/terraform-integration-program-diagram-updated.png

@@ -660,7 +660,7 @@
     "destination": "/terraform/migrate/reference/configuration",
     "permanent": true
   },
-  // Move MCP server to new versioned space 
+  // Move MCP server to new versioned space
   {
     "source": "/terraform/docs/tools/mcp-server",
     "destination": "terraform/mcp-server",
@@ -703,32 +703,43 @@
   },
   {
     "source": "/terraform/language/stacks/reference/tfstack",
-    "destination": "/terraform/language/block/stack/component_configuration",
+    "destination": "/terraform/language/block/stack/tfcomponent",
+    "permanent": true
+  },
+  // Catching the google redirects until a re-index
+    {
+    "source": "/terraform/language/:version/block/stack/component_configuration/:slug*",
+    "destination": "/terraform/language/:version/block/stack/tfcomponent/:slug*",
     "permanent": true
   },
   {
-    "source": "/terraform/language/v:version(1\\.(?:9|1[0-2])\\.x)/block/stack/component_configuration",
+    "source": "/terraform/language/v:version(1\\.(?:9|1[0-2])\\.x)/block/stack/tfcomponent",
     "destination": "/terraform/language/v:version/stacks/reference/tfstack",
     "permanent": true
   },
   {
     "source": "/terraform/language/v:version((?:1\\.(?:1[3-9]|[2-9]\\d)|[2-9]\\d*\\.\\d+)\\.x)/stacks/reference/tfstack",
-    "destination": "/terraform/language/v:version/block/stack/component_configuration",
+    "destination": "/terraform/language/v:version/block/stack/tfcomponent",
     "permanent": true
   },
   {
     "source": "/terraform/language/stacks/reference/tfdeploy",
-    "destination": "/terraform/language/block/stack/deploy",
+    "destination": "/terraform/language/block/stack/tfdeploy",
+    "permanent": true
+  },
+  {
+    "source": "/terraform/language/:version/block/stack/deploy/:slug*",
+    "destination": "/terraform/language/:version/block/stack/tfdeploy/:slug*",
     "permanent": true
   },
   {
-    "source": "/terraform/language/v:version(1\\.(?:9|1[0-2])\\.x)/block/stack/deploy",
+    "source": "/terraform/language/v:version(1\\.(?:9|1[0-2])\\.x)/block/stack/tfdeploy",
     "destination": "/terraform/language/v:version/stacks/reference/tfdeploy",
     "permanent": true
   },
   {
     "source": "/terraform/language/v:version((?:1\\.(?:1[3-9]|[2-9]\\d)|[2-9]\\d*\\.\\d+)\\.x)/stacks/reference/tfdeploy",
-    "destination": "/terraform/language/v:version/block/stack/deploy",
+    "destination": "/terraform/language/v:version/block/stack/tfdeploy",
     "permanent": true
   },
   {