@pnp/cli-microsoft365 6.8.0-beta.e41be56 → 6.8.0-beta.f473be5

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-list.js

@@ -46,8 +46,21 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.defau
                     throw response.ErrorInfo.ErrorMessage;
                 }
                 else {
+                    let spoWebAppServicePrincipalPermissionRequestResult = [];
                     const result = json[json.length - 1]._Child_Items_;
-                    logger.log(result.map(r => {
+                    if (result.length > 0) {
+                        const spoClientExtensibilityWebApplicationPrincipalId = yield this.getSPOClientExtensibilityWebApplicationPrincipalId();
+                        if (spoClientExtensibilityWebApplicationPrincipalId !== null) {
+                            const oAuth2PermissionGrants = yield this.getOAuth2PermissionGrants(spoClientExtensibilityWebApplicationPrincipalId);
+                            if (oAuth2PermissionGrants) {
+                                spoWebAppServicePrincipalPermissionRequestResult = result.filter(x => oAuth2PermissionGrants.indexOf(x.Scope) === -1);
+                            }
+                        }
+                    }
+                    if (spoWebAppServicePrincipalPermissionRequestResult.length === 0) {
+                        spoWebAppServicePrincipalPermissionRequestResult = result;
+                    }
+                    logger.log(spoWebAppServicePrincipalPermissionRequestResult.map(r => {
                         return {
                             Id: r.Id.replace('/Guid(', '').replace(')/', ''),
                             Resource: r.Resource,
@@ -62,6 +75,38 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.defau
             }
         });
     }
+    getOAuth2PermissionGrants(spoClientExtensibilityWebApplicationPrincipalId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/oAuth2Permissiongrants/?$filter=clientId eq '${spoClientExtensibilityWebApplicationPrincipalId}' and consentType eq 'AllPrincipals'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            if (response.value && response.value.length > 0) {
+                return response.value[0].scope.split(' ');
+            }
+            return null;
+        });
+    }
+    getSPOClientExtensibilityWebApplicationPrincipalId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/servicePrincipals/?$filter=displayName eq 'SharePoint Online Client Extensibility Web Application Principal'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            if (response.value && response.value.length > 0) {
+                return response.value[0].id;
+            }
+            return null;
+        });
+    }
 }
 module.exports = new SpoServicePrincipalPermissionRequestListCommand();
 //# sourceMappingURL=serviceprincipal-permissionrequest-list.js.map

package/dist/m365/spo/commands/tenant/tenant-settings-set.js

