Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nsp

Author: dlepow

articles/azure-functions/breadcrumb/toc.yml

@@ -4,5 +4,11 @@ items:
   topicHref: /azure/index
   items:
   - name: Azure Functions
-    tocHref: /azure/azure-functions
+    tocHref: /azure/azure-functions/
+    topicHref: /azure/azure-functions/index
+  - name: Azure Functions
+    tocHref: /azure/developer/
+    topicHref: /azure/azure-functions/index
+  - name: Azure Functions
+    tocHref: /azure/reliability/
     topicHref: /azure/azure-functions/index

articles/azure-resource-manager/bicep/data-types.md

@@ -2,7 +2,7 @@
 title: Data types in Bicep
 description: This article describes the data types that are available in Bicep.
 ms.topic: reference
-ms.date: 01/02/2026
+ms.date: 01/27/2026
 ms.custom: devx-track-bicep
 ---
 
@@ -355,14 +355,11 @@ var storageName = 'storage${uniqueString(resourceGroup().id)}'
 
 ### Multi-line strings
 
-In Bicep, multi-line strings are defined between three single quotation marks (`'''`) followed optionally by a newline (the opening sequence) and three single quotation marks (`'''` is the closing sequence). Characters that are entered between the opening and closing sequence are read verbatim. Escaping isn't necessary or possible.
+## Multi-line strings
 
-> [!NOTE]
-> The Bicep parser reads every character as it is. Depending on the line endings of your Bicep file, newlines are interpreted as either `\r\n` or `\n`.
->
-> Interpolation isn't currently supported in multi-line strings. Because of this limitation, you might need to use the [`concat`](./bicep-functions-string.md#concat) function instead of using [interpolation](#strings).
->
-> Multi-line strings that contain `'''` aren't supported.
+You can define a multi-line string by enclosing it in three single quotation marks (`'''`). The string content is preserved exactly as written, so escape characters are not required. The delimiter `'''` cannot appear within the string.
+
+The string may begin immediately after the opening delimiter or on the following line. In both cases, the resulting value does not include a leading newline. Line breaks are interpreted as `\r\n` or `\n`, depending on the line-ending format of the Bicep file.
 
 ```bicep
 // evaluates to "hello!"
@@ -389,11 +386,26 @@ var myVar5 = '''
 comments // are included
 /* because everything is read as-is */
 '''
+```
+
+With Bicep CLI version v0.40.2 or higher, string interpolation is supported. An optional `$` prefix can be added before the opening delimiter to enable string interpolation using standard Bicep `${...}` syntax. If you need to include `${...}` as a literal value without escaping, you can control interpolation by repeating the `$` prefix. Interpolation is only performed when the number of `$` characters preceding `${...}` matches the number of `$` characters used in the opening delimiter.
 
+```bicep
 // evaluates to "interpolation\nis ${blocked}"
 // note ${blocked} is part of the string, and is not evaluated as an expression
 var myVar6 = '''interpolation
 is ${blocked}'''
+
+// evaluates to "this is a test"
+var interpolated = 'a test'
+var myVar7 = $'''
+this is ${interpolated}'''
+
+// evaluates to "this is a test\nthis is not ${interpolated}"
+var interpolated = 'a test'
+var myVar8 = $$'''
+this is $${interpolated}
+this is not ${interpolated}'''
 ```
 
 ### String-related operators

articles/azure-resource-manager/bicep/file.md

@@ -3,7 +3,7 @@ title: Bicep file structure and syntax
 description: Understand how to use declarative syntax to understand the structure and properties of Bicep files.
 ms.topic: article
 ms.custom: devx-track-bicep
-ms.date: 07/25/2025
+ms.date: 01/13/2026
 ---
 
 # Bicep file structure and syntax
