Skip to content

Commit 9e116a9

Browse files
authored
Merge pull request #42318 from MicrosoftDocs/master
5/25 PM Publish
2 parents 1c2b20b + b3cfd70 commit 9e116a9

File tree

469 files changed

+3126
-1788
lines changed

Some content is hidden

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

469 files changed

+3126
-1788
lines changed

.openpublishing.redirection.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21940,6 +21940,41 @@
2194021940
"source_path": "articles/security/azure-security-getting-started.md",
2194121941
"redirect_url": "https://docs.microsoft.com/azure/security",
2194221942
"redirect_document_id": true
21943+
},
21944+
{
21945+
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-cs-add-utterance.md",
21946+
"redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-cs-add-utterance",
21947+
"redirect_document_id": true
21948+
},
21949+
{
21950+
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-java-add-utterance.md",
21951+
"redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-java-add-utterance",
21952+
"redirect_document_id": true
21953+
},
21954+
{
21955+
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-javascript-add-utterance.md",
21956+
"redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-javascript-add-utterance",
21957+
"redirect_document_id": true
21958+
},
21959+
{
21960+
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-node-add-utterance.md",
21961+
"redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-node-add-utterance",
21962+
"redirect_document_id": true
21963+
},
21964+
{
21965+
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-php-add-utterance.md",
21966+
"redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-php-add-utterance",
21967+
"redirect_document_id": true
21968+
},
21969+
{
21970+
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-python-add-utterance.md",
21971+
"redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-python-add-utterance",
21972+
"redirect_document_id": true
21973+
},
21974+
{
21975+
"source_path": "articles/cognitive-services/LUIS/luis-quickstart-ruby-add-utterance.md",
21976+
"redirect_url": "/azure/cognitive-services/LUIS/luis-get-started-ruby-add-utterance",
21977+
"redirect_document_id": true
2194321978
}
2194421979
]
2194521980
}

articles/active-directory-b2c/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268
- name: Service updates
269269
href: https://azure.microsoft.com/updates/?product=active-directory-b2c
270270
- name: Stack Overflow
271-
href: https://stackoverflow.com/questions/tagged/azure-ad-b2c
271+
href: https://stackoverflow.com/questions/tagged/azure-ad-b2c+identity-experience-framework
272272
- name: Support
273273
href: active-directory-b2c-support.md
274274
- name: Videos

articles/active-directory-b2c/active-directory-b2c-setup-twitter-app.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ To use Twitter as an identity provider in Azure Active Directory (Azure AD) B2C,
2525
3. In the form, provide a value for the **Name**, **Description**, and **Website**.
2626
4. For the **Callback URL**, enter `https://login.microsoftonline.com/te/{tenant}/oauth2/authresp`. Make sure to replace **{tenant}** with your tenant's name (for example, contosob2c.onmicrosoft.com).
2727
5. Check the box to agree to the **Developer Agreement** and click **Create your Twitter application**.
28-
6. After the app is created, click **Keys and Access Tokens**.
29-
7. Copy the value of **Consumer Key** and **Consumer Secret**. You will need both of them to configure Twitter as an identity provider in your tenant.
28+
6. After the app is created, select it in the list, and then select the **Settings** tab.
29+
7. Clear the **Enable Callback Locking** box, and then click **Update settings**.
30+
8. Select the **Keys and Access Tokens** tab.
31+
9. Copy the value of **Consumer Key** and **Consumer Secret**. You will need both of them to configure Twitter as an identity provider in your tenant.
3032

