Merge branch 'MicrosoftDocs:main' into dns-resolution

Author: jaesoni

articles/container-apps/managed-identity.md

@@ -355,9 +355,6 @@ To get a token for a resource, make an HTTP `GET` request to the endpoint, inclu
 
 You can use managed identities in your scale rules to authenticate with Azure services that support managed identities. To use a managed identity in your scale rule, use the `identity` property instead of the `auth` property in your scale rule. Acceptable values for the `identity` property are either the Azure resource ID of a user-assigned identity, or `system` to use a system-assigned identity.
 
-> [!NOTE]
-> Managed identity authentication in scale rules is in public preview. It's available in API version `2024-02-02-preview`.
-
 The following ARM template example shows how to use a managed identity with an Azure Queue Storage scale rule:
 
 The queue storage account uses the `accountName` property to identify the storage account, while the `identity` property specifies which managed identity to use. You do not need to use the `auth` property.

articles/event-grid/authenticate-with-namespaces-using-json-web-tokens.md

@@ -28,7 +28,8 @@ To use OAuth 2.0 JWT authentication for namespaces, follow these steps:
 1. Enable managed identity on your Event Grid namespace. 
 1. Configure OAuth 2.0 authentication settings on your Event Grid namespace by following these steps: 
     1. Create an Azure Key Vault account that hosts the CA certificate that includes your public keys and  add role assignment in Key Vault for the namespace’s managed identity. 
-    1. Upload the PEM file of your public key certificates to namespace. 
+   1. Or upload the PEM file of your public key certificates to namespace. 
+      
   1. Your clients can connect to the Event Grid namespace using the tokens provided by your identity provider. 
 
 ## Create a namespace and configure its subresources 
@@ -45,7 +46,7 @@ For information configuring system and user-assigned identities using the Azure
 
 
 ## Configure OAuth 2.0 JWT authentication settings on your Event Grid namespace -Key Vault 
-First, create an Azure Key Vault account, upload your server certificate, and assign the namespace's managed identity an appropriate role on the key vault. Then, you configure custom authentication settings on your Event Grid namespace using Azure portal and Azure CLI. You need to create the namespace first then update it using the following steps.
+First, create an Azure Key Vault account, upload your server certificate, and assign the namespace's managed identity an appropriate role on the key vault. Then, you configure custom authentication settings on your Event Grid namespace using either Azure portal or Azure CLI. You need to create the namespace first then update it using the following steps.
 
 ### Create an Azure Key Vault account and upload your server certificate 
 
@@ -132,8 +133,8 @@ az resource update \
  
 ```
 ### JSON Web Token format
-JSON Web Tokens are divided into the JWT Header and JWT payload sections.
- 
+JSON Web Tokens needs to have JWT Header, JWT payload and JWT signature sections.
+
 ### JWT Header 
 
 The header must contain at least `typ` and `alg` fields. `typ` must always be `JWS` and `alg` must always be `RS256`. The token header must be as follows: 
@@ -154,7 +155,7 @@ Event Grid requires the following claims: `iss`, `sub`, `aud`, `exp`, 
 | ---  | ----------- | 
 | `iss` | Issuer. Value in JWT must match issuer in the Event Grid namespace configuration for custom JWT authentication. |
 | `sub` | Subject. Value is used as authentication identity name. |
-| `aud` | Audience. Value can be a string or an array of strings. Value must contain standard Event Grid namespace hostname and/or custom domain for that Event Grid namespace (if configured). Audience can contain other strings, but we require at least one of these strings to be a standard Event Grid namespace hostname or custom domain for this namespace. |
+| `aud` | Audience. Value is an array of strings. Value must contain standard Event Grid namespace hostname and/or custom domain for that Event Grid namespace (if configured). Audience can contain other strings, but we require at least one of these strings to be a standard Event Grid namespace hostname or custom domain for this namespace. |
 | `exp` | Expiration. Unix time when JWT expires. |
 | `nbf` | Not before. Unit time when JWT becomes valid. |
 
@@ -227,13 +228,13 @@ az eventgrid namespace update \
 ```
 
 - Replace `<resource-group-name>`, `<namespace-name>`, `<location>`, `<key-vault-name>`, `<certificate-name>`, and `<certificate-in-PEM-format>` with your actual values. 
-- The encodedCertificate value must include the full certificate in PEM format, including headers ( `"-----BEGIN CERTIFICATE-----" and "-----END CERTIFICATE----`). 
+- The encodedCertificate value must include the full certificate and public key in PEM format, including headers ( `"-----BEGIN CERTIFICATE-----", "-----END CERTIFICATE----, ``-----BEGIN PUBLIC KEY----- and -----END PUBLIC KEY-----`). 
 - Ensure the public key certificate provided is valid and trusted by your identity provider. 
 - Regularly update the encodedIssuerCertificates if certificates are rotated or expired. 
 
 ### JSON Web Token format
 
-JWT payload 
+JSON Web Tokens needs to have JWT Header, JWT payload and JWT signature sections.
 
 Event Grid requires the following claims: `iss`, `sub`, `aud`, `exp`, `nbf`. 
 

