Skip to content

Commit a620a13

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into dell-poweredge-r350-new
2 parents 64bef58 + cc6dfe9 commit a620a13

File tree

523 files changed

+6787
-4179
lines changed

Some content is hidden

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

523 files changed

+6787
-4179
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5591,6 +5591,41 @@
55915591
"source_path_from_root": "/articles/azure-monitor/logs/collect-sccm.md",
55925592
"redirect_url": "/mem/configmgr/core/plan-design/changes/deprecated/removed-and-deprecated-cmfeatures",
55935593
"redirect_document_id": false
5594+
},
5595+
{
5596+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-overview.md",
5597+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5598+
"redirect_document_id": false
5599+
},
5600+
{
5601+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-migrate.md",
5602+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5603+
"redirect_document_id": false
5604+
},
5605+
{
5606+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-enable.md",
5607+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5608+
"redirect_document_id": false
5609+
},
5610+
{
5611+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-alerts.md",
5612+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5613+
"redirect_document_id": false
5614+
},
5615+
{
5616+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-configure.md",
5617+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5618+
"redirect_document_id": false
5619+
},
5620+
{
5621+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-configure-dcr.md",
5622+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5623+
"redirect_document_id": false
5624+
},
5625+
{
5626+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-health-troubleshoot.md",
5627+
"redirect_url": "/azure/azure-monitor/vm/vminsights-overview",
5628+
"redirect_document_id": false
55945629
}
55955630
]
55965631
}

articles/active-directory-b2c/azure-ad-b2c-global-identity-funnel-based-design.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ This use case demonstrates how a user from their home country/region performs a
5151

5252
### Existing local user attempts sign up
5353

54-
This use case demonstrates how a user re-registering the same email from their own country, or a different region, is blocked.
54+
This use case demonstrates how a user re-registering the same email from their own country/region, or a different region, is blocked.
5555

5656
![Screenshot shows the existing account sign-up flow.](media/azure-ad-b2c-global-identity-design-considerations/local-existing-account-signup.png)
5757

@@ -108,7 +108,7 @@ This use case demonstrates how a user can travel across regions and maintain the
108108

109109
### Local user forgot password
110110

111-
This use case demonstrates how a user can reset their password when they are within their home country.
111+
This use case demonstrates how a user can reset their password when they are within their home country/region.
112112

113113
![Screenshot shows the local user forgot password flow.](media/azure-ad-b2c-global-identity-design-considerations/local-user-forgot-password.png)
114114

articles/active-directory-b2c/azure-ad-b2c-global-identity-region-based-design.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This use case demonstrates how a user from their home country/region performs a
4949

5050
### Existing local user attempts sign up
5151

52-
This use case demonstrates how a user re-registering the same email from their own country, or a different region, is blocked.
52+
This use case demonstrates how a user re-registering the same email from their own country/region, or a different region, is blocked.
5353

5454
![Screenshot shows the existing local user sign up attempt flow.](media/azure-ad-b2c-global-identity-regional-design/existing-local-user-sign-up.png)
5555

articles/active-directory-b2c/billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ A subscription linked to an Azure AD B2C tenant can be used for the billing of A
7676
1. Select **Create**.
7777
1. Select **Link an existing Azure AD B2C Tenant to my Azure subscription**.
7878
1. Select an **Azure AD B2C Tenant** from the dropdown. Only tenants for which you're a global administrator and that are not already linked to a subscription are shown. The **Azure AD B2C Resource name** field is populated with the domain name of the Azure AD B2C tenant you select.
79-
1. Select an active Azure **Subscription** of which you're an administrator.
79+
1. Select an active Azure **Subscription** of which you're an owner.
8080
1. Under **Resource group**, select **Create new**, and then specify the **Resource group location**. The resource group settings here have no impact on your Azure AD B2C tenant location, performance, or billing status.
8181
1. Select **Create**.
8282

