Merge pull request #296882 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)

Author: Taojunshen

articles/azure-maps/rest-api-azure-maps.md

@@ -29,7 +29,7 @@ The most recent stable release of the Azure Maps services.
 | [Search] |  2025-01-01  | Geocode addresses and coordinates, search for business listings and places by name or category and get administrative boundary polygons. |
 | [Spatial] |  2022-08-01  | Use geofences, great circle distances, and other spatial operations to analyze location data.<br>The Spatial service is deprecated and will be retired on 9/30/25. |
 | [Timezone] |  1.0  | Get time zone and sunrise/sunset information for specified locations. |
-| [Traffic] |  1.0  | Get current traffic information including traffic flow and traffic incident details. |
+| [Traffic] |  2025-01-01  | Provides traffic incident data, such as construction, traffic congestion, accidents, and more, within a specified bounding box. |
 | [Weather] |  1.1  | Get current, forecasted, and historical weather conditions, air quality, tropical storm details, and weather along a route. |
 
 ## Previous releases
@@ -43,6 +43,7 @@ There are previous stable releases of an Azure Maps service that are still in us
 | [Route][Route v1] |  1.0  | Calculate optimized travel times and distances between locations for multiple modes of transportation and get localized travel instructions. |
 | [Search][Search v1] |  1.0  | Geocode addresses and coordinates, search for business listings and places by name or category and get administrative boundary polygons. This is version 1.0 of the Search service. For the latest version, see [Search]. |
 | [Search] |  2023-06-01  | Geocode addresses and coordinates, search for business listings and places by name or category and get administrative boundary polygons. |
+| [Traffic][Traffic v1] |  1.0  | Get current traffic information including traffic flow and traffic incident details. |
 
 ## Latest preview
 
@@ -70,6 +71,7 @@ Prerelease version of an Azure Maps service. Preview releases contain new functi
 [Render v1]: /rest/api/maps/render?view=rest-maps-1.0
 [Route v1]: /rest/api/maps/route?view=rest-maps-1.0
 [Search v1]: /rest/api/maps/search?view=rest-maps-1.0
+[Traffic v1]: /rest/api/maps/traffic?view=rest-maps-1.0
 
 <!--- 2024-07-01-preview is the latest preview release of the Route service,
       currently the only Azure Maps service in Preview -------------------------->

articles/container-apps/storage-mounts-azure-files.md

@@ -6,7 +6,7 @@ author: craigshoemaker
 ms.service: azure-container-apps
 ms.custom: devx-track-azurecli
 ms.topic: tutorial
-ms.date: 02/03/2025
+ms.date: 03/20/2025
 ms.author: cshoe
 ---
 
@@ -438,30 +438,35 @@ Now you can update the container app configuration to support the storage mount.
 
 1. Open *app.yaml* in a code editor.
 
-1. Replace the `volumes: null` definition in the `template` section with a `volumes:` definition referencing the storage volume.  The template section should look like the following:
+1. Replace the `volumes: null` definition in the `template` section with a `volumes:` definition referencing the storage volume. The template section should look like the following:
 
     ```yml
     template:
-      volumes:
-      - name: my-azure-file-volume
-        storageName: mystoragemount
-        storageType: AzureFile
       containers:
       - image: nginx
+        imageType: ContainerImage
         name: my-container-app
-        volumeMounts:
-        - volumeName: my-azure-file-volume
-          mountPath: /var/log/nginx
         resources:
           cpu: 0.5
-          ephemeralStorage: 3Gi
+          ephemeralStorage: 2Gi
           memory: 1Gi
+        volumeMounts:
+        - volumeName: my-azure-file-volume
+          mountPath: /var/log/nginx
       initContainers: null
       revisionSuffix: ''
       scale:
+        cooldownPeriod: 300
         maxReplicas: 1
         minReplicas: 1
+        pollingInterval: 30
         rules: null
+      serviceBinds: null
+      terminationGracePeriodSeconds: null
+      volumes:
+      - name: my-azure-file-volume
+        storageName: mystoragemount
+        storageType: AzureFile
     ```
 
     The new `template.volumes` section includes the following properties.
@@ -540,78 +545,38 @@ Now that the storage mount is established, you can manipulate files in Azure Sto
 
     ---
 