articles/event-hubs/apache-kafka-troubleshooting-guide.md

@@ -17,8 +17,6 @@ If the traffic is excessive, the service has the following behavior:
 - If produce request's delay exceeds request time-out(*request.timeout.ms*), Event Hubs returns **Policy Violation** error code.
 - If fetch request's delay exceeds request time out, Event Hubs logs the request as throttled and responds with empty set of records and no error code.
 
-[Dedicated clusters](event-hubs-dedicated-overview.md) don't have throttling mechanisms. You're free to consume all of your cluster resources.
-
 ## No records received
 You might see consumers not getting any records and constantly rebalancing. In this scenario, consumers don't get any records and constantly rebalance. There's no exception or error when it happens, but the Kafka logs will show that the consumers are stuck trying to rejoin the group and assign partitions. There are a few possible causes:
 

articles/virtual-desktop/TOC.yml

@@ -35,7 +35,7 @@
           displayName: what's new, avd insights, avdi
           href: whats-new-insights.md
         - name: MSIXMGR tool
-          displayName: what's new, msix app attach
+          displayName: what's new, app attach
           href: whats-new-msixmgr.md
         - name: Multimedia redirection
           displayName: what's new, mmr
@@ -282,28 +282,25 @@
             - name: Set preferred application group type
               displayName: applications, apps, host pool properties
               href: set-preferred-application-group-type.md
-        - name: App attach
+        - name: App Attach
           items:
-            - name: App attach overview
-              displayName: applications, apps, msix app attach, app attach, app packages, appx packages
+            - name: App Attach overview
+              displayName: applications, apps, app packages, appx packages
               href: app-attach-overview.md
             - name: Create an MSIX image
-              displayName: msix app attach, app attach, applications, apps, appx packages, app packages
+              displayName: applications, apps, appx packages, app packages
               href: app-attach-create-msix-image.md
-            - name: Add and manage app attach applications
-              displayName: msix app attach, app attach, applications, apps, appx packages, app packages
+            - name: Add and manage App Attach applications
+              displayName: applications, apps, appx packages, app packages
               href: app-attach-setup.md
             - name: Test MSIX packages
-              displayName: msix app attach, app attach, applications, apps, appx packages, app packages
+              displayName: applications, apps, appx packages, app packages
               href: app-attach-test-msix-packages.md
-            - name: Migrate from MSIX app attach to app attach
-              displayName: msix app attach, app attach, applications, apps, appx packages, app packages
-              href: msix-app-attach-migration.md
-            - name: Partner solutions with app attach
+            - name: Partner solutions with App Attach
               displayName: applications, partner, app attach, apps
               href: app-attach-partner-solutions.md
             - name: MSIXMGR tool parameters
-              displayName: msix app attach, app attach, applications, apps, appx packages, app packages
+              displayName: applications, apps, appx packages, app packages
               href: msixmgr-tool-syntax-description.md
         - name: Specific applications
           items:
@@ -638,7 +635,7 @@
     - name: Custom image templates
       displayName: troubleshooting, virtual machines, vms, images, vhd, vhdx
       href: /troubleshoot/azure/virtual-desktop/troubleshoot-custom-image-templates?context=/azure/virtual-desktop/context/context
-    - name: App attach
+    - name: App Attach
       displayName: troubleshooting, apps, remoteapp
       href: /troubleshoot/azure/virtual-desktop/troubleshoot-app-attach?context=/azure/virtual-desktop/context/context
 - name: Reference
@@ -662,7 +659,7 @@
       displayName: reference
       href: /rest/api/desktopvirtualization/
     - name: MSIXMGR tool parameters
-      displayName: msix app attach, app attach, applications, apps, appx packages, app packages
+      displayName: app attach, applications, apps, appx packages, app packages
       href: msixmgr-tool-syntax-description.md
 - name: Resources
   items:

articles/virtual-desktop/add-session-hosts-host-pool.md

@@ -232,7 +232,7 @@ Here's how to create session hosts and register them to a host pool by using the
       | **Security type** | Select from **Standard**, [Trusted launch virtual machines](/azure/virtual-machines/trusted-launch), or [Confidential virtual machines](/azure/confidential-computing/confidential-vm-overview).<br /><br />- If you select **Trusted launch virtual machines**, options for **secure boot** and **vTPM** are automatically selected.<br /><br />- If you select **Confidential virtual machines**, options for **secure boot**, **vTPM**, and **integrity monitoring** are automatically selected. You can't opt out of vTPM when using a confidential VM. |
       | **Image** | Select the OS image that you want to use from the list, or select **See all images** to see more. The full list includes any images that you created and stored as an [Azure Compute Gallery shared image](/azure/virtual-machines/shared-image-galleries) or a [managed image](/azure/virtual-machines/windows/capture-image-resource). |
       | **Virtual machine size** | Select a size. If you want to use a different size, select **Change size**, and then select from the list. |
