Skip to content

Commit 27e8643

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ds-prcleanup1
2 parents 266f4b4 + 30be898 commit 27e8643

18 files changed

+284
-197
lines changed

articles/active-directory/app-provisioning/check-status-user-account-provisioning.md

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

2020
# Tutorial: Reporting on automatic user account provisioning
2121

22-
Azure Active Directory (Azure AD) includes a [user account provisioning service](user-provisioning.md) that helps automate the provisioning de-provisioning of user accounts in SaaS apps and other systems, for the purpose of end-to-end identity lifecycle management. Azure AD supports pre-integrated user provisioning connectors for all of the applications and systems in the "Featured" section of the [Azure AD application gallery](https://azuremarketplace.microsoft.com/marketplace/apps/category/azure-active-directory-apps?page=1&subcategories=featured).
22+
Azure Active Directory (Azure AD) includes a [user account provisioning service](user-provisioning.md) that helps automate the provisioning de-provisioning of user accounts in SaaS apps and other systems, for the purpose of end-to-end identity lifecycle management. Azure AD supports pre-integrated user provisioning connectors for all of the applications and systems with user provisioning tutorials [here](https://docs.microsoft.com/azure/active-directory/saas-apps/tutorial-list).
2323

2424
This article describes how to check the status of provisioning jobs after they have been set up, and how to troubleshoot the provisioning of individual users and groups.
2525

articles/cognitive-services/LUIS/includes/howto-publish.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ ms.author: diberry
1515

1616
In order to receive a LUIS prediction in a chat bot or other client application, you need to publish the app to the endpoint.
1717

18-
1. Select **Publish** in the top right navigation.
18+
1. Select **Publish** in the top-right navigation.
1919

2020
![LUIS publish to endpoint button in top right menu](../media/howto-publish/publish-button.png)
2121

22-
2. Select the **Production** slot and the **Publish** button.
22+
2. Select the **Production** slot, then select **Done**.
2323

24-
![LUIS publish to endpoint](../media/howto-publish/publish-app-popup.png)
24+
> [!div class="mx-imgBorder"]
25+
> ![LUIS publish to endpoint](../media/howto-publish/publish-app-popup.png)
2526
26-
3. Publishing is complete when you see the status bar at the top of the page confirming success.
27+
3. Publishing is complete when you see the notification confirming success.
2728

2829
![LUIS publish to endpoint](../media/howto-publish/publish-endpoint-success.png)
2930

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
---
22
title: Select authoring resource
3-
titleSuffix: Azure Cognitive Services
4-
services: cognitive-services
5-
author: diberry
6-
manager: nitinme
7-
ms.service: cognitive-services
8-
ms.topic: include
9-
ms.date: 11/04/2019
10-
ms.author: diberry
3+
ms.topic: include
4+
ms.date: 03/25/2020
115
---
126

137
## Select subscription and authoring resource
148

15-
In the LUIS portal, to see a list of apps or to create an app, select the subscription and authoring resource. Apps are accessed by the LUIS authoring resource.
9+
In the LUIS portal, to see a list of apps or to create an app, select the subscription and authoring resource. Apps are accessed by the LUIS authoring resource.
1610

17-
![Select authoring subscription and authoring resource](../media/select-authoring-resource/select-authoring-resource.png)
11+
> [!div class="mx-imgBorder"]
12+
> ![Select authoring subscription and authoring resource](../media/select-authoring-resource/select-authoring-resource.png)

articles/cognitive-services/LUIS/includes/v3-prediction-endpoint.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ services: cognitive-services
55
author: diberry
66
manager: nitinme
77
ms.service: cognitive-services
8-
ms.topic: include
8+
ms.topic: include
99
ms.date: 10/14/2019
1010
ms.author: diberry
1111
---
1212

1313

14-
1. In the LUIS portal, in the Manage section (top right menu), on the Keys and endpoints page (left menu), select the endpoint URL at the bottom of the page.
14+
1. In the LUIS portal, in the **Manage** section (top right menu), on the **Azure Resources** page (left menu), on the **Prediction Resources** tab, copy the **example Query** at the bottom of the page.
1515

16-
This action opens browser tab with the endpoint URL in the address bar.
16+
Paste the URL into a new browser tab.
1717

1818
The URL has your app ID, key, and slot name. The V3 prediction endpoint URL looks like:
1919

20-
`https://REGION.api.cognitive.microsoft.com/luis/prediction/v3.0/apps/APP-ID/slots/SLOT-NAME/predict?subscription-key=YOUR-KEY&<optional-name-value-pairs>&query=UTTERANCE-TEXT.`
20+
`https://REGION.api.cognitive.microsoft.com/luis/prediction/v3.0/apps/APP-ID/slots/SLOT-NAME/predict?subscription-key=YOUR-KEY&<optional-name-value-pairs>&query=YOUR_QUERY_HERE`
2121

articles/cognitive-services/LUIS/luis-get-started-create-app.md

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
---
22
title: "Quickstart: create app - LUIS"
3-
titleSuffix: Azure Cognitive Services
43
description: This quickstart shows how to create a LUIS app that uses the prebuilt domain `HomeAutomation` for turning lights and appliances on and off. This prebuilt domain provides intents, entities, and example utterances for you. When you're finished, you'll have a LUIS endpoint running in the cloud.
5-
services: cognitive-services
6-
author: diberry
7-
ms.custom: seodec18
8-
manager: nitinme
9-
ms.service: cognitive-services
10-
ms.subservice: language-understanding
114
ms.topic: quickstart
12-
ms.date: 12/17/2019
13-
ms.author: diberry
5+
ms.date: 03/24/2020
146
#Customer intent: As a new user, I want to quickly get a LUIS app created so I can understand the model and actions to train, test, publish, and query.
157
---
168

@@ -25,11 +17,11 @@ In this quickstart, create a LUIS app that uses the prebuilt domain `HomeAutomat
2517
## Create a new app
2618
You can create and manage your applications on **My Apps**.
2719

28-
1. In the LUIS portal, on the My apps list, select **+ Create**.
20+
1. On the My apps list, select **+ New app for conversation**.
2921

30-
![In the LUIS portal, on the My apps list, select '+ Create.](./media/create-app-in-portal.png)
22+
1. In the dialog box, name your application `Home Automation`. Select **English** as the culture. The description is optional and isn't used for authoring or prediction. The prediction resource is also optional when creating a LUIS app. Select **Done**.
3123

32-
1. In the dialog box, name your application `Home Automation` then select **Done**. LUIS creates the app. The description is optional and isn't used for authoring or prediction. The prediction resource is also optional when creating a LUIS app. When you publish your app to production, you should assign a prediction resource so your app can handle many requests.
24+
LUIS creates the app. When you publish your app to production, you should assign a prediction resource so your app can handle many requests.
3325

3426
![In the dialog box, name your application `Home Automation`](./media/create-new-app-details.png)
3527

@@ -62,23 +54,25 @@ Select the **HomeAutomation.TurnOff** intent. You can see that the intent contai
6254
[!INCLUDE [LUIS How to Train steps](includes/howto-train.md)]
6355

6456
## Test your app
65-
Once you've trained your app, you can test it. Select **Test**. Type a test utterance like `Turn off the lights` into the interactive test pane, and press Enter.
57+
Once you've trained your app, you can test it.
6658

67-
```
68-
Turn off the lights
69-
```
59+
1. Select **Test** from the top-right navigation. 1. Type a test utterance like `Turn off the lights` into the interactive test pane, and press Enter.
7060

71-
Check that the top scoring intent corresponds to the intent you expected for each test utterance.
61+
```
62+
Turn off the lights
63+
```
64+
65+
Check that the top scoring intent corresponds to the intent you expected for each test utterance.
7266
73-
In this example, `Turn off the lights` is correctly identified as the top scoring intent of **HomeAutomation.TurnOff**.
67+
In this example, `Turn off the lights` is correctly identified as the top scoring intent of **HomeAutomation.TurnOff**.
7468
75-
![Screenshot of Test panel with utterance highlighted](media/luis-quickstart-new-app/review-test-inspection-pane-in-portal.png)
69+
![Screenshot of Test panel with utterance highlighted](media/luis-quickstart-new-app/review-test-inspection-pane-in-portal.png)
7670
77-
Select **Inspect** to review more information about the prediction.
71+
1. Select **Inspect** to review more information about the prediction.
7872
79-
![Screenshot of Test panel with inspection information](media/luis-quickstart-new-app/test.png)
73+
![Screenshot of Test panel with inspection information](media/luis-quickstart-new-app/test.png)
8074
81-
Select **Test** again to collapse the test pane.
75+
1. Close the test pane.
8276
8377
<a name="publish-your-app"></a>
8478
@@ -92,14 +86,14 @@ Select **Test** again to collapse the test pane.
9286
9387
[!INCLUDE [LUIS How to get endpoint first step](./includes/v3-prediction-endpoint.md)]
9488
95-
1. In the browser address bar, for the query string, make sure the following name and value bars are in the URL. If they are not in the query string, add them:
89+
2. In the browser address bar, for the query string, make sure the following name and value bars are in the URL. If they are not in the query string, add them:
9690
9791
|Name/value pair|
9892
|--|
9993
|`verbose=true`|
10094
|`show-all-intents=true`|
10195
102-
1. In the browser address bar, go to the end of the URL and enter `turn off the living room light` for the _query_ value, then press Enter.
96+
3. In the browser address bar, go to the end of the URL and enter `turn off the living room light` for the _query_ value, then press Enter.
10397
10498
```json
10599
{
3.59 KB
Loading
32.2 KB
Loading

articles/machine-learning/data-science-virtual-machine/dsvm-tools-data-platforms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The following data platform tools are supported on the DSVM.
2525
| | |
2626
| ------------- | ------------- |
2727
| What is it? | A local relational database instance |
28-
| Supported DSVM editions | Windows: SQL Server 2017, Windows 2019 (Preview) : SQL Server 2019 |
28+
| Supported DSVM editions | Windows 2016: SQL Server 2017, Windows 2019: SQL Server 2019 |
2929
| Typical uses | Rapid development locally with smaller dataset <br/> Run In-database R |
3030
| Links to samples | A small sample of a New York City dataset is loaded into the SQL database:<br/> `nyctaxi` <br/> Jupyter sample showing Microsoft Machine Learning Server and in-database analytics can be found at:<br/> `~notebooks/SQL_R_Services_End_to_End_Tutorial.ipynb` |
3131
| Related tools on the DSVM | SQL Server Management Studio <br/> ODBC/JDBC drivers<br/> pyodbc, RODBC<br />Apache Drill |

articles/machine-learning/data-science-virtual-machine/dsvm-tools-data-science.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ There are several other machine-learning libraries on DSVMs, such as the popular
104104
| | |
105105
| ------------- | ------------- |
106106
| What is it? | Open-source SQL query engine on big data |
107-
| Supported DSVM versions | Windows 2019 (Preview), Linux |
107+
| Supported DSVM versions | Windows 2019, Linux |
108108
| How is it configured and installed on the DSVM? | Installed in `/dsvm/tools/drill*` in embedded mode only |
109109
| Typical uses | For in-place data exploration without requiring extract, transform, load (ETL). Query different data sources and formats, including CSV, JSON, relational tables, and Hadoop. |
110110
| How to use and run it | Desktop shortcut <br/> [Get started with Drill in 10 minutes](https://drill.apache.org/docs/drill-in-10-minutes/) |

articles/machine-learning/data-science-virtual-machine/dsvm-tools-development.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The Data Science Virtual Machine (DSVM) bundles several popular tools in a highl
2222
| | |
2323
| ------------- | ------------- |
2424
| What is it? | General purpose IDE |
25-
| Supported DSVM versions | Windows: Visual Studio 2017, Windows 2019 (Preview) : Visual Studio 2019 |
25+
| Supported DSVM versions | Windows: Visual Studio 2017, Windows 2019 : Visual Studio 2019 |
2626
| Typical uses | Software development |
2727
| How is it configured and installed on the DSVM? | Data Science Workload (Python and R tools), Azure workload (Hadoop, Data Lake), Node.js, SQL Server tools, [Azure Machine Learning for Visual Studio Code](https://github.com/Microsoft/vs-tools-for-ai) |
2828
| How to use and run it | Desktop shortcut (`C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe`). Graphically, open Visual Studio by using the desktop icon or the **Start** menu. Search for programs (Windows logo key+S), followed by **Visual Studio**. From there, you can create projects in languages like C#, Python, R, and Node.js. |
@@ -77,7 +77,7 @@ The Data Science Virtual Machine (DSVM) bundles several popular tools in a highl
7777
| | |
7878
| ------------- | ------------- |
7979
| What is it? | Client IDE for Python language |
80-
| Supported DSVM versions | Windows 2019 (Preview), Linux |
80+
| Supported DSVM versions | Windows 2019, Linux |
8181
| Typical uses | Python development |
8282
| How to use and run it | Desktop shortcut (`C:\Program Files\tk`) on Windows. Desktop shortcut (`/usr/bin/pycharm`) on Linux |
8383
| Related tools on the DSVM | Visual Studio, Visual Studio Code, RStudio |

0 commit comments

Comments
 (0)