Merge branch 'main' into patch-7

Author: Court72

.openpublishing.publish.config.json

@@ -1215,16 +1215,18 @@
   ".openpublishing.redirection.container-service.json",
   ".openpublishing.redirection.defender-for-cloud.json",
   ".openpublishing.redirection.defender-for-iot.json",
+  ".openpublishing.redirection.devops-project.json",
+  ".openpublishing.redirection.guidance.json",
   ".openpublishing.redirection.iot-hub-device-update.json",
   ".openpublishing.redirection.key-vault.json",
   ".openpublishing.redirection.machine-configuration.json",
   ".openpublishing.redirection.marketplace.json",
   ".openpublishing.redirection.openshift.json",
   ".openpublishing.redirection.security-benchmark.json",
+  ".openpublishing.redirection.sentinel.json",
+  ".openpublishing.redirection.spring-cloud.json",
   ".openpublishing.redirection.sql-database.json",
   ".openpublishing.redirection.virtual-desktop.json",
-  ".openpublishing.redirection.devops-project.json",
-  ".openpublishing.redirection.sentinel.json",
   "articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
   "articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
   "articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
@@ -1233,6 +1235,7 @@
   "articles/ai-services/.openpublishing.redirection.cognitive-services.json",
   "articles/ai-studio/.openpublishing.redirection.ai-studio.json",
   "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
+  "articles/azure-functions/.openpublishing.redirection.azure-functions.json",
   "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
   "articles/azure-relay/.openpublishing.redirection.relay.json",
   "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
@@ -1288,7 +1291,6 @@
   "articles/site-recovery/.openpublishing.redirection.site-recovery.json",
   "articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
   "articles/spring-apps/.openpublishing.redirection.spring-apps.json",
-  "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
   "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
   "articles/storsimple/.openpublishing.redirection.storsimple.json",
   "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",

.openpublishing.redirection.azure-monitor.json

@@ -5146,7 +5146,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/platform/partners.md",
-            "redirect_url": "/azure/azure-monitor//partners",
+            "redirect_url": "/azure/azure-monitor/overview#integrate",
             "redirect_document_id": false
         },
         {
@@ -6599,6 +6599,11 @@
             "redirect_url": "/azure/azure-monitor/app/java-get-started-supplemental",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/partners.md",
+            "redirect_url": "/azure/azure-monitor/overview#integrate",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/monitor-reference.md",
             "redirect_url": "/azure/azure-monitor/overview",

.openpublishing.redirection.defender-for-cloud.json

@@ -920,6 +920,21 @@
             "redirect_url": "/azure/defender-for-cloud/multicloud",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/concept-aws-connector.md",
+            "redirect_url": "/azure/defender-for-cloud/quickstart-onboard-aws",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/concept-gcp-connector.md",
+            "redirect_url": "/azure/defender-for-cloud/quickstart-onboard-gcp",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-vulnerability-assessment-elastic.md",
+            "redirect_url": "/azure/defender-for-cloud/agentless-vulnerability-assessment-aws",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/how-to-migrate-to-built-in.md",
             "redirect_url": "/azure/defender-for-cloud/how-to-transition-to-built-in",

.openpublishing.redirection.guidance.json

@@ -2,7 +2,7 @@
 
 Thank you for taking the time to contribute to the Microsoft Azure documentation.
 
-This guide covers some general topics related to contribution and refers to our [contributor guide](/contribute/content) for more detailed explanations when required.
+This guide covers some general topics related to contribution and refers to our [contributor guide](https://learn.microsoft.com/contribute/content) for more detailed explanations when required.
 
 ## Code of Conduct
 
@@ -22,8 +22,8 @@ Please use the Feedback tool at the bottom of any article to submit bugs and sug
 
 ### Edit in GitHub
 
-Follow the guidance for [Quick edits to existing documents](/contribute/content/#quick-edits-to-documentation) in our contributor guide.
+Follow the guidance for [editing documentation in the browser](https://learn.microsoft.com/contribute/content/how-to-write-quick-edits) in our contributor guide.
 
 ## Pull requests
 
-Review the guidance for [pull-request processing](/contribute/content/process-pull-request) in our contributor guide.
+Review the guidance for [pull-request processing](https://learn.microsoft.com/contribute/content/process-pull-request) in our contributor guide.

.openpublishing.redirection.json

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 
 ms.topic: conceptual
-ms.date: 01/11/2024
+ms.date: 02/05/2024
 ms.subservice: B2C
 
 
@@ -25,6 +25,7 @@ The following best practices and recommendations cover some of the primary aspec
 
 | Best practice | Description |
 |--|--|
+| Create emergency access account | This emergency access account helps you gain access to your Azure AD B2C tenant in circumstances such as the only administrator is unreachable when the credential is needed. [Learn how to create an emergency access account](tenant-management-emergency-access-account.md#create-emergency-access-account)  |
 | Choose user flows for most scenarios | The Identity Experience Framework of Azure AD B2C is the core strength of the service. Policies fully describe identity experiences such as sign-up, sign-in, or profile editing. To help you set up the most common identity tasks, the Azure AD B2C portal includes predefined, configurable policies called user flows. With user flows, you can create great user experiences in minutes, with just a few clicks. [Learn when to use user flows vs. custom policies](user-flow-overview.md#comparing-user-flows-and-custom-policies).|
 | App registrations | Every application (web, native) and API that is being secured must be registered in Azure AD B2C. If an app has both a web and native version of iOS and Android, you can register them as one application in Azure AD B2C with the same client ID. Learn how to [register OIDC, SAML, web, and native apps](./tutorial-register-applications.md?tabs=applications). Learn more about [application types that can be used in Azure AD B2C](./application-types.md). |
 | Move to monthly active users billing | Azure AD B2C has moved from monthly active authentications to monthly active users (MAU) billing. Most customers will find this model cost-effective. [Learn more about monthly active users billing](https://azure.microsoft.com/updates/mau-billing/). |

.openpublishing.redirection.machine-configuration.json

@@ -108,6 +108,7 @@ The following table lists the claim resolvers with information about the OpenID
 | {OIDC:Resource} |The `resource`  query string parameter. | N/A |
 | {OIDC:Scope} |The `scope`  query string parameter. | openid |
 | {OIDC:Username}| The [resource owner password credentials flow](add-ropc-policy.md) user's username.| [email protected]|
+| {OIDC:IdToken} | The `id token`  query string parameter. | N/A |
 
 Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-resolver#openid-connect-relying-party-application) of the OpenID Connect claim resolvers.