@@ -418,6 +418,9 @@ _SpoTenantSettingsSetCommand_instances = new WeakSet(), _SpoTenantSettingsSetCom
     }, {
         option: '--DisableCustomAppAuthentication [DisableCustomAppAuthentication]',
         autocomplete: ['true', 'false']
+    }, {
+        option: '--CommentsOnListItemsDisabled [CommentsOnListItemsDisabled]',
+        autocomplete: ['true', 'false']
     }, {
         option: '--EnableAzureADB2BIntegration [EnableAzureADB2BIntegration]',
         autocomplete: ['true', 'false']
@@ -504,6 +507,7 @@ SpoTenantSettingsSetCommand.booleanOptions = [
     'ShowNGSCDialogForSyncOnODB',
     'SyncPrivacyProfileProperties',
     'DisableCustomAppAuthentication',
+    'CommentsOnListItemsDisabled',
     'EnableAzureADB2BIntegration',
     'SyncAadB2BManagementPolicy'
 ];

package/dist/m365/teams/commands/meeting/meeting-transcript-list.js

@@ -0,0 +1,124 @@
+"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 _TeamsMeetingTranscriptListCommand_instances, _TeamsMeetingTranscriptListCommand_initTelemetry, _TeamsMeetingTranscriptListCommand_initOptions, _TeamsMeetingTranscriptListCommand_initValidators, _TeamsMeetingTranscriptListCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
+const accessToken_1 = require("../../../../utils/accessToken");
+const aadUser_1 = require("../../../../utils/aadUser");
+class TeamsMeetingTranscriptListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.MEETING_TRANSCRIPT_LIST;
+    }
+    get description() {
+        return 'Lists all transcripts for a given meeting';
+    }
+    defaultProperties() {
+        return ['id', 'createdDateTime'];
+    }
+    constructor() {
+        super();
+        _TeamsMeetingTranscriptListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsMeetingTranscriptListCommand_instances, "m", _TeamsMeetingTranscriptListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsMeetingTranscriptListCommand_instances, "m", _TeamsMeetingTranscriptListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsMeetingTranscriptListCommand_instances, "m", _TeamsMeetingTranscriptListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsMeetingTranscriptListCommand_instances, "m", _TeamsMeetingTranscriptListCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving transcript list for the given meeting...`);
+                }
+                let requestUrl = `${this.resource}/beta/`;
+                if (isAppOnlyAccessToken) {
+                    if (!args.options.userId && !args.options.userName && !args.options.email) {
+                        throw `The option 'userId', 'userName' or 'email' is required when retrieving meeting transcripts list using app only permissions`;
+                    }
+                    requestUrl += 'users/';
+                    if (args.options.userId) {
+                        requestUrl += args.options.userId;
+                    }
+                    else if (args.options.userName) {
+                        requestUrl += args.options.userName;
+                    }
+                    else if (args.options.email) {
+                        if (this.verbose) {
+                            logger.logToStderr(`Getting user ID for user with email '${args.options.email}'.`);
+                        }
+                        const userId = yield aadUser_1.aadUser.getUserIdByEmail(args.options.email);
+                        requestUrl += userId;
+                    }
+                }
+                else {
+                    if (args.options.userId || args.options.userName || args.options.email) {
+                        throw `The options 'userId', 'userName' and 'email' cannot be used while retrieving meeting transcripts using delegated permissions`;
+                    }
+                    requestUrl += `me`;
+                }
+                requestUrl += `/onlineMeetings/${args.options.meetingId}/transcripts`;
+                const res = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_TeamsMeetingTranscriptListCommand_instances = new WeakSet(), _TeamsMeetingTranscriptListCommand_initTelemetry = function _TeamsMeetingTranscriptListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            email: typeof args.options.email !== 'undefined'
+        });
+    });
+}, _TeamsMeetingTranscriptListCommand_initOptions = function _TeamsMeetingTranscriptListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --userId [userId]'
+    }, {
+        option: '-n, --userName [userName]'
+    }, {
+        option: '--email [email]'
+    }, {
+        option: '-m, --meetingId <meetingId>'
+    });
+}, _TeamsMeetingTranscriptListCommand_initValidators = function _TeamsMeetingTranscriptListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid Guid`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid user principal name (UPN)`;
+        }
+        if (args.options.email && !validation_1.validation.isValidUserPrincipalName(args.options.email)) {
+            return `${args.options.email} is not a valid email`;
+        }
+        return true;
+    }));
+}, _TeamsMeetingTranscriptListCommand_initOptionSets = function _TeamsMeetingTranscriptListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['userId', 'userName', 'email'],
+        runsWhen: (args) => args.options.userId || args.options.userName || args.options.email
+    });
+};
+module.exports = new TeamsMeetingTranscriptListCommand();
+//# sourceMappingURL=meeting-transcript-list.js.map

package/dist/m365/teams/commands.js

@@ -30,6 +30,7 @@ exports.default = {
     MEETING_ATTENDANCEREPORT_LIST: `${prefix} meeting attendancereport list`,
     MEETING_GET: `${prefix} meeting get`,
     MEETING_LIST: `${prefix} meeting list`,
+    MEETING_TRANSCRIPT_LIST: `${prefix} meeting transcript list`,
     MEMBERSETTINGS_LIST: `${prefix} membersettings list`,
     MEMBERSETTINGS_SET: `${prefix} membersettings set`,
     MESSAGE_GET: `${prefix} message get`,

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/planner/roster/roster-plan-list.md

@@ -0,0 +1,109 @@
+# planner roster plan list
+
+Lists all Microsoft Planner Roster plans for a specific user
+
+## Usage
+
+```sh
+m365 planner roster plan list [options]
+```
+
+## Options
+
+`--userId [userId]`
+: User's Azure AD ID. Specify either `userId` or `userName` but not both. Specify this option only when using application permissions.
+
+`--userName [userName]`
+: User's UPN (user principal name, e.g. johndoe@example.com). Specify either `userId` or `userName` but not both. Specify this option only when using application permissions.
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+!!! attention
+    This command is based on an API that is currently in preview and is subject to change once the API reached general availability.
+
+## Examples
+
+List all Planner plans contained in a Roster where the current logged in user is member of.
+
+```sh
+m365 planner roster plan list
+```
+
+List all Planner plans contained in a Roster where specific user is member of by its UPN.
+
+```sh
+m365 planner roster plan list --userName john.doe@contoso.com
+```
+
+List all Planner plans contained in a Roster where specific user is member of by its Id.
+
+```sh
+m365 planner roster plan list --userId 59f80e08-24b1-41f8-8586-16765fd830d3
+```
+
+## Response
+
+=== "JSON"
+
+    ```json
+    [
+      {
+        "createdDateTime": "2023-04-06T14:41:49.8676617Z",
+        "owner": "59f80e08-24b1-41f8-8586-16765fd830d3",
+        "title": "My Planner Plan",
+        "creationSource": null,
+        "id": "_5GY9MJpZU2vb3DC46CP3MkACr8m",
+        "createdBy": {
+          "user": {
+            "displayName": null,
+            "id": "59f80e08-24b1-41f8-8586-16765fd830d3"
+          },
+          "application": {
+            "displayName": null,
+            "id": "31359c7f-bd7e-475c-86db-fdb8c937548e"
+          }
+        },
+        "container": {
+          "containerId": "_5GY9MJpZU2vb3DC46CP3MkACr8m",
+          "type": "unknownFutureValue",
+          "url": "https://graph.microsoft.com/beta/planner/rosters/_5GY9MJpZU2vb3DC46CP3MkACr8m"
+        },
+        "contexts": {},
+        "sharedWithContainers": []
+      }
+    ]
+    ```
+
+=== "Text"
+
+    ```text
+    id                            title            createdDateTime               owner
+    ----------------------------  ---------------  ----------------------------  ------------------------------------
+    _5GY9MJpZU2vb3DC46CP3MkACr8m  My Planner Plan  2023-04-06T14:41:49.8676617Z  59f80e08-24b1-41f8-8586-16765fd830d3
+    ```
+
+=== "CSV"
+
+    ```csv
+    createdDateTime,owner,title,id
+    2023-04-06T14:41:49.8676617Z,59f80e08-24b1-41f8-8586-16765fd830d3,My Planner Plan,_5GY9MJpZU2vb3DC46CP3MkACr8m
+    ```
+
+=== "Markdown"
+
+    ```md
+    # planner roster plan list --userId "59f80e08-24b1-41f8-8586-16765fd830d3"
+
+    Date: 4/8/2023
+
+    ## My Planner Plan (_5GY9MJpZU2vb3DC46CP3MkACr8m)
+
+    Property | Value
+    ---------|-------
+    createdDateTime | 2023-04-06T14:41:49.8676617Z
+    owner | 59f80e08-24b1-41f8-8586-16765fd830d3
+    title | My Planner Plan
+    id | \_5GY9MJpZU2vb3DC46CP3MkACr8m
+    ```

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

@@ -33,11 +33,11 @@ If the specified url doesn't refer to an existing site collection, you will get
 Enable site feature
 
 ```sh
-m365 spo feature enable --url https://contoso.sharepoint.com/sites/sales --featureId 915c240e-a6cc-49b8-8b2c-0bff8b553ed3 --scope Site
+m365 spo feature enable --webUrl https://contoso.sharepoint.com/sites/sales --id 915c240e-a6cc-49b8-8b2c-0bff8b553ed3 --scope Site
 ```
 
 Enable web feature (with force to overwrite feature with same id)
 
 ```sh
-m365 spo feature enable --url https://contoso.sharepoint.com/sites/sales --featureId 00bfea71-5932-4f9c-ad71-1557e5751100 --scope Web --force
+m365 spo feature enable --webUrl https://contoso.sharepoint.com/sites/sales --id 00bfea71-5932-4f9c-ad71-1557e5751100 --scope Web --force
 ```

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