@@ -464,32 +464,6 @@ The following example shows a multiline comment.
 param existingKeyVaultName string
 ```
 
-## Multi-line strings
-
-You can break a string into multiple lines. Use three single quotation marks `'''` to start and end the multi-line string.
-
-Characters within the multi-line string are handled as is. Escape characters are unnecessary. You can't include `'''` in the multi-line string. String interpolation isn't currently supported.
-
-You can start your string right after the opening `'''`, or include a new line. In either case, the resulting string doesn't include a new line. Depending on the line endings in your Bicep file, new lines are interpreted as `\r\n` or `\n`.
-
-The following example shows a multi-line string.
-
-```bicep
-var stringVar = '''
-this is multi-line
-  string with formatting
-  preserved.
-'''
-```
-
-The preceding example is equivalent to the following JSON:
-
-```json
-"variables": {
-  "stringVar": "this is multi-line\r\n  string with formatting\r\n  preserved.\r\n"
-}
-```
-
 ## Multiple-line declarations
 
 You can now use multiple lines in function, array, and object declarations. This feature requires [Bicep CLI version 0.7.X or higher](./install.md).

articles/azure-resource-manager/templates/syntax.md

@@ -3,7 +3,7 @@ title: Template structure and syntax
 description: Describes the structure and properties of Azure Resource Manager templates (ARM templates) using declarative JSON syntax.
 ms.topic: article
 ms.custom: devx-track-arm-template
-ms.date: 04/28/2025
+ms.date: 01/13/2026
 ---
 
 # Understand the structure and syntax of ARM templates
@@ -497,7 +497,7 @@ You can break a string into multiple lines. For example, see the `location` prop
   ],
 ```
 
-In Bicep, see [multi-line strings](../bicep/file.md#multi-line-strings).
+In Bicep, see [multi-line strings](../bicep/data-types.md#multi-line-strings).
 
 ## languageVersion 2.0
 

articles/azure-vmware/includes/vmware-software-versions.md

@@ -23,7 +23,7 @@ The following table lists the software versions that are used in new deployments
 | VMware vSAN on-disk format       |    [20](https://knowledge.broadcom.com/external/article?legacyId=2148493) | N/A |
 | VMware vSAN storage architecture |    [Gen 1: OSA, Gen2: ESA](https://blogs.vmware.com/cloud-foundation/2022/08/31/comparing-the-original-storage-architecture-to-the-vsan-8-express-storage-architecture/) | N/A |
 | VMware NSX                       |    [!INCLUDE [nsxt-version](nsxt-version.md)] | 22224317 |
-| VMware HCX                       |    [4.11.1](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-11/hcx-4-11-release-notes/vmware-hcx-4111-release-notes.html) | 24846706 |
+| VMware HCX                       |    [4.11.3](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-11/hcx-4-11-release-notes/vmware-hcx-4113-release-notes.html) | 24972695 |
 | VMware Live Site Recovery        |    [9.0.2.1](https://techdocs.broadcom.com/us/en/vmware-cis/live-recovery/live-site-recovery/9-0/release-notes/id-b55981c1-41e6-4ad3-b379-ce565212add3.html) | 24401761 |
 | VMware vSphere Replication       |    [9.0.2.1](https://techdocs.broadcom.com/us/en/vmware-cis/live-recovery/vsphere-replication/9-0/release-notes/vsphere-replication-9021-release-notes.html) | 24383568 |
 

articles/bastion/TOC.yml

@@ -10,8 +10,6 @@
     href: bastion-sku-comparison.md
   - name: Cost optimization principles
     href: cost-optimization.md
-  - name: Bastion FAQ
-    href: bastion-faq.md
 - name: Quickstarts & Tutorials
   expanded: true
   items:
@@ -25,8 +23,77 @@
     href: quickstart-host-arm-template.md
   - name: Deploy Bastion - Terraform
     href: quickstart-deploy-terraform.md
+  - name: Bastion FAQ
+    href: bastion-faq.md
 - name: Concepts
   items:
+  - name: Identity & authentication
+    items:
+    - name: Configure Kerberos authentication
+      href: kerberos-authentication-portal.md
+    - name: Connect to a virtual machine
+      items:
+      - name: Windows VM
+        items:
+        - name: RDP connection
+          href: bastion-connect-vm-rdp-windows.md
+        - name: SSH connection
+          href: bastion-connect-vm-ssh-windows.md
+      - name: Linux VM
+        items: 
+        - name: SSH connection
+          href: bastion-connect-vm-ssh-linux.md
+        - name: RDP connection
+          href: bastion-connect-vm-linux-rdp.md
+  - name: Connectivity & Access Methods
+    items:
+    - name: Bastion and VNet peering
+      href: vnet-peering.md
+    - name: Connect to an AKS cluster
+      href: bastion-connect-to-aks-private-cluster.md
+    - name: Configure native client support
+      href: native-client.md 
+      items:
+      - name: Connect from Windows native client
+        href: connect-vm-native-client-windows.md
+      - name: Connect from Linux native client
+        href: connect-vm-native-client-linux.md
+      - name: Transfer files - native client
+        href: vm-upload-download-native.md
+    - name: Connect to a VM - IP address
+      href: connect-ip-address.md
+    - name: Connect to a VM scale set
+      href: bastion-connect-vm-scale-set.md
+    - name: Connect to DevTest Labs VMs
+      href: ../devtest-labs/enable-browser-connection-lab-virtual-machines.md?toc=%2fazure%2fbastion%2ftoc.json
+    - name: Configure a shareable link
+      href: shareable-link.md
+    - name: Deploy private-only Bastion
+      href: private-only-deployment.md
+  - name: Authorization & Privileged Access
+    items:
+      - name: Work with NSGs
+        href: bastion-nsg.md
+  - name: Session controls, auditing, and monitoring
+    items:
+    - name: Monitor Azure Bastion
+      href: monitor-bastion.md
+    - name: Monitor and manage sessions
+      href: session-monitoring.md
+    - name: Configure session recording
+      href: session-recording.md
+  - name: Platform
+    items:
+      - name: Configure host scaling
+        items:
+        - name: Azure portal
+          href: configure-host-scaling.md
+        - name: Azure PowerShell
+          href: configure-host-scaling-powershell.md
+      - name: Design architecture
+        href: design-architecture.md
+      - name: Availability zones and disaster recovery 
+        href: /azure/reliability/reliability-bastion?toc=/azure/bastion/TOC.json
   - name: Bastion configuration settings
     href: configuration-settings.md
   - name: Work remotely
@@ -35,16 +102,8 @@
       href: ../networking/working-remotely-support.md?toc=%2fazure%2fbastion%2ftoc.json
     - name: Leverage Bastion for remote working
       href: work-remotely-support.md
-  - name: Design architecture
-    href: design-architecture.md
   - name: VM connections and features
     href: vm-about.md
-  - name: Bastion and VNet peering
-    href: vnet-peering.md
-  - name: Work with NSGs
-    href: bastion-nsg.md
-  - name: Availability zones and disaster recovery 
-    href: /azure/reliability/reliability-bastion?toc=/azure/bastion/TOC.json
 - name: Security
   items:
   - name: Secure Bastion
@@ -64,69 +123,17 @@
     - name: Azure CLI
       href: create-host-cli.md
     - name: Developer SKU
-      href: quickstart-developer-sku.md
-  - name: Deploy private-only Bastion
-    href: private-only-deployment.md
+      href: quickstart-developer.md
   - name: Configure Bastion settings
     items:
     - name: View or upgrade SKU
       href: upgrade-sku.md
-    - name: Configure native client support
-      href: native-client.md
-    - name: Configure host scaling
-      items:
-      - name: Azure portal
-        href: configure-host-scaling.md
-      - name: Azure PowerShell
-        href: configure-host-scaling-powershell.md
-    - name: Configure a shareable link
-      href: shareable-link.md
-    - name: Configure Kerberos authentication
-      href: kerberos-authentication-portal.md
-    - name: Configure session recording
-      href: session-recording.md
-  - name: Connect to a virtual machine
-    items:
-    - name: Windows VM
-      items:
-      - name: RDP connection
-        href: bastion-connect-vm-rdp-windows.md
-      - name: SSH connection
-        href: bastion-connect-vm-ssh-windows.md
-    - name: Linux VM
-      items: 
-      - name: SSH connection
-        href: bastion-connect-vm-ssh-linux.md
-      - name: RDP connection
-        href: bastion-connect-vm-linux-rdp.md
-  - name: Connect to a VM - native client
-    items:
-    - name: Connect from Windows client
-      href: connect-vm-native-client-windows.md
-    - name: Connect from Linux client
-      href: connect-vm-native-client-linux.md
-  - name: Connect to a VM - IP address
-    href: connect-ip-address.md
-  - name: Connect to a VM scale set
-    href: bastion-connect-vm-scale-set.md
-  - name: Connect to DevTest Labs VMs
-    href: ../devtest-labs/enable-browser-connection-lab-virtual-machines.md?toc=%2fazure%2fbastion%2ftoc.json
-  - name: Connect to an AKS cluster
-    href: bastion-connect-to-aks-private-cluster.md
   - name: Work with a VM session
     items:
     - name: Copy and paste
       href: bastion-vm-copy-paste.md
     - name: Full screen view
       href: bastion-vm-full-screen.md
-    - name: Transfer files - native client
-      href: vm-upload-download-native.md
-  - name: Monitoring
-    items:
-    - name: Monitor Azure Bastion
-      href: monitor-bastion.md
-    - name: Monitor and manage sessions
-      href: session-monitoring.md
   - name: Troubleshoot
     href: troubleshoot.md
 - name: Reference