Skip to content

Commit 919f9a2

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-unknown-ui
2 parents 41114b4 + 25a8f06 commit 919f9a2

File tree

101 files changed

+124
-365
lines changed

Some content is hidden

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

101 files changed

+124
-365
lines changed

articles/active-directory/conditional-access/require-managed-devices.md

Lines changed: 5 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: article
9-
ms.date: 11/21/2019
9+
ms.date: 11/22/2019
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -77,7 +77,7 @@ The option to *require a device to be marked as compliant* is the strongest form
7777

7878
This option requires a device to be registered with Azure AD, and also to be marked as compliant by:
7979

80-
- Intune.
80+
- Intune
8181
- A third-party mobile device management (MDM) system that manages Windows 10 devices via Azure AD integration. Third-party MDM systems for device OS types other than Windows 10 are not supported.
8282

8383
![Device-based conditions](./media/require-managed-devices/46.png)
@@ -89,6 +89,9 @@ For a device that is marked as compliant, you can assume that:
8989
- Your company information is protected by helping to control the way your workforce accesses and shares it
9090
- The device and its apps are compliant with company security requirements
9191

92+
> [!NOTE]
93+
> If you configure a policy to require compliant devices users may be prompted on Mac, iOS, and Android to select a device certificate during policy evaluation. This is a known behavior.
94+
9295
## Next steps
9396

9497
Before configuring a device-based Conditional Access policy in your environment, you should take a look at the [best practices for Conditional Access in Azure Active Directory](best-practices.md).

articles/cognitive-services/LUIS/what-is-luis.md

Lines changed: 45 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,62 @@ manager: nitinme
88
ms.service: cognitive-services
99
ms.subservice: language-understanding
1010
ms.topic: overview
11-
ms.date: 11/04/2019
11+
ms.date: 11/22/2019
1212
ms.author: diberry
1313
#Customer intent: As a developer incorporating LUIS into my client application, I want to understand what natural language processing (LUIS) is, so that I can determine if it will meet my Cognitive Language needs.
1414
---
1515

1616
# What is Language Understanding (LUIS)?
1717

18-
Language Understanding (LUIS) is a cloud-based API service that applies custom machine-learning intelligence to a user's conversational, natural language text to predict overall meaning, and pull out relevant, detailed information.
18+
Language Understanding (LUIS) is a cloud-based API service that applies custom machine-learning intelligence to natural language text to predict overall meaning, and pull out relevant, detailed information.
1919

20-
A client application for LUIS is any conversational application that communicates with a user in natural language to complete a task. Examples of client applications include social media apps, chat bots, and speech-enabled desktop applications.
20+
For example, when a client application sends the text, `find me a wireless keyboard for $30`, LUIS responds with the following JSON object.
21+
22+
```JSON
23+
{
24+
"query": "find me a wireless keyboard for $30",
25+
"prediction": {
26+
"topIntent": "Finditem",
27+
"intents": {
28+
"Finditem": {
29+
"score": 0.934672
30+
}
31+
},
32+
"entities": {
33+
"item": [
34+
"wireless keyboard"
35+
],
36+
"money": [
37+
{
38+
"number": 30,
39+
"units": "Dollar"
40+
}
41+
]
42+
}
43+
44+
}
45+
}
46+
```
47+
In the example above, the _**intent**_, or overall meaning of the phrase is that the user is trying to find an item. The detailed pieces of information that LUIS extracts are called _**entities**_. In this case, the entities are the name of the item the user is looking for and the amount of money they want to spend.
48+
49+
Client applications use LUIS's returned JSON, the _intent_ (category), and _entities_ (extracted detailed information), to drive actions in the client application. A client application for LUIS is often a conversational application that communicates with a user in natural language to complete a task. Examples of client applications include social media apps, chat bots, and speech-enabled desktop applications.
2150

2251
![Conceptual image of 3 client applications working with Cognitive Services Language Understanding (LUIS)](./media/luis-overview/luis-entry-point.png "Conceptual image of 3 client applications working with Cognitive Services Language Understanding (LUIS)")
2352

24-
## Use LUIS in a chat bot
53+
## Example use LUIS in a chat bot
2554

2655
<a name="Accessing-LUIS"></a>
2756

28-
Once the LUIS app is published, a client application sends utterances (text) to the LUIS natural language processing endpoint [API][endpoint-apis] and receives the results as JSON responses. A common client application for LUIS is a chat bot.
57+
A client application sends utterances (text) to the published LUIS natural language processing endpoint [API][endpoint-apis] and receives the results as JSON responses. A common client application for LUIS is a chat bot.
2958

3059

