Merge branch 'main' into release-postgres-flexible

Author: Taojunshen

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/ai-services/openai/concepts/models.md

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Learn about the different model capabilities that are available with Azure OpenAI. 
 ms.service: azure-ai-openai
 ms.topic: conceptual 
-ms.date: 01/03/2024
+ms.date: 01/05/2024
 ms.custom: event-tier1-build-2022, references_regions, build-2023, build-2023-dataai, refefences_regions
 manager: nitinme
 author: mrbullwinkle #ChrisHMSFT
@@ -145,7 +145,7 @@ These models can only be used with Embedding API requests.
 
 |  Model ID  |  Model Availability  | Max Request (tokens) | Training Data (up to)  | Output Dimensions |
 |---|---| :---:|:---:|:---:|
-| `text-embedding-ada-002` (version 2) | Australia East <br> Canada East <br> East US <br> East US2 <br> France Central <br> Japan East <br> North Central US <br> South Central US <br> Sweden Central <br> Switzerland North <br> UK South <br> West Europe |8,191 | Sep 2021 | 1,536 |
+| `text-embedding-ada-002` (version 2) | Australia East <br> Canada East <br> East US <br> East US2 <br> France Central <br> Japan East <br> North Central US <br> Norway East <br> South Central US <br> Sweden Central <br> Switzerland North <br> UK South <br> West Europe <br> West US |8,191 | Sep 2021 | 1,536 |
 | `text-embedding-ada-002` (version 1) | East US <br> South Central US <br> West Europe |2,046 | Sep 2021 | 1,536 |
 
 ### DALL-E models (Preview)

articles/ai-services/openai/reference.md

@@ -379,9 +379,9 @@ curl -i -X POST YOUR_RESOURCE_NAME/openai/deployments/YOUR_DEPLOYMENT_NAME/exten
         {
             "type": "AzureCognitiveSearch",
             "parameters": {
-                "endpoint": "'YOUR_AZURE_COGNITIVE_SEARCH_ENDPOINT'",
-                "key": "'YOUR_AZURE_COGNITIVE_SEARCH_KEY'",
-                "indexName": "'YOUR_AZURE_COGNITIVE_SEARCH_INDEX_NAME'"
+                "endpoint": "YOUR_AZURE_COGNITIVE_SEARCH_ENDPOINT",
+                "key": "YOUR_AZURE_COGNITIVE_SEARCH_KEY",
+                "indexName": "YOUR_AZURE_COGNITIVE_SEARCH_INDEX_NAME"
             }
         }
     ],

articles/app-service/configure-ssl-certificate.md

@@ -309,6 +309,12 @@ After the certificate renews inside your key vault, App Service automatically sy
 - [Azure CLI: Bind a custom TLS/SSL certificate to a web app](scripts/cli-configure-ssl-certificate.md)
 - [Azure PowerShell Bind a custom TLS/SSL certificate to a web app using PowerShell](scripts/powershell-configure-ssl-certificate.md)
 
+#### Can I configure a private CA certificate on my app?
+
+App Service has a list of Trusted Root Certificates which you cannot modify in the multi-tenant variant version of App Service, but you can load your own CA certificate in the Trusted Root Store in an App Service Environment (ASE), which is a single-tenant environment in App Service. (The Free, Basic, Standard, and Premium App Service Plans are all multi-tenant, and the Isolated Plans are single-tenant.)
+- [Private client certificate](environment/overview-certificates.md)
+
+
 ## More resources
 
 * [Secure a custom DNS name with a TLS/SSL binding in Azure App Service](configure-ssl-bindings.md)

articles/app-service/troubleshoot-diagnostic-logs.md

@@ -219,6 +219,8 @@ The following table shows the supported log types and descriptions:
 
 ## Networking considerations
 
