Merge branch 'main' into patch-1

Author: maulikshah23

.openpublishing.redirection.active-directory.json

@@ -10805,6 +10805,11 @@
       "source_path": "articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md",
       "redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
+      "redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
+      "redirect_document_id": true
     }
 
   ]

.openpublishing.redirection.azure-monitor.json

@@ -216,6 +216,11 @@
             "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-sample-links.md",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-samples",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-access.md",
             "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",

.openpublishing.redirection.json

@@ -621,22 +621,22 @@
     },
     {
       "source_path_from_root": "/articles/load-balancer/azure-media-player/components-limitations.md",
-      "redirect_url": "/articles/load-balancer/concepts",
+      "redirect_url": "/azure/load-balancer/concepts",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/frontdoor/standard-premium/resource-manager-template-samples.md",
-      "redirect_url": "/articles/frontdoor/front-door-quickstart-template-samples",
+      "redirect_url": "/azure/frontdoor/front-door-quickstart-template-samples",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/frontdoor/standard-premium/concept-health-probes.md",
-      "redirect_url": "/articles/frontdoor/front-door-health-probes",
+      "redirect_url": "/azure/frontdoor/front-door-health-probes",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/frontdoor/standard-premium/concept-ddos.md",
-      "redirect_url": "/articles/frontdoor/front-door-ddos",
+      "redirect_url": "/azure/frontdoor/front-door-ddos",
       "redirect_document_id": false
     },
     {
@@ -651,7 +651,7 @@
     },
     {
       "source_path_from_root": "/articles/frontdoor/standard-premium/geo-filtering.md",
-      "redirect_url": "/articles/frontdoor/front-door-geo-filtering",
+      "redirect_url": "/azure/frontdoor/front-door-geo-filtering",
       "redirect_document_id": false
     },
     {
@@ -6311,6 +6311,46 @@
       "redirect_url": "/azure/azure-cache-for-redis/scripts/create-manage-cache",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/storage/storage-client-side-encryption.md",
+      "redirect_url": "/azure/storage/common/storage-client-side-encryption",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/storage/common/storage-client-side-encryption.md",
+      "redirect_url": "/azure/storage/blobs/client-side-encryption",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/storage/storage-client-side-encryption-java.md",
+      "redirect_url": "/azure/storage/common/storage-client-side-encryption-java",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/storage/common/storage-client-side-encryption-java.md",
+      "redirect_url": "/azure/storage/blobs/client-side-encryption",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/storage/storage-client-side-encryption-python.md",
+      "redirect_url": "/azure/storage/common/storage-client-side-encryption-python",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/storage/common/storage-client-side-encryption-python.md",
+      "redirect_url": "/azure/storage/blobs/client-side-encryption",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/storage/storage-encrypt-decrypt-blobs-key-vault.md",
+      "redirect_url": "/azure/storage/blobs/storage-encrypt-decrypt-blobs-key-vault",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/storage/blobs/storage-encrypt-decrypt-blobs-key-vault.md",
+      "redirect_url": "/azure/storage/blobs/client-side-encryption",
+      "redirect_document_id": false
+    },    
     {
       "source_path_from_root": "/articles/storage/blobs/Storage-blob-performance-tiers.md",
       "redirect_url": "/azure/storage/common/storage-account-overview",
@@ -22251,6 +22291,11 @@
       "redirect_url": "/azure/sql-data-warehouse/create-data-warehouse-portal",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/virtual-machine-scale-sets/flexible-virtual-machine-scale-sets.md",
+      "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/sql-data-warehouse/sql-data-warehouse-get-started-provision-powershell.md",
       "redirect_url": "/azure/sql-data-warehouse/create-data-warehouse-powershell",
@@ -22861,11 +22906,6 @@
       "redirect_url": "/azure/storage/blobs/storage-dotnet-shared-access-signature-part-2",
       "redirect_document_id": true
     },
