Skip to content

Commit 62ab73b

Browse files
Merge pull request #268306 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 412b0f1 + 58bd925 commit 62ab73b

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

articles/ai-studio/how-to/deploy-models-mistral.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ You can browse the Mistral family of models in the [Model Catalog](model-catalog
2626

2727
## Mistral Large
2828

29+
In this article, you learn how to use Azure AI Studio to deploy the Mistral Large model as a service with pay-as-you-go billing.
30+
2931
Mistral Large is Mistral AI's most advanced Large Language Model (LLM). It can be used on any language-based task thanks to its state-of-the-art reasoning and knowledge capabilities.
3032

3133
Additionally, mistral-large is:
@@ -165,7 +167,7 @@ __Body__
165167

166168
#### Response schema
167169

168-
The response payload is a dictionary with the following fields.
170+
The response payload is a dictionary with the following fields:
169171

170172
| Key | Type | Description |
171173
|-----------|-----------|----------------------------------------------------------------------------|
@@ -180,7 +182,7 @@ The response payload is a dictionary with the following fields.
180182
> In the streaming mode, for each chunk of response, `finish_reason` is always `null`, except from the last one which is terminated by a payload `[DONE]`. In each `choices` object, the key for `messages` is changed by `delta`.
181183
182184

183-
The `choices` object is a dictionary with the following fields.
185+
The `choices` object is a dictionary with the following fields:
184186

185187
| Key | Type | Description |
186188
|---------|-----------|--------------|
@@ -190,7 +192,7 @@ The `choices` object is a dictionary with the following fields.
190192
| `logprobs` | `object` | The log probabilities of the generated tokens in the output text. |
191193

192194

193-
The `usage` object is a dictionary with the following fields.
195+
The `usage` object is a dictionary with the following fields:
194196

195197
| Key | Type | Value |
196198
|---------------------|-----------|-----------------------------------------------|
@@ -205,7 +207,7 @@ The `logprobs` object is a dictionary with the following fields:
205207
| `text_offsets` | `array` of `integers` | The position or index of each token in the completion output. |
206208
| `token_logprobs` | `array` of `float` | Selected `logprobs` from dictionary in `top_logprobs` array. |
207209
| `tokens` | `array` of `string` | Selected tokens. |
208-
| `top_logprobs` | `array` of `dictionary` | Array of dictionary. In each dictionary, the key is the token and the value is the prob. |
210+
| `top_logprobs` | `array` of `dictionary` | Array of dictionary. In each dictionary, the key is the token and the value is the probability. |
209211

210212
#### Example
211213

articles/azure-functions/durable/durable-functions-error-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ await ctx.CallActivityWithRetryAsync("FlakeyActivity", retryOptions, null);
396396
TaskOptions retryOptions = TaskOptions.FromRetryHandler(retryContext =>
397397
{
398398
// Don't retry anything that derives from ApplicationException
399-
if (!retryContext.LastFailure.IsCausedBy<ApplicationException>())
399+
if (retryContext.LastFailure.IsCausedBy<ApplicationException>())
400400
{
401401
return false;
402402
}

articles/azure-functions/functions-reference-node.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,11 +1617,11 @@ Before upgrading your Node.js version, make sure your function app is running on
16171617
Run the Azure CLI [`az functionapp config appsettings set`](/cli/azure/functionapp/config#az-functionapp-config-appsettings-set) command to update the Node.js version for your function app running on Windows:
16181618
16191619
```azurecli-interactive
1620-
az functionapp config appsettings set --settings WEBSITE_NODE_DEFAULT_VERSION=~18 \
1620+
az functionapp config appsettings set --settings WEBSITE_NODE_DEFAULT_VERSION=~20 \
16211621
--name <FUNCTION_APP_NAME> --resource-group <RESOURCE_GROUP_NAME>
16221622
```
16231623
1624-
This sets the [`WEBSITE_NODE_DEFAULT_VERSION` application setting](./functions-app-settings.md#website_node_default_version) the supported LTS version of `~18`.
1624+
This sets the [`WEBSITE_NODE_DEFAULT_VERSION` application setting](./functions-app-settings.md#website_node_default_version) the supported LTS version of `~20`.
16251625
16261626
# [Azure portal](#tab/azure-portal/windows)
16271627
@@ -1634,11 +1634,11 @@ Use the following steps to change the Node.js version:
16341634
Run the Azure CLI [`az functionapp config set`](/cli/azure/functionapp/config#az-functionapp-config-set) command to update the Node.js version for your function app running on Linux:
16351635
16361636
```azurecli-interactive
1637-
az functionapp config set --linux-fx-version "node|18" --name "<FUNCTION_APP_NAME>" \
1637+
az functionapp config set --linux-fx-version "node|20" --name "<FUNCTION_APP_NAME>" \
16381638
--resource-group "<RESOURCE_GROUP_NAME>"
16391639
```
16401640
1641-
This sets the base image of the Linux function app to Node.js version 18.
1641+
This sets the base image of the Linux function app to Node.js version 20.
16421642
16431643
# [Azure portal](#tab/azure-portal/linux)
16441644

articles/service-fabric/how-to-managed-identity-managed-cluster-virtual-machine-scale-sets.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ A user-assigned managed identity can be defined in the resources section of an A
4343
{
4444
"type": "Microsoft.ManagedIdentity/userAssignedIdentities",
4545
"name": "[parameters('userAssignedIdentityName')]",
46-
"apiVersion": "2018-11-30",
46+
"apiVersion": "2023-01-31",
4747
"location": "[resourceGroup().location]"
4848
}
4949
```
@@ -90,14 +90,14 @@ This role assignment can be defined in the resources section template using the
9090
```json
9191
{
9292
"type": "Microsoft.Authorization/roleAssignments",
93-
"apiVersion": "2020-04-01-preview",
93+
"apiVersion": "2022-04-01",
9494
"name": "[parameters('vmIdentityRoleNameGuid')]",
9595
"scope": "[concat('Microsoft.ManagedIdentity/userAssignedIdentities', '/', parameters('userAssignedIdentityName'))]",
9696
"dependsOn": [
9797
"[concat('Microsoft.ManagedIdentity/userAssignedIdentities/', parameters('userAssignedIdentityName'))]"
9898
],
9999
"properties": {
100-
"roleDefinitionId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', 'f1a07417-d97a-45cb-824c-7a7467783830')]",
100+
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', 'f1a07417-d97a-45cb-824c-7a7467783830')]",
101101
"principalId": "<Service Fabric Resource Provider ID>"
102102
}
103103
}
@@ -126,8 +126,8 @@ Finally, add the `vmManagedIdentity` and `userAssignedIdentities` properties to
126126

127127
```json
128128
{
129-
"type": "Microsoft.ServiceFabric/managedclusters/nodetypes",
130-
"apiVersion": "2021-05-01",
129+
"type": "Microsoft.ServiceFabric/managedClusters/nodeTypes",
130+
"apiVersion": "2022-01-01",
131131
"properties": {
132132
"isPrimary": true,
133133
"vmInstanceCount": 5,

articles/virtual-machines/windows/run-command-managed.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.custom: devx-track-azurepowershell, devx-track-azurecli
1818
> [!IMPORTANT]
1919
> **Managed Run Command** is currently available in Azure CLI, PowerShell, and API at this time. Portal functionality will soon be available.
2020
21-
The Run Command feature uses the virtual machine (VM) agent to scripts within an Azure Windows VM. You can use these scripts for general machine or application management. They can help you quickly diagnose and remediate VM access and network issues and get the VM back to a good state.
21+
The Run Command feature uses the virtual machine (VM) agent to execute scripts within an Azure Windows VM. You can use these scripts for general machine or application management. They can help you quickly diagnose and remediate VM access and network issues and get the VM back to a good state.
2222

2323
The *updated* managed Run Command uses the same VM agent channel to execute scripts and provides the following enhancements over the [original action orientated Run Command](run-command.md):
2424
- Support for updated Run Command through ARM deployment template

0 commit comments

Comments
 (0)