Skip to content

Commit e900cc7

Browse files
authored
Merge pull request #301719 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 858b2fa + 81b99df commit e900cc7

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

articles/api-management/api-management-configuration-repository-git.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ This article describes how to enable and use Git to manage your service configur
5252
## Save the service configuration to the Git repository
5353

5454
> [!CAUTION]
55-
> Any secrets that are not defined as named values will be stored in the repository and will remain in its history. Named values provide a secure place to manage constant string values, including secrets, across all API configuration and policies, so you don't have to store them directly in your policy statements. For more information, see [Use named values in Azure API Management policies](api-management-howto-properties.md).
55+
> Any secrets that are not defined as named values will be stored in the repository and will remain in its history. Named values provide a secure place to manage constant string values, including secrets, across all API configurations and policies, so you don't have to store them directly in your policy statements. For more information, see [Use named values in Azure API Management policies](api-management-howto-properties.md).
5656
>
5757
5858

articles/api-management/api-management-get-started-publish-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.author: danlep
1616

1717
[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
1818

19-
There are times when it's impractical to have all callers to your API use the same version. When callers want to upgrade to a later version, they want an approach that's easy to understand. As shown in this tutorial, it's possible to provide multiple *versions* in Azure API Management.
19+
There are situations where it's impractical for all API consumers to use the same version. When consumers are ready to upgrade to a newer version, they prefer a simple and understandable approach. As demonstrated in this tutorial, Azure API Management supports exposing multiple API versions to meet this need.
2020

2121
For background, see [Versions](api-management-versions.md) and [Revisions](api-management-revisions.md).
2222

articles/api-management/get-started-create-service-instance.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ Sign in to the [Azure portal](https://portal.azure.com).
5151

5252
1. On the **Monitor + secure** tab, optionally select one or more recommended add-in services to use with API Management. These services incur extra costs. For example, select **Log Analytics** to define a Log Analytics workspace you can target for API Management logs.
5353

54-
1. On the **Managed identity** tab, we recommend selecting the checkbox to enable a system-assigned identity for your API Management instance. A managed identity generated by Microsoft Entra ID allows your API Management instance to easily and securely access other Microsoft Entra protected resources, such as Azure Key Vault. Azure manages this identity, so you don't have to provision or rotate any credentials.
54+
> [!TIP]
55+
> It can take 30 to 40 minutes or more to create and activate an API Management service in this tier. To quickly find a newly created service, select **Pin to dashboard**.
5556
56-
1. Optionally, on the **Tags** tab, add tags to your API Management instance. Tags are key-value pairs that help you organize and manage your Azure resources.
57-
58-
1. On the **Review + install** tab, review the settings you selected. If you need to make changes, go back to the previous tabs. If everything looks good, select **Create**.
5957

6058
[!INCLUDE [api-management-navigate-to-instance](../../includes/api-management-navigate-to-instance.md)]
6159

articles/expressroute/expressroute-howto-macsec.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,17 @@ Every ExpressRoute Direct instance consists of two physical ports. You can activ
113113
114114
115115
> [!NOTE]
116-
> You can configure both XPN and Non-XPN ciphers:
116+
> You can configure Non-XPN ciphers for 10 gbps ExpressRoute Ports:
117117
> * GcmAes128
118118
> * GcmAes256
119+
>
120+
> You can configure either Non-XPN or XPN ciphers for 40 gbps and greater ExpressRoute Ports:
121+
> * GcmAes128
122+
> * GcmAes256
119123
> * GcmAesXpn128
120124
> * GcmAesXpn256
121125
>
122-
> The suggested best practice is to set up encryption with xpn ciphers to prevent sporadic session failures that occur with non-xpn ciphers on high speed links.
126+
> The suggested best practice is to set up encryption with xpn ciphers to prevent sporadic session failures that occur with non-xpn ciphers on links with 40 gbps or greater bandwidth.
123127
124128
1. Establish the MACsec secrets and cipher and link the user identity with the port to enable the ExpressRoute management code to retrieve the MACsec secrets when required.
125129

articles/expressroute/howto-routing-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ This section helps you create, get, update, and delete the Azure private peering
253253
If you choose to use an MD5 hash, use the following example:
254254

255255
```azurecli
256-
az network express-route peering create --circuit-name MyCircuit --peer-asn 100 --primary-peer-subnet 10.0.0.0/30 -g ExpressRouteResourceGroup --secondary-peer-subnet 10.0.0.4/30 --vlan-id 200 --peering-type AzurePrivatePeering --SharedKey "A1B2C3D4"
256+
az network express-route peering create --circuit-name MyCircuit --peer-asn 100 --primary-peer-subnet 10.0.0.0/30 -g ExpressRouteResourceGroup --secondary-peer-subnet 10.0.0.4/30 --vlan-id 200 --peering-type AzurePrivatePeering --shared-key "A1B2C3D4"
257257
```
258258

259259
> [!IMPORTANT]

articles/reliability/reliability-fabric.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,10 @@ OneLake data remains accessible through multiple channels:
195195
* Azure Storage Explorer: See [Integrate OneLake with Azure Storage Explorer](/fabric/onelake/onelake-azure-storage-explorer)
196196

197197
* OneLake File Explorer: See [Use OneLake file explorer to access Fabric data](/fabric/onelake/onelake-file-explorer)
198+
199+
The OneLake catalog remains available during disaster failover in read-only mode:
200+
* Explore tab: You can access the Explore tab to view all items and workspaces, including their metadata and related details.
201+
* Govern tab: You can access the Govern tab to view insights, recommended actions, and governance tools - based on the most recent successful model refresh prior to failover.
198202

199203
#### Phase 3: Recovery plan
200204

0 commit comments

Comments
 (0)