3133
## Configure Twitter as an identity provider in your tenant
3234
1. Log in to the [Azure portal](https://portal.azure.com/) as the Global Administrator of the Azure AD B2C tenant.

articles/active-directory/active-directory-conditional-access-conditions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ Conditional access now applies to older Office clients that do not support moder
199199

200200
3. Navigate to the client app condition and select "Other clients"
201201

202-
202+
![Supported platforms](./media/active-directory-conditional-access-conditions/140.png)
203203

204204
4. Select the access control you want to enforce for "Other clients". (Any control selection will lead to block access since the other clients are not able to enforce controls like MFA, device compliance, etc.).
205205

articles/active-directory/active-directory-managing-access-to-apps.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,8 @@ In this case, all assigned users would be automatically provisioned to Salesforc
4949

5050
Administrators can employ [Azure AD conditional access](active-directory-conditional-access-azure-portal.md) to set access policies for specific roles. These policies can include whether access is permitted outside the corporate environment and even Multi-Factor Authentication or device requirements to achieve access in various cases.
5151

52-
## How can I get started?
53-
First, if you aren't already using Azure AD and you are an IT admin:
52+
## Next steps
5453

55-
* [Try it out!](https://azure.microsoft.com/trial/get-started-active-directory/) - you can sign up for a free 30-day trial today and deploy your first cloud solution in under 5 minutes using this link
56-
57-
Azure AD features that enable account sharing include:
58-
59-
* [Group assignment](active-directory-accessmanagement-self-service-group-management.md)
60-
* Adding applications to Azure AD
61-
* Getting started with assignment
62-
* Application assignment FAQ
63-
* [App usage dashboard/reports](active-directory-passwords-get-insights.md)
64-
65-
## Where can I learn more?
6654
* [Article Index for Application Management in Azure Active Directory](active-directory-apps-index.md)
6755
* [Protecting apps with conditional access](active-directory-conditional-access-azure-portal.md)
6856
* [Self-service group management/SSAA](active-directory-accessmanagement-self-service-group-management.md)
69-

articles/active-directory/active-directory-report-security-user-at-risk-remediation.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
title: Users flagged for risk security report in the Azure Active Directory portal | Microsoft Docs
44
description: Learn about the users flagged for risk security report in the Azure Active Directory portal
55
services: active-directory
6-
author: MarkusVi
7-
manager: femila
6+
author: rolyon
7+
manager: mtillman
88

99
ms.assetid: addd60fe-d5ac-4b8b-983c-0736c80ace02
1010
ms.service: active-directory
1111
ms.devlang: na
1212
ms.topic: get-started-article
1313
ms.tgt_pltfrm: na
1414
ms.workload: identity
15+
ms.component: compliance-reports
1516
ms.date: 05/23/2018
16-
ms.author: markvi
17+
ms.author: rolyon
1718
ms.reviewer: dhanyahk
1819

1920
---

articles/active-directory/active-directory-reporting-activity-audit-logs.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Audit activity reports in the Azure Active Directory portal | Microsoft D
44
description: Introduction to the audit activity reports in the Azure Active Directory portal
55
services: active-directory
66
documentationcenter: ''
7-
author: MarkusVi
7+
author: rolyon
88
manager: mtillman
99
editor: ''
1010

@@ -14,8 +14,9 @@ ms.devlang: na
1414
ms.topic: get-started-article
1515
ms.tgt_pltfrm: na
1616
ms.workload: identity
17+
ms.component: compliance-reports
1718
ms.date: 04/19/2018
18-
ms.author: markvi
19+
ms.author: rolyon
1920
ms.reviewer: dhanyahk
2021

2122
---

articles/active-directory/active-directory-reporting-activity-audit-reference.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Azure Active Directory (Azure AD) audit activity reference | Microsoft Do
44
description: Get an overview of the audit activities that can be logged in your audit logs in Azure Active Directory (Azure AD).
55
services: active-directory
66
documentationcenter: ''
7-
author: MarkusVi
7+
author: rolyon
88
manager: mtillman
99
editor: ''
1010

@@ -14,8 +14,9 @@ ms.devlang: na
1414
ms.topic: get-started-article
1515
ms.tgt_pltfrm: na
1616
ms.workload: identity
17+
ms.component: compliance-reports
1718
ms.date: 04/19/2018
18-
ms.author: markvi
19+
ms.author: rolyon
1920
ms.reviewer: dhanyahk
2021

2122
---

articles/active-directory/active-directory-reporting-activity-sign-ins-errors.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Sign-in activity report error codes in the Azure Active Directory portal
33
description: Reference of sign-in activity report error codes.
44
services: active-directory
55
documentationcenter: ''
6-
author: MarkusVi
6+
author: rolyon
77
manager: mtillman
88
editor: ''
99

@@ -13,8 +13,9 @@ ms.devlang: na
1313
ms.topic: get-started-article
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16+
ms.component: compliance-reports
1617
ms.date: 05/22/2018
17-
ms.author: markvi
18+
ms.author: rolyon
1819
ms.reviewer: dhanyahk
1920

2021
---

articles/active-directory/active-directory-reporting-activity-sign-ins-mfa.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Reference for multi-factor authentication reporting in the Azure portal |
33
description: Reference information for multi-factor authentication reporting in the Azure portal
44
services: active-directory
55
documentationcenter: ''
6-
author: MarkusVi
6+
author: rolyon
77
manager: mtillman
88
editor: ''
99

@@ -13,8 +13,9 @@ ms.devlang: na
1313
ms.topic: get-started-article
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16+
ms.component: compliance-reports
1617
ms.date: 03/16/2018
17-
ms.author: markvi
18+
ms.author: rolyon
1819
ms.reviewer: dhanyahk
1920

2021
---

0 commit comments

Comments
 (0)