@pnp/cli-microsoft365 6.0.0-beta.38c66cf → 6.0.0-beta.3a04435

package/docs/docs/cmd/spo/page/page-control-get.md

@@ -13,7 +13,7 @@ m365 spo page control get [options]
 `-i, --id <id>`
 : ID of the control to retrieve information for
 
-`-n, --name <name>`
+`-n, --pageName <pageName>`
 : Name of the page where the control is located
 
 `-u, --webUrl <webUrl>`
@@ -23,12 +23,12 @@ m365 spo page control get [options]
 
 ## Remarks
 
-If the specified `name` doesn't refer to an existing modern page, you will get a `File doesn't exists` error.
+If the specified `pageName` doesn't refer to an existing modern page, you will get a `File doesn't exists` error.
 
 ## Examples
 
 Get information about the control with ID _3ede60d3-dc2c-438b-b5bf-cc40bb2351e1_ placed on a modern page with name _home.aspx_
 
 ```sh
-m365 spo page control get --id 3ede60d3-dc2c-438b-b5bf-cc40bb2351e1 --webUrl https://contoso.sharepoint.com/sites/team-a --name home.aspx
+m365 spo page control get --id 3ede60d3-dc2c-438b-b5bf-cc40bb2351e1 --webUrl https://contoso.sharepoint.com/sites/team-a --pageName home.aspx
 ```

package/docs/docs/cmd/spo/page/page-control-list.md

@@ -10,7 +10,7 @@ m365 spo page control list [options]
 
 ## Options
 
-`-n, --name <name>`
+`-n, --pageName <pageName>`
 : Name of the page to list controls of
 
 `-u, --webUrl <webUrl>`
@@ -20,12 +20,12 @@ m365 spo page control list [options]
 
 ## Remarks
 
-If the specified name doesn't refer to an existing modern page, you will get a `File doesn't exists` error.
+If the specified `pageName` doesn't refer to an existing modern page, you will get a `File doesn't exists` error.
 
 ## Examples
 
 List controls on the modern page with name _home.aspx_
 
 ```sh
-m365 spo page control list --webUrl https://contoso.sharepoint.com/sites/team-a --name home.aspx
+m365 spo page control list --webUrl https://contoso.sharepoint.com/sites/team-a --pageName home.aspx
 ```

package/docs/docs/cmd/spo/page/page-control-set.md

@@ -13,7 +13,7 @@ m365 spo page control set [options]
 `-i, --id <id>`
 : ID of the control to update properties of
 
-`-n, --name <name>`
+`-n, --pageName <pageName>`
 : Name of the page where the control is located
 
 `-u, --webUrl <webUrl>`
@@ -29,7 +29,7 @@ m365 spo page control set [options]
 
 ## Remarks
 
-If the specified `name` doesn't refer to an existing modern page, you will get a `File doesn't exists` error.
+If the specified `pageName` doesn't refer to an existing modern page, you will get a `File doesn't exists` error.
 
 When specifying the JSON string with web part properties on Windows, you have to escape double quotes in a specific way. Considering the following value for the _webPartProperties_ option: `{"Foo":"Bar"}`, you should specify the value as \`"{""Foo"":""Bar""}"\`. In addition, when using PowerShell, you should use the `--%` argument.
 
@@ -38,11 +38,11 @@ When specifying the JSON string with web part properties on Windows, you have to
 Update web part data for the control with ID _3ede60d3-dc2c-438b-b5bf-cc40bb2351e1_ placed on a modern page with name _home.aspx_
 
 ```sh
-m365 spo page control set --id 3ede60d3-dc2c-438b-b5bf-cc40bb2351e1 --webUrl https://contoso.sharepoint.com/sites/team-a --name home.aspx --webPartData '{"title":"New WP Title","properties": {"description": "New description"}}'
+m365 spo page control set --id 3ede60d3-dc2c-438b-b5bf-cc40bb2351e1 --webUrl https://contoso.sharepoint.com/sites/team-a --pageName home.aspx --webPartData '{"title":"New WP Title","properties": {"description": "New description"}}'
 ```
 
 Update web part properties for the control with ID _3ede60d3-dc2c-438b-b5bf-cc40bb2351e1_ placed on a modern page with name _home.aspx_
 
 ```sh
