@pnp/cli-microsoft365 7.0.0-beta.2756488 → 7.0.0-beta.3bbfbdf

package/docs/docs/cmd/spo/file/file-roleinheritance-break.mdx

@@ -17,7 +17,7 @@ m365 spo file roleinheritance break [options]
 : URL of the site where the file is located
 
 `--fileUrl [fileUrl]`
-: The server- or site-relative URL of the file. Specify either `fileUrl` or `fileId` but not both
+: The server- or site-relative decoded 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

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

@@ -17,7 +17,7 @@ m365 spo file roleinheritance reset [options]
 : URL of the site where the file is located
 
 `--fileUrl [fileUrl]`
-: The server- or site-relative URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both
+: The server- or site-relative decoded 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

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

@@ -17,7 +17,7 @@ m365 spo file sharinginfo get [options]
 : The URL of the site where the file is located
 
 `--fileUrl [fileUrl]`
-: The server- or site-relative URL of the file for which to build the report. Specify either `fileUrl` or `fileId` but not both
+: The server- or site-relative decoded URL of the file for which to build the report. Specify either `fileUrl` or `fileId` 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

package/docs/docs/cmd/spo/file/file-sharinglink-add.mdx

@@ -19,7 +19,7 @@ m365 spo file sharinglink add [options]
 : The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-: The server- or site-relative (decoded) URL of the file. Specify either `fileUrl` or `fileId` but not both.
+: The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `--fileId [fileId]`
 : The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.

package/docs/docs/cmd/spo/file/file-sharinglink-clear.mdx

@@ -17,7 +17,7 @@ m365 spo file sharinglink clear [options]
 : The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-: The server- or site-relative (decoded) URL of the file. Specify either `fileUrl` or `fileId` but not both.
+: The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `--fileId [fileId]`
 : The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.

package/docs/docs/cmd/spo/file/file-sharinglink-get.mdx

@@ -19,7 +19,7 @@ m365 spo file sharinglink get [options]
 : The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-: The server- or site-relative (decoded) URL of the file. Specify either `fileUrl` or `fileId` but not both.
+: The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `--fileId [fileId]`
 : The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.

package/docs/docs/cmd/spo/file/file-sharinglink-list.mdx

@@ -19,7 +19,7 @@ m365 spo file sharinglink list [options]
 : The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-: The server- or site-relative (decoded) URL of the file. Specify either `fileUrl` or `fileId` but not both.
+: The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `--fileId [fileId]`
 : The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.

package/docs/docs/cmd/spo/file/file-sharinglink-remove.mdx

@@ -17,7 +17,7 @@ m365 spo file sharinglink remove [options]
 : The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-: The server- or site-relative (decoded) URL of the file. Specify either `fileUrl` or `fileId` but not both.
+: The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `--fileId [fileId]`
 : The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.

package/docs/docs/cmd/spo/file/file-sharinglink-set.mdx

@@ -19,7 +19,7 @@ m365 spo file sharinglink set [options]
 :	The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-:	The server- or site-relative (decoded) URL of the file. Specify either `fileUrl` or `fileId` but not both.
+:	The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `--fileId [fileId]`
 :	The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.

package/docs/docs/cmd/spo/file/file-version-clear.mdx

@@ -17,7 +17,7 @@ m365 spo file version clear [options]
 : The URL of the site where the file is located
 
 `-u, --fileUrl [fileUrl]`
-: The server- or site-relative URL of the file. Specify either `fileUrl` or `fileId` but not both
+: The server- or site-relative decoded 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

package/docs/docs/cmd/spo/file/file-version-get.mdx

@@ -22,7 +22,7 @@ m365 spo file version get [options]
 : Label of version which will be retrieved
 
 `-u, --fileUrl [fileUrl]`
-: The server- or site-relative URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both
+: The server- or site-relative decoded 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

package/docs/docs/cmd/spo/file/file-version-list.mdx

@@ -19,7 +19,7 @@ m365 spo file version list [options]
 : The URL of the site where the file is located
 
 `-u, --fileUrl [fileUrl]`