articles/active-directory-b2c/identity-provider-salesforce.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ To enable sign-in for users with a Salesforce account in Azure Active Directory
4545
1. **Contact Email** - The contact email for Salesforce
4646
1. Under **API (Enable OAuth Settings)**, select **Enable OAuth Settings**
4747
1. For the **Callback URL**, enter `https://your-tenant-name.b2clogin.com/your-tenant-name.onmicrosoft.com/oauth2/authresp`. If you use a [custom domain](custom-domain.md), enter `https://your-domain-name/your-tenant-name.onmicrosoft.com/oauth2/authresp`. Replace `your-tenant-name` with the name of your tenant, and `your-domain-name` with your custom domain. You need to use all lowercase letters when entering your tenant name even if the tenant is defined with uppercase letters in Azure AD B2C.
48-
1. In the **Selected OAuth Scopes**, select **Access your basic information (id, profile, email, address, phone)**, and **Allow access to your unique identifier (openid)**.
48+
1. In the **Selected OAuth Scopes**, select **Access the identity URL service (id, profile, email, address, phone)**, and **Allow access to your unique identifier (openid)**.
4949
1. Select **Require Secret for Web Server Flow**.
5050
1. Select **Configure ID Token**
5151
1. Set the **Token Valid for** 5 minutes.

articles/active-directory-b2c/language-customization.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ Chrome and Firefox both request for their set language. If it's a supported lang
472472

473473
## Supported languages
474474

475-
Azure AD B2C includes support for the following languages. User flow languages are provided by Azure AD B2C. The multi-factor authentication (MFA) notification languages are provided by [Azure AD MFA](../active-directory/authentication/concept-mfa-howitworks.md).
475+
Azure AD B2C includes support for the following languages by using ISO 639-1 codes. User flow languages are provided by Azure AD B2C. The multi-factor authentication (MFA) notification languages are provided by [Azure AD MFA](../active-directory/authentication/concept-mfa-howitworks.md).
476476

477477
| Language | Language code | User flows | MFA notifications |
478478
|-----------------------| :-----------: | :----------------: | :----------------: |
@@ -527,6 +527,7 @@ Azure AD B2C includes support for the following languages. User flow languages a
527527
| Turkish | tr | ![Green check mark.](./media/user-flow-language-customization/yes.png) | ![Green check mark.](./media/user-flow-language-customization/yes.png) |
528528
| Ukrainian | uk | ![X indicating no.](./media/user-flow-language-customization/no.png) | ![Green check mark.](./media/user-flow-language-customization/yes.png) |
529529
| Vietnamese | vi | ![X indicating no.](./media/user-flow-language-customization/no.png) | ![Green check mark.](./media/user-flow-language-customization/yes.png) |
530+
| Welsh | cy | ![X indicating no.](./media/user-flow-language-customization/no.png) | ![X indicating no.](./media/user-flow-language-customization/no.png) |
530531
| Chinese - Simplified | zh-hans | ![Green check mark.](./media/user-flow-language-customization/yes.png) | ![Green check mark.](./media/user-flow-language-customization/yes.png) |
531532
| Chinese - Traditional | zh-hant | ![Green check mark.](./media/user-flow-language-customization/yes.png) | ![Green check mark.](./media/user-flow-language-customization/yes.png) |
532533

articles/active-directory/conditional-access/location-condition.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ For the next 24 hours, if the user is still accessing the resource and granted t
8787

8888
Every time the user shares their GPS location, the app does jailbreak detection (Using the same logic as the Intune MAM SDK). If the device is jailbroken, the location isn't considered valid, and the user isn't granted access.
8989

90-
A Conditional Access policy with GPS-based named locations in report-only mode prompts users to share their GPS location, even though they aren't blocked from signing in.
90+
> [!NOTE]
91+
>A Conditional Access policy with GPS-based named locations in report-only mode prompts users to share their GPS location, even though they aren't blocked from signing in.
9192
9293
GPS location doesn't work with [passwordless authentication methods](../authentication/concept-authentication-passwordless.md).
9394

