Skip to content

Commit 03b7eab

Browse files
authored
Merge pull request #222782 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 719e048 + 0002ac3 commit 03b7eab

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

articles/active-directory/hybrid/how-to-connect-staged-rollout.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ You can roll out these options:
171171
- **Pass-through authentication** + **Seamless SSO**
172172
- **Not supported** - **Password hash sync** + **Pass-through authentication** + **Seamless SSO**
173173
- **Certificate-based authentication settings**
174+
- **Azure multifactor authentication**
174175

175176
To configure Staged Rollout, follow these steps:
176177

articles/aks/azure-csi-blob-storage-static.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ The following example demonstrates how to mount a Blob storage container as a pe
114114
kubectl create -f pv-blob-nfs.yaml
115115
```
116116

117-
3. Create a `pvc-blob-nfs.yaml` file with a *PersistentVolume*. For example:
117+
3. Create a `pvc-blob-nfs.yaml` file with a *PersistentVolumeClaim*. For example:
118118

119119
```yml
120120
kind: PersistentVolumeClaim

articles/iot-develop/quickstart-devkit-mxchip-az3166-iot-hub.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ To connect the MXCHIP DevKit to Azure, you'll modify a configuration file for Wi
204204
|Constant name|Value|
205205
|-------------|-----|
206206
|`IOT_HUB_HOSTNAME` |{*Your Iot hub hostName value*}|
207-
|`IOT_DPS_REGISTRATION_ID` |{*Your Device ID value*}|
207+
|`IOT_HUB_DEVICE_ID` |{*Your Device ID value*}|
208208
|`IOT_DEVICE_SAS_KEY` |{*Your Primary key value*}|
209209
210210
1. Save and close the file.

articles/virtual-wan/virtual-wan-global-transit-network-architecture.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ The Remote User-to-branch path lets remote users who are using a point-to-site c
112112
The VNet-to-VNet transit enables VNets to connect to each other in order to interconnect multi-tier applications that are implemented across multiple VNets. Optionally, you can connect VNets to each other through VNet Peering and this may be suitable for some scenarios where transit via the VWAN hub isn't necessary.
113113

114114

115-
## <a name="DefaultRoute"></a>Force tunneling and default route
115+
## <a name="DefaultRoute"></a>Forced tunneling and default route
116116

117-
Force Tunneling can be enabled by configuring the enable default route on a VPN, ExpressRoute, or Virtual Network connection in Virtual WAN.
117+
Forced Tunneling can be enabled by configuring the enable default route on a VPN, ExpressRoute, or Virtual Network connection in Virtual WAN.
118118

119119
A virtual hub propagates a learned default route to a virtual network/site-to-site VPN/ExpressRoute connection if enable default flag is 'Enabled' on the connection.
120120

includes/vpn-gateway-virtual-wan-vpn-profile-intune.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ For other supported options, see the [VPNv2 CSP](/windows/client-management/mdm/
5252
1. Modify the entry between ```<ServerUrlList>``` and ```</ServerUrlList>``` with the entry from your downloaded profile (azurevpnconfig.xml). Change the "TrustedNetworkDetection" FQDN to fit your environment.
5353
1. Open the Azure downloaded profile (azurevpnconfig.xml) and copy the entire contents to the clipboard by highlighting the text and pressing (ctrl) + C.
5454
1. Paste the copied text from the previous step into the file you created in step 2 between the ```<CustomConfiguration> </CustomConfiguration>``` tags. Save the file with an xml extension.
55-
1. Write down the value in the ```<name> </name>``` tags. This is the name of the profile. You will need this name when you create the profile in Intune. Close the file and remember the location where it is saved.
55+
1. Write down the value in the ```<name> </name>``` tags. This is the name of the profile. You can also modify this value to something more meaningful, as it will be visible to the end users. You will need this name when you create the profile in Intune. Close the file and remember the location where it is saved.
5656

5757
## Create Intune profile
5858

0 commit comments

Comments
 (0)