Skip to content

Commit d797e10

Browse files
authored
Merge pull request #112860 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 2d88c90 + 263e7f4 commit d797e10

File tree

7 files changed

+10
-7
lines changed

7 files changed

+10
-7
lines changed

articles/active-directory/devices/hybrid-azuread-join-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ As a first planning step, you should review your environment and determine wheth
9191
If your Windows 10 domain joined devices are [Azure AD registered](overview.md#getting-devices-in-azure-ad) to your tenant, it could lead to a dual state of Hybrid Azure AD joined and Azure AD registered device. We recommend upgrading to Windows 10 1803 (with KB4489894 applied) or above to automatically address this scenario. In pre-1803 releases, you will need to remove the Azure AD registered state manually before enabling Hybrid Azure AD join. In 1803 and above releases, the following changes have been made to avoid this dual state:
9292

9393
- Any existing Azure AD registered state for a user would be automatically removed <i>after the device is Hybrid Azure AD joined and the same user logs in</i>. For example, if User A had an Azure AD registered state on the device, the dual state for User A is cleaned up only when User A logs in to the device. if there are multiple users on the same device, the dual state is cleaned up individually when those users log in.
94-
- You can prevent your domain joined device from being Azure AD registered by adding this registry key - HKLM\SOFTWARE\Policies\Microsoft\Windows\WorkplaceJoin, "BlockAADWorkplaceJoin"=dword:00000001.
94+
- You can prevent your domain joined device from being Azure AD registered by adding the following registry value to HKLM\SOFTWARE\Policies\Microsoft\Windows\WorkplaceJoin: "BlockAADWorkplaceJoin"=dword:00000001.
9595
- In Windows 10 1803, if you have Windows Hello for Business configured, the user needs to re-setup Windows Hello for Business after the dual state clean up.This issue has been addressed with KB4512509
9696

9797
> [!NOTE]

articles/azure-monitor/platform/collect-custom-metrics-linux-telegraf.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ For this tutorial, we deploy a Linux VM that runs the Ubuntu 16.04 LTS operating
2828

2929
Sign in to the [Azure portal](https://portal.azure.com).
3030

31+
> [!NOTE]
32+
> If you want to migrate classic alert rules and use an existing Linux virtual machine, make sure the virutal machine has a system-assigned identity set to **On**.
33+
3134
Create a new Linux VM:
3235

3336
1. Select the **Create a resource** option from the left-hand navigation pane.

articles/azure-monitor/platform/data-sources-collectd.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ The following are basic steps to configure collection of CollectD data in Azure
9696

9797
3. Restart CollectD and Log Analytics agent for Linux with the following commands.
9898

99-
sudo service collectd restart
100-
sudo /opt/microsoft/omsagent/bin/service_control restart
99+
sudo service collectd restart
100+
sudo /opt/microsoft/omsagent/bin/service_control restart
101101

102102
## CollectD metrics to Azure Monitor schema conversion
103103
To maintain a familiar model between infrastructure metrics already collected by Log Analytics agent for Linux and the new metrics collected by CollectD the following schema mapping is used:

articles/azure-monitor/platform/manage-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ See [Defining per-table access control](#table-level-rbac) below if you want to
222222

223223
* Grant users the following permissions on the workspace:
224224

225-
* `Microsoft.OperationalInsights/workspaces/read` – required so the use can enumerate the workspace and open the workspace blade in the Azure portal
225+
* `Microsoft.OperationalInsights/workspaces/read` – required so the user can enumerate the workspace and open the workspace blade in the Azure portal
226226
* `Microsoft.OperationalInsights/workspaces/query/read` – required for every user that can execute queries
227227
* `Microsoft.OperationalInsights/workspaces/query/SigninLogs/read` – to be able to read Azure AD sign-in logs
228228
* `Microsoft.OperationalInsights/workspaces/query/Update/read` – to be able to read Update Management solution logs

articles/cost-management-billing/reservations/exchange-and-refund-azure-reservations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ First, Microsoft cancels the existing reservation and refunds the pro-rated amou
3535

3636
### Enterprise agreement customers
3737

38-
Money is added to the monetary commitment for exchanges and refunds if the original purchase was made using one. Any overage invoices since the original purchases are reopened and rerated to make sure the monetary commitment is used. If the monetary commitment term using the reservation was purchased is no longer active, then credit is added to your current enterprise agreement monetary commitment term. The credit is valid for 90 days from the date fo refund. Unused credit expires at the end of 90 days.
38+
Money is added to the monetary commitment for exchanges and refunds if the original purchase was made using one. Any overage invoices since the original purchases are reopened and rerated to make sure the monetary commitment is used. If the monetary commitment term using the reservation was purchased is no longer active, then credit is added to your current enterprise agreement monetary commitment term. The credit is valid for 90 days from the date of refund. Unused credit expires at the end of 90 days.
3939

4040
If the original purchase was made as an overage, Microsoft issues a credit memo.
4141

articles/sql-database/sql-database-private-endpoint-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 03/09/2020
1212

1313
# Private Link for Azure SQL Database and Data Warehouse
1414

15-
Private Link allows you to connect to various PaaS services in Azure via a **private endpoint**. For a list to PaaS services that support Private Link functionality, go to the [Private Link Documentation](../private-link/index.yml) page. A private endpoint is a private IP address within a specific [VNet](../virtual-network/virtual-networks-overview.md) and Subnet.
15+
Private Link allows you to connect to various PaaS services in Azure via a **private endpoint**. For a list of PaaS services that support Private Link functionality, go to the [Private Link Documentation](../private-link/index.yml) page. A private endpoint is a private IP address within a specific [VNet](../virtual-network/virtual-networks-overview.md) and Subnet.
1616

1717
> [!IMPORTANT]
1818
> This article applies to Azure SQL server, and to both SQL Database and SQL Data Warehouse databases that are created on the Azure SQL server. For simplicity, SQL Database is used when referring to both SQL Database and SQL Data Warehouse. This article does *not* apply to a **managed instance** deployment in Azure SQL Database.

articles/vpn-gateway/vpn-gateway-troubleshoot-vpn-point-to-site-connection-problems.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ When the client connects to Azure by using point-to-site VPN connection, it cann
278278

279279
### Cause
280280

281-
Point-to-site VPN client uses Azure DNS servers that are configured in the Azure virtual network. The Azure DNS servers take precedence over the local DNS servers that are configured in the client, so all DNS queries are sent to the Azure DNS servers. If the Azure DNS servers do not have the records for the local resources, the query fails.
281+
Point-to-site VPN client normally uses Azure DNS servers that are configured in the Azure virtual network. The Azure DNS servers take precedence over the local DNS servers that are configured in the client (unless the metric of the Ethernet interface is lower), so all DNS queries are sent to the Azure DNS servers. If the Azure DNS servers do not have the records for the local resources, the query fails.
282282

283283
### Solution
284284

0 commit comments

Comments
 (0)