@pnp/cli-microsoft365 6.0.0-beta.4d2402f → 6.0.0-beta.5637b93

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

@@ -13,7 +13,7 @@ m365 spo page column 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 columns of
 
 `-s, --section <sectionId>`
@@ -23,12 +23,12 @@ m365 spo page column 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 columns in the first section of a modern page with name _home.aspx_
 
 ```sh
-m365 spo page column list --webUrl https://contoso.sharepoint.com/sites/team-a --name home.aspx --section 1
+m365 spo page column list --webUrl https://contoso.sharepoint.com/sites/team-a --pageName home.aspx --section 1
 ```

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-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-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`, or `owner`)
 
 `-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`, or `owner`)
 
 --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

@@ -19,7 +19,7 @@ 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 +51,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/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

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

@@ -10,13 +10,13 @@ m365 spo site rename [options]
 
 ## Options
 
-`-u, --siteUrl <siteUrl>`
+`-u, --url <url>`
 : The URL of the site to rename
 
-`--newSiteUrl <newSiteUrl>`
+`--newUrl <newUrl>`
 : New URL for the site collection
 
-`--newSiteTitle [newSiteTitle]`
+`--newTitle [newTitle]`
 : New title for the site
 
 `--suppressMarketplaceAppCheck`
@@ -42,17 +42,17 @@ Renaming site collections is by default asynchronous and depending on the curren
 Starts the rename of the site collection with name "samplesite" to "renamed" without modifying the title
 
 ```sh
-m365 spo site rename --siteUrl http://contoso.sharepoint.com/samplesite --newSiteUrl http://contoso.sharepoint.com/renamed
+m365 spo site rename --url http://contoso.sharepoint.com/samplesite --newUrl http://contoso.sharepoint.com/renamed
 ```
 
 Starts the rename of the site collection with name "samplesite" to "renamed" modifying the title of the site to "New Title"
 
 ```sh
-m365 spo site rename --siteUrl http://contoso.sharepoint.com/samplesite --newSiteUrl http://contoso.sharepoint.com/renamed --newSiteTitle "New Title"
+m365 spo site rename --url http://contoso.sharepoint.com/samplesite --newUrl http://contoso.sharepoint.com/renamed --newTitle "New Title"
 ```
 
 Renames the specified site collection and waits for the operation to complete
 
 ```sh
