@pnp/cli-microsoft365 6.0.0-beta.8352f49 → 6.0.0-beta.9e3459d

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

@@ -10,10 +10,13 @@ m365 spo customaction remove [options]
 
 ## Options
 
-`-i, --id <id>`
-: Id (GUID) of the custom action to remove
+`-i, --id [id]`
+: Id (GUID) of the custom action to remove. Specify either `id` or `title`
 
-`-u, --url <url>`
+`-t, --title [title]`
+: Title of the user custom action to retrieve information for. Specify either `id` or `title`
+
+`-u, --webUrl <webUrl>`
 : Url of the site or site collection to remove the custom action from
 
 `-s, --scope [scope]`
@@ -24,30 +27,58 @@ m365 spo customaction remove [options]
 
 --8<-- "docs/cmd/_global.md"
 
+## Remarks
+
+If the command finds multiple user custom actions with the specified title, it will prompt you to disambiguate which user custom action it should use, listing the discovered IDs.
+
 ## Examples
 
 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" --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" --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" --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" --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/feature/feature-disable.md

@@ -10,10 +10,10 @@ m365 spo feature disable [options]
 
 ## Options
 
-`-u, --url <url>`
+`-u, --webUrl <webUrl>`
 : The URL of the site or web for which to disable the feature
 
-`-f, --featureId <id>`
+`-i, --id <id>`
 : The ID of the feature to disable
 
 `-s, --scope [scope]`
@@ -33,11 +33,11 @@ If the specified url doesn't refer to an existing site collection, you will get
 Disable site feature
 
 ```sh
-m365 spo feature disable --url https://contoso.sharepoint.com/sites/sales --featureId 915c240e-a6cc-49b8-8b2c-0bff8b553ed3 --scope Site
+m365 spo feature disable --webUrl https://contoso.sharepoint.com/sites/salis --id 915c240e-a6cc-49b8-8b2c-0bff8b553ed3 --scope Site
 ```
 
 Disable web feature (with force to ignore errors)
 
 ```sh
-m365 spo feature disable --url https://contoso.sharepoint.com/sites/sales --featureId 00bfea71-5932-4f9c-ad71-1557e5751100 --scope Web --force
+m365 spo feature disable --webUrl https://contoso.sharepoint.com/sites/salis --id 00bfea71-5932-4f9c-ad71-1557e5751100 --scope Web --force
 ```

package/docs/docs/cmd/spo/feature/feature-enable.md

@@ -10,10 +10,10 @@ m365 spo feature enable [options]
 
 ## Options
 
-`-u, --url <url>`
+`-u, --webUrl <webUrl>`
 : The URL of the site or web for which to enable the feature
 
-`-f, --featureId <id>`
+`-i, --id <id>`
 : The ID of the feature to enable
 
 `-s, --scope [scope]`

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

@@ -10,7 +10,7 @@ m365 spo feature list [options]
 
 ## Options
 
-`-u, --url <url>`
+`-u, --webUrl <webUrl>`
 : URL of the site (collection) to retrieve the activated Features from
 
 `-s, --scope [scope]`
@@ -23,11 +23,11 @@ m365 spo feature list [options]
 Return details about Features activated in the specified site collection
 
 ```sh
-m365 spo feature list --url https://contoso.sharepoint.com/sites/test --scope Site
+m365 spo feature list --webUrl https://contoso.sharepoint.com/sites/test --scope Site
 ```
 
 Return details about Features activated in the specified site
 
 ```sh
-m365 spo feature list --url https://contoso.sharepoint.com/sites/test --scope Web
+m365 spo feature list --webUrl https://contoso.sharepoint.com/sites/test --scope Web
 ```

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

@@ -23,10 +23,10 @@ m365 spo field get [options]
 : Server- or web-relative URL of the list where the field is located. Specify only one of listTitle, listId or listUrl
 
 `-i, --id [id]`
-: The ID of the field to retrieve. Specify id or fieldTitle but not both
+: The ID of the field to retrieve. Specify id or title but not both
 
-`--fieldTitle [fieldTitle]`
-: The display name (case-sensitive) of the field to retrieve. Specify id or fieldTitle but not both
+`-t, --title [title]`
+: The display name (case-sensitive) of the field to remove. Specify id or title, or group but not both
 
 --8<-- "docs/cmd/_global.md"
 
