Merge branch 'docs-editor/Set-SPOTenant-1755022729' of https://github.com/blarrywangmsft/OfficeDocs-SharePoint-PowerShell into docs-editor/Set-SPOTenant-1755022729

Author: blarrywang

sharepoint/sharepoint-ps/Microsoft.Online.SharePoint.PowerShell/New-SPOListFileVersionBatchDeleteJob.md

@@ -171,6 +171,13 @@ An array of file type names to trim versions. The supported file type names are:
 - OutlookPST
 - Video
 
+<<<<<<< HEAD
+=======
+
+
+
+
+>>>>>>> 6e83ced68a482707018e763b6d17dbe1d5ae7ee5
 ```yaml
 Type: String[]
 Parameter Sets: ByPolicy

sharepoint/sharepoint-ps/Microsoft.Online.SharePoint.PowerShell/New-SPOSiteManageVersionPolicyJob.md

@@ -36,7 +36,7 @@ New-SPOSiteManageVersionPolicyJob [-Identity] <SpoSitePipeBind> [-FileTypes <Str
 ## DESCRIPTION
 Starts a background job that does one or more of the following: 
 
-- set the version history limits of all document libraries to that of the site;
+- sets the version history limits of all document libraries to that of the site;
 
 - trims version in all document libraries according to each list's version history limits.
 
@@ -53,7 +53,7 @@ This effect can be applied to default version history limits, or a set of file t
 ### Example 1
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -SyncListPolicy -FileTypes @("Video","Audio") 
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -SyncListPolicy -FileTypes @("Video","Audio") 
 ```
 
 Apply the site video, audio, and default version history limits to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits.
@@ -62,7 +62,7 @@ Apply the site video, audio, and default version history limits to existing docu
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -SyncListPolicy -FileTypes @("Video","Audio") -ExcludeDefaultPolicy
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -SyncListPolicy -FileTypes @("Video","Audio") -ExcludeDefaultPolicy
 ```
 
 Apply the site video, audio version history limits to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits.
@@ -71,7 +71,7 @@ Apply the site video, audio version history limits to existing document librarie
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -SyncListPolicy -FileTypes @()
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -SyncListPolicy -FileTypes @()
 ```
 
 Apply the site default version history limits to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits.
@@ -80,7 +80,7 @@ Apply the site default version history limits to existing document libraries. If
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -SyncListPolicy
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -SyncListPolicy
 ```
 
 Apply the site version history limits (including file type overrides) to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits.
@@ -89,15 +89,15 @@ Apply the site version history limits (including file type overrides) to existin
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -SyncListPolicy -ExcludeDefaultPolicy
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -SyncListPolicy -ExcludeDefaultPolicy
 ```
 
-Apply the site level all file type version history limit overrides to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits.
+Apply all site file type version history limit overrides to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits.
 
 ### Example 6
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -TrimUseListPolicy -FileTypes @("Video","Audio") 
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -TrimUseListPolicy -FileTypes @("Video","Audio") 
 ```
 
 Trim video and audio file versions, and the file versions that don't have a file type override, based on each document library's version history limits.
@@ -106,7 +106,7 @@ Trim video and audio file versions, and the file versions that don't have a file
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -TrimUseListPolicy -FileTypes @("Video","Audio") -ExcludeDefaultPolicy
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -TrimUseListPolicy -FileTypes @("Video","Audio") -ExcludeDefaultPolicy
 ```
 
 Trim video and audio file versions based on each document library's version history limits.
@@ -115,7 +115,7 @@ Trim video and audio file versions based on each document library's version hist
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -TrimUseListPolicy -FileTypes @()
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -TrimUseListPolicy -FileTypes @()
 ```
 
 Trim file versions that don't have a file type override based on each document library's version history limits.
@@ -124,7 +124,7 @@ Trim file versions that don't have a file type override based on each document l
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -TrimUseListPolicy
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -TrimUseListPolicy
 ```
 
 Trim all file versions based on each document library's version history limits.
@@ -133,7 +133,7 @@ Trim all file versions based on each document library's version history limits.
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -TrimUseListPolicy -ExcludeDefaultPolicy
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -TrimUseListPolicy -ExcludeDefaultPolicy
 ```
 
 Trim all file versions that have a file type override based on each document library's version history limits.
@@ -142,7 +142,7 @@ Trim all file versions that have a file type override based on each document lib
 ### Example 11
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -SyncListPolicy -FileTypes @("Video","Audio") 
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -SyncListPolicy -FileTypes @("Video","Audio") 
 ```
 
 Apply the site video, audio, and default version history limits to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits. Then trim video and audio file versions, and the file versions that don't have a file type override, based on each document library's version history limits.