articles/active-directory/conditional-access/workload-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ A [workload identity](../develop/workload-identities-overview.md) is an identity
2828
These differences make workload identities harder to manage and put them at higher risk for compromise.
2929

3030
> [!IMPORTANT]
31-
> Conditional Access policies can be scoped to to service principals in Azure AD with Workload Identities Premium licenses.
31+
> Conditional Access policies can be scoped to service principals in Azure AD with Workload Identities Premium licenses.
3232
3333
> [!NOTE]
3434
> Policy can be applied to single tenant service principals that have been registered in your tenant. Third party SaaS and multi-tenanted apps are out of scope. Managed identities are not covered by policy.

articles/active-directory/devices/enterprise-state-roaming-windows-settings-reference.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The following is a list of the settings that will be roamed or backed up in Wind
2121

2222
## Windows Settings details
2323

24-
List of settings that can be configured to sync in recent Windows versions. These can be found in Windows 11 under **Settings** > **Accounts** > **Sync your settings** or **Settings** > **Accounts** > **Windows backup** > **Remember my preferences**.
24+
List of settings that can be configured to sync in recent Windows versions.
2525

2626
| Settings | Windows 10 (21H1 or newer) |
2727
| --- | --- |
@@ -36,6 +36,8 @@ List of settings that can be configured to sync in recent Windows versions. Thes
3636
| Touchpad: Scrolling Direction | sync |
3737
| Wi-Fi: Wi-Fi profiles (only WPA) | sync |
3838

39+
Control over these settings can be found in Windows 10 under **Settings** > **Accounts** > **Sync your settings** or in Windows 11 under **Settings** > **Accounts** > **Windows backup** > **Remember my preferences**.
40+
3941
## Browser settings
4042

4143
For more information on the Sync behavior for the new Microsoft Edge, see the article [Microsoft Edge Sync](/deployedge/microsoft-edge-enterprise-sync).

articles/active-directory/fundamentals/active-directory-data-storage-eu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Administrators can choose to enable or disable certain Azure AD features. If the
7979

8080
* **Azure Active Directory Multi Tenant Collaboration** - With multi tenant collaboration scenarios enabled, customers can configure their tenant to collaborate with users from a different tenant. For example, a customer can invite users to their tenant in a B2B context. A customer can create a multi-tenant SaaS application that allows other third party tenants to provision the application in the third party tenant. Or, the customer can make two or more tenants affiliated with one another and act as a single tenant in certain scenarios, such as multi-tenant organization (MTO) formation, tenant to tenant sync, and shared e-mail domain sharing. Customer configuration and use of multi tenant collaboration may occur with tenants outside of the EU Data Residency and EU Data Boundary resulting in some customer data, such as user and device account data, usage data, and service configuration (application, policy, and group) stored and processed in the location of the collaborating tenant.
8181
* **Application Proxy** - Allows customers to access their on-premises web applications externally. Customers may choose advanced routing configurations that allow customer data to egress outside of the EU Data Residency and EU Data Boundary, including user account data, usage data, and application configuration data.
82-
* **Microsoft 365 Multi Geo** - Microsoft 365 Multi-Geo provides customers with the ability to expand their Microsoft 365 presence to multiple geographic regions or countries within a single existing Microsoft 365 tenant. Azure Active Directory will egress customer data to perform backup authentication to the locations configured by the customer. Types of customer data include user and device account data, branding data, and service configuration data (application, policy, and group).
82+
* **Microsoft 365 Multi Geo** - Microsoft 365 Multi-Geo provides customers with the ability to expand their Microsoft 365 presence to multiple geographic regions/countries within a single existing Microsoft 365 tenant. Azure Active Directory will egress customer data to perform backup authentication to the locations configured by the customer. Types of customer data include user and device account data, branding data, and service configuration data (application, policy, and group).
8383

8484
### Other EU Data Boundary online services
8585

0 commit comments

Comments
 (0)