Merge pull request #284907 from MicrosoftDocs/repo_sync_working_branch

PhilKang0704 · web-flow · commit 07a51c485fe6 · 2024-08-19T13:11:32.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/ai-services/openai/concepts/models.md b/articles/ai-services/openai/concepts/models.md
@@ -228,7 +228,8 @@ For more information on Provisioned deployments, see our [Provisioned guidance](
 The following models support global batch:
 
 | Model | Version | Input format |
-|---|---|
+|---|---|---|
+|`gpt-4o-mini`| 2024-07-18 | text + image |
 |`gpt-4o` | 2024-05-13 |text + image |
 |`gpt-4` | turbo-2024-04-09 | text |
 |`gpt-4` | 0613 | text |
diff --git a/articles/azure-cache-for-redis/cache-configure.md b/articles/azure-cache-for-redis/cache-configure.md
@@ -244,7 +244,7 @@ Select **Data persistence** to enable, disable, or configure data persistence fo
 For more information, see [How to configure persistence for a Premium Azure Cache for Redis](cache-how-to-premium-persistence.md).
 
 > [!IMPORTANT]
-> Redis data persistence is only available for Premium caches.
+> Redis data persistence is for Premium caches, Enterprise caches (Preview), and Enterprise Flash caches (Preview).
 
 ### Identity
 
diff --git a/articles/container-apps/java-metrics.md b/articles/container-apps/java-metrics.md
@@ -113,7 +113,7 @@ Use the following steps to view metrics visualizations for your container app.
 
     :::image type="content" source="media/java-metrics/azure-container-apps-java-metrics-visualization.png" alt-text="Screenshot of Java metrics visualization." lightbox="media/java-metrics/azure-container-apps-java-metrics-visualization.png":::
 
-You can see Java metric names on Azure Monitor, but the data sets report as empty unless you use the `--enable-java-metrics` parameter to enable Java metrics.
+You can see Java metric names on Azure Monitor, but the data sets show as empty unless the feature is enabled. Refer to the [Configuration](#configuration) section for how to enable it.
 
 ## Next steps
 
diff --git a/articles/container-registry/container-registry-tasks-reference-yaml.md b/articles/container-registry/container-registry-tasks-reference-yaml.md
@@ -76,7 +76,7 @@ Task properties typically appear at the top of an `acr-task.yaml` file, and are
 
 | Property | Type | Optional | Description | Override supported | Default value |
 | -------- | ---- | -------- | ----------- | ------------------ | ------------- |
-| `version` | string | Yes | The version of the `acr-task.yaml` file as parsed by the ACR Tasks service. While ACR Tasks strives to maintain backward compatibility, this value allows ACR Tasks to maintain compatibility within a defined version. If unspecified, defaults to the latest version. | No | None |
+| `version` | string | Yes | The version of the `acr-task.yaml` file as parsed by the ACR Tasks service. While ACR Tasks strives to maintain backward compatibility, this value allows ACR Tasks to maintain compatibility within a defined version. If unspecified, defaults to `v1.0.0`. | N/A | `v1.0.0` |
 | `stepTimeout` | int (seconds) | Yes | The maximum number of seconds a step can run. If the `stepTimeout` property is specified on a task, it sets the default `timeout` property of all the steps. If the `timeout` property is specified on a step, it overrides the `stepTimeout` property provided by the task.<br/><br/>The sum of the step timeout values for a task should equal the value of the task's run `timeout` property (for example, set by passing `--timeout` to the `az acr task create` command). If the tasks's run `timeout` value is smaller, it takes priority.  | Yes | 600 (10 minutes) |
 | `workingDirectory` | string | Yes | The working directory of the container during runtime. If the property is specified on a task, it sets the default `workingDirectory` property of all the steps. If specified on a step, it overrides the property provided by the task. | Yes | `c:\workspace` in Windows or `/workspace` in Linux |
 | `env` | [string, string, ...] | Yes |  Array of strings in `key=value` format that define the environment variables for the task. If the property is specified on a task, it sets the default `env` property of all the steps. If specified on a step, it overrides any environment variables inherited from the task. | Yes | None |
diff --git a/articles/spring-apps/enterprise/includes/quickstart-deploy-web-app/web-prepare-cloud-environment-consumption-azure-portal.md b/articles/spring-apps/enterprise/includes/quickstart-deploy-web-app/web-prepare-cloud-environment-consumption-azure-portal.md
@@ -34,8 +34,8 @@ Use the following steps to create all the Azure resources that the app depends o
    | **Subscription**               | Your subscription name.           | The Azure subscription that you want to use for your server. If you have multiple subscriptions, choose the subscription in which you'd like to be billed for the resource. |
    | **Resource group**             | *myresourcegroup*                 | A new resource group name or an existing one from your subscription.                                                                                                        |
    | **Region**                     | The region closest to your users. | The region is used to create the resource group.                                                                                                                            |
-   | **Postgre SQL Admin Password** | N/A                               | The password for the PostgreSQL Server administrator.                                                                                                                       |
-   | **Postgre SQL User Password**  | N/A                               | The password for the PostgreSQL application user, which is used in the application.                                                                                         |
+   | **PostgreSQL Admin Password**  | N/A                               | The password for the PostgreSQL Server administrator.                                                                                                                       |
+   | **PostgreSQL User Password**   | N/A                               | The password for the PostgreSQL application user, which is used in the application.                                                                                         |
 
    :::image type="content" source="../../media/quickstart-deploy-web-app/custom-deployment.png" alt-text="Screenshot of the Azure portal that shows the custom deployment." lightbox="../../media/quickstart-deploy-web-app/custom-deployment.png":::
 