3160
![Conceptual imagery of LUIS working with Chat bot to predict user text with natural language understanding (NLP)](./media/luis-overview/LUIS-chat-bot-request-response.svg "Conceptual imagery of LUIS working with Chat bot to predict user text with natural language understanding (NLP")
3261

3362
|Step|Action|
3463
|:--|:--|
3564
|1|The client application sends the user _utterance_ (text in their own words), "I want to call my HR rep." to the LUIS endpoint as an HTTP request.|
36-
|2|LUIS enables you to craft your custom language models to add intelligence to your application. Machine learned language models take the user's unstructured input text and returns a JSON-formatted response, with a top intent, `HRContact`. The minimum JSON endpoint response contains the query utterance, and the top scoring intent. It can also extract data such as the _Contact Type_ entity.|
37-
|3|The client application uses the JSON response to make decisions about how to fulfill the user's requests. These decisions can include decision tree in the bot framework code and calls to other services. |
65+
|2|LUIS applies machine learned language models to the user's unstructured input text and returns a JSON-formatted response, with a top intent, `HRContact`. The minimum JSON endpoint response contains the query utterance, and the top scoring intent. It can also extract data such as the _Contact Type_ entity.|
66+
|3|The client application uses the JSON response to make decisions about how to fulfill the user's requests. These decisions can include a decision tree in the bot and calls to other services. |
3867

3968
The LUIS app provides intelligence so the client application can make smart choices. LUIS doesn't provide those choices.
4069

@@ -43,16 +72,16 @@ The LUIS app provides intelligence so the client application can make smart choi
4372

4473
## Natural language processing
4574

46-
Your LUIS app contains a domain-specific natural language model. You can start the LUIS app with a prebuilt domain model, build your own model, or blend pieces of a prebuilt domain with your own custom information.
75+
Your LUIS app contains domain-specific natural language models, which work together. You can start the LUIS app with one or more prebuilt models, build your own model, or blend prebuilt models with your own custom information.
4776

48-
* **Prebuilt model** LUIS has many prebuilt domain models including intents, utterances, and prebuilt entities. You can use the prebuilt entities without having to use the intents and utterances of the prebuilt model. [Prebuilt domain models](luis-how-to-use-prebuilt-domains.md) include the entire design for you and are a great way to start using LUIS quickly.
77+
* **Prebuilt model** LUIS has many prebuilt domains that include intent and entity models that work together to complete common usage scenarios. These domains include labeled utterances that can be inspected and edited, allowing you to customize them. [Prebuilt domain models](luis-how-to-use-prebuilt-domains.md) include the entire design for you and are a great way to start using LUIS quickly. In addition, there are prebuilt entities such as currency and number that you can use independently from the prebuilt domains.
4978

50-
* **Custom model** LUIS gives you several ways to identify your own custom models including intents, and entities. Entities include machine-learned entities, specific or literal entities, and a combination of machine-learned and literal.
79+
* **Custom model** LUIS gives you several ways to build your own custom models including intents, and entities. Entities include machine-learned entities, pattern matching entities, and a combination of machine-learned and pattern matching.
5180