-    This command may take a moment to open the remote shell. Once the shell is ready, you can interact with the storage mount via file system commands.
+    This command may take a moment to open the remote shell. Once the shell is ready, you can interact with the storage mount via file system commands. For more information see [Connect to a container console in Azure Container Apps](/azure/container-apps/container-console).
 
 1. Change into the nginx */var/log/nginx* folder.
 
-    # [Bash](#tab/bash)
-
-    ```bash
-    cd /var/log/nginx
-    ```
-
-    # [PowerShell](#tab/powershell)
-
-    ```powershell
+    ```sh
     cd /var/log/nginx
     ```
 
-    ---
-
 1. Return to the browser and navigate to the website and refresh the page a few times.
 
     The requests made to the website create a series of log stream entries.
 
 1. Return to your terminal and list the values of the `/var/log/nginx` folder.
 
-    # [Bash](#tab/bash)
-
-    ```bash
+    ```sh
     ls
     ```
 
-    # [PowerShell](#tab/powershell)
-
-    ```powershell
-    ls
-    ```
-
-    ---
-
     Note how the *access.log* and *error.log* files appear in this folder. These files are written to the Azure Files mount in your Azure Storage share created in the previous steps.
 
 1. View the contents of the *access.log* file.
 
-    # [Bash](#tab/bash)
-
-    ```bash
+    ```sh
     cat access.log
     ```
 
-    # [PowerShell](#tab/powershell)
-
-    ```powershell
-    type access.log
-    ```
-
-    ---
-
 1. Exit out of the container's interactive shell to return to your local terminal session.
 
-    # [Bash](#tab/bash)
-
-    ```bash
-    exit
-    ```
-
-    # [PowerShell](#tab/powershell)
-
-    ```powershell
+    ```sh
     exit
     ```
 
-    ---
-
 1. Now, you can view the files in the Azure portal to verify they exist in your Azure Storage account. Print the name of your randomly generated storage account.
 
     # [Bash](#tab/bash)

articles/container-apps/storage-mounts.md

@@ -6,7 +6,7 @@ author: craigshoemaker
 ms.service: azure-container-apps
 ms.custom: devx-track-azurecli
 ms.topic: conceptual
-ms.date: 02/25/2025
+ms.date: 03/20/2025
 ms.author: cshoe
 zone_pivot_groups: arm-azure-cli-portal
 ---
