Skip to content

Commit 6920329

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into privlnkdns
2 parents 7fe7309 + 9678a27 commit 6920329

File tree

50 files changed

+42
-212
lines changed

Some content is hidden

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

50 files changed

+42
-212
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
href: deploy-kcd.md
8888
- name: Configure password and account lockout policies
8989
href: password-policy.md
90-
- name: Enable security audit events (preview)
90+
- name: Enable security audit events
9191
href: security-audit-events.md
9292
- name: Domain-join VMs
9393
items:
-22.6 KB
Loading

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.date: 10/31/2019
1414
ms.author: iainfou
1515

1616
---
17-
# Enable security audits for Azure Active Directory Domain Services (preview)
17+
# Enable security audits for Azure Active Directory Domain Services
1818

1919
Azure Active Directory Domain Services (Azure AD DS) security audits lets Azure stream security events to targeted resources. These resources include Azure Storage, Azure Log Analytics workspaces, or Azure Event Hub. After you enable security audit events, Azure AD DS sends all the audited events for the selected category to the targeted resource. You can archive events into Azure storage and stream events into security information and event management (SIEM) software (or equivalent) using Azure Event Hubs, or do your own analysis and using Azure Log Analytics workspaces from the Azure portal.
2020

@@ -79,7 +79,7 @@ To enable Azure AD DS security audit events using the Azure portal, complete the
7979
8080
1. Sign in to the Azure portal at https://portal.azure.com.
8181
1. At the top of the Azure portal, search for and select **Azure AD Domain Services**. Choose your managed domain, such as *aadds.contoso.com*.
82-
1. In the Azure AD DS window, select **Diagnostic settings (preview)** on the left-hand side.
82+
1. In the Azure AD DS window, select **Diagnostic settings** on the left-hand side.
8383
1. No diagnostics are configured by default. To get started, select **Add diagnostic setting**.
8484

8585
![Add a diagnostic setting for Azure AD Domain Services](./media/security-audit-events/add-diagnostic-settings.png)

articles/active-directory/develop/about-microsoft-identity-platform.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22
title: Evolution of Microsoft identity platform - Azure
33
description: Learn about Microsoft identity platform, an evolution of the Azure Active Directory (Azure AD) identity service and developer platform.
44
services: active-directory
5-
documentationcenter: dev-center-name
65
author: rwike77
76
manager: CelesteDG
8-
editor: ''
97

108
ms.service: active-directory
119
ms.subservice: develop
12-
ms.devlang: na
1310
ms.topic: overview
14-
ms.tgt_pltfrm: na
1511
ms.workload: identity
1612
ms.date: 06/03/2019
1713
ms.author: ryanwi

articles/active-directory/develop/access-tokens.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
title: Microsoft identity platform access tokens reference | Azure
33
description: Learn about access tokens emitted by the Azure AD v1.0 and Microsoft identity platform (v2.0) endpoints.
44
services: active-directory
5-
documentationcenter: ''
65
author: rwike77
76
manager: CelesteDG
87

98
ms.service: active-directory
109
ms.subservice: develop
1110
ms.workload: identity
12-
ms.tgt_pltfrm: na
13-
ms.devlang: na
1411
ms.topic: conceptual
1512
ms.date: 10/22/2019
1613
ms.author: ryanwi

articles/active-directory/develop/accounts-overview.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
title: Microsoft identity platform accounts and tenant profiles (Android) | Azure
33
description: An overview of Microsoft identity platform accounts for Android
44
services: active-directory
5-
documentationcenter: ''
65
author: shoatman
7-
manager: nadima
8-
editor: ''
6+
manager: CelesteDG
97
ms.service: active-directory
108
ms.subservice: develop
11-
ms.devlang: na
129
ms.topic: conceptual
13-
ms.tgt_pltfrm: na
1410
ms.workload: identity
11+
ms.devlang: java
1512
ms.date: 09/14/2019
1613
ms.author: shoatman
1714
ms.custom: aaddev
@@ -27,10 +24,10 @@ The Microsoft Authentication Library (MSAL) API replaces the term *user* with th
2724

2825
An account in the Microsoft identity platform consists of:
2926

30-
- A unique identifier.
31-
- One or more credentials used to demonstrate ownership/control of the account.
32-
- One or more profiles consisting of attributes such as:
33-
- Picture, Given Name, Family Name, Title, Office Location
27+
- A unique identifier.
28+
- One or more credentials used to demonstrate ownership/control of the account.
29+
- One or more profiles consisting of attributes such as:
30+
- Picture, Given Name, Family Name, Title, Office Location
3431
- An account has a source of authority or system of record. This is the system where the account is created and where the credentials associated with that account are stored. In multi-tenant systems like the Microsoft identity platform, the system of record is the `tenant` where the account was created. This tenant is also referred as the `home tenant`.
3532
- Accounts in the Microsoft identity platform have the following systems of record:
3633
- Azure Active Directory, including Azure Active Directory B2C.
@@ -44,7 +41,6 @@ An account in the Microsoft identity platform consists of:
4441
- This local record, that is the representation of the account, is bound to the original account.
4542
- MSAL exposes this local record as a `Tenant Profile`.
4643
- Tenant Profile can have different attributes that are appropriate to the local context, such as Job Title, Office Location, Contact Information, etc.
47-
4844
- Because an account may be present in one or more tenants, an account may have more than one profile.
4945

