@pnp/cli-microsoft365 6.7.0-beta.f5f5666 → 6.8.0-beta.00c3a00

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

@@ -13,24 +13,112 @@ m365 spo file list [options]
 `-u, --webUrl <webUrl>`
 : The URL of the site where the folder from which to retrieve files is located
 
+`-f, --folderUrl <folderUrl>`
+: The server- or site-relative URL of the parent folder from which to retrieve files
+
 `-f, --folder <folder>`
-: The server- or site-relative URL of the folder from which to retrieve files
+: (deprecated. Use `folderUrl` instead) The server- or site-relative URL of the folder from which to retrieve files
+
+`--fields [fields]`
+: Comma-separated list of fields to retrieve. Will retrieve all fields if not specified.
+
+`--filter [filter]`
+: OData filter to use to query the list of items with
 
 `-r, --recursive`
 : Set to retrieve files from subfolders
 
 --8<-- "docs/cmd/_global.md"
 
+## Remarks
+
+When the `fields` option includes values with a `/`, for example: `ListItemAllFields/Id`, an additional `$expand` query parameter will be included on `ListItemAllFields`.
+
 ## Examples
 
-Return all files from folder _Shared Documents_ located in site _https://contoso.sharepoint.com/sites/project-x_
+Return all files from a folder
+
+```sh
+m365 spo file list --webUrl https://contoso.sharepoint.com/sites/project-x --folderUrl 'Shared Documents'
+```
+
+Return all files from a folder and all the sub-folders
+
+```sh
+m365 spo file list --webUrl https://contoso.sharepoint.com/sites/project-x --folderUrl 'Shared Documents' --recursive
+```
+
+Return the files from a folder with specific fields which will be expanded
 
 ```sh
-m365 spo file list --webUrl https://contoso.sharepoint.com/sites/project-x --folder 'Shared Documents'
+m365 spo file list --webUrl https://contoso.sharepoint.com/sites/project-x --folderUrl 'Shared Documents' --fields "Title,Length"
 ```
 
-Return all files from the folder _Shared Documents_ and all the sub-folders of _Shared Documents_ located in site _https://contoso.sharepoint.com/sites/project-x_
+Return the files from a folder that meet the criteria of the filter with specific fields which will be expanded
 
 ```sh
-m365 spo file list --webUrl https://contoso.sharepoint.com/sites/project-x --folder 'Shared Documents' --recursive
+m365 spo file list --webUrl https://contoso.sharepoint.com/sites/project-x --folderUrl 'Shared Documents' --fields ListItemAllFields/Id --filter "Name eq 'document.docx'"
 ```
+
+## Response
+
+=== "JSON"
+
+    ```json
+    [
+      {
+        "CheckInComment": "",
+        "CheckOutType": 2,
+        "ContentTag": "{F09C4EFE-B8C0-4E89-A166-03418661B89B},9,12",
+        "CustomizedPageStatus": 0,
+        "ETag": "\"{F09C4EFE-B8C0-4E89-A166-03418661B89B},9\"",
+        "Exists": true,
+        "IrmEnabled": false,
+        "Length": 331673,
+        "Level": 1,
+        "LinkingUri": "https://contoso.sharepoint.com/sites/project-x/Shared Documents/Document.docx?d=wf09c4efeb8c04e89a16603418661b89b",
+        "LinkingUrl": "https://contoso.sharepoint.com/sites/project-x/Shared Documents/Document.docx?d=wf09c4efeb8c04e89a16603418661b89b",
+        "MajorVersion": 3,
+        "MinorVersion": 0,
+        "Name": "Document.docx",
+        "ServerRelativeUrl": "/sites/project-x/Shared Documents/Document.docx",
+        "TimeCreated": "2018-02-05T08:42:36Z",
+        "TimeLastModified": "2018-02-05T08:44:03Z",
+        "Title": "",
+        "UIVersion": 1536,
+        "UIVersionLabel": "3.0",
+        "UniqueId": "f09c4efe-b8c0-4e89-a166-03418661b89b"
+      }
+    ]
+    ```
+
+=== "Text"
+
+    ```text
+    Name                               ServerRelativeUrl                                UniqueId
+    ---------------------------------  -----------------------------------------------  ------------------------------------
+    Document.docx                      /sites/project-x/Shared Documents/Document.docx  5eb97525-2167-4d26-94b8-092a97d65716
+    ```
+
+=== "CSV"
+
+    ```csv
+    Name,ServerRelativeUrl,UniqueId
+    Document.docx,/sites/project-x/Shared Documents/Document.docx,5eb97525-2167-4d26-94b8-092a97d65716
+    ```
+
+=== "Markdown"
+
+    ```md
+    # spo file list --webUrl "https://contoso.sharepoint.com" --folderUrl "Shared Documents"
+
+    Date: 23/3/2023
+
+    ## Document.docx (5eb97525-2167-4d26-94b8-092a97d65716)
+
+    Property | Value
+    ---------|-------
+    Name | Document.docx
+    ServerRelativeUrl | /sites/project-x/Shared Documents/Document.docx
+    UniqueId | 5eb97525-2167-4d26-94b8-092a97d65716
+    ```

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

