@pnp/cli-microsoft365 6.8.0-beta.2463cfa → 6.8.0-beta.a10f6e4

package/dist/m365/spo/commands/site/site-recyclebinitem-move.js

@@ -0,0 +1,119 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoSiteRecycleBinItemMoveCommand_instances, _SpoSiteRecycleBinItemMoveCommand_initTelemetry, _SpoSiteRecycleBinItemMoveCommand_initOptions, _SpoSiteRecycleBinItemMoveCommand_initOptionSets, _SpoSiteRecycleBinItemMoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoSiteRecycleBinItemMoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.SITE_RECYCLEBINITEM_MOVE;
+    }
+    get description() {
+        return 'Moves items from the first-stage recycle bin to the second-stage recycle bin';
+    }
+    constructor() {
+        super();
+        _SpoSiteRecycleBinItemMoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemMoveCommand_instances, "m", _SpoSiteRecycleBinItemMoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemMoveCommand_instances, "m", _SpoSiteRecycleBinItemMoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemMoveCommand_instances, "m", _SpoSiteRecycleBinItemMoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemMoveCommand_instances, "m", _SpoSiteRecycleBinItemMoveCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.moveRecycleBinItem(args, logger);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: 'Are you sure you want to move these items to the second-stage recycle bin?'
+                });
+                if (result.continue) {
+                    yield this.moveRecycleBinItem(args, logger);
+                }
+            }
+        });
+    }
+    moveRecycleBinItem(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${args.options.siteUrl}/_api/web/recycleBin/MoveAllToSecondStage`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                if (args.options.ids !== undefined) {
+                    const ids = args.options.ids.split(',');
+                    if (this.verbose) {
+                        logger.logToStderr(`Moving ${ids.length} items to the second-stage recycle bin.`);
+                    }
+                    requestOptions.data = {
+                        ids: ids
+                    };
+                }
+                else if (this.verbose) {
+                    logger.logToStderr('Moving all items to the second-stage recycle bin.');
+                }
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoSiteRecycleBinItemMoveCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemMoveCommand_initTelemetry = function _SpoSiteRecycleBinItemMoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            ids: typeof args.options.ids !== 'undefined',
+            all: !!args.options.all,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoSiteRecycleBinItemMoveCommand_initOptions = function _SpoSiteRecycleBinItemMoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-i, --ids [ids]'
+    }, {
+        option: '--all'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoSiteRecycleBinItemMoveCommand_initOptionSets = function _SpoSiteRecycleBinItemMoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['ids', 'all'] });
+}, _SpoSiteRecycleBinItemMoveCommand_initValidators = function _SpoSiteRecycleBinItemMoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.ids && !validation_1.validation.isValidGuidArray(args.options.ids.split(','))) {
+            return 'The option ids contains one or more invalid GUIDs';
+        }
+        return true;
+    }));
+};
+module.exports = new SpoSiteRecycleBinItemMoveCommand();
+//# sourceMappingURL=site-recyclebinitem-move.js.map

package/dist/m365/spo/commands/site/site-recyclebinitem-remove.js

@@ -0,0 +1,106 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoSiteRecycleBinItemRemoveCommand_instances, _SpoSiteRecycleBinItemRemoveCommand_initTelemetry, _SpoSiteRecycleBinItemRemoveCommand_initOptions, _SpoSiteRecycleBinItemRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoSiteRecycleBinItemRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.SITE_RECYCLEBINITEM_REMOVE;
+    }
+    get description() {
+        return 'Permanently deletes specific items from the site recycle bin';
+    }
+    constructor() {
+        super();
+        _SpoSiteRecycleBinItemRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemRemoveCommand_instances, "m", _SpoSiteRecycleBinItemRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemRemoveCommand_instances, "m", _SpoSiteRecycleBinItemRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemRemoveCommand_instances, "m", _SpoSiteRecycleBinItemRemoveCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.removeRecycleBinItem(args, logger);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to permanently delete ${args.options.ids.split(',').length} item(s) from the site recycle bin?`
+                });
+                if (result.continue) {
+                    yield this.removeRecycleBinItem(args, logger);
+                }
+            }
+        });
+    }
+    removeRecycleBinItem(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Permanently deleting items from the site recycle bin at site ${args.options.siteUrl}...`);
+            }
+            try {
+                const requestOptions = {
+                    url: `${args.options.siteUrl}/_api/site/RecycleBin/DeleteByIds`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: {
+                        ids: args.options.ids.split(',')
+                    }
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoSiteRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemRemoveCommand_initTelemetry = function _SpoSiteRecycleBinItemRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoSiteRecycleBinItemRemoveCommand_initOptions = function _SpoSiteRecycleBinItemRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-i, --ids <ids>'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoSiteRecycleBinItemRemoveCommand_initValidators = function _SpoSiteRecycleBinItemRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (!validation_1.validation.isValidGuidArray(args.options.ids.split(','))) {
+            return 'The option ids contains one or more invalid GUIDs.';
+        }
+        return true;
+    }));
+};
+module.exports = new SpoSiteRecycleBinItemRemoveCommand();
+//# sourceMappingURL=site-recyclebinitem-remove.js.map

package/dist/m365/spo/commands.js

@@ -249,6 +249,8 @@ exports.default = {
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
     SITE_RECYCLEBINITEM_CLEAR: `${prefix} site recyclebinitem clear`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
+    SITE_RECYCLEBINITEM_MOVE: `${prefix} site recyclebinitem move`,
+    SITE_RECYCLEBINITEM_REMOVE: `${prefix} site recyclebinitem remove`,
     SITE_RECYCLEBINITEM_RESTORE: `${prefix} site recyclebinitem restore`,
     SITE_REMOVE: `${prefix} site remove`,
     SITE_RENAME: `${prefix} site rename`,

package/dist/utils/spo.js

@@ -453,7 +453,7 @@ exports.spo = {
      * Retrieves the SiteId, VroomItemId and VroomDriveId from a specific file.
      * @param webUrl Web url
      * @param fileId GUID ID of the file
-     * @param fileUrl Decoded URL of the file
+     * @param fileUrl Decoded site-relative or server-relative URL of the file
      */
     getVroomFileDetails(webUrl, fileId, fileUrl) {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -14,7 +14,7 @@ m365 spo file add [options]
 : The URL of the site where the file should be uploaded to
 
 `-f, --folder <folder>`
-: Site-relative or server-relative URL to the folder where the file should be uploaded
+: The server- or site-relative URL to the folder where the file should be uploaded
 
 `-p, --path <path>`
 : Local path to the file to upload

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

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

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

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

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

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

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

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

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

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