Merge branch 'main' into release-preview-site-manager

Author: v-alje

articles/cost-management-billing/automate/understand-usage-details-fields.md

@@ -4,7 +4,7 @@ titleSuffix: Microsoft Cost Management
 description: This article describes the fields in the usage data files.
 author: bandersmsft
 ms.author: banders
-ms.date: 04/15/2024
+ms.date: 04/18/2024
 ms.topic: conceptual
 ms.service: cost-management-billing
 ms.subservice: cost-management
@@ -76,7 +76,7 @@ MPA accounts have all MCA terms, in addition to the MPA terms, as described in t
 | MeterName | All | The name of the meter. Purchases and Marketplace usage might be shown as blank or `unassigned`.|
 | MeterRegion | All | Name of the datacenter location for services priced based on location. See Location. |
 | MeterSubCategory | All | Name of the meter subclassification category. Purchases and Marketplace usage might be shown as blank or `unassigned`.|
-| OfferId¹ | All | Name of the Azure offer, which is the type of Azure subscription that you have. For more information, see supported [Microsoft Azure offer details](https://azure.microsoft.com/support/legal/offer-details/). |
+| OfferId¹ | EA, pay-as-you-go | Name of the Azure offer, which is the type of Azure subscription that you have. For more information, see supported [Microsoft Azure offer details](https://azure.microsoft.com/support/legal/offer-details/). |
 | pay-as-you-goPrice² ³| All | The market price, also referred to as retail or list price, for a given product or service. For more information, see [Pricing behavior in cost details](automation-ingest-usage-details-overview.md#pricing-behavior-in-cost-details). |
 | PartnerEarnedCreditApplied | MPA | Indicates whether the partner earned credit was applied. |
 | PartnerEarnedCreditRate | MPA | Rate of discount applied if there's a partner earned credit (PEC), based on partner admin link access. |

articles/hdinsight-aks/release-notes/hdinsight-aks-release-notes.md

@@ -62,7 +62,7 @@ For more information, see [Control network traffic from HDInsight on AKS Cluster
 Upgrade your clusters and cluster pools with the latest software updates. This means that you can enjoy the latest cluster package hotfixes, security updates, and AKS patches, without recreating clusters. For more information, see [Upgrade your HDInsight on AKS clusters and cluster pools](../in-place-upgrade.md).
 
 > [!IMPORTANT]
-> To take benefit of all these **latest features**, you are required to create a new cluster pool with 1.1 and clsuter version 1.1.1.
+> To take benefit of all these **latest features**, you are required to create a new cluster pool with 1.1 and cluster version 1.1.1.
 
 ### Known issues
 

articles/operator-nexus/how-to-apply-access-control-list-to-network-to-network-interconnects.md

@@ -26,7 +26,7 @@ Before applying ACLs to NNIs, utilize the following commands to view ACL details
 To view the specifics of a particular ACL, execute the following command:
 
 ```azurecli
-az networkfabric acl show --name acl-ingress --resource-group myResourceGroup
+az networkfabric acl show --name "<acl-ingress-name>" --resource-group "<resource-group-name>"
 ```
 
 This command furnishes detailed information regarding the ACL's configuration, administrative state, default action, and matching conditions.
@@ -36,37 +36,37 @@ This command furnishes detailed information regarding the ACL's configuration, a
 To list all ACLs within a resource group, use the command:
 
 ```azurecli
-az networkfabric acl list --resource-group myResourceGroup
+az networkfabric acl list --resource-group "<resource-group-name>"
 ```
 
 This command presents a comprehensive list of ACLs along with their configuration states and other pertinent details.
 
 #### Applying Ingress ACL to NNI
 
 ```azurecli
-az networkfabric nni update --resource-group "example-rg" --resource-name "example-nnimgmt" --fabric "examplefabric" --ingress-acl-id "/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxx/resourceGroups/example-rg/providers/Microsoft.ManagedNetworkFabric/accesscontrollists/example-Ipv4ingressACL"
+az networkfabric nni update --resource-group "<resource-group-name>" --resource-name "<nni-name>" --fabric "<fabric-name>" --ingress-acl-id "<ingress-acl-resource-id>"
 ```
 
 | Parameter         | Description                                      |
 |-------------------|--------------------------------------------------|
-| --ingress-acl-id | Apply the ACL as ingress by specifying its ID.  |
+| --ingress-acl-id | Apply the ACL as ingress by specifying its resource ID.  |
 
 #### Applying Egress ACL to NNI
 
 ```azurecli
-az networkfabric nni update --resource-group "example-rg" --resource-name "example-nnimgmt" --fabric "examplefabric" --egress-acl-id "/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxx/resourceGroups/example-rg/providers/Microsoft.ManagedNetworkFabric/accesscontrollists/example-Ipv4ingressACL"
+az networkfabric nni update --resource-group "example-rg" --resource-name "<nni-name>" --fabric "<fabric-name>" --egress-acl-id "<egress-acl-resource-id>"
 ```
 
 | Parameter        | Description                                    |
 |------------------|------------------------------------------------|
-| --egress-acl-id | Apply the ACL as egress by specifying its ID. |
+| --egress-acl-id | Apply the ACL as egress by specifying its resource ID. |
 
 #### Applying Ingress and Egress ACLs to NNI:
 
 ```azurecli
-az networkfabric nni update --resource-group "example-rg" --resource-name "example-nnimgmt" --fabric "examplefabric" --ingress-acl-id "/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxx/resourceGroups/example-rg/providers/Microsoft.ManagedNetworkFabric/accesscontrollists/example-Ipv4ingressACL" --egress-acl-id "/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxx/resourceGroups/example-rg/providers/Microsoft.ManagedNetworkFabric/accesscontrollists/example-Ipv4egressACL"
+az networkfabric nni update --resource-group "example-rg" --resource-name "<nni-name>" --fabric "<fabric-name>" --ingress-acl-id "<ingress-acl-resource-id>" --egress-acl-id ""<egress-acl-resource-id>""
 ```
 
 | Parameter         | Description                                                                                                    |
 |-------------------|----------------------------------------------------------------------------------------------------------------|
-| --ingress-acl-id, --egress-acl-id | To apply both ingress and egress ACLs simultaneously, create two new ACLs and include their respective IDs. |
+| --ingress-acl-id, --egress-acl-id | To apply both ingress and egress ACLs simultaneously, create two new ACLs and include their respective resource IDs. |

articles/spring-apps/enterprise/how-to-prepare-app-deployment.md

@@ -4,7 +4,7 @@ description: Learn how to prepare an application for deployment to Azure Spring
 author: KarlErickson
 ms.service: spring-apps
 ms.topic: how-to
-ms.date: 07/06/2021
+ms.date: 04/28/2024
 ms.author: karler
 ms.custom: devx-track-java, devx-track-extended-java
 zone_pivot_groups: programming-languages-spring-apps
@@ -172,6 +172,7 @@ The following table lists the supported Spring Boot and Spring Cloud combination
 
 For more information, see the following pages:
 
+* [Version support for Java, Spring Boot, and more](concept-app-customer-responsibilities.md#version-support-for-all-plans)
 * [Spring Boot support](https://spring.io/projects/spring-boot#support)
 * [Spring Cloud Config support](https://spring.io/projects/spring-cloud-config#support)
 * [Spring Cloud Netflix support](https://spring.io/projects/spring-cloud-netflix#support)