@@ -151,7 +151,7 @@ Apply the site video, audio, and default version history limits to existing docu
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -SyncListPolicy -TrimUseListPolicy -FileTypes @("Video","Audio") -ExcludeDefaultPolicy
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -SyncListPolicy -TrimUseListPolicy -FileTypes @("Video","Audio") -ExcludeDefaultPolicy
 ```
 
 Apply the site video, audio version history limits to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits. Then trim video and audio file versions based on each document library's version history limits.
@@ -160,7 +160,7 @@ Apply the site video, audio version history limits to existing document librarie
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -SyncListPolicy -TrimUseListPolicy -FileTypes @()
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -SyncListPolicy -TrimUseListPolicy -FileTypes @()
 ```
 
 Apply the site default version history limits to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits. Then trim file versions that don't have a file type override based on each document library's version history limits.
@@ -169,7 +169,7 @@ Apply the site default version history limits to existing document libraries. If
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -SyncListPolicy -TrimUseListPolicy
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -SyncListPolicy -TrimUseListPolicy
 ```
 
 Apply the site version history limits (including file type overrides) to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits. Then trim all file versions based on each document library's version history limits.
@@ -178,10 +178,10 @@ Apply the site version history limits (including file type overrides) to existin
 
 
 ```powershell
-New-SPOSiteManageVersionPolicyJob -Identity $siteUrl -SyncListPolicy -TrimUseListPolicy -ExcludeDefaultPolicy
+New-SPOSiteManageVersionPolicyJob -Identity https://contoso.sharepoint.com/sites/site1 -SyncListPolicy -TrimUseListPolicy -ExcludeDefaultPolicy
 ```
 
-Apply the site level all file type version history limit overrides to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits. Then trim all file versions that have a file type override based on each document library's version history limits.
+Apply all site file type version history limit overrides to existing document libraries. If the site is not broken inheritance for version history limits, then it applies the tenant version history limits. Then trim all file versions that have a file type override based on each document library's version history limits.
 
 ## PARAMETERS
 
@@ -237,7 +237,9 @@ Accept wildcard characters: False
 ```
 
 ### -Identity
-{{ Fill Identity Description }}
+> Applicable: SharePoint Online
+
+Specifies the URL of the site collection.
 
 ```yaml
 Type: SpoSitePipeBind

sharepoint/sharepoint-ps/Microsoft.Online.SharePoint.PowerShell/Remove-SPOSiteManageVersionPolicyJob.md

@@ -36,7 +36,7 @@ Stops processing of the in-progress manage version policy job for the given site
 Remove-SPOSiteFileVersionBatchDeleteJob -Identity https://contoso.sharepoint.com/sites/site1
 ```
 
-Stops further processing of site manage version policy job
+Stops further processing of site manage version policy job.
 
 ## PARAMETERS
 

sharepoint/sharepoint-ps/Microsoft.Online.SharePoint.PowerShell/Set-SPOListVersionPolicy.md

@@ -294,9 +294,7 @@ Accept wildcard characters: False
 ```
 
 ### -RemoveVersionExpirationFileTypeOverride
-An array of file type names. Removes the version history limits to a set of file types so that they will follow the default version history limits. 
-
-
+An array of file type names. Removes the version history limit override from a set of file types so that they will follow the default version history limits. 
 
 ```yaml
 Type: String[]

sharepoint/sharepoint-ps/Microsoft.Online.SharePoint.PowerShell/Set-SPOSite.md

@@ -157,7 +157,7 @@ Set-SPOSite [-Identity] <SpoSitePipeBind> [-InformationBarriersMode <String>] [-
 
 ```
 Set-SPOSite [-Identity] <SpoSitePipeBind> [-InformationBarriersMode <String>] [-ApplyToNewDocumentLibraries]
- [-RemoveVersionExpirationFileTypeOverride <String[]>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ -RemoveVersionExpirationFileTypeOverride <String[]> [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### ClearGroupId
@@ -1808,7 +1808,7 @@ Type: String[]
 Parameter Sets: RemoveSiteFileVersionPolicy
 Aliases:
 
-Required: False
+Required: True
 Position: Named
 Default value: None
 Accept pipeline input: False

sharepoint/sharepoint-ps/Microsoft.Online.SharePoint.PowerShell/Set-SPOTenant.md

@@ -4507,10 +4507,9 @@ Accept wildcard characters: False
 
 ### -RemoveVersionExpirationFileTypeOverride
 
-An array of file type names. Removes the version history limits to a set of file types so that they will follow the default version history limits. 
+An array of file type names. Removes the version history limit override from a set of file types so that they will follow the default version history limits. 
 
 The version history limits are applied on new document libraries in the tenant.
-
 > [!NOTE]
 > This feature is currently in preview and may not be available in your tenant.