Merge branch 'main' into patch-1

Author: DaniEASmith

.openpublishing.publish.config.json

@@ -986,10 +986,12 @@
     ".openpublishing.redirection.azure-percept.json",
     ".openpublishing.redirection.azure-productivity.json",
     ".openpublishing.redirection.azure-australia.json",
+    ".openpublishing.redirection.aks.json",
     "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
     "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
     "articles/azure-relay/.openpublishing.redirection.relay.json",
     "articles/communication-services/.openpublishing.redirection.communication-services.json",
+    "articles/confidential-computing/.openpublishing.redirection.json",
     "articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
     "articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
     "articles/data-catalog/.openpublishing.redirection.data-catalog.json",

.openpublishing.redirection.active-directory.json

@@ -30,11 +30,6 @@
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/active-directory/saas-apps/netmotion-mobility-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",
@@ -2043,7 +2038,7 @@
     {
       "source_path_from_root": "/articles/active-directory/conditional-access/conditional-access-for-exo-and-spo.md",
       "redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/conditional-access/baseline-protection.md",
@@ -4258,7 +4253,12 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/conditional-access/concept-conditional-access-block-legacy-authentication.md",
-      "redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication",
+      "redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication.md",
+      "redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
       "redirect_document_id": true
     },
     {
@@ -10832,16 +10832,55 @@
       "redirect_document_id": false
     },
     {
-      "source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
-      "redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
-      "redirect_document_id": true
+      "source_path": "articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
+      "redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
+      "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
-      "redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
+      "source_path": "articles/azure-percept/voice-control-your-inventory-then-visualize-with-power-bi-dashboard.md",
+      "redirect_url": "/azure/azure-percept/index",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-members-azure-portal.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-delete-group.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-membership-azure-portal.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-settings-azure-portal.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-manage-groups.md",
+      "redirect_url": "/azure/active-directory/fundamentals/concept-learn-about-groups",
+      "redirect_document_id": false
+       },
+{   
+      "source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
+      "redirect_url": "/azure/active-directory/fundamentals/customize-branding",
       "redirect_document_id": false
     }
 
-
   ]
 }

.openpublishing.redirection.aks.json

@@ -0,0 +1,9 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/aks/azure-cni-overlay.md",
+      "redirect_url": "/azure/aks",
+      "redirect_document_id": false
+    }
+  ]
+}

.openpublishing.redirection.azure-monitor.json

@@ -510,6 +510,11 @@
             "source_path_from_root": "/articles/azure-monitor/logs/workspace-design-service-providers.md" ,
             "redirect_url": "/azure/azure-monitor/logs/workspace-design",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-transition-hybrid.md" ,
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-onboard",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-percept.json

@@ -4,6 +4,28 @@
             "source_path_from_root": "/articles/azure-percept/how-to-select-update-package.md",
             "redirect_url": "/azure/azure-percept/how-to-determine-your-update-strategy",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-percept/deepstream/azure-percept-for-deepstream-overview.md",
+            "redirect_url": "/azure/azure-percept/index",
+            "redirect_document_id": false
+        },
+        { 
+            "source_path_from_root": "/articles/azure-percept/hci/azure-percept-on-azure-stack-hci-overview.md",
+            "redirect_url": "/azure/azure-percept/index",
+            "redirect_document_id": false   
+        },
+        {
+            "source_path_from_root": "/articles/azure-percept/studio/azure-percept-studio-overview.md",
+            "redirect_url": "/azure/azure-percept/index",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-percept/open-source/azure-percept-open-source-project-overview.md",
+            "redirect_url": "/azure/azure-percept/index",
+            "redirect_document_id": false
         }
+
     ]
 }
+

.openpublishing.redirection.json

