@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 6.0.0-beta.0b0fb88

package/docs/docs/cmd/spo/list/list-view-get.md

@@ -22,11 +22,11 @@ m365 spo list view get [options]
 `--listUrl [listUrl]`
 : Server- or web-relative URL of the list where the view is located. Specify only one of `listTitle`, `listId` or `listUrl`
 
-`--viewId [viewId]`
-: ID of the view to get. Specify `viewTitle` or `viewId` but not both
+`--id [id]`
+: ID of the view to get. Specify `title` or `id` but not both
 
-`--viewTitle [viewTitle]`
-: Title of the view to get. Specify `viewTitle` or `viewId` but not both
+`--title [title]`
+: Title of the view to get. Specify `title` or `id` but not both
 
 --8<-- "docs/cmd/_global.md"
 
@@ -35,17 +35,17 @@ m365 spo list view get [options]
 Gets a list view by name from a list located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo list view get --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --viewTitle 'All Items'
+m365 spo list view get --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --title 'All Items'
 ```
 
 Gets a list view by ID from a list located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo list view get --webUrl https://contoso.sharepoint.com/sites/project-x --listUrl 'Lists/My List' --viewId 330f29c5-5c4c-465f-9f4b-7903020ae1ce
+m365 spo list view get --webUrl https://contoso.sharepoint.com/sites/project-x --listUrl 'Lists/My List' --id 330f29c5-5c4c-465f-9f4b-7903020ae1ce
 ```
 
 Gets a list view by name from a list located in site _https://contoso.sharepoint.com/sites/project-x_. Retrieve the list by its ID
 
 ```sh
-m365 spo list view get --webUrl https://contoso.sharepoint.com/sites/project-x --listId 330f29c5-5c4c-465f-9f4b-7903020ae1c1 --viewTitle 'All Items'
+m365 spo list view get --webUrl https://contoso.sharepoint.com/sites/project-x --listId 330f29c5-5c4c-465f-9f4b-7903020ae1c1 --title 'All Items'
 ```

package/docs/docs/cmd/spo/list/list-view-remove.md

@@ -19,11 +19,11 @@ m365 spo list view remove [options]
 `--listTitle [listTitle]`
 : Title of the list from which the view should be removed. Specify either `listId` or `listTitle` but not both
 
-`--viewId [viewId]`
-: ID of the view to remove. Specify either `viewId` or `viewTitle` but not both
+`--id [id]`
+: ID of the view to remove. Specify either `id` or `title` but not both
 
-`--viewTitle [viewTitle]`
-: Title of the view to remove. Specify either `viewId` or `viewTitle` but not both
+`--title [title]`
+: Title of the view to remove. Specify either `id` or `title` but not both
 
 `--confirm`
 : Don't prompt for confirming removing the view
@@ -35,23 +35,23 @@ m365 spo list view remove [options]
 Remove view with ID _cc27a922-8224-4296-90a5-ebbc54da2e81_ from the list with ID _0cd891ef-afce-4e55-b836-fce03286cccf_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo list view remove --webUrl https://contoso.sharepoint.com/sites/project-x --listId 0cd891ef-afce-4e55-b836-fce03286cccf --viewId cc27a922-8224-4296-90a5-ebbc54da2e81
+m365 spo list view remove --webUrl https://contoso.sharepoint.com/sites/project-x --listId 0cd891ef-afce-4e55-b836-fce03286cccf --id cc27a922-8224-4296-90a5-ebbc54da2e81
 ```
 
 Remove view with ID _cc27a922-8224-4296-90a5-ebbc54da2e81_ from the list with title _Documents_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo list view remove --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle Documents --viewId cc27a922-8224-4296-90a5-ebbc54da2e81
+m365 spo list view remove --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle Documents --id cc27a922-8224-4296-90a5-ebbc54da2e81
 ```
 
 Remove view with title _MyView_ from a list with title _Documents_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo list view remove --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle Documents --viewTitle MyView
+m365 spo list view remove --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle Documents --title MyView
 ```
 
 Remove view with ID _cc27a922-8224-4296-90a5-ebbc54da2e81_ from a list with title _Documents_ located in site _https://contoso.sharepoint.com/sites/project-x_ without being asked for confirmation
 
 ```sh