@@ -14,7 +14,7 @@ m365 spo file move [options]
 : The URL of the site where the file is located
 
 `-s, --sourceUrl <sourceUrl>`
-: Site-relative URL of the file to move
+: The server- or site-relative URL of the file to move
 
 `-t, --targetUrl <targetUrl>`
 : Server-relative URL where to move the file
@@ -36,7 +36,7 @@ When you move a file using the `spo file move` command, all of the versions are
 Move file to a document library in another site collection
 
 ```sh
-m365 spo file move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/sp1.pdf --targetUrl /sites/test2/Shared%20Documents/
+m365 spo file move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /sites/test1/Shared%20Documents/sp1.pdf --targetUrl /sites/test2/Shared%20Documents/
 ```
 
 Move file to a document library in the same site collection
@@ -54,7 +54,7 @@ m365 spo file move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceU
 Move file to a document library in another site collection. Allow for schema mismatch
 
  ```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 file move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /sites/test1/Shared%20Documents/sp1.pdf --targetUrl /sites/test2/Shared%20Documents/ --allowSchemaMismatch
 ```
 
 

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

@@ -8,6 +8,12 @@ Removes the specified file
 m365 spo file remove [options]
 ```
 
+## Alias
+
+```sh
+m365 spo page template remove
+```
+
 ## Options
 
 `-w, --webUrl <webUrl>`
@@ -46,3 +52,9 @@ Move the file with server-relative URL _/sites/project-x/SharedDocuments/Test.do
 ```sh
 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_
+
+```sh
+m365 spo page template remove --webUrl https://contoso.sharepoint.com/sites/project-x --url SharedDocuments/Forms/Template.dotx
+```

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

@@ -14,7 +14,7 @@ m365 spo file rename [options]
 : The URL of the site where the file is located
 
 `-s, --sourceUrl <sourceUrl>`
-: Site-relative URL of the file to rename
+: The server- or site-relative URL of the file to rename
 
 `-t, --targetFileName <targetFileName>`
 : New file name of the file

package/docs/docs/cmd/spo/file/file-retentionlabel-ensure.md

