Skip to content

Commit 6800085

Browse files
authored
Merge pull request #298813 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 6112223 + a6abe32 commit 6800085

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

articles/active-directory-b2c/partner-ping-identity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ You can use basic user flows or advanced Identity Enterprise Framework (IEF) pol
9595

9696
![Screenshot of the subject sub claim URL on the Token compatibility dialog.](./media/partner-ping/token-setting.png)
9797

98-
In the advanced policies, configuration includes the IssuanceClaimPattern metadata element to AuthorityWithTfp value in the [JWT token issuer technical profile](./jwt-issuer-technical-profile.md).
98+
In the advanced policies, configuration includes the IssuanceClaimPattern metadata element to AuthorityWithTfp value in the [JWT issuer technical profile](./jwt-issuer-technical-profile.md).
9999

100100
## Configure PingAccess and PingFederate
101101

articles/azure-vmware/configure-storage-policy.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Run the `Set-VMStoragePolicy` cmdlet to modify vSAN-based storage policies on a
9292
| **Field** | **Value** |
9393
| --- | --- |
9494
| **VMName** | Name of the target VM. |
95-
| **StoragePolicyName** | Name of the storage policy to set. For example, **RAID-FTT-1**. |
95+
| **StoragePolicyName** | Name of the storage policy to set. For example, **RAID1 FTT-1**. |
9696
| **Retain up to** | Retention period of the cmdlet output. The default value is 60. |
9797
| **Specify name for execution** | Alphanumeric name, for example, **changeVMStoragePolicy**. |
9898
| **Timeout** | The period after which a cmdlet exits if taking too long to finish. |
@@ -113,7 +113,7 @@ Run the `Set-LocationStoragePolicy` cmdlet to Modify vSAN based storage policies
113113
| **Field** | **Value** |
114114
| --- | --- |
115115
| **Location** | Name of the target VM. |
116-
| **StoragePolicyName** | Name of the storage policy to set. For example, **RAID-FTT-1**. |
116+
| **StoragePolicyName** | Name of the storage policy to set. For example, **RAID1 FTT-1**. |
117117
| **Retain up to** | Retention period of the cmdlet output. The default value is 60. |
118118
| **Specify name for execution** | Alphanumeric name, for example, **changeVMStoragePolicy**. |
119119
| **Timeout** | The period after which a cmdlet exits if taking too long to finish. |
@@ -134,7 +134,7 @@ Run the `Set-ClusterDefaultStoragePolicy` cmdlet to specify default storage poli
134134
| **Field** | **Value** |
135135
| --- | --- |
136136
| **ClusterName** | Name of the cluster. |
137-
| **StoragePolicyName** | Name of the storage policy to set. For example, **RAID-FTT-1**. |
137+
| **StoragePolicyName** | Name of the storage policy to set. For example, **RAID1 FTT-1**. |
138138
| **Retain up to** | Retention period of the cmdlet output. The default value is 60. |
139139
| **Specify name for execution** | Alphanumeric name, for example, **Set-ClusterDefaultStoragePolicy-Exec1**. |
140140
| **Timeout** | The period after which a cmdlet exits if taking too long to finish. |
@@ -172,7 +172,7 @@ This function creates a new or overwrites an existing vSphere Storage Policy. No
172172
| **vSANFailuresToTolerate** | Number of vSAN Hosts failures to Tolerate. <br>- Default is "R1FTT1". <br>- Valid values are "None", "R1FTT1", "R1FTT2", "R1FTT3", "R5FTT1", "R6FTT2", "R1FTT3" <br>- None = No Data Redundancy<br>- R1FTT1 = 1 failure - RAID-1 (Mirroring)<br>- R1FTT2 = 2 failures - RAID-1 (Mirroring)<br>- R1FTT3 = 3 failures - RAID-1 (Mirroring)<br>- R5FTT1 = 1 failure - RAID-5 (Erasure Coding),<br>- R6FTT2 = 2 failures - RAID-6 (Erasure Coding) <br>- No Data Redundancy options aren't covered under Microsoft SLA.|
173173
| **vSANSiteDisasterTolerance** | Only valid for stretch clusters. <br>- Default is "None". <br>- Valid Values are "None", "Dual", "Preferred", "Secondary", "NoneStretch" <br>- None = No Site Redundancy (Recommended Option for Non-Stretch Clusters, NOT recommended for Stretch Clusters) <br>- Dual = Dual Site Redundancy (Recommended Option for Stretch Clusters) <br>- Preferred = No site redundancy - keep data on Preferred (stretched cluster) <br>- Secondary = No site redundancy - Keep data on Secondary Site (stretched cluster) <br>- NoneStretch = No site redundancy - Not Recommended (https://kb.vmware.com/s/article/88358)|
174174
| **Description** | Description of Storage Policy you're creating, free form text. |
175-
| **Name** | Name of the storage policy to set. For example, **RAID-FTT-1**. |
175+
| **Name** | Name of the storage policy to set. For example, **RAID1 FTT-1**. |
176176
| **Retain up to** | Retention period of the cmdlet output. The default value is 60. |
177177
| **Specify name for execution** | Alphanumeric name, for example, **New-AVSStoragePolicy-Exec1**. |
178178
| **Timeout** | The period after which a cmdlet exits if taking too long to finish. |

articles/azure-vmware/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ sections:
115115
Remember that you can only resize a VM within the same series or to an available series in the same Azure region. Ensure the new plan supports your VM's storage and networking configurations.
116116
117117
- question: Is VMware HCX supported on VPNs?
118-
answer: Yes, provided VMware HCX [Network Underlay Minimum Requirements](https://docs.vmware.com/en/VMware-HCX/4.9/hcx-user-guide/GUID-8128EB85-4E3F-4E0C-A32C-4F9B15DACC6D.html) are met.
118+
answer: Yes, provided VMware HCX [Network Underlay Minimum Requirements](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-11/vmware-hcx-user-guide-4-11/preparing-for-hcx-installations/network-underlay-minimum-requirements.html) are met.
119119

120120
- question: What versions of VMware software are used in private clouds?
121121
answer: |

0 commit comments

Comments
 (0)