@@ -326,7 +326,7 @@ For a step-by-step tutorial on mounting an SMB file share, refer to [Create an A
     - For each container in the template that you want to mount Azure Files storage, define a volume mount in the `volumeMounts` array of the container definition.
         - The `volumeName` is the name defined in the `volumes` array.
         - The `mountPath` is the path in the container to mount the volume.
-        - The `subPath` (optional) is the path in the volume to mount. If not specified, the volume root is mounted. For more information see [using subPath](https://kubernetes.io/docs/concepts/storage/volumes/#using-subpath).
+        - The `subPath` is the path in the volume to mount. If not specified, the volume root is mounted. For more information see (#sub-path).
 
     # [SMB](#tab/smb)
 
@@ -586,7 +586,7 @@ The following ARM template snippets demonstrate how to add an Azure Files share
     - For each container in the template that you want to mount Azure Files storage, define a volume mount in the `volumeMounts` array of the container definition.
         - The `volumeName` is the name defined in the `volumes` array.
         - The `mountPath` is the path in the container to mount the volume.
-        - The `subPath` (optional) is the path in the volume to mount. If not specified, the volume root is mounted. For more information see [using subPath](https://kubernetes.io/docs/concepts/storage/volumes/#using-subpath).
+        - The `subPath` (optional) is the path in the volume to mount. If not specified, the volume root is mounted. For more information see (#sub-path).
 
 See the [ARM template API specification](azure-resource-manager-api-spec.md) for a full example.
 
@@ -656,10 +656,36 @@ To configure a volume mount for Azure Files storage in the Azure portal, add a f
 
 1. In **Mount path**, enter the absolute path in the container to mount the volume.
 
-1. In **Sub path (optional)**, enter the path in the volume to mount. If not specified, the volume root is mounted. For more information see [using subPath](https://kubernetes.io/docs/concepts/storage/volumes/#using-subpath).
+1. In **Sub path (optional)**, enter the path in the volume to mount. If not specified, the volume root is mounted. For more information see (#sub-path).
 
 1. Select **Save** to save changes and exit the context pane.
 
 1. Select **Create** to create the new revision.
 
 ::: zone-end
+
+### Sub path
+
+When mounting a file share from Azure Files, in addition to the mount path, you can also specify a sub path.
+
+- **Mount path**: The path in the container where you want to mount the volume.
+- **Sub path**: The path in the volume you want to mount.
+
+The sub path is optional. If not specified, the volume root is mounted.
+
+The sub path is a relative path from the volume root. The sub path should not start with `/`. Specifying a sub path that starts with `/` might prevent your container app from starting up. For example, `my-volume-folder` is a valid sub path, where `/my-volume-folder` is not.
+
+The sub path can refer to either a folder or a file in the volume.
+
+- If the sub path refers to a folder, the mount path should refer to an empty folder in the container.
+
+- If the sub path refers to a file, the mount path should refer to a file that does not already exist in the container.
+
+    For example, suppose the sub path is `my-volume-folder/my-volume-file.txt`, and the mount path is `/my-container-folder/my-container-file`. The folder `/my-container-folder` should already exist in the container but should not yet contain the file `my-container-file.txt`.
+
+Any sub path trailing slashes are ignored.
+
+## Related content
+
+- [Tutorial: Create an Azure Files volume mount in Azure Container Apps](storage-mounts-azure-files.md)
+- [Using subPath](https://kubernetes.io/docs/concepts/storage/volumes/#using-subpath)

articles/sap/workloads/high-availability-zones.md

@@ -117,9 +117,6 @@ The following considerations apply for this configuration:
 - To achieve run time consistency for critical business processes, you can try directing certain batch jobs and users to application instances that are in-zone with the active database instance by using SAP batch server groups, SAP logon groups, or RFC groups. However, in zonal failover process, you would need to manually move these groups to instances running on VMs that are in-zone with the active DB VM.  
 - You might want to deploy dormant dialog instances in each of the zones. 
 
-> [!IMPORTANT]
-> In this active/active scenario charges for cross zone traffic apply. Check the document [Bandwidth Pricing Details](https://azure.microsoft.com/pricing/details/bandwidth/). The data transfer between the SAP application layer and SAP database layer is quite intensive. Therefore the active/active scenario can contribute to costs.
-
 ## Active/Passive deployment
 
 If you can't find a configuration that mitigates the potential delta in runtime of SAP business processes or if you want to deploy a short distance disaster recovery configuration, you can deploy an architecture that has an active/passive character from the SAP application layer point of view. You define an *active* zone, which is the zone where you deploy the complete application layer and where you attempt to run both the active database instance and the SAP Central Services instance. With such a configuration, you need to make sure you don't have extreme run time variations, depending on whether a job runs in-zone with the active database instance or not, in business transactions and batch jobs.

articles/service-bus-messaging/test-locally-with-service-bus-emulator.md

@@ -214,7 +214,7 @@ services:
       - "5300:5300"
     environment:
       SQL_SERVER: sqledge
-      MSSQL_SA_PASSWORD: "${SQL_PASSWORD}"  # Password should be same as what is set for SQL Edge  
+      MSSQL_SA_PASSWORD: "${MSSQL_SA_PASSWORD}"  # Password should be same as what is set for SQL Edge  
       ACCEPT_EULA: ${ACCEPT_EULA}
       SQL_WAIT_INTERVAL: ${SQL_WAIT_INTERVAL} # Optional: Time in seconds to wait for SQL to be ready (default is 15 seconds)
     depends_on:
@@ -232,7 +232,7 @@ services:
               - "sqledge"
         environment:
           ACCEPT_EULA: ${ACCEPT_EULA}
-          MSSQL_SA_PASSWORD: "${SQL_PASSWORD}" # To be filled by user as per policy : https://learn.microsoft.com/en-us/sql/relational-databases/security/strong-passwords?view=sql-server-linux-ver16 
+          MSSQL_SA_PASSWORD: "${MSSQL_SA_PASSWORD}" # To be filled by user as per policy : https://learn.microsoft.com/en-us/sql/relational-databases/security/strong-passwords?view=sql-server-linux-ver16 
 
 networks:
   sb-emulator: