Skip to content

Commit 69ffccc

Browse files
committed
fixing merge conflict; adding ignite branch
2 parents 4cc7d8d + 841dd43 commit 69ffccc

38 files changed

Lines changed: 1732 additions & 315 deletions

memdocs/index.yml

Lines changed: 121 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### YamlMime:Hub
2-
title: Microsoft Endpoint Manager documentation
3-
summary: Official product documentation for Microsoft Endpoint Manager
2+
title: Microsoft Intune product family documentation
3+
summary: Learn more about the products & services in the Microsoft Intune product family that can help you secure, deploy, and manage users, apps, and endpoint devices.
44

55
metadata:
66
services: service
@@ -9,94 +9,135 @@ metadata:
99
author: dougeby
1010
ms.author: dougeby
1111
manager: johmar
12-
ms.date: 05/24/2022
12+
ms.date: 09/19/2022
1313
ms.localizationpriority: high
1414
ms.collection: highpri
1515
ms.custom: intro-hub-or-landing
1616

1717
highlightedContent:
1818
items:
19-
- title: Move to cloud native endpoints
19+
- title: Microsoft Intune product family overview
20+
itemType: overview
21+
url: endpoint-manager-overview.md
22+
- title: Microsoft Intune (product page)
2023
itemType: overview
21-
url: cloud-native-endpoints-overview.md
22-
- title: Getting started with Microsoft Endpoint Manager
23-
itemType: get-started
24-
url: endpoint-manager-getting-started.md
25-
- title: Microsoft Endpoint Manager (product page)
26-
itemType: get-started
2724
url: https://www.microsoft.com/microsoft-365/microsoft-endpoint-manager
28-
- title: "Tutorial: Walkthrough Intune in Microsoft Endpoint Manager"
29-
itemType: tutorial
30-
url: ./intune/fundamentals/tutorial-walkthrough-endpoint-manager.md
25+
- title: Cloud attach your Configuration Manager environment
26+
itemType: overview
27+
url: https://learn.microsoft.com/mem/configmgr/cloud-attach/overview
3128
- title: Secure your remote workforce
3229
itemType: get-started
3330
url: /enterprise-mobility-security/remote-work/
34-
- title: Microsoft Endpoint Manager fundamentals
35-
itemType: learn
36-
url: /training/paths/endpoint-manager-fundamentals/
31+
- title: The latest in tech skilling for Microsoft Endpoint Manager
32+
itemType: overview
33+
url: https://techcommunity.microsoft.com/t5/microsoft-endpoint-manager-blog/the-latest-in-tech-skilling-for-microsoft-endpoint-manager/ba-p/3291643
34+
- title: Training on Microsoft Learn
35+
itemType: get-started
36+
url: https://docs.microsoft.com/search/?terms=intune&category=Learn
37+
- title: How to use the docs for Microsoft Intune technologies
38+
itemType: overview
39+
url: ./use-docs.md
3740

