Merge pull request #178299 from MicrosoftDocs/master

11/02 AM Publish

Author: huypub

.openpublishing.publish.config.json

@@ -833,6 +833,7 @@
     ".openpublishing.redirection.media-services.json",
     ".openpublishing.redirection.security-benchmark.json",
     ".openpublishing.redirection.synapse-analytics.json",
+    ".openpublishing.redirection.azure-web-pubsub.json",
     "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
     "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",   
     "articles/azure-relay/.openpublishing.redirection.relay.json",

.openpublishing.redirection.azure-web-pubsub.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-web-pubsub/howto-troubleshoot-diagnostic-logs.md",
+            "redirect_url": "/azure/azure-web-pubsub/howto-troubleshoot-resource-logs",
+            "redirect_document_id": false
+        }
+    ]
+}

.openpublishing.redirection.json

@@ -5,6 +5,11 @@
       "redirect_url": "/azure/storage/blobs/quickstart-blobs-c-plus-plus",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/automanage/virtual-machines-custom-preferences.md",
+      "redirect_url": "/azure/automanage/automanage-upgrade",
+      "redirect_document_id": false
+    },
     {
       "source_path": "active-directory/authentication/concept-mfa-plan.md",
       "redirect_url": "active-directory/authentication/howto-mfa-getstarted",
@@ -398,6 +403,11 @@
       "redirect_url": "/articles/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_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-sql/database/doc-changes-updates-release-notes.md",
       "redirect_url": "/azure/azure-sql/database/doc-changes-updates-release-notes-whats-new",
@@ -11456,6 +11466,21 @@
       "redirect_url": "/azure/azure-signalr/policy-reference",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-signalr/authenticate-application.md",
+      "redirect_url": "/azure/azure-signalr/signalr-howto-authorize-application",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-signalr/authenticate-managed-identity.md",
+      "redirect_url": "/azure/azure-signalr/signalr-howto-authorize-managed-identity",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-signalr/authorize-access-azure-active-directory.md",
+      "redirect_url": "/azure/azure-signalr/signalr-concept-authorize-azure-active-directory",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-signalr/signalr-authenticate-oauth.md",
       "redirect_url": "/azure/azure-signalr/signalr-concept-authenticate-oauth",

.whatsnew/.active-directory-b2c.json

@@ -7,7 +7,7 @@
         "relativeLinkPrefix": "/azure/active-directory-b2c"
     },
     "inclusionCriteria": {
-        "excludePullRequestTitles": true,
+        "omitPullRequestTitles" : true,
         "minAdditionsToFile" : 10,
         "maxFilesChanged": 50,
         "labels": [
@@ -17,7 +17,7 @@
     },
     "areas": [
         {
-            "name": ".",
+            "names": [ "."],
             "heading": "Azure Active Directory business-to-customer (B2C)"
         }
     ]

articles/active-directory-b2c/TOC.yml

@@ -222,7 +222,7 @@
       displayName: AD-FS, ADFS
     - name: Amazon
       href: identity-provider-amazon.md
-    - name: Apple (Preview)
+    - name: Apple
       href: identity-provider-apple-id.md 
     - name: Azure AD (single tenant)
       href: identity-provider-azure-ad-single-tenant.md

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: 09/22/2021
+ms.date: 11/02/2021
 ms.custom: project-no-code
 ms.author: kengaderdus
 ms.subservice: B2C
@@ -99,7 +99,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 |---------|:---------:|:---------:|---------|
 |[AD FS](identity-provider-adfs.md) | NA | GA | |
 |[Amazon](identity-provider-amazon.md) | GA | GA | |
-|[Apple](identity-provider-apple-id.md) | Preview | Preview | |
+|[Apple](identity-provider-apple-id.md) | GA | GA | |
 |[Azure AD (Single-tenant)](identity-provider-azure-ad-single-tenant.md) | GA | GA | |
 |[Azure AD (Multi-tenant)](identity-provider-azure-ad-multi-tenant.md) | NA  | GA | |
 |[Azure AD B2C](identity-provider-azure-ad-b2c.md) | GA | GA | |

articles/active-directory-b2c/enable-authentication-web-api.md

@@ -7,7 +7,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 06/25/2021
+ms.date: 10/26/2021
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: "b2c-support"
@@ -372,7 +372,7 @@ The authentication function also verifies that the web API is called with the ri
 
 ## Step 5: Configure the web server
 
-In a development environment, set the web API to listen on incoming HTTP or HTTPS requests port number. In this example, use HTTP port 6000 and HTTPS port 6001. The base URI of the web API will be `http://localhost:6000` for HTTP and `https://localhost:6001` for HTTPS. It is also possible to [setup HTTP and HTTPS endpoints for the Node application](https://github.com/expressjs/express/wiki/Migrating-from-2.x-to-3.x#application-function).
+In a development environment, set the web API to listen on incoming HTTP or HTTPS requests port number. In this example, use HTTP port 6000 and HTTPS port 6001. The base URI of the web API will be `http://localhost:6000` for HTTP and `https://localhost:6001` for HTTPS.
 
 # [ASP.NET Core](#tab/csharpclient)
 
@@ -393,7 +393,7 @@ Add the following JSON snippet to the *appsettings.json* file.
 
 # [Node.js](#tab/nodejsgeneric)
 
-Add the following JavaScript code to the *app.js* file. 
+Add the following JavaScript code to the *app.js* file. It is possible to [setup HTTP and HTTPS endpoints for the Node application](https://github.com/expressjs/express/wiki/Migrating-from-2.x-to-3.x#application-function). 
 
 ```javascript
 // Starts listening on port 6000

articles/active-directory-b2c/force-password-reset.md

@@ -19,6 +19,8 @@ zone_pivot_groups: b2c-policy-type
 
 [!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
 
+::: zone pivot="b2c-user-flow"
+
 ## Overview
 
 As an administrator, you can [reset a user's password](manage-users-portal.md#reset-a-users-password) if the user forgets their password. Or you would like to force them to reset the password. In this article, you'll learn how to force a password reset in these scenarios.
@@ -29,12 +31,20 @@ When an administrator resets a user's password via the Azure portal, the value o
 
 The password reset flow is applicable to local accounts in Azure AD B2C that use an [email address](sign-in-options.md#email-sign-in) or [username](sign-in-options.md#username-sign-in) with a password for sign-in.
 
-::: zone pivot="b2c-user-flow"
+::: zone-end
+
+::: zone pivot="b2c-custom-policy"
+
+This feature is currently only available for User Flows. For setup steps, choose **User Flow** above. For custom policies, use the force password reset first logon [GitHub sample](https://github.com/azure-ad-b2c/samples/tree/master/policies/force-password-reset-first-logon) with prerequisites below.
+
+::: zone-end
 
 ## Prerequisites
 
 [!INCLUDE [active-directory-b2c-customization-prerequisites](../../includes/active-directory-b2c-customization-prerequisites.md)]
 
+::: zone pivot="b2c-user-flow"
+
 ## Configure your user flow
 
 To enable the **Forced password reset** setting in a sign-up or sign-in user flow:
@@ -115,12 +125,6 @@ The password expiry duration default value is **90** days. The value is configur
 
 ::: zone-end
 
-::: zone pivot="b2c-custom-policy"
-
-This feature is currently only available for User Flows. For setup steps, choose **User Flow** above. For custom policies, use the force password reset first logon [GitHub sample](https://github.com/azure-ad-b2c/samples/tree/master/policies/force-password-reset-first-logon).
-
-::: zone-end
-
 ## Next steps
 
 Set up a [self-service password reset](add-password-reset-policy.md).

articles/active-directory-b2c/identity-provider-apple-id.md

@@ -9,14 +9,14 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 09/16/2021
+ms.date: 11/02/2021
 ms.custom: project-no-code
 ms.author: kengaderdus
 ms.subservice: B2C
 zone_pivot_groups: b2c-policy-type
 ---
 
-# Set up sign-up and sign-in with an Apple ID  using Azure Active Directory B2C (Preview)
+# Set up sign-up and sign-in with an Apple ID  using Azure Active Directory B2C
 
 [!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
 
@@ -77,7 +77,7 @@ To enable sign-in for users with an Apple ID in Azure Active Directory B2C (Azur
 1. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
 1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
 1. Under **Azure services**, select **Azure AD B2C**. Or use the search box to find and select **Azure AD B2C**.
-1. Select **Identity providers**, then select **Apple (Preview)**.
+1. Select **Identity providers**, then select **Apple**.
 1. For the **Name**, enter **Sign in with Apple**. 
 1. Enter the **Apple developer ID (Team ID)**.
 1. Enter the **Apple service ID (Client ID)**.
@@ -88,8 +88,7 @@ To enable sign-in for users with an Apple ID in Azure Active Directory B2C (Azur
 
 > [!IMPORTANT] 
 > - Sign in with Apple requires the Admin to renew their client secret every 6 months. 
-> - During the public preview of this feature, you'll need to manually renew the Apple client secret if it expires. A warning will appear in advance on Apple identity providers Configure social IDP page, but we recommend you set your own reminder. 
-> - If you need to renew the secret, open Azure AD B2C in the Azure portal, go to **Identity providers** > **Apple**, and select **Renew secret**.
+> - The Apple client secret will be automatically renewed when it expires. If you need to manually renew the secret, open Azure AD B2C in the Azure portal, go to **Identity providers** > **Apple**, and select **Renew secret**.
 > - Follow the guidelines how to [offer Sign in with Apple button](#customize-your-user-interface).
 
 ## Add the Apple identity provider to a user flow
@@ -98,7 +97,7 @@ To enable users to sign in using an Apple ID, you need to add the Apple identity
 
 1. In your Azure AD B2C tenant, select **User flows**.
 1. Select a user flow for which you want to add the Apple identity provider. 
-1. Under **Social identity providers**, select **Apple (Preview)**.
+1. Under **Social identity providers**, select **Apple**.
 1. Select **Save**.
 1. To test your policy, select **Run user flow**.
 1. For **Application**, select the web application named *testapp1* that you previously registered. The **Reply URL** should show `https://jwt.ms`.
@@ -123,7 +122,7 @@ Use the .p8 file you downloaded previously to sign the client secret into a JWT
 
     - **appleTeamId**: Your Apple Developer Team ID
     - **appleServiceId**: The Apple Service ID (client ID)
-    - **appleKeyId**: The 10 digit Key Id stored in the JWT Header (required by Apple)
+    - **appleKeyId**: The 10 digit Key ID stored in the JWT Header (required by Apple)
     - **p8key**: The PEM format key. You can obtain this by opening the .p8 file in a text editor and copying everything between 
     `-----BEGIN PRIVATE KEY-----` and `-----END PRIVATE KEY-----` without line breaks.
 

articles/active-directory-b2c/one-time-password-technical-profile.md

@@ -12,6 +12,7 @@ ms.topic: reference
 ms.date: 10/19/2020
 ms.author: kengaderdus
 ms.subservice: B2C
+ms.custom: "b2c-support"
 ---
 
 # Define a one-time password technical profile in an Azure AD B2C custom policy
@@ -72,7 +73,7 @@ The following settings can be used to configure code generation mode:
 | CodeExpirationInSeconds | No | Time in seconds until code expiration. Minimum: `60`; Maximum: `1200`; Default: `600`. Every time a code is provided (same code using `ReuseSameCode`, or a new code), the code expiration is extended. This time is also used to set retry timeout (once max attempts are reached, user is locked out from attempting to obtain new codes until this time expires) |
 | CodeLength | No | Length of the code. The default value is `6`. |
 | CharacterSet | No | The character set for the code, formatted for use in a regular expression. For example, `a-z0-9A-Z`. The default value is `0-9`. The character set must include a minimum of 10 different characters in the set specified. |
-| NumRetryAttempts | No | The number of verification attempts before the code is considered invalid. The default value is `5`. |
+| NumRetryAttempts | No | The number of verification attempts before the code is considered invalid. The default value is `5`. For example, if you set NumRetryAttempts to 2 it will allow you only 2 attempts in total (first + 1 retry). For the 3rd attempt it will throw max attempts reached irrespective of whether the code is correct or not.|
 | NumCodeGenerationAttempts | No | The number of maximum code generation attempts per identifier. The default value is 10 if not specified. |
 | Operation | Yes | The operation to be performed. Possible value: `GenerateCode`. |
 | ReuseSameCode | No | Whether the same code should be given rather than generating a new code when given code has not expired and is still valid. The default value is `false`.  |