-      | **Hibernate** | Select the box to enable hibernation. Hibernation is available only for personal host pools. For more information, see [Hibernation in virtual machines](/azure/virtual-machines/hibernate-resume). If you're using Microsoft Teams media optimizations, you should update the [WebRTC redirector service to 1.45.2310.13001](whats-new-webrtc.md#updates-for-version-145231013001).<br /><br />FSLogix and app attach currently don't support hibernation. Don't enable hibernation if you're using FSLogix or app attach for your personal host pools.|
+      | **Hibernate** | Select the box to enable hibernation. Hibernation is available only for personal host pools. For more information, see [Hibernation in virtual machines](/azure/virtual-machines/hibernate-resume). If you're using Microsoft Teams media optimizations, you should update the [WebRTC redirector service to 1.45.2310.13001](whats-new-webrtc.md#updates-for-version-145231013001).<br /><br />FSLogix and App Attach currently don't support hibernation. Don't enable hibernation if you're using FSLogix or App Attach for your personal host pools.|
       | **Number of VMs** | Enter the number of virtual machines that you want to deploy. You can deploy up to 400 session hosts at this point if you want (depending on your [subscription quota](/azure/quotas/view-quotas)), or you can add more later.<br /><br />For more information, see [Azure Virtual Desktop service limits](/azure/azure-resource-manager/management/azure-subscription-service-limits#azure-virtual-desktop-service-limits) and [Virtual Machines limits](/azure/azure-resource-manager/management/azure-subscription-service-limits#azure-virtual-machines-limits---azure-resource-manager). |
       | **OS disk type** | Select the disk type to use for your session hosts. We recommend that you use only **Premium SSD** for production workloads. |
       | **OS disk size** | Select a size for the OS disk.<br /><br />If you enable hibernation, ensure that the OS disk is large enough to store the contents of the memory in addition to the OS and other applications. |

articles/virtual-desktop/app-attach-create-msix-image.md

@@ -1,18 +1,15 @@
 ---
-title: Create an MSIX image to use with app attach in Azure Virtual Desktop - Azure
-description: To use app attach in Azure Virtual Desktop, you need to expand an MSIX-packaged application into an MSIX image. This article shows you how to create an MSIX image.
+title: Create an MSIX image to use with App Attach in Azure Virtual Desktop - Azure
+description: To use App Attach in Azure Virtual Desktop, you need to expand an MSIX-packaged application into an MSIX image. This article shows you how to create an MSIX image.
 ms.topic: how-to
 author: dougeby
 ms.author: avdcontent
-ms.date: 03/04/2024
+ms.date: 06/04/2024
 ---
 
-# Create an MSIX image to use with app attach in Azure Virtual Desktop
+# Create an MSIX image to use with App Attach in Azure Virtual Desktop
 
-> [!IMPORTANT]
-> MSIX App Attach will be deprecated on June 1, 2025. Make sure to move all apps to App Attach by this date.
-
-To use MSIX packages with app attach and MSIX app attach in Azure Virtual Desktop, you need to expand an MSIX package application into an MSIX image. This article shows you how to create an MSIX image.
+To use MSIX packages with App Attach in Azure Virtual Desktop, you need to expand an MSIX package application into an MSIX image. This article shows you how to create an MSIX image.
 
 ## Prerequisites
 
@@ -30,7 +27,7 @@ Before you can create an MSIX image, you need the following things:
    > [!NOTE]
    > If you're using packages from the Microsoft Store for Business or Education on your network or on devices not connected to the internet, you'll need to download and install package licenses from the Microsoft Store to run the apps. To get the licenses, see [Use packages offline](app-attach-test-msix-packages.md#use-packages-offline).
 
-## Create an app attach disk image
+## Create an App Attach disk image
 
 When creating an MSIX image, you convert an MSIX package to a *VHD*, *VHDX*, or *CIM* disk image using the *MSIXMGR tool*. We recommend using CIM for best performance, particularly with Windows 11, as it consumes less CPU and memory, with improved mounting and unmounting times. We don't recommend using VHD; use VHDX instead.
 
@@ -60,7 +57,7 @@ You should create a new folder for the destination because a CIM disk image is m
 
    The output should be similar to the following example:
 
-   ```Output
+   ```output
    Successfully created the CIM file: C:\msix\myapp\myapp.cim
    ```
 
@@ -80,7 +77,7 @@ Here's an example command to create a VHDX disk image from an MSIX image. A sing
 
    The output should be similar to the following example:
 
-   ```Output
+   ```output
    Successfully created virtual disk
    Stopping the Shell Hardware Detection service
    Stopping dependent services if necessary.
@@ -99,5 +96,5 @@ After you've created the MSIX package, you need to store it on a [file share](ap
 
 Here are some other articles you might find helpful:
 
-- [App attach in Azure Virtual Desktop](app-attach-overview.md)
+- [App Attach in Azure Virtual Desktop](app-attach-overview.md)
 - Learn more about the available [MSIXMGR tool parameters](msixmgr-tool-syntax-description.md).