Merge pull request #149034 from MicrosoftDocs/master

Merge Master to Live, 4 AM

Author: PMEds28

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/azure-percept/advanced-development-cloud.md",
+      "redirect_url": "/azure/azure-percept/overview-advanced-code",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-percept/advanced-development-local.md",
+      "redirect_url": "/azure/azure-percept/overview-advanced-code",
+      "redirect_document_id": false
+    },
   {
       "source_path": "articles/cosmos-db/create-mongodb-flask.md",
       "redirect_url": "/azure/cosmos-db/mongodb-introduction",
@@ -920,6 +930,11 @@
       "redirect_url": "/azure/active-directory-b2c/identity-protection-investigate-risk",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory-b2c/connect-with-saml-service-providers.md",
+      "redirect_url": "/azure/active-directory-b2c/saml-service-provider",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory-b2c/conditional-access-technical-profile.md",
       "redirect_url": "/azure/active-directory-b2c/conditional-access-user-flow",
@@ -935,11 +950,6 @@
       "redirect_url": "/azure/active-directory-b2c/identity-provider-google-custom",
       "redirect_document_id": true
     },
-    {
-      "source_path_from_root": "/articles/active-directory-b2c/active-directory-b2c-custom-setup-li-idp.md",
-      "redirect_url": "/azure/active-directory-b2c/identity-provider-linkedin",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/active-directory-b2c/active-directory-b2c-setup-li-app.md",
       "redirect_url": "/azure/active-directory-b2c/identity-provider-linkedin",
@@ -5314,6 +5324,11 @@
       "redirect_url": "/azure/partner-solutions/overview",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/partner-solutions/apache-kafka-confluent-cloud/index.md",
+      "redirect_url": "/azure/partner-solutions/apache-kafka-confluent-cloud/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/avere-vfxt/avere-vfxt-required-ports.md",
       "redirect_url": "/azure/avere-vfxt/avere-vfxt-additional-resources",
@@ -14464,6 +14479,46 @@
       "redirect_url": "/azure/cosmos-db/create-sql-api-java",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/cosmos-db/restorable-database-accounts-list.md",
+      "redirect_url": "/rest/api/cosmos-db-resource-provider/2020-06-01-preview/restorabledatabaseaccounts/list",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/cosmos-db/restorable-database-accounts-list-by-location.md",
+      "redirect_url": "/rest/api/cosmos-db-resource-provider/2020-06-01-preview/restorabledatabaseaccounts/listbylocation",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/cosmos-db/restorable-sql-resources-list.md",
+      "redirect_url": "/rest/api/cosmos-db-resource-provider/2020-06-01-preview/restorablesqlresources/list",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/cosmos-db/restorable-sql-databases-list.md",
+      "redirect_url": "/rest/api/cosmos-db-resource-provider/2020-06-01-preview/restorablesqldatabases/list",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/cosmos-db/restorable-sql-containers-list.md",
+      "redirect_url": "/rest/api/cosmos-db-resource-provider/2020-06-01-preview/restorablesqlcontainers/list",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/cosmos-db/restorable-mongodb-resources-list.md",
+      "redirect_url": "/rest/api/cosmos-db-resource-provider/2020-06-01-preview/restorablemongodbresources/list",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/cosmos-db/restorable-mongodb-collections-list.md",
+      "redirect_url": "/rest/api/cosmos-db-resource-provider/2020-06-01-preview/restorablemongodbcollections/list",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/cosmos-db/restorable-mongodb-databases-list.md",
+      "redirect_url": "/rest/api/cosmos-db-resource-provider/2020-06-01-preview/restorablemongodbdatabases/list",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/cosmos-db/create-documentdb-nodejs.md",
       "redirect_url": "/azure/cosmos-db/create-sql-api-nodejs",
@@ -23371,8 +23426,8 @@
     },
     {
       "source_path_from_root": "/articles/iot-central/healthcare/howto-health-data-triage.md",
-      "redirect_url": "/azure/iot-central/healthcare/tutorial-health-data-triage",
-      "redirect_document_id": true
+      "redirect_url": "/azure/iot-central/healthcare/tutorial-health-data-triage/",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/iot-central/core/index.yml",
@@ -32574,6 +32629,26 @@
       "redirect_url": "/azure/security-center/defender-for-app-service-introduction",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/security-center/security-center-monitoring.md",
+      "redirect_url": "/azure/security-center/security-center-remediate-recommendations",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/security-center/security-center-using-recommendations.md",
+      "redirect_url": "/azure/security-center/security-center-remediate-recommendations",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/security-center/configure-security-policy-azure-policy.md",
+      "redirect_url": "/azure/security-center/custom-security-policies?pivot=rest-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/security-center/security-center-alerts-cloud-smart.md",
+      "redirect_url": "/azure/security-center/security-center-alerts-overview.md#cloud-smart-alert-correlation-in-azure-security-center-incidents",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/security-center/azure-container-registry-integration.md",
       "redirect_url": "/azure/security-center/defender-for-container-registries-introduction",
@@ -64233,6 +64308,11 @@
       "source_path": "articles/azure-monitor/app/usage-send-user-context.md",
       "redirect_url": "/azure/azure-monitor/app/usage-overview",
       "redirect_document_id": false
-  }
+    },
+    {
+      "source_path": "articles/virtual-network/quickstart-create-nat-gateway-portal.md",
+      "redirect_url": "/azure/virtual-network/tutorial-create-nat-gateway-portal",
+      "redirect_document_id": false
+    }
   ]
 }

articles/active-directory-b2c/TOC.yml

@@ -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
@@ -160,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

articles/active-directory-b2c/claim-resolver-overview.md

@@ -83,6 +83,7 @@ The following sections list available claim resolvers.
 | {Context:CorrelationId} | The correlation ID.  | 00000000-0000-0000-0000-000000000000 |
 | {Context:DateTimeInUtc} |The date time in UTC.  | 10/10/2018 12:00:00 PM |
 | {Context:DeploymentMode} |The policy deployment mode.  | Production |
+| {Context:HostName} | The host name for the current request.  | contoso.b2clogin.com |
 | {Context:IPAddress} | The user IP address. | 11.111.111.11 |
 | {Context:KMSI} | Indicates whether [Keep me signed in](session-behavior.md?pivots=b2c-custom-policy#enable-keep-me-signed-in-kmsi) checkbox is selected. |  true |
 
@@ -137,7 +138,7 @@ You can use claims resolvers with the following elements:
 |[OpenID Connect](openid-connect-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
 |[Claims transformation](claims-transformation-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
 |[RESTful provider](restful-technical-profile.md) technical profile| `InputClaim`| 1, 2|
-|[SAML identity provider](saml-identity-provider-technical-profile.md)  technical profile| `OutputClaim`| 1, 2|
+|[SAML identity provider](identity-provider-generic-saml.md)  technical profile| `OutputClaim`| 1, 2|
 |[Self-Asserted](self-asserted-technical-profile.md) technical profile| `InputClaim`, `OutputClaim`| 1, 2|
 |[ContentDefinition](contentdefinitions.md)| `LoadUri`| |
 |[ContentDefinitionParameters](relyingparty.md#contentdefinitionparameters)| `Parameter` | |