Skip to content

Commit 145cd28

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 913c391 + 0ff8b24 commit 145cd28

File tree

71 files changed

+1033
-455
lines changed

Some content is hidden

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

71 files changed

+1033
-455
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10874,12 +10874,16 @@
1087410874
"redirect_url": "/azure/azure-health-insights/overview",
1087510875
"redirect_document_id": false
1087610876
},
10877+
{
10878+
"source_path_from_root": "/articles/cloud-services-php-create-web-role.md",
10879+
"redirect_url": "/azure/cloud-services/cloud-services-php-create-web-role",
10880+
"redirect_document_id": true
10881+
},
1087710882
{
1087810883
"source_path_from_root": "/articles/networking/disaster-recovery-dns-traffic-manager.md",
1087910884
"redirect_url": "/azure/reliability/reliability-traffic-manager",
1088010885
"redirect_document_id": false
1088110886
}
10882-
1088310887

1088410888
]
1088510889
}

articles/ai-services/.openpublishing.redirection.applied-ai-services.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@
189189
"source_path_from_root": "/articles/ai-services/custom-vision-service/release-notes.md",
190190
"redirect_url": "/azure/ai-services/custom-vision-service/whats-new",
191191
"redirect_document_id": false
192+
},
193+
{
194+
"source_path_from_root": "/articles/ai-services/luis/luis-migration-authoring.md",
195+
"redirect_url": "/azure/ai-services/language-service/conversational-language-understanding/how-to/migrate-from-luis",
196+
"redirect_document_id": false
192197
}
193198
]
194199
}