@@ -47,5 +47,5 @@ m365 spo field get --webUrl https://contoso.sharepoint.com/sites/contoso-sales -
 Retrieves list column by display name located in site _https://contoso.sharepoint.com/sites/contoso-sales_. Retrieves the list by its url
 
 ```sh
-m365 spo field get --webUrl https://contoso.sharepoint.com/sites/contoso-sales --listUrl 'Lists/Events' --fieldTitle 'Title'
+m365 spo field get --webUrl https://contoso.sharepoint.com/sites/contoso-sales --listUrl "Lists/Events" --title "Title"
 ```

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

@@ -23,13 +23,13 @@ m365 spo field remove [options]
 : Server- or web-relative URL of the list where the field is located. Specify only one of `listTitle`, `listId` or `listUrl`
 
 `-i, --id [id]`
-: The ID of the field to remove. Specify id, fieldTitle, or group
+: The ID of the field to remove. Specify id, title, or group
 
-`-t, --fieldTitle [fieldTitle]`
-: The display name (case-sensitive) of the field to remove. Specify id, fieldTitle, or group
+`-t, --title [title]`
+: The display name (case-sensitive) of the field to remove. Specify id, title, or group
 
 `-g, --group [group]`
-: Delete all fields from this group (case-sensitive). Specify id, fieldTitle, or group
+: Delete all fields from this group (case-sensitive). Specify id, title, or group
 
 `--confirm`
 : Don't prompt for confirming removing the field
@@ -53,11 +53,11 @@ m365 spo field remove --webUrl https://contoso.sharepoint.com/sites/contoso-sale
 Remove the list column with the specified display name, located in site _https://contoso.sharepoint.com/sites/contoso-sales_. Retrieves the list by its url
 
 ```sh
-m365 spo field remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --listUrl 'Lists/Events' --fieldTitle 'Title'
+m365 spo field remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --listUrl "Lists/Events" --title "Title"
 ```
 
 Remove all site columns from group _MyGroup_
 
 ```sh
-m365 spo field remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --group 'MyGroup'
+m365 spo field remove --webUrl https://contoso.sharepoint.com/sites/contoso-sales --group "MyGroup"
 ```

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

@@ -20,10 +20,10 @@ m365 spo field set [options]
 : Title of the list where the field is located (if list column). Specify `listTitle` or `listId` but not both
 
 `-i, --id [id]`
-: ID of the field to update. Specify `name` or `id` but not both
+: ID of the field to update. Specify `id` or `title` but not both
 
-`-n, --name [name]`
-: Title or internal name of the field to update. Specify `name` or `id` but not both
+`-t, --title [title]`
+: Title or internal name of the field to update. Specify `id` or `title` but not both
 
 `--updateExistingLists`
 : Set, to push the update to existing lists. Otherwise, the changes will apply to new lists only
@@ -39,7 +39,7 @@ Specify properties to update using their names, eg. `--Title 'New Title' --JSLin
 Update the title of the site column specified by its internal name and push changes to existing lists
 
 ```sh
-m365 spo field set --webUrl https://contoso.sharepoint.com/sites/project-x --name 'MyColumn' --updateExistingLists --Title 'My column'
+m365 spo field set --webUrl https://contoso.sharepoint.com/sites/project-x --title 'MyColumn' --updateExistingLists --Title 'My column'
 ```
 
 Update the title of the list column specified by its ID
@@ -51,5 +51,5 @@ m365 spo field set --webUrl https://contoso.sharepoint.com/sites/project-x --lis
 Update column formatting of the specified list column
 
 ```sh
-m365 spo field set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --name 'MyColumn' --CustomFormatter '`{"schema":"https://developer.microsoft.com/json-schemas/sp/column-formatting.schema.json", "elmType": "div", "txtContent": "@currentField"}`'
+m365 spo field set --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'My List' --title 'MyColumn' --CustomFormatter '`{"schema":"https://developer.microsoft.com/json-schemas/sp/column-formatting.schema.json", "elmType": "div", "txtContent": "@currentField"}`'
 ```

package/docs/docs/cmd/spo/file/file-checkin.md

@@ -13,11 +13,11 @@ m365 spo file checkin [options]
 `-u, --webUrl <webUrl>`
 : The URL of the site where the file is located
 
-`-f, --fileUrl [fileUrl]`
-: The server-relative URL of the file to retrieve. Specify either `fileUrl` or `id` but not both
+`-f, --url [url]`
+: The server-relative URL of the file to retrieve. Specify either `url` or `id` but not both
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `fileUrl` or `id` but not both
+: The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both
 
 `-t, --type [type]`
 : Type of the check in. Available values `Minor,Major,Overwrite`. Default is Major
@@ -38,17 +38,17 @@ m365 spo file checkin --webUrl https://contoso.sharepoint.com/sites/project-x --
 Checks in file with server-relative url _/sites/project-x/documents/Test1.docx_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo file checkin --webUrl https://contoso.sharepoint.com/sites/project-x --fileUrl '/sites/project-x/documents/Test1.docx'
+m365 spo file checkin --webUrl https://contoso.sharepoint.com/sites/project-x --url '/sites/project-x/documents/Test1.docx'
 ```
 
 Checks in minor version of file with server-relative url _/sites/project-x/documents/Test1.docx_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo file checkin --webUrl https://contoso.sharepoint.com/sites/project-x --fileUrl '/sites/project-x/documents/Test1.docx' --type Minor
