Merge pull request Azure#623 from Azure/canary

likamrat · web-flow · commit 34f19db7d311 · 2025-03-17T07:32:08.000-07:00
Canary
diff --git a/docs/azure_jumpstart_ag/contoso_supermarket/_index.md b/docs/azure_jumpstart_ag/contoso_supermarket/_index.md
@@ -3,7 +3,7 @@ type: docs
 linkTitle: "Contoso Supermarket"
 weight: 4
 description: >-
-  Learn how Contoso Supermarket, a leading global retailer implement cloud to edge strategy while leveraging Azure Arc, IoT services, AKS hybrid, AI, and software distribution and data pipelines.
+  Learn how Contoso Supermarket, a leading global retailer implement cloud to edge strategy while leveraging Azure Arc, IoT services, AKS enabled by Azure Arc, AI, and software distribution and data pipelines.
 ---
 
 # Overview
diff --git a/docs/azure_jumpstart_hcibox/AKS/_index.md b/docs/azure_jumpstart_hcibox/AKS/_index.md
@@ -1,12 +1,12 @@
 ---
 type: docs
 linkTitle: "AKS on Azure Local"
-weight: 8
+weight: 7
 ---
 
 # Azure Kubernetes Service on your Azure Local HCIBox
 
-Azure Local can provide host infrastructure for [Azure Kubernetes Service clusters](https://learn.microsoft.com/azure-stack/aks-hci/). HCIBox comes pre-configured with Azure Kubernetes Service on Azure Local. To see this in action, navigate to the resource group where you deployed HCIBox and follow these steps.
+Azure Local can provide host infrastructure for [AKS enabled by Azure Arc](https://learn.microsoft.com/azure/aks/aksarc/aks-overview). HCIBox comes pre-configured with Azure Kubernetes Service on Azure Local. To see this in action, navigate to the resource group where you deployed HCIBox and follow these steps.
 
 ## Explore AKS on Azure Local
 
@@ -78,4 +78,4 @@ Access to the AKS cluster is [managed through Azure RBAC](https://learn.microsof
 
 ## Next steps
 
-Azure Kubernetes Service on Azure Local provides many more capabilities not directly covered here. Review the documentation to continue your journey with [AKS on Azure Local](https://learn.microsoft.com/azure-stack/aks-hci/).
+Azure Kubernetes Service on Azure Local provides many more capabilities not directly covered here. Review the documentation to continue your journey with [AKS enabled by Azure Arc](https://learn.microsoft.com/azure/aks/aksarc/aks-overview).
diff --git a/docs/azure_jumpstart_hcibox/RB/_index.md b/docs/azure_jumpstart_hcibox/RB/_index.md
@@ -1,7 +1,7 @@
 ---
 type: docs
 linkTitle: "VM Management"
-weight: 7
+weight: 6
 ---
 # Virtual machine provisioning with Azure Arc in your HCIBox
 
diff --git a/docs/azure_jumpstart_hcibox/SQLMI/_index.md b/docs/azure_jumpstart_hcibox/SQLMI/_index.md
@@ -5,9 +5,9 @@ weight: 10
 toc_hide: true
 ---
 
-## Arc-enabled SQL Managed Instance on Azure Stack HCI
+## Arc-enabled SQL Managed Instance on Azure Local
 
-Azure Stack HCI can provide host infrastructure for [Azure Kubernetes Service clusters](https://learn.microsoft.com/azure-stack/aks-hci/) which can be used to deploy Azure Arc-enabled SQL Managed Instance. HCIBox comes pre-configured with Azure Kubernetes Service on HCI (AKS-HCI) and an Azure Arc-enabled SQL Managed Instance. To see this in action, navigate to the resource group where you deployed HCIBox and follow these steps.
+Azure Local can provide host infrastructure for [AKS enabled by Azure Arc](https://learn.microsoft.com/azure/aks/aksarc/aks-overview) which can be used to deploy Azure Arc-enabled SQL Managed Instance. HCIBox comes pre-configured with Azure AKS enabled by Azure Arc cluster and an Arc-enabled SQL Managed Instance. To see this in action, navigate to the resource group where you deployed HCIBox and follow these steps.
 
 - You will first need to get the Azure Custom Location Resource Provider (RP) Object ID (OID). This is required to enable [Custom Location](https://learn.microsoft.com/azure/azure-arc/platform/conceptual-custom-locations) on your Arc-enabled Kubernetes cluster.
 
diff --git a/docs/azure_jumpstart_hcibox/cloud_deployment/_index.md b/docs/azure_jumpstart_hcibox/cloud_deployment/_index.md
@@ -2,9 +2,9 @@
 type: docs
 linkTitle: "Connect to HCIBox"
 isGettingStarted: false
-weight: 5
+weight: 4
 ---
-# Connecting to HCIBox
+# Connect to HCIBox
 
 ## Start post-deployment automation
 
@@ -79,7 +79,7 @@ At this point, the infrastructure deployment is complete.
 
   ![Screenshot showing extensions successfully installed](./extensions_installed.png)
 
-## Azure portal Azure Local instance validation and deployment
+## Azure Local instance validation and deployment from the Azure portal
 
 Azure Local uses a two-step process to create and register instances in Azure using an ARM template.
 
diff --git a/docs/azure_jumpstart_hcibox/deployment_az/_index.md b/docs/azure_jumpstart_hcibox/deployment_az/_index.md
@@ -2,7 +2,7 @@
 type: docs
 linkTitle: "Azure Bicep Deployment"
 isGettingStarted: false
-weight: 4
+weight: 3
 ---
 
 # Deploy HCIBox infrastructure with Azure Bicep
@@ -155,7 +155,7 @@ Example parameter-file:
 
 ## Start post-deployment automation
 
-Once your deployment is complete, you can open the Azure portal and see the initial HCIBox resources inside your resource group. Now you must remote into the *HCIBox-Client* VM to continue the next phase of the deployment. [Continue in Cloud Deployment guide](../cloud_deployment/) for the next steps.
+Once your deployment is complete, you can open the Azure portal and see the initial HCIBox resources inside your resource group. Now you must remote into the *HCIBox-Client* VM to continue the next phase of the deployment. [Continue to learn how to deploy instance in Azure portal](../cloud_deployment/#azure-local-instance-validation-and-deployment-from-the-azure-portal) for the next steps.
 
   ![Screenshot showing all deployed resources in the resource group](./deployed_resources.png)
 
diff --git a/docs/azure_jumpstart_hcibox/faq/_index.md b/docs/azure_jumpstart_hcibox/faq/_index.md
@@ -8,7 +8,7 @@ weight: 7
 
 ## What is Jumpstart HCIBox?
 
-Jumpstart HCIBox is a turnkey solution that provides a complete sandbox for exploring Azure Stack HCI capabilities and hybrid cloud integration in a virtual environment. HCIBox is designed to be completely self-contained within a single Azure subscription and resource group, which makes it easy for users to get hands-on with Azure Stack HCI and Azure Arc technology without the need for physical hardware.
+Jumpstart HCIBox is a turnkey solution that provides a complete sandbox for exploring Azure Local capabilities and hybrid cloud integration in a virtual environment. HCIBox is designed to be completely self-contained within a single Azure subscription and resource group, which makes it easy for users to get hands-on with Azure Local and Azure Arc technology without the need for physical hardware.
 
 > **Note:** For general questions about Arc Jumpstart please see the [Jumpstart FAQ](../../faq/).
 
@@ -31,7 +31,7 @@ HCIBox incurs normal Azure consumption charges for various Azure resources such
 
 - [HCIBox cost estimate](https://aka.ms/HCIBoxCost)
 
-## Which versions of Azure Stack HCI does HCIBox support?
+## Which versions of Azure Local does HCIBox support?
 
 HCIBox uses the 23H2 build of the Azure Stack HCI OS.
 
diff --git a/docs/azure_jumpstart_hcibox/getting_started/_index.md b/docs/azure_jumpstart_hcibox/getting_started/_index.md
@@ -34,9 +34,9 @@ HCIBox automatically creates and configures a two-node Azure Local instance usin
 
 HCIBox comes with [guest VM management in Azure portal](https://learn.microsoft.com/azure-stack/hci/manage/azure-arc-vm-management-overview). The HCIBox documentation will walk you through how to use this feature, including configuring VM images from Azure marketplace and creating VMs on your instance.
 
-### Azure Kubernetes Service on Azure Stack HCI
+### AKS enabled by Azure Arc on Azure Local
 
-Azure Stack HCI includes [Azure Kubernetes Services on Azure Local (AKS hybrid)](https://learn.microsoft.com/azure/aks/hybrid/) as part of the default configuration. A user script is provided that can be used to create a workload instance.
+Azure Local includes [AKS enabled by Azure Arc](https://learn.microsoft.com/azure/aks/aksarc/aks-overview) as part of the default configuration. A user script is provided that can be used to create a workload instance.
 
 ## HCIBox Azure Consumption Costs
 
diff --git a/docs/azure_jumpstart_hcibox/troubleshooting/_index.md b/docs/azure_jumpstart_hcibox/troubleshooting/_index.md
@@ -1,15 +1,15 @@
 ---
 type: docs
 linkTitle: "Troubleshooting"
-weight: 9
+weight: 8
 ---
 # Troubleshooting HCIBox
 
 ## Troubleshooting Deployments
 
 Occasionally deployments of HCIBox may fail at various stages. Common reasons for failed deployments include:
 
-- Invalid service principal id, service principal secret, or service principal Azure tenant ID provided in the _main.bicepparam_ Bicep template file. This can cause failures when running automation that requires logging into Azure, such as the scripts that register the Azure Local instance, deploy AKS Hybrid, or configure Arc Resource Bridge.
+- Invalid service principal id, service principal secret, or service principal Azure tenant ID provided in the _main.bicepparam_ Bicep template file. This can cause failures when running automation that requires logging into Azure, such as the scripts that register the Azure Local instance, deploy AKS enabled by Azure Arc cluster, or configure Arc Resource Bridge.
 - Not enough vCPU quota available in your target Azure region - check vCPU quota and ensure you have at least 32 available. See the [prerequisites](../getting_started/#prerequisites) section for more details.
 - Corruption when downloading HCIBox VHD files can interrupt deployments. HCIBox should automatically halt if this occurs. Re-running the PowerShell script at _C:\HCIBox\HCIBoxLogonScript.ps1_ can often repair this issue.
 
diff --git a/docs/azure_jumpstart_hcibox/using_hcibox/_index.md b/docs/azure_jumpstart_hcibox/using_hcibox/_index.md
@@ -2,7 +2,7 @@
 type: docs
 linkTitle: "Using HCIBox"
 isGettingStarted: false
-weight: 6
+weight: 5
 ---
 # Evaluating the HCIBox
 
@@ -70,7 +70,7 @@ Azure Local supports [VM management through the Azure portal](https://learn.micr
 
 ## Azure Kubernetes Service (AKS)
 
-HCIBox comes pre-configured with [Azure Kubernetes Service on Azure Local](https://learn.microsoft.com/azure-stack/aks-hci/). Open the [HCIBox AKS-HCI documentation](../AKS/) to explore currently available features.
+HCIBox comes pre-configured with [AKS enabled by Azure Arc](https://learn.microsoft.com/azure/aks/aksarc/aks-overview). Open the [Azure Kubernetes Service on your Azure Local HCIBox documentation](../AKS/) to explore currently available features.
 
 ![Screenshot showing AKS on Azure Local](./cluster_detail.png)
 