-m365 spo list view remove --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle Documents --viewId cc27a922-8224-4296-90a5-ebbc54da2e81 --confirm
+m365 spo list view remove --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle Documents --id cc27a922-8224-4296-90a5-ebbc54da2e81 --confirm
 ```

package/docs/docs/cmd/spo/list/list-view-set.md

@@ -19,11 +19,11 @@ m365 spo list view set [options]
 `--listTitle [listTitle]`
 : Title of the list where the view is located. Specify `listTitle` or `listId` but not both
 
-`--viewId [viewId]`
-: ID of the view to update. Specify `viewTitle` or `viewId` but not both
+`--id [id]`
+: ID of the view to update. Specify `title` or `id` but not both
 
-`--viewTitle [viewTitle]`
-: Title of the view to update. Specify `viewTitle` or `viewId` but not both
+`--title [title]`
+: Title of the view to update. Specify `title` or `id` but not both
 
 --8<-- "docs/cmd/_global.md"
 
@@ -38,17 +38,17 @@ When updating list formatting, the value of the CustomFormatter property must be
 Update the title of the list view specified by its name
 
 ```sh
-m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --viewTitle 'All items' --Title 'All events'
+m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --title 'All items' --Title 'All events'
 ```
 
 Update the title of the list view specified by its ID
 
 ```sh
-m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --viewId 330f29c5-5c4c-465f-9f4b-7903020ae1ce --Title 'All events'
+m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --id 330f29c5-5c4c-465f-9f4b-7903020ae1ce --Title 'All events'
 ```
 
 Update view formatting of the specified list view
 
 ```sh
-m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --viewTitle 'All items' --CustomFormatter '`{"schema":"https://developer.microsoft.com/json-schemas/sp/view-formatting.schema.json","additionalRowClass": "=if([$DueDate] &lt;= @now, 'sp-field-severity--severeWarning', '')"}`'
+m365 spo list view set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --title 'All items' --CustomFormatter '`{"schema":"https://developer.microsoft.com/json-schemas/sp/view-formatting.schema.json","additionalRowClass": "=if([$DueDate] &lt;= @now, 'sp-field-severity--severeWarning', '')"}`'
 ```

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

@@ -16,15 +16,9 @@ m365 spo listitem list [options]
 `-i, --listId [listId]`
 : ID of the list to retrieve items from. Specify `listId` or `listTitle` but not both
 
-`--id [id]`
-: (deprecated. Use `listId` instead) ID of the list to retrieve items from. Specify `id` or `title` but not both
-
 `-t, --listTitle [listTitle]`
 : Title of the list to retrieve items from. Specify `listId` or `listTitle` but not both
 
-`--title [title]`
-: (deprecated. Use `listTitle` instead) Title of the list to retrieve items from. Specify `id` or `title` but not both
-
 `-q, --camlQuery [camlQuery]`
 : CAML query to use to query the list of items with
 

package/docs/docs/cmd/spo/listitem/listitem-record-declare.md

@@ -19,7 +19,7 @@ m365 spo listitem record declare [options]
 `-t, --listTitle [listTitle]`
 : The title of the list where the item is located. Specify `listId` or `listTitle` but not both
 
-`-i, --id <id>`
+`-i, --listItemId <listItemId>`
 : The ID of the list item to declare as record
 
 `-d, --date [date]`
@@ -32,23 +32,23 @@ m365 spo listitem record declare [options]
 Declare a document with id _1_ as a record in list with title _Demo List_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo listitem record declare --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle "Demo List" --id 1
+m365 spo listitem record declare --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle "Demo List" --listItemId 1
 ```
 
 Declare a document with id _1_ as a record in list with id _ea8e1109-2013-1a69-bc05-1403201257fc_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo listitem record declare --webUrl https://contoso.sharepoint.com/sites/project-x --listId ea8e1109-2013-1a69-bc05-1403201257fc --id 1
+m365 spo listitem record declare --webUrl https://contoso.sharepoint.com/sites/project-x --listId ea8e1109-2013-1a69-bc05-1403201257fc --listItemId 1
 ```
 
 Declare a document with id _1_ as a record with record declaration date _March 14, 2012_ in list with title _Demo List_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo listitem record declare --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle "Demo List" --id 1 --date 2012-03-14
+m365 spo listitem record declare --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle "Demo List" --listItemId 1 --date 2012-03-14
 ```
 
 Declare a document with id _1_ as a record with record declaration date _September 3, 2013_ in list with id _ea8e1356-5910-abc9-bc05-2408198057fc_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo listitem record declare --webUrl https://contoso.sharepoint.com/sites/project-x --listId ea8e1356-5910-abc9-bc05-2408198057fc --id 1 --date 2013-09-03
