Skip to content

Commit 648e7bd

Browse files
authored
Merge pull request #285396 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents ae6ec29 + beef682 commit 648e7bd

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

articles/azure-functions/functions-run-local.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ If you don't have these tools installed, you need to instead [get a valid access
345345
## <a name="project-file-deployment"></a>Deploy project files
346346

347347
::: zone pivot="programming-language-csharp,programming-language-javascript,programming-language-powershell,programming-language-python,programming-language-typescript"
348-
To publish your local code to a function app in Azure, use the [`func azure functionapp publish publish`](./functions-core-tools-reference.md#func-azure-functionapp-publish) command, as in the following example:
348+
To publish your local code to a function app in Azure, use the [`func azure functionapp publish`](./functions-core-tools-reference.md#func-azure-functionapp-publish) command, as in the following example:
349349

350350
```
351351
func azure functionapp publish <FunctionAppName>

articles/azure-web-pubsub/howto-authorize-from-application.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,15 @@ This sample shows how to assign a `Web PubSub Service Owner` role to a service p
136136

137137
![Screenshot of the response token when using postman to get the token.](./media/howto-authorize-from-application/get-azure-ad-token-using-postman-response.png)
138138

139+
7. For oauth2/v2.0/token endpoint, pass the 'scope' instead of 'resource'
140+
141+
```
142+
client_id: *your client id*
143+
client_secret: *your client secret*
144+
grant_type: client_credentials
145+
scope: https://webpubsub.azure.com/.default
146+
```
147+
139148
## Sample codes using Microsoft Entra authorization
140149

141150
We officially support 4 programming languages:

articles/data-factory/connector-rest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ Request 100: `Header(id->100)`<br/>
648648

649649
*Step 1*: Input `{id}` in **Additional headers**.
650650

651-
*Step 2*: Set **Pagination rules** as **"Headers.{id}" : "RARNGE:0:100:10"**.
651+
*Step 2*: Set **Pagination rules** as **"Headers.{id}" : "RANGE:0:100:10"**.
652652

653653
:::image type="content" source="media/connector-rest/pagination-rule-example-3.png" alt-text="Screenshot showing the pagination rule to send multiple requests whose variables are in Headers.":::
654654

articles/machine-learning/how-to-access-data-batch-endpoints-jobs.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,9 +424,7 @@ Azure Machine Learning data assets (formerly known as datasets) are supported as
424424
}
425425
```
426426

427-
---
428-
429-
The data assets ID looks like `/subscriptions/<subscription>/resourcegroups/<resource-group>/providers/Microsoft.MachineLearningServices/workspaces/<workspace>/data/<data-asset>/versions/<version>`. You can also use the `azureml:/<datasset_name>@latest` format to specify the input.
427+
The data assets ID looks like `/subscriptions/<subscription>/resourcegroups/<resource-group>/providers/Microsoft.MachineLearningServices/workspaces/<workspace>/data/<data-asset>/versions/<version>`. You can also use the `azureml:<datasset_name>@latest` format to specify the input.
430428

431429
1. Run the endpoint:
432430

0 commit comments

Comments
 (0)