-m365 spo page control set --id 3ede60d3-dc2c-438b-b5bf-cc40bb2351e1 --webUrl https://contoso.sharepoint.com/sites/team-a --name home.aspx --webPartProperties '{"description": "New description"}'
+m365 spo page control set --id 3ede60d3-dc2c-438b-b5bf-cc40bb2351e1 --webUrl https://contoso.sharepoint.com/sites/team-a --pageName home.aspx --webPartProperties '{"description": "New description"}'
 ```

package/docs/docs/cmd/spo/page/page-section-add.md

@@ -10,7 +10,7 @@ m365 spo page section add [options]
 
 ## Options
 
--n`, --name <name>`
+`-n, --pageName <pageName>`
 : Name of the page to add section to
 
 `-u, --webUrl <webUrl>`
@@ -26,12 +26,12 @@ m365 spo page section add [options]
 
 ## Remarks
 
-If the specified `name` doesn't refer to an existing modern page, you will get a _File doesn't exists_ error.
+If the specified `pageName` doesn't refer to an existing modern page, you will get a _File doesn't exists_ error.
 
 ## Examples
 
 Add section to the modern page named _home.aspx_
 
 ```sh
-m365 spo page section add --name home.aspx --webUrl https://contoso.sharepoint.com/sites/newsletter  --sectionTemplate OneColumn --order 1
+m365 spo page section add --pageName home.aspx --webUrl https://contoso.sharepoint.com/sites/newsletter  --sectionTemplate OneColumn --order 1
 ```

package/docs/docs/cmd/spo/page/page-section-get.md

@@ -13,7 +13,7 @@ m365 spo page section get [options]
 `-u, --webUrl <webUrl>`
 : URL of the site where the page to retrieve is located
 
-`-n, --name <name>`
+`-n, --pageName <pageName>`
 : Name of the page to get section information of
 
 `-s, --section <sectionId>`
@@ -23,12 +23,12 @@ m365 spo page section get [options]
 
 ## Remarks
 
-If the specified name doesn't refer to an existing modern page, you will get a _File doesn't exists_ error.
+If the specified `pageName` doesn't refer to an existing modern page, you will get a _File doesn't exists_ error.
 
 ## Examples
 
 Get information about the specified section of the modern page named _home.aspx_
 
 ```sh
-m365 spo page section get --webUrl https://contoso.sharepoint.com/sites/team-a --name home.aspx --section 1
+m365 spo page section get --webUrl https://contoso.sharepoint.com/sites/team-a --pageName home.aspx --section 1
 ```

package/docs/docs/cmd/spo/page/page-section-list.md

@@ -13,19 +13,19 @@ m365 spo page section list [options]
 `-u, --webUrl <webUrl>`
 : URL of the site where the page to retrieve is located
 
-`-n, --name <name>`
+`-n, --pageName <pageName>`
 : Name of the page to list sections of
 
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
 
-If the specified name doesn't refer to an existing modern page, you will get a _File doesn't exists_ error.
+If the specified `pageName` doesn't refer to an existing modern page, you will get a _File doesn't exists_ error.
 
 ## Examples
 
 List sections of a modern page named _home.aspx_
 
 ```sh
