Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-bugfix

Author: HeidiSteen

.openpublishing.publish.config.json

@@ -403,6 +403,11 @@
       "url": "https://github.com/Azure-Samples/azure-spring-data-cosmos-java-sql-api-getting-started/",
       "branch": "main"
     },    
+    {
+      "path_to_root": "azure-cosmos-spark",
+      "url": "https://github.com/Azure/azure-cosmosdb-spark",
+      "branch": "2.4"
+    },     
     {
       "path_to_root": "cosmos-dotnet-getting-started",
       "url": "https://github.com/Azure-Samples/cosmos-dotnet-getting-started",
@@ -554,6 +559,11 @@
       "path_to_root": "azure-storage-snippets",
       "url": "https://github.com/azure-samples/AzureStorageSnippets",
       "branch": "master"
+    },
+    {
+      "path_to_root": "azure-sdk-for-net",
+      "url": "https://github.com/Azure/azure-sdk-for-net/",
+      "branch": "master"
     }
   ],
   "branch_target_mapping": {

.openpublishing.redirection.json

@@ -8,11 +8,17 @@
     },
     "inclusionCriteria": {
         "excludePullRequestTitles": true,
+        "minAdditionsToFile" : 10,
+        "maxFilesChanged": 200,
         "labels": [
             "label:cognitive-services/svc"
         ]
     },
     "areas": [
+        {
+            "name": ".",
+            "heading": "Miscellaneous"
+        },
         {
             "name": "Anomaly-Detector",
             "heading": "Anomaly Detector"
@@ -71,19 +77,19 @@
         },
         {
             "name": "Ink-Recognizer",
-            "heading": "Ink-Recognizer"
+            "heading": "Ink Recognizer"
         },
         {
             "name": "LUIS",
             "heading": "LUIS"
         },
         {
-            "name": "QnAMaker",
-            "heading": "QnA Maker"
+            "name": "metrics-advisor",
+            "heading": "Metrics Advisor"
         },
         {
-            "name": "Speaker-recognition",
-            "heading": "Speaker Recognition"
+            "name": "QnAMaker",
+            "heading": "QnA Maker"
         },
         {
             "name": "Speech-Service",

.whatsnew/.cognitive-services.json

@@ -0,0 +1,24 @@
+{
+    "$schema": "https://whatsnewapi.azurewebsites.net/schema",
+    "docSetProductName": "Microsoft identity platform",
+    "rootDirectory": "articles/active-directory/develop/",
+    "docLinkSettings": {
+        "linkFormat": "relative",
+        "relativeLinkPrefix": "/azure/active-directory/develop"
+    },
+    "inclusionCriteria": {
+        "excludePullRequestTitles": true,
+        "minAdditionsToFile" : 20,
+        "maxFilesChanged": 50,
+        "labels": [
+            "label:active-directory/svc",
+            "label:develop/subsvc"
+        ]
+    },
+    "areas": [
+        {
+            "name": ".",
+            "heading": "Microsoft identity platform"
+        }
+    ]
+}

.whatsnew/.microsoft-identity-platform.json

@@ -3,18 +3,19 @@
 # Horizontals
 
 ## Azure Policy: Samples and Compliance Controls
-articles/**/policy-samples.md @DCtheGeek
+articles/**/policy-reference.md @DCtheGeek
 articles/**/security-controls-policy.md @DCtheGeek
 includes/policy/ @DCtheGeek
 
 # Azure Active Directory
 
 articles/active-directory-b2c/ @msmimart @yoelhor
 articles/active-directory/app-provisioning/ @CelesteDG
+articles/active-directory/develop/ @mmacy
 articles/active-directory/manage-apps/ @CelesteDG
 
 # Cognitive Services
-articles/cognitive-services/ @diberry @erhopf @aahill @trevorbye @patrickfarley @nitinme
+articles/cognitive-services/ @erhopf @aahill @trevorbye @patrickfarley @nitinme @mrbullwinkle
 
 # DevOps
 articles/ansible/ @TomArcherMsft
@@ -23,9 +24,9 @@ articles/jenkins/ @TomArcherMsft
 articles/terraform/ @TomArcherMsft
 
 # compute
-articles/virtual-machines/ @cynthn @mimckitt 
-articles/virtual-machine-scale-sets/ @ju-shim @mimckitt 
-articles/cloud-services/ @mimckitt 
+articles/virtual-machines/ @cynthn @mimckitt
+articles/virtual-machine-scale-sets/ @ju-shim @mimckitt
+articles/cloud-services/ @mimckitt
 
 # Requires Internal Review
 articles/best-practices-availability-paired-regions.md @martinekuan @syntaxc4 @snoviking

CODEOWNERS

@@ -51,6 +51,18 @@
   href: code-samples.md
 - name: Concepts
   items:
+  - name: Compare solutions for External Identities
+    href: https://docs.microsoft.com/azure/active-directory/b2b/compare-with-b2c?toc=/azure/active-directory-b2c/TOC.json&bc=/azure/active-directory-b2c/bread/toc.json
+  - name: Learn the basics
+    items:
+    - name: Authentication and authorization
+      href: https://docs.microsoft.com/azure/active-directory/develop/authentication-vs-authorization?toc=/azure/active-directory-b2c/TOC.json&bc=/azure/active-directory-b2c/bread/toc.json
+    - name: Tokens
+      href: https://docs.microsoft.com/azure/active-directory/develop/security-tokens?toc=/azure/active-directory-b2c/TOC.json&bc=/azure/active-directory-b2c/bread/toc.json
+    - name: Protocols
+      href: https://docs.microsoft.com/azure/active-directory/develop/v2-app-types?toc=/azure/active-directory-b2c/TOC.json&bc=/azure/active-directory-b2c/bread/toc.json
+    - name: Authentication library
+      href: https://docs.microsoft.com/azure/active-directory/develop/msal-overview?toc=/azure/active-directory-b2c/TOC.json&bc=/azure/active-directory-b2c/bread/toc.json
   - name: Azure AD B2C best practices
     href: best-practices.md
   - name: Application types
@@ -69,6 +81,8 @@
         href: tokens-overview.md
       - name: Request access token
         href: access-tokens.md
+  - name: Policy keys
+    href: policy-keys-overview.md
   - name: User flow and policy
     items:
     - name: User flows
@@ -81,12 +95,16 @@
     href: user-profile-attributes.md
   - name: SSO sessions
     href: session-overview.md
+  - name: Identity Protection and Conditional Access
+    href: conditional-access-identity-protection-overview.md
 - name: How-to guides
   items:
   - name: App integration
     items:
-    - name: Register an application
+    - name: Register a web application
       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
@@ -111,6 +129,8 @@
         href: configure-ropc.md
       - name: Set up self-serve password reset
         href: user-flow-self-service-password-reset.md
+    - name: Add Conditional Access
+      href: conditional-access-user-flow.md
     - name: UX customization
       items:
       - name: Customize the UI
@@ -162,8 +182,16 @@
       href: basic-age-gating.md
     - name: Define custom attributes
       href: user-flow-custom-attributes.md
+    - name: API connectors (preview)
+      items:
+      - name: Overview
+        href: api-connectors-overview.md
+      - name: Add an API connector
+        href: add-api-connector.md
     - name: Pass through external IdP token
       href: idp-pass-through-user-flow.md
+  - name: Identity Protection and Conditional Access
+    href: conditional-access-identity-protection-setup.md
   - name: Custom policy
     items:
     - name: Create a policy
@@ -333,6 +361,11 @@
             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
             href: jwt-issuer-technical-profile.md
           - name: OAuth1
@@ -359,6 +392,8 @@
             displayName: single sign-on
       - name: UserJourneys
         href: userjourneys.md
+      - name: SubJourneys
+        href: subjourneys.md
       - name: RelyingParty
         href: relyingparty.md
       - name: Claim resolvers
@@ -371,16 +406,20 @@
       href: partner-arkose-labs.md
     - name: Experian
       href: partner-experian.md
+    - name: HYPR
+      href: partner-hypr.md
     - name: IDology
       href: partner-idology.md
     - name: itsme
       href: partner-itsme.md
-    - name: LexisNexis
-      href: partner-lexisnexis.md
     - name: Jumio
       href: partner-jumio.md
+    - name: LexisNexis
+      href: partner-lexisnexis.md
     - name: Onfido
       href: partner-onfido.md
+    - name: Saviynt
+      href: partner-saviynt.md
     - name: Trusona
       href: partner-trusona.md
     - name: Twilio
@@ -445,7 +484,7 @@
     href: error-codes.md
   - name: Extensions app
     href: extensions-app.md
-  - name: IEF release notes
+  - name: Custom policy (IEF) release notes
     href: custom-policy-developer-notes.md
   - name: Microsoft Graph API operations
     href: microsoft-graph-operations.md