+- App Service logs aren't supported using Regional VNet integration, our recommendation is to use the Diagnostic settings feature.
+
 If you secure your Azure Storage account by [only allowing selected networks](../storage/common/storage-network-security.md#change-the-default-network-access-rule), it can receive logs from App Service only if both of the following are true:
 
 - The Azure Storage account is in a different Azure region from the App Service app.

articles/azure-arc/system-center-virtual-machine-manager/enable-virtual-hardware-scvmm.md

@@ -0,0 +1,41 @@
+---
+title:  Enable virtual hardware and VM CRUD capabilities in an SCVMM machine with Arc agent installed
+description: Enable virtual hardware and VM CRUD capabilities in an SCVMM machine with Arc agent installed
+ms.topic: how-to 
+ms.date: 01/05/2024
+ms.service: azure-arc
+ms.subservice: azure-arc-scvmm
+author: Farha-Bano
+ms.author: v-farhabano
+manager: jsuri
+ms.custom: 
+---
+
+# Enable virtual hardware and VM CRUD capabilities in an SCVMM machine with Arc agent installed
+
+In this article, you learn how to enable virtual hardware management and VM CRUD operational ability on an SCVMM VM that has Arc agents installed via the Arc-enabled Servers route.
+
+>[!IMPORTANT]
+> This article is applicable only if you've installed Arc agents directly in SCVMM machines before onboarding to Azure Arc-enabled SCVMM by deploying Arc resource bridge. 
+
+## Prerequisites
+
+- An Azure subscription and resource group where you have *Arc ScVmm VM Administrator* role. 
+- Your SCVMM management server instance must be [onboarded](quickstart-connect-system-center-virtual-machine-manager-to-arc.md) to Azure Arc.
+
+## Enable virtual hardware management and self-service access to SCVMM VMs with Arc agent installed
+
+1. From your browser, go to [Azure portal](https://portal.azure.com/).
+
+1. Navigate to the Virtual machines inventory page of your SCVMM management servers. The virtual machines that have Arc agent installed via the Arc-enabled Servers route will have **Link to SCVMM management server** status under virtual hardware management.
+
+1. Select **Link to SCVMM management server** to view the pane with the list of all the machines under SCVMM management server with Arc agent installed but not linked to the SCVMM management server in Azure Arc.
+
+1. Choose all the machines that need to be enabled in Azure, and select **Link** to link the machines to SCVMM management server.
+
+1. After you link to SCVMM management server, the virtual hardware status will reflect as **Enabled** for all the VMs, and you can perform virtual hardware operations. 
+
+## Next steps
+
+[Set up and manage self-service access to SCVMM resources](set-up-and-manage-self-service-access-scvmm.md).
+

articles/azure-arc/system-center-virtual-machine-manager/toc.yml

@@ -24,6 +24,8 @@
     items:
     - name: Enable SCVMM inventory resources in Azure
       href: enable-scvmm-inventory-resources.md
+    - name: Enable virtual hardware and VM CRUD capabilities in an SCVMM machine with Arc agent installed
+      href: enable-virtual-hardware-scvmm.md
   - name: Use VM lifecycle and self-serve capabilities
     items:
     - name: Set up and manage self-service access to SCVMM resources

articles/azure-monitor/agents/azure-monitor-agent-migration.md

@@ -15,7 +15,7 @@ ms.custom:
 [Azure Monitor Agent (AMA)](./agents-overview.md) replaces the Log Analytics agent (also known as MMA and OMS) for Windows and Linux machines, in Azure and non-Azure environments, including on-premises and third-party clouds. The agent introduces a simplified, flexible method of configuring data collection using [data collection rules (DCRs)](../essentials/data-collection-rule-overview.md). This article provides guidance on how to implement a successful migration from the Log Analytics agent to Azure Monitor Agent.
 
 > [!IMPORTANT]
-> The Log Analytics agent will be [retired on **August 31, 2024**](https://azure.microsoft.com/updates/were-retiring-the-log-analytics-agent-in-azure-monitor-on-31-august-2024/). After this date, Microsoft will no longer provide any support for the Log Analytics agent. If you're currently using the Log Analytics agent with Azure Monitor or [other supported features and services](#migrate-additional-services-and-features), start planning your migration to Azure Monitor Agent by using the information in this article.
+> The Log Analytics agent will be [retired on **August 31, 2024**](https://azure.microsoft.com/updates/were-retiring-the-log-analytics-agent-in-azure-monitor-on-31-august-2024/). After this date, Microsoft will no longer provide any support for the Log Analytics agent. If you're currently using the Log Analytics agent with Azure Monitor or [other supported features and services](#migrate-additional-services-and-features), start planning your migration to Azure Monitor Agent by using the information in this article.  If you are using the Log Analytics Agent for SCOM you will need to [migrate to the SCOM Agent](../vm/scom-managed-instance-overview.md)
 
 ## Benefits
 

articles/azure-monitor/app/java-standalone-sampling-overrides.md

@@ -192,7 +192,8 @@ Span attribute names are based on the OpenTelemetry semantic conventions. (HTTP,
 
 https://github.com/open-telemetry/semantic-conventions/blob/main/docs/README.md
 
-To see the exact set of attributes captured by Application Insights Java for your application, set the
+>[!Note]
+> To see the exact set of attributes captured by Application Insights Java for your application, set the
 [self-diagnostics level to debug](./java-standalone-config.md#self-diagnostics), and look for debug messages starting
 with the text "exporting span".
 

articles/azure-monitor/app/opentelemetry-add-modify.md

@@ -2222,7 +2222,7 @@ Use the add [custom property example](#add-a-custom-property-to-a-span), but rep
     class SpanFilteringProcessor(SpanProcessor):
 
         # Prevents exporting spans from internal activities.
-        def on_start(self, span):
+        def on_start(self, span, parent_context):
             # Check if the span is an internal activity.
             if span._kind is SpanKind.INTERNAL:
                 # Create a new span context with the following properties:
@@ -2235,7 +2235,7 @@ Use the add [custom property example](#add-a-custom-property-to-a-span), but rep
                     span.context.trace_id,
                     span.context.span_id,
                     span.context.is_remote,
-                    TraceFlags.DEFAULT,
+                    TraceFlags(TraceFlags.DEFAULT),
                     span.context.trace_state,
                 )