-: The server- or site-relative URL of the file. Specify either `fileUrl` or `fileId` but not both
+: The server- or site-relative decoded 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

package/docs/docs/cmd/spo/file/file-version-remove.mdx

@@ -20,7 +20,7 @@ m365 spo file version remove [options]
 : Label of version which will be removed
 
 `-u, --fileUrl [fileUrl]`
-: The server- or site-relative URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both
+: The server- or site-relative decoded 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

package/docs/docs/cmd/spo/file/file-version-restore.mdx

@@ -20,7 +20,7 @@ m365 spo file version restore [options]
 : Label of version which will be restored
 
 `-u, --fileUrl [fileUrl]`
-: The server- or site-relative URL of the file whose version will be restored. Specify either `fileUrl` or `fileId` but not both
+: The server- or site-relative decoded URL of the file whose version will be restored. Specify either `fileUrl` or `fileId` but not both
 
 `-i, --fileId [fileId]`
 : The UniqueId (GUID) of the file whose version will be restored. Specify either `fileUrl` or `fileId` but not both

package/docs/docs/cmd/spo/folder/folder-add.mdx

@@ -1,4 +1,6 @@
 import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
 
 # spo folder add
 
@@ -17,7 +19,7 @@ m365 spo folder add [options]
 : The URL of the site where the folder will be created.
 
 `-p, --parentFolderUrl <parentFolderUrl>`
-: The server- or site-relative URL of the parent folder.
+: The server- or site-relative decoded URL of the parent folder.
 
 `-n, --name <name>`
 : Name of the new folder to be created
@@ -38,3 +40,76 @@ Creates folder in a specific folder within the site
 ```sh
 m365 spo folder add --webUrl https://contoso.sharepoint.com/sites/project-x --parentFolderUrl '/sites/project-x/Shared Documents/Reports' --name 'Financial reports'
 ```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "Exists": true,
+    "ExistsAllowThrowForPolicyFailures": true,
+    "IsWOPIEnabled": false,
+    "ItemCount": 0,
+    "Name": "My new folder",
+    "ProgID": null,
+    "ServerRelativeUrl": "/sites/project-x/Shared Documents/My new folder",
+    "TimeCreated": "2023-07-20T19:29:16Z",
+    "TimeLastModified": "2023-07-20T19:29:16Z",
+    "UniqueId": "94a9aa56-f0b5-4268-941f-737c841ba7c7",
+    "WelcomePage": ""
+  }
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  Exists                           : true
+  ExistsAllowThrowForPolicyFailures: true
+  IsWOPIEnabled                    : false
+  ItemCount                        : 0
+  Name                             : My new folder
+  ProgID                           : null
+  ServerRelativeUrl                : /sites/project-x/Shared Documents/My new folder
+  TimeCreated                      : 2023-07-20T19:29:16Z
+  TimeLastModified                 : 2023-07-20T19:29:16Z
+  UniqueId                         : 94a9aa56-f0b5-4268-941f-737c841ba7c7
+  WelcomePage                      :
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  Exists,ExistsAllowThrowForPolicyFailures,IsWOPIEnabled,ItemCount,Name,ServerRelativeUrl,TimeCreated,TimeLastModified,UniqueId,WelcomePage
+  1,1,,0,My new folder,/sites/project-x/Shared Documents/My new folder,2023-07-20T19:29:16Z,2023-07-20T19:29:16Z,94a9aa56-f0b5-4268-941f-737c841ba7c7,
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # spo folder add --webUrl "https://contoso.sharepoint.com/sites/project-x" --parentFolderUrl "/sites/project-x/Shared Documents" --name "My new folder"
+
+  Date: 20/7/2023
+
+  ## My new folder (94a9aa56-f0b5-4268-941f-737c841ba7c7)
+
+  Property | Value
+  ---------|-------
+  Exists | true
+  ExistsAllowThrowForPolicyFailures | true
+  IsWOPIEnabled | false
+  ItemCount | 0
+  Name | My new folder
+  ServerRelativeUrl | /sites/project-x/Shared Documents/My new folder
+  TimeCreated | 2023-07-20T19:29:16Z
+  TimeLastModified | 2023-07-20T19:29:16Z
+  UniqueId | 94a9aa56-f0b5-4268-941f-737c841ba7c7
+  WelcomePage |
+  ```
+
+  </TabItem>
+</Tabs>

package/docs/docs/cmd/spo/folder/folder-copy.mdx

@@ -14,16 +14,28 @@ m365 spo folder copy [options]
 
 ```md definition-list
 `-u, --webUrl <webUrl>`
