Skip to content

Commit b9f39c0

Browse files
authored
Merge pull request #280479 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 8b873b4 + 1556dc5 commit b9f39c0

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

articles/governance/policy/concepts/definition-structure-basics.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,7 @@ When Azure Policy versioning is released, the following Resource Provider modes
130130
## Version (preview)
131131
Built-in policy definitions can host multiple versions with the same `definitionID`. If no version number is specified, all experiences will show the latest version of the definition. To see a specific version of a built-in, it must be specified in API, SDK or UI. To reference a specific version of a definition within an assignment, see [definition version within assignment](../concepts/assignment-structure.md#policy-definition-id-and-version-preview)
132132

133-
The Azure Policy service uses `version`, `preview`, and `deprecated` properties to convey level of
134-
> change to a built-in policy definition or initiative and state. The format of `version` is:
135-
> `{Major}.{Minor}.{Patch}`. Specific states, such as _deprecated_ or _preview_, are appended to the
136-
> `version` property or in another property as a **boolean**.
133+
The Azure Policy service uses `version`, `preview`, and `deprecated` properties to convey level of change to a built-in policy definition or initiative and state. The format of `version` is: `{Major}.{Minor}.{Patch}`. Specific states, such as _deprecated_ or _preview_, are appended to the `version` property or in another property as a **boolean**.
137134

138135
- Major Version (example: 2.0.0): introduce breaking changes such as major rule logic changes, removing parameters, adding an enforcement effect by default.
139136
- Minor Version (example: 2.1.0): introduce changes such as minor rule logic changes, adding new parameter allowed values, change to `roleDefinitionIds`, adding or moving definitions within an initiative.

articles/operator-insights/operator-insights-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ sections:
2020
Azure Operator Insights doesn't move or store customer data out of the region it's deployed in.
2121
2222
The only exceptions to this are:
23-
- Data processing for the Azure Operator Insights Copilot feature (currently in preview). This is because the Azure Open AI service used by the Copilot feature is not available in all regions yet. Data processing may happen cross region but within the same geo.
23+
- Data processing for the Azure Operator Insights Copilot feature (currently in preview). This is because Azure OpenAI Service used by the Copilot feature is not available in all regions yet. Data processing may happen cross region but within the same geo.
2424
- Data storage for the West Central US or South Central US regions. If you deploy to these regions, the data is stored in the East US region.
2525
- question: Does Azure Operator Insights support CMK-based encryption?
2626
answer: |

articles/site-recovery/azure-to-azure-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ When enabling zone to zone replication, only one fabric will be created. But the
251251

252252
```azurepowershell
253253
$primaryProtectionContainer = Get-AzRecoveryServicesAsrProtectionContainer -Fabric $fabric -Name "asr-a2a-default-westeurope-container"
254-
$recoveryPprotectionContainer = Get-AzRecoveryServicesAsrProtectionContainer -Fabric $fabric -Name "asr-a2a-default-westeurope-t-container"
254+
$recoveryProtectionContainer = Get-AzRecoveryServicesAsrProtectionContainer -Fabric $fabric -Name "asr-a2a-default-westeurope-t-container"
255255
```
256256

257257
### Create a replication policy
@@ -641,4 +641,4 @@ Remove-AzRecoveryServicesAsrReplicationProtectedItem -ReplicationProtectedItem $
641641

642642
## Next steps
643643

644-
View the [Azure Site Recovery PowerShell reference](/powershell/module/az.RecoveryServices) to learn how you can do other tasks such as creating recovery plans and testing failover of recovery plans with PowerShell.
644+
View the [Azure Site Recovery PowerShell reference](/powershell/module/az.RecoveryServices) to learn how you can do other tasks such as creating recovery plans and testing failover of recovery plans with PowerShell.

0 commit comments

Comments
 (0)