+m365 spo file checkin --webUrl https://contoso.sharepoint.com/sites/project-x --url '/sites/project-x/documents/Test1.docx' --type Minor
 ```
 
 Checks in file _/sites/project-x/documents/Test1.docx_ with comment located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo file checkin --webUrl https://contoso.sharepoint.com/sites/project-x --fileUrl '/sites/project-x/documents/Test1.docx' --comment 'approved'
+m365 spo file checkin --webUrl https://contoso.sharepoint.com/sites/project-x --url '/sites/project-x/documents/Test1.docx' --comment 'approved'
 ```

package/docs/docs/cmd/spo/file/file-checkout.md

@@ -13,11 +13,11 @@ m365 spo file checkout [options]
 `-u, --webUrl <webUrl>`
 : The URL of the site where the file is located
 
-`-f, --fileUrl [fileUrl]`
-: The server-relative URL of the file to retrieve. Specify either `fileUrl` or `id` but not both
+`-f, --url [url]`
+: The server-relative URL of the file to retrieve. Specify either `url` or `id` but not both
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `fileUrl` or `id` but not both
+: The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both
 
 --8<-- "docs/cmd/_global.md"
 
@@ -32,5 +32,5 @@ m365 spo file checkout --webUrl https://contoso.sharepoint.com/sites/project-x -
 Checks out file with server-relative url _/sites/project-x/documents/Test1.docx_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo file checkout --webUrl https://contoso.sharepoint.com/sites/project-x --fileUrl '/sites/project-x/documents/Test1.docx'
