Skip to content

Commit 1bf362e

Browse files
authored
Merge pull request #301179 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents f886b35 + 274f929 commit 1bf362e

29 files changed

+202
-226
lines changed

articles/active-directory-b2c/password-complexity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Allows you to control the different character types used in the password.
8383

8484
- **2 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains at least two character types. For example, a number and a lowercase character.
8585
- **3 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains at least three character types. For example, a number, a lowercase character and an uppercase character.
86-
- **4 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains all for character types.
86+
- **4 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains all four character types.
8787

8888
> [!NOTE]
8989
> Requiring **4 of 4** can result in end-user frustration. Some studies have shown that this requirement doesn't improve password entropy. See [NIST Password Guidelines](https://pages.nist.gov/800-63-3/sp800-63b.html#appA)

articles/automation/automation-child-runbooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Currently, PowerShell 5.1 is supported and only certain runbook types can call e
4949
> * Executing child scripts using `.\child-runbook.ps1` is not supported in PowerShell 7.1 and PowerShell 7.2
5050
**Workaround**: Use `Start-AutomationRunbook` ([internal cmdlet](/azure/automation/shared-resources/modules#internal-cmdlets)) or `Start-AzAutomationRunbook` (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) to start another runbook from parent runbook.
5151
> * Executing child scripts using Graphical PowerShell Workflow runbooks is not supported.
52-
**Workaround**: Use Start-AzAutomationRunbook (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) from within the parent runbook (via an InlineScript block) to start another runbook.
52+
**Workaround**: Use `Start-AzAutomationRunbook` (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) from within the parent runbook (via an InlineScript block) to start another runbook.
5353

5454
The publish order of runbooks matters only for PowerShell Workflow runbooks.
5555

articles/backup/backup-azure-files-faq.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
metadata:
33
title: Back up Azure Files FAQ
44
description: In this article, discover answers to common questions about how to protect your Azure file shares with the Azure Backup service.
5-
ms.date: 01/08/2025
5+
ms.date: 06/11/2025
66
ms.topic: faq
77
ms.service: azure-backup
88
author: jyothisuri
@@ -299,6 +299,11 @@ sections:
299299
answer: |
300300
When both snapshot and vaulted backups are configured, the expiry date initially reflects the retention period of the snapshot backup. After the snapshot backup expires, the expiry date will update to reflect the retention period of the vaulted backup.
301301
302+
- question: |
303+
Why is the lock recreated during an on-demand backup in Azure?
304+
answer: |
305+
During an on-demand backup, Azure Backup auto-recreates the deleted lock to protect data and prevent accidental changes or deletions.
306+
302307
- name: Lease snapshots
303308
questions:
304309
- question: |

articles/backup/backup-support-matrix.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Azure Backup support matrix
33
description: Provides a summary of support settings and limitations for the Azure Backup service.
44
ms.topic: reference
5-
ms.date: 05/22/2025
5+
ms.date: 06/11/2025
66
ms.custom: references_regions, linux-related-content
77
ms.service: azure-backup
88
author: jyothisuri
@@ -157,7 +157,7 @@ Azure Backup has added the Cross Region Restore feature to strengthen data avail
157157
| SQL /SAP HANA | Available | Available in all Azure public regions and sovereign regions, except for France Central and UG IOWA. |
158158
| MARS Agent (Preview) | Available in preview. <br><br> Not supported for vaults with Private Endpoint enabled. | Available in all Azure public regions. |
159159
| DPM/MABS | No | N/A |
160-
| AFS (Azure file shares) | No | N/A |
160+
| AFS (Azure file shares) | Yes | See the [supported regions](azure-file-share-support-matrix.md?tabs=vault-tier#supported-regions). |
161161

162162
## Resource health
163163

articles/cyclecloud/api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: API Reference
33
description: Read the Azure CycleCloud REST API Reference. Review commands for operations and resources, such as getting cluster nodes or getting the status of the cluster.
44
author: adriankjohnson
55
ms.topic: reference
6-
ms.date: 7/15/2024
6+
ms.date: 06/10/2025
77
ms.author: adjohnso
88
monikerRange: '>= cyclecloud-8'
99
---

articles/cyclecloud/cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Azure CycleCloud CLI Reference
33
description: CycleCloud CLI reference
44
author: rokeptne
5-
ms.date: 07/15/2024
6-
ms.author: rokeptne
5+
ms.date: 06/10/2025
6+
ms.author: padmalathas
77
---
88

99
# CycleCloud CLI

articles/cyclecloud/cookbook-reference.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Cookbook Reference
33
description: See reference information for Chef Cookbooks in Azure CycleCloud. Understand basic Chef concepts, attributes, and the thunderball resource.
44
author: adriankjohnson
55
ms.topic: reference
6-
ms.date: 03/09/2020
6+
ms.date: 06/10/2025
77
ms.author: adjohnso
88
---
99

@@ -26,7 +26,7 @@ However, CycleCloud clusters are provisioned using a set of *Common Cookbooks* a
2626
2727
Common Cookbook attributes are subject to change. Attribute settings are commonly superseded as the features they control become available as more general or powerful features of CycleCloud. If a customization is available in both the Cluster Template and via a Chef attribute, always prefer the Cluster Template method since it's the more general solution.
2828

29-
For more information on the Opscode Chef framework, see the [Opscode website](https://docs.opscode.com/).
29+
For more information on the Opscode Chef framework, see the [Opscode website](https://www.chef.io/).
3030

3131
## Using Chef attributes
3232

@@ -81,4 +81,4 @@ To download objects from another repository, use custom configuration sections.
8181
| proxy_host | Host to use as proxy. |
8282
| proxy_port | Port to use for proxy. |
8383
| user | Local system user for the configuration. If you specify the `user` attribute, the `filename` attribute is ignored. the user's home directory contains the configuration file. |
84-
| username | Access_key/username for Azure. |
84+
| username | Access_key/username for Azure. |

articles/cyclecloud/cycleserver-configuration-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: CycleServer Configuration Reference
33
description: Configuration reference for cycle_server.properties file
44
author: atomic-penguin
5-
ms.date: 03/28/2025
5+
ms.date: 06/10/2025
66
ms.author: erwolfe
77
---
88

articles/cyclecloud/data-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Data Usage Policy
33
description: Read about data usage policy. See how telemetry data is collected and used within Azure CycleCloud.
44
author: KimliW
5-
ms.date: 06/26/2021
5+
ms.date: 06/10/2025
66
ms.author: adjohnso
77
---
88

articles/cyclecloud/download-cluster-templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Download Cluster Projects and Templates
33
description: Azure CycleCloud has built-in templates you can configure and edit to make your own custom templates.
44
author: adriankjohnson
5-
ms.date: 07/17/2019
5+
ms.date: 06/10/2025
66
ms.author: adjohnso
77
---
88

0 commit comments

Comments
 (0)