Merge pull request #15830 from MicrosoftDocs/main

publish main to live, 10:30 AM 8/6/2024

.openpublishing.redirection.json

@@ -1,5 +1,50 @@
 {
   "redirections": [
+    {
+      "source_path": "memdocs/intune/user-help/you-need-to-enable-uac-windows.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/turn-on-defender-windows.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/you-need-to-enable-secure-boot-windows.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/resolve-access-point-restrictions.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/you-need-to-enable-defender-firewall-windows.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/you-need-to-enable-code-integrity.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/your-device-needs-antimalware-software.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/you-need-to-update-os-build-version-windows.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/your-windows-version-isnt-yet-supported.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
     {
       "source_path": "memdocs/intune/enrollment/android-fully-managed-security-settings.md",
       "redirect_url": "/mem/intune/protect/device-restrictions-android-for-work",

memdocs/intune/apps/manage-microsoft-edge.md

@@ -284,7 +284,7 @@ Edge for iOS and Android allows organizations to disable certain features that a
 
 |Key |Value |
 |:-----------|:-------------|
-|com.microsoft.intune.mam.managedbrowser.disabledFeatures|**password** disables prompts that offer to save passwords for the end user <br>**inprivate** disables InPrivate browsing <br>**autofill** disables "Save and Fill Addresses" and "Save and Fill Payment info". Autofill will be disabled even for previously saved information <br>**translator** disables translator <br> **readaloud** disables read aloud <br> **drop** disables drop <br>**coupons** disables coupons <br>**extensions** disabled extensions (Edge for Android only) <br>**developertools** grays out the build version numbers to prevent users from accessing Developer options (Edge for Android only) <br><br>To disable multiple features, separate values with `|`. For example, `inprivate|password` disables both InPrivate and password storage. |
+|com.microsoft.intune.mam.managedbrowser.disabledFeatures|**password** disables prompts that offer to save passwords for the end user <br>**inprivate** disables InPrivate browsing <br>**autofill** disables "Save and Fill Addresses" and "Save and Fill Payment info". Autofill will be disabled even for previously saved information <br>**translator** disables translator <br> **readaloud** disables read aloud <br> **drop** disables drop <br>**coupons** disables coupons <br>**extensions** disables extensions (Edge for Android only) <br>**developertools** grays out the build version numbers to prevent users from accessing Developer options (Edge for Android only) <br>**UIRAlert** suppress re-verify account popups in new tab page screen and in account settings page <br><br>To disable multiple features, separate values with `|`. For example, `inprivate|password` disables both InPrivate and password storage. |
 
 #### Disable import passwords feature
 
@@ -551,7 +551,7 @@ Organizations can define which sites users can access within the work or school
 Organizations also define what happens when a user attempts to navigate to a restricted web site. By default, transitions are allowed. If the organization allows it, restricted web sites can be opened in the personal account context, the Microsoft Entra account’s InPrivate context, or whether the site is blocked entirely. For more information on the various scenarios that are supported, see [Restricted website transitions in Microsoft Edge mobile](https://techcommunity.microsoft.com/t5/intune-customer-success/restricted-website-transitions-in-microsoft-edge-mobile/ba-p/1381333). By allowing transitioning experiences, the organization's users stay protected, while keeping corporate resources safe.
 
 > [!NOTE]
-> Edge for iOS and Android can block access to sites only when they're accessed directly. It doesn't block access when users use intermediate services (such as a translation service) to access the site. URL that launch Edge, such as `Edge://*`, `Edge://flags`, and `Edge://net-export`, aren't supported in app configuration policy **AllowListURLs** or **BlockListURLs** for managed apps. Instead, you can use app configuration policy [URLAllowList](/deployedge/microsoft-edge-mobile-policies#urlallowlist) or [URLBlocklist](/deployedge/microsoft-edge-mobile-policies#urlblocklist) for managed devices. For related information, see [Microsoft Edge mobile policies](/deployedge/microsoft-edge-mobile-policies).
+> Edge for iOS and Android can block access to sites only when they're accessed directly. It doesn't block access when users use intermediate services (such as a translation service) to access the site. URLs that start with **Edge**, such as `Edge://*`, `Edge://flags`, and `Edge://net-export`, aren't supported in app configuration policy **AllowListURLs** or **BlockListURLs** for managed apps. You can disable these URLs with **com.microsoft.intune.mam.managedbrowser.InternalPagesBlockList**. <br><br> If your devices are managed, you can also use app configuration policy [URLAllowList](/deployedge/microsoft-edge-mobile-policies#urlallowlist) or [URLBlocklist](/deployedge/microsoft-edge-mobile-policies#urlblocklist) for managed devices. For related information, see [Microsoft Edge mobile policies](/deployedge/microsoft-edge-mobile-policies).
 
 Use the following key/value pairs to configure either an allowed or blocked site list for Edge for iOS and Android. 
 
@@ -608,6 +608,13 @@ You can use various URL formats to build your allowed/blocked sites lists. These
   - `http://www.contoso.com:*`
   - `http://www.contoso.com: /*`
 
+### Disable Edge internal pages
+You can disable Edge internal pages such as `Edge://flags` and `Edge://net-export`. More pages can be found from `Edge://about`
+
+|Key |Value |
+|:--|:----|
+|com.microsoft.intune.mam.managedbrowser.InternalPagesBlockList | The corresponding value for the key is a list of page names. You can enter the internal pages you want to block as a single value, separated by a pipe `|` character. <br><br> **Examples:** <br>`flags|net-export`|
+
 ### Control the behavior of the Site Blocked popup
 When attempting to access blocked websites, users will be prompted to use either switch to InPrivate or personal account to open the blocked websites. You can choose preferences between InPrivate and personal account.
 

memdocs/intune/remote-actions/collect-diagnostics.md

@@ -64,7 +64,7 @@ To download diagnostics:
 2. On the **Summary** page, select the **Diagnostics** page and download the diagnostics.
 
 > [!IMPORTANT]
-> For Android devices, if the Company Portal isn't signed in by the user, logs will not be available for download in the Intune portal. 
+> For Android devices, if the Company Portal isn't signed in by the user, logs will not be available for download in the Intune portal. Diagnostic uploads exceeding 50 diagnostics or 4MB in diagnostic data cannot be downloaded directly from the Intune portal. For access to larger diagnostic uploads, reach out to [Microsoft Intune support](/mem/get-support). 
 
 Diagnostics take approximately 30 minutes to be delivered from an end user's device. The user may be required to close and reopen the app if prompted for a pin when opening the app for the diagnostics request to prompt.
 

memdocs/intune/user-help/TOC.yml

@@ -200,26 +200,7 @@ items:
       href: enroll-windows-10-device.md
     - name: Unenroll device
       href: unenroll-your-device-from-intune-windows.md
-  - name: Update device settings
-    items:
-    - name: Resolve access point restrictions
-      href: resolve-access-point-restrictions.md
-    - name: Enable antimalware software
-      href: your-device-needs-antimalware-software.md
-    - name: Enable Secure Boot
-      href: you-need-to-enable-secure-boot-windows.md
-    - name: Turn on Windows Code Integrity
-      href: you-need-to-enable-code-integrity.md
-    - name: Turn on Windows Firewall
-      href: you-need-to-enable-defender-firewall-windows.md
-    - name: Change User Access Control setting
-      href: you-need-to-enable-uac-windows.md
-    - name: Update OS build versions
-      href: you-need-to-update-os-build-version-windows.md
-    - name: Turn on Microsoft Defender Antivirus 
-      href: turn-on-defender-windows.md
-    - name: My version of Windows isn't supported
-      href: your-windows-version-isnt-yet-supported.md
+
   - name: Company Portal app for Windows
     items:
     - name: Install apps from Company Portal
@@ -236,6 +217,8 @@ items:
       href: reset-device-company-portal-windows.md
     - name: Turn off Microsoft usage data collection
       href: turn-off-microsoft-usage-data-collection-windows.md
+    - name: Update device settings
+      href: update-device-settings-windows.md
     - name: Help and support page
       href: help-support-windows-cpapp.md
   - name: Get help

memdocs/intune/user-help/update-device-settings-android.md

@@ -11,7 +11,7 @@ ms.date: 03/04/2024
 ms.topic: end-user-help
 ms.service: microsoft-intune
 ms.subservice: end-user
-ms.assetid: e6c4fedc-47b6-44b1-8c59-2fb81417f978
+ms.assetid: 
 searchScope:
  - User help