Skip to content

Commit 5e37847

Browse files
authored
Merge pull request #101945 from MicrosoftDocs/master
1/22 AM Publish
2 parents 38b1150 + 4283fc3 commit 5e37847

File tree

126 files changed

+751
-658
lines changed

Some content is hidden

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

126 files changed

+751
-658
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.tgt_pltfrm: na
1212
ms.devlang: na
1313
ms.topic: conceptual
1414
ms.subservice: compliance
15-
ms.date: 10/24/2019
15+
ms.date: 01/22/2020
1616
ms.author: ajburnle
1717
ms.reviewer: mwahl
1818
ms.collection: M365-identity-device-management
@@ -30,9 +30,12 @@ Azure AD entitlement management enables you to collaborate with people outside y
3030

3131
A connected organization is an external Azure AD directory or domain that you have a relationship with.
3232

33-
For example, suppose you work at Woodgrove Bank and you want to collaborate with two external organizations: Graphic Design Institute and Contoso. You've been told by your contact at Graphic Design Institute that they use Azure AD, and that Graphic Design Institute's users have a user principal name that ends with `graphicdesigninstitute.com`. And you've been told by your contact at Contoso that they do not yet use Azure AD, but that Contoso's users have a user principal name that ends with `contoso.com`.
33+
For example, suppose you work at Woodgrove Bank and you want to collaborate with two external organizations. These two organizations have different configurations:
3434

