update metadata, fix merge conflict

Author: mestew

memdocs/configmgr/core/get-started/2022/includes/2205/13351390.md

@@ -1,13 +1,14 @@
 ---
-author: mestew
-ms.author: mstewart
+author: Baladelli
+ms.author: Baladell
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: include
-ms.date: 05/20/2022
+ms.date: 05/15/2022
 ms.localizationpriority: medium
 ---
 
-## <a name="bkmk_anchor"></a> Feature Name
-<!--CMADO#-->
+## <a name="bkmk_cmg"></a>  Improvements to cloud management gateway (CMG) workflow
+<!--13351390#-->
 
+You can now approve the application workflow through email. For the application approvals through email, manually add the CMG URL in the Azure Active Directory app as single page application redirect URI. For more information on how to change the URI, see [Create an app registration in Azure AD for your App Service app](/azure/app-service/configure-authentication-provider-aad).

memdocs/configmgr/core/get-started/2022/includes/2205/14046376.md

@@ -0,0 +1,142 @@
+---
+author: Banreet
+ms.author: banreetkaur
+ms.prod: configuration-manager
+ms.technology: configmgr-core
+ms.topic: include
+ms.date: 05/17/2022
+ms.localizationpriority: medium
+---
+
+## <a name="bkmk_powershell"></a> PowerShell release notes preview
+
+<!--14046376-->
+
+These release notes summarize changes to the Configuration Manager PowerShell cmdlets in this technical preview release.
+
+For more information about PowerShell for Configuration Manager, see [Get started with Configuration Manager cmdlets](/powershell/sccm/overview).
+
+### New cmdlets
+
+#### Approve-CMOrchestrationGroupScript
+
+Use this cmdlet to approve an orchestration group script. For more information, see [About orchestration groups in Configuration Manager](../../../../../sum/deploy-use/orchestration-groups.md).
+
+```powershell
+$referenceOG = Get-CMOrchestrationGroup -Name "Orchestratrion group 1"
+$preScript = $referenceOG | Get-CMOrchestrationGroupScript -ScriptType Pre
+$preScript | Approve-CMOrchestrationGroupScript -Comment "Approve"
+
+Approve-CMOrchestrationGroupScript -ScriptGuid $PreScript.ScriptGuid
+```
+
+#### Deny-CMOrchestrationGroupScript
+
+Use this cmdlet to deny an orchestration group script. For more information, see [About orchestration groups in Configuration Manager](../../../../../sum/deploy-use/orchestration-groups.md).
+
+```powershell
+$referenceOG = Get-CMOrchestrationGroup -Name "Orchestratrion group 1"
+$preScript = $referenceOG | Get-CMOrchestrationGroupScript -ScriptType Pre
+$preScript | Deny-CMOrchestrationGroupScript -Comment "Deny"
+
+Deny-CMOrchestrationGroupScript -ScriptGuid $PreScript.ScriptGuid -Comment "Deny"
+```
+
+#### Get-CMOrchestrationGroupScript
+
+Use this cmdlet to get a script from the specified orchestration group. For more information, see [About orchestration groups in Configuration Manager](../../../../../sum/deploy-use/orchestration-groups.md).
+
+```powershell
+$referenceOG = Get-CMOrchestrationGroup -Name "Orchestratrion group 1"
+$preScript = $referenceOG | Get-CMOrchestrationGroupScript -ScriptType Pre
+```
+
+#### Get-CMTrustedRootCertificationAuthority
+
+Use this cmdlet to get the certificates for trusted root certification authorities from the site.
+
+```powershell
+$ci =Get-CMTrustedRootCertificationAuthority
+$ci =Get-CMTrustedRootCertificationAuthority -ViewDetail
+```
+
+#### New-CMAADClientApplication
+
+Use this cmdlet to create a client app registration in Azure Active Directory (Azure AD). When you run this cmdlet, it will prompt you to sign in to your tenant. For more information on this app registration, see [Manually register Azure AD apps for the CMG](../../../../clients/manage/cmg/manually-register-azure-ad-apps.md).
+
+```powershell
+$serverApp = New-CMAADServerApplication -AppName $appName
+New-CMAADClientApplication -AppName $name -InputObject $serverApp
+```
+
+#### New-CMAADServerApplication
+
+Use this cmdlet to create a server app registration in Azure AD. When you run this cmdlet, it will prompt you to sign in to your tenant. For more information on this app registration, see [Manually register Azure AD apps for the CMG](../../../../clients/manage/cmg/manually-register-azure-ad-apps.md).
+
+```powershell
+New-CMAADServerApplication -AppName $appName
+```
+
+### Modified cmdlets
+
+#### Add-CMManagementPoint
+
+For more information, see [Add-CMManagementPoint](/powershell/module/configurationmanager/Add-CMManagementPoint).
+
+**Non-breaking changes**
+
+When you use this cmdlet to enable communication with the cloud management gateway, it now by default configures the management point to support both internet and intranet clients.
+
+#### Get-CMObjectSecurityScope
+
+For more information, see [Get-CMObjectSecurityScope](/powershell/module/configurationmanager/Get-CMObjectSecurityScope).
+
+**Non-breaking changes**
+
+You can now use this cmdlet to get the security scope of a specified folder object.
+
+#### New-CMCloudManagementGateway
+
+For more information, see [New-CMCloudManagementGateway](/powershell/module/configurationmanager/New-CMCloudManagementGateway).
+
+**Non-breaking changes**
+
+Added parameters **VMSSVMSize** and **Version** to support creating a cloud management gateway (CMG) using a virtual machine scale set.
+
+#### New-CMComplianceRuleRegistryKeyPermission
+
+For more information, see [New-CMComplianceRuleRegistryKeyPermission](/powershell/module/configurationmanager/New-CMComplianceRuleRegistryKeyPermission).
+
+**Non-breaking changes**
+
+Fixed an issue in **OperandDataType** property when creating a rule.
+
+#### Set-CMClientSettingComplianceSetting
+
+For more information, see [Set-CMClientSettingComplianceSetting](/powershell/module/configurationmanager/Set-CMClientSettingComplianceSetting).
+
+**Non-breaking changes**
+
+Added a new parameter **ScriptExecutionTimeoutSecs** to extend the script execution timeout value.
+
+#### Set-CMClientSettingComputerRestart
+
+For more information, see [Set-CMClientSettingComputerRestart](/powershell/module/configurationmanager/Set-CMClientSettingComputerRestart).
+
+**Non-breaking changes**
+
+- Extended the validation range of the parameters **CountdownMins** and **RebootLogoffNotificationCountdownMins** to align with the console.
+- Added new parameters **CountdownIntervalMins** and **ServerRebootLowRight** to align with the console.
+- Fixed a property name issue for the parameter **NoRebootEnforcement**.
+
+### Module changes
+
+The following folder-related cmdlets now support automatic deployment rules:
+
+- [Get-CMFolder](/powershell/module/configurationmanager/get-cmfolder)
+- [New-CMFolder](/powershell/module/configurationmanager/new-cmfolder)
+- [Remove-CMFolder](/powershell/module/configurationmanager/remove-cmfolder)
+- [Set-CMFolder](/powershell/module/configurationmanager/set-cmfolder)
+- [Move-CMObject](/powershell/module/configurationmanager/move-cmobject)
+- [Add-CMObjectSecurityScope](/powershell/module/configurationmanager/Add-CMObjectSecurityScope)
+- [Remove-CMObjectSecurityScope](/powershell/module/configurationmanager/Remove-CMObjectSecurityScope)