52-
## Build the LUIS model
53-
Build the model with the [authoring](https://go.microsoft.com/fwlink/?linkid=2092087) APIs or with the [LUIS portal](https://www.luis.ai).
81+
## Build the LUIS app
82+
Build the app with the [authoring](https://go.microsoft.com/fwlink/?linkid=2092087) APIs or with the [LUIS portal](https://www.luis.ai).
5483

55-
The LUIS model begins with categories of user intentions called **[intents](luis-concept-intent.md)**. Each intent needs examples of user **[utterances](luis-concept-utterance.md)**. Each utterance can provide data that needs to be extracted.
84+
The LUIS app begins with categories of input text called **[intents](luis-concept-intent.md)**. Each intent needs examples of user **[utterances](luis-concept-utterance.md)**. Each utterance can provide data that needs to be extracted.
5685

5786
|Example user utterance|Intent|Extracted data|
5887
|-----------|-----------|-----------|
@@ -96,8 +125,8 @@ After your LUIS app is published and receives real user utterances, LUIS provide
96125

97126
<a name="using-luis"></a>
98127

99-
## Development lifecycle
100-
LUIS provides tools, versioning, and collaboration with other LUIS authors to integrate into the full [development life cycle](luis-concept-app-iteration.md).
128+
## Iterative development lifecycle
129+
LUIS provides tools, versioning, and collaboration with other LUIS authors to integrate into the full iterative [development life cycle](luis-concept-app-iteration.md).
101130

102131
## Implementing LUIS
103132
Language Understanding (LUIS), as a REST API, can be used with any product, service, or framework with an HTTP request. The following list contains the top Microsoft products and services used with LUIS.
@@ -124,7 +153,7 @@ Samples using LUIS:
124153
## Next steps
125154

126155
* [What's new](whats-new.md)
127-
* Author a new LUIS app with a [prebuilt](luis-get-started-create-app.md) or [custom](luis-quickstart-intents-only.md) domain.
156+
* Author a new LUIS app with a [prebuilt](luis-get-started-create-app.md) or [custom](luis-quickstart-intents-only.md) domain
128157
* [Query the prediction endpoint](luis-get-started-get-intent-from-browser.md) of a public IoT app.
129158
* [Developer resources](developer-reference-resource.md) for LUIS.
130159

articles/container-registry/container-registry-auth-aci.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
---
2-
title: Access Azure Container Registry from Container Instances
2+
title: Access from Container Instances
33
description: Learn how to provide access to images in your private container registry from Azure Container Instances by using an Azure Active Directory service principal.
4-
services: container-registry
5-
author: dlepow
6-
manager: gwallace
7-
8-
ms.service: container-registry
94
ms.topic: article
105
ms.date: 04/23/2018
11-
ms.author: danlep
126
---
137

148
# Authenticate with Azure Container Registry from Azure Container Instances

articles/container-registry/container-registry-auth-service-principal.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
---
2-
title: Azure Container Registry authentication with a service principal
2+
title: Authenticate with service principal
33
description: Provide access to images in your private container registry by using an Azure Active Directory service principal.
4-
services: container-registry
5-
author: dlepow
6-
manager: gwallace
7-
8-
ms.service: container-registry
94
ms.topic: article
105
ms.date: 10/04/2019
11-
ms.author: danlep
126
---
137

148
# Azure Container Registry authentication with service principals

articles/container-registry/container-registry-authentication-managed-identity.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
---
2-
title: Azure Container Registry authentication with a managed identity
2+
title: Authenticate with managed identity
33
description: Provide access to images in your private container registry by using a user-assigned or system-assigned managed Azure identity.
4-
services: container-registry
5-
author: dlepow
6-
manager: gwallace
7-
8-
ms.service: container-registry
94
ms.topic: article
105
ms.date: 01/16/2019
11-
ms.author: danlep
126
---
137

148
# Use an Azure managed identity to authenticate to an Azure container registry

articles/container-registry/container-registry-authentication.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
---
2-
title: Authenticate with an Azure container registry
2+
title: Registry authentication options
33
description: Authentication options for an Azure container registry, including signing in with an Azure Active Directory identity, using service principals, and using optional admin credentials.
4-
services: container-registry
5-
author: dlepow
6-
manager: gwallace
7-
8-
ms.service: container-registry
94
ms.topic: article
105
ms.date: 12/21/2018
11-
ms.author: danlep
126
ms.custom: H1Hack27Feb2017
137
---
148

articles/container-registry/container-registry-auto-purge.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
---
2-
title: Automatically remove image resources in Azure Container Registry
2+
title: Purge tags and manifests
33
description: Use a purge command to delete multiple tags and manifests from an Azure container registry based on age and a tag filter, and optionally schedule purge operations.
4-
services: container-registry
5-
author: dlepow
6-
manager: gwallace
7-
8-
ms.service: container-registry
94
ms.topic: article
105
ms.date: 08/14/2019
11-
ms.author: danlep
126
---
137

148
# Automatically purge images from an Azure container registry

articles/container-registry/container-registry-best-practices.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
---
2-
title: Best practices in Azure Container Registry
2+
title: Registry best practices
33
description: Learn how to use your Azure container registry effectively by following these best practices.
4-
services: container-registry
5-
author: dlepow
6-
manager: gwallace
7-
8-
ms.service: container-registry
94
ms.topic: article
105
ms.date: 09/27/2018
11-
ms.author: danlep
126
---
137

148
# Best practices for Azure Container Registry

articles/container-registry/container-registry-check-health.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
---
2-
title: Check registry health in Azure Container Registry
2+
title: Check registry health
33
description: Learn how to run a quick diagnostic command to identify common problems when using an Azure container registry, including local Docker configuration and connectivity to the registry
4-
services: container-registry
5-
author: dlepow
6-
manager: gwallace
7-
8-
ms.service: container-registry
94
ms.topic: article
105
ms.date: 07/02/2019
11-
ms.author: danlep
126
---
137
# Check the health of an Azure container registry
148

articles/container-registry/container-registry-concepts.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
---
2-
title: About repositories and images in Azure Container Registry
2+
title: About repositories & images
33
description: Introduction to key concepts of Azure container registries, repositories, and container images.
4-
services: container-registry
5-
author: dlepow
6-
7-
ms.service: container-registry
84
ms.topic: article
95
ms.date: 09/10/2019
10-
ms.author: danlep
116
---
127

138
# About registries, repositories, and images

0 commit comments

Comments
 (0)