Skip to content

Commit b5853ae

Browse files
author
Angela Fleischmann
authored
Merge pull request #6967 from MicrosoftDocs/main
Publish 03/07/2022 3:30 PM PT
2 parents f3041e2 + 4846686 commit b5853ae

3 files changed

Lines changed: 12 additions & 13 deletions

File tree

memdocs/analytics/proactive-remediations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Tutorial - Proactive remediations
33
titleSuffix: Microsoft Endpoint Manager
44
description: A tutorial on using Proactive remediations to enhance the user
5-
ms.date: 12/17/2021
5+
ms.date: 03/07/2022
66
ms.prod: configuration-manager
77
ms.technology: configmgr-analytics
88
ms.topic: tutorial
@@ -59,10 +59,10 @@ Proactive remediations requires the [licensing for Endpoint analytics](enroll-in
5959

6060
### <a name="bkmk_requirements"></a> Script requirements
6161

62+
- You can have up to 200 script packages.
63+
- A script package can contain a detection script only or both a detection script and a remediation script.
6264
- Ensure the scripts are encoded in UTF-8.
63-
6465
- The maximum allowed output size limit is 2048 characters.
65-
6666
- If the option **Enforce script signature check** is enabled in the [Settings](#bkmk_prs_deploy) page of creating a script package, the script runs using the device's PowerShell execution policy. The default execution policy for Windows client computers is **Restricted**. The default execution for Windows Server devices is **RemoteSigned**. For more information, see [PowerShell execution policies](/powershell/module/microsoft.powershell.core/about/about_execution_policies#powershell-execution-policies).
6767
- Scripts built into Proactive remediations are signed and the certificate is added to the **Trusted Publishers** certificate store of the device.
6868
- When using third-party scripts that are signed, make sure the certificate is in the **Trusted Publishers** certificate store. As with any certificate, the certificate authority must be trusted by the device.

memdocs/intune/fundamentals/end-user-apps-ios.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: lenewsad
88
ms.author: lanewsad
99
manager: dougeby
10-
ms.date: 03/11/2020
10+
ms.date: 03/01/2022
1111
ms.topic: conceptual
1212
ms.service: microsoft-intune
1313
ms.subservice: fundamentals
@@ -20,7 +20,7 @@ ms.assetid: 7e3135c1-df26-48c9-aa4c-cdab6168897a
2020
#ROBOTS:
2121
#audience:
2222

23-
ms.reviewer: aanavath
23+
ms.reviewer:
2424
ms.suite: ems
2525
search.appverid: MET150
2626
#ms.tgt_pltfrm:
@@ -33,13 +33,13 @@ ms.collection: M365-identity-device-management
3333

3434
Use this information to understand how and where your end users get the apps that you distribute through Microsoft Intune.
3535

36-
**Required apps**--Apps that are required by the admin and that are installed on the device with minimal user involvement, depending on the platform.
36+
**Required apps**: Apps that are required by the admin and that are installed on the device with minimal user involvement, depending on the platform.
3737

38-
**Available apps**--Apps that are provided in the Company Portal app list and that a user may optionally choose to install.
38+
**Available apps**: Apps that are provided in the Company Portal app list and that a user may optionally choose to install.
3939

40-
**Managed apps**--Apps that can be managed through policies and that have been "wrapped" by Intune or have been built with the Intune App Software Development Kit (SDK). These apps can be managed by Intune, and app protection policies can be applied to them.
40+
**Managed apps**: Apps that can be managed through policies and that have been "wrapped" by Intune or have been built with the Intune App Software Development Kit (SDK). These apps can be managed by Intune, and app protection policies can be applied to them.
4141

42-
**Unmanaged apps**--Apps that users can download from the iOS/iPadOS App Store that aren't integrated with the Intune app SDK. Intune doesn't have any control over the distribution, management, or selective wipe of these apps.
42+
**Unmanaged apps**: Apps that users can download from the iOS/iPadOS App Store that aren't integrated with the Intune app SDK. Intune doesn't have any control over the distribution, management, or selective wipe of these apps.
4343

4444
Enrolled users get their apps by tapping on the following tiles on the Apps screen of the Company Portal app:
4545

@@ -49,15 +49,14 @@ Enrolled users get their apps by tapping on the following tiles on the Apps scre
4949

5050
- **Categories** points to the CATEGORIES tab of the Company Portal website.
5151

52-
![iOS Company Portal apps screen](./media/end-user-apps-ios/ios-cp-app-main-apps-screen.png)
52+
:::image type="content" source="./media/end-user-apps-ios/ios-cp-app-main-apps-screen.png" alt-text="iOS Company Portal apps screen.":::
5353

5454
For information on how to add apps, see [How to add an app to Microsoft Intune](../apps/apps-add.md).
5555

5656
## App management takeover
5757
If an app is already installed on an end user's device, the iOS/iPadOS device shows an alert to allow management of the app by your organization. The end user must allow the organization to take management of the app before app configurations can be applied to a managed device. If the user cancels the alert, the alert will appear periodically for as long as the device is managed and the app is assigned.
5858

59-
60-
![Image of the App Management Change alert, showing Cancel and Manage options.](./media/end-user-apps-ios/intune-app-management-confirmation-2002.png)
59+
:::image type="content" source="./media/end-user-apps-ios/intune-app-management-confirmation-2002.png" alt-text="Image of the App Management Change alert, showing Cancel and Manage options.":::
6160

6261
## See also
6362

memdocs/intune/remote-actions/device-inventory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ This article shows you how to view all your devices, and their properties in the
4848
- [Remote lock](device-remote-lock.md)
4949
- [Sync](device-sync.md)
5050
- [Reset passcode](device-passcode-reset.md)
51-
- [Restart](device-restart.md) (Windows only)
51+
- [Restart](device-restart.md)
5252
- [Fresh Start](device-fresh-start.md) (Windows only)
5353
- [Autopilot reset](/windows/deployment/windows-autopilot/windows-autopilot-reset#reset-devices-with-remote-windows-autopilot-reset) (Windows only)
5454
- [Quick scan](../configuration/device-restrictions-windows-10.md) (Windows 10 only)

0 commit comments

Comments
 (0)