-: The URL of the site where the folder is located
+: The URL of the site where the folder is located.
 
-`-s, --sourceUrl <sourceUrl>`
-: The server- or site-relative URL of the folder to copy
+`-s, --sourceUrl [sourceUrl]`
+: The server-, site-relative or absolute decoded URL of the folder to copy. Specify either `sourceUrl` or `sourceId` but not both.
+
+`-i, --sourceId [sourceId]`
+: The UniqueId (GUID) of the folder. Specify either `sourceUrl` or `sourceId` but not both.
 
 `-t, --targetUrl <targetUrl>`
-: Server-relative URL where to copy the folder
+: Server-relative or absolute decoded URL where to copy the folder.
+
+`--newName [newName]`
+: New name of the destination folder.
+
+`--nameConflictBehavior [nameConflictBehavior]`
+: Behavior when a file or folder with the same name is already present at the destination. Possible values: `fail`, `rename`. The default is `fail`.
 
-`--allowSchemaMismatch`
-: Ignores any missing fields in the target document library and copies the folder anyway
+`--resetAuthorAndCreated`
+: Use this option to clear the author and created date. When not specified, the values from the source folder are used.
+
+`--bypassSharedLock`
+: This indicates whether a folder with a shared lock can still be moved. Use this option to copy a folder that is locked.
 ```
 
 <Global />
@@ -32,26 +44,41 @@ m365 spo folder copy [options]
 
 When you copy a folder with documents that have version history, only the latest document version is copied.
 
+When you specify a value for `nameConflictBehavior`, consider the following:
+
+- `fail` will throw an error when the destination folder already exists.
+- `rename` will add a suffix (e.g. Folder1) when the destination folder already exists.
+
 ## Examples
 
-Copies folder from a document library located in one site collection to another site collection
+Copy a folder a folder to another location using server-relative URLs
 
 ```sh
-m365 spo folder copy --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/MyFolder --targetUrl /sites/test2/Shared%20Documents/
+m365 spo folder copy --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/sites/project-x/Shared Documents/Reports" --targetUrl "/sites/project-y/Shared Documents/Project files"
 ```
 
-Copies folder from a document library to another site in the same site collection
+Copy a folder a folder to another location using site-relative URLs and rename it
 
 ```sh
-m365 spo folder copy --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/MyFolder --targetUrl /sites/test1/HRDocuments/
+m365 spo folder copy --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/Shared Documents/Reports" --targetUrl "/sites/project-y/Shared Documents" --newName "Reports January"
 ```
 
-Copies folder to a document library in another site collection. Allow for schema mismatch
+Copy a folder to another location and use new name on conflict
 
 ```sh
-m365 spo folder copy --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/MyFolder --targetUrl /sites/test2/Shared%20Documents/ --allowSchemaMismatch
+m365 spo folder copy --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/sites/project-x/Shared Documents/Reports" --targetUrl "/sites/project-y/Shared Documents/Project files" --nameConflictBehavior rename
 ```
 
+Copy a folder referenced by its ID to another document library and reset author and created date
+
+```sh
+m365 spo folder copy --webUrl https://contoso.sharepoint.com/sites/project-x --sourceId b8cc341b-9c11-4f2d-aa2b-0ce9c18bcba2 --targetUrl "/sites/project-x/Project files" --retainEditorAndModified
+```
+
+## Response
+
+The command won't return a response on success.
+
 ## More information
 
 - Copy items from a SharePoint document library: [https://support.office.com/en-us/article/move-or-copy-items-from-a-sharepoint-document-library-00e2f483-4df3-46be-a861-1f5f0c1a87bc](https://support.office.com/en-us/article/move-or-copy-items-from-a-sharepoint-document-library-00e2f483-4df3-46be-a861-1f5f0c1a87bc)

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

@@ -17,7 +17,7 @@ m365 spo folder get [options]
 : The URL of the site where the folder is located.
 
 `--url [url]`
-: The server- or site-relative URL of the folder to retrieve. Specify either `folderUrl` or `id` but not both.
+: The server- or site-relative decoded 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.

package/docs/docs/cmd/spo/folder/folder-list.mdx

@@ -19,7 +19,7 @@ m365 spo folder list [options]
 : The URL of the site where the folders to list are located.
 
 `-p, --parentFolderUrl <parentFolderUrl>`
-: The server- or site-relative URL of the parent folder.
+: The server- or site-relative decoded URL of the parent folder.
 
 `--fields [fields]`
 : Comma-separated list of fields to retrieve. Will retrieve all fields if not specified and json output is requested.

package/docs/docs/cmd/spo/folder/folder-move.mdx

@@ -14,44 +14,71 @@ m365 spo folder move [options]
 
 ```md definition-list
 `-u, --webUrl <webUrl>`
-: The URL of the site where the folder is located
+: The URL of the site where the folder is located.
 
-`-s, --sourceUrl <sourceUrl>`
-: The server- or site-relative URL of the folder to move
+`-s, --sourceUrl [sourceUrl]`
+: The server-, site-relative or absolute decoded URL of the folder to move. Specify either `sourceUrl` or `sourceId` but not both.
+
+`-i, --sourceId [sourceId]`
+: The ID of the folder to move. Specify either `sourceUrl` or `sourceId` but not both.
 
 `-t, --targetUrl <targetUrl>`
-: Server-relative URL where to move the folder
+: Server-relative or absolute decoded URL where to move the folder.
+
+`--newName [newName]`
+: The new name of the destination folder.
+
+`--nameConflictBehavior [nameConflictBehavior]`
+: Behavior when a file or folder with the same name is already present at the destination. Possible values: `fail`, `rename`. The default is `fail`.
 
-`--allowSchemaMismatch`
-: Ignores any missing fields in the target destination and moves the folder anyway
+`--retainEditorAndModified`
+: Use this option to retain the editor and modified date. When not specified, these values are reset.
+
+`--bypassSharedLock`
+: This indicates whether a folder with a share lock can still be moved. Use this option to move a folder that is locked.
 ```
 
 <Global />
 
 ## Remarks
 
-When you move a folder using the `spo folder move` command, all of the document versions are moved.
+All folder versions are retained while moving a folder.
+
+When you specify a value for `nameConflictBehavior`, consider the following:
+
+- `fail` will throw an error when the destination folder already exists.
+- `rename` will add a suffix (e.g. folder1) when the destination folder already exists.
 
 ## Examples
 
-Move folder to a document library in another site collection
+Move a folder to a document library in another site collection by server-relative URL
 
 ```sh
-m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/MyFolder --targetUrl /sites/test2/Shared%20Documents/
+m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/sites/project-x/Shared Documents/Reports" --targetUrl "/sites/project-y/Shared Documents/Reports January"
 ```
 
-Move folder to a document library in the same site collection
+Move a folder to another location using site-relative URLs and rename it
 
 ```sh
-m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/MyFolder --targetUrl /sites/test1/HRDocuments/
+m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/Shared Documents/Reports" --targetUrl "/sites/project-y/Shared Documents" --newName "Reports January"
 ```
 
-Move folder to a document library in another site collection. Allow for schema mismatch
+Move a folder to another location and use a new name on conflict
 
 ```sh
-m365 spo file move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/sp1.pdf --targetUrl /sites/test2/Shared%20Documents/ --allowSchemaMismatch
+m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/sites/project-x/Shared Documents/Reports" --targetUrl "/sites/project-y/Shared Documents/Project files" --nameConflictBehavior rename
 ```
 
+Move a folder referenced by its ID to another document library and retain editor and modified date
+
+```sh
+m365 spo folder move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceId b8cc341b-9c11-4f2d-aa2b-0ce9c18bcba2 --targetUrl "/sites/project-x/Project files" --retainEditorAndModified
+```
+
+## Response
+
+The command won't return a response on success.
+
 ## More information
 
 - Move items from a SharePoint document library: [https://support.office.com/en-us/article/move-or-copy-items-from-a-sharepoint-document-library-00e2f483-4df3-46be-a861-1f5f0c1a87bc](https://support.office.com/en-us/article/move-or-copy-items-from-a-sharepoint-document-library-00e2f483-4df3-46be-a861-1f5f0c1a87bc)

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

@@ -17,7 +17,7 @@ m365 spo folder remove [options]
 : The URL of the site where the folder to be deleted is located.
 
 `--url <url>`
-: The server- or site-relative URL of the folder to delete.
+: The server- or site-relative decoded URL of the folder to delete.
 
 `--recycle`
 : Recycles the folder instead of actually deleting it.

package/docs/docs/cmd/spo/folder/folder-rename.mdx

@@ -17,7 +17,7 @@ m365 spo folder rename [options]
 : The URL of the site where the folder to be renamed is located.
 
 `--url <url>`
-: The server- or site-relative URL of the folder (including the folder).
+: The server- or site-relative decoded URL of the folder (including the folder).
 
 `-n, --name <name>`
 : New name for the target folder.
@@ -38,3 +38,7 @@ Renames a folder with a specific server-relative URL
 ```sh
 m365 spo folder rename --webUrl https://contoso.sharepoint.com/sites/project-x --url '/sites/project-x/Shared Documents/My Folder 1' --name 'My Folder 2'
 ```
+
+## Response
+
+The command won't return a response on success.

package/docs/docs/cmd/spo/folder/folder-retentionlabel-ensure.mdx

@@ -17,7 +17,7 @@ m365 spo folder retentionlabel ensure [options]
 : URL of the site where the retention label from a file to apply is located
 
 `--folderUrl [folderUrl]`
-: The server- or site-relative URL of the folder that should be labelled. Specify either `folderUrl` or `folderId` but not both.
+: The server- or site-relative decoded URL of the folder that should be labelled. Specify either `folderUrl` or `folderId` but not both.
 
 `i, --folderId [folderId]`
 : The UniqueId (GUID) of the folder that should be labelled. Specify either `folderUrl` or `folderId` but not both.

package/docs/docs/cmd/spo/folder/folder-retentionlabel-remove.mdx

@@ -17,7 +17,7 @@ m365 spo folder retentionlabel remove [options]
 : The url of the web.
 
 `--folderUrl [folderUrl]`
-: The server- or site-relative URL of the folder of which the label should be removed. Specify either `folderUrl` or `folderId` but not both.
+: The server- or site-relative decoded URL of the folder of which the label should be removed. Specify either `folderUrl` or `folderId` but not both.
 
 `-i, --folderId [folderId]`
 : The UniqueId (GUID) of the folder of which the label should be removed. Specify either `folderUrl` or `folderId` but not both.

package/docs/docs/cmd/spo/folder/folder-roleassignment-add.mdx

@@ -17,7 +17,7 @@ m365 spo folder roleassignment add [options]
 : The URL of the site where the folder is located.
 
 `--folderUrl <folderUrl>`
-: The server- or site-relative URL of the folder.
+: The server- or site-relative decoded URL of the folder.
 
 `--principalId [principalId]`
 : The SharePoint principal id. It may be either an user id or group id for which the role assignment will be addd. Specify either upn, groupName or principalId but not multiple.
@@ -32,7 +32,7 @@ m365 spo folder roleassignment add [options]
 : ID of the role definition. Specify either roleDefinitionId or roleDefinitionName but not both.
 
 `--roleDefinitionName [roleDefinitionName]`
-: The name of the role definition. E.g. 'Contribute', 'Read'. Specify either roleDefinitionId or roleDefinitionName but not both
+: The name of the role definition. E.g. 'Contribute', 'Read'. Specify either roleDefinitionId or roleDefinitionName but not both.
 ```
 
 <Global />