-    {
-      "source_path_from_root": "/articles/storage/storage-encrypt-decrypt-blobs-key-vault.md",
-      "redirect_url": "/azure/storage/blobs/storage-encrypt-decrypt-blobs-key-vault",
-      "redirect_document_id": true
-    },
     {
       "source_path_from_root": "/articles/storage/storage-https-custom-domain-cdn.md",
       "redirect_url": "/azure/storage/blobs/storage-https-custom-domain-cdn",
@@ -23262,21 +23302,6 @@
       "redirect_url": "/azure/storage/common/storage-choose-data-transfer-solution",
       "redirect_document_id": true
     },
-    {
-      "source_path_from_root": "/articles/storage/storage-client-side-encryption.md",
-      "redirect_url": "/azure/storage/common/storage-client-side-encryption",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/storage/storage-client-side-encryption-java.md",
-      "redirect_url": "/azure/storage/common/storage-client-side-encryption-java",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/storage/storage-client-side-encryption-python.md",
-      "redirect_url": "/azure/storage/common/storage-client-side-encryption-python",
-      "redirect_document_id": true
-    },
     {
       "source_path_from_root": "/articles/storage/storage-concurrency.md",
       "redirect_url": "/azure/storage/common/storage-concurrency",
@@ -37362,16 +37387,6 @@
       "redirect_url": "/azure/event-grid/event-schema-communication-services",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/azure-monitor/app/change-analysis.md#visualizations-for-application-change-analysis",
-      "redirect_url": "/articles/azure-monitor/app/change-analysis-visualizations",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/azure-monitor/app/change-analysis.md#troubleshoot",
-      "redirect_url": "/articles/azure-monitor/app/change-analysis-troubleshoot",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/cognitive-services/personalizer/personalizer-encryption-of-data-at-rest.md",
       "redirect_url": "/azure/cognitive-services/personalizer/encrypt-data-at-rest",
@@ -40240,12 +40255,12 @@
     },    
     {
       "source_path_from_root": "/articles/virtual-machines/windows/connect-logon.md",
-      "redirect_url": "/articles/virtual-machines/windows/connect-rdp",
+      "redirect_url": "/azure/virtual-machines/windows/connect-rdp",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/virtual-machines/windows/winrm.md",
-      "redirect_url": "/articles/virtual-machines/windows/connect-winrm",
+      "redirect_url": "/azure/virtual-machines/windows/connect-winrm",
       "redirect_document_id": false
     }
   ]

articles/active-directory-b2c/configure-authentication-in-azure-static-app.md

