Merge branch 'master' into master

Author: kenwith

sharepoint/sharepoint-ps/sharepoint-online/Register-SPOHubSite.md

@@ -27,7 +27,7 @@ Register-SPOHubSite
 Use this cmdlet to register an existing site collection as a hub site.
 
 > [!IMPORTANT]
-> A maximum of 100 hub sites may be created per tenant, with 'unlimited' number of site collections associated to a hub site.
+> A maximum of 2000 hub sites may be created per tenant, with 'unlimited' number of site collections associated to a hub site.
 
 > [!NOTE]
 > It can take up to 2-4 hours for the changes to appear.

sharepoint/sharepoint-ps/sharepoint-online/Remove-SPOOrgAssetsLibrary.md

@@ -20,19 +20,28 @@ Removes a library that was designated as a central location for organization ass
 ## SYNTAX
 
 ```powershell
-Remove-SPOOrgAssetsLibrary -LibraryUrl <String> -ShouldRemoveFromCdn <Boolean>
- [<CommonParameters>]
+Remove-SPOOrgAssetsLibrary [-LibraryUrl <String>] [-ListId <Guid>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
 
-The Remove-SPOOrgAssetsLibrary cmdlet removes a library that was designated as a central location for organization assets across the tenant. Once this cmdlet is run, this library will no longer be accessible from the "Your organization" tab in the file picker.
+The Remove-SPOOrgAssetsLibrary cmdlet removes a library that was designated as a central location for organization assets across the tenant. Once this cmdlet is run, this library will no longer be accessible from the "Your organization" tab in the file picker. When running the cmdlet, either the library URL or library ID (not both) needs to be indicated.
+
+Once the library is removed, CDN will still be enabled for this library. To disable CDN for this library, use Remove-SPOTenantCdnOrigin with the server relative URL (example: /sites/branding/assets).
 
 ## EXAMPLES
 
 ### Example 1
 
-This example removes https://contoso.sharepoint.com/sites/branding/Assets as a designated library. Assets within this library will no longer be accessible from the "Your organization" tab in the file picker.
+This example removes https://contoso.sharepoint.com/sites/branding/Assets as a designated library using the library ID. Assets within this library will no longer be accessible from the "Your organization" tab in the file picker.
+
+```powershell
+Remove-SPOOrgAssetsLibrary -ListId 58454454-6546-6466-9769-646464623988
+```
+
+### Example 2
+
+This example removes https://contoso.sharepoint.com/sites/branding/Assets as a designated library using the library URL. Assets within this library will no longer be accessible from the "Your organization" tab in the file picker.
 
 ```powershell
 Remove-SPOOrgAssetsLibrary -LibraryURL sites/branding/Assets
@@ -49,23 +58,23 @@ Type: String
 Parameter Sets: (All)
 Aliases:
 Applicable: SharePoint Online
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ShouldRemoveFromCdn
+### -ListId
 
-Remove CDN from the designated library.
+Indicates the library ID for the library to be removed as a central location for organization assets.
 
 ```yaml
-Type: Boolean
+Type: Guid
 Parameter Sets: (All)
 Aliases:
 Applicable: SharePoint Online
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False

sharepoint/sharepoint-ps/sharepoint-online/Set-SPOOrgAssetsLibrary.md

@@ -31,12 +31,20 @@ The Set-SPOOrgAssetsLibrary cmdlet updates information for a library that is des
 
 ### Example 1
 
-This example updates the thumbnail publicly displayed for the library to contosologo2.jpg.
+This example updates the thumbnail URL publicly displayed for the library to contosologo2.jpg.
 
 ```powershell
 Set-SPOOrgAssetsLibrary -LibraryURL sites/branding/Assets -ThumbnailURL https://contoso.sharepoint.com/sites/branding/Assets/contosologo2.jpg
 ```
 
+### Example 2
+
+This example removes the thumbnail URL that was previously set for the library.
+
+```powershell
+Set-SPOOrgAssetsLibrary -LibraryURL sites/branding/Assets -ThumbnailURL ""
+```
+
 ## PARAMETERS
 
 ### -LibraryUrl

sharepoint/sharepoint-ps/sharepoint-server/Set-SPSecurityTokenServiceConfig.md

@@ -96,8 +96,7 @@ This example updates the signing certificate of the SharePoint security token se
 
 ### --------------------EXAMPLE 2---------------------
 ```
-C:\PS>$stsCert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2 "c:\sts.pfx","a",20
-
+$stsCert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2 "c:\sts.pfx","a",20
 Set-SPSecurityTokenServiceConfig -ImportSigningCertificate $stsCert
 ```
 
@@ -107,7 +106,7 @@ This example imports the signing certificate for the SharePoint STS identity pro
 ## PARAMETERS
 
 ### -QueueSigningCertificateThumbprint
-{{ Fill QueueSigningCertificateThumbprint Description }}
+Sets the certificate with the provided thumbprint as the queued signing certificate.
 
 ```yaml
 Type: String
@@ -136,7 +135,7 @@ Accept wildcard characters: False
 ```
 
 ### -RevokeSigningCertificateThumbprint
-{{ Fill RevokeSigningCertificateThumbprint Description }}
+Revoke the signing certificate with the provided thumbprint.
 
 ```yaml
 Type: String
@@ -247,7 +246,7 @@ Accept wildcard characters: False
 
 ### -MaxLogonTokenCacheItems
 Specifies the maximum number of entries for the in-memory logon token cache.
-The default value is 10000 entries.
+The default value is 250 entries.
 
 The type must be a valid integer.
 
@@ -266,7 +265,7 @@ Accept wildcard characters: False
 
 ### -MaxServiceTokenCacheItems
 Specifies the maximum number of entries for the in-memory service token cache.
-The default value is 10000 entries.
+The default value is 250 entries.
 
 The type must be a valid integer.
 
@@ -284,7 +283,7 @@ Accept wildcard characters: False
 ```
 
 ### -QueueSigningCertificate
-{{ Fill QueueSigningCertificate Description }}
+Sets the provided certificate as the queued signing certificate.
 
 ```yaml
 Type: X509Certificate2
@@ -300,7 +299,7 @@ Accept wildcard characters: False
 ```
 
 ### -QueueSigningCertificateStoreName
-{{ Fill QueueSigningCertificateStoreName Description }}
+The store to search in when looking up a certificate to be set as the queued signing certificate by its thumbprint. Required if QueueSigningCertificateThumbprint was specified.
 
 ```yaml
 Type: String
@@ -316,7 +315,7 @@ Accept wildcard characters: False
 ```
 
 ### -RevokeSigningCertificate
-{{ Fill RevokeSigningCertificate Description }}
+Revokes the signing certificate that matches the provided certificate.
 
 ```yaml
 Type: X509Certificate2
@@ -332,7 +331,7 @@ Accept wildcard characters: False
 ```
 
 ### -RevokeSigningCertificateStoreName
-{{ Fill RevokeSigningCertificateStoreName Description }}
+The store to search when looking up a certificate to be revoked by its thumbprint. Required if the QueueSigningCertificateThumbprint was specified.
 
 ```yaml
 Type: String

sharepoint/sharepoint-ps/sharepoint-server/Set-SPSiteSubscriptionConfig.md

@@ -32,10 +32,10 @@ For permissions and the most current information about Windows PowerShell for Sh
 
 ### --------------------EXAMPLE---------------------
 ```
-Set-SPSiteSubscription https://contoso.com -FeatureSet 12345678-90ab-cdef-1234-567890abcdef
+Set-SPSiteSubscriptionConfig https://contoso.com -FeaturePack 12345678-90ab-cdef-1234-567890abcdef
 ```
 
-This example sets the Feature set of the entire site subscription that contains https://contoso.com with a Feature set GUID.
+This example sets the Feature set of the entire site subscription that contains https://contoso.com with a Feature pack GUID.
 
 
 ## PARAMETERS