resolve merge conflict

Author: laujan

.openpublishing.redirection.active-directory.json

@@ -65,6 +65,16 @@
       "redirect_url": "/azure/active-directory/saas-apps/navex-irm-keylight-lockpath-tutorial",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/headerf5-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/f5-big-ip-headers-easy-button",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/oracle-peoplesoft-protected-by-f5-big-ip-apm-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/fundamentals/whats-new-microsoft-365-government.md",
       "redirect_url": "/azure/active-directory/fundamentals/whats-new",

.openpublishing.redirection.json

@@ -763,11 +763,6 @@
             "redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/aks/node-access.md",
-            "redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/aks/troubleshooting.md",
             "redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",

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

@@ -9,9 +9,10 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 08/04/2022
+ms.date: 10/06/2022
 ms.author: kengaderdus
 ms.subservice: B2C
+ms.custom: b2c-support
 zone_pivot_groups: b2c-policy-type
 ---
 
@@ -132,6 +133,9 @@ Content-type: application/json
 
 If you disabled the strong [password complexity](password-complexity.md), update the password policy to [DisableStrongPassword](user-profile-attributes.md#password-policy-attribute):
 
+> [!NOTE]
+> After the user resets their password, the passwordPolicies will be changed back to DisablePasswordExpiration
+
 ```http
 PATCH https://graph.microsoft.com/v1.0/users/<user-object-ID>
 Content-type: application/json

articles/active-directory/develop/active-directory-claims-mapping.md

@@ -53,7 +53,7 @@ The set of optional claims available by default for applications to use are list
 | `fwd`                      | IP address.| JWT    |   | Adds the original IPv4 address of the requesting client (when inside a VNET) |
 | `groups`| Optional formatting for group claims |JWT, SAML| |For details see [Group claims](#configuring-groups-optional-claims) below. For more information about group claims, see [How to configure group claims](../hybrid/how-to-connect-fed-group-claims.md). Used with the GroupMembershipClaims setting in the [application manifest](reference-app-manifest.md), which must be set as well.
 | `idtyp`                    | Token type   | JWT access tokens | Special: only in app-only access tokens |  Value is `app` when the token is an app-only token. This claim is the most accurate way for an API to determine if a token is an app token or an app+user token.|
-| `login_hint`               | Login hint   | JWT | MSA, Azure AD | An opaque, reliable login hint claim.  This claim is the best value to use for the `login_hint` OAuth parameter in all flows to get SSO.  It can be passed between applications to help them silently SSO as well - application A can sign in a user, read the `login_hint` claim, and then send the claim and the current tenant context to application B in the query string or fragment when the user selects on a link that takes them to application B. To avoid race conditions and reliability issues, the `login_hint` claim *doesn't* include the current tenant for the user, and defaults to the user's home tenant when used.  If you're operating in a guest scenario where the user is from another tenant, you must provide a tenant identifier in the sign-in request, and pass the same to apps you partner with. This claim is intended for use with your SDK's existing `login_hint` functionality, however that it exposed. |
+| `login_hint`               | Login hint   | JWT | MSA, Azure AD | An opaque, reliable login hint claim that's base64 encoded. Do not modify this value. This claim is the best value to use for the `login_hint` OAuth parameter in all flows to get SSO.  It can be passed between applications to help them silently SSO as well - application A can sign in a user, read the `login_hint` claim, and then send the claim and the current tenant context to application B in the query string or fragment when the user selects on a link that takes them to application B. To avoid race conditions and reliability issues, the `login_hint` claim *doesn't* include the current tenant for the user, and defaults to the user's home tenant when used.  If you're operating in a guest scenario where the user is from another tenant, you must provide a tenant identifier in the sign-in request, and pass the same to apps you partner with. This claim is intended for use with your SDK's existing `login_hint` functionality, however that it exposed. |
 | `sid`                      | Session ID, used for per-session user sign-out. | JWT        |  Personal and Azure AD accounts.   |         |
 | `tenant_ctry`              | Resource tenant's country/region | JWT | | Same as `ctry` except set at a tenant level by an admin.  Must also be a standard two-letter value. |
 | `tenant_region_scope`      | Region of the resource tenant | JWT        |           | |

articles/active-directory/develop/active-directory-optional-claims.md

@@ -6,9 +6,9 @@ summary: >
   our quickstarts, tutorials, and in-depth how-to guides.
 
 metadata:
-   author: mmacy
+   author: Dickson-Mwendia
    manager: CelesteDG
-   ms.author: marsma
+   ms.author: dmwendia
    ms.date: 04/01/2022
    ms.service: active-directory
    ms.subservice: develop

articles/active-directory/develop/index-desktop.yml

@@ -6,9 +6,9 @@ summary: >
   our quickstarts, tutorials, and in-depth how-to guides.
 
 metadata:
-   author: mmacy
+   author: Dickson-Mwendia
    manager: CelesteDG
-   ms.author: marsma
+   ms.author: dmwendia
    ms.date: 04/01/2022
    ms.service: active-directory
    ms.subservice: develop

articles/active-directory/develop/index-mobile.yml

@@ -6,9 +6,9 @@ summary: >
   our quickstarts, tutorials, and in-depth how-to guides.
 
 metadata:
-   author: mmacy
+   author: Dickson-Mwendia
    manager: CelesteDG
-   ms.author: marsma
+   ms.author: dmwendia
    ms.date: 04/01/2022
    ms.service: active-directory
    ms.subservice: develop

articles/active-directory/develop/index-service.yml

@@ -6,9 +6,9 @@ summary: >
   our quickstarts, tutorials, and in-depth how-to guides.
 
 metadata:
-   author: mmacy
+   author: Dickson-Mwendia
    manager: CelesteDG
-   ms.author: marsma
+   ms.author: dmwendia
    ms.date: 04/01/2022
    ms.service: active-directory
    ms.subservice: develop

articles/active-directory/develop/index-spa.yml

@@ -6,8 +6,8 @@ summary: >
   our quickstarts and in-depth how-to guides.
 
 metadata:
-   author: mmacy
-   ms.author: marsma
+   author: Dickson-Mwendia
+   ms.author: dmwendia
    ms.date: 04/01/2022
    ms.service: active-directory
    ms.subservice: develop