@pnp/cli-microsoft365 7.0.0-beta.68abdfc → 7.0.0-beta.6fa2bd1

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

@@ -19,14 +19,14 @@ m365 spo page template remove
 ## Options
 
 ```md definition-list
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : URL of the site where the file to remove is located
 
 `-i, --id [id]`
 : The ID of the file to remove. Specify either `id` or `url` but not both
 
-`-u, --url [url]`
-: The server- or site-relative URL of the file to remove. Specify either `id` or `url` but not both
+`--url [url]`
+: The server- or site-relative decoded URL of the file to remove. Specify either `id` or `url` but not both
 
 `--recycle`
 : Recycle the file instead of actually deleting it
@@ -39,26 +39,26 @@ m365 spo page template remove
 
 ## Examples
 
-Remove the file with ID _0cd891ef-afce-4e55-b836-fce03286cccf_ located in site _https://contoso.sharepoint.com/sites/project-x_
+Remove file by ID
 
 ```sh
 m365 spo file remove --webUrl https://contoso.sharepoint.com/sites/project-x --id 0cd891ef-afce-4e55-b836-fce03286cccf
 ```
 
-Remove the file with site-relative URL _SharedDocuments/Test.docx_ from located in site _https://contoso.sharepoint.com/sites/project-x_
+Remove the file by site-relative URL
 
 ```sh
-m365 spo file remove --webUrl https://contoso.sharepoint.com/sites/project-x --url SharedDocuments/Test.docx
+m365 spo file remove --webUrl https://contoso.sharepoint.com/sites/project-x --url "/Shared Documents/Test.docx"
 ```
 
-Move the file with server-relative URL _/sites/project-x/SharedDocuments/Test.docx_ located in site _https://contoso.sharepoint.com/sites/project-x_ to the recycle bin
+Move the file by server-relative URL to the recycle bin
 
 ```sh
-m365 spo file remove --webUrl https://contoso.sharepoint.com/sites/project-x --url /sites/project-x/SharedDocuments/Test.docx --recycle
+m365 spo file remove --webUrl https://contoso.sharepoint.com/sites/project-x --url "/sites/project-x/SharedDocuments/Test.docx" --recycle
 ```
 
-Remove the page template with site-relative URL _SharedDocuments/Test.docx_ from located in site _https://contoso.sharepoint.com/sites/project-x_
+Remove a page template by site-relative URL
 
 ```sh
-m365 spo page template remove --webUrl https://contoso.sharepoint.com/sites/project-x --url SharedDocuments/Forms/Template.dotx
+m365 spo page template remove --webUrl https://contoso.sharepoint.com/sites/project-x --url "/Shared Documents/Forms/Template.dotx"
 ```

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

@@ -17,7 +17,7 @@ m365 spo file rename [options]
 : The URL of the site where the file is located
 
 `-s, --sourceUrl <sourceUrl>`
-: The server- or site-relative URL of the file to rename
+: The server- or site-relative decoded URL of the file to rename
 
 `-t, --targetFileName <targetFileName>`
 : New file name of the file
@@ -34,13 +34,13 @@ If you try to rename a file without the `--force` flag and a file with this name
 
 ## 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_
+Renames a file
 
 ```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
+Renames a file. 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-retentionlabel-ensure.mdx

@@ -14,12 +14,12 @@ m365 spo file retentionlabel ensure [options]
 
 ```md definition-list
 `-u, --webUrl <webUrl>`
-: URL of the site where the retention label from a file to apply is located
+: URL of the site where the retention label from a file to apply is located.
 
 `--fileUrl [fileUrl]`
-: The site- or server-relative URL of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
+: The site- or server-relative decoded URL of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
 
-`i, --fileId [fileId]`
+`-i, --fileId [fileId]`
 : The UniqueId (GUID) of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
 
 `--name <name>`

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

@@ -14,16 +14,16 @@ m365 spo file retentionlabel remove [options]
 
 ```md definition-list
 `-u, --webUrl <webUrl>`
-: URL of the site where the retention label from a file to remove is located
+: URL of the site where the retention label from a file to remove is located.
 
 `--fileUrl [fileUrl]`
-: The server- or site-relative URL of the file of which the label should be removed. Specify either `fileUrl` or `fileId` but not both.
+: The server- or site-relative decoded URL of the file of which the label should be removed. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
 : The UniqueId (GUID) of the file of which the label should be removed. Specify either `fileUrl` or `fileId` but not both.
 
 `-f, --force`
-: Don't prompt for confirming removing the retention label from a file
+: Don't prompt for confirming removing the retention label from a file.
 ```
 
 <Global />

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

@@ -17,7 +17,7 @@ m365 spo file roleassignment add [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-roleassignment-remove.mdx

@@ -17,7 +17,7 @@ m365 spo file roleassignment remove [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-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

@@ -13,11 +13,11 @@ m365 spo file version clear [options]
 ## Options
 
 ```md definition-list
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : 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
+`--fileUrl [fileUrl]`
+: 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

@@ -15,14 +15,14 @@ m365 spo file version get [options]
 ## Options
 
 ```md definition-list
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : The URL of the site where the file is located
 
 `--label <label>`
 : 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
+`--fileUrl [fileUrl]`
+: 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

@@ -15,11 +15,11 @@ m365 spo file version list [options]
 ## Options
 
 ```md definition-list
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : 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
+`--fileUrl [fileUrl]`
+: 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

@@ -13,14 +13,14 @@ m365 spo file version remove [options]
 ## Options
 
 ```md definition-list
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : The URL of the site where the file is located
 
 `--label <label>`
 : 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
+`--fileUrl [fileUrl]`
+: 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

@@ -13,14 +13,14 @@ m365 spo file version restore [options]
 ## Options
 
 ```md definition-list
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : The URL of the site where the file is located
 
 `--label <label>`
 : 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
+`--fileUrl [fileUrl]`
+: 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.