Skip to content

Commit 1843425

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into sdg-setup-computes
2 parents cc1ac2f + e96c575 commit 1843425

File tree

267 files changed

+1378
-1760
lines changed

Some content is hidden

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

267 files changed

+1378
-1760
lines changed

.openpublishing.redirection.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37349,8 +37349,13 @@
3734937349
},
3735037350
{
3735137351
"source_path": "articles/active-directory/application-access-panel-web-sign-in-problem.md",
37352-
"redirect_url": "/azure/active-directory/manage-apps/access-panel-troubleshoot-web-sign-in-problem",
37353-
"redirect_document_id": true
37352+
"redirect_url": "/azure/active-directory/manage-apps/application-sign-in-other-problem-access-panel",
37353+
"redirect_document_id": false
37354+
},
37355+
{
37356+
"source_path": "articles/active-directory/manage-apps/access-panel-troubleshoot-web-sign-in-problem.md",
37357+
"redirect_url": "/azure/active-directory/manage-apps/application-sign-in-other-problem-access-panel",
37358+
"redirect_document_id": false
3735437359
},
3735537360
{
3735637361
"source_path": "articles/active-directory/manage-apps/access-panel-workspaces.md",
@@ -37574,8 +37579,13 @@
3757437579
},
3757537580
{
3757637581
"source_path": "articles/active-directory/application-sign-in-other-problem-deeplink.md",
37577-
"redirect_url": "/azure/active-directory/manage-apps/application-sign-in-other-problem-deeplink",
37578-
"redirect_document_id": true
37582+
"redirect_url": "/azure/active-directory/manage-apps/application-sign-in-other-problem-access-panel",
37583+
"redirect_document_id": false
37584+
},
37585+
{
37586+
"source_path": "articles/active-directory/manage-apps/application-sign-in-other-problem-deeplink.md",
37587+
"redirect_url": "/azure/active-directory/manage-apps/application-sign-in-other-problem-access-panel",
37588+
"redirect_document_id": false
3757937589
},
3758037590
{
3758137591
"source_path": "articles/active-directory/application-sign-in-problem-application-error.md",

articles/active-directory-domain-services/powershell-create-instance.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ ms.subservice: domain-services
1111
ms.workload: identity
1212
ms.topic: sample
1313
ms.date: 07/09/2020
14-
ms.author: iainfou
14+
ms.author: iainfou
15+
ms.custom: devx-track-azurepowershell
1516

1617
---
1718
# Enable Azure Active Directory Domain Services using PowerShell
@@ -264,4 +265,4 @@ To see the managed domain in action, you can [domain-join a Windows VM][windows-
264265
[New-AzVirtualNetwork]: /powershell/module/Az.Network/New-AzVirtualNetwork
265266
[Get-AzSubscription]: /powershell/module/Az.Accounts/Get-AzSubscription
266267
[cloud-shell]: ../cloud-shell/cloud-shell-windows-users.md
267-
[availability-zones]: ../availability-zones/az-overview.md
268+
[availability-zones]: ../availability-zones/az-overview.md

articles/active-directory-domain-services/scoped-synchronization.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ ms.subservice: domain-services
1111
ms.workload: identity
1212
ms.topic: how-to
1313
ms.date: 07/24/2020
14-
ms.author: iainfou
14+
ms.author: iainfou
15+
ms.custom: devx-track-azurepowershell
1516

1617
---
1718
# Configure scoped synchronization from Azure AD to Azure Active Directory Domain Services using the Azure portal
@@ -91,4 +92,4 @@ To learn more about the synchronization process, see [Understand synchronization
9192
[concepts-sync]: synchronization.md
9293
[tutorial-create-instance]: tutorial-create-instance.md
9394
[create-azure-ad-tenant]: ../active-directory/fundamentals/sign-up-organization.md
94-
[associate-azure-ad-tenant]: ../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md
95+
[associate-azure-ad-tenant]: ../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md

articles/active-directory/authentication/howto-mfa-reporting.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ author: iainfoulds
1313
manager: daveba
1414
ms.reviewer: michmcla
1515

16-
ms.collection: M365-identity-device-management
16+
ms.collection: M365-identity-device-management
17+
ms.custom: devx-track-azurepowershell
1718
---
1819
# Use the sign-ins report to review Azure Multi-Factor Authentication events
1920

@@ -176,4 +177,4 @@ The following additional information and reports are available for MFA events, i
176177

177178
## Next steps
178179

179-
This article provided an overview of the sign-ins activity report. For more detailed information on what this report contains and understand the data, see [sign-in activity reports in Azure AD](../reports-monitoring/concept-sign-ins.md).
180+
This article provided an overview of the sign-ins activity report. For more detailed information on what this report contains and understand the data, see [sign-in activity reports in Azure AD](../reports-monitoring/concept-sign-ins.md).

articles/active-directory/authentication/howto-mfa-userstates.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ author: iainfoulds
1313
manager: daveba
1414
ms.reviewer: michmcla
1515

16-
ms.collection: M365-identity-device-management
16+
ms.collection: M365-identity-device-management
17+
ms.custom: devx-track-azurepowershell
1718
---
1819
# Enable per-user Azure Multi-Factor Authentication to secure sign-in events
1920

@@ -186,4 +187,4 @@ To configure Azure Multi-Factor Authentication settings, see [Configure Azure M
186187

187188
To manage user settings for Azure Multi-Factor Authentication, see [Manage user settings with Azure Multi-Factor Authentication](howto-mfa-userdevicesettings.md).
188189

189-
To understand why a user was prompted or not prompted to perform MFA, see [Azure Multi-Factor Authentication reports](howto-mfa-reporting.md).
190+
To understand why a user was prompted or not prompted to perform MFA, see [Azure Multi-Factor Authentication reports](howto-mfa-reporting.md).

articles/active-directory/authentication/howto-password-ban-bad-on-premises-monitor.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ author: iainfoulds
1313
manager: daveba
1414
ms.reviewer: jsimmons
1515

16-
ms.collection: M365-identity-device-management
16+
ms.collection: M365-identity-device-management
17+
ms.custom: devx-track-azurepowershell
1718
---
1819
# Monitor and review logs for on-premises Azure AD Password Protection environments
1920

articles/active-directory/authentication/howto-sspr-authenticationdata.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ author: iainfoulds
1313
manager: daveba
1414
ms.reviewer: rhicock
1515

16-
ms.collection: M365-identity-device-management
16+
ms.collection: M365-identity-device-management
17+
ms.custom: devx-track-azurepowershell
1718
---
1819
# Pre-populate user authentication contact information for Azure Active Directory self-service password reset (SSPR)
1920

@@ -166,4 +167,4 @@ Once authentication contact information is pre-populated for users, complete the
166167
> [!div class="nextstepaction"]
167168
> [Enable Azure AD self-service password reset](tutorial-enable-sspr.md)
168169
169-
[Contact]: ./media/howto-sspr-authenticationdata/user-authentication-contact-info.png "Global administrators can modify a user's authentication contact info"
170+
[Contact]: ./media/howto-sspr-authenticationdata/user-authentication-contact-info.png "Global administrators can modify a user's authentication contact info"

articles/active-directory/develop/active-directory-optional-claims.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The set of optional claims available by default for applications to use are list
5454
| `verified_secondary_email` | Sourced from the user's SecondaryAuthoritativeEmail | JWT | | |
5555
| `vnet` | VNET specifier information. | JWT | | |
5656
| `fwd` | IP address.| JWT | | Adds the original IPv4 address of the requesting client (when inside a VNET) |
57-
| `ctry` | User's country/region | JWT | | Azure AD returns the `ctry` optional claim if it's present and the value of the field is a standard two-letter country/region code, such as FR, JP, SZ, and so on. |
57+
| `ctry` | User's country/region | JWT, SAML | | Azure AD returns the `ctry` optional claim if it's present and the value of the field is a standard two-letter country/region code, such as FR, JP, SZ, and so on. |
5858
| `tenant_ctry` | Resource tenant's country | JWT | | Same as `ctry` except set at a tenant level by an admin. Must also be a standard two-letter value. |
5959
| `xms_pdl` | Preferred data location | JWT | | For Multi-Geo tenants, the preferred data location is the three-letter code showing the geographic region the user is in. For more info, see the [Azure AD Connect documentation about preferred data location](../hybrid/how-to-connect-sync-feature-preferreddatalocation.md).<br/>For example: `APC` for Asia Pacific. |
6060
| `xms_pl` | User preferred language | JWT ||The user's preferred language, if set. Sourced from their home tenant, in guest access scenarios. Formatted LL-CC ("en-us"). |

articles/active-directory/develop/howto-authenticate-service-principal-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88

99
ms.service: active-directory
1010
ms.subservice: develop
11-
ms.custom: aaddev
11+
ms.custom: aaddev , devx-track-azurepowershell
1212
ms.topic: how-to
1313
ms.tgt_pltfrm: multiple
1414
ms.date: 06/26/2020
@@ -220,4 +220,4 @@ You may get the following errors when creating a service principal:
220220

221221
* To set up a service principal with password, see [Create an Azure service principal with Azure PowerShell](/powershell/azure/create-azure-service-principal-azureps).
222222
* For a more detailed explanation of applications and service principals, see [Application Objects and Service Principal Objects](app-objects-and-service-principals.md).
223-
* For more information about Azure AD authentication, see [Authentication Scenarios for Azure AD](./authentication-vs-authorization.md).
223+
* For more information about Azure AD authentication, see [Authentication Scenarios for Azure AD](./authentication-vs-authorization.md).

articles/active-directory/hybrid/how-to-connect-configure-ad-ds-connector-account.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ ms.date: 05/18/2020
1111
ms.subservice: hybrid
1212
ms.author: billmath
1313

14-
ms.collection: M365-identity-device-management
14+
ms.collection: M365-identity-device-management
15+
ms.custom: devx-track-azurepowershell
1516
---
1617

1718
# Azure AD Connect: Configure AD DS Connector Account Permissions

0 commit comments

Comments
 (0)