Merge branch 'main' of https://github.com/MicrosoftDocs/memdocs-pr into ado13055801

Author: MandiOhlinger

memdocs/configmgr/core/plan-design/security/includes/enable-tls-1-2-protocol-security-provider.md

@@ -11,4 +11,4 @@ ms.localizationpriority: medium
 
 TLS 1.2 is enabled by default. Therefore, no change to these keys is needed to enable it. You can make changes under `Protocols` to disable TLS 1.0 and TLS 1.1 after you've followed the rest of the guidance in these articles and you've verified that the environment works when only TLS 1.2 enabled.
 
-Verify the `\SecurityProviders\SCHANNEL\Protocols` registry subkey setting, as shown in [Transport layer security (TLS) best practices with the .NET Framework](/dotnet/framework/network-programming/tls#configuring-security-via-the-windows-registry).
+Verify the `HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols` registry subkey setting, as shown in [Transport layer security (TLS) best practices with the .NET Framework](/dotnet/framework/network-programming/tls#configuring-security-via-the-windows-registry).

memdocs/configmgr/hotfix/2111/12819689.md

@@ -42,8 +42,8 @@ After you download this hotfix, refer to the following installation instructions
 5. Recheck the **Enable this distribution point to be used as Microsoft Connected Cache server** option for the affected distribution point.
 
    > [!TIP]
-   > For sites with a large number of distribution points, replace steps 4 - 5 above with the following.
-   > - Create an empty file named `resetdps.trn` and place it in the `{SMSInstallDir}\inboxes\distmgr.box` folder. This will reinstall all distribution points for that site using the latest version of `DoincInstall.exe` copied in step 3. above. 
+   > For sites with a large number of distribution points, replace steps 3 - 5 above with the following.
+   > - Create an empty file named `resetdps.trn` and place it in the `{SMSInstallDir}\inboxes\distmgr.box` folder. This will reinstall all distribution points for that site using the latest version of `DoincInstall.exe` copied in step 2. above. 
 
 ## Prerequisites
 To apply this hotfix, you must be using Microsoft Endpoint Configuration Manager, versions 1910 through versions 2111.
@@ -60,4 +60,4 @@ This hotfix replaces the following previously released hotfix.
 File information is available in the downloadable [KB12819689_FileList.txt](https://aka.ms/KB12819689_FileList) text file.
 
 ## Release history
-- January 21, 2022: Initial hotfix release
+- January 21, 2022: Initial hotfix release

memdocs/intune/protect/advanced-threat-protection-manage-android.md

@@ -86,7 +86,7 @@ To configure web protection on devices, use the following procedures to create a
      - **Data type**: Select **Integer** in the drop-down list. 
      - **Value**: Enter **0** to disable the VPN-based scan.
        > [!NOTE]
-       > Enter **1** to enable web protection. This setting is the default.
+       > Enter **1** to enable VPN-based scan. This setting is the default.
 
    Select **Add** to save the OMA-URI settings configuration, and then select **Next** to continue.
 

memdocs/intune/user-help/enroll-your-device-in-intune-ios.md

@@ -120,17 +120,15 @@ Pausing for more than a few minutes during enrollment might cause the Company Po
 
     ![Example screenshot of the Settings app, Enroll in organization option.](./media/enroll-in-organization-ios-1909.PNG)  
 
-   If neither options appear, go to **General** > **Profiles & Device Management**> **Management Profile**. If you still don't see a management profile, you may need to download it again.  
+   If neither options appear, go to **General** and select the VPN & device management option to view installed profiles. If you still don't see the profile, try downloading it again. 
 
 5. Tap **Install**.  
 
 6. Enter your device password. Then tap **Install**.    
 
 7. The next screen is a standard system warning about device management. To continue with installation, tap **Install**. If prompted to trust remote management, tap **Trust**.  
 
-8. After installation is complete, tap **Done**. To verify that the profile was installed, go to the **Profiles & Device Management** settings. You should see the profile listed under **Mobile Device Management**.   
-
-    ![Example screenshot of Settings app, Profiles & Device Management settings, showing the management profile.](./media/ios-12-cp-enroll-1904.PNG)  
+8. After installation is complete, tap **Done**. To verify that the profile was installed, go to your VPN and device management settings. You should see the profile listed under **Mobile Device Management**.   
 
 9. Return to the Company Portal app. Company Portal will begin to sync and set up your device. Company Portal might prompt you to update additional device settings. If it does, tap **Continue**.  
 
@@ -170,7 +168,7 @@ Pausing for more than a few minutes during enrollment might cause the Company Po
 
     ![Example screenshot of the Settings app, Enroll in organization option.](./media/enroll-in-organization-ios-1909.PNG)  
 
-   If neither options appear, go to **General** > **Profiles & Device Management**> **Management Profile**. If you still don't see a management profile, you may need to download it again.   
+   If neither options appear, go to **General** and select the VPN & device management option to view installed profiles. If you still don't see the profile, try downloading it again. 
 
 
 6. On the **User Enrollment** screen, tap **Enroll My iPhone**.  
@@ -181,9 +179,7 @@ Pausing for more than a few minutes during enrollment might cause the Company Po
 
 8. On the **Sign in** screen, enter the password for your managed Apple ID. In most cases, these credentials will be the same ones you use to sign in to your work or school account, unless your organization provided you with a different set of credentials. 
 9. Tap **Sign in**.  
-10. A success message will appear on the screen briefly after the profile is installed. To verify that the profile is installed, go to the **Profiles & Device Management** settings. You should see the profile listed under **Mobile Device Management.**  
-
-    ![Example screenshot of Settings app, Profiles & Device Management settings, showing the management profile.](./media/ios-12-cp-enroll-1904.PNG)  
+10. A success message will appear on the screen briefly after the profile is installed. To verify that the profile was installed, go to your VPN and device management settings. You should see the profile listed under **Mobile Device Management**. 
 
 11. Return to the Company Portal app. Company Portal will begin to sync and set up your device. Company Portal might prompt you to update additional device settings. If it does, tap **Continue**.