5046
> [!NOTE]

articles/active-directory/develop/active-directory-acs-migration.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22
title: Migrate from the Azure Access Control Service | Microsoft Docs
33
description: Learn about the options for moving apps and services from the Azure Access Control Service (ACS).
44
services: active-directory
5-
documentationcenter: dev-center-name
65
author: rwike77
76
manager: CelesteDG
8-
editor: ''
97

108
ms.assetid: 820acdb7-d316-4c3b-8de9-79df48ba3b06
119
ms.service: active-directory
1210
ms.subservice: develop
1311
ms.custom: aaddev
14-
ms.devlang: na
1512
ms.topic: conceptual
16-
ms.tgt_pltfrm: na
1713
ms.workload: identity
1814
ms.date: 10/03/2018
1915
ms.author: ryanwi

articles/active-directory/develop/active-directory-authentication-libraries.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,13 @@
22
title: Azure Active Directory Authentication Libraries | Microsoft Docs
33
description: The Azure AD Authentication Library (ADAL) allows client application developers to easily authenticate users to cloud or on-premises Active Directory (AD) and then obtain access tokens for securing API calls.
44
services: active-directory
5-
documentationcenter: ''
65
author: rwike77
76
manager: CelesteDG
8-
editor: ''
97

108
ms.assetid: 2e4fc79a-0285-40be-8c77-65edee408a22
119
ms.service: active-directory
1210
ms.subservice: develop
13-
ms.devlang: na
1411
ms.topic: conceptual
15-
ms.tgt_pltfrm: na
1612
ms.workload: identity
1713
ms.date: 12/01/2018
1814
ms.author: ryanwi
Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
---
22
title: Azure Active Directory authentication protocols | Microsoft Docs
33
description: An overview of the authentication protocols supported by Azure Active Directory (AD)
4-
documentationcenter: dev-center-name
54
author: rwike77
65
services: active-directory
76
manager: CelesteDG
8-
editor: ''
97

108
ms.assetid: 7a838ae2-c24c-4304-b6c0-e77fb888e6c0
119
ms.service: active-directory
1210
ms.subservice: develop
13-
ms.devlang: na
1411
ms.topic: conceptual
15-
ms.tgt_pltfrm: na
1612
ms.workload: identity
1713
ms.date: 04/27/2017
1814
ms.author: ryanwi
@@ -22,9 +18,11 @@ ms.collection: M365-identity-device-management
2218
---
2319

2420
# Azure Active Directory authentication protocols
21+
2522
Azure Active Directory (Azure AD) supports several of the most widely used authentication and authorization protocols. The topics in this section describe the supported protocols and their implementation in Azure AD. The topics included a review of supported claim types, an introduction to the use of federation metadata, detailed OAuth 2.0. and SAML 2.0 protocol reference documentation, and a troubleshooting section.
2623

27-
## Authentication Protocols Articles and Reference
24+
## Authentication protocols articles and reference
25+
2826
* [Important Information About Signing Key Rollover in Azure AD](active-directory-signing-key-rollover.md) – Learn about Azure AD’s signing key rollover cadence, changes you can make to update the key automatically, and discussion for how to update the most common application scenarios.
2927
* [Supported Token and Claim Types](v1-id-and-access-tokens.md) - Learn about the claims in the tokens that Azure AD issues.
3028
* [Federation Metadata](azure-ad-federation-metadata.md) - Learn how to find and interpret the metadata documents that Azure AD generates.
@@ -34,7 +32,7 @@ Azure Active Directory (Azure AD) supports several of the most widely used authe
3432
* [Service to Service Calls with On-Behalf-Of Flow](v1-oauth2-on-behalf-of-flow.md) - Learn how to use OAuth 2.0 On-Behalf-Of flow for service to service calls.
3533
* [SAML Protocol Reference](active-directory-saml-protocol-reference.md) - Learn about the Single Sign-On and Single Sign-out SAML profiles of Azure AD.
3634

37-
## See Also
38-
[Azure Active Directory Developer's Guide](v1-overview.md)
35+
## See also
3936

40-
[Active Directory Code Samples](sample-v1-code.md)
37+
* [Azure Active Directory Developer's Guide](v1-overview.md)
38+
* [Active Directory Code Samples](sample-v1-code.md)

articles/active-directory/develop/active-directory-certificate-credentials.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@ title: Certificate credentials in Azure AD
33
titleSuffix: Microsoft identity platform
44
description: This article discusses the registration and use of certificate credentials for application authentication
55
services: active-directory
6-
documentationcenter: .net
76
author: rwike77
87
manager: CelesteDG
9-
editor: ''
108

119
ms.assetid: 88f0c64a-25f7-4974-aca2-2acadc9acbd8
1210
ms.service: active-directory
1311
ms.subservice: develop
1412
ms.workload: identity
15-
ms.tgt_pltfrm: na
16-
ms.devlang: na
1713
ms.topic: conceptual
1814
ms.date: 05/21/2019
1915
ms.author: ryanwi

0 commit comments

Comments
 (0)