Skip to content

Commit 7f560ac

Browse files
authored
Merge pull request #8263 from MicrosoftDocs/main
Publish main to live on 8/16 @ 10:30 am
2 parents 26407c8 + 3f2310e commit 7f560ac

3 files changed

Lines changed: 24 additions & 4 deletions

File tree

memdocs/configmgr/tenant-attach/breadcrumb/toc.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,24 @@ items:
2121
- name: Tenant attach
2222
tocHref: /mem/intune/protect/
2323
topicHref: /mem/configmgr/tenant-attach/index
24+
25+
- name: Docs
26+
tocHref: /
27+
topicHref: /
28+
items:
29+
- name: Enterprise Mobility + Security
30+
tocHref: /enterprise-mobility-security/
31+
topicHref: /enterprise-mobility-security/
32+
items:
33+
- name: Microsoft Endpoint Manager
34+
tocHref: /mem/
35+
topicHref: /mem/
36+
items:
37+
- name: Configuration Manager
38+
tocHref: /mem/configmgr/
39+
topicHref: /mem/configmgr/index
40+
items:
41+
- name: Tenant attach
42+
tocHref: /mem/configmgr/cloud-attach/
43+
topicHref: /mem/configmgr/tenant-attach/index
44+

memdocs/intune/configuration/device-restrictions-windows-10.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,11 +445,9 @@ This device restrictions profile is directly related to the kiosk profile you cr
445445
- **Clear browsing data on exit** (desktop only): **Yes** clears the history, and browsing data when users exit Microsoft Edge. **No** (default) uses the OS default, which may cache the browsing data.
446446
- **Sync browser settings between user's devices**: Choose how you want to sync browser settings between devices. Your options:
447447
- **Allow**: Allow syncing of Microsoft Edge browser settings between user's devices
448-
- **Block and enable user override**: Block syncing of Microsoft Edge browser settings between user's devices. Users can override this setting.
448+
- **Block and enable user override**: Block syncing of Microsoft Edge browser settings between user's devices. Users can override this setting. When this option is selected, users can override the admin designation.
449449
- **Block**: Block syncing of Microsoft Edge browser setting between users devices. Users can't override this setting.
450450

451-
When "block and enable user override" is selected, user can override admin designation.
452-
453451
- **Allow Password Manager**: **Yes** (default) allows Microsoft Edge to automatically use Password Manager, which allows users to save and manage passwords on the device. **No** prevents Microsoft Edge from using Password Manager.
454452
- **Cookies**: Choose how cookies are handled in the web browser. Your options:
455453
- **Allow**: Cookies are stored on the device.

memdocs/intune/protect/device-compliance-get-started.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: brenduns
88
ms.author: brenduns
99
manager: dougeby
10-
ms.date: 11/16/2021
10+
ms.date: 08/16/2022
1111
ms.topic: overview
1212
ms.service: microsoft-intune
1313
ms.subservice: protect
@@ -123,6 +123,7 @@ The following subjects link to dedicated articles for different aspects of devic
123123

124124
- [Android device administrator](compliance-policy-create-android.md)
125125
- [Android Enterprise](compliance-policy-create-android-for-work.md)
126+
- [Android Android Open Source Project (AOSP)](compliance-policy-create-android-aosp.md)
126127
- [iOS](compliance-policy-create-ios.md)
127128
- [macOS](compliance-policy-create-mac-os.md)
128129
- [Windows Holographic for Business](compliance-policy-create-windows.md#windows-holographic-for-business)

0 commit comments

Comments
 (0)