38-
conceptualContent:
41+
# productDirectory section (optional)
42+
productDirectory:
43+
title: Get started with the Microsoft Intune product family
3944
items:
40-
- title: Microsoft Intune
41-
links:
42-
- url: ./intune/index.yml
43-
itemType: overview
44-
text: Microsoft Intune documentation
45-
- url: ./intune/fundamentals/index.yml
46-
itemType: overview
47-
text: Plan for and set up Intune
48-
- url: ./intune/enrollment/index.yml
49-
itemType: overview
50-
text: Enroll devices
51-
- url: ./intune/remote-actions/index.yml
52-
itemType: overview
53-
text: Remotely manage devices
54-
- url: ./intune/protect/index.yml
55-
itemType: overview
56-
text: Create compliance rules for users and devices
57-
- url: ./intune/configuration/index.yml
58-
itemType: overview
59-
text: Control device features and settings
60-
- url: ./intune/apps/index.yml
61-
itemType: concept
62-
text: Manage and protect apps
63-
- title: Microsoft Endpoint Configuration Manager
64-
links:
65-
- url: ./configmgr/index.yml
66-
itemType: get-started
67-
text: Microsoft Endpoint Configuration Manager documentation
68-
- url: ./configmgr/comanage/index.yml
69-
itemType: concept
70-
text: Manage device workloads in Configuration Manager and Intune
71-
- url: ./configmgr/desktop-analytics/index.yml
72-
itemType: overview
73-
text: Use Desktop Analytics for update readiness
74-
- url: ./configmgr/core/index.yml
75-
itemType: overview
76-
text: Manage your infrastructure
77-
- url: ./configmgr/apps/index.yml
78-
itemType: concept
79-
text: Manage apps
80-
- url: ./configmgr/osd/index.yml
81-
itemType: concept
82-
text: Operating system deployment
83-
- url: ./configmgr/sum/index.yml
84-
itemType: concept
85-
text: Software updates
86-
- url: ./configmgr/compliance/index.yml
87-
itemType: concept
88-
text: Manage configuration and compliance of devices
89-
- url: ./configmgr/protect/index.yml
90-
itemType: concept
91-
text: Protect your infrastructure and data
92-
- title: Windows Autopilot
93-
links:
94-
- url: ./autopilot/index.yml
95-
itemType: concept
96-
text: Windows Autopilot documentation
97-
- url: ./autopilot/enrollment-autopilot.md
98-
itemType: how-to-guide
99-
text: "Intune: Enroll Windows devices using Windows Autopilot"
100-
- url: ./autopilot/existing-devices.md
101-
itemType: how-to-guide
102-
text: "Configuration Manager: Use Windows Autopilot for existing devices"
45+
# Card
46+
- title: Microsoft Intune docs
47+
imageSrc: ./media/microsoft-intune.svg
48+
summary: Microsoft Intune is a cloud-based service that helps enable your workforce to be productive while keeping your corporate data protected.
49+
url: ./intune/index.yml
50+
# Card
51+
- title: Microsoft Endpoint Configuration Manager docs
52+
imageSrc: ./media/configmgr.svg
53+
summary: Configuration Manager is an on-premises and cloud-connected device management solution to manage devices, deploy apps and software updates, etc.
54+
url: ./configmgr/index.yml
55+
# Card
56+
- title: Windows Autopilot docs
57+
imageSrc: ./media/autopilot.svg
58+
summary: Windows Autopilot is a collection of technologies used to set up and pre-configure new devices, getting them ready for productive use, and to reset, repurpose, and recover devices.
59+
url: ./autopilot/index.yml
60+
# Card
61+
- title: Windows Autopatch docs
62+
imageSrc: ./media/autopatch.svg
63+
summary: Windows Autopatch is a cloud service that automates Windows, Microsoft 365 Apps for enterprise, Microsoft Edge, and Microsoft Teams updates to improve security and productivity across your organization.
64+
url: /windows/deployment/windows-autopatch/index.yml
65+
# Card
66+
- title: Endpoint Analytics docs
67+
imageSrc: ./media/endpoint-analytics.svg
68+
summary: Endpoint analytics can help identify policies or hardware issues that may be slowing down devices and help you proactively make improvements before end-users generate a help desk ticket.
69+
url: ./analytics/index.yml
70+
71+
# Card
72+
# Card
73+
#- title: Azure Active Directory
74+
# imageSrc: ./media/active-directory.svg
75+
# summary: Azure Active Directory (Azure AD) is a cloud-based identity and access management service.
76+
# url: /azure/active-directory/index.yml
77+
# Card
78+
79+
80+
# additionalContent section (optional)
81+
# Card with summary style
82+
additionalContent:
83+
# Supports up to 4 subsections
84+
sections:
85+
- title: Solutions & scenarios
86+
items:
87+
# Card
88+
- title: Support remote and hybrid workers with cloud native endpoints
89+
summary: Cloud-native endpoints are devices that can be deployed from anywhere. They receive their applications and configurations dynamically from the cloud, and can easily be reset or restored.
90+
url: ./solutions/cloud-native-endpoints/cloud-native-endpoints-overview.md
91+
- title: Manage devices with Intune and Microsoft 365
92+
summary: A core component of enterprise-level security includes managing and protecting devices. Whether you’re building a Zero Trust security architecture, hardening your environment against ransomware, or building in protections to support remote workers, managing devices is part of the strategy.
93+
url: https://docs.microsoft.com/microsoft-365/solutions/manage-devices-with-intune-overview
94+
- title: Set up your infrastructure for hybrid work
95+
summary: Solution to secure and optimize your worker’s productivity and collaboration, you need to allow on-site and remote workers to access your organization's on-premises and cloud-based information, tools, and resources easily and securely.
96+
url: https://docs.microsoft.com/microsoft-365/solutions/empower-people-to-work-remotely
97+
- title: Zero Trust guidance
98+
summary: Learn about the Zero Trust security model, its principles, and how to implement a Zero Trust architecture using the deployment plans.
99+
url: /security/zero-trust/index.yml
100+
101+
- title: Related services
102+
items:
103+
# Card
104+
- title: Azure Active Directory
105+
summary: Azure Active Directory (Azure AD) is a cloud-based identity and access management service.
106+
url: /azure/active-directory/index.yml
107+
# Card
108+
- title: Windows client docs for IT Pros
109+
summary: Evaluate, plan, deploy, secure, and manage devices running Windows 10 and Windows 11.
110+
url: /windows/resources/index.yml
111+
# Card
112+
- title: Windows 365 docs
113+
summary: Windows 365 is a cloud-based service that automatically creates a new type of Windows virtual machine (Cloud PCs) for your end users.
114+
url: https://docs.microsoft.com/en-us/windows-365/index.yml
115+
# Card
116+
- title: Microsoft Defender for Endpoint
117+
summary: Microsoft Defender for Endpoint delivers preventative protection, post-breach detection, automated investigation, and response.
118+
url: /microsoft-365/security/defender-endpoint/index.yml
119+
120+
- title: Microsoft Intune community & support
121+
items:
122+
# Card
123+
- title: Microsoft Endpoint Manager Blog
124+
summary: Read Microsoft Endpoint Manager blog posts, including announcements, support tips, troubleshooting tips, and more.
125+
url: https://techcommunity.microsoft.com/t5/microsoft-endpoint-manager-blog/bg-p/MicrosoftEndpointManagerBlog
126+
# Card
127+
- title: Intune Customer Success blog
128+
summary: Read blog posts written by the Intune support team, including announcements, support tips, troubleshooting tips, and more.
129+
url: https://techcommunity.microsoft.com/t5/intune-customer-success/bg-p/IntuneCustomerSuccess
130+
# Card
131+
- title: Configuration Manager blog
132+
summary: Read Configuration manager blog posts, including announcements, support tips, troubleshooting tips, and more.
133+
url: https://techcommunity.microsoft.com/t5/configuration-manager-blog/bg-p/ConfigurationManagerBlog
134+
# Card
135+
- title: Microsoft Endpoint Manager Tech Community discussions
136+
summary: Collaborate, share and learn from experts
137+
url: https://techcommunity.microsoft.com/t5/microsoft-endpoint-manager/ct-p/microsoft-endpoint-manager
138+
# Card
139+
- title: "Twitter: #MSIntune"
140+
summary: Keep current with the active Twitter community
141+
url: https://twitter.com/hashtag/msintune
142+
# footer (optional)
143+
footer: "Found a problem with Microsoft Intune docs? [Let us know](use-docs.md#about-feedback)!"

memdocs/intune/apps/app-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Intune offers a range of capabilities to help you get the apps you need on the d
7474
| Apps from a store | Yes | Yes | No | Yes |
7575
| Update apps | Yes | Yes | No | Yes |
7676

77-
<sup>1</sup> Consider using [Windows Information Protection](../protect/windows-information-protection-configure.md) to protect apps on devices that run Windows 10/11.<br>
77+
<sup>1</sup> Consider using [Microsoft Purview Information Protection](/microsoft-365/compliance/information-protection) and [Microsoft Purview Data Loss Prevention](/microsoft-365/compliance/dlp-learn-about-dlp). Microsoft Purview simplifies the configuration set-up and provides an advanced set of capabilities. <br>
7878
<sup>2</sup> Applies to devices managed by Intune only.<br>
7979
<sup>3</sup> Intune supports available apps from Managed Google Play store on Android Enterprise devices.<br>
8080
<sup>4</sup> Intune does not provide installing a shortcut to an app as a web link on standard Android Enterprise devices. However, Web link support is provided for [multi-app dedicated Android Enterprise devices](../configuration/device-restrictions-android-for-work.md#device-experience).<br>

0 commit comments

Comments
 (0)