+m365 spo file checkout --webUrl https://contoso.sharepoint.com/sites/project-x --url '/sites/project-x/documents/Test1.docx'
 ```

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

@@ -0,0 +1,43 @@
+# spo file rename
+
+Renames a file
+
+## Usage
+
+```sh
+m365 spo file rename [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: The URL of the site where the file is located
+
+`-s, --sourceUrl <sourceUrl>`
+: Site-relative URL of the file to rename
+
+`-t, --targetFileName <targetFileName>`
+: New file name of the file
+
+`--force`
+: If a file already exists with target file name, it will be moved to the recycle bin. If omitted, the rename operation will be canceled if a file already exists with the specified file name
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+If you try to rename a file without the `--force` flag and a file with this name already exists, the operation will be cancelled.
+
+## Examples
+
+Renames a file with server-relative URL _/Shared Documents/Test1.docx_ located in site _<https://contoso.sharepoint.com/sites/project-x>_ to _Test2.docx_
+
+```sh
+m365 spo file rename --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl '/Shared Documents/Test1.docx' --targetFileName 'Test2.docx'
+```
+
+Renames a file with server-relative URL _/Shared Documents/Test1.docx_ located in site _<https://contoso.sharepoint.com/sites/project-x>_ to _Test2.docx_. If the file with the target file name already exists, this file will be moved to the recycle bin
+
+```sh
+m365 spo file rename --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl '/Shared Documents/Test1.docx' --targetFileName 'Test2.docx' --force
+```

package/docs/docs/cmd/spo/file/file-roleassignment-add.md

@@ -0,0 +1,57 @@
+# spo file roleassignment add
+
+Adds a role assignment to the specified file.
+
+## Usage
+
+```sh
+m365 spo file roleassignment add [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: URL of the site where the file is located
+
+`--fileUrl [fileUrl]`
+: The server-relative URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both
+
+`i, --fileId [fileId]`
+: The UniqueId (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both
+
+`--principalId [principalId]`
+: The SharePoint Id of the principal. It may be either a user id or group id to add a role assignment for. Specify either upn, groupName or principalId.
+
+`--upn [upn]`
+: upn/email of user to assign role to. Specify either upn, groupName or principalId.
+
+`--groupName [groupName]`
+: The group name of Azure AD or SharePoint group. Specify either upn, groupName or principalId.
+
+`--roleDefinitionId [roleDefinitionId]`
+: ID of role definition. Specify either roleDefinitionId or roleDefinitionName but not both
+
+`--roleDefinitionName [roleDefinitionName]`
+: Enter the name of a role definition, like 'Contribute', 'Read', etc. Specify either roleDefinitionId or roleDefinitionName but not both
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Adds a role assignment to a file with a specified id. It will use a principal id and a specific role definition id.
+
+```sh
+m365 spo file roleassignment add --webUrl "https://contoso.sharepoint.com/sites/project-x" --fileId "b2307a39-e878-458b-bc90-03bc578531d6" --principalId 11 --roleDefinitionId 1073741829
+```
+
+Adds a role assignment to a file with a specified site-relative URL for a specific upn and a role definition name.
+
+```sh
+m365 spo file roleassignment add --webUrl "https://contoso.sharepoint.com/sites/project-x" --fileUrl "Shared Documents/Test1.docx" --upn "testuser@tenant.onmicrosoft.com" --roleDefinitionName "Full Control"
+```
+
+Adds a role assignment to a file with a specified server-relative URL the for a specific group  and a role definition name.
+
+```sh
+m365 spo file roleassignment add --webUrl "https://contoso.sharepoint.com/sites/project-x" --fileUrl "/sites/project-x/documents/Test1.docx" --upn "testuser@tenant.onmicrosoft.com" --roleDefinitionName "Read"
+```

package/docs/docs/cmd/spo/file/file-roleassignment-remove.md

@@ -0,0 +1,54 @@
+# spo file roleassignment remove
+
+Removes a role assignment from a file.
+
+## Usage
+
+```sh
+m365 spo file roleassignment remove [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: URL of the site where the file is located.
+
+`--fileUrl [fileUrl]`
+: The server-relative URL of the file. Specify either `fileUrl` or `fileId` but not both.
+
+`-i, --fileId [fileId]`
+: The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.
+
+`--principalId [principalId]`
+: The SharePoint Id of the principal. It may be either a user id or group id. Specify either `upn`, `groupName`, or `principalId`.
+
+`--upn [upn]`
+: Upn/email of the user. Specify either `upn`, `groupName`, or `principalId`.
+
+`--groupName [groupName]`
+: The group name of an Azure AD or SharePoint group. Specify either `upn`, `groupName`, or `principalId`.
+
+`--confirm [confirm]`
+: Don't prompt for confirmation.
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Remove a role assignment by principal id from a file by id
+
+```sh
+m365 spo file roleassignment remove --webUrl "https://contoso.sharepoint.com/sites/contoso-sales" --fileId "b2307a39-e878-458b-bc90-03bc578531d6" --principalId 2
+```
+
+Remove a role assignment by upn from a file by url
+
+```sh
+m365 spo file roleassignment remove --webUrl "https://contoso.sharepoint.com/sites/contoso-sales" --fileUrl "/sites/contoso-sales/documents/Test1.docx" --upn "user1@contoso.onmicrosoft.com"
+```
+
+Remove a role assignment by group name from a file by id
+
+```sh
+m365 spo file roleassignment remove --webUrl "https://contoso.sharepoint.com/sites/contoso-sales" --fileId "b2307a39-e878-458b-bc90-03bc578531d6" --groupName "saleGroup"
+```

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

@@ -0,0 +1,39 @@
+# spo file roleinheritance reset
+
+Restores the role inheritance of a file
+
+## Usage
+
+```sh
+m365 spo file roleinheritance reset [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: URL of the site where the file is located
+
+`--fileUrl [fileUrl]`
+: The server-relative URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both
+
+`i, --fileId [fileId]`
+: The UniqueId (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both
+
+`--confirm`
+: Don't prompt for confirmation
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Reset inheritance of file with id (UniqueId) _b2307a39-e878-458b-bc90-03bc578531d6_ located in site _https://contoso.sharepoint.com/sites/project-x_
+
+```sh
+m365 spo file roleinheritance reset --webUrl "https://contoso.sharepoint.com/sites/project-x" --fileId "b2307a39-e878-458b-bc90-03bc578531d6"
+```
+
+Reset inheritance of file with server-relative url _/sites/project-x/documents/Test1_.docx located in site _https://contoso.sharepoint.com/sites/project-x_. It will **not** prompt for confirmation before resetting.
+
+```sh
+m365 spo file roleinheritance reset --webUrl "https://contoso.sharepoint.com/sites/project-x" --fileUrl "/sites/project-x/documents/Test1.docx" --confirm
+```

package/docs/docs/cmd/spo/file/file-sharinginfo-get.md

@@ -10,14 +10,14 @@ m365 spo file sharinginfo get [options]
 
 ## Options
 
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : The URL of the site where the file is located
 
-`-u, --url [url]`
-: The server-relative URL of the file for which to build the report. Specify either `url` or `id` but not both
+`-f, --fileUrl [fileUrl]`
+: The server-relative URL of the file for which to build the report. Specify either `fileUrl` or `fileId` but not both
 
-`-i, --id [id]`
-: The UniqueId (GUID) of the file for which to build the report. Specify either `url` or `id` but not both
+`-i, --fileId [fileId]`
+: The UniqueId (GUID) of the file for which to build the report. Specify either `fileUrl` or `fileId` but not both
 
 --8<-- "docs/cmd/_global.md"
 
@@ -26,11 +26,11 @@ m365 spo file sharinginfo get [options]
 Get file sharing information report for the file with server-relative url _/sites/M365CLI/Shared Documents/SharedFile.docx_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo file sharinginfo get --webUrl https://contoso.sharepoint.com/sites/project-x --url "/sites/M365CLI/Shared Documents/SharedFile.docx"
+m365 spo file sharinginfo get --webUrl https://contoso.sharepoint.com/sites/project-x --fileUrl "/sites/M365CLI/Shared Documents/SharedFile.docx"
 ```
 
 Get file sharing information report for file with id (UniqueId) _b2307a39-e878-458b-bc90-03bc578531d6_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo file sharinginfo get --webUrl https://contoso.sharepoint.com/sites/project-x --id "b2307a39-e878-458b-bc90-03bc578531d6"
+m365 spo file sharinginfo get --webUrl https://contoso.sharepoint.com/sites/project-x --fileId "b2307a39-e878-458b-bc90-03bc578531d6"
 ```

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

@@ -13,8 +13,11 @@ m365 spo folder get [options]
 `-u, --webUrl <webUrl>`
 : The URL of the site where the folder is located
 
-`-f, --folderUrl <folderUrl>`
-: Site-relative URL of the folder
+`-f, --url [url]`
+: The server-relative URL of the folder to retrieve. Specify either `folderUrl` or `id` but not both
+
+`-i, --id [id]`
+: The UniqueId (GUID) of the folder to retrieve. Specify either `url` or `id` but not both
 
 --8<-- "docs/cmd/_global.md"
 
@@ -24,8 +27,14 @@ If no folder exists at the specified URL, you will get a `Please check the folde
 
 ## Examples
 
-Get folder properties for folder with site-relative url _'/Shared Documents'_ located in site _https://contoso.sharepoint.com/sites/project-x_
+Get folder properties for folder with server-relative url _'/Shared Documents'_ located in site _https://contoso.sharepoint.com/sites/project-x_
+
+```sh
+m365 spo folder get --webUrl https://contoso.sharepoint.com/sites/project-x --url "/Shared Documents"
+```
+
+Get folder properties for folder with id (UniqueId) _b2307a39-e878-458b-bc90-03bc578531d6_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo folder get --webUrl https://contoso.sharepoint.com/sites/project-x --folderUrl '/Shared Documents'
+m365 spo folder get --webUrl https://contoso.sharepoint.com/sites/project-x --id "b2307a39-e878-458b-bc90-03bc578531d6"
 ```

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

@@ -13,7 +13,7 @@ m365 spo folder remove [options]
 `-u, --webUrl <webUrl>`
 : The URL of the site where the folder to be deleted is located
 
-`-f, --folderUrl <folderUrl>`
+`-f, --url <url>`
 : Site-relative URL of the folder to delete
 
 `--recycle`
@@ -33,11 +33,11 @@ The `spo folder remove` command will remove folder only if it is empty. If the f
 Removes a folder with site-relative URL _/Shared Documents/My Folder_ located in site _https://contoso.sharepoint.com/sites/project-x_
 
 ```sh
-m365 spo folder remove --webUrl https://contoso.sharepoint.com/sites/project-x --folderUrl '/Shared Documents/My Folder'
+m365 spo folder remove --webUrl https://contoso.sharepoint.com/sites/project-x --url '/Shared Documents/My Folder'
 ```
 
 Moves a folder with site-relative URL _/Shared Documents/My Folder_ located in site _https://contoso.sharepoint.com/sites/project-x_ to the site recycle bin
 
 ```sh
-m365 spo folder remove --webUrl https://contoso.sharepoint.com/sites/project-x --folderUrl '/Shared Documents/My Folder' --recycle
+m365 spo folder remove --webUrl https://contoso.sharepoint.com/sites/project-x --url '/Shared Documents/My Folder' --recycle
 ```