-m365 spo page section list --webUrl https://contoso.sharepoint.com/sites/team-a --name home.aspx
+m365 spo page section list --webUrl https://contoso.sharepoint.com/sites/team-a --pageName home.aspx
 ```

package/docs/docs/cmd/spo/roledefinition/roledefinition-add.md

@@ -0,0 +1,43 @@
+# spo roledefinition add
+
+Adds a new roledefinition to web
+
+## Usage
+
+```sh
+m365 spo roledefinition add [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: URL of the site to which role should be added
+
+`-n, --name <name>`
+: role definition name
+
+`-d, --description [description]`
+: role definition description
+
+`--rights [rights]`
+: A case-sensitive string array that contain the permissions needed for the custom action. Allowed values `EmptyMask,ViewListItems,AddListItems,EditListItems,DeleteListItems,ApproveItems,OpenItems,ViewVersions,DeleteVersions,CancelCheckout,ManagePersonalViews,ManageLists,ViewFormPages,AnonymousSearchAccessList,Open,ViewPages,AddAndCustomizePages,ApplyThemeAndBorder,ApplyStyleSheets,ViewUsageData,CreateSSCSite,ManageSubwebs,CreateGroups,ManagePermissions,BrowseDirectories,BrowseUserInfo,AddDelPrivateWebParts,UpdatePersonalWebParts,ManageWeb,AnonymousSearchAccessWebLists,UseClientIntegration,UseRemoteAPIs,ManageAlerts,CreateAlerts,EditMyUserInfo,EnumeratePermissions,FullMask`. Default `EmptyMask`
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+The `--rights` option accepts **case-sensitive** values.
+
+## Examples
+
+Adds the role definition for site _https://contoso.sharepoint.com/sites/project-x_ with name _test_
+
+```sh
+m365 spo roledefinition add --webUrl https://contoso.sharepoint.com/sites/project-x --name test
+```
+
+Adds the role definition for site _https://contoso.sharepoint.com/sites/project-x_ with name _test_ and description _test description_ and rights _ViewListItems,AddListItems,EditListItems,DeleteListItems_
+
+```sh
+m365 spo roledefinition add --webUrl https://contoso.sharepoint.com/sites/project-x --name test --description "test description" --rights "ViewListItems,AddListItems,EditListItems,DeleteListItems"
+```

package/docs/docs/cmd/spo/roledefinition/roledefinition-get.md

@@ -1,6 +1,6 @@
 # spo roledefinition get
 
-Gets specified role definition from web by id
+Gets specified role definition from web
 
 ## Usage
 

package/docs/docs/cmd/spo/serviceprincipal/serviceprincipal-grant-revoke.md

@@ -16,7 +16,7 @@ m365 spo sp grant revoke
 
 ## Options
 
-`-i, --grantId <grantId>`
+`-i, --id <id>`
 : `ObjectId` of the permission grant to revoke
 
 --8<-- "docs/cmd/_global.md"
@@ -33,5 +33,5 @@ The permission grant you want to revoke is denoted using its `ObjectId`. You can
 Revoke permission grant with ObjectId _50NAzUm3C0K9B6p8ORLtIsQccg4rMERGvFGRtBsk2fA_
 
 ```sh
-m365 spo serviceprincipal grant revoke --grantId 50NAzUm3C0K9B6p8ORLtIsQccg4rMERGvFGRtBsk2fA
+m365 spo serviceprincipal grant revoke --id 50NAzUm3C0K9B6p8ORLtIsQccg4rMERGvFGRtBsk2fA
 ```

package/docs/docs/cmd/spo/serviceprincipal/serviceprincipal-permissionrequest-approve.md

@@ -16,7 +16,7 @@ m365 spo sp permissionrequest approve
 
 ## Options
 
-`-i, --requestId <requestId>`
+`-i, --id <id>`
 : ID of the permission request to approve
 
 --8<-- "docs/cmd/_global.md"
@@ -33,5 +33,5 @@ The permission request you want to approve is denoted using its `ID`. You can re
 Approve permission request with id _4dc4c043-25ee-40f2-81d3-b3bf63da7538_
 
 ```sh
-m365 spo serviceprincipal permissionrequest approve --requestId 4dc4c043-25ee-40f2-81d3-b3bf63da7538
+m365 spo serviceprincipal permissionrequest approve --id 4dc4c043-25ee-40f2-81d3-b3bf63da7538
 ```

package/docs/docs/cmd/spo/serviceprincipal/serviceprincipal-permissionrequest-deny.md

@@ -16,7 +16,7 @@ m365 spo sp permissionrequest deny
 
 ## Options
 
-`-i, --requestId <requestId>`
+`-i, --id <id>`
 : ID of the permission request to deny
 
 --8<-- "docs/cmd/_global.md"
@@ -33,5 +33,5 @@ The permission request you want to approve is denoted using its `ID`. You can re
 Deny permission request with id _4dc4c043-25ee-40f2-81d3-b3bf63da7538_
 
 ```sh
-m365 spo serviceprincipal permissionrequest deny --requestId 4dc4c043-25ee-40f2-81d3-b3bf63da7538
+m365 spo serviceprincipal permissionrequest deny --id 4dc4c043-25ee-40f2-81d3-b3bf63da7538
 ```

package/docs/docs/cmd/spo/site/site-add.md

@@ -46,9 +46,6 @@ m365 spo site add [options]
 `--siteDesignId [siteDesignId]`
 : Id of the custom site design to use to create the site. When creating a communication site, specify either `siteDesign` or `siteDesignId` (applies to type CommunicationSite)
 
-`--allowFileSharingForGuestUsers`
-: (deprecated. Use `shareByEmailEnabled` instead) Determines whether it's allowed to share file with guests (applies to type CommunicationSite)
-
 `--shareByEmailEnabled`
 : Determines whether it's allowed to share file with guests (applies to type CommunicationSite)
 
@@ -87,9 +84,9 @@ The value of the `--storageQuota` option must not exceed the company's available
 
 The value of the `--storageQuotaWarningLevel` option must not exceed the the value of the `--storageQuota` option.
 
-If you try to create a site with the same URL as a site that has been previously moved to the recycle bin, you will get an error. To avoid this error, you can use the `--removeDeletedSite` option. Prior to creating the site, the spo site classic add command will check if the site with the specified URL has been previously moved to the recycle bin and if so, will remove it. Because removing sites from the recycle bin might take a moment, it should be used in conjunction with the `--wait` option so that the new site is not created before the old site is fully removed.
+If you try to create a site with the same URL as a site that has been previously moved to the recycle bin, you will get an error. To avoid this error, you can use the `--removeDeletedSite` option. Prior to creating the site, the spo site add command will check if the site with the specified URL has been previously moved to the recycle bin and if so, will remove it. Because removing sites from the recycle bin might take a moment, it should be used in conjunction with the `--wait` option so that the new site is not created before the old site is fully removed.
 
-Deleting and creating classic site collections is by default asynchronous and depending on the current state of Office 365, might take up to few minutes. If you're building a script with steps that require the site to be fully provisioned, you should use the `--wait` flag. When using this flag, the spo site classic add command will keep running until it received confirmation from Office 365 that the site has been fully provisioned.
+Deleting and creating classic site collections is by default asynchronous and depending on the current state of Office 365, might take up to few minutes. If you're building a script with steps that require the site to be fully provisioned, you should use the `--wait` flag. When using this flag, the spo site add command will keep running until it received confirmation from Office 365 that the site has been fully provisioned.
 
 ## Remarks for modern sites
 

package/docs/docs/cmd/spo/site/site-appcatalog-add.md

@@ -10,7 +10,7 @@ m365 spo site appcatalog add [options]
 
 ## Options
 
-`-u, --url <url>`
+`-u, --siteUrl <siteUrl>`
 : URL of the site collection where the app catalog should be added
 
 --8<-- "docs/cmd/_global.md"
@@ -23,7 +23,7 @@ m365 spo site appcatalog add [options]
 Add a site collection app catalog to the specified site
 
 ```sh
-m365 spo site appcatalog add --url https://contoso.sharepoint/sites/site
+m365 spo site appcatalog add --siteUrl https://contoso.sharepoint/sites/site
 ```
 
 ## More information

package/docs/docs/cmd/spo/site/site-appcatalog-remove.md

@@ -10,7 +10,7 @@ m365 spo site appcatalog remove [options]
 
 ## Options
 
-`-u, --url <url>`
+`-u, --siteUrl <siteUrl>`
 : URL of the site collection containing the app catalog to disable
 
 --8<-- "docs/cmd/_global.md"
@@ -27,7 +27,7 @@ While the command uses the term *'remove'*, like its equivalent PowerShell cmdle
 Remove the site collection app catalog from specified site
 
 ```sh
-m365 spo site appcatalog remove --url https://contoso.sharepoint/sites/site
+m365 spo site appcatalog remove --siteUrl https://contoso.sharepoint/sites/site
 ```
 
 ## More information

package/docs/docs/cmd/spo/site/site-apppermission-add.md

@@ -14,7 +14,7 @@ m365 spo site apppermission add [options]
 : URL of the site collection to add the permission
 
 `-p, --permission <permission>`
-: Permission to site (`read`, `write`, `read,write`). If multiple permissions have to be granted, they have to be comma separated ex. `read,write`
+: Permission to site (`read`, `write`, `manage` or `fullcontrol`)
 
 `-i, --appId [appId]`
 : Client ID of the Azure AD app for which to grant permissions

package/docs/docs/cmd/spo/site/site-apppermission-get.md

@@ -13,7 +13,7 @@ m365 spo site apppermission get [options]
 `-u, --siteUrl <siteUrl>`
 : URL of the site collection where the permission to retrieve is located
 
-`-i, --permissionId <permissionId>`
+`-i, --id <id>`
 : ID of the permission to retrieve
 
 --8<-- "docs/cmd/_global.md"
@@ -23,5 +23,5 @@ m365 spo site apppermission get [options]
 Return a specific application permissions for the _https://contoso.sharepoint.com/sites/project-x_ site collection with permission id _aTowaS50fG1zLnNwLmV4dHw4OWVhNWM5NC03NzM2LTRlMjUtOTVhZC0zZmE5NWY2MmI2NmVAZGUzNDhiYzctMWFlYi00NDA2LThjYjMtOTdkYjAyMWNhZGI0_
 
 ```sh
-m365 spo site apppermission get --siteUrl https://contoso.sharepoint.com/sites/project-x --permissionId aTowaS50fG1zLnNwLmV4dHw4OWVhNWM5NC03NzM2LTRlMjUtOTVhZC0zZmE5NWY2MmI2NmVAZGUzNDhiYzctMWFlYi00NDA2LThjYjMtOTdkYjAyMWNhZGI0
+m365 spo site apppermission get --siteUrl https://contoso.sharepoint.com/sites/project-x --id aTowaS50fG1zLnNwLmV4dHw4OWVhNWM5NC03NzM2LTRlMjUtOTVhZC0zZmE5NWY2MmI2NmVAZGUzNDhiYzctMWFlYi00NDA2LThjYjMtOTdkYjAyMWNhZGI0
 ```

package/docs/docs/cmd/spo/site/site-apppermission-remove.md

@@ -19,7 +19,7 @@ m365 spo site apppermission remove [options]
 `-n, --appDisplayName [appDisplayName]`
 : App display name
 
-`-i, --permissionId [permissionId]`
+`-i, --id [id]`
 : ID of the permission to remove
 
 `--confirm`
@@ -44,5 +44,5 @@ m365 spo site apppermission remove --siteUrl https://contoso.sharepoint.com/site
 Removes the application permission with the specified ID on site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo site apppermission remove --siteUrl https://contoso.sharepoint.com/sites/project-x --permissionId aTowaS50fG1zLnNwLmV4dHw4OWVhNWM5NC03NzM2LTRlMjUtOTVhZC0zZmE5NWY2MmI2NmVAZGUzNDhiYzctMWFlYi00NDA2LThjYjMtOTdkYjAyMWNhZGI0
+m365 spo site apppermission remove --siteUrl https://contoso.sharepoint.com/sites/project-x --id aTowaS50fG1zLnNwLmV4dHw4OWVhNWM5NC03NzM2LTRlMjUtOTVhZC0zZmE5NWY2MmI2NmVAZGUzNDhiYzctMWFlYi00NDA2LThjYjMtOTdkYjAyMWNhZGI0
 ```

package/docs/docs/cmd/spo/site/site-apppermission-set.md

@@ -13,17 +13,17 @@ m365 spo site apppermission set [options]
 `-u, --siteUrl <siteUrl>`
 : URL of the site collection where the permission to retrieve is located
 
-`-i, --permissionId [permissionId]`
-: ID of the permission to update. Specify `permissionId`, `appId` or `appDisplayName`
+`-i, --id [id]`
+: ID of the permission to update. Specify `id`, `appId` or `appDisplayName`
 
 `--appId [appId]`
-: Client ID of the Azure AD app for which to update permissions. Specify `permissionId`, `appId` or `appDisplayName`
+: Client ID of the Azure AD app for which to update permissions. Specify `id`, `appId` or `appDisplayName`
 
 `-n, --appDisplayName [appDisplayName]`
-: Display name of the Azure AD app for which to update permissions. Specify `permissionId`, `appId` or `appDisplayName`
+: Display name of the Azure AD app for which to update permissions. Specify `id`, `appId` or `appDisplayName`
 
 `-p, --permission <permission>`
-: Permission to site (`read`, `write`, `read,write`). If multiple permissions have to be granted, they have to be comma separated ex. `read,write`
+: Permission to site (`read`, `write`, `manage` or `fullcontrol`)
 
 --8<-- "docs/cmd/_global.md"
 
@@ -32,7 +32,7 @@ m365 spo site apppermission set [options]
 Updates a specific application permission to _read_ for the _https://contoso.sharepoint.com/sites/project-x_ site collection with permission id _aTowaS50fG1zLnNwLmV4dHw4OWVhNWM5NC03NzM2LTRlMjUtOTVhZC0zZmE5NWY2MmI2NmVAZGUzNDhiYzctMWFlYi00NDA2LThjYjMtOTdkYjAyMWNhZGI0_
 
 ```sh
-m365 spo site apppermission set --siteUrl https://contoso.sharepoint.com/sites/project-x --permissionId aTowaS50fG1zLnNwLmV4dHw4OWVhNWM5NC03NzM2LTRlMjUtOTVhZC0zZmE5NWY2MmI2NmVAZGUzNDhiYzctMWFlYi00NDA2LThjYjMtOTdkYjAyMWNhZGI0 --permission read
+m365 spo site apppermission set --siteUrl https://contoso.sharepoint.com/sites/project-x --id aTowaS50fG1zLnNwLmV4dHw4OWVhNWM5NC03NzM2LTRlMjUtOTVhZC0zZmE5NWY2MmI2NmVAZGUzNDhiYzctMWFlYi00NDA2LThjYjMtOTdkYjAyMWNhZGI0 --permission read
 ```
 
 Updates a specific application permission to _read_ for the _https://contoso.sharepoint.com/sites/project-x_ site collection with an application called _Foo_

package/docs/docs/cmd/spo/site/site-chrome-set.md

@@ -10,7 +10,7 @@ m365 spo site chrome set [options]
 
 ## Options
 
-`-u, --url <url>`
+`-u, --siteUrl <siteUrl>`
 : URL of the site collection to which you want to change the chrome header/footer
 
 `--headerLayout [headerLayout]`
@@ -42,17 +42,17 @@ m365 spo site chrome set [options]
 Show site header in compact mode
 
 ```sh
-m365 spo site chrome set --url https://contoso.sharepoint.com/sites/project-x --headerLayout Compact
+m365 spo site chrome set --siteUrl https://contoso.sharepoint.com/sites/project-x --headerLayout Compact
 ```
 
 Show site header in extended mode and display the logo on the right
 
 ```sh
-m365 spo site chrome set --url https://contoso.sharepoint.com/sites/project-x  --headerLayout Extended --logoAlignment Right
+m365 spo site chrome set --siteUrl https://contoso.sharepoint.com/sites/project-x  --headerLayout Extended --logoAlignment Right
 ```
 
 Disable the footer on the site
 
 ```sh
-m365 spo site chrome set --url https://contoso.sharepoint.com/sites/project-x --disableFooter true
+m365 spo site chrome set --siteUrl https://contoso.sharepoint.com/sites/project-x --disableFooter true
 ```

package/docs/docs/cmd/spo/site/site-groupify.md

@@ -11,15 +11,9 @@ Connects site collection to an Microsoft 365 Group
 m365 spo site groupify [options]
 ```
 
-## Alias
-
-```sh
-m365 spo site groupify
-```
-
 ## Options
 
-`-u, --siteUrl <siteUrl>`
+`-u, --url <url>`
 : URL of the site collection being connected to new Microsoft 365 Group
 
 `-a, --alias <alias>`
@@ -51,25 +45,25 @@ When connecting site collection to an Microsoft 365 Group, SharePoint will creat
 Connect site collection to an Microsoft 365 Group
 
 ```sh
-m365 spo site groupify --siteUrl https://contoso.sharepoin.com/sites/team-a --alias team-a --displayName 'Team A'
+m365 spo site groupify --url https://contoso.sharepoin.com/sites/team-a --alias team-a --displayName 'Team A'
 ```
 
 Connect site collection to an Microsoft 365 Group and make the group public
 
 ```sh
-m365 spo site groupify --siteUrl https://contoso.sharepoin.com/sites/team-a --alias team-a --displayName 'Team A' --isPublic
+m365 spo site groupify --url https://contoso.sharepoin.com/sites/team-a --alias team-a --displayName 'Team A' --isPublic
 ```
 
 Connect site collection to an Microsoft 365 Group and set the group classification
 
 ```sh
-m365 spo site groupify --siteUrl https://contoso.sharepoin.com/sites/team-a --alias team-a --displayName 'Team A' --classification HBI
+m365 spo site groupify --url https://contoso.sharepoin.com/sites/team-a --alias team-a --displayName 'Team A' --classification HBI
 ```
 
 Connect site collection to an Microsoft 365 Group and keep the old home page
 
 ```sh
-m365 spo site groupify --siteUrl https://contoso.sharepoin.com/sites/team-a --alias team-a --displayName 'Team A' --keepOldHomepage
+m365 spo site groupify --url https://contoso.sharepoin.com/sites/team-a --alias team-a --displayName 'Team A' --keepOldHomepage
 ```
 
 ## More information

package/docs/docs/cmd/spo/{hubsite/hubsite-connect.md → site/site-hubsite-connect.md}

@@ -1,19 +1,19 @@
-# spo hubsite connect
+# spo site hubsite connect
 
 Connects the specified site collection to the given hub site
 
 ## Usage
 
 ```sh
-m365 spo hubsite connect [options]
+m365 spo site hubsite connect [options]
 ```
 
 ## Options
 
-`-u, --url <url>`
+`-u, --siteUrl <siteUrl>`
 : The URL of the site collection to connect to the hub site
 
-`-i, --hubSiteId <hubSiteId>`
+`-i, --id <id>`
 : The ID of the hub site to which to connect the site collection
 
 --8<-- "docs/cmd/_global.md"
@@ -25,14 +25,14 @@ m365 spo hubsite connect [options]
 
 If the specified site collection is already connected to a hub site, it will be disconnected and connected to the newly specified hub site.
 
-If the specified `hubSiteId` doesn't point to a valid hub site, you will get a `ResourceNotFoundException` error.
+If the specified `id` doesn't point to a valid hub site, you will get a `ResourceNotFoundException` error.
 
 ## Examples
 
-Connect the site collection with URL _https://contoso.sharepoint.com/sites/contoso-sales_ to the hub site with ID _255a50b2-527f-4413-8485-57f4c17a24d1_
+Connect a specific site collection to a hub site
 
 ```sh
-m365 spo hubsite connect --url https://contoso.sharepoint.com/sites/contoso-sales --hubSiteId 255a50b2-527f-4413-8485-57f4c17a24d1
+m365 spo site hubsite connect --siteUrl https://contoso.sharepoint.com/sites/contoso-sales --id 255a50b2-527f-4413-8485-57f4c17a24d1
 ```
 
 ## More information

package/docs/docs/cmd/spo/site/site-hubsite-disconnect.md

@@ -0,0 +1,42 @@
+# spo site hubsite disconnect
+
+Disconnects the specified site collection from its hub site
+
+## Usage
+
+```sh
+m365 spo site hubsite disconnect [options]
+```
+
+## Options
+
+`-u, --siteUrl <siteUrl>`
+: URL of the site collection to disconnect from its hub site
+
+`--confirm`
+: Don't prompt for confirmation
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+!!! attention
+    This command is based on a SharePoint API that is currently in preview and is subject to change once the API reached general availability.
+
+## Examples
+
+Disconnect a specific site collection from its hub site. Will prompt for confirmation before disconnecting from the hub site.
+
+```sh
+m365 spo site hubsite disconnect --siteUrl https://contoso.sharepoint.com/sites/sales
+```
+
+Disconnect a specific site collection from its hub site without prompting for confirmation.
+
+```sh
+m365 spo site hubsite disconnect --siteUrl https://contoso.sharepoint.com/sites/sales --confirm
+```
+
+## More information
+
+- SharePoint hub sites new in Microsoft 365: [https://techcommunity.microsoft.com/t5/SharePoint-Blog/SharePoint-hub-sites-new-in-Office-365/ba-p/109547](https://techcommunity.microsoft.com/t5/SharePoint-Blog/SharePoint-hub-sites-new-in-Office-365/ba-p/109547)

package/docs/docs/cmd/spo/site/site-list.md

@@ -10,12 +10,18 @@ m365 spo site list [options]
 
 ## Options
 
-`--type [type]`
-: type of modern sites to list. Allowed values `TeamSite,CommunicationSite`, default `TeamSite`
+`-t, --type [type]`
+: convenience option for type of sites to list. Allowed values are `TeamSite,CommunicationSite`.
+
+`--webTemplate [webTemplate]`
+: type of sites to list. To be used with values like `GROUP#0` and `SITEPAGEPUBLISHING#0`. Specify either `type` or `webTemplate`, but not both.  
 
 `-f, --filter [filter]`
 : filter to apply when retrieving sites
 
+`--includeOneDriveSites`
+: use this switch to include OneDrive sites in the result when retrieving sites. Do not specify the `type` or `webTemplate` options when using this.
+
 `--deleted`
 : use this switch to only return deleted sites
 
@@ -28,34 +34,40 @@ m365 spo site list [options]
 
 Using the `-f, --filter` option you can specify which sites you want to retrieve. For example, to get sites with _project_ in their URL, use `Url -like 'project'` as the filter.
 
-When using the text output type (default), the command lists only the values of the `Title`, and `Url` properties of the site. When setting the output type to JSON, all available properties are included in the command output.
+When using the text output type, the command lists only the values of the `Title`, and `Url` properties of the site. When setting the output type to JSON, all available properties are included in the command output.
 
 ## Examples
 
-List all modern team sites in the currently connected tenant
+List all sites in the currently connected tenant
 
 ```sh
 m365 spo site list
 ```
 
-List all modern team sites in the currently connected tenant
+List all group connected team sites in the currently connected tenant
 
 ```sh
 m365 spo site list --type TeamSite
 ```
 
-List all modern communication sites in the currently connected tenant
+List all communication sites in the currently connected tenant
 
 ```sh
 m365 spo site list --type CommunicationSite
 ```
 
-List all modern team sites that contain _project_ in the URL
+List all group connected team sites that contain _project_ in the URL
 
 ```sh
 m365 spo site list --type TeamSite --filter "Url -like 'project'"
 ```
 
+List all sites in the currently connected tenant including OneDrive sites
+
+```sh
+m365 spo site list --includeOneDriveSites
+```
+
 List all deleted sites in the tenant you're logged in to
 
 ```sh