memdocs/configmgr/core/get-started/2022/includes/2205/3601127.md

@@ -1,13 +1,30 @@
 ---
-author: mestew
-ms.author: mstewart
+author: Baladelli
+ms.author: Baladell
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: include
-ms.date: 05/20/2022
+ms.date: 05/15/2022
 ms.localizationpriority: medium
 ---
 
-## <a name="bkmk_anchor"></a> Feature Name
-<!--CMADO#-->
+## <a name="bkmk_offset"></a> Offset for monthly maintenance window reoccurrence schedule
+<!--3601127#-->
 
+Based upon your feedback, you can now offset the monthly maintenance window schedule to better align deployments with monthly security updates. For example, using an offset of two days after the second Tuesday of the month, sets the maintenance window for Thursday.
+
+:::image type="content" source="../../media/3601127-window-schedule.png" alt-text="Screenshot of menu displaying options for the new custom schedule for setting offset days." lightbox="../../media/3601127-window-schedule.png":::
+
+### Try it out!  
+ Try to complete the tasks. Then send **Feedback** from the **Home** tab of the ribbon letting us know how it worked. 
+
+**Create a custom schedule that sets maintenance window offset from a base day**
+
+1. In the **Device Collection** workspace, create **New Collection**, and select **Properties**.
+2. Select on **Maintenance Window** and choose **New Custom Schedule**. 
+3. For the custom schedule, select **Monthly** and put in a base day such as the second Tuesday. 
+4. Verify the **Offset (days)** and the number of days for the offset then **OK** when finished.  
+5. Complete the deployment as usual. 
+
+> [!NOTE]
+> Before using this feature, upgrade the hierarchy to version 2205. 

memdocs/configmgr/core/get-started/2022/media/3601127-window-schedule.png

@@ -2,7 +2,7 @@
 title: Technical preview 2205
 titleSuffix: Configuration Manager
 description: Learn about new features available in the Configuration Manager technical preview branch version 2205.
-ms.date: 05/20/2022
+ms.date: 05/23/2022
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual

memdocs/configmgr/core/get-started/2022/technical-preview-2205.md

@@ -2,7 +2,7 @@
 title: Technical preview releases
 titleSuffix: Configuration Manager
 description: Learn about the technical preview branch to test-drive new functionality and capabilities in Configuration Manager.
-ms.date: 05/20/2022
+ms.date: 05/23/2022
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual