Merge pull request #8653 from MicrosoftDocs/main

v-stsavell · web-flow · commit 716d8e1a3530 · 2022-10-03T12:36:20.000-05:00
Publish main to live on 10/3 @ 10:30 am
diff --git a/memdocs/configmgr/core/migration/administrator-checklists-for-migration-planning.md b/memdocs/configmgr/core/migration/administrator-checklists-for-migration-planning.md
@@ -6,10 +6,12 @@ ms.date: 12/29/2016
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Administrator checklists for migration planning in Configuration Manager
 
diff --git a/memdocs/configmgr/core/migration/configuring-source-hierarchies-and-source-sites-for-migration.md b/memdocs/configmgr/core/migration/configuring-source-hierarchies-and-source-sites-for-migration.md
@@ -6,10 +6,12 @@ ms.date: 12/29/2016
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Configure source hierarchies and source sites for migration to Configuration Manager current branch
 
diff --git a/memdocs/configmgr/core/migration/determine-whether-to-migrate-data.md b/memdocs/configmgr/core/migration/determine-whether-to-migrate-data.md
@@ -6,10 +6,12 @@ ms.date: 12/29/2016
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Determine whether to migrate data to Configuration Manager current branch
 
diff --git a/memdocs/configmgr/core/migration/migrate-data-between-hierarchies.md b/memdocs/configmgr/core/migration/migrate-data-between-hierarchies.md
@@ -6,10 +6,12 @@ ms.date: 11/05/2018
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 
 # Migrate data between hierarchies in Configuration Manager
diff --git a/memdocs/configmgr/core/migration/operations-for-migration.md b/memdocs/configmgr/core/migration/operations-for-migration.md
@@ -6,10 +6,12 @@ ms.date: 12/30/2016
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Operations for migrating to Configuration Manager current branch
 
diff --git a/memdocs/configmgr/core/migration/planning-a-client-migration-strategy.md b/memdocs/configmgr/core/migration/planning-a-client-migration-strategy.md
@@ -6,10 +6,12 @@ ms.date: 12/30/2016
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Plan a client migration strategy in Configuration Manager
 
diff --git a/memdocs/configmgr/core/migration/planning-a-content-deployment-migration-strategy.md b/memdocs/configmgr/core/migration/planning-a-content-deployment-migration-strategy.md
@@ -6,10 +6,12 @@ ms.date: 12/30/2016
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Plan a content deployment migration strategy in Configuration Manager
 
diff --git a/memdocs/configmgr/core/migration/planning-a-migration-job-strategy.md b/memdocs/configmgr/core/migration/planning-a-migration-job-strategy.md
@@ -6,10 +6,12 @@ ms.date: 10/06/2016
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Plan a migration job strategy in Configuration Manager
 
diff --git a/memdocs/configmgr/core/migration/planning-a-source-hierarchy-strategy.md b/memdocs/configmgr/core/migration/planning-a-source-hierarchy-strategy.md
@@ -6,10 +6,12 @@ ms.date: 01/3/2017
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Plan a source hierarchy strategy in Configuration Manager
 
diff --git a/memdocs/configmgr/core/migration/planning-for-migration.md b/memdocs/configmgr/core/migration/planning-for-migration.md
@@ -6,10 +6,12 @@ ms.date: 01/12/2017
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Plan for migration to Configuration Manager current branch
 
diff --git a/memdocs/configmgr/core/migration/planning-for-the-migration-of-objects.md b/memdocs/configmgr/core/migration/planning-for-the-migration-of-objects.md
@@ -6,10 +6,12 @@ ms.date: 01/12/2017
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Plan for the migration of Configuration Manager objects to Configuration Manager current branch
 
diff --git a/memdocs/configmgr/core/migration/planning-to-complete-migration.md b/memdocs/configmgr/core/migration/planning-to-complete-migration.md
@@ -6,10 +6,12 @@ ms.date: 01/12/2017
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Plan to complete migration in Configuration Manager
 
diff --git a/memdocs/configmgr/core/migration/planning-to-monitor-migration-activity.md b/memdocs/configmgr/core/migration/planning-to-monitor-migration-activity.md
@@ -6,10 +6,12 @@ ms.date: 10/06/2016
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Planning to monitor migration activity in Configuration Manager
 
diff --git a/memdocs/configmgr/core/migration/prerequisites-for-migration.md b/memdocs/configmgr/core/migration/prerequisites-for-migration.md
@@ -6,10 +6,12 @@ ms.date: 05/7/2018
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 
 # Prerequisites for migration in Configuration Manager
diff --git a/memdocs/configmgr/core/migration/security-and-privacy-for-migration.md b/memdocs/configmgr/core/migration/security-and-privacy-for-migration.md
@@ -6,10 +6,12 @@ ms.date: 10/06/2016
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Security and privacy for migration to Configuration Manager current branch
 
diff --git a/memdocs/configmgr/core/misc/doc-test.md b/memdocs/configmgr/core/misc/doc-test.md
@@ -8,10 +8,11 @@ ms.technology: configmgr-other
 ms.topic: reference
 ms.localizationpriority: null
 ROBOTS: NOINDEX
-author: aczechowski
-ms.author: aaroncz
-ms.reviewer: mstewart
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+ms.reviewer: mstewart,aczechowski
+manager: apoorvseth
+ms.collection: tier3
 ---
 # Doc team test - FrankRoj
 Date: 07/06/2022
diff --git a/memdocs/configmgr/core/misc/in-console-documentation.md b/memdocs/configmgr/core/misc/in-console-documentation.md
@@ -6,11 +6,13 @@ ms.date: 06/14/2021
 ms.topic: conceptual
 ms.prod: configuration-manager
 ms.technology: configmgr-other
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ROBOTS: NOINDEX
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 
 <!-- 
diff --git a/memdocs/configmgr/core/misc/learn-more-about-available-updates.md b/memdocs/configmgr/core/misc/learn-more-about-available-updates.md
@@ -6,11 +6,13 @@ ms.date: 10/06/2016
 ms.topic: conceptual
 ms.prod: configuration-manager
 ms.technology: configmgr-other
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ROBOTS: NOINDEX
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Learn more about available updates for Configuration Manager
 
diff --git a/memdocs/configmgr/core/misc/mms2019docathon.md b/memdocs/configmgr/core/misc/mms2019docathon.md
@@ -5,11 +5,13 @@ ms.prod: configuration-manager
 ms.technology: configmgr-other
 ms.topic: conceptual
 description: Info and rules for MMS 2019 docathon
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ROBOTS: NOINDEX
 ms.localizationpriority: null
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 
 # MMS 2019 Docathon
diff --git a/memdocs/configmgr/core/misc/online-documentation.md b/memdocs/configmgr/core/misc/online-documentation.md
@@ -5,11 +5,13 @@ ms.date: 02/17/2021
 ms.topic: conceptual
 ms.prod: configuration-manager
 ms.technology: configmgr-other
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 description: Additional links for Configuration Manager help documentation
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 
 # Online documentation for Configuration Manager
diff --git a/memdocs/configmgr/core/misc/pre-release-construction.md b/memdocs/configmgr/core/misc/pre-release-construction.md
@@ -1,15 +1,17 @@
 ---
 title: Pre-release content under construction
 description: Content under construction
-ms.author: mstewart
-author: mestew
+ms.author: banreetkaur
+author: Banreet
 ms.date: 01/10/2020
 ms.prod: configuration-manager
 ms.technology: configmgr-other
 ms.topic: conceptual
 localization_priority: low
 robots: NOINDEX, NOFOLLOW
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 
 # Content under construction
diff --git a/memdocs/configmgr/core/misc/system-center-configuration-manager.md b/memdocs/configmgr/core/misc/system-center-configuration-manager.md
@@ -4,12 +4,14 @@ ms.date: 10/06/2016
 ms.topic: conceptual
 ms.prod: configuration-manager
 ms.technology: configmgr-other
-author: aczechowski
-ms.author: aaroncz
-manager: dougeby
+author: Banreet
+ms.author: banreetkaur
+manager: apoorvseth
 ROBOTS: NOINDEX
 description: Placeholder file for Configuration Manager documentation
 ms.localizationpriority: medium
+ms.collection: tier3
+ms.reviewer: mstewart,aczechowski
 ---
 # Configuration Manager
 
diff --git a/memdocs/intune/configuration/vpn-settings-ios.md b/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.
 
diff --git a/memdocs/intune/protect/compliance-custom-json.md b/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
diff --git a/memdocs/intune/protect/compliance-custom-script.md b/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)  
diff --git a/windows-365/enterprise/TOC.yml b/windows-365/enterprise/TOC.yml
diff --git a/windows-365/enterprise/create-azure-network-connection.md b/windows-365/enterprise/create-azure-network-connection.md
diff --git a/windows-365/enterprise/introduction-windows-365-government.md b/windows-365/enterprise/introduction-windows-365-government.md
diff --git a/windows-365/enterprise/requirements-network.md b/windows-365/enterprise/requirements-network.md
diff --git a/windows-365/enterprise/requirements.md b/windows-365/enterprise/requirements.md
diff --git a/windows-365/enterprise/set-up-tenants-windows-365-gcc.md b/windows-365/enterprise/set-up-tenants-windows-365-gcc.md