+m365 spo listitem record declare --webUrl https://contoso.sharepoint.com/sites/project-x --listId ea8e1356-5910-abc9-bc05-2408198057fc --listItemId 1 --date 2013-09-03
 ```

package/docs/docs/cmd/spo/listitem/listitem-record-undeclare.md

@@ -13,7 +13,7 @@ m365 spo listitem record undeclare [options]
 `-u, --webUrl <webUrl>`
 : The URL of the site where the list is located
 
-`-i, --id <id>`
+`-i, --listItemId <listItemId>`
 : ID of the list item to be undeclared as a record.
 
 `-l, --listId [listId]`
@@ -29,11 +29,11 @@ m365 spo listitem record undeclare [options]
 Undeclare the list item as a record with ID _1_ from list with ID _0cd891ef-afce-4e55-b836-fce03286cccf_ located in site _https://contoso.sharepoint.com/sites/project-x
 
 ```sh_
-spo listitem record undeclare --webUrl https://contoso.sharepoint.com/sites/project-x --listId 0cd891ef-afce-4e55-b836-fce03286cccf --id 1
+spo listitem record undeclare --webUrl https://contoso.sharepoint.com/sites/project-x --listId 0cd891ef-afce-4e55-b836-fce03286cccf --listItemId 1
 ```
 
 Undeclare the list item as a record with ID _1_ from list with title _List 1_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo listitem record undeclare --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'List 1' --id 1
+m365 spo listitem record undeclare --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'List 1' --listItemId 1
 ```

package/docs/docs/cmd/spo/listitem/listitem-roleinheritance-break.md

@@ -25,6 +25,9 @@ m365 spo listitem roleinheritance break [options]
 `-c, --clearExistingPermissions`
 : Set to clear existing roles from the list item
 
+`--confirm`
+: Do not prompt for confirmation before breaking role inheritance.
+
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
@@ -56,3 +59,9 @@ Break inheritance of list item _1_ in list with ID _202b8199-b9de-43fd-9737-7f21
 ```sh
 m365 spo listitem roleinheritance break --webUrl https://contoso.sharepoint.com/sites/project-x --listId 202b8199-b9de-43fd-9737-7f213f51c991 --listItemId 1 --clearExistingPermissions
 ```
+
+Break inheritance of list item _1_ in list with ID _202b8199-b9de-43fd-9737-7f213f51c991_ located in site _https://contoso.sharepoint.com/sites/project-x_ with clearing permissions without prompting for confirmation
+
+```sh
+m365 spo listitem roleinheritance break --webUrl https://contoso.sharepoint.com/sites/project-x --listId 202b8199-b9de-43fd-9737-7f213f51c991 --listItemId 1 --clearExistingPermissions --confirm
+```

package/docs/docs/cmd/spo/listitem/listitem-roleinheritance-reset.md

@@ -22,6 +22,9 @@ m365 spo listitem roleinheritance reset [options]
 `--listTitle [listTitle]`
 : Title of the list. Specify listId or listTitle but not both
 
+`--confirm`
+: Do not prompt for confirmation before resetting role inheritance.
+
 --8<-- "docs/cmd/_global.md"
 
 ## Examples
@@ -37,3 +40,9 @@ Restore role inheritance of list item with id 8 from list with title _test_ loca
 ```sh
 m365 spo listitem roleinheritance reset --webUrl https://contoso.sharepoint.com/sites/project-x --listItemId 8 --listTitle test
 ```
+
+Restore role inheritance of list item with id 8 from list with title _test_ located in site _https://contoso.sharepoint.com/sites/project-x_ without prompting for confirmation
+
+```sh
+m365 spo listitem roleinheritance reset --webUrl https://contoso.sharepoint.com/sites/project-x --listItemId 8 --listTitle test --confirm
+```

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

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

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/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

@@ -87,9 +87,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-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,14 +13,14 @@ 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`, or `owner`)
@@ -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_