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

Author: inward-eye

articles/active-directory/conditional-access/concept-conditional-access-grant.md

@@ -91,7 +91,7 @@ Organizations can require that an approved client app is used  to access selecte
 
 To apply this grant control, the device must be registered in Azure AD, which requires using a broker app. The broker app can be Microsoft Authenticator for iOS, or either Microsoft Authenticator or Microsoft Company Portal for Android devices. If a broker app isn't installed on the device when the user attempts to authenticate, the user is redirected to the appropriate app store to install the required broker app.
 
-The following client apps support this setting:
+The following client apps support this setting, this list isn't exhaustive and is subject to change::
 
 - Microsoft Azure Information Protection
 - Microsoft Bookings
@@ -142,7 +142,7 @@ To apply this grant control, Conditional Access requires that the device is regi
 
 Applications must have the Intune SDK with policy assurance implemented and must meet certain other requirements to support this setting. Developers who are implementing applications with the Intune SDK can find more information on these requirements in the [SDK documentation](/mem/intune/developer/app-sdk-get-started).
 
-The following client apps are confirmed to support this setting:
+The following client apps are confirmed to support this setting, this list isn't exhaustive and is subject to change:
 
 - Microsoft Cortana
 - Microsoft Edge
@@ -165,7 +165,7 @@ The following client apps are confirmed to support this setting:
 - MultiLine for Intune
 - Nine Mail - Email and Calendar
 - Notate for Intune
-- Yammer (iOS and iPadOS)
+- Yammer (Android, iOS, and iPadOS)
 
 This list isn't all encompassing, if your app isn't in this list please check with the application vendor to confirm support.
 

articles/active-directory/governance/entitlement-management-access-package-approval-policy.md

@@ -202,6 +202,7 @@ In order to make sure users are getting access to the right access packages, you
 
 1. If you would like to include a syntax check for text answers to questions, you can also specify a custom regex pattern.  
     :::image type="content" source="media/entitlement-management-access-package-approval-policy/add-regex-localization.png" alt-text="Screenshot of the add regex localization policy." lightbox="media/entitlement-management-access-package-approval-policy/add-regex-localization.png":::
+ If you would like to include a syntax check for text answers to questions, you can also specify a custom regex pattern.
 1. To require requestors to answer this question when requesting access to an access package, select the check box under **Required**.
 
 1. Fill out the remaining tabs (for example, Lifecycle) based on your needs.

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/application-gateway/mutual-authentication-overview.md

@@ -20,7 +20,7 @@ Mutual authentication, or client authentication, allows for the Application Gate
 
 Application Gateway supports certificate-based mutual authentication where you can upload a trusted client CA certificate(s) to the Application Gateway, and the gateway will use that certificate to authenticate the client sending a request to the gateway. With the rise in IoT use cases and increased security requirements across industries, mutual authentication provides a way for you to manage and control which clients can talk to your Application Gateway. 
 
-To configure mutual authentication, a trusted client CA certificate is required to be uploaded as part of the client authentication portion of an SSL profile. The SSL profile will then need to be associated to a listener in order to complete configuration of mutual authentication. There must always be a root CA certificate in the client certificate that you upload. You can upload a certificate chain as well, but the chain must include a root CA certificate in addition to as many intermediate CA certificates as you'd like. 
+To configure mutual authentication, a trusted client CA certificate is required to be uploaded as part of the client authentication portion of an SSL profile. The SSL profile will then need to be associated to a listener in order to complete configuration of mutual authentication. There must always be a root CA certificate in the client certificate that you upload. You can upload a certificate chain as well, but the chain must include a root CA certificate in addition to as many intermediate CA certificates as you'd like. The maximum size of each uploaded file must be 25 KB or less.
 
 For example, if your client certificate contains a root CA certificate, multiple intermediate CA certificates, and a leaf certificate, make sure that the root CA certificate and all the intermediate CA certificates are uploaded onto Application Gateway in one file. For more information on how to extract a trusted client CA certificate, see [how to extract trusted client CA certificates](./mutual-authentication-certificate-management.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/azure-monitor/vm/vminsights-dependency-agent-maintenance.md

@@ -14,9 +14,9 @@ The Dependency Agent collects data about processes running on the virtual machin
 
 ## Dependency Agent requirements
 
-- The Dependency Agent requires the Log Analytics Agent to be installed on the same machine.
+- The Dependency Agent requires the Azure Monitor Agent to be installed on the same machine.
 - On both the Windows and Linux versions, the Dependency Agent collects data using a user-space service and a kernel driver. 
-    - Dependency Agent supports the same [Windows versions Log Analytics Agent supports](../agents/agents-overview.md#supported-operating-systems), except Windows Server 2008 SP2 and Azure Stack HCI.
+    - Dependency Agent supports the same [Windows versions that Azure Monitor Agent supports](../agents/agents-overview.md#supported-operating-systems), except Windows Server 2008 SP2 and Azure Stack HCI.
     - For Linux, see [Dependency Agent Linux support](#dependency-agent-linux-support).
 
 ## Upgrade Dependency Agent 
@@ -123,4 +123,4 @@ Since the Dependency agent works at the kernel level, support is also dependent
 
 ## Next steps
 
-If you want to stop monitoring your VMs for a while or remove VM insights entirely, see [Disable monitoring of your VMs in VM insights](../vm/vminsights-optout.md).
+If you want to stop monitoring your VMs for a while or remove VM insights entirely, see [Disable monitoring of your VMs in VM insights](../vm/vminsights-optout.md).

articles/azure-video-indexer/toc.yml

@@ -13,8 +13,6 @@
     href: accounts-overview.md
   - name: Language support
     href: language-support.md
-  - name: Insights
-    href: insights-overview.md
 - name: Quickstarts
   expanded: true
   items:
@@ -62,6 +60,8 @@
       href: customize-language-model-overview.md
     - name: Person
       href: customize-person-model-overview.md
+  - name: Insights
+    href: insights-overview.md      
   - name: Post-production insights
     items:
     - name: Slate detection

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?