package/docs/docs/cmd/spo/folder/folder-roleassignment-remove.mdx

@@ -17,7 +17,7 @@ m365 spo folder roleassignment remove [options]
 : The URL of the site where the folder is located.
 
 `--folderUrl <folderUrl>`
-: The server- or site-relative URL of the folder.
+: The server- or site-relative decoded URL of the folder.
 
 `--principalId [principalId]`
 : The SharePoint principal id. It may be either an user id or group id for which the role assignment will be removed. Specify either upn, groupName or principalId but not multiple.

package/docs/docs/cmd/spo/folder/folder-roleinheritance-break.mdx

@@ -17,7 +17,7 @@ m365 spo folder roleinheritance break [options]
 : URL of the site where the folder is located.
 
 `--folderUrl <folderUrl>`
-: The server- or site-relative URL of the folder.
+: The server- or site-relative decoded URL of the folder.
 
 `-c, --clearExistingPermissions`
 : Clear all existing permissions from the folder.

package/docs/docs/cmd/spo/folder/folder-roleinheritance-reset.mdx

@@ -17,7 +17,7 @@ m365 spo folder roleinheritance reset [options]
 : URL of the site where the folder is located.
 
 `--folderUrl <folderUrl>`
-: The server- or site-relative URL of the folder.
+: The server- or site-relative decoded URL of the folder.
 
 `-f, --force`
 : Don't prompt for confirmation to reset role inheritance of the folder.

package/docs/docs/cmd/spo/group/group-member-add.mdx

@@ -16,72 +16,72 @@ m365 spo group member add [options]
 
 ```md definition-list
 `-u, --webUrl <webUrl>`
-: URL of the site where the SharePoint group is available
+: URL of the site where the SharePoint group is available.
 
 `--groupId [groupId]`
-: Id of the SharePoint Group to which the user needs to be added, specify either `groupId` or `groupName`
+: Id of the SharePoint Group to which the user needs to be added, specify either `groupId` or `groupName`.
 
 `--groupName [groupName]`
-: Name of the SharePoint Group to which the user needs to be added, specify either `groupId` or `groupName`
+: Name of the SharePoint Group to which the user needs to be added, specify either `groupId` or `groupName`.
 
-`--userName [userName]`
-: User's UPN (user principal name, eg. megan.bowen@contoso.com). If multiple users need to be added, they have to be comma-separated (e.g. megan.bowen@contoso.com,alex.wilber@contoso.com). Specify either `userId`, `userName`, `email`, `aadGroupId` or `aadGroupName`
+`--userNames [userNames]`
+: User's UPN (user principal name, eg. megan.bowen@contoso.com). If multiple users need to be added, they have to be comma-separated (e.g. megan.bowen@contoso.com,alex.wilber@contoso.com). Specify either `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames`.
 
-`--email [email]`
-: User's email (eg. megan.bowen@contoso.com). If multiple users need to be added, they have to be comma-separated (e.g. megan.bowen@contoso.com,alex.wilber@contoso.com). Specify either `userId`, `userName`, `email`, `aadGroupId` or `aadGroupName`
+`--emails [emails]`
+: User's email (eg. megan.bowen@contoso.com). If multiple users need to be added, they have to be comma-separated (e.g. megan.bowen@contoso.com,alex.wilber@contoso.com). Specify either `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames`.
 
-`--userId [userId]`
-: The user Id of the user to add as a member. (Id of the site user, for example: 14) If multiple users need to be added, the Ids have to be comma-separated. Specify either `userId`, `userName`, `email`, `aadGroupId` or `aadGroupName`
+`--userIds [userIds]`
+: The user Id of the user to add as a member. (Id of the site user, for example: 14) If multiple users need to be added, the Ids have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames`.
 
