Merge pull request #217589 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: huypub

articles/active-directory/saas-apps/ms-confluence-jira-plugin-adminguide.md

@@ -88,7 +88,7 @@ Before you start using the plug-in, you must configure it. Select the plug-in, s
 
 The following image shows the configuration screen in both Jira and Confluence:
 
-![Plug-in configuration screen](./media/ms-confluence-jira-plugin-adminguide/jira.png)
+![Plug-in configuration screen](./media/jiramicrosoft-tutorial/jira-configure-addon.png)
 
 * **Metadata URL**: The URL to get federation metadata from Azure AD.
 
@@ -118,6 +118,12 @@ The following image shows the configuration screen in both Jira and Confluence:
 
 * **Enable Single Signout**: The selection to make if you want to sign out from Azure AD when a user signs out from Jira or Confluence.
 
+* Enable **Force Azure Login** checkbox, if you wish to sign in through Azure AD credentials only.
+
+* **Enable Use of Application Proxy** checkbox, if you have configured your on-premise atlassian application in an App Proxy setup.
+
+   * For App proxy setup , follow the steps on the [Azure AD App Proxy Documentation](../app-proxy/what-is-application-proxy.md).
+
 ## Troubleshooting
 
 * **You're getting multiple certificate errors**: Sign in to Azure AD and remove the multiple certificates that are available against the app. Ensure that only one certificate is present.

articles/app-service/quickstart-python.md

