Skip to content

Commit a8d5155

Browse files
authored
Merge pull request #281304 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 e987545 + ea88a1e commit a8d5155

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

articles/ai-services/openai/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Refer to our [Default safety policy documentation](./concepts/default-safety-pol
4646
API version `2024-06-01` is the latest GA data plane inference API release. It replaces API version `2024-02-01` and adds support for:
4747

4848
- embeddings `encoding_format` & `dimensions` parameters.
49-
- chat completions `logprops` & `top_logprobs` parameters.
49+
- chat completions `logprobs` & `top_logprobs` parameters.
5050

5151
Refer to our [data plane inference reference documentation](./reference.md) for more information.
5252

articles/firewall/tutorial-firewall-dnat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: mvc
1313

1414
# Filter inbound Internet traffic with Azure Firewall DNAT using the Azure portal
1515

16-
You can configure Azure Firewall Destination Network Address Translation (DNAT) to translate and filter inbound Internet traffic to your subnets. When you configure DNAT, the NAT rule collection action is set to **Dnat**. Each rule in the NAT rule collection can then be used to translate your firewall public IP address and port to a private IP address and port. DNAT rules implicitly add a corresponding network rule to allow the translated traffic. For security reasons, the recommended approach is to add a specific Internet source to allow DNAT access to the network and avoid using wildcards. To learn more about Azure Firewall rule processing logic, see [Azure Firewall rule processing logic](rule-processing.md).
16+
You can configure Azure Firewall Destination Network Address Translation (DNAT) to translate and filter inbound Internet traffic to your subnets. When you configure DNAT, the NAT rule collection action is set to **Dnat**. Each rule in the NAT rule collection can then be used to translate your firewall public IP address and port to a private/public IP address and port. DNAT rules implicitly add a corresponding network rule to allow the translated traffic. For security reasons, the recommended approach is to add a specific Internet source to allow DNAT access to the network and avoid using wildcards. To learn more about Azure Firewall rule processing logic, see [Azure Firewall rule processing logic](rule-processing.md).
1717

1818
> [!NOTE]
1919
> This article uses classic Firewall rules to manage the firewall. The preferred method is to use [Firewall Policy](../firewall-manager/policy-overview.md). To complete this procedure using Firewall Policy, see [Tutorial: Filter inbound Internet traffic with Azure Firewall policy DNAT using the Azure portal](tutorial-firewall-dnat-policy.md)

articles/machine-learning/how-to-use-batch-model-deployments.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -303,15 +303,15 @@ A model deployment is a set of resources required for hosting the model that doe
303303
| `environment` | The environment to score the model. The example defines an environment inline using `conda_file` and `image`. The `conda_file` dependencies will be installed on top of the `image`. The environment will be automatically registered with an autogenerated name and version. See the [Environment schema](./reference-yaml-environment.md#yaml-syntax) for more options. As a best practice for production scenarios, you should create the environment separately and reference it here. To reference an existing environment, use the `azureml:<environment-name>:<environment-version>` syntax. |
304304
| `compute` | The compute to run batch scoring. The example uses the `batch-cluster` created at the beginning and references it using the `azureml:<compute-name>` syntax. |
305305
| `resources.instance_count` | The number of instances to be used for each batch scoring job. |
306-
| `settings.max_concurrency_per_instance` | [Optional] The maximum number of parallel `scoring_script` runs per instance. |
307-
| `settings.mini_batch_size` | [Optional] The number of files the `scoring_script` can process in one `run()` call. |
308-
| `settings.output_action` | [Optional] How the output should be organized in the output file. `append_row` will merge all `run()` returned output results into one single file named `output_file_name`. `summary_only` won't merge the output results and will only calculate `error_threshold`. |
309-
| `settings.output_file_name` | [Optional] The name of the batch scoring output file for `append_row` `output_action`. |
310-
| `settings.retry_settings.max_retries` | [Optional] The number of max tries for a failed `scoring_script` `run()`. |
311-
| `settings.retry_settings.timeout` | [Optional] The timeout in seconds for a `scoring_script` `run()` for scoring a mini batch. |
312-
| `settings.error_threshold` | [Optional] The number of input file scoring failures that should be ignored. If the error count for the entire input goes above this value, the batch scoring job will be terminated. The example uses `-1`, which indicates that any number of failures is allowed without terminating the batch scoring job. |
313-
| `settings.logging_level` | [Optional] Log verbosity. Values in increasing verbosity are: WARNING, INFO, and DEBUG. |
314-
| `settings.environment_variables` | [Optional] Dictionary of environment variable name-value pairs to set for each batch scoring job. |
306+
| `settings.max_concurrency_per_instance` | The maximum number of parallel `scoring_script` runs per instance. |
307+
| `settings.mini_batch_size` | The number of files the `scoring_script` can process in one `run()` call. |
308+
| `settings.output_action` | How the output should be organized in the output file. `append_row` will merge all `run()` returned output results into one single file named `output_file_name`. `summary_only` won't merge the output results and will only calculate `error_threshold`. |
309+
| `settings.output_file_name` | The name of the batch scoring output file for `append_row` `output_action`. |
310+
| `settings.retry_settings.max_retries` | The number of max tries for a failed `scoring_script` `run()`. |
311+
| `settings.retry_settings.timeout` | The timeout in seconds for a `scoring_script` `run()` for scoring a mini batch. |
312+
| `settings.error_threshold` | The number of input file scoring failures that should be ignored. If the error count for the entire input goes above this value, the batch scoring job will be terminated. The example uses `-1`, which indicates that any number of failures is allowed without terminating the batch scoring job. |
313+
| `settings.logging_level` | Log verbosity. Values in increasing verbosity are: WARNING, INFO, and DEBUG. |
314+
| `settings.environment_variables` | Dictionary of environment variable name-value pairs to set for each batch scoring job. |
315315

316316
# [Python](#tab/python)
317317

0 commit comments

Comments
 (0)