Skip to content

Commit 4c5ee88

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents ddf1e3e + 30c7f99 commit 4c5ee88

File tree

248 files changed

+1664
-780
lines changed

Some content is hidden

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

248 files changed

+1664
-780
lines changed

.openpublishing.redirection.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26998,12 +26998,12 @@
2699826998
},
2699926999
{
2700027000
"source_path": "articles/active-directory/user-help/device-management-azuread-registered-devices-windows10-setup.md",
27001-
"redirect_url": "azure/active-directory/user-help/user-help-register-device-on-network",
27001+
"redirect_url": "/azure/active-directory/user-help/user-help-register-device-on-network",
2700227002
"redirect_document_id": true
2700327003
},
2700427004
{
2700527005
"source_path": "articles/active-directory/user-help/device-management-azuread-joined-devices-setup.md",
27006-
"redirect_url": "azure/active-directory/user-help/user-help-join-device-on-network",
27006+
"redirect_url": "/azure/active-directory/user-help/user-help-join-device-on-network",
2700727007
"redirect_document_id": true
2700827008
},
2700927009
{

articles/active-directory-b2c/active-directory-b2c-reference-threat-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ Azure AD B2C uses detection and mitigation techniques like SYN cookies, and rate
2424

2525
Azure AD B2C also has mitigation techniques in place for password attacks. Mitigation includes brute-force password attacks and dictionary password attacks. Passwords that are set by users are required to be reasonably complex. By using various signals, Azure AD B2C analyzes the integrity of requests. Azure AD B2C is designed to intelligently differentiate intended users from hackers and botnets. Azure AD B2C provides a sophisticated strategy to lock accounts based on the passwords entered, in the likelihood of an attack.
2626

27-
For more information, visit the [Microsoft Trust Center](https://www.microsoft.com/en-us/trustcenter/default.aspx).
27+
For more information, visit the [Microsoft Trust Center](https://www.microsoft.com/trustcenter/default.aspx).

articles/active-directory-b2c/active-directory-b2c-user-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ You can view and monitor logging information in near-real time.
359359
After you complete the [Get started with custom policies][B2C-GetStartedCustom] walkthrough, we recommend that you build your scenario by using your own custom policy files. For your reference, we have provided [Sample policy files][UserMigrationSample].
360360

361361
[AD-PasswordPolicies]: https://docs.microsoft.com/azure/active-directory/active-directory-passwords-policy
362-
[AD-Powershell]: https://docs.microsoft.com/en-us/powershell/azure/active-directory/install-adv2
362+
[AD-Powershell]: https://docs.microsoft.com/powershell/azure/active-directory/install-adv2
363363
[AppService-Deploy]: https://docs.microsoft.com/aspnet/core/tutorials/publish-to-azure-webapp-using-vs
364364
[B2C-AppRegister]: https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-app-registration
365365
[B2C-GetStarted]: https://docs.microsoft.com/azure/active-directory-b2c/active-directory-b2c-get-started

articles/active-directory-b2c/manage-user-access.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Depending on application regulation, parental consent might need to be granted b
4242

4343
The following is an example of a user flow for gathering parental consent:
4444

45-
1. An [Azure Active Directory Graph API](https://msdn.microsoft.com/en-us/library/azure/ad/graph/api/api-catalog) operation identifies the user as a minor and returns the user data to the application in the form of an unsigned JSON token.
45+
1. An [Azure Active Directory Graph API](https://msdn.microsoft.com/library/azure/ad/graph/api/api-catalog) operation identifies the user as a minor and returns the user data to the application in the form of an unsigned JSON token.
4646

4747
2. The application processes the JSON token and shows a screen to the minor, notifying him or her that parental consent is required and requesting the consent of a parent online.
4848

@@ -52,7 +52,7 @@ The following is an example of a user flow for gathering parental consent:
5252

5353
5. When either the minor or the adult revokes consent, the Azure AD Graph API can be used to change **consentProvidedForMinor** to **denied**. Alternatively, the application may choose to delete a minor whose consent has been revoked. It is optionally possible to customize the user flow so that the authenticated minor (or parent that is using the minor’s account) can revoke consent. Azure AD B2C records **consentProvidedForMinor** as **denied**.
5454

55-
For more information about **legalAgeGroupClassification**, **consentProvidedForMinor**, and **ageGroup**, see [User resource type](https://developer.microsoft.com/en-us/graph/docs/api-reference/beta/resources/user). For more information about custom attributes, see [Use custom attributes to collect information about your consumers](active-directory-b2c-reference-custom-attr.md). When you address extended attributes by using the Azure AD Graph API, you must use the long version of the attribute, such as *extension_18b70cf9bb834edd8f38521c2583cd86_dateOfBirth*: *2011-01-01T00:00:00Z*.
55+
For more information about **legalAgeGroupClassification**, **consentProvidedForMinor**, and **ageGroup**, see [User resource type](https://developer.microsoft.com/graph/docs/api-reference/beta/resources/user). For more information about custom attributes, see [Use custom attributes to collect information about your consumers](active-directory-b2c-reference-custom-attr.md). When you address extended attributes by using the Azure AD Graph API, you must use the long version of the attribute, such as *extension_18b70cf9bb834edd8f38521c2583cd86_dateOfBirth*: *2011-01-01T00:00:00Z*.
5656

5757
## Gather date of birth and country data
5858

articles/active-directory-b2c/manage-user-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.component: B2C
1515

1616
# Manage user data in Azure Active Directory B2C
1717

18-
This article discusses how you can manage the user data in Azure Active Directory (Azure AD) B2C by using the operations that are provided by the [Azure Active Directory Graph API](https://msdn.microsoft.com/en-us/library/azure/ad/graph/api/api-catalog). Managing user data includes deleting or exporting data from audit logs.
18+
This article discusses how you can manage the user data in Azure Active Directory (Azure AD) B2C by using the operations that are provided by the [Azure Active Directory Graph API](https://msdn.microsoft.com/library/azure/ad/graph/api/api-catalog). Managing user data includes deleting or exporting data from audit logs.
1919

2020
[!INCLUDE [gdpr-intro-sentence.md](../../includes/gdpr-intro-sentence.md)]
2121

articles/active-directory-domain-services/active-directory-ds-troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ If one or more users in your Azure AD tenant are unable to sign in to the newly
135135
* **External accounts:** Ensure that the affected user account is not an external account in the Azure AD tenant. Examples of external accounts include Microsoft accounts (for example, '[email protected]') or user accounts from an external Azure AD directory. Since Azure AD Domain Services does not have credentials for such user accounts, these users cannot sign in to the managed domain.
136136
* **Synced accounts:** If the affected user accounts are synchronized from an on-premises directory, verify that:
137137

138-
* You have deployed or updated to the [latest recommended release of Azure AD Connect](https://www.microsoft.com/en-us/download/details.aspx?id=47594).
138+
* You have deployed or updated to the [latest recommended release of Azure AD Connect](https://www.microsoft.com/download/details.aspx?id=47594).
139139
* You have configured Azure AD Connect to [perform a full synchronization](active-directory-ds-getting-started-password-sync.md).
140140
* Depending on the size of your directory, it may take a while for user accounts and credential hashes to be available in Azure AD Domain Services. Ensure you wait long enough before retrying authentication.
141141
* If the issue persists after verifying the preceding steps, try restarting the Microsoft Azure AD Sync Service. From your sync machine, launch a command prompt and execute the following commands:

articles/active-directory-domain-services/index.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ sections:
2626
- href: active-directory-ds-overview.md
2727
html: <p>Read about what Azure AD Domain Services can do for you.</p>
2828
image:
29-
src: https://docs.microsoft.com/en-us/media/common/i_investigate.svg
29+
src: https://docs.microsoft.com/media/common/i_investigate.svg
3030
title: What is Azure AD Domain Services?
3131
- href: active-directory-ds-getting-started.md
3232
html: <p>Create your own managed domain with this simple walkthrough.</p>
3333
image:
34-
src: https://docs.microsoft.com/en-us/media/common/i_deploy.svg
34+
src: https://docs.microsoft.com/media/common/i_deploy.svg
3535
title: Get started
3636
- href: active-directory-ds-contact-us.md
3737
html: <p>Receive help when you need it.</p>
3838
image:
39-
src: https://docs.microsoft.com/en-us/media/common/i_support.svg
39+
src: https://docs.microsoft.com/media/common/i_support.svg
4040
title: Get support
41-
- href: https://azure.microsoft.com/en-us/updates/?product=active-directory-ds
41+
- href: https://azure.microsoft.com/updates/?product=active-directory-ds
4242
html: <p>See new features in Azure AD Domain Services.</p>
4343
image:
44-
src: https://docs.microsoft.com/en-us/media/common/i_whats-new.svg
44+
src: https://docs.microsoft.com/media/common/i_whats-new.svg
4545
title: What's new
4646

4747
- title: Videos
@@ -58,7 +58,7 @@ sections:
5858
- html: <a href="active-directory-ds-features.md">Features of Azure AD Domain Services</a>
5959
- html: <a href="active-directory-ds-scenarios.md">How can you use the service?</a>
6060
- html: <a href="active-directory-ds-synchronization.md">Understand how synchronization works in Azure AD Domain Services</a>
61-
- html: <a href="https://azure.microsoft.com/en-us/pricing/details/active-directory-ds/">Pricing of Azure AD Domain Services</a>
61+
- html: <a href="https://azure.microsoft.com/pricing/details/active-directory-ds/">Pricing of Azure AD Domain Services</a>
6262

6363
- title: Applications and Azure AD Domain Services
6464
items:
@@ -90,13 +90,13 @@ sections:
9090
- html: <a href="active-directory-ds-troubleshooting.md">Troubleshooting guide</a>
9191
- html: <a href="active-directory-ds-troubleshoot-alerts.md">Troubleshooting alerts on your managed domain</a>
9292
- html: <a href="active-directory-ds-faqs.md">Frequently Asked Questions</a>
93-
- html: <a href="https://azure.microsoft.com/en-us/support/options/">Get support</a>
93+
- html: <a href="https://azure.microsoft.com/support/options/">Get support</a>
9494

9595
- title: Other resources
9696
items:
9797
- type: list
9898
style: unordered
9999
items:
100100
- html: <a href="https://feedback.azure.com/forums/169401-azure-active-directory/">Give feedback on Azure AD Domain Services at UserVoice</a>
101-
- html: <a href="https://azure.microsoft.com/en-us/roadmap/?category=security-identity">Azure Roadmap</a>
102-
- html: <a href="https://docs.microsoft.com/en-us/azure/active-directory-domain-services/active-directory-ds-contact-us">Contact Us</a>
101+
- html: <a href="https://azure.microsoft.com/roadmap/?category=security-identity">Azure Roadmap</a>
102+
- html: <a href="https://docs.microsoft.com/azure/active-directory-domain-services/active-directory-ds-contact-us">Contact Us</a>

articles/active-directory/TOC.md

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -82,34 +82,9 @@
8282
#### [Getting support for B2B](b2b/get-support.md)
8383

8484
## [Manage groups and members](fundamentals/active-directory-manage-groups.md)
85-
### Manage groups
86-
#### [Azure portal](fundamentals/active-directory-groups-create-azure-portal.md)
87-
#### [Azure AD PowerShell for Graph (v2)](users-groups-roles/groups-settings-v2-cmdlets.md)
88-
#### [Azure AD PowerShell MSOnline](users-groups-roles/groups-settings-cmdlets.md)
89-
### [Manage group members](fundamentals/active-directory-groups-members-azure-portal.md)
90-
### [Manage group owners](fundamentals/active-directory-accessmanagement-managing-group-owners.md)
91-
### [Manage group membership](fundamentals/active-directory-groups-membership-azure-portal.md)
92-
### [Assign licenses using groups](fundamentals/active-directory-licensing-whatis-azure-portal.md)
93-
#### [Assign licenses to a group](users-groups-roles/licensing-groups-assign.md)
94-
#### [Identify and resolve license problems in a group](users-groups-roles/licensing-groups-resolve-problems.md)
95-
#### [Migrate individual licensed users to group-based licensing](users-groups-roles/licensing-groups-migrate-users.md)
96-
#### [Migrate users between product licenses](users-groups-roles/licensing-groups-change-licenses.md)
97-
#### [Additional scenarios for group-based licensing](users-groups-roles/licensing-group-advanced.md)
98-
#### [Azure PowerShell examples for group-based licensing](users-groups-roles/licensing-ps-examples.md)
99-
#### [Reference for products and service plans in Azure AD](users-groups-roles/licensing-service-plan-reference.md)
100-
### [Set up Office 365 groups expiration](users-groups-roles/groups-lifecycle.md)
101-
### [Enforce a naming policy for groups](users-groups-roles/groups-naming-policy.md)
102-
### [View all groups](fundamentals/active-directory-groups-view-azure-portal.md)
103-
### [Add group access to SaaS apps](users-groups-roles/groups-saasapps.md)
85+
### [Manage groups](fundamentals/active-directory-groups-create-azure-portal.md)
10486
### [Restore a deleted Office 365 group](fundamentals/active-directory-groups-restore-azure-portal.md)
10587
### [Manage group settings](fundamentals/active-directory-groups-settings-azure-portal.md)
106-
### [Set up self-service groups](users-groups-roles/groups-self-service-management.md)
107-
### Dynamic groups
108-
#### [Create a dynamic group](users-groups-roles/groups-create-rule.md)
109-
#### [Rule syntax and properties](users-groups-roles/groups-dynamic-membership.md)
110-
#### [Change group membership type](users-groups-roles/groups-change-type.md)
111-
#### [Troubleshoot](users-groups-roles/groups-troubleshooting.md)
112-
11388
## [Manage reports](reports-monitoring/overview-reports.md)
11489
### [Sign-ins activity](reports-monitoring/concept-sign-ins.md)
11590
### [Audit activity](reports-monitoring/concept-audit-logs.md)
@@ -362,12 +337,7 @@
362337
### [Azure AD Connect](./connect/active-directory-aadconnect.md)
363338
### Custom domain names
364339
#### [Quickstart](fundamentals/add-custom-domain.md)
365-
#### [Add custom domain names](users-groups-roles/domains-manage.md)
366340
### [Administer your directory](fundamentals/active-directory-administer.md)
367-
### [Delete a directory](users-groups-roles/directory-delete-howto.md)
368-
### [Multiple directories](users-groups-roles/licensing-directory-independence.md)
369-
### [Self-service signup](users-groups-roles/directory-self-service-signup.md)
370-
### [Take over an unmanaged directory](users-groups-roles/domains-admin-takeover.md)
371341
### [Enterprise State Roaming](active-directory-windows-enterprise-state-roaming-overview.md)
372342
#### [Enable](active-directory-windows-enterprise-state-roaming-enable.md)
373343
#### [Group policy settings](active-directory-windows-enterprise-state-roaming-group-policy-settings.md)
@@ -378,14 +348,6 @@
378348

379349
### [Integrate on-premises identities using Azure AD Connect](./connect/active-directory-aadconnect.md)
380350

381-
## Delegate access to resources
382-
### [Administrator roles](users-groups-roles/directory-assign-admin-roles.md)
383-
#### [View members of an admin role](users-groups-roles//directory-manage-roles-portal.md)
384-
#### [Assign admin role to a user](fundamentals/active-directory-users-assign-role-azure-portal.md)
385-
#### [Compare member and guest user permissions](fundamentals/users-default-permissions.md)
386-
### [Administrator role security](users-groups-roles/directory-admin-roles-secure.md)
387-
#### [Create emergency access administrator accounts](users-groups-roles/directory-emergency-access.md)
388-
### [Administrative units](users-groups-roles/directory-administrative-units.md)
389351
### [Configure token lifetimes](active-directory-configurable-token-lifetimes.md)
390352

391353
## Access reviews
@@ -419,9 +381,6 @@
419381
#### [Microsoft Graph](identity-protection/graph-get-started.md)
420382
### [Privileged Identity Management](privileged-identity-management/pim-configure.md?toc=%2fazure%2factive-directory%2ftoc.json)
421383

422-
## Integrate other services with Azure AD
423-
### [Integrate LinkedIn with Azure AD](users-groups-roles/linkedin-integration.md)
424-
425384
## [Deploy AD FS in Azure](active-directory-aadconnect-azure-adfs.md)
426385
### [High availability](active-directory-adfs-in-azure-with-azure-traffic-manager.md)
427386
### [Change signature hash algorithm](active-directory-federation-sha256-guidance.md)
@@ -434,13 +393,11 @@
434393
### [PoC Playbook: Implementation](active-directory-playbook-implementation.md)
435394
### [PoC Playbook: Building Blocks](active-directory-playbook-building-blocks.md)
436395

437-
438396
# Reference
439397
## [Code samples](https://azure.microsoft.com/resources/samples/?service=active-directory)
440398
## [Azure PowerShell cmdlets](/powershell/azure/overview)
441399
## [Java API Reference](/java/api)
442400
## [.NET API](/active-directory/adal/microsoft.identitymodel.clients.activedirectory)
443-
## [Service limits and restrictions](users-groups-roles/directory-service-limits-restrictions.md)
444401

445402
# Related
446403
## [Multi-Factor Authentication](/azure/multi-factor-authentication/)

articles/active-directory/active-directory-apps-index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ If your organization maintains a Windows Server Active Directory on premises alo
9292
|:---:| --- |
9393
| An overview on the single sign-on options offered in Azure AD Connect, as well as information on managing hybrid environments |[User Sign On Options in Azure AD Connect](active-directory-aadconnect-user-signin.md) |
9494
| General guidance for managing environments with both on-premises Active Directory and Azure Active Directory |[Azure AD Hybrid Identity Design Considerations](active-directory-hybrid-identity-design-considerations-overview.md)<br /><br />[Integrating your On-Premises Identities with Azure Active Directory](active-directory-aadconnect.md) |
95-
| Guidance on using Password Sync to enable SSO |[Implement Password Synchronization with Azure AD Connect](connect/active-directory-aadconnectsync-implement-password-hash-synchronization.md)<br /><br />[Troubleshoot Password Synchronization](https://support.microsoft.com/en-us/kb/2855271) |
95+
| Guidance on using Password Sync to enable SSO |[Implement Password Synchronization with Azure AD Connect](connect/active-directory-aadconnectsync-implement-password-hash-synchronization.md)<br /><br />[Troubleshoot Password Synchronization](https://support.microsoft.com/kb/2855271) |
9696
| Guidance on using Password Writeback to enable SSO |[Getting Started with Password Management in Azure AD](authentication/quickstart-sspr.md)<br /><br />[Troubleshoot Password Writeback](authentication/active-directory-passwords-troubleshoot.md#troubleshoot-password-writeback) |
9797
| Guidance on using third party identity providers to enable SSO |[List of Compatible Third-Party Identity Providers That Can Be Used to Enable Single Sign-On](https://aka.ms/ssoproviders) |
9898
| How Windows 10 users can enjoy the benefits of single sign-on via Azure AD Join |[Extending Cloud Capabilities to Windows 10 Devices through Azure Active Directory Join](active-directory-azureadjoin-overview.md) |

articles/active-directory/active-directory-conditional-access-azure-authenticator-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ After you have installed the Azure Authenticator app, you can also create a work
8686
### Sending log files to report issues
8787
1. Follow the guidance on Microsoft Support to report an incident with the Azure Authenticator app, obtain an incident number, and send log files against the assigned incident number as follows:
8888
2. From the pop up menu, click **Logging**.
89-
3. If you have an open incident with Microsoft Support, make note of the incident number (you'll need it for a later step). If you have not already created a support incident and would like assistance, follow the guidance at [Microsoft Support](https://support.microsoft.com/en-us/contactus) to open a new incident.
89+
3. If you have an open incident with Microsoft Support, make note of the incident number (you'll need it for a later step). If you have not already created a support incident and would like assistance, follow the guidance at [Microsoft Support](https://support.microsoft.com/contactus) to open a new incident.
9090
4. On the logging screen, click **Send Now**.
9191
5. Select the email provider you want to use.
9292
6. If you already have an open incident Microsoft Support, contact the Support Engineer assigned to your issue to find out how to send the log data and have it associated with your incident. The Support Engineer will provide you with information for the email address and subject line. If you do not already have a support incident, please follow the guidance at Microsoft Support to open a new incident.

0 commit comments

Comments
 (0)