Merge branch 'main' into md-compare-arc-vms

Author: Manika Dhiman

.openpublishing.publish.config.json

@@ -1,5 +1,17 @@
 {
   "docsets_to_publish": [
+    {
+      "docset_name": "adaptive-cloud",
+      "build_source_folder": "adaptive-cloud",
+      "build_output_subfolder": "adaptive-cloud",
+      "locale": "en-us",
+      "monikers": [],
+      "open_to_public_contributors": false,
+      "type_mapping": {
+        "Conceptual": "Content"
+      },
+      "build_entry_point": "docs"
+    },
     {
       "docset_name": "AKS-Hybrid",
       "build_source_folder": "AKS-Arc",
@@ -16,31 +28,31 @@
       "template_folder": "_themes"
     },
     {
-      "docset_name": "AzureLocal",
-      "build_source_folder": "azure-local",
-      "build_output_subfolder": "AzureLocal",
+      "docset_name": "azure-managed-lustre",
+      "build_source_folder": "azure-managed-lustre",
+      "build_output_subfolder": "azure-managed-lustre",
       "locale": "en-us",
       "monikers": [],
       "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content"
       },
-      "build_entry_point": "docs"
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
     },
     {
-      "docset_name": "azure-managed-lustre",
-      "build_source_folder": "azure-managed-lustre",
-      "build_output_subfolder": "azure-managed-lustre",
+      "docset_name": "AzureLocal",
+      "build_source_folder": "azure-local",
+      "build_output_subfolder": "AzureLocal",
       "locale": "en-us",
       "monikers": [],
       "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content"
       },
-      "build_entry_point": "docs",
-      "template_folder": "_themes"
+      "build_entry_point": "docs"
     },
     {
       "docset_name": "AzureStack",

AKS-Arc/ssh-connect-to-windows-and-linux-worker-nodes.md

@@ -1,4 +1,4 @@
----
+---
 title: Connect to Windows or Linux worker nodes with SSH
 description: Learn how to use SSH to connect to Windows or Linux worker nodes in an AKS Arc cluster.
 ms.date: 01/10/2025
@@ -31,14 +31,22 @@ This article explains how to use SSH to connect to both Windows and Linux nodes.
    kubectl --kubeconfig /path/to/aks-cluster-kubeconfig get nodes -o wide |
    ```
 
-1. Run `ssh cloud@<IP address of the node>` to connect to a worker node:
+1. Run `ssh` to connect to a worker node:
 
    > [!NOTE]
    > You must pass the correct location to your SSH private key. The following example uses the default location of **~/.ssh/id_rsa**, but you might need to change this location if you requested a different path. To change the location, see [Configure SSH keys](configure-ssh-keys.md) to specify the `--ssh-key-value` parameter when you create an AKS Arc cluster.
 
+   For a Linux worker node, run the following command:
+
    ```azurecli
    ssh -i $env:USERPROFILE\.ssh\id_rsa clouduser@<IP address of the node>
    ```
+   
+   For a Windows worker node, run the following command:
+   
+   ```azurecli
+   ssh -i $env:USERPROFILE\.ssh\id_rsa Administrator@<IP address of the node>
+   ```
 
 If you encounter SSH login issues, verify that your IP address is included in the **--ssh-auth-ip list**. To check this list, run `az aksarc show --name "$<aks_cluster_name>" --resource-group "$<resource_group_name>"` and look for `authorizedIpRanges` under `clusterVmAccessProfile`.
 

README.md

@@ -2,9 +2,11 @@
 
 Welcome to the open source [documentation for Azure Stack](https://learn.microsoft.com/azure-stack). Azure Stack is a portfolio of products that extend Azure services and capabilities to your environment of choice—from the datacenter to edge locations and remote offices. Azure Stack portfolio includes the following products:
 
+- Azure Local
 - Azure Stack HCI
 - Azure Kubernetes Service (AKS) enabled by Azure Arc
 - Azure Stack Hub
+- Azure Managed Lustre File System
 
 ## Contribute to the Azure Stack documentation
 

adaptive-cloud/TOC.yml

@@ -0,0 +1,2 @@
+- name: Index
+  href: index.md

adaptive-cloud/breadcrumb/adaptive-cloud/toc.yml

@@ -0,0 +1,3 @@
+- name: '<please enter product name here>'
+  tocHref: /
+  topicHref: /

adaptive-cloud/docfx.json

@@ -0,0 +1,48 @@
+{
+  "build": {
+    "content": [
+      {
+        "files": [
+          "**/*.md",
+          "**/*.yml"
+        ],
+        "exclude": [
+          "**/obj/**",
+          "**/includes/**",
+          "_themes/**",
+          "**/docfx.json",
+          "_repo.en-us/**",
+          "README.md",
+          "LICENSE",
+          "LICENSE-CODE",
+          "ThirdPartyNotices.md",
+          "SECURITY.md"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "**/*.png",
+          "**/*.jpg"
+        ],
+        "exclude": [
+          "**/obj/**",
+          "**/includes/**",
+          "_themes/**",
+          "**/docfx.json",
+          "_repo.en-us/**"
+        ]
+      }
+    ],
+    "overwrite": [],
+    "externalReference": [],
+    "globalMetadata": {
+      "breadcrumb_path": "~/breadcrumb/adaptive-cloud/toc.yml",
+      "feedback_system": "Standard",
+      "permissioned-type": "public"
+    },
+    "fileMetadata": {},
+    "template": []
+  }
+}

adaptive-cloud/index.md

@@ -0,0 +1 @@
+# Welcome to adaptive-cloud!

azure-local/concepts/billing.md

@@ -5,7 +5,7 @@ author: jasongerend
 ms.author: jgerend
 ms.topic: conceptual
 ms.service: azure-local
-ms.date: 11/01/2024
+ms.date: 01/28/2025
 ---
 
 # Azure Local billing and payment
@@ -39,7 +39,7 @@ To manually upload core data to Azure, use the **`Sync-AzureStackHCI`** cmdlet.
 
 ## FAQ
 
-- If I already have an Azure subscription, can I use it for Azure Local **Yes**
+- If I already have an Azure subscription, can I use it for Azure Local? **Yes**
 - If my organization's finance department already approved spending on Azure, does that cover Azure Local? **Yes**
 - If I have an Azure commitment to spend, can I use that toward Azure Local? **Yes**
 - If I have Azure credits (for example, for students, or awarded as a prize) can I use that toward Azure Local? **Yes**

azure-local/faq.yml

@@ -6,7 +6,7 @@ metadata:
   author: cosmosdarwin
   ms.author: cosdar
   ms.service: azure-local
-  ms.date: 11/13/2024
+  ms.date: 02/03/2025
 title: Azure Local FAQ
 summary: The Azure Local FAQ provides information about Azure Local connectivity with the cloud, and how Azure Local relates to Windows Server.
 
@@ -125,5 +125,5 @@ sections:
           ```
       - question: How long is Azure Local, version 22H2 supported?
         answer: |
-            Azure Local, version 22H2 will reach end of service by May 2025. After that, you won't receive monthly security and quality updates that provide protection from the latest security threats. To continue receiving updates, we recommend updating your operating system to [version 23H2](./upgrade/upgrade-22h2-to-23h2-powershell.md).
+            Azure Stack HCI, version 22H2 will reach end of support on May 31, 2025. After this date, you won't receive monthly security and quality updates. Support requests (SR) will only be available when performing an operating system upgrade. To continue receiving updates, we recommend that you upgrade your operating system to [version 23H2](./upgrade/upgrade-22h2-to-23h2-powershell.md).
             If you're currently running an Azure Local, version 22H2 stretch cluster or managing Azure Local via System Center - Virtual Machine Manager, review the [Supported workloads and configurations](./upgrade/about-upgrades-23h2.md#supported-workloads-and-configurations) table for update timelines.

azure-local/includes/end-of-service-22h2.md

@@ -3,11 +3,11 @@ author: alkohli
 ms.author: alkohli
 ms.service: azure-local
 ms.topic: include
-ms.date: 01/08/2025
+ms.date: 02/03/2025
 ms.reviewer: alkohli
 ---
 
 > [!IMPORTANT]
-> Azure Stack HCI, version 22H2 will reach end of service by May 2025. After that, you won't receive monthly security and quality updates that provide protection from the latest security threats. To continue receiving updates, we recommend updating your operating system to [version 23H2](../upgrade/upgrade-22h2-to-23h2-powershell.md).
+> Azure Stack HCI, version 22H2 will reach end of support on May 31, 2025. After this date, you won't receive monthly security and quality updates. Support requests (SR) will only be available when performing an operating system upgrade. To continue receiving updates, we recommend that you upgrade your operating system to [version 23H2](../upgrade/upgrade-22h2-to-23h2-powershell.md).
 >
 > If you're currently running an Azure Stack HCI, version 22H2 stretch cluster or managing Azure Local via System Center - Virtual Machine Manager, review the [Supported workloads and configurations](../upgrade/about-upgrades-23h2.md#supported-workloads-and-configurations) table for update timelines.