Skip to content

Commit 9d7fe0a

Browse files
authored
Merge pull request #188604 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents fcb3317 + 7ed601f commit 9d7fe0a

File tree

212 files changed

+2377
-608
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+2377
-608
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
"redirect_url": "/azure/azure-monitor/app/performance-counters",
1111
"redirect_document_id": true
1212
},
13+
{
14+
"source_path_from_root": "/articles/application-insights/cloudservices.md",
15+
"redirect_url": "/azure/azure-monitor/app/azure-web-apps-net",
16+
"redirect_document_id": false
17+
},
1318
{
1419
"source_path_from_root": "/articles/azure-monitor/insights/service-bus-insights.md",
1520
"redirect_url": "/azure/service-bus-messaging/service-bus-insights",

articles/active-directory-b2c/deploy-custom-policies-devops.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ try {
7777
$FileExists = Test-Path -Path $filePath -PathType Leaf
7878
7979
if ($FileExists) {
80-
$policycontent = Get-Content $filePath
80+
$policycontent = Get-Content $filePath -Encoding UTF8
8181
8282
# Optional: Change the content of the policy. For example, replace the tenant-name with your tenant name.
8383
# $policycontent = $policycontent.Replace("your-tenant.onmicrosoft.com", "contoso.onmicrosoft.com")

articles/active-directory/hybrid/how-to-connect-install-custom.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ After installing the required components, select your users' single sign-on meth
6767
On the **Connect to Azure AD** page, enter a global admin account and password. If you selected **Federation with AD FS** on the previous page, don't sign in with an account that's in a domain you plan to enable for federation.
6868

6969
You might want to use an account in the default *onmicrosoft.com* domain, which comes with your Azure AD tenant. This account is used only to create a service account in Azure AD. It's not used after the installation finishes.
70-
70+
71+
>[!NOTE]
72+
>A best practice is to avoid using on-premises synced accounts for Azure AD role assignments. If the on premises account is compromised, this can be used to compromise your Azure AD resources as well. For a complete list of best practices refer to [Best practices for Azure AD roles](https://docs.microsoft.com/azure/active-directory/roles/best-practices)
73+
7174
![Screenshot showing the "Connect to Azure AD" page.](./media/how-to-connect-install-custom/connectaad.png)
7275

7376
If your global admin account has multifactor authentication enabled, you provide the password again in the sign-in window, and you must complete the multifactor authentication challenge. The challenge could be a verification code or a phone call.
-3.07 KB
Loading

0 commit comments

Comments
 (0)