Skip to content

Commit 835ef5f

Browse files
authored
Merge pull request #108901 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents a670d80 + 40527d2 commit 835ef5f

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

articles/active-directory/hybrid/how-to-connect-sync-feature-preferreddatalocation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Azure AD Connect supports synchronization of the **preferredDataLocation** attri
6464
By default, **preferredDataLocation** is not enabled for synchronization. This feature is intended for larger organizations. The Active Directory schema in Windows Server 2019 has an attribute **msDS-preferredDataLocation** you should use for this purpose. If you have not updated the Active Directory schema and cannot do so, then you must identify an attribute to hold the Office 365 geo for your users. This is going to be different for each organization.
6565

6666
> [!IMPORTANT]
67-
> Azure AD allows the **preferredDataLocation** attribute on **cloud User objects** to be directly configured by using Azure AD PowerShell. Azure AD no longer allows the **preferredDataLocation** attribute on **synchronized User objects** to be directly configured by using Azure AD PowerShell. To configure this attribute on **synchronized User objects**, you must use Azure AD Connect.
67+
> Azure AD allows the **preferredDataLocation** attribute on **cloud User objects** to be directly configured by using Azure AD PowerShell. To configure this attribute on **synchronized User objects**, you must use Azure AD Connect.
6868
6969
Before enabling synchronization:
7070

articles/azure-functions/functions-monitoring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.date: 04/04/2019
1313

1414
We recommend using Application Insights because it collects log, performance, and error data. It automatically detects performance anomalies and includes powerful analytics tools to help you diagnose issues and to understand how your functions are used. It's designed to help you continuously improve performance and usability. You can even use Application Insights during local function app project development. For more information, see [What is Application Insights?](../azure-monitor/app/app-insights-overview.md).
1515

16-
As the required Application Insights instrumentation is built into Azure Functions, all you need is a valid instrumentation key to connect your function app to an Application Insights resource. The instrumentation key should be added to your application settings when your function app resource is created in Azure. If your function app doesn't already this key, you can [set it manually](#enable-application-insights-integration).
16+
As the required Application Insights instrumentation is built into Azure Functions, all you need is a valid instrumentation key to connect your function app to an Application Insights resource. The instrumentation key should be added to your application settings when your function app resource is created in Azure. If your function app doesn't already have this key, you can [set it manually](#enable-application-insights-integration).
1717

1818
## Application Insights pricing and limits
1919

articles/azure-resource-manager/templates/copy-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ The copy element is an array so you can specify more than one property for the r
113113
{
114114
"type": "Microsoft.Network/loadBalancers",
115115
"apiVersion": "2017-10-01",
116-
"name": "examleLB",
116+
"name": "exampleLB",
117117
"properties": {
118118
"copy": [
119119
{

articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-tables-index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ WITH ( HEAP );
6565

6666
## Clustered and nonclustered indexes
6767

68-
Clustered indexes may outperform clustered columnstore tables when a single row needs to be quickly retrieved. For queries where a single or very few row lookup is required to performance with extreme speed, consider a cluster index or nonclustered secondary index. The disadvantage to using a clustered index is that only queries that benefit are the ones that use a highly selective filter on the clustered index column. To improve filter on other columns a nonclustered index can be added to other columns. However, each index which is added to a table adds both space and processing time to loads.
68+
Clustered indexes may outperform clustered columnstore tables when a single row needs to be quickly retrieved. For queries where a single or very few row lookup is required to perform with extreme speed, consider a cluster index or nonclustered secondary index. The disadvantage to using a clustered index is that only queries that benefit are the ones that use a highly selective filter on the clustered index column. To improve filter on other columns a nonclustered index can be added to other columns. However, each index which is added to a table adds both space and processing time to loads.
6969

7070
To create a clustered index table, simply specify CLUSTERED INDEX in the WITH clause:
7171

articles/virtual-machines/dcv2-series.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Memory Preserving Updates: Not Supported
3636
| Standard_DC8_v2 | 8 | 32 | 400 | 8 | 16000/128 (172) | 12800/192 | 2 |
3737

3838
- DCsv2-series VMs are [generation 2 VMs](./linux/generation-2.md#creating-a-generation-2-vm) and only support `Gen2` images.
39-
- Currently available in UK South only.
39+
- Currently available in UK South and Canada Central only.
4040
- Previous generation of Confidential Compute VMs: [DC Series](sizes-previous-gen.md)
4141
- Create DCsv2 VMs using Azure Portal [Create VM - Portal](./linux/quick-create-portal.md)
4242

0 commit comments

Comments
 (0)