@@ -127,7 +127,7 @@ Once you've added the app ID and secrete, use the following steps to add the Azu
 
 1. Navigate to `/.auth/login/aadb2c`. The `/.auth/login` points the Azure Static app login endpoint. The `aadb2c` references to your [OpenID Connect identity provider](#31-add-an-openid-connect-identity-provider).  The following URL demonstrates an Azure Static app login endpoint: `https://witty-island-11111111.azurestaticapps.net/.auth/login/aadb2c`.
 1. Complete the sign up or sign in process.
-1. In your browser debugger, [run the following JavaScript in the Console](/microsoft-edge/devtools-guide-chromium/console/console-javascript.md). The JavaScript code will present information about the sign in user.
+1. In your browser debugger, [run the following JavaScript in the Console](/microsoft-edge/devtools-guide-chromium/console/console-javascript). The JavaScript code will present information about the sign in user.
 
     ```javascript
     async function getUserInfo() {
@@ -147,4 +147,4 @@ Once you've added the app ID and secrete, use the following steps to add the Azu
 ## Next steps
 
 * After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out [Accessing user information in Azure Static Web Apps](../static-web-apps/user-information.md).
-* Learn how to [customize and enhance the Azure AD B2C authentication experience for your web app](enable-authentication-azure-static-app-options.md).
+* Learn how to [customize and enhance the Azure AD B2C authentication experience for your web app](enable-authentication-azure-static-app-options.md).

articles/active-directory-b2c/configure-authentication-in-azure-web-app-file-based.md

@@ -15,7 +15,7 @@ ms.custom: "b2c-support"
 
 # Configure authentication in an Azure Web App configuration file by using Azure AD B2C
 
-This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [File-based configuration in Azure App Service authentication](/app-service/configure-authentication-file-based.md) article.
+This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [File-based configuration in Azure App Service authentication](/azure/app-service/configure-authentication-file-based) article.
 
 ## Overview
 
@@ -141,6 +141,6 @@ From your server code, the provider-specific tokens are injected into the reques
 
 ## Next steps
 
-* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](/app-service/configure-authentication-user-identities).
-* Lear how to [Work with OAuth tokens in Azure App Service authentication](/app-service/configure-authentication-oauth-tokens).
+* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](/azure/app-service/configure-authentication-user-identities).
+* Lear how to [Work with OAuth tokens in Azure App Service authentication](/azure/app-service/configure-authentication-oauth-tokens).
 

articles/active-directory-b2c/configure-authentication-in-azure-web-app.md

@@ -15,7 +15,7 @@ ms.custom: "b2c-support"
 
 # Configure authentication in an Azure Web App by using Azure AD B2C
 
-This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [configure your App Service or Azure Functions app to login using an OpenID Connect provider](/app-service/configure-authentication-provider-openid-connect.md) article.
+This article explains how to add Azure Active Directory B2C (Azure AD B2C) authentication functionality to an Azure Web App. For more information, check out the [configure your App Service or Azure Functions app to login using an OpenID Connect provider](/azure/app-service/configure-authentication-provider-openid-connect) article.
 
 ## Overview
 
@@ -94,7 +94,7 @@ To register your application, follow these steps:
 1. For the  **Client Secret** provide the Web App (client) secret from [step 2.2](#step-22-create-a-client-secret).
 
     > [!TIP]
-    > Your client secret will be stored as an app setting to ensure secrets are stored in a secure fashion. You can update that setting later to use [Key Vault references](/app-service/app-service-key-vault-references.md) if you wish to manage the secret in Azure Key Vault.
+    > Your client secret will be stored as an app setting to ensure secrets are stored in a secure fashion. You can update that setting later to use [Key Vault references](/azure/app-service/app-service-key-vault-references) if you wish to manage the secret in Azure Key Vault.
     
 1. Keep the rest of the settings with the default values.
 1. Press the **Add** button to finish setting up the identity provider. 
@@ -119,6 +119,6 @@ From your server code, the provider-specific tokens are injected into the reques
 
 ## Next steps
 
-* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](/app-service/configure-authentication-user-identities).
-* Lear how to [Work with OAuth tokens in Azure App Service authentication](/app-service/configure-authentication-oauth-tokens).
+* After successful authentication, you can show display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, check out the [Work with user identities in Azure App Service authentication](/azure/app-service/configure-authentication-user-identities).
+* Lear how to [Work with OAuth tokens in Azure App Service authentication](/azure/app-service/configure-authentication-oauth-tokens).
 

articles/active-directory-b2c/custom-policy-developer-notes.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 06/15/2022
+ms.date: 06/27/2022
 ms.custom: project-no-code
 ms.author: kengaderdus
 ms.subservice: B2C
@@ -154,7 +154,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 
 | Feature | Custom policy | Notes |
 | ------- | :--: | ----- |
-| [MFA using time-based one-time password (TOTP) with authenticator apps](multi-factor-authentication.md#verification-methods) | Preview |  Users can use any authenticator app that supports TOTP verification, such as the [Microsoft Authenticator app](https://www.microsoft.com/security/mobile-authenticator-app).|
+| [MFA using time-based one-time password (TOTP) with authenticator apps](multi-factor-authentication.md#verification-methods) | GA |  Users can use any authenticator app that supports TOTP verification, such as the [Microsoft Authenticator app](https://www.microsoft.com/security/mobile-authenticator-app).|
 | [Phone factor authentication](phone-factor-technical-profile.md) | GA |  |
 | [Azure AD MFA authentication](multi-factor-auth-technical-profile.md) | Preview |  |
 | [One-time password](one-time-password-technical-profile.md) | GA |  |

articles/active-directory-b2c/faq.yml

@@ -146,7 +146,6 @@ sections:
         answer: |
           Yes. End users need to download any authenticator app that supports TOTP verification, such as the [Microsoft Authenticator app](https://www.microsoft.com/security/mobile-authenticator-app) (recommended). For details see, [verification methods](multi-factor-authentication.md#verification-methods).
           
-          This feature is in public preview.
       - question: |
           Why are my TOTP authenticator app codes not working?
         answer: |

articles/active-directory-b2c/multi-factor-authentication.md

@@ -8,7 +8,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 01/14/2022
+ms.date: 06/27/2022
 ms.custom: project-no-code
 ms.author: kengaderdus
 ms.subservice: B2C
@@ -38,7 +38,7 @@ With [Conditional Access](conditional-access-identity-protection-overview.md) us
 - **SMS or phone call** - During the first sign-up or sign-in, the user is asked to provide and verify a phone number. During subsequent sign-ins, the user is prompted to select either the **Send Code** or **Call Me** phone MFA option. Depending on the user's choice, a text message is sent or a phone call is made to the verified phone number to identify the user. The user either provides the OTP code sent via text message or approves the phone call.
 - **Phone call only** - Works in the same way as the SMS or phone call option, but only a phone call is made. 
 - **SMS only** - Works in the same way as the SMS or phone call option, but only a text message is sent. 
-- **Authenticator app - TOTP (preview)** - The user must install an authenticator app that supports time-based one-time password (TOTP) verification, such as the [Microsoft Authenticator app](https://www.microsoft.com/security/mobile-authenticator-app), on a device that they own. During the first sign-up or sign-in, the user scans a QR code or enters a code manually using the authenticator app. During subsequent sign-ins, the user types the TOTP code that appears on the authenticator app. See [how to set up the Microsoft Authenticator app](#enroll-a-user-in-totp-with-an-authenticator-app-for-end-users). 
+- **Authenticator app - TOTP** - The user must install an authenticator app that supports time-based one-time password (TOTP) verification, such as the [Microsoft Authenticator app](https://www.microsoft.com/security/mobile-authenticator-app), on a device that they own. During the first sign-up or sign-in, the user scans a QR code or enters a code manually using the authenticator app. During subsequent sign-ins, the user types the TOTP code that appears on the authenticator app. See [how to set up the Microsoft Authenticator app](#enroll-a-user-in-totp-with-an-authenticator-app-for-end-users). 
 
 > [!IMPORTANT]
 > Authenticator app - TOTP provides stronger security than SMS/Phone and email is the least secure. [SMS/Phone-based multi-factor authentication incurs separate charges from the normal Azure AD B2C MAU's pricing model](https://azure.microsoft.com/pricing/details/active-directory/external-identities/). 
@@ -122,7 +122,7 @@ In Azure AD B2C, you can delete a user's TOTP authenticator app enrollment. Then
 1. In the left menu, select **Users**.
 1. Search for and select the user for which you want to delete TOTP authenticator app enrollment.
 1. In the left menu, select **Authentication methods**.
-1. Under **Usable authentication methods**, find **Software OATH token (Preview)**, and then select the ellipsis menu next to it. If you don't see this interface, select the option to **"Switch to the new user authentication methods experience! Click here to use it now"** to switch to the new authentication methods experience.
+1. Under **Usable authentication methods**, find **Software OATH token**, and then select the ellipsis menu next to it. If you don't see this interface, select the option to **"Switch to the new user authentication methods experience! Click here to use it now"** to switch to the new authentication methods experience.
 1. Select **Delete**, and then select **Yes** to confirm. 
 
 :::image type="content" source="media/multi-factor-authentication/authentication-methods.png" alt-text="User authentication methods":::