Merge pull request #227693 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 4b3b7871765c · 2023-02-20T09:39:23.000-08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/active-directory/develop/scenario-desktop-acquire-token-device-code-flow.md b/articles/active-directory/develop/scenario-desktop-acquire-token-device-code-flow.md
@@ -68,7 +68,7 @@ static async Task<AuthenticationResult> GetATokenForGraph()
     }
     catch (MsalUiRequiredException ex)
     {
-        // No token found in the cache or AAD insists that a form interactive auth is required (e.g. the tenant admin turned on MFA)
+        // No token found in the cache or Azure AD insists that a form interactive auth is required (e.g. the tenant admin turned on MFA)
         // If you want to provide a more complex user experience, check out ex.Classification
 
         return await AcquireByDeviceCodeAsync(pca);
@@ -253,7 +253,7 @@ if accounts:
     result = app.acquire_token_silent(config["scope"], account=chosen)
 
 if not result:
-    logging.info("No suitable token exists in cache. Let's get a new one from AAD.")
+    logging.info("No suitable token exists in cache. Let's get a new one from Azure AD.")
 
     flow = app.initiate_device_flow(scopes=config["scope"])
     if "user_code" not in flow:
diff --git a/articles/active-directory/governance/understanding-lifecycle-workflows.md b/articles/active-directory/governance/understanding-lifecycle-workflows.md
@@ -33,10 +33,10 @@ For delegated scenarios, the admin needs one of the following [Azure AD roles](/
 - Global reader
 - Lifecycle workflows administrator
 
-## Restrictions
+## Limits
 
 
-|Column1  |Limit  |
+|Category  |Limit  |
 |---------|---------|
 |Number of Workflows     |   50 per tenant      |
 |Number of Tasks     |  25 per workflow       |
diff --git a/articles/azure-monitor/essentials/prometheus-metrics-enable.md b/articles/azure-monitor/essentials/prometheus-metrics-enable.md
@@ -295,7 +295,7 @@ Deploy the template with the parameter file using any valid method for deploying
 
 ## Verify Deployment
 
-Run the following command to which verify that the daemon set was deployed properly:
+Run the following command to verify that the daemon set was deployed properly:
 
 ```
 kubectl get ds ama-metrics-node --namespace=kube-system
diff --git a/articles/azure-signalr/server-graceful-shutdown.md b/articles/azure-signalr/server-graceful-shutdown.md
@@ -44,7 +44,7 @@ In general, there will be four stages in a graceful shutdown process:
 
     Azure SignalR Service will try to reroute the client connection on this server to another valid server. 
     
-    In this scenario, `OnConnectedAsync` and `OnDisconnectedAsync` will be triggered on the new server and the old server respectively with an `IConnectionMigrationFeature` set in the `Context`, which can be used to identify if the client connection was being migrated-in our migrated-out. It could be useful especially for stateful scenarios.
+    In this scenario, `OnConnectedAsync` and `OnDisconnectedAsync` will be triggered on the new server and the old server respectively with an `IConnectionMigrationFeature` set in the `Context`, which can be used to identify if the client connection was being migrated-in or migrated-out. It could be useful especially for stateful scenarios.
 
     The client connection will be immediately migrated after the current message has been delivered, which means the next message will be routed to the new server.
 
diff --git a/articles/azure-signalr/signalr-howto-troubleshoot-guide.md b/articles/azure-signalr/signalr-howto-troubleshoot-guide.md
@@ -389,7 +389,7 @@ public class ThreadPoolStarvationDetector : EventListener
     {
         // See: https://learn.microsoft.com/dotnet/framework/performance/thread-pool-etw-events#threadpoolworkerthreadadjustmentadjustment
         if (eventData.EventId == EventIdForThreadPoolWorkerThreadAdjustmentAdjustment &&
-            eventData.Payload[3] as uint? == ReasonForStarvation)
+            eventData.Payload[2] as uint? == ReasonForStarvation)
         {
             _logger.LogWarning("Thread pool starvation detected!");
         }
diff --git a/articles/governance/policy/concepts/initiative-definition-structure.md b/articles/governance/policy/concepts/initiative-definition-structure.md
@@ -153,7 +153,7 @@ A parameter has the following properties that are used in the policy initiative
   **integer**, **float**, or **datetime**.
 - `metadata`: Defines subproperties primarily used by the Azure portal to display user-friendly
   information:
-  - `description`: The explanation of what the parameter is used for. Can be used to provide
+  - `description`: (Optional) The explanation of what the parameter is used for. Can be used to provide
     examples of acceptable values.
   - `displayName`: The friendly name shown in the portal for the parameter.
   - `strongType`: (Optional) Used when assigning the policy definition through the portal. Provides
diff --git a/articles/mariadb/concept-reserved-pricing.md b/articles/mariadb/concept-reserved-pricing.md
@@ -12,7 +12,7 @@ ms.date: 06/24/2022
 
 Azure Database for MariaDB now helps you save money by prepaying for compute resources compared to pay-as-you-go prices. With Azure Database for MariaDB reserved capacity, you make an upfront commitment on MariaDB servers for a one or three year period to get a significant discount on the compute costs. To purchase Azure Database for MariaDB reserved capacity, you need to specify the Azure region, deployment type, performance tier, and term. </br>
 
-You do not need to assign the reservation to specific Azure Database for MariaDB servers. An already running Azure Database for MariaDB or ones that are newly deployed, will automatically get the benefit of reserved pricing. By purchasing a reservation, you are pre-paying for the compute costs for a period of one or three years. As soon as you buy a reservation, the Azure database for MariaDB compute charges that match the reservation attributes are no longer charged at the pay-as-you go rates. A reservation does not cover software, networking, or storage charges associated with the MariaDB Database server. At the end of the reservation term, the billing benefit expires, and the Azure Database for MariaDB are billed at the pay-as-you go price. Reservations do not auto-renew. For pricing information, see the [Azure Database for MariaDB reserved capacity offering](https://azure.microsoft.com/pricing/details/mariadb/). </br>
+You do not need to assign the reservation to specific Azure Database for MariaDB servers. An already running Azure Database for MariaDB or ones that are newly deployed, will automatically get the benefit of reserved pricing. By purchasing a reservation, you are pre-paying for the compute costs for a period of one or three years. As soon as you buy a reservation, the Azure Database for MariaDB compute charges that match the reservation attributes are no longer charged at the pay-as-you go rates. A reservation does not cover software, networking, or storage charges associated with the MariaDB Database server. At the end of the reservation term, the billing benefit expires, and the Azure Database for MariaDB are billed at the pay-as-you go price. Reservations do not auto-renew. For pricing information, see the [Azure Database for MariaDB reserved capacity offering](https://azure.microsoft.com/pricing/details/mariadb/). </br>
 
 You can buy Azure Database for MariaDB reserved capacity in the [Azure portal](https://portal.azure.com/). Pay for the reservation [up front or with monthly payments](../cost-management-billing/reservations/prepare-buy-reservation.md). To buy the reserved capacity:
 
@@ -63,7 +63,7 @@ If you have questions or need help, [create a support request](https://portal.az
 
 ## Next steps
 
-The vCore reservation discount is applied automatically to the number of Azure Database for MariaDB servers that match the Azure Database for MariaDB reserved capacity reservation scope and attributes. You can update the scope of the Azure database for MariaDB reserved capacity reservation through Azure portal, PowerShell, CLI or through the API. </br></br>
+The vCore reservation discount is applied automatically to the number of Azure Database for MariaDB servers that match the Azure Database for MariaDB reserved capacity reservation scope and attributes. You can update the scope of the Azure Database for MariaDB reserved capacity reservation through Azure portal, PowerShell, CLI or through the API. </br></br>
 To learn how to manage the Azure Database for MariaDB reserved capacity, see manage Azure Database for MariaDB reserved capacity.
 
 To learn more about Azure Reservations, see the following articles:
diff --git a/articles/postgresql/migrate/concepts-single-to-flexible.md b/articles/postgresql/migrate/concepts-single-to-flexible.md
@@ -1,7 +1,7 @@
 ---
 title: "Migration tool - Azure Database for PostgreSQL Single Server to Flexible Server - Concepts"
 titleSuffix: Azure Database for PostgreSQL Flexible Server
-description: Concepts about migrating your Single server to Azure database for PostgreSQL Flexible server.
+description: Concepts about migrating your Single server to Azure Database for PostgreSQL Flexible server.
 author: shriram-muthukrishnan
 ms.author: shriramm
 ms.service: postgresql
diff --git a/articles/postgresql/single-server/how-to-manage-server-cli.md b/articles/postgresql/single-server/how-to-manage-server-cli.md
@@ -37,7 +37,7 @@ If you have not already created a server, refer to this [quickstart](quickstart-
 
 ## Scale compute and storage
 
-You can scale up your pricing tier, compute, and storage easily using the following command. You can see all the server operation you can perform [az postgres server overview](/cli/azure/mysql/server)
+You can scale up your pricing tier, compute, and storage easily using the following command. You can see all the server operation you can perform [az postgres server overview](/cli/azure/postgres/server)
 
 ```azurecli-interactive
 az postgres server update --resource-group myresourcegroup --name mydemoserver --sku-name GP_Gen5_4 --storage-size 6144
diff --git a/articles/private-multi-access-edge-compute-mec/overview.md b/articles/private-multi-access-edge-compute-mec/overview.md
@@ -61,8 +61,6 @@ For more information, see [Azure Private 5G Core](../private-5g-core/private-5g-
 ### Azure Stack hardware and services
 **Azure Stack Edge**: Azure Stack Edge offers a portfolio of devices that bring compute, storage, and intelligence to the edge right where data is created. The devices are 1U rack-mountable appliances that come with 1-2 NVIDIA T4 GPUs. Azure IoT Edge allows you to deploy and manage containers from IoT Hub and integrate with Azure IoT solutions on the Azure Stack Edge. The Azure Stack Edge Pro SKU is certified to run Network Functions at the edge. For more information, see [Azure Stack Edge](https://azure.microsoft.com/products/azure-stack/edge/).
 
-**Azure Stack HCI**: Azure Stack HCI is a new hyper-converged infrastructure (HCI) operating system delivered as an Azure service that provides the latest security, performance, and feature updates. Deploy and run Windows and Linux virtual machines (VMs) in your datacenter, or, at the edge using your existing tools and processes. Extend your datacenter to the cloud with Azure Backup, Azure Monitor, and Microsoft Defender for Cloud. For more information, see [Azure Stack HCI](https://azure.microsoft.com/products/azure-stack/hci/).
-
 ### Application services
 
 **Azure IoT Edge Runtime**: Azure IoT Edge Runtime enables cloud workloads to be managed and deployed across edge compute appliances using the same tools and security posture as cloud native workloads. For more information, see [Azure IoT Edge Runtime](/windows/ai/windows-ml-container/iot-edge-runtime).
diff --git a/articles/route-server/route-server-faq.md b/articles/route-server/route-server-faq.md
@@ -110,10 +110,6 @@ You can still use Route Server to direct traffic between subnets in different vi
 
 Azure Route Server supports ***NO_ADVERTISE*** BGP Community. If an NVA advertises routes with this community string to the route server, the route server won't advertise it to other peers including the ExpressRoute gateway. This feature can help reduce the number of routes to be sent from Azure Route Server to ExpressRoute.
 
-### Can Azure Route Server provide transit between ExpressRoute and a Point-to-Site (P2S) VPN gateway connection if the Branch-to-Branch setting is enabled?
-
-No, Azure Route Server provides transit only between ExpressRoute and a Site-to-Site (S2S) VPN gateway connections if the Branch-to-Branch setting is enabled.
-
 ## <a name = "limitations"></a>Route Server Limits
 
 Azure Route Server has the following limits (per deployment).
diff --git a/articles/search/search-security-overview.md b/articles/search/search-security-overview.md
@@ -166,29 +166,13 @@ Currently, the only external resource that a search service writes customer data
 
 ### Exceptions to data residency commitments
 
-Object names will be stored and processed outside of your selected region or location. Customers shouldn't place any sensitive data in name fields or create applications designed to store sensitive data in these fields. This data will appear in the telemetry logs used by Microsoft to provide support for the service. Object names include names of indexes, indexers, data sources, skillsets, containers, and key vault store.
+Object names will be stored and processed outside of your selected region or location. Customers shouldn't place any sensitive data in name fields or create applications designed to store sensitive data in these fields. This data will appear in the telemetry logs used by Microsoft to provide support for the service. Object names include names of indexes, indexers, data sources, skillsets, resources, containers, and key vault store.
 
 Telemetry logs are retained for one and a half years. During that period, Microsoft might access and reference object names under the following conditions:
 
 + Diagnose an issue, improve a feature, or fix a bug. In this scenario, data access is internal only, with no third-party access.
 
-+ During support, this information may be used to make suggestions to the customer. For example, "Based on your usage of the product, consider using `<feature name>` since it would perform better." 
-
-+ Microsoft might expose an object name in dashboards visible to the customer.
-
-Upon request, Microsoft can shorten the retention interval or remove references to specific objects in the telemetry logs. Remember that if you request data removal, Microsoft won't have a full history of your service, which could impede troubleshooting of the object in question.
-
-To remove references to specific objects, or to change the data retention period, [file a support ticket](../azure-portal/supportability/how-to-create-azure-support-request.md) for your search service.
-
-1. In **Problem details**, tag your request using the following selections:
-
-   + **Issue type**: Technical
-   + **Problem type**: Setup and configuration
-   + **Problem subtype**: Issue with security configuration of the service
-
-1. When you get to **Additional details** (the third tab), describe the object names you would like removed, or specify the retention period that you require.
-
-   :::image type="content" source="media/search-security-overview/support-request.png" alt-text="Screenshot of the first page of the support ticket with issue and problem types selected." border="true":::
++ During support, this information may be used to provide quick resolution to issues and escalate product team if needed
 
 <a name="encryption"></a>
 
@@ -258,4 +242,4 @@ Watch this fast-paced video for an overview of the security architecture and eac
 
 + [Azure security fundamentals](../security/fundamentals/index.yml)
 + [Azure Security](https://azure.microsoft.com/overview/security)
-+ [Microsoft Defender for Cloud](../security-center/index.yml)
++ [Microsoft Defender for Cloud](../security-center/index.yml)
diff --git a/articles/sentinel/sap/configure-audit.md b/articles/sentinel/sap/configure-audit.md
@@ -50,7 +50,10 @@ Some installations of SAP systems may not have audit log enabled by default. For
 
     ![Screenshot showing R S A U CONFIG create profile screen.](./media/configure-audit/create-profile.png)
 
-1. Specify a name for the profile in the **Profile/Filter Number** field.
+1. Specify a name for the profile in the **Profile/Filter Number** field. 
+
+   > [!NOTE]
+   > Vanilla SAP installation requires this additional step: right-click the profile you have created and create a new filter.
 
 1. Mark the **Filter for recording active** checkbox.
 
diff --git a/articles/synapse-analytics/data-explorer/data-explorer-compare.md b/articles/synapse-analytics/data-explorer/data-explorer-compare.md
@@ -29,7 +29,7 @@ We recommend starting with Synapse Data Explorer if you are looking for a unifie
 | **Business Continuity** | Availability Zones | Optional | Enabled by default where Availability Zones are available |
 | **SKU** | Compute options | 22+ Azure VM SKUs to choose from | Simplified to Synapse workload types SKUs |
 | **Integrations** | Built-in ingestion pipelines | Event Hub, Event Grid, IoT Hub | Event Hub, Event Grid, and IoT Hub supported via the Azure portal for non-managed VNet |
-|  | Spark integration | Azure Data Explorer linked service: Built-in Kusto Spark integration with support for Azure Active Directory pass-though authentication, Synapse Workspace MSI, and Service Principal | Built-in Kusto Spark connector integration with support for Azure Active Directory pass-though authentication, Synapse Workspace MSI, and Service Principal |
+|  | Spark integration | Azure Data Explorer linked service: Built-in Kusto Spark integration with support for Azure Active Directory pass-through authentication, Synapse Workspace MSI, and Service Principal | Built-in Kusto Spark connector integration with support for Azure Active Directory pass-through authentication, Synapse Workspace MSI, and Service Principal |
 |  | KQL artifacts management | ✗ | Save KQL queries and integrate with Git |
 |  | Metadata sync | ✗ | ✗ |
 | **Features** | KQL queries | ✓ | ✓ |
diff --git a/articles/virtual-machines/windows/disks-upload-vhd-to-managed-disk-powershell.md b/articles/virtual-machines/windows/disks-upload-vhd-to-managed-disk-powershell.md
@@ -188,13 +188,14 @@ $sourceDiskName = <sourceDiskNameHere>
 $targetDiskName = <targetDiskNameHere>
 $targetRG = <targetResourceGroupHere>
 $targetLocate = <yourTargetLocationHere>
+$targetVmGeneration = "V1" # either V1 or V2
 #Expected value for OS is either "Windows" or "Linux"
 $targetOS = <yourOSTypeHere>
 
 $sourceDisk = Get-AzDisk -ResourceGroupName $sourceRG -DiskName $sourceDiskName
 
 # Adding the sizeInBytes with the 512 offset, and the -Upload flag
-$targetDiskconfig = New-AzDiskConfig -SkuName 'Standard_LRS' -osType $targetOS -UploadSizeInBytes $($sourceDisk.DiskSizeBytes+512) -Location $targetLocate -CreateOption 'Upload'
+$targetDiskconfig = New-AzDiskConfig -SkuName 'Standard_LRS' -osType $targetOS -UploadSizeInBytes $($sourceDisk.DiskSizeBytes+512) -Location $targetLocate -CreateOption 'Upload' -HyperVGeneration $targetVmGeneration
 
 $targetDisk = New-AzDisk -ResourceGroupName $targetRG -DiskName $targetDiskName -Disk $targetDiskconfig
 
@@ -213,4 +214,4 @@ Revoke-AzDiskAccess -ResourceGroupName $targetRG -DiskName $targetDiskName
 
 Now that you've successfully uploaded a VHD to a managed disk, you can attach your disk to a VM and begin using it.
 
-To learn how to attach a data disk to a VM, see our article on the subject: [Attach a data disk to a Windows VM with PowerShell](attach-disk-ps.md). To use the disk as the OS disk, see [Create a Windows VM from a specialized disk](create-vm-specialized.md#create-the-new-vm).
+To learn how to attach a data disk to a VM, see our article on the subject: [Attach a data disk to a Windows VM with PowerShell](attach-disk-ps.md). To use the disk as the OS disk, see [Create a Windows VM from a specialized disk](create-vm-specialized.md#create-the-new-vm).
diff --git a/includes/machine-learning-public-internet-access.md b/includes/machine-learning-public-internet-access.md
@@ -63,7 +63,7 @@ You may also need to allow __outbound__ traffic to Visual Studio Code and non-Mi
 | **raw.githubusercontent.com/microsoft/vscode-tools-for-ai/master/azureml_remote_websocket_server/\*** | Used to retrieve websocket server bits, which are installed on the compute instance. The websocket server is used to transmit requests from Visual Studio Code client (desktop application) to Visual Studio Code server running on the compute instance.|
 
 > [!NOTE]
-> When using the [Azure Machine Learning VS Code extension](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.vscode-ai) the remote compute instance will require an access to public repositories to install the packages required by the extension. If the compute instance requires a proxy to access these public repositories or the Internet, you will need to set and export the `HTTP_PROXY` and `HTTPS_PROXY` environment variables in the `~/.bashrc` file of the compute instance. This process can be automated at provisioning time by using a [custom script](/machine-learning/how-to-customize-compute-instance).
+> When using the [Azure Machine Learning VS Code extension](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.vscode-ai) the remote compute instance will require an access to public repositories to install the packages required by the extension. If the compute instance requires a proxy to access these public repositories or the Internet, you will need to set and export the `HTTP_PROXY` and `HTTPS_PROXY` environment variables in the `~/.bashrc` file of the compute instance. This process can be automated at provisioning time by using a [custom script](../articles/machine-learning/how-to-customize-compute-instance.md).
 
 When using Azure Kubernetes Service (AKS) with Azure Machine Learning, allow the following traffic to the AKS VNet:
 
diff --git a/includes/policy/reference/byrp/microsoft.dbforpostgresql.md b/includes/policy/reference/byrp/microsoft.dbforpostgresql.md

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static async Task<AuthenticationResult> GetATokenForGraph()`
`68`	`68`	`}`
`69`	`69`	`catch (MsalUiRequiredException ex)`
`70`	`70`	`{`
`71`		`- // No token found in the cache or AAD insists that a form interactive auth is required (e.g. the tenant admin turned on MFA)`
	`71`	`+ // No token found in the cache or Azure AD insists that a form interactive auth is required (e.g. the tenant admin turned on MFA)`
`72`	`72`	`// If you want to provide a more complex user experience, check out ex.Classification`
`73`	`73`
`74`	`74`	`return await AcquireByDeviceCodeAsync(pca);`
`@@ -253,7 +253,7 @@ if accounts:`
`253`	`253`	`result = app.acquire_token_silent(config["scope"], account=chosen)`
`254`	`254`
`255`	`255`	`if not result:`
`256`		`- logging.info("No suitable token exists in cache. Let's get a new one from AAD.")`
	`256`	`+ logging.info("No suitable token exists in cache. Let's get a new one from Azure AD.")`
`257`	`257`
`258`	`258`	`flow = app.initiate_device_flow(scopes=config["scope"])`
`259`	`259`	`if "user_code" not in flow:`
Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ public class ThreadPoolStarvationDetector : EventListener`
`389`	`389`	`{`
`390`	`390`	`// See: https://learn.microsoft.com/dotnet/framework/performance/thread-pool-etw-events#threadpoolworkerthreadadjustmentadjustment`
`391`	`391`	`if (eventData.EventId == EventIdForThreadPoolWorkerThreadAdjustmentAdjustment &&`
`392`		`- eventData.Payload[3] as uint? == ReasonForStarvation)`
	`392`	`+ eventData.Payload[2] as uint? == ReasonForStarvation)`
`393`	`393`	`{`
`394`	`394`	`_logger.LogWarning("Thread pool starvation detected!");`
`395`	`395`	`}`