merge conflict

Author: Blackmist

.openpublishing.publish.config.json

@@ -1204,6 +1204,7 @@
   "articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
   "articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
   "articles/ai-services/.openpublishing.redirection.cognitive-services.json",
+  "articles/energy-data-services/.openpublishing.redirection.energy-data-services.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",

.openpublishing.redirection.azure-monitor.json

@@ -430,6 +430,11 @@
             "redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-retrieve-legacy-workbooks.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-retrieve-legacy-workbooks",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-view-designer-conversions.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-view-designer-conversions",
@@ -1185,6 +1190,11 @@
             "redirect_url": "/azure/azure-monitor/agents/agents-overview",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/use-azure-monitor-agent-troubleshooter.md",
+            "redirect_url": "/azure/azure-monitor/agents/troubleshooter-ama-windows",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/azure/azure-monitor/agents/agents-overview.md#log-analytics-agent",
             "redirect_url": "/azure/azure-monitor/agents/log-analytics-agent",
@@ -6051,7 +6061,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-using-migration-tool.md",
-            "redirect_url": "previous-versions/azure/azure-monitor/alerts/alerts-using-migration-tool",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-using-migration-tool",
             "redirect_document_id": false
         },
         {
@@ -6074,6 +6084,21 @@
             "redirect_url": "/previous-versions/azure/azure-monitor/visualize/view-designer-filters",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-configurations.md",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-manage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-getting-started.md",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-commonly-used-components.md",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-visualizations",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/export-telemetry.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/app/export-telemetry",

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

@@ -905,6 +905,11 @@
             "redirect_url": "/azure/defender-for-cloud/how-to-manage-attack-path",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/integration-overview.md",
+            "redirect_url": "/azure/defender-for-cloud/integration-servicenow",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/tutorial-security-incident.md",
             "redirect_url": "/azure/defender-for-cloud/managing-and-responding-alerts",

articles/active-directory-b2c/integrate-with-app-code-samples.md

@@ -26,7 +26,7 @@ The following tables provide links to samples for applications including iOS, An
 | [dotnetcore-webapp-msal-api](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/4-WebApp-your-API/4-2-B2C) | An ASP.NET Core web application that can sign in a user using Azure AD B2C, get an access token using MSAL.NET and call an API. |
 | [auth-code-flow-nodejs](https://github.com/Azure-Samples/active-directory-b2c-msal-node-sign-in-sign-out-webapp) | A Node.js app that shows how to enable authentication (sign in, sign out and profile edit) in a Node.js web application using Azure Active Directory B2C. The web app uses MSAL-node.|
 | [javascript-nodejs-webapi](https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi) | A small Node.js Web API for Azure AD B2C that shows how to protect your web api and accept B2C access tokens using passport.js. |
-| [ms-identity-python-webapp](https://github.com/Azure-Samples/ms-identity-python-webapp/blob/main/README_B2C.md) | Demonstrate how to Integrate B2C of Microsoft identity platform with a Python web application.  |
+| [ms-identity-python-webapp](https://github.com/Azure-Samples/ms-identity-python-webapp/blob/main/README.md) | Demonstrate how to Integrate B2C of Microsoft identity platform with a Python web application.  |
 
 ## Single page apps
 

articles/active-directory-b2c/technicalprofiles.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 
 ms.topic: reference
-ms.date: 06/22/2023
+ms.date: 01/08/2024
 ms.author: kengaderdus
 ms.subservice: B2C
 ---
@@ -55,7 +55,7 @@ All types of technical profiles share the same concept. They start by reading th
     - Calls a REST API while sending parameters as InputClaims and getting information back as OutputClaims.
     - Creates or updates the user account.
     - Sends and verifies the multifactor authentication text message.
-1. **Validation technical profiles**: A [self-asserted technical profile](self-asserted-technical-profile.md) can call [validation technical profiles](validation-technical-profile.md) to validate the data profiled by the user.
+1. **Validation technical profiles**: A [self-asserted technical profile](self-asserted-technical-profile.md) can call [validation technical profiles](validation-technical-profile.md) to validate the data profiled by the user. Only self-asserted technical profiles can use validation technical profiles.
 1. **Output claims**: Claims are returned back to the claims bag. You can use those claims in the next orchestrations step or output claims transformations.
 1. **Output claims transformations**: After the technical profile is completed, Azure AD B2C runs output [claims transformations](claimstransformations.md).
 1. **SSO session management**: Persists the technical profile's data to the session by using [SSO session management](custom-policy-reference-sso.md).

articles/active-directory-b2c/user-profile-attributes.md

@@ -5,7 +5,7 @@ author: kengaderdus
 manager: CelesteDG
 ms.service: active-directory
 ms.topic: conceptual
-ms.date: 11/20/2023
+ms.date: 01/08/2024
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: b2c-support
@@ -48,7 +48,7 @@ Azure AD B2C directory user profile supports the [user resource type](/graph/api
 |creationType    |String|If the user account was created as a local account for an Azure Active Directory B2C tenant, the value is LocalAccount or nameCoexistence. Read only.|No|No|Persisted, Output|
 |dateOfBirth     |Date|Date of birth.|No|No|Persisted, Output|
 |department      |String|The name for the department in which the user works. Max length 64.|Yes|No|Persisted, Output|
-|displayName     |String|The display name for the user. Max length 256. \< \> characters aren't allowed. | Yes|Yes|Persisted, Output|
+|displayName     |String|The display name for the user. Max length 256. | Yes|Yes|Persisted, Output|
 |facsimileTelephoneNumber<sup>1</sup>|String|The telephone number of the user's business fax machine.|Yes|No|Persisted, Output|
 |givenName       |String|The given name (first name) of the user. Max length 64.|Yes|Yes|Persisted, Output|
 |jobTitle        |String|The user's job title. Max length 128.|Yes|Yes|Persisted, Output|

articles/active-directory-b2c/whats-new-docs.md

@@ -1,7 +1,7 @@
 ---
 title: "What's new in Azure Active Directory business-to-customer (B2C)"
 description: "New and updated documentation for the Azure Active Directory business-to-customer (B2C)."
-ms.date: 12/01/2023
+ms.date: 01/05/2024
 ms.service: active-directory
 ms.subservice: B2C
 ms.topic: reference
@@ -15,6 +15,15 @@ manager: CelesteDG
 
 Welcome to what's new in Azure Active Directory B2C documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the B2C service, see [What's new in Microsoft Entra ID](../active-directory/fundamentals/whats-new.md), [Azure AD B2C developer release notes](custom-policy-developer-notes.md) and [What's new in Microsoft Entra External ID](/entra/external-id/whats-new-docs).
 
+## December 2023
+
+### Updated articles
+
+- [Set up a resource owner password credentials flow in Azure Active Directory B2C](add-ropc-policy.md) - Updated ROPC flow limitations
+- [Add user attributes and customize user input in Azure Active Directory B2C](configure-user-input.md) - Updated instructional steps
+- [Set up sign-up and sign-in with a Google account using Azure Active Directory B2C](identity-provider-google.md) - Editorial updates
+- [Localization string IDs](localization-string-ids.md) - Updated the localization string IDs
+
 ## November 2023
 
 ### Updated articles
@@ -41,25 +50,5 @@ Welcome to what's new in Azure Active Directory B2C documentation. This article
 - [Azure AD B2C: Frequently asked questions (FAQ)](faq.yml) - Editorial updates
 - [Enable JavaScript and page layout versions in Azure Active Directory B2C](javascript-and-page-layout.md) - Added breaking change on script tags
 
-## September 2023
-
-### Updated articles
-
-- [Supported Microsoft Entra ID features](supported-azure-ad-features.md) - Editorial updates
-- [Publish your Azure Active Directory B2C app to the Microsoft Entra app gallery](publish-app-to-azure-ad-app-gallery.md) - Editorial updates
-- [Secure your API used an API connector in Azure AD B2C](secure-rest-api.md) - Editorial updates
-- [Azure AD B2C: Frequently asked questions (FAQ)'](faq.yml) - Editorial updates
-- [Define an ID token hint technical profile in an Azure Active Directory B2C custom policy](id-token-hint.md) - Editorial updates
-- [Set up sign-in for multitenant Microsoft Entra ID using custom policies in Azure Active Directory B2C](identity-provider-azure-ad-multi-tenant.md) - Editorial updates
-- [Set up sign-in for a specific Microsoft Entra organization in Azure Active Directory B2C](identity-provider-azure-ad-single-tenant.md) - Editorial updates
-- [Localization string IDs](localization-string-ids.md) - Editorial updates
-- [Define a Microsoft Entra ID multifactor authentication technical profile in an Azure AD B2C custom policy](multi-factor-auth-technical-profile.md) - Editorial updates
-- [Define a Microsoft Entra ID SSPR technical profile in an Azure AD B2C custom policy](aad-sspr-technical-profile.md) - Editorial updates
-- [Define a Microsoft Entra technical profile in an Azure Active Directory B2C custom policy](active-directory-technical-profile.md) - Editorial updates
-- [Monitor Azure AD B2C with Azure Monitor](azure-monitor.md) - Editorial updates
-- [Billing model for Azure Active Directory B2C](billing.md) - Editorial updates
-- [Enable custom domains for Azure Active Directory B2C](custom-domain.md) - Editorial updates
-- [Set up a sign-up and sign-in flow with a social account by using Azure Active Directory B2C custom policy](custom-policies-series-sign-up-or-sign-in-federation.md) - Editorial updates
-- [Create and read a user account by using Azure Active Directory B2C custom policy](custom-policies-series-store-user.md) - Editorial updates
 
 

articles/advisor/advisor-reference-reliability-recommendations.md

@@ -645,6 +645,23 @@ In active-active configuration, both instances of the VPN gateway establish S2S
 
 Learn more about [Virtual network gateway - VNetGatewayActiveActive (Enable Active-Active gateways for redundancy)](https://aka.ms/aa_vpnha_learnmore).
 
+### Use HEAD health probes
+
+For health probes, it’s a good practice to use the HEAD method, which reduces the amount of traffic load on your origins.
+
+Learn more about [Front Door - Use HEAD health probes](https://aka.ms/afd-use-health-probes).
+
+### Use managed TLS certificates
+
+Front Door management of your TLS certificates reduces your operational costs and helps you to avoid costly outages caused by forgetting to renew a certificate.
+
+Learn more about [Use managed TLS certificates](https://aka.ms/afd-use-managed-tls).
+
+### Disable health probes when there is only one origin in an origin group
+
+If you only have a single origin, Front Door always routes traffic to that origin even if its health probe reports an unhealthy status. The status of the health probe doesn't do anything to change Front Door's behavior. In this scenario, health probes don't provide a benefit and you should disable them to reduce the traffic on your origin.
+
+Learn more about [Health probe best practices](https://aka.ms/afd-disable-health-probes).
 
 ## SAP for Azure
 

articles/ai-services/cognitive-services-data-loss-prevention.md

@@ -103,6 +103,15 @@ The following services support data loss prevention configuration:
 * Speech Service
 * QnA Maker
 
+
+## Limitations
+
+[Azure OpenAI on your data - text](./openai/concepts/use-your-data.md) features don't support data loss prevention yet. When `restrictOutboundNetworkAccess` is set as true, all requests to the following APIs will fail immediately to prevent potential data loss.
+
+* /extensions/chat/completions (with text models)
+* /extensions/on-your-data/ingestion-jobs
+
+
 ## Next steps
 
 * [Configure Virtual Networks](cognitive-services-virtual-networks.md)

articles/ai-services/content-safety/whats-new.md

@@ -16,6 +16,17 @@ ms.author: pafarley
 
 Learn what's new in the service. These items might be release notes, videos, blog posts, and other types of information. Bookmark this page to stay up to date with new features, enhancements, fixes, and documentation updates.
 
+## January 2024
+
+### Content Safety SDK GA
+
+The Azure AI Content Safety service is now generally available through the following client library SDKs:
+
+- **C#**: [Package](https://www.nuget.org/packages/Azure.AI.ContentSafety) | [API reference](/dotnet/api/overview/azure/ai.contentsafety-readme?view=azure-dotnet) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/dotnet/1.0.0)
+- **Python**: [Package](https://pypi.org/project/azure-ai-contentsafety/) | [API reference](/python/api/overview/azure/ai-contentsafety-readme?view=azure-python) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/python/1.0.0)
+- **Java**: [Package](https://oss.sonatype.org/#nexus-search;quick~contentsafety) | [API reference](/java/api/overview/azure/ai-contentsafety-readme?view=azure-java-stable) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/java/1.0.0)
+- **JavaScript**: [Package](https://www.npmjs.com/package/@azure-rest/ai-content-safety?activeTab=readme) | [API reference](https://www.npmjs.com/package/@azure-rest/ai-content-safety/v/1.0.0) | [Samples](https://github.com/Azure-Samples/AzureAIContentSafety/tree/main/js/1.0.0)
+
 ## November 2023
 
 ### Jailbreak risk and Protected material detection (preview)