@@ -1,10 +1,15 @@
 {
 	"redirections": [
-		{
+{
     "source_path":  "articles/api-management/zone-redundancy.md",
     "redirect_url":  "/azure/availability-zones/migrate-api-mgt",
     "redirect_document_id":  false
 },
+{
+    "source_path":  "articles/api-management/developer-portal-implement-widgets.md",
+    "redirect_url":  "/azure/api-management/developer-portal-extend-custom-functionality",
+    "redirect_document_id":  false
+},
 {
     "source_path":  "articles/virtual-machines/linux/find-unattached-nics.md",
     "redirect_url":  "/previous-versions/azure/virtual-machines/linux/find-unattached-nics",
@@ -30,6 +35,11 @@
     "redirect_url":  "/previous-versions/azure/germany/germany-get-started-connect-with-ps",
     "redirect_document_id":  false
 },
+{
+    "source_path":  "articles/security/fundamentals/azure-disk-encryption-vms-vmss.md",
+    "redirect_url":  "/azure/virtual-machines/disk-encryption-overview",
+    "redirect_document_id":  false
+},
 {
     "source_path":  "articles/germany/germany-get-started-connect-with-vs.md",
     "redirect_url":  "/previous-versions/azure/germany/germany-get-started-connect-with-vs",
@@ -528,6 +538,11 @@
     "redirect_url":  "/azure/frontdoor/front-door-geo-filtering",
     "redirect_document_id":  false
 },
+{
+    "source_path_from_root":  "/articles/frontdoor/front-door-geo-filtering.md",
+    "redirect_url":  "/azure/web-application-firewall/afds/waf-front-door-geo-filtering",
+    "redirect_document_id":  false
+},
 {
     "source_path_from_root":  "/articles/frontdoor/standard-premium/edge-locations.md",
     "redirect_url":  "/azure/frontdoor/edge-locations-by-region",
@@ -6808,6 +6823,11 @@
     "redirect_url":  "/azure/azure-functions/functions-bindings-error-pages",
     "redirect_document_id":  false
 },
+{
+    "source_path_from_root":  "/articles/azure-functions/functions-debug-event-grid-trigger-local.md",
+    "redirect_url":  "/azure/azure-functions/functions-event-grid-blob-trigger",
+    "redirect_document_id":  false
+},
 {
     "source_path_from_root":  "/articles/azure-government/documentation-government-k8.md",
     "redirect_url":  "/azure/azure-government",
@@ -6908,6 +6928,11 @@
     "redirect_url":  "/azure/azure-government/compare-azure-government-global-azure",
     "redirect_document_id":  false
 },
+{
+    "source_path_from_root":  "/articles/azure-government/documentation-government-overview.md",
+    "redirect_url":  "/azure/azure-government/documentation-government-plan-security",
+    "redirect_document_id":  false
+},
 {
     "source_path_from_root":  "/articles/security/compliance/azure-services-in-fedramp-auditscope.md",
     "redirect_url":  "/azure/azure-government/compliance/azure-services-in-fedramp-auditscope",
@@ -12848,6 +12873,16 @@
     "redirect_url":  "/azure/cloudfoundry/cloudfoundry-deploy-your-first-app",
     "redirect_document_id":  true
 },
+{
+    "source_path_from_root":  "/articles/virtual-machines/linux/overview.md",
+    "redirect_url":  "/azure/virtual-machines/overview",
+    "redirect_document_id":  true
+},
+{
+    "source_path_from_root":  "/articles/virtual-machines/windows/overview.md",
+    "redirect_url":  "/azure/virtual-machines/overview",
+    "redirect_document_id":  false
+},
 {
     "source_path_from_root":  "/articles/virtual-machines/linux/cloudfoundry-get-started.md",
     "redirect_url":  "/azure/cloudfoundry/cloudfoundry-get-started",
@@ -18304,14 +18339,19 @@
     "redirect_document_id":  false
 },
 {
-    "source_path_from_root":  "/articles/connectors/connectors-create-api-bingsearch.md",
+    "source_path_from_root": "/articles/connectors/connectors-create-api-bingsearch.md",
     "redirect_url":  "/connectors/bingsearch",
-    "redirect_document_id":  false
+    "redirect_document_id": false
 },
 {
-  "source_path_from_root": "/articles/connectors/connectors-create-api-twilio.md",
-  "redirect_url": "/connectors/twilio",
-  "redirect_document_id": false
+    "source_path_from_root": "/articles/connectors/connectors-create-api-twilio.md",
+    "redirect_url": "/connectors/twilio",
+    "redirect_document_id": false
+},
+{
+    "source_path_from_root": "/articles/connectors/connectors-create-api-sendgrid.md",
+    "redirect_url": "/connectors/sendgrid",
+    "redirect_document_id": false
 },
 {
   "source_path_from_root":  "/articles/connectors/connectors-schema-migration.md",
@@ -22318,6 +22358,11 @@
     "redirect_url":  "/azure/storage/common/customer-managed-keys-configure-key-vault",
     "redirect_document_id":  false
 },
+{
+    "source_path_from_root":  "/articles/storage/common/customer-managed-keys-configure-key-vault.md",
+    "redirect_url":  "/azure/storage/common/customer-managed-keys-configure-existing-account",
+    "redirect_document_id":  false
+},
 {
     "source_path_from_root":  "/articles/storage/common/encryption-customer-managed-keys.md",
     "redirect_url":  "/azure/storage/common/customer-managed-keys-overview",
@@ -34202,6 +34247,16 @@
     "source_path_from_root":  "/articles/virtual-machines/windows/winrm.md",
     "redirect_url":  "/azure/virtual-machines/windows/connect-winrm",
     "redirect_document_id":  false
+},
+{
+    "source_path_from_root":  "/articles/azure-arc/servers/data-residency.md",
+    "redirect_url":  "/azure/azure-arc/servers/overview",
+    "redirect_document_id":  false
+},
+{
+  "source_path_from_root": "/articles/virtual-machines/linux/copy-files-to-linux-vm-using-scp.md",
+  "redirect_url": "/azure/virtual-machines/copy-files-to-vm-using-scp",
+  "redirect_document_id": false
 }
 	]
 }

articles/active-directory-b2c/TOC.yml

@@ -355,7 +355,7 @@
       items:
       - name: Multi-factor authentication
         href: multi-factor-authentication.md
-        displayName: TOTP, time-based-one-time password, time-based one-time password, authenticator app, Microsoft authenticator app, mfa, 2fa
+        displayName: TOTP, multi-factor, multifactor, time-based-one-time password, time-based one-time password, authenticator app, Microsoft authenticator app, mfa, 2fa
       - name: Partner integration
         items:
         - name: Asignio
@@ -482,6 +482,8 @@
     - name: Identity verification and proofing partners
       href: identity-verification-proofing.md
       displayName: id verify, id verification, azure ad b2c proofing, id proofing
+    - name: Deduce
+      href: partner-deduce.md
     - name: eID-Me
       href: partner-eid-me.md
     - name: Experian

articles/active-directory-b2c/configure-authentication-in-azure-static-app.md

@@ -7,7 +7,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 06/28/2022
+ms.date: 08/22/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: "b2c-support"
@@ -30,7 +30,7 @@ OpenID Connect (OIDC) is an authentication protocol that's built on OAuth 2.0. U
 When the access token expires or the app session is invalidated, Azure Static Web App initiates a new authentication request and redirects users to Azure AD B2C. If the Azure AD B2C [SSO session](session-behavior.md) is active, Azure AD B2C issues an access token without prompting users to sign in again. If the Azure AD B2C session expires or becomes invalid, users are prompted to sign in again.
 
 ## Prerequisites
-
+- A premium Azure subscription. 
 - If you haven't created an app yet, follow the guidance how to create an [Azure Static Web App](../static-web-apps/overview.md).
 - Familiarize yourself with the Azure Static Web App [staticwebapp.config.json](../static-web-apps/configuration.md) configuration file.
 - Familiarize yourself with the Azure Static Web App [App Settings](../static-web-apps/application-settings.md).