Skip to content

Commit 7365569

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into asc-faq
2 parents d7b3f12 + 0549551 commit 7365569

24 files changed

+762
-462
lines changed

articles/aks/networking-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: jeconnoc
77

88
ms.service: container-service
99
ms.topic: article
10-
ms.date: 05/07/2018
10+
ms.date: 06/04/2018
1111
ms.author: marsma
1212
---
1313

@@ -51,7 +51,7 @@ Advanced networking provides the following benefits:
5151
* Do not create more than one AKS cluster in the same subnet.
5252
* Advanced networking for AKS does not support VNets that use Azure Private DNS Zones.
5353
* AKS clusters may not use `169.254.0.0/16`, `172.30.0.0/16`, or `172.31.0.0/16` for the Kubernetes service address range.
54-
* The service principal used for the AKS cluster must have `Owner` permissions to the resource group containing the existing VNet.
54+
* The service principal used for the AKS cluster must have `Contributor` permissions to the resource group containing the existing VNet.
5555

5656
## Plan IP addressing for your cluster
5757

articles/automation/automation-webhooks.md

Lines changed: 110 additions & 164 deletions
Large diffs are not rendered by default.
1.91 KB
Loading
-45.2 KB
Loading
7.43 KB
Loading
Binary file not shown.
Binary file not shown.
-65.4 KB
Loading
Binary file not shown.

articles/cognitive-services/LUIS/luis-how-to-account-settings.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: Kaiqb
88
ms.service: cognitive-services
99
ms.component: language-understanding
1010
ms.topic: article
11-
ms.date: 03/16/2018
11+
ms.date: 06/04/2018
1212
ms.author: v-geberr
1313
---
1414

@@ -32,8 +32,21 @@ If your authoring key is compromised, reset the key. The key is reset on all you
3232
## Delete account
3333
See [Data storage and removal](luis-concept-data-storage.md#accounts) for information about what data is deleted when you delete your account.
3434

35+
## Azure Active Directory tenant user
36+
LUIS uses standard Azure Active Directory (Azure AD) consent flow.
37+
38+
The tenant admin should work directly with the user who needs access granted to use LUIS in the Azure AD.
39+
40+
First, the user signs into LUIS, and sees the pop-up dialog needing admin approval. The user contacts the tenant admin before continuing.
41+
42+
Second, the tenant admin signs into LUIS, and sees a consent flow pop-up dialog. This is the dialog the admin needs to give permission for the user. Once the admin accepts the permission, the user is able to continue with LUIS.
43+
44+
If the tenant admin will not sign in to LUIS, the admin can access [consent](https://account.activedirectory.windowsazure.com/Consent.aspx?ClientID=65920ba3-ab61-4a9b-9b10-505e5ce61b58) for LUIS.
45+
46+
If the tenant admin only wants certain users to use LUIS, refer to this [identity blog](https://blogs.technet.microsoft.com/tfg/2017/10/15/english-tips-to-manage-azure-ad-users-consent-to-applications-using-azure-ad-graph-api/).
47+
3548
## Next steps
3649

3750
Learn more about your [authoring key](luis-concept-keys.md#authoring-key).
3851

39-
[LUIS]: luis-reference-regions.md
52+
[LUIS]: luis-reference-regions.md

0 commit comments

Comments
 (0)