Skip to content

Commit 42417ce

Browse files
dougebydougeby
authored
Merge pull request #8763 from dougeby/ebylinux
Updates with main and fixed conflict
2 parents d364613 + 9ea9422 commit 42417ce

114 files changed

Lines changed: 3024 additions & 6401 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.openpublishing.redirection.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "memdocs/endpoint-manager-getting-started.md",
5+
"redirect_url": "/mem/intune/fundamentals/get-started-with-intune",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "memdocs/intune/developer/app-sdk-android.md",
510
"redirect_url": "/mem/intune/developer/app-sdk-android-phase1",
@@ -1217,6 +1222,36 @@
12171222
"redirect_url": "/mem/analytics/adoption-score",
12181223
"redirect_document_id": false
12191224
},
1225+
{
1226+
"source_path": "memdocs/azure-ad-joined-hybrid-azure-ad-joined.md",
1227+
"redirect_url": "/mem/solutions/cloud-native-endpoints/azure-ad-joined-hybrid-azure-ad-joined",
1228+
"redirect_document_id": false
1229+
},
1230+
{
1231+
"source_path": "memdocs/cloud-native-endpoints-known-issues.md",
1232+
"redirect_url": "/mem/solutions/cloud-native-endpoints/cloud-native-endpoints-known-issues",
1233+
"redirect_document_id": false
1234+
},
1235+
{
1236+
"source_path": "memdocs/cloud-native-endpoints-on-premises.md",
1237+
"redirect_url": "/mem/solutions/cloud-native-endpoints/cloud-native-endpoints-on-premises",
1238+
"redirect_document_id": false
1239+
},
1240+
{
1241+
"source_path": "memdocs/cloud-native-endpoints-overview.md",
1242+
"redirect_url": "/mem/solutions/cloud-native-endpoints/cloud-native-endpoints-overview",
1243+
"redirect_document_id": false
1244+
},
1245+
{
1246+
"source_path": "memdocs/cloud-native-endpoints-planning-guide.md",
1247+
"redirect_url": "/mem/solutions/cloud-native-endpoints/cloud-native-endpoints-planning-guide",
1248+
"redirect_document_id": false
1249+
},
1250+
{
1251+
"source_path": "memdocs/cloud-native-windows-endpoints.md",
1252+
"redirect_url": "/mem/solutions/cloud-native-endpoints/cloud-native-windows-endpoints",
1253+
"redirect_document_id": false
1254+
},
12201255
{
12211256
"source_path": "memdocs/intune/fundamentals/multi-admin-approval.md",
12221257
"redirect_url": "/mem/intune/fundamentals/whats-new",

‎memdocs/breadcrumb/toc.yml‎

Lines changed: 80 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -2,89 +2,86 @@ items:
22
- name: Docs
33
tocHref: /
44
topicHref: /
5+
56
items:
6-
- name: Enterprise Mobility + Security
7-
tocHref: /enterprise-mobility-security/
8-
topicHref: /enterprise-mobility-security/
7+
- name: Endpoint management
8+
tocHref: /mem/
9+
topicHref: /mem/
910
items:
10-
- name: Microsoft Endpoint Manager
11-
tocHref: /mem/
12-
topicHref: /mem/
11+
- name: Intune
12+
tocHref: /mem/intune/
13+
topicHref: /mem/intune/
1314
items:
14-
- name: Intune
15-
tocHref: /mem/intune/
16-
topicHref: /mem/intune/
17-
items:
18-
- name: Intune user help
19-
tocHref: /mem/intune/user-help/
20-
topicHref: /mem/intune/user-help/use-managed-devices-to-get-work-done
21-
- name: Apps
22-
tocHref: /mem/intune/apps/
23-
topicHref: /mem/intune/apps/
24-
- name: Fundamentals
25-
tocHref: /mem/intune/fundamentals/
26-
topicHref: /mem/intune/fundamentals/
27-
- name: Enrollment
28-
tocHref: /mem/intune/enrollment/
29-
topicHref: /mem/intune/enrollment/
30-
- name: Remote actions
31-
tocHref: /mem/intune/remote-actions/
32-
topicHref: /mem/intune/remote-actions/
33-
- name: Configuration
34-
tocHref: /mem/intune/configuration/
35-
topicHref: /mem/intune/configuration/
36-
- name: Protect
37-
tocHref: /mem/intune/protect/
38-
topicHref: /mem/intune/protect/
39-
- name: Developer
40-
tocHref: /mem/intune/developer/
41-
topicHref: /mem/intune/developer/
42-
- name: Configuration Manager
43-
tocHref: /mem/configmgr/
44-
topicHref: /mem/configmgr/
45-
items:
46-
- name: Application management guide
47-
tocHref: /mem/configmgr/apps/
48-
topicHref: /mem/configmgr/apps/
49-
- name: Co-management
50-
tocHref: /mem/configmgr/comanage/
51-
topicHref: /mem/configmgr/comanage/
52-
- name: Device compliance
53-
tocHref: /mem/configmgr/compliance/
54-
topicHref: /mem/configmgr/compliance/
55-
- name: Cloud attach
56-
tocHref: /mem/configmgr/cloud-attach/
57-
topicHref: /mem/configmgr/cloud-attach/
58-
- name: Core infrastructure guide
59-
tocHref: /mem/configmgr/core/
60-
topicHref: /mem/configmgr/core/
61-
- name: Desktop Analytics
62-
tocHref: /mem/configmgr/desktop-analytics/
63-
topicHref: /mem/configmgr/desktop-analytics/
64-
- name: Developer
65-
tocHref: /mem/configmgr/develop/
66-
topicHref: /mem/configmgr/develop/
67-
- name: Mobile Device Management
68-
tocHref: /mem/configmgr/mdm/
69-
topicHref: /mem/configmgr/mdm/
70-
- name: Operating System Deployment
71-
tocHref: /mem/configmgr/osd/
72-
topicHref: /mem/configmgr/osd/
73-
- name: Protect
74-
tocHref: /mem/configmgr/protect/
75-
topicHref: /mem/configmgr/protect/
76-
- name: Software updates
77-
tocHref: /mem/configmgr/sum/
78-
topicHref: /mem/configmgr/sum/
79-
- name: Tenant attach
80-
tocHref: /mem/configmgr/tenant-attach/
81-
topicHref: /mem/configmgr/tenant-attach/
82-
- name: Hotfix
83-
tocHref: /mem/configmgr/hotfix
84-
topicHref: /mem/configmgr/hotfix
85-
- name: Endpoint analytics
86-
tocHref: /mem/analytics/
87-
topicHref: /mem/analytics/
88-
- name: Autopilot
89-
tocHref: /mem/autopilot/
90-
topicHref: /mem/autopilot/
15+
- name: Intune user help
16+
tocHref: /mem/intune/user-help/
17+
topicHref: /mem/intune/user-help/use-managed-devices-to-get-work-done
18+
- name: Apps
19+
tocHref: /mem/intune/apps/
20+
topicHref: /mem/intune/apps/
21+
- name: Fundamentals
22+
tocHref: /mem/intune/fundamentals/
23+
topicHref: /mem/intune/fundamentals/
24+
- name: Enrollment
25+
tocHref: /mem/intune/enrollment/
26+
topicHref: /mem/intune/enrollment/
27+
- name: Remote actions
28+
tocHref: /mem/intune/remote-actions/
29+
topicHref: /mem/intune/remote-actions/
30+
- name: Configuration
31+
tocHref: /mem/intune/configuration/
32+
topicHref: /mem/intune/configuration/
33+
- name: Protect
34+
tocHref: /mem/intune/protect/
35+
topicHref: /mem/intune/protect/
36+
- name: Developer
37+
tocHref: /mem/intune/developer/
38+
topicHref: /mem/intune/developer/
39+
- name: Configuration Manager
40+
tocHref: /mem/configmgr/
41+
topicHref: /mem/configmgr/
42+
items:
43+
- name: Application management guide
44+
tocHref: /mem/configmgr/apps/
45+
topicHref: /mem/configmgr/apps/
46+
- name: Co-management
47+
tocHref: /mem/configmgr/comanage/
48+
topicHref: /mem/configmgr/comanage/
49+
- name: Device compliance
50+
tocHref: /mem/configmgr/compliance/
51+
topicHref: /mem/configmgr/compliance/
52+
- name: Cloud attach
53+
tocHref: /mem/configmgr/cloud-attach/
54+
topicHref: /mem/configmgr/cloud-attach/
55+
- name: Core infrastructure guide
56+
tocHref: /mem/configmgr/core/
57+
topicHref: /mem/configmgr/core/
58+
- name: Desktop Analytics
59+
tocHref: /mem/configmgr/desktop-analytics/
60+
topicHref: /mem/configmgr/desktop-analytics/
61+
- name: Developer
62+
tocHref: /mem/configmgr/develop/
63+
topicHref: /mem/configmgr/develop/
64+
- name: Mobile Device Management
65+
tocHref: /mem/configmgr/mdm/
66+
topicHref: /mem/configmgr/mdm/
67+
- name: Operating System Deployment
68+
tocHref: /mem/configmgr/osd/
69+
topicHref: /mem/configmgr/osd/
70+
- name: Protect
71+
tocHref: /mem/configmgr/protect/
72+
topicHref: /mem/configmgr/protect/
73+
- name: Software updates
74+
tocHref: /mem/configmgr/sum/
75+
topicHref: /mem/configmgr/sum/
76+
- name: Tenant attach
77+
tocHref: /mem/configmgr/tenant-attach/
78+
topicHref: /mem/configmgr/tenant-attach/
79+
- name: Hotfix
80+
tocHref: /mem/configmgr/hotfix
81+
topicHref: /mem/configmgr/hotfix
82+
- name: Endpoint analytics
83+
tocHref: /mem/analytics/
84+
topicHref: /mem/analytics/
85+
- name: Autopilot
86+
tocHref: /mem/autopilot/
87+
topicHref: /mem/autopilot/

‎memdocs/configmgr/cloud-attach/overview.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.reviewer: mstewart,aaroncz
1818
<!--9251060-->
1919
*Applies to: Configuration Manager (current branch)*
2020

21-
Attaching your Configuration Manager environment the cloud allows you to continue to modernizing and streamlining your management solution. Cloud attach allows you to transform your existing environment without having to worry about much disruption or risk. A Configuration Manager environment is considered cloud attached when it uses at least one of the three primary cloud attach features. You can enable these three features in any order you wish, or all at once.
21+
Attaching your Configuration Manager environment to the cloud allows you to continue to modernize and streamline your management solution. Cloud attach allows you to transform your existing environment without having to worry about much disruption or risk. A Configuration Manager environment is considered cloud attached when it uses at least one of the three primary cloud attach features. You can enable these three features in any order you wish, or all at once.
2222

2323
- [Tenant attach](#tenant-attach)
2424
- [Endpoint analytics](#endpoint-analytics)

‎memdocs/configmgr/core/clients/manage/collections/collection-evaluation.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ At a high level, each individual collection evaluation and update follows these
3535
1. Add members specified in the *Include* collections.
3636
1. Perform a logical `AND` between the returned results and the limiting collection.
3737
1. Remove members specified in the *exclude* collections.
38-
39-
If the exclude collections also have query rules, or have include or exclude collections, evaluate them also. If these collections themselves are limiting collections, evaluate any collections below them. After fully evaluating the tree, return the results to the calling collection.
40-
4138
1. Compare the result set from evaluating the direct members and include collections with the results of the exclude collections.
4239
1. Write the changes to the database and perform updates.
4340
1. Trigger any dependent collections to update as well. Dependent collections are collections that the current collection limits, or that refer to the current collection using include or exclude rules.

0 commit comments

Comments
 (0)