@pnp/cli-microsoft365 6.0.0-beta.e031afa → 6.0.0-beta.e7c60af

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

@@ -10,7 +10,7 @@ m365 spo app list [options]
 
 ## Options
 
-`-s, --scope [scope]`
+`-s, --appCatalogScope [appCatalogScope]`
 : Target app catalog. `tenant,sitecollection`. Default `tenant`
 
 `-u, --appCatalogUrl [appCatalogUrl]`
@@ -37,7 +37,7 @@ m365 spo app list
 Return the list of available apps from a site collection app catalog of site _https://contoso.sharepoint.com/sites/site1_.
 
 ```sh
-m365 spo app list --scope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
+m365 spo app list --appCatalogScope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
 ```
 
 ## More information

package/docs/docs/cmd/spo/app/app-remove.md

@@ -16,7 +16,7 @@ m365 spo app remove [options]
 `-u, --appCatalogUrl [appCatalogUrl]`
 : URL of the tenant or site collection app catalog. It must be specified when the scope is `sitecollection`
 
-`-s, --scope [scope]`
+`-s, --appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 `--confirm`
@@ -55,7 +55,7 @@ m365 spo app remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --appCatalogUrl ht
 Remove the specified app from a site collection app catalog of site _https://contoso.sharepoint.com/sites/site1_.
 
 ```sh
-m365 spo app remove --id d95f8c94-67a1-4615-9af8-361ad33be93c --scope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1/AppCatalog
+m365 spo app remove --id d95f8c94-67a1-4615-9af8-361ad33be93c --appCatalogScope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1/AppCatalog
 ```
 
 ## More information

package/docs/docs/cmd/spo/app/app-retract.md

@@ -16,7 +16,7 @@ m365 spo app retract [options]
 `-u, --appCatalogUrl [appCatalogUrl]`
 : URL of the tenant or site collection app catalog. It must be specified when the scope is `sitecollection`
 
-`-s, --scope [scope]`
+`-s, --appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 `--confirm`
@@ -55,7 +55,7 @@ m365 spo app retract --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --confirm
 Retract the specified app from a site collection app catalog of site _https://contoso.sharepoint.com/sites/site1_.
 
 ```sh
-m365 spo app retract --id d95f8c94-67a1-4615-9af8-361ad33be93c --scope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
+m365 spo app retract --id d95f8c94-67a1-4615-9af8-361ad33be93c --appCatalogScope sitecollection --appCatalogUrl https://contoso.sharepoint.com/sites/site1
 ```
 
 ## More information

package/docs/docs/cmd/spo/app/app-uninstall.md

@@ -16,7 +16,7 @@ m365 spo app uninstall [options]
 `-s, --siteUrl <siteUrl>`
 : Absolute URL of the site to uninstall the app from
 
-`--scope [scope]`
+`--appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 `--confirm`
@@ -45,7 +45,7 @@ m365 spo app uninstall --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https
 Uninstall the app with ID _b2307a39-e878-458b-bc90-03bc578531d6_ from the _https://contoso.sharepoint.com_ site where the app is deployed to the site collection app catalog of _https://contoso.sharepoint.com_.
 
 ```sh
-m365 spo app uninstall --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https://contoso.sharepoint.com --scope sitecollection
+m365 spo app uninstall --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https://contoso.sharepoint.com --appCatalogScope sitecollection
 ```
 
 ## More information

package/docs/docs/cmd/spo/app/app-upgrade.md

@@ -16,7 +16,7 @@ m365 spo app upgrade [options]
 `-s, --siteUrl <siteUrl>`
 : Absolute URL of the site to upgrade the app in
 
-`--scope [scope]`
+`--appCatalogScope [appCatalogScope]`
 : Scope of the app catalog: `tenant,sitecollection`. Default `tenant`
 
 --8<-- "docs/cmd/_global.md"
@@ -36,7 +36,7 @@ m365 spo app upgrade --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https:/
 Upgrade the app with ID _b2307a39-e878-458b-bc90-03bc578531d6_ in the _https://contoso.sharepoint.com_ site from site collection app catalog.
 
 ```sh
-m365 spo app upgrade --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https://contoso.sharepoint.com --scope sitecollection
+m365 spo app upgrade --id b2307a39-e878-458b-bc90-03bc578531d6 --siteUrl https://contoso.sharepoint.com --appCatalogScope sitecollection
 ```
 
 ## More information

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

@@ -13,7 +13,7 @@ m365 spo apppage set [options]
 `-u, --webUrl <webUrl>`
 : The URL of the site where the page to update is located
 
-`-n, --pageName <pageName>`
+`-n, --name <name>`
 : The name of the page to be updated, eg. page.aspx
 
 `-d, --webPartData <webPartData>`
@@ -26,5 +26,5 @@ m365 spo apppage set [options]
 Updates the single-part app page located in a site with url https://contoso.sharepoint.com. Web part data is stored in the `$webPartData` variable
 
 ```sh
-m365 spo apppage set --webUrl "https://contoso.sharepoint.com" --pageName "Contoso.aspx" --webPartData $webPartData
+m365 spo apppage set --webUrl "https://contoso.sharepoint.com" --name "Contoso.aspx" --webPartData $webPartData
 ```

package/docs/docs/cmd/spo/cdn/cdn-policy-list.md

@@ -10,7 +10,7 @@ m365 spo cdn policy list [options]
 
 ## Options
 
-`-t, --type [type]`
+`-t, --cdnType [cdnType]`
 : Type of CDN to manage. `Public,Private`. Default `Public`
 
 --8<-- "docs/cmd/_global.md"
@@ -20,7 +20,7 @@ m365 spo cdn policy list [options]
 
 ## Remarks
 
-Using the `-t, --type` option you can choose whether you want to manage the settings of the Public (default) or Private CDN. If you don't use the option, the command will use the Public CDN.
+Using the `-t, --cdnType` option you can choose whether you want to manage the settings of the Public (default) or Private CDN. If you don't use the option, the command will use the Public CDN.
 
 ## Examples
 
@@ -33,7 +33,7 @@ m365 spo cdn policy list
 Show the list of policies configured for the Private CDN
 
 ```sh
-m365 spo cdn policy list --type Private
+m365 spo cdn policy list --cdnType Private
 ```
 
 ## More information

package/docs/docs/cmd/spo/cdn/cdn-policy-set.md

@@ -10,7 +10,7 @@ m365 spo cdn policy set [options]
 
 ## Options
 
-`-t, --type [type]`
+`-t, --cdnType [cdnType]`
 : Type of CDN to manage. `Public,Private`. Default `Public`
 
 `-p, --policy <policy>`
@@ -26,14 +26,14 @@ m365 spo cdn policy set [options]
 
 ## Remarks
 
-Using the `-t, --type` option you can choose whether you want to manage the settings of the Public (default) or Private CDN. If you don't use the option, the command will use the Public CDN.
+Using the `-t, --cdnType` option you can choose whether you want to manage the settings of the Public (default) or Private CDN. If you don't use the option, the command will use the Public CDN.
 
 ## Examples
 
 Set the list of extensions supported by the Public CDN
 
 ```sh
-m365 spo cdn policy set --type Public --policy IncludeFileExtensions --value CSS,EOT,GIF,ICO,JPEG,JPG,JS,MAP,PNG,SVG,TTF,WOFF,JSON
+m365 spo cdn policy set --cdnType Public --policy IncludeFileExtensions --value CSS,EOT,GIF,ICO,JPEG,JPG,JS,MAP,PNG,SVG,TTF,WOFF,JSON
 ```
 
 ## More information

package/docs/docs/cmd/spo/contenttype/contenttype-field-set.md

@@ -16,7 +16,7 @@ m365 spo contenttype field set [options]
 `-c, --contentTypeId <contentTypeId>`
 : ID of the content type on which the field reference should be set
 
-`-f, --fieldId <fieldId>`
+`-f, --id <id>`
 : ID of the field to which the reference should be set
 
 `-r, --required [required]`
@@ -36,17 +36,17 @@ If the field reference already exists, the command will update its _required_ an
 Add the specified site column to the specified content type as an optional and visible field
 
 ```sh
-m365 spo contenttype field set --webUrl https://contoso.sharepoint.com/sites/portal --contentTypeId 0x01007926A45D687BA842B947286090B8F67D --fieldId ebe7e498-44ff-43da-a7e5-99b444f656a5
+m365 spo contenttype field set --webUrl https://contoso.sharepoint.com/sites/portal --contentTypeId 0x01007926A45D687BA842B947286090B8F67D --id ebe7e498-44ff-43da-a7e5-99b444f656a5
 ```
 
 Add the specified site column to the specified content type as a required field
 
 ```sh
-m365 spo contenttype field set --webUrl https://contoso.sharepoint.com/sites/portal --contentTypeId 0x01007926A45D687BA842B947286090B8F67D --fieldId ebe7e498-44ff-43da-a7e5-99b444f656a5 --required true
+m365 spo contenttype field set --webUrl https://contoso.sharepoint.com/sites/portal --contentTypeId 0x01007926A45D687BA842B947286090B8F67D --id ebe7e498-44ff-43da-a7e5-99b444f656a5 --required true
 ```
 
 Update the existing site column reference in the specified content type to optional
 
 ```sh
-m365 spo contenttype field set --webUrl https://contoso.sharepoint.com/sites/portal --contentTypeId 0x01007926A45D687BA842B947286090B8F67D --fieldId ebe7e498-44ff-43da-a7e5-99b444f656a5 --required false
+m365 spo contenttype field set --webUrl https://contoso.sharepoint.com/sites/portal --contentTypeId 0x01007926A45D687BA842B947286090B8F67D --id ebe7e498-44ff-43da-a7e5-99b444f656a5 --required false
 ```

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

@@ -0,0 +1,45 @@
+# spo contenttype set
+
+Update existing content type
+
+## Usage
+
+```sh
+m365 spo contenttype set [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: URL of the site where the content type to update is defined.
+
+`-i, --id [id]`
+: ID of the content type to update. Specify `id` or `name` but not both, one is required.
+
+`-n, name [name]`
+: Name of the content type to update. Specify the `id` or the `name` but not both, one is required.
+
+`--listTitle [listTitle]`
+: Title of the list if you want to update a list content type. Specify either `listTitle`, `listId` or `listUrl`.
+
+`--listId [listId]`
+: ID of the list if you want to update a list content type. Specify either `listTitle`, `listId` or `listUrl`.
+
+`--listUrl [listUrl]`
+: URL of the list if you want to update a list content type. Specify either `listTitle`, `listId` or `listUrl`.
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Move site content type to a different group
+
+```sh
+m365 spo contenttype set --id 0x001001 --webUrl https://contoso.sharepoint.com --Group "My group"
+```
+
+Rename list content type
+
+```sh
+m365 spo contenttype set --name "My old item" --webUrl https://contoso.sharepoint.com --listTitle "My list" --Name "My item"
+```

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

@@ -10,7 +10,7 @@ m365 spo customaction add [options]
 
 ## Options
 
-`-u, --url <url>`
+`-u, --webUrl <webUrl>`
 : Url of the site or site collection to add the custom action
 
 `-n, --name <name>`
@@ -71,7 +71,7 @@ m365 spo customaction add [options]
 Running this command from the Windows Command Shell (cmd.exe) or PowerShell for Windows OS XP, 7, 8, 8.1 without bash installed might require additional formatting for command options that have JSON, XML or JavaScript values because the command shell treat quotes differently. For example, this is how ApplicationCustomizer user custom action can be created from the Windows cmd.exe:
 
 ```sh
-m365 spo customaction add --url https://contoso.sharepoint.com/sites/test --title "YourAppCustomizer" --name "YourName" --location "ClientSideExtension.ApplicationCustomizer" --clientSideComponentId b41916e7-e69d-467f-b37f-ff8ecf8f99f2 --clientSideComponentProperties '{\"testMessage\":\"Test message\"}'
+m365 spo customaction add --webUrl https://contoso.sharepoint.com/sites/test --title "YourAppCustomizer" --name "YourName" --location "ClientSideExtension.ApplicationCustomizer" --clientSideComponentId b41916e7-e69d-467f-b37f-ff8ecf8f99f2 --clientSideComponentProperties '{\"testMessage\":\"Test message\"}'
 ```
 
 Note, how the clientSideComponentProperties option (-p) has escaped double quotes `'{\"testMessage\":\"Test message\"}'` compared to execution from bash `'{"testMessage":"Test message"}'`.
@@ -83,49 +83,49 @@ The `--rights` option accepts **case sensitive** values.
 Adds tenant-wide SharePoint Framework Application Customizer extension in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction add --url https://contoso.sharepoint.com/sites/test --title "YourAppCustomizer" --name "YourName" --location "ClientSideExtension.ApplicationCustomizer" --clientSideComponentId b41916e7-e69d-467f-b37f-ff8ecf8f99f2 --clientSideComponentProperties '{"testMessage":"Test message"}'
+m365 spo customaction add --webUrl https://contoso.sharepoint.com/sites/test --title "YourAppCustomizer" --name "YourName" --location "ClientSideExtension.ApplicationCustomizer" --clientSideComponentId b41916e7-e69d-467f-b37f-ff8ecf8f99f2 --clientSideComponentProperties '{"testMessage":"Test message"}'
 ```
 
 Adds tenant-wide SharePoint Framework **modern List View** Command Set extension in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction add --url https://contoso.sharepoint.com/sites/test --title "YourCommandSet" --name "YourName" --location "ClientSideExtension.ListViewCommandSet" --clientSideComponentId db3e6e35-363c-42b9-a254-ca661e437848 --clientSideComponentProperties '{"sampleTextOne":"One item is selected in the list.", "sampleTextTwo":"This command is always visible."}' --registrationId 100 --registrationType List
+m365 spo customaction add --webUrl https://contoso.sharepoint.com/sites/test --title "YourCommandSet" --name "YourName" --location "ClientSideExtension.ListViewCommandSet" --clientSideComponentId db3e6e35-363c-42b9-a254-ca661e437848 --clientSideComponentProperties '{"sampleTextOne":"One item is selected in the list.", "sampleTextTwo":"This command is always visible."}' --registrationId 100 --registrationType List
 ```
 
 Creates url custom action in the SiteActions menu in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction add --url https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "Microsoft.SharePoint.StandardMenu" --group "SiteActions" --actionUrl "~site/SitePages/Home.aspx" --sequence 100
+m365 spo customaction add --webUrl https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "Microsoft.SharePoint.StandardMenu" --group "SiteActions" --actionUrl "~site/SitePages/Home.aspx" --sequence 100
 ```
 
 Creates custom action in **classic** Document Library edit context menu in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction add --url https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "EditControlBlock" --actionUrl "javascript:(function(){ return console.log('CLI for Microsoft 365 rocks!'); })();" --registrationId 101 --registrationType List
+m365 spo customaction add --webUrl https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "EditControlBlock" --actionUrl "javascript:(function(){ return console.log('CLI for Microsoft 365 rocks!'); })();" --registrationId 101 --registrationType List
 ```
 
 Creates ScriptLink custom action with script source in **classic pages** in site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction add --url https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "ScriptLink" --scriptSrc "~sitecollection/SiteAssets/YourScript.js" --sequence 101 --scope Site
+m365 spo customaction add --webUrl https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "ScriptLink" --scriptSrc "~sitecollection/SiteAssets/YourScript.js" --sequence 101 --scope Site
 ```
 
 Creates ScriptLink custom action with script block in **classic pages** in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction add --url https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "ScriptLink" --scriptBlock "(function(){ return console.log('Hello CLI for Microsoft 365!'); })();" --sequence 102
+m365 spo customaction add --webUrl https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "ScriptLink" --scriptBlock "(function(){ return console.log('Hello CLI for Microsoft 365!'); })();" --sequence 102
 ```
 
 Creates **classic List View** custom action located in the Ribbon in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction add --url https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "CommandUI.Ribbon" --commandUIExtension '<CommandUIExtension><CommandUIDefinitions><CommandUIDefinition Location="Ribbon.List.Share.Controls._children"><Button Id="Ribbon.List.Share.GetItemsCountButton" Alt="Get list items count" Sequence="11" Command="Invoke_GetItemsCountButtonRequest" LabelText="Get Items Count" TemplateAlias="o1" Image32by32="_layouts/15/images/placeholder32x32.png" Image16by16="_layouts/15/images/placeholder16x16.png" /></CommandUIDefinition></CommandUIDefinitions><CommandUIHandlers><CommandUIHandler Command="Invoke_GetItemsCountButtonRequest" CommandAction="javascript: alert(ctx.TotalListItems);" EnabledScript="javascript: function checkEnable() { return (true);} checkEnable();"/></CommandUIHandlers></CommandUIExtension>'
+m365 spo customaction add --webUrl https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "CommandUI.Ribbon" --commandUIExtension '<CommandUIExtension><CommandUIDefinitions><CommandUIDefinition Location="Ribbon.List.Share.Controls._children"><Button Id="Ribbon.List.Share.GetItemsCountButton" Alt="Get list items count" Sequence="11" Command="Invoke_GetItemsCountButtonRequest" LabelText="Get Items Count" TemplateAlias="o1" Image32by32="_layouts/15/images/placeholder32x32.png" Image16by16="_layouts/15/images/placeholder16x16.png" /></CommandUIDefinition></CommandUIDefinitions><CommandUIHandlers><CommandUIHandler Command="Invoke_GetItemsCountButtonRequest" CommandAction="javascript: alert(ctx.TotalListItems);" EnabledScript="javascript: function checkEnable() { return (true);} checkEnable();"/></CommandUIHandlers></CommandUIExtension>'
 ```
 
 Creates custom action with delegated rights in the SiteActions menu in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction add --url https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "Microsoft.SharePoint.StandardMenu" --group "SiteActions" --actionUrl "~site/SitePages/Home.aspx" --rights "AddListItems,DeleteListItems,ManageLists"
+m365 spo customaction add --webUrl https://contoso.sharepoint.com/sites/test --title "YourTitle" --name "YourName" --location "Microsoft.SharePoint.StandardMenu" --group "SiteActions" --actionUrl "~site/SitePages/Home.aspx" --rights "AddListItems,DeleteListItems,ManageLists"
 ```
 
 ## More information

package/docs/docs/cmd/spo/customaction/customaction-clear.md

@@ -10,7 +10,7 @@ m365 spo customaction clear [options]
 
 ## Options
 
-`-u, --url <url>`
+`-u, --webUrl <webUrl>`
 : Url of the site or site collection to clear the custom actions from
 
 `-s, --scope [scope]`
@@ -27,17 +27,17 @@ Clears all user custom actions for both site and site collection _https://contos
 Skips the confirmation prompt message.
 
 ```sh
-m365 spo customaction clear --url https://contoso.sharepoint.com/sites/test --confirm
+m365 spo customaction clear --webUrl https://contoso.sharepoint.com/sites/test --confirm
 ```
 
 Clears all user custom actions for site _https://contoso.sharepoint.com/sites/test_. 
 
 ```sh
-m365 spo customaction clear --url https://contoso.sharepoint.com/sites/test --scope Web
+m365 spo customaction clear --webUrl https://contoso.sharepoint.com/sites/test --scope Web
 ```
 
 Clears all user custom actions for site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction clear --url https://contoso.sharepoint.com/sites/test --scope Site
+m365 spo customaction clear --webUrl https://contoso.sharepoint.com/sites/test --scope Site
 ```

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

@@ -16,7 +16,7 @@ m365 spo customaction get [options]
 `-t, --title [title]`
 : Title of the user custom action to retrieve information for. Specify either `id` or `title`
 
-`-u, --url <url>`
+`-u, --webUrl <webUrl>`
 : Url of the site or site collection to retrieve the custom action from
 
 `-s, --scope [scope]`
@@ -33,25 +33,25 @@ If the command finds multiple user custom actions with the specified title, it w
 Return details about the user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site or site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction get --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test
+m365 spo customaction get --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --webUrl https://contoso.sharepoint.com/sites/test
 ```
 
 Return details about the user custom action with Title _YourAppCustomizer_ located in site or site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction get --title "YourAppCustomizer" --url https://contoso.sharepoint.com/sites/test
+m365 spo customaction get --title "YourAppCustomizer" --webUrl https://contoso.sharepoint.com/sites/test
 ```
 
 Return details about the user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction get --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test --scope Site
+m365 spo customaction get --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --webUrl https://contoso.sharepoint.com/sites/test --scope Site
 ```
 
 Return details about the user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction get --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test --scope Web
+m365 spo customaction get --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --webUrl https://contoso.sharepoint.com/sites/test --scope Web
 ```
 
 ## More information

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

@@ -10,7 +10,7 @@ m365 spo customaction list [options]
 
 ## Options
 
-`-u, --url <url>`
+`-u, --webUrl <webUrl>`
 : Url of the site or site collection to retrieve the custom action from
 
 `-s, --scope [scope]`
@@ -27,19 +27,19 @@ When using the text output type (default), the command lists only the values of
 Return details about all user custom actions located in site or site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction list --url https://contoso.sharepoint.com/sites/test
+m365 spo customaction list --webUrl https://contoso.sharepoint.com/sites/test
 ```
 
 Return details about all user custom actions located in site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction list --url https://contoso.sharepoint.com/sites/test --scope Site
+m365 spo customaction list --webUrl https://contoso.sharepoint.com/sites/test --scope Site
 ```
 
 Return details about all user custom actions located in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction list --url https://contoso.sharepoint.com/sites/test --scope Web
+m365 spo customaction list --webUrl https://contoso.sharepoint.com/sites/test --scope Web
 ```
 
 ## More information

package/docs/docs/cmd/spo/customaction/customaction-remove.md

@@ -16,7 +16,7 @@ m365 spo customaction remove [options]
 `-t, --title [title]`
 : Title of the user custom action to retrieve information for. Specify either `id` or `title`
 
-`-u, --url <url>`
+`-u, --webUrl <webUrl>`
 : Url of the site or site collection to remove the custom action from
 
 `-s, --scope [scope]`
@@ -36,49 +36,49 @@ If the command finds multiple user custom actions with the specified title, it w
 Removes user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site or site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test
+m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --webUrl https://contoso.sharepoint.com/sites/test
 ```
 
 Removes user custom action with Title _YourAppCustomizer_ located in site or site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction remove --title "YourAppCustomizer" --url https://contoso.sharepoint.com/sites/test
+m365 spo customaction remove --title "YourAppCustomizer" --webUrl https://contoso.sharepoint.com/sites/test
 ```
 
 Removes user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site or site collection _https://contoso.sharepoint.com/sites/test_. Skips the confirmation prompt message.
 
 ```sh
-m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test --confirm
+m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --webUrl https://contoso.sharepoint.com/sites/test --confirm
 ```
 
 Removes user custom action with Title _YourAppCustomizer_ located in site or site collection _https://contoso.sharepoint.com/sites/test_. Skips the confirmation prompt message.
 
 ```sh
-m365 spo customaction remove --title "YourAppCustomizer" --url https://contoso.sharepoint.com/sites/test --confirm
+m365 spo customaction remove --title "YourAppCustomizer" --webUrl https://contoso.sharepoint.com/sites/test --confirm
 ```
 
 Removes user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test --scope Site
+m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --webUrl https://contoso.sharepoint.com/sites/test --scope Site
 ```
 
 Removes user custom action with Title _YourAppCustomizer_ located in site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction remove --title "YourAppCustomizer" --url https://contoso.sharepoint.com/sites/test --scope Site
+m365 spo customaction remove --title "YourAppCustomizer" --webUrl https://contoso.sharepoint.com/sites/test --scope Site
 ```
 
 Removes user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test --scope Web
+m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --webUrl https://contoso.sharepoint.com/sites/test --scope Web
 ```
 
 Removes user custom action with Title _YourAppCustomizer_ located in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction remove --title "YourAppCustomizer" --url https://contoso.sharepoint.com/sites/test --scope Web
+m365 spo customaction remove --title "YourAppCustomizer" --webUrl https://contoso.sharepoint.com/sites/test --scope Web
 ```
 
 ## More information

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

@@ -10,7 +10,7 @@ m365 spo customaction set [options]
 
 ## Options
 
-`-u, --url <url>`
+`-u, --webUrl <webUrl>`
 : Url of the site or site collection to update the custom action
 
 `-i, --id <id>`
@@ -74,7 +74,7 @@ m365 spo customaction set [options]
 Running this command from the Windows Command Shell (cmd.exe) or PowerShell for Windows OS XP, 7, 8, 8.1 without bash installed might require additional formatting for command options that have JSON, XML or JavaScript values because the command shell treat quotes differently. For example, this is how ApplicationCustomizer user custom action can be created from the Windows cmd.exe:
 
 ```sh
-m365 spo customaction set --url https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --clientSideComponentProperties '{\"testMessage\":\"Test message\"}'
+m365 spo customaction set --webUrl https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --clientSideComponentProperties '{\"testMessage\":\"Test message\"}'
 ```
 
 Note, how the `clientSideComponentProperties` option (-p) has escaped double quotes `'{\"testMessage\":\"Test message\"}'` compared to execution from bash `'{"testMessage":"Test message"}'`.
@@ -88,31 +88,31 @@ Note, specifying the scope option might speed up the execution of the command, b
 Updates tenant-wide SharePoint Framework Application Customizer extension properties in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction set --url https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --clientSideComponentProperties '{"testMessage":"Test message"}'
+m365 spo customaction set --webUrl https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --clientSideComponentProperties '{"testMessage":"Test message"}'
 ```
 
 Updates tenant-wide SharePoint Framework **modern List View** Command Set extension in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction set --url https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --clientSideComponentProperties '{"sampleTextOne":"One item is selected in the list.", "sampleTextTwo":"This command is always visible."}' --sequence 100
+m365 spo customaction set --webUrl https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --clientSideComponentProperties '{"sampleTextOne":"One item is selected in the list.", "sampleTextTwo":"This command is always visible."}' --sequence 100
 ```
 
 Updates url custom action in the SiteActions menu in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction set --url https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --actionUrl "~site/SitePages/Home.aspx"
+m365 spo customaction set --webUrl https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --actionUrl "~site/SitePages/Home.aspx"
 ```
 
 Updates ScriptLink custom action with script source in **classic pages** in site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction set --url https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --scriptSrc "~sitecollection/SiteAssets/YourScript.js"
+m365 spo customaction set --webUrl https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --scriptSrc "~sitecollection/SiteAssets/YourScript.js"
 ```
 
 Creates custom action with delegated rights in the SiteActions menu in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
-m365 spo customaction set --url https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --rights "AddListItems,DeleteListItems,ManageLists"
+m365 spo customaction set --webUrl https://contoso.sharepoint.com/sites/test --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --rights "AddListItems,DeleteListItems,ManageLists"
 ```
 
 ## More information

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

@@ -26,10 +26,10 @@ Specify either `listTitle`, `listId` or `listUrl`.
 Specify either `listTitle`, `listId` or `listUrl`.
 
 `-n, --name [name]`
-The name of the event receiver to retrieve. Specify either `name` or `id` but not both.
+: The name of the event receiver to retrieve. Specify either `name` or `id` but not both.
 
 `-i, --id [id]`
-The id of the event receiver to retrieve. Specify either `name` or `id` but not both.
+: The id of the event receiver to retrieve. Specify either `name` or `id` but not both.
 
 `-s, --scope [scope]`
 : The scope of which to retrieve the Event Receivers.

package/docs/docs/cmd/spo/eventreceiver/eventreceiver-remove.md

@@ -0,0 +1,69 @@
+# spo eventreceiver remove
+
+Removes event receivers for the specified web, site, or list.
+
+## Usage
+
+```sh
+m365 spo eventreceiver remove [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: The URL of the web.
+
+`--listTitle [listTitle]`
+: The title of the list, _if the event receiver should be removed from a list_. Specify either `listTitle`, `listId` or `listUrl`.
+
+`--listId [listId]`
+: The id of the list, _if the event receiver should be retrieved from a list_. Specify either `listTitle`, `listId` or `listUrl`.
+
+`--listUrl [listUrl]`
+: The url of the list, _if the event receiver should be retrieved from a list_. Specify either `listTitle`, `listId` or `listUrl`.
+
+`-n, --name [name]`
+: The name. Specify either `name` or `id` but not both.
+
+`-i, --id [id]`
+: The id. Specify either `name` or `id` but not both.
+
+`-s, --scope [scope]`
+: The scope. Can be either "site" or "web". Defaults to "web". Only applicable when not specifying any of the list properties.
+
+`--confirm`
+: Don't prompt for confirming removing the event receiver
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Remove event receiver in a specific web by name.
+
+```sh
+m365 spo eventreceiver remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --name 'PnP Test Receiver'
+```
+
+Remove event receiver in a specific site by id.
+
+```sh
+m365 spo eventreceiver remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --scope site --id c5a6444a-9c7f-4a0d-9e29-fc6fe30e34ec
+```
+
+Remove event receiver in a specific list retrieved by title by name.
+
+```sh
+m365 spo eventreceiver remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --listTitle Events --name 'PnP Test Receiver'
+```
+
+Remove event receiver in a specific list retrieved by list id by id.
+
+```sh
+m365 spo eventreceiver remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --listId '202b8199-b9de-43fd-9737-7f213f51c991' --id c5a6444a-9c7f-4a0d-9e29-fc6fe30e34ec
+```
+
+Remove event receiver in a specific list retrieved by list url by name.
+
+```sh
+m365 spo eventreceiver remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --listUrl '/sites/contoso-sales/lists/Events' --name 'PnP Test Receiver'
+```