Skip to content

Commit 6d65057

Browse files
authored
Merge branch 'master' into automation-articles-jd-batch1
2 parents b66f751 + a4d0138 commit 6d65057

File tree

1,309 files changed

+23165
-15781
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,309 files changed

+23165
-15781
lines changed

.openpublishing.redirection.json

Lines changed: 223 additions & 18 deletions
Large diffs are not rendered by default.

CODEOWNERS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
# Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
2+
3+
# Horizontals
4+
5+
## Azure Policy: Samples
6+
articles/**/policy-samples.md @DCtheGeek
7+
includes/policy/ @DCtheGeek
8+
29
# Cognitive Services
310
articles/cognitive-services/ @diberry @erhopf @aahill @ievangelist @patrickfarley @nitinme
411

@@ -9,7 +16,7 @@ articles/jenkins/ @TomArcherMsft
916
articles/terraform/ @TomArcherMsft
1017

1118
# Requires Internal Review
12-
articles/best-practices-availability-paired-regions.md @jpconnock @martinekuan @syntaxc4 @tysonn @snoviking
19+
articles/best-practices-availability-paired-regions.md @martinekuan @syntaxc4 @snoviking
1320

1421
# Governance
1522
articles/governance/ @DCtheGeek

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ For more information, see the [Code of Conduct FAQ](https://opensource.microsoft
1111

1212
## How can I contribute?
1313

14-
There are a variety of ways to contribute to the documentation, review the sections below to find out which one is right for you.
14+
There are many ways to contribute to the documentation, review the sections below to find out which one is right for you.
1515

1616
### Reporting Bugs and Suggesting Enhancements
1717

articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,8 +1198,8 @@ The SCIM spec does not define a SCIM-specific scheme for authentication and auth
11981198
[!NOTE] It's not recommended to leave the token field blank in the Azure AD provisioning configuration custom app UI. The token generated is primarily available for testing purposes.
11991199

12001200
**OAuth authorization code grant flow:** The provisioning service supports the [authorization code grant](https://tools.ietf.org/html/rfc6749#page-24). After submitting your request for publishing your app in the gallery, our team will work with you to collect the following information:
1201-
* Authorization URL: A URL by the client to obtain authorization from the resource owner via user-agent redirection. The user is redirected to this URL to authorize access.
1202-
* Token exchange URL: A URL by the client to exchange an authorization grant for an access token, typically with client authentication.
1201+
* Authorization URL: A URL by the client to obtain authorization from the resource owner via user-agent redirection. The user is redirected to this URL to authorize access. Note that this URL is currently not configurable per tenant.
1202+
* Token exchange URL: A URL by the client to exchange an authorization grant for an access token, typically with client authentication. Note that this URL is currently not configurable per tenant.
12031203
* Client ID: The authorization server issues the registered client a client identifier, which is a unique string representing the registration information provided by the client. The client identifier is not a secret; it is exposed to the resource owner and **must not** be used alone for client authentication.
12041204
* Client secret: The client secret is a secret generated by the authorization server. It should be a unique value known only to the authorization server.
12051205

articles/active-directory/authentication/overview-authentication.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ Azure AD provides ways to natively authenticate using passwordless methods to si
8585

8686
## Next steps
8787

88-
To get started, see the [quickstart for self-service password reset][quickstart-sspr] and [Azure Multi-Factor Authentication tutorial][tutorial-mfa-applications].
88+
To get started, see the [tutorial for self-service password reset (SSPR)][tutorial-sspr] and [Azure Multi-Factor Authentication][tutorial-azure-mfa].
8989

9090
To learn more about self-service password reset concepts, see [How Azure AD self-service password reset works][concept-sspr].
9191

9292
To learn more about multi-factor authentication concepts, see [How Azure Multi-Factor Authentication works][concept-mfa].
9393

9494
<!-- INTERNAL LINKS -->
95-
[quickstart-sspr]: quickstart-sspr.md
96-
[tutorial-mfa-applications]: tutorial-mfa-applications.md
95+
[tutorial-sspr]: tutorial-enable-sspr.md
96+
[tutorial-azure-mfa]: tutorial-enable-azure-mfa.md
9797
[concept-sspr]: concept-sspr-howitworks.md
9898
[concept-mfa]: concept-mfa-howitworks.md

articles/active-directory/cloud-provisioning/how-to-prerequisites.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ Run the [IdFix tool](https://docs.microsoft.com/office365/enterprise/prepare-dir
4343

4444
1. Identify a domain-joined host server running Windows Server 2012 R2 or greater with a minimum of 4-GB RAM and .NET 4.7.1+ runtime.
4545

46+
1. The PowerShell execution policy on the local server must be set to Undefined or RemoteSigned.
47+
4648
1. If there's a firewall between your servers and Azure AD, configure the following items:
4749
- Ensure that agents can make *outbound* requests to Azure AD over the following ports:
4850

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Administrators can assign a Conditional Access policy to the following cloud app
6868

6969
Office 365 provides cloud-based productivity and collaboration services like Exchange, SharePoint, and Microsoft Teams. Office 365 cloud services are deeply integrated to ensure smooth and collaborative experiences. This integration can cause confusion when creating policies as some apps such as Microsoft Teams have dependencies on others such as SharePoint or Exchange.
7070

71-
The Office 365 (preview) app makes it possible to target these services all at once. We recommend using the new Office 365 (preview) app, instead of targeting individual cloud apps. Targeting this group of applications helps to avoid issues that may arise due to inconsistent policies and dependencies.
71+
The Office 365 (preview) app makes it possible to target these services all at once. We recommend using the new Office 365 (preview) app, instead of targeting individual cloud apps to avoid issues with [service dependencies](service-dependencies.md). Targeting this group of applications helps to avoid issues that may arise due to inconsistent policies and dependencies.
7272

7373
Administrators can choose to exclude specific apps from policy if they wish by including the Office 365 (preview) app and excluding the specific apps of their choice in policy.
7474

articles/active-directory/conditional-access/concept-conditional-access-report-only.md

Lines changed: 2 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: 03/25/2020
9+
ms.date: 05/01/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -23,7 +23,7 @@ Report-only mode is a new Conditional Access policy state that allows administra
2323

2424
- Conditional Access policies can be enabled in report-only mode.
2525
- During sign-in, policies in report-only mode are evaluated but not enforced.
26-
- Results are logged in the **Conditional Access** and **Report-only (Preview)** tabs of the Sign-in log details.
26+
- Results are logged in the **Conditional Access** and **Report-only** tabs of the Sign-in log details.
2727
- Customers with an Azure Monitor subscription can monitor the impact of their Conditional Access policies using the Conditional Access insights workbook.
2828

2929
> [!WARNING]

articles/active-directory/conditional-access/howto-conditional-access-insights-reporting.md

Lines changed: 1 addition & 1 deletion
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: article
9-
ms.date: 04/30/2020
9+
ms.date: 05/01/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo

articles/active-directory/conditional-access/howto-conditional-access-report-only.md

Lines changed: 4 additions & 4 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: 03/25/2020
9+
ms.date: 05/01/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -15,7 +15,7 @@ ms.reviewer: dawoo
1515

1616
ms.collection: M365-identity-device-management
1717
---
18-
# Configure a Conditional Access policy in report-only mode (Preview)
18+
# Configure a Conditional Access policy in report-only mode
1919

2020
To configure a Conditional Access policy in report-only mode:
2121

@@ -39,7 +39,7 @@ To view the result of a report-only policy for a particular sign-in:
3939
1. Sign into the **Azure portal** as a reports reader, security reader, security administrator, or global administrator.
4040
1. Browse to **Azure Active Directory** > **Sign-ins**.
4141
1. Select a sign-in or add filters to narrow results.
42-
1. In the **Details** drawer, select the **Report-only (Preview)** tab to view the policies evaluated during sign-in.
42+
1. In the **Details** drawer, select the **Report-only** tab to view the policies evaluated during sign-in.
4343

4444
> [!NOTE]
4545
> When downloading the Sign-ins logs, choose JSON format to include Conditional Access report-only result data.
@@ -59,7 +59,7 @@ Once you've integrated your Azure AD logs with Azure Monitor, you can monitor th
5959

6060
1. Sign into the **Azure portal** as a security administrator or global administrator.
6161
1. Browse to **Azure Active Directory** > **Workbooks**.
62-
1. Select **Conditional Access Insights (Preview)**.
62+
1. Select **Conditional Access Insights**.
6363
1. Select one or more policies from the **Conditional Access Policy** dropdown. All enabled policies are selected by default.
6464
1. Select a time range (if the time range exceeds the available dataset, the report will show all available data). Once you have set the **Conditional Access Policy** and **Time Range** parameters, the report will load.
6565
1. Optionally, search for individual **Users** or **Apps** to narrow the scope of the report.

0 commit comments

Comments
 (0)