@@ -11,10 +11,10 @@ m365 spo file retentionlabel ensure [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: URL of the site where the retentionlabel 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 URL of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
 
 `i, --fileId [fileId]`
 : The UniqueId (GUID) of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
@@ -29,7 +29,7 @@ m365 spo file retentionlabel ensure [options]
 
 ## Remarks
 
-You can also use [spo listitem retentionlabel remove](./../../../cmd/spo//listitem/listitem-retentionlabel-remove.md) for removing the retentionlabel from a listitem.
+You can also use [spo listitem retentionlabel remove](./../../../cmd/spo//listitem/listitem-retentionlabel-remove.md) for removing the retention label from a listitem.
 
 The `--assetId` option has to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created.
 

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

@@ -11,10 +11,10 @@ m365 spo file retentionlabel remove [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: URL of the site where the retentionlabel 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 site- or server 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 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.

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

@@ -14,7 +14,7 @@ m365 spo file roleassignment add [options]
 : 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.
+: The server- or site-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.

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

@@ -14,7 +14,7 @@ m365 spo file roleassignment remove [options]
 : 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.
+: The server- or site-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.

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

@@ -14,7 +14,7 @@ m365 spo file roleinheritance break [options]
 : 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
+: The server- or site-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

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

@@ -14,7 +14,7 @@ m365 spo file roleinheritance reset [options]
 : 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
+: The server- or site-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

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

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

@@ -14,7 +14,7 @@ m365 spo file sharinglink add [options]
 : The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-: The server-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.md

@@ -14,7 +14,7 @@ m365 spo file sharinglink clear [options]
 : The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-: The server-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.md

@@ -14,7 +14,7 @@ m365 spo file sharinglink get [options]
 : The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-: The server-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.md

@@ -14,7 +14,7 @@ m365 spo file sharinglink list [options]
 : The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-: The server-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.md

@@ -14,7 +14,7 @@ m365 spo file sharinglink remove [options]
 : The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-: The server-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.md

@@ -14,7 +14,7 @@ m365 spo file sharinglink set [options]
 :	The URL of the site where the file is located.
 
 `--fileUrl [fileUrl]`
-:	The server-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.md

@@ -14,10 +14,10 @@ m365 spo file version clear [options]
 : The URL of the site where the file is located
 
 `-u, --fileUrl [fileUrl]`
-: The server-relative URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both
+: The server- or site-relative URL of the file. 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
+: The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both
 
 `--confirm [confirm]`
 : Don't prompt for confirmation.

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

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

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

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

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

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

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

@@ -17,7 +17,7 @@ m365 spo file version restore [options]
 : Label of version which will be restored
 
 `-u, --fileUrl [fileUrl]`
-: The server-relative URL of the file whose version will be restored. Specify either `fileUrl` or `fileId` but not both
+: The server- or site-relative 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.md

@@ -11,10 +11,10 @@ m365 spo folder add [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: The URL of the site where the folder will be created
+: The URL of the site where the folder will be created.
 
 `-p, --parentFolderUrl <parentFolderUrl>`
-: Site-relative URL of the parent folder
+: The server- or site-relative URL of the parent folder.
 
 `-n, --name <name>`
 : Name of the new folder to be created
@@ -23,8 +23,14 @@ m365 spo folder add [options]
 
 ## Examples
 
-Creates folder in a parent folder with site relative url _/Shared Documents_ located in site _https://contoso.sharepoint.com/sites/project-x_
+Creates folder in a specific library within the site
 
 ```sh
 m365 spo folder add --webUrl https://contoso.sharepoint.com/sites/project-x --parentFolderUrl '/Shared Documents' --name 'My Folder Name'
 ```
+
+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'
+```

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

@@ -14,7 +14,7 @@ m365 spo folder copy [options]
 : The URL of the site where the folder is located
 
 `-s, --sourceUrl <sourceUrl>`
-: Site-relative URL of the folder to copy
+: The server- or site-relative URL of the folder to copy
 
 `-t, --targetUrl <targetUrl>`
 : Server-relative URL where to copy the folder
@@ -45,7 +45,7 @@ m365 spo folder copy --webUrl https://contoso.sharepoint.com/sites/test1 --sourc
 Copies folder to a document library in another site collection. Allow for schema mismatch
 
 ```sh
-m365 spo folder cope --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/test1 --sourceUrl /Shared%20Documents/MyFolder --targetUrl /sites/test2/Shared%20Documents/ --allowSchemaMismatch
 ```
 
 ## More information

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

@@ -11,13 +11,13 @@ m365 spo folder get [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: The URL of the site where the folder is located
+: The URL of the site where the folder is located.
 
 `-f, --url [url]`
-: The server-relative URL of the folder to retrieve. Specify either `folderUrl` or `id` but not both
+: The server- or site-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
+: The UniqueId (GUID) of the folder to retrieve. Specify either `url` or `id` but not both.
 
 `--withPermissions`
 : Set if you want to return associated roles and permissions of the folder. 
@@ -32,20 +32,20 @@ If root level folder is passed, you will get a `Please ensure the specified fold
 
 ## Examples
 
-Get folder properties for folder with server-relative url _'/Shared Documents'_ located in site _https://contoso.sharepoint.com/sites/project-x_
+Get folder properties for a folder with a specific site-relative URL
 
 ```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_
+Get folder properties for a folder with a specific id (UniqueId)
 
 ```sh
 m365 spo folder get --webUrl https://contoso.sharepoint.com/sites/project-x --id "b2307a39-e878-458b-bc90-03bc578531d6"
 ```
 
-Get folder properties for folder with server-relative url _'/Shared Documents/Test1'_ located in site _https://contoso.sharepoint.com/sites/test
+Get folder properties with permissions for a folder with server-relative URL
 
 ```sh
-m365 spo folder get --webUrl https://contoso.sharepoint.com/sites/test --url "Shared Documents/Test1" --withPermissions
+m365 spo folder get --webUrl https://contoso.sharepoint.com/sites/test --url "/sites/test/Shared Documents/Test1" --withPermissions
 ```

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

@@ -11,19 +11,25 @@ m365 spo folder list [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: The URL of the site where the folders to list are located
+: The URL of the site where the folders to list are located.
 
 `-p, --parentFolderUrl <parentFolderUrl>`
-: Site-relative URL of the parent folder
+: The server- or site-relative URL of the parent folder.
+
+`-f, --fields [fields]`
+: Comma-separated list of fields to retrieve. Will retrieve all fields if not specified and json output is requested.
+
+`--filter [filter]`
+: OData filter to use to query the list of folders with.
 
 `-r, --recursive`
-: Set to retrieve nested folders
+: Set to retrieve nested folders.
 
 --8<-- "docs/cmd/_global.md"
 
 ## Examples
 
-Gets list of folders under a parent folder with site-relative url _/Shared Documents_ located in site _https://contoso.sharepoint.com/sites/project-x_
+Gets list of folders under a parent folder with site-relative URL
 
 ```sh
 m365 spo folder list --webUrl https://contoso.sharepoint.com/sites/project-x --parentFolderUrl '/Shared Documents'
@@ -32,7 +38,13 @@ m365 spo folder list --webUrl https://contoso.sharepoint.com/sites/project-x --p
 Gets recursive list of folders under a specific folder on a specific site
 
 ```sh
-m365 spo folder list --webUrl https://contoso.sharepoint.com/sites/project-x --parentFolderUrl '/Shared Documents' --recursive
+m365 spo folder list --webUrl https://contoso.sharepoint.com/sites/project-x --parentFolderUrl '/sites/project-x/Shared Documents' --recursive
+```
+
+Return a filtered list of folders and only return the list item ID
+
+```sh
+m365 spo folder list --webUrl https://contoso.sharepoint.com/sites/project-x --parentFolderUrl '/Shared Documents' --fields ListItemAllFields/Id --filter "startswith(Name,'Folder')"
 ```
 
 ## Response
@@ -47,7 +59,7 @@ m365 spo folder list --webUrl https://contoso.sharepoint.com/sites/project-x --p
         "ItemCount": 9,
         "Name": "Folder A",
         "ProgID": null,
-        "ServerRelativeUrl": "/Shared Documents/Folder A",
+        "ServerRelativeUrl": "/sites/project-x/Shared Documents/Folder A",
         "TimeCreated": "2022-04-26T12:30:56Z",
         "TimeLastModified": "2022-04-26T12:50:14Z",
         "UniqueId": "20523746-971b-4488-aa6d-b45d645f61c5",
@@ -59,14 +71,37 @@ m365 spo folder list --webUrl https://contoso.sharepoint.com/sites/project-x --p
 === "Text"
 
     ```text
-    Name     ServerRelativeUrl
-    -------  -------------------------
-    Folder A /Shared Documents/Folder A
+    Name      ServerRelativeUrl
+    --------  ------------------------------------------
+    Folder A  /sites/project-x/Shared Documents/Folder A
     ```
 
 === "CSV"
 
     ```csv
     Name,ServerRelativeUrl
-    Folder A,/Shared Documents/Folder A
+    Folder A,/sites/project-x/Shared Documents/Folder A
+    ```
+
+=== "Markdown"
+
+    ```md
+    # spo folder list --webUrl "https://contoso.sharepoint.com" --parentFolderUrl "/Shared Documents"
+
+    Date: 29/3/2023
+
+    ## Folder A (20523746-971b-4488-aa6d-b45d645f61c5)
+
+    Property | Value
+    ---------|-------
+    Exists | true
+    IsWOPIEnabled | false
+    ItemCount | 9
+    Name | Folder A
+    ProgID | null
+    ServerRelativeUrl | /sites/project-x/Shared Documents/Folder A
+    TimeCreated | 2022-04-26T12:30:56Z
+    TimeLastModified | 2022-04-26T12:50:14Z
+    UniqueId | 20523746-971b-4488-aa6d-b45d645f61c5
+    WelcomePage |
     ```

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

@@ -14,7 +14,7 @@ m365 spo folder move [options]
 : The URL of the site where the folder is located
 
 `-s, --sourceUrl <sourceUrl>`
-: Site-relative URL of the folder to move
+: The server- or site-relative URL of the folder to move
 
 `-t, --targetUrl <targetUrl>`
 : Server-relative URL where to move the folder

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

@@ -11,16 +11,16 @@ m365 spo folder remove [options]
 ## Options
 
 `-u, --webUrl <webUrl>`
-: The URL of the site where the folder to be deleted is located
+: The URL of the site where the folder to be deleted is located.
 
 `-f, --url <url>`
-: Site-relative URL of the folder to delete
+: The server- or site-relative URL of the folder to delete.
 
 `--recycle`
-: Recycles the folder instead of actually deleting it
+: Recycles the folder instead of actually deleting it.
 
 `--confirm`
-: Don't prompt for confirming deleting the folder
+: Don't prompt for confirming deleting the folder.
 
 --8<-- "docs/cmd/_global.md"
 
@@ -30,14 +30,14 @@ The `spo folder remove` command will remove folder only if it is empty. If the f
 
 ## Examples
 
-Removes a folder with site-relative URL _/Shared Documents/My Folder_ located in site _https://contoso.sharepoint.com/sites/project-x_
+Remove a folder with a specific site-relative URL
 
 ```sh
 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
+Remove a folder with a specific server relative URL to the site recycle bin
 
 ```sh
-m365 spo folder remove --webUrl https://contoso.sharepoint.com/sites/project-x --url '/Shared Documents/My Folder' --recycle
+m365 spo folder remove --webUrl https://contoso.sharepoint.com/sites/project-x --url '/sites/project-x/Shared Documents/My Folder' --recycle
 ```