articles/ai-services/LUIS/encrypt-data-at-rest.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: azure-ai-language
99
ms.subservice: azure-ai-luis
1010
ms.topic: conceptual
11-
ms.date: 01/19/2024
11+
ms.date: 02/05/2024
1212
ms.author: egeaney
1313
#Customer intent: As a user of the Language Understanding (LUIS) service, I want to learn how encryption at rest works.
1414
---
@@ -26,11 +26,11 @@ Data is encrypted and decrypted using [FIPS 140-2](https://en.wikipedia.org/wiki
2626

2727
## About encryption key management
2828

29-
By default, your subscription uses Microsoft-managed encryption keys. There is also the option to manage your subscription with your own keys called customer-managed keys (CMK). CMK offer greater flexibility to create, rotate, disable, and revoke access controls. You can also audit the encryption keys used to protect your data.
29+
By default, your subscription uses Microsoft-managed encryption keys. There is also the option to manage your subscription with your own keys called customer-managed keys (CMKs). CMKs offer greater flexibility to create, rotate, disable, and revoke access controls. You can also audit the encryption keys used to protect your data.
3030

3131
## Customer-managed keys with Azure Key Vault
3232

33-
There is also an option to manage your subscription with your own keys. Customer-managed keys (CMK), also known as Bring your own key (BYOK), offer greater flexibility to create, rotate, disable, and revoke access controls. You can also audit the encryption keys used to protect your data.
33+
There is also an option to manage your subscription with your own keys. Customer-managed keys (CMKs), also known as Bring your own key (BYOK), offer greater flexibility to create, rotate, disable, and revoke access controls. You can also audit the encryption keys used to protect your data.
3434

3535
You must use Azure Key Vault to store your customer-managed keys. You can either create your own keys and store them in a key vault, or you can use the Azure Key Vault APIs to generate keys. The Azure AI services resource and the key vault must be in the same region and in the same Microsoft Entra tenant, but they can be in different subscriptions. For more information about Azure Key Vault, see [What is Azure Key Vault?](../../key-vault/general/overview.md).
3636

@@ -40,8 +40,8 @@ You must use Azure Key Vault to store your customer-managed keys. You can either
4040

4141
There are some limitations when using the E0 tier with existing/previously created applications:
4242

43-
* Migration to an E0 resource will be blocked. Users will only be able to migrate their apps to F0 resources. After you've migrated an existing resource to F0, you can create a new resource in the E0 tier. Learn more about [migration here](./luis-migration-authoring.md).
44-
* Moving applications to or from an E0 resource will be blocked. A work around for this limitation is to export your existing application, and import it as an E0 resource.
43+
* Migration to an E0 resource will be blocked. Users will only be able to migrate their apps to F0 resources. After you've migrated an existing resource to F0, you can create a new resource in the E0 tier.
44+
* Moving applications to or from an E0 resource will be blocked. A work-around for this limitation is to export your existing application, and import it as an E0 resource.
4545
* The Bing Spell check feature isn't supported.
4646
* Logging end-user traffic is disabled if your application is E0.
4747
* The Speech priming capability from the Azure AI Bot Service isn't supported for applications in the E0 tier. This feature is available via the Azure AI Bot Service, which doesn't support CMK.

articles/ai-services/LUIS/luis-concept-data-storage.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: nitinme
99
ms.service: azure-ai-language
1010
ms.subservice: azure-ai-luis
1111
ms.topic: conceptual
12-
ms.date: 01/19/2024
12+
ms.date: 02/05/2024
1313
---
1414

1515
# Data storage and removal in Language Understanding (LUIS) Azure AI services
@@ -19,9 +19,9 @@ ms.date: 01/19/2024
1919

2020
LUIS stores data encrypted in an Azure data store corresponding to [the region](luis-reference-regions.md) specified by the key.
2121

22-
* Data used to train the model such as entities, intents, and utterances will be saved in LUIS for the lifetime of the application. If an owner or contributor deletes the app, this data will be deleted with it. If an application hasn't been used in 90 days, it will be deleted.
22+
* Data used to train the model such as entities, intents, and utterances will be saved in LUIS for the lifetime of the application. If an owner or contributor deletes the app, this data is deleted with it. If an application hasn't been used in 90 days, it will be deleted.
2323

24-
* Application authors can choose to [enable logging](how-to/improve-application.md#log-user-queries-to-enable-active-learning) on the utterances that are sent to a published application. If enabled, utterances will be saved for 30 days, and can be viewed by the application author. If logging isn't enabled when the application is published, this data is not stored.
24+
* Application authors can choose to [enable logging](how-to/improve-application.md#log-user-queries-to-enable-active-learning) on the utterances that are sent to a published application. If enabled, utterances are saved for 30 days, and can be viewed by the application author. If logging isn't enabled when the application is published, this data isn't stored.
2525

2626
## Export and delete app
2727
Users have full control over [exporting](how-to/sign-in.md) and [deleting](how-to/sign-in.md) the app.
@@ -48,7 +48,7 @@ You can delete utterances from the list of user utterances that LUIS suggests in
4848
If you don't want active learning utterances, you can [disable active learning](how-to/improve-application.md). Disabling active learning also disables logging.
4949

5050
### Disable logging utterances
51-
[Disabling active learning](how-to/improve-application.md) is disables logging.
51+
[Disabling active learning](how-to/improve-application.md) disables logging.
5252

5353

5454
<a name="accounts"></a>
@@ -59,12 +59,12 @@ If you are not migrated, you can delete your account and all your apps will be d
5959
Deleting account is available from the **Settings** page. Select your account name in the top right navigation bar to get to the **Settings** page.
6060

6161
## Delete an authoring resource
62-
If you have [migrated to an authoring resource](./luis-migration-authoring.md), deleting the resource itself from the Azure portal will delete all your applications associated with that resource, along with their example utterances and logs. The data is retained for 90 days before it is deleted permanently.
62+
If you have migrated to an authoring resource, deleting the resource itself from the Azure portal deletes all your applications associated with that resource, along with their example utterances and logs. The data is retained for 90 days before it is deleted permanently.
6363

6464
To delete your resource, go to the [Azure portal](https://portal.azure.com/#home) and select your LUIS authoring resource. Go to the **Overview** tab and select the **Delete** button on the top of the page. Then confirm your resource was deleted.
6565

6666
## Data inactivity as an expired subscription
67-
For the purposes of data retention and deletion, an inactive LUIS app may at _Microsoft’s discretion_ be treated as an expired subscription. An app is considered inactive if it meets the following criteria for the last 90 days:
67+
For the purposes of data retention and deletion, an inactive LUIS app might at _Microsoft’s discretion_ be treated as an expired subscription. An app is considered inactive if it meets the following criteria for the last 90 days:
6868

6969
* Has had **no** calls made to it.
7070
* Has not been modified.
@@ -73,4 +73,4 @@ For the purposes of data retention and deletion, an inactive LUIS app may at _Mi
7373

7474
## Next steps
7575

76-
[Learn about exporting and deleting an app](how-to/sign-in.md)
76+
[Learn about exporting and deleting an app.](how-to/sign-in.md)

articles/ai-services/LUIS/luis-how-to-collaborate.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ manager: nitinme
99
ms.service: azure-ai-language
1010
ms.subservice: azure-ai-luis
1111
ms.topic: how-to
12-
ms.date: 01/19/2024
12+
ms.date: 02/05/2024
1313
---
1414

1515
# Add contributors to your app
1616

1717
[!INCLUDE [deprecation notice](./includes/deprecation-notice.md)]
1818

1919

20-
An app owner can add contributors to apps. These contributors can modify the model, train, and publish the app. Once you have [migrated](luis-migration-authoring.md) your account, _contributors_ are managed in the Azure portal for the authoring resource, using the **Access control (IAM)** page. Add a user, using the collaborator's email address and the _contributor_ role.
20+
An app owner can add contributors to apps. These contributors can modify the model, train, and publish the app. _Contributors_ are managed in the Azure portal for the authoring resource, using the **Access control (IAM)** page. Add a user, using the collaborator's email address and the _contributor_ role.
2121

2222
## Add contributor to Azure authoring resource
2323

@@ -62,7 +62,7 @@ The tenant admin should work directly with the user who needs access granted to
6262

6363
If the tenant admin only wants certain users to use LUIS, there are a couple of possible solutions:
6464
* Giving the "admin consent" (consent to all users of the Microsoft Entra ID), but then set to "Yes" the "User assignment required" under Enterprise Application Properties, and finally assign/add only the wanted users to the Application. With this method, the Administrator is still providing "admin consent" to the App, however, it's possible to control the users that can access it.
65-
* A second solution, is by using the [Microsoft Entra identity and access management API in Microsoft Graph](/graph/azuread-identity-access-management-concept-overview) to provide consent to each specific user.
65+
* A second solution is to use the [Microsoft Entra identity and access management API in Microsoft Graph](/graph/azuread-identity-access-management-concept-overview) to provide consent to each specific user.
6666

6767
Learn more about Microsoft Entra users and consent:
6868
* [Restrict your app](../../active-directory/develop/howto-restrict-your-app-to-a-set-of-users.md) to a set of users
@@ -71,5 +71,4 @@ Learn more about Microsoft Entra users and consent:
7171

7272
* Learn [how to use versions](luis-how-to-manage-versions.md) to control your app life cycle.
7373
* Understand the about [authoring resources](luis-how-to-azure-subscription.md) and [adding contributors](luis-how-to-collaborate.md) on that resource.
74-
* Learn [how to create](luis-how-to-azure-subscription.md) authoring and runtime resources
75-
* Migrate to the new [authoring resource](luis-migration-authoring.md)
74+
* Learn [how to create](luis-how-to-azure-subscription.md) authoring and runtime resources

0 commit comments

Comments
 (0)