Merge pull request #101723 from MicrosoftDocs/master

Merge Master to Live, 3 AM

Author: PMEds28

articles/active-directory/develop/shared-device-mode.md

@@ -34,7 +34,7 @@ Shared device mode also provides Microsoft identity backed management of the dev
 To create a shared device mode app, developers and cloud device admins work together:
 
 - Developers write a single-account app (multiple-account apps are not supported in shared device mode), add `"shared_device_mode_supported": true` to the app's configuration, and write code to handle things like shared device sign-out.
-- Device admins prepare the device to be shared by installing the authenticator app, and setting the device to shared mode using the authenticator app. Only users who are in the [Cloud Device Administrator](https://docs.microsoft.com/azure/active-directory/users-groups-roles/directory-assign-admin-roles#cloud-device-administrator) role can put a device into shared mode by using the [Authenticator app](https://www.microsoft.com/account/authenticator). You can configure the membership of your organizational roles in the Azure portal via:
+- Device admins prepare the device to be shared by installing the authenticator app, and setting the device to shared mode using the authenticator app. Only users who are in the [Cloud Device Administrator](https://docs.microsoft.com/azure/active-directory/users-groups-roles/directory-assign-admin-roles#cloud-device-administrator) role can put a device into shared mode by using the [Authenticator app](https://docs.microsoft.com/azure/active-directory/user-help/user-help-auth-app-overview). You can configure the membership of your organizational roles in the Azure portal via:
 **Azure Active Directory** > **Roles and Administrators** > **Cloud Device Administrator**.
 
  This article focuses primarily what developers should think about.

articles/active-directory/manage-apps/manage-consent-requests.md

@@ -38,7 +38,7 @@ After end-user consent is disabled or restricted, there are several important co
 
 3. If your organization has the appropriate license:
 
-    * Use additional [OAuth application auditing features in Microsoft Cloud App Security](https://docs.microsoft.com/azure/cloud-app-security/investigate-risky-oauth).
+    * Use additional [OAuth application auditing features in Microsoft Cloud App Security](https://docs.microsoft.com/cloud-app-security/investigate-risky-oauth).
     * Use [Azure Monitor Workbooks to monitor permissions and consent](../reports-monitoring/howto-use-azure-monitor-workbooks.md) related activity. The *Consent Insights* workbook provides a view of apps by number of failed consent requests. This can be helpful to prioritize applications for administrators to review and decide whether to grant them admin consent.
 
 ### Additional considerations for reducing friction

articles/active-directory/saas-apps/figma-tutorial.md

@@ -92,7 +92,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
     `https://www.figma.com/saml/<TENANT ID>/start`
 
 	> [!NOTE]
-	> These values are not real. Update these values with the actual Identifier, Reply URL and Sign-on URL. You will get the `TENANT ID` from step#11 of Figma`s article [Configure Azure Active Directory SAML SSO process](https://help.figma.com/article/243-configure-azure-active-directory-saml-sso).
+	> These values are not real. Update these values with the actual Identifier, Reply URL and Sign-on URL. You will get the `TENANT ID` from step#11 of Figma`s article [Configure Azure Active Directory SAML SSO process](https://help.figma.com/hc/en-us/articles/360040532413-Configure-and-Provision-SAML-SSO-with-Azure-Active-Directory).
 
 1. Figma application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes.
 
@@ -146,7 +146,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 
 ## Configure Figma SSO
 
-To configure single sign-on on Figma side, you need to follow the Figma`s article [Configure Azure Active Directory SAML SSO process](https://help.figma.com/article/243-configure-azure-active-directory-saml-sso).
+To configure single sign-on on Figma side, you need to follow the Figma`s article [Configure Azure Active Directory SAML SSO process](https://help.figma.com/hc/en-us/articles/360040532413-Configure-and-Provision-SAML-SSO-with-Azure-Active-Directory).
 
 ### Create Figma test user
 

articles/active-directory/saas-apps/mcm-tutorial.md

@@ -108,7 +108,7 @@ To configure Azure AD single sign-on with MCM, perform the following steps:
     `https://myaba.co.uk/<companyname>`
 
 	> [!NOTE]
-	> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [MCM Client support team](https://mcmtechnology.com/support/) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
+	> These values are not real. Update these values with the actual Sign on URL and Identifier. Contact [MCM Client support team](https://mcmtechnology.com/support) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
 
 4. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Federation Metadata XML** from the given options as per your requirement and save it on your computer.
 
@@ -126,7 +126,7 @@ To configure Azure AD single sign-on with MCM, perform the following steps:
 
 ### Configure MCM Single Sign-On
 
-To configure single sign-on on **MCM** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [MCM support team](https://mcmtechnology.com/support/). They set this setting to have the SAML SSO connection set properly on both sides.
+To configure single sign-on on **MCM** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [MCM support team](https://mcmtechnology.com/support). They set this setting to have the SAML SSO connection set properly on both sides.
 
 ### Create an Azure AD test user 
 
@@ -181,7 +181,7 @@ In this section, you enable Britta Simon to use Azure single sign-on by granting
 
 ### Create MCM test user
 
-In this section, you create a user called Britta Simon in MCM. Work with [MCM support team](https://mcmtechnology.com/support/) to add the users in the MCM platform. Users must be created and activated before you use single sign-on.
+In this section, you create a user called Britta Simon in MCM. Work with [MCM support team](https://mcmtechnology.com/support) to add the users in the MCM platform. Users must be created and activated before you use single sign-on.
 
 >[!NOTE]
 >You can use any other MCM user account creation tools or APIs provided by MCM to provision Azure AD user accounts.

articles/active-directory/user-help/my-account-portal-devices-page.md

@@ -77,7 +77,7 @@ After viewing your connected devices, you can:
 
 - [Sign in to manage your Office product](https://support.office.com/article/sign-in-to-manage-your-office-product-959ac957-8d37-4ae4-b1b6-d6e4874e013f)
 
-- [Go to the Office **My Account** page](https://portal.office.com/account/#home)
+- [Go to the Office **My Account** page](https://portal.office.com/account/)
 
 - [Go to the Office **My installs** page](https://portal.office.com/account/#installs)
 

articles/active-directory/user-help/my-account-portal-overview.md

@@ -48,7 +48,7 @@ You can get to the **My Account** portal (https://myprofile.microsoft.com), from
 
 - [Sign in to manage your Office product](https://support.office.com/article/sign-in-to-manage-your-office-product-959ac957-8d37-4ae4-b1b6-d6e4874e013f)
 
-- [Go to the Office **My Account** page](https://portal.office.com/account/#home)
+- [Go to the Office **My Account** page](https://portal.office.com/account/)
 
 - [Go to the Office **My installs** page](https://portal.office.com/account/#installs)
 

articles/aks/azure-disk-customer-managed-keys.md

@@ -187,4 +187,4 @@ Review [best practices for AKS cluster security][best-practices-security]
 [byok-azure-portal]: /azure/storage/common/storage-encryption-keys-portal
 [customer-managed-keys]: /azure/virtual-machines/windows/disk-encryption#customer-managed-keys
 [key-vault-generate]: /azure/key-vault/key-vault-manage-with-cli2
-[supported-regions]: /azure/virtual-machines/windows/disk-encryption#supported-scenarios-and-restrictions
+[supported-regions]: /azure/virtual-machines/windows/disk-encryption#supported-regions

articles/app-service/containers/quickstart-java.md

@@ -97,10 +97,10 @@ Navigate to `pom.xml` again to see the plugin configuration is updated,  You can
 `<schemaVersion>` | false | Specify the version of the configuration schema. Supported values are: `v1`, `v2`. | 1.5.2
 `<resourceGroup>` | true | Azure Resource Group for your Web App. | 0.1.0+
 `<appName>` | true | The name of your Web App. | 0.1.0+
-[`<region>`](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme#region) | true | Specifies the region where your Web App will be hosted; the default value is **westeurope**. All valid regions at [Supported Regions](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme#region) section. | 0.1.0+
-[`<pricingTier>`](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme##pricingtier) | false | The pricing tier for your Web App. The default value is **P1V2**.| 0.1.0+
-[`<runtime>`](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme#runtimesetting) | true | The runtime environment configuration, you could see the detail [here](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme#runtimesetting). | 0.1.0+
-[`<deployment>`](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme#deploymentsetting) | true | The deployment configuration, you could see the details [here](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme#deploymentsetting). | 0.1.0+
+`<region>` | true | Specifies the region where your Web App will be hosted; the default value is **westeurope**. All valid regions at [Supported Regions](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme) section. | 0.1.0+
+`<pricingTier>` | false | The pricing tier for your Web App. The default value is **P1V2**.| 0.1.0+
+`<runtime>` | true | The runtime environment configuration, you could see the detail [here](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme). | 0.1.0+
+`<deployment>` | true | The deployment configuration, you could see the details [here](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme). | 0.1.0+
 
 > [!div class="nextstepaction"]
 > [I ran into an issue](https://www.research.net/r/javae2e?tutorial=app-service-linux-quickstart&step=config)