Merge pull request #253537 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: v-alje

articles/active-directory/fundamentals/how-to-rename-azure-ad.md

@@ -332,7 +332,7 @@ function Update-Terminology {
     foreach ($item in $Terminology.GetEnumerator()) {
         $old = [regex]::Escape($item.Key)
         $new = $item.Value
-        $toReplace = '(?<!(name=\"[^$]*|https?:\/\/aka.ms/[a-z|0-1]*))' + $($old)
+        $toReplace = '(?<!(name=\"[^$]{1,100}|https?://aka.ms/[a-z0-9/-]{1,100}))' + $($old)
 
         # Replace the old terminology with the new one
         $Content.Value = $Content.Value -replace $toReplace, $new

articles/active-directory/fundamentals/what-is-deprecated.md

@@ -33,7 +33,7 @@ Use the following table to learn about changes including deprecations, retiremen
 |[Terms of Use experience](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/microsoft-entra-change-announcements-march-2023-train/ba-p/2967448)|Feature change|Jul 2023|
 |[Azure AD PowerShell and MSOnline PowerShell](https://aka.ms/aadgraphupdate)|Deprecation|Mar 30, 2024|
 |[Azure AD MFA Server](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/microsoft-entra-change-announcements-march-2023-train/ba-p/2967448)|Retirement|Sep 30, 2024|
-|[Legacy MFA & SSPR policy](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/microsoft-entra-change-announcements-march-2023-train/ba-p/2967448)|Retirement|Sep 30, 2024|
+|[Legacy MFA & SSPR policy](https://techcommunity.microsoft.com/t5/microsoft-entra-azure-ad-blog/microsoft-entra-change-announcements-march-2023-train/ba-p/2967448)|Retirement|Sep 30, 2025|
 |['Require approved client app' Conditional Access Grant](https://aka.ms/RetireApprovedClientApp)|Retirement|Mar 31, 2026|
 
 

articles/active-directory/saas-apps/confluencemicrosoft-tutorial.md

@@ -60,7 +60,7 @@ As of now, following versions of Confluence are supported:
 
 - Confluence: 5.0 to 5.10
 - Confluence: 6.0.1 to 6.15.9
-- Confluence: 7.0.1 to 8.0.4
+- Confluence: 7.0.1 to 8.5.1
 
 > [!NOTE]
 > Please note that our Confluence Plugin also works on Ubuntu Version 16.04

articles/active-directory/saas-apps/ms-confluence-jira-plugin-adminguide.md

@@ -64,7 +64,7 @@ The plug-in supports the following versions of Jira and Confluence:
 * JIRA also supports 5.2. For more details, click [Microsoft Entra single sign-on for JIRA 5.2](./jira52microsoft-tutorial.md).
 * Confluence: 5.0 to 5.10.
 * Confluence: 6.0.1 to 6.15.9.
-* Confluence: 7.0.1 to 8.0.4.
+* Confluence: 7.0.1 to 8.5.1.
 
 ## Installation
 
@@ -148,7 +148,7 @@ Confluence:
 
 |Plugin Version   |                                   Release Notes                                           |       Supported JIRA versions       |
 |-----------------|-------------------------------------------------------------------------------------------|-------------------------------------|
-|  6.3.9          |   Bug Fixes:                                                                              | Confluence Server: 7.20.3 to 8.0.4  |
+|  6.3.9          |   Bug Fixes:                                                                              | Confluence Server: 7.20.3 to 8.5.1  |
 |                 |   System Error: Metadata link cannot be configured on SSO plugins.                        |                                     |
 |                 |                                                                                           |                                     |
 |  6.3.8          |   New Feature:                                                                            | Confluence Server: 5.0 to 7.20.1    |
@@ -212,7 +212,7 @@ The plug-in supports these versions:
 * JIRA also supports 5.2. For more details, click [Microsoft Entra single sign-on for JIRA 5.2](./jira52microsoft-tutorial.md).
 * Confluence: 5.0 to 5.10.
 * Confluence: 6.0.1 to 6.15.9.
-* Confluence: 7.0.1 to 8.0.4.
+* Confluence: 7.0.1 to 8.5.1.
 
 ### Is the plug-in free or paid?
 

articles/aks/vertical-pod-autoscaler-api-reference.md

@@ -14,15 +14,15 @@ This reference is based on version 0.13.0 of the AKS implementation of VPA.
 
 ## VerticalPodAutoscaler
 
-|Name |Ojbect |Description |
+|Name |Object |Description |
 |-------|-------||-------|
 |metadata |ObjectMeta | Standard [object metadata][object-metadata-ref].|
 |spec |VerticalPodAutoscalerSpec |The desired behavior of the Vertical Pod Autoscaler.|
 |status |VerticalPodAutoscalerStatus |The most recently observed status of the Vertical Pod Autoscaler. |
 
 ## VerticalPodAutoscalerSpec
 
-|Name |Ojbect |Description |
+|Name |Object |Description |
 |-------|-------||-------|
 |targetRef |CrossVersionObjectReference | Reference to the controller managing the set of pods for the autoscaler to control. For example, a Deployment or a StatefulSet. You can point a Vertical Pod Autoscaler at any controller that has a [Scale][scale-ref] subresource. Typically, the Vertical Pod Autoscaler retrieves the pod set from the controller's ScaleStatus. |
 |updatePolicy |PodUpdatePolicy |Specifies whether recommended updates are applied when a pod is started and whether recommended updates are applied during the life of a pod. |
@@ -31,27 +31,27 @@ This reference is based on version 0.13.0 of the AKS implementation of VPA.
 
 ## VerticalPodAutoscalerList
 
-|Name |Ojbect |Description |
+|Name |Object |Description |
 |-------|-------||-------|
 |metadata |ObjectMeta |Standard [object metadata][object-metadata-ref]. |
 |items |VerticalPodAutoscaler (array) |A list of Vertical Pod Autoscaler objects. |
 
 ## PodUpdatePolicy
 
-|Name |Ojbect |Description |
+|Name |Object |Description |
 |-------|-------||-------|
 |updateMode |string |A string that specifies whether recommended updates are applied when a pod is started and whether recommended updates are applied during the life of a pod. Possible values are `Off`, `Initial`, `Recreate`, and `Auto`. The default is `Auto` if you don't specify a value. |
 |minReplicas |int32 |A value representing the minimal number of replicas which need to be alive for Updater to attempt pod eviction (pending other checks like Pod Disruption Budget). Only positive values are allowed. Defaults to global `--min-replicas` flag, which is set to `2`. |
 
 ## PodResourcePolicy
 
-|Name |Ojbect |Description |
+|Name |Object |Description |
 |-------|-------||-------|
 |conainerPolicies |ContainerResourcePolicy |An array of resource policies for individual containers. There can be at most one entry for every named container, and optionally a single wildcard entry with `containerName = '*'`, which handles all containers that do not have individual policies. |
 
 ## ContainerResourcePolicy
 
-|Name |Ojbect |Description |
+|Name |Object |Description |
 |-------|-------||-------|
 |containerName |string |A string that specifies the name of the container that the policy applies to. If not specified, the policy serves as the default policy. |
 |mode |ContainerScalingMode |Specifies whether recommended updates are applied to the container when it is started and whether recommended updates are applied during the life of the container. Possible values are `Off` and `Auto`. The default is `Auto` if you don't specify a value. |
@@ -61,26 +61,26 @@ This reference is based on version 0.13.0 of the AKS implementation of VPA.
 
 ## VerticalPodAutoscalerRecommenderSelector
 
-|Name |Ojbect |Description |
+|Name |Object |Description |
 |-------|-------||-------|
 |name |string |A string that specifies the name of the recommender responsible for generating recommendation for this object. |
 
 ## VerticalPodAutoscalerStatus
 
-|Name |Ojbect |Description |
+|Name |Object |Description |
 |-------|-------||-------|
 |recommendation |RecommendedPodResources |The most recently recommended CPU and memory requests. |
 |conditions |VerticalPodAutoscalerCondition | An array that describes the current state of the Vertical Pod Autoscaler. |
 
 ## RecommendedPodResources
 
-|Name |Ojbect |Description |
+|Name |Object |Description |
 |-------|-------||-------|
 |containerRecommendation |RecommendedContainerResources |An array of resources recommendations for individual containers. |
 
 ## RecommendedContainerResources
 
-|Name |Ojbect |Description |
+|Name |Object |Description |
 |-------|-------||-------|
 |containerName |string| A string that specifies the name of the container that the recommendation applies to. |
 |target |ResourceList |The recommended CPU request and memory request for the container. |
@@ -90,7 +90,7 @@ This reference is based on version 0.13.0 of the AKS implementation of VPA.
 
 ## VerticalPodAutoscalerCondition
 
-|Name |Ojbect |Description |
+|Name |Object |Description |
 |-------|-------||-------|
 |type |VerticalPodAutoscalerConditionType |The type of condition being described. Possible values are `RecommendationProvided`, `LowConfidence`, `NoPodsMatched`, and `FetchingHistory`. |
 |status |ConditionStatus |The status of the condition. Possible values are `True`, `False`, and `Unknown`. |

articles/cosmos-db/how-to-setup-rbac.md

@@ -355,7 +355,21 @@ principalId='<aadPrincipalId>'
 az cosmosdb sql role assignment create --account-name $accountName --resource-group $resourceGroupName --scope "/" --principal-id $principalId --role-definition-id $readOnlyRoleDefinitionId
 ```
 
-### Using Azure Resource Manager templates
+### Using Bicep/Azure Resource Manager templates
+
+For a built-in assignment using a Bicep template:
+
+```
+resource sqlRoleAssignment 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2023-04-15' = {
+  name: guid(<roleDefinitionId>, <aadPrincipalId>, <databaseAccountResourceId>)
+  parent: databaseAccount
+  properties:{
+    principalId: <aadPrincipalId>
+    roleDefinitionId: '/${subscription().id}/resourceGroups/<databaseAccountResourceGroup>/providers/Microsoft.DocumentDB/databaseAccounts/<myCosmosAccount>/sqlRoleDefinitions/<roleDefinitionId>'
+    scope: <databaseAccountResourceId>
+  }
+}
+```
 
 For a reference and examples of using Azure Resource Manager templates to create role assignments, see [``Microsoft.DocumentDB`` ``databaseAccounts/sqlRoleAssignments``](/azure/templates/microsoft.documentdb/2021-10-15/databaseaccounts/sqlroleassignments).
 

articles/postgresql/flexible-server/overview.md

@@ -103,6 +103,7 @@ One advantage of running your workload in Azure is global reach. The flexible se
 | Jio India West | :heavy_check_mark: (v3 only) | :x: | :heavy_check_mark: | :x: |
 | Korea Central | :heavy_check_mark: | :heavy_check_mark: ** | :heavy_check_mark: | :heavy_check_mark: |
 | Korea South | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: |
+| Poland Central| :heavy_check_mark: (v3/v4 only) | :heavy_check_mark:  | :heavy_check_mark: | :x:|
 | North Central US | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: |
 | North Europe | :heavy_check_mark: (v3/v4 only) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Norway East | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: |

articles/service-fabric/service-fabric-reliable-services-reliable-collections-guidelines.md

@@ -35,6 +35,7 @@ The guidelines are organized as simple recommendations prefixed with the terms *
   Only one user thread operation is supported within a transaction. Otherwise, it will cause memory leak and lock issues.
 * Consider dispose transaction as soon as possible after commit completes (especially if using ConcurrentQueue).
 * Do not perform any blocking code inside a transaction.
+* When [string](/dotnet/api/system.string) is used as the key for a reliable dictionary, the sorting order uses [default string comparer CurrentCulture](/dotnet/api/system.string.compare#system-string-compare(system-string-system-string)). Note that the CurrentCulture sorting order is different from [Ordinal string comparer](/dotnet/api/system.stringcomparer.ordinal). 
 
 Here are some things to keep in mind: