Merge pull request #71584 from MicrosoftDocs/repo_sync_working_branch

Resolve syncing conflicts from repo_sync_working_branch to master

Author: ktoliver

.openpublishing.publish.config.json

@@ -201,6 +201,11 @@
       "path_to_root": "functions-docs-powershell",
       "url": "https://github.com/Azure-Samples/functions-docs-powershell",
       "branch": "master"
+    },    
+    {
+      "path_to_root": "azure-functions-dotnet-worker",
+      "url": "https://github.com/Azure/azure-functions-dotnet-worker",
+      "branch": "main"
     },
     {
       "path_to_root": "samples-personalizer",
@@ -272,6 +277,11 @@
       "url": "https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials",
       "branch": "master"
     },
+    {
+      "path_to_root": "media-services-v3-dotnet",
+      "url": "https://github.com/Azure-Samples/media-services-v3-dotnet",
+      "branch": "main"
+    },
     {
       "path_to_root": "samples-javascript",
       "url": "https://github.com/Microsoft/tsiclient",
@@ -573,6 +583,11 @@
       "path_to_root": "digital-twins-docs-samples",
       "url": "https://github.com/azure-samples/digital-twins-docs-code",
       "branch": "main"
+    },
+    {
+      "path_to_root": "digital-twins-docs-samples-dps",
+      "url": "https://github.com/Azure-Samples/digital-twins-iothub-integration",
+      "branch": "main"
     }
   ],
   "branch_target_mapping": {

.openpublishing.redirection.json

@@ -101,9 +101,14 @@
       href: tutorial-register-applications.md
     - name: Register a single-page application (SPA)
       href: tutorial-register-spa.md
-    - name: Register a SAML service provider
-      href: connect-with-saml-service-providers.md
-      displayName: SP, RP, service provider, connect
+    - name: SAML application
+      items:
+      - name: Configure a SAML application
+        href: saml-service-provider.md
+        displayName: SP, service provider
+      - name: Configure SAML application options
+        href: saml-service-provider-options.md
+        displayName: SP, service provider 
     - name: Register a Microsoft Graph application
       href: microsoft-graph-get-started.md
       displayName: migrate, migration, microsoft graph
@@ -121,10 +126,14 @@
       href: add-sign-up-and-sign-in-policy.md
     - name: Sign-in policy
       href: add-sign-in-policy.md
-    - name: Password reset policy
-      href: add-password-reset-policy.md
-    - name: Password change policy
-      href: add-password-change-policy.md
+    - name: Password reset policies
+      items:
+      - name: Self-service password reset
+        href: add-password-reset-policy.md
+      - name: Self-service password change
+        href: add-password-change-policy.md
+      - name: Force password reset
+        href: force-password-reset.md
     - name: Profile editing policy
       href: add-profile-editing-policy.md
     - name: Resource owner password credentials policy
@@ -146,6 +155,8 @@
       displayName: AD-FS, ADFS
     - name: Amazon
       href: identity-provider-amazon.md
+    - name: Apple (Preview)
+      href: identity-provider-apple-id.md 
     - name: Azure AD (Single-tenant)
       href: identity-provider-azure-ad-single-tenant.md
     - name: Azure AD (Multi-tenant)
@@ -154,8 +165,14 @@
       href: identity-provider-azure-ad-b2c.md
     - name: Facebook
       href: identity-provider-facebook.md
-    - name: Generic identity provider
+    - name: Generic OpenId Connect
       href: identity-provider-generic-openid-connect.md
+    - name: Generic SAML identity provider
+      items:
+      - name: Configure a SAML identity provider
+        href: identity-provider-generic-saml.md
+      - name: Configure SAML identity provider options
+        href: identity-provider-generic-saml-options.md
     - name: GitHub
       href: identity-provider-github.md
     - name: Google
@@ -213,11 +230,11 @@
       href: configure-tokens.md
   - name: Define custom attributes
     href: user-flow-custom-attributes.md
-  - name: Identity Protection and Conditional Access
+  - name: Risk-based authentication
     items:
-    - name: Set up Identity Protection and Conditional Access
-      href: conditional-access-identity-protection-setup.md
-    - name: Add Conditional Access
+    - name: Investigate risk with Identity Protection
+      href: identity-protection-investigate-risk.md
+    - name: Configure Conditional Access
       href: conditional-access-user-flow.md
   - name: Configure age gating
     href: basic-age-gating.md
@@ -323,9 +340,6 @@
             href: aad-sspr-technical-profile.md
           - name: Claims transformation
             href: claims-transformation-technical-profile.md
-          - name: Conditional Access 
-            href: conditional-access-technical-profile.md
-            displayName: ca
           - name: ID token hint
             href: id-token-hint.md
           - name: JWT token issuer
@@ -520,4 +534,4 @@
     href: ../active-directory/fundamentals/active-directory-troubleshooting-support-howto.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
     displayName: technical
   - name: Videos
-    href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory-b2c
+    href: azure-ad-external-identities-videos.md

articles/active-directory-b2c/TOC.yml

@@ -87,7 +87,7 @@ https://jwt.ms/?code=eyJraWQiOiJjcGltY29yZV8wOTI1MjAxNSIsInZlciI6IjEuMC...
 After successfully receiving the authorization code, you can use it to request an access token:
 
 ```http
-POST <tenant-name>.onmicrosoft.com/<policy-name>/oauth2/v2.0/token HTTP/1.1
+POST <tenant-name>.b2clogin.com/<tenant-name>.onmicrosoft.com/<policy-name>/oauth2/v2.0/token HTTP/1.1
 Host: <tenant-name>.b2clogin.com
 Content-Type: application/x-www-form-urlencoded
 

articles/active-directory-b2c/access-tokens.md

@@ -6,7 +6,7 @@ author: msmimart
 manager: celestedg
 
 ms.author: mimart
-ms.date: 01/14/2021
+ms.date: 03/03/2021
 ms.custom: mvc
 ms.topic: how-to
 ms.service: active-directory
@@ -31,6 +31,7 @@ You typically use only one identity provider in your applications, but you have
 
 * [AD FS](identity-provider-adfs.md)
 * [Amazon](identity-provider-amazon.md)
+* [Apple](identity-provider-apple-id.md)
 * [Azure AD (Single-tenant)](identity-provider-azure-ad-single-tenant.md)
 * [Azure AD (Multi-tenant)](identity-provider-azure-ad-multi-tenant.md)
 * [Azure AD B2C](identity-provider-azure-ad-b2c.md)