merge

Author: ErikjeMS

memdocs/intune/configuration/vpn-settings-ios.md

@@ -208,7 +208,6 @@ These settings apply when you choose **Connection type** > **IKEv2**.
       - **ECDSA384**
       - **ECDSA521**
 
-  - **Username and password** (User authentication only): When users connect to the VPN, they're prompted for their username and password.
   - **Shared secret** (Machine authentication only): Allows you to enter a shared secret to send to the VPN server.
     - **Shared secret**: Enter the shared secret, also known as the pre-shared key (PSK). Be sure the value matches the shared secret configured on the VPN server.
 

memdocs/intune/protect/compliance-custom-json.md

@@ -42,6 +42,8 @@ A correctly formatted JSON file must include the following information:
 - **MoreInfoURL** - A URL that’s shown to device users so they can learn more about the compliance requirement when their device is noncompliant for a setting. You can also use this to link to instructions to help users bring their device into compliance for this setting.
 - **RemediationStrings** - Information that gets displayed in the Company Portal when a device is noncompliant to a setting. This information is intended to help users understand the remediation options to bring a device to a compliant state.
 
+You may include as many settings as you'd like in the JSON file, but the file must be no larger than 1 megabyte (MB).
+
 **Supported operators**:  
 - IsEquals
 - NotEquals

memdocs/intune/protect/compliance-custom-script.md

@@ -72,6 +72,14 @@ PS C:\Users\apervaiz\Documents> .\sample.ps1
 
 5. Complete the script creation process. The script is now visible in the *Scripts* pane of the Microsoft Endpoint Manager admin center and will be available to select when configuring compliance policies.
 
+## Limits
+
+The scripts you write must be within these limits in order to successfully return compliance data to Intune:
+
+- Scripts can be no larger than 1 megabyte (MB) each.
+- Output generated by each script can be no larger than 1 MB.
+- Scripts must take 10 minutes or less to run.
+
 ## Next steps
 
 - [Use custom compliance settings](../protect/compliance-use-custom-settings.md)