35-
You can configure two connected organizations -- one for Graphic Design Institute with the domain `graphicdesigninstitute.com`, and one for Contoso with the domain `contoso.com`. If you then add those two connected organizations to a policy, users from each organization that have a user principal name that matches the policy can request access packages. Furthermore, because Graphic Design Institute has been identified as using Azure AD, then if Graphic Design Institute subsequently has subdomains, such as `graphicdesigninstitute.example`, then users with that user principal name will also be able to request access packages using the same policy.
35+
- Graphic Design Institute uses Azure AD and their users have a user principal name that ends with `graphicdesigninstitute.com`
36+
- Contoso does not yet use Azure AD. Contoso users have a user principal name that ends with `contoso.com`.
37+
38+
In this case, you can configure two connected organizations. You would create one connected organization for Graphic Design Institute and one for Contoso. If you then add those two connected organizations to a policy, users from each organization with a user principal name matching the policy can request access packages. Users with a user principal name that has a domain of graphicdesigninstitute.com would match the Graphic Design Institute connected organization and be allowed to submit requests, while users with a user principal name that has a domain of contoso.com would match the Contoso connected organization and would also be allowed to request packages. Furthermore, because Graphic Design Institute uses Azure AD, any users with a principal name matching a [verified domain](../fundamentals/add-custom-domain.md#verify-your-custom-domain-name) added to their tenant, such as graphicdesigninstitute.example will also be able to request access packages using the same policy.
3639

3740
![Connected organization example](./media/entitlement-management-organization/connected-organization-example.png)
3841

articles/active-directory/manage-apps/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
items:
142142
- name: Configure user consent
143143
href: configure-user-consent.md
144-
name: Manage and evaluate consent requests
144+
- name: Manage and evaluate consent requests
145145
href: manage-consent-requests.md
146146
- name: Grant tenant-wide admin consent
147147
href: grant-admin-consent.md

articles/active-directory/privileged-identity-management/azure-pim-resource-rbac.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ My audit enables you to view your personal role activity.
107107
1. Filter the history using a predefined date or custom range.
108108

109109
![Audit list for the current user](media/azure-pim-resource-rbac/my-audit-time.png)
110+
111+
> [!NOTE]
112+
> Access to audit history requires either a Global Administrator or Privileged Role Administrator role.
110113
111114
## Next steps
112115

articles/avere-vfxt/avere-vfxt-deploy-plan.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Explains planning to do before deploying Avere vFXT for Azure
44
author: ekpgh
55
ms.service: avere-vfxt
66
ms.topic: conceptual
7-
ms.date: 01/13/2020
7+
ms.date: 01/21/2020
88
ms.author: rohogue
99
---
1010

@@ -170,6 +170,6 @@ Two built-in Azure roles are used for the Avere vFXT virtual machines:
170170

171171
If you need to customize access roles for Avere vFXT components, you must define your own role and then assign it to the VMs at the time they are created. You cannot use the deployment template in the Azure Marketplace. Consult Microsoft Customer Service and Support by opening a ticket in the Azure portal as described in [Get help with your system](avere-vfxt-open-ticket.md).
172172

173-
## Next step: Understand the deployment process
173+
## Next steps
174174

175175
[Deployment overview](avere-vfxt-deploy-overview.md) gives the big-picture view of the steps needed to create an Avere vFXT for Azure system and get it ready to serve data.

articles/avere-vfxt/avere-vfxt-deploy.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.author: rohogue
1010

1111
# Deploy the vFXT cluster
1212

13-
This procedure walks you through using the deployment wizard available from the Azure Marketplace. The wizard automatically deploys the cluster by using an Azure Resource Manager template. After you enter the parameters in the form and click **Create**, Azure automatically completes these steps:
13+
This procedure walks you through using the deployment wizard available from the Azure Marketplace. The wizard automatically deploys the cluster by using an Azure Resource Manager template. After you enter the parameters in the form and click **Create**, Azure automatically completes these tasks:
1414

1515
* Creates the cluster controller, which is a basic VM that contains the software needed to deploy and manage the cluster.
1616
* Sets up resource group and virtual network infrastructure, including creating new elements.
@@ -23,10 +23,10 @@ After following the instructions in this document, you will have a virtual netwo
2323

2424
Before using the creation template, make sure you have addressed these prerequisites:
2525

26-
1. [New subscription](avere-vfxt-prereqs.md#create-a-new-subscription)
27-
1. [Subscription owner permissions](avere-vfxt-prereqs.md#configure-subscription-owner-permissions)
28-
1. [Quota for the vFXT cluster](avere-vfxt-prereqs.md#quota-for-the-vfxt-cluster)
29-
1. [Storage service endpoint (if needed)](avere-vfxt-prereqs.md#create-a-storage-service-endpoint-in-your-virtual-network-if-needed) - Required for deployments that use an existing virtual network and create blob storage
26+
* [New subscription](avere-vfxt-prereqs.md#create-a-new-subscription)
27+
* [Subscription owner permissions](avere-vfxt-prereqs.md#configure-subscription-owner-permissions)
28+
* [Quota for the vFXT cluster](avere-vfxt-prereqs.md#quota-for-the-vfxt-cluster)
29+
* [Storage service endpoint (if needed)](avere-vfxt-prereqs.md#create-a-storage-service-endpoint-in-your-virtual-network-if-needed) - Required for deployments that use an existing virtual network and create blob storage
3030

3131
For more information about cluster deployment steps and planning, read [Plan your Avere vFXT system](avere-vfxt-deploy-plan.md) and [Deployment overview](avere-vfxt-deploy-overview.md).
3232

articles/avere-vfxt/avere-vfxt-prereqs.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Prerequisites for Avere vFXT for Azure
44
author: ekpgh
55
ms.service: avere-vfxt
66
ms.topic: conceptual
7-
ms.date: 01/13/2020
7+
ms.date: 01/21/2020
88
ms.author: rohogue
99
---
1010

@@ -18,10 +18,10 @@ Start by creating a new Azure subscription. Use a separate subscription for each
1818

1919
To create a new Azure subscription in the Azure portal:
2020

21-
* Navigate to the [Subscriptions blade](https://ms.portal.azure.com/#blade/Microsoft_Azure_Billing/SubscriptionsBlade)
22-
* Click the **+ Add** button at the top
23-
* Sign in if prompted
24-
* Select an offer and walk through the steps to create a new subscription
21+
1. Navigate to the [Subscriptions blade](https://ms.portal.azure.com/#blade/Microsoft_Azure_Billing/SubscriptionsBlade)
22+
1. Click the **+ Add** button at the top
23+
1. Sign in if prompted
24+
1. Select an offer and walk through the steps to create a new subscription
2525

2626
## Configure subscription owner permissions
2727

@@ -99,6 +99,6 @@ Create the storage service endpoint from the Azure portal.
9999

100100
![Azure portal screenshot with annotations for the steps of creating the service endpoint](media/avere-vfxt-service-endpoint.png)
101101

102-
## Next step: Create the vFXT cluster
102+
## Next steps
103103

104104
After completing these prerequisites, you can create the cluster. Read [Deploy the vFXT cluster](avere-vfxt-deploy.md) for instructions.

articles/azure-functions/durable/durable-functions-event-publishing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ The following list explains the lifecycle events schema:
272272

273273
## How to test locally
274274

275-
To test locally, use [ngrok](../functions-bindings-event-grid.md#local-testing-with-ngrok).
275+
To test locally, read [Azure Function Event Grid Trigger Local Debugging](../functions-debug-event-grid-trigger-local.md).
276276

277277
## Next steps
278278

0 commit comments

Comments
 (0)