Skip to content

Commit 2c0fc66

Browse files
authored
Merge pull request #48914 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents e647632 + 65df636 commit 2c0fc66

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

articles/cognitive-services/text-analytics/tutorials/tutorial-power-bi-key-phrases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Now we're ready to create the custom function that will integrate Power BI and T
9090
The function receives the text to be processed as a parameter. It converts data to and from the required JavaScript Object Notation (JSON) and makes the HTTP request to the Key Phrases API endpoint. After parsing the response, the function returns a string containing a comma-separated list of the extracted key phrases.
9191

9292
> [!NOTE]
93-
> Power BI Desktop custom functions are written in the [Power Query M formula language](https://msdn.microsoft.com/library/mt211003.aspx), or just "M" for short. M is a functional programming language based on [F#](http://www.tryfsharp.org/). You don't need to be a programmer to finish this tutorial, though; the required code is included below.
93+
> Power BI Desktop custom functions are written in the [Power Query M formula language](https://msdn.microsoft.com/library/mt211003.aspx), or just "M" for short. M is a functional programming language based on [F#](https://docs.microsoft.com/dotnet/fsharp/). You don't need to be a programmer to finish this tutorial, though; the required code is included below.
9494
9595
You should still be in the Query Editor window. From the Home ribbon, click **New Source** (in the New Query group) and choose **Blank Query** from the drop-down menu.
9696

articles/service-fabric-mesh/service-fabric-mesh-quickstart-deploy-container.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ Create your application in the resource group using the `az mesh deployment crea
4646
```azurecli-interactive
4747
az mesh deployment create --resource-group myResourceGroup --template-uri https://sfmeshsamples.blob.core.windows.net/templates/helloworld/mesh_rp.linux.json --parameters "{\"location\": {\"value\": \"eastus\"}}"
4848
```
49-
The preceding command deploys a Linux using [mesh_rp.linux.json template](https://sfmeshsamples.blob.core.windows.net/templates/helloworld/mesh_rp.linux.json). If you want to deploy a Windows application, use [mesh_rp.windows.json template](https://sfmeshsamples.blob.core.windows.net/templates/helloworld/mesh_rp.windows.json). Windows container images are larger than Linux container images and may take more time to deploy.
49+
The preceding command deploys a Linux application using [mesh_rp.linux.json template](https://sfmeshsamples.blob.core.windows.net/templates/helloworld/mesh_rp.linux.json). If you want to deploy a Windows application, use [mesh_rp.windows.json template](https://sfmeshsamples.blob.core.windows.net/templates/helloworld/mesh_rp.windows.json). Windows container images are larger than Linux container images and may take more time to deploy.
5050

5151
In a few minutes, the command returns:
5252

5353
`helloWorldApp has been deployed successfully on helloWorldNetwork with public ip address <IP Address>`
5454

5555
## Open the application
56-
Once the application successfully deploys, copy the public IP address for the service endpoint from the CLI output. Open the IP address in a web browser. A web page with the Azure Service Fabric Mesh logo displays.
56+
Once the application successfully deploys, copy the public IP address for the service endpoint from the CLI output. Open the IP address in a web browser. A web page with the Azure Service Fabric Mesh logo displays.
5757

5858
## Check the application details
5959
You can check the application's status using the `az mesh app show` command. This command provides useful information that you can follow up on.

articles/stream-analytics/stream-analytics-test-query.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ By using Azure Stream Analytics, you can upload sample data and test queries in
2424

2525
3. On the Stream Analytics job page, under the **Job Topology** heading, select **Query** to open the Query editor window.
2626

27-
4. To test your query with sample input data, right-click on any of your inputs. Then select **Upload sample data from file**.
28-
29-
The data must be JSON formatted data only. If your data is in a different format such as CSV, you should convert it to JSON before uploading. You can use any opensource conversion tool such as [CSV to JSON convertor](http://www.convertcsv.com/csv-to-json.htm) to convert your data to JSON.
27+
4. To test your query with sample input data, right-click on any of your inputs. Then select **Upload sample data from file**. The data must be serialized in JSON, CSV or AVRO.
3028

3129
![stream analytics query editor test query](media/stream-analytics-test-query/stream-analytics-test-query-editor-upload.png)
3230

0 commit comments

Comments
 (0)