-`--aadGroupId [aadGroupId]`
-: The object Id of the Azure AD group to add as a member. If multiple groups need to be added, the Ids have to be comma-separated. Specify either `userId`, `userName`, `email`, `aadGroupId` or `aadGroupName`
+`--aadGroupIds [aadGroupIds]`
+: The object Id of the Azure AD group to add as a member. If multiple groups need to be added, the Ids have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames`.
 
-`--aadGroupName [aadGroupName]`
-: The name of the Azure AD group to add as a member. Specify either `userId`, `userName`, `email`, `aadGroupId` or `aadGroupName`
+`--aadGroupNames [aadGroupNames]`
+: The name of the Azure AD group to add as a member. If multiple groups need to be added, they have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames`.
 ```
 
 <Global />
 
 ## Remarks
 
-For the `userId`, `userName`, `email`, `aadGroupId` or `aadGroupName` options you can specify multiple values by separating them with a comma. If one of the specified entries is not valid, the command will fail with an error message showing the list of invalid values.
+For the `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames` options you can specify multiple values by separating them with a comma. If one of the specified entries is not valid, the command will fail with an error message showing the list of invalid values.
 
 ## Examples
 
-Add a user with the userName parameter to a SharePoint group with the groupId parameter
+Add a user with the userNames parameter to a SharePoint group with the groupId parameter
 
 ```sh
-m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userName "Alex.Wilber@contoso.com"
+m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userNames "Alex.Wilber@contoso.com"
 ```
 
-Add multiple users with the userName parameter to a SharePoint group with the groupId parameter
+Add multiple users with the userNames parameter to a SharePoint group with the groupId parameter
 
 ```sh
-m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userName "Alex.Wilber@contoso.com, Adele.Vance@contoso.com"
+m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userNames "Alex.Wilber@contoso.com, Adele.Vance@contoso.com"
 ```
 
-Add a user with the email parameter to a SharePoint group with the groupName parameter
+Add a user with the emails parameter to a SharePoint group with the groupName parameter
 
 ```sh
-m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Contoso Site Owners" --email "Alex.Wilber@contoso.com"
+m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Contoso Site Owners" --emails "Alex.Wilber@contoso.com"
 ```
 
-Add multiple users with the email parameter to a SharePoint group with the groupName parameter
+Add multiple users with the emails parameter to a SharePoint group with the groupName parameter
 
 ```sh
-m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Contoso Site Owners" --email "Alex.Wilber@contoso.com, Adele.Vance@contoso.com"
+m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Contoso Site Owners" --emails "Alex.Wilber@contoso.com, Adele.Vance@contoso.com"
 ```
 
-Add a user with the userId parameter to a SharePoint group with the groupId parameter
+Add a user with the userIds parameter to a SharePoint group with the groupId parameter
 
 ```sh
-m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userId 5
+m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userIds 5
 ```
 
-Add multiple users with the userId parameter to a SharePoint group with the groupId parameter
+Add multiple users with the userIds parameter to a SharePoint group with the groupId parameter
 
 ```sh
-m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userId "5,12"
+m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userIds "5,12"
 ```
 
 Add multiple users with the aadUserId parameter to a SharePoint group with the groupId parameter
@@ -140,7 +140,7 @@ m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --
   <TabItem value="Markdown">
 
   ```md
-  # spo group member add --webUrl "https://contoso.sharepoint.com" --groupId "5" --aadGroupId "f2fb2f10-cfd2-4054-8ffd-64533657a5ab"
+  # spo group member add --webUrl "https://contoso.sharepoint.com" --groupId "5" --aadGroupIds "f2fb2f10-cfd2-4054-8ffd-64533657a5ab"
 
   Date: 13/2/2023