@@ -103,7 +103,7 @@ Having issues? [Let us know](https://aka.ms/PythonAppServiceQuickstartFeedback).
 
 ## 2 - Create a web app in Azure
 
-To host your application in Azure, you need to create Azure App Service web app in Azure. You can create a web app using the [Azure portal](https://portal.azure.com/), [VS Code](https://code.visualstudio.com/) using the [Azure Tools extension pack](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-node-azure-pack), or the Azure CLI.
+To host your application in Azure, you need to create Azure App Service web app in Azure. You can create a web app using [Azure portal](https://portal.azure.com/), [VS Code](https://code.visualstudio.com/), [Azure Tools extension pack](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-node-azure-pack), or Azure CLI.
 
 ### [Azure CLI](#tab/azure-cli)
 
@@ -296,4 +296,4 @@ Having issues? [Let us know](https://aka.ms/PythonAppServiceQuickstartFeedback).
 > [Add user sign-in to a Python web app](../active-directory/develop/quickstart-v2-python-webapp.md)
 
 > [!div class="nextstepaction"]
-> [Tutorial: Run Python app in custom container](./tutorial-custom-container.md)
+> [Tutorial: Run Python app in custom container](./tutorial-custom-container.md)

articles/azure-maps/quick-android-map.md

@@ -391,6 +391,9 @@ Android Studio will take a few seconds to build the application. After the build
 
 :::image type="content" source="media/quick-android-map/quickstart-android-map.png" alt-text="A screenshot showing Azure Maps in an Android application.":::
 
+> [!TIP]
+> By default, Android reloads the activity when the orientation changes or the keyboard is hidden. This results in the map state being reset (reload the map which resets the view and reloads data to initial state). To prevent this from happening, add the following to the mainfest: `android:configChanges="orientation|keyboardHidden"`. This will stop the activity from reloading and instead call `onConfigurationChanged()` when the orientation has changed or the keyboard is hidden.
+
 ## Clean up resources
 
 >[!WARNING]

articles/communication-services/samples/includes/ui-xamarin.md

@@ -2,7 +2,7 @@
 title: include file
 description: include file
 services: azure-communication-services
-author: jorgegarc
+author: garchiro7
 manager: anujbh
 ms.service: azure-communication-services
 ms.subservice: azure-communication-services
@@ -38,8 +38,8 @@ Refer to the native [UI Library overview](../../concepts/ui-library/ui-library-o
 Clone repo and open `CommunicationCallingXamarinSampleApp.sln` in Visual Studio
 
 #### For Android
-
-Set `CommunicationCallingXamarinSampleApp.Android` as startup project, build solution and select a device or emulator to run application.
+1. Navigate to `/XamarinAndroidBindings/` and in this directory in terminal run `sh downloadJarScript` [Learn More](https://github.com/Azure-Samples/communication-services-ui-library-xamarin/blob/main/XamarinAndroidBindings/README.md)
+2. Set `CommunicationCallingXamarinSampleApp.Android` as start up project, build solution and select a device or emulator to run application.
 
 #### For iOS
 

articles/confidential-computing/confidential-vm-faq-amd.yml

@@ -62,7 +62,7 @@ sections:
           Does memory written to the Windows swap file (pagefile.sys) get protected by the TEE?
         answer: |
           Yes, but only if the pagefile.sys is located on the encrypted OS disk.
-          On confidential VMs with a temp desk, the pagefile.sys file can be moved to the encrypted OS [Tips for moving pagefile.sys to the c:\ drive](../virtual-machines/windows/change-drive-letter.md).
+          On confidential VMs with a temp disk, the pagefile.sys file can be moved to the encrypted OS [Tips for moving pagefile.sys to the c:\ drive](../virtual-machines/windows/change-drive-letter.md).
                   
       - question: |
           How can I deploy Azure confidential VMs?

articles/machine-learning/how-to-create-data-assets.md

@@ -225,7 +225,7 @@ To create a File data asset in the Azure Machine Learning studio, use the follow
 
 Find more details about what are the abilities we provide via `mltable` in [reference-yaml-mltable](reference-yaml-mltable.md).
 
-In this section, we show you how to create a data asset when the type is an `mltable`.
+In this section, we show you how to create a data asset when the type is a `mltable`.
 
 ### The MLTable file
 
@@ -308,7 +308,7 @@ The `uri` parameter in `mltable.load()` should be a valid path to a local or clo
 > [!NOTE]
 > You will need the `mltable` library installed in your Environment (`pip install mltable`).
 
-Below shows you how to create an `mltable` data asset. The `path` can be any of the supported path formats outlined above.
+Below shows you how to create a `mltable` data asset. The `path` can be any of the supported path formats outlined above.
 
 
 # [Azure CLI](#tab/cli)

articles/machine-learning/how-to-custom-dns.md

@@ -171,7 +171,7 @@ To find the internal IP addresses for the FQDNs in the VNet, use one of the foll
 1. To get the ID of the private endpoint network interface, use the following command:
 
     ```azurecli
-    az network private-endpoint show --endpoint-name <endpoint> --resource-group <resource-group> --query 'networkInterfaces[*].id' --output table
+    az network private-endpoint show --name <endpoint> --resource-group <resource-group> --query 'networkInterfaces[*].id' --output table
     ```
 
 1. To get the IP address and FQDN information, use the following command. Replace `<resource-id>` with the ID from the previous step:

articles/security/fundamentals/key-management.md

@@ -38,7 +38,7 @@ Azure offers several options for storing and managing your keys in the cloud, in
 
 **Azure Dedicated HSM**: A FIPS 140-2 Level 3 validated bare metal HSM offering, that lets customers lease a general-purpose HSM appliance that resides in Microsoft datacenters. The customer has complete and total ownership over the HSM device and is responsible for patching and updating the firmware when required. Microsoft has no permissions on the device or access to the key material, and Dedicated HSM is not integrated with any Azure PaaS offerings. Customers can interact with the HSM using the PKCS#11, JCE/JCA, and KSP/CNG APIs. This offering is most useful for legacy lift-and-shift workloads, PKI, SSL Offloading and Keyless TLS (supported integrations include F5, Nginx, Apache, Palo Alto, IBM GW and more), OpenSSL applications, Oracle TDE, and Azure SQL TDE IaaS. For more information, see [What is Azure Key Vault Managed HSM?](../../dedicated-hsm/overview.md) 
 
-**Azure Payments HSM** (in public preview): A FIPS 140-2 Level 3, PCI HSM v3, validated bare metal offering that lets customers lease a payment HSM appliance in Microsoft datacenters for payments operations, including payment processing, payment credential issuing, securing keys and authentication data, and sensitive data protection. The service is PCI DSS and PCI 3DS compliant. Azure Payment HSM offers single-tenant HSMs for customers to have complete administrative control and exclusive access to the HSM. Once the HSM is allocated to a customer, Microsoft has no access to customer data. Likewise, when the HSM is no longer required, customer data is zeroized and erased as soon as the HSM is released, to ensure complete privacy and security is maintained. This offering is currently in public preview. For more information, see [About Azure Payment HSM](../../payment-hsm/overview.md).
+**Azure Payments HSM**: A FIPS 140-2 Level 3, PCI HSM v3, validated bare metal offering that lets customers lease a payment HSM appliance in Microsoft datacenters for payments operations, including payment processing, payment credential issuing, securing keys and authentication data, and sensitive data protection. The service is PCI DSS and PCI 3DS compliant. Azure Payment HSM offers single-tenant HSMs for customers to have complete administrative control and exclusive access to the HSM. Once the HSM is allocated to a customer, Microsoft has no access to customer data. Likewise, when the HSM is no longer required, customer data is zeroized and erased as soon as the HSM is released, to ensure complete privacy and security is maintained. For more information, see [About Azure Payment HSM](../../payment-hsm/overview.md).
 
 ### Pricing