Skip to content

Commit 1357eec

Browse files
author
Owen Duncan
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into aas-datasource
2 parents ba462fd + eac9d2f commit 1357eec

File tree

458 files changed

+3016
-3834
lines changed

Some content is hidden

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

458 files changed

+3016
-3834
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11462,6 +11462,11 @@
1146211462
"redirect_url": "/azure/event-hubs/",
1146311463
"redirect_document_id": false
1146411464
},
11465+
{
11466+
"source_path": "articles/event-hubs/event-hubs-create-kafka-enabled.md",
11467+
"redirect_url": "/azure/event-hubs/event-hubs-create",
11468+
"redirect_document_id": false
11469+
},
1146511470
{
1146611471
"source_path": "articles/event-hubs/event-hubs-csharp-ephcs-getstarted.md",
1146711472
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",

articles/active-directory-b2c/active-directory-b2c-get-started-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ms.subservice: B2C
3030
1. Sign in to the [Azure portal](https://portal.azure.com)
3131
1. Use the **Directory + subscription** filter in the top menu to select the directory that contains your Azure AD B2C tenant.
3232
1. In the left menu, select **Azure AD B2C**. Or, select **All services** and search for and select **Azure AD B2C**.
33-
1. On the Overview page, select **Identity Experience Framework**.
33+
1. On the Overview page, select **Identity Experience Framework** from the **Policies** pane.
3434

3535
### Create the signing key
3636

articles/active-directory-b2c/active-directory-b2c-reference-spa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,5 +245,5 @@ GET https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/
245245
This sample on GitHub is intended to help get you started with Azure AD B2C in a simple web application built on [hello.js][github-hello-js] and using pop-up-style authentication.
246246

247247
<!-- Links - EXTERNAL -->
248-
[github-hello-js-example]: https://github.com/azure-ad-b2c/apps/tree/master/spa/javascript-hellojs-singlepageapp-popup
248+
[github-hello-js-example]: https://github.com/Azure-Samples/active-directory-b2c-javascript-hellojs-singlepageapp
249249
[github-hello-js]: https://github.com/MrSwitch/hello.js

articles/active-directory-domain-services/tutorial-configure-ldaps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ Let's create a rule to allow inbound secure LDAP access over TCP port 636 from a
206206

207207
1. In the Azure portal, select *Resource groups* on the left-hand side navigation.
208208
1. Choose you resource group, such as *myResourceGroup*, then select your network security group, such as *aaads-nsg*.
209-
1. The list of existing inbound and outbound security rules are displayed. On the left-hand side of the network security group windows, choose **Security > Inbound security rules**.
209+
1. The list of existing inbound and outbound security rules are displayed. On the left-hand side of the network security group windows, choose **Settings > Inbound security rules**.
210210
1. Select **Add**, then create a rule to allow *TCP* port *636*. For improved security, choose the source as *IP Addresses* and then specify your own valid IP address or range for your organization.
211211

212212
| Setting | Value |
@@ -241,7 +241,7 @@ The following example DNS entry, either with your external DNS provider or in th
241241

242242
## Test queries to the managed domain
243243

244-
To connect and bind to your Azure AD DS managed domain and search over LDAP, you use the *LDP.exe* too. This tool is included in the Remote Server Administration Tools (RSAT) package. For more information, see [install Remote Server Administration Tools][rsat].
244+
To connect and bind to your Azure AD DS managed domain and search over LDAP, you use the *LDP.exe* tool. This tool is included in the Remote Server Administration Tools (RSAT) package. For more information, see [install Remote Server Administration Tools][rsat].
245245

246246
1. Open *LDP.exe* and connect to the managed domain. Select **Connection**, then choose **Connect...**.
247247
1. Enter the secure LDAP DNS domain name of your managed domain created in the previous step, such as *ldaps.contoso.com*. To use secure LDAP, set **Port** to *636*, then check the box for **SSL**.

articles/active-directory/develop/authentication-flows-app-scenarios.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,14 +258,14 @@ Scenarios that involve acquiring tokens also map to OAuth 2.0 authentication flo
258258

259259
<tr>
260260
<td><a href="scenario-daemon-overview.md"><img alt="Daemon app that calls web APIs" src="media/scenarios/daemon-app.svg"></a></td>
261-
<td><a href=scenario-daemon-overview.md">A daemon app that calls web APIs</a></td>
261+
<td><a href="scenario-daemon-overview.md">A daemon app that calls web APIs</a></td>
262262
<td><a href="v2-oauth2-client-creds-grant-flow.md">Client credentials</a></td>
263263
<td>App-only permissions with no user and used only in Azure AD organizations</td>
264264
</tr>
265265

266266
<tr>
267-
<td><a href=scenario-web-api-call-api-overview.md"><img alt="Web API that calls web APIs" src="media/scenarios/web-api.svg"></a></td>
268-
<td><a href=scenario-web-api-call-api-overview.md">A web API that calls web APIs</a></td>
267+
<td><a href="scenario-web-api-call-api-overview.md"><img alt="Web API that calls web APIs" src="media/scenarios/web-api.svg"></a></td>
268+
<td><a href="scenario-web-api-call-api-overview.md">A web API that calls web APIs</a></td>
269269
<td><a href="v2-oauth2-on-behalf-of-flow.md">On Behalf Of</a></td>
270270
<td>Work or school accounts and personal accounts</td>
271271
</tr>

articles/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.collection: M365-identity-device-management
1616
---
1717

1818
# Add or remove group owners in Azure Active Directory
19-
Azure Active Directory (Azure AD) groups are owned and managed by group owners. Group owners can be users or service principals, and are able to manage the group including membership. Only existing group owners or group-managing administrators can assign group onwers. Group owners aren't required to be members of the group.
19+
Azure Active Directory (Azure AD) groups are owned and managed by group owners. Group owners can be users or service principals, and are able to manage the group including membership. Only existing group owners or group-managing administrators can assign group owners. Group owners aren't required to be members of the group.
2020

2121
When a group has no owner, group-managing administrators are still able to manage the group.
2222

articles/active-directory/fundamentals/whats-new.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,13 +547,13 @@ For more information about setting up Azure Monitor, see [Azure AD activity logs
547547

548548
On September 25, 2019, we'll be turning off the old, non-enhanced security info experience for registering and managing user security info and only turning on the new, [enhanced version](https://techcommunity.microsoft.com/t5/Azure-Active-Directory-Identity/Cool-enhancements-to-the-Azure-AD-combined-MFA-and-password/ba-p/354271). This means that your users will no longer be able to use the old experience.
549549

550-
For more information about the enhanced security info experience, see our [admin documentation](https://aka.ms/securityinfodocs)andour [user documentation](https://aka.ms/securityinfoguide).
550+
For more information about the enhanced security info experience, see our [admin documentation](https://aka.ms/securityinfodocs) and our [user documentation](https://aka.ms/securityinfoguide).
551551

552552
#### To turn on this new experience, you must:
553553

554554
1. Sign in to the Azure portal as a Global Administrator or User Administrator.
555555

556-
2. Go to**Azure Active Directory > User settings > Manage settings for access panel preview features**.
556+
2. Go to **Azure Active Directory > User settings > Manage settings for access panel preview features**.
557557

558558
3. In the **Users can use preview features for registering and managing security info - enhanced** area, select **Selected**, and then either choose a group of users or choose **All** to turn this feature on for all users in the tenant.
559559

articles/active-directory/governance/entitlement-management-organization.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ How users from the Azure AD directory or domain will authenticate depends on the
4242
- [Direct federation](../b2b/direct-federation.md)
4343
- [One-time passcode](../b2b/one-time-passcode.md) (domain)
4444

45+
For a demonstration of how to add a connected organization, watch the following video:
46+
47+
>[!VIDEO https://www.microsoft.com/videoplayer/embed/RE4dskS]
48+
4549
## Add a connected organization
4650

4751
Follow these steps to add an external Azure AD directory or domain as a connected organization.

articles/active-directory/saas-apps/jiramicrosoft-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ To get started, you need the following items:
5757

5858
## Supported versions of JIRA
5959

60-
* JIRA Core and Software: 6.4 to 8.2.4
61-
* JIRA Service Desk 3.0.0 to 4.2.1
60+
* JIRA Core and Software: 6.4 to 8.5.1
61+
* JIRA Service Desk 3.0.0 to 4.5.1
6262
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](jira52microsoft-tutorial.md)
6363

6464
> [!NOTE]
3.65 KB
Loading

0 commit comments

Comments
 (0)