Skip to content

Commit 8a546fc

Browse files
authored
Merge pull request #297127 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 ad8ef3d + 9dc2e22 commit 8a546fc

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

articles/app-service/includes/configure-azure-storage/azure-storage-linux-container-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ You need to mount the storage to the app. Here are three mounting options for Az
4343
| Mounting option | Usage |
4444
|:----------------|:------|
4545
| Basic | Choose this option to mount storage using the Azure portal. You can use the basic option as long as the storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). In this case, the portal gets and stores the access key for you. |
46-
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
46+
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option if storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
4747
| Key Vault | Also use this option when you plan to mount storage using the Azure CLI, which requires the access key. Choose this option when you use Azure Key Vault to securely store and retrieve access keys. [Azure Key Vault](/azure/key-vault/general/overview) has the benefits of storing application secrets centrally and securely with the ability to monitor, administer, and integrate with other Azure services like Azure App Service. |
4848

4949
## Prerequisites

articles/app-service/includes/configure-azure-storage/azure-storage-windows-code-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Here are the three options to mount Azure storage to your app:
2929
| Mounting option | Usage |
3030
|:----------------|:------|
3131
| Basic | Choose this option when you mount storage by using the Azure portal. You can use the basic option as long as the storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). In this case, the portal gets and stores the access key for you. |
32-
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
32+
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option if storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
3333
| Key Vault | Also use this option when you plan to mount storage using the Azure CLI, which requires the access key. Choose this option when using Azure Key Vault to securely store and retrieve access keys. [Azure Key Vault](/azure/key-vault/general/overview) has the benefits of storing application secrets centrally and securely with the ability to monitor, administer, and integrate with other Azure services like Azure App Service. |
3434

3535
## Prerequisites

articles/app-service/includes/configure-azure-storage/azure-storage-windows-container-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Here are the three options to mount Azure storage to your app:
3030
| Mounting option | Usage |
3131
|:----------------|:------|
3232
| Basic | Choose this option when mounting storage using the Azure portal. You can use the basic option as long as the storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). In this case, the portal gets and stores the access key for you. |
33-
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
33+
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option if storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
3434
| Key Vault | Also use this option when you plan to mount storage using the Azure CLI, which requires the access key. Choose this option when using Azure Key Vault to securely store and retrieve access keys. [Azure Key Vault](/azure/key-vault/general/overview) has the benefits of storing application secrets centrally and securely with the ability to monitor, administer, and integrate with other Azure services like Azure App Service. |
3535

3636
## Prerequisites

articles/azure-maps/about-azure-maps.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ For more information, see [Geolocation] in the Azure Maps REST API documentation
7272
>
7373
> **Azure Maps Render v1 service retirement**
7474
>
75-
> The Azure Maps [Render v1] service is now deprecated and will be retired on 9/17/26. To avoid service disruptions, all calls to Render v1 API will need to be updated to use [Render v2024-04-01] API by 9/17/26.
75+
> The Azure Maps Render v1 service is now deprecated and will be retired on 9/17/26. To avoid service disruptions, all calls to Render v1 API will need to be updated to use the [latest version] by 9/17/26.
7676
7777
### Route service
7878

@@ -216,8 +216,7 @@ Stay up to date on Azure Maps:
216216
[Get Map Tile]: /rest/api/maps/render/get-map-tile
217217
[Get Weather along route API]: /rest/api/maps/weather/getweatheralongroute
218218
[Render]: /rest/api/maps/render
219-
[Render v1]: /rest/api/maps/render?view=rest-maps-1.0
220-
[Render v2024-04-01]: /rest/api/maps/render
219+
[latest version]: /rest/api/maps/render
221220
[REST APIs]: /rest/api/maps/
222221
[Route]: /rest/api/maps/route
223222
[Search]: /rest/api/maps/search?view=rest-maps-1.0&preserve-view=true

articles/azure-maps/render-coverage.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The render coverage tables below list the countries/regions that support Azure M
1818
>
1919
> **Azure Maps Render v1 service retirement**
2020
>
21-
> The Azure Maps [Render v1] service is now deprecated and will be retired on 9/17/26. To avoid service disruptions, all calls to Render v1 API will need to be updated to use [Render v2024-04-01] API by 9/17/26.
21+
> The Azure Maps Render v1 service is now deprecated and will be retired on 9/17/26. To avoid service disruptions, all calls to Render v1 API will need to be updated to use the [latest version] by 9/17/26.
2222
2323
### Legend
2424

@@ -214,5 +214,5 @@ The render coverage tables below list the countries/regions that support Azure M
214214
> [Azure Maps routing coverage](routing-coverage.md)
215215
216216
[Zoom levels and tile grid]: zoom-levels-and-tile-grid.md
217-
[Render v1]: /rest/api/maps/render
218-
[Render v2024-04-01]: /rest/api/maps/render
217+
218+
[latest version]: /rest/api/maps/render

0 commit comments

Comments
 (0)