Skip to content

Commit 3dc1a23

Browse files
authored
Merge pull request #101167 from MicrosoftDocs/master
1/14 PM Publish
2 parents 78938c2 + a8bf39b commit 3dc1a23

File tree

1,251 files changed

+54731
-9031
lines changed

Some content is hidden

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

1,251 files changed

+54731
-9031
lines changed

.openpublishing.redirection.json

Lines changed: 44649 additions & 3 deletions
Large diffs are not rendered by default.

articles/active-directory-domain-services/join-windows-vm-template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,6 @@ In this article, you used the Azure portal to configure and deploy resources usi
139139
[create-azure-ad-tenant]: ../active-directory/fundamentals/sign-up-organization.md
140140
[associate-azure-ad-tenant]: ../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md
141141
[create-azure-ad-ds-instance]: tutorial-create-instance.md
142-
[template-overview]: ../azure-resource-manager/template-deployment-overview.md
143-
[deploy-powershell]: ../azure-resource-manager/resource-group-template-deploy.md
144-
[deploy-cli]: ../azure-resource-manager/resource-group-template-deploy-cli.md
142+
[template-overview]: ../azure-resource-manager/templates/overview.md
143+
[deploy-powershell]: ../azure-resource-manager/templates/deploy-powershell.md
144+
[deploy-cli]: ../azure-resource-manager/templates/deploy-cli.md

articles/active-directory-domain-services/mismatched-tenant-error.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ In this example deployment scenario, the Contoso Azure AD DS managed domain is e
5252
The following two options resolve the mismatched directory error:
5353

5454
* [Delete the Azure AD DS managed domain](delete-aadds.md) from your existing Azure AD directory. [Create a replacement Azure AD DS managed domain](tutorial-create-instance.md) in the same Azure AD directory as the virtual network you wish to use. When ready, join all machines previously joined to the deleted domain to the recreated managed domain.
55-
* [Move the Azure subscription](../billing/billing-subscription-transfer.md) containing the virtual network to the same Azure AD directory as the Azure AD DS managed domain.
55+
* [Move the Azure subscription](../cost-management-billing/manage/billing-subscription-transfer.md) containing the virtual network to the same Azure AD directory as the Azure AD DS managed domain.
5656

5757
## Next steps
5858

articles/active-directory-domain-services/security-audit-events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ To enable Azure AD DS security audit events using Azure PowerShell, complete the
122122
123123
1. Create the target resource for the security audit events.
124124
125-
* **Azure storage** - [Create a storage account using Azure PowerShell](../storage/common/storage-quickstart-create-account.md?tabs=azure-powershell)
125+
* **Azure storage** - [Create a storage account using Azure PowerShell](../storage/common/storage-account-create.md?tabs=azure-powershell)
126126
* **Azure event hubs** - [Create an event hub using Azure PowerShell](../event-hubs/event-hubs-quickstart-powershell.md). You may also need to use the [New-AzEventHubAuthorizationRule](/powershell/module/az.eventhub/new-azeventhubauthorizationrule) cmdlet to create an authorization rule that grants Azure AD DS permissions to the event hub *namespace*. The authorization rule must include the **Manage**, **Listen**, and **Send** rights.
127127
128128
> [!IMPORTANT]

articles/active-directory-domain-services/troubleshoot-alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The Azure AD DS managed domain's health automatically updates itself within two
8888

8989
Azure AD DS requires an active subscription, and can't be moved to a different subscription. If the Azure subscription that the Azure AD DS managed domain was associated with is deleted, you must recreate an Azure subscription and Azure AD DS managed domain.
9090

91-
1. [Create an Azure subscription](../billing/billing-create-subscription.md).
91+
1. [Create an Azure subscription](../cost-management-billing/manage/create-subscription.md).
9292
1. [Delete the Azure AD DS managed domain](delete-aadds.md) from your existing Azure AD directory.
9393
1. [Create a replacement Azure AD DS managed domain](tutorial-create-instance.md).
9494

articles/active-directory/authentication/concept-mfa-licensing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure MFA versions and consumption plans - Azure Active Directory
3-
description: Information about the Multi-factor Authentication client and the different methods and versions available.
3+
description: Information about the Multi-factor Authentication client and the different methods and versions available.
44

55
services: multi-factor-authentication
66
ms.service: active-directory
@@ -28,7 +28,7 @@ The following table describes the differences between versions of multi-factor a
2828

2929
| Version | Description |
3030
| --- | --- |
31-
| Free option | Customers who are utilizing the free benefits of Azure AD can use [security defaults](../conditional-access/concept-conditional-access-security-defaults.md) to enable multi-factor authentication in their environment. |
31+
| Free option | Customers who are utilizing the free benefits of Azure AD can use [security defaults](../fundamentals/concept-fundamentals-security-defaults.md) to enable multi-factor authentication in their environment. |
3232
| Multi-Factor Authentication for Office 365 | This version is managed from the Office 365 or Microsoft 365 portal. Administrators can [secure Office 365 resources with two-step verification](https://support.office.com/article/Set-up-multi-factor-authentication-for-Office-365-users-8f0454b2-f51a-4d9c-bcde-2c48e41621c6). This version is part of an Office 365 subscription. |
3333
| Multi-Factor Authentication for Azure AD Administrators | Users assigned the Azure AD Global Administrator role in Azure AD tenants can enable two-step verification at no additional cost. |
3434
| Azure Multi-Factor Authentication | Often referred to as the "full" version, Azure Multi-Factor Authentication offers the richest set of capabilities. It provides additional configuration options via the [Azure portal](https://portal.azure.com), advanced reporting, and support for a range of on-premises and cloud applications. Azure Multi-Factor Authentication is a feature of [Azure Active Directory Premium](https://www.microsoft.com/cloud-platform/azure-active-directory-features) and [Microsoft 365 Business](https://www.microsoft.com/microsoft-365/business). |
@@ -44,7 +44,7 @@ The following table provides a list of the features that are available in the va
4444
> This comparison table discusses the features that are part of each version of Multi-Factor Authentication. If you have the full Azure Multi-Factor Authentication service, some features may not be available depending on whether you use [MFA in the cloud or MFA on-premises](concept-mfa-whichversion.md).
4545
>
4646
47-
| Feature | Multi-Factor Authentication for Office 365 | Multi-Factor Authentication for Azure AD Administrators | Azure Multi-Factor Authentication | Security defaults |
47+
| Feature | Multi-Factor Authentication for Office 365 | Multi-Factor Authentication for Azure AD Administrators | Azure Multi-Factor Authentication | Security defaults |
4848
| --- |:---:|:---:|:---:|:---:|
4949
| Protect Azure AD admin accounts with MFA ||● (Azure AD Global Administrator accounts only) |||
5050
| Mobile app as a second factor |||||

articles/active-directory/conditional-access/concept-conditional-access-policy-common.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 12/10/2019
9+
ms.date: 01/14/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -30,15 +30,17 @@ More information about emergency access accounts and why they are important can
3030

3131
## Typical policies deployed by organizations
3232

33-
* [Require MFA for administrators](howto-conditional-access-policy-admin-mfa.md)
34-
* [Require MFA for Azure management](howto-conditional-access-policy-azure-management.md)
35-
* [Require MFA for all users](howto-conditional-access-policy-all-users-mfa.md)
36-
* [Block legacy authentication](howto-conditional-access-policy-block-legacy.md)
33+
* [Require MFA for administrators](howto-conditional-access-policy-admin-mfa.md)\*
34+
* [Require MFA for Azure management](howto-conditional-access-policy-azure-management.md)\*
35+
* [Require MFA for all users](howto-conditional-access-policy-all-users-mfa.md)\*
36+
* [Block legacy authentication](howto-conditional-access-policy-block-legacy.md)\*
3737
* [Risk-based Conditional Access (Requires Azure AD Premium P2)](howto-conditional-access-policy-risk.md)
3838
* [Require trusted location for MFA registration](howto-conditional-access-policy-registration.md)
3939
* [Block access by location](howto-conditional-access-policy-location.md)
4040
* [Require compliant device](howto-conditional-access-policy-compliant-device.md)
4141

42+
\* These four policies when configured together, would mimic functionality enabled by [security defaults](../fundamentals/concept-fundamentals-security-defaults.md).
43+
4244
## Next steps
4345

4446
- [Simulate sign in behavior using the Conditional Access What If tool.](troubleshoot-conditional-access-what-if.md)

articles/active-directory/develop/quickstart-v2-javascript.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ In this quickstart, you use a code sample to learn how a JavaScript single-page
6060
6161
> [!div class="sxs-lookup" renderon="portal"]
6262
> #### Step 1: Configure your application in the Azure portal
63-
> For the code sample for this quickstart to work, you need to add a redirect URI as `http://localhost:30662/` and enable **Implicit grant**.
63+
> For the code sample for this quickstart to work, you need to add a `redirectUri` as `http://localhost:30662/` and enable **Implicit grant**.
6464
> > [!div renderon="portal" id="makechanges" class="nextstepaction"]
6565
> > [Make these changes for me]()
6666
>
@@ -166,7 +166,7 @@ var msalConfig = {
166166
auth: {
167167
clientId: "Enter_the_Application_Id_here",
168168
authority: "https://login.microsoftonline.com/Enter_the_Tenant_Info_Here",
169-
redirectURI: "http://localhost:30662/"
169+
redirectUri: "http://localhost:30662/"
170170
},
171171
cache: {
172172
cacheLocation: "localStorage",
@@ -181,7 +181,7 @@ var myMSALObj = new Msal.UserAgentApplication(msalConfig);
181181
> |---------|---------|
182182
> |`clientId` | The application ID of the application that's registered in the Azure portal.|
183183
> |`authority` | (Optional) The authority URL that supports account types, as described previously in the configuration section. The default authority is `https://login.microsoftonline.com/common`. |
184-
> |`redirectURI` | The application registration's configured reply/redirect URI. In this case, `http://localhost:30662/`. |
184+
> |`redirectUri` | The application registration's configured reply/redirectUri. In this case, `http://localhost:30662/`. |
185185
> |`cacheLocation` | (Optional) Sets the browser storage for the auth state. The default is sessionStorage. |
186186
> |`storeAuthStateInCookie` | (Optional) The library that stores the authentication request state that's required for validation of the authentication flows in the browser cookies. This cookie is set for IE and Edge browsers to mitigate certain [known issues](https://github.com/AzureAD/microsoft-authentication-library-for-js/wiki/Known-issues-on-IE-and-Edge-Browser#issues). |
187187

articles/active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Use **Switch directory** to go to your new directory. It can take several hours
7575

7676
![Directory switcher page, with sample information](media/active-directory-how-subscriptions-associated-directory/directory-switcher.png)
7777

78-
Changing the subscription directory is a service-level operation, so it doesn't affect subscription billing ownership. The Account Admin can still change the Service Admin from the [Account Center](https://account.azure.com/subscriptions). To delete the original directory, you must transfer the subscription billing ownership to a new Account Admin. To learn more about transferring billing ownership, see [Transfer ownership of an Azure subscription to another account](../../billing/billing-subscription-transfer.md).
78+
Changing the subscription directory is a service-level operation, so it doesn't affect subscription billing ownership. The Account Admin can still change the Service Admin from the [Account Center](https://account.azure.com/subscriptions). To delete the original directory, you must transfer the subscription billing ownership to a new Account Admin. To learn more about transferring billing ownership, see [Transfer ownership of an Azure subscription to another account](../../cost-management-billing/manage/billing-subscription-transfer.md).
7979

8080
## Post-association steps
8181

articles/active-directory/fundamentals/concept-fundamentals-security-defaults.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 12/06/2019
9+
ms.date: 01/14/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -25,7 +25,10 @@ Microsoft is making security defaults available to everyone. The goal is to ensu
2525

2626
![Screenshot of the Azure portal with the toggle to enable security defaults](./media/concept-fundamentals-security-defaults/security-defaults-azure-ad-portal.png)
2727

28-
The following security configurations will be turned on in your tenant.
28+
> [!TIP]
29+
> If your tenant was created on or after October 22nd, 2019, it’s possible you are experiencing the new secure-by-default behavior and already have security defaults enabled in your tenant. In an effort to protect all of our users, security defaults is being rolled out to all new tenants created.
30+
31+
More details on why security defaults are being made available can be found in Alex Weinert's blog post, [Introducing security defaults](https://techcommunity.microsoft.com/t5/azure-active-directory-identity/introducing-security-defaults/ba-p/1061414).
2932

3033
## Unified Multi-Factor Authentication registration
3134

0 commit comments

Comments
 (0)