-m365 spo site rename --siteUrl http://contoso.sharepoint.com/samplesite --newSiteUrl http://contoso.sharepoint.com/renamed --newSiteTitle "New Title" --wait
+m365 spo site rename --url http://contoso.sharepoint.com/samplesite --newUrl http://contoso.sharepoint.com/renamed --newTitle "New Title" --wait
 ```

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

@@ -13,6 +13,12 @@ m365 spo site set [options]
 `-u, --url <url>`
 : The URL of the site collection to update
 
+`-t, --title [title]`
+: The new title for the site collection
+
+`-d, --description [description]`
+: The site description
+
 `--classification [classification]`
 : The new classification for the site collection
 
@@ -31,18 +37,36 @@ m365 spo site set [options]
 `--siteDesignId [siteDesignId]`
 : Id of the custom site design to apply to the site
 
-`--title [title]`
-: The new title for the site collection
-
-`--description [description]`
-: The site description
-
 `--sharingCapability [sharingCapability]`
 : The sharing capability for the site. Allowed values:  `Disabled`, `ExternalUserSharingOnly`, `ExternalUserAndGuestSharing`, `ExistingExternalUserSharingOnly`.
 
 `--siteLogoUrl [siteLogoUrl]`
 : Set the logo for the site collection. This can be an absolute or relative URL to a file on the current site collection.
 
+`--resourceQuota [resourceQuota]`
+: The quota for this site collection in Sandboxed Solutions units
+
+`--resourceQuotaWarningLevel [resourceQuotaWarningLevel]`
+: The warning level for the resource quota
+
+`--storageQuota [storageQuota]`
+: The storage quota for this site collection in megabytes
+
+`--storageQuotaWarningLevel [storageQuotaWarningLevel]`
+: The warning level for the storage quota in megabytes
+
+`--allowSelfServiceUpgrade [allowSelfServiceUpgrade]`
+: Set to allow tenant administrators to upgrade the site collection
+
+`--lockState [lockState]`
+: Sets site's lock state. Allowed values `Unlock,NoAdditions,ReadOnly,NoAccess`
+
+`--noScriptSite [noScriptSite]`
+: Specifies if the site allows custom script or not
+
+`--wait`
+: Wait for the settings to be applied before completing the command
+
 --8<-- "docs/cmd/_global.md"
 
 !!! important
@@ -56,6 +80,20 @@ The `isPublic` property can be set only on groupified site collections. If you t
 
 When setting owners, the specified owners will be added to the already configured owners. Existing owners will not be removed.
 
+The value of the `--resourceQuota` option must not exceed the company's aggregate available Sandboxed Solutions quota. For more information, see Resource Usage Limits on Sandboxed Solutions in SharePoint 2010: [http://msdn.microsoft.com/en-us/library/gg615462.aspx](http://msdn.microsoft.com/en-us/library/gg615462.aspx).
+
+The value of the `--resourceQuotaWarningLevel` option must not exceed the value of the `--resourceQuota` option or the current value of the _UserCodeMaximumLevel_ property.
+
+The value of the `--storageQuota` option must not exceed the company's available quota.
+
+The value of the `--storageQuotaWarningLevel` option must not exceed the the value of the `--storageQuota` option or the current value of the _StorageMaximumLevel_ property.
+
+For more information on locking sites see [https://technet.microsoft.com/en-us/library/cc263238.aspx](https://technet.microsoft.com/en-us/library/cc263238.aspx).
+
+For more information on configuring no script sites see [https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f](https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f).
+
+Setting site properties is by default asynchronous and depending on the current state of Microsoft 365, might take up to few minutes. If you're building a script with steps that require the site to be fully configured, you should use the `--wait` flag. When using this flag, the `spo site set` command will keep running until it received confirmation from Microsoft 365 that the site has been fully configured.
+
 ## Examples
 
 Update site collection's classification
@@ -129,3 +167,9 @@ Unset the logo on the site
 ```sh
 m365 spo site set --url https://estruyfdev2.sharepoint.com/sites/sales --siteLogoUrl ""
 ```
+
+Lock the site preventing users from accessing it. Wait for the configuration to complete
+
+```sh
+m365 spo site set --url https://contoso.sharepoint.com/sites/team --LockState NoAccess --wait
+```

package/docs/docs/cmd/spo/sitedesign/sitedesign-rights-grant.md

@@ -10,7 +10,7 @@ m365 spo sitedesign rights grant [options]
 
 ## Options
 
-`-i, --id <id>`
+`-i, --siteDesignId <siteDesignId>`
 : The ID of the site design to grant rights on
 
 `-p, --principals <principals>`
@@ -26,19 +26,19 @@ m365 spo sitedesign rights grant [options]
 Grant user with alias _PattiF_ view permission to the specified site design
 
 ```sh
-m365 spo sitedesign rights grant --id 9b142c22-037f-4a7f-9017-e9d8c0e34b98 --principals PattiF --rights View
+m365 spo sitedesign rights grant --siteDesignId 9b142c22-037f-4a7f-9017-e9d8c0e34b98 --principals PattiF --rights View
 ```
 
 Grant users with aliases _PattiF_ and _AdeleV_ view permission to the specified site design
 
 ```sh
-m365 spo sitedesign rights grant --id 9b142c22-037f-4a7f-9017-e9d8c0e34b98 --principals "PattiF,AdeleV" --rights View
+m365 spo sitedesign rights grant --siteDesignId 9b142c22-037f-4a7f-9017-e9d8c0e34b98 --principals "PattiF,AdeleV" --rights View
 ```
 
 Grant user with email _PattiF@contoso.com_ view permission to the specified site design
 
 ```sh
-m365 spo sitedesign rights grant --id 9b142c22-037f-4a7f-9017-e9d8c0e34b98 --principals PattiF@contoso.com --rights View
+m365 spo sitedesign rights grant --siteDesignId 9b142c22-037f-4a7f-9017-e9d8c0e34b98 --principals PattiF@contoso.com --rights View
 ```
 
 ## More information