Fixed merge conflict in sys req file

Author: alkohli

.gitignore

@@ -25,4 +25,4 @@ AzureMigration.ps1
 **/.vscode/settings.json
 !/.vscode/settings.json
 
-desktop.ini
+desktop.ini

.openpublishing.publish.config.json

@@ -243,6 +243,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-search-dotnet-samples",
+      "url": "https://github.com/Azure-Samples/azure-search-dotnet-samples",
+      "branch": "master",
+      "branch_mapping": {}
+    },    
     {
       "path_to_root": "samples-personalizer",
       "url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
@@ -357,6 +363,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "media-services-v3-node-tutorials",
+      "url": "https://github.com/Azure-Samples/media-services-v3-node-tutorials",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "remote-monitoring-webui",
       "url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",

.openpublishing.redirection.json

@@ -605,6 +605,11 @@
             "redirect_url": "transform-custom-preset-cli-how-to",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/media-services/video-indexer/observed-people-tracing.md",
+            "redirect_url": "../../media-services/",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/media-services/latest/encode-custom-preset-rest-how-to.md",
             "redirect_url": "transform-custom-preset-rest-how-to",

.openpublishing.redirection.media-services.json

@@ -0,0 +1,24 @@
+{
+    "$schema": "https://whatsnewapi.azurewebsites.net/schema",
+    "docSetProductName": "Azure Active Directory application proxy",
+    "rootDirectory": "articles/active-directory/app-proxy/",
+    "docLinkSettings": {
+        "linkFormat": "relative",
+        "relativeLinkPrefix": "/azure/active-directory/app-proxy"
+    },
+    "inclusionCriteria": {
+        "excludePullRequestTitles": true,
+        "minAdditionsToFile" : 2,
+        "maxFilesChanged": 50,
+        "labels": [
+            "label:active-directory/svc",
+            "label:app-proxy/subsvc"
+        ]
+    },
+    "areas": [
+        {
+            "name": ".",
+            "heading": "Azure Active Directory application proxy"
+        }
+    ]
+}

.openpublishing.redirection.security-benchmark.json

@@ -7,7 +7,7 @@
         "relativeLinkPrefix": "/azure/active-directory/develop"
     },
     "inclusionCriteria": {
-        "excludePullRequestTitles": true,
+        "omitPullRequestTitles" : true,
         "minAdditionsToFile" : 20,
         "maxFilesChanged": 50,
         "labels": [
@@ -17,7 +17,7 @@
     },
     "areas": [
         {
-            "name": ".",
+            "names": [ "."],
             "heading": "Microsoft identity platform"
         }
     ]

.whatsnew/.application-proxy.json

@@ -57,6 +57,10 @@ articles/terraform/ @TomArcherMsft
 articles/virtual-machines/ @cynthn @mimckitt
 articles/virtual-machine-scale-sets/ @ju-shim @mimckitt
 articles/cloud-services/ @mimckitt
+articles/cloud-services-extended-support/ @mimckitt
+articles/service-fabric/ @erikadoyle @mimckitt
+articles/container-instances/ @macolso @mimckitt
+articles/container-registry/ @dlepow @mimckitt
 
 # Requires Internal Review
 articles/best-practices-availability-paired-regions.md @martinekuan @syntaxc4 @snoviking

.whatsnew/.microsoft-identity-platform.json

@@ -2,7 +2,7 @@
 
 Thank you for taking the time to contribute to the Microsoft Azure documentation.
 
-This guide covers some general topics around contribution and refers out to our [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations where relevant.
+This guide covers some general topics related to contribution and refers to the [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations when required.
 
 ## Code of Conduct
 

CODEOWNERS

@@ -45,6 +45,8 @@
       href: tutorial-desktop-app-webapi.md
     - name: Single page
       href: tutorial-single-page-app-webapi.md
+  - name: 6 - Clean up and delete tenant
+    href: tutorial-delete-tenant.md
 - name: Samples
   href: code-samples.md
 - name: Concepts
@@ -86,6 +88,9 @@
       href: user-flow-overview.md
     - name: Custom policy overview
       href: custom-policy-overview.md
+  - name: API Connectors
+    href: api-connectors-overview.md
+    displayName: REST API, web API, API connectors
   - name: User accounts
     href: user-overview.md
   - name: User profile attributes
@@ -96,6 +101,8 @@
     href: policy-keys-overview.md
 - name: How-to guides
   items:
+  - name: Manage your tenant
+    href: tenant-management.md
   - name: App integration
     items:
     - name: Register a web application
@@ -167,6 +174,8 @@
       href: identity-provider-azure-ad-multi-tenant.md
     - name: Azure AD B2C
       href: identity-provider-azure-ad-b2c.md
+    - name: eBay
+      href: identity-provider-ebay.md
     - name: Facebook
       href: identity-provider-facebook.md
     - name: Generic OpenId Connect
@@ -273,26 +282,18 @@
       href: conditional-access-user-flow.md
   - name: Configure age gating
     href: age-gating.md
-  - name: API connectors (preview)
+  - name: API connectors
     items:
-    - name: Overview
-      href: api-connectors-overview.md
-    - name: Add an API connector
+    - name: Add an API connector to a sign-up user flow
       href: add-api-connector.md
+      displayName: rest claims validation, validate
+    - name: Add an API connector to a sign-up or sign-in user flow
+      href: custom-policy-rest-api-claims-exchange.md
+      displayName: rest claims exchange
+    - name: Secure an API connector
+      href: secure-rest-api.md
   - name: Custom policy
     items:
-    - name: Add your own business logic
-      items:
-      - name: Integrate REST API
-        href: custom-policy-rest-api-intro.md
-      - name: Validate user input
-        href: custom-policy-rest-api-claims-validation.md
-        displayName: rest claims validation, validate
-      - name: Obtain additional claims
-        href: custom-policy-rest-api-claims-exchange.md
-        displayName: rest claims exchange
-      - name: Secure REST API
-        href: secure-rest-api.md
     - name: Troubleshooting
       items:
       - name: Collect logs using Application Insights
@@ -321,15 +322,18 @@
       href: partner-lexisnexis.md
     - name: Onfido
       href: partner-onfido.md
-  - name: Fraud protection
+  - name: Fraud protection partners
     items: 
-    - name: Microsoft Dynamics 365 Fraud Protection
-      href: partner-dynamics-365-fraud-protection.md
-      displayName: m365 dynamics, dynamics fraud protection, fraud, 365 protection
     - name: Arkose Labs
       href: partner-arkose-labs.md
       displayName: fraud protection, fraud, Azure AD b2c, protection, B2Cprotection
-  - name: Secure legacy and on-premises apps
+    - name: BioCatch
+      href: partner-biocatch.md
+      displayName: fraud protection, fraud, Azure AD b2c, protection, B2Cprotection, user behavior
+    - name: Microsoft Dynamics 365 Fraud Protection
+      href: partner-dynamics-365-fraud-protection.md
+      displayName: m365 dynamics, dynamics fraud protection, fraud, 365 protection
+  - name: Secure access to legacy and on-premises apps
     items:
     - name: Ping Identity
       href: partner-ping-identity.md
@@ -345,6 +349,10 @@
       href: b2clogin.md
     - name: Configure a custom domain
       href: custom-domain.md
+    - name: Web Application Firewall partners
+      items:
+      - name: Cloudflare
+        href: partner-cloudflare.md
     - name: Configure web API domains 
       href: multiple-token-endpoints.md
       displayName: migrate, b2clogin, owin
@@ -458,6 +466,8 @@
           href: aad-sspr-technical-profile.md
         - name: Claims transformation
           href: claims-transformation-technical-profile.md
+        - name: Conditional access
+          href: conditional-access-technical-profile.md
         - name: ID token hint
           href: id-token-hint.md
         - name: JWT token issuer
@@ -492,10 +502,12 @@
       href: relyingparty.md
     - name: Claim resolvers
       href: claim-resolver-overview.md
-  - name: Custom policy release notes
+  - name: Release notes
     href: custom-policy-developer-notes.md
   - name: Service limits and restrictions
     href: service-limits.md
+  - name: TLS and cipher suite requirements
+    href: https-cipher-tls-requirements.md
   - name: App registrations
     href: app-registrations-training-guide.md
   - name: Billing model